ChangeLogTag: Mon Jun 13 18:00:05 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>

6274 files changed, 56903 insertions, 179624 deletions

diff --git a/COPYING b/COPYING
index cdb68ec588c..a9bbf1d9e0f 100644
--- a/COPYING
+++ b/COPYING
@@ -1,36 +1,37 @@
 
      _________________________________________________________________
 
-  Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and
-  CoSMIC(TM)
+  Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM),
+  DAnCE(TM), and CoSMIC(TM)
 
-   [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), and [4]CoSMIC(TM) (henceforth
-   referred to as "DOC software") are copyrighted by [5]Douglas C.
-   Schmidt and his [6]research group at [7]Washington University,
-   [8]University of California, Irvine, and [9]Vanderbilt University,
-   Copyright (c) 1993-2010, all rights reserved. Since DOC software is
-   open-source, freely available software, you are free to use, modify,
-   copy, and distribute--perpetually and irrevocably--the DOC software
-   source code and object code produced from the source, as well as copy
-   and distribute modified versions of this software. You must, however,
-   include this copyright statement along with any code built using DOC
-   software that you release. No copyright statement needs to be provided
-   if you just ship binary executables of your software products.
+   [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), DAnCE(TM), and [4]CoSMIC(TM)
+   (henceforth referred to as "DOC software") are copyrighted by
+   [5]Douglas C. Schmidt and his [6]research group at [7]Washington
+   University, [8]University of California, Irvine, and [9]Vanderbilt
+   University, Copyright (c) 1993-2011, all rights reserved. Since DOC
+   software is open-source, freely available software, you are free to
+   use, modify, copy, and distribute--perpetually and irrevocably--the
+   DOC software source code and object code produced from the source, as
+   well as copy and distribute modified versions of this software. You
+   must, however, include this copyright statement along with any code
+   built using DOC software that you release. No copyright statement
+   needs to be provided if you just ship binary executables of your
+   software products.
 
    You can use DOC software in commercial and/or binary software releases
    and are under no obligation to redistribute any of your source code
-   that is built using DOC software. Note, however, that you may not do
-   anything to the DOC software code, such as copyrighting it yourself or
-   claiming authorship of the DOC software code, that will prevent DOC
-   software from being distributed freely using an open-source
-   development model. You needn't inform anyone that you're using DOC
-   software in your software, though we encourage you to let [10]us know
-   so we can promote your project in the [11]DOC software success
-   stories.
+   that is built using DOC software. Note, however, that you may not
+   misappropriate the DOC software code, such as copyrighting it yourself
+   or claiming authorship of the DOC software code, in a way that will
+   prevent DOC software from being distributed freely using an
+   open-source development model. You needn't inform anyone that you're
+   using DOC software in your software, though we encourage you to let
+   [10]us know so we can promote your project in the [11]DOC software
+   success stories.
 
-   The [12]ACE, [13]TAO, [14]CIAO, and [15]CoSMIC web sites are
-   maintained by the [16]DOC Group at the [17]Institute for Software
-   Integrated Systems (ISIS) and the [18]Center for Distributed Object
+   The [12]ACE, [13]TAO, [14]CIAO, [15]DAnCE, and [16]CoSMIC web sites
+   are maintained by the [17]DOC Group at the [18]Institute for Software
+   Integrated Systems (ISIS) and the [19]Center for Distributed Object
    Computing of Washington University, St. Louis for the development of
    open-source software as part of the open-source software community.
    Submissions are provided by the submitter ``as is'' with no warranties
@@ -54,11 +55,10 @@
    DOC software is provided with no support and without any obligation on
    the part of Washington University, UC Irvine, Vanderbilt University,
    their employees, or students to assist in its use, correction,
-   modification, or enhancement. A [19]number of companies around the
-   world provide commercial support for DOC software, however.
-
-   DOC software is Y2K-compliant, as long as the underlying OS platform
-   is Y2K-compliant. Likewise, DOC software is compliant with the new US
+   modification, or enhancement. A [20]number of companies around the
+   world provide commercial support for DOC software, however. DOC
+   software is Y2K-compliant, as long as the underlying OS platform is
+   Y2K-compliant. Likewise, DOC software is compliant with the new US
    daylight savings rule passed by Congress as "The Energy Policy Act of
    2005," which established new daylight savings times (DST) rules for
    the United States that expand DST as of March 2007. Since DOC software
@@ -66,23 +66,23 @@
    users will not be affected by the new DST rules as long as they
    upgrade their operating systems accordingly.
 
-   The names ACE(TM), TAO(TM), CIAO(TM), CoSMIC(TM), Washington
-   University, UC Irvine, and Vanderbilt University, may not be used to
-   endorse or promote products or services derived from this source
-   without express written permission from Washington University, UC
-   Irvine, or Vanderbilt University. This license grants no permission to
-   call products or services derived from this source ACE(TM), TAO(TM),
-   CIAO(TM), or CoSMIC(TM), nor does it grant permission for the name
-   Washington University, UC Irvine, or Vanderbilt University to appear
-   in their names.
+   The names ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), CoSMIC(TM),
+   Washington University, UC Irvine, and Vanderbilt University, may not
+   be used to endorse or promote products or services derived from this
+   source without express written permission from Washington University,
+   UC Irvine, or Vanderbilt University. This license grants no permission
+   to call products or services derived from this source ACE(TM),
+   TAO(TM), CIAO(TM), DAnCE(TM), or CoSMIC(TM), nor does it grant
+   permission for the name Washington University, UC Irvine, or
+   Vanderbilt University to appear in their names.
 
    If you have any suggestions, additions, comments, or questions, please
-   let [20]me know.
+   let [21]me know.
 
-   [21]Douglas C. Schmidt
+   [22]Douglas C. Schmidt
      _________________________________________________________________
 
-   Back to the [22]ACE home page.
+   Back to the [23]ACE home page.
 
 References
 
@@ -100,11 +100,12 @@ References
   12. http://www.cs.wustl.edu/~schmidt/ACE.html
   13. http://www.cs.wustl.edu/~schmidt/TAO.html
   14. http://www.dre.vanderbilt.edu/CIAO/
-  15. http://www.dre.vanderbilt.edu/cosmic/
-  16. http://www.dre.vanderbilt.edu/
-  17. http://www.isis.vanderbilt.edu/
-  18. http://www.cs.wustl.edu/~schmidt/doc-center.html
-  19. http://www.cs.wustl.edu/~schmidt/commercial-support.html
-  20. mailto:d.schmidt@vanderbilt.edu
-  21. http://www.dre.vanderbilt.edu/~schmidt/
-  22. http://www.cs.wustl.edu/ACE.html
+  15. http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/DAnCE/
+  16. http://www.dre.vanderbilt.edu/cosmic/
+  17. http://www.dre.vanderbilt.edu/
+  18. http://www.isis.vanderbilt.edu/
+  19. http://www.cs.wustl.edu/~schmidt/doc-center.html
+  20. http://www.cs.wustl.edu/~schmidt/commercial-support.html
+  21. mailto:d.schmidt@vanderbilt.edu
+  22. http://www.dre.vanderbilt.edu/~schmidt/
+  23. http://www.cs.wustl.edu/ACE.html
diff --git a/ChangeLog b/ChangeLog
index 165efe844ad..2f0c05d0050 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,814 @@
+Mon Jun 13 18:00:05 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * Merged main trunk into this branch, resolved all conflicts.
+        * Merged ChangeLog from main trunk.
+
+          Fri Jun 10 19:08:19 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+                  * TAO_IDL/be/be_helper.cpp:
+
+                    Used the recently added ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII
+                    to generate long double literals portably.
+
+          Fri Jun 10 12:41:00 UTC 2011  Simon Massey <sma at prismtech dot com>
+
+                  * tests/MT_NoUpcall_Client_Leader/run_test.pl:
+
+                    This test wasn't capable of exiting with an error, it was
+                    always successful even if the test failed.
+
+                  * tests/MT_NoUpcall_Client_Leader/client.cpp:
+                  * tests/MT_NoUpcall_Client_Leader/server.cpp:
+
+                    The mutex needed to be locked prior to worker thread creation
+                    and the stop_condition.wait condition, then released after,
+                    otherwise worker threads can signal prior to the server/client
+                    being ready to deal with the event. Client needed to
+                    pause before the issuing the shutdown request to the server
+                    so as to allow it to finish its own worker thread.
+
+                  * tests/MT_NoUpcall_Client_Leader/police.cpp:
+
+                    The stat test in the loop was occationally detecting the creation
+                    of the ior file before the contents had been written. Moving
+                    the sleep after the stat and before the test allows the contents to
+                    be output before allowing the client/server to use the ior it
+                    has just detected.
+
+                  * tests/MT_NoUpcall_Client_Leader/chatter.cpp:
+                  * tests/MT_NoUpcall_Client_Leader/chatter.h:
+
+                    Need to mutex control access to the two nrequests_ and nreplies_
+                    counts, as the client has two concurrent worker threads competing
+                    to update them, these counts also need to be volitile.
+
+          Thu Jun  9 19:38:48 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+                  * TAO_IDL/be/be_helper.cpp:
+
+                    Changed print format of long double literal to be conditional,
+                    based on the existence of a native 16-byte long double, in
+                    order to eliminate warnings of rhs and lhs type mismatch.
+
+          Thu Jun  9 17:28:25 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+                  * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
+                  * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
+
+                    Changed generated code to always use a constructor with an
+                    ACE_CDR::LongDoubleAssign argument for long double constants.
+
+          Thu Jun  9 07:05:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp:
+                  * orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp:
+                    Fixed gcc 4.6 warnings
+
+          Thu Jun  9 01:09:40 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+                  * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp (TAO_Notify_ThreadPool_Task::execute):
+                    Fixed a memory leak that occurred when the enqueue() failed.
+                    Thanks to Jochen Meier <gesammeltimusenet2009 at arcor dot de> for
+                    reporting this and suggesting a fix.
+
+          Mon Jun  6 19:53:54 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+                  * tao/AnyTypeCode/Any_Basic_Impl.cpp:
+                  * tao/AnyTypeCode/Any_Basic_Impl.h:
+
+                    Restored the long double member back to the member union of
+                    Any_Basic_Impl. A change suggested by Adam Mitz <mitza at
+                    ociweb dot com> enabled the use of the LongDouble emulator
+                    struct without constructors or assignment operators.
+
+                  * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
+                  * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
+
+                    Changed code generation for long double constant initialization,
+                    when 16-byte native long double does not exist, to use the
+                    new LongDoubleAssign struct in ACE_CDR.
+
+                  * tests/IDL_Test/union.idl:
+
+                    Added a test case of a union containing a long double, to
+                    test that the generated union doesn't contain a member
+                    with a constructor.
+
+          Mon Jun  6 18:59:41 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+                  * TAO_IDL/be/be_helper.cpp:
+
+                    Restored minimum significant digit suggestions for the format
+                    string for double, and added them to the format string for
+                    long double.
+
+          Mon Jun  6 17:28:05 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+                  * tao/AnyTypeCode/Any_Basic_Impl.cpp:
+                  * tao/AnyTypeCode/Any_Basic_Impl.h:
+
+                    Added a separate member for long doubles, rather than have
+                    support for long doubles on all platforms disabled because
+                    the struct that is now used for some long double representations
+                    has a constructor.
+
+                  * tests/DynAny_Test/test_dynany.cpp:
+
+                    Reverted the change in
+
+                    Fri Jun  3 18:54:59 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+                    since that part of the test will work again.
+
+          Mon Jun  6 15:06:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * TAO_IDL/be/be_codegen.cpp:
+                  * TAO_IDL/be/be_global.cpp:
+                  * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+                  * TAO_IDL/be_include/be_global.h:
+                  * TAO_IDL/fe/lex.yy.cpp:
+                  * TAO_IDL/include/idl_global.h:
+                  * TAO_IDL/util/utl_global.cpp:
+                    Extended DDS support
+
+          Fri Jun  3 18:54:59 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+                  * tao/AnyTypeCode/Any_Basic_Impl.cpp:
+                  * tao/AnyTypeCode/Any_Basic_Impl.h:
+
+                    On platforms where native long doubles aren't 16 bytes,
+                    eliminated case where an Any contains a CORBA::LongDouble.
+                    The class contains a C++ union, which can't contain a
+                    non-native LongDouble ( a struct) since it now has a constructor.
+                    A fair tradeoff since in return for the recent changes to
+                    ACE_CDR::LongDouble, we now have support for IDL constants
+                    of type CORBA::LongDouble on all platforms.
+
+                  * tests/DynAny_Test/test_dynany.cpp:
+
+                    Similarly to the above item, eliminated the test for long
+                    double on platforms where a non-native struct alternative
+                    is used.
+
+          Thu Jun  2 12:24:59 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+                  * TAO_IDL/be/be_helper.cpp:
+
+                    - Fixed print format for long double, eliminated warnings.
+                    - Added '#' flag to all floating point print formats, forces
+                      printing of decimal point even if not present in IDL.
+
+          Wed Jun  1 19:39:08 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+                  * TAO_IDL/include/AST_Expression.h:
+                  * TAO_IDL/ast/AST_Expression.cpp
+                  * TAO_IDL/ast/AST_Constant.cpp
+                  * TAO_IDL/be/be_helper.cpp:
+                  * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
+                  * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
+
+                    Added support for long double constants in IDL.
+
+                  * tests/IDL_Test/constants.idl:
+
+                    Added test cases for long double constants.
+
+                  * NEWS:
+
+                    Added item about long double constant support.
+
+          Wed Jun  1 09:46:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
+                  * orbsvcs/tests/Log/Basic_Log_Test/client.cpp:
+                  * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
+                  * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
+                    Fixed Coverity warnings regarding uncaught exceptions.
+
+          Tue May 31 05:47:19 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * tests/Sequence_Unit_Tests/string_sequence_tester.hpp:
+                    Fixed gcc 4.6 warnings: variable was set but not used.
+
+          Mon May 30 10:21:08 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * examples/Logging/Logger_i.cpp:
+                    Resolved gcc 4.6 warning: variable may be used uninitialized
+                    in this function
+
+          Mon May 30 10:00:33 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * orbsvcs/LoadBalancer/LoadMonitor.cpp:
+                    Fixed compiler error on Windows.
+
+          Mon May 30 06:39:12 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * tests/Sequence_Unit_Tests/string_sequence_tester.hpp:
+                  * tests/Smart_Proxies/Benchmark/client.cpp:
+                    Resolved gcc 4.6 warnings: variable was set but not used.
+
+          Fri May 27 14:35:57 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * tests/Bug_2936_Regression/bug2936.cpp:
+                  * tests/Bug_3926_Regression/Client_Request_Interceptor.cpp:
+                  * tests/Exposed_Policies/RT_Properties.cpp:
+                  * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp:
+                    Resolved gcc 4.6 warnings: variable was set but not used.
+
+                  * tests/POA/Bug_2511_Regression/server.cpp:
+                    Resolved gcc 4.6 warnings: variable was set but not used.
+                    Code alignment.
+
+          Fri May 27 14:13:08 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * performance-tests/POA/Demux/demux_test_server.cpp:
+                  * tests/Bug_2677_Regression/DllORB.cpp:
+                  * tests/Bug_2683_Regression/server.cpp:
+                    Resolved gcc 4.6 warnings: variable was set but not used.
+
+          Fri May 27 13:52:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * TAO_IDL/be/be_visitor_union/union_ch.cpp:
+                    Removed generation of holder_ member of an union, it is not used
+                    at all
+
+          Fri May 27 10:09:25 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * orbsvcs/examples/ImR/Advanced/TestClient.cpp:
+                  * orbsvcs/tests/IOR_MCast/client.cpp:
+                  * orbsvcs/tests/Security/Bug_1107_Regression/client.cpp:
+                    Statisfy Coverity and the GNU 4.6 gcc compiler. Using a
+                    returned value either by using ACE_UNUSED_ARG or to print
+                    in a log message.
+
+                  * tests/Sequence_Unit_Tests/value_sequence_tester.hpp:
+                    Fuzz.
+
+          Fri May 27 09:14:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * orbsvcs/LoadBalancer/LoadMonitor.cpp:
+                  * orbsvcs/examples/ImR/Advanced/TestClient.cpp:
+                  * orbsvcs/tests/Bug_3486_Regression/server.cpp:
+                  * orbsvcs/tests/IOR_MCast/client.cpp:
+                  * orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp:
+                  * orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp:
+                  * orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp:
+                  * orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp:
+                  * orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp:
+                  * orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp:
+                  * orbsvcs/tests/Security/Bug_1107_Regression/client.cpp:
+                    Resolved gcc 4.6 warnings: variable was set but not used.
+
+          Thu May 26 15:25:36 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * TAO_IDL/fe/fe_utils.cpp:
+                    tmp variable wasn't necessary. Removed it.
+
+          Thu May 26 14:13:05 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
+                  * TAO_IDL/fe/fe_utils.cpp:
+                  * tao/Strategies/COIOP_Acceptor.cpp:
+                    Resolved gcc 4.6 warnings: variable was set but not used.
+
+          Thu May 26 13:48:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp:
+                  * tests/Sequence_Unit_Tests/Bounded_String.cpp:
+                  * tests/Sequence_Unit_Tests/Unbounded_Octet.cpp:
+                  * tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp:
+                  * tests/Sequence_Unit_Tests/Unbounded_String.cpp:
+                    Catch uncaught exceptions in main.
+
+          Thu May 26 13:11:19 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * tao/Generic_Sequence_T.h:
+                    Added file name to doxygen documentation
+
+                  * tests/Sequence_Unit_Tests/value_sequence_tester.hpp:
+                    Resolved Coverity warning: catching a uncaught BAD_PARAM exception.
+
+          Fri May 20 22:07:56 UTC 2011  Adam Mitz  <mitza@ociweb.com>
+
+                  * tao/AnyTypeCode/TAO_AnyTypeCode.rc:
+                  * tao/Codeset/TAO_Codeset.rc:
+                  * tao/PI/TAO_PI.rc:
+                  * tao/PI_Server/TAO_PI_Server.rc:
+                  * tao/Utils/TAO_Utils.rc:
+                  * tao/ZIOP/TAO_ZIOP.rc:
+
+                    Add resource files to get TAO version number on DLLs.
+
+          Fri May 20 14:20:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * tests/Oneway_Timeouts/test.mpc:
+                    Added explicit idl project to get correct build order on VMS
+
+          Thu May 19 14:53:55 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+                  * tests/QtTests/client.cpp:
+                  * tests/QtTests/client.h:
+                  * tests/QtTests/QtTests.mpc:
+                  * tests/QtTests/server.cpp:
+                  * tests/QtTests/test_i.h:
+                  Adapted to qt4.
+
+          Tue May 17 19:20:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * tests/OBV/Indirection/MessengerServer.cpp:
+                  * tests/Portable_Interceptors/Slot/driver.cpp:
+                    Catch exceptions in main
+
+          Tue May 17 11:32:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+                  * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
+                    Layout changes to the generated code
+
+          Fri May 13 08:04:48 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * tao/Bounded_Basic_String_Sequence_T.h:
+                  * tao/Bounded_Object_Reference_Sequence_T.h:
+                  * tao/Bounded_Value_Sequence_T.h:
+                  * tao/Unbounded_Basic_String_Sequence_T.h:
+                  * tao/Unbounded_Object_Reference_Sequence_T.h:
+                    Doxygen changes.
+
+          Wed May 11 18:43:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * tao/ObjectKey_Table.h:
+                  * tao/orbconf.h:
+                  * tao/params.h:
+                    Doxygen changes
+
+          Wed May 11 13:35:28 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+                  * tao/QtResource/QtResource_Loader.h:
+                  Changed for QT4 deprecated include QT/..
+
+          Tue May 10 18:15:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * tao/ImR_Client/ImR_Client.cpp:
+                    changed variable name to not match method argument
+
+                  * utils/catior/catior.cpp:
+                  * utils/nslist/nsadd.cpp:
+                  * utils/nslist/nsdel.cpp:
+                  * utils/nslist/nslist.cpp:
+                    Fixed coverity errors, not leak exceptions
+
+          Tue May 10 06:15:43 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * tao/IORManipulation/IORManip_IIOP_Filter.cpp:
+                    Fixed compile error.
+
+          Mon May  9 19:10:54 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * TAO_IDL/be/be_interface.cpp:
+                  * tao/CSD_ThreadPool/CSD_TP_Task.cpp:
+                  * tao/IORManipulation/IORManip_IIOP_Filter.cpp:
+                    Fixed coverity errors
+
+          Wed Apr 27 13:35:10 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * TAO.mwc:
+                    Exclude DAnCE, thanks to Remko Duppen <remko dot duppen at syntel dot nl>
+                    for reporting this
+
+          Tue Apr 26 13:12:03 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp:
+                  * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+                    Layout changes generated code
+
+          Tue Apr 26 13:04:11 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * tao/Collocation_Resolver.h:
+                  * tao/Connect_Strategy.h:
+                  * tao/Endpoint_Selector_Factory.h:
+                  * tao/GIOP_Message_Base.h:
+                  * tao/GIOP_Message_Generator_Parser.h:
+                  * tao/GIOP_Message_Generator_Parser_10.h:
+                  * tao/GIOP_Message_Generator_Parser_11.h:
+                  * tao/GIOP_Message_Generator_Parser_Impl.h:
+                  * tao/GIOP_Message_State.h:
+                  * tao/GIOP_Utils.h:
+                  * tao/GUIResource_Factory.h:
+                  * tao/LF_Connect_Strategy.h:
+                  * tao/LF_Follower.cpp:
+                    Doxygen changes
+
+          Tue Apr 26 12:50:24 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * tao/ORB_Core.cpp:
+                  * tao/Thread_Lane_Resources.h:
+                  * tao/Thread_Lane_Resources_Manager.h:
+                  * tao/Thread_Per_Connection_Handler.h:
+                  * tao/Transport.h:
+                  * tao/Transport_Connector.h:
+                  * tao/TypeCodeFactory_Adapter.h:
+                    Doxygen changes
+
+          Tue Apr 26 12:21:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * tao/Acceptor_Impl.h:
+                  * tao/Acceptor_Impl.cpp:
+                  * tao/Acceptor_Registry.h:
+                  * tao/Adapter_Registry.h:
+                  * tao/Bind_Dispatcher_Guard.h:
+                  * tao/Blocked_Connect_Strategy.h:
+                  * tao/Blocked_Connect_Strategy.cpp:
+                  * tao/Cleanup_Func_Registry.h:
+                  * tao/Collocated_Invocation.cpp:
+                  * tao/LF_Event_Loop_Thread_Helper.inl:
+                  * tao/LF_Follower_Auto_Adder.inl:
+                  * tao/Leader_Follower.cpp:
+                  * tao/Queued_Message.h:
+                  * tao/Transport_Cache_Manager_T.cpp:
+                  * tao/Wait_On_LF_No_Upcall.h:
+                  * tao/Wait_On_LF_No_Upcall.cpp:
+                  * tao/Wait_On_Reactor.h:
+                  * tao/Wait_On_Read.h:
+                    Doxygen changes
+
+          Tue Apr 26 11:57:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * tao/Leader_Follower.h:
+                  * tao/Leader_Follower.inl:
+                  * tao/Wait_On_LF_No_Upcall.h:
+                  * tao/Wait_On_Leader_Follower.h:
+                  * tao/Wait_On_Reactor.h:
+                  * tao/Wait_On_Read.h:
+                  * tao/Wait_Strategy.h:
+                    Use explicit for single argument constructors, doxygen improvements
+
+          Tue Apr 26 11:13:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * tests/MT_NoUpcall_Client_Leader/client.cpp:
+                  * tests/MT_NoUpcall_Client_Leader/run_test.pl:
+                  * tests/MT_NoUpcall_Client_Leader/server.cpp:
+                    Make it possible to pass number of threads through the commandline
+
+          Tue Apr 26 09:42:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * tao/Leader_Follower.h:
+                  * tao/Leader_Follower.inl:
+                    Use bool instead of int for several methods
+
+                  * tao/Thread_Lane_Resources.cpp:
+                    Simplied some code
+
+          Tue Apr 26 09:26:48 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * bin/tao_orb_tests.lst:
+                    MT_NoUpcall_Client_Leader shouldn't run when there is no messaging
+
+          Tue Apr 26 09:00:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * bin/tao_orb_tests.lst:
+                    Disabled some tests with CORBA/e micro
+
+                  * tao/Connection_Handler.cpp:
+                  * tao/Resume_Handle_Deferred.h:
+                  * tao/Resume_Handle_Deferred.cpp:
+                    Use reference counting for deletion, also log an error and return -1
+                    when schedule_timer fails, we have a critical error at that moment
+
+                  * tao/Policy_Validator.cpp:
+                  * tao/TAO_Singleton.cpp:
+                  * tao/Leader_Follower.cpp:
+                    Use %@ for logging pointers
+
+          Fri Apr 22 12:41:53 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * orbsvcs/tests/Bug_3418_Regression/b.conf:
+                  * orbsvcs/tests/HTIOP/HT_Config.conf:
+                  * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf:
+                  * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf:
+                  * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf:
+                  * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf:
+                  * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf:
+                  * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf:
+                  * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf:
+                  * orbsvcs/tests/Notify/Lanes/consumer.conf:
+                  * orbsvcs/tests/Notify/Lanes/notify.conf:
+                  * performance-tests/Protocols/lksctp_params.conf:
+                  * performance-tests/Protocols/sctp_params.conf:
+                  * performance-tests/RTCorba/Thread_Pool/native-svc.conf:
+                  * tests/Bug_3068_Regression/server.conf:
+                  * tests/ORB_Local_Config/Bug_1459/m.conf:
+                  * tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf:
+                  * tests/RTCORBA/Explicit_Binding/svc.conf:
+                    Fuzz: added $Id string
+
+          Fri Apr 22 12:14:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * tao/Connection_Handler.cpp:
+                  * tao/Resume_Handle_Deferred.h:
+                  * tao/Resume_Handle_Deferred.cpp:
+                    Notify a specific event handler
+
+                  * tao/Resume_Handle_Deferred.inl:
+                    Removed this file, virtual methods may not be inline
+
+          Fri Apr 22 11:56:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * tao/Resume_Handle_Deferred.h:
+                  * tao/Resume_Handle_Deferred.inl:
+                  * tao/Resume_Handle_Deferred.cpp:
+                    We should only trigger the reactor
+
+                  * tao/Transport.cpp:
+                    Doxygen changes
+
+          Fri Apr 22 07:28:43 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                  * DevGuideExamples/Multithreading/Reactive/svc.conf:
+                  * DevGuideExamples/Multithreading/ThreadPerConnection/server.conf:
+                  * DevGuideExamples/RTCORBA/svc.conf:
+                  * docs/tutorials/Quoter/Event_Service/ec.conf:
+                  * examples/PluggableUDP/tests/Performance/svc.conf:
+                  * examples/PluggableUDP/tests/SimplePerformance/svc.conf:
+                  * examples/RTCORBA/Activity/client.conf:
+                  * examples/RTCORBA/Activity/server.conf:
+                  * examples/RTCORBA/Activity/svc.conf.client:
+                  * examples/RTCORBA/Activity/svc.conf.server:
+                  * examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.client:
+                  * examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.server:
+                  * examples/RTScheduling/MIF_Scheduler/svc.conf.client:
+                  * examples/RTScheduling/MIF_Scheduler/svc.conf.server:
+                  * orbsvcs/Concurrency_Service/svc.conf:
+                  * orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/supplier.conf:
+                  * orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/ec.conf:
+                  * orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/supplier.conf:
+                  * orbsvcs/DevGuideExamples/NotifyService/RTNotify/notify.conf:
+                  * orbsvcs/DevGuideExamples/NotifyService/RTNotify/nsclient.conf:
+                  * orbsvcs/DevGuideExamples/ValueTypes/Notify/notify.conf:
+                  * orbsvcs/Event_Service/svc.conf:
+                  * orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf:
+                  * orbsvcs/TAO_Service/svc.conf:
+                  * orbsvcs/examples/ImR/Combined_Service/dynserver.conf:
+                  * orbsvcs/examples/ImR/Combined_Service/start_all.conf:
+                  * orbsvcs/examples/Notify/Lanes/client.conf:
+                  * orbsvcs/examples/Notify/Lanes/notify.conf:
+                  * orbsvcs/examples/Notify/ThreadPool/client.conf:
+                  * orbsvcs/examples/Notify/ThreadPool/notify.conf:
+                  * orbsvcs/examples/RtEC/IIOPGateway/ec.conf:
+                  * orbsvcs/examples/RtEC/IIOPGateway/gateway.conf:
+                  * orbsvcs/examples/RtEC/Kokyu/svc.conf:
+                  * orbsvcs/examples/RtEC/MCast/svc.conf:
+                  * orbsvcs/examples/RtEC/Schedule/svc.conf:
+                  * orbsvcs/examples/RtEC/Simple/ec.conf:
+                  * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf:
+                  * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf:
+                  * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf:
+                  * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf:
+                  * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf:
+                  * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf:
+                  * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf:
+                  * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf:
+                  * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf:
+                  * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf:
+                  * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf:
+                  * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf:
+                  * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf:
+                  * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf:
+                  * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf:
+                  * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf:
+                  * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf:
+                  * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf:
+                  * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf:
+                  * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf:
+                  * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf:
+                  * orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf:
+                  * orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf:
+                  * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf:
+                  * orbsvcs/tests/Bug_2316_Regression/svc.conf:
+                  * orbsvcs/tests/Bug_2377_Regression/svc.conf:
+                  * orbsvcs/tests/Bug_2925_Regression/svc.conf:
+                  * orbsvcs/tests/Bug_3387_Regression/NotSvc.conf:
+                  * orbsvcs/tests/Bug_3418_Regression/m.conf:
+                  * orbsvcs/tests/Bug_3444_Regression/diop_svc.conf:
+                  * orbsvcs/tests/Bug_3444_Regression/miop_svc.conf:
+                  * orbsvcs/tests/CosEvent/Basic/svc.pull.conf:
+                  * orbsvcs/tests/CosEvent/Timeout/cosevent.conf:
+                  * orbsvcs/tests/EC_MT_Mcast/svc.conf:
+                  * orbsvcs/tests/EC_Mcast/svc.conf:
+                  * orbsvcs/tests/EC_Throughput/ec.conf:
+                  * orbsvcs/tests/Event/Basic/control.conf:
+                  * orbsvcs/tests/Event/Basic/mt.svc.conf:
+                  * orbsvcs/tests/Event/Basic/observer.conf:
+                  * orbsvcs/tests/Event/Basic/svc.complex.conf:
+                  * orbsvcs/tests/Event/Basic/svc.conf:
+                  * orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf:
+                  * orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf:
+                  * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf:
+                  * orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf:
+                  * orbsvcs/tests/Event/Performance/ec.list.conf:
+                  * orbsvcs/tests/Event/Performance/ec.mt.conf:
+                  * orbsvcs/tests/Event/Performance/ec.rb_tree.conf:
+                  * orbsvcs/tests/Event/Performance/ec.st.conf:
+                  * orbsvcs/tests/Event/Performance/latency.conf:
+                  * orbsvcs/tests/Event/UDP/svc.conf:
+                  * orbsvcs/tests/HTIOP/AMI/exclusive.conf:
+                  * orbsvcs/tests/HTIOP/AMI/muxed.conf:
+                  * orbsvcs/tests/ImplRepo/scale/client.conf:
+                  * orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf:
+                  * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf:
+                  * orbsvcs/tests/Miop/McastHello/svc.conf:
+                  * orbsvcs/tests/Notify/Basic/notify.mt.conf:
+                  * orbsvcs/tests/Notify/Basic/notify.reactive.conf:
+                  * orbsvcs/tests/Notify/Basic/notify.rt.conf:
+                  * orbsvcs/tests/Notify/Blocking/notify.conf:
+                  * orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf:
+                  * orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf:
+                  * orbsvcs/tests/Notify/Lanes/consumer.conf:
+                  * orbsvcs/tests/Notify/Persistent_Filter/NS.conf:
+                  * orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf:
+                  * orbsvcs/tests/Notify/Reconnecting/event.conf:
+                  * orbsvcs/tests/Notify/Reconnecting/ns_mt.conf:
+                  * orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf:
+                  * orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf:
+                  * orbsvcs/tests/Notify/Reconnecting/ns_st.conf:
+                  * orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf:
+                  * orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf:
+                  * orbsvcs/tests/Notify/ThreadPool/consumer.conf:
+                  * orbsvcs/tests/Notify/ThreadPool/notify.conf:
+                  * orbsvcs/tests/Notify/ThreadPool/supplier.conf:
+                  * orbsvcs/tests/Notify/Validate_Client/notify.conf:
+                  * orbsvcs/tests/Notify/XML_Persistence/svc.conf:
+                  * orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf:
+                  * orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf:
+                  * orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf:
+                  * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf:
+                  * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf:
+                  * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf:
+                  * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf:
+                  * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf:
+                  * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf:
+                  * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf:
+                  * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf:
+                  * orbsvcs/tests/Security/BiDirectional/client.conf:
+                  * orbsvcs/tests/Security/BiDirectional/server.conf:
+                  * orbsvcs/tests/Security/Bug_2908_Regression/client.conf:
+                  * orbsvcs/tests/Security/Bug_2908_Regression/server.conf:
+                  * orbsvcs/tests/Security/EndpointPolicy/svc.conf:
+                  * orbsvcs/tests/Security/InsecureReferences/client.conf:
+                  * orbsvcs/tests/Security/MT_IIOP_SSL/client.conf:
+                  * orbsvcs/tests/Security/MT_IIOP_SSL/server.conf:
+                  * orbsvcs/tests/Security/MT_SSLIOP/client.conf:
+                  * orbsvcs/tests/Security/MT_SSLIOP/server.conf:
+                  * orbsvcs/tests/Security/ssliop_CSD/csd.conf:
+                  * orbsvcs/tests/Security/ssliop_corbaloc/client.conf:
+                  * orbsvcs/tests/Security/ssliop_corbaloc/server.conf:
+                  * orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf:
+                  * performance-tests/Protocols/altq.conf:
+                  * performance-tests/Protocols/svc.conf:
+                  * performance-tests/RTCorba/Thread_Pool/svc.conf:
+                  * tests/AMI/muxed.conf:
+                  * tests/AMI_Timeouts/svc.conf:
+                  * tests/Bug_2186_Regression/server.conf:
+                  * tests/Bug_2935_Regression/middle.conf:
+                  * tests/Bug_3000_Regression/rw.conf:
+                  * tests/Bug_3068_Regression/client.conf:
+                  * tests/Bug_3163_Regression/server.conf:
+                  * tests/Bug_3251_Regression/Bug_3251.conf:
+                  * tests/Bug_3598a_Regression/svc.conf:
+                  * tests/Bug_3630_Regression/TAO Conf File.conf:
+                  * tests/Bug_3630_Regression/TAO_Conf_File.conf:
+                  * tests/Bug_3683_Regression/svc.conf:
+                  * tests/Bug_3801_Regression/exclusive.conf:
+                  * tests/Bug_3801_Regression/muxed.conf:
+                  * tests/Bug_3837_Regression/logger.conf:
+                  * tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf:
+                  * tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf:
+                  * tests/CodeSets/simple/cs_test.conf:
+                  * tests/CodeSets/simple/svc.conf:
+                  * tests/CodeSets/simple/wcs_test.conf:
+                  * tests/Collocation_Opportunities/svc.conf:
+                  * tests/Exposed_Policies/svc.conf:
+                  * tests/Leader_Followers/select_mt.conf:
+                  * tests/Leader_Followers/tp.conf:
+                  * tests/ORB_Local_Config/Bug_1459/a.conf:
+                  * tests/ORB_Local_Config/Bug_1459/b.conf:
+                  * tests/ORB_Local_Config/Bug_1459/d.conf:
+                  * tests/ORB_Local_Config/Bug_1459/m1.conf:
+                  * tests/ORB_Local_Config/Bug_3049/a.conf:
+                  * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf:
+                  * tests/ORB_Local_Config/Two_DLL_ORB/primary-csd.conf:
+                  * tests/ORB_Local_Config/Two_DLL_ORB/primary-ssl.conf:
+                  * tests/ORB_Local_Config/Two_DLL_ORB/secondary-csd.conf:
+                  * tests/ORB_Local_Config/Two_DLL_ORB/secondary-ssl.conf:
+                  * tests/Oneway_Send_Timeouts/block_flush.conf:
+                  * tests/Oneway_Send_Timeouts/lf_flush.conf:
+                  * tests/Oneway_Send_Timeouts/reactive_flush.conf:
+                  * tests/Optimized_Connection/oc_svc.conf:
+                  * tests/POA/EndpointPolicy/multi_prot.conf:
+                  * tests/POA/Explicit_Activation/alternate.conf:
+                  * tests/Parallel_Connect_Strategy/blocked.conf:
+                  * tests/Parallel_Connect_Strategy/reactive.conf:
+                  * tests/RTCORBA/Banded_Connections/svc.conf:
+                  * tests/RTCORBA/Bug_3382_Regression/svc.conf:
+                  * tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic:
+                  * tests/RTCORBA/Client_Propagated/svc.conf:
+                  * tests/RTCORBA/Client_Protocol/svc.conf:
+                  * tests/RTCORBA/Collocation/continuous.conf:
+                  * tests/RTCORBA/Collocation/svc.conf:
+                  * tests/RTCORBA/Destroy_Thread_Pool/continuous.conf:
+                  * tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf:
+                  * tests/RTCORBA/Dynamic_Thread_Pool/svc.conf:
+                  * tests/RTCORBA/Linear_Priority/svc.conf:
+                  * tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf:
+                  * tests/RTCORBA/Persistent_IOR/continuous.conf:
+                  * tests/RTCORBA/Policy_Combinations/svc.conf:
+                  * tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf:
+                  * tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf:
+                  * tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf:
+                  * tests/RTCORBA/Server_Declared/continuous.conf:
+                  * tests/RTCORBA/Server_Declared/svc.conf:
+                  * tests/RTCORBA/Server_Protocol/server_iiop.conf:
+                  * tests/RTCORBA/Server_Protocol/server_iiop_shmiop.conf:
+                  * tests/RTCORBA/Server_Protocol/server_iiop_uiop.conf:
+                  * tests/RTCORBA/Server_Protocol/server_reverse.conf:
+                  * tests/RTCORBA/Server_Protocol/server_reverse_nt.conf:
+                  * tests/RTCORBA/Server_Protocol/server_shmiop.conf:
+                  * tests/RTCORBA/Server_Protocol/server_uiop.conf:
+                  * tests/RTCORBA/Thread_Pool/continuous.conf:
+                  * tests/RTCORBA/Thread_Pool/svc.conf:
+                  * tests/TransportCurrent/Framework/client-static.conf:
+                  * tests/TransportCurrent/Framework/client.conf:
+                  * tests/TransportCurrent/Framework/server-static.conf:
+                  * tests/TransportCurrent/Framework/server.conf:
+                  * tests/TransportCurrent/IIOP/client_dynamic.conf:
+                  * tests/TransportCurrent/IIOP/client_static.conf:
+                  * tests/TransportCurrent/IIOP/server_dynamic.conf:
+                  * tests/TransportCurrent/IIOP/server_static.conf:
+                    Fuzz. Added lacking $Id string.
+
+          Thu Apr 21 13:02:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * bin/tao_orb_tests.lst:
+                    Updated test list
+
+                  * tests/AMI/mt_noupcall.conf:
+                  * tests/AMI/run_mt_noupcall.pl:
+                  * tests/AMI/run_test.pl:
+                    New run_mt_noupcall, the existing script was using -ORBCollocation no
+                    which doesn't work with AMI and mt_noupcall
+
+                  * tests/AMI/simple_client.cpp:
+                    Layout change
+
+          Thu Apr 21 12:07:41 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * bin/tao_orb_tests.lst:
+                    Run AMI test with more options
+
+                  * tests/AMI/exclusive.conf:
+                  * tests/AMI/server.conf:
+                    Added Id tag
+
+                  * tests/AMI/mt_noupcall.conf:
+                    New file for testing with mt_noupcall
+
+                  * tests/AMI/run_test.pl:
+                    Add option -mt_noupcall and give client/server separate debug levels
+
+          Thu Apr 21 11:17:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * tao/Wait_On_LF_No_Upcall.cpp:
+                    Log transport id
+
+          Thu Apr 21 10:31:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * tao/Connection_Handler.cpp:
+                    Use the orb core reactor which is the LF reactor
+
+          Wed Apr 20 08:59:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+                    Improved portability
+
+                  * bin/tao_orb_tests.lst:
+                    Added new test
+
+                  * tao/Leader_Follower.h:
+                    Layout change
+
+                  * tao/Strategies/SHMIOP_Acceptor.cpp:
+                  * tao/Wait_On_LF_No_Upcall.cpp:
+                    Fixed coverity errors
+
+                  * tests/Bug_3531b_Regression:
+                  * tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc:
+                  * tests/Bug_3531b_Regression/run_test.pl:
+                  * tests/Bug_3531b_Regression/server.cpp:
+                    New test
+
+          Wed Apr 20 09:52:52 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                  * TAO version 2.0.2 released.
+
 Wed Jun  8 13:35:39 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tests/Alt_Mapping/nested_struct.cpp:
diff --git a/ChangeLogs/ChangeLog-2011a b/ChangeLogs/ChangeLog-2011a
new file mode 100644
index 00000000000..de0119e2900
--- /dev/null
+++ b/ChangeLogs/ChangeLog-2011a
@@ -0,0 +1,8470 @@
+Wed Apr 20 09:52:52 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 2.0.2 released.
+
+Thu Apr 14 19:03:06 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/Array_Traits_T.h:
+        * tao/Generic_Sequence_T.h:
+        * tao/Object_Reference_Traits_T.h:
+        * tao/String_Traits_T.h:
+        * tao/Value_Traits_T.h:
+
+        * tao/Valuetype/Valuetype_Traits_T.h:
+
+        * tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/string_sequence_tester.hpp:
+        * tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp:
+
+          Reverted the shallow-copy optimizations, they caused a memory
+          leak in some usages.
+
+Thu Apr 14 11:55:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Resume_Handle.h:
+        * tao/Resume_Handle.cpp:
+          Layout changes
+
+        * tests/IDL_Test/IDL_Test.mpc:
+          Added CoreDX project
+
+Tue Apr 12 18:00:33 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/MT_NoUpcall_Client_Leader/server.cpp:
+          Wchar fix
+
+Tue Apr 12 14:12:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Connection_Handler.cpp:
+          Get the reactor from the event handler
+
+Tue Apr 12 12:47:58 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/string_sequence_tester.hpp:
+        * tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp:
+
+          The shallow-copy optimizations added to the sequence implementation
+          changes the number of freebufs and releases that happen. The tests
+          needed to be updated to reflect this new reality.
+
+Tue Apr 12 08:03:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/tao_idl.mpc:
+        * TAO_IDL/tao_idl_be.mpc:
+          Enable again in cross build
+
+Mon Apr 11 18:29:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/tao_idl.mpc:
+        * TAO_IDL/tao_idl_be.mpc:
+          Reverted the enabling of these projects with cross compilation for
+          the moment
+
+Mon Apr 11 10:48:49 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc:
+          This test requires threads
+
+Mon Apr 11 06:31:40 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/tao_idl_be.mpc:
+          Added no-optimize-sibling-calls
+
+Sun Apr 10 12:06:30 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Transport.cpp:
+          Layout change
+
+        * tests/IDL_Test/IDL_Test.mpc:
+          Use ndds_cck_ts_defaults
+
+Sat Apr  9 08:03:56 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/MT_NoUpcall_Client_Leader/chatter.h:
+        * tests/MT_NoUpcall_Client_Leader/chatter.cpp:
+          Unicode fixes
+
+Fri Apr  8 17:59:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Resume_Handle_Deferred.h:
+        * tao/Resume_Handle_Deferred.inl:
+        * tao/Resume_Handle_Deferred.cpp:
+          Added versioned namespace macros
+
+Fri Apr  8 13:21:17 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/Array_Traits_T.h:
+        * tao/Generic_Sequence_T.h:
+        * tao/Object_Reference_Traits_T.h:
+        * tao/String_Traits_T.h:
+        * tao/Value_Traits_T.h:
+        * tao/Valuetype/Valuetype_Traits_T.h:
+
+          Optimizations for growing unbounded sequences by changing the
+          length. Shallow copies are now used whenever possible during the
+          duplication of the existing sequence elements.
+
+Thu Apr  7 11:40:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        Merged changes from Remedy work branch.
+
+        === start changelog ===
+
+        Wed Apr  6 18:28:45 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * bin/corba-boolean.pl:
+                * bin/subst_env.pl:
+                * bin/tao_env.pl:
+                  Removed these files, obsolete
+
+        Mon Apr  4 17:46:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tests/Bug_3953_Regression:
+                * tests/Bug_3953_Regression:
+                * tests/MT_NoUpcall_Client_Leader:
+                  New tests for Wait Strategy mt_noupcall
+
+                * tao/Connection_Handler.h:
+                * tao/Connection_Handler.cpp:
+                  Integrated some changes from 1.3a as start to get mt_noupcall working
+
+                * tao/LF_Event.h:
+                * tao/LF_Invocation_Event.h:
+                * tao/LF_Multi_Event.h:
+                  Doxygen
+
+                * tao/tao.mpc:
+                  Added new files
+
+        Sun Feb 20 18:57:46 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/fe/lex.yy.cpp:
+                  Added missing include
+
+                * tests/IDL_Test/IDL_Test.mpc:
+                * tests/IDL_Test/anyunion.idl:
+                * tests/IDL_Test/union.idl:
+                  Moved union with any to its own file because RTI DDS 4.5d now gives
+                  an error when using an union with an Any
+
+        === end changelog ===
+
+Wed Apr  6 13:56:43 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * performance-tests/Sequence_Latency/Sequence_Operations_Time/run_test.pl:
+        * bin/tao_other_tests.lst:
+
+          Added run_test.pl to new performance test and included it in the
+          other tests list for nightly running.
+
+Wed Apr  6 12:58:38 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * performance-tests/Sequence_Latency/Sequence_Operations_Time/README.txt:
+        * performance-tests/Sequence_Latency/Sequence_Operations_Time/Sequence_Ops_Time.mpc:
+        * performance-tests/Sequence_Latency/Sequence_Operations_Time/sequence.idl:
+        * performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp:
+
+          A new test designed to highlight the amount of time spent by
+          dynamically growing sequences of varying element complexity.
+
+Tue Apr  5 13:00:41 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/Notify_Service/Notify_Service.cpp:
+
+          Scoreboard fix.
+
+Tue Apr  5 08:11:57 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+        * TAO_IDL/be_include/be_global.h:
+          Don't use NONE as enum value, this is a macro on VxWorks
+
+Fri Apr  1 15:10:04 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/Naming_Service/Naming_Service.h:
+        * orbsvcs/Naming_Service/Naming_Service.cpp:
+
+          Added support for multi-thread operation. In environments where
+          100s of clients are resolving references, the single-threaded
+          naming service becomes a real performance bottleneck. This patch
+          adds a -n <numthreads> command line option. Threading is
+          achieved by using an ACE_Task to call ORB::run() on multiple
+          threads. Default is single threaded behavior.
+
+        * orbsvcs/Notify_Service/Notify_Service.cpp:
+
+          Added a try/catch to the naming service resolving function. It
+          is possible that and execption is thrown while trying to
+          connect, and that was causing the service to crash abrupty
+          messing up some administrative scripts. Now an error is logged
+          and shutdown happens gracefully.
+
+        * orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp:
+
+          Silenced some compiler warnings that complained about an
+          infinite loop. The test added to break will never pass, so the
+          behavior is unchanged, but pedantic gcc compilers are now
+          satified.
+
+Thu Mar 31 11:34:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/tao_idl.mpc:
+        * TAO_IDL/tao_idl_be.mpc:
+          We can now build these projects with cross compilation
+
+        * tao/Client_Strategy_Factory.h:
+          Doxygen change
+
+        * tao/Wait_On_LF_No_Upcall.cpp:
+        * tao/default_client.cpp:
+          Layout changes
+
+Wed Mar 30 07:19:24 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/EventPortDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h:
+        * orbsvcs/tests/EC_Throughput/ECT_Throughput.h:
+        * orbsvcs/tests/Event/Basic/Random.h:
+        * tests/Bug_3531_Regression/client.cpp:
+        * tests/Bug_3531_Regression/test_i.h:
+          Doxygen changes
+
+        * tests/Multiple/Multiple.idl:
+          Fixed problem in this idl file
+
+Tue Mar 29 13:20:41 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h:
+        * TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h:
+        * TAO_IDL/be_include/be_visitor_component/component_exh.h:
+        * TAO_IDL/be_include/be_visitor_component/component_exs.h:
+        * TAO_IDL/be_include/be_visitor_component/context_ex_idl.h:
+        * TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h:
+        * TAO_IDL/be_include/be_visitor_component/executor_exh.h:
+        * TAO_IDL/be_include/be_visitor_component/executor_exs.h:
+        * TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h:
+        * TAO_IDL/be_include/be_visitor_component/executor_private_exh.h:
+        * TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h:
+        * TAO_IDL/be_include/be_visitor_component/facet_exh.h:
+        * TAO_IDL/be_include/be_visitor_component/facet_exs.h:
+        * TAO_IDL/be_include/be_visitor_component/servant_svs.h:
+          Converted to doxygen style
+
+Tue Mar 29 12:42:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Quoter/Quoter.idl:
+        * orbsvcs/orbsvcs/CosConcurrencyControl.idl:
+        * orbsvcs/orbsvcs/miop.idl:
+        * tests/IDL_Test/invalid_scoping1.idl:
+        * tests/IDL_Test/invalid_scoping2.idl:
+        * tests/IDL_Test/old_sequence.idl:
+        * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl:
+        * tests/Param_Test/param_test.idl:
+          Fuzz fixes
+
+Tue Mar 29 12:34:38 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Converted to doxygen style
+
+        * examples/Advanced/ch_12/CCS.idl:
+
+        * examples/Advanced/ch_18/CCS.idl:
+
+        * examples/Advanced/ch_21/CCS.idl:
+
+        * examples/Advanced/ch_3/time.idl:
+
+        * examples/Advanced/ch_8_and_10/CCS.idl:
+
+        * examples/Event_Comm/Event_Comm.idl:
+
+        * examples/Load_Balancing/Identity.idl:
+        * examples/Load_Balancing/Load_Balancer.idl:
+
+        * examples/Load_Balancing_persistent/Identity.idl:
+        * examples/Load_Balancing_persistent/Load_Balancer.idl:
+
+        * examples/Quoter/Quoter.idl:
+
+        * examples/TypeCode_Creation/test.idl:
+
+        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl:
+
+        * orbsvcs/orbsvcs/CosConcurrencyControl.idl:
+        * orbsvcs/orbsvcs/CosLifeCycle.idl:
+        * orbsvcs/orbsvcs/CosNaming.idl:
+        * orbsvcs/orbsvcs/CosTrading.idl:
+        * orbsvcs/orbsvcs/CosTradingDynamic.idl:
+        * orbsvcs/orbsvcs/CosTradingRepos.idl:
+        * orbsvcs/orbsvcs/DsEventLogAdmin.idl:
+        * orbsvcs/orbsvcs/DsLogAdmin.idl:
+        * orbsvcs/orbsvcs/DsLogNotification.idl:
+        * orbsvcs/orbsvcs/DsNotifyLogAdmin.idl:
+        * orbsvcs/orbsvcs/LifeCycleService.idl:
+        * orbsvcs/orbsvcs/RTEventLogAdmin.idl:
+        * orbsvcs/orbsvcs/miop.idl:
+
+        * orbsvcs/tests/HTIOP/AMI/ami_test.idl:
+
+        * orbsvcs/tests/Interoperable_Naming/Web_Server.idl:
+
+        * performance-tests/Anyop/test.idl:
+
+        * tests/AMI_Timeouts/timeout.idl:
+
+        * tests/Bug_1495_Regression/test.idl:
+
+        * tests/File_IO/File.idl:
+
+        * tests/IDL_Test/anonymous.idl:
+        * tests/IDL_Test/anyunion.idl:
+        * tests/IDL_Test/array.idl:
+        * tests/IDL_Test/array_anon_nested.idl:
+        * tests/IDL_Test/array_only.idl:
+        * tests/IDL_Test/constants.idl:
+        * tests/IDL_Test/dif2.idl:
+        * tests/IDL_Test/enum_in_struct.idl:
+        * tests/IDL_Test/full.idl:
+        * tests/IDL_Test/fwd.idl:
+        * tests/IDL_Test/generic_object.idl:
+        * tests/IDL_Test/gperf.idl:
+        * tests/IDL_Test/included.idl:
+        * tests/IDL_Test/including.idl:
+        * tests/IDL_Test/inherit.idl:
+        * tests/IDL_Test/interface.idl:
+        * tests/IDL_Test/invalid_scoping1.idl:
+        * tests/IDL_Test/invalid_scoping2.idl:
+        * tests/IDL_Test/keywords.idl:
+        * tests/IDL_Test/module.idl:
+        * tests/IDL_Test/nested_scope.idl:
+        * tests/IDL_Test/old_array.idl:
+        * tests/IDL_Test/old_constants.idl:
+        * tests/IDL_Test/old_sequence.idl:
+        * tests/IDL_Test/old_struct.idl:
+        * tests/IDL_Test/old_union.idl:
+        * tests/IDL_Test/old_union2.idl:
+        * tests/IDL_Test/params.idl:
+        * tests/IDL_Test/pragma.idl:
+        * tests/IDL_Test/primtypes.idl:
+        * tests/IDL_Test/reopen_include1.idl:
+        * tests/IDL_Test/reopen_include2.idl:
+        * tests/IDL_Test/reopened_modules.idl:
+        * tests/IDL_Test/repo_id_mod.idl:
+        * tests/IDL_Test/sequence.idl:
+        * tests/IDL_Test/simple.idl:
+        * tests/IDL_Test/simple2.idl:
+        * tests/IDL_Test/typecode.idl:
+        * tests/IDL_Test/typedef.idl:
+        * tests/IDL_Test/union.idl:
+        * tests/IDL_Test/valuetype.idl:
+
+        * tests/Multiple/Multiple.idl:
+
+        * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl:
+
+        * tests/NestedUpcall/Simple/test.idl:
+
+        * tests/NestedUpcall/Triangle_Test/Triangle_Test.idl:
+
+        * tests/OBV/TC_Alignment/test.idl:
+
+        * tests/OctetSeq/test.idl:
+
+        * tests/POA/Default_Servant2/File.idl:
+
+        * tests/Param_Test/param_test.idl:
+
+        * tests/Portable_Interceptors/Benchmark/test.idl:
+
+        * tests/Portable_Interceptors/Bug_1559/test.idl:
+
+        * tests/Portable_Interceptors/Collocated/Dynamic/test.idl:
+
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl:
+
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test.idl:
+
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test.idl:
+
+        * tests/Portable_Interceptors/Service_Context_Manipulation/test.idl:
+
+Tue Mar 29 12:24:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be_include/be_component.h:
+        * TAO_IDL/be_include/be_eventtype.h:
+        * TAO_IDL/be_include/be_extended_port.h:
+        * TAO_IDL/be_include/be_helper.h:
+        * TAO_IDL/be_include/be_identifier_helper.h:
+        * TAO_IDL/be_include/be_interface.h:
+        * TAO_IDL/be_include/be_mirror_port.h:
+        * TAO_IDL/be_include/be_porttype.h:
+        * TAO_IDL/be_include/be_root.h:
+        * TAO_IDL/be_include/be_template_module.h:
+        * TAO_IDL/be_include/be_valuetype.h:
+        * TAO_IDL/be_include/be_visitor_attribute/ccm_init.h:
+        * TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h:
+        * TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h:
+        * TAO_IDL/be_include/be_visitor_operation/argument_marshal.h:
+        * TAO_IDL/include/ast_visitor_tmpl_module_ref.h:
+        * TAO_IDL/include/fe_private.h:
+          Doxygen changes
+
+Tue Mar 29 12:15:06 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/AliasDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h:
+        * orbsvcs/orbsvcs/IFRService/ComponentDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h:
+        * orbsvcs/orbsvcs/IFRService/EmitsDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/EnumDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/EventPortDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/HomeDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/NativeDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/PublishesDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h:
+          Doxygen changes
+
+Tue Mar 29 08:38:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/AVStreams/Component_Switching/sender.h:
+          Fixed compile problem
+
+Mon Mar 28 20:48:40 UTC 2011  Adam Mitz  <mitza@ociweb.com>
+
+        * tests/Bug_3068_Regression/Bug_3068_Regression.mpc:
+
+          Added "after" statement to enable correct parallel builds.
+
+Mon Mar 28 11:43:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Kokyu_dsrt_schedulers/fp_example/client.cpp:
+        * examples/Kokyu_dsrt_schedulers/fp_example/server.cpp:
+        * examples/Kokyu_dsrt_schedulers/mif_example/client.cpp:
+        * examples/Kokyu_dsrt_schedulers/mif_example/server.cpp:
+        * examples/Kokyu_dsrt_schedulers/muf_example/client.cpp:
+        * examples/Kokyu_dsrt_schedulers/muf_example/server.cpp:
+        * orbsvcs/tests/Notify/lib/Driver.h:
+        * tests/Bug_2494_Regression/server.cpp:
+        * tests/Bug_3531_Regression/client.cpp:
+        * tests/Bug_3531_Regression/server.cpp:
+        * tests/Bug_3567_Regression/client.cpp:
+        * tests/Bug_3567_Regression/server.cpp:
+        * tests/File_IO/server.cpp:
+        * tests/MT_Server/server.cpp:
+        * tests/Muxed_GIOP_Versions/server.cpp:
+          Doxygen changes
+
+Mon Mar 28 11:28:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp:
+        * orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp:
+        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
+        * orbsvcs/tests/Concurrency/CC_client.cpp:
+        * orbsvcs/tests/Concurrency/CC_tests.cpp:
+        * orbsvcs/tests/HTIOP/AMI/client.cpp:
+        * orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp:
+        * tests/AMI_Timeouts/timeout_i.cpp:
+        * tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h:
+        * tests/CodeSets/simple/server.cpp:
+        * tests/NestedUpcall/Triangle_Test/Initiator_i.cpp:
+        * tests/OctetSeq/OctetSeq.cpp:
+        * tests/Param_Test/multdim_array.cpp:
+          Fuzz fixes
+
+Mon Mar 28 11:21:51 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/AMI/FL_Callback/peer.cpp:
+        * examples/Callback_Quoter/Consumer_Handler.cpp:
+        * examples/Callback_Quoter/Consumer_Signal_Handler.cpp:
+        * examples/Event_Comm/Event_Comm_i.cpp:
+        * examples/Event_Comm/consumer.cpp:
+        * examples/Quoter/Factory_Finder.cpp:
+        * examples/Quoter/Factory_Finder_i.cpp:
+        * examples/Quoter/server.cpp:
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h:
+        * orbsvcs/examples/CosEC/Simple/Consumer.h:
+        * orbsvcs/examples/CosEC/Simple/Supplier.h:
+        * orbsvcs/tests/CosEvent/lib/Counting_Consumer.h:
+        * orbsvcs/tests/CosEvent/lib/Counting_Supplier.h:
+        * performance-tests/POA/Demux/client.cpp:
+        * performance-tests/POA/Demux/server.cpp:
+        * tests/Bug_2935_Regression/sink_i.h:
+        * tests/CSD_Collocation/Collocation_Tester.h:
+        * tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.h:
+        * tests/DSI_Gateway/test_dsi.h:
+        * tests/NestedUpcall/MT_Client_Test/MT_Object_i.h:
+        * tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp:
+        * tests/NestedUpcall/MT_Client_Test/client.h:
+        * tests/NestedUpcall/MT_Client_Test/local_server.h:
+        * tests/NestedUpcall/MT_Client_Test/server.h:
+        * tests/OBV/Simple/Simple_util.h:
+        * tests/Xt_Stopwatch/Stopwatch_display.h:
+          Fuzz fixes
+
+Mon Mar 28 11:12:50 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h:
+        * orbsvcs/examples/RtEC/MCast/Consumer.h:
+        * orbsvcs/examples/RtEC/Schedule/Supplier.h:
+        * orbsvcs/examples/RtEC/Simple/Consumer.h:
+        * orbsvcs/tests/AVStreams/Latency/pong.h:
+        * orbsvcs/tests/AVStreams/Pluggable/server.h:
+        * orbsvcs/tests/Event/Performance/Connect.h:
+        * orbsvcs/tests/Event/Performance/Inversion.h:
+        * orbsvcs/tests/Event/Performance/Latency.h:
+        * orbsvcs/tests/Event/Performance/Throughput.h:
+        * orbsvcs/tests/Event/UDP/AddrServer.h:
+        * orbsvcs/tests/Event/UDP/Consumer.h:
+        * orbsvcs/tests/Event/UDP/Supplier.h:
+        * orbsvcs/tests/Notify/Basic/Sequence.h:
+        * orbsvcs/tests/Notify/Basic/Simple.h:
+        * orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h:
+        * orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h:
+        * orbsvcs/tests/Notify/lib/Options_Parser.h:
+        * orbsvcs/tests/Notify/lib/Peer_T.h:
+        * orbsvcs/tests/Notify/lib/Periodic_Consumer.h:
+        * orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h:
+        * orbsvcs/tests/Notify/lib/Periodic_Supplier.h:
+        * orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h:
+          Fuzz fixes
+
+Mon Mar 28 11:05:03 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h:
+        * orbsvcs/examples/RtEC/MCast/Consumer.h:
+        * orbsvcs/examples/RtEC/Schedule/Supplier.h:
+        * orbsvcs/examples/RtEC/Simple/Consumer.h:
+          Fuzz fixes
+
+Mon Mar 28 11:02:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Callback_Quoter/Supplier_Timer_Handler.h:
+        * examples/Simple/Simple_util.h:
+        * orbsvcs/LifeCycle_Service/Criteria_Evaluator.h:
+        * orbsvcs/LifeCycle_Service/Factory_Trader.h:
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h:
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h:
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h:
+        * orbsvcs/examples/RtEC/Kokyu/Consumer.h:
+        * orbsvcs/examples/RtEC/Kokyu/Supplier.h:
+        * orbsvcs/examples/RtEC/MCast/AddrServer.h:
+        * orbsvcs/examples/RtEC/MCast/AddrServer.cpp:
+        * orbsvcs/examples/RtEC/MCast/Supplier.h:
+        * orbsvcs/examples/RtEC/Schedule/Consumer.h:
+        * orbsvcs/examples/RtEC/Schedule/Consumer.cpp:
+        * orbsvcs/examples/RtEC/Simple/Supplier.h:
+        * orbsvcs/tests/Concurrency/lex.CC_command.cpp:
+        * tests/POA/Loader/Servant_Activator.h:
+        * tests/POA/On_Demand_Loading/Servant_Activator.h:
+          Fuzz fixes
+
+Mon Mar 28 09:59:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Callback_Quoter/Supplier_Timer_Handler.cpp:
+        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
+        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h:
+        * tests/POA/Loader/Servant_Activator.h:
+        * tests/POA/On_Demand_Loading/Servant_Activator.h:
+        * tests/Param_Test/anyop.cpp:
+          Fuzz fixes
+
+Mon Mar 28 07:58:00 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Callback_Quoter/Consumer_Signal_Handler.h:
+        * examples/Callback_Quoter/Notifier_i.h:
+        * examples/Callback_Quoter/Supplier_i.h:
+        * examples/Logging/Logging_Test_i.h:
+        * examples/OBV/Simple_util.h:
+        * examples/Persistent_Grid/Persistent_Client.h:
+        * examples/Persistent_Grid/Simple_util.h:
+        * examples/Quoter/Factory_Finder.h:
+        * examples/Quoter/Factory_Finder_i.h:
+        * examples/Quoter/client.h:
+        * examples/Quoter/server.h:
+        * interop-tests/wchar/wchar_reference.h:
+        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h:
+        * performance-tests/POA/Demux/demux_test_client.h:
+        * performance-tests/POA/Demux/demux_test_macros.h:
+        * performance-tests/POA/Demux/demux_test_server.h:
+        * tests/Alt_Mapping/ub_string.h:
+        * tests/Bug_3683_Regression/Simple_util.h:
+        * tests/Collocation/Collocation_Tester.h:
+        * tests/DSI_AMI_Gateway/test_dsi.h:
+        * tests/Exposed_Policies/Policy_Tester.h:
+        * tests/Param_Test/ub_string.h:
+          Fuzz fixes
+
+Mon Mar 28 07:27:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Converted files below to use doxygen style documentation
+
+        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
+
+        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
+
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
+
+        * TAO_IDL/be/be_visitor_root/root.cpp:
+
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+
+        * TAO_IDL/be_include/be_helper.h:
+
+        * TAO_IDL/be_include/be_visitor_argument/invoke_cs.h:
+
+        * TAO_IDL/be_include/be_visitor_exception/ctor.h:
+        * TAO_IDL/be_include/be_visitor_exception/ctor_assign.h:
+        * TAO_IDL/be_include/be_visitor_exception/exception_ctor.h:
+
+        * TAO_IDL/include/utl_idlist.h:
+
+        * docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp:
+
+        * docs/tutorials/Quoter/Simple/Persistent/server.cpp:
+
+        * examples/AMI/FL_Callback/Peer_i.h:
+        * examples/AMI/FL_Callback/Progress_i.h:
+
+        * examples/Advanced/ch_12/client.cpp:
+        * examples/Advanced/ch_12/icp.h:
+        * examples/Advanced/ch_12/icp.cpp:
+        * examples/Advanced/ch_12/server.h:
+        * examples/Advanced/ch_12/server.cpp:
+
+        * examples/Advanced/ch_18/client.cpp:
+        * examples/Advanced/ch_18/icp.h:
+        * examples/Advanced/ch_18/icp.cpp:
+        * examples/Advanced/ch_18/server.h:
+        * examples/Advanced/ch_18/server.cpp:
+
+        * examples/Advanced/ch_21/client.cpp:
+        * examples/Advanced/ch_21/icp.h:
+        * examples/Advanced/ch_21/icp.cpp:
+        * examples/Advanced/ch_21/server.h:
+        * examples/Advanced/ch_21/server.cpp:
+
+        * examples/Advanced/ch_3/client.cpp:
+        * examples/Advanced/ch_3/server.h:
+        * examples/Advanced/ch_3/server.cpp:
+
+        * examples/Advanced/ch_8_and_10/client.cpp:
+        * examples/Advanced/ch_8_and_10/icp.h:
+        * examples/Advanced/ch_8_and_10/icp.cpp:
+        * examples/Advanced/ch_8_and_10/server.h:
+        * examples/Advanced/ch_8_and_10/server.cpp:
+
+        * examples/Buffered_AMI/client.cpp:
+        * examples/Buffered_AMI/test_i.h:
+
+        * examples/Buffered_Oneways/client.cpp:
+        * examples/Buffered_Oneways/test_i.h:
+
+        * examples/Callback_Quoter/Consumer_Handler.h:
+        * examples/Callback_Quoter/Consumer_Handler.cpp:
+        * examples/Callback_Quoter/Consumer_Input_Handler.h:
+        * examples/Callback_Quoter/Consumer_Input_Handler.cpp:
+        * examples/Callback_Quoter/Consumer_Signal_Handler.h:
+        * examples/Callback_Quoter/Consumer_Signal_Handler.cpp:
+        * examples/Callback_Quoter/Consumer_i.h:
+        * examples/Callback_Quoter/Consumer_i.cpp:
+        * examples/Callback_Quoter/Notifier_Input_Handler.h:
+        * examples/Callback_Quoter/Notifier_Input_Handler.cpp:
+        * examples/Callback_Quoter/Notifier_i.h:
+        * examples/Callback_Quoter/Notifier_i.cpp:
+        * examples/Callback_Quoter/Supplier_Timer_Handler.h:
+        * examples/Callback_Quoter/Supplier_Timer_Handler.cpp:
+        * examples/Callback_Quoter/Supplier_i.h:
+        * examples/Callback_Quoter/Supplier_i.cpp:
+
+        * examples/Content_Server/AMI_Iterator/Content_Iterator_i.h:
+        * examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h:
+        * examples/Content_Server/AMI_Iterator/Iterator_Handler.h:
+
+        * examples/Content_Server/AMI_Observer/Callback_Handler.h:
+        * examples/Content_Server/AMI_Observer/Callback_i.h:
+        * examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h:
+        * examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h:
+
+        * examples/Content_Server/SMI_Iterator/Content_Iterator_i.h:
+        * examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h:
+
+        * examples/Event_Comm/Consumer_Handler.h:
+        * examples/Event_Comm/Consumer_Input_Handler.h:
+        * examples/Event_Comm/Event_Comm_i.h:
+        * examples/Event_Comm/Notifier_Handler.h:
+        * examples/Event_Comm/Notifier_Server.h:
+        * examples/Event_Comm/Supplier_Input_Handler.h:
+        * examples/Event_Comm/notifier.h:
+        * examples/Event_Comm/supplier.h:
+
+        * examples/Kokyu_dsrt_schedulers/fp_example/test_i.h:
+
+        * examples/Kokyu_dsrt_schedulers/mif_example/test_i.h:
+
+        * examples/Kokyu_dsrt_schedulers/muf_example/test_i.h:
+
+        * examples/Load_Balancing/Identity_Client.h:
+        * examples/Load_Balancing/Identity_Client.cpp:
+        * examples/Load_Balancing/Identity_Server.h:
+        * examples/Load_Balancing/Identity_Server.cpp:
+        * examples/Load_Balancing/Identity_i.h:
+        * examples/Load_Balancing/Identity_i.cpp:
+        * examples/Load_Balancing/Load_Balancer_i.h:
+        * examples/Load_Balancing/Load_Balancer_i.cpp:
+        * examples/Load_Balancing/Load_Balancing_Service.h:
+        * examples/Load_Balancing/Load_Balancing_Service.cpp:
+
+        * examples/Load_Balancing_persistent/Identity_Client.h:
+        * examples/Load_Balancing_persistent/Identity_Client.cpp:
+        * examples/Load_Balancing_persistent/Identity_Server.h:
+        * examples/Load_Balancing_persistent/Identity_i.h:
+        * examples/Load_Balancing_persistent/Identity_i.cpp:
+        * examples/Load_Balancing_persistent/Load_Balancer_i.h:
+        * examples/Load_Balancing_persistent/Load_Balancing_Service.h:
+        * examples/Load_Balancing_persistent/Load_Balancing_Service.cpp:
+
+        * examples/Logging/Logger_i.h:
+        * examples/Logging/Logging_Service_i.h:
+        * examples/Logging/Logging_Test_i.h:
+
+        * examples/OBV/Simple_util.h:
+
+        * examples/OBV/Typed_Events/Client_i.h:
+        * examples/OBV/Typed_Events/Server_i.h:
+
+        * examples/Persistent_Grid/Grid_Client_i.h:
+        * examples/Persistent_Grid/Grid_i.h:
+        * examples/Persistent_Grid/Persistent_Client.h:
+        * examples/Persistent_Grid/Simple_util.h:
+
+        * examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h:
+        * examples/PluggableUDP/tests/Performance/UDP_i.h:
+        * examples/PluggableUDP/tests/Performance/client.cpp:
+        * examples/PluggableUDP/tests/Performance/server.cpp:
+
+        * examples/PluggableUDP/tests/SimplePerformance/client.cpp:
+        * examples/PluggableUDP/tests/SimplePerformance/server.cpp:
+        * examples/PluggableUDP/tests/SimplePerformance/test_i.h:
+
+        * examples/Quoter/Factory_Finder.h:
+        * examples/Quoter/Factory_Finder.cpp:
+        * examples/Quoter/Factory_Finder_i.h:
+        * examples/Quoter/Factory_Finder_i.cpp:
+        * examples/Quoter/Generic_Factory.h:
+        * examples/Quoter/Generic_Factory.cpp:
+        * examples/Quoter/Generic_Factory_i.h:
+        * examples/Quoter/Generic_Factory_i.cpp:
+        * examples/Quoter/Quoter_i.h:
+        * examples/Quoter/Quoter_i.cpp:
+        * examples/Quoter/client.h:
+        * examples/Quoter/server.h:
+        * examples/Quoter/server.cpp:
+
+        * examples/Simple/Simple_util.h:
+
+        * examples/Simple/bank/AccountManager_i.h:
+        * examples/Simple/bank/Account_i.h:
+        * examples/Simple/bank/Bank_Client_i.h:
+
+        * examples/Simple/chat/Broadcaster_i.h:
+        * examples/Simple/chat/Broadcaster_i.cpp:
+        * examples/Simple/chat/Client_i.h:
+        * examples/Simple/chat/Client_i.cpp:
+        * examples/Simple/chat/Receiver_i.h:
+        * examples/Simple/chat/Receiver_i.cpp:
+        * examples/Simple/chat/Server.h:
+        * examples/Simple/chat/Server_i.h:
+        * examples/Simple/chat/Server_i.cpp:
+        * examples/Simple/chat/client.cpp:
+        * examples/Simple/chat/server.cpp:
+
+        * examples/Simple/echo/Echo_Client_i.h:
+        * examples/Simple/echo/Echo_i.h:
+
+        * examples/Simple/grid/Grid_Client_i.h:
+        * examples/Simple/grid/Grid_i.h:
+
+        * examples/Simple/time-date/Time_Date_Client_i.h:
+        * examples/Simple/time-date/Time_Date_i.h:
+        * examples/Simple/time-date/server.cpp:
+
+        * examples/Simple/time/Time_Client_i.h:
+        * examples/Simple/time/Time_i.h:
+
+        * examples/Simulator/Event_Supplier/DOVE_Supplier.h:
+        * examples/Simulator/Event_Supplier/DOVE_Supplier.cpp:
+        * examples/Simulator/Event_Supplier/DualEC_Sup.h:
+        * examples/Simulator/Event_Supplier/DualEC_Sup.cpp:
+        * examples/Simulator/Event_Supplier/Event_Con.h:
+        * examples/Simulator/Event_Supplier/Event_Con.cpp:
+        * examples/Simulator/Event_Supplier/Event_Sup.h:
+        * examples/Simulator/Event_Supplier/Event_Sup.cpp:
+        * examples/Simulator/Event_Supplier/Logging_Sup.h:
+        * examples/Simulator/Event_Supplier/Logging_Sup.cpp:
+
+        * examples/ior_corbaloc/client.cpp:
+        * examples/ior_corbaloc/ior_corbaloc_client_i.h:
+        * examples/ior_corbaloc/ior_corbaloc_client_i.cpp:
+
+        * interop-tests/wchar/client.cpp:
+        * interop-tests/wchar/server.cpp:
+        * interop-tests/wchar/wchar_reference.h:
+        * interop-tests/wchar/wchar_reference.cpp:
+
+        * orbsvcs/IFR_Service/IFR_Service.h:
+        * orbsvcs/IFR_Service/be_global.h:
+        * orbsvcs/IFR_Service/be_global.cpp:
+        * orbsvcs/IFR_Service/ifr_adding_visitor.h:
+        * orbsvcs/IFR_Service/ifr_adding_visitor_exception.h:
+        * orbsvcs/IFR_Service/ifr_adding_visitor_operation.h:
+        * orbsvcs/IFR_Service/ifr_adding_visitor_structure.h:
+        * orbsvcs/IFR_Service/ifr_adding_visitor_union.h:
+        * orbsvcs/IFR_Service/ifr_removing_visitor.h:
+        * orbsvcs/IFR_Service/ifr_visitor.h:
+
+        * orbsvcs/LifeCycle_Service/Criteria_Evaluator.h:
+        * orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp:
+        * orbsvcs/LifeCycle_Service/Factory_Trader.h:
+        * orbsvcs/LifeCycle_Service/Factory_Trader.cpp:
+        * orbsvcs/LifeCycle_Service/LifeCycle_Service.h:
+        * orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp:
+        * orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h:
+        * orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp:
+
+        * orbsvcs/Naming_Service/NT_Naming_Server.cpp:
+
+        * orbsvcs/Notify_Service/NT_Notify_Server.cpp:
+
+        * orbsvcs/TAO_Service/TAO_Service.cpp:
+
+        * orbsvcs/Time_Service/Clerk_i.h:
+        * orbsvcs/Time_Service/Server_i.h:
+
+        * orbsvcs/Trading_Service/Trading_Service.h:
+
+        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h:
+        * orbsvcs/examples/CosEC/Factory/FactoryDriver.h:
+
+        * orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h:
+
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h:
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h:
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h:
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h:
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h:
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h:
+
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h:
+
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h:
+
+        * orbsvcs/examples/CosEC/Simple/Consumer.h:
+        * orbsvcs/examples/CosEC/Simple/Supplier.h:
+
+        * orbsvcs/examples/Notify/Filter/Filter.h:
+
+        * orbsvcs/examples/Notify/Subscribe/Subscribe.h:
+
+        * orbsvcs/examples/RtEC/Kokyu/Consumer.h:
+        * orbsvcs/examples/RtEC/Kokyu/Supplier.h:
+
+        * orbsvcs/examples/RtEC/MCast/AddrServer.h:
+        * orbsvcs/examples/RtEC/MCast/Consumer.h:
+        * orbsvcs/examples/RtEC/MCast/Supplier.h:
+
+        * orbsvcs/examples/RtEC/Schedule/Consumer.h:
+        * orbsvcs/examples/RtEC/Schedule/Supplier.h:
+
+        * orbsvcs/examples/RtEC/Simple/Consumer.h:
+        * orbsvcs/examples/RtEC/Simple/Supplier.h:
+
+        * orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h:
+
+        * orbsvcs/examples/Security/Send_File/test_i.h:
+
+        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
+        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
+
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h:
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h:
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h:
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h:
+
+        * orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h:
+        * orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h:
+
+        * orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h:
+        * orbsvcs/tests/AVStreams/Component_Switching/distributer.h:
+        * orbsvcs/tests/AVStreams/Component_Switching/receiver.h:
+        * orbsvcs/tests/AVStreams/Component_Switching/sender.h:
+
+        * orbsvcs/tests/AVStreams/Latency/ping.h:
+        * orbsvcs/tests/AVStreams/Latency/pong.h:
+
+        * orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h:
+        * orbsvcs/tests/AVStreams/Multiple_Flows/sender.h:
+
+        * orbsvcs/tests/AVStreams/Pluggable/ftp.h:
+        * orbsvcs/tests/AVStreams/Pluggable/server.h:
+
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h:
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h:
+
+        * orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h:
+        * orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h:
+        * orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h:
+
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h:
+
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h:
+
+        * orbsvcs/tests/Bug_2248_Regression/Client_i.h:
+
+        * orbsvcs/tests/Concurrency/CC_client.h:
+        * orbsvcs/tests/Concurrency/CC_client.cpp:
+        * orbsvcs/tests/Concurrency/CC_command.h:
+        * orbsvcs/tests/Concurrency/CC_command.cpp:
+        * orbsvcs/tests/Concurrency/CC_naming_service.h:
+        * orbsvcs/tests/Concurrency/CC_naming_service.cpp:
+        * orbsvcs/tests/Concurrency/CC_test_utils.h:
+        * orbsvcs/tests/Concurrency/CC_test_utils.cpp:
+        * orbsvcs/tests/Concurrency/CC_tests.h:
+        * orbsvcs/tests/Concurrency/CC_tests.cpp:
+        * orbsvcs/tests/Concurrency/lex.CC_command.cpp:
+
+        * orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h:
+        * orbsvcs/tests/CosEvent/Basic/Random.h:
+
+        * orbsvcs/tests/CosEvent/lib/Counting_Consumer.h:
+        * orbsvcs/tests/CosEvent/lib/Counting_Supplier.h:
+
+        * orbsvcs/tests/Event/Performance/Connect.h:
+        * orbsvcs/tests/Event/Performance/Inversion.h:
+        * orbsvcs/tests/Event/Performance/Latency.h:
+        * orbsvcs/tests/Event/Performance/Throughput.h:
+
+        * orbsvcs/tests/Event/UDP/AddrServer.h:
+        * orbsvcs/tests/Event/UDP/Consumer.h:
+        * orbsvcs/tests/Event/UDP/Supplier.h:
+
+        * orbsvcs/tests/FaultTolerance/IOGR/Client_i.h:
+        * orbsvcs/tests/FaultTolerance/IOGR/Manager.h:
+        * orbsvcs/tests/FaultTolerance/IOGR/test_i.h:
+
+        * orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp:
+
+        * orbsvcs/tests/HTIOP/AMI/ami_test_i.h:
+        * orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp:
+        * orbsvcs/tests/HTIOP/AMI/client.cpp:
+        * orbsvcs/tests/HTIOP/AMI/server.cpp:
+        * orbsvcs/tests/HTIOP/AMI/simple_client.cpp:
+
+        * orbsvcs/tests/HTIOP/BiDirectional/test_i.h:
+
+        * orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h:
+
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h:
+
+        * orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h:
+
+        * orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h:
+
+        * orbsvcs/tests/Interoperable_Naming/client.cpp:
+        * orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h:
+        * orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp:
+
+        * orbsvcs/tests/Notify/Basic/AdminProperties.h:
+        * orbsvcs/tests/Notify/Basic/ConnectDisconnect.h:
+        * orbsvcs/tests/Notify/Basic/Events.h:
+        * orbsvcs/tests/Notify/Basic/Filter.h:
+        * orbsvcs/tests/Notify/Basic/IdAssignment.h:
+        * orbsvcs/tests/Notify/Basic/LifeCycle.h:
+        * orbsvcs/tests/Notify/Basic/MultiTypes.h:
+        * orbsvcs/tests/Notify/Basic/Sequence.h:
+        * orbsvcs/tests/Notify/Basic/Simple.h:
+        * orbsvcs/tests/Notify/Basic/Updates.h:
+
+        * orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h:
+
+        * orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.h:
+
+        * orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.h:
+
+        * orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h:
+        * orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h:
+
+        * orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h:
+
+        * orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h:
+        * orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h:
+
+        * orbsvcs/tests/Notify/Persistent_Filter/Filter.h:
+
+        * orbsvcs/tests/Notify/Reconnecting/Consumer.h:
+        * orbsvcs/tests/Notify/Reconnecting/Supplier.h:
+
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h:
+
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h:
+
+        * orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h:
+
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h:
+
+        * orbsvcs/tests/Notify/lib/Notify_PushConsumer.h:
+        * orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h:
+        * orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h:
+        * orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h:
+        * orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h:
+        * orbsvcs/tests/Notify/lib/Notify_Test_Client.h:
+        * orbsvcs/tests/Notify/lib/common.h:
+
+        * orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h:
+        * orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h:
+
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h:
+
+        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h:
+
+        * orbsvcs/tests/Property/client.h:
+        * orbsvcs/tests/Property/client.cpp:
+        * orbsvcs/tests/Property/server.h:
+        * orbsvcs/tests/Property/server.cpp:
+
+        * orbsvcs/tests/Security/BiDirectional/test_i.h:
+
+        * orbsvcs/tests/Security/Crash_Test/test_i.h:
+
+        * orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h:
+
+        * orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h:
+        * orbsvcs/tests/Security/MT_SSLIOP/test_i.h:
+
+        * orbsvcs/tests/Security/ssliop_corbaloc/client.h:
+        * orbsvcs/tests/Security/ssliop_corbaloc/client.cpp:
+
+        * orbsvcs/tests/Simple_Naming/client.h:
+        * orbsvcs/tests/Simple_Naming/client.cpp:
+
+        * orbsvcs/tests/Time/Client_i.h:
+
+        * orbsvcs/tests/ior_corbaname/client.cpp:
+        * orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h:
+        * orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp:
+
+        * orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp:
+
+        * performance-tests/Anyop/anyop.cpp:
+
+        * performance-tests/Cubit/TAO/DII_Cubit/client.cpp:
+
+        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h:
+        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h:
+        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h:
+        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp:
+        * performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.h:
+
+        * performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h:
+        * performance-tests/Cubit/TAO/MT_Cubit/Globals.h:
+        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h:
+        * performance-tests/Cubit/TAO/MT_Cubit/Timer.h:
+        * performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h:
+        * performance-tests/Cubit/TAO/MT_Cubit/client.h:
+        * performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h:
+        * performance-tests/Cubit/TAO/MT_Cubit/server.h:
+        * performance-tests/Cubit/TAO/MT_Cubit/server.cpp:
+
+        * performance-tests/POA/Demux/client.cpp:
+        * performance-tests/POA/Demux/demux_stats.cpp:
+        * performance-tests/POA/Demux/demux_test_client.h:
+        * performance-tests/POA/Demux/demux_test_client.cpp:
+        * performance-tests/POA/Demux/demux_test_macros.h:
+        * performance-tests/POA/Demux/demux_test_server.h:
+        * performance-tests/POA/Demux/demux_test_server.cpp:
+        * performance-tests/POA/Demux/server.cpp:
+
+        * performance-tests/POA/Object_Creation_And_Registration/registration.cpp:
+
+        * performance-tests/Pluggable/PP_Test_Client.h:
+        * performance-tests/Pluggable/PP_Test_Server.h:
+        * performance-tests/Pluggable/PP_Test_i.h:
+        * performance-tests/Pluggable/PP_Test_i.cpp:
+
+        * performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h:
+
+        * performance-tests/RTCorba/Oneways/Reliable/test_i.h:
+
+        * tao/IORManipulation/IORManip_Filter.h:
+        * tao/IORManipulation/IORManip_IIOP_Filter.h:
+
+        * tests/AMI_Timeouts/timeout_client.h:
+        * tests/AMI_Timeouts/timeout_i.h:
+        * tests/AMI_Timeouts/timeout_i.cpp:
+
+        * tests/Alt_Mapping/alt_mapping_i.h:
+        * tests/Alt_Mapping/alt_mapping_i.cpp:
+        * tests/Alt_Mapping/client.h:
+        * tests/Alt_Mapping/client.cpp:
+        * tests/Alt_Mapping/driver.h:
+        * tests/Alt_Mapping/driver.cpp:
+        * tests/Alt_Mapping/helper.h:
+        * tests/Alt_Mapping/helper.cpp:
+        * tests/Alt_Mapping/options.h:
+        * tests/Alt_Mapping/options.cpp:
+        * tests/Alt_Mapping/results.h:
+        * tests/Alt_Mapping/results.cpp:
+        * tests/Alt_Mapping/server.cpp:
+        * tests/Alt_Mapping/tests.h:
+        * tests/Alt_Mapping/ub_string.h:
+        * tests/Alt_Mapping/ub_string.cpp:
+        * tests/Alt_Mapping/ub_struct_seq.h:
+        * tests/Alt_Mapping/ub_struct_seq.cpp:
+
+        * tests/BiDirectional/test_i.h:
+
+        * tests/BiDirectional_DelayedUpcall/test_i.h:
+
+        * tests/BiDirectional_MultipleORB/destroy.cpp:
+
+        * tests/BiDirectional_NestedUpcall/test_i.h:
+
+        * tests/Bug_2174_Regression/test_i.h:
+
+        * tests/Bug_2734_Regression/test_i.h:
+
+        * tests/Bug_2935_Regression/middle_i.h:
+        * tests/Bug_2935_Regression/sink_i.h:
+        * tests/Bug_2935_Regression/source_i.h:
+
+        * tests/Bug_3068_Regression/test_i.h:
+
+        * tests/Bug_3683_Regression/Echo_Client_i.h:
+        * tests/Bug_3683_Regression/Echo_i.h:
+        * tests/Bug_3683_Regression/Simple_util.h:
+
+        * tests/CDR/alignment.cpp:
+        * tests/CDR/allocator.cpp:
+        * tests/CDR/basic_types.cpp:
+        * tests/CDR/growth.cpp:
+        * tests/CDR/octet_sequence.cpp:
+        * tests/CDR/tc.cpp:
+
+        * tests/CSD_Collocation/Collocation_Tester.h:
+
+        * tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h:
+        * tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp:
+        * tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp:
+        * tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h:
+        * tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp:
+        * tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp:
+
+        * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp:
+
+        * tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.h:
+        * tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.cpp:
+        * tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp:
+
+        * tests/CodeSets/simple/client.cpp:
+        * tests/CodeSets/simple/server.cpp:
+
+        * tests/Collocation/Collocation_Tester.h:
+
+        * tests/DIOP/UDP_Client_i.h:
+        * tests/DIOP/UDP_i.h:
+        * tests/DIOP/client.cpp:
+        * tests/DIOP/server.cpp:
+
+        * tests/DSI_AMI_Gateway/test_dsi.h:
+        * tests/DSI_AMI_Gateway/test_i.h:
+
+        * tests/DSI_Gateway/test_dsi.h:
+        * tests/DSI_Gateway/test_i.h:
+
+        * tests/Explicit_Event_Loop/client.cpp:
+        * tests/Explicit_Event_Loop/server.h:
+        * tests/Explicit_Event_Loop/server.cpp:
+
+        * tests/Exposed_Policies/Counter_i.h:
+        * tests/Exposed_Policies/Policy_Tester.h:
+        * tests/Exposed_Policies/Policy_Verifier.h:
+        * tests/Exposed_Policies/RT_Properties.h:
+
+        * tests/FL_Cube/test_i.h:
+
+        * tests/Faults/ping_i.h:
+        * tests/Faults/test_i.h:
+
+        * tests/File_IO/File_i.h:
+        * tests/File_IO/File_i.cpp:
+        * tests/File_IO/client.cpp:
+
+        * tests/ForwardOnceUponException/test_i.h:
+
+        * tests/ForwardUponObjectNotExist/test_i.h:
+
+        * tests/Forwarding/test_i.h:
+
+        * tests/IDL_Test/main.cpp:
+
+        * tests/InterOp-Naming/INS_i.h:
+        * tests/InterOp-Naming/Server_i.h:
+
+        * tests/Leader_Followers/client.cpp:
+        * tests/Leader_Followers/test_i.h:
+
+        * tests/MProfile/test_i.h:
+
+        * tests/MProfile_Connection_Timeout/test_i.h:
+
+        * tests/MProfile_Forwarding/Servant_Locator.h:
+        * tests/MProfile_Forwarding/Servant_Locator.cpp:
+        * tests/MProfile_Forwarding/test_i.h:
+
+        * tests/MT_Client/test_i.h:
+
+        * tests/MT_Server/test_i.h:
+
+        * tests/Multiple/Collocation_Tester.h:
+        * tests/Multiple/Multiple_Impl.h:
+
+        * tests/Multiple_Inheritance/client.cpp:
+
+        * tests/Muxed_GIOP_Versions/test_i.h:
+
+        * tests/Native_Exceptions/test_i.h:
+
+        * tests/NestedUpcall/MT_Client_Test/MT_Object_i.h:
+        * tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp:
+        * tests/NestedUpcall/MT_Client_Test/client.h:
+        * tests/NestedUpcall/MT_Client_Test/client.cpp:
+        * tests/NestedUpcall/MT_Client_Test/local_server.h:
+        * tests/NestedUpcall/MT_Client_Test/local_server.cpp:
+        * tests/NestedUpcall/MT_Client_Test/server.h:
+        * tests/NestedUpcall/MT_Client_Test/server.cpp:
+
+        * tests/NestedUpcall/Triangle_Test/Initiator_i.h:
+        * tests/NestedUpcall/Triangle_Test/Initiator_i.cpp:
+        * tests/NestedUpcall/Triangle_Test/Object_A_i.h:
+        * tests/NestedUpcall/Triangle_Test/Object_A_i.cpp:
+        * tests/NestedUpcall/Triangle_Test/Object_B_i.h:
+        * tests/NestedUpcall/Triangle_Test/Object_B_i.cpp:
+        * tests/NestedUpcall/Triangle_Test/initiator.h:
+        * tests/NestedUpcall/Triangle_Test/initiator.cpp:
+        * tests/NestedUpcall/Triangle_Test/server_A.h:
+        * tests/NestedUpcall/Triangle_Test/server_A.cpp:
+        * tests/NestedUpcall/Triangle_Test/server_B.h:
+        * tests/NestedUpcall/Triangle_Test/server_B.cpp:
+
+        * tests/OBV/Any/AnyS_impl.h:
+
+        * tests/OBV/Collocated/Forward/Test_impl.h:
+
+        * tests/OBV/Factory/FactoryS_impl.h:
+
+        * tests/OBV/Forward/Test_impl.h:
+
+        * tests/OBV/Simple/Client_i.h:
+        * tests/OBV/Simple/Server_i.h:
+        * tests/OBV/Simple/Simple_util.h:
+
+        * tests/OBV/TC_Alignment/test_i.h:
+
+        * tests/OBV/Truncatable/TruncatableS_impl.h:
+
+        * tests/OBV/ValueBox/Test_impl.h:
+
+        * tests/ORB_destroy/ORB_destroy.cpp:
+
+        * tests/Object_Loader/Loader.h:
+        * tests/Object_Loader/Test_i.h:
+
+        * tests/OctetSeq/OctetSeq.cpp:
+        * tests/OctetSeq/test_i.h:
+
+        * tests/POA/Adapter_Activator/server.cpp:
+
+        * tests/POA/Bug_2511_Regression/server.cpp:
+
+        * tests/POA/Current/Current.cpp:
+
+        * tests/POA/DSI/client.cpp:
+        * tests/POA/DSI/server.cpp:
+
+        * tests/POA/Default_Servant/Default_Servant.cpp:
+
+        * tests/POA/Default_Servant2/File_i.h:
+        * tests/POA/Default_Servant2/File_i.cpp:
+        * tests/POA/Default_Servant2/client.cpp:
+        * tests/POA/Default_Servant2/server.cpp:
+
+        * tests/POA/Etherealization/Etherealization.cpp:
+
+        * tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp:
+
+        * tests/POA/Explicit_Activation/server.cpp:
+
+        * tests/POA/FindPOA/FindPOA.cpp:
+
+        * tests/POA/Forwarding/Servant_Activator.h:
+        * tests/POA/Forwarding/client.cpp:
+        * tests/POA/Forwarding/server.cpp:
+        * tests/POA/Forwarding/test_i.h:
+
+        * tests/POA/Generic_Servant/test_i.h:
+
+        * tests/POA/Identity/Identity.cpp:
+
+        * tests/POA/Loader/Servant_Activator.h:
+        * tests/POA/Loader/Servant_Activator.cpp:
+        * tests/POA/Loader/Servant_Locator.h:
+        * tests/POA/Loader/Servant_Locator.cpp:
+        * tests/POA/Loader/Server_Manager.h:
+        * tests/POA/Loader/server.cpp:
+
+        * tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp:
+
+        * tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp:
+
+        * tests/POA/NewPOA/NewPOA.cpp:
+
+        * tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp:
+
+        * tests/POA/Object_Reactivation/Object_Reactivation.cpp:
+
+        * tests/POA/On_Demand_Activation/Servant_Activator.h:
+        * tests/POA/On_Demand_Activation/Servant_Activator.cpp:
+        * tests/POA/On_Demand_Activation/Servant_Locator.h:
+        * tests/POA/On_Demand_Activation/Servant_Locator.cpp:
+        * tests/POA/On_Demand_Activation/server.cpp:
+
+        * tests/POA/On_Demand_Loading/Servant_Activator.h:
+        * tests/POA/On_Demand_Loading/Servant_Activator.cpp:
+        * tests/POA/On_Demand_Loading/Servant_Locator.h:
+        * tests/POA/On_Demand_Loading/Servant_Locator.cpp:
+        * tests/POA/On_Demand_Loading/Servant_Manager.h:
+        * tests/POA/On_Demand_Loading/Servant_Manager.cpp:
+        * tests/POA/On_Demand_Loading/Server_Manager.h:
+        * tests/POA/On_Demand_Loading/server.cpp:
+
+        * tests/POA/POAManagerFactory/POAManagerFactory.cpp:
+
+        * tests/POA/POA_BiDir/POA_BiDir.cpp:
+
+        * tests/POA/POA_Destruction/POA_Destruction.cpp:
+
+        * tests/POA/Persistent_ID/client.cpp:
+        * tests/POA/Persistent_ID/server.cpp:
+
+        * tests/POA/Policies/Policies.cpp:
+
+        * tests/POA/Reference_Counted_Servant/server.cpp:
+
+        * tests/POA/RootPOA/RootPOA.cpp:
+
+        * tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp:
+
+        * tests/POA/TIE/client.cpp:
+        * tests/POA/TIE/server.cpp:
+        * tests/POA/TIE/test_i.h:
+        * tests/POA/TIE/test_i.cpp:
+
+        * tests/POA/wait_for_completion/wait_for_completion.cpp:
+
+        * tests/Param_Test/any.h:
+        * tests/Param_Test/any.cpp:
+        * tests/Param_Test/anyop.cpp:
+        * tests/Param_Test/bd_array_seq.h:
+        * tests/Param_Test/bd_array_seq.cpp:
+        * tests/Param_Test/bd_long_seq.h:
+        * tests/Param_Test/bd_long_seq.cpp:
+        * tests/Param_Test/bd_short_seq.h:
+        * tests/Param_Test/bd_short_seq.cpp:
+        * tests/Param_Test/bd_str_seq.h:
+        * tests/Param_Test/bd_str_seq.cpp:
+        * tests/Param_Test/bd_string.h:
+        * tests/Param_Test/bd_string.cpp:
+        * tests/Param_Test/bd_struct_seq.h:
+        * tests/Param_Test/bd_struct_seq.cpp:
+        * tests/Param_Test/bd_wstr_seq.h:
+        * tests/Param_Test/bd_wstr_seq.cpp:
+        * tests/Param_Test/bd_wstring.h:
+        * tests/Param_Test/bd_wstring.cpp:
+        * tests/Param_Test/big_union.h:
+        * tests/Param_Test/big_union.cpp:
+        * tests/Param_Test/client.h:
+        * tests/Param_Test/client.cpp:
+        * tests/Param_Test/complex_any.h:
+        * tests/Param_Test/complex_any.cpp:
+        * tests/Param_Test/driver.h:
+        * tests/Param_Test/driver.cpp:
+        * tests/Param_Test/except.h:
+        * tests/Param_Test/except.cpp:
+        * tests/Param_Test/fixed_array.h:
+        * tests/Param_Test/fixed_array.cpp:
+        * tests/Param_Test/fixed_struct.h:
+        * tests/Param_Test/fixed_struct.cpp:
+        * tests/Param_Test/helper.h:
+        * tests/Param_Test/helper.cpp:
+        * tests/Param_Test/multdim_array.h:
+        * tests/Param_Test/multdim_array.cpp:
+        * tests/Param_Test/nested_struct.h:
+        * tests/Param_Test/nested_struct.cpp:
+        * tests/Param_Test/objref.h:
+        * tests/Param_Test/objref.cpp:
+        * tests/Param_Test/objref_struct.h:
+        * tests/Param_Test/objref_struct.cpp:
+        * tests/Param_Test/options.h:
+        * tests/Param_Test/options.cpp:
+        * tests/Param_Test/param_test_i.h:
+        * tests/Param_Test/param_test_i.cpp:
+        * tests/Param_Test/recursive_struct.h:
+        * tests/Param_Test/recursive_struct.cpp:
+        * tests/Param_Test/recursive_union.h:
+        * tests/Param_Test/recursive_union.cpp:
+        * tests/Param_Test/results.h:
+        * tests/Param_Test/results.cpp:
+        * tests/Param_Test/server.cpp:
+        * tests/Param_Test/short.h:
+        * tests/Param_Test/short.cpp:
+        * tests/Param_Test/small_union.h:
+        * tests/Param_Test/small_union.cpp:
+        * tests/Param_Test/tests.h:
+        * tests/Param_Test/typecode.h:
+        * tests/Param_Test/typecode.cpp:
+        * tests/Param_Test/ub_any_seq.h:
+        * tests/Param_Test/ub_any_seq.cpp:
+        * tests/Param_Test/ub_array_seq.h:
+        * tests/Param_Test/ub_array_seq.cpp:
+        * tests/Param_Test/ub_long_seq.h:
+        * tests/Param_Test/ub_long_seq.cpp:
+        * tests/Param_Test/ub_objref_seq.h:
+        * tests/Param_Test/ub_objref_seq.cpp:
+        * tests/Param_Test/ub_short_seq.h:
+        * tests/Param_Test/ub_short_seq.cpp:
+        * tests/Param_Test/ub_str_seq.h:
+        * tests/Param_Test/ub_str_seq.cpp:
+        * tests/Param_Test/ub_string.h:
+        * tests/Param_Test/ub_string.cpp:
+        * tests/Param_Test/ub_struct_seq.h:
+        * tests/Param_Test/ub_struct_seq.cpp:
+        * tests/Param_Test/ub_wstr_seq.h:
+        * tests/Param_Test/ub_wstr_seq.cpp:
+        * tests/Param_Test/ub_wstring.h:
+        * tests/Param_Test/ub_wstring.cpp:
+        * tests/Param_Test/ulonglong.h:
+        * tests/Param_Test/ulonglong.cpp:
+        * tests/Param_Test/var_array.h:
+        * tests/Param_Test/var_array.cpp:
+        * tests/Param_Test/var_struct.h:
+        * tests/Param_Test/var_struct.cpp:
+
+        * tests/Portable_Interceptors/Benchmark/test_i.h:
+
+        * tests/Portable_Interceptors/Collocated/Dynamic/test_i.h:
+
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h:
+
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h:
+
+        * tests/QtTests/client.h:
+        * tests/QtTests/test_i.h:
+
+        * tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h:
+
+        * tests/RTCORBA/Policies/Policies.cpp:
+
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp:
+
+        * tests/Single_Read/test_i.h:
+
+        * tests/Smart_Proxies/Benchmark/client.cpp:
+        * tests/Smart_Proxies/Benchmark/server.cpp:
+
+        * tests/Smart_Proxies/On_Demand/client.cpp:
+        * tests/Smart_Proxies/On_Demand/server.cpp:
+
+        * tests/Smart_Proxies/Policy/client.cpp:
+        * tests/Smart_Proxies/Policy/server.cpp:
+
+        * tests/Smart_Proxies/client.cpp:
+        * tests/Smart_Proxies/server.cpp:
+
+        * tests/Strategies/simple_test_i.h:
+
+        * tests/Timed_Buffered_Oneways/client.cpp:
+        * tests/Timed_Buffered_Oneways/test_i.h:
+
+        * tests/Timeout/test_i.h:
+
+        * tests/Xt_Stopwatch/Client.h:
+        * tests/Xt_Stopwatch/Control.h:
+        * tests/Xt_Stopwatch/Stopwatch_display.h:
+        * tests/Xt_Stopwatch/test_i.h:
+        * tests/Xt_Stopwatch/timer.h:
+
+        * utils/catior/Catior_i.h:
+        * utils/catior/Catior_i.cpp:
+
+        * utils/nslist/nsadd.cpp:
+        * utils/nslist/nsdel.cpp:
+
+Fri Mar 25 15:32:09 UTC 2011  Adam Mitz  <mitza@ociweb.com>
+
+        * DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc:
+        * orbsvcs/DevGuideExamples/Security/ParticipatingApp/ParticipatingApp.mpc:
+        * orbsvcs/DevGuideExamples/Security/PolicyControllingApp/PolicyControllingApp.mpc:
+        * orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/SecurityUnawareApp.mpc:
+
+          Added "after" statements to enable correct parallel builds.
+
+        * DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp:
+
+          Fixed 64-bit warnings.
+
+Wed Mar 23 03:29:21 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * utils/logWalker/Log.cpp:
+        * utils/logWalker/Session.cpp:
+        * utils/logWalker/Thread.cpp:
+
+          Unfuzzing.
+
+Tue Mar 22 22:09:09 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * utils/logWalker/HostProcess.cpp:
+        * utils/logWalker/Invocation.cpp:
+        * utils/logWalker/Log.h:
+        * utils/logWalker/Log.cpp:
+        * utils/logWalker/README:
+        * utils/logWalker/Session.h:
+        * utils/logWalker/Session.cpp:
+        * utils/logWalker/Thread.h:
+        * utils/logWalker/Thread.cpp:
+        * utils/logWalker/logWalker.cpp:
+
+          Incremental improvements to the log walker utility, mostly in
+          error reporting, also with thread encounter tracking, and source
+          identification.
+
+Tue Mar 22 21:40:44 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * utils/catior/Catior_i.h:
+        * utils/catior/Catior_i.cpp:
+
+          Add the parsing of TAG_MULTIPLE_COMPONENTS which is still used
+          by some ORBs. Also add the detection of ORB type JacORB to help
+          with the identification of IORs in a heterogeneous environment.
+
+Tue Mar 22 14:31:19 UTC 2011  Adam Mitz  <mitza@ociweb.com>
+
+        * tests/Bug_3942_Regression/Bug_3942_Regression.cpp:
+
+          Fuzz fixes and avoid compiler errors, even though they are
+          indicative of bugs in TAO.  At least one compiler accepts the
+          code and we can use the runtime failures on that compiler.
+
+Mon Mar 21 18:15:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Stub.inl:
+        * tao/Stub.cpp:
+          Moved refcount manipulate methods inline
+
+Mon Mar 21 17:27:15 UTC 2011  Adam Mitz  <mitza@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+        * tests/Bug_3942_Regression/Bug_3942_Regression.cpp:
+        * tests/Bug_3942_Regression/Bug_3942_Regression.mpc:
+        * tests/Bug_3942_Regression/Foo.idl:
+        * tests/Bug_3942_Regression/run_test.pl:
+
+          Adding regression test for bug 3942, not yet fixed.
+
+Mon Mar 21 10:34:42 UTC 2011  Martin Corino  <corino_m@remedy.nl>
+
+        * tao/DynamicInterface/Server_Request.cpp:
+
+          Fixed typo in fix for deffered_reply() check.
+
+Sun Mar 20 13:45:05 UTC 2011  Martin Corino  <corino_m@remedy.nl>
+
+        * tao/DynamicInterface/Server_Request.cpp:
+          Fixed problem with handling GIOP::LocateRequest type requests.
+          For this type of request the incoming CDR stream does not exist
+          and the reply should be deferred.
+
+Fri Mar 18 19:52:21 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/IIOP_Connector.cpp:
+        * tao/Transport_Connector.h:
+        * tao/Transport_Connector.cpp:
+
+          Fix for the parallel connect strategy. While processing a list
+          of endpoints, it is possible that one successfully connects
+          quickly enough that the rest of the list does not need to be
+          evaluated. In that case, the cleanup logic was not being
+          evaluated, leaving the base connector to hold on to stale
+          nonblocking connection handlers. At best these are unused
+          objects that linger until the connector is shutdown, and at
+          worst they can eventually connect, leading to unnecessary
+          network resource consumption.
+
+Thu Mar 17 09:55:03 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp:
+          Fixes due to ACE rand_r() changes.
+
+Thu Mar 17 09:45:43 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.h:
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
+          Fixes due to ACE rand_r() changes.
+
+Thu Mar 17 09:43:12 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/tests/Event/Basic/Observer.h:
+        * orbsvcs/tests/Event/Basic/Observer.cpp:
+          Fixes due to ACE rand_r() changes.
+
+Thu Mar 17 09:36:47 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * tests/OctetSeq/client.cpp:
+          Fixes due to ACE rand_r() changes.
+
+Thu Mar 17 09:35:07 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * tests/Policies/Manipulation.cpp:
+          Fixes due to ACE rand_r() changes.
+
+Thu Mar 17 09:32:45 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * tests/Nested_Upcall_Crash/Server_Peer.h:
+        * tests/Nested_Upcall_Crash/Server_Peer.cpp:
+        * tests/Nested_Upcall_Crash/server.cpp:
+          Fixes due to ACE rand_r() changes.
+
+Thu Mar 17 09:29:59 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * tests/CDR/allocator.cpp:
+          Fixes due to ACE rand_r() changes.
+
+Thu Mar 17 08:19:02 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          More fixes due to ACE rand_r() changes.
+
+Thu Mar 17 08:12:47 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+          Fixes due to ACE rand_r() changes.
+
+Wed Mar 16 06:27:59 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp:
+        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
+          Check features against ACE_HAS_PTHREADS instead of
+          ACE_HAS_PTHREADS_STD.
+
+Mon Mar 14 20:17:48 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp:
+        * tests/RTCORBA/Bug_3643_Regression/server.cpp:
+        * tests/RTCORBA/Thread_Pool/server.cpp:
+        * tests/RTCORBA/Dynamic_Thread_Pool/server.cpp:
+          Fixed compile warnings from incorrect use of ACE_TCHAR* type in
+          printf in wchar builds.
+
+Sun Mar 13 10:00:13 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+        * orbsvcs/tests/Bug_2800_Regression/nsmain.cpp:
+        * orbsvcs/tests/Miop/McastHello/server.cpp:
+        * orbsvcs/tests/Bug_3673_Regression/nsmain.cpp:
+        * orbsvcs/tests/Notify/lib/Task_Stats.cpp:
+        * orbsvcs/tests/Notify/Reconnecting/Supplier.cpp:
+        * orbsvcs/tests/FT_App/FT_Client.cpp:
+        * orbsvcs/tests/FT_App/StubFaultNotifier.cpp:
+        * orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp:
+        * tao/HTTP_Handler.cpp:
+        * performance-tests/Cubit/TAO/MT_Cubit/server.cpp:
+        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp:
+        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp:
+        * examples/Kokyu_dsrt_schedulers/Task_Stats.cpp:
+        * examples/RTScheduling/Task_Stats.cpp:
+        * examples/RTCORBA/Activity/Task_Stats.cpp:
+          Fixed compile warnings from incorrect use of ACE_TCHAR* type in
+          printf in wchar builds.
+
+Fri Mar 11 20:31:17 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
+        * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
+          Removed tabs
+
+Fri Mar 11 14:11:54 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
+          Fix for previous commit. Use ACE::is_inequal().
+
+Fri Mar 11 14:04:14 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
+        * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Thu Mar 10 13:08:17 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+        * tao/Stub.h:
+        * tao/Stub.inl:
+        * tao/Stub.cpp:
+          Made the profile_lock now a regular member mutex
+
+Thu Mar 10 11:41:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Stub.h:
+          Doxygen changes
+
+        * tao/Stub.cpp:
+          Explicitly retrieve the client_strategy factory in the constructor in
+          order to force a load of it at this point. Not doing it here leads
+          to the situation in the ImR combined example that we want to load
+          it later and than get a deadlock
+
+Thu Mar 10 11:26:47 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * tao/ZIOP/ZIOP.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Thu Mar 10 10:54:34 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * TAO_IDL/be/be_interface.cpp:
+        * examples/RTScheduling/DT_Creator.cpp:
+          Added casts to types expected by printf format.
+
+Wed Mar  9 14:55:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Server_Strategy_Factory.h:
+        * tao/Server_Strategy_Factory.cpp:
+          Made all methods except the destructor pure virtual, this is an
+          abstract base class
+
+Wed Mar  9 14:27:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Client_Strategy_Factory.h:
+        * tao/Client_Strategy_Factory.cpp:
+          Made all methods except the destructor pure virtual, this is an
+          abstract base class
+
+Wed Mar  9 10:48:48 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/GIOP_Message_Base.cpp:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
+        * TAO_IDL/be/be_sequence.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+          Changed my previous fix to these files. That change was too shallow.
+
+        * orbsvcs/orbsvcs/Notify/XML_Saver.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp:
+        * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
+        * orbsvcs/tests/Notify/lib/Task_Stats.cpp:
+        * orbsvcs/tests/FT_App/FT_Client.cpp:
+        * orbsvcs/tests/FT_App/FT_Creator.cpp:
+        * orbsvcs/tests/FT_App/FT_Creator.h:
+        * utils/catior/Catior_i.cpp:
+        * utils/logWalker/HostProcess.cpp:
+        * utils/logWalker/Log.cpp:
+          Fixed use of types for printf format.
+
+Mon Mar  7 16:19:40 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+        * tao/GIOP_Message_Base.cpp:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_helper.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be_include/be_helper.h:
+          Fixed warnings from incorrect use of printf format.
+
+Mon Mar  7 09:44:39 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp:
+          Fixed leaks in ACE_SSL library. This is a part of the fix
+          for bug#3418.
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp:
+          Fixed other leaks in TAO_SSLIOP that I found during the work
+          on bug#3418.
+
+        * orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc:
+        * orbsvcs/tests/Security/Big_Request/Big_Request.mpc:
+          Removed unnecessary libraries from dependencies.
+
+        * orbsvcs/tests/Security/InsecureReferences/test.cpp:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp:
+        * orbsvcs/tests/Security/Bug_1107_Regression/client.cpp:
+        * orbsvcs/tests/Security/Crash_Test/server.cpp:
+        * orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp:
+        * orbsvcs/tests/Security/BiDirectional/client.cpp:
+        * orbsvcs/tests/Security/BiDirectional/server.cpp:
+        * orbsvcs/tests/Security/MT_SSLIOP/server.cpp:
+        * orbsvcs/tests/Security/Big_Request/client.cpp:
+          Fixed memory leaks local to these tests.
+
+        * orbsvcs/tests/Security/Crash_Test/run_test.pl:
+        * bin/tao_other_tests.lst:
+          Extended the test script so that it supports now QUICK config.
+          This test could run for a very long time which is not necessary
+          in setups like valgrind.
+
+Mon Mar  7 09:32:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Client_Strategy_Factory.h:
+        * tao/Client_Strategy_Factory.cpp:
+        * tao/ORB_Core.h:
+        * tao/PortableServer/Non_Servant_Upcall.cpp:
+        * tao/PortableServer/Object_Adapter.h:
+        * tao/PortableServer/Object_Adapter.inl:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/Root_POA.h:
+        * tao/PortableServer/Root_POA.inl:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+        * tao/PortableServer/Servant_Upcall.cpp:
+        * tao/Resource_Factory.h:
+        * tao/Resource_Factory.cpp:
+        * tao/Server_Strategy_Factory.h:
+        * tao/Server_Strategy_Factory.cpp:
+        * tao/Stub.cpp:
+        * tao/Transport_Mux_Strategy.h:
+        * tao/default_client.h:
+        * tao/default_client.cpp:
+        * tao/default_resource.h:
+        * tao/default_resource.cpp:
+        * tao/default_server.h:
+        * tao/default_server.cpp:
+        * tao/tao.mpc:
+          Reapplied the changes reverted on Mon Feb 14 10:44:30
+
+        * tao/Configurable_Refcount.h:
+        * tao/Configurable_Refcount.inl:
+        * tao/Configurable_Refcount.cpp:
+          Removed these files.
+
+Mon Mar  7 09:10:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+        * tao/Stub.h:
+        * tao/Stub.inl:
+        * tao/Stub.cpp:
+          ImR example again broke, need to sort this out later
+
+Sun Mar  6 10:07:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+        * tao/Stub.h:
+        * tao/Stub.inl:
+        * tao/Stub.cpp:
+          Reworked simplication of the stub
+
+Fri Mar  4 18:04:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/IDL_Test.mpc:
+        * tests/IDL_Test/anyunion.idl:
+        * tests/IDL_Test/union.idl:
+          Moved union with any member to its own file and don't compile that
+          file with RTI DDS
+
+Fri Mar  4 09:38:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+          Reverted changes related to Stub.*, these changes break the ImR
+          example
+
+        * tao/Stub.h:
+        * tao/Stub.inl:
+        * tao/Stub.cpp:
+          Reverted, these changes break the ImR example
+
+        * tests/Client_Leaks/README:
+        * tests/Client_Leaks/child.cpp:
+        * tests/Client_Leaks/server.cpp:
+          Initialize pointers to 0
+
+Wed Mar  2 19:22:23 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+        * tao/Stub.h:
+        * tao/Stub.inl:
+        * tao/Stub.cpp:
+          Applied changes reverted on Mon Feb 14, didn't break the ImR example
+
+Wed Mar  2 16:02:01 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/Synch_Queued_Message.cpp:
+          Fixed leak of contents in synch queued message. Thanks to
+          Chris Galli <christian dot galli at gmail dot com> for providing
+          this fix. It fixes bug#3825.
+
+        * tests/Big_Oneways/server.cpp:
+        * tests/Big_Oneways/Session.cpp:
+        * tests/Big_Oneways/Coordinator.cpp:
+          Fixed leaks local to this test.
+
+Wed Mar  2 14:50:02 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * TAO_IDL/include/ast_home.h:
+        * TAO_IDL/ast/ast_home.cpp:
+          Added a function that transfers elements from home to interface and
+          zeros those elements in home. This is necessary for correct cleanup.
+
+        * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp:
+          Added copying of exception list for operations defined in home
+          when it needs to create an Explicit interface. This is also for
+          cleanup.
+
+Mon Feb 28 14:31:52 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * TAO_IDL/ast/ast_home.cpp:
+        * TAO_IDL/ast/ast_valuetype_fwd.cpp:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/idl.yy:
+          Fixed memory leaks in tao_idl.
+
+Sat Feb 26 14:24:07 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * MPC/config/pi.mpb:
+
+          Reverting the earlier change. There are some libraries that
+          partially depend on PI, and so they can tolerate not having
+          interceptors and still function. For example TAO_Strategies.
+
+Sat Feb 26 03:27:16 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * MPC/config/endpointpolicy.mpb:
+        * MPC/config/pi.mpb:
+
+          Ensure that projects that depend on these do not get built in
+          minimim, compact, or micro configurations.
+
+        * bin/tao_orb_tests.lst:
+        * bin/tao_other_tests.lst:
+
+          Do not attept to run the tests that don't get built by the above
+          build restrictions.
+
+Wed Feb 23 10:34:17 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/Connector_Impl.cpp:
+        * tao/IIOP_Connector.cpp:
+        * tao/IIOP_Connector.h:
+        * tao/Strategies/UIOP_Connector.cpp:
+        * tao/Strategies/SHMIOP_Connector.h:
+        * tao/Strategies/UIOP_Connector.h:
+        * tao/Strategies/SCIOP_Connector.h:
+        * tao/Strategies/SHMIOP_Connector.cpp:
+        * tao/Strategies/SCIOP_Connector.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp:
+          Fixed use of ACE default reactor on the client side. TAO has own
+          reactor associated with ORB which can be used instead of the default
+          one.
+
+Thu Feb 17 15:21:30 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/PortableServer/Active_Object_Map.cpp:
+          Another change to almost the same code. Now I found memory leaks
+          during logging.
+
+Tue Feb 16 11:15:00 UTC 2011  Simon Massey  <simon dot massey at prismtech dot com>
+
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * orbsvcs/ImplRepo_Service/tao_imr_i.cpp:
+          Initalise instance of enum ActivationMode when first
+          created, otherwise rubbish value gets marshaled.
+
+Tue Feb 15 13:53:16 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/PortableServer/Active_Object_Map.cpp:
+          Fixed unsafe code that crashes server if servant is 0. It's visible
+          only when debug logging is on.
+
+Mon Feb 14 12:23:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging/AMH_Response_Handler.cpp:
+        * tao/Object.h:
+        * tao/Object.inl:
+        * tao/Object.cpp:
+          Committed back these files, also didn't break ImR
+
+Mon Feb 14 12:03:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Refcounted_ObjectKey.inl:
+        * tao/Refcounted_ObjectKey.cpp:
+          Committed back these files, also didn't break ImR
+
+Mon Feb 14 11:47:38 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IORTable/Table_Adapter.h:
+        * tao/IORTable/Table_Adapter.cpp:
+          Committed back these files, also didn't break ImR
+
+Mon Feb 14 11:32:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Valuetype/AbstractBase.h:
+        * tao/Valuetype/AbstractBase.cpp:
+          Committed back these files, also didn't break ImR
+
+Mon Feb 14 11:18:49 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Profile.h:
+        * tao/Profile.inl:
+        * tao/Profile.cpp:
+          Committed back these files, also didn't break ImR
+
+Mon Feb 14 11:04:26 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Core.cpp:
+        * tao/ObjectKey_Table.h:
+        * tao/ObjectKey_Table.inl:
+        * tao/ObjectKey_Table.cpp:
+          Reapplied changes, didn't break ImR example
+
+Mon Feb 14 10:44:30 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+        * tao/Client_Strategy_Factory.h:
+        * tao/Client_Strategy_Factory.cpp:
+        * tao/Configurable_Refcount.h:
+        * tao/Configurable_Refcount.inl:
+        * tao/Configurable_Refcount.cpp:
+        * tao/IORTable/Table_Adapter.h:
+        * tao/IORTable/Table_Adapter.cpp:
+        * tao/Messaging/AMH_Response_Handler.cpp:
+        * tao/ORB_Core.h:
+        * tao/ORB_Core.cpp:
+        * tao/Object.h:
+        * tao/Object.inl:
+        * tao/Object.cpp:
+        * tao/ObjectKey_Table.h:
+        * tao/ObjectKey_Table.cpp:
+        * tao/On_Demand_Fragmentation_Strategy.h:
+        * tao/PortableServer/Non_Servant_Upcall.cpp:
+        * tao/PortableServer/Object_Adapter.h:
+        * tao/PortableServer/Object_Adapter.inl:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/Root_POA.h:
+        * tao/PortableServer/Root_POA.inl:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+        * tao/PortableServer/Servant_Upcall.cpp:
+        * tao/Profile.h:
+        * tao/Profile.inl:
+        * tao/Profile.cpp:
+        * tao/Refcounted_ObjectKey.inl:
+        * tao/Refcounted_ObjectKey.cpp:
+        * tao/Resource_Factory.h:
+        * tao/Resource_Factory.cpp:
+        * tao/Server_Strategy_Factory.h:
+        * tao/Server_Strategy_Factory.cpp:
+        * tao/Stub.h:
+        * tao/Stub.inl:
+        * tao/Stub.cpp:
+        * tao/Transport_Mux_Strategy.h:
+        * tao/Valuetype/AbstractBase.h:
+        * tao/Valuetype/AbstractBase.cpp:
+        * tao/default_client.h:
+        * tao/default_client.cpp:
+        * tao/default_resource.h:
+        * tao/default_resource.cpp:
+        * tao/default_server.h:
+        * tao/default_server.cpp:
+        * tao/tao.mpc:
+        * tao/ObjectKey_Table.inl:
+          Reverted the changes to TAO/tao from the commit of last friday.
+          The ImR example Combined_Service broke and I am not in the position
+          to analyze the exact failure at this moment. Will reapply the
+          changes asap when I have time to analyze this
+
+Fri Feb 11 11:16:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        Merged changes from Remedy work branch.
+
+        === start changelog ===
+
+        Wed Feb  9 15:12:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * etc/tao_pi.doxygen:
+                * etc/tao_pi_server.doxygen:
+                * etc/tao_rtcorba.doxygen:
+                * etc/tao_rtportableserver.doxygen:
+                * etc/tao_transportcurrent.doxygen:
+                * etc/tao_ziop.doxygen:
+                  Set some defines to get more documentation
+
+        Wed Feb  9 13:31:39 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * etc/tao_strategies.doxygen:
+                  Improved doxygen generation
+
+                * examples/Load_Balancing/Load_Balancer_i.cpp:
+                * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h:
+                * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h:
+                * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h:
+                * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h:
+                * orbsvcs/tests/Bug_2615_Regression/Test.idl:
+                * tao/MProfile.cpp:
+                * tao/PortableServer/Object_Adapter.cpp:
+                * tao/Strategies/COIOP_Acceptor.h:
+                * tao/Strategies/COIOP_Endpoint.h:
+                * tao/Strategies/DIOP_Acceptor.h:
+                * tao/Strategies/DIOP_Endpoint.h:
+                * tao/Strategies/SCIOP_Acceptor.h:
+                * tao/Strategies/SCIOP_Endpoint.h:
+                * tao/Strategies/SHMIOP_Endpoint.h:
+                * tao/Strategies/UIOP_Endpoint.h:
+                  Fixed typos and doxygen warnings
+
+        Tue Feb  8 19:04:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * examples/RTCORBA/Activity/README:
+                * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp:
+                * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp:
+                * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp:
+                * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp:
+                * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:
+                * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h:
+                * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h:
+                * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
+                * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
+                * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp:
+                * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp:
+                * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h:
+                * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
+                * performance-tests/Cubit/TAO/MT_Cubit/Globals.h:
+                * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h:
+                * performance-tests/Cubit/TAO/MT_Cubit/Timer.h:
+                * performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp:
+                * performance-tests/Cubit/TAO/MT_Cubit/client.h:
+                * performance-tests/Cubit/TAO/MT_Cubit/client.cpp:
+                * tao/Environment.cpp:
+                  Fixed typos and removed old Chorus support
+
+        Thu Feb  3 09:23:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+                  Added workaround for broken HP C++ V7.4-004 on OpenVMS IA64 V8.3
+
+        Wed Feb  2 14:28:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
+                * tao/CSD_Framework/CSD_POA.h:
+                * tao/ORB_Core.h:
+                * tao/Object.h:
+                * tao/PortableServer/Regular_POA.h:
+                * tao/PortableServer/Servant_Dispatcher.h:
+                * tao/Transport_Mux_Strategy.h:
+                  Layout/doxygen changes
+
+        Wed Feb  2 12:31:51 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/orbconf.h:
+                  Removed deprecated macros
+
+        Wed Feb  2 11:44:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/default_resource.cpp:
+                  Removed support for deprecated -ORBConnectionCachingStrategy
+
+        Tue Feb  1 12:52:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                  Don't generate empty methods
+
+        Tue Feb  1 12:30:57 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+                  Fixed race condition in generated code
+
+        Mon Jan 31 18:58:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+                  Throw correct exception
+
+        Mon Jan 31 18:19:54 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+                  Fixed several race conditions, possible memory leaks and incorrect
+                  logic
+
+        Mon Jan 31 15:12:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+                  Layout changes
+
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                  Throw an exception when we can't allocate any memory anymore
+
+        Mon Jan 31 14:45:24 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                  Reduced amount of methods in the servant with LwCCM, this should
+                  reduce the footprint heavily with LwCCM again
+
+        Mon Jan 31 13:45:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+                  Layout change in generated code
+
+        Mon Jan 31 11:38:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+                  Fixed race condition in generated code
+
+        Mon Jan 31 11:23:52 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                  Fixed race condition in generated code
+
+        Mon Jan 31 10:29:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_home/home_svs.cpp:
+                  Fixed race condition in generated code
+
+        Mon Jan 31 09:55:00 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/context_svh.cpp:
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                * TAO_IDL/be_include/be_visitor_component/servant_svs.h:
+                  Fixed race condition in generated code
+
+        Mon Jan 31 08:47:49 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h:
+                * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h:
+                * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h:
+                * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+                  Cleanup of not used stuff
+
+                * tao/Stub.h:
+                * tao/Stub.inl:
+                  Readded profile_lock(), used by FT
+
+        Fri Jan 28 14:26:35 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/context_svh.cpp:
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                  First step in not letting the generate servant use context members
+                  directly, this causes all kind race conditions in a MT situation.
+                  More changes need to be made between the servant and the context.
+
+                * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
+
+                * tao/ObjectKey_Table.h:
+                  Added export macro again, needed for strategies
+
+                * tao/operation_details.h:
+                * tao/Objref_VarOut_T.h:
+                  Doxygen changes
+
+                * tao/On_Demand_Fragmentation_Strategy.h:
+                  Doxygen change, use ACE_Copy_Disabled
+
+        Thu Jan 27 11:29:03 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * docs/Options.html:
+                * tao/ORB_Core.cpp:
+                * tao/ObjectKey_Table.h:
+                * tao/ObjectKey_Table.inl:
+                * tao/ObjectKey_Table.cpp:
+                * tao/Resource_Factory.h:
+                * tao/Resource_Factory.cpp:
+                * tao/default_resource.h:
+                * tao/default_resource.cpp:
+                  Removed -ORBObjectKeyTableLock, tricky option and this removed a few
+                  virtual method calls. Also use inlining as much as possible
+
+        Thu Jan 27 10:46:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/DLL_Parser.cpp:
+                * tao/IORTable/Table_Adapter.h:
+                * tao/IORTable/Table_Adapter.cpp:
+                * tao/Object.h:
+                * tao/ObjectKey_Table.h:
+                * tao/PortableServer/Non_Servant_Upcall.cpp:
+                * tao/PortableServer/Object_Adapter.h:
+                * tao/PortableServer/Object_Adapter.inl:
+                * tao/PortableServer/Object_Adapter.cpp:
+                * tao/PortableServer/Root_POA.cpp:
+                * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+                * tao/PortableServer/Servant_Upcall.cpp:
+                * tao/Server_Strategy_Factory.h:
+                * tao/Server_Strategy_Factory.cpp:
+                * tao/default_resource.h:
+                * tao/default_server.h:
+                * tao/default_server.cpp:
+                  Removed -ORBPOALock support, disabling the lock in a MT situation is
+                  very risky and causes race conditions. By removing this support
+                  we remove several virtual calls from the critical path which
+                  gives a better performance in the regular callpath.
+
+                * DevGuideExamples/Multithreading/Reactive/svc.conf:
+                * docs/Options.html:
+                * docs/configurations.html:
+                * examples/AMH/Sink_Server/st_server.conf:
+                * examples/AMH/Sink_Server/st_server.conf.xml:
+                * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml:
+                * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf:
+                * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml:
+                * orbsvcs/tests/AVStreams/Latency/svc.conf:
+                * orbsvcs/tests/AVStreams/Latency/svc.conf.xml:
+                * orbsvcs/tests/AVStreams/Multicast/components_svc.conf:
+                * orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml:
+                * orbsvcs/tests/Bug_2377_Regression/svc.conf:
+                * orbsvcs/tests/Bug_2925_Regression/svc.conf:
+                * orbsvcs/tests/EC_MT_Mcast/svc.conf:
+                * performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf:
+                * performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml:
+                * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf:
+                * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml:
+                * performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf:
+                * performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml:
+                * performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf:
+                * performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml:
+                * performance-tests/Cubit/TAO/MT_Cubit/svc.conf:
+                * performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml:
+                * performance-tests/Latency/Collocation/svc.conf:
+                * performance-tests/Latency/DII/svc.conf:
+                * performance-tests/Latency/DII/svc.conf.xml:
+                * performance-tests/Latency/DSI/svc.conf:
+                * performance-tests/Latency/DSI/svc.conf.xml:
+                * performance-tests/Latency/Deferred/svc.conf:
+                * performance-tests/Latency/Deferred/svc.conf.xml:
+                * performance-tests/Latency/Single_Threaded/svc.conf:
+                * performance-tests/Latency/Single_Threaded/svc.conf.xml:
+                * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf:
+                * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml:
+                * performance-tests/Sequence_Latency/DII/svc.conf:
+                * performance-tests/Sequence_Latency/DII/svc.conf.xml:
+                * performance-tests/Sequence_Latency/DSI/svc.conf:
+                * performance-tests/Sequence_Latency/DSI/svc.conf.xml:
+                * performance-tests/Sequence_Latency/Deferred/svc.conf:
+                * performance-tests/Sequence_Latency/Deferred/svc.conf.xml:
+                * performance-tests/Sequence_Latency/Single_Threaded/svc.conf:
+                * performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml:
+                * performance-tests/Throughput/svc.conf:
+                * performance-tests/Throughput/svc.conf.xml:
+                * tests/Bug_3163_Regression/server.conf:
+                * tests/Bug_3647_Regression/svc.conf:
+                * tests/CSD_Collocation/svc.conf:
+                * tests/CSD_Collocation/svc.conf.xml:
+                * tests/Collocation/svc.conf:
+                * tests/Collocation/svc.conf.xml:
+                * tests/Smart_Proxies/Collocation/svc.conf:
+                * tests/Smart_Proxies/Collocation/svc.conf.xml:
+                  Removed -ORBPOALock, got removed
+
+        Wed Jan 26 15:20:42 UTC 2011  Martin Corino  <corino_m@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+                  Added exception in case AMI facet not connected.
+
+        Wed Jan 26 13:51:51 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/Client_Strategy_Factory.h:
+                * tao/Messaging/AMH_Response_Handler.cpp:
+                * tao/Object.h:
+                * tao/Object.cpp:
+                * tao/Profile.h:
+                * tao/Profile.inl:
+                * tao/Resource_Factory.h:
+                * tao/Stub.inl:
+                * tao/Stub.cpp:
+                * tao/Valuetype/AbstractBase.h:
+                * tao/Valuetype/AbstractBase.cpp:
+                  Simplified refcounting and use more inlining
+
+                * tao/tao.mpc:
+                  Updated
+
+                * tao/Configurable_Refcount.h:
+                * tao/Configurable_Refcount.inl:
+                * tao/Configurable_Refcount.cpp:
+                  Removed these files, not used anymore
+
+        Wed Jan 26 13:39:14 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/Client_Strategy_Factory.h:
+                * tao/Client_Strategy_Factory.cpp:
+                * tao/Configurable_Refcount.h:
+                * tao/Configurable_Refcount.inl:
+                * tao/Object.inl:
+                * tao/Object.cpp:
+                * tao/Profile.cpp:
+                * tao/Resource_Factory.h:
+                * tao/Resource_Factory.cpp:
+                * tao/Valuetype/AbstractBase.cpp:
+                * tao/default_client.h:
+                * tao/default_client.cpp:
+                * tao/default_resource.h:
+                * tao/default_resource.cpp:
+                  Simplified refcounts, this improves the runtime performance of TAO
+
+        Wed Jan 26 10:44:30 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+                  Fixed race condition in the disconnect
+
+                * tao/SystemException.cpp:
+                  Layout change
+
+        Tue Jan 25 14:01:47 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
+                  Layout change
+
+                * TAO_IDL/be/be_visitor_operation/operation_svs.cpp:
+                  Fixed race condition in generated code
+
+        Tue Jan 25 13:04:28 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                  Throw an InvalidConnection exception when an EventConsumerBase can't
+                  be narrowed to a type specific Event.
+
+        === end changelog ===
+
+Wed Feb  9 13:45:47 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/Acceptor_Impl.cpp:
+          Fixed unnecessary initialization of a default reactor that was done
+          through a call to ACE_Reactor::instance() as the default parameter
+          to the constructor of ACE_Accept_Strategy (base of
+          TAO_Accept_Strategy).
+
+Thu Feb  3 16:32:53 UTC 2011  Martin Corino  <corino_m@remedy.nl>
+
+        * TAO_IDL/be/be_union.cpp:
+          Fixed unused parameter warning.
+
+Thu Feb  3 12:46:15 UTC 2011  Martin Corino  <corino_m@remedy.nl>
+
+        * TAO_IDL/be/be_union.cpp:
+          Fixed problem with generated ostream (gen_ostream=1) op code in
+          case of Array type member in union.
+
+        * TAO_IDL/driver/drv_args.cpp:
+          Fixed incorrectly reported defaults for anonymous type switches.
+
+        * tests/IDL_Test/union.idl:
+          Added IDL constructs to test the fix above.
+
+Fri Jan 28 11:21:05 CET 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 2.0.1 released.
+
+Mon Jan 24 15:14:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/idltocpp0x:
+        * docs/idltocpp0x/IDLC++0xRFP.odt:
+          Removed these files, RFP is now formally published by the OMG
+
+Sun Jan 23 18:03:49 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/tao_qtresource.mpb:
+          Use qt4
+
+Fri Jan 21 10:50:55 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * tests/OBV/ValueBox/client.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Thu Jan 20 15:28:10 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * TAO_IDL/fe/y.tab.cpp:
+          Corrected a fix that was committed for bug#3312. In that change
+          I was too smart and knowing the implementation of
+          UTL_ScopeStack::pop() I tried to mess with prefixes. Actually it
+          was not needed (I was warned by Jeff Parsons about that) and
+          when used it resulted in wrong generation of prefixes.
+
+Thu Jan 20 11:42:53 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        Merged changes from Remedy work branch.
+
+        === start changelog ===
+
+        Wed Jan 19 12:16:46 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+            * tao/TAO_Internal.cpp:
+              Fixed problem with argument parsing.
+
+        Fri Jan 14 17:19:46 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * utils/catior/Catior_i.cpp:
+                  Added more vendor ids
+
+                * utils/catior/README.catior:
+                  Updated executable name
+
+                * TAO_IDL/be/be_visitor_operation/operation_svs.cpp:
+                  Reverted change below, wasn't complete
+
+        Fri Jan 14 10:37:44 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
+                  Layout change
+
+                * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+                  Layout change to the generated code
+
+                * TAO_IDL/be/be_visitor_operation/operation_svs.cpp:
+                  Fixed race condition in generated servant, more fixes have to be made
+
+        Mon Jan 10 12:39:17 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * etc/tao_portableserver.doxygen:
+                  Doxygen improvement
+
+        Mon Jan 10 09:10:17 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * etc/tao.doxygen:
+                * etc/tao_anytypecode.doxygen:
+                * etc/tao_av.doxygen:
+                * etc/tao_compression.doxygen:
+                * etc/tao_cosevent.doxygen:
+                * etc/tao_cosnaming.doxygen:
+                * etc/tao_cosnotification.doxygen:
+                * etc/tao_costime.doxygen:
+                * etc/tao_costrader.doxygen:
+                * etc/tao_dynamicany.doxygen:
+                * etc/tao_dynamicinterface.doxygen:
+                * etc/tao_esf.doxygen:
+                * etc/tao_ifr.doxygen:
+                * etc/tao_implrepo.doxygen:
+                * etc/tao_iormanip.doxygen:
+                * etc/tao_iortable.doxygen:
+                * etc/tao_pi.doxygen:
+                * etc/tao_pi_server.doxygen:
+                * etc/tao_portablegroup.doxygen:
+                * etc/tao_portableserver.doxygen:
+                * etc/tao_rtcorba.doxygen:
+                * etc/tao_rtevent.doxygen:
+                * etc/tao_rtportableserver.doxygen:
+                * etc/tao_security.doxygen:
+                * etc/tao_smartproxies.doxygen:
+                * etc/tao_ssliop.doxygen:
+                * etc/tao_strategies.doxygen:
+                * etc/tao_transportcurrent.doxygen:
+                * etc/tao_ziop.doxygen:
+                  Removed deprecated macros
+
+        Mon Jan 10 08:48:07 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
+                * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
+                * tao/Valuetype/ValueBase.h:
+                  Layout and changes for doxygen
+
+        Sat Jan  8 12:02:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
+                  Fixed comment to not trigger doxygen warnings
+
+        Fri Jan  7 08:25:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/QtResource/QtResource.mpc:
+                  Use qt4
+
+        Fri Jan  7 08:04:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/BiDir_GIOP/BiDir_GIOP.mpc:
+                * tao/CSD_Framework/CSD_Framework.mpc:
+                * tao/Codeset/Codeset.mpc:
+                * tao/DiffServPolicy/DiffServPolicy.mpc:
+                * tao/DynamicAny/DynamicAny.mpc:
+                * tao/EndpointPolicy/EndpointPolicy.mpc:
+                * tao/IORInterceptor/IORInterceptor.mpc:
+                * tao/IORManipulation/IORManipulation.mpc:
+                * tao/IORTable/IORTable.mpc:
+                * tao/ImR_Client/ImR_Client.mpc:
+                * tao/Messaging/Messaging.mpc:
+                * tao/Strategies/Strategies.mpc:
+                * tao/TransportCurrent/TC.mpc:
+                * tao/TransportCurrent/TC_IIOP.mpc:
+                * tao/TypeCodeFactory/TypeCodeFactory.mpc:
+                * tao/Valuetype/Valuetype.mpc:
+                * tao/ZIOP/ZIOP.mpc:
+                * tao/tao.mpc:
+                  Fixed install problems with pidl files, thanks to Thomas Girard
+                  for providing the patch
+
+        Wed Jan  5 09:35:46 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+                * orbsvcs\orbsvcs\Log\Hash_LogStore.cpp:
+                * orbsvcs\orbsvcs\PortableGroup\Portable_Group_Map.cpp:
+                * orbsvcs\orbsvcs\PortableGroup\PG_ObjectGroupManager.cpp:
+                * orbsvcs\orbsvcs\Security\SL3_CredentialsCurator.cpp:
+                * orbsvcs\orbsvcs\Security\SL2_SecurityManager.cpp:
+                * orbsvcs\orbsvcs\AV\AVStreams_i.cpp:
+                * orbsvcs\orbsvcs\Event\EC_TPC_Dispatching.cpp:
+                * orbsvcs\orbsvcs\LoadBalancing\LB_LoadMinimum.cpp:
+                * orbsvcs\orbsvcs\LoadBalancing\LB_LoadManager.cpp:
+                * orbsvcs\orbsvcs\LoadBalancing\LB_LoadAverage.cpp:
+                * orbsvcs\tests\Concurrency\CC_command.tab.cpp:
+                * orbsvcs\ImplRepo_Service\Activator_NT_Service.cpp:
+                * orbsvcs\ImplRepo_Service\Locator_NT_Service.h:
+                * orbsvcs\ImplRepo_Service\Locator_Options.cpp:
+                * orbsvcs\ImplRepo_Service\Activator_NT_Service.h:
+                * orbsvcs\ImplRepo_Service\Locator_NT_Service.cpp:
+                * tao\ORB_Core.h:
+                * utils\logWalker\Session.cpp:
+                  Fixed compile warnings (uninitialized use, const char* assignments,
+                  etc.).
+
+        Sun Jan  2 13:25:46 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/tao_idl.mpc:
+                * tao/tao.mpc:
+                  Integrated DESTDIR patches from debian packaging
+
+        Wed Dec 22 14:42:05 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_connector.cpp:
+                * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp:
+                * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+                * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp:
+                * TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h:
+                  Removes template parameters which indicates whether the sequence
+                  contains fixed data. This fixes bugzilla #3939.
+
+        === end changelog ===
+
+Tue Jan 18 17:49:42 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * NEWS:
+
+          Added item about IDL compiler bug fix.
+
+Fri Jan 14 17:43:26 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/idl.yy:
+
+          Moved code to unset a flag in IDL_GLobalData, it was in
+          the wrong place.
+
+Fri Jan 14 16:54:35 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/util/utl_err.cpp:
+
+          Added the word "error" to the error header method, so the
+          scoreboard will be triggered to output it.
+
+Fri Jan 14 14:24:47 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/y.tab.cpp:
+
+          Fixed fuzz error.
+
+Thu Jan 13 14:47:20 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/fe_utils.cpp:
+        * TAO_IDL/fe/y.tab.cpp:
+
+          Fixed fuzz errors.
+
+Thu Jan 13 09:26:16 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp:
+        * tests/Param_Test/big_union.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Wed Jan 12 21:08:04 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_component.cpp:
+        * TAO_IDL/ast/ast_decl.cpp:
+        * TAO_IDL/ast/ast_field.cpp:
+        * TAO_IDL/ast/ast_home.cpp:
+        * TAO_IDL/ast/ast_interface.cpp:
+        * TAO_IDL/ast/ast_sequence.cpp:
+        * TAO_IDL/ast/ast_valuetype.cpp:
+        * TAO_IDL/fe/fe_utils.cpp:
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/include/ast_decl.h:
+        * TAO_IDL/include/fe_utils.h:
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/include/utl_err.h:
+        * TAO_IDL/util/utl_err.cpp:
+        * TAO_IDL/util/utl_global.cpp:
+
+          Added new error, reporting when there is an
+          illegal reference to an item in the scope
+          of a template module. Unless the item is
+          declared in the same scope in which it is
+          referenced, the reference must be to an
+          item in an alias of a template module. Also
+          added a mechanism to check for this error, and
+          usage of the mechanism in places where AST
+          nodes are referenced.
+
+Wed Jan 12 13:20:09 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/tests/Notify/MC/test_monitor.cpp:
+        * orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Wed Jan 12 13:00:13 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * tests/Param_Test/bd_struct_seq.cpp:
+        * tests/Param_Test/fixed_struct.cpp:
+        * tests/Param_Test/ub_struct_seq.cpp:
+        * tests/Param_Test/var_struct.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Tue Jan 11 18:57:28 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp(visit_enum):
+
+          When generating a default discriminant value of -1 (all
+          enum values are used in union cases), changed the cast
+          (to the enum type) from C-style to C++ style static_cast<>.
+          Thanks to Milan Cvetkovic <milan dot cvetkovic at mpathix dot com>
+          for the suggestion.
+
+Tue Jan 11 07:09:15 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp:
+        * tests/Alt_Mapping/ub_struct_seq.cpp:
+        * tests/DynAny_Test/test_dynany.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Mon Jan 10 14:02:08 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * tests/OctetSeq/client.cpp:
+        * tests/Param_Test/anyop.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Wed Jan  5 13:14:09 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
+          Fixed crash during Naming Server finalization that was happening
+          when it didn't start properly and POA was not initialized.
+
+Mon Jan  3 14:12:04 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * tests/LongDouble/client.cpp:
+          Reverted change "Fri Dec 31 09:12:53 UTC 2010  Olli Savia  <ops@iki.fi>"
+          which broke 32-bit builds.
+
+Sat Jan  1 10:48:07 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/tests/Notify/lib/Task_Stats.cpp:
+          Added missing include.
+
+Fri Dec 31 09:12:53 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/examples/LoadBalancing/server.cpp:
+        * orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp:
+        * orbsvcs/tests/Notify/lib/Task_Stats.cpp:
+        * orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp:
+        * orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp:
+        * tests/CDR/alignment.cpp:
+        * tests/LongDouble/client.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Thu Dec 30 09:01:39 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Wed Dec 29 09:11:54 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Wed Dec 29 08:53:31 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * TAO_IDL/ast/ast_expression.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Mon Dec 27 16:06:40 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc:
+        * orbsvcs/tests/Bug_3891_Regression/server.cpp:
+
+          Link to the ImR_Client library for static builds.
+
+Mon Dec 20 10:01:18 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+          Fixed bug#3941 and fixed broken formatting when processing sequences.
+
+        * tests/Bug_3941_Regression/test.cpp:
+        * tests/Bug_3941_Regression/test.idl:
+        * tests/Bug_3941_Regression/Bug_3941_Regression.mpc:
+        * tests/Bug_3941_Regression/run_test.pl:
+        * tests/Bug_3941_Regression/README:
+        * bin/tao_orb_tests.lst:
+          Added a test for bug#3941.
+
+Fri Dec 17 14:46:53 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * */*.*:
+          Merged RemedyWork branch.
+
+Wed Dec 15 12:34:01 UTC 2010  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp:
+         Correction for return values ami4ccm callbacks.
+
+
+Wed Dec 15 11:34:01 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+          Layout changes to the generated code
+
+Tue Dec 14 15:25:53 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * NEWS:
+          Prepared for next release
+
+Tue Dec 14 13:13:17 CET 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 2.0.0 released.
+
+Sun Dec 12 16:19:01 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Bug_1482_Regression/Hello.cpp:
+          Fixes 'maybe undefined operation' warning in MingW GCC 4.5.0.
+
+        * tests/OBV/Simple/Client_i.cpp:
+          Removed unnecessary include leading to redefinition warnings.
+
+        * tests/POA/DSI/Database_i.cpp:
+          Fixes 'uninitialized use' warnings.
+
+Wed Dec  8 15:20:26 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_module.cpp:
+
+           Cosmetic changes.
+
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/idl.yy:
+
+          Added an exit if there is a an error produced in adding
+          a template module.
+
+Wed Dec  8 12:36:06 UTC 2010  Martin Corino  <corino_m@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp:
+          Some more fixes for the AMI reply handler executor implementation
+          generation.
+
+Wed Dec  8 03:13:28 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/fe_utils.cpp(can_be_redefined):
+
+          Modified the method to return 'false' if either of its 2
+          arguments is a template module. Such a return will
+          cause a redefinition error to be output.
+
+Tue Dec  7 22:10:52 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+
+          Removed an unused variable. Thanks to Adam Mitz
+          <mitza@ociweb.com> for pointing it out.
+
+Tue Dec  7 21:49:36 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be_include/be_codegen.h:
+
+          Fixed a double deletion problem when OpenDDS is the DDS
+          implementation and connector IDL is processed.
+
+Tue Dec  7 20:07:32 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp:
+        * TAO_IDL/ast/ast_visitor_reifying.cpp:
+        * TAO_IDL/util/utl_global.cpp:
+        * TAO_IDL/util/utl_scope.cpp:
+
+          Fixed bug in code generation of DDS4CCM DataWriter
+          and DataReader classes.
+
+Fri Dec  3 21:34:48 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * utils/logWalker/Invocation.cpp:
+
+          Updated logWalker to handle the new logging time format from the
+          ACE commit: Thu Dec  2 18:29:36 UTC 2010  Steve Huston
+          This patch was submitted by Thomas Lockhart
+          <Thomas dot Lockhart at jpl dot nasa dot gov>.
+
+Fri Dec  3 19:33:25 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/IDL_Test/array_anon_nested.idl:
+
+          New file, containing an unusual IDL construct
+          removed from array.idl below, so it can have
+          the appropriate tao_idl options and avoid RTI
+          DDS IDL processing.
+
+        * tests/IDL_Test/IDL_Test.mpc:
+        * tests/IDL_Test/array.idl:
+
+          Changes corresponding to the above description.
+
+Fri Dec  3 18:13:01 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp:
+        * TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h:
+
+          Modified generation of AMI4CCM reply handler implementation
+          class to include the port name in the constructed class
+          name. This change eliminates redefinition errors when
+          a component has more than one AMI receptacle that uses
+          the same interface. The application developer can give
+          each of these reply handlers a unique behavior if desired.
+
+Fri Dec  3 16:10:08 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_root/root_cnh.cpp:
+        * TAO_IDL/be/be_visitor_root/root_cns.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp:
+        * TAO_IDL/be_include/be_codegen.h:
+
+          Removed AMI4CCM reply handler impl stream and the
+          associated mechanism to manage it, since this class is
+          now generated in the component executor.
+
+Fri Dec  3 15:46:55 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * be/be_visitor_component/component_ami_rh_ex_base.cpp:
+
+          Fixed cut and paste error.
+
+Fri Dec  3 10:20:22 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+          Use DDS as sequence prefix for OpenDDS
+
+        * tao/RTCORBA/RT_Mutex.h:
+        * tao/RTCORBA/RT_ORB.cpp:
+        * tao/RTCORBA/RT_ORBInitializer.h:
+        * tao/RTCORBA/RT_Policy_i.h:
+        * tao/RTCORBA/RT_Protocols_Hooks.h:
+        * tao/RTCORBA/RT_Service_Context_Handler.cpp:
+        * tao/RTCORBA/RT_Stub.cpp:
+          Layout changes
+
+Fri Dec  3 06:13:19 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+          Removed seq_type from DDS traits since it's not needed there anymore.
+
+Thu Dec  2 21:31:19 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_decl.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_util.cpp:
+        * TAO_IDL/be/be_visitor_native/native_ch.cpp:
+
+          Added the option -Wb,opendds_sequence_suffix which allows the user
+          to customize the suffix for OpenDDS native sequence support.
+          This is designed for use with dds4ccm (CIAO) and should probably be
+          avoided in other use-cases.
+
+        * TAO_IDL/be/be_visitor_array.cpp:
+        * TAO_IDL/be/be_visitor_enum.cpp:
+        * TAO_IDL/be/be_visitor_field.cpp:
+        * TAO_IDL/be/be_visitor_module.cpp:
+        * TAO_IDL/be/be_visitor_module/module.cpp:
+        * TAO_IDL/be/be_visitor_root.cpp:
+        * TAO_IDL/be/be_visitor_root/root.cpp:
+        * TAO_IDL/be/be_visitor_root/root_ch.cpp:
+        * TAO_IDL/be/be_visitor_root/root_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence.cpp:
+        * TAO_IDL/be/be_visitor_structure.cpp:
+        * TAO_IDL/be/be_visitor_structure/structure.cpp:
+        * TAO_IDL/be/be_visitor_typedef.cpp:
+        * TAO_IDL/be/be_visitor_typedef/typedef.cpp:
+        * TAO_IDL/be/be_visitor_union.cpp:
+        * TAO_IDL/be/be_visitor_union/union.cpp:
+        * TAO_IDL/be/be_visitor_union_branch.cpp:
+        * TAO_IDL/be_include/be_codegen.h:
+        * TAO_IDL/be_include/be_decl.h:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/be_include/be_visitor_array.h:
+        * TAO_IDL/be_include/be_visitor_enum.h:
+        * TAO_IDL/be_include/be_visitor_field.h:
+        * TAO_IDL/be_include/be_visitor_module.h:
+        * TAO_IDL/be_include/be_visitor_root.h:
+        * TAO_IDL/be_include/be_visitor_root/root_ch.h:
+        * TAO_IDL/be_include/be_visitor_root/root_cs.h:
+        * TAO_IDL/be_include/be_visitor_sequence.h:
+        * TAO_IDL/be_include/be_visitor_structure.h:
+        * TAO_IDL/be_include/be_visitor_typedef.h:
+        * TAO_IDL/be_include/be_visitor_union.h:
+        * TAO_IDL/be_include/be_visitor_union_branch.h:
+
+          Removed obsolete code generation for OpenDDS.
+
+        * TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_module/serializer_op.cpp:
+        * TAO_IDL/be/be_visitor_root/serializer_op.cpp:
+        * TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp:
+        * TAO_IDL/be_include/be_visitor_array/serializer_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_array/serializer_op_cs.h:
+        * TAO_IDL/be_include/be_visitor_enum/serializer_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_enum/serializer_op_cs.h:
+        * TAO_IDL/be_include/be_visitor_field/serializer_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_field/serializer_op_cs.h:
+        * TAO_IDL/be_include/be_visitor_module/serializer_op.h:
+        * TAO_IDL/be_include/be_visitor_root/serializer_op.h:
+        * TAO_IDL/be_include/be_visitor_sequence/serializer_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_sequence/serializer_op_cs.h:
+        * TAO_IDL/be_include/be_visitor_structure/serializer_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_structure/serializer_op_cs.h:
+        * TAO_IDL/be_include/be_visitor_typedef/serializer_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_typedef/serializer_op_cs.h:
+        * TAO_IDL/be_include/be_visitor_union/serializer_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_union/serializer_op_cs.h:
+        * TAO_IDL/be_include/be_visitor_union_branch/serializer_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_union_branch/serializer_op_cs.h:
+
+          Removed these files.
+
+Thu Dec  2 20:23:13 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be_include/be_decl.h:
+        * TAO_IDL/be/be_decl.cpp:
+
+          Removed a flag and its accessors that are no longer used.
+
+Thu Dec  2 19:30:21 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+
+          Fixed generated include in *A.idl, not restored when
+          previous changes were reversed.
+
+        * TAO_IDL/driver/drv_preproc.cpp(DRV_pre_proc):
+
+          Added code to unlink all temporary files at any point
+          where this method might bail out. If an automated build
+          takes place when there is something going wrong in
+          TAO_IDL preprocessing, a great many temporary files could
+          have been left over.
+
+Thu Dec  2 14:12:04 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp:
+
+          Added newline at EOF.
+
+        * TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp:
+        * TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h:
+
+          New files, a base class visitor containing common code for
+          the corresponding concrete visitors generating code for the
+          header and source files.
+
+Wed Dec  1 22:15:07 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_component.cpp:
+        * TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be_include/be_interface.h:
+        * TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h:
+        * TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h:
+        * TAO_IDL/be_include/be_visitor_component.h:
+
+          Moved the generation of AMI4CCM reply handler IDL back to
+          the *A.idl file, from the *E.idl file. Also modified
+          the AMI4CCM reply handler implementation class visitors
+          to traverse the original interface and generate the
+          implied IDL operations on the fly, since the reply
+          handler interface itself is now unavailable.
+
+        * TAO_IDL/be/be_argument.cpp:
+
+          Removed extra whitespace.
+
+        * TAO_IDL/be/be_helper.cpp:
+        * TAO_IDL/be_include/be_helper.h:
+
+          Added overload of TAO_OutStream << operator to accept
+          an ACE_CString.
+
+        * TAO_IDL/driver/drv_preproc.cpp:
+
+          Fixed ACE error message that had a mismatched number of
+          format symbols and described the wrong error. If it was
+          actually called, the mismatch in number of format
+          symbols was causing a crash.
+
+Wed Dec  1 13:53:59 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/IDL_Test/anonymous.idl:
+        * tests/IDL_Tests/array.idl:
+
+          Moved some recently added IDL from anonymous.idl, where
+          a struct-in-struct declaration made it incompatible with
+          the -GA option used on that file, to array.idl, where -GA
+          is not used, and where the problem uncovered by the IDL
+          (non-generation of an Array_Traits<> instantiation for
+          an anonymous array in the nested struct) is more
+          appropriately tested anyway. It is a known issue that a
+          type declaration inside an interface, valuetype, component,
+          home, struct or union is not compatible with the -GA
+          option, since these container types can't be reopened in
+          the *A.h file (created by the option) to declare the
+          typecode in the proper scope.
+
+Wed Dec  1 12:09:31 UTC 2010  Martin Corino  <corino_m@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+          Fixed compilation errors.
+        * TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h:
+          Fixed mismatched connector generation (.h <> .cpp).
+
+Tue Nov 30 20:48:06 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp:
+        * TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp:
+
+          When updating the global list of current template
+          module parameter references (associated with an
+          'alias' IDL construct), added a holder for the old
+          list, which then is restored (instead of setting
+          the list to 0) after the current scope is traversed.
+          This change was necessary to handle the case when
+          aliased template modules are nested.
+
+Tue Nov 30 18:15:54 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp:
+
+          Removed an unused variable.
+
+Tue Nov 30 18:05:30 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+
+          Put code generation back in that was inadvertently
+          removed in a previous checkin.
+
+Mon Nov 29 19:02:18 UTC 2010  Martin Corino  <corino_m@remedy.nl>
+
+        * tests/Abstract_Interface/client.cpp:
+          Fixed test so now it really runs the null-test part.
+
+Mon Nov 29 17:11:52 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_array.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
+
+          Cosmetic changes.
+
+        * TAO_IDL/be/be_visitor_traits.cpp:
+
+          - Removed code that prevented the visitor from finding
+            anonymous arrays nested more than one level deep. Thanks
+            to Shi John <John dot Shi at acxiom dot com> for
+            sending in the IDL example that uncovered the problem.
+
+          - Fixed problem with traits generation for an interface
+            that contains itself recursively.
+
+        * tests/IDL_Test/anonymous.idl:
+
+          Added IDL example mentioned above to test coverage.
+
+Mon Nov 29 15:26:46 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_visitor_reifying.cpp:
+        * TAO_IDL/util/utl_scope.cpp:
+
+          Removed unused local variables.
+
+Fri Nov 26 22:30:25 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_ami_rh_exh.cpp:
+        * TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exh.h:
+        * TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exs.h:
+
+          Removed these visitors, they are replaced by the new ones below.
+
+        * TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h:
+        * TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h:
+        * TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp:
+
+          New visitors, replacing the removed ones above.
+
+        * TAO_IDL/be/be_visitor_component.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_connector.cpp:
+        * TAO_IDL/be/be_decl.cpp:
+        * TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp:
+        * TAO_IDL/be/be_visitor_component/component_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be_include/be_interface.h:
+        * TAO_IDL/be_include/be_visitor_connector.h:
+        * TAO_IDL/be_include/be_decl.h:
+        * TAO_IDL/be_include/be_visitor_component.h:
+
+          Moved generation of AMI4CCM reply handler implementations
+          from the *A_conn_i.{h.cpp} files to the appropriate
+          component executor implementation files. This change
+          also required moving the AMI4CCM reply handler IDL from
+          the *A.idl file to the *E.idl file. This set of changes
+          closes [BUGID:3929].
+
+Fri Nov 26 17:45:08 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/include/ast_module.h:
+        * TAO_IDL/include/ast_template_module_ref.h:
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/include/ast_visitor_tmpl_module_inst.h:
+        * TAO_IDL/include/ast_visitor_context.h:
+        * TAO_IDL/include/ast_template_module_inst.h:
+        * TAO_IDL/be/be_visitor_component.cpp:
+        * TAO_IDL/be/be_visitor_component/component_exh.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/ast/ast_visitor_tmpl_module_ref.cpp:
+        * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp:
+        * TAO_IDL/ast/ast_module.cpp:
+        * TAO_IDL/ast/ast_visitor_reifying.cpp:
+        * TAO_IDL/ast/ast_visitor_context.cpp:
+        * TAO_IDL/ast/ast_template_module_ref.cpp:
+        * TAO_IDL/ast/ast_template_module_inst.cpp:
+        * TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h:
+        * TAO_IDL/be_include/be_visitor_component.h:
+        * TAO_IDL/util/utl_global.cpp:
+        * TAO_IDL/util/utl_scope.cpp:
+
+          Fixed two bugs, both related to code generation from
+          connectors that are declared as implied IDL from a
+          referenced template module ('alias' keyword). If the
+          'alias' construct uses a proper subset of the containing
+          template module's template parameters, all code generation
+          for any connectors inside it must use only that subset.
+
+Thu Nov 25 10:11:29 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/ast/ast_type.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp:
+        * TAO_IDL/be/be_visitor_module/module.cpp:
+          Fixed ami4ccm and dds4ccm problems
+
+Wed Nov 24 13:58:17 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp:
+          Always generate a bool fixed for each templated module argument
+
+Wed Nov 24 13:15:10 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp:
+          Some small improvements in connector handling
+
+Wed Nov 24 11:58:08 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_connector.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp:
+          Fixed problem with templated connectors without a base, enabled
+          dds_connector for all templated connectors, will need to rename
+          the visitors soon
+
+Wed Nov 24 11:01:15 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_connector.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp:
+        * TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp:
+        * TAO_IDL/be_include/be_interface.h:
+        * TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h:
+        * TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h:
+          Extended support for non dds4ccm templated connectors
+
+Tue Nov 23 09:15:23 UTC 2010  Marijke Hengstmengel <mhengstmengel@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
+        Set unused member variable provide_ in Servant class between ifdef lw_ccm.
+
+Mon Nov 22 19:57:23 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/driver/drv_preproc.cpp:
+
+          Added checks for failure to open a file or to create
+          an absolute file pathname. Most of these checks are
+          in code that is specific to VMS.
+
+Mon Nov 22 11:31:10 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/Valuetype/AbstractBase.h:
+        * tao/Valuetype/AbstractBase.cpp:
+        * tao/Valuetype/AbstractBase.inl:
+        * tao/Valuetype/AbstractBase_T.cpp:
+          Fixed a leak described in bug#3879. Also refactored the AbstractBase
+          code so that it become simpler and more standard compliant.
+
+        * tao/Synch_Invocation.cpp:
+        * bin/tao_orb_tests.lst:
+          Fixed the bug#3926 and marked the test as fixed.
+
+        * tests/Abstract_Interface/client.cpp:
+          Fixed in this test output to screen.
+
+Mon Nov 22 10:09:56 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+          Small cleanup and tweaks to traits
+
+Sat Nov 20 17:26:21 UTC 2010  Martin Corino  <corino_m@remedy.nl>
+
+        * tests/Abstract_Interface/client.cpp:
+        * tests/Abstract_Interface/test.idl:
+        * tests/Abstract_Interface/test_i.h:
+        * tests/Abstract_Interface/test_i.cpp:
+          Added test for extraction of null abstract interface.
+
+Sat Nov 20 15:34:50 UTC 2010  Martin Corino  <corino_m@remedy.nl>
+
+        * tao/Valuetype/AbstractBase.cpp:
+          Fixed missing support for extraction of null object ref for
+          abstract interface.
+
+Fri Nov 19 19:12:44 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+          Changed generation of DDS_TYPE traits
+
+Fri Nov 19 17:50:57 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/lex.yy.cpp:
+
+          Fixed a bug in processing of pragma ID directive. Thanks to
+          Wendsomde Yameogo <wendsomde at yameogo dot com> for
+          reporting the problem.
+
+Fri Nov 19 15:50:11 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tests/Bug_3926_Regression/Client_ORBInitializer.h:
+        * tests/Bug_3926_Regression/Client_Request_Interceptor.h:
+          Fixed fuzz.
+
+Fri Nov 19 13:29:57 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tests/Bug_3926_Regression/client.cpp:
+        * tests/Bug_3926_Regression/Client_ORBInitializer.cpp:
+        * tests/Bug_3926_Regression/Client_Request_Interceptor.cpp:
+        * tests/Bug_3926_Regression/test.idl:
+        * tests/Bug_3926_Regression/server.cpp:
+        * tests/Bug_3926_Regression/test_i.cpp:
+        * tests/Bug_3926_Regression/Client_ORBInitializer.h:
+        * tests/Bug_3926_Regression/Client_Request_Interceptor.h:
+        * tests/Bug_3926_Regression/README:
+        * tests/Bug_3926_Regression/run_test.pl:
+        * tests/Bug_3926_Regression/test_i.h:
+        * tests/Bug_3926_Regression/Bug_3926_Regression.mpc:
+        * bin/tao_orb_tests.lst:
+          Added a test and marked it as non-fixed.
+
+Thu Nov 18 14:11:00 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_dds_ts_idl.cpp:
+
+          Changed the name of the local file output stream to avoid
+          a warning saying it hides the base class member.
+
+Thu Nov 18 12:54:09 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/taobaseidldefaults.mpb:
+        * TAO_IDL/be/be_produce.cpp:
+        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+        * TAO_IDL/be/be_visitor_dds_ts_idl.cpp:
+          With -Gts only generate TypeSupport.idl and than bail out
+
+Thu Nov 18 07:41:38 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp:
+          Swapped the template arguments.
+
+Wed Nov 17 17:39:41 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_dds_ts_idl.cpp:
+        * TAO_IDL/be_include/be_visitor_dds_ts_idl.h:
+
+          Changed code generation to create one output file
+          per IDL file processed. For Foo.idl, the generated
+          file is called FooTypeSupport.idl.
+
+Wed Nov 17 17:07:20 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_component/facet_svh.cpp:
+        * TAO_IDL/be_include/be_interface.h:
+
+          Cosmetic changes, comment typo fixed.
+
+        * TAO_IDL/be/be_provides.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be_include/be_global.h:
+
+          Added checks to prevent AMI implied IDL sendc_*
+          operations from being generated in a facet servant,
+          in cases where we are using CORBA AMI on the
+          facet interface.
+
+Wed Nov 17 15:07:20 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be_include/be_visitor_dds_ts_idl.h:
+        * TAO_IDL/be/be_visitor_dds_ts_idl.cpp:
+
+          New files, defining a new visitor that generates DDS
+          type support classes, triggered by the option -Gts.
+          At present, only the data writer and data reader
+          classes are generated, and no check is made that
+          the datatype is used by DDS (all structs, unions
+          and valuetypes are processed). Such a check will be
+          added at a later time.
+
+        * TAO_IDL/be/be_util.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_produce.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        * docs/compiler.html:
+
+          Support code for the new visitor and command line option.
+
+Wed Nov 17 09:31:45 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+        * TAO_IDL/be/be_type.cpp:
+        * TAO_IDL/be/be_valuebox.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
+        * TAO_IDL/ast/ast_structure_fwd.cpp:
+        * TAO_IDL/ast/ast_interface_fwd.cpp:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/fe/idl.ll:
+        * TAO_IDL/util/utl_global.cpp:
+          Fixed memory leaks.
+
+Mon Nov 15 18:54:27 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_connector.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+        * TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h:
+
+          Added generation of traits typedefs for attributes, if they
+          appear in a connector or an extended port.
+
+Mon Nov 15 12:59:06 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
+        * orbsvcs/performance-tests/RTEvent/lib/Control.cpp:
+        * orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp:
+        * orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp:
+        * orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
+        * orbsvcs/tests/FtRtEvent/consumer.cpp:
+        * orbsvcs/tests/FtRtEvent/supplier.cpp:
+        * tao/IORManipulation/IORManipulation.cpp:
+        * tao/Load_Protocol_Factory_T.h:
+        * tao/default_resource.cpp:
+          Use ACE_auto_ptr_reset
+
+Sun Nov 14 22:43:56 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp:
+
+          Changed check for CCM home type from dynamic_cast<>,
+          which doesn't work since we process the equivalent
+          interface node(s) for the typecode, to a call to
+          home_equiv() on the interface node.
+
+        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp:
+
+          Added calls to set the 'home_equiv_' flag on both
+          the explicit and implicit home interfaces. It was
+          already set for the equivalent interface. This fix
+          closes [BUGID:3925].
+
+Sat Nov 13 14:01:03 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+        * TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h:
+          Committed changes from Jeff Parsons which change the layout of the
+          ccm traits for the dds connectors
+
+Fri Nov 12 13:10:52 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+          Changed dds_traits
+
+Fri Nov 12 10:57:45 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp:
+          Removed unnecessary template parameter in the generated connector
+          code.
+
+Thu Nov 11 21:43:07 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp:
+
+          Removed commented-out code.
+
+        * TAO_IDL/include/ast_template_module_ref.h:
+        * TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp:
+        * TAO_IDL/ast/ast_template_module_ref.cpp:
+
+          Added flag in node, and use in visitor, to prevent
+          multiple traversals of a template module reference in
+          this visitor. Its only action is to create an equivalent
+          regular module in the same scope (a template module)
+          and this action mustn't be taken more than once. This
+          flag comes into play when the IDL has a 'chain' of
+          aliases.
+
+Wed Nov 10 19:51:41 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+          Updated some dds trait typedefs
+
+        * tao/orbconf.h:
+          Doxygen changes
+
+Wed Nov 10 19:07:15 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+          Updated some dds trait typedefs
+
+Wed Nov 10 14:16:40 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+          Generate some more typedefs in the dds traits
+
+Wed Nov 10 11:23:06 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/idl.yy:
+          Fixed a check for anonymous type. YACC file contained that check for
+          plain strings while in CPP file it was done for bounded strings. As
+          I thought that YACC is a primary source I wrongly moved this check to
+          a wrong place just to make YACC and CPP files consistent. Now I moved
+          it back to bounded strings.
+          Plus added a check for anonymous bounded wide strings which are also
+          deprecated by CORBA spec now.
+
+        * TAO_IDL/util/utl_global.cpp:
+          Restored back to error reporting when anonymous IDL type is
+          encountered.
+
+Wed Nov 10 09:01:37 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * TAO_IDL/ast/ast_field.cpp:
+          Fixed segmentation fault in tao_idl that exhibited in CIAO code
+          and that was triggered by my memory leak fixes from yesterday.
+
+Tue Nov  9 17:12:36 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * TAO_IDL/util/utl_global.cpp:
+          Explicitly silenced reports about deprecated anonymous IDL types.
+          It looks my previous change enabled those reports. Until I
+          investigate what was wrong this the simplest I can do.
+
+Tue Nov  9 12:35:22 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/Wait_On_Read.cpp:
+        * tao/Transport_Cache_Manager_T.cpp:
+          Corrected a bit logged messages.
+
+        * tests/IDL_Test/Bug_3312_Regression.idl:
+          Enabled a problematic part of the test and extended it.
+
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_field.cpp:
+        * TAO_IDL/be/be_global.cpp:
+          Fixed memory leaks in tao_idl.
+
+        * TAO_IDL/be/be_visitor_union/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp:
+          Fixed only bug#3312.
+
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/y.tab.cpp:
+          Fixed bug#3312. Fixed a leak of FE_OBVHeader. Made formatting
+          in generated cpp file consistent with YACC source. Removed
+          unnecessary white spaces.
+
+        * TAO_IDL/fe/idl.ll:
+        * TAO_IDL/fe/lex.yy.cpp:
+          Fixed a leak of a file prefix which was happening in certain
+          conditions. Ported changes made at different times to generated
+          cpp file but was not added to the lexer source.
+
+Thu Nov  4 16:06:56 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp:
+        * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp:
+        * TAO_IDL/util/utl_global.cpp:
+        * TAO_IDL/util/utl_scope.cpp:
+
+          Fixed bug in parsing template module aliases. To create the
+          necessary implied IDL, we must traverse the referenced template
+          module, using the original template module parameter names
+          for lookups, but, when a match is found, create implied IDL
+          param holders using the aliased parameter name. This fix
+          closes [BUGID:3924].
+
+Mon Nov  1 15:09:04 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/PortableServer/POA_Current_Impl.inl:
+
+          Use CORBA::ULong as the local variable type for a sequence length.
+          Avoids warnings on vc10 64-bit.
+
+Mon Nov  1 14:15:56 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/TAO_Internal.cpp:
+          Not needed to get TAO_ORB_DEBUG twice
+
+        * tao/CORBALOC_Parser.cpp:
+        * tao/PI/DLL_Resident_ORB_Initializer.cpp:
+        * tao/default_resource.cpp:
+          Layout changes to debug messages to make them consistent with the
+          other messages in TAO
+
+Sat Oct 30 09:17:36 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Fri Oct 29 14:40:48 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+          Removed LynxOS specific hacks.
+
+Fri Oct 29 12:03:44 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * tao/DynamicAny/DynAny_i.cpp:
+        * tao/ETCL/TAO_ETCL_Constraint.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Fri Oct 29 12:02:11 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp:
+          Use ACE::is_equal() to compare floating point values.
+
+Fri Oct 29 08:25:58 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/IDL_Test.mpc:
+          Disable 3312 generated files with rti
+
+Thu Oct 28 12:19:07 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/Bug_3312_Regression.idl:
+        * tests/IDL_Test/IDL_Test.mpc:
+          Added test for 3312, doesn't seem to be fixed yet
+
+Thu Oct 28 08:26:46 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tests/Bug_3755_Ext_Regression/run_test.pl:
+        * bin/tao_orb_tests.lst:
+          Disabled in e_micro and e_compact builds parts of this test
+          that are not built in those configurations.
+
+Thu Oct 28 07:57:33 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Utils/Server_Main.h:
+        * tao/Utils/Server_Main.cpp:
+          Fixed compile errors
+
+Thu Oct 28 07:51:17 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
+        * orbsvcs/examples/ImR/Advanced/TestServer.h:
+        * orbsvcs/examples/RtEC/MCast/MCast.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h:
+        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h:
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl:
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h:
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl:
+        * orbsvcs/tests/EC_MT_Mcast/MCast.cpp:
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.h:
+        * orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h:
+        * orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp:
+        * orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp:
+        * orbsvcs/tests/Event/Mcast/Complex/consumer.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
+        * orbsvcs/tests/Event/Mcast/Simple/consumer.cpp:
+        * orbsvcs/tests/Event/Mcast/Two_Way/application.cpp:
+        * orbsvcs/tests/Event/UDP/receiver.cpp:
+        * orbsvcs/tests/Event/UDP/sender.cpp:
+          Removed TAO_EC_Servant_Var, use PortableServer::Servant_var instead
+
+Thu Oct 28 07:41:02 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/RTScheduling/DT_Creator.h:
+        * examples/RTScheduling/Fixed_Priority_Scheduler/test.h:
+        * examples/RTScheduling/MIF_Scheduler/test.h:
+        * orbsvcs/examples/ImR/Advanced/TestServer.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h:
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h:
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl:
+        * orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h:
+        * orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp:
+        * orbsvcs/performance-tests/RTEvent/lib/Send_Task.h:
+        * orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp:
+        * performance-tests/POA/Demux/demux_test_server.h:
+        * tao/Array_Traits_T.h:
+        * tao/Object_Reference_Traits_T.h:
+        * tao/PortableServer/Servant_var.h:
+        * tao/String_Traits_T.h:
+        * tao/Value_Traits_T.h:
+        * tao/Valuetype/Valuetype_Traits_T.h:
+        * tests/Bug_1020_Basic_Regression/client.cpp:
+        * tests/Bug_1020_Basic_Regression/server.cpp:
+        * tests/Bug_1020_Regression/client.cpp:
+        * tests/Bug_1020_Regression/server.cpp:
+        * tests/Bug_1269_Regression/client.cpp:
+        * tests/Bug_1269_Regression/server.cpp:
+        * tests/Bug_1270_Regression/client.cpp:
+        * tests/Bug_1270_Regression/server.cpp:
+        * tests/Bug_1361_Regression/client.cpp:
+        * tests/Bug_1361_Regression/server.cpp:
+        * tests/Bug_1535_Regression/bug_1535_regression.cpp:
+        * tests/Bug_1551_Regression/Client_Task.h:
+        * tests/Bug_1551_Regression/server.cpp:
+        * tests/Bug_1568_Regression/server.cpp:
+        * tests/Bug_1670_Regression/server.cpp:
+        * tests/Bug_2503_Regression/test_i.cpp:
+        * tests/Bug_2560_Regression/Stock_Factory_i.cpp:
+        * tests/Bug_3647_Regression/backend_server.cpp:
+        * tests/Bug_3647_Regression/middle_server.cpp:
+          Fixed compile errors, removed gcc < 3 support
+
+Wed Oct 27 17:45:45 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/idltocpp0x/IDLC++0xRFP.odt:
+          Updated to new draft
+
+        * orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp:
+          Unicode fixes
+
+        * tao/Utils/Server_Main.h:
+        * tao/Utils/Server_Main.cpp:
+          Layout changes
+
+        * tao/Utils/Utils.mpc:
+        * tao/Utils/Servant_Var.h:
+        * tao/Utils/Servant_Var.inl:
+        * tao/Utils/Servant_Var.cpp:
+          Removed Servant_Var
+
+Wed Oct 27 10:38:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ChangeLog:
+        * NEWS:
+          Updated for next release
+
+Wed Oct 27 12:01:05 CEST 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 1.8.3 released.
+
+Tue Oct 26 17:05:35 UTC 2010  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/Bug_3755_Ext_Regression/dp_svc.conf:
+
+          Fix a misspelling in the library name.
+
+Tue Oct 26 12:57:30 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_interface/interface_ih.cpp:
+        * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
+        * TAO_IDL/be/be_visitor_null_return_value.cpp:
+        * TAO_IDL/be_include/be_visitor_component/facet_exh.h:
+
+          Fixed fuzz errors.
+
+Mon Oct 25 14:42:46 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_interface/interface_ih.cpp:
+
+          Cosmetic changes.
+
+        * TAO_IDLbe/be_visitor_null_return_value.cpp:
+
+          Fixed bug in static_cast<> template parameter name
+          generation for sequences.
+
+        * TAO_IDLbe/be_visitor_component/facet_exh.cpp:
+        * TAO_IDLbe_include/be_visitor_component/facet_exh.h:
+
+          Reuse of static function be_visitor_interface_ih::method_helper
+          was not a perfect fit, so added a modified version to
+          be_visitor_facet_exh.
+
+Mon Oct 25 13:46:03 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * NEWS:
+
+          Updated with 2 IDL compiler changes.
+
+Mon Oct 25 08:09:14 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_attr_init.cpp:
+          Simplified
+
+Mon Oct 25 05:58:18 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_attr_init.cpp:
+        * TAO_IDL/be/be_visitor_component.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_exs_attr_init.cpp:
+        * TAO_IDL/be_include/be_visitor_attr_init.h:
+          Added new visitor to generate the attribute initialization in the
+          executor constructor
+
+Mon Oct 25 05:37:24 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_null_return_value.cpp:
+          Reverted change below, this visitor seems to be used in multiple
+          places, need to add a new one for attribute initialization
+
+Sun Oct 24 11:34:00 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_null_return_value.cpp:
+          Simplified member initialization
+
+Sat Oct 23 11:54:52 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+        * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/facet_exs.cpp:
+        * TAO_IDL/be/be_visitor_home/home_exs.cpp:
+        * TAO_IDL/be_include/be_visitor_component/executor_exh.h:
+        * TAO_IDL/be_include/be_visitor_component/executor_exs.h:
+        * TAO_IDL/be_include/be_visitor_component/facet_exh.h:
+        * TAO_IDL/be_include/be_visitor_component/facet_exs.h:
+        * TAO_IDL/be_include/be_visitor_home/home_exs.h:
+          Doxygen style of documentation generated
+
+Sat Oct 23 10:29:26 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Bug_3919_Regression/Bug_3919_Regression.mpc:
+        * tests/Bug_3919_Regression/Test2.idl:
+        * tests/Bug_3919_Regression/client.cpp:
+          Added test for nested use of recursive typecode from another
+          IDL file (including the recursive type IDL file).
+
+Sat Oct 23 000:25:53 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_component/facet_exs.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+        * TAO_IDL/be_include/be_visitor_component/executor_exh.h:
+
+          More fixes in logic to support attribute impl generation
+          in the executor.
+
+Fri Oct 22 12:12:51 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
+          No export macro needed and generate doxygen groups
+
+Fri Oct 22 11:59:58 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+          More layout and documentation generation
+
+Fri Oct 22 11:50:19 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+          Generated executor doesn't need an export macro and layout changes
+
+Fri Oct 22 11:54:34 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Added Reactor.h when the reactor code is generated.
+
+        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+          Added a doxygen group "User defined members".
+
+Fri Oct 22 11:32:10 UTC 2010  Martin Corino  <corino_m@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/value_typecode.cpp:
+          Some changes to fix behaviour when encountering nested
+          recursive type.
+
+Fri Oct 22 07:50:54 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+        * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
+        * TAO_IDL/be_include/be_visitor_component/executor_exh.h:
+        * TAO_IDL/be_include/be_visitor_component/facet_exh.h:
+          Removed some more trailing whitespaces from the
+          generated code.
+          Added comment.
+
+Fri Oct 22 07:03:47 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_attr_assign.cpp:
+        * TAO_IDL/be/be_visitor_attr_return.cpp:
+        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_ch.cpp:
+          Declaration of the getter and setter methods for
+          component attributes on one line in the generated
+          executor header file.
+          Return value and setting the attribute value on one
+          line in the generated executor source file.
+
+Fri Oct 22 06:39:15 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_ch.cpp:
+          Removed some more trailing whitespaces from the
+          generated code.
+
+Fri Oct 22 06:28:07 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_attr_assign.cpp:
+        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
+          Fuzz. Trailing whitespaces.
+
+        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
+          Fuzz. Newline at end of file.
+
+Thu Oct 21 17:39:18 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
+
+          Fixed more code generation bugs related to be_attribute
+          newly inheriting from be_field.
+
+Thu Oct 21 17:19:12 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
+        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp:
+
+          Fixed code generation for valuetypes fields. In
+
+          Wed Oct 20 19:50:32 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          class be_valuetypes was modified to inherit from class
+          be_field, requiring some extra checks to distinguish a
+          field from an attribute in valuetypes.
+
+Thu Oct 21 16:23:10 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_attr_setarg_type.cpp:
+        * TAO_IDL/be/be_visitor_member_type_decl.cpp:
+        * TAO_IDL/be_include/be_visitor_attr_assign.h:
+        * TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h:
+        * TAO_IDL/be_include/be_visitor_component/facet_exs.h:
+        * TAO_IDL/be_include/be_visitor_attr_return.h:
+
+          Fixed trailing whitespace and unused parameter warnings.
+
+Thu Oct 21 15:21:13 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_array.cpp:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_helper.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_provides.cpp:
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_string.cpp:
+        * TAO_IDL/be/be_structure.cpp:
+        * TAO_IDL/be/be_type.cpp:
+        * TAO_IDL/be/be_union.cpp:
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be/be_visitor_array/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
+        * TAO_IDL/be/be_visitor_array/array_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_attr_return.cpp:
+        * TAO_IDL/be/be_visitor_attribute/ccm_init.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp:
+        * TAO_IDL/be/be_visitor_component/component_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/component_exs.cpp:
+        * TAO_IDL/be/be_visitor_component/component_svh.cpp:
+        * TAO_IDL/be/be_visitor_component/component_svs.cpp:
+        * TAO_IDL/be/be_visitor_component/context_ex_idl.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/executor_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_private_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/facet_exs.cpp:
+        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
+        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+        * TAO_IDL/be/be_visitor_component_scope.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_ami_rh_exh.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp:
+        * TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
+        * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+        * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
+        * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
+        * TAO_IDL/be/be_visitor_enum/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_enum/enum_ch.cpp:
+        * TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp:
+        * TAO_IDL/be/be_visitor_field/field_ch.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_exs.cpp:
+        * TAO_IDL/be/be_visitor_home/home_svh.cpp:
+        * TAO_IDL/be/be_visitor_home/home_svs.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_si.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/ami4ccm_conn_ex_idl.cpp:
+        * TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp:
+        * TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ih.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_is.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/tie_ss.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_module/module_ch.cpp:
+        * TAO_IDL/be/be_visitor_module/module_sh.cpp:
+        * TAO_IDL/be/be_visitor_native/native_ch.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_sh.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.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/direct_proxy_impl_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_ch.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_exs.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_ih.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_is.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_svs.cpp:
+        * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp:
+        * TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/tie_sh.cpp:
+        * TAO_IDL/be/be_visitor_operation/tie_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp:
+        * TAO_IDL/be/be_visitor_root/root_ch.cpp:
+        * TAO_IDL/be/be_visitor_root/root_sth.cpp:
+        * TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/structure_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/structure_cs.cpp:
+
+        * TAO_IDL/be/be_visitor_template_export.cpp:
+        * TAO_IDL/be/be_visitor_traits.cpp:
+
+        * TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp:
+        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+        * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/value_typecode.cpp:
+
+        * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp:
+        * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp:
+
+        * TAO_IDL/be/be_visitor_union/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union/discriminant_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp:
+        * TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/serializer_op_cs.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_cs.cpp:
+
+        * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp:
+
+        * TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.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_valuebox/field_ci.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+
+        * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/obv_module.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype.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/valuetype_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.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_include/be_helper.h:
+          In order to get rid of whitespaces, I've added a new
+          newline method. This method will add two \n characters
+          to the stream and after that will call indent () in order
+          to set the indent level to the proper position.
+          I've replace all "be_nl << be_nl" with "be_nl_2".
+
+Thu Oct 21 12:31:48 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+          Added an empty group for user defined operations
+
+Thu Oct 21 12:32:06 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+
+        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_ch.cpp:
+          Reduced the amount of whitespaces in the generated code.
+
+Thu Oct 21 11:56:04 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_attr_assign.cpp:
+        * TAO_IDL/be/be_visitor_attr_return.cpp:
+          Removed trailing whitespaces.
+
+        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_exs_attr_init.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_private_exh.cpp:
+        * TAO_IDL/be/be_visitor_component_scope.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_ch.cpp:
+          Reduced the amount of whitespaces in the generated code.
+
+Thu Oct 21 11:06:36 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+        * TAO_IDL/be/be_visitor_component_scope.cpp:
+          Removed some more whitespaces from the generated code.
+
+Thu Oct 21 10:26:18 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+          Removed whitespaces from generated code.
+
+Thu Oct 21 08:01:49 UTC 2010  Martin Corino  <mcorinom@remedy.nl>
+
+        * tests/Bug_3919_Regression/Test.idl:
+        * tests/Bug_3919_Regression/client.cpp:
+          Changes to get rid of wchar problems.
+
+Wed Oct 20 19:50:32 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_component/facet_private_exh.cpp:
+        * TAO_IDL/be_include/be_visitor_component/facet_private_exh.h:
+
+          Renamed these files (and visitor classes) to the entries below.
+
+        * TAO_IDL/be/be_visitor_component/executor_private_exh.cpp:
+        * TAO_IDL/be_include/be_visitor_component/executor_private_exh.h:
+
+          Renamed these files (and visitor classes) from the entries above.
+
+        * TAO_IDL/be/be_visitor_attr_setarg_type.cpp:
+        * TAO_IDL/be/be_visitor_member_type_decl.cpp:
+        * TAO_IDL/be/be_visitor_attr_return.cpp:
+        * TAO_IDL/be/be_visitor_attr_assign.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_exs_attr_init.cpp:
+        * TAO_IDL/be_include/be_visitor_attr_assign.h:
+        * TAO_IDL/be_include/be_visitor_attr_setarg_type.h:
+        * TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h:
+        * TAO_IDL/be_include/be_visitor_attr_return.h:
+        * TAO_IDL/be_include/be_visitor_member_type_decl.h:
+
+          New files and visitor classes, to generate args, return types,
+          member types, and initialization of members, according to
+          the naming rules for CORBA types.
+
+        * TAO_IDL/be/be_attribute.cpp:
+        * TAO_IDL/be/be_visitor_component.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_exs.cpp:
+        * TAO_IDL/be/be_visitor_any_extracted_type_decl.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/executor_exh.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/component_exs.cpp:
+        * TAO_IDL/be/be_visitor_attribute/attribute.cpp:
+        * TAO_IDL/be/be_visitor_component_scope.cpp:
+        * TAO_IDL/be/be_visitor_null_return_value.cpp:
+        * TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h:
+        * TAO_IDL/be_include/be_attribute.h:
+        * TAO_IDL/be_include/be_visitor_component_scope.h:
+        * TAO_IDL/be_include/be_visitor_component/facet_exs.h:
+        * TAO_IDL/be_include/be_visitor_component/executor_exs.h:
+        * TAO_IDL/be_include/be_visitor_component.h:
+
+          Added code generation for attributes in executor impl classes
+
+          - declaration of private members
+          - initialization of these members in the constructor
+          - working set/get operations (formerly empty) for the members
+
+Wed Oct 20 14:14:28 UTC 2010  Martin Corino  <corino_m@remedy.nl>
+
+        * tests/Bug_3919_Regression:
+        * tests/Bug_3919_Regression/Bug_3919_Regression.mpc:
+        * tests/Bug_3919_Regression/Hello.h:
+        * tests/Bug_3919_Regression/Hello.cpp:
+        * tests/Bug_3919_Regression/Test.idl:
+        * tests/Bug_3919_Regression/client.cpp:
+        * tests/Bug_3919_Regression/run_test.pl:
+        * tests/Bug_3919_Regression/server.cpp:
+        * bin/tao_orb_tests.lst:
+          Added a new test to watch for regression of recursive typecode
+          fixes.
+
+Wed Oct 20 13:01:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          2804 and 2844 should now run
+
+Wed Oct 20 13:02:07 UTC 2010  Martin Corino  <corino_m@remedy.nl>
+
+        * TAO_IDL/ast/ast_exception.cpp:
+        * TAO_IDL/ast/ast_sequence.cpp:
+        * TAO_IDL/ast/ast_structure.cpp:
+        * TAO_IDL/ast/ast_type.cpp:
+        * TAO_IDL/ast/ast_union.cpp:
+        * TAO_IDL/ast/ast_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/value_typecode.cpp:
+        * TAO_IDL/include/ast_type.h:
+          Fixed incorrect (unnecessary) generation of Recursive typecodes.
+
+        * tao/AnyTypeCode/Recursive_Type_TypeCode.h:
+        * tao/AnyTypeCode/Recursive_Type_TypeCode.inl:
+        * tao/AnyTypeCode/Recursive_Type_TypeCode.cpp:
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
+          Fixed incorrect marshaling/demarshaling of Recursive typecodes
+          (specifically nested recursions) as well as incorrect reference
+          counting of recursive typecodes.
+
+        These changes fix Bugzilla #2804 and 2844.
+
+Wed Oct 20 12:48:50 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Added 2918
+
+Tue Oct 19 13:25:26 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
+          Add a new line between each facet executor
+
+Mon Oct 18 07:15:28 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Transport_Cache_Manager/mock_ps.h:
+          Updated for change below
+
+Sun Oct 17 12:21:44 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Connection_Purging_Strategy.h:
+        * tao/LRU_Connection_Purging_Strategy.h:
+        * tao/LRU_Connection_Purging_Strategy.cpp:
+        * tao/Strategies/FIFO_Connection_Purging_Strategy.h:
+        * tao/Strategies/FIFO_Connection_Purging_Strategy.cpp:
+        * tao/Strategies/LFU_Connection_Purging_Strategy.h:
+        * tao/Strategies/LFU_Connection_Purging_Strategy.cpp:
+        * tao/Strategies/NULL_Connection_Purging_Strategy.h:
+        * tao/Strategies/NULL_Connection_Purging_Strategy.cpp:
+        * tao/Transport_Cache_Manager_T.cpp:
+          Pass the transport by reference to the purging strategy, it always
+          has a value
+
+Fri Oct 15 13:49:28 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Only include ORB_core.h when the reactor method is created.
+
+Fri Oct 15 07:37:52 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/LRU_Connection_Purging_Strategy.cpp:
+        * tao/Strategies/FIFO_Connection_Purging_Strategy.cpp:
+        * tao/Strategies/LFU_Connection_Purging_Strategy.cpp:
+          Only use the transport pointer when it has a value. Thanks to
+          Van Vuong <vanvuong1 at us dot ibm dot com> for providing some stack
+          traces where the transport pointer is zero when reaching a purging
+          strategy
+
+        * tao/Transport_Cache_Manager_T.cpp:
+          Layout changes
+
+Thu Oct 14 17:47:23 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/driver/drv_preproc.cpp:
+          Fixed typo in comment
+
+        * TAO_IDL/include/drv_extern.h:
+        * orbsvcs/IFR_Service/drv_private_ifr.h:
+          Removed TAO_IDL_COMMAND_LINE_BUFFER_SIZE, not used anymore
+
+        * tao/IORTable/Table_Adapter.h:
+          layout changes
+
+Thu Oct 14 13:33:45 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * TAO_IDL/driver/drv_preproc.cpp:
+          Cleanup I forgot.
+
+Thu Oct 14 13:21:45 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * TAO_IDL/driver/drv_preproc.cpp:
+          Changes to dynamically determin the required size for the
+          command line arguments buffer and the number of cmdline args.
+          The static max is far too inflexible (and the used constant
+          too small) for CCM type projects currently in development.
+
+Wed Oct 13 11:18:45 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * docs/compiler.html:
+          Explained the -Gexr option.
+
+Wed Oct 13 06:27:40 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_util.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+        * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/facet_exs.cpp:
+        * TAO_IDL/be_include/be_global.h:
+          Added another option to the -Gex option. When a user
+          passes -Gexr, the TAO IDL compiler will generate an extra
+          method in the executor class which retrieves the ACE_Reactor
+          of the ORB of the Component. When the reactor
+          can't be retrieved, a CORBA::INTERNAL exception will be thrown.
+
+          Also removed the comments which states where the code
+          has been generated in the TAO IDL compiler.
+
+Tue Oct 12 14:18:00 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/Codeset/Codeset.mpc:
+
+          Need to explicitly list the Template_Files after the MPC bug fix
+          from Mon Oct 11 20:40:13 UTC 2010.
+
+Tue Oct 12 13:15:30 UTC 2010  Simon Massey  <sma at prismtech dot com>
+
+        * TAO_IDL/ast/ast_component.cpp:
+        * TAO_IDL/ast/ast_home.cpp:
+        * TAO_IDL/ast/ast_interface.cpp:
+        * TAO_IDL/ast/ast_module.cpp:
+        * TAO_IDL/ast/ast_valuetype.cpp:
+        * TAO_IDL/include/ast_component.h:
+        * TAO_IDL/include/ast_home.h:
+        * TAO_IDL/include/ast_interface.h:
+        * TAO_IDL/include/ast_module.h:
+        * TAO_IDL/include/ast_valuetype.h:
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/include/utl_scope.h:
+        * TAO_IDL/util/utl_global.cpp:
+        * TAO_IDL/util/utl_scope.cpp:
+        * tests/IDL_Test/invalid_scoping1.idl: (renamed from invalid_scoping.idl)
+        * tests/IDL_Test/invalid_scoping2.idl:
+        * tests/IDL_Test/run_test.pl:
+
+          Fix another invalid_scoping regression (TAO#522/801), the test
+          prismtech were using "invalid_scoping2.idl" was suttley different
+          to the "invalid_scoping1.idl" being tested here. Bringing
+          head into line with the prismtech tests.
+
+Thu Oct  7 11:14:15 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+          Layout changes
+
+        * tao/Valuetype/ValueBase.h:
+          Removed suncc workaround
+
+Mon Oct  4 19:26:55 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * COPYING:
+        * TAO-INSTALL.html:
+          Small updates
+
+        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+          Fixed memory leak of the Port_Activator
+
+        * tao/Valuetype/ValueBase.h:
+          Docu update
+
+Mon Oct  4 13:35:02 UTC 2010  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
+          Remove one noevents ifdef.
+
+Mon Oct  4 10:35:02 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h:
+        * tao/Remote_Invocation.h:
+          Fixed typo
+
+        * tao/ORB_Core.cpp:
+          Use true instead of 1
+
+Fri Oct  1 16:00:51 UTC 2010  William Otte  <wotte@zifnab>
+
+        * COPYING:
+
+          Updated to include DAnCE.
+
+Fri Oct  1 12:58:51 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/util/utl_global.cpp:
+          Typo fix
+
+        * tao/PI/Interceptor_List_T.cpp:
+          Layout changes
+
+Fri Oct  1 09:54:07 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * orbsvcs/tests/Bug_2777_Regression/run_test.pl:
+          Fixed append of .exe part to tao_nslist on Windows.
+
+Thu Sep 30 14:48:58 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/tests/Bug_2777_Regression/run_test.pl:
+
+          The two test targets will communicate over shared memory (SHMIOP)
+          so they can't be 32-bit and 64-bit executables on the same host.
+
+Thu Sep 30 10:17:00 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+          Layout changes to the generated code and simplified the subscribe
+          methods, a few checks where done multiple times
+
+Thu Sep 30 09:47:23 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/AnySeq.pidl:
+        * tao/AnyTypeCode/Dynamic.pidl:
+        * tao/AnyTypeCode/Dynamic_Parameter.pidl:
+        * tao/AnyTypeCode/ValueModifier.pidl:
+        * tao/AnyTypeCode/Visibility.pidl:
+        * tao/BiDir_GIOP/BiDirPolicy.pidl:
+        * tao/BooleanSeq.pidl:
+        * tao/CSD_Framework/CSD_Framework.pidl:
+        * tao/CharSeq.pidl:
+        * tao/DoubleSeq.pidl:
+        * tao/DynamicAny/DynamicAny.pidl:
+        * tao/EndpointPolicy/EndpointPolicyType.pidl:
+        * tao/FloatSeq.pidl:
+        * tao/IIOP.pidl:
+        * tao/IIOP_Endpoints.pidl:
+        * tao/IORInterceptor/IORInfo.pidl:
+        * tao/IORInterceptor/IORInterceptor.pidl:
+        * tao/IORManipulation/IOR.pidl:
+        * tao/IORTable/IORTable.pidl:
+        * tao/ImR_Client/ImplRepo.pidl:
+        * tao/ImR_Client/ServerObject.pidl:
+        * tao/LongDoubleSeq.pidl:
+        * tao/LongLongSeq.pidl:
+        * tao/LongSeq.pidl:
+        * tao/Messaging/Messaging.pidl:
+        * tao/Messaging/Messaging_No_Impl.pidl:
+        * tao/Messaging/Messaging_RT_Policy.pidl:
+        * tao/Messaging/Messaging_SyncScope_Policy.pidl:
+        * tao/Messaging/Messaging_Types.pidl:
+        * tao/Messaging/Pollable.pidl:
+        * tao/Messaging_PolicyValue.pidl:
+        * tao/Messaging_SyncScope.pidl:
+        * tao/ObjectIdList.pidl:
+        * tao/Object_Key.pidl:
+        * tao/OctetSeq.pidl:
+        * tao/PI/ClientRequestInfo.pidl:
+        * tao/PI/ClientRequestInterceptor.pidl:
+        * tao/PI/Interceptor.pidl:
+        * tao/PI/InvalidSlot.pidl:
+        * tao/PI/ORBInitInfo.pidl:
+        * tao/PI/ORBInitializer.pidl:
+        * tao/PI/PIForwardRequest.pidl:
+        * tao/PI/RequestInfo.pidl:
+        * tao/PI_Server/ServerRequestInfo.pidl:
+        * tao/PI_Server/ServerRequestInterceptor.pidl:
+        * tao/ParameterMode.pidl:
+        * tao/Policy.pidl:
+        * tao/Policy_Forward.pidl:
+        * tao/PortableInterceptor.pidl:
+        * tao/PortableServer/POA.pidl:
+        * tao/PortableServer/PS_Forward.pidl:
+        * tao/PortableServer/PortableServer.pidl:
+        * tao/PortableServer/ServantActivator.pidl:
+        * tao/PortableServer/ServantLocator.pidl:
+        * tao/PortableServer/ServantManager.pidl:
+        * tao/RTCORBA/RTCORBA.pidl:
+        * tao/RTPortableServer/RTPortableServer.pidl:
+        * tao/RTScheduling/RTScheduler.pidl:
+        * tao/Services.pidl:
+        * tao/ShortSeq.pidl:
+        * tao/Strategies/COIOP_Endpoints.pidl:
+        * tao/Strategies/sciop_endpoints.pidl:
+        * tao/Strategies/uiop_endpoints.pidl:
+        * tao/StringSeq.pidl:
+        * tao/TimeBase.pidl:
+        * tao/ULongLongSeq.pidl:
+        * tao/ULongSeq.pidl:
+        * tao/UShortSeq.pidl:
+        * tao/WCharSeq.pidl:
+        * tao/WStringSeq.pidl:
+        * tao/orb_types.pidl:
+          Cleanup, no need to document regeneration instructions, that is in the
+          mpc files
+
+Thu Sep 30 09:11:50 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/context_svh.cpp:
+        * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+          Fixed compile issues in generated code related to the
+          replacement of ACE_Array_Map with std::map.
+          These changes only affects full ccm.
+
+Thu Sep 30 07:09:50 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_3896_Regression/Hello.cpp:
+        * tests/Bug_3896_Regression/client.cpp:
+          Added include to get sleep
+
+Thu Sep 30 05:46:16 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h:
+          Removed comments refering to ACE_Pair.
+
+Wed Sep 29 19:53:17 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl:
+        * orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h:
+        * orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp:
+        * orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp:
+        * orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl:
+
+          Added a no-op two way CORBA call from client to server to make sure
+          they are connected before the shutdown() call.  The implicit call to
+          _is_a() used to do this, but now with the change from
+          Mon Sep 27 14:25:28 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+          the _is_a() is no longer needed.
+
+Wed Sep 29 13:35:11 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+        * tests/Bug_3896_Regression:
+        * tests/Bug_3896_Regression/Bug_3896_Regression.mpc:
+        * tests/Bug_3896_Regression/Hello.h:
+        * tests/Bug_3896_Regression/Hello.cpp:
+        * tests/Bug_3896_Regression/Test.idl:
+        * tests/Bug_3896_Regression/client.cpp:
+        * tests/Bug_3896_Regression/run_test.pl:
+        * tests/Bug_3896_Regression/server.cpp:
+          Added new regression test to validate that an invocation that is
+          aborted because of an orb shutdown gives a comm_failure exception
+          and not a timeout
+
+        * tests/No_Server_MT_Connect_Test/client.cpp:
+          layout changes
+
+Wed Sep 29 12:21:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2112_Regression/client.cpp:
+          Fixed warning
+
+        * tao/PortableServer/Servant_var.h:
+        * tao/PortableServer/Servant_var.inl:
+          Removed commented out code
+
+Wed Sep 28 12:18:42 UTC 2010  Marijke Hengstmengel <mhengstmengel@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_util.cpp:
+        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        First step of making it possible to disable events in CCM.
+
+Tue Sep 28 15:02:48 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/tests/Bug_2112_Regression/client.cpp:
+
+          Fixed #include to work with installed build.
+
+Tue Sep 28 14:18:36 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc:
+
+          Test won't build in CORBA/e Micro
+
+        * orbsvcs/tests/Bug_3891_Regression/server.cpp:
+
+          Whitespace cleanup, avoid warnings with older GCC's.
+
+Tue Sep 28 12:10:42 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Environment.h:
+        * tao/Environment.cpp:
+        * tao/Exception.h:
+        * tao/Fault_Tolerance_Service.h:
+        * tao/Flushing_Strategy.h:
+        * tao/GIOP_Message_State.h:
+        * tao/IIOP_Acceptor.h:
+        * tao/IIOP_Connection_Handler.h:
+        * tao/IIOP_Endpoint.h:
+        * tao/Incoming_Message_Queue.h:
+        * tao/Invocation_Adapter.h:
+        * tao/Invocation_Base.h:
+        * tao/Leader_Follower.h:
+        * tests/Client_Leaks/Client_Task.h:
+        * tests/MT_Timeout/Client_Task.h:
+          Doxygen fixes
+
+Tue Sep 28 09:31:34 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2112_Regression/client.cpp:
+          Fixed not used warnings
+
+Tue Sep 28 08:11:50 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl:
+          Resolved error regarding anonymous types.
+
+Mon Sep 27 15:19:09 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * orbsvcs/orbsvcs/Notify/Random_File.cpp:
+          Added missing include for ACE_Guard.
+
+Mon Sep 27 15:04:26 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl:
+          Added missing include for ACE_Guard.
+
+Mon Sep 27 14:25:28 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/PortableServer/Root_POA.cpp:
+
+          Fix for bug #3891: set the type_id in the TAO_Stub for
+          ImR-ified object references.
+
+        * bin/tao_other_tests.lst:
+        * orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc:
+        * orbsvcs/tests/Bug_3891_Regression/Test.idl:
+        * orbsvcs/tests/Bug_3891_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_3891_Regression/server.cpp:
+
+          Added regression test.
+
+Mon Sep 27 14:22:25 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/SystemExceptionA.cpp:
+
+          Added CORBA namespace scoping to the system exception
+          Any extraction operator macro. Thanks to Matthew Waller
+          <matthewrwaller at gmail dot com> for reporting the bug.
+
+Mon Sep 27 11:58:28 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+        * bin/tao_other_tests.lst:
+          Added 2112 and removed SUNCC_51 checks
+
+        * orbsvcs/tests/Bug_2112_Regression:
+        * orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc:
+        * orbsvcs/tests/Bug_2112_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2112_Regression/run_test.pl:
+          Integrated test for bugzilla 2112
+
+Mon Sep 27 11:41:31 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tests/MProfile_Connection_Timeout/client.cpp:
+          Fixed compile warning.
+
+Mon Sep 27 07:47:14 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+          Extension component has less methods that need to be generated
+
+Sun Sep 26 18:34:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_provides.cpp:
+        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
+        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+        * TAO_IDL/be/be_visitor_home/home_svh.cpp:
+        * TAO_IDL/be/be_visitor_home/home_svs.cpp:
+          Updated for ciao changes
+
+Fri Sep 24 14:51:28 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * bin/tao_other_tests.lst:
+          Disabled test for bug 2777 in static builds.
+
+Fri Sep 24 14:19:37 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/tests/Bug_2777_Regression/run_test.pl:
+
+          Fixed a bug in the perl script: $p is an array-ref.
+
+Fri Sep 24 14:07:49 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Changed some generated includes because of changes in CIAO
+
+        * TAO_IDL/be/be_util.cpp:
+          Fixed some small issues when really using the ciao_container_type
+          option
+
+        * docs/compiler.html:
+          Updated name of new option
+
+Fri Sep 24 13:44:07 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Also make the generated includes dependent on the container type
+
+Fri Sep 24 13:40:59 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * docs/releasenotes/ftrt_ec.html:
+        * docs/tutorials/Quoter/Event_Service/index.html:
+        * docs/tutorials/Quoter/Naming_Service/index.html:
+        * docs/tutorials/Quoter/RT_Event_Service/index.html:
+          Some updates regarding ORB services rename action
+
+Fri Sep 24 13:12:07 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_provides.cpp:
+        * TAO_IDL/be/be_util.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp:
+        * TAO_IDL/be/be_visitor_component/component_svh.cpp:
+        * TAO_IDL/be/be_visitor_component/component_svs.cpp:
+        * TAO_IDL/be/be_visitor_component/context_ex_idl.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/executor_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
+        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+        * TAO_IDL/be/be_visitor_component_scope.cpp:
+        * TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp:
+        * TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
+        * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+        * TAO_IDL/be/be_visitor_home/home_svh.cpp:
+        * TAO_IDL/be/be_visitor_home/home_svs.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/be_include/be_interface.h:
+        * docs/compiler.html:
+          Added ciao_container_type as backend option, this is default Session. This
+          way we can start working on other container types easily, just
+          specifyc Extention of Entity as backend option and all code
+          generated will be tweaked to the other container type
+
+        * tao/ORB_Table.h:
+          Fixed typo
+
+Fri Sep 24 11:51:09 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+          Context is now a full template, updated code generation for this
+
+Fri Sep 24 08:49:38 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * TAO_IDL/util/utl_global.cpp:
+          Changed the default behaviour of the IDL compiler when it
+          encounters an anonymous type. It'll now generate an error.
+
+Thu Sep 23 16:16:12 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * rules.tao.GNU:
+
+          Updated setting the shared library version numbers to match the
+          recent change to gnu.mpd and rules.lib.GNU.
+
+Thu Sep 23 13:16:03 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+          Fixed indentation problem
+
+Thu Sep 23 12:50:25 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.h:
+        * orbsvcs/orbsvcs/Trader/Trader_Utils.h:
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:
+        * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp:
+          Removed non-ASCII characters in comments.
+
+        * orbsvcs/examples/ImR/Combined_Service/start_all.conf:
+        * orbsvcs/examples/ImR/Combined_Service/run_test.pl:
+          Extended timeouts. Previous ones were too short on valgrind builds.
+
+        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
+          Added code that ignores any exception from the servant's cleanup.
+          This fixes a problem where servant wasn't removed from a poa in case
+          servant's destructor threw an exception.
+
+        * tests/ORB_shutdown/Foo_Bar.cpp:
+          Don't allow exceptions to propagate out of the servant's destructor.
+
+        * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl:
+          Extended the test so that it can run without SHMIOP part.
+
+        * tests/Bug_1361_Regression/Server_Thread_Pool.cpp:
+        * tests/Bug_1476_Regression/Sender_i.h:
+        * tests/Codec/client.cpp:
+        * tests/DII_AMI_Forward/server_interceptor.cpp:
+        * tests/NestedUpcall/Triangle_Test/initiator.cpp:
+        * tests/NestedUpcall/Triangle_Test/Object_A_i.cpp:
+        * tests/NestedUpcall/Triangle_Test/Object_B_i.cpp:
+        * tests/NestedUpcall/Triangle_Test/Object_A_i.h:
+        * tests/NestedUpcall/Triangle_Test/Object_B_i.h:
+        * tests/NestedUpcall/Triangle_Test/Triangle_Test.idl:
+        * tests/NestedUpcall/Triangle_Test/run_test.pl:
+        * tests/AMH_Exceptions/server.cpp:
+        * tests/MProfile_Connection_Timeout/client.cpp:
+        * tests/Oneways_Invoking_Twoways/Sender_i.h:
+        * tests/Bug_1476_Test/client.cpp:
+          Fixed memory leaks local to these tests.
+
+Thu Sep 23 09:34:36 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ZIOP/ZIOP.h:
+        * tao/ZIOP/ZIOP.cpp:
+          Fixed msvc conversion warnings
+
+Thu Sep 23 08:57:10 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl:
+        * orbsvcs/examples/CosEC/TypedSimple/run_test.pl:
+        * orbsvcs/tests/CosEvent/Timeout/run_test.pl:
+          Resolved some test errors due to the renaming action.
+
+Thu Sep 23 07:28:48 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * orbsvcs/orbsvcs/sfp.idl:
+          Removed anonymous types.
+
+Thu Sep 23 06:07:14 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Updated generated includes, forgot to commit yesterday
+
+Wed Sep 22 12:56:00 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
+        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+          Updated servant base class name
+
+Wed Sep 22 12:05:01 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/orbsvcs.html:
+          Fine tuning documentation.
+
+Wed Sep 22 11:58:47 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * docs/orbsvcs.html:
+        * orbsvcs/Concurrency_Service/Concurrency_Service.mpc:
+          Renamed 'Concurrency_Service' to 'tao_cosconcurrency'
+
+Wed Sep 22 11:56:25 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/orbsvcs.html:
+        * orbsvcs/Fault_Notifier/Fault_Notifier.mpc:
+        * orbsvcs/tests/FT_App/run_test_demo.pl:
+        * orbsvcs/tests/FT_App/run_test_detector.pl:
+        * orbsvcs/tests/FT_App/run_test_notifier.pl:
+        * orbsvcs/tests/FT_App/run_test_rmnotifier.pl:
+          Renamed 'Fault_Notifier' to 'tao_fault_notifier'
+
+Wed Sep 22 11:49:20 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/tutorials/Quoter/Simple/Impl-Repo/index.html:
+        * orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl:
+        * orbsvcs/DevGuideExamples/ImplRepo/run_test.pl:
+        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
+        * orbsvcs/examples/ImR/Advanced/run_test.pl:
+        * orbsvcs/tests/Bug_1395_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_1437_Regression/run_test.pl:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl:
+        * orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl:
+        * orbsvcs/tests/ImplRepo/NameService/run_test.pl:
+        * orbsvcs/tests/ImplRepo/run_test.pl:
+        * orbsvcs/tests/ImplRepo/scale/run_test.pl:
+          Renamed 'ImR_Activator' to 'tao_imr_activator'
+
+Wed Sep 22 11:39:59 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/orbsvcs.html:
+        * docs/tutorials/Quoter/Simple/Impl-Repo/index.html:
+        * orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl:
+        * orbsvcs/DevGuideExamples/ImplRepo/Basic/run_test.pl:
+        * orbsvcs/DevGuideExamples/ImplRepo/IORTable/run_test.pl:
+        * orbsvcs/DevGuideExamples/ImplRepo/run_test.pl:
+        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
+        * orbsvcs/examples/ImR/Advanced/run_test.pl:
+        * orbsvcs/tests/Bug_1395_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_1437_Regression/run_test.pl:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl:
+        * orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl:
+        * orbsvcs/tests/ImplRepo/NameService/run_test.pl:
+        * orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl:
+        * orbsvcs/tests/ImplRepo/locked/run_test.pl:
+        * orbsvcs/tests/ImplRepo/run_test.pl:
+        * orbsvcs/tests/ImplRepo/scale/run_test.pl:
+          Renamed 'ImplRepo_Service' to 'tao_imr_locator'
+
+Wed Sep 22 09:57:14 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/util/utl_err.cpp:
+          Put Error in the error string for anonymous types so that the
+          scoreboard will mark the errors
+
+Wed Sep 22 10:00:26 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * orbsvcs/Time_Service/Time_Service.mpc:
+        * orbsvcs/tests/Time/run_test.pl:
+          Renamed 'Time_Service_Server' to 'tao_costime_server'
+          Renamed 'Time_Service_Clerk' to 'tao_costime_clerk'
+
+Wed Sep 22 09:57:47 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/orbsvcs.html:
+        * orbsvcs/Trading_Service/Trading_Service.mpc:
+        * orbsvcs/tests/Trading/run_test.pl:
+          Renamed 'Trading_Service' to 'tao_costrading'
+
+Wed Sep 22 09:54:57 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * orbsvcs/LoadBalancer/LoadBalancer.mpc:
+        * orbsvcs/examples/LoadBalancing/run_test.pl:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl:
+        * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl:
+          Renamed 'LoadManager' to 'tao_loadmanager'
+          Renamed 'LoadMonitor'to 'tao_loadmonitor'
+
+Wed Sep 22 09:41:22 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/orbsvcs.html:
+        * docs/releasenotes/ec.html:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl:
+        * orbsvcs/Event_Service/Event_Service.mpc:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl:
+        * orbsvcs/examples/CosEC/TypedSimple/run_test.pl:
+        * orbsvcs/tests/CosEvent/Timeout/run_test.pl:
+        * orbsvcs/tests/EC_Custom_Marshal/run_test.pl:
+        * orbsvcs/tests/EC_Throughput/run_test.pl:
+        * orbsvcs/tests/EC_Throughput/run_test_overflow.pl:
+          Renamed 'Event_Service' to 'tao_rtevent'
+
+Wed Sep 22 09:19:49 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/context_svh.cpp:
+        * TAO_IDL/be/be_visitor_home/home_svs.cpp:
+          Changes for homes
+
+Wed Sep 22 09:17:10 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/orbsvcs.html:
+        * docs/tutorials/Quoter/Event_Service/index.html:
+        * orbsvcs/CosEvent_Service/CosEvent_Service.mpc:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl:
+        * orbsvcs/examples/CosEC/TypedSimple/run_test.pl:
+        * orbsvcs/tests/CosEvent/Timeout/run_test.pl:
+          Renamed 'CosEvent_Service' to 'tao_cosevent'
+
+Wed Sep 22 08:48:22 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/component_svh.cpp:
+        * TAO_IDL/be/be_visitor_component/component_svs.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_svh.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:
+          Use Session_Container in the entry points
+
+Wed Sep 22 08:55:44 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/Advanced/ch_18/run_test.pl:
+          Corrected an error during rename action.
+
+Wed Sep 22 08:50:43 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * TAO-INSTALL.html:
+        * examples/Advanced/ch_18/run_test.pl:
+        * examples/Callback_Quoter/run_test.pl:
+        * examples/Quoter/run_test.pl:
+        * examples/RTCORBA/Activity/run_test.pl:
+        * examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl:
+        * examples/RTScheduling/MIF_Scheduler/run_test.pl:
+        * examples/ior_corbaloc/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl:
+        * orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl:
+        * orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl:
+        * orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl:
+        * orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl:
+        * orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl:
+        * orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl:
+        * orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl:
+        * orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl:
+        * orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl:
+        * orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl:
+        * orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl:
+        * orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/run_test.pl:
+        * orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl:
+        * orbsvcs/Naming_Service/Naming_Service.mpc:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl:
+        * orbsvcs/examples/CosEC/TypedSimple/run_test.pl:
+        * orbsvcs/examples/LoadBalancing/run_test.pl:
+        * orbsvcs/examples/Log/Basic/run_test.pl:
+        * orbsvcs/examples/Log/Event/run_test.pl:
+        * orbsvcs/examples/Log/Notify/run_test.pl:
+        * orbsvcs/examples/Log/RTEvent/run_test.pl:
+        * orbsvcs/examples/Notify/Filter/run_test.pl:
+        * orbsvcs/examples/Notify/Lanes/run_test.pl:
+        * orbsvcs/examples/Notify/Subscribe/run_test.pl:
+        * orbsvcs/examples/Notify/ThreadPool/run_test.pl:
+        * orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl:
+        * orbsvcs/examples/RtEC/IIOPGateway/run_test.pl:
+        * orbsvcs/examples/RtEC/Simple/run_test.pl:
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl:
+        * orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl:
+        * orbsvcs/tests/AVStreams/Component_Switching/run_test.pl:
+        * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl:
+        * orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl:
+        * orbsvcs/tests/AVStreams/Multicast/run_test.pl:
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl:
+        * orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl:
+        * orbsvcs/tests/AVStreams/Pluggable/run_test.pl:
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl:
+        * orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl:
+        * orbsvcs/tests/BiDir_CORBALOC/run_test.pl:
+        * orbsvcs/tests/Bug_1334_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_2777_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl:
+        * orbsvcs/tests/Bug_3387_Regression/run_test.pl:
+        * orbsvcs/tests/CosEvent/Timeout/run_test.pl:
+        * orbsvcs/tests/EC_Custom_Marshal/run_test.pl:
+        * orbsvcs/tests/EC_Multiple/run_test.pl:
+        * orbsvcs/tests/EC_Throughput/run_test.pl:
+        * orbsvcs/tests/EC_Throughput/run_test_overflow.pl:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl:
+        * orbsvcs/tests/HTIOP/Hello/run_test.pl:
+        * orbsvcs/tests/ImplRepo/NameService/run_test.pl:
+        * orbsvcs/tests/Interoperable_Naming/run_test.pl:
+        * orbsvcs/tests/Log/Basic_Log_Test/run_test.pl:
+        * orbsvcs/tests/Notify/Basic/run_test.pl:
+        * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl:
+        * orbsvcs/tests/Notify/Blocking/run_test.pl:
+        * orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl:
+        * orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl:
+        * orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl:
+        * orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl:
+        * orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl:
+        * orbsvcs/tests/Notify/Discarding/run_test.pl:
+        * orbsvcs/tests/Notify/Lanes/run_test.pl:
+        * orbsvcs/tests/Notify/MC/run_test.pl:
+        * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl:
+        * orbsvcs/tests/Notify/Ordering/run_test.pl:
+        * orbsvcs/tests/Notify/Persistent_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/Persistent_POA/run_test.pl:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/Structured_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/ThreadPool/run_test.pl:
+        * orbsvcs/tests/Notify/Timeout/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl:
+        * orbsvcs/tests/Property/run_test.pl:
+        * orbsvcs/tests/Redundant_Naming/run_test.pl:
+        * orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl:
+        * orbsvcs/tests/Simple_Naming/run_test.pl:
+        * orbsvcs/tests/Simple_Naming/run_test_ffp.pl:
+        * orbsvcs/tests/Simple_Naming/run_test_ipv6.pl:
+        * tests/Bug_2791_Regression/README:
+        * tests/Bug_3299_Regression/README:
+        * tests/Bug_3479_Regression/README:
+        * tests/DII_AMI_Forward/README:
+        * utils/nslist/run_test.pl:
+          Renamed 'Naming_Service' to 'tao_cosnaming'
+
+Wed Sep 22 08:57:44 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * orbsvcs/Naming_Service/Naming_Service.mpc:
+          Renamed 'NT_Naming_Service' to 'tao_nt_cosnaming'.
+
+Wed Sep 22 08:25:54 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/releasenotes/index.html:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc:
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc:
+        * orbsvcs/examples/Log/Event/run_test.pl:
+        * orbsvcs/examples/Log/RTEvent/run_test.pl:
+          Renamed 'Event_Logging_Service' to 'tao_tls_event'
+          Renamed 'RTEvent_Logging_Service' to 'tao_tls_rtevent'
+
+Wed Sep 22 08:22:27 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/releasenotes/index.html:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc:
+        * orbsvcs/examples/Log/Notify/run_test.pl:
+          Renamed 'Notify_Logging_Service' to 'tao_tls_notify'
+
+Wed Sep 22 08:19:38 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/releasenotes/index.html:
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc:
+        * orbsvcs/examples/Log/Basic/run_test.pl:
+        * orbsvcs/tests/Log/Basic_Log_Test/run_test.pl:
+          Renamed Basic_Logging_Service to tao_tls_basic.
+
+Wed Sep 22 08:15:12 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/orbsvcs.html:
+        * orbsvcs/Scheduling_Service/Scheduling_Service.mpc:
+          Renamed Scheduling_Service to tao_cosscheduling.
+
+Wed Sep 22 08:12:41 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/orbsvcs.html:
+        * orbsvcs/Fault_Detector/Fault_Detector.mpc:
+        * orbsvcs/tests/FT_App/run_test_demo.pl:
+        * orbsvcs/tests/FT_App/run_test_detector.pl:
+        * orbsvcs/tests/FT_App/run_test_fault_consumer.pl:
+        * orbsvcs/tests/FT_App/run_test_notifier.pl:
+        * orbsvcs/tests/FT_App/run_test_rmnotifier.pl:
+          Renamed Fault_Detector to tao_fault_detector
+
+Wed Sep 22 08:06:48 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * orbsvcs/TAO_Service/TAO_Service.mpc:
+          Renamed TAO_Service to tao_service.
+
+Wed Sep 22 07:43:37 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/interfacerepo/index.html:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl:
+        * orbsvcs/DevGuideExamples/InterfaceRepo/run_test.pl:
+        * orbsvcs/IFR_Service/IFR_Service.mpc:
+        * orbsvcs/examples/CosEC/TypedSimple/run_test.pl:
+        * orbsvcs/examples/ORT/run_test.pl:
+        * orbsvcs/tests/Bug_1393_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_1436_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_1630_Regression/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl:
+          Renamed IFR_Service to tao_ifr_service.
+
+Tue Sep 21 11:04:06 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/orbsvcs.html:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
+        * orbsvcs/tests/FT_App/run_test_demo.pl:
+        * orbsvcs/tests/FT_App/run_test_registry.pl:
+        * orbsvcs/tests/FT_App/run_test_rmnotifier.pl:
+        * orbsvcs/tests/FT_App/run_test_rmregistry.pl:
+          Renamed FT_ReplicationManager to tao_ft_replicationmanager.
+
+Tue Sep 21 10:30:11 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/notification/monitor.html:
+        * docs/orbsvcs.html:
+        * orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl:
+        * orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl:
+        * orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl:
+        * orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl:
+        * orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl:
+        * orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl:
+        * orbsvcs/DevGuideExamples/ValueTypes/Notify/run_test.pl:
+        * orbsvcs/Notify_Service/Notify_Service.mpc:
+        * orbsvcs/examples/Notify/Filter/run_test.pl:
+        * orbsvcs/examples/Notify/Lanes/run_test.pl:
+        * orbsvcs/examples/Notify/Subscribe/run_test.pl:
+        * orbsvcs/examples/Notify/ThreadPool/run_test.pl:
+        * orbsvcs/tests/Bug_3387_Regression/run_test.pl:
+        * orbsvcs/tests/Notify/Basic/run_test.pl:
+        * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl:
+        * orbsvcs/tests/Notify/Blocking/run_test.pl:
+        * orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl:
+        * orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl:
+        * orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl:
+        * orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl:
+        * orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl:
+        * orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl:
+        * orbsvcs/tests/Notify/Discarding/run_test.pl:
+        * orbsvcs/tests/Notify/Lanes/run_test.pl:
+        * orbsvcs/tests/Notify/MC/run_test.pl:
+        * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl:
+        * orbsvcs/tests/Notify/Ordering/run_test.pl:
+        * orbsvcs/tests/Notify/Persistent_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/Persistent_POA/run_test.pl:
+        * orbsvcs/tests/Notify/Reconnecting/run_test.pl:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/Structured_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/ThreadPool/run_test.pl:
+        * orbsvcs/tests/Notify/Timeout/run_test.pl:
+        * orbsvcs/tests/Notify/Validate_Client/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl:
+          Renamed Notify_Service to tao_cosnotification.
+
+Tue Sep 21 09:47:22 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * docs/orbsvcs.html:
+        * orbsvcs/Dump_Schedule/Dump_Schedule.mpc:
+          Renamed Dump_Schedule to tao_dump_schedule.
+
+Tue Sep 21 09:41:09 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * docs/orbsvcs.html:
+        * examples/Quoter/run_test.pl:
+        * orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc:
+          Renamed LifeCycle_Service to tao_coslifecycle. This is the first
+          commit of a rename action regarding the ORB services. This rename
+          action is performed due to the fact that different CORBA vendors also
+          have these services and it is sometimes hard to distinguish between
+          those. The main change will be the tao_ prefix.
+
+Tue Sep 21 07:06:01 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/context_svh.cpp:
+        * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+          For the moment generate the instance id again as part of the context
+
+Tue Sep 21 06:42:42 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_provides.cpp:
+          Removed generation for EntityContext, we don't support Entity at
+          all
+
+Mon Sep 20 15:27:54 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/ImR_Client/ImR_Client.mpc:
+
+          Updated lists of Header and Include Files for install.
+
+Mon Sep 20 14:48:01 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/TransportCurrent/TC.mpc:
+        * tao/TransportCurrent/TC_IIOP.mpc:
+
+          *C.inl files are no longer generated.
+
+Mon Sep 20 13:52:02 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Updated generated includes
+
+Mon Sep 20 13:19:19 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_component/context_svh.cpp:
+        * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+          Updated includes and for the fact that we now talk about SessionContext
+
+Mon Sep 20 11:54:13 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/IDL_Test/interface.idl:
+          Fuzz (trailing space).
+
+Mon Sep 20 11:42:58 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp:
+          Don't generate typedef of the context, not needed at all
+
+Mon Sep 20 10:46:39 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          AMI4CCM doesn't need to access container/context internals
+
+Mon Sep 20 09:32:40 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Bug_3042_Regression/test.idl:
+        * tests/DII_Collocation_Tests/twoway/Test.idl:
+        * tests/IDL_Test/IDL_Test.mpc:
+        * tests/IDL_Test/interface.idl:
+        * tests/IDL_Test/old_array.idl:
+        * tests/IDL_Test/old_sequence.idl:
+        * tests/IDL_Test/old_struct.idl:
+          Rewritten anonymous types since anonymous types are not allowed.
+
+Mon Sep 20 08:54:14 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+          Use new methods on the context to get the POA
+
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h:
+          Fixed typo
+
+Mon Sep 20 03:05:29 UTC 2010  Scott Harris  <harris_s@ociweb.com>
+
+        * tao/String_Manager_T.h:
+
+          Reverted previous change because it caused ambiguous overloads
+          in code that compared String_Manager == 0.
+
+Sat Sep 18 22:38:22 UTC 2010  Scott Harris  <harris_s@ociweb.com>
+
+        * tao/String_Manager_T.h:
+
+          Added equality operators per Bugzilla #3844.
+
+Fri Sep 17 22:15:54 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/Codeset/Codeset.mpc:
+        * tao/Strategies/Strategies.mpc:
+        * tao/Valuetype/Valuetype.mpc:
+
+          Restoring "make install" functionality (installing all needed
+          headers, inline files, and template files) which was lost when these
+          mpc files were moved.  Still need to fix some or all of the other mpc
+          files (at least ImR_Client).
+
+Fri Sep 17 20:44:43 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/orbsvcs/AV/QoS_UDP.cpp:
+
+          Added include of OS_NS_strings.h for ACE_OS::strcasecmp().
+
+Fri Sep 17 20:20:37 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/AnyTypeCode/AnyTypeCode.mpc:
+        * tao/BiDir_GIOP/BiDir_GIOP.mpc:
+        * tao/CSD_Framework/CSD_Framework.mpc:
+        * tao/CSD_ThreadPool/CSD_ThreadPool.mpc:
+        * tao/CodecFactory/CodecFactory.mpc:
+        * tao/Codeset/Codeset.mpc:
+        * tao/Compression/Compression.mpc:
+        * tao/Compression/bzip2/Bzip2Compressor.mpc:
+        * tao/Compression/lzo/LzoCompressor.mpc:
+        * tao/Compression/zlib/ZlibCompressor.mpc:
+        * tao/DiffServPolicy/DiffServPolicy.mpc:
+        * tao/DynamicAny/DynamicAny.mpc:
+        * tao/DynamicInterface/DynamicInterface.mpc:
+        * tao/ETCL/TAO_ETCL.mpc:
+        * tao/EndpointPolicy/EndpointPolicy.mpc:
+        * tao/FlResource/FlResource.mpc:
+        * tao/FoxResource/FoxResource.mpc:
+        * tao/IFR_Client/IFR_Client.mpc:
+        * tao/IORInterceptor/IORInterceptor.mpc:
+        * tao/IORManipulation/IORManipulation.mpc:
+        * tao/IORTable/IORTable.mpc:
+        * tao/ImR_Client/ImR_Client.mpc:
+        * tao/Messaging/Messaging.mpc:
+        * tao/Monitor/Monitor.mpc:
+        * tao/ObjRefTemplate/ObjRefTemplate.mpc:
+        * tao/PI/PI.mpc:
+        * tao/PI_Server/PI_Server.mpc:
+        * tao/PortableServer/PortableServer.mpc:
+        * tao/QtResource/QtResource.mpc:
+        * tao/RTCORBA/RTCORBA.mpc:
+        * tao/RTPortableServer/RTPortableServer.mpc:
+        * tao/RTScheduling/RTScheduler.mpc:
+        * tao/SmartProxies/SmartProxies.mpc:
+        * tao/Strategies/Strategies.mpc:
+        * tao/TkResource/TkResource.mpc:
+        * tao/TransportCurrent/TC.mpc:
+        * tao/TransportCurrent/TC_IIOP.mpc:
+        * tao/TypeCodeFactory/TypeCodeFactory.mpc:
+        * tao/Utils/Utils.mpc:
+        * tao/Valuetype/Valuetype.mpc:
+        * tao/XtResource/XtResource.mpc:
+        * tao/ZIOP/ZIOP.mpc:
+
+          Since these have been moved, the default install_dir isn't what we
+          want.  Set the install_dir to the path to the .mpc, starting with
+          tao/.
+
+Fri Sep 17 17:46:09 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/context_svh.cpp:
+        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+          Context constructor now takes one less argument
+
+        * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+          Fixed indentation problem
+
+Fri Sep 17 15:18:15 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/Utils/Utils.mpc:
+
+          Updated relative paths to the Template_Files.
+
+Fri Sep 17 09:23:47 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * bin/tao_other_tests.lst:
+          Disabled test for bug#2777 on builds without corba_messaging.
+          tao_nslist requires the later.
+
+Fri Sep 17 09:17:34 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Utils/Synch_Refcountable.h:
+        * tao/Utils/Synch_Refcountable.inl:
+        * tao/Utils/Synch_Refcountable.cpp:
+          Removed these files, not used anymore, ACE_Atomic_Op is what is used
+          instead
+
+Fri Sep 17 06:26:49 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+          Moved implementation _nil method into the generated cpp file
+
+Thu Sep 16 14:59:33 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/TransportCurrent/TC.mpc:
+        * tao/TransportCurrent/TC_IIOP.mpc:
+          Reduced the number of files generated
+
+Thu Sep 16 14:54:19 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/TransportCurrent/TC.mpc:
+        * tao/TransportCurrent/TC_IIOP.mpc:
+          Added empty IDL_Files sections
+
+Thu Sep 16 10:32:39 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * test/Bug_3812_Regression:
+          Removed unused, incomplete and incorrect test.
+          The test attempted to test the problems from the referred bug
+          but instead of testing the code from TAO itself it tested some
+          simulating code in the test itself making it independent of whether
+          TAO was fixed or not.
+          Unfortunately it is not possible to change the test to reliably
+          reproduce the bug (or its being fixed) using more generalized code
+          accessing TAO functionality itself.
+
+Thu Sep 16 09:19:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DevGuideExamples/AMH_AMI/inner_i.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ClientTask.cpp:
+        * examples/CSD_Strategy/ThreadPool5/FooServantList.cpp:
+        * orbsvcs/Event_Service/Event_Service.cpp:
+        * orbsvcs/ImplRepo_Service/tao_imr_i.cpp:
+        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp:
+        * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp:
+        * orbsvcs/orbsvcs/Channel_Clients_T.h:
+        * orbsvcs/orbsvcs/CosConcurrencyControl.idl:
+        * orbsvcs/orbsvcs/CosNaming.idl:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/Notify/Random_File.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/client.cpp:
+        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
+        * orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp:
+        * orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp:
+        * orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp:
+        * orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp:
+        * orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp:
+        * tests/Bug_2936_Regression/bug2936.cpp:
+        * tests/Bug_3531_Regression/client.cpp:
+        * tests/Bug_3647_Regression/Backend_Impl.cpp:
+        * tests/Bug_3812_Regression/run_test.pl:
+        * tests/Bug_3853_Regression/Hello_i.cpp:
+        * tests/File_IO/client.cpp:
+        * tests/Hang_Shutdown/client.cpp:
+        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
+        * tests/POA/Default_Servant2/client.cpp:
+          Added missing includes
+
+Thu Sep 16 09:14:39 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/Transport_Cache_Manager_T.inl:
+        * tao/Transport_Cache_Manager_T.h:
+        * tao/Transport_Cache_Manager_T.cpp:
+        * tao/Transport.cpp:
+          Changes to fix threadsafety of cache entry management.
+          This fixes Bugzilla #3812.
+
+Wed Sep 15 15:51:01 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_operation/operation_ih.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_is.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_exs.cpp:
+
+          Skip traversal if the operation is an AMI sendc_* implied
+          IDL addition. The CORBA servant impl and CCM executor
+          classes should not be providing these (empty) operations
+          for the application developer to fill in.
+
+        * TAO_IDL/be/be_visitor_interface/interface_ih.cpp:
+
+          Cosmetic changes.
+
+Wed Sep 15 13:07:39 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/pidl_install.mpb:
+        * tao/pidl_install.mpb:
+          Moved from tao to MPC/config
+
+Wed Sep 15 11:32:04 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/AnyTypeCode.mpc:
+        * tao/BiDir_GIOP/BiDir_GIOP.mpc:
+        * tao/CSD_Framework/CSD_Framework.mpc:
+        * tao/CSD_ThreadPool/CSD_ThreadPool.mpc:
+        * tao/CodecFactory/CodecFactory.mpc:
+        * tao/Codeset/Codeset.mpc:
+        * tao/Compression/Compression.mpc:
+        * tao/DiffServPolicy/DiffServPolicy.mpc:
+        * tao/DynamicAny/DynamicAny.mpc:
+        * tao/DynamicInterface/DynamicInterface.mpc:
+        * tao/ETCL/TAO_ETCL.mpc:
+        * tao/EndpointPolicy/EndpointPolicy.mpc:
+        * tao/IFR_Client/IFR_Client.mpc:
+        * tao/IORInterceptor/IORInterceptor.mpc:
+        * tao/IORManipulation/IORManipulation.mpc:
+        * tao/IORTable/IORTable.mpc:
+        * tao/ImR_Client/ImR_Client.mpc:
+        * tao/Messaging/Messaging.mpc:
+        * tao/Monitor/Monitor.mpc:
+        * tao/ObjRefTemplate/ObjRefTemplate.mpc:
+        * tao/PI/PI.mpc:
+        * tao/PI_Server/PI_Server.mpc:
+        * tao/PortableServer/PortableServer.mpc:
+        * tao/RTCORBA/RTCORBA.mpc:
+        * tao/RTPortableServer/RTPortableServer.mpc:
+        * tao/RTScheduling/RTScheduler.mpc:
+        * tao/SmartProxies/SmartProxies.mpc:
+        * tao/Strategies/Strategies.mpc:
+        * tao/TransportCurrent/TC.mpc:
+        * tao/TransportCurrent/TC_IIOP.mpc:
+        * tao/TypeCodeFactory/TypeCodeFactory.mpc:
+        * tao/Utils/Utils.mpc:
+        * tao/Valuetype/Valuetype.mpc:
+        * tao/ZIOP/ZIOP.mpc:
+          Moved all MPC files to their subdirectory and simplified them
+
+        * tao/BiDir_GIOP.mpc:
+        * tao/CSD_Framework.mpc:
+        * tao/CSD_ThreadPool.mpc:
+        * tao/CodecFactory.mpc:
+        * tao/Codeset.mpc:
+        * tao/Compression.mpc:
+        * tao/DiffServPolicy.mpc:
+        * tao/DynamicAny.mpc:
+        * tao/DynamicInterface.mpc:
+        * tao/EndpointPolicy.mpc:
+        * tao/IFR_Client.mpc:
+        * tao/IORInterceptor.mpc:
+        * tao/IORManipulation.mpc:
+        * tao/IORTable.mpc:
+        * tao/ImR_Client.mpc:
+        * tao/Messaging.mpc:
+        * tao/Monitor.mpc:
+        * tao/ObjRefTemplate.mpc:
+        * tao/PI.mpc:
+        * tao/PI_Server.mpc:
+        * tao/PortableServer.mpc:
+        * tao/RTCORBA.mpc:
+        * tao/RTPortableServer.mpc:
+        * tao/RTScheduler.mpc:
+        * tao/SmartProxies.mpc:
+        * tao/Strategies.mpc:
+        * tao/TC.mpc:
+        * tao/TC_IIOP.mpc:
+        * tao/TypeCodeFactory.mpc:
+        * tao/Utils.mpc:
+        * tao/Valuetype.mpc:
+        * tao/ZIOP.mpc:
+          Removed these files.
+
+Tue Sep 14 18:46:20 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode.mpc:
+        * tao/extra_anytypecode.mpb:
+        * tao/AnyTypeCode/AnyTypeCode.mpc:
+        * tao/AnyTypeCode/extra_anytypecode.mpb:
+          Moved to the AnyTypeCode directory and use the new -iC flag, the
+          other mpc files in the tao directory will be moved soon
+
+Tue Sep 14 11:29:21 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/tao_pss.doxygen:
+          Removed this file.
+
+Tue Sep 14 09:24:08 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/examples/LoadBalancing/server.cpp:
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp:
+          Added missing includes
+
+Mon Sep 13 19:09:35 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be_include/be_global.h:
+
+          Added command line option -iC <path> to override the default
+          prefix (if any) for generated *C.h includes *A.h.
+
+        * TAO_IDL/be/be_util.cpp:
+
+          Updated tao_idl usage message.
+
+        * tao/docs/compiler.html:
+
+          Updated IDL compiler command line option documentation.
+
+Mon Sep 13 18:53:08 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/psdl.mpb:
+        * orbsvcs/PSS:
+        * orbsvcs/examples/PSS:
+          Removed these files, have been disabled for years now
+
+Mon Sep 13 18:15:27 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          *:
+          Zapped trailing whitespaces using
+          find -name \*.h -o -name \*.cpp -name \*.inl | xargs perl -i -pe's/\s+\n/\n/'
+
+Mon Sep 13 15:12:27 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Callback_Quoter/Consumer_Handler.cpp:
+        * examples/Simulator/Event_Supplier/Event_Sup.cpp:
+          Added needed includes
+
+Mon Sep 13 14:56:45 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp:
+        * tests/File_IO/client.cpp:
+        * tests/POA/Default_Servant2/client.cpp:
+          Added needed includes
+
+Mon Sep 13 14:42:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp:
+        * orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp:
+        * orbsvcs/orbsvcs/Notify/Random_File.cpp:
+        * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp:
+          Added needed includes
+
+Mon Sep 13 13:53:20 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp:
+          Added missing include
+
+Mon Sep 13 13:38:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Compression/bzip2/Bzip2Compressor.mpc:
+        * tao/Compression/lzo/LzoCompressor.mpc:
+        * tao/Compression/zlib/ZlibCompressor.mpc:
+        * tao/FlResource/FlResource.mpc:
+        * tao/FoxResource/FoxResource.mpc:
+        * tao/QtResource/QtResource.mpc:
+        * tao/TkResource/TkResource.mpc:
+          Moved these mpc files to their own directory
+
+        * tao/Bzip2Compressor.mpc:
+        * tao/FlResource.mpc:
+        * tao/FoxResource.mpc:
+        * tao/LzoCompressor.mpc:
+        * tao/QtResource.mpc:
+        * tao/TkResource.mpc:
+        * tao/ZlibCompressor.mpc:
+          Removed these files.
+
+Mon Sep 13 13:29:02 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/PP_Memory_Management.txt:
+        * tao/PP_Memory_Management.txt:
+          Moved to docs
+
+        * configure.ac:
+          Removed these files.
+
+Mon Sep 13 13:26:24 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * NEWS:
+          Added removal of Makefile.am files
+
+        * PROBLEM-REPORT-FORM:
+          Zapped question for configure
+
+        * tao/Utils.mpc:
+        * tao/Utils/TAO_Utils.pc.in:
+        * tao/TAO_Utils.pc.in:
+          Moved in file to Utils
+
+        * tao/XtResource/XtResource.mpc:
+        * tao/XtResource.mpc:
+          Moved to XtResource
+
+Mon Sep 13 09:27:13 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DevGuideExamples/AMH_AMI/inner_i.cpp:
+        * examples/Advanced/ch_12/icp.h:
+        * examples/Advanced/ch_18/icp.h:
+        * examples/Advanced/ch_21/icp.h:
+        * examples/Advanced/ch_8_and_10/icp.h:
+        * examples/CSD_Strategy/ThreadPool/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool2/FooServantList.cpp:
+        * examples/CSD_Strategy/ThreadPool2/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool4/ClientTask.cpp:
+        * examples/CSD_Strategy/ThreadPool4/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ClientTask.cpp:
+        * examples/CSD_Strategy/ThreadPool5/FooServantList.cpp:
+        * examples/CSD_Strategy/ThreadPool5/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool6/Foo_i.cpp:
+        * examples/Callback_Quoter/Consumer_Handler.cpp:
+        * examples/Callback_Quoter/Supplier_Timer_Handler.cpp:
+        * examples/Kokyu_dsrt_schedulers/Task_Stats.cpp:
+        * examples/Kokyu_dsrt_schedulers/utils.h:
+        * examples/Logging/Logging_Service_i.h:
+        * examples/Persistent_Grid/Grid_i.h:
+        * examples/RTCORBA/Activity/Task_Stats.cpp:
+        * examples/RTScheduling/Task_Stats.cpp:
+        * examples/Simple/bank/AccountManager_i.h:
+        * examples/Simulator/Event_Supplier/DOVE_Supplier.h:
+        * interop-tests/wchar/wchar_reference.h:
+        * orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp:
+        * orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp:
+        * orbsvcs/ImplRepo_Service/tao_imr_i.cpp:
+        * orbsvcs/Naming_Service/NT_Naming_Server.cpp:
+        * orbsvcs/Naming_Service/NT_Naming_Service.h:
+        * orbsvcs/Notify_Service/NT_Notify_Server.cpp:
+        * orbsvcs/Notify_Service/NT_Notify_Service.h:
+        * orbsvcs/PSS/PSDL_l.cpp:
+        * orbsvcs/Trading_Service/Trading_Service.cpp:
+        * orbsvcs/examples/LoadBalancing/server.cpp:
+        * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp:
+        * orbsvcs/examples/Notify/Federation/Gate/Gate.h:
+        * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp:
+        * orbsvcs/orbsvcs/AV/AVStreams_i.h:
+        * orbsvcs/orbsvcs/AV/QoS_UDP.h:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h:
+        * orbsvcs/orbsvcs/Notify/Random_File.cpp:
+        * orbsvcs/orbsvcs/Sched/Config_Scheduler.h:
+        * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
+        * orbsvcs/orbsvcs/Time/TAO_UTO.cpp:
+        * orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2800_Regression/nsmain.cpp:
+        * orbsvcs/tests/Bug_3673_Regression/nsmain.cpp:
+        * orbsvcs/tests/COIOP_Naming_Test/Hello.h:
+        * orbsvcs/tests/Concurrency/CC_test_utils.cpp:
+        * orbsvcs/tests/Concurrency/CC_tests.cpp:
+        * orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp:
+        * orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp:
+        * orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp:
+        * orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp:
+        * orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp:
+        * orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp:
+        * orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp:
+        * orbsvcs/tests/Notify/lib/Task_Stats.cpp:
+        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp:
+        * performance-tests/CSD_Strategy/TestApps/ServerApp.cpp:
+        * performance-tests/CSD_Strategy/TestInf/AppHelper.h:
+        * performance-tests/CSD_Strategy/TestServant/Foo_i.cpp:
+        * tests/Bug_2677_Regression/server.cpp:
+        * tests/Bug_2936_Regression/bug2936.cpp:
+        * tests/Bug_3251_Regression/server.cpp:
+        * tests/Bug_3531_Regression/client.cpp:
+        * tests/Bug_3531_Regression/test_i.cpp:
+        * tests/Bug_3542_Regression/server.cpp:
+        * tests/Bug_3647_Regression/Backend_Impl.cpp:
+        * tests/Bug_3766_Regression/client.cpp:
+        * tests/Bug_3766_Regression/server.cpp:
+        * tests/Bug_3812_Regression/Bug_3812_Regression.cpp:
+        * tests/Bug_3853_Regression/Hello_i.cpp:
+        * tests/Bug_3853_Regression/client.cpp:
+        * tests/COIOP/Hello.h:
+        * tests/CSD_Strategy_Tests/Broken/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/AppHelper.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp:
+        * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp:
+        * tests/Collocation_Exception_Test/Hello.h:
+        * tests/Collocation_Oneway_Tests/Hello.h:
+        * tests/Collocation_Tests/Hello.h:
+        * tests/DII_Collocation_Tests/oneway/Hello.h:
+        * tests/DII_Collocation_Tests/twoway/Hello.h:
+        * tests/DynAny_Test/test_wrapper.cpp:
+        * tests/File_IO/client.cpp:
+        * tests/ForwardOnceUponException/client.cpp:
+        * tests/Hang_Shutdown/client.cpp:
+        * tests/Nested_Event_Loop/client.cpp:
+        * tests/Nested_Upcall_Crash/Clock_Ticks.h:
+        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
+        * tests/POA/Bug_2511_Regression/server.cpp:
+        * tests/POA/Default_Servant2/client.cpp:
+        * tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h:
+        * tests/ZIOP/client.cpp:
+          Removed include of ace/OS.h
+
+Mon Sep 13 07:46:21 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * Makefile.am:
+          Removed, configure is too experimental to be used for TAO. If
+          someone really wants to use configure we need to fix the MPC
+          generator and the configure script and really perform testing
+
+Thu Sep  9 18:29:21 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Leader_Follower.inl:
+        * tao/Leader_Follower.cpp:
+          Changed empty to is_empty
+
+Thu Sep  9 12:15:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
+        * orbsvcs/examples/Log/Event/Event_Consumer.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp:
+        * orbsvcs/tests/Concurrency/CC_naming_service.cpp:
+        * performance-tests/Memory/IORsize/Foo_i.cpp:
+        * performance-tests/Memory/IORsize/Memory_Growth.h:
+        * performance-tests/Memory/IORsize/Test.idl:
+        * tests/Bug_1476_Regression/Sender_i.cpp:
+        * tests/Codec/client.cpp:
+        * tests/File_IO/server.cpp:
+        * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp:
+        * tests/MT_BiDir/Sender_i.cpp:
+        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp:
+        * tests/ORT/ORT_test_IORInterceptor.cpp:
+        * tests/ORT/ServerORBInitializer.cpp:
+        * tests/Oneways_Invoking_Twoways/Receiver_i.cpp:
+        * tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp:
+        * tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp:
+          Fixed fuzz
+
+Thu Sep  9 11:20:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DevGuideExamples/AMH_AMI/inner_server.cpp:
+        * DevGuideExamples/AMH_AMI/middle_server.cpp:
+        * examples/Kokyu_dsrt_schedulers/Task_Stats.cpp:
+        * examples/RTScheduling/Task_Stats.cpp:
+        * orbsvcs/orbsvcs/Naming/Naming_Service_Container.h:
+        * orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp:
+        * orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp:
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp:
+        * tao/DynamicInterface/Request.inl:
+        * tao/ORB_Constants.h:
+        * tao/Utils/Synch_Refcountable.h:
+        * tao/Utils/Synch_Refcountable.inl:
+        * tao/Utils/Synch_Refcountable.cpp:
+        * tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp:
+          Cleanup
+
+Thu Sep  9 09:28:14 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h:
+          All compilers now support template typedefs, no need to use the
+          macros
+
+Wed Sep  8 14:42:36 UTC 2010  William Otte  <wotte@zifnab>
+
+        * Release:
+
+          Removing obsolete release makefile.
+
+Wed Sep  8 13:14:03 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * *.cpp:
+          Removed RCS_ID
+
+Wed Sep  8 06:16:03 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_3068_Regression/test_i.h:
+          Fixed compile error
+
+Wed Sep  8 06:00:00 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp:
+        * orbsvcs/examples/Notify/Federation/Gate/Gate.cpp:
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp:
+          Fixed compile errors
+
+        * tao/Acceptor_Registry.h:
+          Use ACE_Copy_Disabled
+
+Tue Sep  7 18:07:16 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * utils/logWalker/Log.cpp:
+          Added missing include
+
+Tue Sep  7 11:34:14 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/BiDir_GIOP/BiDirGIOP.cpp:
+        * tao/IORManipulation/IORManip_Loader.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
+        * tao/Strategies/SCIOP_Endpoint.cpp:
+        * tao/Utils/Servant_Var.cpp:
+          Fuzz fixes
+
+Tue Sep  7 10:52:59 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * PROBLEM-REPORT-FORM:
+        * VERSION:
+          Updated support email addresses
+
+        * examples/CSD_Strategy/ThreadPool2/FooServantList.h:
+        * examples/CSD_Strategy/ThreadPool2/FooServantList.cpp:
+          Use ACE_Atomic_Op instead of a mutex with a guard
+
+        * examples/CSD_Strategy/ThreadPool5/FooServantList.h:
+        * examples/CSD_Strategy/ThreadPool5/FooServantList.cpp:
+          Use ACE_GUARD
+
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h:
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp:
+          Use ACE_GUARD
+
+        * orbsvcs/Fault_Notifier/FT_Notifier_i.h:
+          Removed not used members
+
+        * orbsvcs/Fault_Notifier/FT_Notifier_i.cpp:
+          Unicode fixes
+
+        * orbsvcs/examples/Notify/Federation/Gate/Gate.h:
+        * orbsvcs/examples/Notify/Federation/Gate/Gate.cpp:
+          Use ACE_GUARD, removed commented out code
+
+        * orbsvcs/examples/PSS/Server.idl:
+        * orbsvcs/examples/PSS/Server_i.h:
+        * orbsvcs/examples/PSS/Server_i.cpp:
+        * orbsvcs/examples/PSS/Simple_Naming.idl:
+        * orbsvcs/examples/PSS/Simple_Naming.cpp:
+        * orbsvcs/examples/PSS/Simple_Naming_i.h:
+        * orbsvcs/examples/PSS/client.cpp:
+          Removed ACE_RCSID
+
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp:
+          Removed ACE_RCSID, use ACE_GUARD macros
+
+        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp:
+        * orbsvcs/orbsvcs/Notify/Consumer.h:
+        * orbsvcs/orbsvcs/Notify/Consumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip.h:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip.cpp:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp:
+          Use ACE_GUARD
+
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp:
+          Disable ACE_Guard fuzz check for some parts of this file
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h:
+          Removed not used members
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp:
+          Layout and unicode changes
+
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp:
+          Initialize pointer with 0
+
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h:
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp:
+          Use ACE_GUARD
+
+        * tao/Abstract_Servant_Base.cpp:
+        * tao/Acceptor_Filter.cpp:
+        * tao/Acceptor_Registry.cpp:
+        * tao/Adapter.cpp:
+        * tao/Adapter_Registry.cpp:
+          Removed ACE_RCSID
+
+        * tao/AnyTypeCode/Alias_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Any.cpp:
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp:
+        * tao/AnyTypeCode/Any_Basic_Impl.cpp:
+        * tao/AnyTypeCode/Any_Impl.cpp:
+        * tao/AnyTypeCode/Any_SystemException.cpp:
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
+        * tao/AnyTypeCode/Empty_Param_TypeCode.cpp:
+        * tao/AnyTypeCode/Enum_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/ExceptionA.cpp:
+        * tao/AnyTypeCode/Marshal.cpp:
+        * tao/AnyTypeCode/NVList_Adapter_Impl.cpp:
+        * tao/AnyTypeCode/Objref_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Sequence_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/String_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Struct_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/SystemExceptionA.cpp:
+        * tao/AnyTypeCode/True_RefCount_Policy.cpp:
+        * tao/AnyTypeCode/TypeCodeA.cpp:
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
+        * tao/AnyTypeCode/TypeCode_Constants.cpp:
+        * tao/AnyTypeCode/Union_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Value_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/append.cpp:
+        * tao/AnyTypeCode/skip.cpp:
+          Removed ACE_RCSID
+
+        * tao/AnyTypeCode_Adapter.cpp:
+        * tao/Asynch_Queued_Message.cpp:
+        * tao/Asynch_Reply_Dispatcher_Base.cpp:
+        * tao/Base_Transport_Property.cpp:
+        * tao/BiDir_Adapter.cpp:
+          Removed ACE_RCSID
+
+        * tao/BiDir_GIOP/BiDirGIOP.cpp:
+        * tao/BiDir_GIOP/BiDirPolicy_Validator.cpp:
+        * tao/BiDir_GIOP/BiDir_ORBInitializer.cpp:
+        * tao/BiDir_GIOP/BiDir_PolicyFactory.cpp:
+        * tao/BiDir_GIOP/BiDir_Policy_i.cpp:
+        * tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp:
+          Removed ACE_RCSID
+
+        * tao/Bind_Dispatcher_Guard.cpp:
+        * tao/Block_Flushing_Strategy.cpp:
+        * tao/Blocked_Connect_Strategy.cpp:
+        * tao/CDR.cpp:
+        * tao/CORBALOC_Parser.cpp:
+        * tao/CORBA_String.cpp:
+          Removed ACE_RCSID
+
+        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+        * tao/CSD_Framework/CSD_Framework_Loader.cpp:
+        * tao/CSD_Framework/CSD_ORBInitializer.cpp:
+        * tao/CSD_Framework/CSD_Object_Adapter.cpp:
+        * tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp:
+        * tao/CSD_Framework/CSD_POA.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Base.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Proxy.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Repository.cpp:
+          Removed ACE_RCSID
+
+        * tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Queue.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h:
+        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Task.h:
+        * tao/CSD_ThreadPool/CSD_TP_Task.cpp:
+          Removed ACE_RCSID
+
+        * tao/Cleanup_Func_Registry.cpp:
+        * tao/ClientRequestInterceptor_Adapter.cpp:
+        * tao/ClientRequestInterceptor_Adapter_Factory.cpp:
+        * tao/Client_Strategy_Factory.cpp:
+        * tao/Codeset_Manager.cpp:
+        * tao/Codeset_Manager_Factory_Base.cpp:
+        * tao/Codeset_Translator_Base.cpp:
+        * tao/Collocated_Invocation.cpp:
+        * tao/Collocation_Proxy_Broker.cpp:
+        * tao/Collocation_Resolver.cpp:
+          Removed ACE_RCSID
+
+        * tao/Compression/Base_Compressor.cpp:
+        * tao/Compression/Compression.cpp:
+        * tao/Compression/Compression_Manager.cpp:
+        * tao/Compression/Compressor_Factory.cpp:
+          Removed ACE_RCSID
+
+        * tao/Compression/bzip2/Bzip2Compressor.cpp:
+        * tao/Compression/bzip2/Bzip2Compressor_Factory.cpp:
+          Removed ACE_RCSID
+
+        * tao/Compression/lzo/LzoCompressor.cpp:
+        * tao/Compression/lzo/LzoCompressor_Factory.cpp:
+          Removed ACE_RCSID
+
+        * tao/Compression/zlib/ZlibCompressor.cpp:
+        * tao/Compression/zlib/ZlibCompressor_Factory.cpp:
+          Removed ACE_RCSID
+
+        * tao/Connection_Handler.cpp:
+          Fixed bugzilla 3658
+
+        * tao/Configurable_Refcount.cpp:
+        * tao/Connection_Purging_Strategy.cpp:
+        * tao/Connector_Registry.cpp:
+        * tao/DLL_Parser.cpp:
+        * tao/Default_Collocation_Resolver.cpp:
+        * tao/Default_Endpoint_Selector_Factory.cpp:
+        * tao/Default_Thread_Lane_Resources_Manager.cpp:
+          Removed ACE_RCSID
+
+        * tao/DiffServPolicy/Client_Network_Priority_Policy.cpp:
+        * tao/DiffServPolicy/DiffServPolicy.cpp:
+        * tao/DiffServPolicy/DiffServPolicy_Factory.cpp:
+        * tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp:
+        * tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp:
+        * tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp:
+        * tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp:
+        * tao/DiffServPolicy/Server_Network_Priority_Policy.cpp:
+          Removed ACE_RCSID
+
+        * tao/DynamicAny/DynAnyFactory.cpp:
+        * tao/DynamicAny/DynAny_i.cpp:
+        * tao/DynamicAny/DynArray_i.cpp:
+        * tao/DynamicAny/DynCommon.cpp:
+        * tao/DynamicAny/DynEnum_i.cpp:
+        * tao/DynamicAny/DynSequence_i.cpp:
+        * tao/DynamicAny/DynStruct_i.cpp:
+        * tao/DynamicAny/DynUnion_i.cpp:
+        * tao/DynamicAny/DynValueBox_i.cpp:
+        * tao/DynamicAny/DynValueCommon_i.cpp:
+        * tao/DynamicAny/DynValue_i.cpp:
+        * tao/DynamicAny/DynamicAny.cpp:
+          Removed ACE_RCSID
+
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+        * tao/DynamicInterface/Context.cpp:
+        * tao/DynamicInterface/DII_Arguments.cpp:
+        * tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp:
+        * tao/DynamicInterface/DII_Invocation.cpp:
+        * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+        * tao/DynamicInterface/DII_Reply_Dispatcher.cpp:
+        * tao/DynamicInterface/DII_Reply_Handler.cpp:
+        * tao/DynamicInterface/Dynamic_Adapter_Impl.cpp:
+        * tao/DynamicInterface/Dynamic_Implementation.cpp:
+        * tao/DynamicInterface/ExceptionList.cpp:
+        * tao/DynamicInterface/Request.cpp:
+        * tao/DynamicInterface/Server_Request.cpp:
+        * tao/DynamicInterface/Unknown_User_Exception.cpp:
+          Removed ACE_RCSID
+
+        * tao/Dynamic_Adapter.cpp:
+        * tao/Endpoint.cpp:
+          Removed ACE_RCSID
+
+        * tao/EndpointPolicy/EndpointPolicy.cpp:
+        * tao/EndpointPolicy/EndpointPolicy_Factory.cpp:
+        * tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp:
+        * tao/EndpointPolicy/EndpointPolicy_i.cpp:
+        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp:
+        * tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp:
+        * tao/EndpointPolicy/IIOPEndpointValue_i.cpp:
+        * tao/Endpoint_Selector_Factory.cpp:
+        * tao/Exception.cpp:
+        * tao/Exclusive_TMS.cpp:
+        * tao/FILE_Parser.cpp:
+        * tao/Fault_Tolerance_Service.cpp:
+        * tao/Flushing_Strategy.cpp:
+        * tao/FoxResource/FoxResource_Factory.cpp:
+        * tao/FoxResource/FoxResource_Loader.cpp:
+        * tao/GIOP_Message_Base.cpp:
+        * tao/GIOP_Message_Generator_Parser_11.cpp:
+        * tao/GIOP_Message_Generator_Parser_12.cpp:
+        * tao/GIOP_Message_Generator_Parser_Impl.cpp:
+        * tao/GIOP_Message_Locate_Header.cpp:
+        * tao/GIOP_Message_State.cpp:
+        * tao/GIOP_Message_Version.cpp:
+        * tao/HTTP_Parser.cpp:
+        * tao/IFR_Client_Adapter.cpp:
+        * tao/IIOP_Acceptor.cpp:
+        * tao/IIOP_Connector.cpp:
+        * tao/IIOP_Endpoint.cpp:
+        * tao/IIOP_Profile.cpp:
+        * tao/IIOP_Transport.cpp:
+        * tao/IORInterceptor_Adapter.cpp:
+        * tao/IORInterceptor_Adapter_Factory.cpp:
+        * tao/IORManipulation/IORManip_Filter.cpp:
+        * tao/IORManipulation/IORManip_IIOP_Filter.cpp:
+        * tao/IORManipulation/IORManip_Loader.cpp:
+        * tao/IORManipulation/IORManipulation.cpp:
+        * tao/IORTable/IORTable.cpp:
+        * tao/IORTable/IOR_Table_Impl.cpp:
+        * tao/IORTable/Table_Adapter.cpp:
+        * tao/IOR_Parser.cpp:
+        * tao/ImR_Client/ImR_Client.cpp:
+        * tao/Incoming_Message_Queue.cpp:
+        * tao/Incoming_Message_Stack.cpp:
+        * tao/Invocation_Adapter.cpp:
+        * tao/Invocation_Base.cpp:
+        * tao/Invocation_Endpoint_Selectors.cpp:
+        * tao/LF_CH_Event.cpp:
+        * tao/LF_Connect_Strategy.cpp:
+        * tao/LF_Event.cpp:
+        * tao/LF_Event_Binder.cpp:
+        * tao/LF_Follower.cpp:
+        * tao/LF_Follower_Auto_Adder.cpp:
+        * tao/LF_Invocation_Event.cpp:
+        * tao/LF_Multi_Event.cpp:
+        * tao/LF_Strategy.cpp:
+        * tao/LF_Strategy_Complete.cpp:
+        * tao/LRU_Connection_Purging_Strategy.cpp:
+        * tao/Leader_Follower.cpp:
+        * tao/Leader_Follower_Flushing_Strategy.cpp:
+        * tao/LocalObject.cpp:
+        * tao/MCAST_Parser.cpp:
+        * tao/MProfile.cpp:
+        * tao/Messaging/AMI_Arguments_Converter_Impl.cpp:
+        * tao/Messaging/Asynch_Invocation.cpp:
+        * tao/Messaging/Asynch_Invocation_Adapter.cpp:
+        * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
+        * tao/Messaging/Asynch_Timeout_Handler.cpp:
+        * tao/Messaging/Buffering_Constraint_Policy.cpp:
+        * tao/Messaging/Connection_Timeout_Policy_i.cpp:
+        * tao/Messaging/ExceptionHolder_i.cpp:
+        * tao/Messaging/Messaging.cpp:
+        * tao/Messaging/Messaging_Loader.cpp:
+        * tao/Messaging/Messaging_ORBInitializer.cpp:
+        * tao/Messaging/Messaging_PolicyFactory.cpp:
+        * tao/Messaging/Messaging_Policy_i.cpp:
+        * tao/Messaging/Messaging_Queueing_Strategies.cpp:
+        * tao/Monitor/Monitor.cpp:
+        * tao/Monitor/Monitor_Impl.cpp:
+        * tao/Muxed_TMS.cpp:
+        * tao/NVList_Adapter.cpp:
+        * tao/Network_Priority_Protocols_Hooks.cpp:
+        * tao/ORB.cpp:
+        * tao/ORBInitializer_Registry.cpp:
+        * tao/ORBInitializer_Registry_Adapter.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/ORB_Core_Auto_Ptr.cpp:
+        * tao/ORB_Table.cpp:
+        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp:
+        * tao/ObjRefTemplate/ORT_Adapter_Impl.cpp:
+        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp:
+        * tao/ObjectKey_Table.cpp:
+        * tao/Object_Loader.cpp:
+        * tao/Object_Proxy_Broker.cpp:
+        * tao/Object_Ref_Table.cpp:
+        * tao/PI/ClientRequestDetails.cpp:
+        * tao/PI/ClientRequestInfo.cpp:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp:
+        * tao/PI/ClientRequestInterceptor_Factory_Impl.cpp:
+        * tao/PI/DLL_Resident_ORB_Initializer.cpp:
+        * tao/PI/ORBInitInfo.cpp:
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
+        * tao/PI/PI.cpp:
+        * tao/PI/PICurrent.cpp:
+        * tao/PI/PICurrent_Impl.cpp:
+        * tao/PI/PICurrent_Loader.cpp:
+        * tao/PI/PI_ORBInitializer.cpp:
+        * tao/PI/PI_PolicyFactory.cpp:
+        * tao/PI/PolicyFactory_Loader.cpp:
+        * tao/PI/PolicyFactory_Registry.cpp:
+        * tao/PI/ProcessingModePolicy.cpp:
+        * tao/PI/RequestInfo_Util.cpp:
+        * tao/PI/RequestInterceptor_Adapter_Impl.cpp:
+        * tao/PI_Server/PICurrent_Guard.cpp:
+        * tao/PI_Server/PI_Server.cpp:
+        * tao/PI_Server/PI_Server_Loader.cpp:
+        * tao/PI_Server/PortableServer_ORBInitializer.cpp:
+        * tao/PI_Server/PortableServer_PolicyFactory.cpp:
+        * tao/PI_Server/ServerInterceptorAdapter.cpp:
+        * tao/PI_Server/ServerRequestDetails.cpp:
+        * tao/PI_Server/ServerRequestInfo.cpp:
+        * tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp:
+        * tao/Pluggable_Messaging_Utils.cpp:
+        * tao/PolicyFactory_Registry_Adapter.cpp:
+        * tao/PolicyFactory_Registry_Factory.cpp:
+        * tao/Policy_Current.cpp:
+        * tao/Policy_Manager.cpp:
+        * tao/Policy_Set.cpp:
+        * tao/Policy_Validator.cpp:
+        * tao/PortableServer/Acceptor_Filter_Factory.cpp:
+        * tao/PortableServer/Active_Object_Map.cpp:
+        * tao/PortableServer/Active_Object_Map_Entry.cpp:
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+        * tao/PortableServer/Adapter_Activator.cpp:
+        * tao/PortableServer/Collocated_Arguments_Converter.cpp:
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
+        * tao/PortableServer/Creation_Time.cpp:
+        * tao/PortableServer/Default_Acceptor_Filter.cpp:
+        * tao/PortableServer/Default_Policy_Validator.cpp:
+        * tao/PortableServer/Default_Servant_Dispatcher.cpp:
+        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp:
+        * tao/PortableServer/IdAssignmentPolicy.cpp:
+        * tao/PortableServer/IdAssignmentStrategy.cpp:
+        * tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp:
+        * tao/PortableServer/IdAssignmentStrategySystem.cpp:
+        * tao/PortableServer/IdAssignmentStrategyUser.cpp:
+        * tao/PortableServer/IdUniquenessPolicy.cpp:
+        * tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp:
+        * tao/PortableServer/IdUniquenessStrategyMultiple.cpp:
+        * tao/PortableServer/IdUniquenessStrategyUnique.cpp:
+        * tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp:
+        * tao/PortableServer/ImR_Client_Adapter.cpp:
+        * tao/PortableServer/ImplicitActivationPolicy.cpp:
+        * tao/PortableServer/ImplicitActivationStrategy.cpp:
+        * tao/PortableServer/ImplicitActivationStrategyExplicit.cpp:
+        * tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp:
+        * tao/PortableServer/ImplicitActivationStrategyImplicit.cpp:
+        * tao/PortableServer/Key_Adapters.cpp:
+        * tao/PortableServer/LifespanPolicy.cpp:
+        * tao/PortableServer/LifespanStrategy.cpp:
+        * tao/PortableServer/LifespanStrategyFactoryImpl.cpp:
+        * tao/PortableServer/LifespanStrategyPersistent.cpp:
+        * tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp:
+        * tao/PortableServer/LifespanStrategyTransient.cpp:
+        * tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp:
+        * tao/PortableServer/Local_Servant_Base.cpp:
+        * tao/PortableServer/Network_Priority_Hook.cpp:
+        * tao/PortableServer/Non_Servant_Upcall.cpp:
+        * tao/PortableServer/ORT_Adapter_Factory.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/Operation_Table.cpp:
+        * tao/PortableServer/Operation_Table_Binary_Search.cpp:
+        * tao/PortableServer/Operation_Table_Dynamic_Hash.cpp:
+        * tao/PortableServer/Operation_Table_Linear_Search.cpp:
+        * tao/PortableServer/Operation_Table_Perfect_Hash.cpp:
+        * tao/PortableServer/POAManager.cpp:
+        * tao/PortableServer/POAManagerFactory.cpp:
+        * tao/PortableServer/POA_Cached_Policies.cpp:
+        * tao/PortableServer/POA_Current.cpp:
+        * tao/PortableServer/POA_Current_Impl.cpp:
+        * tao/PortableServer/POA_Guard.h:
+        * tao/PortableServer/POA_Guard.cpp:
+        * tao/PortableServer/POA_Policy_Set.cpp:
+        * tao/PortableServer/PortableServer.cpp:
+        * tao/PortableServer/PortableServer_Functions.cpp:
+        * tao/PortableServer/PortableServer_WFunctions.cpp:
+        * tao/PortableServer/Regular_POA.cpp:
+        * tao/PortableServer/RequestProcessingPolicy.cpp:
+        * tao/PortableServer/RequestProcessingStrategy.cpp:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp:
+        * tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantManager.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/ServantRetentionPolicy.cpp:
+        * tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp:
+        * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp:
+        * tao/PortableServer/Servant_Base.cpp:
+        * tao/PortableServer/Servant_Dispatcher.cpp:
+        * tao/PortableServer/Servant_Upcall.cpp:
+        * tao/PortableServer/StrategyFactory.cpp:
+        * tao/PortableServer/ThreadPolicy.cpp:
+        * tao/PortableServer/ThreadStrategy.cpp:
+        * tao/PortableServer/ThreadStrategyFactoryImpl.cpp:
+        * tao/PortableServer/ThreadStrategyORBControl.cpp:
+        * tao/PortableServer/ThreadStrategySingle.cpp:
+        * tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp:
+        * tao/PortableServer/Upcall_Command.cpp:
+        * tao/PortableServer/Upcall_Wrapper.cpp:
+        * tao/Profile.cpp:
+        * tao/Protocol_Factory.cpp:
+        * tao/Protocols_Hooks.cpp:
+        * tao/QtResource/QtResource_Factory.cpp:
+        * tao/QtResource/QtResource_Loader.cpp:
+        * tao/Queued_Data.cpp:
+        * tao/Queued_Message.cpp:
+        * tao/RTCORBA/Continuous_Priority_Mapping.cpp:
+        * tao/RTCORBA/Direct_Priority_Mapping.cpp:
+        * tao/RTCORBA/Linear_Network_Priority_Mapping.cpp:
+        * tao/RTCORBA/Linear_Priority_Mapping.cpp:
+        * tao/RTCORBA/Multi_Priority_Mapping.cpp:
+        * tao/RTCORBA/Network_Priority_Mapping.cpp:
+        * tao/RTCORBA/Network_Priority_Mapping_Manager.cpp:
+        * tao/RTCORBA/Priority_Mapping.cpp:
+        * tao/RTCORBA/Priority_Mapping_Manager.cpp:
+        * tao/RTCORBA/RTCORBA.cpp:
+        * tao/RTCORBA/RT_Current.cpp:
+        * tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp:
+        * tao/RTCORBA/RT_Endpoint_Utils.cpp:
+        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp:
+        * tao/RTCORBA/RT_Mutex.cpp:
+        * tao/RTCORBA/RT_ORB.cpp:
+        * tao/RTCORBA/RT_ORBInitializer.cpp:
+        * tao/RTCORBA/RT_ORB_Loader.cpp:
+        * tao/RTCORBA/RT_PolicyFactory.cpp:
+        * tao/RTCORBA/RT_Policy_i.cpp:
+        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
+        * tao/RTCORBA/RT_Service_Context_Handler.cpp:
+        * tao/RTCORBA/RT_Stub.cpp:
+        * tao/RTCORBA/RT_Stub_Factory.cpp:
+        * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp:
+        * tao/RTCORBA/RT_Transport_Descriptor.cpp:
+        * tao/RTCORBA/RT_Transport_Descriptor_Property.cpp:
+        * tao/RTCORBA/Thread_Pool.cpp:
+        * tao/RTPortableServer/RTPortableServer.cpp:
+        * tao/RTPortableServer/RT_Acceptor_Filters.cpp:
+        * tao/RTPortableServer/RT_Collocation_Resolver.cpp:
+        * tao/RTPortableServer/RT_Object_Adapter_Factory.cpp:
+        * tao/RTPortableServer/RT_POA.cpp:
+        * tao/RTPortableServer/RT_Policy_Validator.cpp:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+        * tao/RTScheduling/Current.cpp:
+        * tao/RTScheduling/RTScheduler.cpp:
+        * tao/RTScheduling/RTScheduler_Initializer.cpp:
+        * tao/RTScheduling/RTScheduler_Loader.cpp:
+        * tao/RTScheduling/RTScheduler_Manager.cpp:
+        * tao/RTScheduling/Request_Interceptor.cpp:
+        * tao/Reactive_Connect_Strategy.cpp:
+        * tao/Reactive_Flushing_Strategy.cpp:
+        * tao/Refcounted_ObjectKey.cpp:
+        * tao/Remote_Invocation.cpp:
+        * tao/Remote_Object_Proxy_Broker.cpp:
+        * tao/Reply_Dispatcher.cpp:
+        * tao/RequestInterceptor_Adapter.cpp:
+        * tao/Request_Dispatcher.cpp:
+        * tao/Resource_Factory.cpp:
+        * tao/Resume_Handle.cpp:
+        * tao/ServerRequestInterceptor_Adapter.cpp:
+        * tao/ServerRequestInterceptor_Adapter_Factory.cpp:
+        * tao/Server_Strategy_Factory.cpp:
+        * tao/Service_Callbacks.cpp:
+        * tao/Service_Context.cpp:
+        * tao/Service_Context_Handler_Registry.cpp:
+        * tao/SmartProxies/Smart_Proxies.cpp:
+        * tao/Strategies/COIOP_Acceptor.cpp:
+        * tao/Strategies/COIOP_Connection_Handler.cpp:
+        * tao/Strategies/COIOP_Connector.cpp:
+        * tao/Strategies/COIOP_Endpoint.cpp:
+        * tao/Strategies/COIOP_Factory.cpp:
+        * tao/Strategies/COIOP_Profile.cpp:
+        * tao/Strategies/COIOP_Transport.cpp:
+        * tao/Strategies/DIOP_Acceptor.cpp:
+        * tao/Strategies/DIOP_Connection_Handler.cpp:
+        * tao/Strategies/DIOP_Connector.cpp:
+        * tao/Strategies/DIOP_Endpoint.cpp:
+        * tao/Strategies/DIOP_Factory.cpp:
+        * tao/Strategies/DIOP_Profile.cpp:
+        * tao/Strategies/DIOP_Transport.cpp:
+        * tao/Strategies/FIFO_Connection_Purging_Strategy.cpp:
+        * tao/Strategies/LFU_Connection_Purging_Strategy.cpp:
+        * tao/Strategies/LF_Strategy_Null.cpp:
+        * tao/Strategies/NULL_Connection_Purging_Strategy.cpp:
+        * tao/Strategies/OC_Endpoint_Selector_Factory.cpp:
+        * tao/Strategies/OC_Endpoint_Selector_Loader.cpp:
+        * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp:
+        * tao/Strategies/SCIOP_Acceptor.cpp:
+        * tao/Strategies/SCIOP_Connection_Handler.cpp:
+        * tao/Strategies/SCIOP_Connector.cpp:
+        * tao/Strategies/SCIOP_Endpoint.cpp:
+        * tao/Strategies/SCIOP_Factory.cpp:
+        * tao/Strategies/SCIOP_Profile.cpp:
+        * tao/Strategies/SCIOP_Transport.cpp:
+        * tao/Strategies/SHMIOP_Acceptor.cpp:
+        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
+        * tao/Strategies/SHMIOP_Connector.cpp:
+        * tao/Strategies/SHMIOP_Endpoint.cpp:
+        * tao/Strategies/SHMIOP_Factory.cpp:
+        * tao/Strategies/SHMIOP_Profile.cpp:
+        * tao/Strategies/SHMIOP_Transport.cpp:
+        * tao/Strategies/Strategies_ORBInitializer.cpp:
+        * tao/Strategies/UIOP_Acceptor.cpp:
+        * tao/Strategies/UIOP_Connection_Handler.cpp:
+        * tao/Strategies/UIOP_Connector.cpp:
+        * tao/Strategies/UIOP_Endpoint.cpp:
+        * tao/Strategies/UIOP_Factory.cpp:
+        * tao/Strategies/UIOP_Profile.cpp:
+        * tao/Strategies/UIOP_Transport.cpp:
+        * tao/Strategies/advanced_resource.cpp:
+        * tao/String_Alloc.cpp:
+        * tao/Stub.cpp:
+        * tao/Synch_Invocation.cpp:
+        * tao/Synch_Queued_Message.cpp:
+        * tao/Synch_Reply_Dispatcher.cpp:
+        * tao/SystemException.cpp:
+        * tao/TAO_Internal.cpp:
+        * tao/TAO_Singleton_Manager.cpp:
+        * tao/TSS_Resources.cpp:
+        * tao/Tagged_Components.cpp:
+        * tao/Tagged_Profile.cpp:
+        * tao/Thread_Lane_Resources.cpp:
+        * tao/Thread_Lane_Resources_Manager.cpp:
+        * tao/Thread_Per_Connection_Handler.cpp:
+        * tao/TkResource/TkResource_Factory.cpp:
+        * tao/TkResource/TkResource_Loader.cpp:
+        * tao/Transport.cpp:
+        * tao/TransportCurrent/Current_Loader.cpp:
+        * tao/TransportCurrent/IIOP_Current_Loader.cpp:
+        * tao/Transport_Cache_Manager_T.cpp:
+        * tao/Transport_Connector.cpp:
+        * tao/Transport_Descriptor_Interface.cpp:
+        * tao/Transport_Mux_Strategy.cpp:
+        * tao/TypeCodeFactory/Recursive_TypeCode.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+        * tao/TypeCodeFactory_Adapter.cpp:
+        * tao/UserException.cpp:
+        * tao/Utils/Implicit_Deactivator.cpp:
+        * tao/Utils/ORB_Destroyer.cpp:
+        * tao/Utils/ORB_Manager.cpp:
+        * tao/Utils/PolicyList_Destroyer.cpp:
+        * tao/Utils/Servant_Var.cpp:
+        * tao/Utils/Synch_Refcountable.cpp:
+        * tao/Valuetype_Adapter.cpp:
+        * tao/Valuetype_Adapter_Factory.cpp:
+        * tao/Wait_On_LF_No_Upcall.cpp:
+        * tao/Wait_On_Leader_Follower.cpp:
+        * tao/Wait_On_Reactor.cpp:
+        * tao/Wait_On_Read.cpp:
+        * tao/Wait_Strategy.cpp:
+        * tao/XtResource/XtResource_Factory.cpp:
+        * tao/XtResource/XtResource_Loader.cpp:
+        * tao/ZIOP/ZIOP.cpp:
+        * tao/ZIOP/ZIOP_ORBInitializer.cpp:
+        * tao/ZIOP/ZIOP_PolicyFactory.cpp:
+        * tao/ZIOP/ZIOP_Policy_Validator.cpp:
+        * tao/ZIOP/ZIOP_Policy_i.cpp:
+        * tao/ZIOP/ZIOP_Service_Context_Handler.cpp:
+        * tao/ZIOP/ZIOP_Stub.cpp:
+        * tao/ZIOP/ZIOP_Stub_Factory.cpp:
+        * tao/debug.cpp:
+        * tao/default_client.cpp:
+        * tao/default_resource.cpp:
+        * tao/default_server.cpp:
+        * tao/operation_details.cpp:
+        * tao/params.cpp:
+        * tao/target_specification.cpp:
+          Removed ACE_RCSID
+
+        * tests/Bug_1361_Regression/Server_Thread_Pool.cpp:
+          Initialise pointer with 0
+
+        * tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h:
+        * tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp:
+          Use ACE_Atomic_Op
+
+        * tests/CSD_Strategy_Tests/TP_Common/ClientTask.h:
+        * tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp:
+          Use ACE_GUARD
+
+        * tests/Faults/client.cpp:
+          Don't use ACE_UNUSED_ARG
+
+        * tests/Oneway_Send_Timeouts/Test_i.cpp:
+          Unicode fix
+
+Sat Sep 04 11:30:18 CEST 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 1.8.2 released.
+
+Wed Sep  1 11:43:33 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Connection_Handler.cpp:
+          Reverted my changes to show that the change in behaviour in the
+          Faults test is not related to this.
+
+Wed Sep  1 09:24:39 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/Transport.cpp:
+          Fixed compile warning on QNX. time_t on QNX is defined as unsigned
+          int.
+
+Tue Aug 31 16:36:53 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/driver/drv_preproc.cpp(DRV_sweep_dirs):
+
+          When adding the path as a -I argument, surrounded the path
+          name with quotes, in case there are spaces in the path
+          string stored from the command line. If there are no
+          spaces, the quotes do no harm. Thanks to
+          Catherine L. Paquin <catherine dot paquin at ngc dot com>
+          for reporting the problem.
+
+Mon Aug 30 15:07:23 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * tests/Bug_3632_Regression/Bug_3632_Regression.mpc:
+
+          Added an "after" so that parallel builds work correctly and the
+          generated makefiles achieve the author's presumed intent of running
+          the *idl project first.
+
+Mon Aug 30 14:55:33 UTC 2010  Brian Johnson  <johnsonb@ociweb.com>
+
+        * TAO_IDL/tao_idl.mpc:
+
+          Added postinstall commands to add symlinks to TAO_IDL_BE and
+          TAO_IDL_FE to the installed share/ace directory, so that
+          projects built on taobaseidldefaults.mpb (dependent_libs
+          on TAO_IDL_FE/BE) can build from a TAO install.(Bugzilla #3281)
+
+Mon Aug 30 10:00:45 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Valuetype/AbstractBase.h:
+        * tao/Valuetype/AbstractBase.inl:
+        * tao/Valuetype/AbstractBase_T.h:
+        * tao/Valuetype/AbstractBase_T.cpp:
+        * tao/Valuetype/ValueFactory.h:
+        * tao/Valuetype/Valuetype_Adapter_Impl.h:
+        * tao/Valuetype/Valuetype_Adapter_Impl.cpp:
+          Layout and const changes
+
+Mon Aug 30 07:44:17 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Connection_Handler.cpp:
+          Readded some code that I zapped by accident, this fixes the crashing
+          of the Faults test
+
+Fri Aug 27 19:09:02 UTC 2010  Brian Johnson  <johnsonb@ociweb.com>
+
+        * MPC/config/taobaseidldefaults.mpb:
+
+          Merged dependent_libs change from TAO 1.5a to cause idl files
+          to be rebuilt when tao_idl's dynamically linked libraries are
+          rebuilt.(Bugzilla #3281)
+
+Fri Aug 27 18:06:56 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Connection_Handler.h:
+        * tao/Connection_Handler.cpp:
+          Thinking more about this, we don't need a mutex here
+
+Fri Aug 27 14:57:20 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Trader/Locking.h:
+          Removed this file.
+
+Fri Aug 27 14:33:01 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Notify/Admin.cpp:
+        * orbsvcs/orbsvcs/Notify/AdminProperties.cpp:
+
+        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp:
+
+        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp:
+        * orbsvcs/orbsvcs/Notify/Builder.cpp:
+        * orbsvcs/orbsvcs/Notify/Consumer.cpp:
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp:
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp:
+        * orbsvcs/orbsvcs/Notify/Default_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp:
+        * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp:
+        * orbsvcs/orbsvcs/Notify/Event.cpp:
+        * orbsvcs/orbsvcs/Notify/EventChannel.cpp:
+        * orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp:
+        * orbsvcs/orbsvcs/Notify/EventType.cpp:
+        * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp:
+        * orbsvcs/orbsvcs/Notify/Event_Manager.cpp:
+        * orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/FilterAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/ID_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/Object.cpp:
+        * orbsvcs/orbsvcs/Notify/POA_Helper.cpp:
+        * orbsvcs/orbsvcs/Notify/Peer.cpp:
+        * orbsvcs/orbsvcs/Notify/Properties.cpp:
+        * orbsvcs/orbsvcs/Notify/PropertySeq.cpp:
+        * orbsvcs/orbsvcs/Notify/Property_Boolean.cpp:
+        * orbsvcs/orbsvcs/Notify/Property_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Proxy.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/QoSProperties.cpp:
+        * orbsvcs/orbsvcs/Notify/RT_Builder.cpp:
+        * orbsvcs/orbsvcs/Notify/RT_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp:
+        * orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp:
+        * orbsvcs/orbsvcs/Notify/RT_Properties.cpp:
+        * orbsvcs/orbsvcs/Notify/Reactive_Task.cpp:
+        * orbsvcs/orbsvcs/Notify/Refcountable.cpp:
+        * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip.h:
+
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp:
+
+        * orbsvcs/orbsvcs/Notify/Service.cpp:
+
+        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp:
+
+        * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp:
+        * orbsvcs/orbsvcs/Notify/Supplier.cpp:
+        * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp:
+        * orbsvcs/orbsvcs/Notify/Timer_Queue.cpp:
+        * orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp:
+        * orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp:
+        * orbsvcs/orbsvcs/Notify/Worker_Task.cpp:
+          Zapped RCSID
+
+        * performance-tests/CSD_Strategy/TestInf/AppShutdown.h:
+        * performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp:
+        * performance-tests/CSD_Strategy/TestInf/ClientTask.h:
+        * performance-tests/CSD_Strategy/TestInf/ClientTask.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Task.h:
+          Guard changes
+
+Fri Aug 27 12:50:13 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Notify/Refcountable.cpp:
+        * examples/Advanced/ch_21/server.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp:
+        * orbsvcs/orbsvcs/Notify/Consumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp:
+        * orbsvcs/orbsvcs/Notify/Random_File.cpp:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip.cpp:
+        * orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp:
+        * orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp:
+        * orbsvcs/tests/Bug_2925_Regression/client.cpp:
+        * tao/Transport.cpp:
+        * tests/Bug_1254_Regression/Bug_1254_Regression.mpc:
+        * tests/Bug_2417_Regression/publisher_impl.cpp:
+        * tests/Bug_2654_Regression/Bug_2654_Regression.mpc:
+        * tests/Bug_2654_Regression/Hello.h:
+        * tests/Bug_2654_Regression/Hello.idl:
+        * tests/Bug_2654_Regression/Hello.cpp:
+        * tests/Bug_2654_Regression/client.cpp:
+        * tests/Bug_2654_Regression/server.cpp:
+        * tests/Bug_3531_Regression/test_i.cpp:
+        * tests/Bug_3812_Regression/Bug_3812_Regression.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc:
+        * tests/Optimized_Connection/Optimized_Connection.mpc:
+        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
+          Use ACE_GUARD macro, use %B for logging a size_t, layout and cleanup
+
+Fri Aug 27 12:22:35 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Connection_Handler.h:
+        * tao/Connection_Handler.inl:
+        * tao/Connection_Handler.cpp:
+          Added a mutex to guard that we only close once, this fixes bugzilla
+          3658
+
+        * tao/Transport.cpp:
+          Fixed debug message
+
+Fri Aug 27 11:38:42 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/tao_cosevent.doxygen:
+          Corrected output directory tag file
+
+Fri Aug 27 08:16:20 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/tao.mpc:
+          Removed zapped file
+
+        * tests/Portable_Interceptors/Dynamic/client_interceptor.cpp:
+        * tao/TransportCurrent/Current_Impl.cpp:
+          Layout changes
+
+Fri Aug 27 06:57:04 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/tao_anytypecode.doxygen:
+        * etc/tao_av.doxygen:
+        * etc/tao_cosevent.doxygen:
+        * etc/tao_cosnotification.doxygen:
+        * etc/tao_costrader.doxygen:
+        * etc/tao_portablegroup.doxygen:
+        * etc/tao_rtevent.doxygen:
+        * etc/tao_security.doxygen:
+        * etc/tao_ssliop.doxygen:
+          Fuzz fixes
+
+Thu Aug 26 16:02:12 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * MPC/config/notifytest.mpb:
+
+          Reverted the change from
+          Fri Aug 20 20:06:05 UTC 2010  Adam Mitz  <mitza at ociweb dot com>
+          because it causes the "make install" builds to fail.  We will have
+          to live with a warning from some linker for now.  Real fix to follow.
+
+Thu Aug 26 14:54:25 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+          Slightly changed the dds traits
+
+        * tests/MProfile_Connection_Timeout/test_i.cpp:
+          Removed rcsid
+
+Thu Aug 26 13:44:36 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/Dump_Schedule/Dump_Schedule.cpp:
+        * orbsvcs/Event_Service/Event_Service.cpp:
+        * orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp:
+        * tests/AMH_Exceptions/client.cpp:
+        * tests/AMH_Exceptions/server.cpp:
+        * tests/Abstract_Interface/client.cpp:
+        * tests/Abstract_Interface/server.cpp:
+        * tests/Abstract_Interface/test_i.h:
+        * tests/Abstract_Interface/test_i.cpp:
+        * tests/Alt_Mapping/options.cpp:
+        * tests/Bug_2677_Regression/DllORB.cpp:
+        * tests/Bug_2936_Regression/DllORB.cpp:
+        * tests/Bug_2966_Regression/Hello.cpp:
+        * tests/Bug_2966_Regression/client.cpp:
+        * tests/Bug_2966_Regression/server.cpp:
+        * tests/Bug_3251_Regression/DllOrb.cpp:
+        * tests/Bug_3524_Regression/client.cpp:
+        * tests/Bug_3524_Regression/server.cpp:
+        * tests/Bug_3524_Regression/test_i.cpp:
+        * tests/Bug_3542_Regression/DllOrb.cpp:
+        * tests/Bug_3647_Regression/Backend_Impl.cpp:
+        * tests/Bug_3647_Regression/Middle_Impl.cpp:
+        * tests/Bug_3647_Regression/backend_server.cpp:
+        * tests/Bug_3647_Regression/client.cpp:
+        * tests/Bug_3647_Regression/middle_server.cpp:
+        * tests/COIOP/Client_Task.cpp:
+        * tests/COIOP/Hello.cpp:
+        * tests/COIOP/Server_Task.cpp:
+        * tests/MProfile_Connection_Timeout/client.cpp:
+        * tests/MProfile_Connection_Timeout/server.cpp:
+        * tests/OctetSeq/OctetSeq.cpp:
+        * tests/OctetSeq/client.cpp:
+        * tests/OctetSeq/server.cpp:
+        * tests/OctetSeq/test_i.cpp:
+        * tests/POA/Default_Servant/Default_Servant.cpp:
+        * tests/Param_Test/ub_struct_seq.cpp:
+        * tests/TransportCurrent/Framework/Current_Test_Impl.cpp:
+        * tests/TransportCurrent/Framework/Server_Main.cpp:
+        * tests/TransportCurrent/Framework/Tester.cpp:
+        * tests/TransportCurrent/Framework/server.cpp:
+        * tests/TransportCurrent/Framework/simple.cpp:
+        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
+        * tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp:
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
+        * tests/TransportCurrent/IIOP/client.cpp:
+        * tests/TransportCurrent/IIOP/server.cpp:
+        * tests/TransportCurrent/lib/Client_ORBInitializer.cpp:
+        * tests/TransportCurrent/lib/Client_Request_Interceptor.cpp:
+        * tests/TransportCurrent/lib/Current_Test.idl:
+        * tests/TransportCurrent/lib/Server_ORBInitializer.cpp:
+        * tests/TransportCurrent/lib/Server_Request_Interceptor.cpp:
+          Various cleanup
+
+        * tao/Utils/Auto_Functor.h:
+        * tao/Auto_Functor.h:
+          Removed this file, use the ACE file
+
+Thu Aug 26 13:39:29 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CORBANAME_Parser.cpp:
+        * tao/Cache_Entries_T.cpp:
+        * tao/CodecFactory/CDR_Encaps_Codec.cpp:
+        * tao/CodecFactory/CodecFactory.cpp:
+        * tao/CodecFactory/CodecFactory_impl.cpp:
+        * tao/Codeset/Codeset.cpp:
+        * tao/Codeset/Codeset_Descriptor.cpp:
+        * tao/Codeset/Codeset_Manager_Factory.cpp:
+        * tao/Codeset/Codeset_Manager_i.cpp:
+        * tao/Codeset/Codeset_Service_Context_Handler.cpp:
+        * tao/Codeset/Codeset_Translator_Factory.cpp:
+        * tao/Codeset/UTF16_BOM_Translator.cpp:
+        * tao/Connect_Strategy.cpp:
+        * tao/Connection_Handler.cpp:
+        * tao/Default_Stub_Factory.cpp:
+        * tao/FlResource/FlResource_Factory.cpp:
+        * tao/FlResource/FlResource_Loader.cpp:
+        * tao/GIOP_Message_Generator_Parser.cpp:
+        * tao/GIOP_Message_Generator_Parser_10.cpp:
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/IIOP_Factory.cpp:
+        * tao/IORInterceptor/IORInfo.cpp:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
+        * tao/IORInterceptor/IORInterceptor_Details.cpp:
+        * tao/Invocation_Adapter.cpp:
+        * tao/LF_Event_Loop_Thread_Helper.cpp:
+        * tao/LF_Follower_Auto_Ptr.cpp:
+        * tao/LocateRequest_Invocation.cpp:
+        * tao/LocateRequest_Invocation_Adapter.cpp:
+        * tao/New_Leader_Generator.cpp:
+        * tao/Parser_Registry.cpp:
+        * tao/Policy_Current_Impl.cpp:
+        * tao/Profile_Transport_Resolver.cpp:
+        * tao/Service_Context_Handler.cpp:
+        * tao/Services_Activate.cpp:
+        * tao/Stub_Factory.cpp:
+        * tao/TAO_Server_Request.cpp:
+        * tao/Transport_Acceptor.cpp:
+        * tao/Transport_Queueing_Strategies.cpp:
+        * tao/Transport_Selection_Guard.cpp:
+        * tao/Transport_Timer.cpp:
+        * tao/Valuetype/AbstractBase_Invocation_Adapter.cpp:
+        * tao/Valuetype/ValueBase.cpp:
+        * tao/Valuetype/ValueFactory.cpp:
+        * tao/Valuetype/ValueFactory_Map.cpp:
+        * tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp:
+        * tao/Valuetype/Valuetype_Adapter_Impl.cpp:
+          Zap ACE_RCSID
+
+Thu Aug 26 13:03:25 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/tao.doxygen:
+        * etc/tao_anytypecode.doxygen:
+        * etc/tao_av.doxygen:
+        * etc/tao_compression.doxygen:
+        * etc/tao_cosevent.doxygen:
+        * etc/tao_cosnaming.doxygen:
+        * etc/tao_cosnotification.doxygen:
+        * etc/tao_costime.doxygen:
+        * etc/tao_costrader.doxygen:
+        * etc/tao_dynamicany.doxygen:
+        * etc/tao_dynamicinterface.doxygen:
+        * etc/tao_esf.doxygen:
+        * etc/tao_ifr.doxygen:
+        * etc/tao_implrepo.doxygen:
+        * etc/tao_iormanip.doxygen:
+        * etc/tao_iortable.doxygen:
+        * etc/tao_pi.doxygen:
+        * etc/tao_pi_server.doxygen:
+        * etc/tao_portablegroup.doxygen:
+        * etc/tao_portableserver.doxygen:
+        * etc/tao_pss.doxygen:
+        * etc/tao_rtcorba.doxygen:
+        * etc/tao_rtevent.doxygen:
+        * etc/tao_rtportableserver.doxygen:
+        * etc/tao_security.doxygen:
+        * etc/tao_smartproxies.doxygen:
+        * etc/tao_ssliop.doxygen:
+        * etc/tao_strategies.doxygen:
+        * etc/tao_transportcurrent.doxygen:
+        * etc/tao_ziop.doxygen:
+          Changed documentation subdirectories to make debian packaging easier
+
+Wed Aug 25 13:25:41 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * orbsvcs/orbsvcs/Event_Utilities.h:
+        * orbsvcs/orbsvcs/Event_Utilities.cpp:
+          Selected changes from patches in Bugzilla 3652.
+
+Tue Aug 24 14:26:36 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * interop-tests/wchar/client.cpp:
+        * interop-tests/wchar/interop_wchar_i.cpp:
+        * interop-tests/wchar/server.cpp:
+          Layout changes and no need to convert to wchar
+
+        * tao/Adapter_Registry.h:
+        * tao/Condition.h:
+        * tao/Connection_Handler.h:
+        * tao/TAO_Singleton.h:
+          Use ACE_Copy_Disabled
+
+        * tao/Connector_Impl.cpp:
+          Layout changes
+
+Tue Aug 24 14:20:19 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/LocalObject.h:
+          Reverted change from yesterday, apps using TAO will rely on the
+          version macros to determine the LocalObject refcounting.
+
+Tue Aug 24 09:09:41 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/IIOP_Acceptor.cpp:
+          Removed superfluous safety check.
+
+Tue Aug 24 08:45:41 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/Connection_Handler.h:
+        * tao/GIOP_Message_Base.cpp:
+        * tao/Transport_Connector.cpp:
+        * tao/IIOP_Acceptor.cpp:
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/Connection_Handler.cpp:
+        * tao/Transport.cpp:
+          First set of selected implementations from patches in Bugzilla
+          3652.
+
+Mon Aug 23 19:37:45 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tao/PortableServer/Active_Object_Map.cpp:
+
+          Fixed path to debug.h
+
+Mon Aug 23 15:55:50 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/LocalObject.h:
+
+          Added a preprocessor macro that allows applications to determine
+          whether or not this version of TAO always reference-counts its
+          local objects.
+
+Mon Aug 23 14:54:46 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/tests/Security/BiDirectional/ssl/ca.pem:
+        * orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem:
+        * orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem:
+        * orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem:
+        * orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem:
+
+          Updated certificates that are set to expire soon.
+
+Mon Aug 23 09:38:41 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/PortableServer/Active_Object_Map.cpp:
+          Implements patches from Bugzilla 3655 (with changes).
+
+Mon Aug 23 09:31:41 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/Transport_Cache_Manager_T.inl:
+          Fuzz fix.
+
+Fri Aug 20 20:06:05 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * MPC/config/notifytest.mpb:
+
+          Changed the libpaths and includes back to paths starting with
+          $(TAO_ROOT) as they were before
+          Tue May 18 21:42:49 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+Fri Aug 20 14:44:41 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/Transport_Cache_Manager_T.inl:
+        * tao/Transport_Cache_Manager_T.cpp:
+          Moved check for null entry outside lock.
+          Optimization. Resolves Bugzilla #3659.
+
+Thu Aug 19 10:11:41 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/idltocpp0x/IDLC++0xRFP.odt:
+          Updated draft
+
+        * tao/LocalObject.h:
+        * tao/LocalObject.inl:
+          Removed TAO_Local_Refcounted_Object, it is deprecated for years now
+
+        * tao/Objref_VarOut_T.h:
+          Doxygen changes
+
+Wed Aug 18 18:10:21 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_component/context_svh.cpp:
+        * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+
+          Removed generation of the context servants's _narrow()
+          method, it doesn't appear to be needed any more.
+
+Wed Aug 18 17:14:05 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_component/context_svh.cpp:
+
+          Cosmetic changes.
+
+        * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+
+          Modified generated _narrow() method for contexts, to
+          increment the refcount, as with all other _narrow()
+          methods.
+
+Wed Aug 18 15:04:49 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_root.cpp(destroy):
+
+          Removed unused local variable.
+
+Wed Aug 18 14:05:20 UTC 2010  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Root_POA.h:
+        * tao/PortableServer/ServantRetentionStrategy.h:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.h:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetain.h:
+        Fix bugzilla 3654: Add Active Object Map accessor patches
+
+Tue Aug 17 18:47:23 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_root.cpp:
+
+          Fixed bug in cleanup of root scope when TAO_IDL processes
+          multiple files in one execution. Thanks to Olli Savia
+          <ops@iki.fi> for reporting the problem.
+
+Tue Aug 17 18:33:20 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp:
+          Instead of calling delete on the ami4ccm facet, release it
+
+Tue Aug 17 10:56:02 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * tao/AnyTypeCode/TypeCode.inl:
+        * tao/Object.h:
+        * tao/Object.inl:
+          Modified template specializations to work with older GCCs.
+
+Tue Aug 17 08:49:29 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/idltocpp0x/IDLC++0xRFP.odt:
+          First initial commit, much more has to be done to get this draft RFP
+          ready
+
+        * tao/IIOP_Connector.cpp:
+        * tests/TransportCurrent/IIOP/IIOP_Tester.cpp:
+          Layout changes
+
+        * tests/POA/On_Demand_Activation/Servant_Activator.cpp:
+          Boolean now maps to bool
+
+        * tests/TransportCurrent/IIOP/run_test.pl:
+          Removed obsolete helper method
+
+Mon Aug 16 09:09:51 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp:
+          Generate missing _duplicate call
+
+Fri Aug 13 13:48:03 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/IFR_Service/makefile.am:
+
+          Updated with new file in TAO_IFR_BE.
+
+Wed Aug 11 20:49:43 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/tao.mpc:
+
+          install orb.idl.
+
+Tue Aug 10 17:46:16 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/fe_init.cpp(fe_populate_global_scope):
+
+          Put "omg.org" on the pragma prefix stack temporarily
+          so it will be applied when creating CORBA module
+          and its contents.
+
+Tue Aug 10 12:24:31 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/IDL_Test/included.idl:
+
+          Cosmetic changes.
+
+Mon Aug  9 17:06:41 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_redef.cpp:
+        * TAO_IDL/Makefile.am:
+
+          Removed the source file, since its only
+          method has been moved rewritten in
+          class FE_Utils, and updated the automake
+          file.
+
+        * TAO_IDL/include/fe_utils.h:
+        * TAO_IDL/include/utl_scope_T.cpp:
+        * TAO_IDL/include/global_extern.h:
+        * TAO_IDL/ast/ast_module.cpp:
+        * TAO_IDL/ast/ast_enum.cpp:
+        * TAO_IDL/fe/fe_utils.cpp:
+        * TAO_IDL/util/utl_scope.cpp:
+
+          Rewrote the formerly global method
+          can_be_redefined() in class FE_Utils,
+          and rerouted all calls to the new version.
+          This change fixes some redefinition bugs
+          that were introduced in x.8.1, thanks to
+          Robert Shectman <shectman at llnl dot gov> for
+          reporting the problem.
+
+        * tests/IDL_Test/interface.idl:
+
+          Added test cases for the above change.
+
+Mon Aug  9 13:13:21 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/tests/InterfaceRepo/Bug_3883_Regression/test.idl:
+
+          Added id string.
+
+Sun Aug  8 21:10:30 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_enum.cpp:
+        * TAO_IDL/be/be_visitor_enum/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception.cpp:
+        * TAO_IDL/be/be_visitor_exception/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence.cpp:
+        * TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure.cpp:
+        * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union.cpp:
+        * TAO_IDL/be/be_visitor_union/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
+        * tao/AnyTypeCode/Any.h:
+        * tao/AnyTypeCode/Any.inl:
+        * tao/AnyTypeCode/Any.cpp:
+        * tao/AnyTypeCode/ExceptionA.h:
+        * tao/AnyTypeCode/ExceptionA.cpp:
+        * tao/AnyTypeCode/PolicyA.h:
+        * tao/AnyTypeCode/PolicyA.cpp:
+        * tao/AnyTypeCode/WrongTransactionA.h:
+        * tao/AnyTypeCode/WrongTransactionA.cpp:
+
+          Expanded use of the ACE_ANY_OPS_USE_NAMESPACE macro for compilers that
+          implement strict argument dependent lookup, especially for overloaded
+          operators.
+
+        * tao/DynamicAny/DynCommon.cpp:
+        * tao/Messaging/Buffering_Constraint_Policy.cpp:
+        * tao/RTCORBA/RT_ProtocolPropertiesA.cpp:
+        * tao/orbconf.h:
+
+          Various compile fixes for the Clang LLVM compiler.
+
+Fri Aug  6 20:24:47 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_component.cpp:
+        * TAO_IDL/be/be_visitor_home.cpp:
+        * TAO_IDL/be_include/be_visitor_home.h:
+
+          Removed unnecessary includes.
+
+Fri Aug  6 20:18:12 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_home/home_ch.cpp:
+        * TAO_IDL/be/be_visitor_home/home_cs.cpp:
+        * TAO_IDL/be_include/be_visitor_home/home_cs.h:
+        * TAO_IDL/be_include/be_visitor_home/home_ch.h:
+
+          Removed these visitors, their functionality has
+          been subsumed by the corresponding interface
+          visitors.
+
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_home.cpp:
+        * TAO_IDL/be/be_visitor_module/module.cpp:
+        * TAO_IDL/be_include/be_visitor_home.h:
+
+          Changes related to the visitor removal described
+          above.
+
+Fri Aug  6 18:57:50 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_component/component_ss.cpp:
+        * TAO_IDL/be/be_visitor_component/component_sh.cpp:
+        * TAO_IDL/be/be_visitor_component/component_si.cpp:
+        * 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/component_ss.h:
+
+          Removed these visitors, their functions are now taken
+          over by the corresponding interface visitors.
+
+        * TAO_IDL/be/be_visitor_component.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_ss.cpp:
+        * TAO_IDL/be/be_component.cpp:
+        * TAO_IDL/be/be_visitor_component/component.cpp:
+        * TAO_IDL/be/be_visitor_module/module.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be_include/be_interface.h:
+        * TAO_IDL/be_include/be_component.h:
+        * TAO_IDL/be_include/be_visitor_interface/interface_sh.h:
+        * TAO_IDL/be_include/be_visitor_interface/interface_si.h:
+        * TAO_IDL/be_include/be_visitor_interface/interface_ss.h:
+        * TAO_IDL/be_include/be_visitor_component.h:
+
+          - Refactored code from component and interface skeleton
+            visitors, to facilitate the removal of the former,
+            as described above.
+
+          - Formatted ACE_ERROR macros to use ACE_TEXT.
+
+          - Cosmetic changes.
+
+Fri Aug  6 14:43:26 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * bin/tao_other_tests.lst:
+
+          Added new test below.
+
+Fri Aug  6 14:35:45 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/*.*:
+
+          New test, consisiting of IDL file and perl script, to
+          check for reintroduction of [BUGID:3881].
+
+Fri Aug  6 13:42:39 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp(valid_creation):
+
+          Skipped call to pre_exist() check if the new entry represents
+          an IDL module, since modules may be reopened. This bug (reported
+          by Bogdan Jeram <bjeram at eso dot org>) was somehow
+          reintroduced since 1.7.8. This fix handles any reopened
+          module, and closes [BUGID:3881].
+
+Thu Aug  5 13:25:00 UTC 2010  Build CZar  <buildczar at prismtech dot com>
+
+        * tao/Valuetype/AbstractBase.h:
+
+          Removed hard-coded 'inline' from declaration of _decr_refcount().
+
+Wed Aug  4 20:52:39 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_util.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be_include/be_global.h:
+
+          New IDL compiler option -Sg, which disables the generation of
+          unique extensions on header file preprocessor guards. These
+          changes are from a patch supplied by Bogdan Jeram
+          <bjeram at eso dot org>, and close [BUGID:3867].
+
+        * docs/compiler.html:
+
+          Updated IDL compiler options table.
+
+Wed Aug  4 19:24:15 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/rtcosscheduling.mpb:
+        * orbsvcs/orbsvcs/RTCosScheduling:
+        * orbsvcs/orbsvcs/RTCosScheduling.idl:
+        * orbsvcs/orbsvcs/RTCosScheduling.mpc:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.inl:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.inl:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_export.h:
+        * orbsvcs/tests/RTCosScheduling:
+        * orbsvcs/tests/RTCosScheduling/Object1_i.h:
+        * orbsvcs/tests/RTCosScheduling/Object1_i.cpp:
+        * orbsvcs/tests/RTCosScheduling/README:
+        * orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc:
+        * orbsvcs/tests/RTCosScheduling/client.cpp:
+        * orbsvcs/tests/RTCosScheduling/run_test.pl:
+        * orbsvcs/tests/RTCosScheduling/schedule.cfg:
+        * orbsvcs/tests/RTCosScheduling/server.ior:
+        * orbsvcs/tests/RTCosScheduling/server.cpp:
+        * orbsvcs/tests/RTCosScheduling/svc.conf:
+        * orbsvcs/tests/RTCosScheduling/testSched.idl:
+        * orbsvcs/tests/RTCosScheduling/testSched_export.h:
+          Removed these files, RTCosScheduling got disabled with a dummy label
+          5 years ago because it used a non portable way to register
+          interceptors and in those 5 years nobody complained about this
+
+Wed Aug  4 17:54:39 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * test//Bug_3672_Regression/client.cpp:
+
+          Changed call orb->_decr_refcnt() to new name _decr_refcount().
+
+        * TAO_IDL/be/be_visitor_argument/invoke_cs.cpp:
+        * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp:
+
+          Removed unused local variable and commented out code.
+
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+
+          In the generated marshal() operation, added generation of
+          /*. . .*/ guards around the 'cdr' parameter if the
+          interface is local and parameter is not used.
+
+        * tao/Object.h:
+
+          Removed hard-coded 'inline' from declaration of _decr_refcount().
+
+Wed Aug  4 14:48:11 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/tao.mpc:
+
+          orb.idl is not a Template_File.  Adding it to that list causes
+          uninteded side-effects that produce an unusable project with vc10.
+          Moved it to the PIDL_Files so that it will continue to not be
+          compiled by tao_idl.
+
+Wed Aug  4 14:43:14 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Notify/XML_Loader.h:
+        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp:
+          Fixed compile errors
+
+Wed Aug  4 13:10:21 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * tao/SystemException.cpp:
+          Renamed TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING to
+          TAO_SUPPRESS_NEW_LINE_IN_EXCEPTION_LOGGING.
+
+Wed Aug  4 12:21:58 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * tao/SystemException.cpp:
+          Added TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING define. When set,
+          no newline character will occur in the exception logging and therefor
+          all logging will appear on one line.
+
+Wed Aug  4 08:41:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
+          Fixed compile errors
+
+Tue Aug  3 14:48:42 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Environment.cpp:
+
+          Added Id string.
+
+        * tao/Object.inl:
+        * tao/Valuetype/AbstractBase.inl:
+
+          Replace 'inline' with 'ACE_INLINE'.
+
+        * TAO_IDL/be/be_visitor_argument/argument.cpp:
+
+          Added missing final newline.
+
+Tue Aug  3 14:17:23 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tests/Exposed_Policies/Policy_Verifier.cpp:
+          Fixed memory leaks.
+
+Tue Aug  3 13:59:58 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * 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/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_cs.cpp:
+        * TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp:
+        * 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/component_ch.h:
+        * TAO_IDL/be_include/be_visitor_component/component_ci.h:
+        * TAO_IDL/be_include/be_visitor_component/cdr_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_component/component_cs.h:
+
+          Removed these files, the contained visitors are now
+          replaced in the traversal by the corresponding interface
+          visitor.
+
+        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
+        * TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp:
+        * TAO_IDL/be/be_visitor_argument/invoke_cs.cpp:
+        * TAO_IDL/be/be_visitor_argument/argument.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/marshal_ss.cpp:
+        * TAO_IDL/be/be_visitor_component.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
+        * TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/any_op_ch.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/sequence_cs.cpp:
+        * TAO_IDL/be/be_type.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
+        * TAO_IDL/be/be_component.cpp:
+        * TAO_IDL/be/be_visitor_interface.cpp:
+        * TAO_IDL/be/be_visitor_module/module.cpp:
+        * TAO_IDL/be/be_visitor_union/union_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/structure_ch.cpp:
+        * TAO_IDL/be/be_extended_port.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be_include/be_interface.h:
+        * TAO_IDL/be_include/be_component.h:
+        * TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h:
+        * TAO_IDL/be_include/be_visitor_argument/argument.h:
+        * TAO_IDL/be_include/be_type.h:
+        * TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h:
+        * TAO_IDL/be_include/be_visitor_interface/any_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_interface/interface.h:
+        * TAO_IDL/be_include/be_visitor_interface/any_op_cs.h:
+        * TAO_IDL/be_include/be_visitor_interface/interface_ch.h:
+        * TAO_IDL/be_include/be_visitor_interface/interface_ci.h:
+        * TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_interface/interface_cs.h:
+        * TAO_IDL/be_include/be_visitor_component_scope.h:
+        * TAO_IDL/be_include/be_visitor_interface.h:
+        * TAO_IDL/be_include/be_visitor_component.h:
+
+          - Factored common stub header file code generation into
+            a method in class be_type.
+
+          - Abstracted differences in stub code generation between
+            interfaces and components into methods on the
+            corresponding node classes.
+
+          - Replaced calls to component visitors for stub, cdr op
+            and any op generation with the corresponding interface
+            visitors.
+
+        * tao/Object.inl:
+        * tao/AnyTypeCode/TypeCode.cpp:
+        * tao/AnyTypeCode/AnyTypeCode_methods.h:
+        * tao/AnyTypeCode/TypeCode.inl:
+        * tao/AnyTypeCode/NVList.h:
+        * tao/AnyTypeCode/NVList.cpp:
+        * tao/AnyTypeCode/NVList.inl:
+        * tao/Adapter.h:
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
+        * tao/ZIOP_Adapter.cpp:
+        * tao/Unbounded_Sequence_CDR_T.h:
+        * tao/DynamicInterface/ExceptionList.h:
+        * tao/DynamicInterface/Server_Request.h:
+        * tao/DynamicInterface/Context.h:
+        * tao/DynamicInterface/ExceptionList.cpp:
+        * tao/DynamicInterface/ExceptionList.inl:
+        * tao/DynamicInterface/Request.h:
+        * tao/DynamicInterface/DII_CORBA_methods.h:
+        * tao/DynamicInterface/Dynamic_Adapter_Impl.cpp:
+        * tao/DynamicInterface/Server_Request.inl:
+        * tao/DynamicInterface/Server_Request.cpp:
+        * tao/DynamicInterface/Context.cpp:
+        * tao/DynamicInterface/Context.inl:
+        * tao/DynamicInterface/Request.inl:
+        * tao/DynamicInterface/Request.cpp:
+        * tao/CORBA_methods.h:
+        * tao/Environment.h:
+        * tao/ORB.h:
+        * tao/Environment.cpp:
+        * tao/Object.h:
+        * tao/IORManipulation/IORManip_Filter.h:
+        * tao/Principal.cpp:
+        * tao/Principal.h:
+        * tao/Valuetype/AbstractBase.h:
+        * tao/Valuetype/AbstractBase.inl:
+        * tao/Valuetype/AbstractBase.cpp:
+        * tao/Valuetype/Value_CORBA_methods.h:
+        * tao/Object.cpp::
+        * tao/ORB.inl
+        * tao/Environment.inl:
+        * tao/Principal.inl:
+
+          Made CORBA::is_nil() and CORBA::release() into
+          template functions, and removed all the overloads.
+          This fix closes [BUGID:3854].
+
+Tue Aug  3 12:07:11 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/taodefaults.mpb:
+          Removed exceptions as base, we are removing non exception support
+
+        * tao/Acceptor_Registry.cpp:
+          Removed not needed include
+
+        * tao/CORBALOC_Parser.h:
+          Updated include base ace/Array.h will be removed soon
+
+Sun Aug  1 18:16:59 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * NEWS:
+          Updated for next release
+
+Sun Aug 01 11:30:54 CEST 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 1.8.1 released.
+
+Wed Jul 28 13:34:11 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * NEWS:
+
+          Updated with IDL compiler changes.
+
+Tue Jul 27 20:00:14 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/driver/drv_args.cpp:
+        * TAO_IDL/util/utl_err.cpp:
+        * TAO_IDL/util/utl_global.cpp:
+        * TAO_IDL/include/idl_global.h:
+
+          Modified IDL compiler handling of anonymous types.
+          Default is now silence, or no output. IDL_ANON_ERROR,
+          IDL_ANON_WARNING, or IDL_ANON_SILENT may be defined
+          in config.h to select global behavior of outputting
+          error, warning or nothing respectively. The command
+          line options -ae (error), -aw (warning) or -as
+          (silent) may be used to override this behavior
+          locally.
+
+        * MPC/config/idl_anon_error.mpb:
+        * MPC/config/idl_anon_warning.mpb:
+        * MPC/config/idl_anon_silent.mpb:
+
+          New base project files, which simply add -ae, -aw
+          or -as, respectively, to the IDL compiler command
+          line.
+
+        * docs/compiler.html:
+
+          Updated IDL compiler documentation.
+
+        * tests/IDL_Test/IDL_Test.mpc:
+
+          Removed -as option from project, it is now the default
+          behavior.
+
+Tue Jul 27 11:51:25 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/CSD_Strategy/ThreadPool5/Foo.idl:
+        * examples/Logging/Logger.idl:
+        * tests/DII_Collocation_Tests/oneway/Test.idl:
+
+          Removed anonymous constructs from test IDL and modified
+          test code accordingly.
+
+Sat Jul 24 20:41:24 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/util/utl_global.cpp:
+          For the moment make -as the default, that should resolve a lot of
+          issues on the scoreboard and makes it possible to resolve the fallout
+          seperately and get a feeling on the current repo status
+
+Sat Jul 24 07:35:12 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/OBV/ValueBox/vb_struct.idl:
+
+          Removed anonymous constructs from test IDL and modified
+          test code accordingly.
+
+Sat Jul 24 07:28:04 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl:
+        * tests/DSI_AMI_Gateway/test.idl:
+        * tests/DSI_Gateway/test.idl:
+
+          Removed anonymous constructs from test IDL and modified
+          test code accordingly.
+
+Sat Jul 24 07:15:15 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Bug_3506_Regression/IF_EXE_M_R_Structs.idl:
+        * tests/Bug_3524_Regression/test.idl:
+
+          Removed anonymous constructs from test IDL and modified
+          test code accordingly.
+
+Fri Jul 23 20:59:59 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/driver/drv_args.cpp:
+        * TAO_IDL/util/utl_global.cpp:
+
+          Added -as option to completely silence any diagnostic
+          for anonymous IDL constructs.
+
+        * docs/compiler.html:
+
+          Updated IDL compiler options documentation.
+
+        * tests/IDL_Test/IDL_Test.mpc:
+
+          Replace -aw option with the new -as option.
+
+Fri Jul 23 19:56:53 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/Param_Test/big_union.cpp:
+        * tests/Param_Test/param_test.idl:
+        * tests/Param_Test/recursive_union.cpp:
+
+          Removed anonymous constructs from test IDL and modified
+          test code accordingly.
+
+Thu Jul 22 19:21:28 UTC 2010  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * examples/CSD_Strategy/ThreadPool4/Foo.idl:
+        * orbsvcs/orbsvcs/miop.idl:
+        * orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl:
+        * performance-tests/Anyop/test.idl:
+        * tests/Bug_2119_Regression/test.idl:
+
+          Fix anonymous type errors.
+
+Thu Jul 22 03:57:34 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO_IDL/util/utl_err.cpp:
+        * TAO_IDL/util/utl_global.cpp:
+
+          Fuzz.
+
+Wed Jul 21 21:38:11 UTC 2010  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/orbsvcs/RtecUDPAdmin.idl:
+        * orbsvcs/orbsvcs/miop.idl:
+
+          Fix anonymous arrays that the IDL compiler now complains about.
+
+Wed Jul 21 16:22:38 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/y.tab.cpp:
+
+          Overlooked change in error message call signature.
+
+        * tests/IDL_Test/IDL_Test.mpc:
+
+          Added new option -aw from
+
+          Wed Jul 21 15:02:16 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          to necessary IDL files.
+
+Wed Jul 21 15:54:27 UTC 2010  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/TAO_Internal.cpp:
+
+          reverted for_TAO specific call to service gestalt open.
+
+Wed Jul 21 15:43:39 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tests/Sequence_Unit_Tests/value_sequence_tester.hpp:
+          Fixed a valgrind complain about uninitialized value.
+
+Wed Jul 21 15:02:16 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_array.cpp:
+
+          Cosmetic changes.
+
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/include/utl_err.h:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/driver/drv_args.cpp:
+        * TAO_IDL/util/utl_err.cpp:
+        * TAO_IDL/util/utl_global.cpp:
+
+          An error is now output when an anonymous
+          type is seen. For legacy IDL files, a
+          command line option -aw has been added,
+          which will cause a warning to be output
+          instead.
+
+        * docs/compiler.html:
+
+          Updated documentation with the new option above.
+
+Wed Jul 21 09:57:34 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/ORB_Core_TSS_Resources.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/ORB_Core.inl:
+        * tao/ORB_Core_TSS_Resources.h:
+        * tao/ORB_Core.h:
+          Fixed bug 2533. Now ORB_Core's TSS resources are cleaned during
+          orb destroy.
+
+        * tests/Portable_Interceptors/Slot/driver.cpp:
+          Explicitely destroy orb since doing this implicitely when main()
+          returns is too late.
+
+Wed Jul 21 03:09:21 UTC 2010  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/TAO_Internal.cpp:
+
+          Fix for premature committal error.
+
+Wed Jul 21 02:34:25 UTC 2010  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/TAO_Internal.cpp:
+
+          Use the modified open method in the ACE_Service_Gestalt to get
+          the behavior that has been assumed since the introduction of
+          multiple service contexts.
+
+Tue Jul 20 12:28:24 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_attribute/attribute.cpp:
+
+          Fixed typo in facet impl attribute operation generation,
+          similar to the fix in
+
+          Mon Jul 19 17:14:48 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+Mon Jul 19 18:25:04 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp:
+
+          Fixed fuzz error.
+
+Mon Jul 19 18:19:22 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/driver/drv_preproc.cpp:
+
+          Fixed typo in OpenVMS-spcific code.
+
+Mon Jul 19 17:14:48 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_operation/operation_exs.cpp:
+
+          Fixed typo in facet impl operation generation.
+
+Sat Jul 17 14:13:33 UTC 2010  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/TAO_Internal.cpp (ORB::open_services):
+
+          Silence compiler warnings
+
+Fri Jul 16 22:13:14 UTC 2010  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/TAO_Internal.cpp:
+
+          Detect and allow an ENOENT error returned from opening a service
+          configuration context. That is alright because any explicitly named
+          service config files are checked for existence when the -ORBSvcConf
+          argument is processed, so the only file that could raise ENOENT is
+          a defaulted svc.conf.
+
+Thu Jul 15 13:37:06 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp(end_server_header):
+
+          Changes to avoid a mismatched versioned namespace macro
+          pair in *S.h when the -SS option is used.
+
+Thu Jul 15 12:55:54 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
+
+          Added code generation for _get_component() and
+          _set_component) in the AMI4CCM connector's facet executor,
+          as well as code to initialize and reset this value in
+          the corresponding connector executor.
+
+Thu Jul 15 09:44:25 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_ami_rh_exh.cpp:
+        * TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exs.h:
+        * TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exh.h:
+
+          New visitors, generating the AMI4CCM reply handler
+          implementation, with empty method bodies, and triggered by
+          -Gex used on the generated *A.idl file. The option -Gcn
+          used on this file will generate a *A_conn.{h,cpp} set
+          of files. The addition of -Gex to this command line
+          will trigger the generation of a *A_conn_i.{h,cpp}
+          set of files, containing the corresponding empty
+          implementations of the reply handler methods.
+
+        * TAO_IDL/be/be_visitor_home/home_exs.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_exs.cpp:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_root/root_cnh.cpp:
+        * TAO_IDL/be/be_visitor_root/root_cns.cpp:
+        * TAO_IDL/be/be_visitor_connector.cpp:
+        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_visitor_attribute/attribute.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp:
+        * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
+        * TAO_IDL/be/be_visitor.cpp:
+        * TAO_IDL/be_include/be_visitor_operation/operation_exs.h:
+        * TAO_IDL/be_include/be_visitor_context.h:
+        * TAO_IDL/be_include/be_visitor_connector.h:
+        * TAO_IDL/be_include/be_visitor.h:
+        * TAO_IDL/be_include/be_codegen.h:
+        * TAO_IDL/be_include/be_helper.h:
+        * TAO_IDL/be_include/be_visitor_attribute/attribute.h:
+        * TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h:
+        * TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h:
+        * TAO_IDL/be_include/be_global.h:
+
+          Changes to existing files necessary to complete the
+          support of AMI4CCM reply handler implementation
+          generation. Also some minor cosmetic and comment changes.
+
+Thu Jul 15 09:23:20 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.h:
+        * orbsvcs/orbsvcs/Trader/Offer_Database.h:
+        * orbsvcs/orbsvcs/Trader/Offer_Iterators.h:
+        * tao/Bounded_Basic_String_Sequence_T.h:
+        * tao/Bounded_Object_Reference_Sequence_T.h:
+        * tao/Bounded_Value_Sequence_T.h:
+        * tao/Endpoint.h:
+        * tao/Unbounded_Basic_String_Sequence_T.h:
+        * tao/Unbounded_Object_Reference_Sequence_T.h:
+        * tao/Unbounded_Octet_Sequence_T.h:
+          Doxygen improvements
+
+Tue Jul 13 11:29:59 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/fe/fe_utils.cpp:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/idl.yy:
+
+          Fixes for various code generation errors stemming from
+
+          Mon Jul 12 08:19:49 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+Tue Jul 13 11:22:49 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/Alt_Mapping/ub_struct_seq.cpp:
+
+          Changes corresponding to changes in generated code for
+          sequences (in this test represented by std::vector<>).
+
+Mon Jul 12 12:55:55 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/PortableServer/PS_ForwardS.h:
+
+          New file, an empty placeholder that is now generated as
+          an include by the IDL compiler. The corresponding IDL
+          file is not automatically processed, but it is included
+          in other IDL files.
+
+Mon Jul 12 11:32:30 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/fe_init.cpp:
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/util/utl_scope.cpp:
+
+          Changes in handling of pseudo object creation and lookup.
+
+Mon Jul 12 08:26:24 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tools/IDL3_to_IDL2/be_util.cpp:
+        * tools/IDL3_to_IDL2/be_util.h:
+
+          New files containing a utility class
+          of static methods.
+
+
+        * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
+
+          Added new files to project.
+
+        * tools/IDL3_to_IDL2/be_global.cpp:
+        * tools/IDL3_to_IDL2/be_global.h:
+
+          Factored out methods that have nothing
+          to do with global data storage and
+          moved them to the new utility class.
+
+Mon Jul 12 08:19:49 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/include/fe_utils.h:
+        * TAO_IDL/include/ast_decl.h:
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/include/utl_scope.h:
+        * TAO_IDL/include/ast_interface.h:
+        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_root/root_sh.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
+        * TAO_IDL/be/be_util.cpp:
+        * TAO_IDL/be/be_visitor_typecode.cpp:
+        * TAO_IDL/be/be_visitor_operation.cpp:
+        * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence.cpp:
+        * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
+        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp:
+        * TAO_IDL/be/be_generator.cpp:
+        * TAO_IDL/ast/ast_visitor_reifying.cpp:
+        * TAO_IDL/ast/ast_decl.cpp:
+        * TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h:
+        * TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h:
+        * TAO_IDL/be_include/be_util.h:
+        * TAO_IDL/be_include/be_visitor_constant/constant_cs.h:
+        * TAO_IDL/be_include/be_constant.h:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/fe/fe_utils.cpp:
+        * TAO_IDL/fe/fe_init.cpp:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/fe/idl.ll:
+        * TAO_IDL/driver/drv_preproc.cpp:
+        * TAO_IDL/driver/drv_args.cpp:
+        * TAO_IDL/tao_idl.cpp:
+        * TAO_IDL/util/utl_global.cpp:
+        * TAO_IDL/util/utl_scope.cpp:
+
+
+          - Changed generation of alternate mapping sequences to be a
+            typedef of std::vector.
+
+          - Refactored non-data code in FE and BE global data classes
+            to corresponding utils classes.
+
+          - Changed code generation triggered by ?SS to generate the
+            *S.h and *C.h includes, so they can be propagated to
+            including IDL files.
+
+Tue Jul  6 11:11:49 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/tao.doxygen:
+        * etc/tao_anytypecode.doxygen:
+        * etc/tao_av.doxygen:
+        * etc/tao_compression.doxygen:
+        * etc/tao_cosevent.doxygen:
+        * etc/tao_cosnaming.doxygen:
+        * etc/tao_cosnotification.doxygen:
+        * etc/tao_costime.doxygen:
+        * etc/tao_costrader.doxygen:
+        * etc/tao_dynamicany.doxygen:
+        * etc/tao_dynamicinterface.doxygen:
+        * etc/tao_esf.doxygen:
+        * etc/tao_ifr.doxygen:
+        * etc/tao_implrepo.doxygen:
+        * etc/tao_iormanip.doxygen:
+        * etc/tao_iortable.doxygen:
+        * etc/tao_pi.doxygen:
+        * etc/tao_pi_server.doxygen:
+        * etc/tao_portablegroup.doxygen:
+        * etc/tao_portableserver.doxygen:
+        * etc/tao_pss.doxygen:
+        * etc/tao_rtcorba.doxygen:
+        * etc/tao_rtevent.doxygen:
+        * etc/tao_rtportableserver.doxygen:
+        * etc/tao_security.doxygen:
+        * etc/tao_smartproxies.doxygen:
+        * etc/tao_ssliop.doxygen:
+        * etc/tao_strategies.doxygen:
+        * etc/tao_transportcurrent.doxygen:
+        * etc/tao_ziop.doxygen:
+          Reduced the size of the colloboration graphs
+
+Mon Jul  5 14:00:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/tao.doxygen:
+        * etc/tao_anytypecode.doxygen:
+        * etc/tao_av.doxygen:
+        * etc/tao_compression.doxygen:
+        * etc/tao_cosevent.doxygen:
+        * etc/tao_cosnaming.doxygen:
+        * etc/tao_cosnotification.doxygen:
+        * etc/tao_costime.doxygen:
+        * etc/tao_costrader.doxygen:
+        * etc/tao_dynamicany.doxygen:
+        * etc/tao_dynamicinterface.doxygen:
+        * etc/tao_esf.doxygen:
+        * etc/tao_ifr.doxygen:
+        * etc/tao_implrepo.doxygen:
+        * etc/tao_iormanip.doxygen:
+        * etc/tao_iortable.doxygen:
+        * etc/tao_pi.doxygen:
+        * etc/tao_pi_server.doxygen:
+        * etc/tao_portablegroup.doxygen:
+        * etc/tao_portableserver.doxygen:
+        * etc/tao_pss.doxygen:
+        * etc/tao_rtcorba.doxygen:
+        * etc/tao_rtevent.doxygen:
+        * etc/tao_rtportableserver.doxygen:
+        * etc/tao_security.doxygen:
+        * etc/tao_smartproxies.doxygen:
+        * etc/tao_ssliop.doxygen:
+        * etc/tao_strategies.doxygen:
+        * etc/tao_transportcurrent.doxygen:
+        * etc/tao_ziop.doxygen:
+          Disable include and included graphs, this should reduce the size
+          of the documentation a lot
+
+Mon Jul  5 11:43:01 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2777_Regression/run_test.pl:
+          Added another path
+
+        * tao/Leader_Follower.h:
+          Doxygen fix
+
+Sun Jul 04 18:57:33 CEST 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 1.8 released.
+
+Local Variables:
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
+End:
+ambiguous
diff --git a/DevGuideExamples/AMH/MessengerServer.cpp b/DevGuideExamples/AMH/MessengerServer.cpp
index fce26c51fb6..ae8fb522e47 100644
--- a/DevGuideExamples/AMH/MessengerServer.cpp
+++ b/DevGuideExamples/AMH/MessengerServer.cpp
@@ -28,7 +28,7 @@ parse_args(int argc, ACE_TCHAR *argv[])
         return -1;
         break;
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/AMH_AMI/inner_i.cpp b/DevGuideExamples/AMH_AMI/inner_i.cpp
index c1c696ecbc2..83b1858a1b4 100644
--- a/DevGuideExamples/AMH_AMI/inner_i.cpp
+++ b/DevGuideExamples/AMH_AMI/inner_i.cpp
@@ -1,15 +1,8 @@
-#include "amh_ami_pch.h"
 /* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+#include "amh_ami_pch.h"
 
 #include "inner_i.h"
-#include "ace/OS.h"
+#include "ace/OS_NS_unistd.h"
 
 Inner_i::Inner_i (int d)
   : divisor_ (d)
diff --git a/DevGuideExamples/AMH_AMI/inner_server.cpp b/DevGuideExamples/AMH_AMI/inner_server.cpp
index a72479629a3..e9dfe2f872e 100644
--- a/DevGuideExamples/AMH_AMI/inner_server.cpp
+++ b/DevGuideExamples/AMH_AMI/inner_server.cpp
@@ -4,7 +4,6 @@
 
 #include "inner_i.h"
 #include "ace/SString.h"
-#include "ace/OS_String.h"
 #include "ace/Get_Opt.h"
 #include <iostream>
 #include <fstream>
@@ -38,7 +37,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/AMH_AMI/middle_server.cpp b/DevGuideExamples/AMH_AMI/middle_server.cpp
index 4a76ade1f0e..ede0bac8250 100644
--- a/DevGuideExamples/AMH_AMI/middle_server.cpp
+++ b/DevGuideExamples/AMH_AMI/middle_server.cpp
@@ -3,7 +3,6 @@
 #include "amh_ami_pch.h"
 
 #include "middle_i.h"
-#include "ace/OS_String.h"
 #include "ace/Get_Opt.h"
 #include <iostream>
 #include <fstream>
@@ -42,7 +41,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/AMH_AMI/run_test.pl b/DevGuideExamples/AMH_AMI/run_test.pl
index 1e73cf21dc8..3747df0fa09 100755
--- a/DevGuideExamples/AMH_AMI/run_test.pl
+++ b/DevGuideExamples/AMH_AMI/run_test.pl
@@ -38,11 +38,11 @@ $md_server->DeleteFile($middle_ior);
 my $client_iorfile = $client->LocalFile ($middle_ior);
 $client->DeleteFile($middle_ior);
 
-$IS = $in_server->CreateProcess ("inner_server", 
+$IS = $in_server->CreateProcess ("inner_server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $in_server_inner_ior");
 
-$MD = $md_server->CreateProcess ("middle_server", 
+$MD = $md_server->CreateProcess ("middle_server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $md_server_middle_ior " .
                               "-i file://$md_server_inner_ior");
diff --git a/DevGuideExamples/BiDirectionalGIOP/server.cpp b/DevGuideExamples/BiDirectionalGIOP/server.cpp
index 1d5164c621f..617a933d85d 100644
--- a/DevGuideExamples/BiDirectionalGIOP/server.cpp
+++ b/DevGuideExamples/BiDirectionalGIOP/server.cpp
@@ -34,7 +34,7 @@ parse_args(int argc, ACE_TCHAR *argv[])
         return -1;
         break;
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/GettingStarted/MessengerServer.cpp b/DevGuideExamples/GettingStarted/MessengerServer.cpp
index 15ee01f543d..057681e8ad7 100644
--- a/DevGuideExamples/GettingStarted/MessengerServer.cpp
+++ b/DevGuideExamples/GettingStarted/MessengerServer.cpp
@@ -31,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp b/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
index 27d02a450dc..9c3f7306a6f 100644
--- a/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
+++ b/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
@@ -25,6 +25,6 @@ CORBA::Boolean Messenger_i::send_message (
   CORBA::string_free(message);
   message = CORBA::string_dup("Thanks for the message.");
   return true;
-  
+
 }
 
diff --git a/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h b/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h
index c2dc71e773e..ba0da517de5 100644
--- a/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h
+++ b/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h
@@ -27,4 +27,4 @@ class Messenger_Locator_i : public PortableServer::ServantLocator,
                            PortableServer::Servant servant);
 };
 
-#endif 
+#endif
diff --git a/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp b/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp
index 01f8018f71b..8cb1f57ff63 100644
--- a/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp
+++ b/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp
@@ -32,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc b/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc
index 519ebd794eb..ed176d4530e 100644
--- a/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc
+++ b/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc
@@ -8,21 +8,9 @@ project(*Server): messaging, taoexe, portableserver, ami {
 }
 
 project(*Client): messaging, taoexe, portableserver, ami {
+  after += *Server
   Source_Files {
     MessengerHandler.cpp
     MessengerClient.cpp
   }
-  verbatim(gnuace, local) {
-    ## Using the -g option causes an internal compiler error with g++ 2.96
-    ## on Linux Itanium when compiling MessengerHandler.cpp.
-    ifeq ($(CXX), g++)
-      ifeq ($(findstring 2.96, $(CXX_VERSION)), 2.96)
-        ifeq ($(shell uname -s), Linux)
-          ifeq ($(shell uname -m), ia64)
-            DCFLAGS = -O0
-	  endif
-	endif
-      endif
-    endif
-  }
 }
diff --git a/DevGuideExamples/Messaging/AMIcallback/Messenger.idl b/DevGuideExamples/Messaging/AMIcallback/Messenger.idl
index 17f625393f0..6488044fc67 100644
--- a/DevGuideExamples/Messaging/AMIcallback/Messenger.idl
+++ b/DevGuideExamples/Messaging/AMIcallback/Messenger.idl
@@ -8,7 +8,7 @@ exception MessengerUnableToSendMessage
 
 interface Messenger
 {
-  
+
   boolean send_message(in string user_name,
                        in string subject,
                        inout string message,
diff --git a/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp b/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
index 9ede1f8097b..d2cd1ef0502 100644
--- a/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
+++ b/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
@@ -74,7 +74,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
     mgr->activate();
 
     // Register an AMI handler for the Messenger interface
-    PortableServer::Servant_var<MessengerHandler> servant = 
+    PortableServer::Servant_var<MessengerHandler> servant =
       new MessengerHandler(orb.in());
     PortableServer::ObjectId_var oid = poa->activate_object(servant.in());
     obj = poa->id_to_reference(oid.in());
diff --git a/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h b/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
index 986654f44d4..5a12435881d 100644
--- a/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
+++ b/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
@@ -8,12 +8,12 @@
 class  MessengerHandler : public virtual POA_AMI_MessengerHandler
 {
 public:
-  //Constructor 
+  //Constructor
   MessengerHandler (CORBA::ORB_ptr orb);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~MessengerHandler (void);
-  
+
 virtual void send_message (
     CORBA::Boolean ami_return_val,
     const char * message,
diff --git a/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp b/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
index 9dc1a81ebdf..18d792ccc13 100644
--- a/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
+++ b/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
@@ -43,7 +43,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h b/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
index 2cc2587c3eb..9bfe4448d19 100644
--- a/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
+++ b/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
@@ -20,13 +20,13 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (unsigned int seconds_to_wait = 0,
                CORBA::Boolean throw_exception = 0);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
@@ -42,7 +42,7 @@ private:
   // Force an exception to be thrown to test client-side
   // exception handling
   CORBA::Boolean throw_exception_;
-  
+
 };
 
 
diff --git a/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp b/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp
index c9162bf77d2..83f9c51a02d 100644
--- a/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp
+++ b/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h b/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
index 98be27c4cdd..07e4e735ee9 100644
--- a/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
+++ b/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
@@ -20,12 +20,12 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
diff --git a/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp b/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
index 1843bc73b98..48b503ce45d 100644
--- a/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
+++ b/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
@@ -14,12 +14,12 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
   : orb_(CORBA::ORB::_duplicate(orb))
 {
 }
-  
+
 // Implementation skeleton destructor
 Messenger_i::~Messenger_i (void)
 {
 }
-  
+
 CORBA::Boolean Messenger_i::send_message (
     const char * user_name,
     const char * subject,
diff --git a/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h b/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
index 3a2dff83972..dc1ef1e8be5 100644
--- a/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
+++ b/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
@@ -20,12 +20,12 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (CORBA::ORB_ptr orb);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
   virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
diff --git a/DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp b/DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp
index 124a3dcffdb..abef2390901 100644
--- a/DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp
+++ b/DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp
@@ -4,8 +4,6 @@
 #include <iostream>
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://Messenger.ior");
 
 int
diff --git a/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp b/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp
index 8b300719e91..030229099be 100644
--- a/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp
+++ b/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp b/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
index 4fae956687b..23d2653fcfc 100644
--- a/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
+++ b/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
@@ -13,12 +13,12 @@
 Messenger_i::Messenger_i (void)
 {
 }
-  
+
 // Implementation skeleton destructor
 Messenger_i::~Messenger_i (void)
 {
 }
-  
+
 CORBA::Boolean Messenger_i::send_message (
     const char * user_name,
     const char * subject,
diff --git a/DevGuideExamples/Multithreading/Reactive/Messenger_i.h b/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
index 98be27c4cdd..07e4e735ee9 100644
--- a/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
+++ b/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
@@ -20,12 +20,12 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
diff --git a/DevGuideExamples/Multithreading/Reactive/svc.conf b/DevGuideExamples/Multithreading/Reactive/svc.conf
index 3cd02504e29..539b4a43944 100644
--- a/DevGuideExamples/Multithreading/Reactive/svc.conf
+++ b/DevGuideExamples/Multithreading/Reactive/svc.conf
@@ -1,4 +1,6 @@
+# $Id$
+
 # svc.conf file for single-threaded reactive server.
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null"
+static Server_Strategy_Factory "-ORBConcurrency reactive"
 dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_st -ORBInputCDRAllocator null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler st"
+static Client_Strategy_Factory "-ORBClientConnectionHandler st"
diff --git a/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp b/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
index ec9426a9ad5..693824c3b61 100644
--- a/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
+++ b/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h b/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
index 98be27c4cdd..07e4e735ee9 100644
--- a/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
+++ b/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
@@ -20,12 +20,12 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
diff --git a/DevGuideExamples/Multithreading/ThreadPerConnection/server.conf b/DevGuideExamples/Multithreading/ThreadPerConnection/server.conf
index 3b6d80259ef..f90809e5ed6 100644
--- a/DevGuideExamples/Multithreading/ThreadPerConnection/server.conf
+++ b/DevGuideExamples/Multithreading/ThreadPerConnection/server.conf
@@ -1,2 +1,4 @@
+## $Id$
+
 # server.conf file for thread-per-connection server.
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBThreadPerConnectionTimeout 1000"
diff --git a/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp b/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp
index 2097b73a3a3..1bc86c5f497 100644
--- a/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp
+++ b/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp
@@ -31,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h b/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
index 98be27c4cdd..07e4e735ee9 100644
--- a/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
+++ b/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
@@ -20,12 +20,12 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
diff --git a/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp b/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp
index e2f8d786fe1..a86a87c6494 100644
--- a/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp
+++ b/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp
@@ -34,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp b/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp
index eec45d66938..c67158aed3a 100644
--- a/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp
+++ b/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp
@@ -34,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp b/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
index 42bb29ef004..4bdf3fd51e1 100644
--- a/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
+++ b/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
@@ -24,12 +24,14 @@ ServerIORInterceptor::establish_components (
 
   IOP::TaggedComponent myTag;
 
-  myTag.tag =  tagID;
-  myTag.component_data.length (ACE_OS::strlen(permission) + 1 );
+  myTag.tag = tagID;
+  const CORBA::ULong len =
+    static_cast<CORBA::ULong> (ACE_OS::strlen (permission));
+  myTag.component_data.length (len + 1);
 
   CORBA::Octet *buf = myTag.component_data.get_buffer();
 
-  ACE_OS::memcpy (buf, permission, ACE_OS::strlen(permission) + 1);
+  ACE_OS::memcpy (buf, permission, len + 1);
 
   // add tagged component
   info->add_ior_component (myTag);
@@ -45,7 +47,7 @@ ServerIORInterceptor::components_established (
 
 void
 ServerIORInterceptor::adapter_manager_state_changed (
-                             const char* /*id*/, 
+                             const char* /*id*/,
                              PortableInterceptor::AdapterState /*state*/)
 {
 }
diff --git a/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp b/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
index 9b8850a173c..0e869a4ff00 100644
--- a/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
+++ b/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
@@ -81,7 +81,7 @@ ClientInterceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
   } else {
     std::cerr << "Could not extract a boolean value from any" << std::endl;
   }
-     
+
   // Add this context to the service context list.
   ri->add_request_service_context (sc, false);
 
diff --git a/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp b/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
index bcf37b51d37..9aa625f79c1 100644
--- a/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
+++ b/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
@@ -36,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp b/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp
index 56428bff073..86ab2829b18 100644
--- a/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp
+++ b/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp
@@ -34,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/RTCORBA/MessengerServer.cpp b/DevGuideExamples/RTCORBA/MessengerServer.cpp
index e5e97679b4a..b9abf1d1d26 100644
--- a/DevGuideExamples/RTCORBA/MessengerServer.cpp
+++ b/DevGuideExamples/RTCORBA/MessengerServer.cpp
@@ -32,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/RTCORBA/svc.conf b/DevGuideExamples/RTCORBA/svc.conf
index 511f7c4974e..b2015393232 100644
--- a/DevGuideExamples/RTCORBA/svc.conf
+++ b/DevGuideExamples/RTCORBA/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # This is more portable across multiple systems
 
 static RT_ORB_Loader "-ORBPriorityMapping continuous"
diff --git a/DevGuideExamples/SmartProxies/Logger.idl b/DevGuideExamples/SmartProxies/Logger.idl
index b800e926afc..3b144588056 100644
--- a/DevGuideExamples/SmartProxies/Logger.idl
+++ b/DevGuideExamples/SmartProxies/Logger.idl
@@ -1,4 +1,4 @@
-// $Id$ 
+// $Id$
 
 // Logger.idl
 
diff --git a/DevGuideExamples/SmartProxies/LoggerServer.cpp b/DevGuideExamples/SmartProxies/LoggerServer.cpp
index d29453ef576..8d7c9627b2d 100644
--- a/DevGuideExamples/SmartProxies/LoggerServer.cpp
+++ b/DevGuideExamples/SmartProxies/LoggerServer.cpp
@@ -31,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/SmartProxies/MessengerServer.cpp b/DevGuideExamples/SmartProxies/MessengerServer.cpp
index 5e0fc0b2cbb..580e8ae123f 100644
--- a/DevGuideExamples/SmartProxies/MessengerServer.cpp
+++ b/DevGuideExamples/SmartProxies/MessengerServer.cpp
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp b/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
index 4322b6397a4..a3572439088 100644
--- a/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
+++ b/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
@@ -51,7 +51,7 @@ Smart_Messenger_Proxy::send_message (
   char *& message)
 {
   logger_->log_message("Before send_message()");
-  CORBA::Boolean ret_val = 
+  CORBA::Boolean ret_val =
     TAO_Messenger_Smart_Proxy_Base::send_message(user_name, subject, message);
   logger_->log_message("After send_message()");
   return ret_val;
diff --git a/DevGuideExamples/ValueTypes/Bank/server.cpp b/DevGuideExamples/ValueTypes/Bank/server.cpp
index 26c3612b9ca..5eb0169c880 100644
--- a/DevGuideExamples/ValueTypes/Bank/server.cpp
+++ b/DevGuideExamples/ValueTypes/Bank/server.cpp
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp b/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp
index 51323ff466d..5cf051cb6c4 100644
--- a/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp
+++ b/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp
@@ -34,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp b/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
index 3dc5a20807e..15a1dfed447 100644
--- a/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
+++ b/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
@@ -6,7 +6,7 @@
 
 #include <sstream>
 
-  
+
 CORBA::Boolean Messenger_i::send_message (Message*& msg)
 {
   msg->print();
diff --git a/MPC/config/endpointpolicy.mpb b/MPC/config/endpointpolicy.mpb
index 7759133023e..e97ea3266f8 100644
--- a/MPC/config/endpointpolicy.mpb
+++ b/MPC/config/endpointpolicy.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taolib, portableserver, pi {
+project : taolib, portableserver, pi, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro  {
   after   += EndpointPolicy
   libs    += TAO_EndpointPolicy
 }
diff --git a/tao/pidl_install.mpb b/MPC/config/pidl_install.mpb
index f435c20db8e..f435c20db8e 100644
--- a/tao/pidl_install.mpb
+++ b/MPC/config/pidl_install.mpb
diff --git a/MPC/config/psdl.mpb b/MPC/config/psdl.mpb
deleted file mode 100644
index fcc0e4edaa2..00000000000
--- a/MPC/config/psdl.mpb
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  after += PSDL_Parser PSDL PSDL_Datastore
-  libs  += TAO_PSDL TAO_PSDL_Datastore
-
-  Define_Custom(PSDL) {
-    dependent        = $(TAO_ROOT)/orbsvcs/PSS/psdl_tao
-    command          = $(TAO_ROOT)/orbsvcs/PSS/psdl_tao
-    libpath          = $(ACE_ROOT)/lib
-    inputext         = .psdl
-    source_outputext = .cpp
-    header_outputext = .h
-    inline_outputext = .i
-    // unlike idl, the psdl compiler doesn't seem to generate *S.* files.
-    pre_extension    = C
-  }
-}
\ No newline at end of file
diff --git a/MPC/config/stl_mapping.mpb b/MPC/config/stl_mapping.mpb
index c960f2a3d94..a7601f47fdf 100644
--- a/MPC/config/stl_mapping.mpb
+++ b/MPC/config/stl_mapping.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-feature(stl_mapping) : taoidldefaults {
-  requires += stl_mapping
+feature(stl_mapping) {
+//  requires += stl_mapping
   idlflags += -Gstl
 }
diff --git a/MPC/config/tao_qtresource.mpb b/MPC/config/tao_qtresource.mpb
index 43bd3fca0b6..b99cbc42418 100644
--- a/MPC/config/tao_qtresource.mpb
+++ b/MPC/config/tao_qtresource.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taolib, ace_qtreactor {
+project : taolib, ace_qt4reactor {
   requires += tao_qtresource
   after    += TAO_QtResource
   libs     += TAO_QtResource
diff --git a/MPC/config/taobaseidldefaults.mpb b/MPC/config/taobaseidldefaults.mpb
index 69b753272bb..510dcce15a0 100644
--- a/MPC/config/taobaseidldefaults.mpb
+++ b/MPC/config/taobaseidldefaults.mpb
@@ -15,6 +15,7 @@ project: build_files {
   Define_Custom(IDL) {
     automatic            = 1
     dependent            = $(TAO_IDL_DEP)
+    dependent_libs       = $(ACE_ROOT)/lib/TAO_IDL_BE $(ACE_ROOT)/lib/TAO_IDL_FE
     command              = $(TAO_IDL)
     libpath              = $(ACE_ROOT)/lib
     inputext             = .idl
diff --git a/MPC/config/taoidldefaults.mpb b/MPC/config/taoidldefaults.mpb
index 2e2af48f6c7..625584c2a67 100644
--- a/MPC/config/taoidldefaults.mpb
+++ b/MPC/config/taoidldefaults.mpb
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project: taobaseidldefaults, corba_e_compact, corba_e_micro, minimum_corba, optimize_collocated_invocations {
+project: taobaseidldefaults, corba_e_compact, corba_e_micro, minimum_corba, optimize_collocated_invocations, stl_mapping {
 }
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 4b2f848d4d2..00000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,46 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        TAO_IDL \
-        tao \
-        orbsvcs \
-        docs \
-        utils
-
-if BUILD_EXAMPLES
-SUBDIRS += examples
-endif
-
-if BUILD_TESTS
-SUBDIRS += performance-tests interop-tests tests
-endif
-
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = -I ../m4
-AUTOMAKE_OPTIONS = foreign
-
-EXTRA_DIST =  \
-  PROBLEM-REPORT-FORM \
-  VERSION \
-  COPYING.sun \
-  LICENSE.sun \
-  README.sun
-
-release:
-	$(MAKE) dist
-
-TAO_EXTRA_DIST = docs
-
-dist-hook:
-	(cd $(top_srcdir); tar cf - $(TAO_EXTRA_DIST)) | (cd $(distdir); \
-	  tar xfBp -)
-	list=`find $(distdir) -type d -name .svn -print`; for p in $$list; do \
-	  rm -rf $$p; done
diff --git a/NEWS b/NEWS
index addc824824b..18bd130a44b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,108 @@
+USER VISIBLE CHANGES BETWEEN TAO-2.0.2 and TAO-2.0.3
+====================================================
+
+. Added support for long double constants in IDL
+
+. Improved support for mt_noupcall but this is still experimental
+
+. Addressed several Coverity reported issues
+
+USER VISIBLE CHANGES BETWEEN TAO-2.0.1 and TAO-2.0.2
+====================================================
+
+. Remove support for already deprecated -ORBConnectionCachingStrategy
+
+. Removed -ORBObjectKeyTableLock and -ORBPOALock, very risk options and this
+  way the regular invocation path can be optimized much more
+
+. Improved support for mt_noupcall wait strategy. Upcall detection has been
+  improved and the transport is polled each 2ms to see if we can do the
+  upcall.
+
+. Improved performance of the Parallel Connect Strategy in TAO.
+
+. tao_catior does a better job with JacORB generated IORs.
+
+. tao_cosnaming can now be multithreaded.
+
+USER VISIBLE CHANGES BETWEEN TAO-2.0.0 and TAO-2.0.1
+====================================================
+
+. Fixed IDL compiler bug that caused illegal references to items
+  in the scope of a template module to be overlooked.
+
+USER VISIBLE CHANGES BETWEEN TAO-1.8.3 and TAO-2.0.0
+====================================================
+
+. Improved support for abstract
+
+USER VISIBLE CHANGES BETWEEN TAO-1.8.2 and TAO-1.8.3
+====================================================
+
+. TAO IDL compiler now generates attribute members for generated CCM
+  executor implementation classes, as well as full implementations for
+  the associated set/get operations.
+
+. Add TAO IDL compiler command line option -iC, which overrides the
+  default include path (current directory or $TAO_ROOT/tao) for
+  *C.h files included in generated *A.h files.
+
+. Removed autoconf support for TAO, it is really not tested, unstable, and
+  unmaintainable at this moment
+
+. The TAO IDL compiler now gives the following error when anonymous
+  types are used: 'anonymous types are deprecated by OMG spec'.
+  One can changes this error into a warning. There's also a possibility
+  to silence the TAO IDL compiler about this message. One of the following
+  defines can be added to your config.h file in order to change the behavior
+  of the TAO IDL compiler:
+  * IDL_ANON_ERROR:   The TAO IDL generates an error when it encounters
+                      an anonymous type (default behavior).
+  * IDL_ANON_WARNING: The TAO IDL generates a warning when it encounters
+                      an anonymous type.
+  * ANON_TYPE_SILENT: The TAO IDL doesn't generate a warning nor an error
+                      when it encounters an anonymous type.
+
+. Renamed ALL ORB services executables. This because of
+  the fact that the TAO ORB services should be recognizable
+  between the ORB services of other CORBA vendors. There are
+  systems where ORB services of several CORBA vendors are
+  installed (mainly via the installed packages). The following
+  rename actions have been taken place:
+  * 'LifeCycle_Service'       to 'tao_coslifecycle'
+  * 'Dump_Schedule'           to 'tao_dump_schedule'
+  * 'NT_Notify_Service'       to 'tao_nt_cosnotification'
+  * 'Notify_Service'          to 'tao_cosnotification'
+  * 'FT_ReplicationManager'   to 'tao_ft_replicationmanager'
+  * 'IFR_Service'             to 'tao_ifr_service'
+  * 'TAO_Service'             to 'tao_service'
+  * 'Fault_Detector'          to 'tao_fault_detector'
+  * 'Scheduling_Service'      to 'tao_cosscheduling'
+  * 'Basic_Logging_Service'   to 'tao_tls_basic'
+  * 'Notify_Logging_Service'  to 'tao_tls_notify'
+  * 'Event_Logging_Service'   to 'tao_tls_event'
+  * 'RTEvent_Logging_Service' to 'tao_tls_rtevent'
+  * 'Naming_Service'          to 'tao_cosnaming'
+  * 'NT_Naming_Service'       to 'tao_nt_cosnaming'
+  * 'CosEvent_Service'        to 'tao_cosevent'
+  * 'Event_Service'           to 'tao_rtevent'
+  * 'LoadManager'             to 'tao_loadmanager'
+  * 'LoadMonitor'             to 'tao_loadmonitor'
+  * 'Trading_Service'         to 'tao_costrading'
+  * 'Time_Service_Server'     to 'tao_costime_server'
+  * 'Time_Service_Clerk'      to 'tao_costime_clerk'
+  * 'ImplRepo_Service'        to 'tao_imr_locator'
+  * 'ImR_Activator'           to 'tao_imr_activator'
+  * 'Fault_Notifier'          to 'tao_fault_notifier'
+  * 'Concurrency_Service'     to 'tao_cosconcurrency'
+
+. Fixed several bugs related to recursive typecodes
+
 USER VISIBLE CHANGES BETWEEN TAO-1.8.1 and TAO-1.8.2
 ====================================================
 
+. Extended logging related to the POA active object map
+
 USER VISIBLE CHANGES BETWEEN TAO-1.8.0 and TAO-1.8.1
 ====================================================
 
@@ -11,7 +113,7 @@ USER VISIBLE CHANGES BETWEEN TAO-1.8.0 and TAO-1.8.1
     AMI4CCM connector, triggered by the same option, -Gex,
     that generates a similar implementation for a
     component executor.
-    
+
   - Added flags that can be defined in config.h to output
     an error or warning if an anonymous IDL construct is
     seen by the IDL compiler. Also added IDL compiler
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index 24f5911ba64..8f1d1e31f18 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -1,7 +1,8 @@
 [Please use the PRF form below to submit bug reports, problem
  reports, etc., to the TAO developers and interested users.
- Send to tao-bugs@cs.wustl.edu.  If you are using OCI or PrismTech's
- versions of TAO do not send bugs to this mailing list, but
+ Send it to tao-bugs@list.isis.vanderbilt.edu, you must be subscribed
+ to the list in order to be able to post to it. If you are using OCI
+ or PrismTech's versions of TAO do not send bugs to this mailing list, but
  instead contact those companies for support.  Please also send your
  PRF as plain ASCII text, _not_ uuencoded or as an attachment.
 
@@ -15,12 +16,8 @@
  browse bugzilla and the ChangeLog files to find out if your problem
  has been solved in a more recent version of TAO.
 
- To ensure that you see responses, please do one of the following:
-
-    1) Subscribe to the tao-bugs mail list, by sending email with
-       contents "subscribe tao-bugs" to majordomo@cs.wustl.edu.
-
-    2) Or, monitor the comp.soft-sys.ace newsgroup for responses.
+ To subscribe to the list see
+  http://www.cs.wustl.edu/~schmidt/ACE-mail.html
 
  Replace/remove all the explanatory text in brackets before mailing.
 
@@ -40,11 +37,11 @@
 
 8<----------8<----------8<----------8<----------8<----------8<----------8<---
 
-To: tao-bugs@cs.wustl.edu
+To: tao-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 1.8.1
-    ACE VERSION: 5.8.1
+    TAO VERSION: 2.0.2
+    ACE VERSION: 6.0.2
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
@@ -61,9 +58,6 @@ Subject: [area]: [synopsis]
     (unless this isn't used in this case, e.g., with Microsoft Visual
     C++)]:
 
-    BUILD METHOD USED:
-[experimental ./configure or traditional makefile/project file?]
-
     CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features
     (used by MPC when you generate your own makefiles):
 
diff --git a/Release b/Release
deleted file mode 100644
index ffc4f196444..00000000000
--- a/Release
+++ /dev/null
@@ -1,97 +0,0 @@
-#----------------------------------------------------------------------------
-#       $Id$
-#
-#       Top-level Makefile for the TAO
-#----------------------------------------------------------------------------
-
-#### The "release" targets can be used to create the ACE+TAO kit.  By
-#### default, it creates a new beta release.  To create a new minor or
-#### major release, add "REL=minor" or "REL=major", respectively, to
-#### the make invocation.
-####
-
-CONTROLLED_FILES = \
-	TAO/COPYING* \
-	TAO/ChangeLog* \
-	TAO/LICENSE.sun \
-	TAO/Makefile.am \
-	TAO/NEWS \
-	TAO/PROBLEM-REPORT-FORM \
-	TAO/README* \
-	TAO/Release \
-	TAO/TAO-INSTALL.html \
-	TAO/TAO.mwc \
-        TAO/TAO_*.mwc \
-	TAO/TAO_IDL \
-	TAO/VERSION \
-        TAO/bin \
-	TAO/configure.ac \
-        TAO/DevGuideExamples \
-	TAO/docs \
-	TAO/examples \
-	TAO/interop-tests \
-        TAO/m4 \
-	TAO/orbsvcs \
-	TAO/performance-tests \
-	TAO/rules.tao.GNU \
-        TAO/MPC \
-	TAO/tao \
-	TAO/tests \
-	TAO/utils \
-	TAO/etc
-
-RELEASE_FILES = $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \
-                ACE_wrappers/TAO/TAO-INSTALL \
-		ACE_wrappers/TAO/GNUmake* \
-        	ACE_wrappers/TAO/*.sln \
-                ACE_wrappers/TAO/*.bmak \
-        	ACE_wrappers/TAO/Makefile.in \
-        	ACE_wrappers/TAO/configure \
-		ACE_wrappers/TAO/aclocal.m4
-
-
-.PHONY: INSTALL
-TAO-INSTALL: TAO-INSTALL.html
-	@lynx -dump $^ > $@; chmod a+r $@
-
-.PHONY: release tag
-
-REL                = beta
-MAKE	 	   = make -f Release
-CHECK              =
-APPLY_NEW_TAG      = tag
-
-
-####################################################################
-##### The following target is used by the $ACE_ROOT/Release to create
-##### complete source distribution
-####################################################################
-allsources: $(APPLY_NEW_TAG)
-	@cd CIAO  &&  $(MAKE) -s allsources REL=$(REL)
-
-tag:
-	@$(ACE_ROOT)/bin/make_release $(CHECK) -k tao -v $(REL) -u
-
-####################################################################
-##### The following target is used by the $ACE_ROOT/Release to create
-##### TAO alone distribution (with ACE)
-####################################################################
-TAO: $(APPLY_NEW_TAG)
-	@cd ..  &&  $(MAKE) -s taosources
-
-.PHONY: show_controlled_files show_release_files show_release_lib_files
-
-show_controlled_files:
-	@echo $(CONTROLLED_FILES)
-
-show_release_files:
-	@echo $(RELEASE_FILES)
-
-show_release_lib_files:
-	@echo ""
-
-show_release_tag_files:
-	@echo ""
-
-INSTALL: TAO-INSTALL.html
-	@lynx -dump $< > TAO-INSTALL
diff --git a/TAO-INSTALL.html b/TAO-INSTALL.html
index 48d23fab5ca..d8b5259f8c3 100644
--- a/TAO-INSTALL.html
+++ b/TAO-INSTALL.html
@@ -24,38 +24,38 @@
 
 
 <p>The following table summarizes platforms on which TAO runs, see the
-<a href="../ACE/ACE-INSTALL.html#platforms">ACE installation notes</A> for an
+<a href="../ACE-INSTALL.html#platforms">ACE installation notes</A> for an
 overview of all the platforms ACE runs on, these are all candidates
 to run TAO on:<P>
 
 <table width="100%" border=1>
   <tr valign=top>
     <td><b>Fully supported, i.e., continually tested and used daily</b></td>
-    <td>Solaris 7, 8, 9, 10 & 11, Windows 2000/XP/2003/Vista (7.1, and 8.0 and
-        Borland C++ Builder 6/2006/2007), Linux/Intel (Redhat,
-        Debian and SuSe), VxWorks 5.5.1/6.2/6.3/6.4/6,5, OpenVMS 8.2 & 8.3
-        Alpha & IA64
+    <td>Solaris 9, 10 & 11, Windows XP/2003/Vista (Microsoft Visual C++ 7.1, 8.0, 9.0, and 10.0),
+        Linux/Intel (Redhat,
+        Debian and SuSe), OpenVMS 8.3 IA64
     </td>
   </tr>
   <tr valign=top bgcolor="#AFAFAF">
    <td><b>Nearly fully supported, i.e., periodically tested</b></td>
-   <td>Windows 9x/ME, HP/UX 11.x, LynxOS, and AIX 4.x
+   <td>HP/UX 11.x, LynxOS, and AIX 5.x
    </td>
   </tr>
   <tr valign=top>
     <td><b>Partially supported, i.e., infrequently tested</b></td>
     <td> FreeBSD, NetBSD, Chorus, Tandem NS,
-         DEC UNIX 6.5, Linux/Alpha (Redhat and Debian), and MACOSX
+         Linux/Alpha (Redhat, SuSE, and Debian), and MACOSX
     </td>
   </tr>
   <tr valign=top bgcolor="#AFAFAF">
     <td><b>Planned support, i.e., pending</b></td>
-    <td> MVS, Windows CE, SCO, UnixWare</td>
+    <td>Windows CE</td>
   </tr>
   <tr valign=top>
     <td><b>Compilers whose support were dropped recently</b></td>
-    <td> Borland C++ Builder 4 and 5, Sun/C++ 5.1 through 5.4, g++
-         prior to 2.95.x, HP/UX 10.x, pSoS, Chorus
+    <td> Borland C++ Builder, Sun/C++ 5.1 through 5.4, g++
+         prior to 2.95.x, HP/UX 10.x, pSoS, Chorus, DEC UNIX, SCO, UnixWare, MVS,
+         Windows 9x/ME
     </td>
   </tr>
 </table>
@@ -126,7 +126,7 @@ bundle as a single piece instead of trying to mix and match things up.<P>
         </P>
 
         <P>If you wish to compile the ORB services distributed with TAO,
-          including the <CODE>Naming_Service</CODE> you
+          including the <CODE>Naming Service</CODE> you
           must include <CODE>$TAO_ROOT/orbsvcs</CODE> to the list
           above.  Please see the
           <A HREF="docs/configurations.html#orbsvcs">TAO configuration documentation</a>
diff --git a/TAO.mwc b/TAO.mwc
index a0fb1585ff1..f731a80e427 100644
--- a/TAO.mwc
+++ b/TAO.mwc
@@ -3,6 +3,7 @@
 workspace {
   exclude {
     CIAO
+    DAnCE
   }
 
   // The associate scope does not add directories to the workspace;
diff --git a/TAO_IDL/Makefile.am b/TAO_IDL/Makefile.am
deleted file mode 100644
index 164d924f85d..00000000000
--- a/TAO_IDL/Makefile.am
+++ /dev/null
@@ -1,459 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_ROOT = $(top_srcdir)
-
-## Makefile.TAO_IDL_FE.am
-
-noinst_LTLIBRARIES = libTAO_IDL_FE.la
-
-libTAO_IDL_FE_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(srcdir)/include \
-  -I$(srcdir)/fe \
-  -DTAO_IDL_FE_BUILD_DLL
-
-libTAO_IDL_FE_la_SOURCES = \
-  ast/ast_argument.cpp \
-  ast/ast_array.cpp \
-  ast/ast_attribute.cpp \
-  ast/ast_check.cpp \
-  ast/ast_component.cpp \
-  ast/ast_component_fwd.cpp \
-  ast/ast_concrete_type.cpp \
-  ast/ast_connector.cpp \
-  ast/ast_constant.cpp \
-  ast/ast_consumes.cpp \
-  ast/ast_decl.cpp \
-  ast/ast_emits.cpp \
-  ast/ast_enum.cpp \
-  ast/ast_enum_val.cpp \
-  ast/ast_eventtype.cpp \
-  ast/ast_eventtype_fwd.cpp \
-  ast/ast_exception.cpp \
-  ast/ast_expression.cpp \
-  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 \
-  ast/ast_interface_fwd.cpp \
-  ast/ast_mirror_port.cpp \
-  ast/ast_module.cpp \
-  ast/ast_native.cpp \
-  ast/ast_operation.cpp \
-  ast/ast_param_holder.cpp \
-  ast/ast_porttype.cpp \
-  ast/ast_predefined_type.cpp \
-  ast/ast_provides.cpp \
-  ast/ast_publishes.cpp \
-  ast/ast_recursive.cpp \
-  ast/ast_root.cpp \
-  ast/ast_sequence.cpp \
-  ast/ast_string.cpp \
-  ast/ast_structure.cpp \
-  ast/ast_structure_fwd.cpp \
-  ast/ast_template_module.cpp \
-  ast/ast_template_module_inst.cpp \
-  ast/ast_template_module_ref.cpp \
-  ast/ast_type.cpp \
-  ast/ast_typedef.cpp \
-  ast/ast_union.cpp \
-  ast/ast_union_branch.cpp \
-  ast/ast_union_fwd.cpp \
-  ast/ast_union_label.cpp \
-  ast/ast_uses.cpp \
-  ast/ast_valuebox.cpp \
-  ast/ast_valuetype.cpp \
-  ast/ast_valuetype_fwd.cpp \
-  ast/ast_visitor.cpp \
-  ast/ast_visitor_context.cpp \
-  ast/ast_visitor_reifying.cpp \
-  ast/ast_visitor_tmpl_module_inst.cpp \
-  ast/ast_visitor_tmpl_module_ref.cpp \
-  fe/fe_component_header.cpp \
-  fe/fe_declarator.cpp \
-  fe/fe_extern.cpp \
-  fe/fe_global.cpp \
-  fe/fe_home_header.cpp \
-  fe/fe_init.cpp \
-  fe/fe_interface_header.cpp \
-  fe/fe_lookup.cpp \
-  fe/fe_obv_header.cpp \
-  fe/fe_private.cpp \
-  fe/fe_utils.cpp \
-  fe/lex.yy.cpp \
-  fe/y.tab.cpp \
-  narrow/narrow.cpp \
-  util/utl_decllist.cpp \
-  util/utl_err.cpp \
-  util/utl_exceptlist.cpp \
-  util/utl_exprlist.cpp \
-  util/utl_global.cpp \
-  util/utl_identifier.cpp \
-  util/utl_idlist.cpp \
-  util/utl_indenter.cpp \
-  util/utl_labellist.cpp \
-  util/utl_list.cpp \
-  util/utl_namelist.cpp \
-  util/utl_scope.cpp \
-  util/utl_stack.cpp \
-  util/utl_string.cpp \
-  util/utl_strlist.cpp
-
-noinst_HEADERS = \
-  fe/y.tab.h \
-  include/TAO_IDL_FE_Export.h \
-  include/ast.h \
-  include/ast_argument.h \
-  include/ast_array.h \
-  include/ast_attribute.h \
-  include/ast_component.h \
-  include/ast_component_fwd.h \
-  include/ast_concrete_type.h \
-  include/ast_connector.h \
-  include/ast_constant.h \
-  include/ast_consumes.h \
-  include/ast_decl.h \
-  include/ast_emits.h \
-  include/ast_enum.h \
-  include/ast_enum_val.h \
-  include/ast_eventtype.h \
-  include/ast_eventtype_fwd.h \
-  include/ast_exception.h \
-  include/ast_expression.h \
-  include/ast_extended_port.h \
-  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 \
-  include/ast_interface_fwd.h \
-  include/ast_mirror_port.h \
-  include/ast_module.h \
-  include/ast_native.h \
-  include/ast_operation.h \
-  include/ast_param_holder.h \
-  include/ast_porttype.h \
-  include/ast_predefined_type.h \
-  include/ast_provides.h \
-  include/ast_publishes.h \
-  include/ast_root.h \
-  include/ast_sequence.h \
-  include/ast_string.h \
-  include/ast_structure.h \
-  include/ast_structure_fwd.h \
-  include/ast_template_module.h \
-  include/ast_template_module_inst.h \
-  include/ast_template_module_ref.h \
-  include/ast_type.h \
-  include/ast_typedef.h \
-  include/ast_union.h \
-  include/ast_union_branch.h \
-  include/ast_union_fwd.h \
-  include/ast_union_label.h \
-  include/ast_uses.h \
-  include/ast_valuebox.h \
-  include/ast_valuetype.h \
-  include/ast_valuetype_fwd.h \
-  include/ast_visitor.h \
-  include/ast_visitor_context.h \
-  include/ast_visitor_reifying.h \
-  include/ast_visitor_tmpl_module_inst.h \
-  include/ast_visitor_tmpl_module_ref.h \
-  include/drv_extern.h \
-  include/fe_component_header.h \
-  include/fe_declarator.h \
-  include/fe_extern.h \
-  include/fe_home_header.h \
-  include/fe_interface_header.h \
-  include/fe_obv_header.h \
-  include/fe_private.h \
-  include/fe_utils.h \
-  include/global_extern.h \
-  include/idl_defines.h \
-  include/idl_global.h \
-  include/idl_narrow.h \
-  include/nr_extern.h \
-  include/utl_decllist.h \
-  include/utl_err.h \
-  include/utl_exceptlist.h \
-  include/utl_exprlist.h \
-  include/utl_identifier.h \
-  include/utl_idlist.h \
-  include/utl_indenter.h \
-  include/utl_labellist.h \
-  include/utl_list.h \
-  include/utl_namelist.h \
-  include/utl_scope.h \
-  include/utl_scoped_name.h \
-  include/utl_stack.h \
-  include/utl_string.h \
-  include/utl_strlist.h
-
-## Makefile.TAO_IDL_BE.am
-
-noinst_LTLIBRARIES += libTAO_IDL_BE.la
-
-libTAO_IDL_BE_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(srcdir)/include \
-  -I$(srcdir)/be_include \
-  -I$(srcdir)/fe \
-  -DTAO_IDL_BE_BUILD_DLL
-
-libTAO_IDL_BE_la_SOURCES = \
-  be/be_argument.cpp \
-  be/be_array.cpp \
-  be/be_attribute.cpp \
-  be/be_codegen.cpp \
-  be/be_component.cpp \
-  be/be_component_fwd.cpp \
-  be/be_connector.cpp \
-  be/be_constant.cpp \
-  be/be_consumes.cpp \
-  be/be_decl.cpp \
-  be/be_emits.cpp \
-  be/be_enum.cpp \
-  be/be_enum_val.cpp \
-  be/be_eventtype.cpp \
-  be/be_eventtype_fwd.cpp \
-  be/be_exception.cpp \
-  be/be_expression.cpp \
-  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 \
-  be/be_home.cpp \
-  be/be_identifier_helper.cpp \
-  be/be_init.cpp \
-  be/be_interface.cpp \
-  be/be_interface_fwd.cpp \
-  be/be_mirror_port.cpp \
-  be/be_module.cpp \
-  be/be_native.cpp \
-  be/be_null_return_emitter.cpp \
-  be/be_operation.cpp \
-  be/be_param_holder.cpp \
-  be/be_porttype.cpp \
-  be/be_predefined_type.cpp \
-  be/be_produce.cpp \
-  be/be_provides.cpp \
-  be/be_publishes.cpp \
-  be/be_root.cpp \
-  be/be_scope.cpp \
-  be/be_sequence.cpp \
-  be/be_string.cpp \
-  be/be_structure.cpp \
-  be/be_structure_fwd.cpp \
-  be/be_template_module.cpp \
-  be/be_template_module_inst.cpp \
-  be/be_template_module_ref.cpp \
-  be/be_tmplinst.cpp \
-  be/be_type.cpp \
-  be/be_typedef.cpp \
-  be/be_union.cpp \
-  be/be_union_branch.cpp \
-  be/be_union_fwd.cpp \
-  be/be_union_label.cpp \
-  be/be_uses.cpp \
-  be/be_util.cpp \
-  be/be_valuebox.cpp \
-  be/be_valuetype.cpp \
-  be/be_valuetype_fwd.cpp \
-  be/be_visitor.cpp \
-  be/be_visitor_amh_pre_proc.cpp \
-  be/be_visitor_ami_pre_proc.cpp \
-  be/be_visitor_any_extracted_type_decl.cpp \
-  be/be_visitor_arg_traits.cpp \
-  be/be_visitor_argument.cpp \
-  be/be_visitor_array.cpp \
-  be/be_visitor_attribute.cpp \
-  be/be_visitor_ccm_pre_proc.cpp \
-  be/be_visitor_component.cpp \
-  be/be_visitor_component_fwd.cpp \
-  be/be_visitor_component_scope.cpp \
-  be/be_visitor_connector.cpp \
-  be/be_visitor_constant.cpp \
-  be/be_visitor_context.cpp \
-  be/be_visitor_decl.cpp \
-  be/be_visitor_enum.cpp \
-  be/be_visitor_exception.cpp \
-  be/be_visitor_field.cpp \
-  be/be_visitor_home.cpp \
-  be/be_visitor_interface.cpp \
-  be/be_visitor_interface_fwd.cpp \
-  be/be_visitor_module.cpp \
-  be/be_visitor_native.cpp \
-  be/be_visitor_null_return_value.cpp \
-  be/be_visitor_operation.cpp \
-  be/be_visitor_root.cpp \
-  be/be_visitor_scope.cpp \
-  be/be_visitor_sequence.cpp \
-  be/be_visitor_structure.cpp \
-  be/be_visitor_structure_fwd.cpp \
-  be/be_visitor_template_export.cpp \
-  be/be_visitor_traits.cpp \
-  be/be_visitor_typecode.cpp \
-  be/be_visitor_typedef.cpp \
-  be/be_visitor_union.cpp \
-  be/be_visitor_union_branch.cpp \
-  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
-
-noinst_HEADERS += \
-  be_include/TAO_IDL_BE_Export.h \
-  be_include/be_argument.h \
-  be_include/be_array.h \
-  be_include/be_attribute.h \
-  be_include/be_codegen.h \
-  be_include/be_component.h \
-  be_include/be_component_fwd.h \
-  be_include/be_connector.h \
-  be_include/be_constant.h \
-  be_include/be_consumes.h \
-  be_include/be_decl.h \
-  be_include/be_emits.h \
-  be_include/be_enum.h \
-  be_include/be_enum_val.h \
-  be_include/be_eventtype.h \
-  be_include/be_eventtype_fwd.h \
-  be_include/be_exception.h \
-  be_include/be_expression.h \
-  be_include/be_extended_port.h \
-  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 \
-  be_include/be_home.h \
-  be_include/be_identifier_helper.h \
-  be_include/be_interface.h \
-  be_include/be_interface_fwd.h \
-  be_include/be_mirror_port.h \
-  be_include/be_module.h \
-  be_include/be_native.h \
-  be_include/be_null_return_emitter.h \
-  be_include/be_operation.h \
-  be_include/be_param_holder.h \
-  be_include/be_porttype.h \
-  be_include/be_predefined_type.h \
-  be_include/be_provides.h \
-  be_include/be_publishes.h \
-  be_include/be_root.h \
-  be_include/be_scope.h \
-  be_include/be_sequence.h \
-  be_include/be_string.h \
-  be_include/be_structure.h \
-  be_include/be_structure_fwd.h \
-  be_include/be_template_module.h \
-  be_include/be_template_module_inst.h \
-  be_include/be_template_module_ref.h \
-  be_include/be_type.h \
-  be_include/be_typedef.h \
-  be_include/be_union.h \
-  be_include/be_union_branch.h \
-  be_include/be_union_fwd.h \
-  be_include/be_union_label.h \
-  be_include/be_uses.h \
-  be_include/be_util.h \
-  be_include/be_valuebox.h \
-  be_include/be_valuetype.h \
-  be_include/be_valuetype_fwd.h \
-  be_include/be_visitor.h \
-  be_include/be_visitor_amh_pre_proc.h \
-  be_include/be_visitor_ami_pre_proc.h \
-  be_include/be_visitor_any_extracted_type_decl.h \
-  be_include/be_visitor_arg_traits.h \
-  be_include/be_visitor_argument.h \
-  be_include/be_visitor_array.h \
-  be_include/be_visitor_attribute.h \
-  be_include/be_visitor_ccm_pre_proc.h \
-  be_include/be_visitor_component.h \
-  be_include/be_visitor_component_fwd.h \
-  be_include/be_visitor_component_scope.h \
-  be_include/be_visitor_connector.h \
-  be_include/be_visitor_constant.h \
-  be_include/be_visitor_context.h \
-  be_include/be_visitor_decl.h \
-  be_include/be_visitor_enum.h \
-  be_include/be_visitor_exception.h \
-  be_include/be_visitor_field.h \
-  be_include/be_visitor_home.h \
-  be_include/be_visitor_interface.h \
-  be_include/be_visitor_interface_fwd.h \
-  be_include/be_visitor_module.h \
-  be_include/be_visitor_native.h \
-  be_include/be_visitor_null_return_value.h \
-  be_include/be_visitor_operation.h \
-  be_include/be_visitor_root.h \
-  be_include/be_visitor_scope.h \
-  be_include/be_visitor_sequence.h \
-  be_include/be_visitor_structure.h \
-  be_include/be_visitor_structure_fwd.h \
-  be_include/be_visitor_template_export.h \
-  be_include/be_visitor_traits.h \
-  be_include/be_visitor_typecode.h \
-  be_include/be_visitor_typedef.h \
-  be_include/be_visitor_union.h \
-  be_include/be_visitor_union_branch.h \
-  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
-
-## Makefile.TAO_IDL_EXE.am
-
-bin_PROGRAMS = tao_idl
-
-tao_idl_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(srcdir)/include \
-  -I$(srcdir)/be_include \
-  -I$(srcdir)/fe \
-  -I$(TAO_ROOT) \
-  -DTAO_IDL_INCLUDE_DIR="\"$(includedir)/tao\""
-
-tao_idl_SOURCES = \
-  driver/drv_args.cpp \
-  driver/drv_preproc.cpp \
-  tao_idl.cpp \
-  include/drv_extern.h
-
-tao_idl_LDADD = \
-  libTAO_IDL_BE.la \
-  libTAO_IDL_FE.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO_IDL/ast/ast_array.cpp b/TAO_IDL/ast/ast_array.cpp
index ba801392419..848c3b06366 100644
--- a/TAO_IDL/ast/ast_array.cpp
+++ b/TAO_IDL/ast/ast_array.cpp
@@ -135,10 +135,10 @@ AST_Array::compute_dims (UTL_ExprList *ds,
     {
       AST_Expression *orig = iter.item ();
       AST_Param_Holder *ph = orig->param_holder ();
-      
+
       AST_Expression::ExprType ex_type =
         (ph == 0 ? orig->ev ()->et : ph->info ()->const_type_);
-        
+
       AST_Expression *copy = 0;
       ACE_NEW_RETURN (copy,
                       AST_Expression (orig,
@@ -256,11 +256,11 @@ AST_Array::destroy (void)
       delete this->pd_dims[i];
       this->pd_dims[i] = 0;
     }
-    
+
   delete [] this->pd_dims;
   this->pd_dims = 0;
   this->pd_n_dims = 0;
-  
+
   this->AST_ConcreteType::destroy ();
 }
 
diff --git a/TAO_IDL/ast/ast_attribute.cpp b/TAO_IDL/ast/ast_attribute.cpp
index 0c9d5036ce6..795b63fc5f3 100644
--- a/TAO_IDL/ast/ast_attribute.cpp
+++ b/TAO_IDL/ast/ast_attribute.cpp
@@ -114,7 +114,7 @@ AST_Attribute::dump (ACE_OSTREAM_TYPE &o)
   this->dump_i (o, (this->pd_readonly == true
                     ? "readonly attribute "
                     : "attribute "));
-                    
+
   this->AST_Field::dump (o);
 }
 
@@ -137,7 +137,7 @@ AST_Attribute::destroy (void)
       this->pd_get_exceptions->destroy ();
       this->pd_get_exceptions = 0;
     }
-  
+
   if (this->pd_set_exceptions != 0)
     {
       this->pd_set_exceptions->destroy ();
@@ -223,7 +223,7 @@ AST_Attribute::fe_add_get_exceptions (UTL_NameList *t)
           idl_global->err ()->lookup_error (nl_n);
           return 0;
         }
-        
+
       AST_Decl::NodeType nt = d->node_type ();
 
       if (nt != AST_Decl::NT_except
@@ -276,7 +276,7 @@ AST_Attribute::fe_add_set_exceptions (UTL_NameList *t)
           idl_global->err ()->lookup_error (nl_n);
           return 0;
         }
-        
+
       AST_Decl::NodeType nt = d->node_type ();
 
       if (nt != AST_Decl::NT_except
diff --git a/TAO_IDL/ast/ast_component.cpp b/TAO_IDL/ast/ast_component.cpp
index fd68d16fc5e..f70d490f33b 100644
--- a/TAO_IDL/ast/ast_component.cpp
+++ b/TAO_IDL/ast/ast_component.cpp
@@ -13,6 +13,7 @@
 #include "utl_indenter.h"
 #include "utl_err.h"
 #include "global_extern.h"
+#include "fe_extern.h"
 
 AST_Decl::NodeType const
 AST_Component::NT = AST_Decl::NT_component;
@@ -39,6 +40,8 @@ AST_Component::AST_Component (UTL_ScopedName *n,
                    false),
     pd_base_component (base_component)
 {
+  FE_Utils::tmpl_mod_ref_check (this, base_component);
+
   if (!this->imported ())
     {
       idl_global->component_seen_ = true;
@@ -72,7 +75,7 @@ AST_Component::look_in_inherited (UTL_ScopedName *e,
                                   bool full_def_only)
 {
   AST_Decl *d = 0;
-  
+
   if (this->pd_base_component != 0)
     {
       d =
@@ -145,18 +148,19 @@ AST_Component::n_supports (void) const
 
 AST_Decl *
 AST_Component::special_lookup (UTL_ScopedName *e,
-                               bool full_def_only)
+                               bool full_def_only,
+                               AST_Decl *&/*final_parent_decl*/)
 {
   AST_Decl *d = this->look_in_inherited (e, full_def_only);
-  
+
   if (d == 0)
     {
       d = this->look_in_supported (e, full_def_only);
     }
-    
+
   return d;
 }
-                                    
+
 void
 AST_Component::destroy (void)
 {
diff --git a/TAO_IDL/ast/ast_constant.cpp b/TAO_IDL/ast/ast_constant.cpp
index f8daab685bc..47396064b39 100644
--- a/TAO_IDL/ast/ast_constant.cpp
+++ b/TAO_IDL/ast/ast_constant.cpp
@@ -207,7 +207,7 @@ AST_Constant::destroy (void)
       delete this->pd_constant_value;
       this->pd_constant_value = 0;
     }
-    
+
   this->AST_Decl::destroy ();
 }
 
@@ -254,6 +254,8 @@ AST_Constant::exprtype_to_string (void)
       return "CORBA::Float";
     case AST_Expression::EV_double:
       return "CORBA::Double";
+    case AST_Expression::EV_longdouble:
+      return "CORBA::LongDouble";
     case AST_Expression::EV_char:
       return "CORBA::Char";
     case AST_Expression::EV_octet:
@@ -275,7 +277,6 @@ AST_Constant::exprtype_to_string (void)
     case AST_Expression::EV_wstring:
       return "CORBA::WChar *const";
     case AST_Expression::EV_enum:
-    case AST_Expression::EV_longdouble:
     case AST_Expression::EV_any:
     case AST_Expression::EV_object:
       return 0;
diff --git a/TAO_IDL/ast/ast_decl.cpp b/TAO_IDL/ast/ast_decl.cpp
index 5b5555c7f45..e2e7fe673d8 100644
--- a/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO_IDL/ast/ast_decl.cpp
@@ -157,7 +157,8 @@ AST_Decl::AST_Decl (NodeType nt,
     anonymous_ (anonymous),
     typeid_set_ (false),
     last_referenced_as_ (0),
-    prefix_scope_ (0)
+    prefix_scope_ (0),
+    in_tmpl_mod_not_aliased_ (idl_global->in_tmpl_mod_no_alias ())
 {
   // If this is the root node, the filename won't have been set yet.
   UTL_String *fn = idl_global->filename ();
@@ -1274,7 +1275,7 @@ AST_Decl::set_name (UTL_ScopedName *n)
     }
 
   this->pd_name = n;
-  
+
   if (n)
     {
       if (this->pd_local_name)
@@ -1500,7 +1501,8 @@ AST_Decl::masking_checks (AST_Decl *mod)
     }
 
   AST_Module *me_mod = AST_Module::narrow_from_decl (this);
-  if (me_mod)
+
+  if (me_mod != 0)
     {
       AST_Module *po_mod = AST_Module::narrow_from_decl (mod);
       if (po_mod)
@@ -1518,6 +1520,18 @@ AST_Decl::masking_checks (AST_Decl *mod)
   return false;
 }
 
+bool
+AST_Decl::in_tmpl_mod_not_aliased (void) const
+{
+  return this->in_tmpl_mod_not_aliased_;
+}
+
+void
+AST_Decl::in_tmpl_mod_not_aliased (bool val)
+{
+  this->in_tmpl_mod_not_aliased_ = val;
+}
+
 //Narrowing methods for AST_Decl.
 
 IMPL_NARROW_FROM_DECL(AST_Decl)
diff --git a/TAO_IDL/ast/ast_enum.cpp b/TAO_IDL/ast/ast_enum.cpp
index 8af1434ec1c..93855da6494 100644
--- a/TAO_IDL/ast/ast_enum.cpp
+++ b/TAO_IDL/ast/ast_enum.cpp
@@ -264,7 +264,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t)
 
       t1->set_name (sn);
     }
-      
+
   // Already defined and cannot be redefined? Or already used?
   if ((d = this->lookup_for_add (t)) != 0)
     {
diff --git a/TAO_IDL/ast/ast_exception.cpp b/TAO_IDL/ast/ast_exception.cpp
index 685b66273e7..f3598c77ed1 100644
--- a/TAO_IDL/ast/ast_exception.cpp
+++ b/TAO_IDL/ast/ast_exception.cpp
@@ -112,11 +112,30 @@ AST_Exception::~AST_Exception (void)
 bool
 AST_Exception::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 {
+  bool self_test = (list.size () == 0);
+
+  // We should calculate this only once. If it has already been
+  // done, just return it.
+  if (self_test && this->in_recursion_ != -1)
+    {
+      return (this->in_recursion_ == 1);
+    }
+
+  if (list.size () > 1)
+  {
+    if (match_names (this, list))
+      {
+        // this happens when we are not recursed ourselves but instead
+        // are part of another recursive type
+        return false;
+      }
+  }
+
+  list.enqueue_tail(this);
+
   // Proceed if the number of members in our scope is greater than 0.
   if (this->nmembers () > 0)
     {
-      list.enqueue_tail (this);
-
       // Continue until each element is visited.
       for (UTL_ScopeActiveIterator i (this, IK_decls);!i.is_done ();i.next ())
         {
@@ -148,16 +167,18 @@ AST_Exception::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 
           if (type->in_recursion (list))
             {
-              this->in_recursion_ = 1;
+              if (self_test)
+                this->in_recursion_ = 1;
               idl_global->recursive_type_seen_ = true;
-              return this->in_recursion_;
+              return true;
             }
         }
     }
 
   // Not in recursion.
-  this->in_recursion_ = 0;
-  return this->in_recursion_;
+  if (self_test)
+    this->in_recursion_ = 0;
+  return 0; //this->in_recursion_;
 }
 
 // Dump this AST_Exception node to the ostream o.
diff --git a/TAO_IDL/ast/ast_expression.cpp b/TAO_IDL/ast/ast_expression.cpp
index 9a366e7c4e1..3c42c043a6d 100644
--- a/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO_IDL/ast/ast_expression.cpp
@@ -80,6 +80,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "nr_extern.h"
 #include "global_extern.h"
 
+#include "ace/ACE.h"
+
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
@@ -106,11 +108,11 @@ AST_Expression::AST_Expression (UTL_ScopedName *nm)
     param_holder_ (0)
 {
   this->fill_definition_details ();
-  
+
   AST_Decl *d =
     idl_global->scopes ().top_non_null ()->lookup_by_name (nm,
                                                            true);
-  
+
   if (d->node_type () == AST_Decl::NT_param_holder)
     {
       this->param_holder_ =
@@ -519,6 +521,12 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
       return 0;
     }
 
+#if defined (NONNATIVE_LONGDOUBLE)
+  typedef  ACE_CDR::LongDouble::NativeImpl LD_TYPE;
+#else
+  typedef ACE_CDR::LongDouble LD_TYPE;
+#endif // defined NONNATIVE_LONGDOUBLE
+
   switch (t)
     {
     case AST_Expression::EV_short:
@@ -623,6 +631,15 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_short;
           return ev;
         case AST_Expression::EV_longdouble:
+          if (ev->u.ldval > (LD_TYPE) ACE_INT16_MAX
+              || ev->u.ldval < (LD_TYPE) ACE_INT16_MIN)
+            {
+              return 0;
+            }
+
+          ev->u.sval = (short) ev->u.ldval;
+          ev->et = AST_Expression::EV_short;
+          return ev;
         case AST_Expression::EV_string:
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_enum:
@@ -734,6 +751,14 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_ushort;
           return ev;
         case AST_Expression::EV_longdouble:
+          if (ev->u.ldval > (LD_TYPE) ACE_UINT16_MAX)
+            {
+              return 0;
+            }
+
+          ev->u.usval = (unsigned short) ev->u.ldval;
+          ev->et = AST_Expression::EV_ushort;
+          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -828,6 +853,15 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_long;
           return ev;
         case AST_Expression::EV_longdouble:
+          if (ev->u.ldval > (LD_TYPE) ACE_INT32_MAX
+              || ev->u.ldval < (LD_TYPE) ACE_INT32_MIN)
+            {
+              return 0;
+            }
+
+          ev->u.lval = (long) ev->u.ldval;
+          ev->et = AST_Expression::EV_long;
+          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -932,6 +966,14 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_ulong;
           return ev;
         case AST_Expression::EV_longdouble:
+          if (ev->u.ldval > (LD_TYPE) ACE_UINT32_MAX)
+            {
+              return 0;
+            }
+
+          ev->u.ulval = (unsigned long) ev->u.ldval;
+          ev->et = AST_Expression::EV_ulong;
+          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -966,7 +1008,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulonglong:
           if (ev->u.ullval > ACE_INT64_MAX)
             {
-                    return 0;
+              return 0;
             }
 
           ev->u.llval =
@@ -981,7 +1023,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval > (float) ACE_INT64_MAX
               || ev->u.fval < (float) ACE_INT64_MIN)
             {
-                    return 0;
+              return 0;
             }
 
           ev->u.llval = (ACE_CDR::LongLong) ev->u.fval;
@@ -991,7 +1033,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval > (double) ACE_INT64_MAX
               || ev->u.dval < (double) ACE_INT64_MIN)
             {
-                    return 0;
+              return 0;
             }
 
           ev->u.llval = (ACE_CDR::LongLong) ev->u.dval;
@@ -1010,6 +1052,15 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_longlong;
           return ev;
         case AST_Expression::EV_longdouble:
+          if (ev->u.ldval > (LD_TYPE) ACE_INT64_MAX
+              || ev->u.ldval < (LD_TYPE) ACE_INT64_MIN)
+            {
+              return 0;
+            }
+
+          ev->u.llval = (ACE_CDR::LongLong) ev->u.ldval;
+          ev->et = AST_Expression::EV_longlong;
+          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1128,6 +1179,14 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_ulonglong;
           return ev;
         case AST_Expression::EV_longdouble:
+          if (ev->u.ldval > (LD_TYPE) ACE_UINT64_MAX)
+            {
+              return 0;
+            }
+
+          ev->u.ullval = (ACE_CDR::ULongLong) ev->u.ldval;
+          ev->et = AST_Expression::EV_ulonglong;
+          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1178,11 +1237,11 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_bool:
           return ev;
         case AST_Expression::EV_float:
-          ev->u.bval = (ev->u.fval == 0.0) ? false : true;
+          ev->u.bval = ACE::is_equal (ev->u.fval, 0.0f) ? false : true;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_double:
-          ev->u.bval = (ev->u.dval == 0.0) ? false : true;
+          ev->u.bval = ACE::is_equal (ev->u.dval, 0.0) ? false : true;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_char:
@@ -1198,6 +1257,12 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_longdouble:
+          {
+            ev->u.bval =
+              ACE::is_equal<LD_TYPE> (ev->u.ldval, 0.0) ? false : true;
+            ev->et = AST_Expression::EV_bool;
+            return ev;
+          }
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1257,7 +1322,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval > ACE_FLT_MAX
               || ev->u.dval < -(ACE_FLT_MAX))
             {
-                    return 0;
+              return 0;
             }
 
           ev->u.fval = (float) ev->u.dval;
@@ -1276,6 +1341,15 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_float;
           return ev;
         case AST_Expression::EV_longdouble:
+          if (ev->u.ldval > ACE_FLT_MAX
+              || ev->u.ldval < -(ACE_FLT_MAX))
+            {
+              return 0;
+            }
+
+          ev->u.fval = (float) ev->u.ldval;
+          ev->et = AST_Expression::EV_float;
+          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1350,6 +1424,15 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_double;
           return ev;
         case AST_Expression::EV_longdouble:
+          if (ev->u.ldval > ACE_DBL_MAX
+              || ev->u.ldval < -(ACE_DBL_MAX))
+            {
+              return 0;
+            }
+
+          ev->u.dval = (double) ev->u.ldval;
+          ev->et = AST_Expression::EV_double;
+          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1435,7 +1518,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval > (float) ACE_CHAR_MAX
               || ev->u.fval < (float) ACE_CHAR_MIN)
             {
-                    return 0;
+              return 0;
             }
 
           ev->u.cval = (char) ev->u.fval;
@@ -1445,7 +1528,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval > (double) ACE_CHAR_MAX
               || ev->u.dval < (double) ACE_CHAR_MIN)
             {
-                    return 0;
+              return 0;
             }
 
           ev->u.cval = (char) ev->u.dval;
@@ -1465,13 +1548,22 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_octet:
           if (ev->u.oval > (unsigned char) ACE_CHAR_MAX)
             {
-                    return 0;
+              return 0;
             }
 
           ev->u.cval = (char) ev->u.oval;
           ev->et = AST_Expression::EV_char;
           return ev;
         case AST_Expression::EV_longdouble:
+          if (ev->u.ldval > (double) ACE_CHAR_MAX
+              || ev->u.ldval < (double) ACE_CHAR_MIN)
+            {
+              return 0;
+            }
+
+          ev->u.cval = (char) ev->u.ldval;
+          ev->et = AST_Expression::EV_char;
+          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1551,7 +1643,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval > (float) ACE_WCHAR_MAX
               || ev->u.fval < 0)
             {
-                    return 0;
+              return 0;
             }
 
           ev->u.wcval = (ACE_CDR::WChar) ev->u.fval;
@@ -1561,7 +1653,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval > (double) ACE_WCHAR_MAX
               || ev->u.dval < 0)
             {
-                    return 0;
+              return 0;
             }
 
           ev->u.wcval = (ACE_CDR::WChar) ev->u.dval;
@@ -1583,6 +1675,15 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_wchar;
           return ev;
         case AST_Expression::EV_longdouble:
+          if (ev->u.ldval > (double) ACE_WCHAR_MAX
+              || ev->u.ldval < 0)
+            {
+              return 0;
+            }
+
+          ev->u.wcval = (ACE_CDR::WChar) ev->u.ldval;
+          ev->et = AST_Expression::EV_wchar;
+          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1668,7 +1769,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval < 0.0
               || ev->u.fval > (float) ACE_OCTET_MAX)
             {
-                    return 0;
+              return 0;
             }
 
           ev->u.oval = (unsigned char) ev->u.fval;
@@ -1678,7 +1779,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval < 0.0
               || ev->u.dval > (double) ACE_OCTET_MAX)
             {
-                    return 0;
+              return 0;
             }
 
           ev->u.oval = (unsigned char) ev->u.dval;
@@ -1705,6 +1806,17 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_octet:
           return ev;
         case AST_Expression::EV_longdouble:
+          {
+            if (ev->u.ldval < 0.0
+                || ev->u.ldval > (LD_TYPE) ACE_OCTET_MAX)
+              {
+                return 0;
+              }
+
+            ev->u.oval = (unsigned char) ev->u.ldval;
+            ev->et = AST_Expression::EV_octet;
+            return ev;
+          }
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1742,6 +1854,77 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           return 0;
         }
     case AST_Expression::EV_longdouble:
+      switch (ev->et)
+        {
+        case AST_Expression::EV_short:
+          ev->u.ldval = (LD_TYPE) ev->u.sval;
+          ev->et = AST_Expression::EV_longdouble;
+          return ev;
+        case AST_Expression::EV_ushort:
+          ev->u.ldval = (LD_TYPE) ev->u.usval;
+          ev->et = AST_Expression::EV_longdouble;
+          return ev;
+        case AST_Expression::EV_long:
+          ev->u.ldval = (LD_TYPE) ev->u.lval;
+          ev->et = AST_Expression::EV_longdouble;
+          return ev;
+        case AST_Expression::EV_ulong:
+          ev->u.ldval = (LD_TYPE) ev->u.ulval;
+          ev->et = AST_Expression::EV_double;
+          return ev;
+        case AST_Expression::EV_longlong:
+#if ! defined (ACE_LACKS_LONGLONG_T)
+          ev->u.ldval = (LD_TYPE) ev->u.llval;
+          ev->et = AST_Expression::EV_longdouble;
+          return ev;
+#else /* ! defined (ACE_LACKS_LONGLONG_T) */
+          return 0;
+#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
+        case AST_Expression::EV_ulonglong:
+#if ! defined (ACE_LACKS_LONGLONG_T)
+          ev->u.ldval = (LD_TYPE) ((ACE_CDR::LongLong) ev->u.ullval);
+          ev->et = AST_Expression::EV_longdouble;
+          return ev;
+#else /* ! defined (ACE_LACKS_LONGLONG_T) */
+          return 0;
+#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
+        case AST_Expression::EV_bool:
+          {
+            ev->u.ldval = (ev->u.bval == true) ? 1.0 : 0.0;
+            ev->et = AST_Expression::EV_longdouble;
+            return ev;
+          }
+        case AST_Expression::EV_float:
+          ev->u.ldval = (LD_TYPE) ev->u.fval;
+          ev->et = AST_Expression::EV_longdouble;
+          return ev;
+        case AST_Expression::EV_double:
+          ev->u.ldval =(LD_TYPE) ev->u.dval;
+          ev->et = AST_Expression::EV_longdouble;
+          return ev;
+        case AST_Expression::EV_char:
+          ev->u.ldval = (LD_TYPE) ev->u.cval;
+          ev->et = AST_Expression::EV_longdouble;
+          return ev;
+        case AST_Expression::EV_wchar:
+          ev->u.ldval = (LD_TYPE) ev->u.wcval;
+          ev->et = AST_Expression::EV_longdouble;
+          return ev;
+        case AST_Expression::EV_octet:
+          ev->u.ldval = (LD_TYPE) ev->u.oval;
+          ev->et = AST_Expression::EV_longdouble;
+          return ev;
+        case AST_Expression::EV_longdouble:
+          return ev;
+        case AST_Expression::EV_wstring:
+        case AST_Expression::EV_string:
+        case AST_Expression::EV_enum:
+        case AST_Expression::EV_void:
+        case AST_Expression::EV_none:
+        case AST_Expression::EV_any:
+        case AST_Expression::EV_object:
+          return 0;
+        }
     case AST_Expression::EV_wstring:
     case AST_Expression::EV_any:
     case AST_Expression::EV_object:
@@ -1823,12 +2006,12 @@ eval_kind (AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek)
   ACE_NEW_RETURN (newval,
                   AST_Expression::AST_ExprValue,
                   0);
-                  
+
   if (ev != 0)
     {
       *newval = *ev;
     }
-    
+
   AST_Expression::AST_ExprValue *retval = 0;
 
   switch (ek)
@@ -1865,12 +2048,21 @@ eval_kind (AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek)
     case AST_Expression::EK_bool:
       retval = coerce_value (newval, AST_Expression::EV_bool);
       break;
+    case AST_Expression::EK_float:
+      retval = coerce_value (newval, AST_Expression::EV_float);
+      break;
+    case AST_Expression::EK_double:
+      retval = coerce_value (newval, AST_Expression::EV_double);
+      break;
+    case AST_Expression::EK_longdouble:
+      retval = coerce_value (newval, AST_Expression::EV_longdouble);
+      break;
     default:
       break;
   }
-  
+
   // Sometimes the call above to coerce_value() will return an
-  // evaluated newval, other times 0. But a heap-allocated 
+  // evaluated newval, other times 0. But a heap-allocated
   // ExprValue is not always passed to coerce_value(), so we
   // have to manage it here, where we know it is always a 'new'.
   if (retval != newval)
@@ -1878,7 +2070,7 @@ eval_kind (AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek)
       delete newval;
       newval = 0;
     }
-    
+
   return retval;
 }
 
@@ -2006,7 +2198,7 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
       this->pd_v1->ev ()->u.dval * this->pd_v2->ev ()->u.dval;
     break;
   case EC_div:
-    if (this->pd_v2->ev ()->u.dval == 0.0)
+    if (ACE::is_equal (this->pd_v2->ev ()->u.dval, 0.0))
       {
         return 0;
       }
@@ -2173,7 +2365,7 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           return 0;
       }
     }
-    
+
     break;
   case EK_longlong:
     {
@@ -2207,7 +2399,7 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           return 0;
       }
     }
-    
+
     break;
 #endif /* !defined (ACE_LACKS_LONGLONG_T) */
   case EK_ulong:
@@ -2242,7 +2434,7 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           return 0;
       }
     }
-    
+
     break;
   case EK_long:
     {
@@ -2274,9 +2466,9 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           break;
         default:
           return 0;
-      } 
+      }
     }
-    
+
     break;
   case EK_ushort:
     {
@@ -2310,7 +2502,7 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           return 0;
       }
     }
-    
+
     break;
   case EK_short:
     {
@@ -2342,9 +2534,9 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           break;
         default:
           return 0;
-      } 
+      }
     }
-    
+
     break;
   case EK_bool:
     {
@@ -2378,7 +2570,7 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           return 0;
       }
     }
-    
+
     break;
   case EK_octet:
     {
@@ -2406,7 +2598,7 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
             // even if both operands are in range, so we set the ExprType
             // to a large type and then check for overflow.
             retval->u.ulval =
-              this->pd_v1->ev ()->u.ulval << this->pd_v2->ev ()->u.ulval;             
+              this->pd_v1->ev ()->u.ulval << this->pd_v2->ev ()->u.ulval;
             AST_Expression test (retval->u.ulval, EV_ulong);
             AST_ExprValue *ev = test.coerce (EV_octet);
             delete retval;
@@ -2421,11 +2613,11 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           return 0;
       }
     }
-    
+
     break;
   default:
     return 0;
-  }  
+  }
 
   return retval;
 }
@@ -2560,10 +2752,10 @@ AST_Expression::eval_symbol (AST_Expression::EvalKind ek)
       idl_global->err ()->lookup_error (this->pd_n);
       return 0;
     }
-    
+
   // If we are a template parameter placeholder, just skip the
   // rest - nothing needs to be evaluated until instantiation
-  // time.  
+  // time.
   if (this->param_holder_ != 0)
     {
       return 0;
@@ -2706,6 +2898,15 @@ AST_Expression::coerce (AST_Expression::ExprType t)
     case EV_bool:
       tmp = this->eval_internal (EK_bool);
       break;
+    case EV_float:
+      tmp = this->eval_internal (EK_float);
+      break;
+    case EV_double:
+      tmp = this->eval_internal (EK_double);
+      break;
+    case EV_longdouble:
+      tmp = this->eval_internal (EK_longdouble);
+      break;
     default:
       tmp = this->eval_internal (EK_const);
       break;
@@ -2731,7 +2932,6 @@ AST_Expression::coerce (AST_Expression::ExprType t)
 
   switch (this->pd_ev->et)
   {
-    case EV_longdouble:
     case EV_void:
     case EV_none:
       delete copy;
@@ -2776,6 +2976,9 @@ AST_Expression::coerce (AST_Expression::ExprType t)
     case EV_double:
       copy->u.dval = this->pd_ev->u.dval;
       break;
+    case EV_longdouble:
+      copy->u.ldval = this->pd_ev->u.ldval;
+      break;
     case EV_char:
       copy->u.cval = this->pd_ev->u.cval;
       break;
@@ -2864,7 +3067,7 @@ AST_Expression::evaluate (EvalKind ek)
   AST_ExprValue *tmp = eval_kind (this->pd_ev, ek);
   delete this->pd_ev;
   this->pd_ev = tmp;
-  
+
   // Artifact of expressions doing double duty for all template
   // args. At this point, we have knowledge that we must be an
   // enum constant, so we set the expression type here, rather
@@ -2908,9 +3111,9 @@ AST_Expression::operator== (AST_Expression *vc)
     case EV_ulong:
       return this->pd_ev->u.ulval == vc->ev()->u.ulval ? true : false;
     case EV_float:
-      return this->pd_ev->u.fval == vc->ev ()->u.fval ? true : false;
+      return ACE::is_equal (this->pd_ev->u.fval, vc->ev ()->u.fval) ? true : false;
     case EV_double:
-      return this->pd_ev->u.dval == vc->ev ()->u.dval ? true : false;
+      return ACE::is_equal (this->pd_ev->u.dval, vc->ev ()->u.dval) ? true : false;
     case EV_char:
       return this->pd_ev->u.cval == vc->ev ()->u.cval ? true : false;
     case EV_wchar:
@@ -2999,9 +3202,9 @@ AST_Expression::compare (AST_Expression *vc)
     case EV_ulong:
       return this->pd_ev->u.ulval == vc->ev ()->u.ulval ? true : false;
     case EV_float:
-      return this->pd_ev->u.fval == vc->ev ()->u.fval ? true : false;
+      return ACE::is_equal (this->pd_ev->u.fval, vc->ev ()->u.fval) ? true : false;
     case EV_double:
-      return this->pd_ev->u.dval == vc->ev ()->u.dval ? true : false;
+      return ACE::is_equal (this->pd_ev->u.dval, vc->ev ()->u.dval) ? true : false;
     case EV_char:
       return this->pd_ev->u.cval == vc->ev ()->u.cval ? true : false;
     case EV_wchar:
@@ -3311,7 +3514,7 @@ AST_Expression::destroy (void)
 
   delete this->pd_n;
   this->pd_n = 0;
-  
+
   if (this->param_holder_ != 0)
     {
       this->param_holder_->destroy ();
diff --git a/TAO_IDL/ast/ast_factory.cpp b/TAO_IDL/ast/ast_factory.cpp
index 347ec3470c9..6502ee8c86a 100644
--- a/TAO_IDL/ast/ast_factory.cpp
+++ b/TAO_IDL/ast/ast_factory.cpp
@@ -237,7 +237,7 @@ AST_Factory::fe_add_exceptions (UTL_NameList *t)
           idl_global->err ()->lookup_error (nl_n);
           return 0;
         }
-        
+
       AST_Decl::NodeType nt = d->node_type ();
 
       if (nt != AST_Decl::NT_except
@@ -273,7 +273,7 @@ AST_Factory::fe_add_exceptions (UTL_NameList *t)
   t->destroy ();
   delete t;
   t = 0;
-  
+
   return t;
 }
 
diff --git a/TAO_IDL/ast/ast_field.cpp b/TAO_IDL/ast/ast_field.cpp
index fc20472e2d5..af4e4a5e07c 100644
--- a/TAO_IDL/ast/ast_field.cpp
+++ b/TAO_IDL/ast/ast_field.cpp
@@ -96,20 +96,22 @@ AST_Field::AST_Field (AST_Type *ft,
     visibility_ (vis),
     owns_base_type_ (false)
 {
+  FE_Utils::tmpl_mod_ref_check (this, ft);
+
   AST_Decl::NodeType fnt = ft->node_type ();
-  
+
   // In each of these cases, we are responsible for destroying
   // our ref_type_ member.
   this->owns_base_type_ =
     fnt == AST_Decl::NT_array
     || fnt == AST_Decl::NT_sequence
     || fnt == AST_Decl::NT_param_holder;
-    
+
   if (fnt == AST_Decl::NT_param_holder)
     {
       AST_Param_Holder *ph =
         AST_Param_Holder::narrow_from_decl (ft);
-        
+
       if (ph->info ()->type_ == AST_Decl::NT_const)
         {
           idl_global->err ()->not_a_type (ft);
@@ -130,19 +132,19 @@ AST_Field::AST_Field (AST_Decl::NodeType nt,
     owns_base_type_ (false)
 {
   AST_Decl::NodeType fnt = ft->node_type ();
-  
+
   // In each of these cases, we are responsible for destroying
   // our ref_type_ member.
   this->owns_base_type_ =
     fnt == AST_Decl::NT_array
     || fnt == AST_Decl::NT_sequence
     || fnt == AST_Decl::NT_param_holder;
-    
+
   if (fnt == AST_Decl::NT_param_holder)
     {
       AST_Param_Holder *ph =
         AST_Param_Holder::narrow_from_decl (ft);
-        
+
       if (ph->info ()->type_ == AST_Decl::NT_const)
         {
           idl_global->err ()->not_a_type (ft);
@@ -188,7 +190,7 @@ AST_Field::ast_accept (ast_visitor *visitor)
 void
 AST_Field::destroy (void)
 {
-  if (this->owns_base_type_)
+  if (this->owns_base_type_ && this->ref_type_)
     {
       this->ref_type_->destroy ();
       delete this->ref_type_;
diff --git a/TAO_IDL/ast/ast_generator.cpp b/TAO_IDL/ast/ast_generator.cpp
index d490aa13622..73600426c4b 100644
--- a/TAO_IDL/ast/ast_generator.cpp
+++ b/TAO_IDL/ast/ast_generator.cpp
@@ -978,8 +978,8 @@ AST_Generator::create_provides (UTL_ScopedName *n,
                   AST_Provides (n,
                                 provides_type),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 
 AST_Uses *
@@ -993,8 +993,8 @@ AST_Generator::create_uses (UTL_ScopedName *n,
                             uses_type,
                             is_multiple),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 
 AST_Publishes *
@@ -1006,8 +1006,8 @@ AST_Generator::create_publishes (UTL_ScopedName *n,
                   AST_Publishes (n,
                                  publishes_type),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 
 AST_Emits *
@@ -1019,8 +1019,8 @@ AST_Generator::create_emits (UTL_ScopedName *n,
                   AST_Emits (n,
                              emits_type),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 AST_Consumes *
 AST_Generator::create_consumes (UTL_ScopedName *n,
@@ -1031,8 +1031,8 @@ AST_Generator::create_consumes (UTL_ScopedName *n,
                   AST_Consumes (n,
                                 consumes_type),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 
 AST_Extended_Port *
@@ -1045,8 +1045,8 @@ AST_Generator::create_extended_port (
                   AST_Extended_Port (n,
                                      porttype_ref),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 
 AST_Mirror_Port *
@@ -1059,8 +1059,8 @@ AST_Generator::create_mirror_port (
                   AST_Mirror_Port (n,
                                    porttype_ref),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 
 AST_Connector *
@@ -1073,8 +1073,8 @@ AST_Generator::create_connector (
                   AST_Connector (n,
                                  base_connector),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 
 AST_Template_Module *
@@ -1087,10 +1087,10 @@ AST_Generator::create_template_module (
                   AST_Template_Module (n,
                                        template_params),
                   0);
-                  
+
   return retval;
 }
-  
+
 AST_Template_Module_Inst *
 AST_Generator::create_template_module_inst (
   UTL_ScopedName *n,
@@ -1103,10 +1103,10 @@ AST_Generator::create_template_module_inst (
                                             ref,
                                             template_args),
                   0);
-                  
+
   return retval;
 }
-  
+
 AST_Template_Module_Ref *
 AST_Generator::create_template_module_ref (
   UTL_ScopedName *n,
@@ -1119,10 +1119,10 @@ AST_Generator::create_template_module_ref (
                                            ref,
                                            param_refs),
                   0);
-                  
+
   return retval;
 }
-    
+
 AST_Param_Holder *
 AST_Generator::create_param_holder (
   UTL_ScopedName *parameter_name,
@@ -1133,7 +1133,7 @@ AST_Generator::create_param_holder (
                   AST_Param_Holder (parameter_name,
                                     info),
                   0);
-                  
+
   return retval;
 }
 
diff --git a/TAO_IDL/ast/ast_home.cpp b/TAO_IDL/ast/ast_home.cpp
index 986bef94d3a..75d83fa75a6 100644
--- a/TAO_IDL/ast/ast_home.cpp
+++ b/TAO_IDL/ast/ast_home.cpp
@@ -43,9 +43,11 @@ AST_Home::AST_Home (UTL_ScopedName *n,
     pd_primary_key (primary_key),
     owns_primary_key_ (false)
 {
+  FE_Utils::tmpl_mod_ref_check (this, base_home);
+
   AST_ValueType *pk =
     AST_ValueType::narrow_from_decl (primary_key);
-    
+
   if (pk != 0)
     {
       idl_global->primary_keys ().enqueue_tail (pk);
@@ -106,12 +108,12 @@ AST_Home::look_in_supported (UTL_ScopedName *e,
         {
           continue;
         }
-        
+
       AST_Interface *i =
         AST_Interface::narrow_from_decl (*is);
-        
+
       d = (i)->lookup_by_name_r (e, full_def_only);
-                               
+
       if (d != 0)
         {
           break;
@@ -123,15 +125,16 @@ AST_Home::look_in_supported (UTL_ScopedName *e,
 
 AST_Decl *
 AST_Home::special_lookup (UTL_ScopedName *e,
-                          bool full_def_only)
+                          bool full_def_only,
+                          AST_Decl *&/*final_parent_decl*/)
 {
   AST_Decl *d = this->look_in_inherited (e, full_def_only);
-  
+
   if (d == 0)
     {
       d = this->look_in_supported (e, full_def_only);
     }
-    
+
   return d;
 }
 
@@ -172,6 +175,40 @@ AST_Home::primary_key (void) const
 }
 
 void
+AST_Home::transfer_scope_elements (AST_Interface *dst)
+{
+  for (UTL_ScopeActiveIterator src_iter (this, UTL_Scope::IK_decls);
+       ! src_iter.is_done ();
+       src_iter.next ())
+    {
+      AST_Decl *d = src_iter.item ();
+
+      Identifier *local_id = 0;
+      ACE_NEW (local_id,
+               Identifier (d->local_name ()->get_string ()));
+      UTL_ScopedName *last_segment = 0;
+      ACE_NEW (last_segment,
+               UTL_ScopedName (local_id,
+                               0));
+      UTL_ScopedName *full_name =
+        static_cast<UTL_ScopedName *> (dst->name ()->copy ());
+      full_name->nconc (last_segment);
+
+      d->set_name (full_name);
+      dst->add_to_scope (d);
+      d->set_defined_in (dst);
+    }
+
+  // Zero decls so that they are not cleaned twice.
+  long const end = this->pd_decls_used;
+  for (long i = 0; i < end; ++i)
+    {
+      this->pd_decls[i] = 0;
+      --this->pd_decls_used;
+    }
+}
+
+void
 AST_Home::destroy (void)
 {
   // If it's a param holder, it was created on the fly.
@@ -182,44 +219,7 @@ AST_Home::destroy (void)
       this->pd_primary_key = 0;
     }
 
-  // We have to go through these conniptions to destroy
-  // a home because its decls (for which there are no
-  // copy constructors) are assigned to the scope
-  // of the equivalent interface, which will destroy
-  // them. But we still have to destroy the containers
-  // for those references, which may be private or
-  // protected.
-
-  delete [] this->inherits ();
-  delete [] this->inherits_flat ();
-  
-  delete [] this->pd_decls;
-  this->pd_decls = 0;
-  this->pd_decls_allocated = 0;
-  this->pd_decls_used = 0;
-  
-  delete [] this->pd_referenced;
-  this->pd_referenced = 0;
-  this->pd_referenced_allocated = 0;
-  this->pd_referenced_used = 0;
-  
-  // These are stored by copying the Identifier.
-  for (long i = 0; i < this->pd_name_referenced_used; ++i)
-    {
-      this->pd_name_referenced[i]->destroy ();
-      delete this->pd_name_referenced[i];
-      this->pd_name_referenced[i] = 0;
-    }
-  
-  delete [] this->pd_name_referenced;
-  this->pd_name_referenced = 0;
-  this->pd_name_referenced_allocated = 0;
-  this->pd_name_referenced_used = 0;
-  
-  // Skip AST_Interface, since the home's decls
-  // are added to the equivalent interface, and
-  // they should get destroyed there.
-  this->AST_Type::destroy ();
+  this->AST_Interface::destroy ();
 }
 
 void
diff --git a/TAO_IDL/ast/ast_interface.cpp b/TAO_IDL/ast/ast_interface.cpp
index f3a2ed21268..4aafc06dd89 100644
--- a/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO_IDL/ast/ast_interface.cpp
@@ -130,16 +130,20 @@ AST_Interface::AST_Interface (UTL_ScopedName *n,
 {
   this->size_type (AST_Type::VARIABLE); // always the case
   this->has_constructor (true);      // always the case
-  
+
   // Enqueue the param holders (if any) for later destruction.
   // By the time our destroy() is called, it will be too late
   // to iterate over pd_inherits.
+  // Also check for illegal reference to a template module
+  // scope item.
   for (long i = 0; i < nih; ++i)
     {
       if (ih[i]->node_type () == AST_Decl::NT_param_holder)
-        { 
+        {
           this->param_holders_.enqueue_tail (ih[i]);
         }
+
+      FE_Utils::tmpl_mod_ref_check (this, ih[i]);
     }
 }
 
@@ -350,7 +354,7 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i,
   // lookup is all that's needed.
   AST_Decl *d = s->lookup_by_name_local (i->local_name (),
                                          false);
-                                         
+
   AST_Interface *fd = 0;
 
   if (d != 0)
@@ -379,7 +383,7 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i,
       if (fd == 0)
         {
           AST_Decl::NodeType nt = d->node_type ();
-          
+
           if (nt == AST_Decl::NT_struct_fwd || nt == AST_Decl::NT_union_fwd)
             {
               idl_global->err ()->redef_error (i->full_name (),
@@ -418,14 +422,14 @@ 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;
@@ -445,12 +449,12 @@ AST_Interface::redef_clash_populate_r (AST_Type *t)
 
   AST_Decl::NodeType nt = t->node_type ();
   long n = 0;
-  
+
   if (nt != AST_Decl::NT_param_holder)
     {
       AST_Interface *i =
         AST_Interface::narrow_from_decl (t);
-        
+
       AST_Type **parents = i->inherits ();
       long n_parents = i->n_inherits ();
 
@@ -514,7 +518,7 @@ AST_Interface::insert_non_dup (AST_Type *t,
 {
   AST_Interface *f =
     AST_Interface::narrow_from_decl (t);
-    
+
   // Now check if the dequeued element has any ancestors. If yes, insert
   // them inside the queue making sure that there are no duplicates.
   // If we are doing a component, the inheritance list is actually a
@@ -523,7 +527,7 @@ AST_Interface::insert_non_dup (AST_Type *t,
     {
       for (long i = 0; i < f->n_inherits (); ++i)
         {
-          // Retrieve the next parent from which 
+          // Retrieve the next parent from which
           // the dequeued element inherits.
           AST_Type *parent = f->inherits ()[i];
 
@@ -754,7 +758,7 @@ AST_Interface::redef_clash (void)
                         {
                           group2_member_item =
                             group2_member_items.item ();
-                            
+
                           AST_Decl::NodeType nt2 =
                             group2_member_item->node_type ();
 
@@ -776,7 +780,7 @@ AST_Interface::redef_clash (void)
                                 *group1_member,
                                 *group2_member,
                                 group2_member_item);
-                                
+
                               return true;
                             }
                           else if (pid1->case_compare_quiet (pid2))
@@ -788,7 +792,7 @@ AST_Interface::redef_clash (void)
                                     *group1_member,
                                     group1_member_item,
                                     group2_member_item);
-                                    
+
                                   return true;
                                 }
                               else
@@ -835,14 +839,14 @@ AST_Interface::look_in_inherited (UTL_ScopedName *e,
        nis > 0;
        nis--, is++)
     {
-      AST_Interface *i = 
+      AST_Interface *i =
         AST_Interface::narrow_from_decl (*is);
-        
+
       if (i == 0)
         {
           continue;
         }
-        
+
       d = (i)->lookup_by_name_r (e, full_def_only);
       if (d != 0)
         {
@@ -903,22 +907,22 @@ AST_Interface::look_in_inherited_local (Identifier *e,
        nis > 0;
        nis--, is++)
     {
-      AST_Interface *i = 
+      AST_Interface *i =
         AST_Interface::narrow_from_decl (*is);
-        
+
       if (i == 0)
         {
           continue;
         }
-        
+
       d = i->lookup_by_name_local (e, full_def_only);
-      
+
       if (d != 0)
         {
           break;
         }
     }
-    
+
   return d;
 }
 
@@ -1007,7 +1011,7 @@ AST_Interface::analyze_parentage (void)
     }
 
   this->has_mixed_parentage_ = 0;
-  
+
   // Only interfaces may have mixed parentage.
   if (this->node_type () != AST_Decl::NT_interface)
     {
@@ -1035,21 +1039,21 @@ AST_Interface::analyze_parentage (void)
 
   // Must check if we are declared in a template module, in
   // which case no code will be generated, so we should not
-  // be enqueued.                        
+  // be enqueued.
   bool in_tmpl_module = false;
   UTL_Scope *s = this->defined_in ();
-  
+
   while (s != 0)
     {
       AST_Template_Module *m =
         AST_Template_Module::narrow_from_scope (s);
-        
+
       if (m != 0)
         {
           in_tmpl_module = true;
           break;
         }
-        
+
       s = ScopeAsDecl (s)->defined_in ();
     }
 
@@ -1070,22 +1074,23 @@ AST_Interface::legal_for_primary_key (void) const
 
 AST_Decl *
 AST_Interface::special_lookup (UTL_ScopedName *e,
-                               bool full_def_only)
+                               bool full_def_only,
+                               AST_Decl *&final_parent_decl)
 {
   AST_Decl *d = this->look_in_inherited_local (e->head (),
                                                full_def_only);
-  
+
   if (d != 0)
     {
       UTL_Scope *s = DeclAsScope (d);
       UTL_ScopedName *sn =
         static_cast<UTL_ScopedName *> (e->tail ());
-        
+
       return (s != 0 && sn != 0
-                ? s->lookup_by_name_r (sn, full_def_only)
+                ? s->lookup_by_name_r (sn, full_def_only, final_parent_decl)
                 : d);
     }
-    
+
   return 0;
 }
 
@@ -1128,12 +1133,12 @@ AST_Interface::destroy (void)
       delete t;
       t = 0;
     }
-    
+
   // The destroy() we are in gets called twice if we start from
   // be_valuetype or be_eventtype. This line keeps us from
-  // iterating over null pointers the 2nd time.  
+  // iterating over null pointers the 2nd time.
   this->param_holders_.reset ();
-    
+
   delete [] this->pd_inherits;
   this->pd_inherits = 0;
   this->pd_n_inherits = 0;
diff --git a/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO_IDL/ast/ast_interface_fwd.cpp
index 7b68c4f3e9a..501b7f60b9d 100644
--- a/TAO_IDL/ast/ast_interface_fwd.cpp
+++ b/TAO_IDL/ast/ast_interface_fwd.cpp
@@ -203,6 +203,7 @@ AST_InterfaceFwd::full_definition (void)
 void
 AST_InterfaceFwd::set_full_definition (AST_Interface *nfd)
 {
+  this->pd_full_definition->destroy ();
   delete this->pd_full_definition;
   this->pd_full_definition = nfd;
 }
diff --git a/TAO_IDL/ast/ast_module.cpp b/TAO_IDL/ast/ast_module.cpp
index 7c03eaacb54..910864ecd74 100644
--- a/TAO_IDL/ast/ast_module.cpp
+++ b/TAO_IDL/ast/ast_module.cpp
@@ -110,7 +110,8 @@ AST_Module::AST_Module (UTL_ScopedName *n, AST_Module *previous)
     pd_has_nested_valuetype_ (0),
     previous_opening_ (previous),
     last_in_same_parent_scope_ (this),
-    from_inst_ (0)
+    from_inst_ (0),
+    from_ref_ (0)
 {
   // NOTE previous passed into this constructor should be
   // the FIRST module that is a previous opening of this same
@@ -264,7 +265,8 @@ AST_Module::look_in_prev_mods_local (Identifier *e,
 
 AST_Decl *
 AST_Module::look_in_prev_mods (UTL_ScopedName *e,
-                               bool full_def_only)
+                               bool full_def_only,
+                               AST_Decl *&final_parent_decl)
 {
   for (AST_Module *po = this->previous_opening_;
        po;
@@ -283,6 +285,7 @@ AST_Module::look_in_prev_mods (UTL_ScopedName *e,
                 static_cast<UTL_ScopedName *> (e->tail ());
               if (!sn)
                 {
+                  final_parent_decl= static_cast<AST_Decl *> (po);
                   return d; // Nothing left in path, found wanted name
                 }
 
@@ -290,7 +293,7 @@ AST_Module::look_in_prev_mods (UTL_ScopedName *e,
               if (s)
                 {
                   // Recurse down what is left of the path
-                  return s->lookup_by_name_r (sn, full_def_only);
+                  return s->lookup_by_name_r (sn, full_def_only, final_parent_decl);
                 }
 
               // Find next match, this one didn't work out.
@@ -319,11 +322,24 @@ AST_Module::from_inst (AST_Template_Module_Inst *node)
   this->from_inst_ = node;
 }
 
+AST_Template_Module_Ref *
+AST_Module::from_ref (void) const
+{
+  return this->from_ref_;
+}
+
+void
+AST_Module::from_ref (AST_Template_Module_Ref *node)
+{
+  this->from_ref_ = node;
+}
+
 AST_Decl *
 AST_Module::special_lookup (UTL_ScopedName *e,
-                            bool full_def_only)
+                            bool full_def_only,
+                            AST_Decl *&final_parent_decl)
 {
-  return this->look_in_prev_mods (e, full_def_only);
+  return this->look_in_prev_mods (e, full_def_only, final_parent_decl);
 }
 
 //================================================
@@ -346,12 +362,14 @@ AST_Module::fe_add_module (AST_Module *t)
         {
           AST_Decl *parent = ScopeAsDecl (scope);
           const char *prefix_holder = parent->prefix ();
+
           if (!prefix_holder)
             {
               break; // We have reached global scope.
             }
 
           t->prefix (const_cast<char *> (prefix_holder));
+
           if (ACE_OS::strcmp (t->prefix (), ""))
             {
               break;
@@ -364,7 +382,7 @@ AST_Module::fe_add_module (AST_Module *t)
   // Already defined and cannot be redefined? Or already used?
   AST_Module *m = 0;
   AST_Decl *d = this->lookup_for_add (t);
-  
+
   if (d)
     {
       if (!FE_Utils::can_be_redefined (d, t))
diff --git a/TAO_IDL/ast/ast_operation.cpp b/TAO_IDL/ast/ast_operation.cpp
index 818aa3f2241..037629214bd 100644
--- a/TAO_IDL/ast/ast_operation.cpp
+++ b/TAO_IDL/ast/ast_operation.cpp
@@ -203,7 +203,7 @@ AST_Operation::destroy (void)
       this->pd_exceptions->destroy ();
       this->pd_exceptions = 0;
     }
-  
+
   this->UTL_Scope::destroy ();
   this->AST_Decl::destroy ();
 }
@@ -301,7 +301,7 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t)
     {
       return 0;
     }
-    
+
   UTL_ScopedName *nl_n = 0;
   AST_Type *fe = 0;
   AST_Decl *d = 0;
@@ -318,9 +318,9 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t)
           idl_global->err ()->lookup_error (nl_n);
           return 0;
         }
-        
+
       AST_Decl::NodeType nt = d->node_type ();
-        
+
       switch (nt)
         {
           case AST_Decl::NT_except:
@@ -329,32 +329,32 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t)
             {
               AST_Param_Holder *ph =
                 AST_Param_Holder::narrow_from_decl (d);
-                
+
               nt = ph->info ()->type_;
-                
+
               if (nt != AST_Decl::NT_except
                   && nt != AST_Decl::NT_type)
                 {
                   idl_global->err ()->mismatched_template_param (
                     ph->info ()->name_.c_str ());
                 }
-                
+
               break;
             }
           case AST_Decl::NT_typedef:
             {
               AST_Typedef *td =
                 AST_Typedef::narrow_from_decl (d);
-                
+
               nt = td->primitive_base_type ()->node_type ();
-              
+
               if (nt != AST_Decl::NT_except)
                 {
                   idl_global->err ()->error1 (
                     UTL_Error::EIDL_ILLEGAL_RAISES,
                     this);
                 }
-                
+
               break;
             }
           case AST_Decl::NT_native:
@@ -363,27 +363,27 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t)
               int compare =
                 ACE_OS::strcmp (d->local_name ()->get_string (),
                                 "UserExceptionBase");
-                                
+
               if (compare != 0)
                 {
                   idl_global->err ()->error1 (
                     UTL_Error::EIDL_ILLEGAL_RAISES,
                     this);
                 }
-                
+
               break;
             }
           default:
             idl_global->err ()->error1 (
               UTL_Error::EIDL_ILLEGAL_RAISES,
               this);
-              
+
             break;
         };
 
       bool oneway_op =
         (this->flags () == AST_Operation::OP_oneway);
-        
+
       fe = AST_Type::narrow_from_decl (d);
 
       if (oneway_op && fe != 0)
diff --git a/TAO_IDL/ast/ast_sequence.cpp b/TAO_IDL/ast/ast_sequence.cpp
index 1827823d37a..ca7e6f705fb 100644
--- a/TAO_IDL/ast/ast_sequence.cpp
+++ b/TAO_IDL/ast/ast_sequence.cpp
@@ -107,13 +107,15 @@ AST_Sequence::AST_Sequence (AST_Expression *ms,
     pd_base_type (bt),
     owns_base_type_ (false)
 {
+  FE_Utils::tmpl_mod_ref_check (this, bt);
+
   AST_Decl::NodeType bnt = bt->node_type ();
-    
+
   if (bnt == AST_Decl::NT_param_holder)
     {
       AST_Param_Holder *ph =
         AST_Param_Holder::narrow_from_decl (bt);
-        
+
       if (ph->info ()->type_ == AST_Decl::NT_const)
         {
           idl_global->err ()->not_a_type (bt);
@@ -159,12 +161,10 @@ AST_Sequence::~AST_Sequence (void)
 bool
 AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 {
-  // We should calculate this only once. If it has already been
-  // done, just return it.
-  if (this->in_recursion_ != -1)
-    {
-      return this->in_recursion_;
-    }
+  if (list.size () == 0) // only structs, unions and valuetypes can be recursive
+    return false;
+
+  list.enqueue_tail(this);
 
   AST_Type *type = AST_Type::narrow_from_decl (this->base_type ());
   AST_Decl::NodeType nt = type->node_type ();
@@ -193,25 +193,23 @@ AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
       return false;
     }
 
-  if (this->match_names (type, list))
+  bool recursion_found = false;
+  AST_Type** recursable_type = 0;
+  list.get (recursable_type, 0);
+  if (!ACE_OS::strcmp (type->full_name (),
+                           (*recursable_type)->full_name ()))
     {
       // They match.
-      this->in_recursion_ = 1;
+      recursion_found = true;
       idl_global->recursive_type_seen_ = true;
     }
   else
     {
       // Check the element type.
-      list.enqueue_tail (type);
-      this->in_recursion_ = type->in_recursion (list);
-
-      if (this->in_recursion_ == 1)
-        {
-          idl_global->recursive_type_seen_ = true;
-        }
+      recursion_found = type->in_recursion (list);
     }
 
-  return this->in_recursion_;
+  return recursion_found;
 }
 
 // Redefinition of inherited virtual operations.
diff --git a/TAO_IDL/ast/ast_structure.cpp b/TAO_IDL/ast/ast_structure.cpp
index 2ebd955d41d..f62ed5c32a3 100644
--- a/TAO_IDL/ast/ast_structure.cpp
+++ b/TAO_IDL/ast/ast_structure.cpp
@@ -125,19 +125,32 @@ AST_Structure::~AST_Structure (void)
 bool
 AST_Structure::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 {
+  bool self_test = (list.size () == 0);
+
   // We should calculate this only once. If it has already been
   // done, just return it.
-  if (this->in_recursion_ != -1)
+  if (self_test && this->in_recursion_ != -1)
     {
-      return this->in_recursion_;
+      return (this->in_recursion_ == 1);
     }
 
+  if (list.size () > 1)
+  {
+    if (match_names (this, list))
+      {
+        // We've found ourselves outside of a sequence.
+        // This happens when we are not recursed ourselves but instead
+        // are part of another recursed type which is part of us.
+        // f.i. union containing sequence of struct containing the union as member.
+        return false;
+      }
+  }
+
+  list.enqueue_tail(this);
+
   // Proceed if the number of members in our scope is greater than 0.
   if (this->nmembers () > 0)
     {
-      ACE_Unbounded_Queue<AST_Type *> scope_list = list;
-      scope_list.enqueue_tail (this);
-
       // Initialize an iterator to iterate over our scope.
       // Continue until each element is visited.
       for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls);
@@ -170,18 +183,20 @@ AST_Structure::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
                                 0);
             }
 
-          if (type->in_recursion (scope_list))
+          if (type->in_recursion (list))
             {
-              this->in_recursion_ = 1;
+              if (self_test)
+                this->in_recursion_ = 1;
               idl_global->recursive_type_seen_ = true;
-              return this->in_recursion_;
+              return true;
             }
         }
     }
 
   // Not in recursion.
-  this->in_recursion_ = 0;
-  return this->in_recursion_;
+  if (self_test)
+    this->in_recursion_ = 0;
+  return false;
 }
 
 int
diff --git a/TAO_IDL/ast/ast_structure_fwd.cpp b/TAO_IDL/ast/ast_structure_fwd.cpp
index 724ba6ada86..7b1b8b62781 100644
--- a/TAO_IDL/ast/ast_structure_fwd.cpp
+++ b/TAO_IDL/ast/ast_structure_fwd.cpp
@@ -56,8 +56,8 @@ AST_StructureFwd::full_definition (void)
 void
 AST_StructureFwd::set_full_definition (AST_Structure *nfd)
 {
+  this->pd_full_definition->destroy ();
   delete this->pd_full_definition;
-  this->pd_full_definition = 0;
   this->pd_full_definition = nfd;
 
   // In case it's not already set.
diff --git a/TAO_IDL/ast/ast_template_module.cpp b/TAO_IDL/ast/ast_template_module.cpp
index 6b6d3dfbba4..e362f620737 100644
--- a/TAO_IDL/ast/ast_template_module.cpp
+++ b/TAO_IDL/ast/ast_template_module.cpp
@@ -50,9 +50,9 @@ AST_Template_Module::match_arg_names (FE_Utils::T_ARGLIST *args)
                                   this);
       return false;
     }
-    
+
   size_t slot = 0UL;
-  
+
   for (FE_Utils::T_ARGLIST::CONST_ITERATOR i (*args);
        !i.done ();
        i.advance (), ++slot)
@@ -60,41 +60,41 @@ AST_Template_Module::match_arg_names (FE_Utils::T_ARGLIST *args)
       AST_Decl **item = 0;
       i.next (item);
       AST_Decl *d = *item;
-      
+
       if (d->node_type () == AST_Decl::NT_typedef)
         {
           AST_Typedef *td =
             AST_Typedef::narrow_from_decl (d);
-            
+
           d = td->primitive_base_type ();
         }
-        
+
       FE_Utils::T_Param_Info *param = 0;
       (void) this->template_params_->get (param, slot);
       const char *s = 0;
-      
+
       if (! this->match_one_param (param, d))
         {
           UTL_ScopedName *n = d->name ();
-          
+
           if (n == 0)
             {
               AST_Constant *c =
                 AST_Constant::narrow_from_decl (d);
-                
+
               s = c->exprtype_to_string ();
             }
           else
             {
               s = d->full_name ();
             }
-        
+
           idl_global->err ()->mismatched_template_param (s);
-            
+
           return false;
         }
     }
-    
+
   return true;
 }
 
@@ -104,7 +104,7 @@ AST_Template_Module::match_param_refs (UTL_StrList *refs,
 {
   UTL_Scope *s = decl_scope;
   AST_Template_Module *enclosing = 0;
-  
+
   while (enclosing == 0 && s != 0)
     {
       enclosing = AST_Template_Module::narrow_from_scope (s);
@@ -117,20 +117,20 @@ AST_Template_Module::match_param_refs (UTL_StrList *refs,
     {
       FE_Utils::T_Param_Info *enclosing_param =
         enclosing->find_param (i.item ());
-        
+
       if (enclosing_param == 0)
         {
           // Enclosing param not found
           return false;
         }
-        
+
       if (!this->match_param_by_type (enclosing_param))
         {
           // Referenced param type not matched to enclosiong param.
           return false;
         }
     }
-    
+
   return true;
 }
 
@@ -171,35 +171,35 @@ AST_Template_Module::match_one_param (FE_Utils::T_Param_Info *param,
     {
       return true;
     }
-    
+
   if (d->node_type () == AST_Decl::NT_typedef)
     {
       AST_Typedef *td = AST_Typedef::narrow_from_decl (d);
       d = td->primitive_base_type ();
     }
-    
+
   AST_Decl::NodeType other_type = d->node_type ();
-    
+
   if (other_type == AST_Decl::NT_const)
     {
       AST_Constant *c =
         AST_Constant::narrow_from_decl (d);
-        
+
       AST_Expression *ex = c->constant_value ();
-       
+
       AST_Expression::AST_ExprValue *ev =
         ex->check_and_coerce (param->const_type_,
                               param->enum_const_type_decl_);
-        
+
       if (ev == 0)
         {
           idl_global->err ()->coercion_error (ex,
                                               param->const_type_);
         }
-        
+
       return (ev != 0);
     }
-    
+
   return (param->type_ == other_type);
 }
 
@@ -213,13 +213,13 @@ AST_Template_Module::find_param (UTL_String *name)
     {
       FE_Utils::T_Param_Info *param = 0;
       i.next (param);
-      
+
       if (param->name_ == name->get_string ())
         {
           return param;
         }
     }
-    
+
   return 0;
 }
 
@@ -234,7 +234,7 @@ AST_Template_Module::match_param_by_type (
     {
       FE_Utils::T_Param_Info *my_param = 0;
       i.next (my_param);
-      
+
       if (param->type_ == my_param->type_)
         {
           if (param->type_ == AST_Decl::NT_const)
@@ -261,10 +261,10 @@ AST_Template_Module::match_param_by_type (
             }
         }
     }
-    
+
   idl_global->err ()->mismatched_template_param (
     param->name_.c_str ());
-    
+
   return false;
 }
 
diff --git a/TAO_IDL/ast/ast_template_module_inst.cpp b/TAO_IDL/ast/ast_template_module_inst.cpp
index e51d39128f9..7aad3c2c364 100644
--- a/TAO_IDL/ast/ast_template_module_inst.cpp
+++ b/TAO_IDL/ast/ast_template_module_inst.cpp
@@ -33,7 +33,7 @@ AST_Template_Module_Inst::ref (void) const
     AST_Template_Module::narrow_from_decl (this->field_type ());
 }
 
-FE_Utils::T_ARGLIST *
+FE_Utils::T_ARGLIST const *
 AST_Template_Module_Inst::template_args (void) const
 {
   return this->template_args_;
diff --git a/TAO_IDL/ast/ast_template_module_ref.cpp b/TAO_IDL/ast/ast_template_module_ref.cpp
index 56b5f0a7d2b..63b0d10f862 100644
--- a/TAO_IDL/ast/ast_template_module_ref.cpp
+++ b/TAO_IDL/ast/ast_template_module_ref.cpp
@@ -20,7 +20,8 @@ AST_Template_Module_Ref::AST_Template_Module_Ref (
     AST_Field (AST_Decl::NT_module,
                ref,
                n),
-    param_refs_ (param_refs)
+    param_refs_ (param_refs),
+    processed_ (false)
 {
 }
 
@@ -35,7 +36,7 @@ AST_Template_Module_Ref::ref (void) const
     AST_Template_Module::narrow_from_decl (this->field_type ());
 }
 
-UTL_StrList const *
+UTL_StrList *
 AST_Template_Module_Ref::param_refs (void) const
 {
   return this->param_refs_;
@@ -77,5 +78,17 @@ AST_Template_Module_Ref::adjust_found (
   return ignore_fwd ? 0 : this;
 }
 
+bool
+AST_Template_Module_Ref::processed (void) const
+{
+  return this->processed_;
+}
+
+void
+AST_Template_Module_Ref::processed (bool val)
+{
+  this->processed_ = val;
+}
+
 IMPL_NARROW_FROM_DECL (AST_Template_Module_Ref)
 
diff --git a/TAO_IDL/ast/ast_type.cpp b/TAO_IDL/ast/ast_type.cpp
index e2c9a671c73..57b5eb5fb31 100644
--- a/TAO_IDL/ast/ast_type.cpp
+++ b/TAO_IDL/ast/ast_type.cpp
@@ -138,7 +138,7 @@ AST_Type::compute_size_type (void)
 }
 
 bool
-AST_Type::in_recursion (ACE_Unbounded_Queue<AST_Type *> &)
+AST_Type::in_recursion (ACE_Unbounded_Queue<AST_Type *> & /*list*/)
 {
   // By default we are not involved in recursion.
   return 0;
@@ -298,14 +298,14 @@ AST_Type::nested_name (const char* local_name,
   // generations of "::" here and there, which have now been removed.
   UTL_Scope *s = this->defined_in ();
   AST_Decl *def_scope = s != 0 ? ScopeAsDecl (s) : 0;
-  
+
   // TypeCode is a special case for predefined types, since it's
   // defined in the CORBA module.
   bool in_root =
     (def_scope != 0 && def_scope->node_type () == AST_Decl::NT_root)
     || ((this->node_type () == AST_Decl::NT_pre_defined
         && ACE_OS::strcmp (this->flat_name (), "CORBA_TypeCode") == 0));
-        
+
   ACE_CString fname (this->full_name ());
   bool corba_type = fname.find ("CORBA::") == 0;
 
@@ -544,6 +544,4 @@ AST_Type::destroy (void)
   this->AST_Decl::destroy ();
 }
 
-
-
 IMPL_NARROW_FROM_DECL(AST_Type)
diff --git a/TAO_IDL/ast/ast_union.cpp b/TAO_IDL/ast/ast_union.cpp
index 43b0de85503..48eaee7214e 100644
--- a/TAO_IDL/ast/ast_union.cpp
+++ b/TAO_IDL/ast/ast_union.cpp
@@ -235,12 +235,31 @@ AST_Union::default_index (void)
 bool
 AST_Union::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 {
+  bool self_test = (list.size () == 0);
+
+  // We should calculate this only once. If it has already been
+  // done, just return it.
+  if (self_test && this->in_recursion_ != -1)
+    {
+      return (this->in_recursion_ == 1);
+    }
+
+  if (list.size () > 1)
+  {
+    if (match_names (this, list))
+      {
+        // We've found ourselves outside of a sequence.
+        // This happens when we are not recursed ourselves but instead
+        // are part of another recursive type
+        return false;
+      }
+  }
+
+  list.enqueue_tail(this);
+
   // Proceed if the number of members in our scope is greater than 0.
   if (this->nmembers () > 0)
     {
-      ACE_Unbounded_Queue<AST_Type *> scope_list = list;
-      scope_list.enqueue_tail (this);
-
       // Initialize an iterator to iterate thru our scope.
       // Continue until each element is visited.
       for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls);
@@ -274,18 +293,20 @@ AST_Union::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
                                 0);
             }
 
-          if (type->in_recursion (scope_list))
+          if (type->in_recursion (list))
             {
-              this->in_recursion_ = 1;
+              if (self_test)
+                this->in_recursion_ = 1;
               idl_global->recursive_type_seen_ = true;
-              return this->in_recursion_;
+              return true;
             }
         }
     }
 
   // Not in recursion.
-  this->in_recursion_ = 0;
-  return this->in_recursion_;
+  if (self_test)
+    this->in_recursion_ = 0;
+  return 0;
 }
 
 // Look up the default branch in union.
diff --git a/TAO_IDL/ast/ast_union_branch.cpp b/TAO_IDL/ast/ast_union_branch.cpp
index 7e376d9eaa0..67fdfe5d8b4 100644
--- a/TAO_IDL/ast/ast_union_branch.cpp
+++ b/TAO_IDL/ast/ast_union_branch.cpp
@@ -187,14 +187,14 @@ AST_UnionBranch::add_labels (AST_Union *u)
     }
 
   const bool enum_labels = (u->udisc_type () == AST_Expression::EV_enum);
-  
+
   for (UTL_LabellistActiveIterator i (this->pd_ll);
        !i.is_done ();
        i.next ())
     {
       AST_Expression *ex = i.item ()->label_val ();
       UTL_ScopedName *n = ex->n ();
-      
+
       if (n)
         {
           u->add_to_name_referenced (n->first_component ());
@@ -208,13 +208,13 @@ AST_UnionBranch::add_labels (AST_Union *u)
           ex->ev ()->et = AST_Expression::EV_enum;
           AST_Enum *disc = AST_Enum::narrow_from_decl (u->disc_type ());
           AST_EnumVal *dval = disc->lookup_by_value (ex);
-          
+
           if (dval == 0)
             {
               idl_global->err ()->incompatible_disc_error (disc, ex);
               throw Bailout ();
             }
-            
+
           ex->ev ()->u.eval = dval->constant_value ()->ev ()->u.ulval;
         }
     }
diff --git a/TAO_IDL/ast/ast_valuebox.cpp b/TAO_IDL/ast/ast_valuebox.cpp
index 832f6cf478c..97d841e7c18 100644
--- a/TAO_IDL/ast/ast_valuebox.cpp
+++ b/TAO_IDL/ast/ast_valuebox.cpp
@@ -15,14 +15,14 @@ AST_ValueBox::AST_ValueBox (UTL_ScopedName *n,
     AST_Type (AST_Decl::NT_valuebox,
               n),
     AST_ConcreteType (AST_Decl::NT_valuebox, n),
-    pd_boxed_type (boxed_type) 
+    pd_boxed_type (boxed_type)
 {
 }
 
 AST_ValueBox::~AST_ValueBox (void)
 {
 }
- 
+
 AST_Type *
 AST_ValueBox::boxed_type (void) const
 {
@@ -32,7 +32,7 @@ AST_ValueBox::boxed_type (void) const
 void
 AST_ValueBox::dump (ACE_OSTREAM_TYPE &o)
 {
-  
+
   this->dump_i (o, "valuetype ");
 
   this->local_name ()->dump (o);
diff --git a/TAO_IDL/ast/ast_valuetype.cpp b/TAO_IDL/ast/ast_valuetype.cpp
index b61076f528e..e3fbd93f917 100644
--- a/TAO_IDL/ast/ast_valuetype.cpp
+++ b/TAO_IDL/ast/ast_valuetype.cpp
@@ -58,16 +58,20 @@ AST_ValueType::AST_ValueType (UTL_ScopedName *n,
   // Enqueue the param holders (if any) for later destruction.
   // By the time our destroy() is called, it will be too late
   // to iterate over pd_inherits.
+  // Also check for illegal template module scope reference,
+  // as long as we're iterating.
   for (long i = 0; i < n_supports; ++i)
     {
       if (supports[i]->node_type () == AST_Decl::NT_param_holder)
         {
           this->param_holders_.enqueue_tail (supports[i]);
         }
+
+      FE_Utils::tmpl_mod_ref_check (this, supports[i]);
     }
-   
+
   if (inherits_concrete != 0)
-    {  
+    {
       if (inherits_concrete->node_type () == AST_Decl::NT_param_holder)
         {
           this->param_holders_.enqueue_tail (inherits_concrete);
@@ -82,14 +86,50 @@ AST_ValueType::~AST_ValueType (void)
 bool
 AST_ValueType::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 {
+  bool self_test = (list.size () == 0);
+
   // We should calculate this only once. If it has already been
   // done, just return it.
-  if (this->in_recursion_ != -1)
+  if (self_test && this->in_recursion_ != -1)
     {
-      return this->in_recursion_;
+      return (this->in_recursion_ == 1);
     }
 
-  list.enqueue_tail (this);
+  if (list.size ())
+  {
+    if (match_names (this, list))
+    {
+      // A valuetype may contain itself as a member (nesting == 1)
+      // which is not a problem., but we could also match ourselves when
+      // we are not recursed ourselves but instead are part of another
+      // recursive type.
+      if (list.size () == 1)
+      {
+        idl_global->recursive_type_seen_ = true;
+        return true;
+      }
+      else
+      {
+        // get the head element which is the type being tested
+        AST_Type** recursable_type = 0;
+        list.get (recursable_type, 0);
+        // Check if we are the possibly recursive type being tested
+        if (!ACE_OS::strcmp (this->full_name (),
+                                 (*recursable_type)->full_name ()))
+        {
+          // match, so we're recursive
+          idl_global->recursive_type_seen_ = true;
+          return true;
+        }
+        else
+        {
+          return false;
+        }
+      }
+    }
+  }
+
+  list.enqueue_tail(this);
 
   for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls);
        !si.is_done ();
@@ -114,19 +154,6 @@ AST_ValueType::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 
       AST_Type *type = field->field_type ();
 
-      // A valuetype may contain itself as a member. This will not
-      // cause a problem when checking if the valuetype itself is
-      // recursive, but if another valuetype contains a recursive
-      // one, the string compare below is not sufficient, and we
-      // will go into an infinite recursion of calls to in_recursion ;-).
-      // The check below will catch that use case.
-      if (this == type)
-        {
-          this->in_recursion_ = 1;
-          idl_global->recursive_type_seen_ = true;
-          return this->in_recursion_;
-        }
-
       if (type == 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -135,15 +162,6 @@ AST_ValueType::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
                             0);
         }
 
-      // IDL doesn't have such a feature as name reuse so
-      // just compare fully qualified names.
-      if (this->match_names (this, list))
-        {
-          this->in_recursion_ = 1;
-          idl_global->recursive_type_seen_ = true;
-          return this->in_recursion_;
-        }
-
       if (type->node_type () == AST_Decl::NT_typedef)
         {
           AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
@@ -153,15 +171,18 @@ AST_ValueType::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
       // Now hand over to our field type.
       if (type->in_recursion (list))
         {
-          this->in_recursion_ = 1;
+          if (self_test)
+            this->in_recursion_ = 1;
           idl_global->recursive_type_seen_ = true;
-          return this->in_recursion_;
+          return true;
         }
 
     } // end of for loop
 
-  this->in_recursion_ = 0;
-  return this->in_recursion_;
+  // Not in recursion.
+  if (self_test)
+    this->in_recursion_ = 0;
+  return false;
 }
 
 void
@@ -255,12 +276,12 @@ AST_ValueType::look_in_supported (UTL_ScopedName *e,
         {
           continue;
         }
-        
+
       AST_Interface *i =
         AST_Interface::narrow_from_decl (*is);
-        
+
       d = (i)->lookup_by_name_r (e, full_def_only);
-                               
+
       if (d != 0)
         {
           if (d_before == 0)
@@ -303,15 +324,16 @@ AST_ValueType::look_in_supported (UTL_ScopedName *e,
 
 AST_Decl *
 AST_ValueType::special_lookup (UTL_ScopedName *e,
-                               bool full_def_only)
+                               bool full_def_only,
+                               AST_Decl *&/*final_parent_decl*/)
 {
   AST_Decl *d = this->look_in_inherited (e, full_def_only);
-  
+
   if (d == 0)
     {
       d = this->look_in_supported (e, full_def_only);
     }
-    
+
   return d;
 }
 
@@ -379,7 +401,7 @@ void
 AST_ValueType::destroy (void)
 {
   this->AST_Interface::destroy ();
-  
+
   delete [] this->pd_supports;
   this->pd_supports = 0;
   this->pd_n_supports = 0;
diff --git a/TAO_IDL/ast/ast_valuetype_fwd.cpp b/TAO_IDL/ast/ast_valuetype_fwd.cpp
index cfc3b778dcc..953861c4b7d 100644
--- a/TAO_IDL/ast/ast_valuetype_fwd.cpp
+++ b/TAO_IDL/ast/ast_valuetype_fwd.cpp
@@ -50,6 +50,7 @@ AST_ValueTypeFwd::ast_accept (ast_visitor *visitor)
 void
 AST_ValueTypeFwd::destroy (void)
 {
+  this->AST_InterfaceFwd::destroy ();
 }
 
 
diff --git a/TAO_IDL/ast/ast_visitor_context.cpp b/TAO_IDL/ast/ast_visitor_context.cpp
index 7c0f3866528..fe9d4071e54 100644
--- a/TAO_IDL/ast/ast_visitor_context.cpp
+++ b/TAO_IDL/ast/ast_visitor_context.cpp
@@ -43,14 +43,14 @@ ast_visitor_context::template_params (FE_Utils::T_PARAMLIST_INFO *params)
   this->template_params_ = params;
 }
 
-FE_Utils::T_ARGLIST *
+FE_Utils::T_ARGLIST const *
 ast_visitor_context::template_args (void) const
 {
   return this->template_args_;
 }
 
 void
-ast_visitor_context::template_args (FE_Utils::T_ARGLIST *args)
+ast_visitor_context::template_args (FE_Utils::T_ARGLIST const *args)
 {
   this->template_args_ = args;
 }
diff --git a/TAO_IDL/ast/ast_visitor_reifying.cpp b/TAO_IDL/ast/ast_visitor_reifying.cpp
index 7bee77ff986..b99f4a47e5d 100644
--- a/TAO_IDL/ast/ast_visitor_reifying.cpp
+++ b/TAO_IDL/ast/ast_visitor_reifying.cpp
@@ -32,6 +32,8 @@
 
 #include "utl_identifier.h"
 #include "utl_exprlist.h"
+#include "utl_strlist.h"
+#include "utl_string.h"
 #include "nr_extern.h"
 
 ast_visitor_reifying::ast_visitor_reifying (
@@ -521,17 +523,17 @@ ast_visitor_reifying::visit_string (AST_String *node)
                   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);
-                  
+
   return 0;
 }
 
@@ -548,7 +550,7 @@ int
 ast_visitor_reifying::visit_param_holder (AST_Param_Holder *node)
 {
   size_t i = 0;
-  FE_Utils::T_ARGLIST *t_args =
+  FE_Utils::T_ARGLIST const *t_args =
     this->ctx_->template_args ();
 
   for (FE_Utils::T_PARAMLIST_INFO::ITERATOR iter (
@@ -559,7 +561,15 @@ ast_visitor_reifying::visit_param_holder (AST_Param_Holder *node)
       FE_Utils::T_Param_Info *item = 0;
       iter.next (item);
 
-      if (item->name_ == node->info ()->name_)
+      ACE_CString name (item->name_);
+
+      /// The param holder's info->name_ may be the same as the
+      /// node's local name, but if the node comes from an
+      /// alias, info->name_ will be the name of the alias's
+      /// referenced template module parameter, while the local
+      /// name will be that of the corresponding alias param
+      /// name, which is what we want.
+      if (name == node->local_name ()->get_string ())
         {
           AST_Decl **ret_ptr = 0;
 
@@ -588,7 +598,7 @@ ast_visitor_reifying::visit_param_holder (AST_Param_Holder *node)
                      ACE_TEXT ("ast_visitor_reifying::")
                      ACE_TEXT ("visit_param_holder() - no match for ")
                      ACE_TEXT ("template param %C in %C\n"),
-                     node->info ()->name_.c_str (),
+                     node->local_name ()->get_string (),
                      ScopeAsDecl (idl_global->scopes ().top ())->full_name ()),
                     -1);
 }
diff --git a/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp b/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
index b360b7b505d..a1831f2efd0 100644
--- a/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
+++ b/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
@@ -56,6 +56,7 @@ ast_visitor_tmpl_module_inst::ast_visitor_tmpl_module_inst (
       ast_visitor_context *ctx,
       bool ref_only)
   : ast_visitor (),
+    tmi_ (0),
     ctx_ (ctx),
     for_eventtype_ (false),
     for_finder_ (false),
@@ -682,13 +683,24 @@ ast_visitor_tmpl_module_inst::visit_module (AST_Module *node)
     idl_global->gen ()->create_module (idl_global->scopes ().top (),
                                        &sn);
 
+  added_module->from_inst (this->tmi_);
+
   AST_Module *m =
     AST_Module::narrow_from_scope (idl_global->scopes ().top ());
-  
+
   m->fe_add_module (added_module);
 
   idl_global->scopes ().push (added_module);
 
+  AST_Template_Module_Ref *ref = node->from_ref ();
+  UTL_StrList const *old_refs = idl_global->alias_params ();
+
+  if (ref != 0)
+    {
+      added_module->from_ref (ref);
+      idl_global->alias_params (ref->param_refs ());
+    }
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -701,6 +713,8 @@ ast_visitor_tmpl_module_inst::visit_module (AST_Module *node)
   // Restore scope stack.
   idl_global->scopes ().pop ();
 
+  idl_global->alias_params (const_cast<UTL_StrList *> (old_refs));
+
   return 0;
 }
 
@@ -729,18 +743,19 @@ ast_visitor_tmpl_module_inst::visit_template_module_inst (
   AST_Template_Module_Inst *node)
 {
   this->ctx_->template_args (node->template_args ());
+  this->tmi_ = node;
 
   AST_Module *instance =
     idl_global->gen ()->create_module (idl_global->scopes ().top (),
                                        node->name ());
-                                       
+
   instance->from_inst (node);
 
   // Add the new module to the scope containing the template
   // module instantiation.
   AST_Module *m =
     AST_Module::narrow_from_scope (idl_global->scopes ().top ());
-    
+
   m->fe_add_module (instance);
 
   // Update our scope management.
@@ -900,7 +915,7 @@ ast_visitor_tmpl_module_inst::visit_interface (AST_Interface *node)
                              node->is_local (),
                              node->is_abstract (),
                              true);
-                             
+
   AST_Interface *added_iface =
     idl_global->gen ()->create_interface (header.name (),
                                           header.inherits (),
@@ -918,7 +933,7 @@ ast_visitor_tmpl_module_inst::visit_interface (AST_Interface *node)
     }
 
   idl_global->scopes ().top ()->add_to_scope (added_iface);
-  
+
   // If this interface has both abstract and concrete parents,
   // extra code needs to be generated for it, such as overrides
   // of _is_nil() and release().
@@ -1020,6 +1035,15 @@ ast_visitor_tmpl_module_inst::visit_argument (AST_Argument *node)
     AST_Type::narrow_from_decl (
       this->reify_type (node->field_type ()));
 
+  if (t == 0)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("ast_visitor_tmpl_module_inst::")
+                         ACE_TEXT ("visit_argument - ")
+                         ACE_TEXT ("reify_type failed\n")),
+                        -1);
+    }
+
   AST_Argument *added_arg =
     idl_global->gen ()->create_argument (node->direction (),
                                          t,
@@ -1045,8 +1069,6 @@ ast_visitor_tmpl_module_inst::visit_typedef (AST_Typedef *node)
                                         false,
                                         false);
 
-  //AST_Decl *d = ScopeAsDecl (idl_global->scopes ().top ());
-
   idl_global->scopes ().top ()->add_to_scope (added_td);
 
   return 0;
@@ -1162,7 +1184,7 @@ ast_visitor_tmpl_module_inst::visit_factory (AST_Factory *node)
   UTL_ScopedName sn (&id, 0);
 
   AST_Factory *added_factory = 0;
-  
+
   if (this->for_finder_)
     {
       added_factory =
@@ -1198,7 +1220,7 @@ ast_visitor_tmpl_module_inst::visit_factory (AST_Factory *node)
 
   // In case it was set for this call.
   this->for_finder_ = false;
-  
+
   return 0;
 }
 
@@ -1224,7 +1246,6 @@ ast_visitor_tmpl_module_inst::reify_type (AST_Decl *d)
       // owns param holders.
       if (d->node_type () == AST_Decl::NT_param_holder)
         {
-          //const char *s = d->full_name ();
           return
             idl_global->scopes ().top ()->lookup_by_name (
               d->name (),
diff --git a/TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp b/TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp
index 172f4d6fcc3..1a05135ffc4 100644
--- a/TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp
+++ b/TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp
@@ -32,13 +32,21 @@ int
 ast_visitor_tmpl_module_ref::visit_template_module_ref (
   AST_Template_Module_Ref *node)
 {
-  // This mehod is an override of the base class, and creates
+  /// This traversal should be done only once. If the template
+  /// module this ref is contained in is itself aliased later,
+  /// we don't want to execute the steps below again.
+  if (node->processed ())
+    {
+      return 0;
+    }
+
+  // This method is an override of the base class, and creates
   // the necessary implied IDL in the template module.
   // Later, the base class visitor then skips the alias and
   // processes the implied IDL. It's a bit inefficient to have
   // the implied IDL in both the template module and its
   // instantiations, but otherwise the lookup issues are
-  // extremely complicated. This approach allows 
+  // extremely complicated. This approach allows
   // lookup_by_name_local() to just skip over the alias and
   // match the module of the same name occurring later in the
   // template module scope. From that vantage point, the
@@ -47,19 +55,43 @@ ast_visitor_tmpl_module_ref::visit_template_module_ref (
   // module scope (see ast_visitor_reifying::check_and_store()
   // and ast_visitor_reifying::template_module_rel_name()).
   UTL_ScopedName sn (node->local_name (), 0);
-  
+
   AST_Module *added_module =
     idl_global->gen ()->create_module (idl_global->scopes (). top (),
                                        &sn);
-                                       
+
+  added_module->from_ref (node);
+  added_module->from_inst (this->tmi_);
+
   idl_global->scopes ().top ()->add_to_scope (added_module);
-  
+
   idl_global->scopes ().push (added_module);
-  
+
+  /// Replace the current param list (from the reference) with
+  /// the the list from the referenced template module, since
+  /// that's what will be search for any matches. We save the
+  /// current list to restore after the traversal.
+
+  if (idl_global->for_new_holder () == 0)
+    {
+      idl_global->for_new_holder (
+        const_cast<UTL_StrList *> (
+          node->param_refs ()));
+    }
+
+  UTL_StrList const *old_refs = idl_global->alias_params ();
+  FE_Utils::T_PARAMLIST_INFO const *old_params =
+    idl_global->current_params ();
+
+  idl_global->alias_params (
+    const_cast<UTL_StrList *> (node->param_refs ()));
+  AST_Template_Module *tm = node->ref ();
+  idl_global->current_params (tm->template_params ());
+
   // Visit the scope of referenced template module. No need to
   // update the template parameter list since its param list has
   // to be a subset of the one we're in.
-  if (this->visit_scope (node->ref ()) != 0)
+  if (this->visit_scope (tm) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("ast_visitor_tmpl_module_ref::")
@@ -67,9 +99,17 @@ ast_visitor_tmpl_module_ref::visit_template_module_ref (
                          ACE_TEXT ("visit_scope failed\n")),
                         -1);
     }
-    
+
+  /// Restore the global param list state.
+  idl_global->current_params (
+    const_cast<FE_Utils::T_PARAMLIST_INFO *> (
+      old_params));
+  idl_global->for_new_holder (0);
+  idl_global->alias_params (const_cast<UTL_StrList *> (old_refs));
+
   idl_global->scopes ().pop ();
-  
+
+  node->processed (true);
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_argument.cpp b/TAO_IDL/be/be_argument.cpp
index c18855c84f3..5473f5bc46f 100644
--- a/TAO_IDL/be/be_argument.cpp
+++ b/TAO_IDL/be/be_argument.cpp
@@ -68,6 +68,4 @@ be_argument::destroy (void)
   this->AST_Argument::destroy ();
 }
 
-
-
 IMPL_NARROW_FROM_DECL (be_argument)
diff --git a/TAO_IDL/be/be_array.cpp b/TAO_IDL/be/be_array.cpp
index 12b46af4791..67bc226edf6 100644
--- a/TAO_IDL/be/be_array.cpp
+++ b/TAO_IDL/be/be_array.cpp
@@ -258,14 +258,14 @@ be_array::gen_ostream_operator (TAO_OutStream *os,
       << "const " << arg_name.c_str () << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "strm << \"" << this->name () << "\";" <<  be_nl << be_nl;
+      << "strm << \"" << this->name () << "\";" <<  be_nl_2;
 
   ACE_CDR::ULong ndims = this->n_dims ();
   ACE_CDR::ULong i = 0;
 
   for (i = 0; i < ndims; ++i)
     {
-      *os << "strm << \"[\";" << be_nl << be_nl;
+      *os << "strm << \"[\";" << be_nl_2;
 
       AST_Expression *expr = this->dims ()[i];
 
diff --git a/TAO_IDL/be/be_attribute.cpp b/TAO_IDL/be/be_attribute.cpp
index 4d5c0c633d2..9e8b87e2633 100644
--- a/TAO_IDL/be/be_attribute.cpp
+++ b/TAO_IDL/be/be_attribute.cpp
@@ -38,7 +38,9 @@ be_attribute::be_attribute (bool ro,
                    local,
                    abstract),
     be_decl (AST_Decl::NT_attr,
-             n)
+             n),
+    be_field (ft,
+              n)
 {
   if (!this->imported () && !this->is_local ())
     {
diff --git a/TAO_IDL/be/be_codegen.cpp b/TAO_IDL/be/be_codegen.cpp
index 371d8121084..a6cd7ca4d61 100644
--- a/TAO_IDL/be/be_codegen.cpp
+++ b/TAO_IDL/be/be_codegen.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    be_codegen.cpp
@@ -52,8 +51,6 @@ TAO_CodeGen::TAO_CodeGen (void)
     ciao_conn_header_ (0),
     ciao_conn_source_ (0),
     ciao_ami_conn_idl_ (0),
-    ciao_ami_rh_impl_header_ (0),
-    ciao_ami_rh_impl_source_ (0),
     gperf_input_filename_ (0)
 {
 }
@@ -147,7 +144,7 @@ TAO_CodeGen::start_client_header (const char *fname)
 
   *this->client_header_ << be_nl << "// TAO_IDL - Generated from" << be_nl
                         << "// " << __FILE__ << ":" << __LINE__
-                        << be_nl << be_nl;
+                        << be_nl_2;
 
   // Generate the #ident string, if any.
   this->gen_ident_string (this->client_header_);
@@ -156,67 +153,21 @@ TAO_CodeGen::start_client_header (const char *fname)
   bool const got_pidl =
     (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl");
 
-  if (be_global->gen_dcps_type_support_only ())
+  if (!got_pidl)
     {
-      if (!got_pidl)
-        {
-          // Generate #ifndef string which is different from
-          // no dcps type support.
-          this->gen_ifndef_string (fname,
-                                  this->client_header_,
-                                  "_TAO_IDL_DDS_",
-                                  "_H_");
-        }
-      else
-        {
-          // Generate the #ifndef clause.
-          this->gen_ifndef_string (fname,
-                                  this->client_header_,
-                                  "_TAO_PIDL_DDS_",
-                                  "_H_");
-        }
-
-      if (be_global->stub_export_include () != 0)
-        {
-          *this->client_header_ << "\n#include /**/ \""
-                                << be_global->stub_export_include ()
-                                << "\"";
-        }
-
-      // DDS/DCPS marshaling.
-      this->gen_cond_file_include (
-          true,
-          "dds/DCPS/Serializer.h",
-          this->client_header_
-        );
-
-      // Generate the includes of tao version sequence header.
-      this->client_header_->print ("\n#include \"tao/%s\"",
-                                          fname);
-
-      // Add #if 0 to disable TAO specific code
-      *this->client_header_ << be_nl << be_nl
-        << "#if 0 // disable TAO specific code"
-        << be_nl << be_nl;
+      // Generate the #ifndef clause.
+      this->gen_ifndef_string (fname,
+                               this->client_header_,
+                               "_TAO_IDL_",
+                               "_H_");
     }
   else
     {
-      if (!got_pidl)
-        {
-          // Generate the #ifndef clause.
-          this->gen_ifndef_string (fname,
-                                  this->client_header_,
-                                  "_TAO_IDL_",
-                                  "_H_");
-        }
-      else
-        {
-          // Generate the #ifndef clause.
-          this->gen_ifndef_string (fname,
-                                  this->client_header_,
-                                  "_TAO_PIDL_",
-                                  "_H_");
-        }
+      // Generate the #ifndef clause.
+      this->gen_ifndef_string (fname,
+                               this->client_header_,
+                               "_TAO_PIDL_",
+                               "_H_");
     }
 
   if (be_global->pre_include () != 0)
@@ -292,7 +243,7 @@ TAO_CodeGen::start_client_header (const char *fname)
           *this->client_header_ << "\n#include <string>"
                                 << "\n#include <vector>\n";
         }
-        
+
       this->gen_stub_hdr_includes ();
 
       size_t const nfiles = idl_global->n_included_idl_files ();
@@ -311,20 +262,6 @@ TAO_CodeGen::start_client_header (const char *fname)
         {
           char* idl_name = idl_global->included_idl_files ()[j];
 
-          if (be_global->gen_dcps_type_support ())
-            {
-              // When -Gdcps is enabled, if the "tao/*Seq.pidl" is
-              // included in a DDS idl file then the generated code
-              // will include the dds version idl generated code.
-              if (ACE_OS::strstr (idl_name, "tao/") == idl_name
-                && ACE_OS::strstr (idl_name, "Seq.pidl"))
-                {
-                  idl_name[0] = 'd';
-                  idl_name[1] = 'd';
-                  idl_name[2] = 's';
-                }
-            }
-
           // Make a String out of it.
           UTL_String idl_name_str = idl_name;
 
@@ -350,7 +287,7 @@ TAO_CodeGen::start_client_header (const char *fname)
             }
         }
     }
-    
+
   for (ACE_Unbounded_Queue<char *>::CONST_ITERATOR i (
          idl_global->ciao_ami_idl_fnames ());
        !i.done ();
@@ -358,7 +295,7 @@ TAO_CodeGen::start_client_header (const char *fname)
     {
       char **tmp = 0;
       i.next (tmp);
-      
+
       // Make a String out of it.
       UTL_String idl_name_str (*tmp);
 
@@ -424,7 +361,7 @@ TAO_CodeGen::start_client_stubs (const char *fname)
 
   *this->client_stubs_ << be_nl << "// TAO_IDL - Generated from" << be_nl
                        << "// " << __FILE__ << ":" << __LINE__
-                       << be_nl << be_nl;
+                       << be_nl_2;
 
   this->gen_stub_src_includes ();
 
@@ -509,27 +446,16 @@ TAO_CodeGen::start_server_header (const char *fname)
   *this->server_header_ << be_nl
                         << "// TAO_IDL - Generated from" << be_nl
                         << "// " << __FILE__ << ":" << __LINE__
-                        << be_nl << be_nl;
+                        << be_nl_2;
 
   // Generate the ident string, if any.
   this->gen_ident_string (this->server_header_);
 
-  if (be_global->gen_dcps_type_support_only ())
-    {
-      // Generate the #ifndef clause.
-      this->gen_ifndef_string (fname,
-                               this->server_header_,
-                               "_TAO_IDL_DDS_",
-                               "_H_");
-    }
-  else
-    {
-      // Generate the #ifndef clause.
-      this->gen_ifndef_string (fname,
-                              this->server_header_,
-                              "_TAO_IDL_",
-                              "_H_");
-    }
+  // Generate the #ifndef clause.
+  this->gen_ifndef_string (fname,
+                           this->server_header_,
+                           "_TAO_IDL_",
+                           "_H_");
 
   if (be_global->pre_include () != 0)
     {
@@ -581,7 +507,7 @@ TAO_CodeGen::start_server_header (const char *fname)
   // copyright text and an informative message.
   if (!be_global->gen_skel_files ())
     {
-      *this->server_header_ << be_nl << be_nl
+      *this->server_header_ << be_nl_2
                             << "// Skeleton file generation suppressed with "
                             << "command line option -SS";
 
@@ -678,7 +604,7 @@ TAO_CodeGen::start_server_template_header (const char *fname)
                                  << be_nl
                                  << "// " << __FILE__
                                  << ":" << __LINE__
-                                 << be_nl << be_nl;
+                                 << be_nl_2;
 
   // Generate the ident string, if any.
   this->gen_ident_string (this->server_template_header_);
@@ -729,9 +655,9 @@ TAO_CodeGen::start_server_skeletons (const char *fname)
       return -1;
     }
 
-  *this->server_skeletons_ << be_nl << be_nl << "// TAO_IDL - Generated from "
+  *this->server_skeletons_ << be_nl_2 << "// TAO_IDL - Generated from "
                            << be_nl << "// " << __FILE__ << ":" << __LINE__
-                           << be_nl << be_nl;
+                           << be_nl_2;
 
   // Generate the ident string, if any.
   this->gen_ident_string (this->server_skeletons_);
@@ -806,7 +732,7 @@ TAO_CodeGen::start_server_template_skeletons (const char *fname)
   *this->server_template_skeletons_ << be_nl << "// TAO_IDL - Generated from "
                                     << be_nl << "// "
                                     << __FILE__ << ":" << __LINE__
-                                    << be_nl << be_nl;
+                                    << be_nl_2;
 
   // Generate the ident string, if any.
   this->gen_ident_string (this->server_template_skeletons_);
@@ -918,7 +844,7 @@ TAO_CodeGen::start_anyop_header (const char *fname)
   *this->anyop_header_ << be_nl
                        << "// TAO_IDL - Generated from" << be_nl
                        << "// " << __FILE__ << ":" << __LINE__
-                       << be_nl << be_nl;
+                       << be_nl_2;
 
   // Generate the #ident string, if any.
   this->gen_ident_string (this->anyop_header_);
@@ -953,18 +879,29 @@ TAO_CodeGen::start_anyop_header (const char *fname)
   // Generate the include statement for AnyTypeCode
   *this->anyop_header_ << "\n#include \"tao/AnyTypeCode/Any.h\"\n";
 
-  const char *tao_prefix = "";
+  ACE_CString tao_prefix;
   ACE_CString pidl_checker (idl_global->filename ()->get_string ());
   bool const got_tao_pidl =
     (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl");
 
   // If we're here and we have a .pidl file, we need to generate
-  // the *C.h include from the tao library.
+  // the *C.h include from the tao library, or from the command line
+  // override path.
   if (got_tao_pidl)
     {
-      tao_prefix = "tao/";
+      const char *stub_incl_dir = be_global->stub_include_dir ();
+
+      if (stub_incl_dir == 0)
+        {
+          tao_prefix = "tao/";
+        }
+      else
+        {
+          tao_prefix = stub_incl_dir;
+          tao_prefix += '/';
+        }
     }
-  
+
   // Generate the include statement for the client header. We just
   // need to put only the base names. Path info is not required.
   if (be_global->safe_include ())
@@ -977,7 +914,7 @@ TAO_CodeGen::start_anyop_header (const char *fname)
     }
   else
     {
-      *this->anyop_header_ << "\n#include \"" << tao_prefix
+      *this->anyop_header_ << "\n#include \"" << tao_prefix.c_str ()
                            << be_global->be_get_client_hdr_fname ()
                            << "\"";
     }
@@ -1043,7 +980,7 @@ TAO_CodeGen::start_anyop_header (const char *fname)
             }
         }
     }
-    
+
   *this->anyop_header_ << "\n";
 
   // Begin versioned namespace support after initial headers have been
@@ -1142,7 +1079,7 @@ TAO_CodeGen::start_ciao_svnt_header (const char *fname)
   os << be_nl
      << "// TAO_IDL - Generated from" << be_nl
      << "// " << __FILE__ << ":" << __LINE__
-     << be_nl << be_nl;
+     << be_nl_2;
 
   // Generate the #ident string, if any.
   this->gen_ident_string (this->ciao_svnt_header_);
@@ -1216,7 +1153,7 @@ TAO_CodeGen::start_ciao_svnt_source (const char *fname)
   os << be_nl
      << "// TAO_IDL - Generated from" << be_nl
      << "// " << __FILE__ << ":" << __LINE__
-     << be_nl << be_nl;
+     << be_nl_2;
 
   // Generate the #ident string, if any.
   this->gen_ident_string (this->ciao_svnt_source_);
@@ -1267,11 +1204,6 @@ TAO_CodeGen::start_ciao_exec_header (const char *fname)
 
   TAO_OutStream &os = *this->ciao_exec_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_exec_header_);
 
@@ -1326,13 +1258,6 @@ TAO_CodeGen::start_ciao_exec_source (const char *fname)
                         -1);
     }
 
-  TAO_OutStream &os = *this->ciao_exec_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_exec_source_);
 
@@ -1423,7 +1348,7 @@ TAO_CodeGen::start_ciao_conn_header (const char *fname)
   os << be_nl
      << "// TAO_IDL - Generated from" << be_nl
      << "// " << __FILE__ << ":" << __LINE__
-     << be_nl << be_nl;
+     << be_nl_2;
 
   // Generate the #ident string, if any.
   this->gen_ident_string (this->ciao_conn_header_);
@@ -1554,130 +1479,6 @@ TAO_CodeGen::ciao_ami_conn_idl (void)
   return this->ciao_ami_conn_idl_;
 }
 
-int
-TAO_CodeGen::start_ciao_ami_rh_impl_header (const char *fname)
-{
-  // Clean up between multiple files.
-  delete this->ciao_ami_rh_impl_header_;
-
-  ACE_NEW_RETURN (this->ciao_ami_rh_impl_header_,
-                  TAO_OutStream,
-                  -1);
-
-  int status =
-    this->ciao_ami_rh_impl_header_->open (
-      fname,
-      TAO_OutStream::CIAO_AMI_RH_IMPL_HDR);
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO_CodeGen::")
-                         ACE_TEXT ("start_ciao_ami_rh_impl_header - ")
-                         ACE_TEXT ("Error opening file\n")),
-                        -1);
-    }
-
-  TAO_OutStream &os = *this->ciao_ami_rh_impl_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_ami_rh_impl_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_ami_rh_impl_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_standard_include (
-    this->ciao_ami_rh_impl_header_,
-    be_global->be_get_client_hdr_fname (true));
-
-  *this->ciao_ami_rh_impl_header_ << be_global->versioning_begin ();
-
-  return 0;
-}
-
-TAO_OutStream *
-TAO_CodeGen::ciao_ami_rh_impl_header (void)
-{
-  return this->ciao_ami_rh_impl_header_;
-}
-
-int
-TAO_CodeGen::start_ciao_ami_rh_impl_source (const char *fname)
-{
-  // Clean up between multiple files.
-  delete this->ciao_ami_rh_impl_source_;
-
-  ACE_NEW_RETURN (this->ciao_ami_rh_impl_source_,
-                  TAO_OutStream,
-                  -1);
-
-  int status =
-    this->ciao_ami_rh_impl_source_->open (
-      fname,
-      TAO_OutStream::CIAO_AMI_RH_IMPL_SRC);
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO_CodeGen::")
-                         ACE_TEXT ("start_ciao_ami_rh_impl_source - ")
-                         ACE_TEXT ("Error opening file\n")),
-                        -1);
-    }
-
-  TAO_OutStream &os = *this->ciao_ami_rh_impl_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_ami_rh_impl_source_);
-
-  this->gen_standard_include (
-    this->ciao_ami_rh_impl_source_,
-    be_global->be_get_ciao_ami_conn_impl_hdr_fname (true));
-
-  return 0;
-}
-
-TAO_OutStream *
-TAO_CodeGen::ciao_ami_rh_impl_source (void)
-{
-  return this->ciao_ami_rh_impl_source_;
-}
-
 // Set the server header stream.
 int
 TAO_CodeGen::start_implementation_header (const char *fname)
@@ -1699,7 +1500,7 @@ TAO_CodeGen::start_implementation_header (const char *fname)
   *this->implementation_header_ << be_nl << "// TAO_IDL - Generated from "
                                 << be_nl << "// "
                                 << __FILE__ << ":" << __LINE__
-                                << be_nl << be_nl;
+                                << be_nl_2;
 
   // Generate the ident string, if any.
   this->gen_ident_string (this->implementation_header_);
@@ -1721,9 +1522,8 @@ TAO_CodeGen::start_implementation_header (const char *fname)
 
   if (idl_global->local_iface_seen_)
     {
-      *this->implementation_header_ << "#include \"tao/LocalObject.h\"\n\n";
+      *this->implementation_header_ << "#include \"tao/LocalObject.h\"\n";
     }
-
   return 0;
 }
 
@@ -1757,7 +1557,7 @@ TAO_CodeGen::start_implementation_skeleton (const char *fname)
   *this->implementation_skeleton_ << be_nl << "// TAO_IDL - Generated from "
                                   << be_nl << "// "
                                   << __FILE__ << ":" << __LINE__
-                                  << be_nl << be_nl;
+                                  << be_nl_2;
 
   // Generate the ident string, if any.
   this->gen_ident_string (this->implementation_skeleton_);
@@ -1784,7 +1584,7 @@ TAO_CodeGen::end_client_header (void)
 {
   // Generate the <<= and >>= operators here.
 
-  *this->client_header_ << be_nl << be_nl << "// TAO_IDL - Generated from"
+  *this->client_header_ << be_nl_2 << "// TAO_IDL - Generated from"
                         << be_nl << "// " << __FILE__ << ":"
                         << __LINE__ << be_nl;
 
@@ -1812,13 +1612,6 @@ TAO_CodeGen::end_client_header (void)
                             << "\"\n\n";
     }
 
-  if (be_global->gen_dcps_type_support_only ())
-    {
-      *this->client_header_ << be_nl << be_nl
-        << "#endif /* end of disabling TAO specific code */"
-        << be_nl << be_nl;
-    }
-
   *this->client_header_ << "#endif /* ifndef */\n"
                         << "\n";
 
@@ -1857,7 +1650,7 @@ TAO_CodeGen::end_server_header (void)
   /// Otherwise just generate the post_include(), if any,
   /// and the #endif.
   if (be_global->gen_skel_files ())
-    {    
+    {
       // End versioned namespace support.  Do not place include directives
       // before this.
       *os << be_global->versioning_end ();
@@ -1884,16 +1677,16 @@ TAO_CodeGen::end_server_header (void)
 
   if (be_global->post_include () != 0)
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "#include /**/ \""
           << be_global->post_include ()
           << "\"";
     }
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "#endif /* ifndef */\n"
       << "\n";
-                        
+
   return 0;
 }
 
@@ -1958,7 +1751,7 @@ TAO_CodeGen::end_implementation_header (const char *fname)
 int
 TAO_CodeGen::end_server_template_header (void)
 {
-  *this->server_template_header_ << be_nl << be_nl << "// TAO_IDL - Generated from "
+  *this->server_template_header_ << be_nl_2 << "// TAO_IDL - Generated from "
                                  << be_nl << "// "
                                  << __FILE__ << ":" << __LINE__ << "\n";
 
@@ -2145,37 +1938,6 @@ TAO_CodeGen::end_ciao_ami_conn_idl (void)
   return 0;
 }
 
-int
-TAO_CodeGen::end_ciao_ami_rh_impl_header (void)
-{
-  *this->ciao_ami_rh_impl_header_ << be_nl << be_nl << "// TAO_IDL - Generated from"
-                                  << be_nl << "// " << __FILE__ << ":"
-                                  << __LINE__ << be_nl;
-
-  // End versioned namespace support before remaining include
-  // directives at end of file.
-  *this->ciao_ami_rh_impl_header_ << be_global->versioning_end ();
-
-  if (be_global->post_include () != 0)
-    {
-      *this->ciao_ami_rh_impl_header_ << "\n\n#include /**/ \""
-                                      << be_global->post_include ()
-                                      << "\"";
-    }
-
-  *this->ciao_ami_rh_impl_header_ << "\n\n#endif /* ifndef */\n";
-
-  return 0;
-}
-
-int
-TAO_CodeGen::end_ciao_ami_rh_impl_source (void)
-{
-  *this->ciao_ami_rh_impl_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
@@ -2184,10 +1946,7 @@ TAO_CodeGen::end_ciao_ami_rh_impl_source (void)
 void
 TAO_CodeGen::gperf_input_stream (TAO_OutStream *os)
 {
-#if !defined (linux) && !defined (__QNX__) && !defined (__GLIBC__)
-  // This causes a seg fault on Linux RH 5.1.  Let it leak . . .
   delete this->gperf_input_stream_;
-#endif /* ! linux */
   this->gperf_input_stream_ = os;
 }
 
@@ -2217,7 +1976,7 @@ TAO_CodeGen::gen_ident_string (TAO_OutStream *stream) const
 
   if (str != 0)
     {
-      *stream << "#" << str << be_nl << be_nl;
+      *stream << "#" << str << be_nl_2;
     }
 }
 
@@ -2446,7 +2205,7 @@ TAO_CodeGen::gen_ifndef_string (const char *fname,
       extension = fname;
     }
 
-  ACE_OS::sprintf (macro_name, prefix);
+  ACE_OS::sprintf (macro_name, "%s", prefix);
 
   size_t offset = ACE_OS::strlen (prefix);
 
@@ -2586,26 +2345,6 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
 
   // Conditionally included.
 
-  // DDS/DCPS marshaling.
-  this->gen_cond_file_include (
-      be_global->gen_dcps_type_support (),
-      "dds/DCPS/Serializer.h",
-      this->client_header_
-    );
-
-  if (be_global->gen_dcps_type_support ())
-    {
-      this->gen_standard_include (this->client_header_, "dds/Version.h");
-      *this->client_header_ <<
-        "\n#if DDS_MAJOR_VERSION > 1 || (DDS_MAJOR_VERSION == 1 && "
-        "(DDS_MINOR_VERSION > 2 || (DDS_MINOR_VERSION == 2 && "
-        "DDS_MICRO_VERSION >= 1)))\n"
-        "#define DDS_USE_QUERY_CONDITION_COMPARATOR";
-      this->gen_standard_include (this->client_header_,
-                                  "dds/DCPS/Comparator_T.h");
-      *this->client_header_ << "\n#endif\n";
-    }
-
   // DDS/DCPS zero-copy read sequence type support.
   if (idl_global->dcps_support_zero_copy_read ())
     {
@@ -2798,12 +2537,6 @@ TAO_CodeGen::gen_stub_src_includes (void)
       this->gen_typecode_includes (this->client_stubs_);
     }
 
-  if (be_global->gen_dcps_type_support_only ())
-    {
-      *this->client_stubs_ << "\n\n#if 0 // disable TAO specific code "
-                           << be_nl << be_nl;
-    }
-
   // Always generated.
   this->gen_standard_include (this->client_stubs_,
                               "tao/CDR.h");
@@ -2889,7 +2622,7 @@ TAO_CodeGen::gen_stub_src_includes (void)
     {
       this->gen_standard_include (this->client_stubs_,
                                   "tao/Vector_CDR_T.h");
-                                  
+
       if (be_global->any_support ())
         {
           this->gen_standard_include (
@@ -2897,17 +2630,12 @@ TAO_CodeGen::gen_stub_src_includes (void)
             "tao/AnyTypeCode/Vector_AnyOp_T.h");
         }
     }
-    
+
   // Includes whatever arg helper template classes that may be needed.
   this->gen_stub_arg_file_includes (this->client_stubs_);
 
-  // strlen() for DCPS marshaling or
   // strcmp() is used with interfaces and exceptions.
-  if ((be_global->gen_dcps_type_support ()
-          && (idl_global->string_seen_
-              || idl_global->string_seq_seen_
-                  || idl_global->wstring_seq_seen_) )
-          || idl_global->interface_seen_
+  if (idl_global->interface_seen_
       || idl_global->exception_seen_
       || idl_global->union_seen_)
     {
@@ -3446,17 +3174,33 @@ TAO_CodeGen::gen_typecode_includes (TAO_OutStream * stream)
 void
 TAO_CodeGen::gen_svnt_hdr_includes (void)
 {
+  ACE_CString container_file ("ciao/Containers/");
+  container_file += be_global->ciao_container_type ();
+  container_file += "/";
+  container_file += be_global->ciao_container_type ();
+  container_file += "_ContainerC.h";
+
   this->gen_standard_include (
     this->ciao_svnt_header_,
-    "ciao/Containers/Container_BaseC.h");
+    container_file.c_str ());
+
+  ACE_CString context_file ("ciao/Contexts/");
+  context_file += be_global->ciao_container_type ();
+  context_file += "/";
+  context_file += be_global->ciao_container_type ();
+  context_file += "_Context_T.h";
 
   this->gen_standard_include (
     this->ciao_svnt_header_,
-       "ciao/Contexts/Context_Impl_T.h");
+       context_file.c_str ());
+
+  ACE_CString servant_file ("ciao/Servants/");
+  servant_file += be_global->ciao_container_type ();
+  servant_file += "/Servant_Impl_T.h";
 
   this->gen_standard_include (
     this->ciao_svnt_header_,
-    "ciao/Servants/Servant_Impl_T.h");
+    servant_file.c_str ());
 
   this->gen_standard_include (
     this->ciao_svnt_header_,
@@ -3538,14 +3282,24 @@ TAO_CodeGen::gen_exec_src_includes (void)
   this->gen_standard_include (
     this->ciao_exec_source_,
     be_global->be_get_ciao_exec_hdr_fname (true));
+  if (be_global->gen_ciao_exec_reactor_impl ())
+    {
+      this->gen_standard_include (
+        this->ciao_exec_source_, "tao/ORB_Core.h");
+      this->gen_standard_include (
+        this->ciao_exec_source_, "ace/Reactor.h");
+    }
 }
 
 void
 TAO_CodeGen::gen_exec_idl_includes (void)
 {
-  this->gen_standard_include (
-    this->ciao_exec_idl_,
-    "ccm/CCM_Events.idl");
+  if (!be_global->gen_noeventccm ())
+    {
+      this->gen_standard_include (
+      this->ciao_exec_idl_,
+      "ccm/CCM_Events.idl");
+     }
 
   this->gen_standard_include (
     this->ciao_exec_idl_,
@@ -3556,28 +3310,31 @@ TAO_CodeGen::gen_exec_idl_includes (void)
     "ccm/CCM_Object.idl");
 
   if (!be_global->gen_lwccm ())
-    {    
+    {
       this->gen_standard_include (
         this->ciao_exec_idl_,
         "ccm/CCM_Enumeration.idl");
     }
-    
+
   this->gen_standard_include (
     this->ciao_exec_idl_,
     "ccm/CCM_CCMException.idl");
-    
+
   this->gen_standard_include (
     this->ciao_exec_idl_,
     "ccm/CCM_HomeExecutorBase.idl");
 
-  this->gen_standard_include (
-    this->ciao_exec_idl_,
-    "ccm/CCM_SessionContext.idl");
+
+  ACE_CString component_file ("ccm/");
+  component_file += be_global->ciao_container_type ();
+  component_file += "/CCM_";
+  component_file += be_global->ciao_container_type ();
+  component_file += "Component.idl";
 
   this->gen_standard_include (
     this->ciao_exec_idl_,
-    "ccm/CCM_SessionComponent.idl");
-    
+    component_file.c_str ());
+
   if (be_global->ami4ccm_call_back ())
     {
       this->gen_standard_include (
@@ -3597,15 +3354,14 @@ TAO_CodeGen::gen_exec_idl_includes (void)
        riter.advance ())
     {
       riter.next (path_tmp);
-      
+
       const char *exec_idl_fname =
         be_global->be_get_ciao_exec_idl_fname (true);
-        
-      /// No need to have the exec IDL file include itself.  
+
+      /// No need to have the exec IDL file include itself.
       if (ACE_OS::strcmp (*path_tmp, exec_idl_fname) != 0)
         {
-          this->gen_standard_include (this->ciao_exec_idl_,
-                                      *path_tmp);
+          this->gen_standard_include (this->ciao_exec_idl_, *path_tmp);
         }
     }
 }
@@ -3640,42 +3396,26 @@ TAO_CodeGen::gen_conn_hdr_includes (void)
       BE_GlobalData::DDS_IMPL const the_dds_impl =
         be_global->dds_impl ();
 
-      /// The default, and we have to set the reference to
-      /// something.
-      ACE_Unbounded_Queue<char *> &ts_files =
-        idl_global->ciao_rti_ts_file_names ();
-
       switch (the_dds_impl)
         {
           case BE_GlobalData::NDDS:
+            this->gen_conn_ts_includes (
+              idl_global->ciao_rti_ts_file_names ());
             break;
           case BE_GlobalData::OPENSPLICE:
-            ts_files =
-              idl_global->ciao_spl_ts_file_names ();
+            this->gen_conn_ts_includes (
+              idl_global->ciao_spl_ts_file_names ());
             break;
           case BE_GlobalData::OPENDDS:
-            ts_files =
-              idl_global->ciao_oci_ts_file_names ();
+            this->gen_conn_ts_includes (
+              idl_global->ciao_oci_ts_file_names ());
             break;
-          case BE_GlobalData::NONE:
+          case BE_GlobalData::COREDX:
+            this->gen_conn_ts_includes (
+              idl_global->ciao_coredx_ts_file_names ());
+            break;
+          case BE_GlobalData::DDS_NONE:
             break;
-        }
-
-      if (ts_files.size () > 0)
-        {
-          *this->ciao_conn_header_ << be_nl;
-        }
-
-      for (ACE_Unbounded_Queue_Iterator<char *> iter (
-             ts_files);
-           iter.done () == 0;
-           iter.advance ())
-        {
-          iter.next (path_tmp);
-
-          this->gen_standard_include (
-            this->ciao_conn_header_,
-            *path_tmp);
         }
     }
 
@@ -3685,7 +3425,7 @@ TAO_CodeGen::gen_conn_hdr_includes (void)
        iiter.advance ())
     {
       iiter.next (path_tmp);
-      
+
       this->gen_standard_include (
         this->ciao_conn_header_,
         *path_tmp);
@@ -3697,7 +3437,7 @@ TAO_CodeGen::gen_conn_hdr_includes (void)
         this->ciao_conn_header_,
         "tao/LocalObject.h");
     }
-    
+
   for (size_t j = 0; j < idl_global->n_included_idl_files (); ++j)
     {
       if (j == 0)
@@ -3707,8 +3447,8 @@ TAO_CodeGen::gen_conn_hdr_includes (void)
 
       char * const idl_name =
         idl_global->included_idl_files ()[j];
-        
-      bool system_file =
+
+      bool const system_file =
         ACE_OS::strcmp (idl_name, "Components.idl") == 0
         || ACE_OS::strcmp (
              idl_name,
@@ -3724,10 +3464,10 @@ TAO_CodeGen::gen_conn_hdr_includes (void)
       this->gen_standard_include (
         this->ciao_conn_header_,
         BE_GlobalData::be_get_server_hdr (&str, true));
-        
+
       str.destroy ();
     }
-        
+
   this->gen_standard_include (
     this->ciao_conn_header_,
     BE_GlobalData::be_get_ciao_exec_stub_header (
@@ -3748,14 +3488,6 @@ TAO_CodeGen::gen_conn_src_includes (void)
       this->gen_standard_include (
         this->ciao_conn_source_,
         "connectors/ami4ccm/ami4ccm/ami4ccm.h");
-
-        this->gen_standard_include (
-        this->ciao_conn_source_,
-        "ciao/Contexts/Context_Impl_Base.h");
-
-      this->gen_standard_include (
-        this->ciao_conn_source_,
-        "ciao/Containers/Container_Base.h");
     }
 }
 
@@ -3842,6 +3574,27 @@ TAO_CodeGen::make_rand_extension (char * const t)
 }
 
 void
+TAO_CodeGen::gen_conn_ts_includes (
+  ACE_Unbounded_Queue<char *> &ts_files)
+{
+  if (ts_files.size () > 0)
+    {
+      *this->ciao_conn_header_ << be_nl;
+    }
+
+  char **tmp = 0;
+
+  for (ACE_Unbounded_Queue_Iterator<char *> i (ts_files);
+       !i.done ();
+       i.advance ())
+    {
+      i.next (tmp);
+      this->gen_standard_include (this->ciao_conn_header_,
+                                  *tmp);
+    }
+}
+
+void
 TAO_CodeGen::destroy (void)
 {
   delete this->client_header_;
@@ -3860,9 +3613,9 @@ TAO_CodeGen::destroy (void)
   delete this->ciao_svnt_source_;
   delete this->ciao_exec_header_;
   delete this->ciao_exec_source_;
+  delete this->ciao_exec_idl_;
   delete this->ciao_conn_header_;
   delete this->ciao_conn_source_;
-  delete this->ciao_exec_idl_;
   delete this->ciao_ami_conn_idl_;
   delete this->gperf_input_stream_;
   delete [] this->gperf_input_filename_;
diff --git a/TAO_IDL/be/be_component.cpp b/TAO_IDL/be/be_component.cpp
index b4e1a8171f5..9d2cd33ab31 100644
--- a/TAO_IDL/be/be_component.cpp
+++ b/TAO_IDL/be/be_component.cpp
@@ -201,27 +201,27 @@ be_component::scan (UTL_Scope *s)
           case AST_Decl::NT_provides:
             ++this->n_provides_;
             p = AST_Provides::narrow_from_decl (d);
-            
+
             if (!p->provides_type ()->is_local ())
               {
                 ++this->n_remote_provides_;
               }
-              
+
             continue;
           case AST_Decl::NT_uses:
             ++this->n_uses_;
             u = AST_Uses::narrow_from_decl (d);
-            
+
             if (u->is_multiple ())
               {
                 this->has_uses_multiple_ = true;
               }
-              
+
             if (!u->uses_type ()->is_local ())
               {
                 ++this->n_remote_uses_;
               }
-              
+
             continue;
           case AST_Decl::NT_publishes:
             ++this->n_publishes_;
@@ -242,24 +242,24 @@ be_component::scan (UTL_Scope *s)
             continue;
           case AST_Decl::NT_attr:
             a = AST_Attribute::narrow_from_decl (d);;
-            
+
             if (!a->readonly ())
               {
                 my_nt = this->node_type ();
                 scope_nt =
                   ScopeAsDecl (a->defined_in ())->node_type ();
-                  
+
                 /// Attributes coming from a porttype appear
-                /// only on connectors.  
+                /// only on connectors.
                 if (my_nt == AST_Decl::NT_component
                     && scope_nt == AST_Decl::NT_porttype)
                   {
                     continue;
                   }
-              
+
                 this->has_rw_attributes_ = true;
               }
-              
+
             continue;
           default:
             continue;
@@ -297,7 +297,7 @@ be_component::gen_stub_inheritance (TAO_OutStream *os)
   if (nsupports > 0)
     {
       *os << be_idt;
-      
+
       AST_Type **supp_list = this->supports ();
 
       for (long i = 0; i < nsupports; ++i)
@@ -309,7 +309,7 @@ be_component::gen_stub_inheritance (TAO_OutStream *os)
 
       *os << be_uidt;
     }
-    
+
   *os << be_uidt;
 }
 
@@ -364,7 +364,7 @@ be_component::gen_is_a_ancestors (TAO_OutStream *os)
       << "value," << be_nl
       << "\"IDL:omg.org/Components/CCMObject:1.0\"" << be_uidt_nl
       << ") == 0" << be_uidt << be_uidt_nl;
-      
+
   return 0;
 }
 
@@ -399,31 +399,31 @@ be_component::mirror_scan (AST_PortType *pt)
           case AST_Decl::NT_provides:
             ++this->n_uses_;
             p = AST_Provides::narrow_from_decl (d);
-            
+
             if (!p->provides_type ()->is_local ())
               {
                 ++this->n_remote_uses_;
               }
-              
+
             continue;
           case AST_Decl::NT_uses:
             ++this->n_provides_;
             u = AST_Uses::narrow_from_decl (d);
-            
+
             if (!u->uses_type ()->is_local ())
               {
                 ++this->n_remote_provides_;
               }
-              
+
             continue;
           case AST_Decl::NT_attr:
             a = AST_Attribute::narrow_from_decl (d);;
-            
+
             if (!a->readonly ())
               {
                 this->has_rw_attributes_ = true;
               }
-              
+
             continue;
           default:
             continue;
diff --git a/TAO_IDL/be/be_connector.cpp b/TAO_IDL/be/be_connector.cpp
index eed6949227c..00cb361db33 100644
--- a/TAO_IDL/be/be_connector.cpp
+++ b/TAO_IDL/be/be_connector.cpp
@@ -2,6 +2,8 @@
 
 #include "be_connector.h"
 #include "be_visitor.h"
+#include "ast_module.h"
+#include "ast_template_module_inst.h"
 
 #include "utl_identifier.h"
 
@@ -89,16 +91,13 @@ be_connector::ami_connector (void)
 void
 be_connector::check_ancestors (void)
 {
-  /// Start from derived connector since we are no longer
-  /// (2010-05-05) putting derived DDS4CCM connector declarations
-  /// in application IDL.
   AST_Connector *base = this;
-  
+
   while (base != 0)
     {
       const char *base_fname = base->full_name ();
-      
-      if (ACE_OS::strcmp (base_fname, "CCM_DDS::DDS_TopicBase") == 0)
+
+      if (ACE_OS::strcmp (base_fname, "CCM_DDS::DDS_Base") == 0)
         {
           this->dds_connector_ = true;
           idl_global->dds_connector_seen_ = true;
@@ -110,7 +109,28 @@ be_connector::check_ancestors (void)
           idl_global->ami_connector_seen_ = true;
           break;
         }
-        
+      else
+        {
+          // If we have a templated module, enable it as dds_connector_
+          // for the moment
+          AST_Module *m =
+            AST_Module::narrow_from_scope (this->defined_in ());
+          AST_Template_Module_Inst *t_inst = 0;
+          while (t_inst == 0 && m != 0)
+            {
+              t_inst = m->from_inst ();
+              m = AST_Module::narrow_from_scope (m->defined_in ());
+            }
+          if (t_inst != 0 && t_inst->template_args () != 0)
+            {
+              if (t_inst->template_args ()->size () > 0)
+                {
+                  this->dds_connector_ = true;
+                  idl_global->dds_connector_seen_ = true;
+                }
+            }
+        }
+
       base = base->base_connector ();
     }
 }
diff --git a/TAO_IDL/be/be_decl.cpp b/TAO_IDL/be/be_decl.cpp
index e38dc986860..ddc9e7838b7 100644
--- a/TAO_IDL/be/be_decl.cpp
+++ b/TAO_IDL/be/be_decl.cpp
@@ -64,10 +64,6 @@ be_decl::be_decl (AST_Decl::NodeType type,
     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),
@@ -351,30 +347,6 @@ be_decl::cli_inline_cdr_decl_gen (void)
 }
 
 bool
-be_decl::cli_hdr_serializer_op_gen (void)
-{
-  return this->cli_hdr_serializer_op_gen_;
-}
-
-bool
-be_decl::cli_stub_serializer_op_gen (void)
-{
-  return this->cli_stub_serializer_op_gen_;
-}
-
-bool
-be_decl::cli_inline_serializer_op_gen (void)
-{
-  return this->cli_inline_serializer_op_gen_;
-}
-
-bool
-be_decl::cli_inline_serializer_decl_gen (void)
-{
-  return this->cli_inline_cdr_decl_gen_;
-}
-
-bool
 be_decl::cli_traits_gen (void)
 {
   return this->cli_traits_gen_;
@@ -646,30 +618,6 @@ be_decl::cli_inline_cdr_decl_gen (bool val)
 }
 
 void
-be_decl::cli_hdr_serializer_op_gen (bool val)
-{
-  this->cli_hdr_serializer_op_gen_ = val;
-}
-
-void
-be_decl::cli_stub_serializer_op_gen (bool val)
-{
-  this->cli_stub_serializer_op_gen_ = val;
-}
-
-void
-be_decl::cli_inline_serializer_op_gen (bool val)
-{
-  this->cli_inline_serializer_op_gen_ = val;
-}
-
-void
-be_decl::cli_inline_serializer_decl_gen (bool val)
-{
-  this->cli_inline_serializer_decl_gen_ = val;
-}
-
-void
 be_decl::cli_inline_gen (bool val)
 {
   this->cli_inline_gen_ = val;
diff --git a/TAO_IDL/be/be_enum.cpp b/TAO_IDL/be/be_enum.cpp
index 1bc36f1f7a1..8e1acae31ac 100644
--- a/TAO_IDL/be/be_enum.cpp
+++ b/TAO_IDL/be/be_enum.cpp
@@ -57,16 +57,16 @@ be_enum::gen_ostream_operator (TAO_OutStream *os,
       << "{" << be_idt_nl
       << "switch (_tao_enumerator)" << be_idt_nl
       << "{" << be_idt_nl;
-      
+
   for (int i = 0; i < this->member_count (); ++i)
     {
       UTL_ScopedName *mname =
         this->value_to_name (static_cast<unsigned long> (i));
-    
+
       *os << "case " << mname << ": return strm << \""
           << mname << "\";" << be_nl;
     }
-    
+
   *os << "default: return strm;" << be_uidt_nl
       << "}" << be_uidt << be_uidt_nl
       << "}" << be_nl;
diff --git a/TAO_IDL/be/be_factory.cpp b/TAO_IDL/be/be_factory.cpp
index 5d3d1679097..e8bc0c3f6ec 100644
--- a/TAO_IDL/be/be_factory.cpp
+++ b/TAO_IDL/be/be_factory.cpp
@@ -48,7 +48,7 @@ be_factory::destroy (void)
   // Call the destroy methods of our base classes.
   this->be_scope::destroy ();
   this->be_decl::destroy ();
-  
+
   this->AST_Factory::destroy ();
 }
 
diff --git a/TAO_IDL/be/be_field.cpp b/TAO_IDL/be/be_field.cpp
index 199e6cfbb47..dbc64cc4409 100644
--- a/TAO_IDL/be/be_field.cpp
+++ b/TAO_IDL/be/be_field.cpp
@@ -37,7 +37,7 @@ be_field::be_field (AST_Type *ft,
   // This covers valuetype fields as well, which is what we want.
   AST_Decl::NodeType nt =
     ft->unaliased_type ()->node_type ();
-    
+
   if (nt == AST_Decl::NT_string || nt == AST_Decl::NT_wstring)
     {
       idl_global->string_member_seen_ = true;
@@ -86,8 +86,8 @@ be_field::accept (be_visitor *visitor)
 void
 be_field::destroy (void)
 {
-  // AST_Field::destroy() is called by another path.
   this->be_decl::destroy ();
+  this->AST_Field::destroy ();
 }
 
 IMPL_NARROW_FROM_DECL (be_field)
diff --git a/TAO_IDL/be/be_generator.cpp b/TAO_IDL/be/be_generator.cpp
index d6ad8bc02f0..aca95d1012e 100644
--- a/TAO_IDL/be/be_generator.cpp
+++ b/TAO_IDL/be/be_generator.cpp
@@ -217,11 +217,11 @@ be_generator::create_interface (UTL_ScopedName *n,
                                 l,
                                 a),
                   0);
-  
+
   /// Trigger this interation over the included pragmas when the
   /// first local interface is seen in the main file. In an
   /// executor IDL file (the case we want), this happens near the
-  /// top. In other files, it will do no harm.                
+  /// top. In other files, it will do no harm.
   if (l && idl_global->in_main_file ())
     {
       FE_Utils::create_implied_ami_uses_stuff ();
@@ -982,8 +982,8 @@ be_generator::create_provides (UTL_ScopedName *n,
                   be_provides (n,
                                provides_type),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 
 AST_Uses *
@@ -997,8 +997,8 @@ be_generator::create_uses (UTL_ScopedName *n,
                            uses_type,
                            is_multiple),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 
 AST_Publishes *
@@ -1010,8 +1010,8 @@ be_generator::create_publishes (UTL_ScopedName *n,
                   be_publishes (n,
                                 publishes_type),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 
 AST_Emits *
@@ -1023,8 +1023,8 @@ be_generator::create_emits (UTL_ScopedName *n,
                   be_emits (n,
                             emits_type),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 AST_Consumes *
 be_generator::create_consumes (UTL_ScopedName *n,
@@ -1035,8 +1035,8 @@ be_generator::create_consumes (UTL_ScopedName *n,
                   be_consumes (n,
                                consumes_type),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 
 AST_Extended_Port *
@@ -1049,8 +1049,8 @@ be_generator::create_extended_port (
                   be_extended_port (n,
                                     porttype_ref),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 
 AST_Mirror_Port *
@@ -1063,8 +1063,8 @@ be_generator::create_mirror_port (
                   be_mirror_port (n,
                                   porttype_ref),
                   0);
-                  
-  return retval;              
+
+  return retval;
 }
 
 AST_Connector *
@@ -1077,7 +1077,7 @@ be_generator::create_connector (
                   be_connector (n,
                                 base_connector),
                   0);
-                  
+
   return retval;
 }
 
@@ -1091,10 +1091,10 @@ be_generator::create_template_module (
                   be_template_module (n,
                                       template_params),
                   0);
-                  
+
   return retval;
 }
-  
+
 AST_Template_Module_Inst *
 be_generator::create_template_module_inst (
   UTL_ScopedName *n,
@@ -1107,10 +1107,10 @@ be_generator::create_template_module_inst (
                                            ref,
                                            template_args),
                   0);
-                  
+
   return retval;
 }
-  
+
 AST_Template_Module_Ref *
 be_generator::create_template_module_ref (
   UTL_ScopedName *n,
@@ -1123,10 +1123,10 @@ be_generator::create_template_module_ref (
                                           ref,
                                           param_refs),
                   0);
-                  
+
   return retval;
 }
-    
+
 AST_Param_Holder *
 be_generator::create_param_holder (
   UTL_ScopedName *parameter_name,
@@ -1137,7 +1137,7 @@ be_generator::create_param_holder (
                   be_param_holder (parameter_name,
                                    info),
                   0);
-                  
+
   return retval;
 }
 
diff --git a/TAO_IDL/be/be_global.cpp b/TAO_IDL/be/be_global.cpp
index 8a1afa511ae..704e51a5223 100644
--- a/TAO_IDL/be/be_global.cpp
+++ b/TAO_IDL/be/be_global.cpp
@@ -85,7 +85,9 @@ BE_GlobalData::BE_GlobalData (void)
     ciao_ami_conn_idl_ending_ (ACE::strnew ("A.idl")),
     ciao_ami_conn_impl_hdr_ending_ (ACE::strnew ("_conn_i.h")),
     ciao_ami_conn_impl_src_ending_ (ACE::strnew ("_conn_i.cpp")),
+    ciao_container_type_ (ACE::strnew ("Session")),
     output_dir_ (0),
+    stub_include_dir_ (0),
     skel_output_dir_ (0),
     anyop_output_dir_ (0),
     any_support_ (true),
@@ -100,6 +102,7 @@ BE_GlobalData::BE_GlobalData (void)
     gen_corba_e_ (false),
     gen_minimum_corba_ (false),
     gen_lwccm_ (false),
+    gen_noeventccm_ (false),
     opt_tc_ (false),
     ami4ccm_call_back_ (false),
     ami_call_back_ (false),
@@ -107,12 +110,11 @@ BE_GlobalData::BE_GlobalData (void)
     gen_tie_classes_ (false),
     gen_smart_proxies_ (false),
     gen_inline_constants_ (true),
-    gen_dcps_type_support_ (false),
-    gen_dcps_type_support_only_ (false),
     gen_orb_h_include_ (true),
     gen_empty_anyop_header_ (false),
     lookup_strategy_ (TAO_PERFECT_HASH),
-    dds_impl_ (NONE),
+    dds_impl_ (DDS_NONE),
+    opendds_sequence_suffix_ ("Seq"),
     void_type_ (0),
     ccmobject_ (0),
     messaging_ (0),
@@ -133,7 +135,9 @@ BE_GlobalData::BE_GlobalData (void)
     gen_ciao_svnt_ (false),
     gen_ciao_exec_idl_ (false),
     gen_ciao_exec_impl_ (false),
+    gen_ciao_exec_reactor_impl_ (false),
     gen_ciao_conn_impl_ (false),
+    gen_dds_typesupport_idl_ (false),
     gen_ciao_valuefactory_reg_ (true),
     gen_stub_export_hdr_file_ (false),
     gen_skel_export_hdr_file_ (false),
@@ -142,7 +146,8 @@ BE_GlobalData::BE_GlobalData (void)
     gen_conn_export_hdr_file_ (false),
     gen_lem_force_all_ (false),
     tab_size_ (2),
-    alt_mapping_ (false)
+    alt_mapping_ (false),
+    in_facet_servant_ (false)
 {
 }
 
@@ -274,7 +279,7 @@ BE_GlobalData::be_get_client_hdr (UTL_String *idl_file_name,
   ACE_CString fn (idl_file_name->get_string ());
   ACE_CString fn_ext = fn.substr (fn.length () - 5);
   bool orb_file = (fn_ext == ".pidl" || fn_ext == ".PIDL");
-  
+
   if (!orb_file && !be_global->gen_custom_ending ()
       && FE_Utils::validate_orb_include (idl_file_name))
     {
@@ -312,7 +317,7 @@ BE_GlobalData::be_get_server_hdr (UTL_String *idl_file_name,
   ACE_CString fn (idl_file_name->get_string ());
   ACE_CString fn_ext = fn.substr (fn.length () - 5);
   bool orb_file = (fn_ext == ".pidl" || fn_ext == ".PIDL");
-  
+
   if (!orb_file && !be_global->gen_custom_ending ()
       && FE_Utils::validate_orb_include (idl_file_name))
     {
@@ -1438,6 +1443,19 @@ BE_GlobalData::ciao_ami_conn_impl_src_ending (void) const
 }
 
 void
+BE_GlobalData::ciao_container_type (const char* s)
+{
+  ACE::strdelete (this->ciao_container_type_);
+  this->ciao_container_type_ = ACE::strnew (s);
+}
+
+const char *
+BE_GlobalData::ciao_container_type (void) const
+{
+  return this->ciao_container_type_;
+}
+
+void
 BE_GlobalData::output_dir (const char* s)
 {
   ACE::strdelete (this->output_dir_);
@@ -1464,6 +1482,19 @@ BE_GlobalData::skel_output_dir (void) const
 }
 
 void
+BE_GlobalData::stub_include_dir (const char* s)
+{
+  ACE::strdelete (this->stub_include_dir_);
+  this->stub_include_dir_ = ACE::strnew (s);
+}
+
+const char*
+BE_GlobalData::stub_include_dir (void) const
+{
+  return this->stub_include_dir_;
+}
+
+void
 BE_GlobalData::anyop_output_dir (const char* s)
 {
   ACE::strdelete (this->anyop_output_dir_);
@@ -1609,6 +1640,18 @@ BE_GlobalData::gen_minimum_corba (void) const
 }
 
 void
+BE_GlobalData::gen_noeventccm (bool val)
+{
+  this->gen_noeventccm_ = val;
+}
+
+bool
+BE_GlobalData::gen_noeventccm (void) const
+{
+  return this->gen_noeventccm_;
+}
+
+void
 BE_GlobalData::gen_lwccm (bool val)
 {
   this->gen_lwccm_ = val;
@@ -1706,31 +1749,6 @@ BE_GlobalData::gen_inline_constants (void) const
 }
 
 void
-BE_GlobalData::gen_dcps_type_support (bool val)
-{
-  this->gen_dcps_type_support_ = val;
-}
-
-bool
-BE_GlobalData::gen_dcps_type_support (void) const
-{
-  return this->gen_dcps_type_support_;
-}
-
-void
-BE_GlobalData::gen_dcps_type_support_only (bool val)
-{
-  this->gen_dcps_type_support_only_ = val;
-}
-
-bool
-BE_GlobalData::gen_dcps_type_support_only (void) const
-{
-  return this->gen_dcps_type_support_only_;
-}
-
-
-void
 BE_GlobalData::gen_orb_h_include (bool val)
 {
   this->gen_orb_h_include_ = val;
@@ -1783,6 +1801,10 @@ BE_GlobalData::dds_impl (char const * const val)
     {
       this->dds_impl_ = OPENDDS;
     }
+  else if (tmp == "coredx")
+    {
+      this->dds_impl_ = COREDX;
+    }
   else
     {
       ACE_ERROR ((LM_ERROR,
@@ -1800,6 +1822,18 @@ BE_GlobalData::dds_impl (void) const
 }
 
 void
+BE_GlobalData::opendds_sequence_suffix (const char *val)
+{
+  this->opendds_sequence_suffix_ = val;
+}
+
+const char *
+BE_GlobalData::opendds_sequence_suffix (void) const
+{
+  return this->opendds_sequence_suffix_.c_str ();
+}
+
+void
 BE_GlobalData::destroy (void)
 {
   ACE::strdelete (this->skel_export_macro_);
@@ -1928,9 +1962,24 @@ BE_GlobalData::destroy (void)
   ACE::strdelete (this->ciao_ami_conn_idl_ending_);
   this->ciao_ami_conn_idl_ending_ = 0;
 
+  ACE::strdelete (this->ciao_ami_conn_impl_hdr_ending_);
+  this->ciao_ami_conn_impl_hdr_ending_ = 0;
+
+  ACE::strdelete (this->ciao_ami_conn_impl_src_ending_);
+  this->ciao_ami_conn_impl_src_ending_ = 0;
+
+  ACE::strdelete (this->ciao_container_type_);
+  this->ciao_container_type_ = 0;
+
   ACE::strdelete (this->output_dir_);
   this->output_dir_ = 0;
 
+  ACE::strdelete (this->stub_include_dir_);
+  this->stub_include_dir_ = 0;
+
+  ACE::strdelete (this->skel_output_dir_);
+  this->skel_output_dir_ = 0;
+
   ACE::strdelete (this->anyop_output_dir_);
   this->anyop_output_dir_ = 0;
 
@@ -1969,7 +2018,7 @@ BE_GlobalData:: void_type (void)
       AST_Decl *d =
         idl_global->root ()->lookup_primitive_type (
           AST_Expression::EV_void);
-          
+
       this->void_type_ = AST_PredefinedType::narrow_from_decl (d);
     }
 
@@ -2314,6 +2363,18 @@ BE_GlobalData::gen_ciao_exec_impl (bool val)
 }
 
 bool
+BE_GlobalData::gen_ciao_exec_reactor_impl (void) const
+{
+  return this->gen_ciao_exec_reactor_impl_;
+}
+
+void
+BE_GlobalData::gen_ciao_exec_reactor_impl (bool val)
+{
+  this->gen_ciao_exec_reactor_impl_ = val;
+}
+
+bool
 BE_GlobalData::gen_ciao_conn_impl (void) const
 {
   return this->gen_ciao_conn_impl_;
@@ -2326,6 +2387,18 @@ BE_GlobalData::gen_ciao_conn_impl (bool val)
 }
 
 bool
+BE_GlobalData::gen_dds_typesupport_idl (void) const
+{
+  return this->gen_dds_typesupport_idl_;
+}
+
+void
+BE_GlobalData::gen_dds_typesupport_idl (bool val)
+{
+  this->gen_dds_typesupport_idl_ = val;
+}
+
+bool
 BE_GlobalData::gen_ciao_valuefactory_reg (void) const
 {
   return this->gen_ciao_valuefactory_reg_;
@@ -2421,6 +2494,18 @@ BE_GlobalData::alt_mapping (bool val)
   this->alt_mapping_ = val;
 }
 
+bool
+BE_GlobalData::in_facet_servant (void) const
+{
+  return this->in_facet_servant_;
+}
+
+void
+BE_GlobalData::in_facet_servant (bool val)
+{
+  this->in_facet_servant_ = val;
+}
+
 unsigned long
 BE_GlobalData::tab_size (void) const
 {
@@ -2643,6 +2728,23 @@ BE_GlobalData::parse_args (long &i, char **av)
           {
             be_global->changing_standard_include_files (0);
           }
+        else if (av[i][2] == 'C')
+          {
+            if (av[i][3] == '\0')
+              {
+                be_global->stub_include_dir (av[i + 1]);
+                ++i;
+              }
+            else
+              {
+                ACE_ERROR ((
+                    LM_ERROR,
+                    ACE_TEXT ("IDL: I don't understand")
+                    ACE_TEXT (" the '%C' option\n"),
+                    av[i]
+                  ));
+              }
+          }
         else
           {
             ACE_ERROR ((
@@ -2808,7 +2910,7 @@ BE_GlobalData::parse_args (long &i, char **av)
         else if (av[i][2] == 'M')
           {
             // AMI4CCM calls implicit option 'C': AMI with Call back.
-            be_global->ami_call_back (true); 
+            be_global->ami_call_back (true);
              // Generate tie classes and files
             be_global->ami4ccm_call_back (true);
           }
@@ -2840,11 +2942,23 @@ BE_GlobalData::parse_args (long &i, char **av)
 
             break;
           }
+        else if (av[i][2] == 't' && av[i][3] == 's')
+          {
+            // DDS type support IDL generation.
+            be_global->gen_dds_typesupport_idl (true);
+
+            break;
+          }
         else if (av[i][2] == 'e' && av[i][3] == 'x')
           {
             // CIAO executor impl code generation.
             be_global->gen_ciao_exec_impl (true);
 
+            // should the reactor code be generated?
+            if (av[i][4] == 'r')
+              {
+                be_global->gen_ciao_exec_reactor_impl (true);
+              }
             break;
           }
         else if (av[i][2] == 's')
@@ -2975,6 +3089,11 @@ BE_GlobalData::parse_args (long &i, char **av)
                 // CORBA/e.
                 be_global->gen_lwccm (true);
               }
+            else if (av[i][3] == 'm')
+              {
+                // NOEVENTS ccm, ccm without events .
+                be_global->gen_noeventccm (true);
+              }
             else
               {
                 ACE_ERROR ((
@@ -3038,43 +3157,7 @@ BE_GlobalData::parse_args (long &i, char **av)
           }
         else if (av[i][2] == 'd')
           {
-            if (av[i][3] == 'c')
-              {
-                if (av[i][4] == 'p' && av[i][5] =='s')
-                  {
-                    if ('\0' == av[i][6])
-                      {
-                        // DDS DCPS type support.
-                        be_global->gen_dcps_type_support (true);
-                      }
-                    else if (av[i][6] == 'o' && av[i][7] == 'n'
-                      && av[i][8] == 'l' && av[i][9] == 'y' && '\0' == av[i][10])
-                      {
-                        // DDS DCPS type only support
-                        be_global->gen_dcps_type_support (true);
-                        be_global->gen_dcps_type_support_only (true);
-                      }
-                    else
-                      {
-                        ACE_ERROR ((
-                            LM_ERROR,
-                            ACE_TEXT ("IDL: I don't understand ")
-                            ACE_TEXT ("the '%C' option\n"),
-                            av[i]
-                          ));
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((
-                        LM_ERROR,
-                        ACE_TEXT ("IDL: I don't understand ")
-                        ACE_TEXT ("the '%C' option\n"),
-                        av[i]
-                      ));
-                  }
-              }
-            else if ('\0' == av[i][3])
+            if ('\0' == av[i][3])
               {
                 // Generating Direct collocated stubs.
                 be_global->gen_direct_collocation (true);
diff --git a/TAO_IDL/be/be_helper.cpp b/TAO_IDL/be/be_helper.cpp
index 22e14bf6221..11cf872b902 100644
--- a/TAO_IDL/be/be_helper.cpp
+++ b/TAO_IDL/be/be_helper.cpp
@@ -56,6 +56,11 @@ TAO_NL::TAO_NL (void)
   ACE_UNUSED_ARG (copyright);
 }
 
+TAO_NL_2::TAO_NL_2 (void)
+{
+  ACE_UNUSED_ARG (copyright);
+}
+
 TAO_INDENT::TAO_INDENT (int do_now)
   :  do_now_ (do_now)
 {
@@ -67,6 +72,7 @@ TAO_UNINDENT::TAO_UNINDENT (int do_now)
 }
 
 const TAO_NL be_nl;
+const TAO_NL_2 be_nl_2;
 const TAO_INDENT be_idt;
 const TAO_INDENT be_idt_nl (1);
 const TAO_UNINDENT be_uidt;
@@ -82,8 +88,6 @@ TAO_OutStream::TAO_OutStream (void)
     {
       this->tab_unit_str_ += ' ';
     }
-    
-  this->tab_unit_ = this->tab_unit_str_.c_str ();
 }
 
 TAO_OutStream::~TAO_OutStream (void)
@@ -208,7 +212,7 @@ TAO_OutStream::indent (void)
     {
       for (int i = 0; i < this->indent_level_; i++)
         {
-          ACE_OS::fprintf (this->fp_, this->tab_unit_);
+          ACE_OS::fprintf (this->fp_, "%s", this->tab_unit_str_.c_str ());
         }
     }
 
@@ -320,6 +324,13 @@ TAO_OutStream::operator<< (const char *str)
 }
 
 TAO_OutStream &
+TAO_OutStream::operator<< (const ACE_CString &str)
+{
+  ACE_OS::fprintf (this->fp_, "%s", str.c_str ());
+  return *this;
+}
+
+TAO_OutStream &
 TAO_OutStream::operator<< (const ACE_CDR::UShort num)
 {
   ACE_OS::fprintf (this->fp_,
@@ -390,6 +401,17 @@ TAO_OutStream::operator<< (const TAO_NL&)
 }
 
 TAO_OutStream &
+TAO_OutStream::operator<< (const TAO_NL_2&)
+{
+  ACE_OS::fprintf (this->fp_ ,
+                   "\n");
+  ACE_OS::fprintf (this->fp_ ,
+                   "\n");
+  this->indent ();
+  return *this;
+}
+
+TAO_OutStream &
 TAO_OutStream::operator<< (const TAO_INDENT& i)
 {
   this->incr_indent (0);
@@ -436,8 +458,7 @@ TAO_OutStream::operator<< (AST_Expression *expr)
 TAO_OutStream &
 TAO_OutStream::print (Identifier *id)
 {
-  ACE_OS::fprintf (this->fp_,
-                   id->get_string ());
+  ACE_OS::fprintf (this->fp_, "%s", id->get_string ());
 
   return *this;
 }
@@ -486,14 +507,14 @@ TAO_OutStream&
 TAO_OutStream::print (AST_Expression *expr)
 {
   AST_Expression::AST_ExprValue *ev = expr->ev ();
-  
+
   /// Never happens as far as I know, but just in case...
   if (ev == 0)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("TAO_OutStream::print() - ")
                   ACE_TEXT ("expression not evaluated\n")));
-                  
+
       return *this;
     }
 
@@ -527,12 +548,13 @@ TAO_OutStream::print (AST_Expression *expr)
       this->TAO_OutStream::print (")");
       break;
     case AST_Expression::EV_float:
-      this->TAO_OutStream::print ("%f%c", ev->u.fval, 'F');
+      this->TAO_OutStream::print ("%#gF", ev->u.fval);
       break;
     case AST_Expression::EV_double:
-      this->TAO_OutStream::print ("%24.16G", ev->u.dval);
+      this->TAO_OutStream::print ("%#24.16G", ev->u.dval);
       break;
     case AST_Expression::EV_longdouble:
+      this->TAO_OutStream::print ("%#24.16LGL", ev->u.ldval);
       break;
     case AST_Expression::EV_char:
       // isprint() sees \ and ' as printable characters
diff --git a/TAO_IDL/be/be_home.cpp b/TAO_IDL/be/be_home.cpp
index 77e294b4ffd..cecee18c8cb 100644
--- a/TAO_IDL/be/be_home.cpp
+++ b/TAO_IDL/be/be_home.cpp
@@ -102,7 +102,7 @@ be_home::scan (UTL_Scope *s)
       AST_Decl *d = i.item ();
       AST_Attribute *attr =
         AST_Attribute::narrow_from_decl (d);
-        
+
       if (attr != 0 && ! attr->readonly ())
         {
           this->has_rw_attributes_ = true;
@@ -123,67 +123,67 @@ be_home::destroy (void)
 {
   delete [] this->full_skel_name_;
   this->full_skel_name_ = 0;
-  
+
   delete [] this->full_coll_name_;
   this->full_coll_name_ = 0;
-  
+
   delete [] this->local_coll_name_;
   this->local_coll_name_ = 0;
-  
+
   delete [] this->relative_skel_name_;
   this->relative_skel_name_ = 0;
-  
+
   delete [] this->base_proxy_impl_name_;
   this->base_proxy_impl_name_ = 0;
-  
+
   delete [] this->remote_proxy_impl_name_;
   this->remote_proxy_impl_name_ = 0;
-  
+
   delete [] this->direct_proxy_impl_name_;
   this->direct_proxy_impl_name_ = 0;
-  
+
   delete [] this->full_base_proxy_impl_name_;
   this->full_base_proxy_impl_name_ = 0;
-  
+
   delete [] this->full_remote_proxy_impl_name_;
   this->full_remote_proxy_impl_name_ = 0;
-  
+
   delete [] this->full_direct_proxy_impl_name_;
   this->full_direct_proxy_impl_name_ = 0;
-  
+
   delete [] this->base_proxy_broker_;
   this->base_proxy_broker_ = 0;
-  
+
   delete [] this->remote_proxy_broker_;
   this->remote_proxy_broker_ = 0;
-  
+
   delete [] this->strategized_proxy_broker_;
   this->strategized_proxy_broker_ = 0;
-  
+
   delete [] this->full_base_proxy_broker_name_;
   this->full_base_proxy_broker_name_ = 0;
-  
+
   delete [] this->full_remote_proxy_broker_name_;
   this->full_remote_proxy_broker_name_ = 0;
-  
+
   delete [] this->full_strategized_proxy_broker_name_;
   this->full_strategized_proxy_broker_name_ = 0;
-  
+
   delete [] this->client_scope_;
   this->client_scope_ = 0;
-  
+
   delete [] this->flat_client_scope_;
   this->flat_client_scope_ = 0;
-  
+
   delete [] this->server_scope_;
   this->server_scope_ = 0;
-  
+
   delete [] this->flat_server_scope_;
   this->flat_server_scope_ = 0;
-  
+
   this->be_scope::destroy ();
   this->be_type::destroy ();
-  
+
   // This skips AST_Interface, for the reason above.
   this->AST_Home::destroy ();
 }
diff --git a/TAO_IDL/be/be_identifier_helper.cpp b/TAO_IDL/be/be_identifier_helper.cpp
index af6ab6bfb32..87d6210514b 100644
--- a/TAO_IDL/be/be_identifier_helper.cpp
+++ b/TAO_IDL/be/be_identifier_helper.cpp
@@ -78,7 +78,7 @@ IdentifierHelper::original_local_name (Identifier * local_name)
 {
   Identifier * id = 0;
   const char *lname = local_name->get_string ();
-   
+
   // Remove _cxx_ if:
   // 1. it occurs and
   // 2. it occurs at the beginning of the string and
@@ -86,10 +86,10 @@ IdentifierHelper::original_local_name (Identifier * local_name)
   if (ACE_OS::strstr (lname, "_cxx_") == lname)
     {
       TAO_IDL_CPP_Keyword_Table cpp_key_tbl;
-      
+
       unsigned int len =
         static_cast<unsigned int> (ACE_OS::strlen (lname + 5));
-        
+
       const TAO_IDL_CPP_Keyword_Entry *entry =
         cpp_key_tbl.lookup (lname + 5, len);
 
@@ -101,12 +101,12 @@ IdentifierHelper::original_local_name (Identifier * local_name)
                           0);
         }
     }
-    
+
   if (id == 0)
     {
       id = local_name->copy ();
     }
-   
+
   return id;
 }
 
@@ -133,9 +133,9 @@ IdentifierHelper::orig_sn (UTL_IdList * sn, bool for_idl)
         for_idl
           ? IdentifierHelper::original_local_name (i.item ())
           : i.item ()->copy ();
-          
+
       i.next ();
-      
+
       // Append the identifier.
       retval +=
         for_idl
@@ -154,12 +154,12 @@ IdentifierHelper::orig_sn (UTL_IdList * sn, bool for_idl)
               second = true;
             }
         }
-        
+
       id->destroy ();
       delete id;
       id = 0;
     }
-  
+
   return retval;
 }
 
@@ -175,7 +175,7 @@ IdentifierHelper::is_idl_keyword (Identifier * local_name)
   return !idl_global->idl_keywords ().find (ext_id);
 }
 
-ACE_CString 
+ACE_CString
 IdentifierHelper::try_escape (Identifier * local_name)
 {
   ACE_CString s_local_name (local_name->get_string ());
diff --git a/TAO_IDL/be/be_interface.cpp b/TAO_IDL/be/be_interface.cpp
index 1d464a2490f..5f9600f3e58 100644
--- a/TAO_IDL/be/be_interface.cpp
+++ b/TAO_IDL/be/be_interface.cpp
@@ -108,7 +108,6 @@ be_interface::be_interface (UTL_ScopedName *n,
     skel_count_ (0),
     in_mult_inheritance_ (-1),
     original_interface_ (0),
-    session_component_child_ (-1),
     is_ami_rh_ (false),
     is_ami4ccm_rh_ (false),
     full_skel_name_ (0),
@@ -216,7 +215,7 @@ be_interface::compute_full_skel_name (const char *prefix,
     {
       return;
     }
-    
+
   size_t namelen = ACE_OS::strlen (prefix);
   long first = true;
   long second = false;
@@ -670,7 +669,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
   // Generate the constructor from stub and servant.
   if (!this->is_local ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "ACE_INLINE" << be_nl;
       *os << this->name () << "::"
           << this->local_name () << " ("
@@ -781,34 +780,34 @@ be_interface:: gen_var_out_seq_decls (void)
   const char *lname = this->local_name ();
   TAO_OutStream *os = tao_cg->client_header ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Generate the ifdefined macro for this interface.
   os->gen_ifdef_macro (this->flat_name (),
                        "var_out");
-          
+
   // Need this clunky string compare for when we are processing
   // the *A.idl file. The *_sendc operations are generated in
   // a separate interface distinguished only by the AMI4CCM_
   // prefix. Since it does not come from implied IDL (in this
   // execution of the IDL compiler) there is nothing
   // to tell the IDL compiler that this interface is in any
-  // way special. All we can do is search for the prefix.                  
+  // way special. All we can do is search for the prefix.
   ACE_CString test (lname, 0, false);
   bool has_ami4ccm_prefix = (test.find ("AMI4CCM_") == 0);
-    
+
   bool already_ami =
     (this->is_ami_rh ()
      || this->is_ami4ccm_rh ()
      || has_ami4ccm_prefix);
-           
+
   /// Forward declare the handler interface before declaring
-  /// the original interface.                     
+  /// the original interface.
   if (be_global->ami_call_back ()
       && !already_ami)
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "class AMI_" << lname << "Handler;" << be_nl
           << "typedef AMI_" << lname << "Handler *AMI_"
           << lname << "Handler_ptr;";
@@ -817,17 +816,17 @@ be_interface:: gen_var_out_seq_decls (void)
   if (be_global->ami4ccm_call_back ()
       && !already_ami)
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "class AMI4CCM_" << lname << "Handler;" << be_nl
           << "typedef AMI4CCM_" << lname << "Handler *AMI4CCM_"
           << lname << "Handler_ptr;";
     }
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "class " << lname << ";" << be_nl
       << "typedef " << lname << " *" << lname << "_ptr;";
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "typedef" << be_idt_nl
       << "TAO_Objref_Var_T<" << be_idt << be_idt_nl
       << lname << be_uidt_nl
@@ -978,7 +977,7 @@ be_interface::gen_operation_table (const char *flat_name,
         os->indent ();
 
         // Start the table generation.
-        *os << be_nl << be_nl
+        *os << be_nl_2
             << "static const TAO_operation_db_entry " << flat_name
             << "_operations [] = {" << be_idt_nl;
 
@@ -1043,7 +1042,7 @@ be_interface::gen_operation_table (const char *flat_name,
             ++this->skel_count_;
           }
 
-        *os << "};" << be_nl << be_nl;
+        *os << "};" << be_nl_2;
         *os << "static const ::CORBA::Long _tao_" << flat_name
             << "_optable_size = sizeof (ACE_Hash_Map_Entry<const char *,"
             << " TAO::Operation_Skeletons>) * (" << (3 * this->skel_count_)
@@ -1099,7 +1098,7 @@ be_interface::gen_operation_table (const char *flat_name,
                          "%s%d.%d.%s.gperf",
                          idl_global->temp_dir (),
                          ACE_OS::rand_r (&seed),
-                         ACE_OS::getpid (),
+                         static_cast<int> (ACE_OS::getpid ()),
                          flat_name);
 
         // QNX can't handle individual file names (path components)
@@ -1119,7 +1118,7 @@ be_interface::gen_operation_table (const char *flat_name,
         // Make a new outstream to hold the gperf_temp_file for this
         // interface.
         TAO_OutStream *os = 0;
-        ACE_NEW_RETURN (os, TAO_OutStream, -1);
+        ACE_NEW_NORETURN (os, TAO_OutStream);
 
         if (os == 0)
           {
@@ -1210,7 +1209,7 @@ be_interface::gen_operation_table (const char *flat_name,
             *os << "_repository_id,&"
                 << skeleton_class_name
                 << "::_repository_id_skel, 0" << be_nl;
-                
+
             ++this->skel_count_;
           }
 
@@ -1303,12 +1302,12 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
             {
               be_operation *op =
                 be_operation::narrow_from_decl (d);
-                
+
               if (op->is_sendc_ami ())
                 {
                   continue;
                 }
-                
+
               // We are an operation node.
               *os << "{\"" << d->original_local_name () << "\", &"
                   << full_skeleton_name << "::"
@@ -1404,12 +1403,12 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
             {
               be_operation *op =
                 be_operation::narrow_from_decl (d);
-                
+
               if (op->is_sendc_ami ())
                 {
                   continue;
                 }
-                
+
               // Generate operation name.
 
               // We are an operation node. We use the original
@@ -1508,11 +1507,11 @@ be_interface::gen_collocated_skel_body (be_interface *derived,
                                         UTL_ExceptList *,
                                         TAO_OutStream *os)
 {
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Generate the static method corresponding to this method.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "ACE_INLINE void" << be_nl
       << derived->full_direct_proxy_impl_name ()
       << "::" << prefix << d->local_name () << " ("
@@ -1711,8 +1710,8 @@ be_interface::gen_gperf_things (const char *flat_name)
 
   TAO_OutStream *os = tao_cg->server_skeletons ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Generate the correct class definition for the operation lookup
   // strategy. Then, get the lookup method from GPERF. And then,
@@ -1869,7 +1868,7 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name)
                          "fclose"),
                         -1);
     }
-    
+
   // And reset file to 0 because otherwise there is a problem during destruction of stream.
   tao_cg->gperf_input_stream ()->file () = 0;
 
@@ -2220,17 +2219,17 @@ be_interface::gen_skel_helper (be_interface *derived,
             {
               be_operation *op =
                 be_operation::narrow_from_decl (d);
-               
-              /// These are not generated on the server side.  
+
+              /// These are not generated on the server side.
               if (op->is_sendc_ami ())
                 {
                   continue;
                 }
-        
-              *os << be_nl << be_nl
+
+              *os << be_nl_2
                   << "// TAO_IDL - Generated from" << be_nl
                   << "// " << __FILE__ << ":" << __LINE__
-                  << be_nl << be_nl;
+                  << be_nl_2;
 
               if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR)
                 {
@@ -2281,8 +2280,8 @@ be_interface::gen_skel_helper (be_interface *derived,
                 {
                   return -1;
                 }
-                
-              *os << be_nl << be_nl;
+
+              *os << be_nl_2;
 
               if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR)
                 {
@@ -2326,7 +2325,7 @@ be_interface::gen_skel_helper (be_interface *derived,
 
               if (!attr->readonly ())
                 {
-                  *os << be_nl << be_nl;
+                  *os << be_nl_2;
 
                   if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR)
                     {
@@ -2408,8 +2407,8 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived,
 
       if (d->node_type () == AST_Decl::NT_op)
         {
-          *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-              << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+          *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+              << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
           // Generate the static method corresponding to this method.
           *os << "static void" << be_nl
@@ -2436,7 +2435,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived,
 
           if (!attr->readonly ())
             {
-              *os << be_nl << be_nl;
+              *os << be_nl_2;
 
               // Generate the static method corresponding to
               // this method.
@@ -2489,7 +2488,7 @@ be_interface::gen_colloc_op_defn_helper (be_interface *derived,
       if (nt == AST_Decl::NT_op)
         {
           op = be_operation::narrow_from_decl (d);
-          
+
           /// Skip these on the skeleton side.
           if (op->is_sendc_ami ())
             {
@@ -2676,23 +2675,45 @@ be_interface::op_attr_decl_helper (be_interface * /*derived */,
     {
       // Get the next AST decl node
       AST_Decl *d = si.item ();
+      AST_Decl::NodeType nt = d->node_type ();
 
-      if (d->node_type () == AST_Decl::NT_op)
+      if (nt == AST_Decl::NT_op)
         {
           be_operation *op = be_operation::narrow_from_decl (d);
+
+          /// No sendc_* operations in facet servants. If the
+          /// original interface had these generated as AMI
+          /// implied IDL, we want to skip them.
+          if (be_global->in_facet_servant () && op->is_sendc_ami ())
+            {
+              continue;
+            }
+
           be_visitor_operation_ch v (&ctx);
 
           if (v.visit_operation (op) == -1)
             {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ACE_TEXT ("be_interface::")
+                                 ACE_TEXT ("op_attr_decl_helper - ")
+                                 ACE_TEXT ("visit_operation()")
+                                 ACE_TEXT (" failed\n")),
+                                -1);
             }
         }
-      else if (d->node_type () == AST_Decl::NT_attr)
+      else if (nt == AST_Decl::NT_attr)
         {
           be_attribute *attr = be_attribute::narrow_from_decl (d);
           be_visitor_attribute v (&ctx);
 
           if (v.visit_attribute (attr) == -1)
             {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ACE_TEXT ("be_interface::")
+                                 ACE_TEXT ("op_attr_decl_helper - ")
+                                 ACE_TEXT ("visit_attribute()")
+                                 ACE_TEXT (" failed\n")),
+                                -1);
             }
         }
     }
@@ -2705,64 +2726,64 @@ be_interface::destroy (void)
 {
   delete [] this->full_skel_name_;
   this->full_skel_name_ = 0;
-  
+
   delete [] this->full_coll_name_;
   this->full_coll_name_ = 0;
-  
+
   delete [] this->local_coll_name_;
   this->local_coll_name_ = 0;
-  
+
   delete [] this->relative_skel_name_;
   this->relative_skel_name_ = 0;
-  
+
   delete [] this->base_proxy_impl_name_;
   this->base_proxy_impl_name_ = 0;
-  
+
   delete [] this->remote_proxy_impl_name_;
   this->remote_proxy_impl_name_ = 0;
-  
+
   delete [] this->direct_proxy_impl_name_;
   this->direct_proxy_impl_name_ = 0;
-  
+
   delete [] this->full_base_proxy_impl_name_;
   this->full_base_proxy_impl_name_ = 0;
-  
+
   delete [] this->full_remote_proxy_impl_name_;
   this->full_remote_proxy_impl_name_ = 0;
-  
+
   delete [] this->full_direct_proxy_impl_name_;
   this->full_direct_proxy_impl_name_ = 0;
-  
+
   delete [] this->base_proxy_broker_;
   this->base_proxy_broker_ = 0;
-  
+
   delete [] this->remote_proxy_broker_;
   this->remote_proxy_broker_ = 0;
-  
+
   delete [] this->strategized_proxy_broker_;
   this->strategized_proxy_broker_ = 0;
-  
+
   delete [] this->full_base_proxy_broker_name_;
   this->full_base_proxy_broker_name_ = 0;
-  
+
   delete [] this->full_remote_proxy_broker_name_;
   this->full_remote_proxy_broker_name_ = 0;
-  
+
   delete [] this->full_strategized_proxy_broker_name_;
   this->full_strategized_proxy_broker_name_ = 0;
-  
+
   delete [] this->client_scope_;
   this->client_scope_ = 0;
-  
+
   delete [] this->flat_client_scope_;
   this->flat_client_scope_ = 0;
-  
+
   delete [] this->server_scope_;
   this->server_scope_ = 0;
-  
+
   delete [] this->flat_server_scope_;
   this->flat_server_scope_ = 0;
-  
+
   // Call the destroy methods of our base classes.
   this->AST_Interface::destroy ();
   this->be_scope::destroy ();
@@ -2787,54 +2808,6 @@ be_interface::original_interface (void)
   return this->original_interface_;
 }
 
-int
-be_interface::session_component_child (void)
-{
-  if (this->session_component_child_ == -1)
-    {
-      // We are looking only for executor interfaces.
-      if (!this->is_local_)
-        {
-          this->session_component_child_ = 0;
-          return this->session_component_child_;
-        }
-
-      Identifier tail_id ("SessionComponent");
-      UTL_ScopedName tail (&tail_id, 0);
-      Identifier head_id ("Components");
-      UTL_ScopedName sn (&head_id, &tail);
-
-      AST_Decl *session_component =
-        const_cast<be_interface*> (this)->scope ()->lookup_by_name (&sn, true);
-
-      tail_id.destroy ();
-      head_id.destroy ();
-
-      // If Components::SessionComponent is not in the AST, we are
-      // barking up the wrong tree.
-      if (session_component == 0)
-        {
-          this->session_component_child_ = 0;
-          return this->session_component_child_;
-        }
-
-      for (long i = 0; i < this->pd_n_inherits; ++i)
-        {
-          AST_Decl *tmp = this->pd_inherits[i];
-
-          if (tmp == session_component)
-            {
-              this->session_component_child_ = 1;
-              return this->session_component_child_;
-            }
-        }
-
-      this->session_component_child_ = 0;
-    }
-
-  return this->session_component_child_;
-}
-
 bool
 be_interface::is_event_consumer (void)
 {
@@ -2940,13 +2913,13 @@ be_interface::gen_stub_inheritance (TAO_OutStream *os)
   if (nparents > 0)
     {
       *os << be_idt;
-      
+
       AST_Type **parents = this->inherits ();
 
       for (i = 0; i < nparents; ++i)
         {
           AST_Type *parent = parents[i];
-        
+
           if (! parent->is_abstract ())
             {
               has_concrete_parent = true;
@@ -3193,7 +3166,7 @@ be_interface::gen_facet_svnt_hdr (be_visitor *visitor,
       suffix = ACE_CString ("_") + suffix;
     }
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "namespace CIAO_FACET" << suffix.c_str () << be_nl
      << "{" << be_idt_nl;
 
@@ -3236,7 +3209,7 @@ be_interface::gen_facet_svnt_hdr (be_visitor *visitor,
                         -1);
     }
 
-  os << be_nl << be_nl << "// Get component implementation." << be_nl
+  os << be_nl_2 << "// Get component implementation." << be_nl
      << "virtual CORBA::Object_ptr _get_component (void);"
      << be_uidt_nl << be_nl;
 
@@ -3244,12 +3217,12 @@ be_interface::gen_facet_svnt_hdr (be_visitor *visitor,
 
   os << "// Facet executor." << be_nl
      << global << sname << "::CCM_"
-     << lname << "_var executor_;" << be_nl << be_nl;
+     << lname << "_var executor_;" << be_nl_2;
 
   os << "// Context object." << be_nl
      << "::Components::CCMContext_var ctx_;" << be_uidt_nl;
 
-  os << "};" << be_nl << be_nl;
+  os << "};" << be_nl_2;
 
   os << be_uidt_nl
      << "}";
@@ -3280,7 +3253,7 @@ be_interface::gen_facet_svnt_src (be_visitor *visitor,
       suffix = ACE_CString ("_") + suffix;
     }
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "namespace CIAO_FACET" << suffix.c_str () << be_nl
      << "{" << be_idt_nl;
 
@@ -3297,13 +3270,13 @@ be_interface::gen_facet_svnt_src (be_visitor *visitor,
      << "{" << be_nl
      << "}";
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << lname << "_Servant::~"
      << lname << "_Servant (void)" << be_nl
      << "{" << be_nl
      << "}";
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "// All facet operations and attributes.";
 
   /// The overload of traverse_inheritance_graph() used here
@@ -3330,30 +3303,30 @@ be_interface::gen_facet_svnt_src (be_visitor *visitor,
                         -1);
     }
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "::CORBA::Object_ptr" << be_nl
      << lname << "_Servant::_get_component (void)"
      << be_nl
      << "{" << be_idt_nl
-     << "::Components::SessionContext_var sc =" << be_idt_nl
-     << "::Components::SessionContext::_narrow (this->ctx_.in ());"
+     << "::Components::" << be_global->ciao_container_type ()
+     << "Context_var sc =" << be_idt_nl
+     << "::Components::" << be_global->ciao_container_type ()
+     << "Context::_narrow (this->ctx_.in ());"
      << be_uidt_nl << be_nl
      << "if (! ::CORBA::is_nil (sc.in ()))" << be_idt_nl
-     << "{" << be_idt_nl
-     << "return sc->get_CCM_object ();" << be_uidt_nl
-     << "}" << be_uidt_nl << be_nl;
+     << "{" << be_idt_nl;
 
-  if (!be_global->gen_lwccm ())
+  if (ACE_OS::strcmp (be_global->ciao_container_type (), "Session") == 0)
+    {
+      os << "return sc->get_CCM_object ();";
+    }
+  else
     {
-      os << "::Components::EntityContext_var ec =" << be_idt_nl
-         << "::Components::EntityContext::_narrow (this->ctx_.in ());"
-         << be_uidt_nl << be_nl
-         << "if (! ::CORBA::is_nil (ec.in ()))" << be_idt_nl
-         << "{" << be_idt_nl
-         << "return ec->get_CCM_object ();" << be_uidt_nl
-         << "}" << be_uidt_nl << be_nl;
+      os << "return ::CORBA::Object::_nil ();";
     }
 
+  os  << be_uidt_nl << "}" << be_uidt_nl << be_nl;
+
   os << "throw ::CORBA::INTERNAL ();" << be_uidt_nl
      << "}";
 
@@ -3382,7 +3355,7 @@ be_interface::gen_ami4ccm_idl (TAO_OutStream *os)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_interface::gen_ami4ccm_idl - ")
-                         ACE_TEXT ("reply handler visitor failed\n")),
+                         ACE_TEXT ("rh visitor failed\n")),
                         -1);
     }
 
@@ -3392,7 +3365,7 @@ be_interface::gen_ami4ccm_idl (TAO_OutStream *os)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_interface::gen_ami4ccm_idl - ")
-                         ACE_TEXT ("sendc op visitor failed\n")),
+                         ACE_TEXT ("sendc visitor failed\n")),
                         -1);
     }
 
@@ -3448,7 +3421,7 @@ be_interface::base_proxy_impl_name (void)
           this->local_name (),
           this->suffix_table_[PROXY_IMPL]);
     }
-    
+
   return this->base_proxy_impl_name_;
 }
 
@@ -3462,7 +3435,7 @@ be_interface::full_base_proxy_impl_name (void)
         this->base_proxy_impl_name ();
       size_t length =
         ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
-        
+
       ACE_NEW_RETURN (this->full_base_proxy_impl_name_,
                       char[length + 1],
                       0);
@@ -3472,7 +3445,7 @@ be_interface::full_base_proxy_impl_name (void)
       ACE_OS::strcat (this->full_base_proxy_impl_name_,
                       base_name);
     }
-    
+
   return this->full_base_proxy_impl_name_;
 }
 
@@ -3488,7 +3461,7 @@ be_interface::remote_proxy_impl_name (void)
           this->suffix_table_[PROXY_IMPL],
           this->tag_table_[REMOTE]);
     }
-    
+
   return this->remote_proxy_impl_name_;
 }
 
@@ -3501,7 +3474,7 @@ be_interface::full_remote_proxy_impl_name (void)
       const char *base_name = this->remote_proxy_impl_name ();
       size_t length =
         ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
-        
+
       ACE_NEW_RETURN (this->full_remote_proxy_impl_name_,
                       char[length + 1],
                       0);
@@ -3511,7 +3484,7 @@ be_interface::full_remote_proxy_impl_name (void)
       ACE_OS::strcat (this->full_remote_proxy_impl_name_,
                       base_name);
     }
-    
+
   return this->full_remote_proxy_impl_name_;
 }
 
@@ -3527,7 +3500,7 @@ be_interface::direct_proxy_impl_name (void)
           this->suffix_table_[PROXY_IMPL],
           this->tag_table_[DIRECT]);
     }
-    
+
   return this->direct_proxy_impl_name_;
 }
 
@@ -3541,7 +3514,7 @@ be_interface::full_direct_proxy_impl_name (void)
 
       size_t length =
         ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
-        
+
       ACE_NEW_RETURN (this->full_direct_proxy_impl_name_,
                       char[length + 1],
                       0);
@@ -3551,7 +3524,7 @@ be_interface::full_direct_proxy_impl_name (void)
       ACE_OS::strcat (this->full_direct_proxy_impl_name_,
                       base_name);
     }
-    
+
   return this->full_direct_proxy_impl_name_;
 }
 
@@ -3567,7 +3540,7 @@ be_interface::base_proxy_broker_name (void)
           this->local_name (),
           this->suffix_table_[PROXY_BROKER]);
     }
-    
+
   return this->base_proxy_broker_;
 }
 
@@ -3580,7 +3553,7 @@ be_interface::full_base_proxy_broker_name (void)
       const char *base_name = this->base_proxy_broker_name ();
       size_t length =
         ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
-        
+
       ACE_NEW_RETURN (this->full_base_proxy_broker_name_,
                       char[length + 1],
                       0);
@@ -3590,7 +3563,7 @@ be_interface::full_base_proxy_broker_name (void)
       ACE_OS::strcat (this->full_base_proxy_broker_name_,
                       base_name);
     }
-    
+
   return this->full_base_proxy_broker_name_;
 }
 
@@ -3607,7 +3580,7 @@ be_interface::remote_proxy_broker_name (void)
           this->suffix_table_[PROXY_BROKER],
           this->tag_table_[REMOTE]);
     }
-    
+
   return this->remote_proxy_broker_;
 }
 
@@ -3620,7 +3593,7 @@ be_interface::full_remote_proxy_broker_name (void)
       const char *base_name = this->remote_proxy_broker_name ();
       size_t length =
         ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
-        
+
       ACE_NEW_RETURN (this->full_remote_proxy_broker_name_,
                       char[length + 1],
                       0);
@@ -3630,7 +3603,7 @@ be_interface::full_remote_proxy_broker_name (void)
       ACE_OS::strcat (this->full_remote_proxy_broker_name_,
                       base_name);
     }
-    
+
   return this->full_remote_proxy_broker_name_;
 }
 
@@ -3647,7 +3620,7 @@ be_interface::strategized_proxy_broker_name (void)
           this->suffix_table_[PROXY_BROKER],
           this->tag_table_[STRATEGIZED]);
     }
-    
+
   return this->strategized_proxy_broker_;
 }
 
@@ -3661,7 +3634,7 @@ be_interface::full_strategized_proxy_broker_name (void)
         this->strategized_proxy_broker_name ();
       size_t length =
         ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
-        
+
       ACE_NEW_RETURN (this->full_strategized_proxy_broker_name_,
                       char[length + 1],
                       0);
@@ -3671,7 +3644,7 @@ be_interface::full_strategized_proxy_broker_name (void)
       ACE_OS::strcat (this->full_strategized_proxy_broker_name_,
                       base_name);
     }
-    
+
   return this->full_strategized_proxy_broker_name_;
 }
 
@@ -3692,7 +3665,7 @@ be_interface::client_enclosing_scope (void)
       ACE_OS::strncpy (this->client_scope_, full_name, length);
       this->client_scope_[length] = '\0';
     }
-    
+
   return this->client_scope_;
 }
 
@@ -3707,7 +3680,7 @@ be_interface::flat_client_enclosing_scope (void)
 
       size_t offset = ACE_OS::strlen (name);
       size_t length = ACE_OS::strlen (full_name) - offset;
-      
+
       ACE_NEW_RETURN (this->flat_client_scope_,
                       char[length + 1],
                       0);
@@ -3717,7 +3690,7 @@ be_interface::flat_client_enclosing_scope (void)
                        length);
       this->flat_client_scope_[length] = '\0';
     }
-    
+
   return this->flat_client_scope_;
 }
 
@@ -3741,7 +3714,7 @@ be_interface::server_enclosing_scope (void)
       ACE_OS::strncpy (this->server_scope_, full_name, length);
       this->server_scope_[length] = '\0';
     }
-    
+
   return this->server_scope_;
 }
 
diff --git a/TAO_IDL/be/be_null_return_emitter.cpp b/TAO_IDL/be/be_null_return_emitter.cpp
index d8b689dbf4e..d0d79ce406f 100644
--- a/TAO_IDL/be/be_null_return_emitter.cpp
+++ b/TAO_IDL/be/be_null_return_emitter.cpp
@@ -37,9 +37,9 @@ int
 be_null_return_emitter::emit (be_type *node)
 {
   os_ << "return ";
-  
+
   be_visitor_null_return_value visitor (this->ctx_);
-  
+
   if (node->accept (&visitor) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -49,8 +49,8 @@ be_null_return_emitter::emit (be_type *node)
                          node->full_name ()),
                         -1);
     }
-    
+
   os_ << ";";
-  
+
   return 0;
 }
diff --git a/TAO_IDL/be/be_param_holder.cpp b/TAO_IDL/be/be_param_holder.cpp
index 2e51be56b44..958a336b779 100644
--- a/TAO_IDL/be/be_param_holder.cpp
+++ b/TAO_IDL/be/be_param_holder.cpp
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  Place holder referenced by AST_Field (or subclass) 
+ *  Place holder referenced by AST_Field (or subclass)
  *  representing a corresponding template parameter in IDL.
  *
  *
diff --git a/TAO_IDL/be/be_produce.cpp b/TAO_IDL/be/be_produce.cpp
index 425bccc2ee9..aa74be74b5c 100644
--- a/TAO_IDL/be/be_produce.cpp
+++ b/TAO_IDL/be/be_produce.cpp
@@ -68,6 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "be_visitor_ami_pre_proc.h"
 #include "be_visitor_amh_pre_proc.h"
 #include "be_visitor_ccm_pre_proc.h"
+#include "be_visitor_dds_ts_idl.h"
 #include "be_visitor_context.h"
 #include "be_root.h"
 #include "be_extern.h"
@@ -116,6 +117,14 @@ BE_produce (void)
 {
   be_visitor_context ctx;
 
+  // Only generate the TypeSupport and directly bail out
+  if (be_global->gen_dds_typesupport_idl ())
+    {
+      be_visitor_dds_ts_idl root_dds_idl_visitor (&ctx);
+      BE_visit_root (root_dds_idl_visitor, "DDS type support IDL");
+      return;
+    }
+
   if (!idl_global->ignore_idl3 ())
     {
       be_visitor_ccm_pre_proc ccm_preproc_visitor (&ctx);
@@ -209,7 +218,7 @@ BE_produce (void)
       be_visitor_root_is root_is_visitor (&ctx);
       BE_visit_root (root_is_visitor, "implementation skeleton");
     }
-    
+
   if (be_global->gen_ciao_svnt ())
     {
       ctx.state (TAO_CodeGen::TAO_ROOT_SVH);
@@ -220,12 +229,12 @@ BE_produce (void)
       be_visitor_root_svs root_svs_visitor (&ctx);
       BE_visit_root (root_svs_visitor, "CIAO servant source");
     }
-      
+
   if (be_global->gen_ciao_exec_idl ())
     {
       ctx.state (TAO_CodeGen::TAO_ROOT_EX_IDL);
-      be_visitor_root_ex_idl root_svs_visitor (&ctx);
-      BE_visit_root (root_svs_visitor, "CIAO executor IDL");
+      be_visitor_root_ex_idl root_ex_idl_visitor (&ctx);
+      BE_visit_root (root_ex_idl_visitor, "CIAO executor IDL");
     }
 
   if (be_global->gen_ciao_exec_impl ())
@@ -238,7 +247,7 @@ BE_produce (void)
       be_visitor_root_exs root_exs_visitor (&ctx);
       BE_visit_root (root_exs_visitor, "CIAO exec impl source");
     }
-    
+
   if (be_global->gen_ciao_conn_impl ())
     {
       ctx.state (TAO_CodeGen::TAO_ROOT_CNH);
@@ -249,7 +258,7 @@ BE_produce (void)
       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_IDL/be/be_provides.cpp b/TAO_IDL/be/be_provides.cpp
index 846f35d068f..5c788a3ee39 100644
--- a/TAO_IDL/be/be_provides.cpp
+++ b/TAO_IDL/be/be_provides.cpp
@@ -70,7 +70,7 @@ be_provides::gen_facet_svnt_decl (TAO_OutStream &os)
       suffix = ACE_CString ("_") + suffix;
     }
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "namespace CIAO_FACET" << suffix.c_str () << be_nl
      << "{" << be_idt_nl;
 
@@ -105,31 +105,36 @@ be_provides::gen_facet_svnt_decl (TAO_OutStream &os)
       be_interface *intf =
         be_interface::narrow_from_decl (impl);
 
+      be_global->in_facet_servant (true);
+
       int status =
         intf->traverse_inheritance_graph (
           be_interface::op_attr_decl_helper,
           &os);
 
+      be_global->in_facet_servant (false);
+
       if (status == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_provides::gen_facet - ")
-                             ACE_TEXT ("traverse_inheritance_graph() failed\n")),
+                             ACE_TEXT ("traverse_inheritance_graph()")
+                             ACE_TEXT (" failed\n")),
                             -1);
         }
     }
 
-  os << be_nl << be_nl << "// Get component implementation." << be_nl
+  os << be_nl_2 << "/// Get component implementation." << be_nl
      << "virtual CORBA::Object_ptr _get_component (void);"
      << be_uidt_nl << be_nl;
 
   os << "protected:" << be_idt_nl;
 
-  os << "// Facet executor." << be_nl
+  os << "/// Facet executor." << be_nl
      << global << sname << "::CCM_"
-     << lname << "_var executor_;" << be_nl << be_nl;
+     << lname << "_var executor_;" << be_nl_2;
 
-  os << "// Context object." << be_nl
+  os << "/// Context object." << be_nl
      << "::Components::CCMContext_var ctx_;" << be_uidt_nl;
 
   os << "};" << be_nl << be_uidt_nl;
@@ -170,7 +175,7 @@ be_provides::gen_facet_svnt_defn (TAO_OutStream &os)
       suffix = ACE_CString ("_") + suffix;
     }
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "namespace CIAO_FACET" << suffix.c_str () << be_nl
      << "{" << be_idt_nl;
 
@@ -187,7 +192,7 @@ be_provides::gen_facet_svnt_defn (TAO_OutStream &os)
      << "{" << be_nl
      << "}";
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << lname << "_Servant::~"
      << lname << "_Servant (void)" << be_nl
      << "{" << be_nl
@@ -200,7 +205,7 @@ be_provides::gen_facet_svnt_defn (TAO_OutStream &os)
       be_interface *op_scope =
         be_interface::narrow_from_decl (impl);
 
-      os << be_nl << be_nl
+      os << be_nl_2
          << "// All facet operations and attributes.";
 
       /// The overload of traverse_inheritance_graph() used here
@@ -228,30 +233,30 @@ be_provides::gen_facet_svnt_defn (TAO_OutStream &os)
         }
     }
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "::CORBA::Object_ptr" << be_nl
      << lname << "_Servant::_get_component (void)"
      << be_nl
      << "{" << be_idt_nl
-     << "::Components::SessionContext_var sc =" << be_idt_nl
-     << "::Components::SessionContext::_narrow (this->ctx_.in ());"
+     << "::Components::" << be_global->ciao_container_type ()
+     << "Context_var sc =" << be_idt_nl
+     << "::Components::" << be_global->ciao_container_type ()
+     << "Context::_narrow (this->ctx_.in ());"
      << be_uidt_nl << be_nl
      << "if (! ::CORBA::is_nil (sc.in ()))" << be_idt_nl
-     << "{" << be_idt_nl
-     << "return sc->get_CCM_object ();" << be_uidt_nl
-     << "}" << be_uidt_nl << be_nl;
+     << "{" << be_idt_nl;
 
-  if (!be_global->gen_lwccm ())
+  if (ACE_OS::strcmp (be_global->ciao_container_type (), "Session") == 0)
+    {
+      os << "return sc->get_CCM_object ();";
+    }
+  else
     {
-      os << "::Components::EntityContext_var ec =" << be_idt_nl
-         << "::Components::EntityContext::_narrow (this->ctx_.in ());"
-         << be_uidt_nl << be_nl
-         << "if (! ::CORBA::is_nil (ec.in ()))" << be_idt_nl
-         << "{" << be_idt_nl
-         << "return ec->get_CCM_object ();" << be_uidt_nl
-         << "}" << be_uidt_nl << be_nl;
+      os << "return ::CORBA::Object::_nil ();";
     }
 
+  os << be_uidt_nl << "}" << be_uidt_nl << be_nl;
+
   os << "throw ::CORBA::INTERNAL ();" << be_uidt_nl
      << "}";
 
@@ -315,6 +320,14 @@ be_facet_op_attr_defn_helper::emit (be_interface * /* derived_interface */,
               be_operation *op =
                 be_operation::narrow_from_decl (d);
 
+              /// If AMI implied IDL was generated for the
+              /// original interface, we don't want those
+              /// extra operations in the facet servant.
+              if (op->is_sendc_ami ())
+                {
+                  continue;
+                }
+
               be_visitor_operation_svs v (&ctx);
               v.scope (op_scope_);
 
diff --git a/TAO_IDL/be/be_root.cpp b/TAO_IDL/be/be_root.cpp
index 3901bc329e1..12679acf696 100644
--- a/TAO_IDL/be/be_root.cpp
+++ b/TAO_IDL/be/be_root.cpp
@@ -42,7 +42,7 @@ void
 be_root::destroy (void)
 {
   // Call the destroy methods of our base classes.
-  
+
 // The scope of the root is handled specially, since we may
 // be processing multiple IDL files and we want to keep
 // the predefined types around until we are all done.
diff --git a/TAO_IDL/be/be_sequence.cpp b/TAO_IDL/be/be_sequence.cpp
index af460ee4d69..e81abd4692d 100644
--- a/TAO_IDL/be/be_sequence.cpp
+++ b/TAO_IDL/be/be_sequence.cpp
@@ -204,7 +204,7 @@ be_sequence::gen_name (void)
     {
       char ulval_str [NAMEBUFSIZE];
       ACE_OS::sprintf (ulval_str,
-                       "_%lu",
+                       "_" ACE_UINT32_FORMAT_SPECIFIER_ASCII,
                        this->max_size ()->ev ()->u.ulval);
       ACE_OS::strcat (namebuf,
                       ulval_str);
@@ -397,7 +397,7 @@ be_sequence::gen_ostream_operator (TAO_OutStream *os,
       << "const " << this->name () << " &_tao_sequence" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "strm << \"" << this->name () << "[\";" << be_nl << be_nl
+      << "strm << \"" << this->name () << "[\";" << be_nl_2
       << "for (CORBA::ULong i = 0; i < _tao_sequence.size (); ++i)"
       << be_idt_nl
       << "{" << be_idt_nl
@@ -465,7 +465,8 @@ be_sequence::instance_name ()
       else
         {
           ACE_OS::sprintf (namebuf,
-                           "_TAO_bounded_object_reference_sequence_%s_%lu",
+                           "_TAO_bounded_object_reference_sequence_%s_"
+                           ACE_UINT32_FORMAT_SPECIFIER_ASCII,
                            prim_type->local_name ()->get_string (),
                            this->max_size ()->ev ()->u.ulval);
         }
@@ -481,7 +482,8 @@ be_sequence::instance_name ()
       else
         {
           ACE_OS::sprintf (namebuf,
-                           "_TAO_bounded_valuetype_sequence_%s_%lu",
+                           "_TAO_bounded_valuetype_sequence_%s_"
+                           ACE_UINT32_FORMAT_SPECIFIER_ASCII,
                            prim_type->local_name ()->get_string (),
                            this->max_size ()->ev ()->u.ulval);
         }
@@ -539,9 +541,10 @@ be_sequence::instance_name ()
       else
         {
           ACE_OS::sprintf (namebuf,
-                           "_TAO_bounded_value_sequence_%s_%lu",
-                            prim_type->local_name ()->get_string (),
-                            this->max_size ()->ev ()->u.ulval);
+                           "_TAO_bounded_value_sequence_%s_"
+                           ACE_UINT32_FORMAT_SPECIFIER_ASCII,
+                           prim_type->local_name ()->get_string (),
+                           this->max_size ()->ev ()->u.ulval);
         }
 
       break;
@@ -561,7 +564,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
     {
       *os << "std::vector<" << elem->nested_type_name (ctx_scope)
           << ">";
-          
+
       return 0;
     }
 */
@@ -826,7 +829,7 @@ be_sequence::compute_tc_name (void)
   char bound[30] = { 0 };
 
   ACE_OS::sprintf (bound,
-                   "_%lu",
+                   "_" ACE_UINT32_FORMAT_SPECIFIER_ASCII,
                    this->max_size ()->ev ()->u.ulval);
 
   ACE_CString local_tc_name =
diff --git a/TAO_IDL/be/be_string.cpp b/TAO_IDL/be/be_string.cpp
index b16aeb60867..f0d93527172 100644
--- a/TAO_IDL/be/be_string.cpp
+++ b/TAO_IDL/be/be_string.cpp
@@ -58,17 +58,17 @@ be_string::gen_member_ostream_operator (TAO_OutStream *os,
   if (this->width () == 1)
     {
       *os << "\"\\\"\" << ";
-      
+
       this->be_type::gen_member_ostream_operator (os,
                                                   instance_name,
                                                   use_underscore,
                                                   accessor);
-      
+
       *os << " << \"\\\"\"";
     }
   else
     {
-      *os << "\"[\";" << be_nl << be_nl
+      *os << "\"[\";" << be_nl_2
           << "for (size_t i = 0; i < " << "ACE_OS::strlen ("
           << instance_name
           << (accessor ? " ()" : ".in ()") << "); ++i)" << be_idt_nl
@@ -142,7 +142,7 @@ be_string::compute_tc_name (void)
       ACE_NEW (id,
                Identifier (local_tc_name.c_str ()));
     }
-    
+
   zero.destroy ();
 
   UTL_ScopedName *conc_name = 0;
diff --git a/TAO_IDL/be/be_structure.cpp b/TAO_IDL/be/be_structure.cpp
index 39141f84456..f686332d741 100644
--- a/TAO_IDL/be/be_structure.cpp
+++ b/TAO_IDL/be/be_structure.cpp
@@ -98,24 +98,24 @@ be_structure::gen_ostream_operator (TAO_OutStream *os,
       << "std::ostream& operator<< (" << be_idt << be_idt_nl
       << "std::ostream &strm," << be_nl
       << "const " << this->name () << " &";
-  
+
   long n = this->pd_decls_used;
-      
-  // be_exception is a subclass and could be empty.    
+
+  // be_exception is a subclass and could be empty.
   if (n > 0)
-    {    
+    {
       *os <<  "_tao_aggregate";
     }
-    
+
   *os << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "strm << \"" << this->name () << "(\"";
-  
+
   for (long i = 0; i < n; ++i)
     {
       be_field *f = be_field::narrow_from_decl (this->pd_decls[i]);
-      
+
       // We don't want any decls, just members.
       if (f == 0)
         {
@@ -125,11 +125,11 @@ be_structure::gen_ostream_operator (TAO_OutStream *os,
       if (i != 0)
         {
           *os << " << \", \"";
-        }        
-        
+        }
+
       *os << be_nl
           << "     << ";
-          
+
       ACE_CString instance_name ("_tao_aggregate.");
       instance_name += f->local_name ()->get_string ();
       AST_Decl::NodeType nt = f->field_type ()->node_type ();
@@ -140,9 +140,9 @@ be_structure::gen_ostream_operator (TAO_OutStream *os,
                                       member_use_underscore,
                                       false);
     }
-    
+
   *os << be_nl
-      << "     << \")\";" << be_nl << be_nl
+      << "     << \")\";" << be_nl_2
       << "return strm;" << be_uidt_nl
       << "}" << be_nl;
 }
diff --git a/TAO_IDL/be/be_type.cpp b/TAO_IDL/be/be_type.cpp
index c71c22bf93a..c431afbbb68 100644
--- a/TAO_IDL/be/be_type.cpp
+++ b/TAO_IDL/be/be_type.cpp
@@ -63,7 +63,12 @@ be_type::compute_tc_name (void)
   static char namebuf [NAMEBUFSIZE];
   UTL_ScopedName *n = this->name ();
 
-  this->tc_name_ = 0;
+  if (this->tc_name_ != 0)
+    {
+      this->tc_name_->destroy ();
+      delete this->tc_name_;
+      this->tc_name_ = 0;
+    }
 
   ACE_OS::memset (namebuf,
                   '\0',
@@ -251,17 +256,17 @@ be_type::gen_common_varout (TAO_OutStream *os)
       return;
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   AST_Type::SIZE_TYPE st = this->size_type ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << (this->node_type () == AST_Decl::NT_struct ? "struct "
                                                     : "class ")
       << this->local_name () << ";";
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "typedef" << be_idt_nl
       << (st == AST_Type::FIXED ? "::TAO_Fixed_Var_T<"
                                 : "::TAO_Var_Var_T<")
@@ -295,26 +300,26 @@ be_type::gen_stub_decls (TAO_OutStream *os)
     {
       return;
     }
-    
-  *os << be_nl << be_nl
+
+  *os << be_nl_2
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
-      
+
   *os << be_nl;
-      
+
   AST_Interface *i = AST_Interface::narrow_from_decl (this);
   AST_ValueType *v = AST_ValueType::narrow_from_decl (this);
-  
+
   if (i != 0)
     {
       *os << be_nl
           << "typedef " << this->local_name ()
           << (v == 0 ? "_ptr" : " *") << " _ptr_type;";
     }
-    
+
   bool skip_varout = false;
   AST_Sequence *s = AST_Sequence::narrow_from_decl (this);
-  
+
   if (s != 0)
     {
       // _vars and _outs not supported yet by alt mapping.
@@ -323,16 +328,16 @@ be_type::gen_stub_decls (TAO_OutStream *os)
           skip_varout = true;
         }
     }
-  
+
   if (!skip_varout)
-    {  
+    {
       *os << be_nl
           << "typedef " << this->local_name ()
           << "_var _var_type;" << be_nl
           << "typedef " << this->local_name ()
           << "_out _out_type;";
     }
-      
+
   bool gen_any_destructor =
     be_global->any_support ()
     && (!this->is_local ()
@@ -340,7 +345,7 @@ be_type::gen_stub_decls (TAO_OutStream *os)
 
   if (gen_any_destructor)
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "static void _tao_any_destructor (void *);";
     }
 }
diff --git a/TAO_IDL/be/be_union.cpp b/TAO_IDL/be/be_union.cpp
index 660bdf84aab..efd3194664f 100644
--- a/TAO_IDL/be/be_union.cpp
+++ b/TAO_IDL/be/be_union.cpp
@@ -96,7 +96,7 @@ be_union::has_duplicate_case_labels (void)
 
 void
 be_union::gen_ostream_operator (TAO_OutStream *os,
-                                bool use_underscore)
+                                bool /*use_underscore*/)
 {
   *os << be_nl
       << "std::ostream& operator<< (" << be_idt << be_idt_nl
@@ -104,23 +104,23 @@ be_union::gen_ostream_operator (TAO_OutStream *os,
       << "const " << this->name () << " &_tao_union" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "strm << \"" << this->name () << "(\";" << be_nl << be_nl
+      << "strm << \"" << this->name () << "(\";" << be_nl_2
       << "switch (_tao_union._d ())" << be_nl
       << "{" << be_idt;
-      
+
   for (long i = 0; i < this->pd_decls_used; ++i)
     {
       be_union_branch *ub =
         be_union_branch::narrow_from_decl (this->pd_decls[i]);
-      
+
       // We don't want any decls, just members.
       if (ub == 0)
         {
           continue;
         }
-        
+
       *os << be_nl;
-        
+
       unsigned long ll_len = ub->label_list_length ();
 
       for (unsigned long j = 0; j < ll_len; ++j)
@@ -151,29 +151,34 @@ be_union::gen_ostream_operator (TAO_OutStream *os,
 
       ACE_CString instance_name ("_tao_union.");
       instance_name += ub->local_name ()->get_string ();
-      
+
       *os << "strm << ";
-      
+
+      be_type *ub_ft = be_type::narrow_from_decl (ub->field_type ());
+      AST_Decl::NodeType ub_nt = ub_ft->node_type ();
+      // catch anonymous Array member types
+      bool ub_use_underscore = ub_nt == AST_Decl::NT_array;
+
       ub->gen_member_ostream_operator (os,
                                        instance_name.c_str (),
-                                       use_underscore,
+                                       ub_use_underscore,
                                        true);
-      
+
       *os << ";" << be_nl
           << "break;" << be_uidt;
     }
-  
+
   // Some compilers complain unless this is present, but only
-  // if not all values are covered in case statements.  
+  // if not all values are covered in case statements.
   if (this->gen_empty_default_label ())
     {
       *os << be_nl
           << "default:" << be_idt_nl
           << "break;" << be_uidt;
     }
-    
+
   *os << be_uidt_nl
-      << "}" << be_nl << be_nl
+      << "}" << be_nl_2
       << "return strm << \")\";" << be_uidt_nl
       << "}" << be_nl;
 }
diff --git a/TAO_IDL/be/be_util.cpp b/TAO_IDL/be/be_util.cpp
index 8a2adb6245c..3131f77cba4 100644
--- a/TAO_IDL/be/be_util.cpp
+++ b/TAO_IDL/be/be_util.cpp
@@ -43,7 +43,7 @@ be_util::gen_nested_namespace_begin (TAO_OutStream *os,
         {
           // Leave the outermost root scope.
           *os << be_nl << "namespace ";
-          
+
           if (first_level && skel)
             {
               // We are outermost module.
@@ -77,22 +77,22 @@ void
 be_util::gen_nesting_open (TAO_OutStream &os, AST_Decl *node)
 {
   AST_Decl::NodeType nt = node->node_type ();
-  
+
   if (nt == AST_Decl::NT_root)
     {
       os << be_nl;
       return;
     }
-    
+
   be_util::gen_nesting_open (
     os,
     ScopeAsDecl (node->defined_in ()));
-   
+
   if (nt == AST_Decl::NT_module)
-    {  
+    {
       ACE_CString module_name (
         IdentifierHelper::try_escape (node->original_local_name ()));
-      
+
       os << be_nl
          << "module " << module_name.c_str () << be_nl
          << "{" << be_idt;
@@ -104,12 +104,12 @@ be_util::gen_nesting_close (TAO_OutStream &os, AST_Decl *node)
 {
   AST_Decl *d = ScopeAsDecl (node->defined_in ());
   AST_Decl::NodeType nt = d->node_type ();
-  
+
   while (nt != AST_Decl::NT_root)
     {
       os << be_uidt_nl
          << "};";
-         
+
       d = ScopeAsDecl (d->defined_in ());
       nt = d->node_type ();
     }
@@ -139,10 +139,12 @@ be_util::prep_be_arg (char *s)
   static const char arg_versioning_begin[] = "versioning_begin=";
   static const char arg_versioning_end[]   = "versioning_end=";
   static const char obv_opt_accessor[]     = "obv_opt_accessor";
+  static const char ciao_container_type[]  = "ciao_container_type=";
   static const char include_guard[]        = "include_guard=";
   static const char safe_include[]         = "safe_include=";
   static const char unique_include[]       = "unique_include=";
   static const char dds_impl[]             = "dds_impl=";
+  static const char opendds_sequence_suffix[] = "opendds_sequence_suffix=";
 
   char* last = 0;
 
@@ -256,6 +258,11 @@ be_util::prep_be_arg (char *s)
         {
           be_global->obv_opt_accessor (1);
         }
+      else if (ACE_OS::strstr (arg, ciao_container_type) == arg)
+        {
+          char* val = arg + sizeof (ciao_container_type) - 1;
+          be_global->ciao_container_type (val);
+        }
       else if (ACE_OS::strstr (arg, arg_versioning_begin) == arg)
         {
           char const * const val =
@@ -274,6 +281,12 @@ be_util::prep_be_arg (char *s)
             arg + sizeof (dds_impl) - 1;
           be_global->dds_impl (val);
         }
+      else if (ACE_OS::strstr (arg, opendds_sequence_suffix) == arg)
+        {
+          char const * const val =
+            arg + sizeof (opendds_sequence_suffix) - 1;
+          be_global->opendds_sequence_suffix (val);
+        }
       else
         {
           ACE_ERROR ((LM_ERROR,
@@ -457,6 +470,10 @@ be_util::usage (void)
     ));
   ACE_DEBUG ((
       LM_DEBUG,
+      ACE_TEXT (" -Wb,container_type=<type>\t\t\ttype of container we generated\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
       ACE_TEXT (" -Wb,obv_opt_accessor\t\t\t\toptimizes access to base class ")
       ACE_TEXT ("data in valuetypes\n")
     ));
@@ -518,6 +535,10 @@ be_util::usage (void)
     ));
   ACE_DEBUG ((
       LM_DEBUG,
+      ACE_TEXT (" -Gcm \t\t\tGenerate code optimized for noevent CCM\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
       ACE_TEXT (" -Gd \t\t\tGenerate the code for direct collocation. Default ")
       ACE_TEXT ("is thru-POA collocation\n")
     ));
@@ -639,11 +660,21 @@ be_util::usage (void)
     ));
   ACE_DEBUG ((
       LM_DEBUG,
+      ACE_TEXT (" -Gexr\t\t\tgenerate CIAO executor implementation ")
+      ACE_TEXT ("code with an ACE_Reactor implementation (not generated by default)\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
       ACE_TEXT (" -Gcn\t\t\tgenerate CIAO connector implementation ")
       ACE_TEXT ("code (not generated by default)\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
+      ACE_TEXT (" -Gts\t\t\tgenerate DDS type support IDL ")
+      ACE_TEXT ("(not generated by default)\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
       ACE_TEXT (" -Gsc\t\t\tgenerate CIAO code for static ")
       ACE_TEXT ("configuration (not generated by default)\n")
     ));
@@ -719,6 +750,12 @@ be_util::usage (void)
     ));
   ACE_DEBUG ((
       LM_DEBUG,
+      ACE_TEXT (" -iC <path>\tInclude path for the generated stub files")
+      ACE_TEXT ("in *A.h. Can be relative to $TAO_ROOT or $CIAO_ROOT. ")
+      ACE_TEXT ("Default is $TAO_ROOT/tao or current directory\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
       ACE_TEXT (" -o <output_dir>\tOutput directory for the generated files.")
       ACE_TEXT (" Default is current directory\n")
     ));
diff --git a/TAO_IDL/be/be_valuebox.cpp b/TAO_IDL/be/be_valuebox.cpp
index f39483ddb34..7b8569e2a05 100644
--- a/TAO_IDL/be/be_valuebox.cpp
+++ b/TAO_IDL/be/be_valuebox.cpp
@@ -58,7 +58,8 @@ void
 be_valuebox::destroy (void)
 {
   // Call the destroy methods of our base classes.
-  this->AST_Type::destroy ();
+  this->AST_ValueBox::destroy ();
+  this->be_type::destroy ();
 }
 
 
diff --git a/TAO_IDL/be/be_valuetype.cpp b/TAO_IDL/be/be_valuetype.cpp
index 7d01635b3f8..d1e3e0abddb 100644
--- a/TAO_IDL/be/be_valuetype.cpp
+++ b/TAO_IDL/be/be_valuetype.cpp
@@ -17,11 +17,15 @@
 #include "be_visitor.h"
 #include "be_extern.h"
 #include "be_helper.h"
+
 #include "ast_module.h"
+#include "ast_attribute.h"
+
 #include "utl_identifier.h"
 #include "idl_defines.h"
 #include "nr_extern.h"
 #include "global_extern.h"
+
 #include "ace/Log_Msg.h"
 
 be_valuetype::be_valuetype (UTL_ScopedName *n,
@@ -97,7 +101,7 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
     {
       be_interface *intf =
         be_interface::narrow_from_decl (this->pd_supports[i]);
-        
+
       if (intf == 0)
         {
           // The item is a template param holder.
@@ -363,7 +367,7 @@ be_valuetype::have_supported_op (be_interface * node)
       long i;  // loop index
       long n_inherits = node->n_inherits ();
       AST_Type **inherits = node->inherits ();
-      
+
       for (i = 0; i < n_inherits; ++i)
         {
           be_interface * intf =
@@ -428,9 +432,9 @@ be_valuetype::gen_helper_header (char *, char *)
 {
   TAO_OutStream *os = tao_cg->client_header ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -459,10 +463,10 @@ be_valuetype::gen_helper_inline (char *, char *)
   // is not getting generated... Actually this is a much bigger
   // problem. Just hacking  it up for the timebeing..
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
-  *os << "#if defined (__ACE_INLINE__)" << be_nl << be_nl
+  *os << "#if defined (__ACE_INLINE__)" << be_nl_2
       << be_global->core_versioning_begin () << be_nl
       << "namespace CORBA" << be_nl
       << "{"
@@ -472,7 +476,7 @@ be_valuetype::gen_helper_inline (char *, char *)
       << "extern " << be_global->stub_export_macro () << " void remove_ref ("
       << this->full_name () << " *);"
       <<  be_uidt_nl
-      << "}" << be_nl << be_nl
+      << "}" << be_nl_2
       << be_global->core_versioning_end () << be_nl
       << "#endif /*__ACE_INLINE__*/";
 
@@ -485,8 +489,8 @@ be_valuetype::gen_helper_stubs (char *, char *)
 {
   TAO_OutStream *os = tao_cg->client_stubs ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "void" << be_nl
       << "CORBA::add_ref (" << this->full_name () << " * vt)" << be_nl
@@ -495,7 +499,7 @@ be_valuetype::gen_helper_stubs (char *, char *)
       << "{" << be_idt_nl
       << "vt->_add_ref ();" << be_uidt_nl
       << "}" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "void" << be_nl
       << "CORBA::remove_ref (" << this->full_name () << " * vt)" << be_nl
@@ -537,8 +541,8 @@ be_valuetype::gen_var_out_seq_decls (void)
 
   TAO_OutStream *os = tao_cg->client_header ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Generate the ifdefined macro for this interface.
   os->gen_ifdef_macro (this->flat_name (),
@@ -546,7 +550,7 @@ be_valuetype::gen_var_out_seq_decls (void)
 
   const char *lname = this->local_name ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "class " << lname << ";" << be_nl
       << "typedef" << be_idt_nl
       << "TAO_Value_Var_T<" << be_idt << be_idt_nl
@@ -602,6 +606,9 @@ be_valuetype::accept (be_visitor *visitor)
 void
 be_valuetype::destroy (void)
 {
+  delete [] this->full_obv_skel_name_;
+  this->full_obv_skel_name_ = 0;
+
   this->be_interface::destroy ();
   this->AST_ValueType::destroy ();
 }
@@ -625,8 +632,9 @@ be_valuetype::data_members_count (AST_Field::Visibility vis)
         }
 
       AST_Field *field = AST_Field::narrow_from_decl (d);
+      AST_Attribute *attr = AST_Attribute::narrow_from_decl (d);
 
-      if (!field)
+      if (field == 0 || attr != 0)
         {
           continue;
         }
@@ -800,7 +808,7 @@ be_valuetype::gen_skel_helper (be_interface *concrete,
               os->indent ();
 
               *os << "// TAO_IDL - Generated from" << be_nl
-                  << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+                  << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
               if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR)
                 {
diff --git a/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
index 4e16bdbc91c..6d42245906c 100644
--- a/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
+++ b/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
@@ -187,14 +187,14 @@ be_visitor_amh_pre_proc::create_response_handler (
   response_handler->set_imported (node->imported ());
   response_handler->set_line (node->line ());
   response_handler->set_file_name (node->file_name ());
-  
+
   // Set repo id to 0, so it will be recomputed on the next access,
   // and set the prefix to the node's prefix. All this is
   // necessary in case the node's prefix was modified after
   // its declaration.
   response_handler->AST_Decl::repoID (0);
   response_handler->prefix (const_cast<char*> (node->prefix ()));
-  
+
   response_handler->gen_fwd_helper_name ();
   this->add_rh_node_members (node, response_handler, exception_holder);
   return response_handler;
@@ -291,8 +291,8 @@ be_visitor_amh_pre_proc::create_response_handler_operation (
     {
       return -1;
     }
-    
-  /// These are for the stub side only.  
+
+  /// These are for the stub side only.
   if (node->is_sendc_ami ())
     {
       return 0;
@@ -324,11 +324,11 @@ be_visitor_amh_pre_proc::create_response_handler_attribute (
     this->create_response_handler_operation (get_operation,
                                              response_handler,
                                              exception_holder);
-                                             
+
   get_operation->destroy ();
   delete get_operation;
   get_operation = 0;
-                                             
+
   if (status == -1)
     {
       return -1;
@@ -348,11 +348,11 @@ be_visitor_amh_pre_proc::create_response_handler_attribute (
     this->create_response_handler_operation (set_operation,
                                              response_handler,
                                              exception_holder);
-                                             
+
   set_operation->destroy ();
   delete set_operation;
   set_operation = 0;
-                                             
+
   return status;
 }
 
@@ -372,14 +372,14 @@ be_visitor_amh_pre_proc::add_exception_reply (be_operation *node,
                                 1,
                                 0),
                   -1);
-                  
+
   node_excep->set_name (operation_name);
 
   Identifier *arg_id = 0;
   ACE_NEW_RETURN (arg_id,
                   Identifier ("holder"),
                   -1);
-                  
+
   UTL_ScopedName *arg_name = 0;
   ACE_NEW_RETURN (arg_name,
                   UTL_ScopedName (arg_id, 0),
@@ -451,7 +451,7 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node,
       ACE_NEW_RETURN (arg_id,
                       Identifier ("return_value"),
                       -1);
-                      
+
       UTL_ScopedName *arg_name = 0;
       ACE_NEW_RETURN (arg_name,
                       UTL_ScopedName (arg_id, 0),
@@ -464,9 +464,9 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node,
                                    node->return_type (),
                                    arg_name),
                       -1);
-                      
+
       arg->set_name (arg_name);
-                      
+
       // Add the response handler to the argument list
       operation->be_add_argument (arg);
     }
@@ -575,14 +575,14 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
 
   excep_holder->set_name (excep_holder_name);
   excep_holder->set_defined_in (node->defined_in ());
-  
+
   // Set repo id to 0, so it will be recomputed on the next access,
   // and set the prefix to the node's prefix. All this is
   // necessary in case the node's prefix was modified after
   // its declaration.
   excep_holder->AST_Decl::repoID (0);
   excep_holder->prefix (const_cast<char*> (node->prefix ()));
-  
+
   excep_holder->gen_fwd_helper_name ();
 
   // Now our customized valuetype is created, we have to
@@ -704,7 +704,7 @@ be_visitor_amh_pre_proc::create_raise_operation (
         {
           // Copy the exceptions.
           UTL_ExceptList *exceptions = orig_op->exceptions ();
-          
+
           if (0 != exceptions)
             {
               operation->be_add_exceptions (exceptions->copy ());
diff --git a/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
index 2ed02589fb3..daa11786694 100644
--- a/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
+++ b/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
@@ -64,7 +64,7 @@ be_visitor_ami_pre_proc::visit_root (be_root *node)
       /// Generate the *A.idl file containing AMI4CCM-related
       /// interfaces and connector.
       int status = this->generate_ami4ccm_idl ();
-      
+
       if (status == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -204,7 +204,7 @@ be_visitor_ami_pre_proc::visit_operation (be_operation *node)
       // We do nothing for oneways!
       return 0;
     }
-    
+
   be_interface *parent =
     be_interface::narrow_from_scope (node->defined_in ());
 
@@ -214,7 +214,7 @@ be_visitor_ami_pre_proc::visit_operation (be_operation *node)
 
   be_operation *sendc_op =
     this->create_sendc_operation (node); // for arguments = TRUE
-                                  
+
   parent->be_add_operation (sendc_op);
 
   return 0;
@@ -236,18 +236,18 @@ be_visitor_ami_pre_proc::visit_attribute (be_attribute *node)
       delete set_operation;
       set_operation = 0;
     }
-    
+
   /// Temporarily generate the get operation.
   be_operation *get_operation =
     this->generate_get_operation (node);
   get_operation->set_defined_in (node->defined_in ());
 
   this->visit_operation (get_operation);
-  
+
   get_operation->destroy ();
   delete get_operation;
   get_operation = 0;
-  
+
   return 0;
 }
 
@@ -270,7 +270,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node)
 
   UTL_ScopedName *reply_handler_name =
     static_cast<UTL_ScopedName *> (node->name ()->copy ());
-    
+
   reply_handler_name->last_component ()->replace_string (
     reply_handler_local_name.c_str ());
 
@@ -302,7 +302,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node)
 
   reply_handler->set_name (reply_handler_name);
   reply_handler->set_defined_in (s);
-  
+
   /// Store here for convenient retrieval later.
   node->ami_handler (reply_handler);
 
@@ -349,7 +349,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node)
                 {
                   be_operation *get_operation =
                     this->generate_get_operation (attribute);
-                    
+
                   this->create_reply_handler_operation (get_operation,
                                                         reply_handler);
 
@@ -395,7 +395,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node)
 
   reply_handler->is_ami_rh (true);
   reply_handler->is_ami4ccm_rh (true);
-  
+
   return reply_handler;
 }
 
@@ -423,7 +423,7 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node)
   op_name->last_component ()->replace_string (new_op_name.c_str ());
 
   idl_global->scopes ().push (node->defined_in ());
-  
+
   // Create the operation
   be_operation *op = 0;
   ACE_NEW_RETURN (op,
@@ -433,7 +433,7 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node)
                                 false,
                                 false),
                   0);
-                  
+
   idl_global->scopes ().pop ();
 
   op->set_name (op_name);
@@ -467,11 +467,11 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node)
 
   be_interface *field_type =
     be_interface::narrow_from_decl (handler);
-  
+
   ACE_NEW_RETURN (id,
                   Identifier ("ami_handler"),
                   0);
- 
+
   UTL_ScopedName *tmp = 0;
 
   ACE_NEW_RETURN (tmp,
@@ -1120,9 +1120,18 @@ be_visitor_ami_pre_proc::generate_ami4ccm_idl (void)
       if (d == 0)
         {
           idl_global->err ()->lookup_error (sn);
+
+          sn->destroy ();
+          delete sn;
+          sn = 0;
+
           continue;
         }
 
+      sn->destroy ();
+      delete sn;
+      sn = 0;
+
       be_interface *iface =
         be_interface::narrow_from_decl (d);
 
diff --git a/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp b/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp
index deef051a509..ed9d7c78a5a 100644
--- a/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp
+++ b/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp
@@ -25,7 +25,6 @@
 be_visitor_any_extracted_type_decl::be_visitor_any_extracted_type_decl (
     be_visitor_context *ctx)
   : be_visitor_decl (ctx),
-    os_ (*ctx->stream ()),
     var_name_ ("_extract_val"),
     tmp_name_ ("_extract_tmp")
 {
@@ -88,7 +87,7 @@ be_visitor_any_extracted_type_decl::visit_predefined_type (
   be_predefined_type *node)
 {
   os_ << node->full_name () << " ";
-  
+
   switch (node->pt ())
     {
       case AST_PredefinedType::PT_boolean:
@@ -160,12 +159,12 @@ be_visitor_any_extracted_type_decl::visit_predefined_type (
             os_ << "_ptr " << var_name_
                 << " = ::CORBA::TypeCode::_nil ();";
           }
-        
+
         break;
       default: // PT_void is left out of the case list.
         break;
     }
-    
+
   return 0;
 }
 
@@ -173,15 +172,15 @@ int
 be_visitor_any_extracted_type_decl::visit_sequence (be_sequence *node)
 {
   be_type *bt = this->ctx_->alias ();
-  
+
   if (bt == 0)
     {
       bt = node;
     }
-    
+
   os_ << "const " << bt->nested_type_name (idl_global->root ())
       << " * " << var_name_ << " = 0;";
-      
+
   return 0;
 }
 
@@ -204,7 +203,7 @@ be_visitor_any_extracted_type_decl::visit_typedef (be_typedef *node)
 {
   this->ctx_->alias (node);
   int status = node->primitive_base_type ()->accept (this);
-  
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -213,7 +212,7 @@ be_visitor_any_extracted_type_decl::visit_typedef (be_typedef *node)
                          "accept on primitive type failed\n"),
                         -1);
     }
-    
+
   this->ctx_->alias (0);
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO_IDL/be/be_visitor_arg_traits.cpp
index c0e1ba75532..a15234e5d61 100644
--- a/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -63,14 +63,14 @@ be_visitor_arg_traits::visit_root (be_root *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   *os << be_nl
       << be_global->core_versioning_begin ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// Arg traits specializations." << be_nl
       << "namespace TAO" << be_nl
       << "{" << be_idt;
@@ -132,7 +132,7 @@ be_visitor_arg_traits::visit_interface (be_interface *node)
     {
       TAO_OutStream *os = this->ctx_->stream ();
 
-      *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
           << "// " << __FILE__ << ":" << __LINE__;
 
       std::string guard_suffix =
@@ -142,7 +142,7 @@ be_visitor_arg_traits::visit_interface (be_interface *node)
       // guard prevents multiple declarations.
       os->gen_ifdef_macro (node->flat_name (), guard_suffix.c_str (), false);
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "template<>" << be_nl
           << "class "
           << " " << this->S_ << "Arg_Traits<"
@@ -159,7 +159,7 @@ be_visitor_arg_traits::visit_interface (be_interface *node)
               << "TAO::Objref_Traits<" << node->name () << ">";
         }
 
-      *os << "," << be_nl << this->insert_policy() 
+      *os << "," << be_nl << this->insert_policy()
           << be_uidt_nl
           << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
           << "{" << be_nl
@@ -220,7 +220,7 @@ be_visitor_arg_traits::visit_valuebox (be_valuebox *node)
     {
       TAO_OutStream & os = *this->ctx_->stream ();
 
-      os << be_nl << be_nl
+      os << be_nl_2
          << "// TAO_IDL - Generated from" << be_nl
          << "// " << __FILE__ << ":" << __LINE__;
 
@@ -231,7 +231,7 @@ be_visitor_arg_traits::visit_valuebox (be_valuebox *node)
       // guard prevents multiple declarations.
       os.gen_ifdef_macro (node->flat_name (), guard_suffix.c_str (), false);
 
-      os << be_nl << be_nl
+      os << be_nl_2
          << "template<>" << be_nl
          << "class "
          << this->S_ << "Arg_Traits<"
@@ -274,7 +274,7 @@ be_visitor_arg_traits::visit_valuetype (be_valuetype *node)
     {
       TAO_OutStream & os = *this->ctx_->stream ();
 
-      os << be_nl << be_nl
+      os << be_nl_2
          << "// TAO_IDL - Generated from" << be_nl
          << "// " << __FILE__ << ":" << __LINE__;
 
@@ -285,7 +285,7 @@ be_visitor_arg_traits::visit_valuetype (be_valuetype *node)
       // guard prevents multiple declarations.
       os.gen_ifdef_macro (node->flat_name (), guard_suffix.c_str (), false);
 
-      os << be_nl << be_nl
+      os << be_nl_2
          << "template<>" << be_nl
          << "class "
          << this->S_ << "Arg_Traits<"
@@ -390,12 +390,12 @@ be_visitor_arg_traits::visit_operation (be_operation *node)
         {
           TAO_OutStream *os = this->ctx_->stream ();
 
-          *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+          *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
               << "// " << __FILE__ << ":" << __LINE__;
 
           bool wide = (str->width () != 1);
 
-          *os << be_nl << be_nl;
+          *os << be_nl_2;
 
           bool const skel =
             (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS);
@@ -407,7 +407,7 @@ be_visitor_arg_traits::visit_operation (be_operation *node)
               || (skel && ACE_OS::strlen (this->S_) != 0))
             {
               *os << "struct " << node->flat_name () << " {};"
-                  << be_nl << be_nl;
+                  << be_nl_2;
             }
 
           *os << "template<>" << be_nl
@@ -419,7 +419,7 @@ be_visitor_arg_traits::visit_operation (be_operation *node)
               << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl
               << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl
               << bound << "," << be_nl
-              << this->insert_policy() 
+              << this->insert_policy()
               << ">"
               << be_uidt << be_uidt << be_uidt_nl
               << "{" << be_nl
@@ -465,7 +465,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   bool wide = (st->width () != 1);
@@ -488,7 +488,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node)
       || (skel && ACE_OS::strlen (this->S_) != 0))
     {
       *os << "struct " << node->flat_name () << " {};"
-          << be_nl << be_nl;
+          << be_nl_2;
     }
 
   *os << "template<>" << be_nl
@@ -539,7 +539,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   bool wide = (st->width () != 1);
@@ -550,11 +550,11 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
   // the same operation, so we use the argument's flat name to
   // declare an empty struct, and use that struct as the template
   // parameter for Arg_Traits<>.
-  *os << be_nl << be_nl;
+  *os << be_nl_2;
 
   bool const skel =
     (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS);
-    
+
   AST_Decl *op = ScopeAsDecl (node->defined_in ());
   AST_Decl *intf = ScopeAsDecl (op->defined_in ());
   ACE_CString arg_flat_name (intf->flat_name ());
@@ -569,7 +569,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
       || (skel && ACE_OS::strlen (this->S_) != 0))
     {
       *os << "struct " << arg_flat_name.c_str () << " {};"
-          << be_nl << be_nl;
+          << be_nl_2;
     }
 
   *os << "template<>" << be_nl
@@ -581,7 +581,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
       << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl
       << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl
       << bound << "," << be_nl
-      << this->insert_policy() 
+      << this->insert_policy()
       << be_uidt_nl
       << ">"
       << be_uidt << be_uidt << be_uidt_nl
@@ -603,7 +603,7 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node)
   TAO_OutStream *os = this->ctx_->stream ();
   be_typedef *alias = this->ctx_->alias ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   std::string guard_suffix =
@@ -614,11 +614,11 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node)
   os->gen_ifdef_macro (alias->flat_name (),
                        guard_suffix.c_str (),
                        false);
-                       
+
   bool use_vec = (node->unbounded () && be_global->alt_mapping ());
   UTL_ScopedName *sn = alias->name ();
-  
-  *os << be_nl << be_nl
+
+  *os << be_nl_2
       << "template<>" << be_nl
       << "class " << this->S_ << "Arg_Traits<" << sn << ">"
       << be_idt_nl
@@ -677,17 +677,17 @@ be_visitor_arg_traits::visit_string (be_string *node)
       // Form a unique macro name using the local name and the bound.
       ACE_CDR::ULong l = bound;
       int num_digits = 0;
-      
+
       while (l > 0)
         {
           l /= 10 ;
           ++num_digits ;
         }
-        
+
       size_t bound_length = num_digits + 1;
       char* bound_string = 0;
       ACE_NEW_RETURN (bound_string, char[bound_length], -1) ;
-      ACE_OS::sprintf (bound_string, "%lu", bound);
+      ACE_OS::sprintf (bound_string, ACE_UINT32_FORMAT_SPECIFIER_ASCII, bound);
 
       size_t cat_length = ACE_OS::strlen (alias->local_name ()->get_string ()) +
                           ACE_OS::strlen (bound_string) +
@@ -713,7 +713,7 @@ be_visitor_arg_traits::visit_string (be_string *node)
     {
       // A workaround 'dummy' type, since bounded (w)strings are all
       // generated as typedefs of (w)char *.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "struct ";
 
       if (alias == 0)
@@ -728,7 +728,7 @@ be_visitor_arg_traits::visit_string (be_string *node)
       *os << " {};";
     }
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "template<>" << be_nl
       << "class "
       << this->S_ << "Arg_Traits<";
@@ -748,7 +748,7 @@ be_visitor_arg_traits::visit_string (be_string *node)
       << be_idt << be_idt_nl
       << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl
       << bound << "," << be_nl
-      << this->insert_policy() 
+      << this->insert_policy()
       << be_uidt << be_uidt_nl
       << ">"
       << be_uidt << be_uidt << be_uidt << be_uidt_nl
@@ -777,7 +777,7 @@ be_visitor_arg_traits::visit_array (be_array *node)
   suffix += "arg_traits";
   os->gen_ifdef_macro (node->flat_name (), suffix.c_str (), false);
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "template<>" << be_nl
       << "class "
       << this->S_ << "Arg_Traits<"
@@ -815,7 +815,7 @@ be_visitor_arg_traits::visit_enum (be_enum *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   std::string guard_suffix =
@@ -825,7 +825,7 @@ be_visitor_arg_traits::visit_enum (be_enum *node)
   // guard prevents multiple declarations.
   os->gen_ifdef_macro (node->flat_name (), guard_suffix.c_str (), false);
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "template<>" << be_nl
       << "class "
       << this->S_ << "Arg_Traits<"
@@ -857,7 +857,7 @@ be_visitor_arg_traits::visit_structure (be_structure *node)
   // multiple declarations.
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   std::string guard_suffix =
@@ -867,7 +867,7 @@ be_visitor_arg_traits::visit_structure (be_structure *node)
   // guard prevents multiple declarations.
   os->gen_ifdef_macro (node->flat_name (), guard_suffix.c_str (), false);
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "template<>" << be_nl
       << "class "
       << this->S_ << "Arg_Traits<"
@@ -932,7 +932,7 @@ be_visitor_arg_traits::visit_field (be_field *node)
   // recursion. So we set the field node as processed (the
   // field *type* may not have been reached yet) and return.
   AST_Decl::NodeType nt = bt->base_node_type ();
-  
+
   if (nt == AST_Decl::NT_valuetype || nt == AST_Decl::NT_eventtype)
     {
       node->cli_traits_gen (true);
@@ -965,7 +965,7 @@ be_visitor_arg_traits::visit_union (be_union *node)
   // multiple declarations.
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   std::string guard_suffix =
@@ -975,7 +975,7 @@ be_visitor_arg_traits::visit_union (be_union *node)
   // guard prevents multiple declarations.
   os->gen_ifdef_macro (node->flat_name (), guard_suffix.c_str (), false);
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "template<>" << be_nl
       << "class "
       << this->S_ << "Arg_Traits<"
diff --git a/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO_IDL/be/be_visitor_argument/arglist.cpp
index 4579bf2cf1c..00f10290aeb 100644
--- a/TAO_IDL/be/be_visitor_argument/arglist.cpp
+++ b/TAO_IDL/be/be_visitor_argument/arglist.cpp
@@ -88,7 +88,7 @@ int be_visitor_args_arglist::visit_array (be_array *node)
 int be_visitor_args_arglist::visit_enum (be_enum *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  
+
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
@@ -303,7 +303,7 @@ int be_visitor_args_arglist::visit_sequence (be_sequence *node)
         {
           *os << this->type_name (node, "_out");
         }
-        
+
       break;
     }
 
@@ -315,7 +315,7 @@ int be_visitor_args_arglist::visit_string (be_string *node)
   TAO_OutStream *os = this->ctx_->stream ();
   ACE_CDR::ULong bound = node->max_size ()->ev ()->u.ulval;
   bool wide = (node->width () != (long) sizeof (char));
-  
+
   if (!wide && bound == 0 && be_global->alt_mapping ())
     {
       switch (this->direction ())
@@ -327,7 +327,7 @@ int be_visitor_args_arglist::visit_string (be_string *node)
             *os << "std::string &";
             break;
         }
-        
+
       return 0;
     }
 
diff --git a/TAO_IDL/be/be_visitor_argument/argument.cpp b/TAO_IDL/be/be_visitor_argument/argument.cpp
index 9013b758b4f..309f5cf5f4e 100644
--- a/TAO_IDL/be/be_visitor_argument/argument.cpp
+++ b/TAO_IDL/be/be_visitor_argument/argument.cpp
@@ -94,29 +94,29 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node,
 {
   TAO_CodeGen::CG_SUB_STATE ss = this->ctx_->sub_state ();
   AST_Argument::Direction d = this->direction ();
-  
+
   bool in_arg = (d == AST_Argument::dir_IN);
   bool out_arg = (d == AST_Argument::dir_OUT);
   bool out_stream = (ss == TAO_CodeGen::TAO_CDR_OUTPUT);
   bool in_stream = (ss == TAO_CodeGen::TAO_CDR_INPUT);
-  
+
   bool skip = (in_arg && for_stub && in_stream)
               || (in_arg && !for_stub && out_stream)
               || (out_arg && for_stub && out_stream)
               || (out_arg && !for_stub && in_stream);
-              
+
   if (skip)
     {
       return 0;
     }
-              
+
   TAO_OutStream *os = this->ctx_->stream ();
   const char *var_call = "";
   const char *any_deref = "";
-    
+
   AST_PredefinedType::PredefinedType pt = node->pt ();
   bool is_any = (pt == AST_PredefinedType::PT_any);
-    
+
   if (for_stub)
     {
       if (in_stream && out_arg)
@@ -128,7 +128,7 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node,
   else if (out_stream)
     {
       var_call = ".in ()";
-      
+
       if (is_any && !out_arg)
         {
           var_call = "";
@@ -138,17 +138,17 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node,
     {
       var_call = ".out ()";
     }
-    
+
   ACE_CString to_from_str = (in_stream
                              ? "::ACE_InputCDR::to_"
                              : "::ACE_OutputCDR::from_");
-                             
+
   const char *to_from = to_from_str.c_str ();
-  
+
   be_argument *arg =
     be_argument::narrow_from_decl (this->ctx_->node ());
   const char *lname = arg->local_name ()->get_string ();
-  
+
   switch (pt)
   {
     case AST_PredefinedType::PT_any:
@@ -173,7 +173,7 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node,
       *os << lname;
       break;
   }
-    
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp b/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
index 7ce9b1e9ea5..8aad43b92ac 100644
--- a/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
+++ b/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
@@ -320,7 +320,7 @@ int be_visitor_args_marshal_ss::visit_string (be_string *node)
                   << (wide ? "w" : "" ) << "string ("
                   << lname << ".out (), " << bound << ")";
             }
-            
+
           break;
         case AST_Argument::dir_OUT:
           break;
@@ -354,7 +354,7 @@ int be_visitor_args_marshal_ss::visit_string (be_string *node)
                   << (wide ? "w" : "" ) << "string (("
                   << (wide ? "CORBA::WChar" : "char") << " *)"
                   << lname << ".in (), " << bound << ")";
-              
+
               break;
             }
         }
@@ -517,7 +517,7 @@ be_visitor_args_marshal_ss::emit_common2 (be_type *node)
         case AST_Argument::dir_OUT:
           *os << lname
               << (st == AST_Type::VARIABLE ? ".in ()" : "");
-              
+
           break;
         }
     }
diff --git a/TAO_IDL/be/be_visitor_array.cpp b/TAO_IDL/be/be_visitor_array.cpp
index 68470b962bf..231860965db 100644
--- a/TAO_IDL/be/be_visitor_array.cpp
+++ b/TAO_IDL/be/be_visitor_array.cpp
@@ -12,7 +12,6 @@
  */
 //=============================================================================
 
-
 #include "be_enum.h"
 #include "be_type.h"
 #include "be_typedef.h"
@@ -47,6 +46,4 @@
 #include "be_visitor_array/any_op_cs.cpp"
 #include "be_visitor_array/cdr_op_ch.cpp"
 #include "be_visitor_array/cdr_op_cs.cpp"
-#include "be_visitor_array/serializer_op_ch.cpp"
-#include "be_visitor_array/serializer_op_cs.cpp"
 
diff --git a/TAO_IDL/be/be_visitor_array/any_op_ch.cpp b/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
index cc5644aae2f..98065961084 100644
--- a/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
@@ -40,8 +40,8 @@ be_visitor_array_any_op_ch::visit_array (be_array *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
index 8a957354afe..79dbcaaad22 100644
--- a/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
@@ -40,12 +40,12 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
-  
+
   // Since we don't generate CDR stream operators for types that
   // explicitly contain a local interface (at some level), we
   // must override these Any template class methods to avoid
@@ -54,7 +54,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
   // type is inserted into an Any and then marshaled.
   if (node->is_local ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "namespace TAO" << be_nl
           << "{" << be_idt_nl
           << "template<>" << be_nl
@@ -67,7 +67,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
           << "return false;" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "template<>" << be_nl
           << "::CORBA::Boolean" << be_nl
           << "Any_Array_Impl_T<" << be_idt << be_idt_nl
@@ -81,7 +81,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
     }
 
   // If this is non-zero, we want to call its tc_name()
-  // for the TypeCode to pass to the Any operator impls.  
+  // for the TypeCode to pass to the Any operator impls.
   be_typedef *td = this->ctx_->tdef ();
 
   *os << "void operator<<= (" << be_idt << be_idt_nl
@@ -102,7 +102,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       << ": "
       << node->name () << "_dup (_tao_elem.in ())" << be_uidt << be_uidt_nl
       << ");" << be_uidt << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
@@ -122,7 +122,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       << "}";
 
   *os << be_global->core_versioning_end () << be_nl;
-  
+
   node->cli_stub_any_op_gen (1);
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO_IDL/be/be_visitor_array/array_ch.cpp
index a1608e904e2..8bbb08ac0dc 100644
--- a/TAO_IDL/be/be_visitor_array/array_ch.cpp
+++ b/TAO_IDL/be/be_visitor_array/array_ch.cpp
@@ -52,7 +52,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
 
   AST_Decl::NodeType nt = bt->node_type ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from " << be_nl
                << "// " __FILE__ << ":" << __LINE__;
 
   // If we contain an anonymous sequence,
@@ -114,7 +114,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
         }
     }
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "typedef ";
 
   if (bt->accept (this) == -1)
@@ -203,7 +203,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
       // An _out decl is generated only for a variable size array.
       if (node->size_type () == AST_Type::VARIABLE)
         {
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "typedef" << be_idt_nl
               << "TAO_VarArray_Var_T<" << be_idt << be_idt_nl
               << node->local_name () << "," << be_nl
@@ -212,7 +212,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
               << ">" << be_uidt_nl
               << node->local_name () << "_var;" << be_uidt;
 
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "typedef" << be_idt_nl
               << "TAO_Array_Out_T<" << be_idt << be_idt_nl
               << node->local_name () << "," << be_nl
@@ -224,7 +224,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
         }
       else
         {
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "typedef" << be_idt_nl
               << "TAO_FixedArray_Var_T<" << be_idt << be_idt_nl
               << node->local_name () << "," << be_nl
@@ -233,14 +233,14 @@ int be_visitor_array_ch::visit_array (be_array *node)
               << ">" << be_uidt_nl
               << node->local_name () << "_var;" << be_uidt;
 
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "typedef" << be_idt_nl << node->local_name () << be_nl
               << node->local_name () << "_out;" << be_uidt;
         }
     }
 
   // Generate _forany decl.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "typedef" << be_idt_nl
       << "TAO_Array_Forany_T<" << be_idt << be_idt_nl
       << anon_p << node->local_name () << "," << be_nl
@@ -249,7 +249,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
       << ">" << be_uidt_nl
       << anon_p << node->local_name () << "_forany;" << be_uidt;
 
-  *os << be_nl << be_nl;
+  *os << be_nl_2;
 
   // The _alloc, _dup, copy, and free methods. If the node is nested, the
   // methods become static
@@ -277,7 +277,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
       *os << storage_class << node->nested_type_name (scope, "_slice")
           << " *" << be_nl;
       *os << node->nested_type_name (scope, "_alloc") << " (void);"
-          << be_nl << be_nl;
+          << be_nl_2;
       *os << storage_class << "void" << be_nl
           << node->nested_type_name (scope, "_free")
           << " (" << be_idt << be_idt_nl;
@@ -307,7 +307,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
       *os << storage_class << node->nested_type_name (scope, "_slice", "_")
           << " *" << be_nl;
       *os << node->nested_type_name (scope, "_alloc", "_")
-          << " (void);" << be_nl << be_nl;
+          << " (void);" << be_nl_2;
       *os << storage_class << "void" << be_nl
           << node->nested_type_name (scope, "_free", "_")
           << " (" << be_idt << be_idt_nl;
@@ -333,6 +333,6 @@ int be_visitor_array_ch::visit_array (be_array *node)
           << ");" << be_uidt;
     }
 
-  node->cli_hdr_gen (1);
+  node->cli_hdr_gen (true);
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO_IDL/be/be_visitor_array/array_ci.cpp
index 02afb1016e6..f634b7042cc 100644
--- a/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    array_ci.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Arrays in the client inline.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    array_ci.cpp
+ *
+ *  $Id$
+ *
+ *  Visitor generating code for Arrays in the client inline.
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 // ************************************************************************
 //  visitor for array declaration in client inline
@@ -152,7 +149,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Generate the array traits specialization definitions,
@@ -179,14 +176,14 @@ int be_visitor_array_ci::visit_array (be_array *node)
                       '\0',
                       NAMEBUFSIZE);
       ACE_OS::sprintf (buf,
-                       "_%ld",
+                       "_" ACE_UINT32_FORMAT_SPECIFIER_ASCII,
                        node->dims ()[i]->ev ()->u.ulval);
       unique += buf;
     }
 
   unique += "_traits";
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "ACE_INLINE" << be_nl
       << "void" << be_nl
       << "TAO::Array_Traits<" << fname << "_forany>::free ("
@@ -197,7 +194,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
       << fname << "_free (_tao_slice);" << be_uidt_nl
       << "}";
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "ACE_INLINE" << be_nl
       << fname << "_slice *" << be_nl
       << "TAO::Array_Traits<" << fname << "_forany>::dup ("
@@ -208,7 +205,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
       << "return " << fname << "_dup (_tao_slice);" << be_uidt_nl
       << "}";
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "ACE_INLINE" << be_nl
       << "void" << be_nl
       << "TAO::Array_Traits<" << fname << "_forany>::copy ("
@@ -220,7 +217,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
       << fname << "_copy (_tao_to, _tao_from);" << be_uidt_nl
       << "}";
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "ACE_INLINE" << be_nl
       << "void" << be_nl
       << "TAO::Array_Traits<" << fname << "_forany>::zero ("
@@ -348,7 +345,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
     }
   *os << be_uidt_nl << "}";
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "ACE_INLINE" << be_nl
       << fname << "_slice *" << be_nl
      << "TAO::Array_Traits<" << fname << "_forany>::alloc (void)"
diff --git a/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO_IDL/be/be_visitor_array/array_cs.cpp
index 5e37c22ef61..d1b40071784 100644
--- a/TAO_IDL/be/be_visitor_array/array_cs.cpp
+++ b/TAO_IDL/be/be_visitor_array/array_cs.cpp
@@ -96,8 +96,8 @@ int be_visitor_array_cs::visit_array (be_array *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // dup method.
   *os << fname << "_slice *" << be_nl
@@ -113,7 +113,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
       << "}" << be_uidt_nl << be_nl;
   *os << fname << "_copy (_tao_dup_array, _tao_src_array);" << be_nl;
   *os << "return _tao_dup_array;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   // alloc method.
   *os << fname << "_slice *" << be_nl;
@@ -142,7 +142,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
 
   *os << ", 0);" << be_nl;
   *os << "return retval;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   // free method.
   *os << "void" << be_nl
@@ -151,7 +151,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << "delete [] _tao_slice;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   // copy method.
   *os << "void " << be_nl;
diff --git a/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp b/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
index 8c92b6eecea..0ae23d294fe 100644
--- a/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
@@ -103,8 +103,8 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp b/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
index c6973b1a09c..4f3cf7e2905 100644
--- a/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
@@ -131,7 +131,7 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
   ACE_OS::memset (fname,
                   '\0',
                   NAMEBUFSIZE);
-                  
+
   bool use_underscore = (this->ctx_->tdef () == 0);
 
   if (!use_underscore)
@@ -167,8 +167,8 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -189,7 +189,7 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
                         -1);
     }
 
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_INPUT);
   *os << "::CORBA::Boolean operator>> (" << be_idt << be_idt_nl
@@ -874,7 +874,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
       *os << be_uidt_nl << "}" << be_uidt;
     }
 
-  *os << be_nl << be_nl << "return _tao_marshal_flag;" << be_uidt_nl;
+  *os << be_nl_2 << "return _tao_marshal_flag;" << be_uidt_nl;
 
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp b/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp
deleted file mode 100644
index e96a8cf10ec..00000000000
--- a/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-#include "be_visitor_sequence/serializer_op_ch.h"
-
-// ***************************************************************************
-// Array visitor for generating Serializer operator declarations in the client header
-// ***************************************************************************
-
-be_visitor_array_serializer_op_ch::be_visitor_array_serializer_op_ch (
-    be_visitor_context *ctx
-  )
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_array_serializer_op_ch::~be_visitor_array_serializer_op_ch (void)
-{
-}
-
-
-void 
-be_visitor_array_serializer_op_ch::gen_arg_ref(be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (!this->ctx_->tdef ())
-    {
-      be_scope* scope = be_scope::narrow_from_scope (node->defined_in ());
-      be_decl* parent = scope->decl ();
-
-      *os << parent->full_name ()
-          << "::_" << node->local_name ()
-          << "_forany &);" << be_nl;
-    }
-  else
-    {
-      *os << node->name () << "_forany &);" << be_nl;
-    }
-}
-
-int
-be_visitor_array_serializer_op_ch::visit_array (be_array *node)
-{
-  if (node->cli_hdr_serializer_op_gen () || node->imported () || node->is_local ())
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  AST_Decl::NodeType nt = bt->node_type ();
-
-  // If the node is an array of anonymous sequence, we need to
-  // generate the sequence's Serializer operator declaration here.
-  if (nt == AST_Decl::NT_sequence && bt->anonymous ())
-    {
-      be_visitor_sequence_serializer_op_ch visitor (this->ctx_);
-
-      if (bt->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_array_serializer_op_ch::"
-                             "visit_array - "
-                             "accept on anonymous base type failed\n"),
-                            -1);
-        }
-    }
-
-  // If the array is an anonymous member and if its element type
-  // is a declaration (not a reference), we must generate code for
-  // the declaration.
-  if (this->ctx_->alias () == 0 // Not a typedef.
-      && bt->is_child (this->ctx_->scope ()->decl ()))
-    {
-      int status = 0;
-      be_visitor_context ctx (*this->ctx_);
-
-      switch (nt)
-      {
-        case AST_Decl::NT_enum:
-          {
-            be_visitor_enum_serializer_op_ch ec_visitor (&ctx);
-            status = bt->accept (&ec_visitor);
-            break;
-          }
-        case AST_Decl::NT_struct:
-          {
-            be_visitor_structure_serializer_op_ch sc_visitor (&ctx);
-            status = bt->accept (&sc_visitor);
-            break;
-          }
-        case AST_Decl::NT_union:
-          {
-            be_visitor_union_serializer_op_ch uc_visitor (&ctx);
-            status = bt->accept (&uc_visitor);
-            break;
-          }
-        default:
-          break;
-      }
-
-      if (status == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_ch::"
-                             "visit_array - "
-                             "array base type codegen failed\n"),
-                            -1);
-        }
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  //  Set the sub state as generating code for the size method
-  *os << be_global->stub_export_macro () 
-      << " size_t _dcps_max_marshaled_size (" 
-      << "const ";
-  this->gen_arg_ref(node);
-
-  *os << be_global->stub_export_macro () 
-      << " ::CORBA::Boolean _tao_is_bounded_size (" 
-      << "const ";
-  this->gen_arg_ref(node);
-
-  *os << be_global->stub_export_macro () 
-      << " size_t _dcps_find_size (" 
-      << "const ";
-  this->gen_arg_ref(node);
-
-  // Generate the Serializer << and >> operator declarations.
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator<< (TAO::DCPS::Serializer &, const ";
-  this->gen_arg_ref(node);
-
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>> (TAO::DCPS::Serializer &, ";
-  this->gen_arg_ref(node);
-
-  node->cli_hdr_serializer_op_gen (1);
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp b/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp
deleted file mode 100644
index d9de2d00506..00000000000
--- a/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp
+++ /dev/null
@@ -1,1230 +0,0 @@
-
-//=============================================================================
-/**
- *  @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>
- */
-//=============================================================================
-
-
-// ***************************************************************************
-// Array visitor for generating Serializer operator declarations in the client
-// stubs file
-// ***************************************************************************
-
-be_visitor_array_serializer_op_cs::be_visitor_array_serializer_op_cs (
-    be_visitor_context *ctx
-  )
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_array_serializer_op_cs::~be_visitor_array_serializer_op_cs (void)
-{
-}
-
-int
-be_visitor_array_serializer_op_cs::visit_array (be_array *node)
-{
-  if (this->ctx_->alias ())
-    {
-      // We are here because we are visiting base type
-      // of the array node which is itself an
-      // array, i.e., this is a case of array of array.
-      return this->visit_node (node);
-    }
-
-  if (node->cli_stub_serializer_op_gen ()
-      || node->imported ()
-      || node->is_local ())
-    {
-      return 0;
-    }
-
-  // Retrieve the base type.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_serializer_op_cs::"
-                         "visit_array - "
-                         "Bad base type\n"),
-                        -1);
-    }
-  
-  AST_Decl::NodeType nt = bt->node_type ();
-
-  // If we contain an anonymous sequence,
-  // generate code for the sequence here.
-
-  if (nt == AST_Decl::NT_sequence)
-    {
-      if (this->gen_anonymous_base_type (bt,
-                                         TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS)
-          == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_serializer_op_cs::"
-                             "visit_array - "
-                             "gen_anonymous_base_type failed\n"),
-                            -1);
-        }
-    }
-
-  // If the array is an anonymous member and if its element type
-  // is a declaration (not a reference), we must generate code for
-  // the declaration.
-  if (this->ctx_->alias () == 0 // Not a typedef.
-      && bt->is_child (this->ctx_->scope ()->decl ()))
-    {
-      int status = 0;
-      be_visitor_context ctx (*this->ctx_);
-
-      switch (nt)
-      {
-        case AST_Decl::NT_enum:
-          {
-            be_visitor_enum_serializer_op_cs ec_visitor (&ctx);
-            status = bt->accept (&ec_visitor);
-            break;
-          }
-        case AST_Decl::NT_struct:
-          {
-            be_visitor_structure_serializer_op_cs sc_visitor (&ctx);
-            status = bt->accept (&sc_visitor);
-            break;
-          }
-        case AST_Decl::NT_union:
-          {
-            be_visitor_union_serializer_op_cs uc_visitor (&ctx);
-            status = bt->accept (&uc_visitor);
-            break;
-          }
-        default:
-          break;
-      }
-
-      if (status == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_ch::"
-                             "visit_array - "
-                             "array base type codegen failed\n"),
-                            -1);
-        }
-    }
-
-  // For anonymous arrays, the type name has a _ prepended. We compute the
-  // full_name with or without the underscore and use it later on.
-  char fname [NAMEBUFSIZE];  // to hold the full and
-
-  // Save the node's local name and full name in a buffer for quick use later
-  // on.
-  ACE_OS::memset (fname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  if (this->ctx_->tdef ())
-    {
-      ACE_OS::sprintf (fname, "%s", node->full_name ());
-    }
-  else
-    {
-      // For anonymous arrays ...
-      // We have to generate a name for us that has an underscope prepended
-      // to our local name. This needs to be inserted after the parents's
-      // name.
-
-      if (node->is_nested ())
-        {
-          be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname,
-                           "%s::_%s",
-                           parent->full_name (),
-                           node->local_name ()->get_string ());
-        }
-      else
-        {
-          ACE_OS::sprintf (fname,
-                           "_%s",
-                           node->full_name ());
-        }
-    }
-
-  // Generate the Serializer << and >> operator defns.
-
-  TAO_OutStream *os = this->ctx_->stream ();
-  this->ctx_->node (node);
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  //  Set the sub state as generating code for the size method
-  this->ctx_->sub_state (TAO_CodeGen::TAO_MAX_MARSHALED_SIZE);
-  *os << "size_t _dcps_max_marshaled_size (" << be_idt << be_idt_nl
-      << "const " << fname << "_forany &_tao_array" << be_uidt_nl
-      <<")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_array_serializer_op_cs::"
-                         "visit_array - "
-                         "Base type codegen failed\n"),
-                        -1);
-    }
-
-  *os << "}" << be_nl << be_nl;
-
-  //  Set the sub state as generating code for the size method
-  this->ctx_->sub_state (TAO_CodeGen::TAO_IS_BOUNDED_SIZE);
-  *os << "::CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl
-      << "const " << fname << "_forany &_tao_array" << be_uidt_nl
-      <<")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_array_serializer_op_cs::"
-                         "visit_array - "
-                         "Base type codegen failed\n"),
-                        -1);
-    }
-
-  *os << "}" << be_nl << be_nl;
-
-  //  Set the sub state as generating code for the size method
-  this->ctx_->sub_state (TAO_CodeGen::TAO_FIND_SIZE);
-  *os << "size_t _dcps_find_size (" << be_idt << be_idt_nl
-      << "const " << fname << "_forany &_tao_array" << be_uidt_nl
-      <<")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_array_serializer_op_cs::"
-                         "visit_array - "
-                         "Base type codegen failed\n"),
-                        -1);
-    }
-
-  *os << "}" << be_nl << be_nl;
-
-
-  //  Set the sub state as generating code for the output operator.
-  this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
-  *os << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl
-      << "TAO::DCPS::Serializer &strm," << be_nl
-      << "const " << fname << "_forany &_tao_array" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_array_serializer_op_cs::"
-                         "visit_array - "
-                         "Base type codegen failed\n"),
-                        -1);
-    }
-
-  *os << "}" << be_nl << be_nl;
-
-  this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_INPUT);
-  *os << "::CORBA::Boolean operator>> (" << be_idt << be_idt_nl
-      << "TAO::DCPS::Serializer &strm," << be_nl
-      << fname << "_forany &_tao_array" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_array_serializer_op_cs::"
-                         "visit_array - "
-                         "Base type codegen failed\n"),
-                        -1);
-    }
-
-  *os << "}";
-
-  node->cli_stub_serializer_op_gen (1);
-  return 0;
-}
-
-// Handle all the base types.
-
-int
-be_visitor_array_serializer_op_cs::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  unsigned long i;
-
-  // Grab the array node.
-  be_array *array =
-    be_array::narrow_from_decl (this->ctx_->node ());
-
-  if (array == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "bad array node\n"),
-                        -1);
-    }
-
-  // Check what is the code generation substate. Are we generating
-  // code for the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      *os << "ACE_UNUSED_ARG (_tao_array);" << be_nl
-          << "return true; // array of enum" << be_uidt_nl;
-      break;
-    case TAO_CodeGen::TAO_FIND_SIZE:
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      {
-        *os << "ACE_UNUSED_ARG (_tao_array);" << be_nl;
-        *os << "// array of enum = sizeof ( ::CORBA::ULong) * array size" << be_nl
-            << "return _dcps_max_marshaled_size_ulong () * ";
-
-        unsigned long ndims = array->n_dims ();
-
-        // Generate a product of all the dimensions. This will be the total length
-        // of the "unfolded" single dimensional array.
-        for (i = 0; i < ndims; ++i)
-          {
-            // Retrieve the ith dimension value.
-            AST_Expression *expr = array->dims ()[i];
-
-            if ((expr == 0) || ((expr != 0) && (expr->ev () == 0)))
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                  "(%N:%l) be_visitor_array_serializer_op_cs::"
-                                  "visit_predefined_type - "
-                                  "bad array dimension\n"),
-                                  -1);
-              }
-
-            if (i != 0)
-              {
-                // Do not generate the multiplication operator the first time in.
-                *os << "*";
-              }
-
-            if (expr->ev ()->et == AST_Expression::EV_ulong)
-              {
-                // Generate a loop for each dimension.
-                *os << expr->ev ()->u.ulval;
-              }
-            else
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                  "(%N:%l) be_visitor_array_serializer_op_cs::"
-                                  "visit_predefined_type - "
-                                  "bad array dimension value\n"),
-                                  -1);
-              }
-          }
-
-  *os << ";" << be_uidt_nl;
-      }
-      break;
-
-    default:
-      return this->visit_node (node);
-    }
-  return 0;
-}
-
-int
-be_visitor_array_serializer_op_cs::visit_interface (be_interface *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_array_serializer_op_cs::visit_interface_fwd (be_interface_fwd *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_array_serializer_op_cs::visit_valuetype (be_valuetype *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_array_serializer_op_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_array_serializer_op_cs::visit_predefined_type (
-    be_predefined_type *node
-  )
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_pseudo:
-    case AST_PredefinedType::PT_object:
-    case AST_PredefinedType::PT_value:
-    case AST_PredefinedType::PT_abstract:
-    case AST_PredefinedType::PT_any:
-      // Let the helper handle this.
-      return this->visit_node (node);
-    case AST_PredefinedType::PT_void:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "Bad primitive type\n"),
-                        -1);
-    default:
-      // All other primitive types. Handle them as shown below.
-      break;
-    };
-
-  // We get here if the "type" of individual elements of the array is a
-  // primitive type. In this case, we treat the array as a single dimensional
-  // array (even though it was multi-dimensional), and pass the total length
-  // of the array as a cross product of the dimensions.
-
-  unsigned long i;
-
-  // Grab the array node.
-  be_array *array =
-    be_array::narrow_from_decl (this->ctx_->node ());
-
-  if (array == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "bad array node\n"),
-                        -1);
-    }
-
-  // Check what is the code generation substate. Are we generating
-  // code for the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      // all predefined types are fixed size hence they are bounded.
-      *os << "ACE_UNUSED_ARG(_tao_array);" << be_nl;
-      *os << "return true;" << be_uidt_nl;
-      return 0; // all done - no need to get the array size
-      break;
-
-    // all predefined types are fixed size so
-    //      _dcps_find_size() = _dcps_max_marshaled_size
-    case TAO_CodeGen::TAO_FIND_SIZE:
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      switch (node->pt ())
-        {
-        case AST_PredefinedType::PT_octet:
-          *os << "ACE_UNUSED_ARG(_tao_array);" << be_nl;
-          *os << "return (_dcps_max_marshaled_size_octet () *";
-          break;
-        case AST_PredefinedType::PT_char:
-          *os << "ACE_UNUSED_ARG(_tao_array);" << be_nl;
-          *os << "return (_dcps_max_marshaled_size_char () *";
-          break;
-        case AST_PredefinedType::PT_wchar:
-          *os << "ACE_UNUSED_ARG(_tao_array);" << be_nl;
-          *os << "return (_dcps_max_marshaled_size_wchar () *";
-          break;
-        case AST_PredefinedType::PT_long:
-        case AST_PredefinedType::PT_ulong:
-        case AST_PredefinedType::PT_short:
-        case AST_PredefinedType::PT_ushort:
-        case AST_PredefinedType::PT_float:
-        case AST_PredefinedType::PT_double:
-        case AST_PredefinedType::PT_longlong:
-        case AST_PredefinedType::PT_ulonglong:
-        case AST_PredefinedType::PT_longdouble:
-          // array size = slice type size * length
-          // note: *(_tao_array.in ()) is the array's slice; hence base type
-          *os << "return (_dcps_max_marshaled_size (*(_tao_array.in ())) * ";
-          break;
-          break;
-        case AST_PredefinedType::PT_boolean:
-          *os << "ACE_UNUSED_ARG(_tao_array);" << be_nl;
-          *os << "return (_dcps_max_marshaled_size_boolean () *";
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "(%N:%l) be_visitor_array_serializer_op_cs::"
-                            "visit_predefined_type - "
-                            "bad primitive type for _dcps_max_marshaled_size code gen\n"),
-                            -1);
-        }
-      break;
-
-        case TAO_CodeGen::TAO_CDR_INPUT:
-        case TAO_CodeGen::TAO_CDR_OUTPUT:
-          {
-  // We generate optimized code based on an optimized interface available from
-  // the Serializer class. These optimizations are applicable only to primitive
-  // types.
-  *os << " return strm.";
-
-  // Based on our substate, we may be reading from a stream or writing into a
-  // stream.
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "read_";
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "write_";
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  // Determine what kind of array are we reading/writing.
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_long:
-      *os << "long_array";
-      break;
-    case AST_PredefinedType::PT_ulong:
-      *os << "ulong_array";
-      break;
-    case AST_PredefinedType::PT_short:
-      *os << "short_array";
-      break;
-    case AST_PredefinedType::PT_ushort:
-      *os << "ushort_array";
-      break;
-    case AST_PredefinedType::PT_octet:
-      *os << "octet_array";
-      break;
-    case AST_PredefinedType::PT_char:
-      *os << "char_array";
-      break;
-    case AST_PredefinedType::PT_wchar:
-      *os << "wchar_array";
-      break;
-    case AST_PredefinedType::PT_float:
-      *os << "float_array";
-      break;
-    case AST_PredefinedType::PT_double:
-      *os << "double_array";
-      break;
-    case AST_PredefinedType::PT_longlong:
-      *os << "longlong_array";
-      break;
-    case AST_PredefinedType::PT_ulonglong:
-      *os << "ulonglong_array";
-      break;
-    case AST_PredefinedType::PT_longdouble:
-      *os << "longdouble_array";
-      break;
-    case AST_PredefinedType::PT_boolean:
-      *os << "boolean_array";
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "bad primitive type for optimized code gen\n"),
-                        -1);
-    }
-
-  // Handle special case to avoid compiler errors.
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << " ((";
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << " ((const ";
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "bad substate in context\n"),
-                        -1);
-    }
-
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_long:
-      *os << "ACE_CDR::Long *)";
-      break;
-    case AST_PredefinedType::PT_ulong:
-      *os << "ACE_CDR::ULong *)";
-      break;
-    case AST_PredefinedType::PT_short:
-      *os << "ACE_CDR::Short *)";
-      break;
-    case AST_PredefinedType::PT_ushort:
-      *os << "ACE_CDR::UShort *)";
-      break;
-    case AST_PredefinedType::PT_octet:
-      *os << "ACE_CDR::Octet *)";
-      break;
-    case AST_PredefinedType::PT_char:
-      *os << "ACE_CDR::Char *)";
-      break;
-    case AST_PredefinedType::PT_wchar:
-      *os << "ACE_CDR::WChar *)";
-      break;
-    case AST_PredefinedType::PT_float:
-      *os << "ACE_CDR::Float *)";
-      break;
-    case AST_PredefinedType::PT_double:
-      *os << "ACE_CDR::Double *)";
-      break;
-    case AST_PredefinedType::PT_longlong:
-      *os << "ACE_CDR::LongLong *)";
-      break;
-    case AST_PredefinedType::PT_ulonglong:
-      *os << "ACE_CDR::ULongLong *)";
-      break;
-    case AST_PredefinedType::PT_longdouble:
-      *os << "ACE_CDR::LongDouble *)";
-      break;
-    case AST_PredefinedType::PT_boolean:
-      *os << "ACE_CDR::Boolean *)";
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "bad primitive type for optimized code gen\n"),
-                        -1);
-    }
-
-  // Handle special case to avoid compiler errors.
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << " _tao_array.out (), ";
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "_tao_array.in (), ";
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "bad substate in context\n"),
-                        -1);
-        }
-    } // end TAO_CDR_INPUT/OUTPUT specific code.
-    break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // This is done in serializer_op_cs and hacked into *.i.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  unsigned long ndims = array->n_dims ();
-
-  // Generate a product of all the dimensions. This will be the total length
-  // of the "unfolded" single dimensional array.
-  for (i = 0; i < ndims; ++i)
-    {
-      // Retrieve the ith dimension value.
-      AST_Expression *expr = array->dims ()[i];
-
-      if ((expr == 0) || ((expr != 0) && (expr->ev () == 0)))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_serializer_op_cs::"
-                             "visit_predefined_type - "
-                             "bad array dimension\n"),
-                            -1);
-        }
-
-      if (i != 0)
-        {
-          // Do not generate the multiplication operator the first time in.
-          *os << "*";
-        }
-
-      if (expr->ev ()->et == AST_Expression::EV_ulong)
-        {
-          // Generate a loop for each dimension.
-          *os << expr->ev ()->u.ulval;
-        }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_serializer_op_cs::"
-                             "visit_predefined_type - "
-                             "bad array dimension value\n"),
-                            -1);
-        }
-    }
-
-  *os << ");" << be_uidt_nl;
-
-  return 0;
-}
-
-int
-be_visitor_array_serializer_op_cs::visit_sequence (be_sequence *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_array_serializer_op_cs::visit_string (be_string *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_array_serializer_op_cs::visit_structure (be_structure *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_array_serializer_op_cs::visit_union (be_union *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_array_serializer_op_cs::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-
-  // The node to be visited in the base primitve type that gets typedefed.
-  be_type *bt = node->primitive_base_type ();
-
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_serializer_op_cs::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"),
-                        -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// Helper.
-int
-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 ());
-  AST_Decl::NodeType nt = bt->node_type ();
-
-  if (node == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_serializer_op_cs::"
-                         "visit_node - "
-                         "bad array node\n"),
-                        -1);
-    }
-
-  unsigned long ndims = node->n_dims ();
-
-  AST_Decl::NodeType bnt = bt->node_type ();
-
-  switch (this->ctx_->sub_state ())
-      {
-      case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-        switch (bnt)
-          {
-          case AST_Decl::NT_string:
-          case AST_Decl::NT_wstring:
-            {
-            be_string *str =
-              be_string::narrow_from_decl (bt);
-
-            if (!str)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%N:%l) be_visitor_array_serializer_op_cs::"
-                                   "visit_node - "
-                                   "bad string node\n"),
-                                  -1);
-              }
-
-            *os << "ACE_UNUSED_ARG(_tao_array);" << be_nl;
-            if (0 == str->max_size ()->ev ()->u.ulval)
-              *os << "return false; // array of unbounded string";
-            else
-              *os << "return true; //  array of bounded string ";
-            }
-            break;
-          case AST_Decl::NT_array:
-              *os << "// use ULong instead of literal to avoid overload ambiguity"
-                  << be_nl << "::CORBA::ULong first = 0;" << be_nl
-                  << "// must use forany instead of a slice to avoid overload ambiguity"
-                  << be_nl
-                  << bt->name () << "_var tmp_var ("
-                  << bt->name () << "_dup (_tao_array";
-
-              for (i = 0; i < ndims; ++i)
-                {
-                  *os << "[first]";
-                }
-
-              *os << "));" << be_nl;
-              *os << bt->name () << "_forany tmp (tmp_var.inout ());" << be_nl;
-              *os << "return _tao_is_bounded_size (tmp);";
-            break;
-          default:
-            *os << "return _tao_is_bounded_size (*(_tao_array.in ()));";
-            break;
-          }
-          *os << be_uidt_nl;
-          break;
-      case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-        {
-        switch (bnt)
-          {
-          case AST_Decl::NT_string:
-          case AST_Decl::NT_wstring:
-            {
-            be_string *str =
-              be_string::narrow_from_decl (bt);
-
-            if (!str)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%N:%l) be_visitor_array_serializer_op_cs::"
-                                   "visit_node - "
-                                   "bad string node\n"),
-                                  -1);
-              }
-            *os << "ACE_UNUSED_ARG(_tao_array);" << be_nl;
-            char buff[15];
-            ACE_OS::sprintf(buff, "%ld", str->max_size ()->ev ()->u.ulval);
-            *os << "return _dcps_max_marshaled_size_ulong () + (" << buff;
-            }
-            break;
-          case AST_Decl::NT_array:
-              *os << "// use ULong instead of literal to avoid overload ambiguity"
-                  << be_nl << "::CORBA::ULong first = 0;" << be_nl
-                  << "// must use forany instead of a slice to avoid overload ambiguity"
-                  << be_nl
-                  << bt->name () << "_var tmp_var ("
-                  << bt->name () << "_dup (_tao_array";
-
-              for (i = 0; i < ndims; ++i)
-                {
-                  *os << "[first]";
-                }
-
-              *os << "));" << be_nl;
-              *os << bt->name () << "_forany tmp (tmp_var.inout ());" << be_nl;
-              *os << "return (_dcps_max_marshaled_size (tmp)";
-            break;
-          default:
-            // array size = slice type size * length
-            // note: *(_tao_array.in ()) is the array's slice; hence base type
-            *os << "return (_dcps_max_marshaled_size (*(_tao_array.in ()))";
-            break;
-          }
-        *os << " * ";
-
-        //SHH - TBD - this array dim size code could be common
-        // Generate a product of all the dimensions. This will be the total length
-        // of the "unfolded" single dimensional array.
-        for (i = 0; i < ndims; ++i)
-          {
-            // Retrieve the ith dimension value.
-            AST_Expression *expr = node->dims ()[i];
-
-            if ((expr == 0) || ((expr != 0) && (expr->ev () == 0)))
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                  "(%N:%l) be_visitor_array_serializer_op_cs::"
-                                  "visit_node - "
-                                  "bad array dimension\n"),
-                                  -1);
-              }
-
-            if (i != 0)
-              {
-                // Do not generate the multiplication operator the first time in.
-                *os << "*";
-              }
-
-            if (expr->ev ()->et == AST_Expression::EV_ulong)
-              {
-                // Generate a loop for each dimension.
-                *os << expr->ev ()->u.ulval;
-              }
-            else
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                  "(%N:%l) be_visitor_array_serializer_op_cs::"
-                                  "visit_node - "
-                                  "bad array dimension value\n"),
-                                  -1);
-              }
-          }
-
-        *os << ");" << be_uidt_nl;
-
-      }
-        break;
-      case TAO_CodeGen::TAO_FIND_SIZE:
-      case TAO_CodeGen::TAO_CDR_INPUT:
-      case TAO_CodeGen::TAO_CDR_OUTPUT:
-        {
-          if (TAO_CodeGen::TAO_FIND_SIZE == this->ctx_->sub_state ())
-            {
-            *os << "//iterate over the array to find the current size" << be_nl
-                << "size_t the_length = 0;" << be_nl;
-            }
-          else
-            {
-              // Initialize a boolean variable.
-              *os << "::CORBA::Boolean _tao_marshal_flag = true;" << be_nl;
-            }
-
-    ACE_CDR::ULong ndims = node->n_dims ();
-
-    // We get here if the "type" of individual elements of the array is not a
-    // primitive type. In this case, we are left with no other alternative but to
-    // encode/decode element by element.
-
-    // generate nested loops for as many dimensions as there are
-    for (i = 0; i < ndims; ++i)
-      {
-        // Retrieve the ith dimension value.
-        AST_Expression *expr = node->dims ()[i];
-
-        if ((expr == 0) || ((expr != 0) && (expr->ev () == 0)))
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "(%N:%l) be_visitor_array_serializer_op_cs::"
-                              "visit_node - "
-                              "bad array dimension\n"),
-                              -1);
-          }
-
-        if (expr->ev ()->et == AST_Expression::EV_ulong)
-          {
-            // Generate a loop for each dimension.
-            *os << be_nl << "for ( ::CORBA::ULong i" << i
-                << " = 0; i" << i << " < "
-                << expr->ev ()->u.ulval;
-
-            if (TAO_CodeGen::TAO_FIND_SIZE != this->ctx_->sub_state ())
-              {
-                *os << " && _tao_marshal_flag";
-              }
-
-            *os << "; i" << i
-                << "++)" << be_idt_nl
-                << "{" << be_idt;
-          }
-        else
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "(%N:%l) be_visitor_array_serializer_op_cs::"
-                              "visit_node - "
-                              "bad array dimension value\n"),
-                              -1);
-          }
-      }
-
-    // @@ (JP) Need to factor out some of this into method call(s).
-    switch (this->ctx_->sub_state ())
-      {
-      case TAO_CodeGen::TAO_FIND_SIZE:
-        {
-          *os << be_nl;
-          if (AST_Decl::NT_array == bnt)
-            {
-              *os << bt->name () << "_var tmp_var ("
-                  << bt->name () << "_dup (_tao_array";
-
-              for (i = 0; i < ndims; ++i)
-                {
-                  *os << "[i" << i << "]";
-                }
-
-              *os << "));" << be_nl;
-              *os << bt->name () << "_forany tmp (tmp_var.inout ());" << be_nl;
-              *os << "the_length += _dcps_find_size (tmp);";
-            }
-          else
-            {
-              if (AST_Decl::NT_string == bnt ||
-                  AST_Decl::NT_wstring == bnt )
-                *os << "the_length += _dcps_max_marshaled_size_ulong() + "
-                    << "ACE_OS::strlen(_tao_array";
-              else
-                *os << "the_length += _dcps_find_size (_tao_array";
-
-              for (i = 0; i < ndims; ++i)
-                {
-                  *os << "[i" << i << "]";
-                }
-              if (AST_Decl::NT_string == bnt ||
-                  AST_Decl::NT_wstring == bnt )
-                *os << ".in()";
-
-              *os << ");";
-            }
-        }
-        break;
-      case TAO_CodeGen::TAO_CDR_INPUT:
-        *os << be_nl;
-
-        // Handle the array of array case, where we need to pass the
-        // forany type.
-        if (nt == AST_Decl::NT_array)
-          {
-            *os << bt->name () << "_forany tmp ("
-                << bt->name () << "_alloc ());" << be_nl;
-            *os << "_tao_marshal_flag = (strm >> tmp);" << be_nl;
-            *os << bt->name () << "_copy (_tao_array";
-
-            for (i = 0; i < ndims; ++i)
-              {
-                *os << "[i" << i << "]";
-              }
-
-            *os << ", tmp.in ());" << be_nl;
-            *os << bt->name () << "_free (tmp.inout ());";
-          }
-        else
-          {
-            *os << "_tao_marshal_flag = (strm >> ";
-            *os << "_tao_array ";
-
-            for (i = 0; i < ndims; ++i)
-              {
-                *os << "[i" << i << "]";
-              }
-
-            switch (bt->node_type ())
-              {
-                // The following have a _var type and must be
-                // handled in a special way.
-                case AST_Decl::NT_string:
-                case AST_Decl::NT_wstring:
-                case AST_Decl::NT_valuetype:
-                case AST_Decl::NT_eventtype:
-                case AST_Decl::NT_eventtype_fwd:
-                case AST_Decl::NT_valuetype_fwd:
-                case AST_Decl::NT_valuebox:
-                  *os << ".out ()";
-                  break;
-                case AST_Decl::NT_pre_defined:
-                  {
-                    // We need to separately handle this case of pseudo
-                    // objects because they have a _var type.
-                    be_predefined_type *pt =
-                      be_predefined_type::narrow_from_decl (bt);
-
-                    if (!pt)
-                      {
-                        ACE_ERROR_RETURN ((LM_ERROR,
-                                          "(%N:%l) be_visitor_array_serializer_op_cs::"
-                                          "visit_node - "
-                                          "bad predefined type node\n"),
-                                          -1);
-                      }
-
-                    AST_PredefinedType::PredefinedType pdt = pt->pt ();
-
-                    if (pdt == AST_PredefinedType::PT_pseudo
-                        || pdt == AST_PredefinedType::PT_object)
-                      {
-                        *os << ".out ()";
-                      }
-                  }
-                default:
-                  break;
-              }
-
-            *os << ");";
-          }
-
-        break;
-      case TAO_CodeGen::TAO_CDR_OUTPUT:
-        *os << be_nl;
-
-        // Handle the array of array case, where we need to pass the
-        // forany type.
-        if (nt == AST_Decl::NT_array)
-          {
-            *os << bt->name () << "_var tmp_var ("
-                << bt->name () << "_dup (_tao_array";
-
-            for (i = 0; i < ndims; ++i)
-              {
-                *os << "[i" << i << "]";
-              }
-
-            *os << "));" << be_nl;
-            *os << bt->name () << "_forany tmp (tmp_var.inout ());" << be_nl;
-            *os << "_tao_marshal_flag = (strm << tmp);";
-          }
-        else if (nt == AST_Decl::NT_interface
-                || nt == AST_Decl::NT_interface_fwd)
-          {
-            *os << "_tao_marshal_flag = " << be_idt_nl;
-
-            if (bt->is_defined ())
-              {
-                *os << "_tao_array";
-
-                for (i = 0; i < ndims; ++i)
-                  {
-                    *os << "[i" << i << "]";
-                  }
-
-                *os << ".in ()->marshal (strm);" << be_uidt;
-              }
-            else
-              {
-
-                AST_Decl *parent =
-                  ScopeAsDecl (bt->defined_in ());
-
-                if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
-                  {
-                    *os << parent->name () << "::";
-                  }
-
-                *os << "TAO::Objref_Traits<" << bt->name () << ">::"
-                    << "tao_marshal (_tao_array";
-
-                for (i = 0; i < ndims; ++i)
-                  {
-                    *os << "[i" << i << "]";
-                  }
-
-                *os << ".in (), strm);" << be_uidt;
-              }
-          }
-        else
-          {
-            *os << "_tao_marshal_flag = (strm << ";
-            *os << "_tao_array ";
-
-            for (i = 0; i < ndims; ++i)
-              {
-                *os << "[i" << i << "]";
-              }
-
-            switch (bt->node_type ())
-              {
-                // The following have a _var type and must be
-                // handled in a special way.
-                case AST_Decl::NT_string:
-                case AST_Decl::NT_wstring:
-                case AST_Decl::NT_valuetype:
-                case AST_Decl::NT_eventtype:
-                case AST_Decl::NT_eventtype_fwd:
-                case AST_Decl::NT_valuetype_fwd:
-                case AST_Decl::NT_valuebox:
-                  *os << ".in ()";
-                  break;
-                case AST_Decl::NT_pre_defined:
-                  {
-                    // We need to separately handle this case of pseudo
-                    // objects because they have a _var type.
-                    be_predefined_type *pt =
-                      be_predefined_type::narrow_from_decl (bt);
-
-                    if (!pt)
-                      {
-                        ACE_ERROR_RETURN ((LM_ERROR,
-                                          "(%N:%l) be_visitor_array_serializer_op_cs::"
-                                          "visit_node - "
-                                          "bad predefined type node\n"),
-                                          -1);
-                      }
-
-                    AST_PredefinedType::PredefinedType pdt = pt->pt ();
-
-                    if (pdt == AST_PredefinedType::PT_pseudo
-                        || pdt == AST_PredefinedType::PT_object)
-                      {
-                        *os << ".in ()";
-                      }
-                  }
-                default:
-                  break;
-              }
-
-            *os << ");";
-          }
-
-        break;
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                          "(%N:%l) be_visitor_array_serializer_op_cs::"
-                          "visit_node - "
-                          "bad sub state\n"),
-                          -1);
-      }
-
-    for (i = 0; i < ndims; ++i)
-      {
-        // Decrement indentation as many times as the number of dimensions.
-        *os << be_uidt_nl << "}" << be_uidt;
-      }
-
-    if (TAO_CodeGen::TAO_FIND_SIZE == this->ctx_->sub_state ())
-      {
-      *os << be_nl << be_nl << "return the_length;" << be_uidt_nl;
-      }
-    else
-      {
-        *os << be_nl << be_nl << "return _tao_marshal_flag;" << be_uidt_nl;
-      }
-
-    } // end INPUT/OUTPUT_CDR case
-    break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_serializer_op_cs::"
-                         "visit_node outter- "
-                         "bad sub state\n"),
-                        -1);
-  } // end outer switch
-
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_attr_assign.cpp b/TAO_IDL/be/be_visitor_attr_assign.cpp
new file mode 100644
index 00000000000..4845e3572b1
--- /dev/null
+++ b/TAO_IDL/be/be_visitor_attr_assign.cpp
@@ -0,0 +1,216 @@
+// $Id$
+
+#include "be_visitor_attr_assign.h"
+
+#include "be_visitor_context.h"
+#include "be_array.h"
+#include "be_component.h"
+#include "be_enum.h"
+#include "be_eventtype.h"
+#include "be_home.h"
+#include "be_predefined_type.h"
+#include "be_sequence.h"
+#include "be_string.h"
+#include "be_structure.h"
+#include "be_typedef.h"
+#include "be_union.h"
+#include "be_valuebox.h"
+#include "be_valuetype.h"
+
+be_visitor_attr_assign::be_visitor_attr_assign  (
+      be_visitor_context *ctx)
+  : be_visitor_decl (ctx),
+    attr_name_ (0),
+    attr_name_string_ ("this->")
+{
+}
+
+be_visitor_attr_assign::~be_visitor_attr_assign (void)
+{
+}
+
+int
+be_visitor_attr_assign::visit_array (be_array *node)
+{
+  os_ << be_nl
+      << this->attr_name_string_.c_str () << " = "
+      << "::" << node->full_name () << "_dup ("
+      << this->attr_name_ << ");";
+
+  return 0;
+}
+
+int
+be_visitor_attr_assign::visit_component (be_component *node)
+{
+  os_ << be_nl
+      << this->attr_name_string_.c_str () << " = "
+      << "::" << node->full_name () << "::_duplicate ("
+      << this->attr_name_ << ");";
+
+  return 0;
+}
+
+int
+be_visitor_attr_assign::visit_enum (be_enum *)
+{
+  os_ << be_nl
+      << this->attr_name_string_.c_str () << " = "
+      << this->attr_name_ << ";";
+
+  return 0;
+}
+
+int
+be_visitor_attr_assign::visit_eventtype (be_eventtype *)
+{
+  os_ << be_nl
+      << this->attr_name_ << "->_add_ref ();" << be_nl
+      << this->attr_name_string_.c_str () << " = "
+      << this->attr_name_ << ";";
+
+  return 0;
+}
+
+int
+be_visitor_attr_assign::visit_home (be_home *node)
+{
+  os_ << be_nl
+      << this->attr_name_string_.c_str () << " = "
+      << "::" << node->full_name () << "::_duplicate ("
+      << this->attr_name_ << ");";
+
+  return 0;
+}
+
+int
+be_visitor_attr_assign::visit_interface (
+  be_interface *node)
+{
+  os_ << be_nl
+      << this->attr_name_string_.c_str () << " = "
+      << "::" << node->full_name () << "::_duplicate ("
+      << this->attr_name_ << ");";
+
+  return 0;
+}
+
+int
+be_visitor_attr_assign::visit_predefined_type (
+  be_predefined_type *)
+{
+  os_ << be_nl
+      << this->attr_name_string_.c_str () << " = "
+      << this->attr_name_ << ";";
+
+  return 0;
+}
+
+/// Unused if anonymous types are not allowed.
+int
+be_visitor_attr_assign::visit_sequence (be_sequence *node)
+{
+  os_ << be_nl
+      << "::" << node->full_name () << " * _ciao_tmp = 0;" << be_nl
+      << "ACE_NEW (" << be_idt_nl
+      << "_ciao_tmp," << be_nl
+      << node->full_name () << " (" << this->attr_name_
+      << "));" << be_uidt_nl << be_nl
+      << this->attr_name_string_.c_str () << " = _ciao_tmp;";
+
+  return 0;
+}
+
+int
+be_visitor_attr_assign::visit_string (be_string *node)
+{
+  os_ << be_nl
+      << this->attr_name_string_.c_str () << " = "
+      << "::CORBA::" << (node->width () == sizeof (char) ? "" : "w")
+      << "string_dup (" << this->attr_name_ << ");";
+
+  return 0;
+}
+
+int
+be_visitor_attr_assign::visit_structure (be_structure *node)
+{
+  os_ << be_nl
+      << "::" << node->full_name () << " * _ciao_tmp = 0;" << be_nl
+      << "ACE_NEW (" << be_idt_nl
+      << "_ciao_tmp," << be_nl
+      << "::" << node->full_name () << ");" << be_uidt_nl << be_nl
+      << "*_ciao_tmp = " << this->attr_name_ << ";" << be_nl
+      << this->attr_name_string_.c_str () << " = _ciao_tmp;";
+
+  return 0;
+}
+
+int
+be_visitor_attr_assign::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node);
+  int status = node->primitive_base_type ()->accept (this);
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_memkber_type_decl::"
+                         "visit_typedef - "
+                         "accept on primitive type failed\n"),
+                        -1);
+    }
+
+  this->ctx_->alias (0);
+  return 0;
+}
+
+int
+be_visitor_attr_assign::visit_union (be_union *node)
+{
+  os_ << be_nl
+      << "::" << node->full_name () << " * _ciao_tmp = 0;" << be_nl
+      << "ACE_NEW (" << be_idt_nl
+      << "_ciao_tmp," << be_nl
+      << "::" << node->full_name () << ");" << be_uidt_nl << be_nl
+      << "*_ciao_tmp = " << this->attr_name_ << ";" << be_nl
+      << this->attr_name_string_.c_str () << " = _ciao_tmp;";
+
+  return 0;
+}
+
+int
+be_visitor_attr_assign::visit_valuebox (be_valuebox *)
+{
+  os_ << be_nl
+      << this->attr_name_ << "->_add_ref ();" << be_nl
+      << this->attr_name_string_.c_str () << " = "
+      << this->attr_name_ << ";";
+
+  return 0;
+}
+
+int
+be_visitor_attr_assign::visit_valuetype (be_valuetype *)
+{
+  os_ << be_nl
+      << this->attr_name_ << "->_add_ref ();" << be_nl
+      << this->attr_name_string_.c_str () << " = "
+      << this->attr_name_ << ";";
+
+  return 0;
+}
+
+void
+be_visitor_attr_assign::attr_name (const char *name)
+{
+  // No need for copying, the lifetime of the attr
+  // the arg is from is longer than that of this visitor.
+  this->attr_name_ = name;
+
+  // Add to this string for convenience, it's generated
+  // in each method above at least once.
+  this->attr_name_string_ += this->ctx_->port_prefix ();
+  this->attr_name_string_ += name;
+  this->attr_name_string_ += '_';
+}
diff --git a/TAO_IDL/be/be_visitor_attr_init.cpp b/TAO_IDL/be/be_visitor_attr_init.cpp
new file mode 100644
index 00000000000..ff9507ee2d3
--- /dev/null
+++ b/TAO_IDL/be/be_visitor_attr_init.cpp
@@ -0,0 +1,161 @@
+// $Id$
+
+#include "be_visitor_attr_init.h"
+#include "be_visitor_context.h"
+#include "be_helper.h"
+#include "be_array.h"
+#include "be_component.h"
+#include "be_enum.h"
+#include "be_eventtype.h"
+#include "be_home.h"
+#include "be_predefined_type.h"
+#include "be_sequence.h"
+#include "be_string.h"
+#include "be_structure.h"
+#include "be_typedef.h"
+#include "be_union.h"
+#include "be_valuebox.h"
+#include "be_valuetype.h"
+
+be_visitor_attr_init::be_visitor_attr_init (
+    be_visitor_context *ctx)
+  : be_visitor_decl (ctx),
+    os_ (*ctx->stream ())
+{
+}
+
+be_visitor_attr_init::~be_visitor_attr_init (void)
+{
+}
+
+int
+be_visitor_attr_init::visit_array (be_array *)
+{
+  return 0;
+}
+
+int
+be_visitor_attr_init::visit_component (be_component *node)
+{
+  return this->visit_interface (node);
+}
+
+int
+be_visitor_attr_init::visit_enum (be_enum *node)
+{
+  os_ << "static_cast< ::" << node->full_name () << "> (0UL)";
+
+  return 0;
+}
+
+int
+be_visitor_attr_init::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
+int
+be_visitor_attr_init::visit_home (be_home *node)
+{
+  return this->visit_interface (node);
+}
+
+int
+be_visitor_attr_init::visit_interface (be_interface *)
+{
+  return 0;
+}
+
+int
+be_visitor_attr_init::visit_predefined_type (be_predefined_type *node)
+{
+  switch (node->pt ())
+    {
+      case AST_PredefinedType::PT_boolean:
+        os_ << "false";
+        break;
+      case AST_PredefinedType::PT_octet:
+      case AST_PredefinedType::PT_char:
+      case AST_PredefinedType::PT_wchar:
+      case AST_PredefinedType::PT_short:
+      case AST_PredefinedType::PT_ushort:
+      case AST_PredefinedType::PT_long:
+      case AST_PredefinedType::PT_ulong:
+      case AST_PredefinedType::PT_ulonglong:
+      case AST_PredefinedType::PT_value:
+      case AST_PredefinedType::PT_any:
+        os_ << "0";
+        break;
+      case AST_PredefinedType::PT_longlong:
+        os_ << "ACE_CDR_LONGLONG_INITIALIZER";
+        break;
+      case AST_PredefinedType::PT_float:
+        os_ << "0.0f";
+        break;
+      case AST_PredefinedType::PT_double:
+        os_ << "0.0";
+        break;
+      case AST_PredefinedType::PT_longdouble:
+        os_ << "ACE_CDR_LONG_DOUBLE_INITIALIZER";
+        break;
+      case AST_PredefinedType::PT_object:
+        os_ << " ::CORBA::Object::_nil ()";
+        break;
+      case AST_PredefinedType::PT_abstract:
+        os_ << " ::CORBA::AbstractBase::_nil ()";
+        break;
+      case AST_PredefinedType::PT_pseudo:
+        os_ << " ::CORBA::TypeCode::_nil ()";
+        break;
+      default: // PT_void not handled.
+        break;
+    }
+
+  return 0;
+}
+
+int
+be_visitor_attr_init::visit_sequence (be_sequence *)
+{
+  return 0;
+}
+
+int
+be_visitor_attr_init::visit_string (be_string *)
+{
+  return 0;
+}
+
+int
+be_visitor_attr_init::visit_structure (be_structure *)
+{
+  return 0;
+}
+
+int
+be_visitor_attr_init::visit_typedef (be_typedef *node)
+{
+  return node->primitive_base_type ()->accept (this);
+}
+
+int
+be_visitor_attr_init::visit_union (be_union *)
+{
+  return 0;
+}
+
+int
+be_visitor_attr_init::visit_valuebox (be_valuebox *node)
+{
+  os_ << "static_cast< ::" << node->full_name ()
+      << " *> (0)";
+
+  return 0;
+}
+
+int
+be_visitor_attr_init::visit_valuetype (be_valuetype *)
+{
+  return 0;
+}
+
diff --git a/TAO_IDL/be/be_visitor_attr_return.cpp b/TAO_IDL/be/be_visitor_attr_return.cpp
new file mode 100644
index 00000000000..65c38e768d3
--- /dev/null
+++ b/TAO_IDL/be/be_visitor_attr_return.cpp
@@ -0,0 +1,284 @@
+// $Id$
+
+#include "be_visitor_attr_return.h"
+
+#include "be_visitor_context.h"
+#include "be_array.h"
+#include "be_component.h"
+#include "be_enum.h"
+#include "be_eventtype.h"
+#include "be_home.h"
+#include "be_predefined_type.h"
+#include "be_sequence.h"
+#include "be_string.h"
+#include "be_structure.h"
+#include "be_typedef.h"
+#include "be_union.h"
+#include "be_valuebox.h"
+#include "be_valuetype.h"
+
+be_visitor_attr_return::be_visitor_attr_return  (
+      be_visitor_context *ctx)
+  : be_visitor_decl (ctx),
+    attr_name_string_ ("this->")
+{
+}
+
+be_visitor_attr_return::~be_visitor_attr_return (void)
+{
+}
+
+int
+be_visitor_attr_return::visit_array (be_array *node)
+{
+  os_ << be_nl
+      << "return "
+      << "::" << node->full_name () << "_dup ("
+      << this->attr_name_string_.c_str ()
+      << ".in ());";
+
+  return 0;
+}
+
+int
+be_visitor_attr_return::visit_component (be_component *node)
+{
+  os_ << be_nl
+      << "return "
+      << "::" << node->full_name () << "::_duplicate ("
+      << this->attr_name_string_.c_str ()
+      << ".in ());";
+
+  return 0;
+}
+
+int
+be_visitor_attr_return::visit_enum (be_enum *)
+{
+  os_ << be_nl
+      << "return " << this->attr_name_string_.c_str () << ";";
+
+  return 0;
+}
+
+int
+be_visitor_attr_return::visit_eventtype (be_eventtype *)
+{
+  os_ << be_nl
+      << "this->" << this->attr_name_string_.c_str ()
+      << "->_add_ref ();" << be_nl_2
+      << "return "
+      << "this->" << this->attr_name_string_.c_str ()
+      << ".in ();";
+
+  return 0;
+}
+
+int
+be_visitor_attr_return::visit_home (be_home *node)
+{
+  os_ << be_nl
+      << "return "
+      << "::" << node->full_name () << "::_duplicate ("
+      << this->attr_name_string_.c_str ()
+      << ".in ());";
+
+  return 0;
+}
+
+int
+be_visitor_attr_return::visit_interface (
+  be_interface *node)
+{
+  os_ << be_nl
+      << "return "
+      << "::" << node->full_name () << "::_duplicate ("
+      << this->attr_name_string_.c_str ()
+      << ".in ());";
+
+  return 0;
+}
+
+int
+be_visitor_attr_return::visit_predefined_type (
+  be_predefined_type *node)
+{
+  os_ << be_nl;
+
+  switch (node->pt ())
+    {
+      case AST_PredefinedType::PT_abstract:
+      case AST_PredefinedType::PT_object:
+      case AST_PredefinedType::PT_pseudo:
+        os_ << "return "
+            << "::" << node->full_name ()
+            << "::_duplicate (" << be_idt_nl
+            << this->attr_name_string_.c_str () << ".in ());";
+        break;
+      case AST_PredefinedType::PT_any:
+        os_ << "::CORBA::Any * retval = 0;" << be_nl
+            << "ACE_NEW_RETURN (" << be_idt_nl
+            << "retval," << be_nl
+            << "::CORBA::Any ("
+            << this->attr_name_string_.c_str ()
+            << ".in ())," << be_nl
+            << "0);" << be_uidt_nl << be_nl
+            << "return retval;";
+        break;
+      case AST_PredefinedType::PT_value:
+        os_ << "::CORBA::ValueBase * retval =" << be_idt_nl
+            << this->attr_name_string_.c_str () << ".in ();"
+            << be_uidt_nl
+            << "retval->_add_ref ();" << be_nl
+            << "return retval;";
+        break;
+      default:
+        os_ << "return "
+            << this->attr_name_string_.c_str ()
+            << ";";
+        break;
+    }
+
+  return 0;
+}
+
+/// Unused if anonymous types are not allowed.
+int
+be_visitor_attr_return::visit_sequence (be_sequence *node)
+{
+  os_ << be_nl
+      << "::" << node->full_name () << " * retval = 0;" << be_nl
+      << "ACE_NEW_RETURN (" << be_idt_nl
+      << "retval," << be_nl
+      << "::" << node->full_name () << " (" << be_idt_nl
+      << this->attr_name_string_.c_str ()
+      << ".in ())," << be_uidt_nl
+      << "0);" << be_uidt_nl << be_nl
+      << "return retval;";
+
+  return 0;
+}
+
+int
+be_visitor_attr_return::visit_string (be_string *node)
+{
+  os_ << be_nl
+      << "return "
+      << "::CORBA::"
+      << (node->width () == sizeof (char) ? "" : "w")
+      << "string_dup (" << this->attr_name_string_.c_str ()
+      << ".in ());";
+
+  return 0;
+}
+
+int
+be_visitor_attr_return::visit_structure (be_structure *node)
+{
+  os_ << be_nl;
+
+  if (node->size_type () == AST_Type::FIXED)
+    {
+      os_ << "::" << node->full_name () << " retval ="
+          << be_idt_nl
+          << this->attr_name_string_.c_str () << ".in ();"
+          << be_uidt_nl << be_nl
+          << "return retval;";
+    }
+  else
+    {
+      os_ << node->full_name () << " * retval = 0;" << be_nl
+          << "ACE_NEW_RETURN (" << be_idt_nl
+          << "retval," << be_nl
+          << "::" << node->full_name () << "," << be_nl
+          << "0);" << be_uidt_nl << be_nl
+          << "*retval =" << be_idt_nl
+          << this->attr_name_string_.c_str () << ".in ();"
+          << be_uidt_nl << be_nl
+          << "return retval;";
+    }
+
+  return 0;
+}
+
+int
+be_visitor_attr_return::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node);
+  int status = node->primitive_base_type ()->accept (this);
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_memkber_type_decl::"
+                         "visit_typedef - "
+                         "accept on primitive type failed\n"),
+                        -1);
+    }
+
+  this->ctx_->alias (0);
+  return 0;
+}
+
+int
+be_visitor_attr_return::visit_union (be_union *node)
+{
+  os_ << be_nl;
+
+  if (node->size_type () == AST_Type::FIXED)
+    {
+      os_ << "::" << node->full_name () << " retval ="
+          << be_idt_nl
+          << this->attr_name_string_.c_str () << ".in ();"
+          << be_uidt_nl << be_nl
+          << "return retval;";
+    }
+  else
+    {
+      os_ << node->full_name () << " * retval = 0;" << be_nl
+          << "ACE_NEW_RETURN (" << be_idt_nl
+          << "retval," << be_nl
+          << "::" << node->full_name () << "," << be_nl
+          << "0);" << be_uidt_nl << be_nl
+          << "*retval =" << be_idt_nl
+          << this->attr_name_string_.c_str () << ".in ();"
+          << be_uidt_nl << be_nl
+          << "return retval;";
+    }
+
+  return 0;
+}
+
+int
+be_visitor_attr_return::visit_valuebox (be_valuebox *)
+{
+  os_ << be_nl
+      << this->attr_name_string_.c_str () << "->_add_ref ();"
+      << be_nl_2
+      << "return "
+      << this->attr_name_string_.c_str ()
+      << ".in ();";
+
+  return 0;
+}
+
+int
+be_visitor_attr_return::visit_valuetype (be_valuetype *)
+{
+  os_ << be_nl
+      << this->attr_name_string_.c_str () << "->_add_ref ();"
+      << be_nl_2
+      << "return "
+      << this->attr_name_string_.c_str ()
+      << ".in ();";
+
+  return 0;
+}
+
+void
+be_visitor_attr_return::attr_name (const char *name)
+{
+  this->attr_name_string_ += this->ctx_->port_prefix ();
+  this->attr_name_string_ += name;
+  this->attr_name_string_ += '_';
+}
diff --git a/TAO_IDL/be/be_visitor_attr_setarg_type.cpp b/TAO_IDL/be/be_visitor_attr_setarg_type.cpp
new file mode 100644
index 00000000000..9e206729fb4
--- /dev/null
+++ b/TAO_IDL/be/be_visitor_attr_setarg_type.cpp
@@ -0,0 +1,185 @@
+// $Id$
+
+#include "be_visitor_attr_setarg_type.h"
+
+#include "be_visitor_context.h"
+#include "be_array.h"
+#include "be_component.h"
+#include "be_enum.h"
+#include "be_eventtype.h"
+#include "be_home.h"
+#include "be_predefined_type.h"
+#include "be_sequence.h"
+#include "be_string.h"
+#include "be_structure.h"
+#include "be_typedef.h"
+#include "be_union.h"
+#include "be_valuebox.h"
+#include "be_valuetype.h"
+
+be_visitor_attr_setarg_type::be_visitor_attr_setarg_type  (
+      be_visitor_context *ctx)
+  : be_visitor_decl (ctx)
+{
+}
+
+be_visitor_attr_setarg_type::~be_visitor_attr_setarg_type (void)
+{
+}
+
+int
+be_visitor_attr_setarg_type::visit_array (be_array *)
+{
+  be_type *bt = this->ctx_->alias ();
+
+  if (bt == 0)
+    {
+      /// Support anonymous types?
+      return -1;
+    }
+
+  os_ << "const ::" << bt->full_name () << " ";
+
+  return 0;
+}
+
+int
+be_visitor_attr_setarg_type::visit_component (be_component *node)
+{
+  os_ << "::" << node->full_name () << "_ptr ";
+  return 0;
+}
+
+int
+be_visitor_attr_setarg_type::visit_enum (be_enum *node)
+{
+  os_ << "const ::" << node->full_name () << " ";
+  return 0;
+}
+
+int
+be_visitor_attr_setarg_type::visit_eventtype (
+  be_eventtype *node)
+{
+  os_ << "::" << node->full_name () << " * ";
+  return 0;
+}
+
+int
+be_visitor_attr_setarg_type::visit_home (be_home *node)
+{
+  os_ << "::" << node->full_name () << "_ptr ";
+  return 0;
+}
+
+int
+be_visitor_attr_setarg_type::visit_interface (
+  be_interface *node)
+{
+  os_ << "::" << node->full_name () << "_ptr ";
+  return 0;
+}
+
+int
+be_visitor_attr_setarg_type::visit_predefined_type (
+  be_predefined_type *node)
+{
+  switch (node->pt ())
+    {
+      case AST_PredefinedType::PT_abstract:
+      case AST_PredefinedType::PT_object:
+      case AST_PredefinedType::PT_pseudo:
+        os_ << "::" << node->full_name () << "_ptr";
+        break;
+      case AST_PredefinedType::PT_any:
+      case AST_PredefinedType::PT_value:
+        os_ << "::" << node->full_name () << " * ";
+        break;
+      default:
+        os_ << "const ::" << node->full_name () << " ";
+        break;
+    }
+
+  return 0;
+}
+
+/// Unused if anonymous types are not allowed.
+int
+be_visitor_attr_setarg_type::visit_sequence (be_sequence *)
+{
+  be_type *bt = this->ctx_->alias ();
+
+  if (bt == 0)
+    {
+      /// Support anonymous types?
+      return -1;
+    }
+
+  os_ << "const " << bt->full_name () << " & ";
+
+  return 0;
+}
+
+int
+be_visitor_attr_setarg_type::visit_string (be_string *node)
+{
+  if (node->width () == sizeof (char))
+    {
+      os_ << "const char * ";
+    }
+  else
+    {
+      os_ << "const ::CORBA::WChar * ";
+    }
+
+  return 0;
+}
+
+int
+be_visitor_attr_setarg_type::visit_structure (be_structure *node)
+{
+  os_ << "const ::" << node->full_name () << " & ";
+
+  return 0;
+}
+
+int
+be_visitor_attr_setarg_type::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node);
+  int status = node->primitive_base_type ()->accept (this);
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_memkber_type_decl::"
+                         "visit_typedef - "
+                         "accept on primitive type failed\n"),
+                        -1);
+    }
+
+  this->ctx_->alias (0);
+  return 0;
+}
+
+int
+be_visitor_attr_setarg_type::visit_union (be_union *node)
+{
+  os_ << "const ::" << node->full_name () << " & ";
+  return 0;
+}
+
+int
+be_visitor_attr_setarg_type::visit_valuebox (be_valuebox *node)
+{
+  os_ << "::" << node->full_name () << " * ";
+  return 0;
+}
+
+int
+be_visitor_attr_setarg_type::visit_valuetype (be_valuetype *node)
+{
+  os_ << "::" << node->full_name () << " * ";
+  return 0;
+}
+
diff --git a/TAO_IDL/be/be_visitor_attribute/attribute.cpp b/TAO_IDL/be/be_visitor_attribute/attribute.cpp
index 26b72c79093..36e5969b365 100644
--- a/TAO_IDL/be/be_visitor_attribute/attribute.cpp
+++ b/TAO_IDL/be/be_visitor_attribute/attribute.cpp
@@ -55,37 +55,23 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
 {
   this->ctx_->node (node);
   this->ctx_->attribute (node);
-  be_interface *intf = this->ctx_->interface ();
-  
-  if (intf != 0)
-    {
-      AST_Decl::NodeType snt = intf->node_type ();
-      AST_Decl::NodeType ant =
-        ScopeAsDecl (node->defined_in ())->node_type ();
-        
-      if (snt == AST_Decl::NT_component
-          && ant == AST_Decl::NT_porttype)
-        {
-          return 0;
-        }
-    }
-    
+
   UTL_Scope *s = node->defined_in ();
-  AST_Decl *d = ScopeAsDecl (s);  
+  AST_Decl *d = ScopeAsDecl (s);
   ACE_CString op_name (this->ctx_->port_prefix ());
   op_name += node->local_name ()->get_string ();
   Identifier *op_id = 0;
   ACE_NEW_RETURN (op_id,
                   Identifier (op_name.c_str ()),
                   -1);
-                 
+
   UTL_ScopedName *op_ln = 0;
   ACE_NEW_RETURN (op_ln,
                   UTL_ScopedName (op_id, 0),
                   -1);
-        
+
   UTL_ScopedName *op_sn =
-    static_cast<UTL_ScopedName *> (d->name ()->copy ());                
+    static_cast<UTL_ScopedName *> (d->name ()->copy ());
   op_sn->nconc (op_ln);
 
   // first the "get" operation
@@ -255,7 +241,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
                                          node->name ());
 
   arg->set_name ((UTL_IdList *) node->name ()->copy ());
-  
+
   // Create the operation.
   be_operation set_op (&rt,
                        AST_Operation::OP_noflags,
diff --git a/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp b/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp
index 3b64d85ef38..fb666bc7fcb 100644
--- a/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp
+++ b/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp
@@ -35,13 +35,13 @@ be_visitor_attribute_ccm_init::visit_attribute (
     }
 
   be_interface *intf = this->ctx_->interface ();
-  
+
   if (intf != 0)
     {
       AST_Decl::NodeType snt = intf->node_type ();
       AST_Decl::NodeType ant =
         ScopeAsDecl (node->defined_in ())->node_type ();
-        
+
       if (snt == AST_Decl::NT_component
           && ant == AST_Decl::NT_porttype)
         {
@@ -216,22 +216,22 @@ be_visitor_attribute_ccm_init::emit_error (
   const char *corba_kind)
 {
   this->open_if_block ();
-  
+
   os_ << "ACE_ERROR ((LM_ERROR," << be_nl
       << "            \"CCM attributes of "
       << corba_kind << "\"" << be_nl
       << "            \"IDL type are not yet "
       << "supported by CIAO\\n\"));"
-      << be_nl << be_nl
+      << be_nl_2
       << "ACE_UNUSED_ARG (descr_value);" << be_nl;
-      
+
   this->close_if_block ();
 }
 
 void
 be_visitor_attribute_ccm_init::open_if_block (void)
 {
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "if (ACE_OS::strcmp (descr_name, \""
       << this->ctx_->port_prefix ().c_str ()
       << attr_->local_name ()->get_string ()
diff --git a/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp b/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp
index 51c67462c59..8ffa5d9ba30 100644
--- a/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp
+++ b/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp
@@ -105,7 +105,7 @@ be_visitor_attribute_set_from_extracted::visit_predefined_type (
       default: // PT_void left out of case list.
         break;
     }
-    
+
   return 0;
 }
 
@@ -139,7 +139,7 @@ be_visitor_attribute_set_from_extracted::visit_typedef (
 {
   be_type *pbt =
     be_type::narrow_from_decl (node->primitive_base_type ());
-    
+
   return (pbt->accept (this));
 }
 
diff --git a/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp b/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
index 1dfac8b8822..a61db51ab69 100644
--- a/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
+++ b/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
@@ -68,7 +68,7 @@ const int N_LW_EXCEPS =
   sizeof (LW_EXCEP_NAMES) / sizeof (char *);
 const int N_ADDL_EXCEPS =
   sizeof (ADDL_EXCEP_NAMES) / sizeof (char *);
-  
+
 be_exception *LW_EXCEPS[N_LW_EXCEPS];
 be_exception *ADDL_EXCEPS[N_ADDL_EXCEPS];
 
@@ -106,7 +106,7 @@ be_visitor_ccm_pre_proc::visit_root (be_root *node)
   /// No need to check for the -GM option here - what's
   /// generated by this call depends only on the contents
   /// of the ciao_ami_recep_names_ queue.
-  int status = this->generate_ami4ccm_uses ();
+  int const status = this->generate_ami4ccm_uses ();
 
   if (status == -1)
     {
@@ -173,7 +173,7 @@ be_visitor_ccm_pre_proc::visit_component (be_component *node)
                              ACE_TEXT ("lookups failed\n")),
                             -1);
         }
-        
+
       this->ccm_lookups_done_ = true;
     }
 
@@ -321,64 +321,70 @@ be_visitor_ccm_pre_proc::visit_uses (be_uses *node)
 int
 be_visitor_ccm_pre_proc::visit_publishes (be_publishes *node)
 {
-  if (this->gen_subscribe (node) == -1)
+  if (!be_global->gen_noeventccm ())
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_ccm_pre_proc::")
-                         ACE_TEXT ("visit_publishes - ")
-                         ACE_TEXT ("gen_subscribe failed\n")),
-                        -1);
-    }
+      if (this->gen_subscribe (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_ccm_pre_proc::")
+                             ACE_TEXT ("visit_publishes - ")
+                             ACE_TEXT ("gen_subscribe failed\n")),
+                            -1);
+        }
 
-  if (this->gen_unsubscribe (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_ccm_pre_proc::")
-                         ACE_TEXT ("visit_publishes - ")
-                         ACE_TEXT ("gen_unsubscribe failed\n")),
-                        -1);
+      if (this->gen_unsubscribe (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_ccm_pre_proc::")
+                             ACE_TEXT ("visit_publishes - ")
+                             ACE_TEXT ("gen_unsubscribe failed\n")),
+                            -1);
+        }
     }
-
   return 0;
 }
 
 int
 be_visitor_ccm_pre_proc::visit_emits (be_emits *node)
 {
-  if (this->gen_emits_connect (node) == -1)
+  if (!be_global->gen_noeventccm ())
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_ccm_pre_proc::")
-                         ACE_TEXT ("visit_emits - ")
-                         ACE_TEXT ("gen_emits_connect failed\n")),
-                        -1);
-    }
+      if (this->gen_emits_connect (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_ccm_pre_proc::")
+                             ACE_TEXT ("visit_emits - ")
+                             ACE_TEXT ("gen_emits_connect failed\n")),
+                            -1);
+        }
 
-  if (this->gen_emits_disconnect (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_ccm_pre_proc::")
-                         ACE_TEXT ("visit_emits - ")
-                         ACE_TEXT ("gen_emits_disconnect failed\n")),
-                        -1);
+      if (this->gen_emits_disconnect (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_ccm_pre_proc::")
+                             ACE_TEXT ("visit_emits - ")
+                             ACE_TEXT ("gen_emits_disconnect failed\n")),
+                            -1);
+        }
     }
-
   return 0;
 }
 
 int
 be_visitor_ccm_pre_proc::visit_consumes (be_consumes *node)
 {
-  if (this->gen_get_consumer (node) == -1)
+  if (!be_global->gen_noeventccm ())
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_ccm_pre_proc::")
-                         ACE_TEXT ("visit_comsumes - ")
-                         ACE_TEXT ("gen_get_consumer failed\n")),
-                        -1);
-    }
-
-  return 0;
+      if (this->gen_get_consumer (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_ccm_pre_proc::")
+                             ACE_TEXT ("visit_comsumes - ")
+                             ACE_TEXT ("gen_get_consumer failed\n")),
+                            -1);
+        }
+     }
+   return 0;
 }
 
 int
@@ -431,21 +437,24 @@ be_visitor_ccm_pre_proc::visit_home (be_home *node)
 int
 be_visitor_ccm_pre_proc::visit_eventtype (be_eventtype *node)
 {
-  if (node->ccm_pre_proc_gen ())
+  if (!be_global->gen_noeventccm ())
     {
-      return 0;
-    }
+      if (node->ccm_pre_proc_gen ())
+        {
+          return 0;
+        }
 
-  if (this->create_event_consumer (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_ccm_pre_proc::")
-                         ACE_TEXT ("visit_eventtype - code generation ")
-                         ACE_TEXT ("for consumer failed\n")),
-                        -1);
-    }
+      if (this->create_event_consumer (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_ccm_pre_proc::")
+                             ACE_TEXT ("visit_eventtype - code generation ")
+                             ACE_TEXT ("for consumer failed\n")),
+                            -1);
+        }
 
-  node->ccm_pre_proc_gen (true);
+      node->ccm_pre_proc_gen (true);
+    }
   return 0;
 }
 
@@ -803,50 +812,52 @@ int
 be_visitor_ccm_pre_proc::gen_push_op (be_eventtype *node,
                                       AST_Interface *consumer)
 {
-  UTL_ScopedName *op_full_name =
-    this->create_scoped_name ("push_",
-                              node->local_name (),
-                              0,
-                              consumer);
-  be_operation *push_op = 0;
-  ACE_NEW_RETURN (push_op,
-                  be_operation (be_global->void_type (),
-                                AST_Operation::OP_noflags,
-                                0,
-                                false,
-                                false),
-                  -1);
-  push_op->set_defined_in (consumer);
-  push_op->set_imported (node->imported ());
-  push_op->set_name (op_full_name);
-  ACE_CString arg_string ("the_",
-                          0,
-                          false);
-  arg_string += node->local_name ();
-  Identifier arg_id (arg_string.fast_rep ());
-  UTL_ScopedName arg_name (&arg_id,
-                           0);
-  be_argument *arg = 0;
-  ACE_NEW_RETURN (arg,
-                  be_argument (AST_Argument::dir_IN,
-                               node,
-                               &arg_name),
-                  -1);
-  arg_id.destroy ();
-  push_op->be_add_argument (arg);
-
-  if (0 == consumer->be_add_operation (push_op))
+  if (!be_global->gen_noeventccm ())
     {
-      return -1;
-    }
+      UTL_ScopedName *op_full_name =
+        this->create_scoped_name ("push_",
+                                  node->local_name (),
+                                  0,
+                                  consumer);
+      be_operation *push_op = 0;
+      ACE_NEW_RETURN (push_op,
+                      be_operation (be_global->void_type (),
+                                    AST_Operation::OP_noflags,
+                                    0,
+                                    false,
+                                    false),
+                      -1);
+      push_op->set_defined_in (consumer);
+      push_op->set_imported (node->imported ());
+      push_op->set_name (op_full_name);
+      ACE_CString arg_string ("the_",
+                              0,
+                              false);
+      arg_string += node->local_name ();
+      Identifier arg_id (arg_string.fast_rep ());
+      UTL_ScopedName arg_name (&arg_id,
+                               0);
+      be_argument *arg = 0;
+      ACE_NEW_RETURN (arg,
+                      be_argument (AST_Argument::dir_IN,
+                                   node,
+                                   &arg_name),
+                      -1);
+      arg_id.destroy ();
+      push_op->be_add_argument (arg);
 
+      if (0 == consumer->be_add_operation (push_op))
+        {
+          return -1;
+        }
+     }
   return 0;
 }
 
 int
 be_visitor_ccm_pre_proc::gen_subscribe (be_publishes *node)
 {
-  if (be_global->gen_lwccm ())
+  if ((be_global->gen_lwccm ()) ||(be_global->gen_noeventccm ()))
     {
       return 0;
     }
@@ -907,7 +918,7 @@ be_visitor_ccm_pre_proc::gen_subscribe (be_publishes *node)
 int
 be_visitor_ccm_pre_proc::gen_unsubscribe (be_publishes *node)
 {
-  if (be_global->gen_lwccm ())
+  if (be_global->gen_lwccm () ||be_global->gen_noeventccm ())
     {
       return 0;
     }
@@ -967,7 +978,7 @@ be_visitor_ccm_pre_proc::gen_unsubscribe (be_publishes *node)
 int
 be_visitor_ccm_pre_proc::gen_emits_connect (be_emits *node)
 {
-  if (be_global->gen_lwccm ())
+  if ((be_global->gen_lwccm ()) ||(be_global->gen_noeventccm ()))
     {
       return 0;
     }
@@ -1027,7 +1038,7 @@ be_visitor_ccm_pre_proc::gen_emits_connect (be_emits *node)
 int
 be_visitor_ccm_pre_proc::gen_emits_disconnect (be_emits *node)
 {
-  if (be_global->gen_lwccm ())
+  if ((be_global->gen_lwccm ()) ||(be_global->gen_noeventccm ()))
     {
       return 0;
     }
@@ -1077,7 +1088,7 @@ be_visitor_ccm_pre_proc::gen_emits_disconnect (be_emits *node)
 int
 be_visitor_ccm_pre_proc::gen_get_consumer (be_consumes *node)
 {
-  if (be_global->gen_lwccm ())
+  if (be_global->gen_lwccm () || be_global->gen_noeventccm ())
     {
       return 0;
     }
@@ -1155,7 +1166,7 @@ be_visitor_ccm_pre_proc::gen_create (be_home *node,
                       -1);
       arg_id.destroy ();
       op->be_add_argument (arg);
-      
+
       UTL_ExceptList *tail = 0;
       ACE_NEW_RETURN (tail,
                       UTL_ExceptList (this->invalid_key_,
@@ -1210,10 +1221,10 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node,
                   -1);
   arg_id.destroy ();
   op->be_add_argument (arg);
-  
+
   UTL_ExceptList *tail = 0;
   UTL_ExceptList *middle = 0;
-  
+
   if (!be_global->gen_lwccm ())
     {
       ACE_NEW_RETURN (tail,
@@ -1225,7 +1236,7 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node,
                                       tail),
                       -1);
     }
-                    
+
   UTL_ExceptList *exceps = 0;
   ACE_NEW_RETURN (exceps,
                   UTL_ExceptList (this->finder_failure_,
@@ -1272,10 +1283,10 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node,
                   -1);
   arg_id.destroy ();
   op->be_add_argument (arg);
-  
+
   UTL_ExceptList *tail = 0;
   UTL_ExceptList *middle = 0;
-  
+
   if (!be_global->gen_lwccm ())
     {
       ACE_NEW_RETURN (tail,
@@ -1287,7 +1298,7 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node,
                                       tail),
                       -1);
     }
-    
+
   UTL_ExceptList *exceps = 0;
   ACE_NEW_RETURN (exceps,
                   UTL_ExceptList (this->remove_failure_,
@@ -1415,7 +1426,7 @@ be_visitor_ccm_pre_proc::lookup_exceptions (void)
   this->create_failure_             = LW_EXCEPS[4];
   this->remove_failure_             = LW_EXCEPS[5];
   this->finder_failure_             = LW_EXCEPS[6];
-  
+
   if (!be_global->gen_lwccm ())
     {
       for (int j = 0; j < N_ADDL_EXCEPS; ++j)
@@ -1433,7 +1444,7 @@ be_visitor_ccm_pre_proc::lookup_exceptions (void)
       this->unknown_key_value_          = ADDL_EXCEPS[1];
       this->duplicate_key_value_        = ADDL_EXCEPS[2];
     }
-    
+
   return 0;
 }
 
@@ -1470,6 +1481,7 @@ be_visitor_ccm_pre_proc::lookup_one_exception (const char *name,
 int
 be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
 {
+
   UTL_Scope *s = node->defined_in ();
 
   UTL_ScopedName *consumer_name =
@@ -1648,6 +1660,9 @@ be_visitor_ccm_pre_proc::create_implicit (be_home *node)
   header.destroy ();
   parent_list.destroy ();
 
+  // So we can generate the proper typecode.
+  i->home_equiv (true);
+
   i->set_name (implicit_name);
   i->set_defined_in (node->defined_in ());
   i->set_imported (node->imported ());
@@ -1700,7 +1715,7 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node,
   // Back to reality.
   idl_global->scopes ().pop ();
 
-  // So we can skip typecode generation.
+  // So we can generate the proper typecode.
   retval->home_equiv (true);
 
   retval->set_name (equiv_name);
@@ -1718,7 +1733,7 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node,
                               ScopeAsDecl (s));
   node->set_name (mangled_name);
   AST_Module *m = AST_Module::narrow_from_scope (s);
-  
+
   /// Calling be_add_interface() here calls add_to_referenced(),
   /// which will give a redef error.
   m->add_to_scope (retval);
@@ -1850,9 +1865,18 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void)
       if (d == 0)
         {
           idl_global->err ()->lookup_error (sn);
+
+          sn->destroy ();
+          delete sn;
+          sn = 0;
+
           continue;
         }
 
+      sn->destroy ();
+      delete sn;
+      sn = 0;
+
       be_uses *u = be_uses::narrow_from_decl (d);
 
       if (u == 0)
@@ -1867,7 +1891,7 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void)
 
       be_interface *iface =
         be_interface::narrow_from_decl (u->uses_type ());
-        
+
       /// The real AMI_xxx exists only in the *A.idl file, so
       /// we create a dummy as the uses type for the implied
       /// receptacle created below, but only if it hasn't
@@ -1879,7 +1903,7 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void)
       if (ami_iface == 0)
         {
           ACE_CString iname ("AMI4CCM_");
-     
+
           iname += iface->local_name ();
           Identifier itmp_id (iname.c_str ());
           UTL_ScopedName itmp_sn (&itmp_id, 0);
@@ -1901,11 +1925,11 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void)
           /// Make it imported so it doesn't trigger
           /// any unwanted code generation.
           ami_iface->set_imported (true);
-          
+
           s->add_to_scope (ami_iface);
           iface->ami4ccm_uses (ami_iface);
         }
-        
+
       /// Now create the receptacle, passing in
       /// the local interface created above as the
       /// uses type. We don't generate anything
@@ -1928,7 +1952,7 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void)
 
       s->add_to_scope (ami_uses);
       idl_global->scopes ().pop ();
-      
+
       if (u->is_multiple ())
         {
         /*
diff --git a/TAO_IDL/be/be_visitor_component.cpp b/TAO_IDL/be/be_visitor_component.cpp
index 6d1980bf5b8..a1e66d0c267 100644
--- a/TAO_IDL/be/be_visitor_component.cpp
+++ b/TAO_IDL/be/be_visitor_component.cpp
@@ -22,6 +22,7 @@
 #include "ast_argument.h"
 #include "ast_exception.h"
 
+#include "be_argument.h"
 #include "be_connector.h"
 #include "be_provides.h"
 #include "be_uses.h"
@@ -39,19 +40,30 @@
 #include "be_structure.h"
 #include "be_typedef.h"
 #include "be_valuetype.h"
+#include "be_argument.h"
 
 #include "be_visitor_component.h"
 #include "be_visitor_attribute.h"
 #include "be_visitor_operation.h"
+#include "be_visitor_argument.h"
 #include "be_visitor_interface.h"
 #include "be_visitor_structure.h"
 #include "be_visitor_typedef.h"
 #include "be_visitor_context.h"
+#include "be_visitor_member_type_decl.h"
+#include "be_visitor_attr_setarg_type.h"
+#include "be_visitor_attr_assign.h"
+#include "be_visitor_attr_return.h"
+#include "be_visitor_null_return_value.h"
+#include "be_visitor_attr_init.h"
 #include "be_util.h"
 #include "be_helper.h"
 #include "be_identifier_helper.h"
 #include "be_extern.h"
 
+#include "be_visitor_argument/argument.h"
+#include "be_visitor_argument/arglist.h"
+
 #include "be_visitor_component/component.cpp"
 #include "be_visitor_component/component_svh.cpp"
 #include "be_visitor_component/facet_svh.cpp"
@@ -67,9 +79,13 @@
 #include "be_visitor_component/context_ex_idl.cpp"
 #include "be_visitor_component/component_exh.cpp"
 #include "be_visitor_component/facet_exh.cpp"
-#include "be_visitor_component/facet_private_exh.cpp"
+#include "be_visitor_component/executor_private_exh.cpp"
 #include "be_visitor_component/executor_exh.cpp"
 #include "be_visitor_component/component_exs.cpp"
 #include "be_visitor_component/facet_exs.cpp"
 #include "be_visitor_component/executor_exs.cpp"
+#include "be_visitor_component/executor_exs_attr_init.cpp"
+#include "be_visitor_component/component_ami_rh_ex_base.cpp"
+#include "be_visitor_component/component_ami_rh_exh.cpp"
+#include "be_visitor_component/component_ami_rh_exs.cpp"
 
diff --git a/TAO_IDL/be/be_visitor_component/component.cpp b/TAO_IDL/be/be_visitor_component/component.cpp
index 313280196b5..204ff9b79ad 100644
--- a/TAO_IDL/be/be_visitor_component/component.cpp
+++ b/TAO_IDL/be/be_visitor_component/component.cpp
@@ -322,9 +322,9 @@ be_visitor_component::visit_extended_port (
   /// line to tell what scope we are actually in.
   this->ctx_->interface (
     be_interface::narrow_from_scope (node->defined_in ()));
-  
+
   be_porttype *pt = node->port_type ();
-  
+
   if (this->visit_scope (pt) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -333,9 +333,9 @@ be_visitor_component::visit_extended_port (
                          ACE_TEXT ("visit_scope () failed\n")),
                         -1);
     }
-    
+
   this->ctx_->port_prefix () = "";
-  
+
   return 0;
 }
 
@@ -351,9 +351,9 @@ be_visitor_component::visit_mirror_port (be_mirror_port *node)
   /// line to tell what scope we are actually in.
   this->ctx_->interface (
     be_interface::narrow_from_scope (node->defined_in ()));
-  
+
   be_porttype *pt = node->port_type ();
-  
+
   if (this->visit_scope (pt) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -362,9 +362,9 @@ be_visitor_component::visit_mirror_port (be_mirror_port *node)
                          ACE_TEXT ("visit_scope () failed\n")),
                         -1);
     }
-    
+
   this->ctx_->port_prefix () = "";
-  
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp b/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp
new file mode 100644
index 00000000000..6c536403d57
--- /dev/null
+++ b/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp
@@ -0,0 +1,183 @@
+
+//=============================================================================
+/**
+ *  @file    component_ami_rh_ex_base.cpp
+ *
+ *  $Id$
+ *
+ *  Base class visitor generating code for AMI4CCM reply handler impl\
+ *  visitors.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+be_visitor_component_ami_rh_ex_base::be_visitor_component_ami_rh_ex_base (
+      be_visitor_context *ctx)
+  : be_visitor_scope (ctx),
+    iface_ (0),
+    port_ (0)
+{
+}
+
+be_visitor_component_ami_rh_ex_base::~be_visitor_component_ami_rh_ex_base (
+  void)
+{
+}
+
+int
+be_visitor_component_ami_rh_ex_base::post_process (be_decl *bd)
+{
+  // Has to be (1) an argument, (2) not an IN arg, and
+  // (3) not the last INOUT or OUT arg.
+  if (bd->node_type () == AST_Decl::NT_argument)
+    {
+      AST_Argument *arg =
+        AST_Argument::narrow_from_decl (bd);
+
+      if (arg->direction () != AST_Argument::dir_IN
+          && ! this->last_inout_or_out_node (bd))
+        {
+          os_ << "," << be_nl;
+        }
+    }
+
+  return 0;
+}
+
+void
+be_visitor_component_ami_rh_ex_base::init (void)
+{
+  UTL_Scope *s = this->iface_->defined_in ();
+  AST_Decl *scope = ScopeAsDecl (s);
+  bool global = (scope->node_type () == AST_Decl::NT_root);
+  const char *smart_scope = (global ? "" : "::");
+
+  ACE_CString base ("AMI4CCM_");
+  base += this->iface_->original_local_name ()->get_string ();
+  base += "ReplyHandler";
+
+  this->base_class_name_ = scope->full_name ();
+  this->base_class_name_ += smart_scope;
+  this->base_class_name_ += "CCM_";
+  this->base_class_name_ += base;
+
+  this->class_name_ = base;
+  this->class_name_ += '_';
+  this->class_name_ +=
+    this->port_->original_local_name ()->get_string ();
+  this->class_name_ += "_i";
+}
+
+void
+be_visitor_component_ami_rh_ex_base::gen_excep_op (
+  const char *prefix,
+  be_decl *node,
+  bool for_defn)
+{
+  os_ << be_nl_2
+      << (for_defn ? "" : "virtual ") << "void" << be_nl;
+
+  if (for_defn)
+    {
+      os_ << this->class_name_ << "::";
+    }
+
+  os_ << prefix << node->local_name ()->get_string ()
+      << "_excep (" << be_idt_nl
+      << "::CCM_AMI::ExceptionHolder_ptr "
+      << (for_defn ? "/* " : "") << "excep_holder"
+      << (for_defn ? " */" : "") << ")"
+      << (for_defn ? "" : ";") << be_uidt;
+
+  this->gen_op_body ();
+}
+
+void
+be_visitor_component_ami_rh_ex_base::gen_op_body (void)
+{
+}
+
+int
+be_visitor_component_ami_rh_ex_base::gen_attr_op (
+  be_attribute *node,
+  bool for_defn)
+{
+  os_ << be_nl_2
+      << (for_defn ? "" : "virtual ") << "void" << be_nl;
+
+  if (for_defn)
+    {
+      os_ << this->class_name_ << "::";
+    }
+
+  os_ << "get_" << node->local_name ()->get_string ()
+      << " (" << be_idt_nl;
+
+  be_argument arg (AST_Argument::dir_IN,
+                   node->field_type (),
+                   node->name ());
+
+  be_visitor_args_arglist arg_visitor (this->ctx_);
+
+  if (for_defn)
+    {
+      arg_visitor.unused (true);
+    }
+
+  if (arg_visitor.visit_argument (&arg) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_component_ami_rh_ex_base")
+                         ACE_TEXT ("::gen_attr_op - ")
+                         ACE_TEXT ("attr arg gen failed\n")),
+                        -1);
+    }
+
+  os_ << ")" << (for_defn ? "" : ";") << be_uidt;
+
+  arg.destroy ();
+
+  this->gen_op_body ();
+
+  this->gen_excep_op ("get_", node, for_defn);
+
+  if (! node->readonly ())
+    {
+      os_ << be_nl_2
+          << (for_defn ? "" : "virtual ") << "void" << be_nl;
+
+      if (for_defn)
+        {
+          os_ << this->class_name_ << "::";
+        }
+
+      os_ << "set_" << node->local_name ()->get_string ()
+          << " (void)" << (for_defn ? "" : ";");
+
+      this->gen_op_body ();
+
+      this->gen_excep_op ("set_", node, for_defn);
+    }
+
+  return 0;
+}
+
+// ======================================================
+
+Exec_ReplyHandler_Op_Attr_Generator::Exec_ReplyHandler_Op_Attr_Generator (
+    be_visitor_scope * visitor)
+  : visitor_ (visitor)
+{
+}
+
+int
+Exec_ReplyHandler_Op_Attr_Generator::emit (
+  be_interface * /* derived_interface */,
+  TAO_OutStream * /* os */,
+  be_interface * base_interface)
+{
+  return visitor_->visit_scope (base_interface);
+}
+
diff --git a/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp b/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp
new file mode 100644
index 00000000000..7a0894466ef
--- /dev/null
+++ b/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp
@@ -0,0 +1,215 @@
+
+//=============================================================================
+/**
+ *  @file    component_ami_rh_exh.cpp
+ *
+ *  $Id$
+ *
+ *  Visitor generating code for AMI4CCM reply handler impl headers.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+be_visitor_component_ami_rh_exh::be_visitor_component_ami_rh_exh (
+      be_visitor_context *ctx)
+  : be_visitor_component_ami_rh_ex_base (ctx),
+    export_macro_ (be_global->exec_export_macro ())
+{
+}
+
+be_visitor_component_ami_rh_exh::~be_visitor_component_ami_rh_exh (void)
+{
+}
+
+int
+be_visitor_component_ami_rh_exh::visit_uses (be_uses *node)
+{
+  this->port_ = node;
+
+  this->iface_ =
+    be_interface::narrow_from_decl (node->uses_type ());
+
+  this->init ();
+
+  os_ << be_nl_2
+      << "class " << this->class_name_ << be_idt_nl
+      << ": public ::" << this->base_class_name_ << "," << be_idt_nl
+      << "public virtual ::CORBA::LocalObject" << be_uidt_nl
+      << "{" << be_nl
+      << "public:" << be_idt_nl
+      << this->class_name_ << " (void);" << be_nl
+      << "virtual ~" << this->class_name_ << " (void);";
+
+  /// This overload of traverse_inheritance_graph() used here
+  /// doesn't automatically prime the queues.
+  this->iface_->get_insert_queue ().reset ();
+  this->iface_->get_del_queue ().reset ();
+  this->iface_->get_insert_queue ().enqueue_tail (this->iface_);
+
+  Exec_ReplyHandler_Op_Attr_Generator op_attr_gen (this);
+
+  int status =
+    this->iface_->traverse_inheritance_graph (op_attr_gen,
+                                              &os_,
+                                              false,
+                                              false);
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_component_ami_rh_exh")
+                         ACE_TEXT ("::visit_uses - ")
+                         ACE_TEXT ("traverse_inheritance_graph() on ")
+                         ACE_TEXT ("callback interface failed\n")),
+                        -1);
+    }
+
+  os_ << be_uidt_nl
+      << "};";
+
+  return 0;
+}
+
+int
+be_visitor_component_ami_rh_exh::visit_attribute (
+  be_attribute *node)
+{
+  return this->gen_attr_op (node, false);
+}
+
+int
+be_visitor_component_ami_rh_exh::visit_operation (
+  be_operation *node)
+{
+  /// Skip these for the reply handler.
+  if (node->is_sendc_ami ())
+    {
+      return 0;
+    }
+
+  AST_Decl *d =
+    ScopeAsDecl (node->defined_in ());
+
+  /// We end up here also from the visit_scope() call on the
+  /// connector. We want to skip the CCM-related operations
+  /// that were added to the connector since it's a component.
+  /// We want only the facet interface operations.
+  if (d->node_type () != AST_Decl::NT_interface)
+    {
+      return  0;
+    }
+
+  os_ << be_nl_2
+      << "virtual void" << be_nl
+      << node->local_name ()->get_string () << " (";
+
+  int count =
+    node->count_arguments_with_direction (
+      AST_Argument::dir_INOUT | AST_Argument::dir_OUT);
+
+  bool vrt = node->void_return_type ();
+
+  if (count == 0 && vrt)
+    {
+      os_ << "void);";
+    }
+  else
+    {
+      os_ << be_idt_nl;
+
+      if (!vrt)
+        {
+          Identifier *id = 0;
+          UTL_ScopedName *sn = 0;
+
+          ACE_NEW_RETURN (id,
+                          Identifier ("ami_return_val"),
+                          -1);
+
+          UTL_ScopedName *tmp = 0;
+
+          ACE_NEW_RETURN (tmp,
+                          UTL_ScopedName (id,
+                                          0),
+                          -1);
+
+          sn = (UTL_ScopedName *)node->name ()->copy ();
+          sn->nconc (tmp);
+
+          // Create the argument.
+          be_argument *arg = 0;
+          ACE_NEW_RETURN (arg,
+                          be_argument (AST_Argument::dir_OUT,
+                                      node->return_type (),
+                                      sn),
+                          -1);
+
+          arg->set_defined_in (node);
+          arg->set_name (sn);
+
+          if (this->visit_argument (arg) == -1)
+            {
+              delete arg;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ACE_TEXT ("be_visitor_component")
+                                 ACE_TEXT ("_ami_rh_exh")
+                                 ACE_TEXT ("::visit_operation - ")
+                                 ACE_TEXT ("return type arg")
+                                 ACE_TEXT (" gen failed\n")),
+                                -1);
+            }
+          else
+            {
+              delete arg;
+            }
+
+          if (count != 0)
+            {
+              os_ << "," << be_nl;
+            }
+        }
+
+      if (this->visit_scope (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_component")
+                             ACE_TEXT ("_ami_rh_exh")
+                             ACE_TEXT ("::visit_operation - ")
+                             ACE_TEXT ("visit_scope() failed\n")),
+                            -1);
+        }
+
+      os_ << ");" << be_uidt;
+    }
+
+  this->gen_excep_op ("", node, false);
+
+  return 0;
+}
+
+int
+be_visitor_component_ami_rh_exh::visit_argument (
+  be_argument *node)
+{
+  if (node->direction () == AST_Argument::dir_IN)
+    {
+      return 0;
+    }
+
+  be_visitor_args_arglist arg_visitor (this->ctx_);
+  arg_visitor.set_fixed_direction (AST_Argument::dir_IN);
+
+  if (arg_visitor.visit_argument (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_component_ami_rh_exh")
+                         ACE_TEXT ("::visit_argument - ")
+                         ACE_TEXT ("be_visitor_args_arglist failed\n")),
+                        -1);
+    }
+
+  return 0;
+}
+
diff --git a/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp b/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp
new file mode 100644
index 00000000000..30324fe6585
--- /dev/null
+++ b/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp
@@ -0,0 +1,236 @@
+
+//=============================================================================
+/**
+ *  @file    component_ami_rh_exs.cpp
+ *
+ *  $Id$
+ *
+ *  Visitor generating code for AMI4CCM reply handler impl source
+ *  files.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+be_visitor_component_ami_rh_exs::be_visitor_component_ami_rh_exs (
+      be_visitor_context *ctx)
+  : be_visitor_component_ami_rh_ex_base (ctx),
+    your_code_here_ ("/* Your code here. */")
+{
+}
+
+be_visitor_component_ami_rh_exs::~be_visitor_component_ami_rh_exs (void)
+{
+}
+
+int
+be_visitor_component_ami_rh_exs::visit_uses (be_uses *node)
+{
+  this->port_ = node;
+
+  this->iface_ =
+    be_interface::narrow_from_decl (node->uses_type ());
+
+  this->init ();
+
+  os_ << be_nl_2
+      << this->class_name_ << "::"
+      << this->class_name_ << " (void)" << be_nl
+      << "{" << be_nl
+      << "}";
+
+  os_ << be_nl_2
+      << this->class_name_ << "::~"
+      << this->class_name_ << " (void)" << be_nl
+      << "{" << be_nl
+      << "}";
+
+  ACE_CString port_pfix = this->ctx_->port_prefix ();
+  this->ctx_->port_prefix () = "";
+
+  /// This overload of traverse_inheritance_graph() used here
+  /// doesn't automatically prime the queues.
+  this->iface_->get_insert_queue ().reset ();
+  this->iface_->get_del_queue ().reset ();
+  this->iface_->get_insert_queue ().enqueue_tail (this->iface_);
+
+  Exec_ReplyHandler_Op_Attr_Generator op_attr_gen (this);
+
+  int status =
+    this->iface_->traverse_inheritance_graph (op_attr_gen,
+                                              &os_,
+                                              false,
+                                              false);
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_component_ami_rh_exs")
+                         ACE_TEXT ("::visit_provides - ")
+                         ACE_TEXT ("traverse_inheritance_graph() on ")
+                         ACE_TEXT ("callback interface failed\n")),
+                        -1);
+    }
+
+  this->ctx_->port_prefix () = port_pfix;
+  return 0;
+}
+
+int
+be_visitor_component_ami_rh_exs::visit_operation (
+  be_operation *node)
+{
+  /// Skip these for the reply handler.
+  if (node->is_sendc_ami ())
+    {
+      return 0;
+    }
+
+  AST_Decl *d =
+    ScopeAsDecl (node->defined_in ());
+
+  /// We end up here also from the visit_scope() call on the
+  /// connector. We want to skip the CCM-related operations
+  /// that were added to the connector since it's a component.
+  /// We want only the facet interface operations.
+  if (d->node_type () != AST_Decl::NT_interface)
+    {
+      return  0;
+    }
+
+  os_ << be_nl_2
+      << "void" << be_nl
+      << this->class_name_ << "::"
+      << node->local_name ()->get_string ()
+      << " (";
+
+  int count =
+    node->count_arguments_with_direction (
+      AST_Argument::dir_INOUT | AST_Argument::dir_OUT);
+
+  bool vrt = node->void_return_type ();
+
+  if (count == 0 && vrt)
+    {
+      os_ << "void)";
+    }
+  else
+    {
+      os_ << be_idt_nl;
+    }
+
+  if (!vrt)
+    {
+      Identifier *id = 0;
+      UTL_ScopedName *sn = 0;
+
+      ACE_NEW_RETURN (id,
+                      Identifier ("ami_return_val"),
+                      -1);
+
+      UTL_ScopedName *tmp = 0;
+
+      ACE_NEW_RETURN (tmp,
+                      UTL_ScopedName (id,
+                                      0),
+                      -1);
+
+      sn = (UTL_ScopedName *)node->name ()->copy ();
+      sn->nconc (tmp);
+
+      // Create the argument.
+      be_argument *arg = 0;
+      ACE_NEW_RETURN (arg,
+                      be_argument (AST_Argument::dir_OUT,
+                                  node->return_type (),
+                                  sn),
+                      -1);
+
+      arg->set_defined_in (node);
+      arg->set_name (sn);
+
+      if (this->visit_argument (arg) == -1)
+        {
+          delete arg;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                              ACE_TEXT ("be_visitor_component")
+                              ACE_TEXT ("_ami_rh_exh")
+                              ACE_TEXT ("::visit_operation - ")
+                              ACE_TEXT ("return type arg")
+                              ACE_TEXT (" gen failed\n")),
+                            -1);
+        }
+      else
+        {
+          delete arg;
+        }
+
+      if (count != 0)
+        {
+          os_ << "," << be_nl;
+        }
+    }
+
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_component_ami_rh_exs")
+                         ACE_TEXT ("::visit_operation - ")
+                         ACE_TEXT ("visit_scope() failed\n")),
+                        -1);
+    }
+
+  if (count != 0 || ! vrt)
+    {
+      os_ << ")" << be_uidt;
+    }
+
+  this->gen_op_body ();
+
+  this->gen_excep_op ("", node, true);
+
+  return 0;
+}
+
+int
+be_visitor_component_ami_rh_exs::visit_attribute (
+  be_attribute *node)
+{
+  return this->gen_attr_op (node, true);
+}
+
+int
+be_visitor_component_ami_rh_exs::visit_argument (
+  be_argument *node)
+{
+  if (node->direction () == AST_Argument::dir_IN)
+    {
+      return 0;
+    }
+
+  be_visitor_args_arglist arg_visitor (this->ctx_);
+  arg_visitor.set_fixed_direction (AST_Argument::dir_IN);
+  arg_visitor.unused (true);
+
+  if (arg_visitor.visit_argument (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_component_ami_rh_exs")
+                         ACE_TEXT ("::visit_argument - ")
+                         ACE_TEXT ("be_visitor_args_arglist failed\n")),
+                        -1);
+    }
+
+  return 0;
+}
+
+void
+be_visitor_component_ami_rh_exs::gen_op_body (void)
+{
+  os_ << be_nl
+      << "{" << be_idt_nl
+      << this->your_code_here_ << be_uidt_nl
+      << "}";
+}
+
diff --git a/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp b/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp
index 7b0c602c31d..0a6d0a0e3cc 100644
--- a/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp
+++ b/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp
@@ -35,7 +35,7 @@ be_visitor_component_ex_idl::visit_component (
   if (be_global->gen_lem_force_all ())
     {
       be_visitor_facet_ex_idl facet_visitor (this->ctx_);
-      
+
       if (facet_visitor.visit_scope (node) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -49,7 +49,7 @@ be_visitor_component_ex_idl::visit_component (
   be_util::gen_nesting_open (os_, node);
 
   be_visitor_executor_ex_idl exec_visitor (this->ctx_);
-  
+
   if (exec_visitor.visit_component (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,7 +60,7 @@ be_visitor_component_ex_idl::visit_component (
     }
 
   be_visitor_context_ex_idl context_visitor (this->ctx_);
-  
+
   if (context_visitor.visit_component (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -83,17 +83,15 @@ be_visitor_component_ex_idl::visit_component (
 
   const char *global = (sname_str == "" ? "" : "::");
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "module CIAO_" << node->flat_name () << "_Impl" << be_nl
-      << "{" << be_idt_nl
-      << "typedef " << global << sname << "::CCM_" << lname
-      << "_Context " << lname << "_Exec_Context;";
+      << "{" << be_idt_nl;
 
-  os_ << be_nl << be_nl
-      << "local interface " << lname << "_Exec" << be_idt_nl
+  os_ << "local interface " << lname << "_Exec" << be_idt_nl
       << ": " << global << sname << "::CCM_" << lname
       << "," << be_idt_nl
-      << "::Components::SessionComponent" << be_uidt << be_uidt_nl
+      << "::Components::" << be_global->ciao_container_type ()
+      << "Component" << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "};";
 
diff --git a/TAO_IDL/be/be_visitor_component/component_exh.cpp b/TAO_IDL/be/be_visitor_component/component_exh.cpp
index 34c70b74ce8..9b652118d59 100644
--- a/TAO_IDL/be/be_visitor_component/component_exh.cpp
+++ b/TAO_IDL/be/be_visitor_component/component_exh.cpp
@@ -34,14 +34,14 @@ be_visitor_component_exh::visit_component (be_component *node)
 
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
       << "{" << be_idt;
-     
+
   be_visitor_facet_exh facet_visitor (this->ctx_);
   facet_visitor.node (node);
-  
+
   if (facet_visitor.visit_component_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -50,9 +50,9 @@ be_visitor_component_exh::visit_component (be_component *node)
                          ACE_TEXT ("facet visitor failed\n")),
                         -1);
     }
-    
+
   be_visitor_executor_exh exec_visitor (this->ctx_);
-    
+
   if (exec_visitor.visit_component (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -61,12 +61,78 @@ be_visitor_component_exh::visit_component (be_component *node)
                          ACE_TEXT ("exec visitor failed\n")),
                         -1);
     }
-    
+
+  /// If this list has members, then we can assume that the
+  /// artifacts from -GC exist.
+  for (ACE_Unbounded_Queue<char *>::CONST_ITERATOR i (
+         idl_global->ciao_ami_recep_names ());
+       ! i.done ();
+       i.advance ())
+    {
+      char **item = 0;
+      i.next (item);
+
+      UTL_ScopedName *sn =
+        FE_Utils::string_to_scoped_name (*item);
+
+      UTL_Scope *s =
+        idl_global->scopes ().top_non_null ();
+
+      AST_Decl *d = s->lookup_by_name (sn, true);
+
+      if (d == 0)
+        {
+          idl_global->err ()->lookup_error (sn);
+
+          sn->destroy ();
+          delete sn;
+          sn = 0;
+
+          continue;
+        }
+
+      sn->destroy ();
+      delete sn;
+      sn = 0;
+
+      be_uses *u = be_uses::narrow_from_decl (d);
+
+      if (u == 0)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_component_exh")
+                             ACE_TEXT ("::visit_component - ")
+                             ACE_TEXT ("narrow to AMI receptacle ")
+                             ACE_TEXT ("failed\n")),
+                            -1);
+        }
+
+      be_component *c =
+        be_component::narrow_from_decl (
+          ScopeAsDecl (u->defined_in ()));
+
+      if (c == node)
+        {
+          be_visitor_context ctx (*this->ctx_);
+          be_visitor_component_ami_rh_exh ami_rh_visitor (&ctx);
+
+          if (ami_rh_visitor.visit_uses (u) == -1)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ACE_TEXT ("be_visitor_component_exh")
+                                 ACE_TEXT ("::visit_component - ")
+                                 ACE_TEXT ("AMI reply handler generation ")
+                                 ACE_TEXT ("failed\n")),
+                                -1);
+            }
+        }
+    }
+
   this->gen_exec_entrypoint_decl ();
 
   os_ << be_uidt_nl
       << "}";
-     
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_component/component_exs.cpp b/TAO_IDL/be/be_visitor_component/component_exs.cpp
index f5e01b0641c..38b2f4ed57f 100644
--- a/TAO_IDL/be/be_visitor_component/component_exs.cpp
+++ b/TAO_IDL/be/be_visitor_component/component_exs.cpp
@@ -34,11 +34,11 @@ be_visitor_component_exs::visit_component (be_component *node)
 
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
       << "{" << be_idt;
-      
+
   be_visitor_facet_exs facet_visitor (this->ctx_);
   facet_visitor.node (node);
 
@@ -50,8 +50,9 @@ be_visitor_component_exs::visit_component (be_component *node)
                          ACE_TEXT ("facet visitor failed\n")),
                         -1);
     }
-    
+
   be_visitor_executor_exs exec_visitor (this->ctx_);
+  exec_visitor.node (node);
 
   if (exec_visitor.visit_component (node) == -1)
     {
@@ -62,6 +63,72 @@ be_visitor_component_exs::visit_component (be_component *node)
                         -1);
     }
 
+  /// Generate the empty ops for the AMI4CCM reply handlers,
+  /// if any.
+  for (ACE_Unbounded_Queue<char *>::CONST_ITERATOR i (
+         idl_global->ciao_ami_recep_names ());
+       ! i.done ();
+       i.advance ())
+    {
+      char **item = 0;
+      i.next (item);
+
+      UTL_ScopedName *sn =
+        FE_Utils::string_to_scoped_name (*item);
+
+      UTL_Scope *s =
+        idl_global->scopes ().top_non_null ();
+
+      AST_Decl *d = s->lookup_by_name (sn, true);
+
+      if (d == 0)
+        {
+          idl_global->err ()->lookup_error (sn);
+
+          sn->destroy ();
+          delete sn;
+          sn = 0;
+
+          continue;
+        }
+
+      sn->destroy ();
+      delete sn;
+      sn = 0;
+
+      be_uses *u = be_uses::narrow_from_decl (d);
+
+      if (u == 0)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_component_exs")
+                             ACE_TEXT ("::visit_component - ")
+                             ACE_TEXT ("narrow to AMI receptacle ")
+                             ACE_TEXT ("failed\n")),
+                            -1);
+        }
+
+      be_component *c =
+        be_component::narrow_from_decl (
+          ScopeAsDecl (u->defined_in ()));
+
+      if (c == node)
+        {
+          be_visitor_context ctx (*this->ctx_);
+          be_visitor_component_ami_rh_exs ami_rh_visitor (&ctx);
+
+          if (ami_rh_visitor.visit_uses (u) == -1)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ACE_TEXT ("be_visitor_component_exs")
+                                 ACE_TEXT ("::visit_component - ")
+                                 ACE_TEXT ("AMI reply handler generation ")
+                                 ACE_TEXT ("failed\n")),
+                                -1);
+            }
+        }
+    }
+
   this->gen_exec_entrypoint_defn ();
 
   os_ << be_uidt_nl
diff --git a/TAO_IDL/be/be_visitor_component/component_svh.cpp b/TAO_IDL/be/be_visitor_component/component_svh.cpp
index c6f749f3500..1764e19a800 100644
--- a/TAO_IDL/be/be_visitor_component/component_svh.cpp
+++ b/TAO_IDL/be/be_visitor_component/component_svh.cpp
@@ -42,14 +42,14 @@ be_visitor_component_svh::visit_component (be_component *node)
     {
       return 0;
     }
-    
+
   /// Fills in the node's has_* members, for use in minimizing
-  /// code generation.  
+  /// code generation.
   node->scan (node);
-  
+
   // Generate the facet servant class declaration.
   be_visitor_facet_svh facet_visitor (this->ctx_);
-  
+
   if (facet_visitor.visit_component_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -61,7 +61,7 @@ be_visitor_component_svh::visit_component (be_component *node)
 
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
       << "{" << be_idt;
@@ -77,8 +77,8 @@ be_visitor_component_svh::visit_component (be_component *node)
                          ACE_TEXT ("context visitor failed\n")),
                         -1);
     }
-    
-  // Generate the servant class declaration.  
+
+  // Generate the servant class declaration.
   be_visitor_servant_svh servant_visitor (this->ctx_);
 
   if (servant_visitor.visit_component (node) == -1)
@@ -107,13 +107,14 @@ be_visitor_component_svh::visit_connector (be_connector *node)
 void
 be_visitor_component_svh::gen_entrypoint (be_component *node)
 {
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::PortableServer::Servant" << be_nl
       << "create_" << node->flat_name ()
       << "_Servant (" << be_idt_nl
       << "::Components::EnterpriseComponent_ptr p," << be_nl
-      << "::CIAO::Container_ptr c," << be_nl
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Container_ptr c," << be_nl
       << "const char * ins_name);" << be_uidt;
 }
 
diff --git a/TAO_IDL/be/be_visitor_component/component_svs.cpp b/TAO_IDL/be/be_visitor_component/component_svs.cpp
index c38624b4cee..5e098aa39fa 100644
--- a/TAO_IDL/be/be_visitor_component/component_svs.cpp
+++ b/TAO_IDL/be/be_visitor_component/component_svs.cpp
@@ -56,7 +56,7 @@ be_visitor_component_svs::visit_component (be_component *node)
 
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
       << "{" << be_idt;
@@ -106,13 +106,14 @@ be_visitor_component_svs::gen_entrypoint (AST_Component *node)
   const char *lname = node->local_name ()->get_string ();
   const char *global = (sname_str == "" ? "" : "::");
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::PortableServer::Servant" << be_nl
       << "create_" << node->flat_name ()
       << "_Servant (" << be_idt_nl
       << "::Components::EnterpriseComponent_ptr p," << be_nl
-      << "::CIAO::Container_ptr c," << be_nl
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Container_ptr c," << be_nl
       << "const char * ins_name)" << be_uidt_nl
       << "{" << be_idt_nl
       << global << sname << "::CCM_" << lname
diff --git a/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp b/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp
index d4221607652..3d7496b5d80 100644
--- a/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp
+++ b/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp
@@ -29,7 +29,7 @@ be_visitor_context_ex_idl::visit_component (be_component *node)
 {
   node_ = node;
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "local interface CCM_"
       << node->original_local_name ()->get_string ()
       << "_Context" << be_idt_nl
@@ -39,7 +39,8 @@ be_visitor_context_ex_idl::visit_component (be_component *node)
 
   if (base == 0)
     {
-      os_ << "::Components::SessionContext";
+      os_ << "::Components::"
+          << be_global->ciao_container_type () << "Context";
     }
   else
     {
diff --git a/TAO_IDL/be/be_visitor_component/context_svh.cpp b/TAO_IDL/be/be_visitor_component/context_svh.cpp
index 09a720a4674..f3615ad1be2 100644
--- a/TAO_IDL/be/be_visitor_component/context_svh.cpp
+++ b/TAO_IDL/be/be_visitor_component/context_svh.cpp
@@ -28,7 +28,6 @@ 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 ());
@@ -43,25 +42,27 @@ be_visitor_context_svh::visit_component (be_component *node)
 
   os_ << be_nl
       << "class " << lname << "_Servant;"
-      << be_nl << be_nl;
+      << be_nl_2;
 
   os_ << "class " << export_macro_.c_str () << " " << lname
       << "_Context" << be_idt_nl
       << ": public virtual ::CIAO::"
-      << "Context_Impl<" << be_idt << be_idt_nl
+      << be_global->ciao_container_type ()
+      << "_Context_Impl<" << be_idt << be_idt_nl
       << global << sname << "::CCM_" << lname
       << "_Context," << be_nl
       << "::" << node->name () << ">" << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "public:" << be_idt_nl;
 
-  os_ << "// Allow the servant to access our state." << be_nl
+  os_ << "/// Allow the servant to access our state." << be_nl
       << "friend class " << lname << "_Servant;"
-      << be_nl << be_nl;
+      << be_nl_2;
 
-  os_ << "// Some useful typedefs." << be_nl<< be_nl
+  os_ << "/// Some useful typedefs." << be_nl
       << "typedef" << be_nl
-      << "::CIAO::Context_Impl<" << be_idt << be_idt_nl
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Context_Impl<" << be_idt << be_idt_nl
       << global << sname << "::CCM_"
       << lname << "_Context," << be_nl
       << "::" << node->name () << ">" << be_uidt_nl
@@ -87,27 +88,25 @@ be_visitor_context_svh::visit_component (be_component *node)
 
   os_ << "typedef ::CIAO::"
       << (de_facto ? "Connector_" : "")
-      << "Servant_Impl_Base svnt_base_type;" << be_nl << be_nl;
+      << "Servant_Impl_Base svnt_base_type;" << be_nl_2;
 
   os_ << lname << "_Context (" << be_idt_nl
       << "::Components::CCMHome_ptr h," << be_nl
-      << "::CIAO::Container_ptr c," << be_nl
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Container_ptr c," << be_nl
       << "PortableServer::Servant sv," << be_nl
       << "const char *id);" << be_uidt_nl << be_nl;
 
   os_ << "virtual ~" << lname << "_Context (void);";
 
-  os_ << be_nl << be_nl
-      << "// CIAO-specific." << be_nl
-      << "static " << lname << "_Context *" << be_nl
-      << "_narrow ( ::Components::SessionContext_ptr p);";
-
-  os_ << be_nl << be_nl
-      << "// Operations for " << lname
+  os_ << be_nl_2
+      << "/** @name Operations and members for " << lname
       << " receptacles and event sources,"
       << be_nl
-      << "// defined in " << global << sname
-      << "::CCM_" << lname << "_Context.";
+      << " * defined in " << global << sname
+      << "::CCM_" << lname << "_Context." << be_nl << " */"
+      << be_nl
+      << "//@{";
 
   if (this->visit_component_scope (node) == -1)
     {
@@ -119,7 +118,9 @@ be_visitor_context_svh::visit_component (be_component *node)
                         -1);
     }
 
-  os_ << be_uidt_nl
+  os_ << be_nl
+      << "//@}"
+      << be_uidt_nl
       << "};";
 
   return 0;
@@ -162,9 +163,9 @@ be_visitor_context_svh::visit_uses (be_uses *node)
       << "virtual "
       << (is_multiple ? "::Components::Cookie *" : "void")
       << be_nl
-      << "connect_" << port_name << " (" 
+      << "connect_" << port_name << " ("
       << "::" << obj_name << "_ptr);"
-      << be_nl << be_nl;
+      << be_nl_2;
 
   os_ << "virtual ::" << obj_name << "_ptr" << be_nl
       << "disconnect_" << port_name << " (";
@@ -179,13 +180,13 @@ be_visitor_context_svh::visit_uses (be_uses *node)
     }
 
   os_ << be_uidt_nl << be_nl
-      << "protected:" << be_idt_nl;
+      << "private:" << be_idt_nl;
 
   if (is_multiple)
     {
-      os_ << "// Multiplex " << port_name << " connection." << be_nl
-          << "typedef ACE_Array_Map<ptrdiff_t," << be_nl
-          << "                      ::"
+      os_ << "/// Multiplex " << port_name << " connection." << be_nl
+          << "typedef std::map<ptrdiff_t," << be_nl
+          << "                 ::"
           << obj_name << "_var>" << be_idt_nl
           << tao_cg->upcase (port_name)
           << "_TABLE;" << be_uidt_nl
@@ -195,7 +196,7 @@ be_visitor_context_svh::visit_uses (be_uses *node)
     }
   else
     {
-      os_ << "// Simplex " << port_name << " connection." << be_nl
+      os_ << "/// Simplex " << port_name << " connection." << be_nl
           << "::" << obj_name << "_var" << be_nl
           << "ciao_uses_" << port_name << "_;";
     }
@@ -228,16 +229,16 @@ be_visitor_context_svh::visit_publishes (be_publishes *node)
       << "::Components::Cookie * ck);" << be_uidt;
 
   os_ << be_uidt_nl << be_nl
-      << "protected:" << be_idt_nl;
+      << "private:" << be_idt_nl;
 
-  os_ << "typedef ACE_Array_Map<ptrdiff_t," << be_nl
-      << "                      ::" << obj_name
+  os_ << "typedef std::map<ptrdiff_t," << be_nl
+      << "                 ::" << obj_name
       << "Consumer_var>" << be_idt_nl
       << tao_cg->upcase (port_name) << "_TABLE;" << be_uidt_nl
       << tao_cg->upcase (port_name) << "_TABLE ciao_publishes_"
       << port_name << "_;" << be_nl
       << "TAO_SYNCH_MUTEX " << port_name << "_lock_;"
-      << be_nl << be_nl;
+      << be_nl_2;
 
   return 0;
 }
@@ -262,7 +263,7 @@ be_visitor_context_svh::visit_emits (be_emits *node)
       << "connect_" << port_name << " (" << be_idt_nl
       << "::" << obj_name << "Consumer_ptr c);" << be_uidt;
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "virtual ::" << obj_name << "Consumer_ptr" << be_nl
       << "disconnect_" << port_name << " (void);";
 
diff --git a/TAO_IDL/be/be_visitor_component/context_svs.cpp b/TAO_IDL/be/be_visitor_component/context_svs.cpp
index e7153be92d1..d8ff3f68c4a 100644
--- a/TAO_IDL/be/be_visitor_component/context_svs.cpp
+++ b/TAO_IDL/be/be_visitor_component/context_svs.cpp
@@ -41,11 +41,15 @@ be_visitor_context_svs::visit_component (be_component *node)
       << lname <<"_Context::" << lname << "_Context ("
       << be_idt << be_idt_nl
       << "::Components::CCMHome_ptr h," << be_nl
-      << "::CIAO::Container_ptr c," << be_nl
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Container_ptr c," << be_nl
       << "PortableServer::Servant sv," << be_uidt_nl
       << "const char *id)" << be_uidt_nl
-      << ": ::CIAO::Context_Impl_Base (h, c, id)," << be_idt_nl
-      << "::CIAO::Context_Impl<" << be_idt_nl
+      << ": ::CIAO::Context_Impl_Base_T < ::CIAO::"
+      << be_global->ciao_container_type () << "_Container> (h, c, id),"
+      << be_idt_nl
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Context_Impl<" << be_idt_nl
       << global << sname << "::CCM_"
       << lname << "_Context," << be_nl
       << "::" << node->full_name () << "> (h, c, sv, id)";
@@ -54,7 +58,7 @@ be_visitor_context_svs::visit_component (be_component *node)
       << "{" << be_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << lname << "_Context::~"
       << lname << "_Context (void)" << be_nl
       << "{" << be_nl
@@ -123,7 +127,7 @@ be_visitor_context_svs::visit_publishes (be_publishes *node)
   ACE_CString sname_str (
     ScopeAsDecl (obj->defined_in ())->full_name ());
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
       << node_->local_name () << "_Context::push_"
       << port_name << " (" << be_idt_nl
@@ -133,7 +137,7 @@ be_visitor_context_svs::visit_publishes (be_publishes *node)
   os_ << "ACE_GUARD (TAO_SYNCH_MUTEX," << be_nl
       << "           mon," << be_nl
       << "           this->" << port_name
-      << "_lock_);" << be_nl << be_nl;
+      << "_lock_);" << be_nl_2;
 
   os_ << "for (" << tao_cg->upcase (port_name)
       << "_TABLE::const_iterator iter =" << be_nl
@@ -148,7 +152,7 @@ be_visitor_context_svs::visit_publishes (be_publishes *node)
       << "}" << be_uidt << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::Components::Cookie *" << be_nl
       << node_->local_name () << "_Context::subscribe_"
       << port_name << " (" << be_idt_nl
@@ -156,58 +160,52 @@ be_visitor_context_svs::visit_publishes (be_publishes *node)
       << "{" << be_idt_nl
       << "if ( ::CORBA::is_nil (c))" << be_idt_nl
       << "{" << be_idt_nl
-      << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "std::pair<" << tao_cg->upcase (port_name)
-      << "_TABLE::iterator, bool> result;" << be_nl
-      << tao_cg->upcase (port_name)
-      << "_TABLE::value_type entry;" << be_nl
-      << "entry.first = reinterpret_cast<ptrdiff_t> (c);"
-      << be_nl
-      << "entry.second = ::" << fname
-      << "Consumer::_duplicate (c);" << be_nl << be_nl;
+      << "throw ::Components::InvalidConnection ();" << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl;
+
+  os_ << "ptrdiff_t const ptr = reinterpret_cast<ptrdiff_t> (c);"
+      << be_nl_2;
 
   os_ << "{" << be_idt_nl
       << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
       << "                  mon," << be_nl
       << "                  this->" << port_name
       << "_lock_," << be_nl
-      << "                  0);" << be_nl << be_nl;
-
-  os_ << "result = this->ciao_publishes_" << port_name
-      << "_.insert (entry);";
+      << "                  0);";
 
-  os_ << be_uidt_nl
+  os_ << be_nl_2
+      << "::" << fname << "Consumer_var ciao_var = " << be_idt_nl
+      << "::" << fname << "Consumer::_duplicate (c);" << be_uidt << be_nl_2
+      << "std::pair<" << tao_cg->upcase (port_name) <<"_TABLE::iterator, bool> ret =" << be_idt_nl
+      << "this->ciao_publishes_" << port_name
+      << "_.insert (" << be_idt_nl << tao_cg->upcase (port_name)
+      << "_TABLE::value_type (ptr, ciao_var.in ()));"
+      << be_uidt << be_uidt_nl
+      << "if (!ret.second)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "throw ::Components::AlreadyConnected ();" << be_uidt_nl
+      << "}" << be_uidt_nl
+      << "ciao_var._retn ();" << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
-      << "if (! result.second)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "ACE_ERROR_RETURN ((LM_ERROR," << be_nl
-      << "                   ACE_TEXT (\"subscribe on %s failed\\n\"),"
+  os_ << be_nl
       << be_nl
-      << "                   ACE_TEXT (\"" << port_name
-      << "\"))," << be_nl
-      << "                  0);" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
       << "::Components::Cookie * retv = 0;" << be_nl
       << "ACE_NEW_THROW_EX (retv," << be_nl
-      << "                  ::CIAO::Cookie_Impl (entry.first),"
+      << "                  ::CIAO::Cookie_Impl (ptr),"
       << be_nl
       << "                  ::CORBA::NO_MEMORY ());"
-      << be_nl << be_nl
+      << be_nl_2
       << "return retv;" << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::" << fname << "Consumer_ptr" << be_nl
       << node_->local_name () << "_Context::unsubscribe_"
       << port_name << " (" << be_idt_nl
       << "::Components::Cookie * ck)" << be_uidt_nl
       << "{" << be_idt_nl
-      << "ptrdiff_t key = 0UL;" << be_nl
-      << tao_cg->upcase (port_name)
-      << "_TABLE::size_type n = 0UL;" << be_nl << be_nl
+      << "ptrdiff_t key = 0UL;" << be_nl_2
       << "if (ck == 0 || ! ::CIAO::Cookie_Impl::extract (ck, key))"
       << be_idt_nl
       << "{" << be_idt_nl
@@ -220,7 +218,7 @@ be_visitor_context_svs::visit_publishes (be_publishes *node)
       << "                  this->" << port_name
       << "_lock_," << be_nl
       << "                  ::" << fname
-      << "Consumer::_nil ());" << be_nl << be_nl;
+      << "Consumer::_nil ());" << be_nl_2;
 
   os_ << tao_cg->upcase (port_name) << "_TABLE::iterator iter ="
       << be_idt_nl
@@ -231,25 +229,21 @@ be_visitor_context_svs::visit_publishes (be_publishes *node)
       << "{" << be_idt_nl
       << "::" << fname
       << "Consumer_var retv = iter->second;" << be_nl
-      << "n = this->ciao_publishes_" << port_name
-      << "_.erase (key);" << be_nl << be_nl
+      << tao_cg->upcase (port_name)
+      << "_TABLE::size_type n =" << be_idt_nl
+      << "this->ciao_publishes_" << port_name
+      << "_.erase (key);" << be_uidt_nl << be_nl
       << "if (n == 1UL)" << be_idt_nl
       << "{" << be_idt_nl
       << "return retv._retn ();" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "throw ::Components::InvalidConnection ();" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl;
+      << "}" << be_uidt << be_uidt_nl
+      << "}" << be_uidt_nl;
 
   os_ << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
-      << "if (n != 1UL)" << be_idt_nl
-      << "{" << be_idt_nl
+  os_ << be_nl_2
       << "throw ::Components::InvalidConnection ();" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return ::" << fname << "Consumer::_nil ();"
-      << be_uidt_nl
       << "}";
 
   return 0;
@@ -265,7 +259,7 @@ be_visitor_context_svs::visit_emits (be_emits *node)
   const char *fname = obj->full_name ();
   const char *lname = obj->local_name ()->get_string ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
       << node_->local_name () << "_Context::push_" << port_name
       << " (" << be_idt_nl
@@ -279,7 +273,7 @@ be_visitor_context_svs::visit_emits (be_emits *node)
       << "}" << be_uidt << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
       << node_->local_name () << "_Context::connect_" << port_name
       << " (" << be_idt_nl
@@ -287,7 +281,7 @@ be_visitor_context_svs::visit_emits (be_emits *node)
       << "{" << be_idt_nl
       << "if ( ::CORBA::is_nil (c))" << be_idt_nl
       << "{" << be_idt_nl
-      << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
+      << "throw ::Components::InvalidConnection ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "if (! ::CORBA::is_nil (this->ciao_emits_"
       << port_name << "_consumer_.in ()))" << be_idt_nl
@@ -300,18 +294,20 @@ be_visitor_context_svs::visit_emits (be_emits *node)
       << be_uidt << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::" << fname << "Consumer_ptr" << be_nl
       << node_->local_name () << "_Context::disconnect_"
       << port_name << " (void)" << be_nl
       << "{" << be_idt_nl
-      << "if ( ::CORBA::is_nil (this->ciao_emits_"
-      << port_name << "_consumer_.in ()))" << be_idt_nl
+      << "::" << fname << "Consumer_var ciao_emits_" << port_name << " =" << be_idt_nl
+      << "this->ciao_emits_" << port_name << "_consumer_._retn ();" << be_uidt_nl << be_nl
+      << "if ( ::CORBA::is_nil (ciao_emits_"
+      << port_name << ".in ()))" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::Components::NoConnection ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
-      << "return this->ciao_emits_" << port_name
-      << "_consumer_._retn ();" << be_uidt_nl
+      << "return ciao_emits_" << port_name
+      << "._retn ();" << be_uidt_nl
       << "}";
 
   return 0;
@@ -323,49 +319,50 @@ be_visitor_context_svs::gen_uses_simplex (AST_Type *obj,
 {
   const char *fname = obj->full_name ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::" << fname << "_ptr" << be_nl
       << node_->local_name () << "_Context::get_connection_"
       << port_name << " (void)" << be_nl
       << "{" << be_idt_nl
-      << "return" << be_idt_nl
-      << "::" << fname << "::_duplicate (" << be_idt_nl
+      << "return ::" << fname << "::_duplicate (" << be_idt_nl
       << "this->ciao_uses_" << port_name << "_.in ());"
-      << be_uidt << be_uidt << be_uidt_nl
+      << be_uidt << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
       << node_->local_name () << "_Context::connect_"
       << port_name << " (" << be_idt_nl
       << "::" << fname << "_ptr c)" << be_uidt_nl
       << "{" << be_idt_nl
+      << "if ( ::CORBA::is_nil (c))" << be_idt_nl
+      << "{" << be_idt_nl
+      << "throw ::Components::InvalidConnection ();" << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
       << "if (! ::CORBA::is_nil (this->ciao_uses_"
       << port_name << "_.in ()))" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::Components::AlreadyConnected ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
-      << "if ( ::CORBA::is_nil (c))" << be_idt_nl
-      << "{" << be_idt_nl
-      << "throw ::Components::InvalidConnection ();" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
       << "this->ciao_uses_" << port_name << "_ =" << be_idt_nl
       << "::" << fname << "::_duplicate (c);"
       << be_uidt << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::" << fname << "_ptr" << be_nl
       << node_->local_name () << "_Context::disconnect_"
       << port_name << " (void)" << be_nl
       << "{" << be_idt_nl
-      << "if ( ::CORBA::is_nil (this->ciao_uses_"
-      << port_name << "_.in ()))" << be_idt_nl
+      << "::" << fname << "_var ciao_uses_" << port_name << " =" << be_idt_nl
+      << "this->ciao_uses_" << port_name << "_._retn ();" << be_uidt_nl << be_nl
+      << "if ( ::CORBA::is_nil (ciao_uses_"
+      << port_name << ".in ()))" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::Components::NoConnection ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
-      << "return this->ciao_uses_" << port_name
-      << "_._retn ();" << be_uidt_nl
+      << "return ciao_uses_" << port_name
+      << "._retn ();" << be_uidt_nl
       << "}";
 }
 
@@ -376,7 +373,7 @@ be_visitor_context_svs::gen_uses_multiplex (
 {
   const char *fname = obj->full_name ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::" << node_->full_name () << "::" << port_name
       << "Connections *" << be_nl
       << node_->local_name () << "_Context::get_connections_"
@@ -387,7 +384,7 @@ be_visitor_context_svs::gen_uses_multiplex (
       << "                  mon," << be_nl
       << "                  this->" << port_name
       << "_lock_," << be_nl
-      << "                  0);" << be_nl << be_nl;
+      << "                  0);" << be_nl_2;
 
   os_ << "::" << node_->full_name () << "::" << port_name
       << "Connections * tmp_retv = 0;" << be_nl
@@ -397,12 +394,12 @@ be_visitor_context_svs::gen_uses_multiplex (
       << "                    this->ciao_uses_"
       << port_name << "_.size ())," << be_nl
       << "                  ::CORBA::NO_MEMORY ());"
-      << be_nl << be_nl
+      << be_nl_2
       << "::" << node_->full_name () << "::" << port_name
       << "Connections_var retv = tmp_retv;" << be_nl
       << "retv->length (this->ciao_uses_" << port_name
       << "_.size ());" << be_nl
-      << "::CORBA::ULong i = 0UL;" << be_nl << be_nl
+      << "::CORBA::ULong i = 0UL;" << be_nl_2
       << "for (" << tao_cg->upcase (port_name)
       << "_TABLE::const_iterator iter =" << be_nl
       << "       this->ciao_uses_" << port_name << "_.begin ();"
@@ -411,7 +408,7 @@ be_visitor_context_svs::gen_uses_multiplex (
       << port_name << "_.end ();" << be_nl
       << "     ++iter, ++i)" << be_idt_nl
       << "{" << be_idt_nl
-      << "retv[i].objref = iter->second;" << be_nl << be_nl
+      << "retv[i].objref = iter->second;" << be_nl_2
       << "ACE_NEW_THROW_EX (retv[i].ck.inout ()," << be_nl
       << "                  ::CIAO::Cookie_Impl (iter->first),"
       << be_nl
@@ -420,7 +417,7 @@ be_visitor_context_svs::gen_uses_multiplex (
       << "return retv._retn (); " << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::Components::Cookie *" << be_nl
       << node_->local_name () << "_Context::connect_"
       << port_name << " (" << be_idt_nl
@@ -429,16 +426,11 @@ be_visitor_context_svs::gen_uses_multiplex (
       << "if ( ::CORBA::is_nil (c))" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::Components::InvalidConnection ();" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "std::pair<" << tao_cg->upcase (port_name)
-      << "_TABLE::iterator, bool> result;" << be_nl
-      << tao_cg->upcase (port_name)
-      << "_TABLE::value_type entry;" << be_nl
-      << "entry.first = reinterpret_cast<ptrdiff_t> (c);" << be_nl
-      << "entry.second = ::" << fname
-      << "::_duplicate (c);";
+      << "}" << be_uidt_nl << be_nl;
 
-  os_ << be_nl << be_nl
+  os_ << "ptrdiff_t const ptr = reinterpret_cast<ptrdiff_t> (c);";
+
+  os_ << be_nl_2
       << "{" << be_idt_nl
       << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
       << "                  mon," << be_nl
@@ -446,29 +438,32 @@ be_visitor_context_svs::gen_uses_multiplex (
       << "_lock_," << be_nl
       << "                  0);";
 
-  os_ << be_nl << be_nl
-      << "result = this->ciao_uses_" << port_name
-      << "_.insert (entry);";
-
-  os_ << be_uidt_nl
+  os_ << be_nl_2
+      << "::" << fname << "_var ciao_var = " << be_idt_nl
+      << "::" << fname << "::_duplicate (c);" << be_uidt << be_nl_2
+      << "std::pair<" << tao_cg->upcase (port_name) <<"_TABLE::iterator, bool> ret =" << be_idt_nl
+      << "this->ciao_uses_" << port_name
+      << "_.insert (" << be_idt_nl << tao_cg->upcase (port_name)
+      << "_TABLE::value_type (ptr, ciao_var.in ()));"
+      << be_uidt << be_uidt_nl
+      << "if (!ret.second)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "throw ::Components::AlreadyConnected ();" << be_uidt_nl
+      << "}" << be_uidt_nl
+      << "ciao_var._retn ();" << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
-      << "if (! result.second)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "throw ::Components::InvalidConnection ();"
-      << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
+  os_ << be_nl_2
       << "::Components::Cookie * ck = 0;" << be_nl
       << "ACE_NEW_THROW_EX (ck," << be_nl
-      << "                  ::CIAO::Cookie_Impl (entry.first),"
+      << "                  ::CIAO::Cookie_Impl (ptr),"
       << be_nl
       << "                  ::CORBA::NO_MEMORY ());"
-      << be_nl << be_nl
+      << be_nl_2
       << "return ck;" << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::" << fname << "_ptr" << be_nl
       << node_->local_name  () << "_Context::disconnect_"
       << port_name << " (" << be_idt_nl
@@ -477,14 +472,14 @@ be_visitor_context_svs::gen_uses_multiplex (
       << "::" << fname << "_var retv;" << be_nl
       << "ptrdiff_t key = 0UL;" << be_nl
       << tao_cg->upcase (port_name)
-      << "_TABLE::size_type n = 0UL;" << be_nl << be_nl
+      << "_TABLE::size_type n = 0UL;" << be_nl_2
       << "if (ck == 0 || ! ::CIAO::Cookie_Impl::extract (ck, key))"
       << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::Components::InvalidConnection ();" << be_uidt_nl
       << "}" << be_uidt;
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "{" << be_idt_nl
       << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
       << "                  mon," << be_nl
@@ -493,24 +488,21 @@ be_visitor_context_svs::gen_uses_multiplex (
       << "                  ::" << fname
       << "::_nil ());";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << tao_cg->upcase (port_name)
       << "_TABLE::iterator iter =" << be_idt_nl
       << "this->ciao_uses_" << port_name
       << "_.find (key);" << be_uidt_nl << be_nl
-      << "if (iter == this->ciao_uses_" << port_name
+      << "if (iter != this->ciao_uses_" << port_name
       << "_.end ())" << be_idt_nl
       << "{" << be_idt_nl
-      << "throw ::Components::InvalidConnection ();" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
       << "retv = iter->second;" << be_nl
       << "n = this->ciao_uses_" << port_name
-      << "_.erase (key);";
-
-  os_ << be_uidt_nl
-      << "}";
+      << "_.erase (key);" << be_uidt_nl
+      << "}" << be_uidt_nl
+      << "}" << be_uidt;
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "if (n != 1UL)" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::Components::InvalidConnection ();" << be_uidt_nl
diff --git a/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp b/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp
index 309d9565a71..afe0d6f703d 100644
--- a/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp
+++ b/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp
@@ -29,7 +29,7 @@ be_visitor_executor_ex_idl::visit_component (
   be_component *node)
 {
   node_ = node;
-  
+
   AST_Component *base = node->base_component ();
 
   os_ << be_nl
@@ -71,7 +71,7 @@ be_visitor_executor_ex_idl::visit_component (
 
   os_ << be_uidt_nl
       << "};";
-      
+
   return 0;
 }
 
@@ -87,7 +87,7 @@ be_visitor_executor_ex_idl::visit_attribute (be_attribute *node)
   AST_Decl::NodeType snt = this->node_->node_type ();
   AST_Decl::NodeType ant =
     ScopeAsDecl (node->defined_in ())->node_type ();
-    
+
   /// For now, we want porttype attributes generated only for
   /// connectors.
   if (snt == AST_Decl::NT_component
@@ -95,7 +95,7 @@ be_visitor_executor_ex_idl::visit_attribute (be_attribute *node)
     {
       return 0;
     }
-  
+
   bool rd_only = node->readonly ();
 
   // Keep output statements separate because of side effects.
@@ -181,11 +181,11 @@ be_visitor_executor_ex_idl::visit_provides (
   ACE_CString prefix (this->ctx_->port_prefix ());
   prefix += node->local_name ()->get_string ();
   const char *port_name = prefix.c_str ();
-  
+
   os_ << be_nl
       << global << sname << "::CCM_" << lname << " get_"
       << port_name << " ();";
-      
+
   return 0;
 }
 
@@ -200,7 +200,7 @@ be_visitor_executor_ex_idl::visit_consumes (
       << " (in ::"
       << IdentifierHelper::orig_sn (impl->name ()).c_str ()
       << " e);";
-      
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO_IDL/be/be_visitor_component/executor_exh.cpp
index 7f8158a9676..fe294044a14 100644
--- a/TAO_IDL/be/be_visitor_component/executor_exh.cpp
+++ b/TAO_IDL/be/be_visitor_component/executor_exh.cpp
@@ -14,7 +14,9 @@
 
 be_visitor_executor_exh::be_visitor_executor_exh (
       be_visitor_context *ctx)
-  : be_visitor_component_scope (ctx)
+  : be_visitor_component_scope (ctx),
+    comment_start_border_ ("/**"),
+    comment_end_border_ (" */")
 {
   // This is initialized in the base class to svnt_export_macro()
   // or skel_export_macro(), since there are many more visitor
@@ -30,6 +32,15 @@ be_visitor_executor_exh::~be_visitor_executor_exh (void)
 int
 be_visitor_executor_exh::visit_attribute (be_attribute *node)
 {
+  AST_Decl::NodeType nt = this->node_->node_type ();
+
+  // Executor attribute code generated for porttype attributes
+  // always in connectors and only for mirrorports in components.
+  if (this->in_ext_port_ && nt == AST_Decl::NT_component)
+    {
+      return 0;
+    }
+
   this->ctx_->interface (this->node_);
   be_visitor_attribute v (this->ctx_);
   return v.visit_attribute (node);
@@ -49,8 +60,14 @@ be_visitor_executor_exh::visit_component (be_component *node)
 
   const char *global = (sname_str == "" ? "" : "::");
 
-  os_ << be_nl << be_nl
-      << "class " << export_macro_.c_str () << " " << lname
+  os_ << be_nl_2
+      << comment_start_border_ << be_nl
+      << " * Component Executor Implementation Class: "
+      << lname << "_exec_i" << be_nl
+      << comment_end_border_;
+
+  os_ << be_nl_2
+      << "class " << lname
       << "_exec_i" << be_idt_nl
       << ": public virtual " << lname << "_Exec," << be_idt_nl
       << "public virtual ::CORBA::LocalObject"
@@ -63,9 +80,9 @@ be_visitor_executor_exh::visit_component (be_component *node)
   os_ << be_nl
       << "virtual ~" << lname << "_exec_i (void);";
 
-  os_ << be_nl << be_nl
-      << "//@{" << be_nl
-      << "/** Supported operations and attributes. */" << be_nl;
+  os_ << be_nl_2
+      << "/** @name Supported operations and attributes. */" << be_nl
+      << "//@{";
 
   int status =
     node->traverse_inheritance_graph (
@@ -74,8 +91,7 @@ be_visitor_executor_exh::visit_component (be_component *node)
       false,
       false);
 
-  os_ << be_nl
-      << "//@}" << be_nl;
+  os_ << be_nl_2 << "//@}" << be_nl_2;
 
   if (status == -1)
     {
@@ -87,14 +103,12 @@ be_visitor_executor_exh::visit_component (be_component *node)
                         -1);
     }
 
-  os_ << be_nl
-      << "//@{" << be_nl
-      << "/** Component attributes and port operations. */" << be_nl;
+  os_ << "/** @name Component attributes and port operations. */" << be_nl
+      << "//@{";
 
   status = this->visit_component_scope (node);
 
-  os_ << be_nl
-      << "//@}" << be_nl;
+  os_<< be_nl << "//@}" << be_nl_2;
 
   if (status == -1)
     {
@@ -106,42 +120,96 @@ be_visitor_executor_exh::visit_component (be_component *node)
                         -1);
     }
 
+  os_
+      << "/** @name Operations from Components::" << be_global->ciao_container_type ()
+      << "Component. */" << be_nl
+      << "//@{";
+
+  const char *container_type = be_global->ciao_container_type ();
+
   os_ << be_nl
-      << "//@{" << be_nl
-      << "/** Operations from Components::SessionComponent. */";
+      << "virtual void set_"
+      << tao_cg->downcase (container_type)
+      << "_context ("
+      << "::Components::" << be_global->ciao_container_type ()
+      << "Context_ptr ctx);";
 
-  os_ << be_nl << be_nl
-      << "virtual void set_session_context ("
-      << "::Components::SessionContext_ptr ctx);";
+  if (ACE_OS::strcmp (be_global->ciao_container_type (), "Session") == 0)
+    {
+      os_ << be_nl
+          << "virtual void configuration_complete (void);";
 
-  os_ << be_nl << be_nl
-      << "virtual void configuration_complete (void);";
+      os_ << be_nl
+          << "virtual void ccm_activate (void);" << be_nl
+          << "virtual void ccm_passivate (void);";
+    }
 
-  os_ << be_nl << be_nl
-      << "virtual void ccm_activate (void);" << be_nl
-      << "virtual void ccm_passivate (void);" << be_nl
-      << "virtual void ccm_remove (void);";
+  os_ << be_nl << "virtual void ccm_remove (void);";
 
   os_ << be_nl
       << "//@}";
 
-  os_ << be_uidt_nl << be_nl
+  os_ << be_nl_2
+      << "/** @name User defined public operations. */" << be_nl
+      << "//@{";
+
+  os_ << be_nl_2 << "//@}";
+
+  os_ << be_uidt << be_nl_2
       << "private:" << be_idt_nl
       << global << sname << "::CCM_" << lname
-      << "_Context_var ciao_context_;";
-      
-  be_visitor_facet_private_exh v (this->ctx_);
-  
-  if (v.visit_component_scope (node) == -1)
+      << "_Context_var ciao_context_;" << be_nl_2;
+
+  /// The overload of traverse_inheritance_graph() used here
+  /// doesn't automatically prime the queues.
+  node->get_insert_queue ().reset ();
+  node->get_del_queue ().reset ();
+  node->get_insert_queue ().enqueue_tail (node_);
+
+  be_visitor_executor_private_exh v (this->ctx_);
+  v.node (node);
+
+  os_ << "/** @name Component attributes. */" << be_nl
+      << "//@{";
+
+  Exec_Attr_Decl_Generator attr_decl (&v);
+
+  status =
+    node->traverse_inheritance_graph (attr_decl,
+                                      &os_,
+                                      false,
+                                      false);
+
+  if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_executor_exh::")
                          ACE_TEXT ("visit_component - ")
-                         ACE_TEXT ("facet private member ")
-                         ACE_TEXT ("visitor failed\n")),
+                         ACE_TEXT ("traverse_inheritance_graph() ")
+                         ACE_TEXT ("for attr decls failed\n")),
                         -1);
     }
-      
+
+  os_<< be_nl << "//@}" << be_nl_2;
+
+  os_ << "/** @name User defined members. */" << be_nl
+      << "//@{";
+
+  os_ << be_nl_2 << "//@}";
+
+  os_ << be_nl_2
+      << "/** @name User defined private operations. */" << be_nl
+      << "//@{";
+
+  os_ << be_nl_2 << "//@}";
+
+  if (be_global->gen_ciao_exec_reactor_impl ())
+    {
+      os_ << be_nl_2
+          << "/// Get the ACE_Reactor" << be_nl
+          << "ACE_Reactor* reactor (void);";
+    }
+
   os_ << be_uidt_nl
       << "};";
 
@@ -154,7 +222,7 @@ be_visitor_executor_exh::visit_provides (be_provides *node)
   ACE_CString prefix (this->ctx_->port_prefix ());
   prefix += node->local_name ()->get_string ();
   const char *port_name = prefix.c_str ();
-  
+
   be_type *impl = node->provides_type ();
 
   AST_Decl *scope = ScopeAsDecl (impl->defined_in ());
@@ -167,7 +235,7 @@ be_visitor_executor_exh::visit_provides (be_provides *node)
 
   const char *global = (sname_str == "" ? "" : "::");
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "virtual " << global << sname << "::CCM_"
       << lname << "_ptr" << be_nl
       << "get_" << port_name << " (void);";
@@ -184,7 +252,7 @@ be_visitor_executor_exh::visit_consumes (be_consumes *node)
   const char *port_name =
     node->local_name ()->get_string ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "virtual void" << be_nl
       << "push_" << port_name << " (" << be_idt_nl
       << "::" << obj_name << " * ev);" << be_uidt;
@@ -192,3 +260,22 @@ be_visitor_executor_exh::visit_consumes (be_consumes *node)
   return 0;
 }
 
+// ==================================================
+
+Exec_Attr_Decl_Generator::Exec_Attr_Decl_Generator (
+      be_visitor_scope * visitor)
+  : visitor_ (visitor)
+{
+}
+
+int
+Exec_Attr_Decl_Generator::emit (
+  be_interface * /*derived_interface */,
+  TAO_OutStream * /* os */,
+  be_interface * base_interface)
+{
+  // Even though this call seems unaware of CCM types, the
+  // visitor must inherit from be_visitor_component_scope so
+  // it will pick up attributes via porttypes.
+  return visitor_->visit_scope (base_interface);
+}
diff --git a/TAO_IDL/be/be_visitor_component/executor_exs.cpp b/TAO_IDL/be/be_visitor_component/executor_exs.cpp
index 2b66ad5a0ad..602e197d672 100644
--- a/TAO_IDL/be/be_visitor_component/executor_exs.cpp
+++ b/TAO_IDL/be/be_visitor_component/executor_exs.cpp
@@ -12,12 +12,14 @@
  */
 //=============================================================================
 
+#include <TAO_IDL/be_include/be_helper.h>
+
 be_visitor_executor_exs::be_visitor_executor_exs (
       be_visitor_context *ctx)
   : be_visitor_component_scope (ctx),
     op_scope_ (0),
-    comment_border_ ("//=============================="
-                     "=============================="),
+    comment_start_border_ ("/**"),
+    comment_end_border_ (" */"),
     your_code_here_ ("/* Your code here. */")
 {
 }
@@ -47,52 +49,179 @@ be_visitor_executor_exs::visit_operation (be_operation *node)
 int
 be_visitor_executor_exs::visit_attribute (be_attribute *node)
 {
-  this->ctx_->interface (this->node_);
-  be_visitor_attribute v (this->ctx_);
-  v.op_scope (op_scope_);
-  return v.visit_attribute (node);
-}
+  AST_Decl::NodeType nt = this->node_->node_type ();
 
-int
-be_visitor_executor_exs::visit_component (be_component *node)
-{
-  // In the interest of pretty formatting, if we have generated
-  // at least one facet executor impl class, add a linebreak.
-  for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
-       !si.is_done ();
-       si.next ())
+  // Executor attribute code generated for porttype attributes
+  // always in connectors and only for mirrorports in components.
+  if (this->in_ext_port_ && nt == AST_Decl::NT_component)
+    {
+      return 0;
+    }
+
+  os_ << be_nl_2;
+
+  be_type *ft = node->field_type ();
+  be_visitor_operation_rettype rt_visitor (this->ctx_);
+
+  if (ft->accept (&rt_visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_executor_exs::")
+                         ACE_TEXT ("visit_attribute - ")
+                         ACE_TEXT ("accept on return type failed\n")),
+                        -1);
+    }
+
+  os_ << be_nl
+      << this->node_->original_local_name () << "_exec_i::"
+      << this->ctx_->port_prefix ().c_str ()
+      << node->local_name () << " (void)" << be_nl
+      << "{" << be_idt;
+
+  be_visitor_attr_return ar_visitor (this->ctx_);
+  ar_visitor.attr_name (node->original_local_name ()->get_string ());
+
+  if (ft->accept (&ar_visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_executor_exs::")
+                         ACE_TEXT ("visit_attribute - ")
+                         ACE_TEXT ("accept on get visitor failed\n")),
+                        -1);
+    }
+
+  os_ << be_uidt_nl
+      << "}";
+
+  if (node->readonly ())
     {
-      AST_Decl *d = si.item ();
+      // Skip the mutator operation generation.
+      return 0;
+    }
 
-      if (d->node_type () == AST_Decl::NT_provides)
-        {
-          os_ << be_nl;
-          break;
-        }
+  os_ << be_nl_2
+      << "void" << be_nl
+      << this->node_->original_local_name () << "_exec_i::"
+      << this->ctx_->port_prefix ().c_str ()
+      << node->local_name () << " (" << be_idt_nl;
+
+  be_visitor_attr_setarg_type at_visitor (this->ctx_);
+
+  if (ft->accept (&at_visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_executor_exs::")
+                         ACE_TEXT ("visit_attribute - ")
+                         ACE_TEXT ("accept on set arg type failed\n")),
+                        -1);
     }
 
+  os_ << node->local_name () << ")" << be_uidt_nl
+      << "{" << be_idt;
+
+  be_visitor_attr_assign as_visitor (this->ctx_);
+  as_visitor.attr_name (node->original_local_name ()->get_string ());
+
+  if (ft->accept (&as_visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_executor_exs::")
+                         ACE_TEXT ("visit_attribute - ")
+                         ACE_TEXT ("accept on set func body failed\n")),
+                        -1);
+    }
+
+  os_ << be_uidt_nl
+      << "}";
+
+  return 0;
+}
+
+int
+be_visitor_executor_exs::visit_component (be_component *node)
+{
   node_ = node;
   const char *lname = node->local_name ();
 
-  os_ << be_nl
-      << comment_border_ << be_nl
-      << "// Component Executor Implementation Class: "
+  os_ << be_nl_2
+      << comment_start_border_ << be_nl
+      << " * Component Executor Implementation Class: "
       << lname << "_exec_i" << be_nl
-      << comment_border_;
+      << comment_end_border_;
 
-  os_ << be_nl << be_nl
-      << lname << "_exec_i::" << lname << "_exec_i (void)" << be_nl
-      << "{" << be_nl
+  os_ << be_nl_2
+      << lname << "_exec_i::" << lname
+      << "_exec_i (void)";
+
+  /// The overload of traverse_inheritance_graph() used here
+  /// doesn't automatically prime the queues.
+  node->get_insert_queue ().reset ();
+  node->get_del_queue ().reset ();
+  node->get_insert_queue ().enqueue_tail (this->node_);
+
+  be_visitor_executor_exs_attr_init ai_visitor (this->ctx_);
+  ai_visitor.node (node);
+
+  Component_Exec_Attr_Init_Generator attr_init_gen (&ai_visitor);
+
+  int status =
+    node->traverse_inheritance_graph (attr_init_gen,
+                                      &os_,
+                                      false,
+                                      false);
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_executor_exs::")
+                         ACE_TEXT ("visit_component - ")
+                         ACE_TEXT ("traverse_inheritance_graph() ")
+                         ACE_TEXT ("for attr init failed\n")),
+                        -1);
+    }
+
+  if (ai_visitor.attr_generated ())
+    {
+      os_ << be_uidt << be_uidt_nl;
+    }
+
+  os_ << "{" << be_nl
       << "}";
 
-  os_ << be_nl << be_nl
-      << lname << "_exec_i::~" << lname << "_exec_i (void)" << be_nl
+  os_ << be_nl_2
+      << lname << "_exec_i::~" << lname
+      << "_exec_i (void)" << be_nl
       << "{" << be_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "// Supported operations and attributes.";
 
+  if (be_global->gen_ciao_exec_reactor_impl ())
+    {
+      os_ << be_nl
+          << "ACE_Reactor*" << be_nl
+          << lname << "_exec_i::reactor (void)" << be_nl
+          << "{" << be_idt_nl
+          << "ACE_Reactor* reactor = 0;" << be_nl
+          << "::CORBA::Object_var ccm_object = " << be_idt_nl
+          << "this->ciao_context_->get_CCM_object();" << be_uidt_nl
+          << "if (! ::CORBA::is_nil (ccm_object.in ())) " << be_idt_nl
+          << "{" << be_idt_nl
+          << "::CORBA::ORB_var orb = ccm_object->_get_orb ();" << be_nl
+          << "if (! ::CORBA::is_nil (orb.in ()))" << be_idt_nl
+          << "{" << be_idt_nl
+          << "reactor = orb->orb_core ()->reactor ();"
+          << be_uidt_nl << "}"
+          << be_uidt << be_uidt_nl << "}"
+          << be_uidt_nl << "if (reactor == 0)" << be_idt_nl
+          << "{" << be_idt_nl
+          << "throw ::CORBA::INTERNAL ();"
+          << be_uidt_nl << "}"
+          << be_uidt_nl << "return reactor;"
+          << be_uidt_nl << "}";
+    }
+
   op_scope_ = node;
 
   /// The overload of traverse_inheritance_graph() used here
@@ -103,7 +232,7 @@ be_visitor_executor_exs::visit_component (be_component *node)
 
   Component_Exec_Op_Attr_Generator op_attr_gen (this);
 
-  int status =
+  status =
     node->traverse_inheritance_graph (op_attr_gen,
                                       &os_,
                                       false,
@@ -115,11 +244,11 @@ be_visitor_executor_exs::visit_component (be_component *node)
                          ACE_TEXT ("be_visitor_executor_exs::")
                          ACE_TEXT ("visit_component - ")
                          ACE_TEXT ("traverse_inheritance_graph() ")
-                         ACE_TEXT ("failed\n")),
+                         ACE_TEXT ("for operations failed\n")),
                         -1);
     }
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "// Component attributes and port operations.";
 
   if (this->visit_component_scope (node) == -1)
@@ -131,22 +260,27 @@ be_visitor_executor_exs::visit_component (be_component *node)
                         -1);
     }
 
-  os_ << be_nl << be_nl
-      << "// Operations from Components::SessionComponent.";
+  os_ << be_nl_2
+      << "// Operations from Components::"
+      << be_global->ciao_container_type () << "Component.";
 
   AST_Decl *scope = ScopeAsDecl (node->defined_in ());
   ACE_CString sname_str (scope->full_name ());
   const char *sname = sname_str.c_str ();
   const char *global = (sname_str == "" ? "" : "::");
+  const char *container_type = be_global->ciao_container_type ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
-      << lname << "_exec_i::set_session_context (" << be_idt_nl
-      << "::Components::SessionContext_ptr ctx)" << be_uidt_nl
+      << lname << "_exec_i::set_"
+      << tao_cg->downcase (container_type)
+      << "_context (" << be_idt_nl
+      << "::Components::" << be_global->ciao_container_type ()
+      << "Context_ptr ctx)" << be_uidt_nl
       << "{" << be_idt_nl
       << "this->ciao_context_ =" << be_idt_nl
       << global << sname << "::CCM_" << lname
-      << "_Context::_narrow (ctx);" << be_uidt_nl << be_nl
+      << "_Context::_narrow (ctx);" << be_uidt << be_nl_2
       << "if ( ::CORBA::is_nil (this->ciao_context_.in ()))"
       << be_idt_nl
       << "{" << be_idt_nl
@@ -154,29 +288,32 @@ be_visitor_executor_exs::visit_component (be_component *node)
       << "}" << be_uidt << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
-      << "void" << be_nl
-      << lname << "_exec_i::configuration_complete (void)"
-      << be_nl
-      << "{" << be_idt_nl
-      << your_code_here_ << be_uidt_nl
-      << "}";
-
-  os_ << be_nl << be_nl
-      << "void" << be_nl
-      << lname << "_exec_i::ccm_activate (void)" << be_nl
-      << "{" << be_idt_nl
-      << your_code_here_ << be_uidt_nl
-      << "}";
-
-  os_ << be_nl << be_nl
-      << "void" << be_nl
-      << lname << "_exec_i::ccm_passivate (void)" << be_nl
-      << "{" << be_idt_nl
-      << your_code_here_ << be_uidt_nl
-      << "}";
+  if (ACE_OS::strcmp (be_global->ciao_container_type (), "Session") == 0)
+    {
+      os_ << be_nl_2
+          << "void" << be_nl
+          << lname << "_exec_i::configuration_complete (void)"
+          << be_nl
+          << "{" << be_idt_nl
+          << your_code_here_ << be_uidt_nl
+          << "}";
+
+      os_ << be_nl_2
+          << "void" << be_nl
+          << lname << "_exec_i::ccm_activate (void)" << be_nl
+          << "{" << be_idt_nl
+          << your_code_here_ << be_uidt_nl
+          << "}";
+
+      os_ << be_nl_2
+          << "void" << be_nl
+          << lname << "_exec_i::ccm_passivate (void)" << be_nl
+          << "{" << be_idt_nl
+          << your_code_here_ << be_uidt_nl
+          << "}";
+    }
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
       << lname << "_exec_i::ccm_remove (void)" << be_nl
       << "{" << be_idt_nl
@@ -206,7 +343,7 @@ be_visitor_executor_exs::visit_provides (be_provides *node)
   lname_str += node->original_local_name ()->get_string ();
   const char *lname = lname_str.c_str ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << global << sname << "::CCM_"
       << iname << "_ptr" << be_nl
       << node_->local_name () << "_exec_i::get_"
@@ -219,11 +356,11 @@ be_visitor_executor_exs::visit_provides (be_provides *node)
       << "ACE_NEW_RETURN (" << be_idt_nl
       << "tmp," << be_nl
       << lname << "_exec_i (" << be_idt_nl
-      << "this->ciao_context_.in ())," << be_uidt_nl
+      << "this->ciao_context_.in ())," << be_nl
       << global << sname << "::CCM_" << iname << "::_nil ());"
-      << be_uidt_nl << be_nl
-      << "this->ciao_" << port_name << "_ = tmp;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
+      << be_uidt << be_nl_2
+      << "this->ciao_" << port_name << "_ = tmp;" << be_uidt << be_uidt_nl
+      << "}" << be_uidt << be_nl_2
       << "return" << be_idt_nl
       << global << sname << "::CCM_" << iname
       << "::_duplicate (" << be_idt_nl
@@ -240,7 +377,7 @@ be_visitor_executor_exs::visit_consumes (be_consumes *node)
   be_eventtype *obj = node->consumes_type ();
   const char *port_name = node->local_name ()->get_string ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
       << node_->original_local_name () << "_exec_i::push_"
       << port_name << " (" << be_idt_nl
@@ -253,3 +390,22 @@ be_visitor_executor_exs::visit_consumes (be_consumes *node)
   return 0;
 }
 
+// ==================================================
+
+Component_Exec_Attr_Init_Generator::Component_Exec_Attr_Init_Generator (
+      be_visitor_scope * visitor)
+  : visitor_ (visitor)
+{
+}
+
+int
+Component_Exec_Attr_Init_Generator::emit (
+  be_interface * /*derived_interface */,
+  TAO_OutStream * /* os */,
+  be_interface * base_interface)
+{
+  // Even though this call seems unaware of CCM types, the
+  // visitor must inherit from be_visitor_component_scope so
+  // it will pick up attributes via porttypes.
+  return visitor_->visit_scope (base_interface);
+}
diff --git a/TAO_IDL/be/be_visitor_component/executor_exs_attr_init.cpp b/TAO_IDL/be/be_visitor_component/executor_exs_attr_init.cpp
new file mode 100644
index 00000000000..b6a6277fff5
--- /dev/null
+++ b/TAO_IDL/be/be_visitor_component/executor_exs_attr_init.cpp
@@ -0,0 +1,99 @@
+
+//=============================================================================
+/**
+ *  @file    executor_exs_attr_init.cpp
+ *
+ *  $Id$
+ *
+ *  Visitor generating code in the exec impl source for
+ *  the initialization of attribute members in the constructor.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+be_visitor_executor_exs_attr_init::be_visitor_executor_exs_attr_init (
+      be_visitor_context *ctx)
+  : be_visitor_component_scope (ctx),
+    semicolon_generated_ (false)
+{
+}
+
+be_visitor_executor_exs_attr_init::~be_visitor_executor_exs_attr_init (void)
+{
+}
+
+int
+be_visitor_executor_exs_attr_init::visit_attribute (
+  be_attribute *node)
+{
+  AST_Decl::NodeType nt = this->node_->node_type ();
+
+  // Executor attribute code generated for porttype attributes
+  // always in connectors and only for mirrorports in components.
+  if (this->in_ext_port_ && nt == AST_Decl::NT_component)
+    {
+      return 0;
+    }
+
+  os_ << this->ctx_->port_prefix ().c_str ()
+      << node->local_name () << "_ (";
+
+  be_visitor_attr_init nrt_visitor (this->ctx_);
+
+  int status =
+    node->field_type ()->accept (&nrt_visitor);
+
+   if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_executor_exs_attr_init::")
+                         ACE_TEXT ("visit_attribute - ")
+                         ACE_TEXT ("accept with null value ")
+                         ACE_TEXT ("visitor failed\n")),
+                        -1);
+    }
+
+  os_ << ")";
+
+  return 0;
+}
+
+int
+be_visitor_executor_exs_attr_init::pre_process (be_decl *node)
+{
+  AST_Decl::NodeType nt = this->node_->node_type ();
+
+  // Executor attribute code generated for porttype attributes
+  // always in connectors and only for mirrorports in components.
+  if (this->in_ext_port_ && nt == AST_Decl::NT_component)
+    {
+      return 0;
+    }
+
+  if (node->node_type () == AST_Decl::NT_attr)
+    {
+      if (this->semicolon_generated_)
+        {
+          os_ << be_nl
+              << ", ";
+        }
+      else
+        {
+          os_ << be_idt_nl
+              << ": " << be_idt;
+
+          this->semicolon_generated_ = true;
+        }
+    }
+
+  return 0;
+}
+
+bool
+be_visitor_executor_exs_attr_init::attr_generated (void) const
+{
+  return this->semicolon_generated_;
+}
+
diff --git a/TAO_IDL/be/be_visitor_component/executor_private_exh.cpp b/TAO_IDL/be/be_visitor_component/executor_private_exh.cpp
new file mode 100644
index 00000000000..de540aff8a4
--- /dev/null
+++ b/TAO_IDL/be/be_visitor_component/executor_private_exh.cpp
@@ -0,0 +1,74 @@
+
+//=============================================================================
+/**
+ *  @file    executor_private_exh.cpp
+ *
+ *  $Id$
+ *
+ *  Visitor generating code for private facet members
+ *  in the exec impl header.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+be_visitor_executor_private_exh::be_visitor_executor_private_exh (
+      be_visitor_context *ctx)
+  : be_visitor_component_scope (ctx)
+{
+}
+
+be_visitor_executor_private_exh::~be_visitor_executor_private_exh (void)
+{
+}
+
+int
+be_visitor_executor_private_exh::visit_provides (be_provides *node)
+{
+  be_type *impl = node->provides_type ();
+  AST_Decl *i_scope = ScopeAsDecl (impl->defined_in ());
+  bool is_global = (i_scope->node_type () == AST_Decl::NT_root);
+  const char *smart_scope = (is_global ? "" : "::");
+  ACE_CString scope_name =
+    IdentifierHelper::orig_sn (i_scope->name (), false);
+
+  os_ << be_nl
+      << smart_scope << scope_name.c_str () << "::CCM_"
+      << impl->original_local_name () << "_var ciao_"
+      << this->ctx_->port_prefix ().c_str ()
+      << node->original_local_name () << "_;";
+
+  return 0;
+}
+
+int
+be_visitor_executor_private_exh::visit_attribute (be_attribute *node)
+{
+  AST_Decl::NodeType nt = this->node_->node_type ();
+
+  // Executor attribute code generated for porttype attributes
+  // always in connectors and only for mirrorports in components.
+  if (this->in_ext_port_ && nt == AST_Decl::NT_component)
+    {
+      return 0;
+    }
+
+  os_ << be_nl_2;
+
+  be_visitor_member_type_decl v (this->ctx_);
+
+  if (node->field_type ()->accept (&v) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_executor_private_exh::")
+                         ACE_TEXT ("visit_attribute - ")
+                         ACE_TEXT ("accept on field type failed\n")),
+                        -1);
+    }
+
+  os_ << this->ctx_->port_prefix ().c_str ()
+      << node->local_name () << "_;";
+
+  return 0;
+}
diff --git a/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp b/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp
index 3c5b2a7e57c..5ec8c36f277 100644
--- a/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp
+++ b/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp
@@ -12,7 +12,6 @@
  */
 //=============================================================================
 
-
 be_visitor_facet_ex_idl::be_visitor_facet_ex_idl (
       be_visitor_context *ctx)
   : be_visitor_component_scope (ctx)
@@ -49,7 +48,8 @@ be_visitor_facet_ex_idl::visit_provides (be_provides *node)
   be_util::gen_nesting_close (os_, impl);
 
   impl->ex_idl_facet_gen (true);
-  
+
   return 0;
 }
 
+
diff --git a/TAO_IDL/be/be_visitor_component/facet_exh.cpp b/TAO_IDL/be/be_visitor_component/facet_exh.cpp
index 767308e5659..2a2c076e6c7 100644
--- a/TAO_IDL/be/be_visitor_component/facet_exh.cpp
+++ b/TAO_IDL/be/be_visitor_component/facet_exh.cpp
@@ -14,7 +14,9 @@
 
 be_visitor_facet_exh::be_visitor_facet_exh (
       be_visitor_context *ctx)
-  : be_visitor_component_scope (ctx)
+  : be_visitor_component_scope (ctx),
+    comment_start_border_ ("/**"),
+    comment_end_border_ (" */")
 {
   // This is initialized in the base class to svnt_export_macro()
   // or skel_export_macro(), since there are many more visitor
@@ -33,27 +35,29 @@ be_visitor_facet_exh::visit_provides (be_provides *node)
   be_type *impl = node->provides_type ();
   const char *iname =
     impl->original_local_name ()->get_string ();
-  
+
   ACE_CString lname_str (this->ctx_->port_prefix ());
   lname_str += node->original_local_name ()->get_string ();
   const char *lname = lname_str.c_str ();
-  
+
   AST_Decl *s = ScopeAsDecl (impl->defined_in ());
   ACE_CString sname_str =
     IdentifierHelper::orig_sn (s->name (), false);
   const char *sname = sname_str.c_str ();
   const char *global = (sname_str == "" ? "" : "::");
-  
+
   AST_Decl *c_scope = ScopeAsDecl (this->node_->defined_in ());
   bool is_global = (c_scope->node_type () == AST_Decl::NT_root);
   const char *smart_scope = (is_global ? "" : "::");
-      
-  os_ << be_nl << be_nl
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-      
-  os_ << be_nl
-      << "class " << export_macro_.c_str () << " "
+
+  os_ << be_nl_2
+      << comment_start_border_ << be_nl
+      << " * Provider Executor Implementation Class: "
+      << lname << "_exec_i" << be_nl
+      << comment_end_border_;
+
+  os_ << be_nl_2
+      << "class "
       << lname << "_exec_i" << be_idt_nl
       << ": public virtual " << global << sname << "::CCM_"
       << iname << "," << be_idt_nl
@@ -66,32 +70,20 @@ be_visitor_facet_exh::visit_provides (be_provides *node)
       << this->node_->local_name ()
       << "_Context_ptr ctx);" << be_uidt_nl
       << "virtual ~" << lname << "_exec_i (void);";
-   
+
   if (impl->node_type () == AST_Decl::NT_interface)
     {
       be_interface *intf =
         be_interface::narrow_from_decl (impl);
-            
-      os_ << be_nl << be_nl
-          << "// Operations and attributes from ::"
-          << intf->full_name ();
-          
-      be_visitor_context ctx (*this->ctx_);  
-      be_visitor_interface_ih v (&ctx);
-      
-      if (v.visit_scope (intf) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("be_visitor_facet_exh::")
-                             ACE_TEXT ("visit_provides - ")
-                             ACE_TEXT ("visit_scope() ")
-                             ACE_TEXT ("failed\n")),
-                            -1);
-        }
-        
-      int status =
+
+      os_ << be_nl_2
+          << "/** @name Operations and attributes from "
+          << intf->full_name () << " */" << be_nl
+          << "//@{";
+
+      int const status =
         intf->traverse_inheritance_graph (
-          be_visitor_interface_ih::method_helper,
+          be_visitor_facet_exh::method_helper,
           &os_);
 
       if (status == -1)
@@ -103,15 +95,39 @@ be_visitor_facet_exh::visit_provides (be_provides *node)
                              ACE_TEXT ("failed\n")),
                             -1);
         }
+
+      os_ << be_nl << "//@}";
     }
-    
-  os_ << be_uidt_nl << be_nl
+
+  os_ << be_uidt << be_nl_2
       << "private:" << be_idt_nl
       << smart_scope << c_scope->full_name () << "::CCM_"
       << this->node_->local_name ()
       << "_Context_var ciao_context_;" << be_uidt_nl
       << "};";
-      
+
+  return 0;
+}
+
+int
+be_visitor_facet_exh::method_helper (be_interface *derived,
+                                     be_interface *node,
+                                     TAO_OutStream *os)
+{
+  be_visitor_context ctx;
+  ctx.state (TAO_CodeGen::TAO_ROOT_IH);
+  ctx.interface (derived);
+  ctx.stream (os);
+  be_visitor_interface_ih visitor (&ctx);
+
+  if (visitor.visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_facet_exh::method_helper "
+                         "- visit_scope() failed\n"),
+                        -1);
+    }
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_component/facet_exs.cpp b/TAO_IDL/be/be_visitor_component/facet_exs.cpp
index 571fd11ee29..af1165b9a71 100644
--- a/TAO_IDL/be/be_visitor_component/facet_exs.cpp
+++ b/TAO_IDL/be/be_visitor_component/facet_exs.cpp
@@ -16,8 +16,8 @@ be_visitor_facet_exs::be_visitor_facet_exs (
       be_visitor_context *ctx)
   : be_visitor_component_scope (ctx),
     op_scope_ (0),
-    comment_border_ ("//=============================="
-                     "==============================")
+    comment_start_border_ ("/**"),
+    comment_end_border_ (" */")
 {
 }
 
@@ -37,17 +37,28 @@ be_visitor_facet_exs::visit_operation (be_operation *node)
     {
       return 0;
     }
-    
+
   be_visitor_operation_exs v (this->ctx_);
-  v.scope (op_scope_);
+  v.scope (this->op_scope_);
   return v.visit_operation (node);
 }
 
 int
 be_visitor_facet_exs::visit_attribute (be_attribute *node)
 {
-  AST_Decl::NodeType nt =
-    ScopeAsDecl (node->defined_in ())->node_type ();
+  AST_Decl::NodeType nt = this->node_->node_type ();
+
+  // Executor attribute code generated for porttype attributes
+  // always in connectors and only for mirrorports in components.
+  if (this->in_ext_port_ && nt == AST_Decl::NT_component)
+    {
+      return 0;
+    }
+
+  be_decl *attr_scope =
+    be_decl::narrow_from_decl (ScopeAsDecl (node->defined_in ()));
+
+  nt = attr_scope->node_type ();
 
   // Components have implied IDL operations added to the AST, but
   // we are interested only in supported interface operations.
@@ -55,9 +66,9 @@ be_visitor_facet_exs::visit_attribute (be_attribute *node)
     {
       return 0;
     }
-    
+
   be_visitor_attribute v (this->ctx_);
-  v.op_scope (op_scope_);
+  v.op_scope (this->op_scope_);
   return v.visit_attribute (node);
 }
 
@@ -70,21 +81,17 @@ be_visitor_facet_exs::visit_provides (be_provides *node)
   lname_str += node->original_local_name ()->get_string ();
   const char *lname = lname_str.c_str ();
 
-  os_ << be_nl << be_nl
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-      
-  os_ << be_nl
-      << comment_border_ << be_nl
-      << "// Facet Executor Implementation Class: "
+  os_ << be_nl_2
+      << comment_start_border_ << be_nl
+      << " * Facet Executor Implementation Class: "
       << lname << "_exec_i" << be_nl
-      << comment_border_;
+      << comment_end_border_;
 
   AST_Decl *c_scope = ScopeAsDecl (this->node_->defined_in ());
   bool is_global = (c_scope->node_type () == AST_Decl::NT_root);
   const char *smart_scope = (is_global ? "" : "::");
-      
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << lname << "_exec_i::" << lname
       << "_exec_i (" << be_idt << be_idt << be_idt_nl
       << smart_scope << c_scope->full_name () << "::CCM_"
@@ -98,20 +105,20 @@ be_visitor_facet_exs::visit_provides (be_provides *node)
       << "{" << be_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << lname << "_exec_i::~" << lname
       << "_exec_i (void)" << be_nl
       << "{" << be_nl
       << "}";
 
-  op_scope_ = node;
+  this->op_scope_ = node;
 
   if (impl->node_type () == AST_Decl::NT_interface)
     {
       be_interface *intf =
         be_interface::narrow_from_decl (impl);
 
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "// Operations from ::" << intf->full_name ();
 
       /// The overload of traverse_inheritance_graph() used here
@@ -141,4 +148,3 @@ be_visitor_facet_exs::visit_provides (be_provides *node)
 
   return 0;
 }
-
diff --git a/TAO_IDL/be/be_visitor_component/facet_private_exh.cpp b/TAO_IDL/be/be_visitor_component/facet_private_exh.cpp
deleted file mode 100644
index 283da630487..00000000000
--- a/TAO_IDL/be/be_visitor_component/facet_private_exh.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    facet_private_exh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for private facet members
- *  in the exec impl header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-be_visitor_facet_private_exh::be_visitor_facet_private_exh (
-      be_visitor_context *ctx)
-  : be_visitor_component_scope (ctx)
-{
-}
-
-be_visitor_facet_private_exh::~be_visitor_facet_private_exh (void)
-{
-}
-
-int
-be_visitor_facet_private_exh::visit_provides (be_provides *node)
-{
-  be_type *impl = node->provides_type ();
-  AST_Decl *i_scope = ScopeAsDecl (impl->defined_in ());
-  bool is_global = (i_scope->node_type () == AST_Decl::NT_root);
-  const char *smart_scope = (is_global ? "" : "::");
-  ACE_CString scope_name =
-    IdentifierHelper::orig_sn (i_scope->name (), false);
-  
-  os_ << be_nl
-      << smart_scope << scope_name.c_str () << "::CCM_"
-      << impl->original_local_name () << "_var ciao_"
-      << this->ctx_->port_prefix ().c_str ()
-      << node->original_local_name () << "_;";
-  
-  return 0;
-}
-
diff --git a/TAO_IDL/be/be_visitor_component/facet_svh.cpp b/TAO_IDL/be/be_visitor_component/facet_svh.cpp
index 9453829ca70..4f279b95e07 100644
--- a/TAO_IDL/be/be_visitor_component/facet_svh.cpp
+++ b/TAO_IDL/be/be_visitor_component/facet_svh.cpp
@@ -13,7 +13,6 @@
  */
 //=============================================================================
 
-
 be_visitor_facet_svh::be_visitor_facet_svh (be_visitor_context *ctx)
   : be_visitor_component_scope (ctx)
 {
@@ -35,7 +34,7 @@ be_visitor_facet_svh::visit_provides (be_provides *node)
                          ACE_TEXT ("failed\n")),
                         -1);
     }
-                
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_component/facet_svs.cpp b/TAO_IDL/be/be_visitor_component/facet_svs.cpp
index cc7b2d59dc2..c9127923226 100644
--- a/TAO_IDL/be/be_visitor_component/facet_svs.cpp
+++ b/TAO_IDL/be/be_visitor_component/facet_svs.cpp
@@ -34,7 +34,7 @@ be_visitor_facet_svs::visit_provides (be_provides *node)
                          ACE_TEXT ("failed\n")),
                         -1);
     }
-                
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO_IDL/be/be_visitor_component/servant_svh.cpp
index 47193d68f21..24115152589 100644
--- a/TAO_IDL/be/be_visitor_component/servant_svh.cpp
+++ b/TAO_IDL/be/be_visitor_component/servant_svh.cpp
@@ -28,7 +28,6 @@ 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 ());
@@ -41,11 +40,12 @@ be_visitor_servant_svh::visit_component (be_component *node)
 
   const char *global = (sname_str == "" ? "" : "::");
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "class " << export_macro_.c_str () << " " << lname
       << "_Servant" << be_idt_nl
       << ": public virtual" << be_idt << be_idt_nl
-      << "::CIAO::Servant_Impl<" << be_idt_nl
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Servant_Impl<" << be_idt_nl
       << "::" << node_->full_skel_name () << "," << be_nl
       << global << sname << "::CCM_" << lname << "," << be_nl
       << lname << "_Context>"
@@ -63,7 +63,8 @@ be_visitor_servant_svh::visit_component (be_component *node)
       << "::Components::CCMHome_ptr h," << be_nl
       << "const char * ins_name," << be_nl
       << "::CIAO::Home_Servant_Impl_Base *hs," << be_nl
-      << "::CIAO::Container_ptr c);" << be_uidt_nl;
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Container_ptr c);" << be_uidt_nl;
 
   os_ << be_nl
       << "virtual ~" << lname << "_Servant"
@@ -125,6 +126,15 @@ be_visitor_servant_svh::visit_connector (be_connector *node)
 int
 be_visitor_servant_svh::visit_attribute (be_attribute *node)
 {
+  AST_Decl::NodeType nt = this->node_->node_type ();
+
+  // Executor attribute code generated for porttype attributes
+  // always in connectors and only for mirrorports in components.
+  if (this->in_ext_port_ && nt == AST_Decl::NT_component)
+    {
+      return 0;
+    }
+
   this->ctx_->interface (this->node_);
   be_visitor_attribute v (this->ctx_);
   return v.visit_attribute (node);
@@ -154,12 +164,15 @@ be_visitor_servant_svh::visit_provides (be_provides *node)
   os_ << be_uidt_nl << be_nl
       << "private:" << be_idt_nl
       << "void" << be_nl
-      << "setup_" << port_name << "_i (void);"
-      << be_uidt_nl << be_nl;
+      << "setup_" << port_name << "_i (void);";
 
-  os_ << "private:" << be_idt_nl
-      << "::" << obj_name << "_var" << be_nl
-      << "provide_" << port_name << "_;";
+  if (!be_global->gen_lwccm ())
+     {
+      os_ << be_uidt_nl << be_nl
+          << "private:" << be_idt_nl
+          << "::" << obj_name << "_var" << be_nl
+          << "provide_" << port_name << "_;";
+     }
 
   return 0;
 }
@@ -167,7 +180,7 @@ be_visitor_servant_svh::visit_provides (be_provides *node)
 int
 be_visitor_servant_svh::visit_uses (be_uses *node)
 {
-  if (node->uses_type ()->is_local ())
+  if (node->uses_type ()->is_local () || be_global->gen_lwccm ())
     {
       return 0;
     }
@@ -194,13 +207,13 @@ be_visitor_servant_svh::visit_uses (be_uses *node)
           << "get_connection_" << port_name << " (void);";
     }
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "virtual "
       << (is_multiple ? "::Components::Cookie *" : "void")
       << be_nl
-      << "connect_" << port_name << " (" 
+      << "connect_" << port_name << " ("
       << "::" << obj_name << "_ptr);"
-      << be_nl << be_nl;
+      << be_nl_2;
 
   os_ << "virtual ::" << obj_name << "_ptr" << be_nl
       << "disconnect_" << port_name << " (";
@@ -220,142 +233,151 @@ be_visitor_servant_svh::visit_uses (be_uses *node)
 int
 be_visitor_servant_svh::visit_publishes (be_publishes *node)
 {
-  const char *obj_name = node->publishes_type ()->full_name ();
-  const char *port_name = node->local_name ()->get_string ();
-
-  os_ << be_uidt_nl << be_nl
-      << "public:" << be_idt_nl;
+  if(!be_global->gen_noeventccm () && !be_global->gen_lwccm ())
+    {
+      const char *obj_name = node->publishes_type ()->full_name ();
+      const char *port_name = node->local_name ()->get_string ();
 
-  os_ << "virtual ::Components::Cookie *" << be_nl
-      << "subscribe_" << port_name << " (" << be_idt_nl
-      << "::" << obj_name << "Consumer_ptr c);" << be_uidt_nl;
+      os_ << be_uidt_nl << be_nl
+          << "public:" << be_idt_nl;
 
-  os_ << be_nl
-      << "virtual ::" << obj_name << "Consumer_ptr" << be_nl
-      << "unsubscribe_" << port_name << " (" << be_idt_nl
-      << "::Components::Cookie * ck);" << be_uidt;
+      os_ << "virtual ::Components::Cookie *" << be_nl
+          << "subscribe_" << port_name << " (" << be_idt_nl
+          << "::" << obj_name << "Consumer_ptr c);" << be_uidt_nl;
 
+      os_ << be_nl
+          << "virtual ::" << obj_name << "Consumer_ptr" << be_nl
+          << "unsubscribe_" << port_name << " (" << be_idt_nl
+          << "::Components::Cookie * ck);" << be_uidt;
+    }
   return 0;
 }
 
 int
 be_visitor_servant_svh::visit_emits (be_emits *node)
 {
-  const char *obj_name = node->emits_type ()->full_name ();
-  const char *port_name = node->local_name ()->get_string ();
-
-  os_ << be_nl << be_nl
-      << "virtual void" << be_nl
-      << "connect_" << port_name << " (" << be_idt_nl
-      << "::" << obj_name << "Consumer_ptr c);" << be_uidt;
+   if(!be_global->gen_noeventccm () && !be_global->gen_lwccm ())
+    {
+      const char *obj_name = node->emits_type ()->full_name ();
+      const char *port_name = node->local_name ()->get_string ();
 
-  os_ << be_nl << be_nl
-      << "virtual ::" << obj_name << "Consumer_ptr" << be_nl
-      << "disconnect_" << port_name << " (void);";
+      os_ << be_nl_2
+          << "virtual void" << be_nl
+          << "connect_" << port_name << " (" << be_idt_nl
+          << "::" << obj_name << "Consumer_ptr c);" << be_uidt;
 
+      os_ << be_nl_2
+          << "virtual ::" << obj_name << "Consumer_ptr" << be_nl
+          << "disconnect_" << port_name << " (void);";
+    }
   return 0;
 }
 
 int
 be_visitor_servant_svh::visit_consumes (be_consumes *node)
 {
-  const char *obj_name = node->consumes_type ()->full_name ();
-  const char *port_name = node->local_name ()->get_string ();
-
-  ACE_CString holder (obj_name);
-  ACE_CString::size_type pos = holder.rfind (':');
-  const char *ev_lname = 0;
-
-  if (pos == ACE_CString::npos)
-    {
-      ev_lname = obj_name;
-    }
-  else
+  if(!be_global->gen_noeventccm ())
     {
-      holder = holder.substr (pos + 1);
-      ev_lname = holder.c_str ();
-    }
-
-  os_ << be_uidt_nl << be_nl
-      << "public:" << be_idt_nl;
+      const char *obj_name = node->consumes_type ()->full_name ();
+      const char *port_name = node->local_name ()->get_string ();
 
-  os_ << "// Servant class for the " << port_name
-      << " consumer." << be_nl
-      << "class " << export_macro_.c_str () << " " << ev_lname
-      << "Consumer_" << port_name << "_Servant" << be_idt_nl
-      << ": public virtual ::POA_" << obj_name << "Consumer"
-      << be_uidt_nl
-      << "{" << be_nl
-      << "public:" << be_idt_nl;
+      ACE_CString holder (obj_name);
+      ACE_CString::size_type pos = holder.rfind (':');
+      const char *ev_lname = 0;
 
-  ACE_CString sname_str (
-    ScopeAsDecl (node_->defined_in ())->full_name ());
-  const char *sname = sname_str.c_str ();
-  const char *lname = node_->local_name ();
-  const char *global = (sname_str == "" ? "" : "::");
-
-  os_ << ev_lname << "Consumer_" << port_name
-      << "_Servant (" << be_idt_nl
-      << global << sname << "::CCM_" << lname
-      << "_ptr executor," << be_nl
-      << global << sname << "::CCM_" << lname
-      << "_Context_ptr c);" << be_uidt_nl << be_nl;
-
-  os_ << "virtual ~" << ev_lname << "Consumer_" << port_name
-      << "_Servant (void);";
-
-  os_ << be_nl << be_nl
-      << "virtual void" << be_nl
-      << "push_" << ev_lname << " (" << be_idt_nl
-      << "::" << obj_name << " * evt);" << be_uidt;
+      if (pos == ACE_CString::npos)
+        {
+          ev_lname = obj_name;
+        }
+      else
+        {
+          holder = holder.substr (pos + 1);
+          ev_lname = holder.c_str ();
+        }
 
-  os_ << be_nl << be_nl
-      << "// Inherited from ::Components::EventConsumerBase." << be_nl
-      << "virtual void" << be_nl
-      << "push_event ( ::Components::EventBase * ev);";
+      os_ << be_uidt_nl << be_nl
+          << "public:" << be_idt_nl;
+
+      os_ << "// Servant class for the " << port_name
+          << " consumer." << be_nl
+          << "class " << export_macro_.c_str () << " " << ev_lname
+          << "Consumer_" << port_name << "_Servant" << be_idt_nl
+          << ": public virtual ::POA_" << obj_name << "Consumer"
+          << be_uidt_nl
+          << "{" << be_nl
+          << "public:" << be_idt_nl;
+
+      ACE_CString sname_str (
+        ScopeAsDecl (node_->defined_in ())->full_name ());
+      const char *sname = sname_str.c_str ();
+      const char *lname = node_->local_name ();
+      const char *global = (sname_str == "" ? "" : "::");
+
+      os_ << ev_lname << "Consumer_" << port_name
+          << "_Servant (" << be_idt_nl
+          << global << sname << "::CCM_" << lname
+          << "_ptr executor," << be_nl
+          << global << sname << "::CCM_" << lname
+          << "_Context_ptr c);" << be_uidt_nl << be_nl;
+
+      os_ << "virtual ~" << ev_lname << "Consumer_" << port_name
+          << "_Servant (void);";
+
+      os_ << be_nl_2
+          << "virtual void" << be_nl
+          << "push_" << ev_lname << " (" << be_idt_nl
+          << "::" << obj_name << " * evt);" << be_uidt;
 
-  os_ << be_nl << be_nl
-      << "// Get component implementation." << be_nl
-      << "virtual ::CORBA::Object_ptr" << be_nl
-      << "_get_component (void);";
+      os_ << be_nl_2
+          << "/// Inherited from ::Components::EventConsumerBase." << be_nl
+          << "virtual void" << be_nl
+          << "push_event ( ::Components::EventBase * ev);";
 
-  os_ << be_uidt_nl << be_nl
-      << "protected:" << be_idt_nl;
+      os_ << be_nl_2
+          << "/// Get component implementation." << be_nl
+          << "virtual ::CORBA::Object_ptr" << be_nl
+          << "_get_component (void);";
 
-  os_ << global << sname << "::CCM_" << lname << "_var" << be_nl
-      << "executor_;";
+      os_ << be_uidt_nl << be_nl
+          << "protected:" << be_idt_nl;
 
-  os_ << be_nl << be_nl
-      << global << sname << "::CCM_"
-      << lname << "_Context_var" << be_nl
-      << "ctx_;";
+      os_ << global << sname << "::CCM_" << lname << "_var" << be_nl
+          << "executor_;";
 
-  os_ << be_uidt_nl
-      << "};";
+      os_ << be_nl_2
+          << global << sname << "::CCM_"
+          << lname << "_Context_var" << be_nl
+          << "ctx_;";
 
-  os_ << be_nl << be_nl
-      << "virtual ::" << obj_name << "Consumer_ptr" << be_nl
-      << "get_consumer_" << port_name << " (void);";
+      os_ << be_uidt_nl
+          << "};";
 
-  os_ << be_uidt_nl << be_nl
-      << "private:" << be_idt_nl;
+      if (!be_global->gen_lwccm ())
+        {
+          os_ << be_nl_2
+              << "virtual ::" << obj_name << "Consumer_ptr" << be_nl
+              << "get_consumer_" << port_name << " (void);";
+        }
 
-  os_ << "void" << be_nl
-      << "setup_consumer_" << port_name << "_i (void);";
+      os_ << be_uidt_nl << be_nl
+          << "private:" << be_idt_nl;
 
-  os_ << be_uidt_nl << be_nl
-      << "private:" << be_idt_nl;
+      os_ << "void" << be_nl
+          << "setup_consumer_" << port_name << "_i (void);";
 
-  os_ << "::" << obj_name << "Consumer_var" << be_nl
-      << "consumes_" << port_name << "_;";
+      os_ << be_uidt_nl << be_nl
+          << "private:" << be_idt_nl;
 
+      os_ << "::" << obj_name << "Consumer_var" << be_nl
+          << "consumes_" << port_name << "_;";
+    }
   return 0;
 }
 
 void
 be_visitor_servant_svh::gen_non_type_specific (void)
 {
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "// Base class overrides."
       << be_uidt_nl << be_nl
       << "public:" << be_idt;
@@ -366,49 +388,56 @@ be_visitor_servant_svh::gen_non_type_specific (void)
           << "virtual ::Components::Cookie *" << be_nl
           << "connect (const char * name, ::CORBA::Object_ptr connection);";
 
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "virtual ::CORBA::Object_ptr " << be_nl
           << "disconnect (const char * name, ::Components::Cookie * ck);";
     }
-    
-  if (!be_global->gen_lwccm ())
+
+  if (!be_global->gen_lwccm () && this->node_->n_uses () != 0)
     {
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "virtual ::Components::ReceptacleDescriptions *"
           << be_nl
           << "get_all_receptacles (void);";
     }
-    
+
   AST_Decl::NodeType nt = this->node_->node_type ();
   bool is_connector = (nt == AST_Decl::NT_connector);
 
-  if (!be_global->gen_lwccm () && !is_connector)
+  if (!be_global->gen_lwccm () && !is_connector &&
+      !be_global->gen_noeventccm ())
     {
-      os_ << be_nl << be_nl
-          << "virtual ::Components::PublisherDescriptions *"
-          << be_nl
-          << "get_all_publishers (void);";
+      if (this->node_->n_publishes () != 0UL)
+        {
+          os_ << be_nl_2
+              << "virtual ::Components::PublisherDescriptions *"
+              << be_nl
+              << "get_all_publishers (void);";
+        }
 
-      os_ << be_nl << be_nl
-          << "virtual ::Components::EmitterDescriptions *"
-          << be_nl
-          << "get_all_emitters (void);";
+      if (this->node_->n_emits () != 0UL)
+        {
+          os_ << be_nl_2
+              << "virtual ::Components::EmitterDescriptions *"
+              << be_nl
+              << "get_all_emitters (void);";
+        }
     }
 
-  /// If the node is a connector, event sources and sinks cannot
-  /// be declared.
-  if (!is_connector)
+  /// If the node is a connector or the events must be disabled, event sources
+  /// and sinks cannot be declared.
+  if ((!is_connector) || (!be_global->gen_noeventccm ()))
     {
       if (this->node_->n_publishes () > 0UL)
         {
-          os_ << be_nl << be_nl
+          os_ << be_nl_2
               << "virtual ::Components::Cookie *" << be_nl
               << "subscribe (const char * publisher_name,"
               << be_nl
               << "           ::Components::"
               << "EventConsumerBase_ptr subscriber);";
 
-          os_ << be_nl << be_nl
+          os_ << be_nl_2
               << "virtual ::Components::EventConsumerBase_ptr"
               << be_nl
               << "unsubscribe (const char * publisher_name,"
@@ -418,14 +447,14 @@ be_visitor_servant_svh::gen_non_type_specific (void)
 
       if (this->node_->n_emits () > 0UL)
         {
-          os_ << be_nl << be_nl
+          os_ << be_nl_2
               << "virtual void" << be_nl
               << "connect_consumer (const char * emitter_name,"
               << be_nl
               << "                  ::Components::"
               << "EventConsumerBase_ptr consumer);";
 
-          os_ << be_nl << be_nl
+          os_ << be_nl_2
               << "virtual ::Components::EventConsumerBase_ptr"
               << be_nl
               << "disconnect_consumer (const char * source_name);";
@@ -434,7 +463,7 @@ be_visitor_servant_svh::gen_non_type_specific (void)
 
   if (this->node_->n_provides () > 0UL)
     {
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "/// CIAO-specific." << be_nl
           << "::CORBA::Object_ptr" << be_nl
           << "get_facet_executor (const char * name);";
diff --git a/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO_IDL/be/be_visitor_component/servant_svs.cpp
index 07c853fdbd4..cd9943a1671 100644
--- a/TAO_IDL/be/be_visitor_component/servant_svs.cpp
+++ b/TAO_IDL/be/be_visitor_component/servant_svs.cpp
@@ -29,7 +29,6 @@ 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;
 
   AST_Decl *scope = ScopeAsDecl (node_->defined_in ());
@@ -55,7 +54,7 @@ be_visitor_servant_svs::visit_component (be_component *node)
   const char *opt_conn =
     (de_facto ? "Connector_" : "");
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << lname << "_Servant::"
       << lname << "_Servant (" << be_idt << be_idt << be_idt_nl
       << global << sname << "::CCM_" << lname
@@ -63,10 +62,12 @@ be_visitor_servant_svs::visit_component (be_component *node)
       << "::Components::CCMHome_ptr h," << be_nl
       << "const char * ins_name," << be_nl
       << "::CIAO::Home_Servant_Impl_Base * hs," << be_nl
-      << "::CIAO::Container_ptr c)" << be_uidt << be_uidt_nl
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Container_ptr c)" << be_uidt << be_uidt_nl
       << ": ::CIAO::" << opt_conn
       << "Servant_Impl_Base (h, hs, c)," << be_idt_nl
-      << "::CIAO::Servant_Impl<" << be_idt_nl
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Servant_Impl<" << be_idt_nl
       << "::" << node_->full_skel_name ()
       << "," << be_nl
       << global << sname << "::CCM_"
@@ -92,7 +93,7 @@ be_visitor_servant_svs::visit_component (be_component *node)
       || this->node_->n_consumes () > 0UL)
     {
       be_visitor_populate_port_tables ppt_visitor (this->ctx_);
-      
+
       if (ppt_visitor.visit_component_scope (node) == -1)
       {
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -105,7 +106,7 @@ be_visitor_servant_svs::visit_component (be_component *node)
 
   os_ << be_uidt_nl << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << lname << "_Servant::~"
       << lname << "_Servant (void)" << be_nl
       << "{" << be_nl
@@ -113,7 +114,7 @@ be_visitor_servant_svs::visit_component (be_component *node)
 
   if (this->node_->has_rw_attributes ())
     {
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "void" << be_nl
           << lname << "_Servant::set_attributes (" << be_idt_nl
           << "const ::Components::ConfigValues & descr)"
@@ -128,7 +129,7 @@ be_visitor_servant_svs::visit_component (be_component *node)
           << "::CORBA::Any & descr_value = descr[i]->value ();";
 
       be_visitor_attr_set as_visitor (this->ctx_);
-      
+
       /// This will get assigned to the visitor's interface_
       /// member later so it can catch and skip porttype
       /// attributes in a component.
@@ -148,7 +149,7 @@ be_visitor_servant_svs::visit_component (be_component *node)
           << "}";
     }
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "/// Supported operations and attributes.";
 
   this->op_scope_ = node;
@@ -166,7 +167,7 @@ be_visitor_servant_svs::visit_component (be_component *node)
                                              &os_,
                                              false,
                                              false);
- 
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -176,7 +177,7 @@ be_visitor_servant_svs::visit_component (be_component *node)
                         -1);
     }
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "/// All ports and component attributes.";
 
   /// Port operations that require scope traversal to get all the
@@ -234,6 +235,15 @@ be_visitor_servant_svs::visit_operation (be_operation *node)
 int
 be_visitor_servant_svs::visit_attribute (be_attribute *node)
 {
+  AST_Decl::NodeType nt = this->node_->node_type ();
+
+  // Executor attribute code generated for porttype attributes
+  // always in connectors and only for mirrorports in components.
+  if (this->in_ext_port_ && nt == AST_Decl::NT_component)
+    {
+      return 0;
+    }
+
   this->ctx_->interface (this->node_);
   be_visitor_attribute v (this->ctx_);
 
@@ -270,7 +280,7 @@ be_visitor_servant_svs::visit_provides (be_provides *node)
 
   if (!be_global->gen_lwccm ())
     {
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "::" << obj_name << "_ptr" << be_nl
           << node_->local_name () << "_Servant::provide_"
           << port_name << " (void)" << be_nl
@@ -282,7 +292,7 @@ be_visitor_servant_svs::visit_provides (be_provides *node)
           << "}";
     }
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
       << node_->local_name () << "_Servant::setup_"
       << port_name << "_i (void)" << be_nl
@@ -298,7 +308,7 @@ be_visitor_servant_svs::visit_provides (be_provides *node)
       << "MACRO_MADNESS_TYPEDEF;" << be_uidt_nl << be_nl
       << "MACRO_MADNESS_TYPEDEF * tmp = 0;" << be_nl
       << "ACE_CString obj_id (this->ins_name_);" << be_nl
-      << "obj_id += \"_" << port_name << "\";" << be_nl << be_nl
+      << "obj_id += \"_" << port_name << "\";" << be_nl_2
       << "ACE_NEW_THROW_EX (" << be_idt_nl
       << "tmp," << be_nl
       << "MACRO_MADNESS_TYPEDEF (" << be_idt_nl
@@ -309,11 +319,11 @@ be_visitor_servant_svs::visit_provides (be_provides *node)
       << "this->context_," << be_nl
       << "this)," << be_uidt_nl
       << "::CORBA::NO_MEMORY ());" << be_uidt_nl << be_nl
-      << "::CIAO::Port_Activator_var pa = tmp;" << be_nl << be_nl
+      << "::CIAO::Port_Activator_var pa = tmp;" << be_nl_2
       << "::CIAO::Servant_Activator_var sa =" << be_idt_nl
       << "this->container_->ports_servant_activator ();"
       << be_uidt_nl << be_nl
-      << "if (sa->register_port_activator (pa._retn ()))"
+      << "if (sa->register_port_activator (pa.in ()))"
       << be_idt_nl
       << "{" << be_idt_nl
       << "::CORBA::Object_var obj =" << be_idt_nl
@@ -324,7 +334,7 @@ be_visitor_servant_svs::visit_provides (be_provides *node)
       << be_uidt_nl << be_uidt_nl
       << "this->add_facet (\"" << port_name << "\", obj.in ());"
       << be_uidt_nl
-      << "}" << be_uidt_nl
+      << "}" << be_uidt << be_uidt_nl
       << "}";
 
   return 0;
@@ -333,7 +343,7 @@ be_visitor_servant_svs::visit_provides (be_provides *node)
 int
 be_visitor_servant_svs::visit_uses (be_uses *node)
 {
-  if (node->uses_type ()->is_local ())
+  if (node->uses_type ()->is_local () || be_global->gen_lwccm ())
     {
       return 0;
     }
@@ -345,7 +355,7 @@ be_visitor_servant_svs::visit_uses (be_uses *node)
   const char *obj_name = node->uses_type ()->full_name ();
   bool const is_multiple = node->is_multiple ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << (is_multiple ? "::Components::Cookie *" : "void")
       << be_nl
       << node_->local_name () << "_Servant::connect_"
@@ -362,7 +372,7 @@ be_visitor_servant_svs::visit_uses (be_uses *node)
       << " (c);" << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::" << obj_name << "_ptr" << be_nl
       << node_->local_name () << "_Servant::disconnect_"
       << port_name << " (";
@@ -384,7 +394,7 @@ be_visitor_servant_svs::visit_uses (be_uses *node)
       << ");" << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::";
 
   if (is_multiple)
@@ -413,10 +423,15 @@ be_visitor_servant_svs::visit_uses (be_uses *node)
 int
 be_visitor_servant_svs::visit_publishes (be_publishes *node)
 {
+  if (be_global->gen_lwccm ())
+    {
+      return 0;
+    }
+
   const char *obj_name = node->publishes_type ()->full_name ();
   const char *port_name = node->local_name ()->get_string ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::Components::Cookie *" << be_nl
       << node_->local_name () << "_Servant::subscribe_"
       << port_name << " (" << be_idt_nl
@@ -427,7 +442,7 @@ be_visitor_servant_svs::visit_publishes (be_publishes *node)
       << " (c);" << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::" << obj_name << "Consumer_ptr" << be_nl
       << node_->local_name () << "_Servant::unsubscribe_"
       << port_name << " (" << be_idt_nl
@@ -444,10 +459,15 @@ be_visitor_servant_svs::visit_publishes (be_publishes *node)
 int
 be_visitor_servant_svs::visit_emits (be_emits *node)
 {
+  if (be_global->gen_lwccm ())
+    {
+      return 0;
+    }
+
   const char *obj_name = node->emits_type ()->full_name ();
   const char *port_name = node->local_name ()->get_string ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
       << node_->local_name () << "_Servant::connect_"
       << port_name << " (" << be_idt_nl
@@ -457,7 +477,7 @@ be_visitor_servant_svs::visit_emits (be_emits *node)
       << " (c);" << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::" << obj_name << "Consumer_ptr" << be_nl
       << node_->local_name () << "_Servant::disconnect_"
       << port_name << " (void)" << be_nl
@@ -484,7 +504,7 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node)
   const char *lname = obj->local_name ()->get_string ();
   const char *fname = obj->full_name ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << comp_lname << "_Servant::" << lname << "Consumer_"
       << port_name << "_Servant::" << lname << "Consumer_"
       << port_name << "_Servant (" << be_idt << be_idt_nl
@@ -500,22 +520,31 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node)
       << "{" << be_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << comp_lname << "_Servant::" << lname << "Consumer_"
       << port_name << "_Servant::~" << lname << "Consumer_"
       << port_name << "_Servant (void)" << be_nl
       << "{" << be_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::CORBA::Object_ptr" << be_nl
       << comp_lname << "_Servant::" << lname << "Consumer_"
       << port_name << "_Servant::_get_component (void)" << be_nl
-      << "{" << be_idt_nl
-      << "return this->ctx_->get_CCM_object ();" << be_uidt_nl
-      << "}";
+      << "{" << be_idt_nl;
 
-  os_ << be_nl << be_nl
+  if (ACE_OS::strcmp (be_global->ciao_container_type (), "Session") == 0)
+    {
+      os_ << "return this->ctx_->get_CCM_object ();";
+    }
+  else
+    {
+      os_ << "return ::CORBA::Object::_nil ();";
+    }
+
+  os_ << be_uidt_nl << "}";
+
+  os_ << be_nl_2
       << "void" << be_nl
       << comp_lname << "_Servant::" << lname << "Consumer_"
       << port_name << "_Servant::push_" << lname
@@ -526,7 +555,7 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node)
       << " (evt);" << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "/// Inherited from ::Components::EventConsumerBase."
       << be_nl
       << "void" << be_nl
@@ -545,18 +574,21 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node)
       << "throw ::Components::BadEventType ();" << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
-      << "::" << fname << "Consumer_ptr" << be_nl
-      << node_->local_name () << "_Servant::get_consumer_"
-      << port_name << " (void)" << be_nl
-      << "{" << be_idt_nl
-      << "return" << be_idt_nl
-      << "::" << fname << "Consumer::_duplicate (" << be_idt_nl
-      << "this->consumes_" << port_name << "_.in ());"
-      << be_uidt << be_uidt << be_uidt_nl
-      << "}";
+  if (!be_global->gen_lwccm ())
+    {
+      os_ << be_nl_2
+          << "::" << fname << "Consumer_ptr" << be_nl
+          << node_->local_name () << "_Servant::get_consumer_"
+          << port_name << " (void)" << be_nl
+          << "{" << be_idt_nl
+          << "return" << be_idt_nl
+          << "::" << fname << "Consumer::_duplicate (" << be_idt_nl
+          << "this->consumes_" << port_name << "_.in ());"
+          << be_uidt << be_uidt << be_uidt_nl
+          << "}";
+    }
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
       << node_->local_name () << "_Servant::setup_consumer_"
       << port_name << "_i (void)" << be_nl
@@ -573,7 +605,7 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node)
       << "MACRO_MADNESS_TYPEDEF;" << be_uidt_nl << be_nl
       << "MACRO_MADNESS_TYPEDEF * tmp = 0;" << be_nl
       << "ACE_CString obj_id (this->ins_name_);" << be_nl
-      << "obj_id += \"_" << port_name << "\";" << be_nl << be_nl
+      << "obj_id += \"_" << port_name << "\";" << be_nl_2
       << "ACE_NEW_THROW_EX (" << be_idt_nl
       << "tmp," << be_nl
       << "MACRO_MADNESS_TYPEDEF (" << be_idt_nl
@@ -584,11 +616,11 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node)
       << "this->context_," << be_nl
       << "this)," << be_uidt_nl
       << "::CORBA::NO_MEMORY ());" << be_uidt_nl << be_nl
-      << "::CIAO::Port_Activator_var pa = tmp;" << be_nl << be_nl
+      << "::CIAO::Port_Activator_var pa = tmp;" << be_nl_2
       << "::CIAO::Servant_Activator_var sa =" << be_idt_nl
       << "this->container_->ports_servant_activator ();"
       << be_uidt_nl << be_nl
-      << "if (sa->register_port_activator (pa._retn ()))"
+      << "if (sa->register_port_activator (pa.in ()))"
       << be_idt_nl
       << "{" << be_idt_nl
       << "::CORBA::Object_var obj =" << be_idt_nl
@@ -610,7 +642,7 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node)
       << be_uidt_nl << be_nl
       << "this->add_consumer (\"" << port_name << "\", ecb.in ());"
       << be_uidt_nl
-      << "}" << be_uidt_nl
+      << "}" << be_uidt_nl << be_uidt_nl
       << "}";
 
   return 0;
@@ -624,7 +656,12 @@ be_visitor_servant_svs::gen_provides_top (void)
       return;
     }
 
-  os_ << be_nl << be_nl
+  ACE_CString comp_sname_str (
+    ScopeAsDecl (node_->defined_in ())->full_name ());
+  const char *global = (comp_sname_str == "" ? "" : "::");
+  ACE_CString sname_str (ScopeAsDecl (node_->defined_in ())->full_name ());
+
+  os_ << be_nl_2
       << "/// CIAO-specific." << be_nl
       << "::CORBA::Object_ptr" << be_nl
       << node_->local_name ()
@@ -635,6 +672,17 @@ be_visitor_servant_svs::gen_provides_top (void)
   os_ << "if (name == 0)" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
+      << "}" << be_uidt << be_nl_2;
+
+  os_ << "::" << sname_str << global << "CCM_" << node_->original_local_name ()
+      << "_var executor = " << be_idt_nl
+      << "::" << sname_str << global << "CCM_" << node_->original_local_name ()
+      << "::_duplicate (this->executor_.in ());" << be_uidt << be_nl_2;
+
+  os_ << "if ( ::CORBA::is_nil (executor.in ()))"
+      << be_idt_nl
+      << "{"<< be_idt_nl
+      << "throw ::CORBA::INV_OBJREF ();" << be_uidt_nl
       << "}" << be_uidt;
 
   be_visitor_facet_executor_block feb_visitor (this->ctx_);
@@ -649,7 +697,7 @@ be_visitor_servant_svs::gen_provides_top (void)
       return;
     }
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "throw ::Components::InvalidName ();" << be_uidt_nl
       << "}";
 }
@@ -661,7 +709,7 @@ be_visitor_servant_svs::gen_publishes_top (void)
 
   if (npubs > 0UL)
     {
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "::Components::Cookie *" << be_nl
           << node_->local_name () << "_Servant::subscribe ("
           << be_idt_nl
@@ -687,11 +735,11 @@ be_visitor_servant_svs::gen_publishes_top (void)
           return;
         }
 
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "throw ::Components::InvalidName ();" << be_uidt_nl
           << "}";
 
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "::Components::EventConsumerBase_ptr" << be_nl
           << node_->local_name () << "_Servant::unsubscribe ("
           << be_idt_nl
@@ -716,24 +764,24 @@ be_visitor_servant_svs::gen_publishes_top (void)
           return;
         }
 
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "throw ::Components::InvalidName ();" << be_uidt_nl
           << "}";
     }
-    
-  if (!be_global->gen_lwccm ())
+
+  if (!be_global->gen_lwccm () && !be_global->gen_noeventccm () && this->node_->n_publishes () != 0)
     {
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "::Components::PublisherDescriptions *" << be_nl
           << node_->local_name ()
           << "_Servant::get_all_publishers (void)" << be_nl
           << "{" << be_idt_nl
           << "::Components::PublisherDescriptions *retval = 0;"
           << be_nl
-          << "ACE_NEW_RETURN (retval," << be_nl
-          << "                ::Components::PublisherDescriptions,"
+          << "ACE_NEW_THROW_EX (retval," << be_nl
+          << "                  ::Components::PublisherDescriptions,"
           << be_nl
-          << "                0);" << be_nl << be_nl
+          << "                  ::CORBA::NO_MEMORY ());" << be_nl_2
           << "::Components::PublisherDescriptions_var "
           << "safe_retval = retval;" << be_nl
           << "safe_retval->length (" << this->node_->n_publishes ()
@@ -755,7 +803,7 @@ be_visitor_servant_svs::gen_publishes_top (void)
             }
         }
 
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "return safe_retval._retn ();" << be_uidt_nl
           << "}";
     }
@@ -765,10 +813,10 @@ void
 be_visitor_servant_svs::gen_uses_top (void)
 {
   ACE_CDR::ULong nuses = this->node_->n_uses ();
-    
+
   if (nuses > 0UL)
-    {  
-      os_ << be_nl << be_nl
+    {
+      os_ << be_nl_2
           << "::Components::Cookie *" << be_nl
           << node_->local_name () << "_Servant::connect ("
           << be_idt_nl
@@ -793,11 +841,11 @@ be_visitor_servant_svs::gen_uses_top (void)
           return;
         }
 
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "throw ::Components::InvalidName ();" << be_uidt_nl
           << "}";
 
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "::CORBA::Object_ptr" << be_nl
           << node_->local_name () << "_Servant::disconnect ("
           << be_idt_nl
@@ -823,24 +871,24 @@ be_visitor_servant_svs::gen_uses_top (void)
           return;
         }
 
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "throw ::Components::InvalidName ();" << be_uidt_nl
           << "}";
     } // nuses > 0UL
 
-  if (!be_global->gen_lwccm ())
+  if (!be_global->gen_lwccm () && nuses > 0)
     {
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "::Components::ReceptacleDescriptions *" << be_nl
           << node_->local_name ()
           << "_Servant::get_all_receptacles (void)" << be_nl
           << "{" << be_idt_nl
           << "::Components::ReceptacleDescriptions * retval = 0;"
           << be_nl
-          << "ACE_NEW_RETURN (retval," << be_nl
-          << "                ::Components::ReceptacleDescriptions,"
+          << "ACE_NEW_THROW_EX (retval," << be_nl
+          << "                  ::Components::ReceptacleDescriptions,"
           << be_nl
-          << "                0);" << be_nl
+          << "                  ::CORBA::NO_MEMORY ());" << be_nl_2
           << "::Components::ReceptacleDescriptions_var "
           << "safe_retval = retval;" << be_nl
           << "safe_retval->length (" << nuses
@@ -848,7 +896,7 @@ be_visitor_servant_svs::gen_uses_top (void)
 
       if (nuses > 0UL)
         {
-          be_visitor_receptacle_desc rd_visitor (this->ctx_);
+          be_visitor_receptacle_desc rd_visitor (this->ctx_, this->node_);
 
           if (rd_visitor.visit_component_scope (node_) == -1)
             {
@@ -862,7 +910,7 @@ be_visitor_servant_svs::gen_uses_top (void)
             }
         }
 
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "return safe_retval._retn ();" << be_uidt_nl
           << "}";
     }
@@ -884,7 +932,7 @@ be_visitor_servant_svs::gen_emits_top (void)
       return;
     }
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
       << node_->local_name () << "_Servant::connect_consumer ("
       << be_idt_nl
@@ -910,11 +958,11 @@ be_visitor_servant_svs::gen_emits_top (void)
       return;
     }
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "throw ::Components::InvalidName ();" << be_uidt_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::Components::EventConsumerBase_ptr" << be_nl
       << node_->local_name ()
       << "_Servant::disconnect_consumer (" << be_idt_nl
@@ -938,7 +986,7 @@ be_visitor_servant_svs::gen_emits_top (void)
       return;
     }
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "throw ::Components::InvalidName ();" << be_uidt_nl
       << "}";
 }
@@ -946,22 +994,22 @@ be_visitor_servant_svs::gen_emits_top (void)
 void
 be_visitor_servant_svs::gen_get_all_emitters (void)
 {
-  if (be_global->gen_lwccm ())
+  if (be_global->gen_lwccm () || be_global->gen_noeventccm () || this->node_->n_emits () == 0UL)
     {
       return;
     }
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::Components::EmitterDescriptions *" << be_nl
       << node_->local_name ()
       << "_Servant::get_all_emitters (void)" << be_nl
       << "{" << be_idt_nl
       << "::Components::EmitterDescriptions *retval = 0;"
       << be_nl
-      << "ACE_NEW_RETURN (retval," << be_nl
-      << "                ::Components::EmitterDescriptions,"
+      << "ACE_NEW_THROW_EX (retval," << be_nl
+      << "                  ::Components::EmitterDescriptions,"
       << be_nl
-      << "                0);" << be_nl << be_nl
+      << "                  ::CORBA::NO_MEMORY ());" << be_nl_2
       << "::Components::EmitterDescriptions_var "
       << "safe_retval = retval;" << be_nl
       << "safe_retval->length (" << this->node_->n_emits ()
@@ -979,7 +1027,7 @@ be_visitor_servant_svs::gen_get_all_emitters (void)
       return;
     }
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "return safe_retval._retn ();" << be_uidt_nl
       << "}";
 }
@@ -1083,11 +1131,11 @@ be_visitor_facet_executor_block::visit_provides (
   prefix += node->local_name ()->get_string ();
   const char *port_name = prefix.c_str ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "if (ACE_OS::strcmp (name, \"" << port_name
       << "\") == 0)" << be_idt_nl
       << "{" << be_idt_nl
-      << "return this->executor_->get_" << port_name
+      << "return executor->get_" << port_name
       << " ();" << be_uidt_nl
       << "}" << be_uidt;
 
@@ -1116,7 +1164,7 @@ be_visitor_connect_block::visit_uses (be_uses *node)
   const char *obj_name = node->uses_type ()->full_name ();
   bool const is_multiple = node->is_multiple ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "if (ACE_OS::strcmp (name, \"" << port_name
       << "\") == 0)" << be_idt_nl
       << "{" << be_idt_nl
@@ -1124,29 +1172,14 @@ be_visitor_connect_block::visit_uses (be_uses *node)
       << "::" << obj_name << "::_narrow (connection);"
       << be_uidt_nl << be_nl;
 
-  if (node->uses_type ()->is_local ())
-    {
-      // @@todo: placeholder for connection logic
-      os_ << "/// " << (is_multiple ? "Multiplex" : "Simplex")
-          << " connect." << be_nl
-          << (is_multiple ? "return " : "") << "this->context_->connect_"
-          << port_name << " (_ciao_conn.in ());";
-    }
-  else
-    {
-      os_ << "if ( ::CORBA::is_nil (_ciao_conn.in ()))" << be_idt_nl
-          << "{" << be_idt_nl
-          << "throw ::Components::InvalidConnection ();" << be_uidt_nl
-          << "}" << be_uidt_nl << be_nl;
-      os_ << "/// " << (is_multiple ? "Multiplex" : "Simplex")
-          << " connect." << be_nl
-          << (is_multiple ? "return " : "") << "this->connect_"
-          << port_name << " (_ciao_conn.in ());";
-    }
+  os_ << "/// " << (is_multiple ? "Multiplex" : "Simplex")
+      << " connect." << be_nl
+      << (is_multiple ? "return " : "") << "this->context_->connect_"
+      << port_name << " (_ciao_conn.in ());";
 
   if (! is_multiple)
     {
-      os_ << be_nl << be_nl
+      os_ << be_nl
           << "return 0;";
     }
 
@@ -1178,7 +1211,7 @@ be_visitor_disconnect_block::visit_uses (be_uses *node)
 
   bool const is_multiple = node->is_multiple ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "if (ACE_OS::strcmp (name, \"" << port_name
       << "\") == 0)" << be_idt_nl
       << "{" << be_idt_nl
@@ -1193,14 +1226,7 @@ be_visitor_disconnect_block::visit_uses (be_uses *node)
           << "}" << be_uidt_nl << be_nl;
     }
 
-  os_ << "return this->";
-
-  if (node->uses_type ()->is_local ())
-    {
-      os_ << "context_->";
-    }
-
-  os_ << "disconnect_" << port_name
+  os_ << "return this->context_->disconnect_" << port_name
       << " (" << (is_multiple ? "ck" : "") << ");" << be_uidt_nl
       << "}" << be_uidt;
 
@@ -1210,10 +1236,13 @@ be_visitor_disconnect_block::visit_uses (be_uses *node)
 // ======================================================
 
 be_visitor_receptacle_desc::be_visitor_receptacle_desc (
-      be_visitor_context *ctx)
+      be_visitor_context *ctx,
+      be_component *node)
   : be_visitor_component_scope (ctx),
-    slot_ (0UL)
+    slot_ (0UL),
+    comp_ (node)
 {
+  node_ = node;
 }
 
 be_visitor_receptacle_desc::~be_visitor_receptacle_desc (
@@ -1231,37 +1260,49 @@ be_visitor_receptacle_desc::visit_uses (be_uses *node)
   AST_Type *obj = node->uses_type ();
   bool const is_multiple = node->is_multiple ();
 
-  os_ << be_nl << be_nl;
+  os_ << be_nl_2;
 
-  bool gen_guard = is_multiple;
+  ACE_CString sname_str (comp_->full_name ());
+  const char *sname = sname_str.c_str ();
+
+  const char *global = (sname_str == "" ? "" : "::");
 
-  if (gen_guard)
+  if (!is_multiple)
     {
-      os_ << "{" << be_idt_nl
-          << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-          << "                  mon," << be_nl
-          << "                  this->context_->"
-          << port_name << "_lock_," << be_nl
-          << "                  0);" << be_nl << be_nl;
+      os_ << obj->full_name () << "_var ciao_"
+          << port_name << " = " << be_idt_nl
+          << "this->context_->get_connection_"
+          << port_name << " ();" << be_uidt_nl;
+    }
+  else
+    {
+      os_ << "::" << sname << global << port_name << "Connections_var ciao_"
+          << port_name << " = " << be_idt_nl
+          << "this->context_->get_connections_"
+          << port_name << " ();" << be_uidt_nl;
     }
 
   os_ << "::CIAO::Servant::describe_"
       << (is_multiple ? "multiplex" : "simplex")
-      << "_receptacle<" << be_idt_nl
-      << "::" << obj->full_name () << "_var> (" << be_idt_nl
-      << "\"" << port_name << "\"," << be_nl
-      << "\"" << obj->repoID () << "\"," << be_nl
-      << "this->context_->ciao_uses_"
-      << port_name << "_," << be_nl
-      << "safe_retval," << be_nl
-      << slot_++ << "UL);" << be_uidt << be_uidt;
+      << "_receptacle<" << be_idt_nl;
 
-  if (gen_guard)
+  if (!is_multiple)
     {
-      os_ << be_uidt_nl
-          << "}";
+      os_ << "::" << obj->full_name () << "> (" << be_idt_nl;
+    }
+  else
+    {
+      os_ << "::" << sname << global << port_name << "Connections> (" << be_idt_nl;
     }
 
+  os_ << "\"" << port_name << "\"," << be_nl
+      << "\"" << obj->repoID () << "\"," << be_nl;
+
+  os_  << "ciao_" << port_name << ".in (), " << be_nl;
+
+  os_ << "safe_retval," << be_nl
+      << slot_++ << "UL);" << be_uidt << be_uidt;
+
   return 0;
 }
 
@@ -1287,22 +1328,15 @@ be_visitor_subscribe_block::visit_publishes (
   const char *port_name =
     node->local_name ()->get_string ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "if (ACE_OS::strcmp (publisher_name, \""
       << port_name << "\") == 0)" << be_idt_nl
       << "{" << be_idt_nl
       << "::" << obj_name << "Consumer_var sub =" << be_idt_nl
       << "::" << obj_name << "Consumer::_narrow (subscribe);"
       << be_uidt_nl << be_nl
-      << "if ( ::CORBA::is_nil (sub.in ()))" << be_idt_nl
-      << "{" << be_idt_nl
-      << "throw ::Components::InvalidConnection ();" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return this->subscribe_" << port_name
+      << "return this->context_->subscribe_" << port_name
       << " (sub.in ());" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
       << "}" << be_uidt;
 
   return 0;
@@ -1328,11 +1362,11 @@ be_visitor_unsubscribe_block::visit_publishes (
   const char *port_name =
     node->local_name ()->get_string ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "if (ACE_OS::strcmp (publisher_name, \""
       << port_name << "\") == 0)" << be_idt_nl
       << "{" << be_idt_nl
-      << "return this->unsubscribe_" << port_name
+      << "return this->context_->unsubscribe_" << port_name
       << " (ck);" << be_uidt_nl
       << "}" << be_uidt;
 
@@ -1361,14 +1395,14 @@ be_visitor_event_source_desc::visit_publishes (
   const char *port_name =
     node->local_name ()->get_string ();
 
-  os_ << be_nl << be_nl;
+  os_ << be_nl_2;
 
   os_ << "{" << be_idt_nl
       << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
       << "                  mon," << be_nl
       << "                  this->context_->"
       << port_name << "_lock_," << be_nl
-      << "                  0);" << be_nl << be_nl;
+      << "                  0);" << be_nl_2;
 
   os_ << "::CIAO::Servant::describe_pub_event_source<"
       << be_idt_nl
@@ -1408,7 +1442,7 @@ be_visitor_connect_consumer_block::visit_emits (
   const char *port_name =
     node->local_name ()->get_string ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "if (ACE_OS::strcmp (emitter_name, \""
       << port_name << "\") == 0)" << be_idt_nl
       << "{" << be_idt_nl
@@ -1416,13 +1450,8 @@ be_visitor_connect_consumer_block::visit_emits (
       << "Consumer_var _ciao_consumer =" << be_idt_nl
       << "::" << obj_name
       << "Consumer::_narrow (consumer);" << be_uidt_nl << be_nl
-      << "if ( ::CORBA::is_nil (_ciao_consumer.in ()))"
-      << be_idt_nl
-      << "{" << be_idt_nl
-      << "throw ::Components::InvalidConnection ();" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "this->connect_" << port_name
-      << " (_ciao_consumer.in ());" << be_nl << be_nl
+      << "this->context_->connect_" << port_name
+      << " (_ciao_consumer.in ());" << be_nl_2
       << "return;" << be_uidt_nl
       << "}" << be_uidt;
 
@@ -1449,11 +1478,11 @@ be_visitor_disconnect_consumer_block::visit_emits (
   const char *port_name =
     node->local_name ()->get_string ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "if (ACE_OS::strcmp (source_name, \""
       << port_name << "\") == 0)" << be_idt_nl
       << "{" << be_idt_nl
-      << "return this->disconnect_" << port_name
+      << "return this->context_->disconnect_" << port_name
       << " ();" << be_uidt_nl
       << "}" << be_uidt;
 
@@ -1481,7 +1510,7 @@ be_visitor_emitter_desc::visit_emits (be_emits *node)
   const char *port_name =
     node->local_name ()->get_string ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::CIAO::Servant::describe_emit_event_source<"
       << be_idt_nl
       << "::" << obj->full_name () << "Consumer_var> ("
diff --git a/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp b/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp
index 09aa5f42b18..f2669690cb1 100644
--- a/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  Visitor generating code for Any operators for a forward declared 
+ *  Visitor generating code for Any operators for a forward declared
  *  component in the client header.
  *
  *
diff --git a/TAO_IDL/be/be_visitor_component_scope.cpp b/TAO_IDL/be/be_visitor_component_scope.cpp
index 0e9d0106063..b7ede5b3039 100644
--- a/TAO_IDL/be/be_visitor_component_scope.cpp
+++ b/TAO_IDL/be/be_visitor_component_scope.cpp
@@ -31,7 +31,8 @@ be_visitor_component_scope::be_visitor_component_scope (
   : be_visitor_scope (ctx),
     node_ (0),
     os_ (*ctx->stream ()),
-    export_macro_ (be_global->svnt_export_macro ())
+    export_macro_ (be_global->svnt_export_macro ()),
+    in_ext_port_ (false)
 {
   /// 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
@@ -52,6 +53,7 @@ int
 be_visitor_component_scope::visit_extended_port (
   be_extended_port *node)
 {
+  this->in_ext_port_ = true;
   this->ctx_->interface (this->node_);
 
   AST_Decl::NodeType nt =
@@ -79,6 +81,7 @@ be_visitor_component_scope::visit_extended_port (
 
   /// Reset port prefix string.
   this->ctx_->port_prefix () = "";
+  this->in_ext_port_ = false;
   return 0;
 }
 
@@ -123,7 +126,7 @@ be_visitor_component_scope::visit_component_scope (
     {
       return 0;
     }
-    
+
   this->ctx_->interface (node);
 
   if (this->visit_scope (node) == -1)
@@ -209,7 +212,7 @@ be_visitor_component_scope::visit_porttype_scope_mirror (
                                    d->full_name ()),
                                   -1);
               }
-              
+
             break;
         }
     }
@@ -226,13 +229,15 @@ be_visitor_component_scope::node (be_component *c)
 void
 be_visitor_component_scope::gen_svnt_entrypoint_decl (void)
 {
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::PortableServer::Servant" << be_nl
       << "create_" << node_->flat_name ()
       << "_Servant (" << be_idt_nl
       << "::Components::EnterpriseComponent_ptr p," << be_nl
-      << "::CIAO::Container_ptr c," << be_nl
+      << "::CIAO::"
+      << be_global->ciao_container_type ()
+      << "_Container_ptr c," << be_nl
       << "const char * ins_name);" << be_uidt;
 }
 
@@ -245,13 +250,14 @@ be_visitor_component_scope::gen_svnt_entrypoint_defn (void)
   const char *lname = node_->local_name ();
   const char *global = (sname_str == "" ? "" : "::");
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::PortableServer::Servant" << be_nl
       << "create_" << node_->flat_name ()
       << "_Servant (" << be_idt_nl
       << "::Components::EnterpriseComponent_ptr p," << be_nl
-      << "::CIAO::Container_ptr c," << be_nl
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Container_ptr c," << be_nl
       << "const char * ins_name)" << be_uidt_nl
       << "{" << be_idt_nl
       << global << sname << "::CCM_" << lname
@@ -270,7 +276,7 @@ be_visitor_component_scope::gen_svnt_entrypoint_defn (void)
       << "                ins_name," << be_nl
       << "                0," << be_nl
       << "                c)," << be_uidt_nl
-      << "                0);" << be_nl << be_nl
+      << "                0);" << be_nl_2
       << "return retval;" << be_uidt_nl
       << "}";
 }
@@ -278,7 +284,7 @@ be_visitor_component_scope::gen_svnt_entrypoint_defn (void)
 void
 be_visitor_component_scope::gen_exec_entrypoint_decl (void)
 {
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::Components::EnterpriseComponent_ptr" << be_nl
       << "create_" << node_->flat_name ()
@@ -288,7 +294,7 @@ be_visitor_component_scope::gen_exec_entrypoint_decl (void)
 void
 be_visitor_component_scope::gen_exec_entrypoint_defn (void)
 {
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::Components::EnterpriseComponent_ptr" << be_nl
       << "create_" << node_->flat_name ()
@@ -297,12 +303,11 @@ be_visitor_component_scope::gen_exec_entrypoint_defn (void)
       << "::Components::EnterpriseComponent_ptr retval ="
       << be_idt_nl
       << "::Components::EnterpriseComponent::_nil ();"
-      << be_uidt_nl << be_nl
+      << be_uidt << be_nl_2
       << "ACE_NEW_NORETURN (" << be_idt_nl
       << "retval," << be_nl
       << node_->local_name () << "_exec_i);"
-      << be_uidt_nl << be_nl
+      << be_uidt << be_nl_2
       << "return retval;" << be_uidt_nl
       << "}";
 }
-
diff --git a/TAO_IDL/be/be_visitor_connector.cpp b/TAO_IDL/be/be_visitor_connector.cpp
index 143ec4b44f2..0e1eb4a9926 100644
--- a/TAO_IDL/be/be_visitor_connector.cpp
+++ b/TAO_IDL/be/be_visitor_connector.cpp
@@ -12,6 +12,7 @@
  */
 //=============================================================================
 
+#include "ast_template_module.h"
 #include "ast_template_module_inst.h"
 #include "ast_uses.h"
 #include "ast_module.h"
@@ -22,10 +23,12 @@
 #include "nr_extern.h"
 
 #include "be_connector.h"
+#include "be_mirror_port.h"
 #include "be_provides.h"
 #include "be_uses.h"
 #include "be_operation.h"
 #include "be_argument.h"
+#include "be_attribute.h"
 
 #include "be_visitor_connector.h"
 #include "be_visitor_operation.h"
@@ -42,5 +45,3 @@
 #include "be_visitor_connector/facet_ami_exs.cpp"
 #include "be_visitor_connector/executor_ami_exh.cpp"
 #include "be_visitor_connector/executor_ami_exs.cpp"
-#include "be_visitor_connector/connector_ami_rh_exh.cpp"
-#include "be_visitor_connector/connector_ami_rh_exs.cpp"
diff --git a/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp b/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp
index 6f6ec2d1864..a198b932062 100644
--- a/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp
+++ b/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp
@@ -34,18 +34,18 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node)
     {
       return 0;
     }
-    
+
   this->node_ = node;
-    
+
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
       << "{" << be_idt;
-      
+
   be_visitor_facet_ami_exh facet_visitor (this->ctx_);
-  
+
   /// We call visit_component() so the visitor base class member
   /// node_ can be set. If a facet is defined in a porttype, it
   /// complicates navigation to the component.
@@ -57,9 +57,9 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node)
                          ACE_TEXT ("facet visitor failed\n")),
                         -1);
     }
-      
+
   be_visitor_executor_ami_exh exec_visitor (this->ctx_);
-  
+
   if (exec_visitor.visit_connector (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -68,53 +68,11 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node)
                          ACE_TEXT ("exec visitor failed\n")),
                         -1);
     }
-      
+
   this->gen_entrypoint ();
-      
+
   os_ << be_uidt_nl
       << "}";
-      
-  /// Presence of -Gex option here triggers generation of AMI4CCM
-  /// reply handler impl class, with empty methods for user to
-  /// complete, in its own set of files.    
-  if (be_global->gen_ciao_exec_impl ())
-    {
-      TAO_OutStream *new_stream = tao_cg->ciao_ami_rh_impl_header ();
-      
-      if (new_stream == 0)
-        {
-          int status =
-            tao_cg->start_ciao_ami_rh_impl_header (
-              be_global->be_get_ciao_ami_conn_impl_hdr_fname ());
-              
-           if (status == -1)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   ACE_TEXT ("be_visitor_connector_ami_exh")
-                                   ACE_TEXT ("::visit_connector - ")
-                                   ACE_TEXT ("Error opening CIAO AMI ")
-                                   ACE_TEXT ("conn rh impl header file\n")),
-                                  -1);
-              }
-              
-            new_stream = tao_cg->ciao_ami_rh_impl_header ();
-        }
-        
-      /// Initialize new visitor with a copy of our context,
-      /// because the new visitor gets a different stream.
-      be_visitor_context new_ctx (*this->ctx_);
-      new_ctx.stream (new_stream);
-      be_visitor_connector_ami_rh_exh impl_visitor (&new_ctx);
-      
-      if (impl_visitor.visit_component (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("be_visitor_connector_ami_rh_exh::")
-                             ACE_TEXT ("visit_connector - ")
-                             ACE_TEXT ("rh impl visitor failed\n")),
-                            -1);
-        }
-    }
 
   return 0;
 }
@@ -122,7 +80,7 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node)
 void
 be_visitor_connector_ami_exh::gen_entrypoint (void)
 {
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "extern \"C\" " << this->export_macro_.c_str ()
       << " ::Components::EnterpriseComponent_ptr" << be_nl
       << "create_"
diff --git a/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp b/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp
index f1b53b52eeb..624f08c864d 100644
--- a/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp
+++ b/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp
@@ -35,7 +35,7 @@ be_visitor_connector_ami_exs::visit_connector (be_connector *node)
 
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
       << "{" << be_idt;
@@ -67,48 +67,6 @@ be_visitor_connector_ami_exs::visit_connector (be_connector *node)
   os_ << be_uidt_nl
       << "}";
 
-  /// Presence of -Gex option here triggers generation of AMI4CCM
-  /// reply handler impl class, with empty methods for user to
-  /// complete, in its own set of files.    
-  if (be_global->gen_ciao_exec_impl ())
-    {
-      TAO_OutStream *new_stream = tao_cg->ciao_ami_rh_impl_source ();
-      
-      if (new_stream == 0)
-        {
-          int status =
-            tao_cg->start_ciao_ami_rh_impl_source (
-              be_global->be_get_ciao_ami_conn_impl_src_fname ());
-              
-           if (status == -1)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   ACE_TEXT ("be_visitor_connector_ami_exh")
-                                   ACE_TEXT ("::visit_connector - ")
-                                   ACE_TEXT ("Error opening CIAO AMI ")
-                                   ACE_TEXT ("conn rh impl header file\n")),
-                                  -1);
-              }
-              
-            new_stream = tao_cg->ciao_ami_rh_impl_source ();
-        }
-        
-      /// Initialize new visitor with a copy of our context,
-      /// because the new visitor gets a different stream.
-      be_visitor_context new_ctx (*this->ctx_);
-      new_ctx.stream (new_stream);
-      be_visitor_connector_ami_rh_exs impl_visitor (&new_ctx);
-      
-      if (impl_visitor.visit_component (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("be_visitor_connector_ami_rh_exh::")
-                             ACE_TEXT ("visit_connector - ")
-                             ACE_TEXT ("rh impl visitor failed\n")),
-                            -1);
-        }
-    }
-
   return 0;
 }
 
@@ -117,7 +75,7 @@ be_visitor_connector_ami_exs::gen_entrypoint (void)
 {
   AST_Decl *s = ScopeAsDecl (this->node_->defined_in ());
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "extern \"C\" ::Components::EnterpriseComponent_ptr"
       << be_nl
       << "create_" << s->flat_name () << "_Impl (void)" << be_nl
diff --git a/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exh.cpp b/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exh.cpp
deleted file mode 100644
index 190bd27a1c2..00000000000
--- a/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exh.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    connector_ami_rh_exh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for AMI4CCM reply handler impl headers.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-be_visitor_connector_ami_rh_exh::be_visitor_connector_ami_rh_exh (
-      be_visitor_context *ctx)
-  : be_visitor_facet_ami_exh (ctx)
-{
-}
-
-be_visitor_connector_ami_rh_exh::~be_visitor_connector_ami_rh_exh (void)
-{
-}
-
-int
-be_visitor_connector_ami_rh_exh::visit_component (be_component *node)
-{
-  if (node->imported ())
-    {
-      return 0;
-    }
-    
-  this->node_ = node;
-  
-  /// 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;
-      
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_facet_ami_rh_exh")
-                         ACE_TEXT ("::visit_component - ")
-                         ACE_TEXT ("visit_scope() ")
-                         ACE_TEXT ("failed\n")),
-                        -1);
-    }
-      
-  os_ << be_uidt_nl
-      << "}";
-   
-  return 0;
-}
-
-int
-be_visitor_connector_ami_rh_exh::visit_provides (be_provides *node)
-{
-  this->iface_ =
-    be_interface::narrow_from_decl (node->provides_type ());
-
-  this->init (true);
-  
-  const char *suffix = "ReplyHandler";
-  
-  os_ << be_nl
-      << "class " << this->export_macro_.c_str () << " "
-      << this->iface_name_ << suffix << "_i" << be_idt_nl
-      << ": public ::" << this->scope_name_ << this->smart_scope_
-      << this->iface_name_ << suffix << be_uidt_nl
-      << "{" << be_nl
-      << "public:" << be_idt_nl
-      << this->iface_name_ << suffix << "_i (void);" << be_nl
-      << "virtual ~" << this->iface_name_ << suffix << "_i (void);";
-      
-  /// This overload of traverse_inheritance_graph() used here
-  /// doesn't automatically prime the queues.
-  this->callback_iface_->get_insert_queue ().reset ();
-  this->callback_iface_->get_del_queue ().reset ();
-  this->callback_iface_->get_insert_queue ().enqueue_tail (
-    this->callback_iface_);
-
-  ReplyHandler_Op_Attr_Decl_Generator op_attr_gen (this);
-
-  int status =
-    this->callback_iface_->traverse_inheritance_graph (op_attr_gen,
-                                                       &os_,
-                                                       false,
-                                                       false);
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_connector_ami_rh_exh")
-                         ACE_TEXT ("::visit_provides - ")
-                         ACE_TEXT ("traverse_inheritance_graph() on ")
-                         ACE_TEXT ("callback interface failed\n")),
-                        -1);
-    }
-    
-  os_ << be_uidt_nl
-      << "};";
-
-  return 0;
-}
-
-int
-be_visitor_connector_ami_rh_exh::visit_attribute (
-  be_attribute *node)
-{
-  this->ctx_->interface (this->callback_iface_);
-  TAO_CodeGen::CG_STATE state = this->ctx_->state ();
-  this->ctx_->state (TAO_CodeGen::TAO_ROOT_IH);
-  
-  be_visitor_attribute v (this->ctx_);
-  
-  if (v.visit_attribute (node) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("be_visitor_connector_ami_rh_exh")
-                  ACE_TEXT ("::visit_attribute - ")
-                  ACE_TEXT ("be_visitor_attribute:: ")
-                  ACE_TEXT ("visit_attribute failed\n")));
-    }
-    
-  this->ctx_->state (state);
-  
-  return 0;
-}
-
-// ======================================================
-
-ReplyHandler_Op_Attr_Decl_Generator::ReplyHandler_Op_Attr_Decl_Generator (
-    be_visitor_scope * visitor)
-  : visitor_ (visitor)
-{
-}
-
-int
-ReplyHandler_Op_Attr_Decl_Generator::emit (
-  be_interface * /* derived_interface */,
-  TAO_OutStream * /* os */,
-  be_interface * base_interface)
-{
-  return visitor_->visit_scope (base_interface);
-}
-
diff --git a/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp b/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp
deleted file mode 100644
index 65bb3156cfc..00000000000
--- a/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    connector_ami_rh_exs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for AMI4CCM reply handler impl source
- *  files.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-be_visitor_connector_ami_rh_exs::be_visitor_connector_ami_rh_exs (
-      be_visitor_context *ctx)
-  : be_visitor_facet_ami_exh (ctx)
-{
-}
-
-be_visitor_connector_ami_rh_exs::~be_visitor_connector_ami_rh_exs (void)
-{
-}
-
-int
-be_visitor_connector_ami_rh_exs::visit_component (be_component *node)
-{
-  if (node->imported ())
-    {
-      return 0;
-    }
-    
-  this->node_ = node;
-  
-  /// 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;
-      
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_facet_ami_rh_exs")
-                         ACE_TEXT ("::visit_component - ")
-                         ACE_TEXT ("visit_component_scope() ")
-                         ACE_TEXT ("failed\n")),
-                        -1);
-    }
-      
-  os_ << be_uidt_nl
-      << "}";
-   
-  return 0;
-}
-
-int
-be_visitor_connector_ami_rh_exs::visit_provides (be_provides *node)
-{
-  this->iface_ =
-    be_interface::narrow_from_decl (node->provides_type ());
-
-  this->init (true);
-  
-  const char *suffix = "ReplyHandler_i";
-  
-  os_ << be_nl
-      << this->iface_name_ << suffix << "::"
-      << this->iface_name_ << suffix << " (void)" << be_nl
-      << "{" << be_nl
-      << "}";
-      
-  os_ << be_nl << be_nl
-      << this->iface_name_ << suffix << "::~"
-      << this->iface_name_ << suffix << " (void)" << be_nl
-      << "{" << be_nl
-      << "}";
-      
-  ACE_CString port_pfix = this->ctx_->port_prefix ();
-  this->ctx_->port_prefix () = "";
-  
-  /// This overload of traverse_inheritance_graph() used here
-  /// doesn't automatically prime the queues.
-  this->callback_iface_->get_insert_queue ().reset ();
-  this->callback_iface_->get_del_queue ().reset ();
-  this->callback_iface_->get_insert_queue ().enqueue_tail (
-    this->callback_iface_);
-
-  ReplyHandler_Op_Attr_Defn_Generator op_attr_gen (this);
-
-  int status =
-    this->callback_iface_->traverse_inheritance_graph (op_attr_gen,
-                                                       &os_,
-                                                       false,
-                                                       false);
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_connector_ami_rh_exs")
-                         ACE_TEXT ("::visit_provides - ")
-                         ACE_TEXT ("traverse_inheritance_graph() on ")
-                         ACE_TEXT ("callback interface failed\n")),
-                        -1);
-    }
-    
-  this->ctx_->port_prefix () = port_pfix;  
-  return 0;
-}
-
-int
-be_visitor_connector_ami_rh_exs::visit_operation (
-  be_operation *node)
-{
-  AST_Decl::NodeType nt = node->defined_in ()->scope_node_type ();
-  
-  if (nt != AST_Decl::NT_interface)
-    {
-      return 0;
-    }
-    
-  be_visitor_operation_exs v (this->ctx_);
-  v.scope (this->callback_iface_);
-  v.class_extension ("_i");
-  return v.visit_operation (node);
-}
-
-int
-be_visitor_connector_ami_rh_exs::visit_attribute (
-  be_attribute *node)
-{
-  be_visitor_attribute v (this->ctx_);
-  v.op_scope (this->callback_iface_);
-  v.exec_class_extension ("_i");
-  return v.visit_attribute (node);
-}
-
-// ======================================================
-
-ReplyHandler_Op_Attr_Defn_Generator::ReplyHandler_Op_Attr_Defn_Generator (
-    be_visitor_scope * visitor)
-  : visitor_ (visitor)
-{
-}
-
-int
-ReplyHandler_Op_Attr_Defn_Generator::emit (
-  be_interface * /* derived_interface */,
-  TAO_OutStream * /* os */,
-  be_interface * base_interface)
-{
-  return visitor_->visit_scope (base_interface);
-}
-
diff --git a/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp b/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp
index 7a984d168ce..9e3715971e7 100644
--- a/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp
+++ b/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp
@@ -13,16 +13,28 @@
  */
 //=============================================================================
 
+#include "ast_structure.h"
+#include "ast_typedef.h"
+#include "ast_template_module.h"
+#include "ast_template_module_ref.h"
+
+#include "utl_strlist.h"
+#include "utl_string.h"
+
+#include "fe_extern.h"
+
 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),
+    t_ref_ (0),
+    t_params_ (0),
     base_tname_ (0)
 {
 }
 
-be_visitor_connector_dds_ex_base::~be_visitor_connector_dds_ex_base (void)
+be_visitor_connector_dds_ex_base::~be_visitor_connector_dds_ex_base (
+  void)
 {
 }
 
@@ -31,45 +43,87 @@ be_visitor_connector_dds_ex_base::begin (be_connector *node)
 {
   node_ = node;
 
-  AST_Connector *base = node->base_connector ();
+  this->process_template_args (node);
 
-  this->process_template_args (base);
+  AST_Connector *base = node;
 
-  /// If the previous call hasn't initialized our arg
-  /// list, it could be because we were processing
-  /// DDS_State or DDS_Event, whose base class,
-  /// DDS_TopicBase, is not in a template module.
-  /// To check this, we call again with the node itself,
-  /// and if we get an arg list this time, proceed.
-  if (this->t_args_ == 0)
+  while (this->t_args_.is_empty () && base != 0)
     {
-      this->process_template_args (node);
-      
-      if (this->t_args_ == 0)
-        {
-          return false;
-        }
+      this->process_template_args (base);
+      base = base->base_connector ();
+    }
+
+  if (this->t_args_.is_empty ())
+    {
+      return false;
     }
 
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
       << "{" << be_idt;
 
-  this->base_tname_ = node->local_name ();  
-    
+  this->base_tname_ = node->local_name ();
+
   return true;
 }
 
+bool
+be_visitor_connector_dds_ex_base::is_dds_type (
+  be_connector *node, AST_Decl *d)
+{
+  bool result = false;
+  AST_Connector* base = node->base_connector ();
+
+  if (base)
+    {
+      while (base->base_connector () != 0)
+        {
+          base = base->base_connector ();
+        }
+
+      const char* lname = base->local_name ()->get_string ();
+
+      if (ACE_OS::strcmp (lname, "DDS_Base") == 0)
+        {
+          AST_Structure *s = AST_Structure::narrow_from_decl (d);
+
+          if (s == 0)
+            {
+              AST_Typedef *td = AST_Typedef::narrow_from_decl (d);
+
+              if (td != 0)
+                {
+                  s = AST_Structure::narrow_from_decl (td->primitive_base_type ());
+                }
+            }
+
+          if (s)
+            {
+              result = true;
+            }
+        }
+    }
+
+  return result;
+}
+
 void
 be_visitor_connector_dds_ex_base::process_template_args (
   AST_Connector *node)
 {
   AST_Module *m =
     AST_Module::narrow_from_scope (node->defined_in ());
-    
+
+  /// If this is non-zero, we use this to limit our template
+  /// args list to those used in the alias. If it is zero, we
+  /// just use the complete template arg list in the
+  /// instantiation.
+  this->t_ref_ = m->from_ref ();
+  this->t_inst_ = m->from_inst ();
+
   /// We assume the connector comes from the instantiation
   /// of a template module, and the regular module it's
   /// defined in (at some level) will have a reference to it.
@@ -90,12 +144,19 @@ be_visitor_connector_dds_ex_base::process_template_args (
       return;
     }
 
-  this->t_args_ = this->t_inst_->template_args ();
+  /// We need to fetch and store these so we can match them
+  /// to the corresponding args and determine whether a
+  /// corresponding boolean template arg (indicating FIXED
+  /// size type) should be inserted into the
+  /// connector base class template arg list.
+  this->t_params_ = this->t_inst_->ref ()->template_params ();
+
+  this->match_template_args ();
 
   /// We depend on the DDS datatype being the first template
   /// argument for now, this may change.
   AST_Decl **datatype = 0;
-  int const status = this->t_args_->get (datatype, 0UL);
+  int const status = this->t_args_.get (datatype, 0UL);
 
   if (status != 0)
     {
@@ -111,3 +172,43 @@ be_visitor_connector_dds_ex_base::process_template_args (
   this->dds_traits_name_ += "_DDS_Traits";
 }
 
+void
+be_visitor_connector_dds_ex_base::match_template_args (void)
+{
+  /// If the connector was declared in an aliased templated
+  /// module, we want to populate our template args list with
+  /// only the args referenced in the alias (see FOR loop
+  /// below). Otherwise, we just copy the containing template
+  /// module instantiation's arg list.
+  if (this->t_ref_ == 0)
+    {
+      this->t_args_ = *this->t_inst_->template_args ();
+      return;
+    }
+
+  for (UTL_StrlistActiveIterator i (this->t_ref_->param_refs ());
+       ! i.is_done ();
+       i.next ())
+    {
+      const char *ref_name = i.item ()->get_string ();
+      size_t slot = 0;
+
+      for (FE_Utils::T_PARAMLIST_INFO::CONST_ITERATOR ci (
+             *this->t_inst_->ref ()->template_params ());
+           ! ci.done ();
+           ci.advance (), ++slot)
+        {
+          FE_Utils::T_Param_Info *t_param = 0;
+          ci.next (t_param);
+
+          if (t_param->name_ == ref_name)
+            {
+              AST_Decl **d = 0;
+              this->t_inst_->template_args ()->get (d, slot);
+              this->t_args_.enqueue_tail (*d);
+              break;
+            }
+        }
+    }
+}
+
diff --git a/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
index 33f25aec814..32ba7906973 100644
--- a/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
+++ b/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
@@ -12,6 +12,15 @@
  */
 //=============================================================================
 
+#include "global_extern.h"
+#include "utl_strlist.h"
+#include "utl_string.h"
+
+#include "ast_structure.h"
+#include "ast_union.h"
+#include "ast_template_module_ref.h"
+#include "ast_template_module.h"
+
 be_visitor_connector_dds_exh::be_visitor_connector_dds_exh (
       be_visitor_context *ctx)
   : be_visitor_connector_dds_ex_base (ctx)
@@ -39,74 +48,180 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node)
     {
       return -1;
     }
-    
-  this->gen_dds_traits ();
-  this->gen_connector_traits ();
-  
-  /// Unset the flags in the port interfaces list so
-  /// they can be used again in another connector.
+
+  // If we have a connector within a templated module
+  if (! this->t_args_.is_empty ())
+    {
+      // Generate all needed dds_traits
+      for (FE_Utils::T_ARGLIST::CONST_ITERATOR i (this->t_args_);
+          !i.done ();
+          i.advance ())
+        {
+          AST_Decl **item = 0;
+          i.next (item);
+          AST_Decl *d = *item;
+
+          if (this->is_dds_type (node, d))
+            {
+              this->gen_dds_traits (d);
+            }
+        }
+
+      // Generate connector traits
+      this->gen_connector_traits ();
+
+      os_ << be_nl_2
+          << "class " << this->export_macro_.c_str () << " "
+          << this->node_->local_name () << "_exec_i" << be_idt_nl
+          << ": public " << this->base_tname_ << "_Connector_T";
+
+      os_ << " <" << be_idt << be_idt_nl;
+
+      os_ << "CCM_" << this->node_->flat_name ()
+          << "_Traits," << be_nl;
+
+      size_t slot = 1UL;
+
+      for (FE_Utils::T_ARGLIST::CONST_ITERATOR i (this->t_args_);
+          !i.done ();
+          i.advance (), ++slot)
+        {
+          AST_Decl **item = 0;
+          i.next (item);
+          AST_Decl *d = *item;
+
+          if (this->is_dds_type (node, d))
+            {
+              os_ << d->flat_name ()
+                  << "_DDS_Traits";
+            }
+          else
+            {
+              os_ << d->name ();
+            }
+
+          bool needs_bool = false;
+          bool is_fixed = false;
+          FE_Utils::T_Param_Info *param = 0;
+
+          if (this->t_params_->get (param, slot - 1) != 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ACE_TEXT ("be_visitor_connector_dds_exh::")
+                                 ACE_TEXT ("visit_connector - ")
+                                 ACE_TEXT ("template param fetch failed\n ")),
+                                -1);
+            }
+
+          if (d->node_type () == AST_Decl::NT_typedef)
+            {
+              /// Strip away all layers of typedef before narrowing.
+              AST_Typedef *td = AST_Typedef::narrow_from_decl (d);
+              d = td->primitive_base_type ();
+            }
+
+          /// No need to check if this is 0, but must narrow
+          /// to call virtual function size_type() below.
+          AST_Type *t = AST_Type::narrow_from_decl (d);
+
+          switch (param->type_)
+            {
+              case AST_Decl::NT_type:
+              case AST_Decl::NT_struct:
+              case AST_Decl::NT_union:
+                needs_bool = true;
+                is_fixed = (t->size_type () == AST_Type::FIXED);
+                break;
+              default:
+                break;
+            }
+
+          if (needs_bool)
+            {
+              os_ << "," << be_nl
+                  << (is_fixed ? "true" : "false");
+            }
+
+          if (slot < this->t_args_.size ())
+            {
+              os_ << "," << be_nl;
+            }
+        }
+
+      os_ << ">";
+
+      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);" << be_uidt_nl
+          << "};";
+
+      this->gen_exec_entrypoint_decl ();
+
+    }
+
+  os_ << be_uidt_nl
+      << "}";
+
+  /// Unset the flags in the port interfaces list. This is
+  /// also done in visit_mirror_port(), but we must also do
+  /// it here to catch a port interface that didn't come to
+  /// us from an extended port or mirror port.
   for (ACE_Unbounded_Queue<be_interface *>::ITERATOR iter (
-         this->port_ifaces_);
-       !iter.done ();
-       iter.advance ())
+        this->port_ifaces_);
+      !iter.done ();
+      iter.advance ())
     {
       be_interface **item = 0;
       iter.next (item);
-      
+
       (*item)->dds_connector_traits_done (false);
     }
-  
-  /// 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 " << this->base_tname_ << "_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;
-    }
+  return 0;
+}
 
-  AST_Type *ut = AST_Type::narrow_from_decl (*datatype);
+int
+be_visitor_connector_dds_exh::visit_mirror_port (
+  be_mirror_port *node)
+{
+  os_ << be_nl
+      << "struct " << node->local_name ()->get_string ()
+      << "_traits" << be_nl
+      << "{" << be_idt;
 
-  os_ << " <" << be_idt << be_idt_nl
-      << this->dds_traits_name_.c_str () << "," << be_nl
-      << "DDS_" << this->node_->local_name ()
-      << "_Traits," << be_nl;
+  /// Reuse the code in the base class to flip the
+  /// facet/receptacle elements in the scope. We will end up
+  /// in visit_provides() and visit_uses() below.
+  int status =
+    this->be_visitor_component_scope::visit_mirror_port (node);
 
-  if (ut->size_type () == AST_Type::FIXED)
-    {
-      os_ << "true, ";
-    }
-  else
+  if (status != 0)
     {
-      os_ << "false, ";
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_connector_dds_exh::")
+                         ACE_TEXT ("visit_mirror_port - ")
+                         ACE_TEXT ("base class traversal failed\n ")),
+                        -1);
     }
 
-  os_ << be_nl << "DDS4CCM_NDDS" << ">";
-
-  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);" << be_uidt_nl
-      << "};";
+  os_ << be_uidt_nl
+      << "};" << be_nl;
 
-  this->gen_exec_entrypoint_decl ();
+  /// Unset the flags in the port interfaces list so
+  /// they can be used again in another port.
+  for (ACE_Unbounded_Queue<be_interface *>::ITERATOR iter (
+         this->port_ifaces_);
+       !iter.done ();
+       iter.advance ())
+    {
+      be_interface **item = 0;
+      iter.next (item);
 
-  os_ << be_uidt_nl
-      << "}";
+      (*item)->dds_connector_traits_done (false);
+    }
 
   return 0;
 }
@@ -116,9 +231,9 @@ be_visitor_connector_dds_exh::visit_provides (be_provides *node)
 {
   be_interface *iface =
     be_interface::narrow_from_decl (node->provides_type ());
-  
-  this->gen_interface_connector_trait (iface, true);
-    
+
+  this->gen_interface_connector_trait (iface, node, true);
+
   return 0;
 }
 
@@ -127,37 +242,50 @@ be_visitor_connector_dds_exh::visit_uses (be_uses *node)
 {
   be_interface *iface =
     be_interface::narrow_from_decl (node->uses_type ());
-    
-  this->gen_interface_connector_trait (iface, false);
-    
+
+  this->gen_interface_connector_trait (iface, node, false);
+
   return 0;
 }
 
-void
-be_visitor_connector_dds_exh::gen_dds_traits (void)
+int
+be_visitor_connector_dds_exh::visit_attribute (
+  be_attribute *node)
 {
-  /// We depend on the DDS datatype being the first template
-  /// argument for now, this may change.
-  AST_Decl **datatype = 0;
-  int const status = this->t_args_->get (datatype, 0UL);
+  AST_Decl::NodeType nt =
+    ScopeAsDecl (node->defined_in ())->node_type ();
 
-  if (status != 0)
+  /// We are interested in attributes in extended ports
+  /// and connectors, skip all others.
+  if (nt == AST_Decl::NT_component)
     {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("be_visitor_connector_dds_exh::")
-                  ACE_TEXT ("gen_dds_traits - ")
-                  ACE_TEXT ("template arg not found\n ")));
-
-      return;
+      return 0;
     }
 
-  UTL_ScopedName *dt_name = (*datatype)->name ();
+  os_ << be_nl
+      << "typedef "
+      << node->field_type ()->full_name () << " "
+      << node->local_name ()->get_string () << "_type;";
+
+  return 0;
+}
+
+void
+be_visitor_connector_dds_exh::gen_dds_traits (AST_Decl *datatype)
+{
+  AST_Decl *comp_scope =
+    ScopeAsDecl (this->node_->defined_in ());
+
+  bool const global_comp =
+    (comp_scope->node_type () == AST_Decl::NT_root);
+
+  UTL_ScopedName *dt_name = datatype->name ();
   BE_GlobalData::DDS_IMPL the_dds_impl = be_global->dds_impl ();
 
-  if (the_dds_impl != BE_GlobalData::NONE)
+  if (the_dds_impl != BE_GlobalData::DDS_NONE)
     {
       os_ << be_nl
-          << "struct " << this->dds_traits_name_.c_str () << be_nl
+          << "struct " << datatype->flat_name () << "_DDS_Traits" << be_nl
           << "{" << be_idt_nl
           << "typedef ::" << dt_name << " value_type;" << be_nl
           << "typedef ::" << dt_name;
@@ -166,14 +294,53 @@ be_visitor_connector_dds_exh::gen_dds_traits (void)
         {
           os_ << "RTI";
         }
-        
-      os_ << "Seq dds_seq_type;" << be_nl
-          << "typedef ::" << dt_name
-          << "TypeSupport type_support;" << be_nl
-          << "typedef ::" << dt_name
-          << "DataWriter data_writer;" << be_nl
+      else if (the_dds_impl == BE_GlobalData::OPENDDS)
+        {
+          os_ << "DDS";
+        }
+
+      os_ << "Seq dds_seq_type;" << be_nl;
+
+      if (the_dds_impl == BE_GlobalData::NDDS)
+        {
+          os_ << "typedef ::" << dt_name
+              << "TypeSupport type_support;" << be_nl;
+        }
+      else if (the_dds_impl == BE_GlobalData::COREDX)
+        {
+          os_ << "typedef ::" << dt_name
+              << "TypeSupport type_support;" << be_nl;
+        }
+      else if (the_dds_impl == BE_GlobalData::OPENDDS)
+        {
+          os_ << "typedef ::" << dt_name
+              << "TypeSupportImpl type_support;" << be_nl;
+        }
+
+      if (the_dds_impl == BE_GlobalData::NDDS)
+        {
+          os_ << "typedef ::DDS_SampleInfoSeq sampleinfo_seq_type;" << be_nl
+              << "typedef ::DDS_SampleInfo sampleinfo_type;" << be_nl;
+        }
+      else if (the_dds_impl == BE_GlobalData::COREDX)
+        {
+          os_ << "typedef ::DDS_SampleInfoSeq sampleinfo_seq_type;" << be_nl
+              << "typedef ::DDS_SampleInfo sampleinfo_type;" << be_nl;
+        }
+      else if (the_dds_impl == BE_GlobalData::OPENDDS)
+        {
+          os_ << "typedef ::DDS::SampleInfoSeq sampleinfo_seq_type;" << be_nl
+              << "typedef ::DDS::SampleInfo sampleinfo_type;" << be_nl;
+        }
+
+      os_ << "typedef ::" << dt_name
+          << "DataWriter datawriter_type;" << be_nl
           << "typedef ::" << dt_name
-          << "DataReader data_reader;" << be_uidt_nl
+          << "DataReader datareader_type;" << be_nl
+          << "typedef " << (global_comp ? "" : "::") << comp_scope->full_name ()
+          << "::DataWriter typed_writer_type;" << be_nl
+          << "typedef " << (global_comp ? "" : "::") << comp_scope->full_name ()
+          << "::DataReader typed_reader_type;" << be_uidt_nl
           << "};";
     }
 }
@@ -181,50 +348,23 @@ be_visitor_connector_dds_exh::gen_dds_traits (void)
 void
 be_visitor_connector_dds_exh::gen_connector_traits (void)
 {
-  AST_Decl **dt = 0;
-  int status = this->t_args_->get (dt, 0UL);
-
-  if (status != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("be_visitor_connector_dds_exh::")
-                  ACE_TEXT ("gen_connector_traits - ")
-                  ACE_TEXT ("first template arg not found\n ")));
-
-      return;
-    }
-
-  AST_Decl **dt_seq = 0;
-  status = this->t_args_->get (dt_seq, 1UL);
-
-  if (status != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("be_visitor_connector_dds_exh::")
-                  ACE_TEXT ("gen_connector_traits - ")
-                  ACE_TEXT ("second template arg not found\n ")));
-
-      return;
-    }
-
   AST_Decl *comp_scope =
     ScopeAsDecl (this->node_->defined_in ());
 
   bool global_comp =
     (comp_scope->node_type () == AST_Decl::NT_root);
-    
-  os_ << be_nl << be_nl
-      << "struct DDS_" << this->node_->local_name () 
+
+  os_ << be_nl_2
+      << "struct CCM_" << this->node_->flat_name ()
       << "_Traits" << be_nl
       << "{" << be_idt_nl
       << "typedef ::CIAO_" << this->node_->flat_name () << "_Impl::"
       << this->node_->local_name () << "_Exec base_type;" << be_nl
-      << "typedef ::" << (*dt)->name () << " value_type;" << be_nl
-      << "typedef ::" << (*dt_seq)->name () << " seq_type;" << be_nl
       << "typedef " << (global_comp ? "" : "::")
       << comp_scope->name () << "::CCM_"
-      << this->node_->local_name () << "_Context context_type;";
-      
+      << this->node_->local_name () << "_Context context_type;"
+      << be_nl;
+
   if (this->visit_component_scope (this->node_) == -1)
     {
       ACE_ERROR ((LM_ERROR,
@@ -234,7 +374,6 @@ be_visitor_connector_dds_exh::gen_connector_traits (void)
 
       return;
     }
-      
   os_ << be_uidt_nl
       << "};";
 }
@@ -242,21 +381,23 @@ be_visitor_connector_dds_exh::gen_connector_traits (void)
 void
 be_visitor_connector_dds_exh::gen_interface_connector_trait (
   be_interface *iface,
+  be_field *port_elem,
   bool for_facet)
 {
   if (!iface->dds_connector_traits_done ())
-    {  
+    {
       AST_Decl *scope = ScopeAsDecl (iface->defined_in ());
       bool global = (scope->node_type () == AST_Decl::NT_root);
       const char *smart_scope = (global ? "" : "::");
       const char *lname = iface->local_name ();
-      
+
       os_ << be_nl
           << "typedef ::" << scope->name () << smart_scope
-          << (for_facet ? "CCM_" : "") << lname
-          << " " << tao_cg->downcase (lname) << "_type;";
-          
-      iface->dds_connector_traits_done (true);  
+          << (!for_facet ? "" : "CCM_") << lname
+          << " " << port_elem->local_name ()->get_string ()
+          << "_type;";
+
+      iface->dds_connector_traits_done (true);
       this->port_ifaces_.enqueue_tail (iface);
     }
 }
diff --git a/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp b/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp
index 0b244cfb1d8..feb70be1e8a 100644
--- a/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp
+++ b/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp
@@ -39,58 +39,103 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node)
     {
       return -1;
     }
-    
-  os_ << be_nl
-      << this->node_->local_name () << "_exec_i::"
-      << this->node_->local_name () << "_exec_i (void)"
-      << be_idt_nl
-      << ": " << this->base_tname_ << "_Connector_T";
 
-  AST_Decl **datatype = 0;
-  int const status = this->t_args_->get (datatype, 0UL);
-
-  if (status != 0)
+  // If we have a connector within a templated module
+  if (! this->t_args_.is_empty ())
     {
-      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;
-    }
+      os_ << be_nl
+          << this->node_->local_name () << "_exec_i::"
+          << this->node_->local_name () << "_exec_i (void)"
+          << be_idt_nl
+          << ": " << this->base_tname_ << "_Connector_T";
+
+      os_ << " <" << be_idt << be_idt_nl;
+
+      os_ << "CCM_" << this->node_->flat_name ()
+          << "_Traits," << be_nl;
+
+      size_t slot = 1UL;
+
+      for (FE_Utils::T_ARGLIST::CONST_ITERATOR i (this->t_args_);
+          !i.done ();
+          i.advance (), ++slot)
+        {
+          AST_Decl **item = 0;
+          i.next (item);
+          AST_Decl *d = *item;
+
+          if (this->is_dds_type (node, d))
+            {
+              os_ << d->flat_name ()
+                  << "_DDS_Traits";
+            }
+          else
+            {
+              os_ << d->name ();
+            }
+
+          bool needs_bool = false;
+          bool is_fixed = false;
+          FE_Utils::T_Param_Info *param = 0;
+
+          if (this->t_params_->get (param, slot - 1) != 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ACE_TEXT ("be_visitor_connector_dds_exh::")
+                                 ACE_TEXT ("visit_connector - ")
+                                 ACE_TEXT ("template param fetch failed\n ")),
+                                -1);
+            }
+
+          if (d->node_type () == AST_Decl::NT_typedef)
+            {
+              /// Strip away all layers of typedef before narrowing.
+              AST_Typedef *td = AST_Typedef::narrow_from_decl (d);
+              d = td->primitive_base_type ();
+            }
+
+          /// No need to check if this is 0, but must narrow
+          /// to call virtual function size_type() below.
+          AST_Type *t = AST_Type::narrow_from_decl (d);
+
+          switch (param->type_)
+            {
+              case AST_Decl::NT_type:
+              case AST_Decl::NT_struct:
+              case AST_Decl::NT_union:
+                needs_bool = true;
+                is_fixed = (t->size_type () == AST_Type::FIXED);
+                break;
+              default:
+                break;
+            }
+
+          if (needs_bool)
+            {
+              os_ << "," << be_nl
+                  << (is_fixed ? "true" : "false");
+            }
+
+          if (slot < this->t_args_.size ())
+            {
+              os_ << "," << be_nl;
+            }
+        }
+
+      os_ << "> ()"
+          << be_uidt << be_uidt << be_uidt_nl
+          << "{" << be_nl
+          << "}";
+
+      os_ << be_nl_2
+          << this->node_->local_name () << "_exec_i::~"
+          << this->node_->local_name () << "_exec_i (void)" << be_nl
+          << "{" << be_nl
+          << "}";
+
+      this->gen_exec_entrypoint_defn ();
 
-  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_ << "DDS4CCM_NDDS" << ">";
-  
-  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
-      << "}";
-
-  this->gen_exec_entrypoint_defn ();
 
   os_ << be_uidt_nl
       << "}";
diff --git a/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp b/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp
index 06fb1124656..b523c254798 100644
--- a/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp
+++ b/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp
@@ -36,7 +36,7 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node)
   const char *suffix = "_exec_i";
   AST_Decl *scope = ScopeAsDecl (node->defined_in ());
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "class " << this->export_macro_.c_str () << " "
       << scope->local_name () << suffix << be_idt_nl
       << ": public virtual AMI4CCM_Connector_Exec," << be_idt_nl
@@ -47,7 +47,7 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node)
       << scope->local_name () << suffix << " (void);" << be_nl
       << "virtual ~" << scope->local_name () << suffix
       << " (void);";
-      
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,12 +57,17 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node)
                         -1);
     }
 
-  os_ << be_nl << be_nl
-      << "virtual void set_session_context (" 
-      << "::Components::SessionContext_ptr ctx);"
-      << be_nl << be_nl
+  const char *container_type = be_global->ciao_container_type ();
+
+  os_ << be_nl_2
+      << "virtual void set_"
+      << tao_cg->downcase (container_type)
+      << "_context ("
+      << "::Components::" << be_global->ciao_container_type ()
+      << "Context_ptr ctx);"
+      << be_nl_2
       << "virtual void configuration_complete (void);"
-      << be_nl << be_nl
+      << be_nl_2
       << "virtual void ccm_activate (void);" << be_nl
       << "virtual void ccm_passivate (void);" << be_nl
       << "virtual void ccm_remove (void);";
@@ -97,7 +102,7 @@ be_visitor_executor_ami_exh::visit_provides (be_provides *node)
   bool global = (scope->node_type () == AST_Decl::NT_root);
   const char *smart_scope = (global ? "" : "::");
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "virtual " << smart_scope << scope->full_name ()
       << "::CCM_" << t->local_name () << "_ptr" << be_nl
       << "get_";
diff --git a/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp b/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp
index 8980cf1ccbe..57ea0791ac3 100644
--- a/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp
+++ b/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp
@@ -33,13 +33,13 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
   ACE_CString class_name_str (scope->local_name ()->get_string ());
   class_name_str += suffix;
   const char *class_name = class_name_str.c_str ();
-  
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << class_name << "::"
       << class_name << " (void)" << be_idt_nl
       << ": facet_exec_ (new ";
-      
-  /// The port is the only item in the connector's scope.    
+
+  /// The port is the only item in the connector's scope.
   UTL_ScopeActiveIterator j (node, UTL_Scope::IK_decls);
   AST_Extended_Port *p =
     AST_Extended_Port::narrow_from_decl (j.item ());
@@ -50,24 +50,24 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
     {
       AST_Decl *d = i.item ();
       AST_Provides *p = AST_Provides::narrow_from_decl (d);
-      
+
       if (p != 0)
         {
           os_ << p->provides_type ()->local_name ();
         }
     }
-    
+
   os_ << suffix << " ())" << be_uidt_nl
       << "{" << be_nl
       << "}";
-      
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << class_name << "::~"
       << class_name << " (void)" << be_nl
       << "{" << be_idt_nl
       << "delete this->facet_exec_;" << be_uidt_nl
       << "}";
-      
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -76,42 +76,49 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
                          ACE_TEXT ("visit_scope() failed\n")),
                         -1);
     }
-    
-  os_ << be_nl << be_nl
+
+  const char *container_type = be_global->ciao_container_type ();
+
+  os_ << be_nl_2
       << "void" << be_nl
-      << class_name << "::set_session_context (" << be_idt_nl
-      << "::Components::SessionContext_ptr ctx)"
+      << class_name << "::set_"
+      << tao_cg->downcase (container_type)
+      << "_context (" << be_idt_nl
+      << "::Components::" << be_global->ciao_container_type ()
+      << "Context_ptr ctx)"
       << be_uidt_nl
       << "{" << be_idt_nl
-      << "this->facet_exec_->set_session_context "
+      << "this->facet_exec_->set_"
+      << tao_cg->downcase (container_type)
+      << "_context "
       << "(ctx);" << be_uidt_nl
       << "}";
-      
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << "void" << be_nl
       << class_name << "::configuration_complete (void)" << be_nl
       << "{" << be_idt_nl
       << "this->facet_exec_->_set_component (this);" << be_uidt_nl
       << "}";
-      
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << "void" << be_nl
       << class_name << "::ccm_activate (void)" << be_nl
       << "{" << be_nl
       << "}";
-      
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << "void" << be_nl
       << class_name << "::ccm_passivate (void)" << be_nl
       << "{" << be_nl
       << "}";
-      
+
   AST_Decl *s = ScopeAsDecl (this->node_->defined_in ());
   bool is_global =
    (s->node_type () == AST_Decl::NT_root);
   const char *smart_scope = (is_global ? "" : "::");
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
       << class_name << "::ccm_remove (void)" << be_nl
       << "{" << be_idt_nl
@@ -120,7 +127,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
       << "CCM_" << this->node_->local_name ()
       << "::_nil ());" << be_uidt << be_uidt_nl
       << "}";
-  
+
   return 0;
 }
 
@@ -131,24 +138,24 @@ be_visitor_executor_ami_exs::visit_provides (be_provides *node)
   AST_Decl *scope = ScopeAsDecl (t->defined_in ());
   bool global = (scope->node_type () == AST_Decl::NT_root);
   const char *smart_scope = (global ? "" : "::");
-  
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << smart_scope << scope->full_name () << "::CCM_"
       << t->local_name () << "_ptr" << be_nl
       << ScopeAsDecl (this->node_->defined_in ())->local_name ()
       << "_exec_i::get_";
-      
+
   /// The port is the only thing in the connector's scope, and
-  /// we need to insert its name into the operation name.    
+  /// we need to insert its name into the operation name.
   UTL_ScopeActiveIterator i (this->node_, UTL_Scope::IK_decls);
   AST_Decl *d = i.item ();
-  
+
   os_ << d->local_name () << "_"
       << node->local_name () << " (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->facet_exec_;" << be_uidt_nl
       << "}";
-  
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp b/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp
index 92916335bc3..e8eeef9e16e 100644
--- a/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp
+++ b/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp
@@ -88,7 +88,7 @@ be_visitor_facet_ami_exh::visit_operation (be_operation *node)
     {
       return  0;
     }
-    
+
   /// We're generating implementation operation declarations,
   /// so we can just use this visitor.
   be_visitor_operation_ih v (this->ctx_);
@@ -124,7 +124,7 @@ be_visitor_facet_ami_exh::init (bool for_impl)
   /// by -GC, which must be applied to this IDL file.
   this->handler_str_ = this->scope_name_;
   this->handler_str_ += this->smart_scope_;
-  
+
   this->handler_str_ += (for_impl ? "" : "AMI_");
   ACE_CString tmp (this->iface_name_);
   this->handler_str_ +=
@@ -199,7 +199,7 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void)
     ScopeAsDecl (this->iface_->defined_in ())->full_name ();
   const char *iface_name = this->iface_->local_name ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "class " << export_macro_.c_str () << " "
       << iface_name << suffix << be_idt_nl
       << ": public virtual ::" << scope_name << "::CCM_"
@@ -208,10 +208,10 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void)
       << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "public:" << be_idt_nl
-      << iface_name << suffix << " (void);" << be_nl << be_nl
+      << iface_name << suffix << " (void);" << be_nl_2
       << "virtual ~" << iface_name << suffix
       << " (void);";
-      
+
   if (this->visit_scope (this->iface_) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -221,25 +221,30 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void)
                          ACE_TEXT ("interface failed\n")),
                         -1);
     }
-    
-  os_ << be_nl << be_nl
-      << "virtual void set_session_context (" 
-      << "::Components::SessionContext_ptr ctx);";
-      
+
+  const char *container_type = be_global->ciao_container_type ();
+
+  os_ << be_nl_2
+      << "virtual void set_"
+      << tao_cg->downcase (container_type)
+      << "_context ("
+      << "::Components::"
+      << be_global->ciao_container_type () << "Context_ptr ctx);";
+
   AST_Decl *s = ScopeAsDecl (this->node_->defined_in ());
   bool is_global =
    (s->node_type () == AST_Decl::NT_root);
   const char *smart_scope = (is_global ? "" : "::");
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "virtual ::CORBA::Object_ptr _get_component (void);";
-      
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << "virtual void _set_component (" << be_idt_nl
       << "::" << s->name () << smart_scope
       << "CCM_" << this->node_->local_name ()
       << "_ptr);" << be_uidt;
-      
+
   os_ << be_uidt_nl << be_nl
       << "private:" << be_idt_nl
       << "::" << s->name () << smart_scope
diff --git a/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp b/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp
index f0593049bdc..5cf4cf3bbb3 100644
--- a/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp
+++ b/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp
@@ -148,7 +148,7 @@ be_visitor_facet_ami_exs::gen_reply_handler_class (void)
       << "{" << be_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << iface_name << suffix << "::~"
       << iface_name << suffix << " (void)" << be_nl
       << "{" << be_nl
@@ -215,13 +215,13 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void)
     ScopeAsDecl (this->iface_->defined_in ())->full_name ();
   const char *iface_name = this->iface_->local_name ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << iface_name << suffix << "::"
       << iface_name << suffix << " (void)" << be_nl
       << "{" << be_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << iface_name << suffix << "::~"
       << iface_name << suffix << " (void)" << be_nl
       << "{" << be_nl
@@ -239,11 +239,16 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void)
 
   ACE_CString scope_str (scope_name, 0, false);
 
-  os_ << be_nl << be_nl
+  const char *container_type = be_global->ciao_container_type ();
+
+  os_ << be_nl_2
       << "void" << be_nl
-      << iface_name << "_exec_i::set_session_context ("
+      << iface_name << "_exec_i::set_"
+      << tao_cg->downcase (container_type)
+      << "_context ("
       << be_idt_nl
-      << "::Components::SessionContext_ptr ctx)" << be_uidt_nl
+      << "::Components::" << be_global->ciao_container_type ()
+      << "Context_ptr ctx)" << be_uidt_nl
       << "{" << be_idt_nl
       << "this->context_ =" << be_idt_nl
       << "::"
@@ -256,13 +261,13 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void)
       << "throw ::CORBA::INTERNAL ();" << be_uidt_nl
       << "}" << be_uidt << be_uidt_nl
       << "}";
-      
+
   AST_Decl *s = ScopeAsDecl (this->node_->defined_in ());
   bool is_global =
    (s->node_type () == AST_Decl::NT_root);
   const char *smart_scope = (is_global ? "" : "::");
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::CORBA::Object_ptr" << be_nl
       << iface_name << "_exec_i::_get_component (void)" << be_nl
       << "{" << be_idt_nl
@@ -273,8 +278,8 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void)
       << "this->component_.in ());"
       << be_uidt << be_uidt << be_uidt_nl
       << "}";
-      
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << "void" << be_nl
       << iface_name << "_exec_i::_set_component (" << be_idt_nl
       << "::" << s->name () << smart_scope
@@ -294,7 +299,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void)
 int
 be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node)
 {
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
       << this->iface_->local_name () << "_reply_handler::"
       << node->local_name ();
@@ -334,7 +339,7 @@ be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node)
 
   os_ << "if (! ::CORBA::is_nil (this->callback_.in ()))"
       << be_idt_nl << "{" << be_idt_nl;
-      
+
   if (is_excep)
     {
       os_ << "::CCM_AMI::ExceptionHolder_i holder (excep_holder);"
@@ -366,7 +371,7 @@ be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node)
     }
 
   os_ << be_uidt_nl << "}" << be_uidt_nl;
-  
+
   os_ << be_nl
       << "::PortableServer::ObjectId_var oid =" << be_idt_nl
       << "this->poa_->servant_to_id (this);" << be_uidt_nl
@@ -379,7 +384,7 @@ be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node)
 int
 be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node)
 {
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
       << this->iface_->local_name () << "_exec_i::"
       << node->local_name ();
@@ -395,11 +400,11 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node)
                          ACE_TEXT ("list failed\n")),
                         -1);
     }
-    
+
   AST_Decl *scope = ScopeAsDecl (this->iface_->defined_in ());
   bool global = (scope->node_type () == AST_Decl::NT_root);
   const char *smart_scope = (global ? "" : "::");
-  
+
   const char *prefix = "AMI4CCM_";
   ACE_CString iface_str (this->iface_->local_name ());
   ACE_CString orig_iface_str (
@@ -412,23 +417,20 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node)
       << orig_iface_name << "_var receptacle_objref =" << be_idt_nl
       << "this->context_->get_connection_ami4ccm_port_ami4ccm_uses ();"
       << be_uidt_nl << be_nl;
-      
+
   os_ << "if (! ::CORBA::is_nil (receptacle_objref.in ()))"
       << be_idt_nl
       << "{" << be_idt_nl
       << "::" << scope->full_name () << smart_scope << "AMI_"
       << orig_iface_name << "Handler_var the_handler_var;"
-      << be_nl << be_nl;
-      
+      << be_nl_2;
+
   os_ << "if (! ::CORBA::is_nil (ami_handler))" << be_idt_nl
       << "{" << be_idt_nl
-      << "::CIAO::Context_Impl_Base *ctx_base =" << be_idt_nl
-      << "dynamic_cast <CIAO::Context_Impl_Base *> (this->context_.in ());"
-      << be_uidt_nl
-      << "::CIAO::Container_i *ctr =" << be_idt_nl
-      << "dynamic_cast <CIAO::Container_i *> (ctx_base->_ciao_the_Container ());"
-      << be_uidt_nl
-      << "::PortableServer::POA_ptr poa = ctr->the_POA ();" << be_nl
+      << "::CORBA::Object_var objvar =" << be_idt_nl
+      << "this->context_->resolve_service_reference (\"POA\");" << be_uidt_nl
+      << "::PortableServer::POA_var poa =" << be_idt_nl
+      << "::PortableServer::POA::_narrow (objvar.in ());" << be_uidt_nl
       << this->iface_->local_name () << "_reply_handler *handler = 0;"
       << be_nl
       << "ACE_NEW (handler, " << be_nl
@@ -436,8 +438,8 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node)
       << "_reply_handler (ami_handler, poa));" << be_nl
       << "::PortableServer::ServantBase_var owner_transfer (handler);"
       << be_nl
-      << "::PortableServer::ObjectId_var oid =" << be_idt_nl
-      << "poa->activate_object (handler);" << be_uidt_nl
+      << "::PortableServer::ObjectId_var oid = "
+      << "poa->activate_object (handler);" << be_nl
       << "::CORBA::Object_var handler_obj = poa->id_to_reference (oid.in ());"
       << be_nl
       << "the_handler_var = ::" << scope->full_name ()
@@ -470,8 +472,17 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node)
     }
 
   os_ << ");" << be_uidt << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}";
+      << "}" << be_uidt << be_nl;
+
+  /// Throw an INV_OBJREF exception because there is no connection
+  /// see AMI4CCM mars/11-xx-yy , 2011
+
+  os_ << "else" << be_idt_nl
+      << "{" << be_idt_nl
+      << "throw ::CORBA::INV_OBJREF ();" << be_uidt_nl
+      << "}" << be_uidt << be_uidt_nl;
+
+  os_ << "}";
 
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_constant/constant_ch.cpp b/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
index 9dfca5fbe24..0e7ae60c80b 100644
--- a/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
+++ b/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
@@ -37,7 +37,7 @@ be_visitor_constant_ch::visit_constant (be_constant *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // If we are defined in the outermost scope, then the value is assigned
@@ -56,7 +56,7 @@ be_visitor_constant_ch::visit_constant (be_constant *node)
       bnt = td->base_node_type ();
     }
 
-  *os << be_nl << be_nl;
+  *os << be_nl_2;
 
   if (! node->is_nested ())
     {
@@ -126,7 +126,16 @@ be_visitor_constant_ch::visit_constant (be_constant *node)
   if (!node->is_nested ()
       || (be_global->gen_inline_constants () && !forbidden_in_class))
     {
-      *os << " = " << node->constant_value ();
+      if (etype == AST_Expression::EV_longdouble)
+        {
+          *os << " (" << be_idt_nl
+              << "ACE_CDR::LongDoubleAssign ("
+              << node->constant_value () << "))" << be_uidt;
+        }
+      else
+        {
+          *os << " = " << node->constant_value ();
+        }
     }
 
   *os << ";";
diff --git a/TAO_IDL/be/be_visitor_constant/constant_cs.cpp b/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
index 58d6e600d15..6d4ceca7677 100644
--- a/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
+++ b/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
@@ -39,7 +39,7 @@ be_visitor_constant_cs::visit_constant (be_constant *node)
     }
 
   AST_Decl::NodeType snt = node->defined_in ()->scope_node_type ();
-  bool in_class = (snt != AST_Decl::NT_root 
+  bool in_class = (snt != AST_Decl::NT_root
                    && snt != AST_Decl::NT_module);
   if (be_global->gen_inline_constants () && !in_class)
     {
@@ -57,10 +57,10 @@ be_visitor_constant_cs::visit_constant (be_constant *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << be_nl << be_nl;
+  *os << be_nl_2;
   if (be_global->gen_inline_constants () && !forbidden_in_class)
     {
       // Some compilers (especially Microsoft) always define storeage
@@ -69,7 +69,7 @@ be_visitor_constant_cs::visit_constant (be_constant *node)
       *os << "#ifndef ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE" << be_nl << "  ";
     }
   *os << "const ";
-  
+
   if (node->et () == AST_Expression::EV_enum)
     {
       *os << node->enum_full_name ();
@@ -80,12 +80,23 @@ be_visitor_constant_cs::visit_constant (be_constant *node)
     }
 
   *os << " " << node->name ();
+
   if (!be_global->gen_inline_constants () || forbidden_in_class)
     {
       // For those constants not defined in the outermost scope,
       // or in a module, they get assigned to their values in the source file.
-      *os << " = " << node->constant_value ();
+      if (etype == AST_Expression::EV_longdouble)
+        {
+          *os << " (" << be_idt_nl
+              << "ACE_CDR::LongDoubleAssign ("
+              << node->constant_value () << "))" << be_uidt;
+        }
+      else
+        {
+          *os << " = " << node->constant_value ();
+        }
     }
+
   *os << ";";
 
   if (be_global->gen_inline_constants () && !forbidden_in_class)
diff --git a/TAO_IDL/be/be_visitor_dds_ts_idl.cpp b/TAO_IDL/be/be_visitor_dds_ts_idl.cpp
new file mode 100644
index 00000000000..51409cfbb2a
--- /dev/null
+++ b/TAO_IDL/be/be_visitor_dds_ts_idl.cpp
@@ -0,0 +1,372 @@
+
+//=============================================================================
+/**
+ *  @file    be_visitor_dds_ts_idl.cpp
+ *
+ *  $Id$
+ *
+ *  Visitor generating code for DDS type support IDL files.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+// ********************************
+// Visitor for DDS type support IDL
+// ********************************
+
+#include "be_visitor_dds_ts_idl.h"
+#include "be_visitor_context.h"
+#include "be_root.h"
+#include "be_structure.h"
+#include "be_union.h"
+#include "be_valuetype.h"
+#include "be_extern.h"
+#include "be_util.h"
+
+#include "utl_string.h"
+#include "utl_identifier.h"
+
+be_visitor_dds_ts_idl::be_visitor_dds_ts_idl (
+      be_visitor_context *ctx)
+  : be_visitor_scope (ctx),
+    os_ptr_ (0)
+{
+}
+
+be_visitor_dds_ts_idl::~be_visitor_dds_ts_idl (void)
+{
+}
+
+int
+be_visitor_dds_ts_idl::visit_root (be_root *node)
+{
+  if (this->init_file () == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_dds_ts_idl")
+                         ACE_TEXT ("::visit_root - ")
+                         ACE_TEXT ("failed to initialize\n")),
+                        -1);
+    }
+
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_dds_ts_idl")
+                         ACE_TEXT ("::visit_root - ")
+                         ACE_TEXT ("codegen for scope failed\n")),
+                        -1);
+    }
+
+  this->fini_file ();
+
+  return 0;
+}
+
+int
+be_visitor_dds_ts_idl::visit_module (be_module *node)
+{
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_dds_ts_idl")
+                         ACE_TEXT ("::visit_module - ")
+                         ACE_TEXT ("codegen for scope failed\n")),
+                        -1);
+    }
+
+  return 0;
+}
+
+int
+be_visitor_dds_ts_idl::visit_structure (be_structure *node)
+{
+  return this->process_node (node);
+}
+
+int
+be_visitor_dds_ts_idl::visit_union (be_union *node)
+{
+  return this->process_node (node);
+}
+
+int
+be_visitor_dds_ts_idl::visit_valuetype (be_valuetype *node)
+{
+  return this->process_node (node);
+}
+
+int
+be_visitor_dds_ts_idl::process_node (be_type *node)
+{
+  be_util::gen_nesting_open (*this->os_ptr_, node);
+
+  this->gen_datawriter (node);
+  this->gen_datareader (node);
+
+  be_util::gen_nesting_close (*this->os_ptr_, node);
+
+  return 0;
+}
+
+void
+be_visitor_dds_ts_idl::gen_datawriter (be_type *node)
+{
+  TAO_OutStream &los (*this->os_ptr_);
+  const char *lname = node->local_name ()->get_string ();
+
+  los << be_nl
+      << "local interface " << lname
+      << "IDLDataWriter : ::DDS::DataWriter" << be_nl
+      << "{" << be_idt;
+
+  los << be_nl
+      << "DDS::InstanceHandle_t register_instance (" << be_idt_nl
+      << "in " << lname << " instance_data);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::InstanceHandle_t register_instance_w_timestamp ("
+      << be_idt_nl
+      << "in " << lname << " instance_data," << be_nl
+      << "in DDS::Time_t source_timestamp);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t unregister_instance (" << be_idt_nl
+      << "in " << lname << " instance_data," << be_nl
+      << "in DDS::InstanceHandle_t handle);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t unregister_instance_w_timestamp ("
+      << be_idt_nl
+      << "in " << lname << " instance_data," << be_nl
+      << "in DDS::InstanceHandle_t handle," << be_nl
+      << "in DDS::Time_t source_timestamp);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t write (" << be_idt_nl
+      << "in " << lname << " instance_data," << be_nl
+      << "in DDS::InstanceHandle_t handle);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t write_w_timestamp (" << be_idt_nl
+      << "in " << lname << " instance_data," << be_nl
+      << "in DDS::InstanceHandle_t handle," << be_nl
+      << "in DDS::Time_t source_timestamp);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t dispose (" << be_idt_nl
+      << "in " << lname << " instance_data," << be_nl
+      << "in DDS::InstanceHandle_t instance_handle);"
+      << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t dispose_w_timestamp ("
+      << be_idt_nl
+      << "in " << lname << " instance_data," << be_nl
+      << "in DDS::InstanceHandle_t instance_handle," << be_nl
+      << "in DDS::Time_t source_timestamp);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t get_key_value (" << be_idt_nl
+      << "inout " << lname << " key_holder," << be_nl
+      << "in DDS::InstanceHandle_t handle);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::InstanceHandle_t lookup_instance ("
+      << be_idt_nl
+      << "in " << lname << " instance_data);" << be_uidt;
+
+  los << be_uidt_nl
+      << "};";
+}
+
+void
+be_visitor_dds_ts_idl::gen_datareader (be_type *node)
+{
+  TAO_OutStream &los (*this->os_ptr_);
+  const char *lname = node->local_name ()->get_string ();
+
+  los << be_nl_2
+      << "local interface " << lname
+      << "IDLDataReader : ::DDS::DataReader" << be_nl
+      << "{" << be_idt;
+
+  los << be_nl
+      << "DDS::ReturnCode_t read (" << be_idt_nl
+      << "inout " << lname << "Seq data_values," << be_nl
+      << "inout DDS::SampleInfoSeq sample_infos," << be_nl
+      << "in long max_samples," << be_nl
+      << "in DDS::SampleStateMask sample_states," << be_nl
+      << "in DDS::ViewStateMask view_states," << be_nl
+      << "in DDS::InstanceStateMask instance_states);"
+      << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t take (" << be_idt_nl
+      << "inout " << lname << "Seq data_values," << be_nl
+      << "inout DDS::SampleInfoSeq sample_infos," << be_nl
+      << "in long max_samples," << be_nl
+      << "in DDS::SampleStateMask sample_states," << be_nl
+      << "in DDS::ViewStateMask view_states," << be_nl
+      << "in DDS::InstanceStateMask instance_states);"
+      << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t read_w_condition (" << be_idt_nl
+      << "inout " << lname << "Seq data_values," << be_nl
+      << "inout DDS::SampleInfoSeq sample_infos," << be_nl
+      << "in long max_samples," << be_nl
+      << "in DDS::ReadCondition a_condition);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t take_w_condition (" << be_idt_nl
+      << "inout " << lname << "Seq data_values," << be_nl
+      << "inout DDS::SampleInfoSeq sample_infos," << be_nl
+      << "in long max_samples," << be_nl
+      << "in DDS::ReadCondition a_condition);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t read_next_sample (" << be_idt_nl
+      << "inout " << lname << " data_values," << be_nl
+      << "inout DDS::SampleInfo sample_info);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t take_next_sample (" << be_idt_nl
+      << "inout " << lname << " data_values," << be_nl
+      << "inout DDS::SampleInfo sample_info);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t read_instance (" << be_idt_nl
+      << "inout " << lname << "Seq data_values," << be_nl
+      << "inout DDS::SampleInfoSeq sample_infos," << be_nl
+      << "in long max_samples," << be_nl
+      << "in DDS::InstanceHandle_t a_handle," << be_nl
+      << "in DDS::SampleStateMask sample_states," << be_nl
+      << "in DDS::ViewStateMask view_states," << be_nl
+      << "in DDS::InstanceStateMask instance_states);"
+      << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t take_instance (" << be_idt_nl
+      << "inout " << lname << "Seq data_values," << be_nl
+      << "inout DDS::SampleInfoSeq sample_infos," << be_nl
+      << "in long max_samples," << be_nl
+      << "in DDS::InstanceHandle_t a_handle," << be_nl
+      << "in DDS::SampleStateMask sample_states," << be_nl
+      << "in DDS::ViewStateMask view_states," << be_nl
+      << "in DDS::InstanceStateMask instance_states);"
+      << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t read_next_instance (" << be_idt_nl
+      << "inout " << lname << "Seq data_values," << be_nl
+      << "inout DDS::SampleInfoSeq sample_infos," << be_nl
+      << "in long max_samples," << be_nl
+      << "in DDS::InstanceHandle_t previous_handle," << be_nl
+      << "in DDS::SampleStateMask sample_states," << be_nl
+      << "in DDS::ViewStateMask view_states," << be_nl
+      << "in DDS::InstanceStateMask instance_states);"
+      << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t take_next_instance (" << be_idt_nl
+      << "inout " << lname << "Seq data_values," << be_nl
+      << "inout DDS::SampleInfoSeq sample_infos," << be_nl
+      << "in long max_samples," << be_nl
+      << "in DDS::InstanceHandle_t previous_handle," << be_nl
+      << "in DDS::SampleStateMask sample_states," << be_nl
+      << "in DDS::ViewStateMask view_states," << be_nl
+      << "in DDS::InstanceStateMask instance_states);"
+      << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t read_next_instance_w_condition ("
+      << be_idt_nl
+      << "inout " << lname << "Seq data_values," << be_nl
+      << "inout DDS::SampleInfoSeq sample_infos," << be_nl
+      << "in long max_samples," << be_nl
+      << "in DDS::InstanceHandle_t previous_handle," << be_nl
+      << "in DDS::ReadCondition a_condition);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t take_next_instance_w_condition ("
+      << be_idt_nl
+      << "inout " << lname << "Seq data_values," << be_nl
+      << "inout DDS::SampleInfoSeq sample_infos," << be_nl
+      << "in long max_samples," << be_nl
+      << "in DDS::InstanceHandle_t previous_handle," << be_nl
+      << "in DDS::ReadCondition a_condition);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t return_loan (" << be_idt_nl
+      << "inout " << lname << "Seq data_values," << be_nl
+      << "inout DDS::SampleInfoSeq sample_infos);"
+      << be_uidt;
+
+  los << be_nl_2
+      << "DDS::ReturnCode_t get_key_value (" << be_idt_nl
+      << "inout " << lname << " key_holder," << be_nl
+      << "in DDS::InstanceHandle_t handle);" << be_uidt;
+
+  los << be_nl_2
+      << "DDS::InstanceHandle_t lookup_instance ("
+      << be_idt_nl
+      << "in " << lname << " instance_data);" << be_uidt;
+
+  los << be_uidt_nl
+      << "};";
+}
+
+int
+be_visitor_dds_ts_idl::init_file (void)
+{
+  /// Open an IDL file for writing.
+  ACE_CString orig (
+    idl_global->stripped_filename ()->get_string ());
+
+  ACE_CString fname_noext (orig.substr (0, orig.rfind ('.')));
+  fname_noext += "TypeSupport";
+
+  ACE_CString fname (fname_noext);
+  fname += ".idl";
+
+  ACE_NEW_RETURN (this->os_ptr_,
+                  TAO_OutStream,
+                  -1);
+
+  int status = this->os_ptr_->open (fname.c_str ());
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_root_ts_idl::init - ")
+                         ACE_TEXT ("Error opening DDS type support ")
+                         ACE_TEXT ("IDL file\n")),
+                        -1);
+    }
+
+  this->os_ptr_->gen_ifdef_macro (fname_noext.c_str (),
+                                  "IDL",
+                                  false);
+
+  *this->os_ptr_ << be_nl_2
+                 << "#include <dds_rtf2_dcps.idl>" << be_nl_2
+                 << "#include \""
+                 << idl_global->filename ()->get_string ()
+                 << "\"";
+
+  return 0;
+}
+
+void
+be_visitor_dds_ts_idl::fini_file (void)
+{
+  *this->os_ptr_ << be_nl_2
+                 << "#endif /* ifndef */\n"
+                 << "\n";
+
+  delete this->os_ptr_;
+  this->os_ptr_ = 0;
+}
diff --git a/TAO_IDL/be/be_visitor_enum.cpp b/TAO_IDL/be/be_visitor_enum.cpp
index 83f5e627b43..d8940c09d32 100644
--- a/TAO_IDL/be/be_visitor_enum.cpp
+++ b/TAO_IDL/be/be_visitor_enum.cpp
@@ -31,6 +31,5 @@
 #include "be_visitor_enum/any_op_cs.cpp"
 #include "be_visitor_enum/cdr_op_ch.cpp"
 #include "be_visitor_enum/cdr_op_cs.cpp"
-#include "be_visitor_enum/serializer_op_ch.cpp"
-#include "be_visitor_enum/serializer_op_cs.cpp"
+
 
diff --git a/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp b/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
index 2761135062a..af30d3f2c7a 100644
--- a/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
@@ -39,11 +39,11 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   be_module *module = 0;
-  
+
   if (node->is_nested ())
     {
       AST_Decl *d = node;
@@ -68,20 +68,20 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node)
           // Some compilers handle "any" operators in a namespace
           // corresponding to their module, others do not.
           *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-      
+
           be_util::gen_nested_namespace_begin (os, module);
-      
+
           // Generate the Any <<= and >>= operators.
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << macro << " void operator<<= (::CORBA::Any &, ::" << node->name ()
               << ");" << be_nl;
           *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ::"
               << node->name () << " &);";
-      
+
           be_util::gen_nested_namespace_end (os, module);
-      
+
           // Emit #else.
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "#else\n\n";
         }
     }
@@ -89,7 +89,7 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node)
   *os << be_global->core_versioning_begin () << be_nl;
 
   // Generate the Any <<= and >>= operators.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << ");" << be_nl;
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
diff --git a/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
index 26686877228..801cd05f882 100644
--- a/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
@@ -39,7 +39,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl;
 
   *os << be_global->core_versioning_begin () << be_nl;
@@ -62,7 +62,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
           << "return false;" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "template<>" << be_nl
           << "::CORBA::Boolean" << be_nl
           << "Any_Basic_Impl_T<" << node->name ()
@@ -70,9 +70,9 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
           << "}" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
-  
+
 
   *os << be_global->core_versioning_end () << be_nl;
 
@@ -101,10 +101,10 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
           // Some compilers handle "any" operators in a namespace corresponding
           // to their module, others do not.
           *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-      
+
           be_util::gen_nested_namespace_begin (os, module);
-      
-      
+
+
           // Generate the Any <<= and >>= operator declarations
           // Any <<= and >>= operators.
           *os << "void operator<<= (" << be_idt << be_idt_nl
@@ -118,8 +118,8 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
               << "::" << node->tc_name () << "," << be_nl
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt_nl
-              << "}" << be_nl << be_nl;
-      
+              << "}" << be_nl_2;
+
           *os << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
               << "const ::CORBA::Any &_tao_any," << be_nl
               << "::" << node->name () << " &_tao_elem" << be_uidt_nl
@@ -133,11 +133,11 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
               << "_tao_elem " << be_uidt_nl
               << ");" << be_uidt << be_uidt << be_uidt_nl
               << "}";
-      
+
           be_util::gen_nested_namespace_end (os, module);
-      
+
           // Emit #else.
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "#else\n";
         }
     }
@@ -157,7 +157,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
       << node->tc_name () << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
diff --git a/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp b/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
index fcac3e1c015..f24b8f1494e 100644
--- a/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
@@ -36,8 +36,8 @@ be_visitor_enum_cdr_op_ch::visit_enum (be_enum *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -48,7 +48,7 @@ be_visitor_enum_cdr_op_ch::visit_enum (be_enum *node)
   *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator>> (TAO_InputCDR &strm, " << node->name ()
       << " &_tao_enumerator);" << be_nl;
-      
+
   if (be_global->gen_ostream_operators ())
     {
       *os << be_nl
diff --git a/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp b/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
index cc754ea58da..e543df8230b 100644
--- a/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
@@ -37,8 +37,8 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -47,7 +47,7 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node)
       << "{" << be_idt_nl
       << "return strm << static_cast< ::CORBA::ULong> (_tao_enumerator);"
       << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean operator>> (TAO_InputCDR &strm, "
       << node->name () << " & _tao_enumerator)" << be_nl
@@ -62,7 +62,7 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node)
       << "}" << be_uidt_nl << be_nl
       << "return _tao_success;" << be_uidt_nl
       << "}" << be_nl;
-      
+
   if (be_global->gen_ostream_operators ())
     {
       node->gen_ostream_operator (os, false);
diff --git a/TAO_IDL/be/be_visitor_enum/enum_ch.cpp b/TAO_IDL/be/be_visitor_enum/enum_ch.cpp
index 57f16d8986e..2e7336b3d15 100644
--- a/TAO_IDL/be/be_visitor_enum/enum_ch.cpp
+++ b/TAO_IDL/be/be_visitor_enum/enum_ch.cpp
@@ -43,8 +43,8 @@ be_visitor_enum_ch::visit_enum (be_enum *node)
   // Comma to be generated by the scope visitor.
   this->ctx_->comma (1);
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "enum " << node->local_name () << be_nl;
   *os << "{" << be_idt_nl;
@@ -60,7 +60,7 @@ be_visitor_enum_ch::visit_enum (be_enum *node)
      }
 
   *os << be_uidt_nl;
-  *os << "};" << be_nl << be_nl;
+  *os << "};" << be_nl_2;
 
   // As per the ORBOS spec, we need the following typedef
   *os << "typedef " << node->local_name () << " &" << node->local_name ()
diff --git a/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp b/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp
deleted file mode 100644
index fefd745ed86..00000000000
--- a/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-// ***************************************************************************
-// Enum visitor for generating Serializer operator declarations in the client header
-// ***************************************************************************
-
-be_visitor_enum_serializer_op_ch::be_visitor_enum_serializer_op_ch (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_enum_serializer_op_ch::~be_visitor_enum_serializer_op_ch (void)
-{
-}
-
-int
-be_visitor_enum_serializer_op_ch::visit_enum (be_enum *node)
-{
-  if (node->cli_hdr_serializer_op_gen () || node->imported ())
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  // generate the Serializer << and >> operators
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator<< (TAO::DCPS::Serializer &, const " << node->name ()
-      << " &);" << be_nl;
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>> (TAO::DCPS::Serializer &, "
-      << node->name () << " &);";
-
-  node->cli_hdr_serializer_op_gen (1);
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp b/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp
deleted file mode 100644
index dbe1732044e..00000000000
--- a/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-// ***************************************************************************
-// Enum visitor for generating Serializer operator declarations in the client
-// stubs file.
-// ***************************************************************************
-
-be_visitor_enum_serializer_op_cs::be_visitor_enum_serializer_op_cs (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_enum_serializer_op_cs::~be_visitor_enum_serializer_op_cs (void)
-{
-}
-
-int
-be_visitor_enum_serializer_op_cs::visit_enum (be_enum *node)
-{
-  if (node->cli_stub_serializer_op_gen () || node->imported ())
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *os << "::CORBA::Boolean operator<< (TAO::DCPS::Serializer &strm, "
-      << "const " << node->name () << " &_tao_enumval)" << be_nl
-      << "{" << be_idt_nl
-      << "::CORBA::ULong _tao_temp = _tao_enumval;" << be_nl
-      << "return strm << _tao_temp;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  *os << "::CORBA::Boolean operator>> (TAO::DCPS::Serializer &strm, "
-      << node->name () << " &_tao_enumval)" << be_nl
-      << "{" << be_idt_nl
-      << "::CORBA::ULong _tao_temp = 0;" << be_nl
-      << "::CORBA::Boolean _tao_result = strm >> _tao_temp;" << be_nl << be_nl
-      << "if (_tao_result == 1)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "_tao_enumval = static_cast<" << node->name ()
-      << "> (_tao_temp);" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return _tao_result;" << be_uidt_nl
-      << "}";
-
-  node->cli_stub_serializer_op_gen (true);
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp b/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
index cf5f5d9ed18..80540235feb 100644
--- a/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
@@ -40,7 +40,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   be_module *module = 0;
@@ -68,10 +68,10 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
           // Some compilers handle "any" operators in a namespace
           // corresponding to their module, others do not.
           *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-      
+
           be_util::gen_nested_namespace_begin (os, module);
-      
-          *os << be_nl << be_nl
+
+          *os << be_nl_2
               << macro << " void operator<<= (::CORBA::Any &, const ::" << node->name ()
               << " &); // copying version" << be_nl;
           *os << macro << " void operator<<= (::CORBA::Any &, ::" << node->name ()
@@ -80,18 +80,18 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
               << node->name () << " *&); // deprecated\n";
           *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ::"
               << node->name () << " *&);";
-      
+
           be_util::gen_nested_namespace_end (os, module);
-      
+
           // Emit #else.
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "#else\n\n";
         }
     }
-      
+
   *os << be_global->core_versioning_begin () << be_nl;
-  
-  *os << be_nl << be_nl
+
+  *os << be_nl_2
       << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
       << " &); // copying version" << be_nl;
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
@@ -107,7 +107,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
     {
       *os << "\n\n#endif";
     }
-  
+
   // All we have to do is to visit the scope and generate code.
   if (this->visit_scope (node) == -1)
     {
diff --git a/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
index 7295a43fa2a..a1cecbb2468 100644
--- a/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    any_op_cs.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for the Any operators for Exceptions.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    any_op_cs.cpp
+ *
+ *  $Id$
+ *
+ *  Visitor generating code for the Any operators for Exceptions.
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 // ***************************************************************************
 // Exception visitor for generating Any operator declarations in the client
@@ -43,7 +40,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
@@ -51,7 +48,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
 
   if (!node->is_local ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "namespace TAO" << be_nl
           << "{" << be_idt_nl
           << "template<>" << be_nl
@@ -61,7 +58,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
           << "TAO_InputCDR & cdr" << be_uidt_nl
           << ")" << be_uidt_nl
           << "{" << be_idt_nl
-          << "::CORBA::String_var id;" << be_nl << be_nl
+          << "::CORBA::String_var id;" << be_nl_2
           << "if (!(cdr >> id.out ()))" << be_idt_nl
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
@@ -76,7 +73,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
           << "}" << be_uidt
-          << be_nl << be_nl
+          << be_nl_2
           << "return true;" << be_uidt_nl
           << "}" << be_uidt_nl
           << "}";
@@ -89,7 +86,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
   // type is inserted into an Any and then marshaled.
   else
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "namespace TAO" << be_nl
           << "{" << be_idt_nl
           << "template<>" << be_nl
@@ -100,7 +97,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
           << "return false;" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "template<>" << be_nl
           << "::CORBA::Boolean" << be_nl
           << "Any_Dual_Impl_T<" << node->name ()
@@ -110,7 +107,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
           << "}" << be_uidt_nl
           << "}";
     }
-  
+
   *os << be_global->core_versioning_end () << be_nl;
 
   be_module *module = 0;
@@ -143,7 +140,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
 
           // Copying insertion operator.
 
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "// Copying insertion." << be_nl
               << "void operator<<= (" << be_idt << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
@@ -157,7 +154,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
               << "::" << node->tc_name () << "," << be_nl
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           // Non-copying insertion operator."
           *os << "// Non-copying insertion." << be_nl
@@ -173,7 +170,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
               << "::" << node->tc_name () << "," << be_nl
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           // Extraction to non-const pointer operator.
           *os << "// Extraction to non-const pointer (deprecated)." << be_nl
@@ -186,7 +183,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
               << "const ::" << node->name () << " *&> (" << be_nl
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           // Extraction to const pointer operator.
           *os << "// Extraction to const pointer." << be_nl
@@ -204,21 +201,21 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt << be_uidt_nl
               << "}";
-          
+
           be_util::gen_nested_namespace_end (os, module);
-          
+
           // Emit #else.
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "#else\n";
         }
     }
-  
-  
+
+
   *os << be_global->core_versioning_begin () << be_nl;
 
   // Copying insertion operator.
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// Copying insertion." << be_nl
       << "void operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
@@ -232,7 +229,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << node->tc_name () << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Non-copying insertion operator."
   *os << "// Non-copying insertion." << be_nl
@@ -248,7 +245,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << node->tc_name () << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Extraction to non-const pointer operator.
   *os << "// Extraction to non-const pointer (deprecated)." << be_nl
@@ -261,7 +258,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << "const " << node->name () << " *&> (" << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Extraction to const pointer operator.
   *os << "// Extraction to const pointer." << be_nl
@@ -281,12 +278,12 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << "}";
 
   *os << be_global->core_versioning_end () << be_nl;
-  
+
   if (module != 0)
     {
       *os << "\n\n#endif";
     }
-  
+
   // all we have to do is to visit the scope and generate code
   if (this->visit_scope (node) == -1)
     {
diff --git a/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp b/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
index 70351c7ebcf..9a12dcf6f85 100644
--- a/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
@@ -39,12 +39,12 @@ be_visitor_exception_cdr_op_ch::visit_exception (be_exception *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator<< (TAO_OutputCDR &, const " << node->name ()
       << " &);" << be_nl;
@@ -69,7 +69,7 @@ be_visitor_exception_cdr_op_ch::visit_exception (be_exception *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception_cdr_op_ch::"
                          "visit_exception - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
diff --git a/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp b/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
index 6b4a0e5759e..6088791ee71 100644
--- a/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
@@ -39,13 +39,13 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception_cdr_op_cs::"
                          "visit_exception - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   *os << be_global->core_versioning_begin () << be_nl;
@@ -53,7 +53,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl
       << "TAO_OutputCDR &strm," << be_nl
       << "const " << node->name () << " &_tao_aggregate" << be_uidt_nl
@@ -71,9 +71,9 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_exception_cdr_op_cs::"
                              "visit_exception - "
-                             "codegen for field decl scope failed\n"), 
+                             "codegen for field decl scope failed\n"),
                             -1);
-        }        
+        }
 
       // some members
       *os << "// First marshal the repository ID." << be_nl
@@ -87,7 +87,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_exception_cdr_op_cs::"
                              "visit_exception - "
-                             "codegen for scope failed\n"), 
+                             "codegen for scope failed\n"),
                             -1);
         }
 
@@ -105,7 +105,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
           << "return (strm << _tao_aggregate._rep_id ());" << be_uidt_nl;
     }
 
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   // Set the substate as generating code for the input operator.
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
@@ -150,7 +150,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_exception_cdr_op_cs::"
                              "visit_exception - "
-                             "codegen for scope failed\n"), 
+                             "codegen for scope failed\n"),
                             -1);
         }
 
@@ -178,7 +178,7 @@ int
 be_visitor_exception_cdr_op_cs::post_process (be_decl *bd)
 {
   // This checks for members of an enum 'non-scope' declared inside
-  // the exception. If an enum val is actually a member, it will 
+  // the exception. If an enum val is actually a member, it will
   // have node type NT_field.
   if (bd->node_type () == AST_Decl::NT_enum_val)
     {
diff --git a/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp b/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
index f7004e00d38..19f6b90b04e 100644
--- a/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
+++ b/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
@@ -147,13 +147,13 @@ be_visitor_exception_ctor_assign::visit_interface (be_interface *node)
   if (this->ctx_->exception ()) // Special constructor.
     {
       *os << "this->" << bd->local_name () << " = TAO::Objref_Traits<"
-          << node->name () << ">::duplicate (_tao_" 
+          << node->name () << ">::duplicate (_tao_"
           << bd->local_name () << ");";
     }
   else
     {
       *os << "this->" << bd->local_name () << " = TAO::Objref_Traits<"
-          << node->name () << ">::duplicate (_tao_excp." 
+          << node->name () << ">::duplicate (_tao_excp."
           << bd->local_name () << ".in ());";
     }
 
@@ -350,7 +350,7 @@ be_visitor_exception_ctor_assign::visit_structure_fwd (
 {
   be_structure *s =
     be_structure::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_structure (s);
 }
 
@@ -381,7 +381,7 @@ be_visitor_exception_ctor_assign::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
     be_union::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_union (u);
 }
 
diff --git a/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
index 333b74e15a4..3d1b21a4671 100644
--- a/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
+++ b/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
@@ -39,10 +39,10 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << be_nl << be_nl << "class " << be_global->stub_export_macro ()
+  *os << be_nl_2 << "class " << be_global->stub_export_macro ()
             << " " << node->local_name ()
             << " : public ::CORBA::UserException" << be_nl;
   *os << "{" << be_nl
@@ -68,19 +68,19 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
 
   // Assignment operator.
   *os << node->local_name () << " &operator= (const "
-      << node->local_name () << " &);" << be_nl << be_nl;
+      << node->local_name () << " &);" << be_nl_2;
 
   if (be_global->any_support ())
     {
-      *os << "static void _tao_any_destructor (void *);" << be_nl << be_nl;
+      *os << "static void _tao_any_destructor (void *);" << be_nl_2;
     }
 
   *os << "static " << node->local_name ()
       << " *_downcast ( ::CORBA::Exception *);" << be_nl
       << "static const " << node->local_name ()
-      << " *_downcast ( ::CORBA::Exception const *);" << be_nl << be_nl;
+      << " *_downcast ( ::CORBA::Exception const *);" << be_nl_2;
 
-  *os << "static ::CORBA::Exception *_alloc (void);" << be_nl << be_nl;
+  *os << "static ::CORBA::Exception *_alloc (void);" << be_nl_2;
 
   *os << "virtual ::CORBA::Exception *"
       << "_tao_duplicate (void) const;\n" << be_nl
@@ -108,7 +108,7 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
 
   if (be_global->tc_support ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;";
     }
 
diff --git a/TAO_IDL/be/be_visitor_exception/exception_ci.cpp b/TAO_IDL/be/be_visitor_exception/exception_ci.cpp
index 5464067f9ee..e9e2a557895 100644
--- a/TAO_IDL/be/be_visitor_exception/exception_ci.cpp
+++ b/TAO_IDL/be/be_visitor_exception/exception_ci.cpp
@@ -40,7 +40,7 @@ int be_visitor_exception_ci::visit_exception (be_exception *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception::"
                          "visit_exception -"
-                         "code for inline failed\n"), 
+                         "code for inline failed\n"),
                         -1);
     }
 
diff --git a/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 64e765b5865..039d043b689 100644
--- a/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -94,11 +94,11 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
                             -1);
         }
 
-      *os << be_uidt_nl << "}" << be_nl << be_nl;
+      *os << be_uidt_nl << "}" << be_nl_2;
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from " << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Default constructor.
   *os << node->name () << "::" << node->local_name ()
@@ -108,13 +108,13 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       << "\"" << node->local_name () << "\"" << be_uidt_nl
       << ")" << be_uidt << be_uidt << be_uidt_nl;
   *os << "{" << be_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   // Destructor.
   *os << node->name () << "::~" << node->local_name ()
       << " (void)" << be_nl;
   *os << "{" << be_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   // Copy constructor.
   *os << node->name () << "::" << node->local_name () << " (const ::"
@@ -145,7 +145,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
     }
 
   *os << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Assignment operator.
   *os << node->name () << "&" << be_nl;
@@ -170,7 +170,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
   *os << be_nl
       << "return *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   if (be_global->any_support ())
     {
@@ -182,7 +182,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
           << "static_cast<"
           << node->local_name () << " *> (_tao_void_pointer);" << be_uidt_nl
           << "delete _tao_tmp_pointer;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
 
   // Non-const downcast method.
@@ -191,7 +191,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
   *os << "{" << be_idt_nl;
   *os << "return dynamic_cast<" << node->local_name ()
       << " *> (_tao_excp);" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   // Const downcast method.
   *os << "const " << node->name () << " *" << be_nl;
@@ -200,7 +200,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
   *os << "{" << be_idt_nl;
   *os << "return dynamic_cast<const " << node->local_name ()
       << " *> (_tao_excp);" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   // Generate the _alloc method.
   *os << "::CORBA::Exception *" << node->name ()
@@ -210,7 +210,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       << "ACE_NEW_RETURN (retval, ::" << node->name ()
       << ", 0);" << be_nl
       << "return retval;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   *os << "::CORBA::Exception *" << be_nl
       << node->name () << "::_tao_duplicate (void) const" << be_nl
@@ -222,12 +222,12 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       << "0" << be_uidt_nl
       << ");" << be_uidt_nl
       << "return result;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "void " << node->name () << "::_raise (void) const" << be_nl
       << "{" << be_idt_nl
       << "throw *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "void " << node->name ()
       << "::_tao_encode (";
@@ -241,7 +241,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
           << "throw ::CORBA::MARSHAL ();" << be_uidt_nl
           << "}" << be_uidt << be_uidt_nl;
 
-      *os << "}" << be_nl << be_nl;
+      *os << "}" << be_nl_2;
     }
   else
     {
@@ -250,7 +250,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
       *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
 
-      *os << "}" << be_nl << be_nl;
+      *os << "}" << be_nl_2;
     }
 
   *os << "void " << node->name ()
@@ -265,7 +265,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
           << "throw ::CORBA::MARSHAL ();" << be_uidt_nl
           << "}" << be_uidt << be_uidt_nl;
 
-      *os << "}" << be_nl << be_nl;
+      *os << "}" << be_nl_2;
     }
   else
     {
@@ -274,14 +274,14 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
       *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
 
-      *os << "}" << be_nl << be_nl;
+      *os << "}" << be_nl_2;
     }
 
   // Switch streams to the *A.cpp file if we are using this option.
   if (be_global->gen_anyop_files ())
     {
       os = tao_cg->anyop_source ();
-      *os << be_nl << be_nl;
+      *os << be_nl_2;
     }
 
   if (be_global->tc_support ())
diff --git a/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp b/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
index ff8de1848d2..32adc6db0cd 100644
--- a/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
+++ b/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
@@ -52,10 +52,10 @@ be_visitor_exception_ctor::visit_exception (be_exception *node)
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << be_nl << be_nl;
+  *os << be_nl_2;
 
   if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
     {
@@ -397,7 +397,7 @@ be_visitor_exception_ctor::visit_structure_fwd (
 {
   be_structure *s =
     be_structure::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_structure (s);
 }
 
@@ -435,7 +435,7 @@ be_visitor_exception_ctor::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
     be_union::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_union (u);
 }
 
diff --git a/TAO_IDL/be/be_visitor_field.cpp b/TAO_IDL/be/be_visitor_field.cpp
index acf41ac2e2e..86ef8b6d341 100644
--- a/TAO_IDL/be/be_visitor_field.cpp
+++ b/TAO_IDL/be/be_visitor_field.cpp
@@ -47,6 +47,3 @@
 #include "be_visitor_field/field_cs.cpp"
 #include "be_visitor_field/cdr_op_ch.cpp"
 #include "be_visitor_field/cdr_op_cs.cpp"
-#include "be_visitor_field/serializer_op_ch.cpp"
-#include "be_visitor_field/serializer_op_cs.cpp"
-
diff --git a/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp b/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp
index c3337ae628f..be27d59a7c7 100644
--- a/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp
@@ -46,7 +46,7 @@ be_visitor_field_cdr_op_ch::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cdr_op_ch::"
                          "visit_field - "
-                         "Bad field type\n"), 
+                         "Bad field type\n"),
                         -1);
     }
 
@@ -89,7 +89,7 @@ be_visitor_field_cdr_op_ch::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_field_cdr_op_ch::"
                              "visit_array - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -189,7 +189,7 @@ be_visitor_field_cdr_op_ch::visit_structure_fwd (
 {
   be_structure *s =
     be_structure::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_structure (s);
 }
 
@@ -251,7 +251,7 @@ be_visitor_field_cdr_op_ch::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
     be_union::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_union (u);
 }
 
diff --git a/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp b/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
index 707c33f646c..d4e2f985a78 100644
--- a/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
@@ -85,6 +85,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 ());
 
@@ -775,7 +776,7 @@ be_visitor_field_cdr_op_cs::visit_structure_fwd (
 {
   be_structure *s =
     be_structure::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_structure (s);
 }
 
@@ -869,7 +870,7 @@ be_visitor_field_cdr_op_cs::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
     be_union::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_union (u);
 }
 
diff --git a/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO_IDL/be/be_visitor_field/field_ch.cpp
index 35a9011d92f..167306c4027 100644
--- a/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -109,7 +109,7 @@ be_visitor_field_ch::visit_array (be_array *node)
 
       // Having defined all array type and its supporting operations, now
       // generate the actual variable that is a field of the structure.
-      *os << be_nl << be_nl << "_" << bt->local_name ();
+      *os << be_nl_2 << "_" << bt->local_name ();
     }
   else
     {
@@ -348,8 +348,8 @@ be_visitor_field_ch::visit_sequence (be_sequence *node)
           // Generate the anonymous sequence member typedef.
           be_decl *bs = this->ctx_->scope ()->decl ();
 
-          *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-              << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+          *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+              << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
           *os << "typedef " << bt->nested_type_name (bs)
               << " _" << this->ctx_->node ()->local_name ()
@@ -459,7 +459,7 @@ be_visitor_field_ch::visit_structure_fwd (be_structure_fwd *node)
 {
   be_structure *s =
     be_structure::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_structure (s);
 }
 
@@ -518,7 +518,7 @@ be_visitor_field_ch::visit_union (be_union *node)
         }
     }
 
-  *os << be_nl << be_nl;
+  *os << be_nl_2;
 
   // This was a typedefed array.
   // ACE_NESTED_CLASS macro generated by nested_type_name
@@ -546,7 +546,7 @@ be_visitor_field_ch::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
     be_union::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_union (u);
 }
 
diff --git a/TAO_IDL/be/be_visitor_field/field_ci.cpp b/TAO_IDL/be/be_visitor_field/field_ci.cpp
index 83dc00f14ea..f7ac597e587 100644
--- a/TAO_IDL/be/be_visitor_field/field_ci.cpp
+++ b/TAO_IDL/be/be_visitor_field/field_ci.cpp
@@ -30,13 +30,13 @@ be_visitor_field_ci::visit_field (be_field *node)
 {
   be_type *bt =
     be_type::narrow_from_decl (node->field_type ());
- 
+
   if (!bt)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_ci::"
                          "visit_field - "
-                         "Bad field type\n"), 
+                         "Bad field type\n"),
                         -1);
     }
 
@@ -47,7 +47,7 @@ be_visitor_field_ci::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_ci::"
                          "visit_field - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -71,7 +71,7 @@ be_visitor_field_ci::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_field_ci::"
                              "visit_array - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -100,7 +100,7 @@ be_visitor_field_ci::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_field_ci::"
                              "visit_struct - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -114,7 +114,7 @@ be_visitor_field_ci::visit_structure_fwd (
 {
   be_structure *s =
     be_structure::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_structure (s);
 }
 
@@ -129,7 +129,7 @@ be_visitor_field_ci::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_ci::"
                          "visit_typedef - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     }
 
@@ -152,7 +152,7 @@ be_visitor_field_ci::visit_union (be_union *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_field_ci::"
                              "visit_union - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -165,7 +165,7 @@ be_visitor_field_ci::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
     be_union::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_union (u);
 }
 
diff --git a/TAO_IDL/be/be_visitor_field/field_cs.cpp b/TAO_IDL/be/be_visitor_field/field_cs.cpp
index 348139582bc..278aa734ac1 100644
--- a/TAO_IDL/be/be_visitor_field/field_cs.cpp
+++ b/TAO_IDL/be/be_visitor_field/field_cs.cpp
@@ -41,7 +41,7 @@ be_visitor_field_cs::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cs::"
                          "visit_field - "
-                         "Bad field type\n"), 
+                         "Bad field type\n"),
                         -1);
     }
 
@@ -52,7 +52,7 @@ be_visitor_field_cs::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cs::"
                          "visit_field - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -74,7 +74,7 @@ be_visitor_field_cs::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_field_cs::"
                              "visit_array - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -97,7 +97,7 @@ be_visitor_field_cs::visit_enum (be_enum *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_field_cs::"
                              "visit_enum - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -120,7 +120,7 @@ be_visitor_field_cs::visit_sequence (be_sequence *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_field_cs::"
                              "visit_sequence - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -143,7 +143,7 @@ be_visitor_field_cs::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_field_cs::"
                              "visit_struct - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -157,7 +157,7 @@ be_visitor_field_cs::visit_structure_fwd (
 {
   be_structure *s =
     be_structure::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_structure (s);
 }
 
@@ -172,7 +172,7 @@ be_visitor_field_cs::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_ci::"
                          "visit_typedef - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     }
 
@@ -195,7 +195,7 @@ be_visitor_field_cs::visit_union (be_union *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_field_cs::"
                              "visit_union - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -208,7 +208,7 @@ be_visitor_field_cs::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
     be_union::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_union (u);
 }
 
diff --git a/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp b/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp
deleted file mode 100644
index 48891c1aead..00000000000
--- a/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-#include "be_visitor_array/serializer_op_ch.h"
-#include "be_visitor_enum/serializer_op_ch.h"
-#include "be_visitor_sequence/serializer_op_ch.h"
-#include "be_visitor_structure/structure.h"
-#include "be_visitor_structure/serializer_op_ch.h"
-#include "be_visitor_union/union.h"
-#include "be_visitor_union/serializer_op_ch.h"
-
-// **********************************************
-//  Visitor for field in the client header file.
-// **********************************************
-
-// Constructor.
-be_visitor_field_serializer_op_ch::be_visitor_field_serializer_op_ch (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-// Destructor.
-be_visitor_field_serializer_op_ch::~be_visitor_field_serializer_op_ch (void)
-{
-}
-
-// Visit the field node.
-int
-be_visitor_field_serializer_op_ch::visit_field (be_field *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_ch::"
-                         "visit_field - "
-                         "Bad field type\n"), 
-                        -1);
-    }
-
-  this->ctx_->node (node);
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_ch::"
-                         "visit_field - "
-                         "codegen for field type failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-// Visit operations on all possible data types that a field can be.
-
-int
-be_visitor_field_serializer_op_ch::visit_array (be_array *node)
-{
-  // If not a typedef and we are defined in the use scope, we must be defined.
-
-  if (!this->ctx_->alias ()
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      // This is the case for anonymous arrays.
-
-      // 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);
-
-      // First generate the array declaration.
-      be_visitor_array_serializer_op_ch visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_serializer_op_ch::"
-                             "visit_array - "
-                             "codegen failed\n"), 
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_field_serializer_op_ch::visit_enum (be_enum *node)
-{
-  // If not a typedef and we are defined in the use scope, we must be defined
-  if (!this->ctx_->alias () // not a typedef.
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      // 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);
-
-      // First generate the enum declaration.
-      be_visitor_enum_serializer_op_ch visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_serializer_op_ch::"
-                             "visit_enum - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_field_serializer_op_ch::visit_sequence (be_sequence *node)
-{
-  // If not a typedef and we are defined in the use scope, we must be defined.
-  if (!this->ctx_->alias () // not a typedef
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      // 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);
-
-      // First generate the sequence declaration.
-      be_visitor_sequence_serializer_op_ch visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_serializer_op_ch::"
-                             "visit_sequence - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_field_serializer_op_ch::visit_structure (be_structure *node)
-{
-  // if not a typedef and we are defined in the use scope, we must be defined
-
-  if (!this->ctx_->alias () // not a typedef
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      // 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); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the struct declaration
-      be_visitor_structure_serializer_op_ch visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_serializer_op_ch::"
-                             "visit_struct - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_field_serializer_op_ch::visit_typedef (be_typedef *node)
-{
-  // Save the node for use in code generation and
-  // indicate that the field of the field node
-  // is a typedefed quantity.
-  this->ctx_->alias (node);
-
-  // Make a decision based on the primitive base type.
-  be_type *bt = node->primitive_base_type ();
-
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_ch::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// visit union type
-int
-be_visitor_field_serializer_op_ch::visit_union (be_union *node)
-{
-  // If not a typedef and we are defined in the use scope, we must be defined.
-  if (!this->ctx_->alias () // not a typedef
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      // 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);
-
-      // First generate the enum declaration.
-      be_visitor_union_serializer_op_ch visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_serializer_op_ch::"
-                             "visit_enum - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-    }
-
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp b/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp
deleted file mode 100644
index d01d7c8fd06..00000000000
--- a/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp
+++ /dev/null
@@ -1,1149 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-#include "be_visitor_array/serializer_op_cs.h"
-#include "be_visitor_sequence/serializer_op_cs.h"
-#include "be_visitor_structure/serializer_op_cs.h"
-#include "be_visitor_union/serializer_op_cs.h"
-
-// **********************************************
-//  visitor for field in the client stubs file
-// **********************************************
-
-be_visitor_field_serializer_op_cs::be_visitor_field_serializer_op_cs (
-      be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_field_serializer_op_cs::~be_visitor_field_serializer_op_cs (void)
-{
-}
-
-int
-be_visitor_field_serializer_op_cs::visit_field (be_field *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_field - "
-                         "Bad field type\n"),
-                        -1);
-    }
-
-  this->ctx_->node (node);
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_field - "
-                         "codegen for field type failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_field_serializer_op_cs::visit_array (be_array *node)
-{
-  // If the array is defined in this scope, we must generate
-  // CDR stream operators for the array itself.
-  if (!this->ctx_->alias ()
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-      be_visitor_array_serializer_op_cs visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_serializer_op_cs::"
-                             "visit_array - "
-                             "codegen failed\n"),
-                            -1);
-        }
-    }
-
-  // Now generate the (de)marshaling code for the array as a
-  // field.
-
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_array - "
-                         "cannot retrieve field node\n"),
-                        -1);
-    }
-
-  // For anonymous arrays, the type name has a _ prepended. We compute
-  // the full_name with or without the underscore and use it later on.
-  char fname [NAMEBUFSIZE];
-
-  // Save the node's local name and full name in a buffer for quick
-  // use later on.
-  ACE_OS::memset (fname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  if (this->ctx_->alias () == 0 // Not a typedef.
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      // For anonymous arrays ...
-      // we have to generate a name for us that has an underscore
-      // prepended to our local name. This needs to be inserted after
-      // the parents's name.
-      if (node->is_nested ())
-        {
-          be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname,
-                           "%s::_%s",
-                           parent->full_name (),
-                           node->local_name ()->get_string ());
-        }
-      else
-        {
-          ACE_OS::sprintf (fname,
-                           "_%s",
-                           node->full_name ());
-        }
-    }
-  else
-    {
-      // Typedefed node.
-      ACE_OS::sprintf (fname,
-                       "%s",
-                       node->full_name ());
-    }
-
-  // Check what is the code generation substate. Are we generating
-  // code for the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      *os << "_tao_is_bounded_size (_tao_aggregate_" << f->local_name ()
-          << ")";
-      break;
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      // get the size of an array typedef
-      *os << "_dcps_max_marshaled_size (_tao_aggregate_" << f->local_name ()
-          << ")";
-      break;
-    case TAO_CodeGen::TAO_FIND_SIZE:
-      // get the size of an array typedef
-      *os << "_dcps_find_size (_tao_aggregate_" << f->local_name ()
-          << ")";
-      break;
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> "
-          << "_tao_aggregate_" << f->local_name () << ")";
-
-      return 0;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << "
-          << "_tao_aggregate_" << f->local_name () << ")";
-
-      return 0;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // This is done in serializer_op_cs and hacked into *.i.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_array - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_field_serializer_op_cs::visit_enum (be_enum *node)
-{
-  // If we are defined inside this scope, we must generate the
-  /// Serializer stream operators for us here.
-  if (node->node_type () != AST_Decl::NT_typedef
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-      be_visitor_enum_serializer_op_cs visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_serializer_op_cs::"
-                             "visit_enum - "
-                             "codegen failed\n"),
-                            -1);
-        }
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_enum - "
-                         "cannot retrieve field node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      *os << " true /* enum */";
-      break;
-    case TAO_CodeGen::TAO_FIND_SIZE:
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      // enums are serialized as CORBA::ULong
-      *os << "_dcps_max_marshaled_size_ulong () /* enum */";
-      break;
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> _tao_aggregate." << f->local_name () << ")";
-
-      return 0;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << _tao_aggregate." << f->local_name () << ")";
-
-      return 0;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Proceed further.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_enum - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-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 ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_interface - "
-                         "cannot retrieve field node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> _tao_aggregate." << f->local_name () << ".out ())";
-
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      if (node->is_defined ())
-        {
-          if (f->is_abstract ())
-            {
-              *os << "(strm << _tao_aggregate."
-                  << f->local_name () << ".in ())";
-            }
-          else
-            {
-              *os << "::CORBA::Object::marshal (" << be_idt << be_idt_nl
-                  << "_tao_aggregate." << f->local_name () << ".in ()," << be_nl
-                  << "strm" << be_uidt_nl
-                  << ")" << be_uidt;
-            }
-        }
-      else
-        {
-          *os << "TAO::Objref_Traits<" << node->name () << ">::marshal ("
-              << be_idt << be_idt_nl
-              << "_tao_aggregate." << f->local_name () << ".in ()," << be_nl
-              << "strm" << be_uidt_nl
-              << ")" << be_uidt;
-        }
-
-      break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Nothing to be done because an interface cannot be declared inside a
-      // structure.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_interface - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_field_serializer_op_cs::visit_component (be_component *node)
-{
-  return this->visit_interface (node);
-}
-
-int
-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 ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_interface_fwd - "
-                         "cannot retrieve field node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> _tao_aggregate." << f->local_name () << ".out ())";
-
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      if (node->is_defined ())
-        {
-          if (f->is_abstract ())
-            {
-              *os << "(strm << _tao_aggregate."
-                  << f->local_name () << ".in ())";
-            }
-          else
-            {
-              *os << "::CORBA::Object::marshal (" << be_idt << be_idt_nl
-                  << "_tao_aggregate." << f->local_name () << ".in ()," << be_nl
-                  << "strm" << be_uidt_nl
-                  << ")" << be_uidt;
-            }
-        }
-      else
-        {
-          AST_Decl *parent = ScopeAsDecl (node->defined_in ());
-
-          if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
-            {
-              *os << parent->name () << "::";
-            }
-
-          *os << "TAO::Objref_Traits<" << node->name () << ">::marshal ("
-              << be_idt << be_idt_nl
-              << "_tao_aggregate." << f->local_name () << ".in ()," << be_nl
-              << "strm" << be_uidt_nl
-              << ")" << be_uidt;
-        }
-
-      break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Nothing to be done because an interface cannot be declared inside a
-      // structure.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_interface_fwd - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_field_serializer_op_cs::visit_component_fwd (be_component_fwd *node)
-{
-  return this->visit_interface_fwd (node);
-}
-
-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 ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_valuetype - "
-                         "cannot retrieve field node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> _tao_aggregate." << f->local_name () << ".out ())";
-
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << _tao_aggregate." << f->local_name () << ".in ())";
-
-      break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Nothing to be done because a valuetype cannot be declared inside a
-      // structure.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_valuetype - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_field_serializer_op_cs::visit_eventtype (be_eventtype *node)
-{
-  return this->visit_valuetype (node);
-}
-
-int
-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 ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_valuetype_fwd - "
-                         "cannot retrieve field node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> _tao_aggregate." << f->local_name () << ".out ())";
-
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << _tao_aggregate." << f->local_name () << ".in ())";
-
-      break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Nothing to be done because a valuetype cannot be declared inside a
-      // structure.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_valuetype_fwd - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_field_serializer_op_cs::visit_eventtype_fwd (be_eventtype_fwd *node)
-{
-  return this->visit_valuetype_fwd (node);
-}
-
-// Visit predefined type.
-int
-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 ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "cannot retrieve field node\n"),
-                        -1);
-    }
-
-  AST_PredefinedType::PredefinedType pt = node->pt ();
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-
-  case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      if (pt == AST_PredefinedType::PT_pseudo
-          || pt == AST_PredefinedType::PT_object)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_predefined_type - TAO_IS_BOUNDED_SIZE  "
-                         "object and psuedo are not supported by DDS\n"),
-                        -1);
-        }
-
-      else
-        {
-          *os << " true "; // all predefined types are bounded
-        }
-      break;
-  case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-  case TAO_CodeGen::TAO_FIND_SIZE: // the max and current sizes are the same for predefined types
-      if (pt == AST_PredefinedType::PT_pseudo
-          || pt == AST_PredefinedType::PT_object)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_predefined_type - TAO_MAX_MARSHALED_SIZE  "
-                         "object and psuedo are not supported by DDS\n"),
-                        -1);
-        }
-      else if (pt == AST_PredefinedType::PT_char)
-        {
-          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_char (_tao_aggregate."
-              << f->local_name () << "))";
-        }
-      else if (pt == AST_PredefinedType::PT_wchar)
-        {
-          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_wchar (_tao_aggregate."
-              << f->local_name () << "))";
-        }
-      else if (pt == AST_PredefinedType::PT_octet)
-        {
-          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_octet (_tao_aggregate."
-              << f->local_name () << "))";
-        }
-      else if (pt == AST_PredefinedType::PT_boolean)
-        {
-          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_boolean (_tao_aggregate."
-              << f->local_name () << "))";
-        }
-      else
-        {
-          *os << "_dcps_max_marshaled_size (_tao_aggregate." << f->local_name () << ")";
-        }
-      break;
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      if (pt == AST_PredefinedType::PT_pseudo
-          || pt == AST_PredefinedType::PT_object)
-        {
-          *os << "(strm >> _tao_aggregate." << f->local_name ()
-              << ".out ())";
-        }
-      else if (pt == AST_PredefinedType::PT_char)
-        {
-          *os << "(strm >> ::ACE_InputCDR::to_char (_tao_aggregate."
-              << f->local_name () << "))";
-        }
-      else if (pt == AST_PredefinedType::PT_wchar)
-        {
-          *os << "(strm >> ::ACE_InputCDR::to_wchar (_tao_aggregate."
-              << f->local_name () << "))";
-        }
-      else if (pt == AST_PredefinedType::PT_octet)
-        {
-          *os << "(strm >> ::ACE_InputCDR::to_octet (_tao_aggregate."
-              << f->local_name () << "))";
-        }
-      else if (pt == AST_PredefinedType::PT_boolean)
-        {
-          *os << "(strm >> ::ACE_InputCDR::to_boolean (_tao_aggregate."
-              << f->local_name () << "))";
-        }
-      else
-        {
-          *os << "(strm >> _tao_aggregate." << f->local_name () << ")";
-        }
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      if (pt == AST_PredefinedType::PT_pseudo
-          || pt == AST_PredefinedType::PT_object)
-        {
-          *os << "(strm << _tao_aggregate." << f->local_name () << ".in ())";
-        }
-      else if (pt == AST_PredefinedType::PT_char)
-        {
-          *os << "(strm << ::ACE_OutputCDR::from_char (_tao_aggregate."
-              << f->local_name () << "))";
-        }
-      else if (pt == AST_PredefinedType::PT_wchar)
-        {
-          *os << "(strm << ::ACE_OutputCDR::from_wchar (_tao_aggregate."
-              << f->local_name () << "))";
-        }
-      else if (pt == AST_PredefinedType::PT_octet)
-        {
-          *os << "(strm << ::ACE_OutputCDR::from_octet (_tao_aggregate."
-              << f->local_name () << "))";
-        }
-      else if (pt == AST_PredefinedType::PT_boolean)
-        {
-          *os << "(strm << ::ACE_OutputCDR::from_boolean (_tao_aggregate."
-              << f->local_name () << "))";
-        }
-      else
-        {
-          *os << "(strm << _tao_aggregate." << f->local_name () << ")";
-        }
-      break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Nothing to be done.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_field_serializer_op_cs::visit_sequence (be_sequence *node)
-{
-  // If the sequence is defined in this scope, generate its
-  // Serializer stream operators here.
-  if (node->node_type () != AST_Decl::NT_typedef
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-      be_visitor_sequence_serializer_op_cs visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_serializer_op_cs::"
-                             "visit_sequence - "
-                             "codegen failed\n"),
-                            -1);
-        }
-    }
-
-  // How generate the marshaling code for the sequence as a field.
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_sequence - "
-                         "cannot retrieve field node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      *os << "_tao_is_bounded_size (_tao_aggregate." << f->local_name ()
-          << ")";
-      break;
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      *os << "_dcps_max_marshaled_size (_tao_aggregate." << f->local_name ()
-          << ")";
-      break;
-    case TAO_CodeGen::TAO_FIND_SIZE:
-      *os << "_dcps_find_size (_tao_aggregate." << f->local_name ()
-          << ")";
-      break;
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> _tao_aggregate." << f->local_name () << ")";
-
-      return 0;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << _tao_aggregate." << f->local_name () << ")";
-
-      return 0;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Proceed further.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_sequence - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-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 ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_string - "
-                         "cannot retrieve field node\n"),
-                        -1);
-    }
-
-  // check what is the code generation's substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-       if (0 == node->max_size ()->ev ()->u.ulval)
-         *os << "false /* unbounded string */";
-       else
-         *os << "true /* bounded string */";
-      break;
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      char buff[15];
-      ACE_OS::sprintf(buff, "%ld", node->max_size ()->ev ()->u.ulval);
-      *os << "_dcps_max_marshaled_size_ulong () + " << buff;
-      break;
-    case TAO_CodeGen::TAO_FIND_SIZE:
-      if (node->node_type() == AST_Decl::NT_wstring)
-      {
-        *os << "_dcps_max_marshaled_size_ulong() + "
-          << "(_tao_aggregate." << f->local_name () << ".in () ? " 
-            << "ACE_OS::strlen(_tao_aggregate."
-            << f->local_name () << ".in ()) * sizeof (CORBA::WChar) : 0)";
-      }
-      else
-      {
-        *os << "_dcps_max_marshaled_size_ulong() + "
-            << "(_tao_aggregate." << f->local_name () << ".in () ? "
-            << "ACE_OS::strlen(_tao_aggregate."
-            << f->local_name () << ".in ()) : 0)";
-      }
-      break;
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> _tao_aggregate." << f->local_name () << ".out ())";
-
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << _tao_aggregate." << f->local_name () << ".in ())";
-
-      break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Nothing to be done.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_array - "
-                         "bad substate\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_field_serializer_op_cs::visit_structure (be_structure *node)
-{
-  // If the struct is defined in this scope, generate its Serializer stream
-  // operators here.
-  if (node->node_type () != AST_Decl::NT_typedef
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-      be_visitor_structure_serializer_op_cs visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_serializer_op_cs::"
-                             "visit_struct - "
-                             "codegen failed\n"),
-                            -1);
-        }
-    }
-
-  // How generate the marshaling code for the struct as a field.
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_structure - "
-                         "cannot retrieve field node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      *os << "_tao_is_bounded_size (_tao_aggregate." << f->local_name ()
-          << ")";
-      break;
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      *os << "_dcps_max_marshaled_size (_tao_aggregate." << f->local_name ()
-          << ")";
-      break;
-    case TAO_CodeGen::TAO_FIND_SIZE:
-      *os << "_dcps_find_size (_tao_aggregate." << f->local_name ()
-          << ")";
-      break;
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> _tao_aggregate." << f->local_name () << ")";
-
-      return 0;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << _tao_aggregate." << f->local_name () << ")";
-
-      return 0;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Proceed further.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_structure - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_field_serializer_op_cs::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  be_type *bt = node->primitive_base_type ();
-
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"),
-                        -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_field_serializer_op_cs::visit_union (be_union *node)
-{
-  // If the union is defined in this scope, generate its Serializer stream
-  // operators here.
-  if (node->node_type () != AST_Decl::NT_typedef
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-      be_visitor_union_serializer_op_cs visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_serializer_op_cs::"
-                             "visit_union - "
-                             "codegen failed\n"),
-                            -1);
-        }
-    }
-
-  // Now generate marshaling code for the union as a field.
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_union - "
-                         "cannot retrieve field node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      *os << "_tao_is_bounded_size (_tao_aggregate." << f->local_name ()
-          << ")";
-      break;
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      *os << "_dcps_max_marshaled_size (_tao_aggregate." << f->local_name ()
-          << ")";
-      break;
-    case TAO_CodeGen::TAO_FIND_SIZE:
-      *os << "_dcps_find_size (_tao_aggregate." << f->local_name ()
-          << ")";
-      break;
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> _tao_aggregate." << f->local_name () << ")";
-
-      return 0;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << _tao_aggregate." << f->local_name () << ")";
-
-      return 0;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Proceed further.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_serializer_op_cs::"
-                         "visit_union - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-// ****************************************************************
-
-be_visitor_serializer_op_field_decl::be_visitor_serializer_op_field_decl (
-      be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-// This is a field, but the action depends on the type of the field,
-// use this visitor to detect the type of the field.
-// Notice that this is why the parent visitor (who create us) cannot
-// do the job, because it may have another purpose for some or all of
-// the visit_* methods; in other words, while running a visitor to
-// generate TAO::DCPS::Serializer operators for structures we cannot use that one to
-// generate the code of each field, because visit_struct already has a
-// meaning in that visitor.
-int
-be_visitor_serializer_op_field_decl::visit_field (be_field *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-
-  if (bt == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_serializer_op_field_decl::"
-                         "visit_field - "
-                         "Bad field type\n"),
-                        -1);
-    }
-
-  // @@ Shouldn't this be saved in the visitor and not the context?!
-  this->ctx_->node (node);
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_serializer_op_field_decl::"
-                         "visit_field - "
-                         "codegen for field type failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-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 ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_serializer_op_field_decl::"
-                         "visit_array - "
-                         "cannot retrieve field node\n"),
-                        -1);
-    }
-
-  // For anonymous arrays, the type name has a _ prepended. We compute
-  // the full_name with or without the underscore and use it later on.
-  char fname [NAMEBUFSIZE];
-
-  ACE_OS::memset (fname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  if (this->ctx_->alias () == 0 // Not a typedef.
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      // For anonymous arrays,
-      // we have to generate a name for us that has an underscope
-      // prepended to our local name. This needs to be inserted after
-      // the parents's name.
-
-      if (node->is_nested ())
-        {
-          be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname,
-                           "%s::_%s",
-                           parent->full_name (),
-                           node->local_name ()->get_string ());
-        }
-      else
-        {
-          ACE_OS::sprintf (fname,
-                           "_%s",
-                           node->full_name ());
-        }
-    }
-  else
-    {
-      // Typedefed node.
-      ACE_OS::sprintf (fname,
-                       "%s",
-                       node->full_name ());
-    }
-
-  // Check what is the code generation substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-    case TAO_CodeGen::TAO_FIND_SIZE:
-    case TAO_CodeGen::TAO_CDR_INPUT:
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << fname << "_forany "
-          << "_tao_aggregate_" << f->local_name () << be_idt << be_idt_nl
-          << "(const_cast<" << be_idt << be_idt_nl
-          << fname << "_slice*> (" << be_nl
-          << "_tao_aggregate." << f->local_name () << be_uidt_nl
-          << ")" << be_uidt << be_uidt_nl
-          << ");" << be_uidt_nl;
-
-      break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_serializer_op_field_decl::"
-                         "visit_array - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-
-int
-be_visitor_serializer_op_field_decl::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // Save the typedef node for use in code
-                            // generation as we visit the base type.
-
-  // The node to be visited in the base primitve type that gets typedefed.
-  be_type *bt = node->primitive_base_type ();
-
-  if (bt == 0 || bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_serializer_op_field_decl::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"),
-                        -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp b/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp
index 43157a41d2b..8cc7fa1de75 100644
--- a/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp
+++ b/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp
@@ -232,7 +232,7 @@ be_visitor_home_ex_idl::gen_implicit (void)
 void
 be_visitor_home_ex_idl::gen_explicit (void)
 {
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "local interface CCM_"
       << IdentifierHelper::try_escape (node_->original_local_name ()).c_str ()
       << "Explicit" << be_idt_nl
@@ -282,7 +282,7 @@ be_visitor_home_ex_idl::gen_derived (void)
     IdentifierHelper::try_escape (node_->original_local_name ());
   const char *lname = lname_str.c_str ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "local interface CCM_" << lname << be_nl
       << "  : CCM_" << lname << "Explicit," << be_nl
       << "    CCM_" << lname << "Implicit" << be_nl
@@ -372,7 +372,7 @@ be_visitor_home_ex_idl::gen_home_executor (void)
 
   const char *global = (sname_str == "" ? "" : "::");
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "module CIAO_" << comp->flat_name () << "_Impl" << be_nl
       << "{" << be_idt_nl
       << "local interface " << lname << "_Exec" << be_idt_nl
diff --git a/TAO_IDL/be/be_visitor_home/home_exh.cpp b/TAO_IDL/be/be_visitor_home/home_exh.cpp
index 8490704fe76..606071df4b5 100644
--- a/TAO_IDL/be/be_visitor_home/home_exh.cpp
+++ b/TAO_IDL/be/be_visitor_home/home_exh.cpp
@@ -36,16 +36,16 @@ be_visitor_home_exh::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
+  os_ << be_nl_2
       << "namespace CIAO_" << comp_->flat_name () << "_Impl" << be_nl
       << "{" << be_idt;
-    
+
   if (this->gen_exec_class () == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -54,12 +54,12 @@ be_visitor_home_exh::visit_home (be_home *node)
                          ACE_TEXT ("gen_servant_class() failed\n")),
                         -1);
     }
-     
+
   this->gen_entrypoint ();
 
   os_ << be_uidt_nl
       << "}";
-     
+
   return 0;
 }
 
@@ -80,13 +80,13 @@ be_visitor_home_exh::visit_attribute (be_attribute *node)
 int
 be_visitor_home_exh::visit_factory (be_factory *node)
 {
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "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,
@@ -96,9 +96,9 @@ be_visitor_home_exh::visit_factory (be_factory *node)
                          ACE_TEXT ("list failed\n")),
                         -1);
     }
-    
+
   os_ << ";";
-    
+
   return 0;
 }
 
@@ -108,7 +108,7 @@ be_visitor_home_exh::gen_exec_class (void)
   // We don't want a '_cxx_' prefix here.
   const char *lname =
     node_->original_local_name ()->get_string ();
-  
+
   os_ << be_nl
       << "class " << export_macro_.c_str () << " " << lname
       << "_exec_i" << be_idt_nl
@@ -117,15 +117,15 @@ be_visitor_home_exh::gen_exec_class (void)
       << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "public:" << be_idt;
-      
+
   os_ << be_nl
       << lname << "_exec_i (void);";
-      
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << "virtual ~" << lname << "_exec_i (void);";
-      
+
   be_home *h = node_;
-  
+
   while (h != 0)
     {
       if (this->visit_scope (h) != 0)
@@ -136,19 +136,19 @@ be_visitor_home_exh::gen_exec_class (void)
                              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,
@@ -159,32 +159,32 @@ be_visitor_home_exh::gen_exec_class (void)
                                  bi->full_name ()),
                                 -1);
             }
-        }  
-        
+        }
+
       h = be_home::narrow_from_decl (h->base_home ());
     }
-    
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << "// Implicit operations.";
-      
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << "virtual ::Components::EnterpriseComponent_ptr" << be_nl
       << "create (void);";
 
   os_ << be_uidt_nl
       << "};";
-     
+
   return 0;
 }
 
 void
 be_visitor_home_exh::gen_entrypoint (void)
 {
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::Components::HomeExecutorBase_ptr" << be_nl
       << "create_" << node_->flat_name ()
-      << "_Impl (void);"; 
+      << "_Impl (void);";
 }
 
 int
@@ -198,8 +198,8 @@ be_visitor_home_exh::op_attr_decl_helper (be_interface * /* derived */,
   ctx.state (TAO_CodeGen::TAO_ROOT_EXH);
   ctx.stream (os);
   be_visitor_home_exh 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_IDL/be/be_visitor_home/home_exs.cpp b/TAO_IDL/be/be_visitor_home/home_exs.cpp
index a57c9e65a34..833fc5d4540 100644
--- a/TAO_IDL/be/be_visitor_home/home_exs.cpp
+++ b/TAO_IDL/be/be_visitor_home/home_exs.cpp
@@ -21,8 +21,8 @@ be_visitor_home_exs::be_visitor_home_exs (be_visitor_context *ctx)
     node_ (0),
     comp_ (0),
     os_ (*ctx->stream ()),
-    comment_border_ ("//=============================="
-                     "=============================="),
+    comment_start_border_ ("/**"),
+    comment_end_border_ (" */"),
     your_code_here_ ("/* Your code here. */"),
     export_macro_ (be_global->exec_export_macro ())
 {
@@ -45,7 +45,7 @@ be_visitor_home_exs::visit_home (be_home *node)
 
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "namespace CIAO_" << comp_->flat_name () << "_Impl" << be_nl
       << "{" << be_idt;
 
@@ -91,7 +91,7 @@ be_visitor_home_exs::visit_factory (be_factory *node)
   const char *lname = comp_->local_name ()->get_string ();
   const char *global = (sname_str == "" ? "" : "::");
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::Components::EnterpriseComponent_ptr" << be_nl
       << node_->original_local_name ()->get_string ()
       << "_exec_i::" << node->local_name ();
@@ -126,23 +126,23 @@ be_visitor_home_exs::gen_exec_class (void)
     node_->original_local_name ()->get_string ();
 
   os_ << be_nl
-      << comment_border_ << be_nl
-      << "// Home Executor Implementation Class: "
+      << comment_start_border_ << be_nl
+      << " * Home Executor Implementation Class: "
       << lname << "_exec_i" << be_nl
-      << comment_border_;
+      << comment_end_border_;
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << lname << "_exec_i::" << lname << "_exec_i (void)" << be_nl
       << "{" << be_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << lname << "_exec_i::~" << lname << "_exec_i (void)" << be_nl
       << "{" << be_nl
       << "}";
-      
+
   be_home *h = node_;
-  
+
   while (h != 0)
     {
       if (this->visit_scope (h) != 0)
@@ -154,14 +154,14 @@ be_visitor_home_exs::gen_exec_class (void)
                              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);
@@ -184,15 +184,15 @@ be_visitor_home_exs::gen_exec_class (void)
                                  bi->full_name ()),
                                 -1);
             }
-        }  
-        
+        }
+
       h = be_home::narrow_from_decl (h->base_home ());
     }
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "// Implicit operations.";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::Components::EnterpriseComponent_ptr" << be_nl
       << lname << "_exec_i::create (void)" << be_nl
       << "{" << be_idt_nl
@@ -215,7 +215,7 @@ be_visitor_home_exs::gen_exec_class (void)
 void
 be_visitor_home_exs::gen_entrypoint (void)
 {
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::Components::HomeExecutorBase_ptr" << be_nl
       << "create_" << node_->flat_name ()
diff --git a/TAO_IDL/be/be_visitor_home/home_svh.cpp b/TAO_IDL/be/be_visitor_home/home_svh.cpp
index a6900282c88..0de7daadb7f 100644
--- a/TAO_IDL/be/be_visitor_home/home_svh.cpp
+++ b/TAO_IDL/be/be_visitor_home/home_svh.cpp
@@ -51,7 +51,7 @@ be_visitor_home_svh::visit_home (be_home *node)
 
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "namespace CIAO_" << comp_->flat_name () << "_Impl" << be_nl
       << "{" << be_idt;
 
@@ -96,7 +96,7 @@ be_visitor_home_svh::visit_factory (be_factory *node)
 
   AST_Component *c = h->managed_component ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "virtual ::" << c->name () << "_ptr" << be_nl
       << node->local_name ();
 
@@ -146,7 +146,8 @@ be_visitor_home_svh::gen_servant_class (void)
       << "Home_Servant_Impl<" << be_idt_nl
       << "::" << node_->full_skel_name () << "," << be_nl
       << global << sname << "::CCM_" << lname << "," << be_nl
-      << clname << "_Servant>"
+      << clname << "_Servant," << be_nl
+      << "::CIAO::" << be_global->ciao_container_type () << "_Container>"
       << be_uidt << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "public:" << be_idt_nl;
@@ -154,14 +155,15 @@ be_visitor_home_svh::gen_servant_class (void)
   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;
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Container_ptr c);" << be_uidt;
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "virtual ~" << lname << "_Servant (void);";
 
   if (this->node_->has_rw_attributes ())
     {
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "virtual void" << be_nl
           << "set_attributes (const "
           << "::Components::ConfigValues & descr);";
@@ -171,30 +173,30 @@ AST_Type *pk = node_->primary_key ();
 
   if (pk != 0)
     {
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "// Implicit home primary key operations - not supported.";
 
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "virtual ::" << comp_->name () << "_ptr" << be_nl
           << "create (" << be_idt_nl
           << "::" << pk->name () << " * key);" << be_uidt;
 
       if (!be_global->gen_lwccm ())
         {
-          os_ << be_nl << be_nl
+          os_ << be_nl_2
               << "virtual ::" << comp_->name () << "_ptr" << be_nl
               << "find_by_primary_key (" << be_idt_nl
               << "::" << pk->name () << " * key);" << be_uidt;
         }
 
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "virtual void" << be_nl
           << "remove (" << be_idt_nl
           << "::" << pk->name () << " * key);" << be_uidt;
 
       if (!be_global->gen_lwccm ())
         {
-          os_ << be_nl << be_nl
+          os_ << be_nl_2
               << "virtual ::" << pk->name () << " *" << be_nl
               << "get_primary_key (" << be_idt_nl
               << "::" << comp_->name () << "_ptr comp);" << be_uidt;
@@ -250,13 +252,14 @@ AST_Type *pk = node_->primary_key ();
 void
 be_visitor_home_svh::gen_entrypoint (void)
 {
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::PortableServer::Servant" << be_nl
       << "create_" << node_->flat_name ()
       << "_Servant (" << be_idt_nl
       << "::Components::HomeExecutorBase_ptr p," << be_nl
-      << "::CIAO::Container_ptr c," << be_nl
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Container_ptr c," << be_nl
       << "const char * ins_name);" << be_uidt;
 }
 
diff --git a/TAO_IDL/be/be_visitor_home/home_svs.cpp b/TAO_IDL/be/be_visitor_home/home_svs.cpp
index 458afe2be1d..14c37a30f6b 100644
--- a/TAO_IDL/be/be_visitor_home/home_svs.cpp
+++ b/TAO_IDL/be/be_visitor_home/home_svs.cpp
@@ -51,7 +51,7 @@ be_visitor_home_svs::visit_home (be_home *node)
 
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "namespace CIAO_" << comp_->flat_name () << "_Impl" << be_nl
       << "{" << be_idt;
 
@@ -111,7 +111,7 @@ be_visitor_home_svs::visit_factory (be_factory *node)
 
   AST_Component *c = h->managed_component ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "::" << c->name () << "_ptr" << be_nl
       << node_->original_local_name ()->get_string ()
       << "_Servant::" << node->local_name ();
@@ -145,9 +145,23 @@ be_visitor_home_svs::visit_factory (be_factory *node)
       const char *comp_lname = comp_->local_name ()->get_string ();
       const char *global = (comp_sname_str == "" ? "" : "::");
 
+      ACE_CString sname_str (ScopeAsDecl (node_->defined_in ())->full_name ());
+
+      os_ << "::" << sname_str << global << "CCM_" << node_->original_local_name ()
+          << "_var executor = " << be_idt_nl
+          << "::" << sname_str << global << "CCM_" << node_->original_local_name ()
+          << "::_duplicate (this->executor_.in ());" << be_uidt
+          << be_nl_2;
+
+      os_ << "if ( ::CORBA::is_nil (executor.in ()))"
+          << be_idt_nl
+          << "{"<< be_idt_nl
+          << "throw ::CORBA::INV_OBJREF ();" << be_uidt_nl
+          << "}" << be_uidt_nl << be_nl;
+
       os_ << "::Components::EnterpriseComponent_var _ciao_ec ="
           << be_idt_nl
-          << "this->executor_->" << node->local_name () << " (";
+          << "executor->" << node->local_name () << " (";
 
       if (node->argument_count () > 0)
         {
@@ -209,18 +223,20 @@ be_visitor_home_svs::gen_servant_class (void)
       << lname << "_Servant (" << be_idt << be_idt_nl
       << global << sname << "::CCM_" << lname << "_ptr exe," << be_nl
       << "const char * ins_name," << be_nl
-      << "::CIAO::Container_ptr c)" << be_uidt_nl
-      << ": ::CIAO::Home_Servant_Impl_Base (c)," << be_idt_nl
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Container_ptr c)" << be_uidt_nl
+      << ": ::CIAO::Home_Servant_Impl_Base ()," << be_idt_nl
       << "::CIAO::"
       << "Home_Servant_Impl<" << be_idt_nl
       << "::" << node_->full_skel_name () << "," << be_nl
       << global << sname << "::CCM_" << lname << "," << be_nl
-      << clname << "_Servant> (exe, c, ins_name)"
+      << clname << "_Servant," << be_nl
+      << "::CIAO::" << be_global->ciao_container_type () << "_Container> (exe, c, ins_name)"
       << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "}";
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << lname << "_Servant::~" << lname << "_Servant (void)"
       << be_nl
       << "{" << be_nl
@@ -228,7 +244,7 @@ be_visitor_home_svs::gen_servant_class (void)
 
   if (this->node_->has_rw_attributes ())
     {
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "void" << be_nl
           << lname << "_Servant::set_attributes (" << be_idt_nl
           << "const ::Components::ConfigValues & descr)"
@@ -262,7 +278,7 @@ be_visitor_home_svs::gen_servant_class (void)
 
   if (pk != 0)
     {
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "::" << comp_->name () << "_ptr" << be_nl
           << lname << "_Servant::create (" << be_idt_nl
           << "::" << pk->name () << " * /* key */)" << be_uidt_nl
@@ -275,7 +291,7 @@ be_visitor_home_svs::gen_servant_class (void)
 
       if (!be_global->gen_lwccm ())
         {
-          os_ << be_nl << be_nl
+          os_ << be_nl_2
               << "::" << comp_->name () << "_ptr" << be_nl
               << lname << "_Servant::find_by_primary_key (" << be_idt_nl
               << "::" << pk->name () << " * /* key */)" << be_uidt_nl
@@ -287,7 +303,7 @@ be_visitor_home_svs::gen_servant_class (void)
               << "}";
         }
 
-      os_ << be_nl << be_nl
+      os_ << be_nl_2
           << "void" << be_nl
           << lname << "_Servant::remove (" << be_idt_nl
           << "::" << pk->name () << " * /* key */)" << be_uidt_nl
@@ -300,7 +316,7 @@ be_visitor_home_svs::gen_servant_class (void)
 
       if (!be_global->gen_lwccm ())
         {
-          os_ << be_nl << be_nl
+          os_ << be_nl_2
               << "::" << pk->name () << " *" << be_nl
               << lname << "_Servant::get_primary_key (" << be_idt_nl
               << "::" << comp_->name () << "_ptr /* comp */)" << be_uidt_nl
@@ -377,13 +393,14 @@ be_visitor_home_svs::gen_entrypoint (void)
 
   const char *global = (sname_str == "" ? "" : "::");
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::PortableServer::Servant" << be_nl
       << "create_" << node_->flat_name ()
       << "_Servant (" << be_idt_nl
       << "::Components::HomeExecutorBase_ptr p," << be_nl
-      << "::CIAO::Container_ptr c," << be_nl
+      << "::CIAO::" << be_global->ciao_container_type ()
+      << "_Container_ptr c," << be_nl
       << "const char * ins_name)" << be_uidt_nl
       << "{" << be_idt_nl
       << "::PortableServer::Servant retval = 0;" << be_nl
@@ -444,7 +461,7 @@ be_visitor_home_attr_set::visit_home (be_home *node)
        i.next ())
     {
       be_decl *d = be_decl::narrow_from_decl (i.item ());
-      
+
       if (d->accept (this) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -454,9 +471,9 @@ be_visitor_home_attr_set::visit_home (be_home *node)
                             -1);
         }
     }
-    
+
   be_home *h = be_home::narrow_from_decl (node->base_home ());
-  
+
   return this->visit_home (h);
 }
 
diff --git a/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp b/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
index 6b4d85365b1..9112d28e41f 100644
--- a/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
+++ b/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
@@ -47,8 +47,8 @@ be_visitor_amh_rh_interface_sh::visit_interface (be_interface *node)
       rh_skel_class_name = "POA_TAO_";
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   rh_skel_class_name += rh_base_class_name.c_str ();
 
@@ -57,7 +57,7 @@ be_visitor_amh_rh_interface_sh::visit_interface (be_interface *node)
   // Generate the _ptr declaration.
   *os << "typedef " << rh_skel_class_name.c_str () << " *"
       << rh_skel_class_name.c_str()
-      << "_ptr;" << be_nl << be_nl;
+      << "_ptr;" << be_nl_2;
 
   ACE_CString inherit_client_parent = node->client_enclosing_scope ();
   inherit_client_parent +=  rh_base_class_name;
diff --git a/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp b/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
index e6f482a87f7..5a7bb54567f 100644
--- a/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
+++ b/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
@@ -65,15 +65,15 @@ be_visitor_amh_rh_interface_ss::visit_interface (be_interface *node)
   ACE_CString rh_skel_class_name (rh_skel_class_name_prefix);
   rh_skel_class_name += node->local_name ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from " << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << rh_skel_full_scope_name.c_str ()
       << "::" << rh_skel_class_name.c_str () << " (void)" << be_nl
       << ": TAO_AMH_Response_Handler ()," << be_idt_nl
       << "::" << node->full_name () << " ()" << be_uidt << be_uidt_nl
       << "{" << be_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << rh_skel_full_scope_name.c_str ()
       << "::~" << rh_skel_class_name.c_str ()
diff --git a/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
index 0747f9b1896..13e39657395 100644
--- a/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
+++ b/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
@@ -43,8 +43,8 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
   ACE_CString class_name;
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // We shall have a POA_ prefix only if we are at the topmost level.
   if (!node->is_nested ())
@@ -64,7 +64,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
 
   // Generate the _ptr declaration.
   *os << "typedef " << class_name.c_str () << " *" << class_name.c_str ()
-      << "_ptr;" << be_nl << be_nl;
+      << "_ptr;" << be_nl_2;
 
   // Now generate the class definition.
   *os << "class " << be_global->skel_export_macro ()
@@ -116,7 +116,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
       << "& rhs);" << be_nl
       << "virtual ~" << class_name.c_str () << " (void);\n\n"
       << be_nl
-      << "virtual ::CORBA::Boolean _is_a (const char* logical_type_id);" << be_nl << be_nl;
+      << "virtual ::CORBA::Boolean _is_a (const char* logical_type_id);" << be_nl_2;
 
   // Add a skeleton for our _is_a method.
   *os << "static void _is_a_skel (" << be_idt << be_idt_nl
diff --git a/TAO_IDL/be/be_visitor_interface/amh_si.cpp b/TAO_IDL/be/be_visitor_interface/amh_si.cpp
index 9969e0061be..5a81582e537 100644
--- a/TAO_IDL/be/be_visitor_interface/amh_si.cpp
+++ b/TAO_IDL/be/be_visitor_interface/amh_si.cpp
@@ -120,17 +120,17 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
             {
               be_operation *op =
                 be_operation::narrow_from_decl (d);
-              
+
               /// These implied IDL operations are for stub-side only.
               if (op->is_sendc_ami ())
                 {
                   continue;
                 }
-            
-              *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+
+              *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
                   << "// " << __FILE__ << ":" << __LINE__;
 
-              *os << be_nl << be_nl;
+              *os << be_nl_2;
 
               // Generate code in the inline file.
               // Generate the static method corresponding to this method.
@@ -165,8 +165,8 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                 {
                   return -1;
                 }
-                
-              *os << be_nl << be_nl;
+
+              *os << be_nl_2;
 
               // Generate code in the inline file.
               // Generate the static method corresponding to this method.
@@ -197,7 +197,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
 
               if (!attr->readonly ())
                 {
-                  *os << be_nl << be_nl;
+                  *os << be_nl_2;
 
                   // Generate code in the inline file.
                   // Generate the static method corresponding to
diff --git a/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
index c703391bff5..645b5640710 100644
--- a/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+++ b/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
@@ -62,14 +62,14 @@ be_visitor_amh_interface_ss::this_method (be_interface *node)
     this->generate_full_skel_name (node);
   const char *full_skel_name = full_skel_name_holder.c_str ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from " << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << non_amh_name.c_str () << "*" << be_nl
       << full_skel_name
       << "::_this (void)" << be_nl
       << "{" << be_idt_nl
-      << "TAO_Stub *stub = this->_create_stub ();" << be_nl << be_nl;
+      << "TAO_Stub *stub = this->_create_stub ();" << be_nl_2;
 
   *os << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl
       << "::CORBA::Object_ptr tmp = CORBA::Object_ptr ();" << be_nl
@@ -84,7 +84,7 @@ be_visitor_amh_interface_ss::this_method (be_interface *node)
       << ");" << be_uidt_nl << be_nl;
 
   *os << "::CORBA::Object_var obj = tmp;" << be_nl
-      << "(void) safe_stub.release ();" << be_nl << be_nl;
+      << "(void) safe_stub.release ();" << be_nl_2;
 
   *os << "typedef ::" << node->name () << " STUB_SCOPED_NAME;" << be_nl
       << "return" << be_idt_nl;
@@ -125,8 +125,8 @@ be_visitor_amh_interface_ss::dispatch_method (be_interface *node)
     this->generate_full_skel_name (node);
   const char *full_skel_name = full_skel_name_holder.c_str ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from " << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "void" << be_nl
       << full_skel_name << "::_dispatch (" << be_idt << be_idt_nl
@@ -145,7 +145,7 @@ be_visitor_amh_interface_ss::dispatch_method (be_interface *node)
 void
 be_visitor_amh_interface_ss::generate_send_reply (TAO_OutStream * os)
 {
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "server_request.tao_send_reply ();";
 }
 
diff --git a/TAO_IDL/be/be_visitor_interface/ami4ccm_conn_ex_idl.cpp b/TAO_IDL/be/be_visitor_interface/ami4ccm_conn_ex_idl.cpp
index 9a187a43953..50f467e5fd1 100644
--- a/TAO_IDL/be/be_visitor_interface/ami4ccm_conn_ex_idl.cpp
+++ b/TAO_IDL/be/be_visitor_interface/ami4ccm_conn_ex_idl.cpp
@@ -28,11 +28,11 @@ be_visitor_ami4ccm_conn_ex_idl::visit_interface (be_interface *node)
 {
   Identifier *oln = node->original_local_name ();
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "module CCM_AMI::Connector_T<" << oln << ", AMI4CCM_"
       << oln << "> AMI4CCM_" << oln << "_Connector;";
 
diff --git a/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp b/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp
index efbe6efee68..0ac0c2595bd 100644
--- a/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp
+++ b/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp
@@ -31,58 +31,58 @@ be_visitor_ami4ccm_rh_ex_idl::visit_interface (be_interface *node)
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "local interface AMI4CCM_"
       << node->original_local_name ()
       << "ReplyHandler" << be_idt_nl
       << ": ";
-    
+
   long n_parents = node->n_inherits ();
-  
+
   if (n_parents == 0)
-    {    
+    {
       os_ << "::CCM_AMI::ReplyHandler";
     }
   else
     {
       os_ << be_idt;
-    
+
       for (long i = 0; i < n_parents; ++i)
         {
           if (i != 0)
             {
               os_ << "," << be_nl;
             }
-            
+
           AST_Type *parent = node->inherits ()[i];
-            
+
           AST_Decl *d = ScopeAsDecl (parent->defined_in ());
-            
+
           bool global = (d->node_type () == AST_Decl::NT_root);
-          
+
           os_ << (global ? "" : "::") << d->full_name ()
               << "::AMI4CCM_" << parent->original_local_name ()
               << "ReplyHandler";
         }
-        
+
       os_ << be_uidt;
     }
-      
+
   os_ << be_uidt_nl
       << "{" << be_idt;
-      
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_ami4ccm_rh_ex_idl")
                          ACE_TEXT ("::visit_interface - ")
                          ACE_TEXT ("visit_scope() failed\n")),
-                        -1);         
+                        -1);
     }
-  
+
   os_ << be_uidt_nl
       << "};";
-      
+
   return 0;
 }
 
@@ -94,7 +94,7 @@ be_visitor_ami4ccm_rh_ex_idl::visit_operation (be_operation *node)
       // We do nothing for oneways!
       return 0;
     }
-    
+
   if (node->is_sendc_ami ())
     {
       return 0;
@@ -103,37 +103,37 @@ be_visitor_ami4ccm_rh_ex_idl::visit_operation (be_operation *node)
   os_ << be_nl
       << "void " << node->original_local_name ()
       << " (" << be_idt;
-      
+
   if (!node->void_return_type ())
     {
       be_type *t =
         be_type::narrow_from_decl (node->return_type ());
-    
+
       os_ << be_nl
           << "in "
           << IdentifierHelper::type_name (t, this)
           << " ami_return_val";
     }
-    
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_ami4ccm_rh_ex_idl")
                          ACE_TEXT ("::visit_operation - ")
                          ACE_TEXT ("visit_scope() failed\n")),
-                        -1);         
+                        -1);
     }
-      
+
   os_ << ");" << be_uidt;
-  
+
   os_ << be_nl
       << "void " << node->original_local_name ()
       << "_excep (" << be_idt_nl
       << "in ::CCM_AMI::ExceptionHolder excep_holder);" << be_uidt;
-      
-  /// Reset for next operation traversal.    
+
+  /// Reset for next operation traversal.
   this->seen_in_or_inout_arg_ = false;
-  
+
   return 0;
 }
 
@@ -141,12 +141,12 @@ int
 be_visitor_ami4ccm_rh_ex_idl::visit_attribute (be_attribute *node)
 {
   this->gen_attr_rh_ops (false, node);
-  
+
   if (!node->readonly ())
     {
       this->gen_attr_rh_ops (true, node);
     }
-    
+
   return 0;
 }
 
@@ -157,17 +157,17 @@ be_visitor_ami4ccm_rh_ex_idl::visit_argument (be_argument *node)
     {
       return 0;
     }
-    
+
   be_type *t =
     be_type::narrow_from_decl (node->field_type ());
-    
+
   os_ << be_nl
       << "in ";
-  
+
   os_ << IdentifierHelper::type_name (t, this);
-  
+
   os_ << " " << node->original_local_name ();
-    
+
   return 0;
 }
 
@@ -208,21 +208,21 @@ be_visitor_ami4ccm_rh_ex_idl::pre_process (be_decl *node)
 {
   be_operation *op =
     be_operation::narrow_from_scope (this->ctx_->scope ());
-    
+
   if (op == 0)
     {
       return 0;
     }
-    
+
   bool void_ret_type = op->void_return_type ();
-    
+
   be_argument *arg = be_argument::narrow_from_decl (node);
-  
+
   if (arg == 0)
     {
       return 0;
     }
-    
+
   if (arg->direction () == AST_Argument::dir_IN)
     {
       return 0;
@@ -231,7 +231,7 @@ be_visitor_ami4ccm_rh_ex_idl::pre_process (be_decl *node)
   if (!this->seen_in_or_inout_arg_)
     {
       this->seen_in_or_inout_arg_ = true;
-      
+
       if (void_ret_type)
         {
           /// If we are here, we are generating the first
@@ -240,11 +240,11 @@ be_visitor_ami4ccm_rh_ex_idl::pre_process (be_decl *node)
           return 0;
         }
     }
-    
+
   /// If we are here after all the above checks, we
-  /// always want to generate a leading comma.  
+  /// always want to generate a leading comma.
   os_ << ",";
-    
+
   return 0;
 }
 
@@ -255,19 +255,19 @@ be_visitor_ami4ccm_rh_ex_idl::gen_attr_rh_ops (bool is_set_op,
   os_ << be_nl
       << "void " << (is_set_op ? "set_" : "get_")
       << node->original_local_name () << " (";
-      
+
   if (!is_set_op)
     {
       be_type *t =
         be_type::narrow_from_decl (node->field_type ());
-        
+
       os_ << be_idt_nl << "in ";
-      
+
       os_ << IdentifierHelper::type_name (t, this);
-      
+
       os_ << " " << node->original_local_name () << be_uidt;
     }
-    
+
   os_ << ");"
       << be_nl
       << "void " << (is_set_op ? "set_" : "get_")
diff --git a/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp b/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp
index e4f4f3df1ad..66336648390 100644
--- a/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp
+++ b/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp
@@ -28,44 +28,44 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_interface (be_interface *node)
 {
   this->iface_ = node;
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "local interface AMI4CCM_"
       << node->original_local_name () << be_nl
       << "{" << be_idt;
-      
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_ami4ccm_sendc_ex_idl")
                          ACE_TEXT ("::visit_interface - ")
                          ACE_TEXT ("visit_scope() failed\n")),
-                        -1);         
+                        -1);
     }
-    
+
   AST_Interface **inh_flat = node->inherits_flat ();
-    
+
   for (long i = 0; i < node->n_inherits_flat (); ++i)
     {
       be_interface *ancestor =
         be_interface::narrow_from_decl (inh_flat[i]);
-        
+
       if (this->visit_scope (ancestor) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_ami4ccm_sendc_ex_idl")
                              ACE_TEXT ("::visit_interface - visit ")
                              ACE_TEXT ("ancestor scope failed\n")),
-                            -1);         
+                            -1);
         }
     }
-  
+
   os_ << be_uidt_nl
       << "};";
-      
+
   return 0;
 }
 
@@ -77,7 +77,7 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_operation (be_operation *node)
       // We do nothing for oneways!
       return 0;
     }
-    
+
   if (!node->is_sendc_ami ())
     {
       return 0;
@@ -86,17 +86,18 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_operation (be_operation *node)
   os_ << be_nl
       << "void " << node->original_local_name ()
       << " (" << be_idt;
-      
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_ami4ccm_rh_ex_idl::visit_operation - ")
+                         ACE_TEXT ("be_visitor_ami4ccm_sendc_ex_idl")
+                         ACE_TEXT ("::visit_operation - ")
                          ACE_TEXT ("visit_scope() failed\n")),
-                        -1);         
+                        -1);
     }
-      
+
   os_ << ");" << be_uidt;
-  
+
   return 0;
 }
 
@@ -107,7 +108,7 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_argument (be_argument *node)
     {
       return 0;
     }
-    
+
   /// AMI4CCM uses a different reply handler type, so we just
   /// replace the original handler parameter (which is always the
   /// first one) type.
@@ -121,15 +122,15 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_argument (be_argument *node)
     {
       be_type *t =
         be_type::narrow_from_decl (node->field_type ());
-        
+
       os_ << be_nl
           << "in ";
-      
+
       os_ << IdentifierHelper::type_name (t, this);
     }
-      
+
   os_ << " " << node->original_local_name ();
-    
+
   return 0;
 }
 
@@ -169,24 +170,24 @@ int
 be_visitor_ami4ccm_sendc_ex_idl::pre_process (be_decl *node)
 {
   be_argument *arg = be_argument::narrow_from_decl (node);
-  
+
   if (arg == 0)
     {
       return 0;
     }
-    
+
   if (arg->direction () != AST_Argument::dir_IN)
     {
       return 0;
     }
-    
+
   if (this->elem_number () == 1)
     {
       return 0;
     }
 
   os_ << ",";
-    
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp b/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
index 6e4f9c76cf5..c9508573bc9 100644
--- a/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
@@ -40,12 +40,12 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl << be_nl;
-  
+  *os << be_nl_2;
+
   *os << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
-      
-  *os << be_nl << be_nl;
+
+  *os << be_nl_2;
 
   be_module *module = 0;
 
@@ -90,13 +90,13 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
           be_util::gen_nested_namespace_end (os, module);
 
           // Emit #else.
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "#else\n\n";
         }
     }
 
   *os << be_global->core_versioning_begin () << be_nl;
-  
+
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << "_ptr); // copying" << be_nl;
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
diff --git a/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index 7a77fa81e82..9794c4e8e0a 100644
--- a/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    any_op_cs.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Any operators for Interface in the stubs
-//    file.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    any_op_cs.cpp
+ *
+ *  $Id$
+ *
+ *  Visitor generating code for Any operators for Interface in the stubs
+ *  file.
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 // ***************************************************************************
 // Interface visitor for generating Any operator declarations in the client
@@ -45,7 +42,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // All template specializations must be generated before the instantiations
@@ -55,7 +52,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
   if (! node->is_abstract ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "namespace TAO" << be_nl
           << "{" << be_idt_nl
           << "template<>" << be_nl
@@ -73,7 +70,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
   if (node->is_abstract () || node->has_mixed_parentage ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "namespace TAO" << be_nl
           << "{" << be_idt_nl
           << "template<>" << be_nl
@@ -99,7 +96,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
   // type is inserted into an Any and then marshaled.
   if (node->is_local ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "namespace TAO" << be_nl
           << "{" << be_idt_nl
           << "template<>" << be_nl
@@ -110,7 +107,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
           << "return false;" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "template<>" << be_nl
           << "::CORBA::Boolean" << be_nl
           << "Any_Impl_T<" << node->name ()
@@ -153,7 +150,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
           be_util::gen_nested_namespace_begin (os, module);
 
           // emit  nested variation of any operators
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "/// Copying insertion." << be_nl
               << "void" << be_nl
               << "operator<<= (" << be_idt << be_idt_nl
@@ -163,7 +160,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
               << node->local_name () << "_ptr _tao_objptr =" << be_idt_nl
               << node->local_name () << "::_duplicate (_tao_elem);" << be_uidt_nl
               << "_tao_any <<= &_tao_objptr;" << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           *os << "/// Non-copying insertion." << be_nl
               << "void" << be_nl
@@ -178,7 +175,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
               << node->tc_name ()->last_component () << "," << be_nl
               << "*_tao_elem);" << be_uidt
               << be_uidt << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           *os << "::CORBA::Boolean" << be_nl
               << "operator>>= (" << be_idt << be_idt_nl
@@ -198,14 +195,14 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
           be_util::gen_nested_namespace_end (os, module);
 
           // Emit #else.
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "#else\n";
         }
     }
 
   *os << be_global->core_versioning_begin () << be_nl;
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "/// Copying insertion." << be_nl
       << "void" << be_nl
       << "operator<<= (" << be_idt << be_idt_nl
@@ -215,7 +212,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
       << node->full_name () << "_ptr _tao_objptr =" << be_idt_nl
       << node->full_name () << "::_duplicate (_tao_elem);" << be_uidt_nl
       << "_tao_any <<= &_tao_objptr;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "/// Non-copying insertion." << be_nl
       << "void" << be_nl
@@ -230,7 +227,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
       << node->tc_name () << "," << be_nl
       << "*_tao_elem);" << be_uidt
       << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean" << be_nl
       << "operator>>= (" << be_idt << be_idt_nl
diff --git a/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp b/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
index f7d0caed56e..f3ecbea4dee 100644
--- a/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
@@ -41,11 +41,11 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl;
-  
+  *os << be_nl_2;
+
   *os << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
-      
+
   *os << be_nl;
 
   *os << be_global->core_versioning_begin () << be_nl;
diff --git a/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
index 22d00a2ae0f..73b02626b19 100644
--- a/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
@@ -49,7 +49,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
                          "codegen for scope failed\n"), -1);
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl;
 
   *os << be_global->core_versioning_begin () << be_nl;
@@ -62,7 +62,7 @@ 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 ())
@@ -80,7 +80,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
 
   *os << " _tao_corba_obj = _tao_objref;" << be_nl;
   *os << "return (strm << _tao_corba_obj);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Set the substate as generating code for the input operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_INPUT);
@@ -104,13 +104,13 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
       *os << "::CORBA::Object_var obj;";
     }
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "if (!(strm >> obj.inout ()))" << be_idt_nl
       << "{" << be_idt_nl
       << "return false;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "typedef ::" << node->name () << " RHS_SCOPED_NAME;"
-      << be_nl << be_nl
+      << be_nl_2
       << "// Narrow to the right type." << be_nl;
 
   *os << "_tao_objref =" << be_idt_nl;
diff --git a/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
index 43bac884bc7..f3ccdce64c5 100644
--- a/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
+++ b/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
@@ -22,15 +22,15 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface (
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "///////////////////////////////////////////////////////////////////////"
       << be_nl
       << "//                    Direct  Impl. Declaration" << be_nl
-      << "//" << be_nl << be_nl;
+      << "//" << be_nl_2;
 
   // Generate Class Declaration.
   *os << "class " << be_global->skel_export_macro ()
@@ -109,11 +109,11 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface (
     }
 
   *os << be_uidt_nl
-      << "};" << be_nl << be_nl
+      << "};" << be_nl_2
       << "//" << be_nl
       << "//                Direct  Proxy Impl. Declaration" << be_nl
       << "///////////////////////////////////////////////////////////////////////"
-      << be_nl << be_nl;
+      << be_nl_2;
 
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp b/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
index d42dbf5fb2d..957c44c8e04 100644
--- a/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
+++ b/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
@@ -24,16 +24,16 @@ be_visitor_interface_direct_proxy_impl_ss::visit_interface (
 
   this->ctx_->node (node);
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "///////////////////////////////////////////////////////////////////////"
       << be_nl
       << "//                 Direct Proxy  Implementation" << be_nl
-      << "//" << be_nl << be_nl;
+      << "//" << be_nl_2;
 
   // Destructor Implementation
   *os << node->full_direct_proxy_impl_name () << "::~"
       << node->direct_proxy_impl_name () << " (void)"
-      << be_nl << "{" << be_nl << "}" << be_nl << be_nl;
+      << be_nl << "{" << be_nl << "}" << be_nl_2;
 
   if (this->visit_scope (node) == -1)
     {
@@ -44,7 +44,7 @@ be_visitor_interface_direct_proxy_impl_ss::visit_interface (
                         -1);
     }
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "//" << be_nl
       << "//           End Direct Proxy Implementation" << be_nl
       << "///////////////////////////////////////////////////////////////////////";
diff --git a/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO_IDL/be/be_visitor_interface/interface.cpp
index 99b73167f7f..2881de3760a 100644
--- a/TAO_IDL/be/be_visitor_interface/interface.cpp
+++ b/TAO_IDL/be/be_visitor_interface/interface.cpp
@@ -406,7 +406,7 @@ be_visitor_interface::visit_operation (be_operation *node)
       }
     case TAO_CodeGen::TAO_ROOT_CS:
       ctx.state (TAO_CodeGen::TAO_OPERATION_CS);
-      
+
       if (node->is_sendc_ami ())
         {
           be_visitor_operation_ami_cs visitor (&ctx);
@@ -417,7 +417,7 @@ be_visitor_interface::visit_operation (be_operation *node)
           be_visitor_operation_cs visitor (&ctx);
           status = node->accept (&visitor);
         }
-        
+
       break;
     case TAO_CodeGen::TAO_ROOT_SH:
       {
diff --git a/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index de558db4e48..634a01c18e7 100644
--- a/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -39,8 +39,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl;
-  
+  *os << be_nl_2;
+
   *os << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
@@ -49,7 +49,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
   if (c != 0)
     {
       // Forward class declarations for components.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "class " << node->base_proxy_impl_name ()
           << ";" << be_nl
           << "class " << node->remote_proxy_impl_name ()
@@ -61,7 +61,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     }
 
   // Now generate the class definition.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "class " << be_global->stub_export_macro ()
       << " " << node->local_name () << be_idt_nl
       << ": ";
@@ -77,7 +77,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
   if (!node->is_local ())
     {
       bool abs = node->is_abstract ();
-      
+
       *os << be_nl
           << "friend class TAO::"
           << (abs ? "AbstractBase_" : "") << "Narrow_Utils<"
@@ -88,16 +88,16 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
   // Generate the static _duplicate, _narrow, _unchecked_narrow and
   // _nil operations.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// The static operations." << be_nl
       << "static " << node->local_name () << "_ptr " << "_duplicate ("
-      << node->local_name () << "_ptr obj);" << be_nl << be_nl;
-      
+      << node->local_name () << "_ptr obj);" << be_nl_2;
+
   if (c == 0)
     {
       *os << "static void _tao_release ("
           << node->local_name () << "_ptr obj);"
-          << be_nl << be_nl;
+          << be_nl_2;
     }
 
   if (! this->gen_xxx_narrow ("_narrow", node, os))
@@ -109,7 +109,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
                          ACE_TEXT ("_narrow () declaration\n")),
                         -1);
     }
-    
+
   if (c == 0)
     {
       if (! this->gen_xxx_narrow ("_unchecked_narrow", node, os))
@@ -123,14 +123,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
         }
     }
 
-  // This method is defined in the header file to workaround old
-  // g++ problems.
-  *os << "static " << node->local_name () << "_ptr _nil (void)"
-      << be_nl
-      << "{" << be_idt_nl
-      << "return static_cast<" << node->local_name ()
-      << "_ptr> (0);" << be_uidt_nl
-      << "}";
+  *os << "static " << node->local_name () << "_ptr _nil (void);";
 
   // Generate code for the interface definition by traversing thru the
   // elements of its scope. We depend on the front-end to have made sure
@@ -157,18 +150,18 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
         }
     }
 
-  *os << be_nl << be_nl;
-  
+  *os << be_nl_2;
+
   *os << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
-      
-  *os << be_nl << be_nl;
+
+  *os << be_nl_2;
 
   // If we inherit from both CORBA::Object and CORBA::AbstractBase,
   // we have to override _add_ref() to avoid ambiguity.
   if (node->has_mixed_parentage ())
     {
-      *os << "virtual void _add_ref (void);" << be_nl << be_nl;
+      *os << "virtual void _add_ref (void);" << be_nl_2;
     }
 
   // The _is_a method
@@ -215,7 +208,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
         {
           *os << "// Concrete interface only." << be_nl
               << node->local_name () << " (void);"
-              << be_nl << be_nl;
+              << be_nl_2;
         }
 
       if (be_global->gen_direct_collocation()
@@ -227,7 +220,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
               << "// parents piece of the given class in the right mode."
               << be_nl
               << "virtual void " << node->flat_name ()
-              << "_setup_collocation (void);" << be_nl << be_nl;
+              << "_setup_collocation (void);" << be_nl_2;
         }
     }
 
@@ -235,7 +228,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     {
       // Protected default constructor for abstract interfaces.
       *os << "// Abstract or local interface only." << be_nl
-          << node->local_name () << " (void);" << be_nl << be_nl;
+          << node->local_name () << " (void);" << be_nl_2;
     }
 
   if (node->is_abstract ())
@@ -243,7 +236,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       // Protected copy constructor for abstract interfaces.
       *os << "// Protected for abstract interfaces." << be_nl
           << node->local_name () << " (const "
-          << node->local_name () << " &);" << be_nl << be_nl;
+          << node->local_name () << " &);" << be_nl_2;
     }
 
   // Local interfaces don't support stub objects.
@@ -270,7 +263,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
   if (c != 0)
     {
       // Friends declarations, component only.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "friend class " << node->remote_proxy_impl_name ()
           << ";" << be_nl
           << "friend class " << node->direct_proxy_impl_name ()
@@ -278,7 +271,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     }
 
   // Protected destructor.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "virtual ~" << node->local_name () << " (void);";
 
   // Private copy constructor and assignment operator. These are not
@@ -291,7 +284,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     {
       *os << "// Private and unimplemented for concrete interfaces." << be_nl
           << node->local_name () << " (const "
-          << node->local_name () << " &);" << be_nl << be_nl;
+          << node->local_name () << " &);" << be_nl_2;
     }
 
   *os << "void operator= (const " << node->local_name () << " &);";
@@ -300,7 +293,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       << "};";
 
   be_visitor_context ctx (*this->ctx_);
-      
+
   // Don't support smart proxies for local interfaces.
   if (! node->is_local ())
     {
@@ -309,7 +302,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
       if (be_global->gen_smart_proxies ())
         {
-          *os << be_nl << be_nl;
+          *os << be_nl_2;
 
           // Smart Proxy related classes.
           ctx.state (TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CH);
@@ -368,7 +361,7 @@ be_visitor_interface_ch::visit_extended_port (be_extended_port *node)
   /// line to tell what scope we are actually in.
   this->ctx_->interface (
     be_interface::narrow_from_scope (node->defined_in ()));
-  
+
   /// Will ignore everything but porttype attributes.
   int status = this->visit_scope (node->port_type ());
 
@@ -397,7 +390,7 @@ be_visitor_interface_ch::visit_mirror_port (be_mirror_port *node)
   /// line to tell what scope we are actually in.
   this->ctx_->interface (
     be_interface::narrow_from_scope (node->defined_in ()));
-  
+
   /// Will ignore everything but porttype attributes.
   int status = this->visit_scope (node->port_type ());
 
diff --git a/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
index 209c80d5871..75a3f3b0ef7 100644
--- a/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    interface_ci.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Interfaces in the client inline file
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    interface_ci.cpp
+ *
+ *  $Id$
+ *
+ *  Visitor generating code for Interfaces in the client inline file
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 // **************************************************
 // Interface visitor for client inline
@@ -64,16 +61,16 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   if (node->is_abstract ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "ACE_INLINE" << be_nl
           << node->name () << "::" << node->local_name ()
           << " (void)" << be_nl
-          << "{}" << be_nl << be_nl;
+          << "{}" << be_nl_2;
 
       *os << "ACE_INLINE" << be_nl
           << node->name () << "::" << node->local_name ()
@@ -87,7 +84,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
 
   if (!node->is_local () && !node->is_abstract ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "ACE_INLINE" << be_nl;
       *os << node->name () << "::"
           << node->local_name () << " ("
diff --git a/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index ad466d52b82..0cfcf428e3d 100644
--- a/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -47,15 +47,15 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   AST_Component *c = AST_Component::narrow_from_decl (node);
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   if (node->is_defined ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "// Traits specializations for " << node->name () << ".";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << node->name () << "_ptr" << be_nl
           << "TAO::Objref_Traits<" << node->name () << ">::duplicate ("
           << be_idt << be_idt_nl
@@ -64,16 +64,27 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "return " << node->name () << "::_duplicate (p);" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void" << be_nl
           << "TAO::Objref_Traits<" << node->name () << ">::release ("
           << be_idt << be_idt_nl
           << node->name () << "_ptr p)" << be_uidt << be_uidt_nl
-          << "{" << be_idt_nl
-          << "::CORBA::release (p);" << be_uidt_nl
-          << "}";
+          << "{" << be_idt_nl;
 
-      *os << be_nl << be_nl
+      // Workaround for broken HP V7.4-004 on OpenVMS IA83
+      if (node->has_mixed_parentage ())
+        {
+          *os << "::CORBA::AbstractBase_ptr abs = p;" << be_nl
+              << "::CORBA::release (abs);" << be_uidt_nl;
+        }
+      else
+        {
+          *os << "::CORBA::release (p);" << be_uidt_nl;
+        }
+
+      *os << "}";
+
+      *os << be_nl_2
           << node->name () << "_ptr" << be_nl
           << "TAO::Objref_Traits<" << node->name () << ">::nil (void)"
           << be_nl
@@ -81,7 +92,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "return " << node->name () << "::_nil ();" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "::CORBA::Boolean" << be_nl
           << "TAO::Objref_Traits<" << node->name () << ">::marshal ("
           << be_idt << be_idt_nl
@@ -90,14 +101,14 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "{" << be_idt_nl
           << "return ";
 
-          if (node->is_abstract () || c != 0)
-            {
-              *os << "cdr << p;";
-            }
-          else
-            {
-              *os << "::CORBA::Object::marshal (p, cdr);";
-            }
+      if (node->is_abstract () || c != 0)
+        {
+          *os << "cdr << p;";
+        }
+      else
+        {
+          *os << "::CORBA::Object::marshal (p, cdr);";
+        }
 
       *os << be_uidt_nl
           << "}";
@@ -105,7 +116,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   if (c == 0 && be_global->gen_ostream_operators ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "std::ostream &" << be_nl
           << node->name () << "::_tao_stream_v (std::ostream &strm) const"
           << be_nl
@@ -117,7 +128,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   if (node->has_mixed_parentage ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void" << be_nl
           << "CORBA::release ("
           << node->name ()
@@ -127,7 +138,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "::CORBA::release (abs);" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "::CORBA::Boolean" << be_nl
           << "CORBA::is_nil ("
           << node->name ()
@@ -142,7 +153,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       (be_global->gen_direct_collocation() || be_global->gen_thru_poa_collocation ()))
     {
       // Generate the proxy broker factory function pointer definition.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "// Function pointer for collocation factory initialization."
           << be_nl
           << "TAO::Collocation_Proxy_Broker * " << be_nl
@@ -166,7 +177,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   if (node->is_local ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << node->name () << "::" << node->local_name ()
           << " (void)" << be_nl
           << "{}";
@@ -174,7 +185,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   if (! node->is_abstract () && ! node->is_local ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << node->name () << "::" << node->local_name ()
           << " (void)" << be_nl;
 
@@ -197,7 +208,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
      (be_global->gen_direct_collocation()
       || be_global->gen_thru_poa_collocation ()))
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void" << be_nl
           << node->name () << "::" << node->flat_name ()
           << "_setup_collocation ()" << be_nl
@@ -248,10 +259,10 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << be_uidt_nl << "}";
     }
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << node->name () << "::~" << node->local_name ()
       << " (void)" << be_nl;
-  *os << "{}" << be_nl << be_nl;
+  *os << "{}" << be_nl_2;
 
   bool gen_any_destructor =
     be_global->any_support ()
@@ -268,7 +279,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "static_cast<"
           << node->local_name () << " *> (_tao_void_pointer);" << be_uidt_nl
           << "::CORBA::release (_tao_tmp_pointer);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
 
   if (node->has_mixed_parentage ())
@@ -278,7 +289,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "{" << be_idt_nl
           << "this->::CORBA::Object::_add_ref ();"
           << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
 
   // The _narrow method
@@ -302,6 +313,13 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
                         -1);
     }
 
+  // The _nil method
+  *os << node->full_name () << "_ptr" << be_nl
+      << node->full_name () << "::_nil (void)"
+      << be_nl
+      << "{" << be_idt_nl
+      << "return 0;" << be_uidt_nl
+      << "}" << be_nl_2;
 
   // The _duplicate method
   *os << node->full_name () << "_ptr" << be_nl
@@ -314,7 +332,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << "obj->_add_ref ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "return obj;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // The _tao_release method
   if (c == 0)
@@ -325,7 +343,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "_ptr obj)" << be_nl
           << "{" << be_idt_nl
           << "::CORBA::release (obj);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
 
   *os << "::CORBA::Boolean" << be_nl
@@ -337,7 +355,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << "if (" << be_idt << be_idt_nl;
 
   int status = node->gen_is_a_ancestors (os);
-  
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -346,7 +364,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
                          ACE_TEXT ("gen_is_a_ancestors() failed\n")),
                         -1);
     }
-      
+
   *os << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "return true; // success using local knowledge" << be_uidt_nl
@@ -364,7 +382,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     }
 
   *os << "}" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "const char* " << node->full_name ()
       << "::_interface_repository_id (void) const"
@@ -373,10 +391,10 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << "return \"" << node->repoID ()
       << "\";" << be_uidt_nl
       << "}";
-      
+
   bool is_loc = node->is_local ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "::CORBA::Boolean" << be_nl
       << node->name () << "::marshal (TAO_OutputCDR &"
       << (is_loc ? " /* " : "") << "cdr"
@@ -460,7 +478,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
           << "_ptr> (_tao_objref)"
           << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       return true;
     }
@@ -468,7 +486,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
            !node->is_abstract ())
     {
       *os << node->full_name () << " *proxy = 0;"
-      << be_nl << be_nl
+      << be_nl_2
           << "proxy = TAO::Narrow_Utils<"
           << node->local_name () << ">::" << pre << " (";
 
@@ -491,7 +509,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
           << "return TAO_" << node->flat_name ()
           << "_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (proxy);"
           << be_uidt << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
   else
     {
@@ -524,7 +542,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
           *os << "0" << be_uidt_nl;
         }
       *os << ");" << be_uidt << be_uidt << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
 
   return true;
@@ -553,7 +571,7 @@ be_visitor_interface_cs::visit_extended_port (be_extended_port *node)
   /// line to tell what scope we are actually in.
   this->ctx_->interface (
     be_interface::narrow_from_scope (node->defined_in ()));
-  
+
   /// Will ignore everything but porttype attributes.
   int status = this->visit_scope (node->port_type ());
 
@@ -582,7 +600,7 @@ be_visitor_interface_cs::visit_mirror_port (be_mirror_port *node)
   /// line to tell what scope we are actually in.
   this->ctx_->interface (
     be_interface::narrow_from_scope (node->defined_in ()));
-  
+
   /// Will ignore everything but porttype attributes.
   int status = this->visit_scope (node->port_type ());
 
diff --git a/TAO_IDL/be/be_visitor_interface/interface_ih.cpp b/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
index 694bc3e9a3a..0e2e2990c0a 100644
--- a/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
+++ b/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
@@ -48,7 +48,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
   if (be_global->gen_impl_debug_info ())
     {
       *os << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+          << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
     }
 
   // Now generate the class definition.
@@ -79,7 +79,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
       << "public:" << be_idt_nl
       << "// Constructor " << be_nl
       <<  be_global->impl_class_prefix () << namebuf
-      << be_global->impl_class_suffix () << " (void);" << be_nl << be_nl;
+      << be_global->impl_class_suffix () << " (void);" << be_nl_2;
 
   if (be_global->gen_copy_ctor () && !node->is_local ())
     {
@@ -96,7 +96,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
           << be_global->impl_class_prefix () << namebuf
           << be_global->impl_class_suffix () << "& " << "operator=(const "
           << be_global->impl_class_prefix () << namebuf
-          << be_global->impl_class_suffix () << "&);" << be_nl << be_nl;
+          << be_global->impl_class_suffix () << "&);" << be_nl_2;
 
     }
 
@@ -110,7 +110,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "be_visitor_interface_ih::"
-                        "visit_interface - "
+                         "visit_interface - "
                          "codegen for scope failed\n"),
                         -1);
     }
@@ -133,7 +133,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
 
 
   *os << be_uidt_nl
-      << "};" << be_nl << be_nl;
+      << "};" << be_nl_2;
 
   return 0;
 }
@@ -145,8 +145,10 @@ be_visitor_interface_ih::method_helper (be_interface *derived,
                                         be_interface *node,
                                         TAO_OutStream *os)
 {
+  int compare =
+    ACE_OS::strcmp (derived->flat_name (), node->flat_name ());
 
-  if (ACE_OS::strcmp (derived->flat_name (), node->flat_name ()) != 0)
+  if (compare != 0)
     {
       be_visitor_context ctx;
       ctx.state (TAO_CodeGen::TAO_ROOT_IH);
diff --git a/TAO_IDL/be/be_visitor_interface/interface_is.cpp b/TAO_IDL/be/be_visitor_interface/interface_is.cpp
index 9340043b22b..3283b03e6d4 100644
--- a/TAO_IDL/be/be_visitor_interface/interface_is.cpp
+++ b/TAO_IDL/be/be_visitor_interface/interface_is.cpp
@@ -41,7 +41,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
   if (be_global->gen_impl_debug_info ())
     {
       *os << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+          << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
     }
 
   *os << "// Implementation skeleton constructor" << be_nl;
@@ -54,7 +54,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
       << " (void)" << be_nl;
 
   *os << "{" << be_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   os->indent ();
   *os << "// Implementation skeleton destructor" << be_nl;
@@ -66,7 +66,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
       << " (void)" << be_nl;
 
   *os << "{" <<be_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   if (be_global->gen_copy_ctor () && !node->is_local ())
     {
diff --git a/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
index dc156ed15fd..7c2f10fc67f 100644
--- a/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -72,13 +72,13 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       class_name +=  node->local_name ();
     }
 
-  *os << be_nl << be_nl;
-  
+  *os << be_nl_2;
+
   *os << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Generate the skeleton class name.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "class " << class_name.c_str () << ";" << be_nl;
 
   // Generate the _ptr declaration.
@@ -88,7 +88,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
 
   if (be_global->gen_direct_collocation ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "class " << node->direct_proxy_impl_name ()
           << ";" << be_nl
           << "class " << node->strategized_proxy_broker_name ()
@@ -96,7 +96,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
     }
 
   // Now generate the class definition.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "class " << be_global->skel_export_macro ()
       << " " << class_name.c_str () << be_idt_nl
       << ": " << be_idt;
@@ -113,18 +113,18 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << "public:" << be_idt_nl;
 
   // Some useful typedefs.
-  *os << "// Useful for template programming." << be_nl
+  *os << "/// Useful for template programming." << be_nl
       << "typedef ::" << node->name () << " _stub_type;"
       << be_nl
       << "typedef ::" << node->name () << "_ptr _stub_ptr_type;"
       << be_nl
       << "typedef ::" << node->name () << "_var _stub_var_type;"
-      << be_nl << be_nl;
+      << be_nl_2;
 
   // Copy constructor and destructor.
   *os << class_name.c_str () << " (const "
       << class_name.c_str () << "& rhs);" << be_nl
-      << "virtual ~" << class_name.c_str () << " (void);" << be_nl << be_nl;
+      << "virtual ~" << class_name.c_str () << " (void);" << be_nl_2;
 
   // _is_a
   *os << "virtual ::CORBA::Boolean _is_a (const "
diff --git a/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 84b54614e95..d87b3ab0600 100644
--- a/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -91,12 +91,12 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl;
-  
+  *os << be_nl_2;
+
   *os << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
-      
-  *os << be_nl << be_nl;
+
+  *os << be_nl_2;
 
   // Find if we are at the top scope or inside some module,
   // pre-compute the prefix that must be added to the local name in
@@ -123,7 +123,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   *os << "{" << be_idt_nl
       << "this->optable_ = &tao_" << flat_name
       << "_optable;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // find if we are at the top scope or inside some module
   *os << full_skel_name << "::"
@@ -146,7 +146,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   *os << be_uidt_nl
       << "{" << be_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << full_skel_name << "::~"
       << local_name_prefix << node_local_name
@@ -164,12 +164,12 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                         -1);
     }
 
-  *os << be_nl << be_nl;
-  
+  *os << be_nl_2;
+
   *os << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
-      
-  *os << be_nl << be_nl;
+
+  *os << be_nl_2;
 
   // Generate code for the _is_a skeleton.
   {
@@ -210,7 +210,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                                   full_skel_name,
                                   is_a_upcall_command_name.c_str ());
 
-    *os << be_nl << be_nl
+    *os << be_nl_2
         << "void " << full_skel_name
         << "::_is_a_skel (" << be_idt << be_idt_nl
         << "TAO_ServerRequest & server_request, " << be_nl
@@ -235,7 +235,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     op_visitor.gen_skel_body_arglist (&is_a,
                                       os);
 
-    *os << be_nl << be_nl
+    *os << be_nl_2
         << "TAO::Argument * const args[] =" << be_idt_nl
         << "{" << be_idt_nl
         << "&retval," << be_nl
@@ -243,7 +243,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << be_uidt_nl
         << "};" << be_uidt_nl << be_nl;
 
-    *os << "static size_t const nargs = 2;" << be_nl << be_nl;
+    *os << "static size_t const nargs = 2;" << be_nl_2;
 
     // Get the right object implementation.
     *os << full_skel_name << " * const impl =" << be_idt_nl
@@ -287,7 +287,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     this->generate_send_reply (os);
 
     *os << be_uidt_nl
-        << "}" << be_nl << be_nl;
+        << "}" << be_nl_2;
 
     is_a.destroy ();
     rt.destroy ();
@@ -320,7 +320,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                                   full_skel_name,
                                   non_exist_upcall_command_name.c_str ());
 
-    *os << be_nl << be_nl
+    *os << be_nl_2
         << "void " << full_skel_name
         << "::_non_existent_skel (" << be_idt << be_idt_nl
         << "TAO_ServerRequest & server_request, " << be_nl
@@ -345,14 +345,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     op_visitor.gen_skel_body_arglist (&non_existent,
                                       os);
 
-    *os << be_nl << be_nl
+    *os << be_nl_2
         << "TAO::Argument * const args[] =" << be_idt_nl
         << "{" << be_idt_nl
         << "&retval"
         << be_uidt_nl
         << "};" << be_uidt_nl << be_nl;
 
-    *os << "static size_t const nargs = 1;" << be_nl << be_nl;
+    *os << "static size_t const nargs = 1;" << be_nl_2;
 
     // Get the right object implementation.
     *os << full_skel_name << " * const impl =" << be_idt_nl
@@ -434,7 +434,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                                   full_skel_name,
                                   repository_id_upcall_command_name.c_str ());
 
-    *os << be_nl << be_nl
+    *os << be_nl_2
         << "void " << full_skel_name
         << "::_repository_id_skel (" << be_idt << be_idt_nl
         << "TAO_ServerRequest & server_request, " << be_nl
@@ -459,14 +459,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     op_visitor.gen_skel_body_arglist (&repository_id,
                                       os);
 
-    *os << be_nl << be_nl
+    *os << be_nl_2
         << "TAO::Argument * const args[] =" << be_idt_nl
         << "{" << be_idt_nl
         << "&retval"
         << be_uidt_nl
         << "};" << be_uidt_nl << be_nl;
 
-    *os << "static size_t const nargs = 1;" << be_nl << be_nl;
+    *os << "static size_t const nargs = 1;" << be_nl_2;
 
     // Get the right object implementation.
     *os << full_skel_name << " * const impl =" << be_idt_nl
@@ -519,12 +519,12 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   if (!be_global->gen_corba_e ()
       && !be_global->gen_minimum_corba ())
   {
-    *os << be_nl << be_nl;
-    
+    *os << be_nl_2;
+
     *os << "// TAO_IDL - Generated from " << be_nl
         << "// " << __FILE__ << ":" << __LINE__;
 
-    *os << be_nl << be_nl
+    *os << be_nl_2
         << "void " << full_skel_name
         << "::_interface_skel (" << be_idt << be_idt_nl
         << "TAO_ServerRequest & server_request, " << be_nl
@@ -553,12 +553,12 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << be_nl
         << "server_request.init_reply ();" << be_nl
         << "TAO_OutputCDR &_tao_out = *server_request.outgoing ();"
-        << be_nl << be_nl
+        << be_nl_2
         << "::CORBA::Boolean const _tao_result =" << be_idt_nl
         << "_tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval);"
         << be_uidt_nl << be_nl
         << "_tao_adapter->dispose (_tao_retval);"
-        << be_nl << be_nl;
+        << be_nl_2;
 
     *os << "if (!_tao_result)" << be_idt_nl
         << "{" << be_idt_nl
@@ -568,7 +568,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     this->generate_send_reply (os);
 
     *os << be_uidt_nl
-        << "}" << be_nl << be_nl;
+        << "}" << be_nl_2;
   }
 
   // Generate code for the _component skeleton, don't generate it when
@@ -600,7 +600,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                                   full_skel_name,
                                   get_component_upcall_command_name.c_str());
 
-    *os << be_nl << be_nl
+    *os << be_nl_2
         << "void " << full_skel_name
         << "::_component_skel (" << be_idt << be_idt_nl
         << "TAO_ServerRequest & server_request, " << be_nl
@@ -623,14 +623,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
     *os << ">::ret_val retval;";
 
-    *os << be_nl << be_nl
+    *os << be_nl_2
         << "TAO::Argument * const args[] =" << be_idt_nl
         << "{" << be_idt_nl
         << "&retval"
         << be_uidt_nl
         << "};" << be_uidt_nl << be_nl;
 
-    *os << "static size_t const nargs = 1;" << be_nl << be_nl;
+    *os << "static size_t const nargs = 1;" << be_nl_2;
 
     // Get the right object implementation.
     *os << full_skel_name << " * const impl =" << be_idt_nl
@@ -679,7 +679,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   // Generate code for the _is_a override.
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "::CORBA::Boolean " << full_skel_name
       << "::_is_a (const "
       << (be_global->alt_mapping () ? "std::string " : "char *")
@@ -732,7 +732,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   *os << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "const char* " << full_skel_name
       << "::_interface_repository_id (void) const"
@@ -897,12 +897,12 @@ be_visitor_interface_ss::this_method (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl;
-  
+  *os << be_nl_2;
+
   *os << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
-      
-  *os << be_nl << be_nl;
+
+  *os << be_nl_2;
 
   // The _this () operation.
   *os << node->full_name () << " *" << be_nl
@@ -910,13 +910,13 @@ be_visitor_interface_ss::this_method (be_interface *node)
       << "::_this (void)" << be_nl
       << "{" << be_idt_nl
       << "TAO_Stub *stub = this->_create_stub ();"
-      << be_nl << be_nl
+      << be_nl_2
       << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl;
 
   /* Coverity whines about an unused return value from _nil() when
      initializing tmp.  Just use zero instead. */
   *os << "::CORBA::Object_ptr tmp = CORBA::Object_ptr ();"
-      << be_nl << be_nl;
+      << be_nl_2;
 
    if (be_global->gen_direct_collocation() || be_global->gen_thru_poa_collocation ())
      {
@@ -944,7 +944,7 @@ be_visitor_interface_ss::this_method (be_interface *node)
       << ");" << be_uidt_nl << be_nl;
 
   *os << "::CORBA::Object_var obj = tmp;" << be_nl
-      << "(void) safe_stub.release ();" << be_nl << be_nl
+      << "(void) safe_stub.release ();" << be_nl_2
       << "typedef ::" << node->name () << " STUB_SCOPED_NAME;"
       << be_nl
       << "return" << be_idt_nl
@@ -979,12 +979,12 @@ be_visitor_interface_ss::dispatch_method (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl;
-  
+  *os << be_nl_2;
+
   *os << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
-      
-  *os << be_nl << be_nl;
+
+  *os << be_nl_2;
 
   *os << "void " << node->full_skel_name ()
       << "::_dispatch (TAO_ServerRequest & req, void * servant_upcall)"
@@ -1042,13 +1042,13 @@ be_visitor_interface_ss::generate_proxy_classes (be_interface *node)
       if (be_global->gen_direct_collocation()
           || be_global->gen_thru_poa_collocation ())
       {
-        *os << be_nl << be_nl;
-        
+        *os << be_nl_2;
+
         *os << "// TAO_IDL - Generated from" << be_nl
             << "// " << __FILE__ << ":" << __LINE__;
 
         // Proxy Broker Factory Function.
-        *os << be_nl << be_nl
+        *os << be_nl_2
             << "TAO::Collocation_Proxy_Broker *" << be_nl
             << node->flat_client_enclosing_scope ()
             << node->base_proxy_broker_name ()
@@ -1082,7 +1082,7 @@ be_visitor_interface_ss::generate_proxy_classes (be_interface *node)
           }
 
         *os << be_uidt_nl
-            << "}" << be_nl << be_nl;
+            << "}" << be_nl_2;
 
         // Proxy Broker Function Pointer Initializer.
         *os << "int" << be_nl
@@ -1100,7 +1100,7 @@ be_visitor_interface_ss::generate_proxy_classes (be_interface *node)
             << be_uidt_nl
             << be_nl
             << "return 0;" << be_uidt_nl
-            << "}" << be_nl << be_nl;
+            << "}" << be_nl_2;
 
         *os << "static int" << be_nl
             << node->flat_client_enclosing_scope ()
@@ -1113,8 +1113,7 @@ be_visitor_interface_ss::generate_proxy_classes (be_interface *node)
             << "reinterpret_cast<size_t> ("
             << node->flat_client_enclosing_scope ()
             << node->base_proxy_broker_name ()
-            << "_Factory_Initializer)" << be_uidt_nl
-            << ");" << be_uidt << be_uidt;
+            << "_Factory_Initializer));" << be_uidt << be_uidt << be_uidt_nl;
       }
     }
 
diff --git a/TAO_IDL/be/be_visitor_interface/interface_svh.cpp b/TAO_IDL/be/be_visitor_interface/interface_svh.cpp
index 431cc2f0159..eef8deab7ab 100644
--- a/TAO_IDL/be/be_visitor_interface/interface_svh.cpp
+++ b/TAO_IDL/be/be_visitor_interface/interface_svh.cpp
@@ -35,13 +35,13 @@ be_visitor_interface_svh::visit_interface (be_interface *node)
     {
       return 0;
     }
-    
-  // Skip implied IDL nodes.  
+
+  // Skip implied IDL nodes.
   if (node->original_interface () != 0)
     {
       return 0;
     }
-    
+
   if (node->is_local () || node->imported () || node->is_abstract ())
     {
       return 0;
diff --git a/TAO_IDL/be/be_visitor_interface/interface_svs.cpp b/TAO_IDL/be/be_visitor_interface/interface_svs.cpp
index cfdfe89ec39..d493009484a 100644
--- a/TAO_IDL/be/be_visitor_interface/interface_svs.cpp
+++ b/TAO_IDL/be/be_visitor_interface/interface_svs.cpp
@@ -35,13 +35,13 @@ be_visitor_interface_svs::visit_interface (be_interface *node)
     {
       return 0;
     }
-    
-  // Skip implied IDL nodes.  
+
+  // Skip implied IDL nodes.
   if (node->original_interface () != 0)
     {
       return 0;
     }
-    
+
   if (node->is_local () || node->imported () || node->is_abstract ())
     {
       return 0;
@@ -56,7 +56,7 @@ be_visitor_interface_svs::visit_operation (be_operation *node)
   be_visitor_operation_svs v (this->ctx_);
   v.scope (be_interface::narrow_from_decl (
              this->ctx_->scope ()->decl ()));
-  
+
   return v.visit_operation (node);
 }
 
@@ -64,11 +64,11 @@ int
 be_visitor_interface_svs::visit_attribute (be_attribute *node)
 {
   be_visitor_attribute v (this->ctx_);
-  
+
   v.for_facets (true);
   v.op_scope (be_interface::narrow_from_decl (
                 this->ctx_->scope ()->decl ()));
-  
+
   return v.visit_attribute (node);
 }
 
diff --git a/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
index c1919a3c5c6..f969c3a3065 100644
--- a/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
+++ b/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
@@ -42,8 +42,8 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
       bt = node;
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "class " << be_global->stub_export_macro ()<< " "
       << "TAO_" << node->flat_name ()
@@ -61,7 +61,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
       << "// flexibility of having a different smart proxy per object "<<be_nl
       <<"// instead of per interface."<<be_nl<< be_nl
       << "virtual ~TAO_" << node->flat_name ()
-      << "_Default_Proxy_Factory (void);" << be_nl << be_nl
+      << "_Default_Proxy_Factory (void);" << be_nl_2
       << "virtual "<< node->local_name ()
       << "_ptr create_proxy (" << be_idt << be_idt_nl
       << node->local_name ()
@@ -75,12 +75,12 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
       << "{" << be_nl
       << "public:" << be_idt_nl << be_nl
       << "friend class TAO_Singleton<TAO_" << node->flat_name ()
-      << "_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>;" << be_nl << be_nl
+      << "_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>;" << be_nl_2
       << "void register_proxy_factory (" << be_idt << be_idt_nl
       << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df,"<< be_nl
       << "bool one_shot_factory = true" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl
-      << "void unregister_proxy_factory (void);" << be_nl << be_nl
+      << "void unregister_proxy_factory (void);" << be_nl_2
       << node->local_name ()
       << "_ptr create_proxy (" << be_idt << be_idt_nl
       << node->local_name () << "_ptr proxy" << be_uidt_nl
@@ -102,10 +102,10 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
       << "TAO_SYNCH_RECURSIVE_MUTEX lock_;" << be_uidt_nl
       << "};";
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "typedef TAO_Singleton<TAO_"<<node->flat_name ()
       << "_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> TAO_"
-      << node->flat_name ()<< "_PROXY_FACTORY_ADAPTER;"<<be_nl << be_nl;
+      << node->flat_name ()<< "_PROXY_FACTORY_ADAPTER;"<<be_nl_2;
 
   *os << "class " << be_global->stub_export_macro ()<< " "
       << "TAO_"<< node->flat_name ()
diff --git a/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
index 76f62ecf011..38ff9db58bd 100644
--- a/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
+++ b/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
@@ -45,7 +45,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       // are in the same scope as the proxy.
       be_decl* scope = be_scope::narrow_from_scope (node->defined_in ())->decl ();
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << scope->full_name ();
 
       // Only if there exists any nesting "::" is needed!
@@ -79,7 +79,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << "{" << be_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << node->full_name () << "_ptr" << be_nl << be_uidt << be_uidt;
       *os << scope->full_name ();
 
@@ -96,7 +96,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << "return proxy;" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << scope->full_name ();
 
       // Only if there exists any nesting "::" is needed!
@@ -236,7 +236,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << be_uidt << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << scope->full_name ();
 
       // Only if there exists any nesting "::" is needed!
@@ -247,7 +247,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       *os << "TAO_"
           <<  node->flat_name () << "_Smart_Proxy_Base (void)" << be_uidt_nl
           << "{" << be_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       os->indent ();
       *os << scope->full_name ();
@@ -275,7 +275,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       *os << "_stubobj (void) const"<<be_nl
           << "{" << be_idt_nl
           << "return this->base_proxy_->_stubobj ();"<< be_uidt_nl
-          << "}"<< be_nl << be_nl;
+          << "}"<< be_nl_2;
 
       // Implement the <stubobj> method of the base class
       os->indent ();
@@ -289,7 +289,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       *os << "_stubobj (void)"<<be_nl
           << "{" << be_idt_nl
           << "return this->base_proxy_->_stubobj ();"<< be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       if (this->visit_scope (node) == -1)
         {
@@ -327,7 +327,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << be_uidt_nl
           << "}" << be_uidt_nl
           << "return this->proxy_.in ();" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
   else
     {
diff --git a/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp b/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
index 310e84a8918..8dddfb293be 100644
--- a/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
+++ b/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
@@ -22,14 +22,14 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "///////////////////////////////////////////////////////////////////////"
       << be_nl
       << "//               Strategized Proxy Broker Declaration " << be_nl
-      << "//" << be_nl << be_nl;
+      << "//" << be_nl_2;
 
   *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "class " << be_global->skel_export_macro () << " "
       << node->strategized_proxy_broker_name () << be_idt_nl
@@ -42,7 +42,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (
   *os << be_nl
       << "virtual ~" << node->strategized_proxy_broker_name () << " (void);";
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "TAO::Collocation_Strategy "
       << "get_strategy (::CORBA::Object_ptr obj);" << be_nl;
 
@@ -67,11 +67,11 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (
 
   *os << "};";
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "//" << be_nl
       << "//            End Strategized Proxy Broker Declaration " << be_nl
       << "///////////////////////////////////////////////////////////////////////"
-      << be_nl << be_nl;
+      << be_nl_2;
 
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
index 097bd1ae71e..5aafa765692 100644
--- a/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
+++ b/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
@@ -29,16 +29,16 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
       << "///////////////////////////////////////////////////////////////////////"
       << be_nl
       << "//            Strategized Proxy Broker Implementation" << be_nl
-      << "//" << be_nl << be_nl;
+      << "//" << be_nl_2;
 
   *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "// Global static proxy broker." << be_nl
       << "static " << node->full_strategized_proxy_broker_name () << be_nl
       << "tao_" << node->flat_client_enclosing_scope ()
       << node->base_proxy_broker_name ()
-      << ";" << be_nl << be_nl;
+      << ";" << be_nl_2;
 
   *os << "// Factory function Implementation." << be_nl
       << node->full_strategized_proxy_broker_name ()
@@ -49,13 +49,13 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
       << "{" << be_idt_nl
       << "return &" << "tao_" << node->flat_client_enclosing_scope ()
       << node->base_proxy_broker_name () << ";" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Destructor Implementation.
   *os << node->full_strategized_proxy_broker_name () << "::~"
       << node->strategized_proxy_broker_name () << " (void)" << be_nl
       << "{" << be_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // get_strategy() impementation.
   *os << "TAO::Collocation_Strategy" << be_nl
@@ -64,7 +64,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
       << "::CORBA::Object_ptr obj)" << be_uidt << be_uidt_nl
       << "{" << be_idt_nl
       << "return TAO_ORB_Core::collocation_strategy (obj);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // create_proxy implementation
   *os << "void" << be_nl
@@ -91,7 +91,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
       << "strategy);" << be_uidt << be_uidt_nl
       << "}";
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "//" << be_nl
       << "//        End Strategized Proxy Broker Implementation" << be_nl
       << "///////////////////////////////////////////////////////////////////////";
diff --git a/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
index 6ba50a98d63..9fcd63a1729 100644
--- a/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -74,8 +74,8 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
     }
 
   // Now generate the class definition.
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "// TIE class: Refer to CORBA v2.2, Section 20.34.4" << be_nl;
   *os << "template <class T>" << be_nl;
@@ -94,7 +94,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << "PortableServer::POA_ptr poa," << be_nl
       << "::CORBA::Boolean release = true" << be_uidt_nl
       << ");" << be_uidt_nl
-      << "/// dtor" << be_nl << be_nl
+      << "/// dtor" << be_nl_2
       << "~" << tiename << " (void);" << be_nl
       << "// TIE specific functions" << be_nl
       << "/// return the underlying object" << be_nl
@@ -105,7 +105,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << "void _tied_object (T *obj, ::CORBA::Boolean release = true);" << be_nl
       << "/// do we own it" << be_nl
       << "::CORBA::Boolean _is_owner (void);" << be_nl
-      << "/// set the ownership" << be_nl << be_nl
+      << "/// set the ownership" << be_nl_2
       << "void _is_owner ( ::CORBA::Boolean b);" << be_nl
       << "// overridden ServantBase operations" << be_nl
       << "PortableServer::POA_ptr _default_POA (void);";
@@ -129,7 +129,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << "private:" << be_idt_nl
       << "T *ptr_;" << be_nl
       << "PortableServer::POA_var poa_;" << be_nl
-      << "::CORBA::Boolean rel_;" << be_nl << be_nl
+      << "::CORBA::Boolean rel_;" << be_nl_2
       << "// copy and assignment are not allowed" << be_nl
       << tiename << " (const " << tiename << " &);" << be_nl
       << "void operator= (const " << tiename << " &);" << be_uidt_nl
diff --git a/TAO_IDL/be/be_visitor_interface/tie_ss.cpp b/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
index cdaad5a88cc..041bc2101d8 100644
--- a/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
+++ b/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
@@ -82,15 +82,15 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "template <class T>" << be_nl
       << fulltiename << "<T>::" << localtiename << " (T &t)" << be_nl
       << "\t: ptr_ (&t)," << be_nl
       << "\t  poa_ ( ::PortableServer::POA::_nil ())," << be_nl
       << "\t  rel_ (false)" << be_nl
-      << "{}" << be_nl << be_nl;
+      << "{}" << be_nl_2;
 
   *os << "template <class T> " << be_nl
       << fulltiename << "<T>::" << localtiename
@@ -98,7 +98,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "\t: ptr_ (&t)," << be_nl
       << "\t  poa_ ( ::PortableServer::POA::_duplicate (poa))," << be_nl
       << "\t  rel_ (false)" << be_nl
-      << "{}" << be_nl << be_nl;
+      << "{}" << be_nl_2;
 
   *os << "template <class T>" << be_nl
       << fulltiename << "<T>::" << localtiename
@@ -106,7 +106,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "\t: ptr_ (tp)," << be_nl
       << "\t  poa_ ( ::PortableServer::POA::_nil ())," << be_nl
       << "\t  rel_ (release)" << be_nl
-      << "{}" << be_nl << be_nl;
+      << "{}" << be_nl_2;
 
   *os << "template <class T>" << be_nl
       << fulltiename << "<T>::" << localtiename
@@ -115,7 +115,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "\t: ptr_ (tp)," << be_nl
       << "\t  poa_ ( ::PortableServer::POA::_duplicate (poa))," << be_nl
       << "\t  rel_ (release)" << be_nl
-      << "{}" << be_nl << be_nl;
+      << "{}" << be_nl_2;
 
   *os << "template <class T>" << be_nl
       << fulltiename << "<T>::~" << localtiename << " (void)" << be_nl
@@ -124,13 +124,13 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "{" << be_idt_nl
       << "delete this->ptr_;" << be_uidt_nl
       << "}" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "template <class T> T *" << be_nl
       << fulltiename << "<T>::_tied_object (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->ptr_;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "template <class T> void" << be_nl
       << fulltiename << "<T>::_tied_object (T &obj)" << be_nl
@@ -141,7 +141,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "}" << be_uidt_nl << be_nl
       << "this->ptr_ = &obj;" << be_nl
       << "this->rel_ = false;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "template <class T> void" << be_nl
       << fulltiename << "<T>::_tied_object (T *obj, "
@@ -153,19 +153,19 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "}" << be_uidt_nl << be_nl
       << "this->ptr_ = obj;" << be_nl
       << "this->rel_ = release;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "template <class T>  ::CORBA::Boolean" << be_nl
       << fulltiename << "<T>::_is_owner (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->rel_;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "template <class T> void" << be_nl
       << fulltiename << "<T>::_is_owner ( ::CORBA::Boolean b)" << be_nl
       << "{" << be_idt_nl
       << "this->rel_ = b;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "template <class T> "
       << "PortableServer::POA_ptr" << be_nl
diff --git a/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
index ec4a3c01a27..9e98fb7934b 100644
--- a/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
@@ -52,8 +52,8 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   be_module *module = 0;
 
@@ -90,12 +90,12 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (
       be_util::gen_nested_namespace_end (os, module);
 
       // Emit #else.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "#else\n\n";
     }
 
   *os << be_global->core_versioning_begin () << be_nl;
-  
+
   *os << macro << " void"
       << " operator<<= (::CORBA::Any &, " << node->name ()
       << "_ptr); // copying" << be_nl;
@@ -107,7 +107,7 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (
       << node->name () << " *&);";
 
   *os << be_global->core_versioning_end () << be_nl;
-  
+
   if (module != 0)
     {
       *os << "\n\n#endif";
diff --git a/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp b/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
index 9a250cebe6d..4093b6ae834 100644
--- a/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
@@ -51,11 +51,11 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
-  
+
   *os << be_global->stub_export_macro () << " ::CORBA::Boolean "
       << "operator<< (TAO_OutputCDR &, const " << node->full_name ()
       << "_ptr );" << be_nl;
@@ -64,7 +64,7 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node)
       << node->full_name () << "_ptr &);\n";
 
   *os << be_global->core_versioning_end () << be_nl;
-  
+
   node->cli_hdr_cdr_op_gen (1);
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_member_type_decl.cpp b/TAO_IDL/be/be_visitor_member_type_decl.cpp
new file mode 100644
index 00000000000..f1ea4cf1871
--- /dev/null
+++ b/TAO_IDL/be/be_visitor_member_type_decl.cpp
@@ -0,0 +1,180 @@
+// $Id$
+
+#include "be_visitor_member_type_decl.h"
+
+#include "be_visitor_context.h"
+#include "be_array.h"
+#include "be_component.h"
+#include "be_enum.h"
+#include "be_eventtype.h"
+#include "be_home.h"
+#include "be_predefined_type.h"
+#include "be_sequence.h"
+#include "be_string.h"
+#include "be_structure.h"
+#include "be_typedef.h"
+#include "be_union.h"
+#include "be_valuebox.h"
+#include "be_valuetype.h"
+
+be_visitor_member_type_decl::be_visitor_member_type_decl  (
+      be_visitor_context *ctx)
+  : be_visitor_decl (ctx)
+{
+}
+
+be_visitor_member_type_decl::~be_visitor_member_type_decl (void)
+{
+}
+
+int
+be_visitor_member_type_decl::visit_array (be_array *)
+{
+  be_type *bt = this->ctx_->alias ();
+
+  if (bt == 0)
+    {
+      /// Support anonymous types?
+      return -1;
+    }
+
+  os_ << "::" << bt->full_name () << "_var ";
+
+  return 0;
+}
+
+int
+be_visitor_member_type_decl::visit_component (be_component *node)
+{
+  os_ << "::" << node->full_name () << "_var ";
+  return 0;
+}
+
+int
+be_visitor_member_type_decl::visit_enum (be_enum *node)
+{
+  os_ << "::" << node->full_name () << " ";
+  return 0;
+}
+
+int
+be_visitor_member_type_decl::visit_eventtype (
+  be_eventtype *node)
+{
+  os_ << "::" << node->full_name () << " * ";
+  return 0;
+}
+
+int
+be_visitor_member_type_decl::visit_home (be_home *node)
+{
+  os_ << "::" << node->full_name () << "_var ";
+  return 0;
+}
+
+int
+be_visitor_member_type_decl::visit_interface (
+  be_interface *node)
+{
+  os_ << "::" << node->full_name () << "_var ";
+  return 0;
+}
+
+int
+be_visitor_member_type_decl::visit_predefined_type (
+  be_predefined_type *node)
+{
+  os_ << "::" << node->full_name ();
+
+  switch (node->pt ())
+    {
+      case AST_PredefinedType::PT_abstract:
+      case AST_PredefinedType::PT_object:
+      case AST_PredefinedType::PT_pseudo:
+      case AST_PredefinedType::PT_any:
+        os_ << "_var";
+        break;
+      case AST_PredefinedType::PT_value:
+        os_ << " *";
+        break;
+      default:
+        break;
+    }
+
+  os_ << " ";
+
+  return 0;
+}
+
+/// Unused if anonymous types are not allowed.
+int
+be_visitor_member_type_decl::visit_sequence (be_sequence *)
+{
+  be_type *bt = this->ctx_->alias ();
+
+  if (bt == 0)
+    {
+      /// Support anonymous types?
+      return -1;
+    }
+
+  os_ << "::" << bt->full_name () << "_var ";
+
+  return 0;
+}
+
+int
+be_visitor_member_type_decl::visit_string (be_string *node)
+{
+  os_ << "::CORBA::" << (node->width () == 1 ? "" : "W")
+      << "String_var ";
+  return 0;
+}
+
+int
+be_visitor_member_type_decl::visit_structure (be_structure *node)
+{
+  os_ << "::" << node->full_name () << "_var ";
+  return 0;
+}
+
+int
+be_visitor_member_type_decl::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node);
+  int status = node->primitive_base_type ()->accept (this);
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_memkber_type_decl::"
+                         "visit_typedef - "
+                         "accept on primitive type failed\n"),
+                        -1);
+    }
+
+  this->ctx_->alias (0);
+  return 0;
+}
+
+int
+be_visitor_member_type_decl::visit_union (be_union *node)
+{
+  os_ << "::" << node->full_name () << "_var ";
+  return 0;
+}
+
+int
+be_visitor_member_type_decl::visit_valuebox (be_valuebox *node)
+{
+  os_ << "::" << node->full_name () << "_var ";
+  return 0;
+}
+
+int
+be_visitor_member_type_decl::visit_valuetype (be_valuetype *node)
+{
+  os_ << "::" << node->full_name () << "_var ";
+  return 0;
+}
+
diff --git a/TAO_IDL/be/be_visitor_module.cpp b/TAO_IDL/be/be_visitor_module.cpp
index fa1823127f0..8d2f27c8f09 100644
--- a/TAO_IDL/be/be_visitor_module.cpp
+++ b/TAO_IDL/be/be_visitor_module.cpp
@@ -64,5 +64,3 @@
 #include "be_visitor_module/module_ih.cpp"
 #include "be_visitor_module/any_op.cpp"
 #include "be_visitor_module/cdr_op.cpp"
-#include "be_visitor_module/serializer_op.cpp"
-
diff --git a/TAO_IDL/be/be_visitor_module/any_op.cpp b/TAO_IDL/be/be_visitor_module/any_op.cpp
index aaf05f86ec7..639e9b080ab 100644
--- a/TAO_IDL/be/be_visitor_module/any_op.cpp
+++ b/TAO_IDL/be/be_visitor_module/any_op.cpp
@@ -35,7 +35,7 @@ be_visitor_module_any_op::visit_module (be_module *node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_module::visit_module - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
diff --git a/TAO_IDL/be/be_visitor_module/cdr_op.cpp b/TAO_IDL/be/be_visitor_module/cdr_op.cpp
index 64bacbcde9d..53fe04bc832 100644
--- a/TAO_IDL/be/be_visitor_module/cdr_op.cpp
+++ b/TAO_IDL/be/be_visitor_module/cdr_op.cpp
@@ -35,7 +35,7 @@ be_visitor_module_cdr_op::visit_module (be_module *node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_module_cdr_op::visit_module - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
diff --git a/TAO_IDL/be/be_visitor_module/module.cpp b/TAO_IDL/be/be_visitor_module/module.cpp
index 8a3f05abf91..70965c24dc2 100644
--- a/TAO_IDL/be/be_visitor_module/module.cpp
+++ b/TAO_IDL/be/be_visitor_module/module.cpp
@@ -164,18 +164,6 @@ be_visitor_module::visit_enum (be_enum *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-      {
-        be_visitor_enum_serializer_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
-      {
-        be_visitor_enum_serializer_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     default:
       return 0; // nothing to be done
     }
@@ -245,12 +233,6 @@ be_visitor_module::visit_exception (be_exception *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
-      {
-        return 0; // nothing to be done for DCPS
-        break;
-      }
     default:
       return 0; // nothing to be done
     }
@@ -367,8 +349,6 @@ be_visitor_module::visit_interface (be_interface *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-    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:
@@ -434,11 +414,6 @@ be_visitor_module::visit_interface_fwd (be_interface_fwd *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-      {
-        return 0; // nothing to be done for DCPS
-       break;
-      }
     default:
       return 0; // nothing to be done
     }
@@ -571,12 +546,6 @@ be_visitor_module::visit_valuetype (be_valuetype *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
-      {
-        return 0; // nothing to be done for DCPS
-        break;
-      }
     case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
       {
         be_visitor_valuetype_any_op_ch visitor (&ctx);
@@ -652,11 +621,6 @@ be_visitor_module::visit_valuetype_fwd (be_valuetype_fwd *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-      {
-        return 0; // nothing to be done for DCPS
-        break;
-      }
     default:
       return 0; // nothing to be done
     }
@@ -708,10 +672,8 @@ be_visitor_module::visit_component (be_component *node)
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
       return this->visit_interface (node);
-      
-    // Nothing for these with components.  
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
+
+    // Nothing for these with components.
     case TAO_CodeGen::TAO_ROOT_IH:
     case TAO_CodeGen::TAO_ROOT_IS:
     case TAO_CodeGen::TAO_ROOT_CNH:
@@ -884,30 +846,30 @@ be_visitor_module::visit_connector (be_connector *node)
     {
       case TAO_CodeGen::TAO_ROOT_CNH:
         {
-          if (node->dds_connector ())
-            {  
-              be_visitor_connector_dds_exh visitor (&ctx);
+          if (node->ami_connector ())
+            {
+              be_visitor_connector_ami_exh visitor (&ctx);
               status = node->accept (&visitor);
               break;
             }
-          else if (node->ami_connector ())
+          else if (node->dds_connector ())
             {
-              be_visitor_connector_ami_exh visitor (&ctx);
+              be_visitor_connector_dds_exh visitor (&ctx);
               status = node->accept (&visitor);
               break;
             }
         }
       case TAO_CodeGen::TAO_ROOT_CNS:
         {
-          if (node->dds_connector ())
-            {  
-              be_visitor_connector_dds_exs visitor (&ctx);
+          if (node->ami_connector ())
+            {
+              be_visitor_connector_ami_exs visitor (&ctx);
               status = node->accept (&visitor);
               break;
             }
-          else if (node->ami_connector ())
+          else if (node->dds_connector ())
             {
-              be_visitor_connector_ami_exs visitor (&ctx);
+              be_visitor_connector_dds_exs visitor (&ctx);
               status = node->accept (&visitor);
               break;
             }
@@ -922,7 +884,7 @@ be_visitor_module::visit_connector (be_connector *node)
         // In all other cases, same as component.
         return this->visit_component (node);
     }
-    
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -931,7 +893,7 @@ be_visitor_module::visit_connector (be_connector *node)
                          ACE_TEXT ("failed to accept visitor\n")),
                         -1);
     }
-    
+
   return 0;
 }
 
@@ -988,18 +950,6 @@ be_visitor_module::visit_structure (be_structure *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-      {
-        be_visitor_structure_serializer_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
-      {
-        be_visitor_structure_serializer_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     default:
       return 0; // nothing to be done
     }
@@ -1102,18 +1052,6 @@ be_visitor_module::visit_union (be_union *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-      {
-        be_visitor_union_serializer_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
-      {
-        be_visitor_union_serializer_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     default:
       return 0; // nothing to be done
     }
@@ -1216,18 +1154,6 @@ be_visitor_module::visit_typedef (be_typedef *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-      {
-        be_visitor_typedef_serializer_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
-      {
-        be_visitor_typedef_serializer_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     default:
       return 0; // nothing to be done
     }
diff --git a/TAO_IDL/be/be_visitor_module/module_ch.cpp b/TAO_IDL/be/be_visitor_module/module_ch.cpp
index 0980c135019..922eb54f0f1 100644
--- a/TAO_IDL/be/be_visitor_module/module_ch.cpp
+++ b/TAO_IDL/be/be_visitor_module/module_ch.cpp
@@ -37,8 +37,8 @@ be_visitor_module_ch::visit_module (be_module *node)
   TAO_OutStream *os = this->ctx_->stream ();
   TAO_OutStream *aos = 0;
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "namespace " << node->local_name () << be_nl
       << "{" << be_idt;
@@ -47,8 +47,8 @@ be_visitor_module_ch::visit_module (be_module *node)
     {
       aos = tao_cg->anyop_header ();
 
-      *aos << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-           << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      *aos << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+           << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
       *aos << "namespace " << node->local_name () << be_nl
            << "{" << be_idt;
diff --git a/TAO_IDL/be/be_visitor_module/module_ih.cpp b/TAO_IDL/be/be_visitor_module/module_ih.cpp
index 0e70e377f49..139890224ac 100644
--- a/TAO_IDL/be/be_visitor_module/module_ih.cpp
+++ b/TAO_IDL/be/be_visitor_module/module_ih.cpp
@@ -36,7 +36,7 @@ be_visitor_module_ih::visit_module (be_module *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_module_ih::"
                              "visit_module - "
-                             "codegen for scope failed\n"), 
+                             "codegen for scope failed\n"),
                             -1);
         }
     }
diff --git a/TAO_IDL/be/be_visitor_module/module_sh.cpp b/TAO_IDL/be/be_visitor_module/module_sh.cpp
index 648a9d77167..1e6f7bfd9fc 100644
--- a/TAO_IDL/be/be_visitor_module/module_sh.cpp
+++ b/TAO_IDL/be/be_visitor_module/module_sh.cpp
@@ -37,8 +37,8 @@ be_visitor_module_sh::visit_module (be_module *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Generate the skeleton class name.
 
@@ -64,12 +64,12 @@ be_visitor_module_sh::visit_module (be_module *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_module_sh::"
                          "visit_module - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
   *os << be_uidt_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "} // module "
       << node->name ();
diff --git a/TAO_IDL/be/be_visitor_module/serializer_op.cpp b/TAO_IDL/be/be_visitor_module/serializer_op.cpp
deleted file mode 100644
index cae4ec74c42..00000000000
--- a/TAO_IDL/be/be_visitor_module/serializer_op.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-// ***************************************************************************
-// Module visitor for generating Serializer operator declarations in the client header
-// and stub
-// ***************************************************************************
-
-be_visitor_module_serializer_op::be_visitor_module_serializer_op (be_visitor_context *ctx)
-  : be_visitor_module (ctx)
-{
-}
-
-be_visitor_module_serializer_op::~be_visitor_module_serializer_op (void)
-{
-}
-
-int
-be_visitor_module_serializer_op::visit_module (be_module *node)
-{
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module_serializer_op::visit_module - "
-                         "codegen for scope failed\n"), 
-                        -1);
-    }
-
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_native/native_ch.cpp b/TAO_IDL/be/be_visitor_native/native_ch.cpp
index 9e774b8c4dd..5cae9b040cd 100644
--- a/TAO_IDL/be/be_visitor_native/native_ch.cpp
+++ b/TAO_IDL/be/be_visitor_native/native_ch.cpp
@@ -41,13 +41,16 @@ be_visitor_native_ch::visit_native (be_native *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__
-      << be_nl << be_nl;
+      << be_nl_2;
 
   const char *node_name = node->full_name ();
-  
+
+  const char *dds_suffix = be_global->opendds_sequence_suffix ();
+  const size_t dds_suffix_len = ACE_OS::strlen (dds_suffix);
+
   if (ACE_OS::strcmp (node_name, "PortableServer::ServantLocator::Cookie") == 0)
     {
       *os << "typedef void *Cookie;" << be_nl;
@@ -60,7 +63,7 @@ be_visitor_native_ch::visit_native (be_native *node)
            && 0 == ACE_OS::strcmp (node->full_name (),"DDS::SampleInfoSeq"))
     {
       // DDS/DCPS zero-copy read sequence type support.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "typedef ::TAO::DCPS::ZeroCopyInfoSeq< "
           << "SampleInfo"
           << ", DCPS_ZERO_COPY_SEQ_DEFAULT_SIZE> "
@@ -68,26 +71,27 @@ be_visitor_native_ch::visit_native (be_native *node)
           << "Seq;" << be_nl;
     }
   else if (idl_global->dcps_support_zero_copy_read ()
-      && ACE_OS::strlen (node_name) > 3
-      && 0 == ACE_OS::strcmp (node_name + ACE_OS::strlen (node_name)-3, "Seq") )
+      && ACE_OS::strlen (node_name) > dds_suffix_len
+      && 0 == ACE_OS::strcmp (node_name + ACE_OS::strlen (node_name) -
+                              dds_suffix_len, dds_suffix) )
     {
       // DDS/DCPS zero-copy read sequence type support.
 
       // 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::strlen (node_name) - dds_suffix_len);
+      sample_name[ACE_OS::strlen (node_name) - dds_suffix_len] = '\0';
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "typedef ::TAO::DCPS::ZeroCopyDataSeq< "
           << sample_name
           << ", DCPS_ZERO_COPY_SEQ_DEFAULT_SIZE> "
diff --git a/TAO_IDL/be/be_visitor_null_return_value.cpp b/TAO_IDL/be/be_visitor_null_return_value.cpp
index cf1ca9606e1..08eaf3df02f 100644
--- a/TAO_IDL/be/be_visitor_null_return_value.cpp
+++ b/TAO_IDL/be/be_visitor_null_return_value.cpp
@@ -30,10 +30,11 @@ be_visitor_null_return_value::~be_visitor_null_return_value (void)
 }
 
 int
-be_visitor_null_return_value::visit_array (be_array *)
+be_visitor_null_return_value::visit_array (be_array *node)
 {
-  os_ << "0";
-  
+  os_ << "static_cast< ::" << node->full_name ()
+      << "_slice *> (0)";
+
   return 0;
 }
 
@@ -66,7 +67,7 @@ be_visitor_null_return_value::visit_home (be_home *node)
 int
 be_visitor_null_return_value::visit_interface (be_interface *node)
 {
-  os_ << "::" << node->full_name () << "::_nil ()";
+  os_ << " ::" << node->full_name () << "::_nil ()";
 
   return 0;
 }
@@ -104,34 +105,49 @@ be_visitor_null_return_value::visit_predefined_type (be_predefined_type *node)
         os_ << "ACE_CDR_LONG_DOUBLE_INITIALIZER";
         break;
       case AST_PredefinedType::PT_object:
-        os_ << "::CORBA::Object::_nil ()";
+        os_ << " ::CORBA::Object::_nil ()";
         break;
       case AST_PredefinedType::PT_abstract:
-        os_ << "::CORBA::AbstractBase::_nil ()";
+        os_ << " ::CORBA::AbstractBase::_nil ()";
         break;
       case AST_PredefinedType::PT_pseudo:
-        os_ << "::CORBA::TypeCode::_nil ()";
+        os_ << " ::CORBA::TypeCode::_nil ()";
         break;
       default: // PT_void not handled.
         break;
     }
-    
+
   return 0;
 }
 
 int
-be_visitor_null_return_value::visit_sequence (be_sequence *)
+be_visitor_null_return_value::visit_sequence (be_sequence *node)
 {
-  os_ << "0";
-  
+  const char *fname = node->full_name ();
+  be_typedef *td = this->ctx_->tdef ();
+
+  if (td != 0)
+    {
+      fname = td->full_name ();
+    }
+
+  os_ << "static_cast< ::" << fname << " *> (0)";
+
   return 0;
 }
 
 int
-be_visitor_null_return_value::visit_string (be_string *)
+be_visitor_null_return_value::visit_string (be_string *node)
 {
-  os_ << "0";
-  
+  if (node->width () == sizeof (char))
+    {
+      os_ << "static_cast<char *> (0)";
+    }
+  else
+    {
+      os_ << "static_cast< ::CORBA::WChar *> (0)";
+    }
+
   return 0;
 }
 
@@ -140,19 +156,21 @@ be_visitor_null_return_value::visit_structure (be_structure *node)
 {
   if (node->size_type () == AST_Type::FIXED)
     {
-      os_ << "::" << node->full_name () << " ()";
+      os_ << " ::" << node->full_name () << " ()";
     }
   else
     {
-      os_ << "0";
+      os_ << "static_cast< ::" << node->full_name ()
+          << " *> (0)";
     }
-  
+
   return 0;
 }
 
 int
 be_visitor_null_return_value::visit_typedef (be_typedef *node)
 {
+  this->ctx_->tdef (node);
   return node->primitive_base_type ()->accept (this);
 }
 
@@ -161,29 +179,32 @@ be_visitor_null_return_value::visit_union (be_union *node)
 {
   if (node->size_type () == AST_Type::FIXED)
     {
-      os_ << "::" << node->full_name () << " ()";
+      os_ << " ::" << node->full_name () << " ()";
     }
   else
     {
-      os_ << "0";
+      os_ << "static_cast< ::" << node->full_name ()
+          << " *> (0)";
     }
-  
+
   return 0;
 }
 
 int
-be_visitor_null_return_value::visit_valuebox (be_valuebox *)
+be_visitor_null_return_value::visit_valuebox (be_valuebox *node)
 {
-  os_ << "0";
-  
+  os_ << "static_cast< ::" << node->full_name ()
+      << " *> (0)";
+
   return 0;
 }
 
 int
-be_visitor_null_return_value::visit_valuetype (be_valuetype *)
+be_visitor_null_return_value::visit_valuetype (be_valuetype *node)
 {
-  os_ << "0";
-  
+  os_ << "static_cast< ::" << node->full_name ()
+      << " *> (0)";
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp b/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp
index 9d1e5760977..21fa9fe6798 100644
--- a/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp
+++ b/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp
@@ -37,7 +37,7 @@ be_visitor_amh_rh_operation_sh::visit_operation (be_operation *node)
       return 0;
     }
 
-  /// These are not for the server side.  
+  /// These are not for the server side.
   if (node->is_sendc_ami ())
     {
       return 0;
@@ -51,13 +51,13 @@ be_visitor_amh_rh_operation_sh::visit_operation (be_operation *node)
     this->ctx_->attribute ()
       ? this->ctx_->attribute ()->defined_in ()
       : node->defined_in ();
-      
+
   be_interface *intf = be_interface::narrow_from_scope (s);
 
   if (intf == 0)
     {
       be_porttype *pt = be_porttype::narrow_from_scope (s);
-      
+
       if (pt == 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -72,8 +72,8 @@ be_visitor_amh_rh_operation_sh::visit_operation (be_operation *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "virtual void ";
 
diff --git a/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp b/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
index 98cd49868d3..28e70e58e7c 100644
--- a/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
+++ b/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
@@ -30,7 +30,7 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
       return 0;
     }
 
-  /// These are not for the server side.  
+  /// These are not for the server side.
   if (node->is_sendc_ami ())
     {
       return 0;
@@ -43,13 +43,13 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
     this->ctx_->attribute ()
       ? this->ctx_->attribute ()->defined_in ()
       : node->defined_in ();
-      
+
   be_interface *intf = be_interface::narrow_from_scope (s);
 
   if (intf == 0)
     {
       be_porttype *pt = be_porttype::narrow_from_scope (s);
-      
+
       if (pt == 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -74,8 +74,8 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
   buf = 0;
 
   // Step 1 : Generate return type: always void
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from " << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "void" << be_nl
       << response_handler_implementation_name.c_str () << "::";
@@ -183,7 +183,7 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
     {
       // Step 3: Generate actual code for the method
       *os << be_nl << "{" << be_idt_nl
-          << "this->_tao_rh_init_reply ();" << be_nl << be_nl;
+          << "this->_tao_rh_init_reply ();" << be_nl_2;
 
       this->marshal_params (node);
 
diff --git a/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
index 29b675f53ae..d5269a02b8d 100644
--- a/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
+++ b/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
@@ -36,8 +36,8 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node)
     {
       return 0;
     }
-    
-  /// These are not for the server side.  
+
+  /// These are not for the server side.
   if (node->is_sendc_ami ())
     {
       return 0;
@@ -130,8 +130,8 @@ be_visitor_amh_operation_sh::generate_shared_prologue (
     const char *skel_prefix
   )
 {
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from " << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "static void " << skel_prefix
       << this->ctx_->port_prefix ().c_str ()
diff --git a/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
index d8b7930f3b8..da66afebb59 100644
--- a/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -31,7 +31,7 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node)
       return 0;
     }
 
-  /// These are not for the server side.  
+  /// These are not for the server side.
   if (node->is_sendc_ami ())
     {
       return 0;
@@ -83,7 +83,7 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node)
 
       *os << be_nl
           << "TAO_InputCDR & _tao_in ="
-          << " *_tao_server_request.incoming ();" << be_nl << be_nl
+          << " *_tao_server_request.incoming ();" << be_nl_2
           << "if (!(" << be_idt << be_idt;
 
       // Marshal each in and inout argument.
@@ -237,7 +237,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
   *os << be_nl
       << "TAO_InputCDR & _tao_in ="
       << " *_tao_server_request.incoming ();"
-      << be_nl << be_nl
+      << be_nl_2
       << "if (!(" << be_idt << be_idt;
 
   {
@@ -302,8 +302,8 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node,
                                                        TAO_OutStream *os,
                                                        const char *skel_prefix)
 {
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from " << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // We need the interface node in which this operation was defined. However,
   // if this operation node was an attribute node in disguise, we get this
diff --git a/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
index 88b97927506..1edecc7e41c 100644
--- a/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -57,11 +57,11 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Generate the return type mapping. Return type is simply void.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "void" << be_nl;
 
   // Generate the operation name.
@@ -152,7 +152,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
       // No arguments other than the reply handler, and the return
       // type is void.  No need to generate argument list.
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "TAO::Argument ** _the_tao_operation_signature = 0;";
       nargs = 0; // Don't count the reply handler.
     }
@@ -168,7 +168,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
       this->gen_stub_body_arglist (ami_op, os, true);
 
       // Assemble the arg helper class pointer array.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "TAO::Argument *_the_tao_operation_signature[] =" << be_idt_nl
           << "{" << be_idt_nl
           << "&_tao_retval";
@@ -195,20 +195,20 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
   be_interface *intf = be_interface::narrow_from_decl (parent);
 
   ACE_CString base (node->local_name ()->get_string ());
-  
+
   /// The sendc_* operation makes the invocation with the
   /// original operation name.
   ACE_CString lname_str (base.substr (ACE_OS::strlen ("sendc_")));
   const char *lname = lname_str.c_str ();
-  
+
   ACE_CString opname (node->is_attr_op () ? "_" : "");
   opname += lname;
-  
+
   /// Some compilers can't resolve the stream operator overload.
   const char *op_name = opname.c_str ();
   ACE_CDR::ULong len = opname.length ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "TAO::Asynch_Invocation_Adapter _tao_call (" << be_idt << be_idt_nl
       << "this," << be_nl
       << "_the_tao_operation_signature," << be_nl
@@ -227,8 +227,8 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
 
   *os << be_uidt_nl
       << ");" << be_uidt;
-  
-  *os << be_nl << be_nl
+
+  *os << be_nl_2
       << "_tao_call.invoke (" << be_idt << be_idt_nl
       << "ami_handler," << be_nl
       << "&";
@@ -240,7 +240,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
 
       *os << gparent->name () << "::";
     }
-    
+
   *os << "AMI_"  << parent->local_name () << "Handler::"
       << lname << "_reply_stub" << be_uidt_nl
       << ");" << be_uidt;
diff --git a/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
index 5e28e5365ed..09cbabefdf2 100644
--- a/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+++ b/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
@@ -75,7 +75,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
   os->indent ();
 
   // Generate the return type. Return type is simply void.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "void" << be_nl;
 
   // Get the scope name.
@@ -112,7 +112,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
 
   *os << parent->full_name ();
   *os << "::_narrow (_tao_reply_handler);" << be_uidt
-      << be_nl << be_nl
+      << be_nl_2
       << "// Exception handling" << be_nl
       << "switch (reply_status)" << be_nl
       << "{" << be_idt_nl
@@ -199,7 +199,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
 
         }
 
-      *os << be_uidt_nl << "};" << be_nl << be_nl;
+      *os << be_uidt_nl << "};" << be_nl_2;
 
       *os << "::CORBA::ULong const exceptions_count = "
           << excep_count << ";\n" << be_nl;
@@ -275,7 +275,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_argument (
 
   os->indent ();
   *os << "{" << bt->tc_name () << ", ";
-  
+
   switch (node->direction ())
     {
     case AST_Argument::dir_IN:
diff --git a/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO_IDL/be/be_visitor_operation/arglist.cpp
index 207e0f6862a..bf786bb9c94 100644
--- a/TAO_IDL/be/be_visitor_operation/arglist.cpp
+++ b/TAO_IDL/be/be_visitor_operation/arglist.cpp
@@ -37,11 +37,6 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
   bool has_args = node->argument_count () > 0;
 
   *os << " (";
-  
-  if (has_args)
-    {
-      *os << be_idt_nl;
-    }
 
   switch (this->ctx_->state ())
     {
@@ -74,11 +69,6 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
     }
 
   *os << ")";
-  
-  if (has_args)
-    {
-      *os << be_uidt;
-    }
 
   switch (this->ctx_->state ())
     {
@@ -112,7 +102,7 @@ be_visitor_operation_arglist::visit_factory (be_factory *node)
   bool has_args = node->argument_count () > 0;
 
   *os << " (";
-  
+
   if (has_args)
     {
       *os << be_idt_nl;
@@ -134,12 +124,12 @@ be_visitor_operation_arglist::visit_factory (be_factory *node)
     }
 
   *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.
@@ -169,7 +159,7 @@ be_visitor_operation_arglist::visit_argument (be_argument *node)
     {
       be_factory *f =
         be_factory::narrow_from_scope (this->ctx_->scope ());
-        
+
       intf = be_interface::narrow_from_scope (f->defined_in ());
     }
   else
@@ -178,7 +168,7 @@ be_visitor_operation_arglist::visit_argument (be_argument *node)
         ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
         : be_interface::narrow_from_scope (op->defined_in ());
     }
-    
+
   // Set new scope.
   ctx.scope (intf);
 
diff --git a/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp b/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
index b0ff9d80ba5..7de506bd3b0 100644
--- a/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
+++ b/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
@@ -109,7 +109,7 @@ be_visitor_operation_argument_invoke::post_process (be_decl *bd)
                          "Bad argument node\n"),
                         -1);
     }
-    
+
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_OUTPUT:
@@ -156,7 +156,7 @@ be_visitor_operation_argument_invoke::post_process (be_decl *bd)
                          "Bad sub state\n"),
                         -1);
     }
-    
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp b/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
index b349e15e088..3a399e5a071 100644
--- a/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
+++ b/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
@@ -49,7 +49,7 @@ be_visitor_operation_argument_marshal::pre_process (be_decl *bd)
                          "Bad argument node\n"),
                         -1);
     }
-    
+
   switch (arg->direction ())
     {
     case AST_Argument::dir_IN:
@@ -109,7 +109,7 @@ be_visitor_operation_argument_marshal::post_process (be_decl *bd)
                          "Bad argument node\n"),
                         -1);
     }
-    
+
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
@@ -199,7 +199,7 @@ be_visitor_args_decl::visit_array (be_array *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_args_decl::"
                          "visit_array - "
-                         "cannot retrieve argument node\n"), 
+                         "cannot retrieve argument node\n"),
                         -1);
     }
 
@@ -207,8 +207,8 @@ be_visitor_args_decl::visit_array (be_array *node)
   // the full_name with or without the underscore and use it later on.
   char fname [NAMEBUFSIZE];  // to hold the full and
 
-  ACE_OS::memset (fname, 
-                  '\0', 
+  ACE_OS::memset (fname,
+                  '\0',
                   NAMEBUFSIZE);
 
   if (!this->ctx_->alias () // not a typedef
@@ -224,23 +224,23 @@ be_visitor_args_decl::visit_array (be_array *node)
           be_decl *parent =
             be_scope::narrow_from_scope (node->defined_in ())->decl ();
 
-          ACE_OS::sprintf (fname, 
-                           "%s::_%s", 
+          ACE_OS::sprintf (fname,
+                           "%s::_%s",
                            parent->full_name (),
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, 
-                           "_%s",        
+          ACE_OS::sprintf (fname,
+                           "_%s",
                            node->full_name ());
         }
     }
   else
     {
       // Typedefed node.
-      ACE_OS::sprintf (fname, 
-                       "%s", 
+      ACE_OS::sprintf (fname,
+                       "%s",
                        node->full_name ());
     }
 
@@ -272,7 +272,7 @@ be_visitor_args_decl::visit_typedef (be_typedef *node)
                          "(%N:%l) be_visitor_args_decl::"
                          "visit_typedef - "
                          "Bad primitive type\n"
-                         ), 
+                         ),
                         -1);
     }
 
diff --git a/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp b/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp
index f4a74e0cd44..2b2aa030fd0 100644
--- a/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp
+++ b/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp
@@ -16,8 +16,8 @@ int be_visitor_operation_base_proxy_impl_ch::visit_operation (be_operation *node
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "virtual ";
 
diff --git a/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
index fba6f0e5bd4..b62d7224634 100644
--- a/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
+++ b/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
@@ -21,7 +21,7 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
     {
       return 0;
     }
-    
+
   TAO_OutStream *os = this->ctx_->stream ();
 
   // We need the interface node in which this operation was defined. However,
@@ -31,13 +31,13 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
     this->ctx_->attribute ()
       ? this->ctx_->attribute ()->defined_in ()
       : node->defined_in ();
-      
+
   be_interface *intf = be_interface::narrow_from_scope (s);
 
   if (intf == 0)
     {
       be_porttype *pt = be_porttype::narrow_from_scope (s);
-      
+
       if (pt == 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -54,7 +54,7 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
     }
 
   *os << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "void" << be_nl
       << intf->full_direct_proxy_impl_name () << "::";
@@ -84,8 +84,7 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
     }
 
   *os << "," << be_nl
-      << "int" << be_uidt_nl
-      << ")";
+      << "int)" << be_uidt_nl;
 
   *os << be_uidt_nl
       << "{" << be_idt_nl;
diff --git a/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp b/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
index a3ae13db0dd..fba098186f6 100644
--- a/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
+++ b/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
@@ -37,7 +37,7 @@ be_visitor_operation_exceptlist_cs::visit_operation (be_operation *node)
   // Don't do anything if the exception list is empty.
   if (node->exceptions ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "static TAO::Exception_Data" << be_nl
           << "_tao_" << node->flat_name ()
           << "_exceptiondata [] = " << be_idt_nl;
@@ -75,7 +75,7 @@ be_visitor_operation_exceptlist_cs::visit_operation (be_operation *node)
 
           if (!ei.is_done ())
             {
-              *os << "," << be_nl << be_nl;
+              *os << "," << be_nl_2;
             }
         }
 
diff --git a/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp b/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
index 6512ff893cd..033f905f5b0 100644
--- a/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
+++ b/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
@@ -72,7 +72,7 @@ be_visitor_operation_exceptlist_ss::visit_operation (be_operation * node)
           << "static ::CORBA::ULong const nexceptions = 0;";
     }
 
-  *os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_nl << be_nl;
+  *os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_nl_2;
 
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO_IDL/be/be_visitor_operation/operation.cpp
index 48f13b135ce..42f56085bc1 100644
--- a/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -140,13 +140,13 @@ be_visitor_operation::gen_stub_operation_body (
     this->ctx_->attribute ()
       ? this->ctx_->attribute ()->defined_in ()
       : node->defined_in ();
-      
+
   be_interface *intf = be_interface::narrow_from_scope (s);
 
   if (intf == 0)
     {
       be_porttype *pt = be_porttype::narrow_from_scope (s);
-      
+
       if (pt == 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -195,7 +195,7 @@ be_visitor_operation::gen_stub_operation_body (
           << "::CORBA::Object::tao_object_initialize (this);"
           << be_uidt_nl
           << "}" << be_uidt_nl << be_nl;
-          
+
       if (be_global->gen_direct_collocation() || be_global->gen_thru_poa_collocation ())
         {
             *os << "if (this->the" << intf->base_proxy_broker_name () << "_ == 0)"
@@ -222,7 +222,7 @@ be_visitor_operation::gen_stub_operation_body (
   // Declare the argument helper classes.
   this->gen_stub_body_arglist (node, os);
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "TAO::Argument *_the_tao_operation_signature [] =" << be_idt_nl
       << "{" << be_idt_nl
       << "&_tao_retval";
@@ -251,7 +251,7 @@ be_visitor_operation::gen_stub_operation_body (
                         -1);
     }
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "TAO::" << (node->is_abstract () ? "AbstractBase_" : "" )
       << "Invocation_Adapter _tao_call (" << be_idt << be_idt_nl
       << "this," << be_nl
@@ -283,11 +283,11 @@ be_visitor_operation::gen_stub_operation_body (
     }
 
   opname += node->original_local_name ()->get_string ();
-  
+
   /// Some compilers can't resolve the stream operator overload.
   const char *lname = opname.c_str ();
   ACE_CDR::ULong len = opname.length ();
-  
+
   *os << lname << "\"," << be_nl
       << len << "," << be_nl;
 
@@ -309,7 +309,7 @@ be_visitor_operation::gen_stub_operation_body (
   *os << be_uidt_nl
       << ");" << be_uidt;
 
-  *os << be_nl << be_nl;
+  *os << be_nl_2;
 
   // Since oneways cannot raise user exceptions, we have that
   // case covered as well.
@@ -328,7 +328,7 @@ be_visitor_operation::gen_stub_operation_body (
 
   if (!this->void_return_type (return_type))
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "return _tao_retval.retn ();";
     }
 
@@ -537,13 +537,13 @@ be_visitor_operation::gen_arg_template_param_name (AST_Decl *scope,
       // without the leading double colon.
       *os << "::";
     }
-    
+
   /// For now, keep a list of system operation or arg names
   /// that may not be remapped. May decide later to regnerate
-  /// ORB code for alt mapping as well.  
+  /// ORB code for alt mapping as well.
   ACE_CString repo_id (scope->repoID ());
   bool sys_val = (repo_id == "IDL:repository_id:1.0");
-    
+
   // For types other than the 4 above, don't unalias the type name
   // in case it is a sequence or array.
   if (nt == AST_Decl::NT_string && bound == 0)
diff --git a/TAO_IDL/be/be_visitor_operation/operation_ch.cpp b/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
index 4aa05cef6b7..e2ead068506 100644
--- a/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
+++ b/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
@@ -32,11 +32,8 @@ be_visitor_operation_ch::visit_operation (be_operation *node)
 
   this->ctx_->node (node);
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
   // Every operation is declared virtual in the client code.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "virtual ";
 
   // STEP I: generate the return type.
@@ -50,7 +47,7 @@ be_visitor_operation_ch::visit_operation (be_operation *node)
                          ACE_TEXT ("Bad return type\n")),
                         -1);
     }
-    
+
   // Grab the right visitor to generate the return type.
   be_visitor_context ctx (*this->ctx_);
   be_visitor_operation_rettype or_visitor (&ctx);
@@ -67,7 +64,7 @@ be_visitor_operation_ch::visit_operation (be_operation *node)
   // STEP 2: generate the operation name. The port prefix should
   // be an empty string except for operations from attributes
   // defined in a porttype.
-  *os << be_nl << node->local_name ();
+  *os << " " << node->local_name ();
 
   // STEP 3: generate the argument list with the appropriate mapping. For these
   // we grab a visitor that generates the parameter listing.
@@ -83,19 +80,19 @@ be_visitor_operation_ch::visit_operation (be_operation *node)
                          "codegen for argument list failed\n"),
                         -1);
     }
-    
+
   be_interface *intf =
     be_interface::narrow_from_scope (node->defined_in ());
-   
+
   /// If we are in a reply handler, are not an execp_* operation,
   /// and have no native args, then generate the AMI static
-  /// reply stub declaration.  
+  /// reply stub declaration.
   if (intf != 0
       && intf->is_ami_rh ()
       && !node->is_excep_ami ()
       && !node->has_native ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "static void " << be_nl
           << node->local_name () << "_reply_stub (" << be_idt_nl
           << "TAO_InputCDR &_tao_reply_cdr," << be_nl
diff --git a/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
index 80f9ae985af..d6986c83e12 100644
--- a/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+++ b/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
@@ -47,13 +47,13 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
     this->ctx_->attribute ()
       ? this->ctx_->attribute ()->defined_in ()
       : node->defined_in ();
-      
+
   be_interface *intf = be_interface::narrow_from_scope (s);
 
   if (intf == 0)
     {
       be_porttype *pt = be_porttype::narrow_from_scope (s);
-      
+
       if (pt == 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -76,8 +76,8 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
       return 0;
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Retrieve the operation return type.
   be_type *bt = be_type::narrow_from_decl (node->return_type ());
@@ -103,7 +103,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
                          "codegen for return type failed\n"),
                         -1);
     }
-    
+
   // Generate the operation name
   *os << be_nl
       << intf->name () << "::" << node->local_name ();
@@ -130,10 +130,10 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
                          "codegen for stub body failed\n"),
                         -1);
     }
-    
+
   /// If we are in a reply handler, are not an execp_* operation,
   /// and have no native args, then generate the AMI static
-  /// reply stub declaration.  
+  /// reply stub declaration.
   if (intf != 0
       && intf->is_ami_rh ()
       && !node->is_excep_ami ()
@@ -141,9 +141,9 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
     {
       be_visitor_operation_ami_handler_reply_stub_operation_cs v (
         this->ctx_);
-        
+
       int status = v.visit_operation (node);
-      
+
       if (status == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -153,7 +153,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
                             -1);
         }
     }
-    
+
   return 0;
 }
 
@@ -191,6 +191,6 @@ be_visitor_operation_cs::visit_argument (be_argument *node)
     }
 
   *os << "0}";
-  
+
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_operation/operation_exs.cpp b/TAO_IDL/be/be_visitor_operation/operation_exs.cpp
index 833817461b6..dcaeaa21228 100644
--- a/TAO_IDL/be/be_visitor_operation/operation_exs.cpp
+++ b/TAO_IDL/be/be_visitor_operation/operation_exs.cpp
@@ -28,10 +28,16 @@ be_visitor_operation_exs::~be_visitor_operation_exs (void)
 int
 be_visitor_operation_exs::visit_operation (be_operation *node)
 {
+  // Impl classes shouldn't have implied AMI operations.
+  if (node->is_sendc_ami ())
+    {
+      return 0;
+    }
+
   this->ctx_->node (node);
 
-  os_ << be_nl << be_nl;
-     
+  os_ << be_nl_2;
+
   // Retrieve the operation return type.
   be_type *rt = be_type::narrow_from_decl (node->return_type ());
 
@@ -61,11 +67,11 @@ be_visitor_operation_exs::visit_operation (be_operation *node)
   // Generate the operation name
   os_ << be_nl
       << this->ctx_->port_prefix ().c_str ()
-      << scope_->original_local_name ()->get_string ()
+      << this->scope_->original_local_name ()->get_string ()
       << this->class_extension_.c_str () << "::"
       << node->local_name ();
-  
-  // Generate the argument list, which will use our overrridden 
+
+  // Generate the argument list, which will use our overrridden
   // visit_argument().
   be_visitor_operation_arglist al_visitor (this->ctx_);
   al_visitor.unused (true);
@@ -82,7 +88,7 @@ be_visitor_operation_exs::visit_operation (be_operation *node)
 
   // Must set this again, it's been changed by traversals above.
   this->ctx_->node (node);
-  
+
   return this->gen_op_body (rt);
 }
 
@@ -104,16 +110,16 @@ be_visitor_operation_exs::gen_op_body (be_type *return_type)
   os_ << be_nl
       << "{" << be_idt_nl
       << your_code_here_;
-      
+
   be_operation *op =
     be_operation::narrow_from_decl (this->ctx_->node ());
-  
+
   if (! op->void_return_type ())
     {
       os_ << be_nl;
-    
+
       be_null_return_emitter emitter (this->ctx_);
-      
+
       if (emitter.emit (return_type) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -124,10 +130,10 @@ be_visitor_operation_exs::gen_op_body (be_type *return_type)
                             -1);
         }
     }
-       
+
   os_ << be_uidt_nl
       << "}";
-      
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_operation/operation_ih.cpp b/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
index ba35fad7023..8d382cb21d3 100644
--- a/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
+++ b/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
@@ -28,15 +28,21 @@ be_visitor_operation_ih::~be_visitor_operation_ih (void)
 int
 be_visitor_operation_ih::visit_operation (be_operation *node)
 {
+  // Impl classes shouldn't have implied AMI operations.
+  if (node->is_sendc_ami ())
+    {
+      return 0;
+    }
+
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
-  
-  *os << be_nl << be_nl;
+
+  *os << be_nl_2;
 
   if (be_global->gen_impl_debug_info ())
     {
       *os << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+          << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
     }
 
   // every operation is declared virtual in the client code
diff --git a/TAO_IDL/be/be_visitor_operation/operation_is.cpp b/TAO_IDL/be/be_visitor_operation/operation_is.cpp
index 56cdfd3ecbc..8cd2168c699 100644
--- a/TAO_IDL/be/be_visitor_operation/operation_is.cpp
+++ b/TAO_IDL/be/be_visitor_operation/operation_is.cpp
@@ -28,6 +28,12 @@ be_visitor_operation_is::~be_visitor_operation_is (void)
 int
 be_visitor_operation_is::visit_operation (be_operation *node)
 {
+  // Impl classes shouldn't have implied AMI operations.
+  if (node->is_sendc_ami ())
+    {
+      return 0;
+    }
+
   TAO_OutStream *os = this->ctx_->stream ();
   be_interface *intf = this->ctx_->interface ();
 
@@ -48,7 +54,7 @@ be_visitor_operation_is::visit_operation (be_operation *node)
   if (be_global->gen_impl_debug_info ())
     {
       *os << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+          << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
     }
 
   be_visitor_context ctx (*this->ctx_);
@@ -97,7 +103,7 @@ be_visitor_operation_is::visit_operation (be_operation *node)
 
   *os << be_nl << "{" << be_idt_nl;
   *os << "// Add your implementation here" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
index faf04367558..af72ab06923 100644
--- a/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
+++ b/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
@@ -33,12 +33,12 @@ be_visitor_operation_sh::visit_operation (be_operation *node)
     {
       return 0;
     }
-    
+
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "virtual ";
 
@@ -88,7 +88,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node)
   // if there was no "native" type.
   if (!node->has_native ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "static void ";
 
       // Check if we are an attribute node in disguise.
diff --git a/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index 5933502c8ef..54363971d8b 100644
--- a/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -33,7 +33,7 @@ be_visitor_operation_ss::visit_operation (be_operation * node)
     {
       return 0;
     }
-    
+
   TAO_OutStream *os = this->ctx_->stream ();
   be_type *bt = 0;
 
@@ -131,9 +131,9 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
   UTL_Scope *s = this->ctx_->attribute ()
                  ? this->ctx_->attribute ()->defined_in ()
                  : node->defined_in ();
-                 
+
   be_interface *intf = be_interface::narrow_from_scope (s);
-  
+
   if (intf == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -169,8 +169,8 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
                                 intf->full_skel_name (),
                                 upcall_command_name.c_str ());
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from " << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "void " << intf->full_skel_name () << "::";
 
@@ -222,7 +222,7 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
   // Declare the argument helper classes.
   this->gen_skel_body_arglist (node, os);
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "TAO::Argument * const args[] =" << be_idt_nl
       << "{" << be_idt_nl
       << "&retval";
@@ -242,7 +242,7 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
       << "};" << be_uidt_nl << be_nl;
 
   *os << "static size_t const nargs = "
-      << (node->argument_count () + 1) << ";" << be_nl << be_nl;
+      << (node->argument_count () + 1) << ";" << be_nl_2;
 
   // Get the right object implementation.
   *os << intf->full_skel_name () << " * const impl =" << be_idt_nl
@@ -281,7 +281,7 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
       << "                       , nexceptions"
       << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
       << "                       );" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_operation/operation_svs.cpp b/TAO_IDL/be/be_visitor_operation/operation_svs.cpp
index 7f623d20cb7..68084dc7420 100644
--- a/TAO_IDL/be/be_visitor_operation/operation_svs.cpp
+++ b/TAO_IDL/be/be_visitor_operation/operation_svs.cpp
@@ -28,7 +28,7 @@ be_visitor_operation_svs::visit_operation (be_operation *node)
 {
   this->ctx_->node (node);
 
-  os_ << be_nl << be_nl;
+  os_ << be_nl_2;
 
   // Retrieve the operation return type.
   be_type *bt = be_type::narrow_from_decl (node->return_type ());
@@ -85,7 +85,16 @@ be_visitor_operation_svs::gen_op_body (be_operation *node)
   os_ << be_nl
       << "{" << be_idt_nl;
 
-  os_ << "if ( ::CORBA::is_nil (this->executor_.in ()))"
+  ACE_CString sname_str (ScopeAsDecl (scope_->defined_in ())->full_name ());
+  const char *global = (sname_str == "" ? "" : "::");
+
+  os_ << "::" << sname_str << global << "CCM_" << scope_->original_local_name ()
+      << "_var executor = " << be_idt_nl
+      << "::" << sname_str << global << "CCM_" << scope_->original_local_name ()
+      << "::_duplicate (this->executor_.in ());" << be_uidt
+      << be_nl_2;
+
+  os_ << "if ( ::CORBA::is_nil (executor.in ()))"
       << be_idt_nl
       << "{"<< be_idt_nl
       << "throw ::CORBA::INV_OBJREF ();" << be_uidt_nl
@@ -98,7 +107,7 @@ be_visitor_operation_svs::gen_op_body (be_operation *node)
       os_ << "return ";
     }
 
-  os_ << "this->executor_->" << node->local_name () << " (";
+  os_ << "executor->" << node->local_name () << " (";
 
   if (node->argument_count () == 0)
     {
diff --git a/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp b/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
index f23dbd3eb1b..711b4abb1b0 100644
--- a/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
+++ b/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
@@ -19,12 +19,12 @@ int be_visitor_operation_proxy_impl_xh::visit_operation (be_operation *node)
     {
       return 0;
     }
-    
+
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "static void" << be_nl;
 
diff --git a/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp b/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
index 9d73f192cd8..81436f6c775 100644
--- a/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
+++ b/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
@@ -55,8 +55,8 @@ be_visitor_operation_remote_proxy_impl_cs::visit_operation (
                         -1);
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Generate the return type mapping (same as in the header file)
   be_visitor_context ctx = *this->ctx_;
diff --git a/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO_IDL/be/be_visitor_operation/rettype.cpp
index 5b607d1214f..323474b95be 100644
--- a/TAO_IDL/be/be_visitor_operation/rettype.cpp
+++ b/TAO_IDL/be/be_visitor_operation/rettype.cpp
@@ -133,7 +133,7 @@ be_visitor_operation_rettype::visit_sequence (
   be_sequence *node)
 {
   *os << "::" << this->type_name (node);
-  
+
   if (!be_global->alt_mapping () || !node->unbounded ())
     {
       *os << " *";
@@ -147,7 +147,7 @@ be_visitor_operation_rettype::visit_string (be_string *node)
 {
   ACE_CDR::ULong bound = node->max_size ()->ev ()->u.ulval;
   bool wide = (node->width () != (long) sizeof (char));
-  
+
   if (wide)
     {
       *os << "::CORBA::WChar *";
diff --git a/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp b/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
index fff9050a710..9c012f6efc7 100644
--- a/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
+++ b/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
@@ -208,7 +208,7 @@ be_visitor_operation_rettype_return_cs::visit_union (
     {
       *os << "_tao_retval";
     }
-  
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp b/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp
index e5a1973d1b6..37efa14f16b 100644
--- a/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp
+++ b/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp
@@ -42,13 +42,13 @@ int be_visitor_operation_smart_proxy_cs::visit_operation (be_operation *node)
         this->ctx_->attribute ()
           ? this->ctx_->attribute ()->defined_in ()
           : node->defined_in ();
-          
+
       be_interface *intf = be_interface::narrow_from_scope (s);
 
       if (intf == 0)
         {
           be_porttype *pt = be_porttype::narrow_from_scope (s);
-          
+
           if (pt == 0)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_operation/tie_sh.cpp b/TAO_IDL/be/be_visitor_operation/tie_sh.cpp
index 33c2f374789..2ee99c3a473 100644
--- a/TAO_IDL/be/be_visitor_operation/tie_sh.cpp
+++ b/TAO_IDL/be/be_visitor_operation/tie_sh.cpp
@@ -37,7 +37,7 @@ be_visitor_operation_tie_sh::visit_operation (be_operation *node)
     {
       return 0;
     }
-    
+
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
@@ -53,8 +53,8 @@ be_visitor_operation_tie_sh::visit_operation (be_operation *node)
                         -1);
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   be_visitor_context ctx (*this->ctx_);
   be_visitor_operation_rettype oro_visitor (&ctx);
diff --git a/TAO_IDL/be/be_visitor_operation/tie_ss.cpp b/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
index a4e93c33c3e..597475cbe94 100644
--- a/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
+++ b/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
@@ -35,7 +35,7 @@ int be_visitor_operation_tie_ss::visit_operation (be_operation *node)
     {
       return 0;
     }
-    
+
   TAO_OutStream *os = this->ctx_->stream ();
 
   be_interface *intf = this->ctx_->interface ();
@@ -94,8 +94,8 @@ int be_visitor_operation_tie_ss::visit_operation (be_operation *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from " << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "template <class " << template_name.c_str () << ">" << be_nl;
 
diff --git a/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp b/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
index 874ba46a403..fcde2ce172f 100644
--- a/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
+++ b/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
@@ -34,7 +34,7 @@ be_visitor_operation_upcall_command_ss::visit (
     {
       return 0;
     }
-    
+
   be_interface * const intf = this->ctx_->attribute ()
     ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
     : be_interface::narrow_from_scope (node->defined_in ());
@@ -71,14 +71,14 @@ be_visitor_operation_upcall_command_ss::visit (
 
       be_util::gen_nested_namespace_begin (&os, module, true);
     }
-  
+
   be_visitor_context ctx (*this->ctx_);
 
   // save the node.
   this->ctx_->node (node);
 
-  os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Generate the operation-specific TAO::Upcall_Command concrete
   // class.
@@ -132,7 +132,7 @@ be_visitor_operation_upcall_command_ss::visit (
   os << be_uidt_nl;
 
   os << "{" << be_nl
-     << "}" << be_nl << be_nl;
+     << "}" << be_nl_2;
 
   // Generate execute() method.
   os << "virtual void execute (void)" << be_nl
@@ -225,7 +225,7 @@ be_visitor_operation_upcall_command_ss::gen_upcall (
   bool excep_method = ((ACE_OS::strstr (op_name, excep_suffix) +
                         excep_suffix_len) ==
                        (op_name + ACE_OS::strlen (op_name)));
-                       
+
   for (; !si.is_done (); si.next (), ++index)
     {
       AST_Argument * const arg =
@@ -348,7 +348,7 @@ be_visitor_operation_upcall_command_ss::gen_upcall (
       exceplist.visit_operation (node);
 
       unsigned int exceptions_count = 0;
-      
+
       for (UTL_ExceptlistActiveIterator ei (node->exceptions ());
            !ei.is_done (); ei.next ())
         {
diff --git a/TAO_IDL/be/be_visitor_root.cpp b/TAO_IDL/be/be_visitor_root.cpp
index a82e54e44e9..92456f48d4a 100644
--- a/TAO_IDL/be/be_visitor_root.cpp
+++ b/TAO_IDL/be/be_visitor_root.cpp
@@ -81,4 +81,3 @@
 #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"
diff --git a/TAO_IDL/be/be_visitor_root/any_op.cpp b/TAO_IDL/be/be_visitor_root/any_op.cpp
index 18443c5f93a..54b14ed1c47 100644
--- a/TAO_IDL/be/be_visitor_root/any_op.cpp
+++ b/TAO_IDL/be/be_visitor_root/any_op.cpp
@@ -31,17 +31,17 @@ int
 be_visitor_root_any_op::visit_root (be_root *node)
 {
   if (be_global->gen_anyop_files ())
-    { 
+    {
       // Switch streams, ctx will be reassigned when this
       // pass is done.
       switch (this->ctx_->state ())
         {
           case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
             this->ctx_->stream (tao_cg->anyop_header ());
-            break;         
+            break;
           case TAO_CodeGen::TAO_ROOT_ANY_OP_CS:
             this->ctx_->stream (tao_cg->anyop_source ());
-            break;         
+            break;
           default:
             break;
         }
@@ -51,9 +51,9 @@ be_visitor_root_any_op::visit_root (be_root *node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_root::visit_root - ")
-                         ACE_TEXT ("codegen for scope failed\n")), 
+                         ACE_TEXT ("codegen for scope failed\n")),
                         -1);
     }
-    
+
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_root/cdr_op.cpp b/TAO_IDL/be/be_visitor_root/cdr_op.cpp
index e20bdbdf021..5df9e4d564f 100644
--- a/TAO_IDL/be/be_visitor_root/cdr_op.cpp
+++ b/TAO_IDL/be/be_visitor_root/cdr_op.cpp
@@ -35,7 +35,7 @@ be_visitor_root_cdr_op::visit_root (be_root *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_root_cdr_op::")
                          ACE_TEXT ("visit_root - codegen ")
-                         ACE_TEXT ("for scope failed\n")), 
+                         ACE_TEXT ("for scope failed\n")),
                         -1);
     }
 
diff --git a/TAO_IDL/be/be_visitor_root/root.cpp b/TAO_IDL/be/be_visitor_root/root.cpp
index 886859716ed..85642a7d750 100644
--- a/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO_IDL/be/be_visitor_root/root.cpp
@@ -1,20 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    root.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for the Root node. This is a generic visitor.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    root.cpp
+ *
+ *  $Id$
+ *
+ *  Visitor generating code for the Root node. This is a generic visitor.
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 // Generic Root visitor
 be_visitor_root::be_visitor_root (be_visitor_context *ctx)
@@ -69,13 +66,6 @@ be_visitor_root::visit_module (be_module *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
-      {
-        be_visitor_module_serializer_op visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     default:
       {
         be_visitor_module visitor (&ctx);
diff --git a/TAO_IDL/be/be_visitor_root/root_ch.cpp b/TAO_IDL/be/be_visitor_root/root_ch.cpp
index 108787d3106..c46957b7beb 100644
--- a/TAO_IDL/be/be_visitor_root/root_ch.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_ch.cpp
@@ -36,7 +36,7 @@ be_visitor_root_ch::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
   this->gen_fwd_decls ();
 
   if (this->visit_scope (node) == -1)
@@ -46,11 +46,11 @@ be_visitor_root_ch::visit_root (be_root *node)
                          ACE_TEXT ("codegen for scope failed\n")),
                         -1);
     }
-    
+
   this->gen_proxy_broker_factory_pointers ();
-  
+
   this->gen_ref_counting_overrides ();
-  
+
   this->gen_static_corba_overrides ();
 
   if (this->gen_obv_decls (node) == -1)
@@ -80,7 +80,7 @@ be_visitor_root_ch::visit_root (be_root *node)
                          ACE_TEXT ("failed to export templates\n")),
                         -1);
     }
-    
+
   if (this->gen_any_ops (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -101,15 +101,6 @@ be_visitor_root_ch::visit_root (be_root *node)
     }
 
 
-  if (this->gen_dds_serializer_ops (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_root_ch::")
-                         ACE_TEXT ("visit_root - failed to ")
-                         ACE_TEXT ("generate DDS serialization\n")),
-                        -1);
-    }
-
   (void) tao_cg->end_client_header ();
 
   return 0;
@@ -122,7 +113,7 @@ be_visitor_root_ch::init (void)
   int status =
     tao_cg->start_client_header (
       be_global->be_get_client_hdr_fname ());
-  
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -133,9 +124,9 @@ be_visitor_root_ch::init (void)
 
   /// Initialize the stream.
   this->ctx_->stream (tao_cg->client_header ());
-  
+
   this->o_ = this->ctx_->stream ();
-  
+
   return 0;
 }
 
@@ -146,13 +137,13 @@ be_visitor_root_ch::gen_fwd_decls (void)
   // forward declaration of the proxy broker for a possible collocated call.
   if (idl_global->non_local_iface_seen_)
     {
-      *o_ << be_nl << be_nl
+      *o_ << be_nl_2
           << "// TAO_IDL - Generated from " << be_nl
           << "// " << __FILE__ << ":" << __LINE__;
 
       *o_ << be_global->core_versioning_begin () << be_nl;
 
-      *o_ << be_nl << be_nl
+      *o_ << be_nl_2
           << "namespace TAO" << be_nl
           << "{" << be_idt_nl;
 
@@ -177,18 +168,18 @@ void
 be_visitor_root_ch::gen_proxy_broker_factory_pointers (void)
 {
   size_t size = be_global->non_local_interfaces.size ();
-  
+
   if (size == 0)
     {
       return;
     }
-    
+
   size_t index = 0;
   be_interface *i = 0;
-  
-  *o_ << be_nl << be_nl
+
+  *o_ << be_nl_2
       << "// Proxy Broker Factory function pointer declarations."
-      << be_nl << be_nl
+      << be_nl_2
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
@@ -198,7 +189,7 @@ be_visitor_root_ch::gen_proxy_broker_factory_pointers (void)
 
       if (be_global->gen_direct_collocation() || be_global->gen_thru_poa_collocation ())
         {
-          *o_ << be_nl << be_nl
+          *o_ << be_nl_2
               << "extern " << be_global->stub_export_macro () << be_nl
               << "TAO::Collocation_Proxy_Broker *" << be_nl
               << "(*" << i->flat_client_enclosing_scope ()
@@ -214,16 +205,16 @@ void
 be_visitor_root_ch::gen_ref_counting_overrides (void)
 {
   size_t size = be_global->non_defined_interfaces.size ();
-  
+
   if (size == 0)
     {
       return;
     }
-    
+
   size_t index = 0;
   be_interface_fwd *ifwd = 0;
 
-  *o_ << be_nl << be_nl
+  *o_ << be_nl_2
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
@@ -231,12 +222,12 @@ be_visitor_root_ch::gen_ref_counting_overrides (void)
     {
       be_global->non_defined_interfaces.dequeue_head (ifwd);
 
-      *o_ << be_nl << be_nl;
+      *o_ << be_nl_2;
 
       if (ifwd->is_valuetype ())
         {
           *o_ << "// External declarations for undefined valuetype"
-              << be_nl << be_nl
+              << be_nl_2
               << "// " << ifwd->full_name () << be_nl;
 
           *o_ << be_global->stub_export_macro () << be_nl
@@ -260,16 +251,16 @@ void
 be_visitor_root_ch::gen_static_corba_overrides (void)
 {
   size_t size = idl_global->mixed_parentage_interfaces ().size ();
-  
+
   if (size == 0)
     {
       return;
     }
-    
+
   size_t index = 0;
   AST_Interface *i = 0;
 
-  *o_ << be_nl << be_nl
+  *o_ << be_nl_2
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__
       << be_nl;
@@ -280,7 +271,7 @@ be_visitor_root_ch::gen_static_corba_overrides (void)
       << "// Overrides of CORBA::release and CORBA::is_nil for"
       << be_nl
       << "// interfaces that inherit from both CORBA::Object" << be_nl
-      << "// and CORBA::AbstractBase." << be_nl << be_nl
+      << "// and CORBA::AbstractBase." << be_nl_2
       << "namespace CORBA" << be_nl
       << "{" << be_idt;
 
@@ -327,8 +318,8 @@ be_visitor_root_ch::gen_template_exports (be_root *node)
     {
       return 0;
     }
-    
-  be_visitor_context ctx = *this->ctx_;  
+
+  be_visitor_context ctx = *this->ctx_;
   be_visitor_template_export export_visitor (&ctx);
   return node->accept (&export_visitor);
 }
@@ -365,17 +356,3 @@ be_visitor_root_ch::gen_cdr_ops (be_root *node)
   return node->accept (&visitor);
 }
 
-int
-be_visitor_root_ch::gen_dds_serializer_ops (be_root *node)
-{
-  if (! be_global->gen_dcps_type_support ())
-    {
-      return 0;
-    }
-    
-  be_visitor_context ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH);
-  be_visitor_root_cdr_op visitor (&ctx);
-  return node->accept (&visitor);
-}
-
diff --git a/TAO_IDL/be/be_visitor_root/root_cnh.cpp b/TAO_IDL/be/be_visitor_root/root_cnh.cpp
index 540759a7ad3..b2764612aef 100644
--- a/TAO_IDL/be/be_visitor_root/root_cnh.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_cnh.cpp
@@ -36,7 +36,7 @@ be_visitor_root_cnh::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -46,17 +46,7 @@ be_visitor_root_cnh::visit_root (be_root *node)
     }
 
   (void) tao_cg->end_ciao_conn_header ();
-  
-  TAO_OutStream *rh_impl = tao_cg->ciao_ami_rh_impl_header ();
-  
-  /// If this stream has been created during the connector AST
-  /// pass we generate the file ending stuff here, to make sure
-  /// that all the AST nodes have been traversed.
-  if (rh_impl != 0)
-    {
-      (void) tao_cg->end_ciao_ami_rh_impl_header ();
-    }
-  
+
   return 0;
 }
 
@@ -67,7 +57,7 @@ be_visitor_root_cnh::init (void)
   int status =
     tao_cg->start_ciao_conn_header (
       be_global->be_get_ciao_conn_hdr_fname ());
-      
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_root/root_cns.cpp b/TAO_IDL/be/be_visitor_root/root_cns.cpp
index 5da09f03cad..eac09e96d28 100644
--- a/TAO_IDL/be/be_visitor_root/root_cns.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_cns.cpp
@@ -36,7 +36,7 @@ be_visitor_root_cns::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -47,16 +47,6 @@ be_visitor_root_cns::visit_root (be_root *node)
 
   (void) tao_cg->end_ciao_conn_source ();
 
-  TAO_OutStream *rh_impl = tao_cg->ciao_ami_rh_impl_source ();
-  
-  /// If this stream has been created during the connector AST
-  /// pass we generate the file ending stuff here, to make sure
-  /// that all the AST nodes have been traversed.
-  if (rh_impl != 0)
-    {
-      (void) tao_cg->end_ciao_ami_rh_impl_source ();
-    }
-  
   return 0;
 }
 
@@ -67,7 +57,7 @@ be_visitor_root_cns::init (void)
   int status =
     tao_cg->start_ciao_conn_source (
       be_global->be_get_ciao_conn_src_fname ());
-      
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_root/root_cs.cpp b/TAO_IDL/be/be_visitor_root/root_cs.cpp
index 14ddf78de94..8727266c11a 100644
--- a/TAO_IDL/be/be_visitor_root/root_cs.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_cs.cpp
@@ -35,7 +35,7 @@ be_visitor_root_cs::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
 
   if (this->gen_arg_traits (node) == -1)
     {
@@ -85,15 +85,6 @@ be_visitor_root_cs::visit_root (be_root *node)
     }
 
 
-  if (this->gen_dds_serializer_ops (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_root_cs::")
-                         ACE_TEXT ("visit_root - failed to ")
-                         ACE_TEXT ("generate DDS serialization\n")),
-                        -1);
-    }
-
   (void) tao_cg->end_client_stubs ();
 
   return 0;
@@ -106,7 +97,7 @@ be_visitor_root_cs::init (void)
   int status =
     tao_cg->start_client_stubs (
       be_global->be_get_client_stub_fname ());
-  
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -156,7 +147,7 @@ be_visitor_root_cs::gen_any_ops (be_root *node)
     {
       (void) tao_cg->end_anyop_source ();
     }
-    
+
   return status;
 }
 
@@ -169,17 +160,4 @@ be_visitor_root_cs::gen_cdr_ops (be_root *node)
   return node->accept (&visitor);
 }
 
-int
-be_visitor_root_cs::gen_dds_serializer_ops (be_root *node)
-{
-  if (! be_global->gen_dcps_type_support ())
-    {
-      return 0;
-    }
-    
-  be_visitor_context ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS);
-  be_visitor_root_cdr_op visitor (&ctx);
-  return node->accept (&visitor);
-}
 
diff --git a/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp b/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp
index 14dbb784521..97b066e0151 100644
--- a/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp
@@ -36,7 +36,7 @@ be_visitor_root_ex_idl::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_root/root_exh.cpp b/TAO_IDL/be/be_visitor_root/root_exh.cpp
index 2d464d829b7..02afa1a3949 100644
--- a/TAO_IDL/be/be_visitor_root/root_exh.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_exh.cpp
@@ -36,7 +36,7 @@ be_visitor_root_exh::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,7 +57,7 @@ be_visitor_root_exh::init (void)
   int status =
     tao_cg->start_ciao_exec_header (
       be_global->be_get_ciao_exec_hdr_fname ());
-      
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_root/root_exs.cpp b/TAO_IDL/be/be_visitor_root/root_exs.cpp
index a2f4717080d..16d9d5f9c7a 100644
--- a/TAO_IDL/be/be_visitor_root/root_exs.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_exs.cpp
@@ -36,7 +36,7 @@ be_visitor_root_exs::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,7 +57,7 @@ be_visitor_root_exs::init (void)
   int status =
     tao_cg->start_ciao_exec_source (
       be_global->be_get_ciao_exec_src_fname ());
-      
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_root/root_ih.cpp b/TAO_IDL/be/be_visitor_root/root_ih.cpp
index 85d6656bdfd..472b0c9b107 100644
--- a/TAO_IDL/be/be_visitor_root/root_ih.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_ih.cpp
@@ -35,7 +35,7 @@ be_visitor_root_ih::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,7 +57,7 @@ be_visitor_root_ih::init (void)
   int status =
     tao_cg->start_implementation_header (
       be_global->be_get_implementation_hdr_fname ());
-  
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_root/root_is.cpp b/TAO_IDL/be/be_visitor_root/root_is.cpp
index 5fa99b5b944..5e9389004b5 100644
--- a/TAO_IDL/be/be_visitor_root/root_is.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_is.cpp
@@ -34,7 +34,7 @@ be_visitor_root_is::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,7 +53,7 @@ be_visitor_root_is::init (void)
   int status =
     tao_cg->start_implementation_skeleton (
       be_global->be_get_implementation_skel_fname ());
-  
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_root/root_sh.cpp b/TAO_IDL/be/be_visitor_root/root_sh.cpp
index b40ce5c36e6..44b6aba4236 100644
--- a/TAO_IDL/be/be_visitor_root/root_sh.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_sh.cpp
@@ -35,7 +35,7 @@ be_visitor_root_sh::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
   /// The SI and SS cases are caught in BE_produce(). We
   /// want to generate an empty skeleton header file, which
   /// has been done, so -SS can flag a skip of the scope
@@ -64,7 +64,7 @@ be_visitor_root_sh::init (void)
   int status =
     tao_cg->start_server_header (
       be_global->be_get_server_hdr_fname ());
-  
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_root/root_si.cpp b/TAO_IDL/be/be_visitor_root/root_si.cpp
index e78bc2a685a..35b082bc11b 100644
--- a/TAO_IDL/be/be_visitor_root/root_si.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_si.cpp
@@ -35,7 +35,7 @@ be_visitor_root_si::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -56,7 +56,7 @@ be_visitor_root_si::init (void)
   int status =
     tao_cg->start_server_inline (
       be_global->be_get_server_inline_fname ());
-  
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_root/root_ss.cpp b/TAO_IDL/be/be_visitor_root/root_ss.cpp
index f6e851a7bcc..b754b1d52a9 100644
--- a/TAO_IDL/be/be_visitor_root/root_ss.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_ss.cpp
@@ -35,13 +35,13 @@ be_visitor_root_ss::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
   if (this->gen_arg_traits (node) == -1)
     {
       /// Error message already output.
       return -1;
     }
-    
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -67,7 +67,7 @@ be_visitor_root_ss::init (void)
   int status =
     tao_cg->start_server_skeletons (
       be_global->be_get_server_skeleton_fname ());
-  
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -81,7 +81,7 @@ be_visitor_root_ss::init (void)
       status =
         tao_cg->start_server_template_skeletons (
               be_global->be_get_server_template_skeleton_fname ());
-      
+
       if (status == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -129,7 +129,7 @@ be_visitor_root_ss::gen_arg_traits (be_root *node)
                             -1);
         }
     }
-    
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_root/root_sth.cpp b/TAO_IDL/be/be_visitor_root/root_sth.cpp
index fe3cc3cabc9..e5f4588ef89 100644
--- a/TAO_IDL/be/be_visitor_root/root_sth.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_sth.cpp
@@ -32,7 +32,7 @@ be_visitor_root_sth::visit_root (be_root *node)
     {
       return 0;
     }
-    
+
   if (this->init () == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -40,7 +40,7 @@ be_visitor_root_sth::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -66,8 +66,8 @@ be_visitor_root_sth::visit_module (be_module *node)
 
   // Generate the skeleton class name.
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-               << "// " __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from " << be_nl
+               << "// " __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Now generate the class definition. The prefix POA_ is prepended to our
   // name only if we are the outermost module.
@@ -138,7 +138,7 @@ be_visitor_root_sth::init (void)
   int status =
     tao_cg->start_server_template_header (
       be_global->be_get_server_template_hdr_fname ());
-  
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_root/root_svh.cpp b/TAO_IDL/be/be_visitor_root/root_svh.cpp
index 02e07ace652..09e31cd29b2 100644
--- a/TAO_IDL/be/be_visitor_root/root_svh.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_svh.cpp
@@ -35,7 +35,7 @@ be_visitor_root_svh::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_root/root_svs.cpp b/TAO_IDL/be/be_visitor_root/root_svs.cpp
index 35f6d6c640d..d81469299ac 100644
--- a/TAO_IDL/be/be_visitor_root/root_svs.cpp
+++ b/TAO_IDL/be/be_visitor_root/root_svs.cpp
@@ -35,7 +35,7 @@ be_visitor_root_svs::visit_root (be_root *node)
                          ACE_TEXT ("failed to initialize\n")),
                         -1);
     }
-    
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -56,7 +56,7 @@ be_visitor_root_svs::init (void)
   int status =
     tao_cg->start_ciao_svnt_source (
       be_global->be_get_ciao_svnt_src_fname ());
-      
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_root/serializer_op.cpp b/TAO_IDL/be/be_visitor_root/serializer_op.cpp
deleted file mode 100644
index c0ae070ab2b..00000000000
--- a/TAO_IDL/be/be_visitor_root/serializer_op.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-// ***************************************************************************
-// Root visitor for generating Serializer operator declarations in the client header
-// and stub
-// ***************************************************************************
-
-be_visitor_root_serializer_op::be_visitor_root_serializer_op (be_visitor_context *ctx)
-  : be_visitor_root (ctx)
-{
-}
-
-be_visitor_root_serializer_op::~be_visitor_root_serializer_op (void)
-{
-}
-
-int
-be_visitor_root_serializer_op::visit_root (be_root *node)
-{
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_root_serializer_op::")
-                         ACE_TEXT ("visit_root - codegen ")
-                         ACE_TEXT ("for scope failed\n")), 
-                        -1);
-    }
-
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_scope.cpp b/TAO_IDL/be/be_visitor_scope.cpp
index bb24050fea4..49022a2f806 100644
--- a/TAO_IDL/be/be_visitor_scope.cpp
+++ b/TAO_IDL/be/be_visitor_scope.cpp
@@ -64,7 +64,7 @@ be_visitor_scope::visit_scope (be_scope *node)
                              "bad node in this scope\n"),
                             -1);
         }
-        
+
       be_decl *bd = be_decl::narrow_from_decl (d);
 
       // Set the scope node as "node" in which the code is being
diff --git a/TAO_IDL/be/be_visitor_sequence.cpp b/TAO_IDL/be/be_visitor_sequence.cpp
index d39552b6bae..149258b6449 100644
--- a/TAO_IDL/be/be_visitor_sequence.cpp
+++ b/TAO_IDL/be/be_visitor_sequence.cpp
@@ -51,8 +51,6 @@
 #include "be_visitor_sequence/any_op_cs.cpp"
 #include "be_visitor_sequence/cdr_op_ch.cpp"
 #include "be_visitor_sequence/cdr_op_cs.cpp"
-#include "be_visitor_sequence/serializer_op_ch.cpp"
-#include "be_visitor_sequence/serializer_op_cs.cpp"
 #include "be_visitor_sequence/buffer_type.cpp"
 #include "be_visitor_sequence/sequence_base.cpp"
 #include "be_visitor_sequence/sequence_ch.cpp"
diff --git a/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp b/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
index ef6c3d6458c..2b9ea6f3573 100644
--- a/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
@@ -43,16 +43,18 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
 
   *os << be_nl << be_nl;
   
+  *os << be_nl_2;
+
   *os << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
-      
-  *os << be_nl << be_nl;
+
+*os << be_nl_2;
 
   ACE_CString name = node->full_name ();
-  
+
   bool alt = be_global->alt_mapping ();
-  
-  be_module *module = 0;  
+
+  be_module *module = 0;
   if (node->is_nested ())
     {
       AST_Decl *d = node;
@@ -77,7 +79,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
           // Some compilers handle "any" operators in a namespace
           // corresponding to their module, others do not.
           *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-          
+
           be_util::gen_nested_namespace_begin (os, module);
 
           // Generate the Any <<= and >>= operators.
@@ -86,22 +88,22 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
               << " operator<<= ( ::CORBA::Any &, const ::"
               << name.c_str ()
               << " &); // copying version" << be_nl;
-      
+
           if (!alt)
-            {    
+            {
               *os << macro
                   << " void"
                   << " operator<<= ( ::CORBA::Any &, ::"
                   << name.c_str ()
                   << "*); // noncopying version" << be_nl;
-      
+
               *os << macro
                   << " ::CORBA::Boolean"
                   << " operator>>= (const ::CORBA::Any &, ::"
                   << name.c_str ()
                   << " *&); // deprecated" << be_nl;
             }
-      
+
           *os << macro
               << " ::CORBA::Boolean"
               << " operator>>= (const ::CORBA::Any &, const ::"
@@ -109,37 +111,37 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
               << " *&);";
 
           be_util::gen_nested_namespace_end (os, module);
-          
+
           // Emit #else.
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "#else\n\n";
         }
     }
 
   *os << be_global->core_versioning_begin () << be_nl;
-  
+
   // Generate the Any <<= and >>= operators.
   *os << macro
       << " void"
       << " operator<<= ( ::CORBA::Any &, const "
       << name.c_str ()
       << " &); // copying version" << be_nl;
-      
+
   if (!alt)
-    {    
+    {
       *os << macro
           << " void"
           << " operator<<= ( ::CORBA::Any &, "
           << name.c_str ()
           << "*); // noncopying version" << be_nl;
-      
+
       *os << macro
           << " ::CORBA::Boolean"
           << " operator>>= (const ::CORBA::Any &, "
           << name.c_str ()
           << " *&); // deprecated" << be_nl;
     }
-      
+
   *os << macro
       << " ::CORBA::Boolean"
       << " operator>>= (const ::CORBA::Any &, const "
@@ -153,7 +155,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
       *os << "\n\n#endif";
     }
 
-  
+
   node->cli_hdr_any_op_gen (true);
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
index ec1ded0b19f..681f0f02c6d 100644
--- a/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
@@ -41,24 +41,24 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
-  
+
   // These are no-ops for now, so we just generate them and return
   if (be_global->alt_mapping () && node->max_size ()->ev ()->u.ulval == 0)
     {
       be_type *bt =
         be_type::narrow_from_decl (node->base_type ());
-        
+
       if (bt->node_type () == AST_Decl::NT_typedef)
         {
           be_typedef *td = be_typedef::narrow_from_decl (bt);
           bt = td->primitive_base_type ();
         }
-        
+
       enum type_category
       {
         ANY_VALUE,
@@ -66,7 +66,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
         ANY_ARRAY,
         ANY_STRING
       };
-      
+
       type_category tc = ANY_VALUE;
       AST_Decl::NodeType nt = bt->node_type ();
       
@@ -110,7 +110,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
           << " &_tao_elem)" << be_uidt_nl
           << "{" << be_idt_nl
           << "TAO::";
-          
+
       switch (tc)
         {
         case ANY_OBJREF:
@@ -121,7 +121,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
         case ANY_ARRAY:
           *os << "insert_array_vector<"
               << bt->full_name () << "_forany> (";
-                
+
           break;
         case ANY_STRING:
           *os << "insert_value_vector<std::string> (";
@@ -132,31 +132,31 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
  ACE_DEBUG ((LM_DEBUG, "default: %s\n", bt->local_name ()->get_string ()));
           break;
         }
-          
+
       *os << be_idt_nl
           << "_tao_any," << be_nl
           << "_tao_elem);" << be_uidt << be_uidt_nl
           << "}";
-          
-      *os << be_nl << be_nl
+
+      *os << be_nl_2
           << "::CORBA::Boolean operator>>= (" << be_idt_nl
           << "const ::CORBA::Any &_tao_any," << be_nl
           << node->name () << " &_tao_elem)" << be_uidt_nl
           << "{" << be_idt_nl
           << "return" << be_idt_nl
           << "TAO::";
-          
+
       switch (tc)
         {
         case ANY_OBJREF:
           *os << "extract_objref_vector<"
               << bt->full_name () << "_ptr> (";
-                
+
           break;
         case ANY_ARRAY:
           *os << "extract_array_vector<"
               << bt->full_name () << "_forany> (";
-                
+
           break;
         case ANY_STRING:
           *os << "extract_value_vector<std::string> (";
@@ -164,22 +164,22 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
         default:
           *os << "extract_value_vector<"
               << bt->full_name () << "> (";
-                
+
           break;
         }
-          
+
       *os << be_idt_nl
           << "_tao_any," << be_nl
           << "_tao_elem);" << be_uidt << be_uidt << be_uidt_nl
           << "}";
-          
+
       *os << be_nl
           << be_global->core_versioning_end () << be_nl;
-      
+
       node->cli_stub_any_op_gen (true);
       return 0;
     }
-  
+
   // Since we don't generate CDR stream operators for types that
   // explicitly contain a local interface (at some level), we
   // must override these Any template class methods to avoid
@@ -198,7 +198,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
           << "return false;" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "template<>" << be_nl
           << "::CORBA::Boolean" << be_nl
           << "Any_Dual_Impl_T<" << node->name ()
@@ -208,14 +208,14 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
           << "}" << be_uidt_nl
           << "}" << be_nl;
     }
-  
+
   *os << be_global->core_versioning_end () << be_nl;
 
   // If this is non-zero, we want to call its tc_name()
-  // for the TypeCode to pass to the Any operator impls.  
+  // for the TypeCode to pass to the Any operator impls.
   be_typedef *td = this->ctx_->tdef ();
 
-  be_module *module = 0;  
+  be_module *module = 0;
   if (node->is_nested ())
     {
       AST_Decl *d = node;
@@ -240,9 +240,9 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
           // Some compilers handle "any" operators in a namespace
           // corresponding to their module, others do not.
           *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-          
+
           be_util::gen_nested_namespace_begin (os, module);
-  
+
           // Copying insertion.
           *os << be_nl
               << "// Copying insertion." << be_nl
@@ -265,7 +265,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
               << "::" << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           // Non-copying insertion.
           *os << "// Non-copying insertion." << be_nl
@@ -281,7 +281,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
               << "::" << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           // Extraction to non-const pointer (deprecated, just calls the other).
           *os << "// Extraction to non-const pointer (deprecated)." << be_nl
@@ -294,7 +294,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
               << "const ::" << node->name () << " *&> (" << be_nl
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           // Extraction to const pointer.
           *os << "// Extraction to const pointer." << be_nl
@@ -314,15 +314,15 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
               << "}";
 
           be_util::gen_nested_namespace_end (os, module);
-  
+
           // Emit #else.
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "#else\n\n";
         }
     }
 
   *os << be_global->core_versioning_begin () << be_nl;
-  
+
   // Copying insertion.
   *os << be_nl
       << "// Copying insertion." << be_nl
@@ -345,7 +345,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Non-copying insertion.
   *os << "// Non-copying insertion." << be_nl
@@ -361,7 +361,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Extraction to non-const pointer (deprecated, just calls the other).
   *os << "// Extraction to non-const pointer (deprecated)." << be_nl
@@ -374,7 +374,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << "const " << node->name () << " *&> (" << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Extraction to const pointer.
   *os << "// Extraction to const pointer." << be_nl
@@ -399,7 +399,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
     {
       *os << "\n\n#endif";
     }
-  
+
   node->cli_stub_any_op_gen (true);
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp b/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
index 980975738ab..e8c2ef42014 100644
--- a/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
@@ -57,7 +57,7 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node)
   be_type *bt = be_type::narrow_from_decl (node);
   be_typedef *tdef = be_typedef::narrow_from_decl (bt);
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // If we're an anonymous sequence, we must protect against
@@ -68,31 +68,29 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node)
           << node->flat_name () << "_H_"
           << "\n#define _TAO_CDR_OP_" << node->flat_name () << "_H_";
     }
-    
+
   bool alt = be_global->alt_mapping ();
 
   *os << be_global->core_versioning_begin ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator<< (" << be_idt << be_idt_nl
       << "TAO_OutputCDR &strm," << be_nl
       << "const " << node->name ();
-    
-  *os << " &_tao_sequence" << be_uidt_nl
-      << ");" << be_uidt_nl;
-      
+
+  *os << " &_tao_sequence);" << be_uidt << be_uidt_nl;
+
   *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator>> (" << be_idt << be_idt_nl
       << "TAO_InputCDR &strm," << be_nl
       << node->name ();
-  
-  *os << " &_tao_sequence" << be_uidt_nl
-      << ");" << be_uidt;
+
+  *os << " &_tao_sequence);" << be_uidt << be_uidt;
 
   if (be_global->gen_ostream_operators ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << be_global->stub_export_macro () << " std::ostream&"
           << " operator<< (" << be_idt_nl
           << "std::ostream &strm," << be_nl
diff --git a/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index b000f6c2f95..cd1062dbed2 100644
--- a/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_cs.cpp
-//
-// = DESCRIPTION
-//    Visitor for code generation of Sequences for the CDR operators
-//    in the client stubs.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    cdr_op_cs.cpp
+ *
+ *  $Id$
+ *
+ *  Visitor for code generation of Sequences for the CDR operators
+ *  in the client stubs.
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 // ***************************************************************************
 // Sequence visitor for generating CDR operator declarations in the client
@@ -90,14 +87,14 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
     << "// " << __FILE__ << ":" << __LINE__ << be_nl;
 
   *os << "#if !defined _TAO_CDR_OP_"
       << node->flat_name () << "_CPP_" << be_nl
       << "#define _TAO_CDR_OP_" << node->flat_name () << "_CPP_"
       << be_nl;
-      
+
   bool alt = be_global->alt_mapping ();
 
   *os << be_global->core_versioning_begin () << be_nl;
@@ -114,7 +111,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
  
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
-  
+
   if (alt)
     {
       *os << "::CORBA::Boolean operator<< (" << be_idt_nl
@@ -124,7 +121,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
           << "{" << be_idt_nl
           << "::CORBA::ULong length = _tao_sequence.size ();"
           << be_nl
-          << "strm << length;" << be_nl << be_nl
+          << "strm << length;" << be_nl_2
           << "for ( ::CORBA::ULong i = 0UL; i < length; ++i)"
           << be_idt_nl
           << "{" << be_idt_nl;
@@ -172,20 +169,20 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
           << "}" << be_uidt << be_uidt_nl
           << "}" << be_uidt_nl << be_nl
           << "return true;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
   else
     {
       *os << "::CORBA::Boolean operator<< ("
           << be_idt << be_idt_nl
           << "TAO_OutputCDR &strm," << be_nl
-          << "const " << node->name () << " &_tao_sequence"
+          << "const " << node->name () << " &_tao_sequence)"
+          << be_uidt
           << be_uidt_nl
-          << ")" << be_uidt_nl
           << "{" << be_idt_nl
           << "return TAO::marshal_sequence(strm, _tao_sequence);"
           << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
         }
 
   //  Set the sub state as generating code for the input operator.
@@ -199,7 +196,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
           << "{" << be_idt_nl
           << "::CORBA::ULong length = 0UL;" << be_nl
           << bt->full_name ();
-          
+
       AST_Interface *i = AST_Interface::narrow_from_decl (bt);
       AST_ValueType *v = AST_ValueType::narrow_from_decl (bt);
       bool ptr_type = false;
@@ -287,9 +284,9 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
           << "TAO_InputCDR &strm"
           << "," << be_nl
           << node->name ()
-          << " &_tao_sequence"
+          << " &_tao_sequence)"
+          << be_uidt
           << be_uidt_nl
-          << ")" << be_uidt_nl
           << "{" << be_idt_nl
           << "return TAO::demarshal_sequence(strm, _tao_sequence);"
           << be_uidt_nl
diff --git a/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
index 864fd4cde2a..e30ec8af9a8 100644
--- a/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -94,16 +94,16 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
       this->ctx_->tdef (tmp);
     }
 
-  *os << be_nl << be_nl;
-  
+  *os << be_nl_2;
+
   *os << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
 
   os->gen_ifdef_macro (node->flat_name ());
 
-  *os << be_nl << be_nl;
-  
+  *os << be_nl_2;
+
   /// If we are using std::vector, we won't be using _vars
   /// and _outs. They may get redefined and reinstated later.
   if (!be_global->alt_mapping () || !node->unbounded ())
@@ -135,19 +135,19 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
                              ACE_TEXT ("buffer type visit failed\n")),
                             -1);
         }
-        
+
       *os << "> " << node->local_name () << ";";
-      
+
       os->gen_endif ();
       node->cli_hdr_gen (true);
       return 0;
     }
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "class " << be_global->stub_export_macro () << " "
       << node->local_name () << be_idt_nl
       << ": public" << be_idt << be_idt_nl;
-      
+
   int status =
     node->gen_base_class_name (os,
                                "",
@@ -211,7 +211,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
       *os << "* buffer, " << be_nl
           << "::CORBA::Boolean release = false);" << be_uidt;
   }
-  
+
   *os << be_nl
       << node->local_name () << " (const " << node->local_name ()
       << " &);" << be_nl;
@@ -219,14 +219,14 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
 
   if (be_global->alt_mapping () && node->unbounded ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "virtual ::CORBA::ULong length (void) const;"
           << be_nl
           << "virtual void length ( ::CORBA::ULong);"
-          << be_nl << be_nl
+          << be_nl_2
           << "virtual ::CORBA::ULong maximum (void) const;";
     }
-    
+
   *os << be_nl;
 
   node->gen_stub_decls (os);
@@ -259,7 +259,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
       && node->unbounded ()
       && !be_global->alt_mapping ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "\n\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)" << be_nl
           << node->local_name () << " (" << be_idt << be_idt_nl
           << "::CORBA::ULong length," << be_nl
@@ -285,7 +285,7 @@ be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node,
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl;
+  *os << be_nl_2;
 
     AST_Type::SIZE_TYPE st = elem->size_type ();
 
@@ -299,7 +299,7 @@ be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node,
         << ">" << be_uidt_nl
         << node->local_name () << "_var;" << be_uidt;
 
-    *os << be_nl << be_nl
+    *os << be_nl_2
         << "typedef" << be_idt_nl
         << "::TAO_Seq_Out_T<" << be_idt << be_idt_nl
         << node->local_name () << be_uidt_nl
diff --git a/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
index 2ca1b6ed917..db044c11ea0 100644
--- a/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
+++ b/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
@@ -49,7 +49,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
         }
 
     }
-    
+
   if (be_global->alt_mapping () && node->unbounded ())
     {
       // We are just a typedef and don't need any stub source
@@ -59,15 +59,15 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl;
-  
+  *os << be_nl_2;
+
   *os << "// TAO_IDL - Generated from " << be_nl
       << "// "__FILE__ << ":" << __LINE__;
 
   os->gen_ifdef_macro (node->flat_name ());
 
   // default constructor
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << node->name () << "::" << node->local_name ()
       << " (void)" << be_nl
       << "{}";
@@ -75,12 +75,12 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
   // for unbounded sequences, we have a different set of constructors
   if (node->unbounded ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << node->name () << "::" << node->local_name () << " ("
           << be_idt << be_idt_nl
           << "::CORBA::ULong max)" << be_uidt_nl
           << ": " << be_idt;
-          
+
       int status =
         node->gen_base_class_name (os,
                                    "",
@@ -107,7 +107,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
   if (!be_global->alt_mapping () || !node->unbounded ())
     {
       // Constructor with the buffer
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << node->name () << "::" << node->local_name () << " ("
           << be_idt << be_idt_nl;
 
@@ -162,9 +162,9 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
   }
 
   // Copy constructor.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << node->name () << "::" << node->local_name ()
-      << " (" << be_idt << be_idt << be_idt_nl
+      << " (" << be_idt << be_idt_nl
       << "const " << node->local_name ()
       << " &seq)" << be_uidt << be_uidt_nl
       << "  : " << be_idt << be_idt;
@@ -186,29 +186,29 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
       << "{}";
 
   // Destructor.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << node->name () << "::~" << node->local_name ()
       << " (void)" << be_nl
       << "{}";
 
   if (be_global->alt_mapping () && node->unbounded ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "::CORBA::ULong" << be_nl
           << node->name () << "::length (void) const" << be_nl
           << "{" << be_idt_nl
           << "return this->size ();" << be_uidt_nl
           << "}";
-          
-      *os << be_nl << be_nl
+
+      *os << be_nl_2
           << "void" << be_nl
           << node->name () << "::length ( ::CORBA::ULong length)"
           << be_nl
           << "{" << be_idt_nl
           << "this->resize (length);" << be_uidt_nl
           << "}";
-          
-      *os << be_nl << be_nl
+
+      *os << be_nl_2
           << "::CORBA::ULong" << be_nl
           << node->name () << "::maximum (void) const" << be_nl
           << "{" << be_idt_nl
@@ -221,7 +221,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
       && (!node->is_local ()
           || be_global->gen_local_iface_anyops ()))
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void "
           << node->name () << "::_tao_any_destructor ("
           << be_idt << be_idt_nl
diff --git a/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp b/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp
deleted file mode 100644
index 3b79e6390ee..00000000000
--- a/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-// ***************************************************************************
-// Sequence visitor for generating Serializer operator declarations in the client header
-// ***************************************************************************
-
-be_visitor_sequence_serializer_op_ch::be_visitor_sequence_serializer_op_ch (
-    be_visitor_context *ctx
-  )
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_sequence_serializer_op_ch::~be_visitor_sequence_serializer_op_ch (void)
-{
-}
-
-int
-be_visitor_sequence_serializer_op_ch::visit_sequence (be_sequence *node)
-{
-  if (node->cli_hdr_serializer_op_gen ()
-      || node->imported ()
-      || node->is_local ())
-    {
-      return 0;
-    }
-
-  be_type *base_type = be_type::narrow_from_decl (node->base_type ());
-
-  // If our base type is an anonymous sequence, generate code for it here.
-  if (base_type->node_type () == AST_Decl::NT_sequence)
-    {
-      if (base_type->accept (this) != 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_sequence_serializer_op_ch::visit_sequence -"
-                             "codegen for nested anonymous sequence failed\n"),
-                            -1);
-        }
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  be_type *bt = be_type::narrow_from_decl (node);
-  be_typedef *tdef = be_typedef::narrow_from_decl (bt);
-
-  if (be_global->gen_dcps_type_support_only ())
-    {
-      *os << "\n#endif /* end of disabling TAO specific code */"
-          << be_nl << be_nl;
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  // If we're an anonymous sequence, we must protect against
-  // being declared more than once.
-  if (!tdef)
-    {
-      *os << "\n\n#if !defined _TAO_SERIALIZER_OP_"
-          << node->flat_name () << "_H_"
-          << "\n#define _TAO_SERIALIZER_OP_" << node->flat_name () << "_H_";
-    }
-
-  *os << be_nl << be_nl;
-
-  *os << be_global->stub_export_macro () 
-      << " ::CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl
-      << "const " << node->name () << " &" << be_uidt_nl
-      << ");" << be_uidt_nl;
-  *os << be_global->stub_export_macro () 
-      << " size_t _dcps_max_marshaled_size (" << be_idt << be_idt_nl
-      << "const " << node->name () << " &" << be_uidt_nl
-      << ");" << be_uidt_nl;
-  *os << be_global->stub_export_macro () 
-      << " size_t _dcps_find_size (" << be_idt << be_idt_nl
-      << "const " << node->name () << " &" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  *os << be_nl << be_nl 
-      << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator<< (" << be_idt << be_idt_nl
-      << "TAO::DCPS::Serializer &," << be_nl
-      << "const " << node->name () << " &" << be_uidt_nl
-      << ");" << be_uidt_nl;
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>> (" << be_idt << be_idt_nl
-      << "TAO::DCPS::Serializer &," << be_nl
-      << node->name () << " &" << be_uidt_nl
-      << ");" << be_uidt;
-
-  if (!tdef)
-    {
-      *os << "\n\n#endif /* _TAO_SERIALIZER_OP_"
-          << node->flat_name () << "_H_ */";
-    }
-
-  if (be_global->gen_dcps_type_support_only ())
-    {
-      *os << be_nl  << be_nl << "#if 0 // disable TAO specific code" 
-          << be_nl << be_nl;
-    }
-  node->cli_hdr_serializer_op_gen (1);
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp b/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
deleted file mode 100644
index 7ff8f80573a..00000000000
--- a/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
+++ /dev/null
@@ -1,1361 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    serializer_op_cs.cpp
-//
-// = DESCRIPTION
-//    Visitor for code generation of Sequences for the
-//    TAO::DCPS::Serializer operators in the client stubs.
-//
-// = AUTHOR
-//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
-//
-// ============================================================================
-
-// ***************************************************************************
-// Sequence visitor for generating Serializer operator declarations in the client
-// stubs file.
-// ***************************************************************************
-
-be_visitor_sequence_serializer_op_cs::be_visitor_sequence_serializer_op_cs (
-    be_visitor_context *ctx
-  )
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_sequence_serializer_op_cs::~be_visitor_sequence_serializer_op_cs (void)
-{
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_sequence (be_sequence *node)
-{
-  if (this->ctx_->alias ())
-    {
-      // We are here because the base type of the sequence node is
-      // itself a sequence i.e., this is a case of sequence of
-      // typedef'd sequence. For the case of sequence of
-      // anonymous sequence, see comment below.
-      return this->visit_node (node);
-    }
-
-  if (node->cli_stub_serializer_op_gen ()
-      || node->imported ()
-      || node->is_local ())
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  be_type *bt =
-    be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_sequence_serializer_op_cs::"
-                         "visit_sequence - "
-                         "Bad base type\n"),
-                        -1);
-    }
-
-  // Generate the Serializer << and >> operator defns.
-
-  // Save the sequence node for further use.
-  this->ctx_->node (node);
-
-  // If our element type is an anonymous sequence, generate code for it here.
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      int status =
-          this->gen_anonymous_base_type (
-              bt,
-              TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS
-            );
-
-      if (status == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                             "visit_sequence - "
-                             "gen_anonymous_base_type failed\n"),
-                            -1);
-        }
-    }
-
-
-  if (be_global->gen_dcps_type_support_only ())
-    {
-      *os << be_nl << be_nl
-          << "#endif /* end of disabling TAO specific code */"
-          << be_nl << be_nl;
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-    << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *os << "#if !defined _TAO_SERIALIZER_OP_"
-      << node->flat_name () << "_CPP_" << be_nl
-      << "#define _TAO_SERIALIZER_OP_" << node->flat_name () << "_CPP_"
-      << be_nl << be_nl;
-
-  // --- _tao_is_bounded_size ---
-  this->ctx_->sub_state (TAO_CodeGen::TAO_IS_BOUNDED_SIZE);
-
-  *os << "::CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl
-      << "const " << node->name ()
-      << " &_tao_sequence" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      this->visit_node (node);
-    }
-  else
-    {
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_sequence_serializer_op_cs::"
-                             "visit_sequence - "
-                             "Base type codegen failed\n"),
-                            -1);
-        }
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // --- _dcps_max_marshaled_size ---
-
-  this->ctx_->sub_state (TAO_CodeGen::TAO_MAX_MARSHALED_SIZE);
-
-  *os << "size_t _dcps_max_marshaled_size (" << be_idt << be_idt_nl
-      << "const " << node->name ()
-      << " &_tao_sequence" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      this->visit_node (node);
-    }
-  else
-    {
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_sequence_serializer_op_cs::"
-                             "visit_sequence - "
-                             "Base type codegen failed\n"),
-                            -1);
-        }
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // --- _dcps_find_size ---
-  this->ctx_->sub_state (TAO_CodeGen::TAO_FIND_SIZE);
-
-  *os << "size_t _dcps_find_size (" << be_idt << be_idt_nl
-      << "const " << node->name ()
-      << " &_tao_sequence" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      this->visit_node (node);
-    }
-  else
-    {
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_sequence_serializer_op_cs::"
-                             "visit_sequence - "
-                             "Base type codegen failed\n"),
-                            -1);
-        }
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-
-  // --- operator<< ---
-
-  //  Set the sub state as generating code for the output operator.
-  this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
-
-  *os << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl
-      << "TAO::DCPS::Serializer &strm," << be_nl
-      << "const " << node->name ()
-      << " &_tao_sequence" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  // First encode the sequence length.
-  *os << "const ::CORBA::ULong _tao_seq_len = _tao_sequence.size ();"
-      << be_nl << be_nl;
-  *os << "if (strm << _tao_seq_len)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  // Now encode the sequence elements.
-  *os << "// Encode all elements." << be_nl;
-
-
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      this->visit_node (node);
-    }
-  else
-    {
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_sequence_serializer_op_cs::"
-                             "visit_sequence - "
-                             "Base type codegen failed\n"),
-                            -1);
-        }
-    }
-
-  *os << "}" << be_uidt_nl << be_nl
-      << "return 0;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // --- operator>> ---
-
-  //  Set the sub state as generating code for the input operator.
-  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
-
-  *os << "::CORBA::Boolean operator>> (" << be_idt << be_idt_nl
-      << "TAO::DCPS::Serializer &";
-
-  if (! bt->is_local ())
-    {
-      *os << "strm";
-    }
-
-  *os << "," << be_nl
-      << node->name () << " &";
-
-  if (! bt->is_local ())
-    {
-      *os << "_tao_sequence";
-    }
-
-  *os << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  if (! bt->is_local ())
-    {
-      // First retrieve the length and adjust the sequence length accordingly.
-      *os << "::CORBA::ULong _tao_seq_len;" << be_nl << be_nl;
-      *os << "if (strm >> _tao_seq_len)" << be_idt_nl
-          << "{" << be_idt_nl;
-
-      // Now check if the length does not exceed the maximum. We do this only
-      // for bounded sequences
-      AST_Expression *expr = node->max_size ();
-
-      if (expr == 0 || (expr != 0 && expr->ev () == 0))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                             "visit_sequence - "
-                             "bad sequence dimension\n"),
-                            -1);
-        }
-
-      if (expr->ev ()->et == AST_Expression::EV_ulong)
-        {
-          if (expr->ev ()->u.ulval > 0)
-            {
-              // We are dealing with a bounded sequence. Check if we are within
-              // bounds.
-              *os << "if (_tao_seq_len <= _tao_sequence.maximum ())" << be_idt_nl
-                  << "{" << be_idt_nl;
-            }
-        }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                             "visit_sequence - "
-                             "bad sequence dimension value\n"),
-                            -1);
-        }
-
-      *os << "// Set the length of the sequence." << be_nl
-          << "_tao_sequence.length (_tao_seq_len);" << be_nl << be_nl;
-
-      // Now we do a check for the sequence length to be non zero.
-      // If length is 0 we return true.
-      *os << "// If length is 0 we return true." << be_nl;
-      *os << "if (0 >= _tao_seq_len) " << be_idt_nl
-          << "{" << be_idt_nl;
-      *os << "return 1;" << be_uidt_nl
-          << "}" << be_uidt_nl << be_nl;
-
-      *os << "// Retrieve all the elements." << be_nl;
-
-      if (bt->node_type () == AST_Decl::NT_sequence)
-        {
-          this->visit_node (node);
-        }
-      else
-        {
-          if (bt->accept (this) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "be_visitor_sequence_serializer_op_cs::"
-                                 "visit_sequence - "
-                                 "Base type codegen failed\n"),
-                                -1);
-            }
-        }
-
-      if (expr->ev ()->u.ulval > 0)
-        {
-          // We are dealing with a bounded sequence.
-          *os << be_nl << "}" << be_uidt << be_uidt;
-        }
-
-      *os << be_nl << "}" << be_uidt_nl << be_nl;
-    }
-
-  *os << "return 0;" << be_uidt_nl
-      << "}";
-
-  *os << be_nl << be_nl
-      << "#endif /* _TAO_SERIALIZER_OP_"
-      << node->flat_name () << "_CPP_ */";
-
-  node->cli_stub_serializer_op_gen (1);
-  return 0;
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_array (be_array *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // We get here if the "type" of individual elements of the sequence is a
-  // primitive type. In this case, we treat the sequence as a single
-  // dimensional sequence (even of it was multi-dimensional), and pass
-  // the total length of the sequence as a cross product of the
-  // dimensions.
-
-  be_sequence *sequence =
-    be_sequence::narrow_from_decl (this->ctx_->node ());
-
-  if (sequence == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                         "visit_enum - "
-                         "bad sequence node\n"),
-                        -1);
-    }
-
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-        *os << "ACE_UNUSED_ARG(_tao_sequence);" << be_nl;
-        if (sequence->unbounded ())
-          *os << "return false; /* unbounded enum sequence */";
-        else
-          *os << "return true; /* bounded enum sequence */";
-        break;
-    case TAO_CodeGen::TAO_FIND_SIZE:
-      *os << "//enum types are fixed size so OK to call max_marshaled_size"
-          << be_nl;
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      *os << "//sequence of enum = ulong for length + ulong for enum * length"
-          << be_nl;
-      *os << "return _dcps_max_marshaled_size_ulong () + "
-          << "_dcps_max_marshaled_size_ulong () * "
-          << be_idt << be_idt_nl;
-      switch (this->ctx_->sub_state ())
-        {
-        case TAO_CodeGen::TAO_FIND_SIZE:
-          *os << "_tao_sequence.length();" << be_uidt << be_uidt;
-          break;
-        case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-          *os << "_tao_sequence.maximum();" << be_uidt << be_uidt;
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "(%N:%l) be_visitor_array_serializer_op_cs::"
-                            "visit_enum - "
-                            "bad sub_state for seq length\n"),
-                            -1);
-        }
-      break;
-    default:
-      return this->visit_node (node);
-    }
-  return 0;
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_interface (be_interface *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_interface_fwd (be_interface_fwd *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_component (be_component *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_component_fwd (be_component_fwd *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_home (be_home *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_valuetype (be_valuetype *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_eventtype (be_eventtype *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_eventtype_fwd (be_eventtype_fwd *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_predefined_type (
-    be_predefined_type *node
-  )
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_object:
-    case AST_PredefinedType::PT_abstract:
-    case AST_PredefinedType::PT_value:
-    case AST_PredefinedType::PT_pseudo:
-    case AST_PredefinedType::PT_any:
-      return this->visit_node (node);
-    case AST_PredefinedType::PT_void:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "Bad primitive type\n"),
-                        -1);
-    default:
-      break;
-    };
-
-  // We get here if the "type" of individual elements of the sequence is a
-  // primitive type. In this case, we treat the sequence as a single
-  // dimensional sequence (even of it was multi-dimensional), and pass
-  // the total length of the sequence as a cross product of the
-  // dimensions.
-
-  be_sequence *sequence =
-    be_sequence::narrow_from_decl (this->ctx_->node ());
-
-  if (sequence == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "bad sequence node\n"),
-                        -1);
-    }
-
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-        *os << "ACE_UNUSED_ARG(_tao_sequence);" << be_nl;
-        if (sequence->unbounded ())
-          *os << "return false; /* seq<predef'd> */";
-        else
-          *os << "return true; /* seq<predef'd,N> */";
-        break;
-    case TAO_CodeGen::TAO_FIND_SIZE:
-      *os << "//primitive types are fixed size so OK to call max_marshaled_size"
-          << be_nl;
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      switch (node->pt ())
-        {
-        case AST_PredefinedType::PT_octet:
-          *os << "return _dcps_max_marshaled_size_ulong () + "
-              << "_dcps_max_marshaled_size_octet ()"
-              << be_idt << be_idt_nl;
-          break;
-        case AST_PredefinedType::PT_char:
-          *os << "return _dcps_max_marshaled_size_ulong () + "
-              << "_dcps_max_marshaled_size_char ()"
-              << be_idt << be_idt_nl;
-          break;
-        case AST_PredefinedType::PT_wchar:
-          *os << "return _dcps_max_marshaled_size_ulong () + "
-              << "_dcps_max_marshaled_size_wchar ()"
-              << be_idt << be_idt_nl;
-          break;
-        case AST_PredefinedType::PT_long:
-        case AST_PredefinedType::PT_ulong:
-        case AST_PredefinedType::PT_short:
-        case AST_PredefinedType::PT_ushort:
-        case AST_PredefinedType::PT_float:
-        case AST_PredefinedType::PT_double:
-        case AST_PredefinedType::PT_longlong:
-        case AST_PredefinedType::PT_ulonglong:
-        case AST_PredefinedType::PT_longdouble:
-          *os << "//sequence is of a fixed sized predefined type = "
-              << "sizeof(ULong) + type size * length" << be_nl;
-          *os << node->name () << " a_base_value;" << be_nl;
-          *os << "return _dcps_max_marshaled_size_ulong () + "
-              << "_dcps_max_marshaled_size (a_base_value)"
-              << be_idt << be_idt_nl;
-          break;
-          break;
-        case AST_PredefinedType::PT_boolean:
-          *os << "return _dcps_max_marshaled_size_ulong () + "
-              << "_dcps_max_marshaled_size_boolean ()"
-              << be_idt << be_idt_nl;
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "(%N:%l) be_visitor_array_serializer_op_cs::"
-                            "visit_predefined_type - "
-                            "bad primitive type for _dcps_max_marshaled_size code gen\n"),
-                            -1);
-        }
-
-      switch (this->ctx_->sub_state ())
-        {
-        case TAO_CodeGen::TAO_FIND_SIZE:
-          *os << " * _tao_sequence.length();" << be_uidt << be_uidt;
-          break;
-        case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-          *os << " * _tao_sequence.maximum();" << be_uidt << be_uidt;
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "(%N:%l) be_visitor_array_serializer_op_cs::"
-                            "visit_predefined_type - "
-                            "bad sub_state for seq length\n"),
-                            -1);
-        }
-      break;
-      case TAO_CodeGen::TAO_CDR_INPUT:
-      case TAO_CodeGen::TAO_CDR_OUTPUT:
-        {
-  /*
-   * Avoiding the work to make TAO::DCPS::Serializer handle the
-   * TAO_NO_COPY_OCTET_SEQUENCES optimization.
-   * TBD - support this optimization -- see corresponding CDR code.
-   */
-  *os << "return strm.";
-
-  // Based on our substate, we may be reading from a stream or writing into a
-  // stream/
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "read_";
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "write_";
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  // Determine what kind of sequence are we reading/writing.
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_long:
-      *os << "long_array";
-      break;
-    case AST_PredefinedType::PT_ulong:
-      *os << "ulong_array";
-      break;
-    case AST_PredefinedType::PT_short:
-      *os << "short_array";
-      break;
-    case AST_PredefinedType::PT_ushort:
-      *os << "ushort_array";
-      break;
-    case AST_PredefinedType::PT_octet:
-      *os << "octet_array";
-      break;
-    case AST_PredefinedType::PT_char:
-      *os << "char_array";
-      break;
-    case AST_PredefinedType::PT_wchar:
-      *os << "wchar_array";
-      break;
-    case AST_PredefinedType::PT_float:
-      *os << "float_array";
-      break;
-    case AST_PredefinedType::PT_double:
-      *os << "double_array";
-      break;
-    case AST_PredefinedType::PT_longlong:
-      *os << "longlong_array";
-      break;
-    case AST_PredefinedType::PT_ulonglong:
-      *os << "ulonglong_array";
-      break;
-    case AST_PredefinedType::PT_longdouble:
-      *os << "longdouble_array";
-      break;
-    case AST_PredefinedType::PT_boolean:
-      *os << "boolean_array";
-      break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "bad primitive type for optimized code gen\n"),
-                        -1);
-    }
-
-  // Handle special case to avoid compiler errors.
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_char:
-      switch (this->ctx_->sub_state ())
-        {
-        case TAO_CodeGen::TAO_CDR_INPUT:
-          *os << " ((char *)_tao_sequence.get_buffer (), ";
-          break;
-        case TAO_CodeGen::TAO_CDR_OUTPUT:
-          *os << " ((const char *)_tao_sequence.get_buffer (), ";
-          break;
-        default:
-          // error
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_serializer_op_cs"
-                             "::visit_predefined_type - "
-                             "bad codegen substate\n"),
-                            -1);
-        }
-      break;
-    default:
-      *os << " (_tao_sequence.get_buffer (), ";
-      break;
-    }
-
-  *os << "_tao_sequence.length ());" << be_uidt_nl;
-
-      } // end TAO_CDR_INPUT/OUTPUT case
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                          "visit_predefined_type - outter "
-                          "bad sub state\n"),
-                        -1);
-    } // end outter switch
-
-  return 0;
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_string (be_string *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_structure (be_structure *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_union (be_union *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_serializer_op_cs::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  be_type *bt = node->primitive_base_type ();
-
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"),
-                        -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
-
-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 ());
-
-  if (node == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                         "visit_node - "
-                         "bad sequence node\n"),
-                        -1);
-    }
-
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_sequence_base visitor (&ctx);
-
-  // We get here if the "type" of individual elements of the sequence is not a
-  // primitive type. In this case, we are left with no other alternative but
-  // to encode/decode element by element.
-
-  AST_Expression *expr = node->max_size ();
-
-  if (expr == 0 || (expr != 0 && expr->ev () == 0))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                         "visit_node - "
-                         "bad sequence dimension\n"),
-                        -1);
-    }
-
-  AST_Decl::NodeType nt = bt->node_type ();
-  be_typedef *td = 0;
-
-  if (nt == AST_Decl::NT_typedef)
-    {
-      td = be_typedef::narrow_from_decl (bt);
-      nt = td->base_node_type ();
-    }
-
-switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-     if (node->unbounded ())
-       {
-         *os << "ACE_UNUSED_ARG(_tao_sequence);" << be_nl;
-         *os << "return false; /* unbounded sequence */";
-       }
-     else
-
-      switch (nt)
-        {
-        case AST_Decl::NT_enum:
-          *os << "ACE_UNUSED_ARG(_tao_sequence);" << be_nl;
-          *os << "return true; // bounded seqence of enums";
-          break;
-        case AST_Decl::NT_union:
-          *os << "ACE_UNUSED_ARG(_tao_sequence);" << be_nl;
-          *os << "// Always return false for a union because " << be_nl
-              << "// _dcps_max_marshaled_size may produce an access violation."
-              << be_nl
-              << "return false; // seq of union " << bt->name () << be_uidt;
-          break;
-        case AST_Decl::NT_sequence:
-        case AST_Decl::NT_struct:
-          // its a type that should be defined in the generated code.
-          *os << "ACE_UNUSED_ARG(_tao_sequence);" << be_nl;
-          *os << bt->name () << " a_base_value;" << be_nl;
-          *os << "return _tao_is_bounded_size (a_base_value);";
-          break;
-        case AST_Decl::NT_array:
-          *os << "ACE_UNUSED_ARG(_tao_sequence);" << be_nl;
-          *os << bt->name () << " a_base_value;" << be_nl;
-          *os << bt->name () << "_forany tmp(a_base_value);" << be_nl;
-          *os << "return _tao_is_bounded_size (tmp);" << be_uidt_nl;
-          break;
-        case AST_Decl::NT_string:
-        case AST_Decl::NT_wstring:
-          {
-            be_string *str =
-              be_string::narrow_from_decl (
-                  td == 0 ? bt : td->primitive_base_type ()
-                );
-
-            if (!str)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                   "visit_node - "
-                                   "bad string node\n"),
-                                  -1);
-              }
-
-            *os << "ACE_UNUSED_ARG(_tao_sequence);" << be_nl;
-            if (str->max_size ()->ev ()->u.ulval == 0)
-              {
-                 // Unbounded string
-                 *os << "return false; /* bounded seq of unbounded strings */";
-              }
-            else
-              {
-                 *os << "return true; /* bounded seq of bounded strings */";
-              }
-          }
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                              "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                              "visit_node - is_bounded_size - "
-                              "unsupported sequence base type\n"),
-                            -1);
-          break;
-        }
-      break;
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      switch (nt)
-        {
-        case AST_Decl::NT_enum:
-          *os << "// sequence of enums" << be_nl
-              << "return _dcps_max_marshaled_size_ulong () + " << be_idt_nl
-              << "_tao_sequence.maximum() * " << be_nl
-              << "_dcps_max_marshaled_size_ulong ();" << be_uidt;
-          break;
-        case AST_Decl::NT_union:
-          *os << "ACE_UNUSED_ARG(_tao_sequence);" << be_nl;
-          *os << "// do not try getting the _dcps_max_marshaled_size" << be_nl
-              << "// doing so may produce an access violation" << be_nl
-              << "return 100000; // seq of union " << bt->name () << be_uidt;
-          break;
-        case AST_Decl::NT_sequence:
-        case AST_Decl::NT_struct:
-          // its a type that should be defined in the generated code.
-          *os << bt->name () << " a_base_value;" << be_nl
-              << "return _dcps_max_marshaled_size_ulong () + " << be_idt_nl
-              << "_tao_sequence.maximum() * " << be_nl
-              << "_dcps_max_marshaled_size (a_base_value);" << be_uidt;
-          break;
-        case AST_Decl::NT_array:
-          *os << bt->name () << " a_base_value;" << be_nl;
-          *os << bt->name() << "_forany tmp(a_base_value);" << be_nl;
-          *os << "return _dcps_max_marshaled_size_ulong () + " << be_idt_nl
-              << "_tao_sequence.maximum() * " << be_nl;
-          *os << "_dcps_max_marshaled_size (tmp);" << be_uidt_nl;
-
-          break;
-        case AST_Decl::NT_string:
-        case AST_Decl::NT_wstring:
-          {
-            be_string *str =
-              be_string::narrow_from_decl (
-                  td == 0 ? bt : td->primitive_base_type ()
-                );
-
-            if (!str)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                   "visit_node - "
-                                   "bad string node\n"),
-                                  -1);
-              }
-
-            u_long max_size = str->max_size ()->ev ()->u.ulval;
-            if (max_size == 0)
-                 *os << "// bounded seq of unbounded strings" << be_nl;
-            else
-                 *os << "// bounded seq of bounded strings" << be_nl;
-
-            char buff[15];
-            ACE_OS::sprintf(buff, "%ld", max_size);
-            *os << "return _dcps_max_marshaled_size_ulong () + " << be_nl
-                << " _tao_sequence.maximum() * ";
-            *os << "(_dcps_max_marshaled_size_ulong () + " << buff << ");";
-
-          }
-          break;
-        case AST_Decl::NT_interface:
-          *os << "//DCPS - Sequence of interfaces is not supported" << be_nl;
-          *os << "return 77777;" << be_nl;
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                              "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                              "visit_node - is_bounded_size - "
-                              "unsupported sequence base type\n"),
-                            -1);
-          break;
-        }
-      break;
-    case TAO_CodeGen::TAO_FIND_SIZE:
-      {
-        *os << "//iterate over the sequence to find the current size" << be_nl
-            << "size_t the_length = _dcps_max_marshaled_size_ulong ();" << be_nl
-            << "for ( ::CORBA::ULong i = 0; i < _tao_sequence.length(); "
-            << "++i)" << be_idt_nl
-            << "{" << be_idt_nl;
-
-      switch (nt)
-        {
-        case AST_Decl::NT_enum:
-          *os << "the_length += _dcps_max_marshaled_size_ulong (); // enum" << be_uidt_nl;
-          break;
-        case AST_Decl::NT_union:
-        case AST_Decl::NT_sequence:
-        case AST_Decl::NT_struct:
-          // its a type that should be defined in the generated code.
-          *os << "the_length += _dcps_find_size (_tao_sequence[i]);" << be_uidt_nl;
-          break;
-        case AST_Decl::NT_array:
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_var tmp_var (" << be_idt << be_idt_nl;
-
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_dup (_tao_sequence[i])" << be_uidt_nl
-              << ");" << be_uidt_nl;
-
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_forany tmp (tmp_var.inout ());" << be_nl;
-          *os << "the_length += _dcps_find_size (tmp);" << be_uidt_nl;
-
-          break;
-        case AST_Decl::NT_string:
-          *os << "the_length += _dcps_max_marshaled_size_ulong () " << be_nl
-            << "+ (_tao_sequence[i] == 0 ? 0 : ACE_OS::strlen (_tao_sequence[i]));" 
-            << be_uidt_nl;
-          break;
-        case AST_Decl::NT_wstring:
-          *os << "the_length += _dcps_max_marshaled_size_ulong () " << be_nl
-            << "+ (_tao_sequence[i] == 0 ? 0 : ACE_OS::strlen (_tao_sequence[i]) * sizeof (CORBA::WChar));" 
-            << be_uidt_nl;
-          break;
-        case AST_Decl::NT_interface:
-          *os << "//DCPS - Sequence of interfaces is not supported" << be_nl;
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                              "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                              "visit_node - is_bounded_size - "
-                              "unsupported sequence base type\n"),
-                            -1);
-          break;
-        }
-
-
-        *os << "}" << be_uidt_nl
-            << "return the_length;";
-      }
-      break;
-    case TAO_CodeGen::TAO_CDR_INPUT:
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      {
-    // Initialize a boolean variable.
-  *os << "::CORBA::Boolean _tao_marshal_flag = true;" << be_nl << be_nl;
-
-
-  if (expr->ev ()->et == AST_Expression::EV_ulong)
-    {
-      *os << "for ( ::CORBA::ULong i = 0; i < _tao_seq_len"
-          << " && _tao_marshal_flag; "
-          << "++i)" << be_idt_nl
-          << "{" << be_idt_nl;
-    }
-  else
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                         "visit_node - "
-                         "bad sequence dimension value\n"),
-                        -1);
-    }
-
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      switch (nt)
-        {
-        case AST_Decl::NT_array:
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_forany tmp (";
-
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_alloc ());" << be_nl;
-          *os << "_tao_marshal_flag = (strm >> tmp);" << be_nl;
-
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_copy (_tao_sequence[i], tmp.in ());" << be_nl;
-
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_free (tmp.inout ());" << be_uidt_nl;
-
-          break;
-        case AST_Decl::NT_string:
-        case AST_Decl::NT_wstring:
-          {
-            be_string *str =
-              be_string::narrow_from_decl (
-                  td == 0 ? bt : td->primitive_base_type ()
-                );
-
-            if (!str)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                   "visit_node - "
-                                   "bad string node\n"),
-                                  -1);
-              }
-
-            if (str->max_size ()->ev ()->u.ulval == 0)
-              {
-                // Unbounded.
-                *os << node->name ()
-                    << "::value_type * buffer = _tao_sequence.get_buffer();"
-                    << be_idt_nl;;
-                *os << "_tao_marshal_flag = (strm >> buffer[i]);"
-                    << be_uidt_nl;
-              }
-            else
-              {
-                if (str->width () == (long) sizeof (char))
-                  {
-                    *os << "_tao_marshal_flag = (strm >> "
-                        << "::ACE_InputCDR::to_string (_tao_sequence[i].out (), ";
-                  }
-                else
-                  {
-                    *os << "_tao_marshal_flag = (strm >> "
-                        << "::ACE_InputCDR::to_wstring (_tao_sequence[i].out (), ";
-                  }
-
-                *os << str->max_size ()->ev ()->u.ulval << "));"
-                    << be_uidt_nl;
-              }
-          }
-          break;
-        case AST_Decl::NT_interface:
-        case AST_Decl::NT_interface_fwd:
-        case AST_Decl::NT_valuetype:
-        case AST_Decl::NT_valuetype_fwd:
-        case AST_Decl::NT_eventtype:
-        case AST_Decl::NT_eventtype_fwd:
-        case AST_Decl::NT_valuebox:
-          *os << "//DCPS does not support interfaces and value types";
-
-          break;
-        case AST_Decl::NT_pre_defined:
-          {
-            // We need to separately handle this case of pseudo objects
-            // because they have a _var type.
-            be_predefined_type *pt =
-              be_predefined_type::narrow_from_decl (
-                  td == 0 ? bt : td->primitive_base_type ()
-                );
-
-            if (!pt)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                   "visit_node - "
-                                   "bad predefined type node\n"),
-                                  -1);
-              }
-
-            switch (pt->pt ())
-              {
-                case AST_PredefinedType::PT_pseudo:
-                case AST_PredefinedType::PT_abstract:
-                case AST_PredefinedType::PT_object:
-                case AST_PredefinedType::PT_value:
-                  *os << "_tao_marshal_flag = (strm >> _tao_sequence[i].out ());";
-                  break;
-                case AST_PredefinedType::PT_char:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::ACE_InputCDR::to_char (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                case AST_PredefinedType::PT_wchar:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::ACE_InputCDR::to_wchar (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                case AST_PredefinedType::PT_boolean:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::ACE_InputCDR::to_boolean (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                case AST_PredefinedType::PT_octet:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::ACE_InputCDR::to_octet (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                default:
-                  *os << "_tao_marshal_flag = (strm >> _tao_sequence[i]);";
-                  break;
-              }
-          }
-
-          break;
-        default:
-          *os << "_tao_marshal_flag = (strm >> _tao_sequence[i]);";
-
-          break;
-        }
-
-      *os << be_uidt_nl
-          << "}";
-
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      switch (nt)
-        {
-        case AST_Decl::NT_array:
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_var tmp_var (" << be_idt << be_idt_nl;
-
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_dup (_tao_sequence[i])" << be_uidt_nl
-              << ");" << be_uidt_nl;
-
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_forany tmp (tmp_var.inout ());" << be_nl;
-          *os << "_tao_marshal_flag = (strm << tmp);";
-
-          break;
-        case AST_Decl::NT_interface:
-        case AST_Decl::NT_interface_fwd:
-          *os << "//DCPS does not support interfaces";
-          
-          break;
-        case AST_Decl::NT_string:
-        case AST_Decl::NT_wstring:
-          *os << "_tao_marshal_flag = (strm << _tao_sequence[i]);";
-          
-          break;
-        case AST_Decl::NT_valuetype:
-        case AST_Decl::NT_valuetype_fwd:
-        case AST_Decl::NT_eventtype:
-        case AST_Decl::NT_eventtype_fwd:
-        case AST_Decl::NT_valuebox:
-          *os << "//DCPS does not support value types";
-          
-          break;
-        case AST_Decl::NT_pre_defined:
-          {
-            //SHH harris_s@ociweb.com - I am not sure you can every get here
-            //   predefined types are handled by be_visitor_sequence_serializer_op_cs::visit_predefined_type
-            be_predefined_type *pt =
-              be_predefined_type::narrow_from_decl (
-                  td == 0 ? bt : td->primitive_base_type ()
-                );
-
-            if (!pt)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                                   "visit_node - "
-                                   "bad predefined type node\n"),
-                                  -1);
-              }
-
-            switch (pt->pt ())
-              {
-                case AST_PredefinedType::PT_pseudo:
-                case AST_PredefinedType::PT_abstract:
-                case AST_PredefinedType::PT_object:
-                case AST_PredefinedType::PT_value:
-                  *os << "_tao_marshal_flag = (strm << _tao_sequence[i].in ());";
-                  break;
-                case AST_PredefinedType::PT_char:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::ACE_OutputCDR::from_char (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                case AST_PredefinedType::PT_wchar:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::ACE_OutputCDR::from_wchar (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                case AST_PredefinedType::PT_boolean:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::ACE_OutputCDR::from_boolean (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                case AST_PredefinedType::PT_octet:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::ACE_OutputCDR::from_octet (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                default:
-                  *os << "_tao_marshal_flag = (strm << _tao_sequence[i]);";
-                  break;
-              }
-          }
-
-          break;
-        default:
-          *os << "_tao_marshal_flag = (strm << _tao_sequence[i]);";
-
-          break;
-        }
-
-      *os << be_uidt_nl
-          << "}";
-
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                         "visit_node - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  *os << be_uidt_nl << be_nl;
-  *os << "return _tao_marshal_flag;" << be_uidt_nl;
-  }
-  break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_serializer_op_cs::"
-                         "visit_node - "
-                         "bad sub state\n"),
-                        -1);
-    break;
-} //outer switch
-
-
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_structure.cpp b/TAO_IDL/be/be_visitor_structure.cpp
index f2eac91d559..73e941095cf 100644
--- a/TAO_IDL/be/be_visitor_structure.cpp
+++ b/TAO_IDL/be/be_visitor_structure.cpp
@@ -34,6 +34,3 @@
 #include "be_visitor_structure/any_op_cs.cpp"
 #include "be_visitor_structure/cdr_op_ch.cpp"
 #include "be_visitor_structure/cdr_op_cs.cpp"
-#include "be_visitor_structure/serializer_op_ch.cpp"
-#include "be_visitor_structure/serializer_op_cs.cpp"
-
diff --git a/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp b/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
index cfffd42a31e..5b0efa6b73f 100644
--- a/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
@@ -40,9 +40,9 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-  
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+
   be_module *module = 0;
   if (node->is_nested ())
     {
@@ -68,9 +68,9 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
           // Some compilers handle "any" operators in a namespace
           // corresponding to their module, others do not.
           *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-          
+
           be_util::gen_nested_namespace_begin (os, module);
-          
+
           *os << macro << " void operator<<= (::CORBA::Any &, const ::" << node->name ()
               << " &); // copying version" << be_nl;
           *os << macro << " void operator<<= (::CORBA::Any &, ::" << node->name ()
@@ -79,15 +79,15 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
               << node->name () << " *&); // deprecated\n";
           *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ::"
               << node->name () << " *&);";
-          
+
           be_util::gen_nested_namespace_end (os, module);
-          
+
           // Emit #else.
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "#else\n\n";
         }
     }
-      
+
   *os << be_global->core_versioning_begin () << be_nl;
 
   *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
diff --git a/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
index 42fb3f3c335..d64029fdd43 100644
--- a/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
@@ -40,9 +40,9 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Since we don't generate CDR stream operators for types that
   // explicitly contain a local interface (at some level), we
@@ -54,7 +54,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
     {
       *os << be_global->core_versioning_begin () << be_nl;
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "namespace TAO" << be_nl
           << "{" << be_idt_nl
           << "template<>" << be_nl
@@ -65,7 +65,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
           << "return false;" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "template<>" << be_nl
           << "::CORBA::Boolean" << be_nl
           << "Any_Dual_Impl_T<" << node->name ()
@@ -77,7 +77,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
 
       *os << be_global->core_versioning_end () << be_nl;
     }
-  
+
 
   be_module *module = 0;
   if (node->is_nested ())
@@ -127,7 +127,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
               << "::" << node->tc_name () << "," << be_nl
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           // Non-copying insertion.
           *os << "// Non-copying insertion." << be_nl
@@ -143,7 +143,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
               << "::" << node->tc_name () << "," << be_nl
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           // Extraction to non-const pointer (deprecated, just calls the other).
           *os << "// Extraction to non-const pointer (deprecated)." << be_nl
@@ -156,7 +156,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
               << "const ::" << node->name () << " *&> (" << be_nl
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           // Extraction to const pointer.
           *os << "// Extraction to const pointer." << be_nl
@@ -174,15 +174,15 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt << be_uidt_nl
               << "}";
-      
+
           be_util::gen_nested_namespace_end (os, module);
-      
+
           // Emit #else.
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "#else\n";
         }
     }
-  
+
   *os << be_global->core_versioning_begin () << be_nl;
 
   // Copying insertion.
@@ -204,7 +204,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << node->tc_name () << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Non-copying insertion.
   *os << "// Non-copying insertion." << be_nl
@@ -220,7 +220,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << node->tc_name () << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Extraction to non-const pointer (deprecated, just calls the other).
   *os << "// Extraction to non-const pointer (deprecated)." << be_nl
@@ -233,7 +233,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << "const " << node->name () << " *&> (" << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Extraction to const pointer.
   *os << "// Extraction to const pointer." << be_nl
diff --git a/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp b/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
index 8649bb5000f..31866916e0c 100644
--- a/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
@@ -41,15 +41,15 @@ be_visitor_structure_cdr_op_ch::visit_structure (be_structure *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
   *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator<< (TAO_OutputCDR &, const " << node->name ()
       << " &);" << be_nl;
-      
+
   *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator>> (TAO_InputCDR &, "
       << node->name () << " &);" << be_nl;
@@ -71,7 +71,7 @@ be_visitor_structure_cdr_op_ch::visit_structure (be_structure *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_structure_cdr_op_ch::"
                          "visit_structure - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
diff --git a/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp b/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
index 93037b0067b..b294dfa6ca0 100644
--- a/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
@@ -42,14 +42,14 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_structure_cdr_op_cs::"
                          "visit_structure - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
   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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -73,12 +73,12 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_structure_cdr_op_cs::"
                          "visit_structure - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
   *os << ";" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Set the substate as generating code for the input operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_INPUT);
@@ -91,14 +91,14 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
       *os << "strm";
     }
 
-  *os << "," << be_nl 
+  *os << "," << be_nl
       << node->name () << " &";
-      
+
   if (! node->is_local ())
     {
       *os << "_tao_aggregate";
     }
-    
+
   *os << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl;
@@ -116,9 +116,9 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_structure_cdr_op_cs::"
                              "visit_structure - "
-                             "codegen for field decl scope failed\n"), 
+                             "codegen for field decl scope failed\n"),
                             -1);
-        }        
+        }
 
       *os << "return" << be_idt_nl;
 
@@ -127,7 +127,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_structure_cdr_op_cs"
                              "::visit_structure - "
-                             "codegen for scope failed\n"), 
+                             "codegen for scope failed\n"),
                             -1);
         }
 
diff --git a/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp b/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp
deleted file mode 100644
index 3ba993d300f..00000000000
--- a/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-#include "global_extern.h"
-
-// ***************************************************************************
-// Structure visitor for generating Serializer operator declarations in the client header
-// ***************************************************************************
-
-be_visitor_structure_serializer_op_ch::be_visitor_structure_serializer_op_ch (
-    be_visitor_context *ctx
-  )
-  : be_visitor_structure (ctx)
-{
-}
-
-be_visitor_structure_serializer_op_ch::~be_visitor_structure_serializer_op_ch (void)
-{
-}
-
-int
-be_visitor_structure_serializer_op_ch::visit_structure (be_structure *node)
-{
-  if (node->cli_hdr_serializer_op_gen ()
-      || node->imported ()
-      || node->is_local ())
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  IDL_GlobalData::DCPS_Data_Type_Info* info;
-  if (0 != (info =  idl_global->is_dcps_type(node->name())))
-    {
-      *os << be_global->stub_export_macro () 
-          << " ::CORBA::Boolean _dcps_has_key(const " 
-          << node->name() << "& val);" << be_nl;
-
-      *os << "// This structure supports use of std::map with a key" << be_nl
-          << "// defined by one or more #pragma DCPS_DATA_KEY lines." << be_nl
-          << "struct " << be_global->stub_export_macro () << " " 
-          << node->name()->last_component() << "KeyLessThan " << be_nl
-          << "{" << be_idt_nl
-          << "bool operator() (" << be_idt << be_idt_nl
-          << "const " << node->name() << "& v1," << be_nl
-          << "const " << node->name() << "& v2) const"  << be_uidt << be_uidt_nl 
-          << "{" << be_idt_nl;
-
-      if (info->key_list_.is_empty())
-        {
-          *os << "ACE_UNUSED_ARG(v1);" << be_nl;
-          *os << "ACE_UNUSED_ARG(v2);" << be_nl;
-          *os << "// if no DCPS_DATA_KEY values then return false" << be_nl
-              << "// to allow use of map with just one entry" << be_nl;
-          *os << "return false;" << be_nl;
-        }
-      else
-        {
-          *os << "return ";
-          IDL_GlobalData::DCPS_Data_Type_Info_Iter iter (info->key_list_);
-
-          IDL_GlobalData::DCPS_Data_Type_Info_Iter begin = iter;
-
-          for (ACE_TString *kp = 0;
-               iter.next (kp) != 0;
-               )
-            {
-              *os << "(";
-              IDL_GlobalData::DCPS_Data_Type_Info_Iter prev = begin;
-              for (ACE_TString *p = 0;
-               prev.next (p) != 0 && p != kp;
-               )
-              {
-                *os << "v1." << ACE_TEXT_ALWAYS_CHAR (p->c_str ()) << " == " << "v2." << ACE_TEXT_ALWAYS_CHAR (p->c_str ()) << " && ";
-                prev.advance ();
-              }
-
-              *os << "v1." << ACE_TEXT_ALWAYS_CHAR (kp->c_str ()) << " < " << "v2." << ACE_TEXT_ALWAYS_CHAR (kp->c_str ());
-              *os << ")";
-
-              iter.advance ();
-              if (iter.done ()) 
-                *os << ";" << be_uidt_nl;
-              else
-                *os << " || " << be_nl;
-            }
-        }
-      *os << "}" << be_uidt_nl
-          << "};" << be_nl << be_nl;
-    }
-
-  //- _dcps_max_marshaled_size(type) method 
-  *os << be_global->stub_export_macro () 
-      << " size_t _dcps_max_marshaled_size (const " 
-      << node->name() << "& _tao_aggregate);" << be_nl;
-  //- _tao_is_bounded_size(type) method 
-  *os << be_global->stub_export_macro () 
-      << " ::CORBA::Boolean _tao_is_bounded_size (const " 
-      << node->name() << "& _tao_aggregate);" << be_nl;
-  //- _dcps_find_size(type) method 
-  *os << be_global->stub_export_macro () 
-      << " size_t _dcps_find_size (const " 
-      << node->name() << "& _tao_aggregate);" << be_nl;
-
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator<< (TAO::DCPS::Serializer &, const " << node->name ()
-      << " &);" << be_nl;
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>> (TAO::DCPS::Serializer &, "
-      << node->name () << " &);" << be_nl;
-
-  //FUTURE: This can be excluded if the OpenDDS is excluding the DDS
-  //        content-subscription profile at compile-time.
-  *os << be_nl << "#ifdef DDS_USE_QUERY_CONDITION_COMPARATOR" << be_nl
-      << "namespace OpenDDS" << be_nl
-      << "{" << be_idt_nl
-      << "namespace DCPS" << be_nl
-      << "{" << be_idt_nl
-      << be_global->stub_export_macro () << be_nl
-      << "ComparatorBase::Ptr create_qc_comparator (" << node->name ()
-      << " *, const char *field, ComparatorBase::Ptr next);" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "}" << be_nl
-      << "#endif" << be_nl;
-
-  // Set the substate as generating code for the types defined in our scope.
-  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE);
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_structure_serializer_op_ch::"
-                         "visit_structure - "
-                         "codegen for scope failed\n"), 
-                        -1);
-    }
-
-
-  node->cli_hdr_serializer_op_gen (1);
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp b/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp
deleted file mode 100644
index de822568d77..00000000000
--- a/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-#include "utl_identifier.h"
-
-be_visitor_structure_serializer_op_cs::be_visitor_structure_serializer_op_cs (
-    be_visitor_context *ctx
-  )
-  : be_visitor_structure (ctx)
-{
-}
-
-be_visitor_structure_serializer_op_cs::~be_visitor_structure_serializer_op_cs (void)
-{
-}
-
-int
-be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node)
-{
-  if (node->cli_stub_serializer_op_gen ()
-      || node->imported ()
-      || node->is_local ())
-    {
-      return 0;
-    }
-
-  // Set the substate as generating code for the types defined in our scope.
-  this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE);
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_structure_serializer_op_cs::"
-                         "visit_structure - "
-                         "codegen for scope failed\n"), 
-                        -1);
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  IDL_GlobalData::DCPS_Data_Type_Info* info;
-  if (0 != (info =  idl_global->is_dcps_type(node->name())))
-    {
-      *os << "::CORBA::Boolean _dcps_has_key (const " 
-          << node->name() << "& ) { " << be_idt_nl;
-      if (info->key_list_.is_empty())
-        *os << "return false;";
-      else
-        *os << "return true;";
-      *os << be_uidt_nl << "}" << be_nl;
-    }
-
-  //- _dcps_max_marshaled_size(type) method
-  this->ctx_->sub_state (TAO_CodeGen::TAO_MAX_MARSHALED_SIZE);
-  *os << "size_t "  
-      << "_dcps_max_marshaled_size (const " 
-      << node->name() << "& _tao_aggregate)" << be_nl
-      << "{" << be_idt_nl
-      << "ACE_UNUSED_ARG (_tao_aggregate);" 
-      << " // sometimes not used - avoid warning" << be_nl;
-
-  {
-    be_visitor_context new_ctx (*this->ctx_);
-    be_visitor_serializer_op_field_decl field_decl (&new_ctx);
-
-    if (field_decl.visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_serializer_op_cs::"
-                             "visit_structure - "
-                             "codegen for field decl scope failed\n"), 
-                            -1);
-        }        
-
-#ifdef DCPS_DEBUG_IDL
-    *os << "size_t result = 0;" << be_nl;
-#else
-    *os << "return " << be_idt_nl;
-#endif
-
-    if (this->visit_scope (node) == -1)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                          "(%N:%l) be_visitor_structure_serializer_op_cs::"
-                          "visit_structure - "
-                          "codegen for scope failed\n"), 
-                          -1);
-      }
-  }
-  *os << ";" << be_uidt << be_uidt_nl; 
-#ifdef DCPS_DEBUG_IDL
-  *os << "return result;" <<  be_uidt_nl;
-#endif
-  *os << "}" << be_nl << be_nl;
-
-
-  //- _tao_is_bounded_size(type) method
-  this->ctx_->sub_state (TAO_CodeGen::TAO_IS_BOUNDED_SIZE);
-  *os << "::CORBA::Boolean _tao_is_bounded_size (const " 
-      << node->name() << "& _tao_aggregate)" << be_nl
-      << "{" << be_idt_nl;
-
-  {
-    be_visitor_context new_ctx (*this->ctx_);
-    be_visitor_serializer_op_field_decl field_decl (&new_ctx);
-    field_decl.visit_scope (node);
-
-    *os << "ACE_UNUSED_ARG (_tao_aggregate);"
-        << " // often not used - avoid warning"  << be_nl
-        << "return" << be_idt_nl;
-
-    if (this->visit_scope (node) == -1)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                          "(%N:%l) be_visitor_structure_serializer_op_cs::"
-                          "visit_structure - "
-                          "codegen for scope failed\n"), 
-                          -1);
-      }
-  }
-  *os << ";" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  //- _dcps_find_size(type) method -- like max_marshaled_size but use len - not max.
-  this->ctx_->sub_state (TAO_CodeGen::TAO_FIND_SIZE);
-  *os << "size_t "  
-      << "_dcps_find_size(const " 
-      << node->name() << "& _tao_aggregate)" << be_nl
-      << "{" << be_idt_nl
-      << "ACE_UNUSED_ARG(_tao_aggregate);" 
-      << " // sometimes not used - avoid warning" << be_nl;
-
-  {
-    be_visitor_context new_ctx (*this->ctx_);
-    be_visitor_serializer_op_field_decl field_decl (&new_ctx);
-    field_decl.visit_scope (node);
-#ifdef DCPS_DEBUG_IDL
-    *os << "size_t result = 0;" << be_nl;
-#else
-    *os << "return " << be_idt_nl;
-#endif
-
-    if (this->visit_scope (node) == -1)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                          "(%N:%l) be_visitor_structure_serializer_op_cs::"
-                          "visit_structure - "
-                          "codegen for scope failed\n"), 
-                          -1);
-      }
-  }
-  *os << ";" << be_uidt << be_uidt_nl; 
-#ifdef DCPS_DEBUG_IDL
-  *os << "return result;" <<  be_uidt_nl;
-#endif
-  *os << "}" << be_nl << be_nl;
-
-
-  //  Set the sub state as generating code for the output operator.
-  this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
-
-  *os << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl
-      << "TAO::DCPS::Serializer &strm," << be_nl
-      << "const " << node->name () << " &_tao_aggregate" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  be_visitor_context new_ctx (*this->ctx_);
-  be_visitor_serializer_op_field_decl field_decl (&new_ctx);
-  field_decl.visit_scope (node);
-
-  *os << "return" << be_idt_nl;
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_structure_serializer_op_cs::"
-                         "visit_structure - "
-                         "codegen for scope failed\n"), 
-                        -1);
-    }
-
-  *os << ";" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // Set the substate as generating code for the input operator.
-  this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_INPUT);
-
-  *os << "::CORBA::Boolean operator>> (" << be_idt << be_idt_nl
-      << "TAO::DCPS::Serializer &";
-
-  if (! node->is_local ())
-    {
-      *os << "strm";
-    }
-
-  *os << "," << be_nl 
-      << node->name () << " &";
-      
-  if (! node->is_local ())
-    {
-      *os << "_tao_aggregate";
-    }
-    
-  *os << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  if (node->is_local ())
-    {
-      *os << "return 0;";
-    }
-  else
-    {
-      new_ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
-      field_decl.visit_scope (node);
-
-      *os << "return" << be_idt_nl;
-
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_structure_serializer_op_cs"
-                             "::visit_structure - "
-                             "codegen for scope failed\n"), 
-                            -1);
-        }
-
-      *os << ";" << be_uidt << be_uidt;
-    }
-
-  *os << be_uidt_nl << "}";
-
-
-  // QueryCondition support
-
-  *os << be_nl << be_nl << "#ifdef DDS_USE_QUERY_CONDITION_COMPARATOR" << be_nl
-      << "namespace OpenDDS" << be_nl
-      << "{" << be_idt_nl
-      << "namespace DCPS" << be_nl
-      << "{" << be_idt_nl
-      << "ComparatorBase::Ptr create_qc_comparator (" << node->name ()
-      << " *, const char *field, ComparatorBase::Ptr next)" << be_nl
-      << "{" << be_idt_nl;
-
-  size_t nfields = node->nfields ();
-  bool used_args (false);
-  for (size_t i = 0; i < nfields; ++i)
-    {
-      AST_Field **f;
-      node->field (f, i);
-      char *fname = (*f)->local_name ()->get_string ();
-      ACE_UINT32 fname_len = ACE_OS::strlen (fname) + 1;
-      AST_Type *ftype = (*f)->field_type ();
-      UTL_ScopedName *ftype_name = ftype->name ();
-      switch (ftype->node_type ())
-        {
-        case AST_Decl::NT_pre_defined:
-        case AST_Decl::NT_string:
-        case AST_Decl::NT_enum:
-          used_args = true;
-          *os << "if (ACE_OS::strcmp(\"" << fname << "\", field) == 0)"
-              << be_idt_nl
-              << "{" << be_idt_nl
-              << "return make_field_cmp(&" << node->name () << "::" << fname
-              << ", next);" << be_uidt_nl
-              << "}" << be_uidt_nl;
-          break;
-        case AST_Decl::NT_struct:
-          used_args = true;
-          *os << "if (ACE_OS::strncmp(\"" << fname << ".\", field, "
-              << fname_len << ") == 0)"
-              << be_idt_nl
-              << "{" << be_idt_nl
-              << "return make_struct_cmp(&" << node->name () << "::" << fname
-              << ", create_qc_comparator(static_cast<" << ftype_name
-              << " *>(0), field + " << fname_len << ", 0), next);"
-              << be_uidt_nl
-              << "}" << be_uidt_nl;
-          break;
-        default: ;
-        }
-    }
-
-  if (!used_args)
-    {
-      *os << "ACE_UNUSED_ARG (field);" << be_nl
-          << "ACE_UNUSED_ARG (next);" << be_nl;
-    }
-
-  *os << "return 0;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "}" << be_nl
-      << "#endif" << be_nl;
-
-  node->cli_stub_serializer_op_gen (true);
-  return 0;
-}
-
-int
-be_visitor_structure_serializer_op_cs::post_process (be_decl *bd)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-    case TAO_CodeGen::TAO_CDR_INPUT:
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      if (!this->last_node (bd))
-        {
-          *os << " &&" << be_nl;
-        }
-      break;
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-    case TAO_CodeGen::TAO_FIND_SIZE:
-#ifdef DCPS_DEBUG_IDL
-      *os << ";" << be_nl;
-#else
-      if (!this->last_node (bd))
-        {
-          *os << " +" << be_nl;
-        }
-#endif
-      break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-    default:
-      break;
-    };
-
-  return 0;
-}
-
-int
-be_visitor_structure_serializer_op_cs::pre_process (be_decl *bd)
-{
-#ifdef DCPS_DEBUG_IDL
-  TAO_OutStream *os = this->ctx_->stream ();
-#else
-  ACE_UNUSED_ARG(bd);
-#endif
-
-      switch (this->ctx_->sub_state ())
-        {
-        case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-          break;
-        case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-        case TAO_CodeGen::TAO_FIND_SIZE:
-#ifdef DCPS_DEBUG_IDL
-          *os << "result += ";
-#endif
-          break;
-        case TAO_CodeGen::TAO_CDR_OUTPUT:
-        case TAO_CodeGen::TAO_CDR_INPUT:
-        case TAO_CodeGen::TAO_CDR_SCOPE:
-        default:
-          break;
-        };
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_structure/structure.cpp b/TAO_IDL/be/be_visitor_structure/structure.cpp
index 9558e7507a7..adc584e7ff0 100644
--- a/TAO_IDL/be/be_visitor_structure/structure.cpp
+++ b/TAO_IDL/be/be_visitor_structure/structure.cpp
@@ -73,24 +73,12 @@ be_visitor_structure::visit_field (be_field *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-      {
-        be_visitor_field_serializer_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
-      {
-        be_visitor_field_serializer_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_structure::"
                            "visit_field - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
     }
@@ -100,7 +88,7 @@ be_visitor_structure::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_structure::"
                          "visit_field - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
diff --git a/TAO_IDL/be/be_visitor_structure/structure_ch.cpp b/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
index da53e48b739..2f2cb688a39 100644
--- a/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
+++ b/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
@@ -43,18 +43,18 @@ int be_visitor_structure_ch::visit_structure (be_structure *node)
   // Generate the _var and _out typedefs.
   node->gen_common_varout (os);
 
-  *os << be_nl << be_nl;
-  
+  *os << be_nl_2;
+
   *os << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "struct " << be_global->stub_export_macro () << " "
       << node->local_name () << be_nl
       << "{" << be_idt;
 
   node->gen_stub_decls (os);
-  
+
   *os << be_nl;
 
   // Generate code for field members.
diff --git a/TAO_IDL/be/be_visitor_structure/structure_cs.cpp b/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
index 598501fe506..403fe774109 100644
--- a/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
+++ b/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
@@ -51,9 +51,9 @@ be_visitor_structure_cs::visit_structure (be_structure *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl;
+  *os << be_nl_2;
   *os << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   if (be_global->any_support ())
     {
diff --git a/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp b/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
index 4df083567e3..3bb30b2cd85 100644
--- a/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
+++ b/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
@@ -35,7 +35,7 @@ be_visitor_structure_fwd_ch::visit_structure_fwd (be_structure_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  be_structure *fd = 
+  be_structure *fd =
     be_structure::narrow_from_decl (node->full_definition ());
 
   // This will be a no-op if it has already been done for this node.
diff --git a/TAO_IDL/be/be_visitor_template_export.cpp b/TAO_IDL/be/be_visitor_template_export.cpp
index f085d8f6789..bee0c3db328 100644
--- a/TAO_IDL/be/be_visitor_template_export.cpp
+++ b/TAO_IDL/be/be_visitor_template_export.cpp
@@ -37,7 +37,7 @@ be_visitor_template_export::visit_root (be_root *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   *os << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT";
 
diff --git a/TAO_IDL/be/be_visitor_traits.cpp b/TAO_IDL/be/be_visitor_traits.cpp
index 7281d751573..0f0fa5c33f2 100644
--- a/TAO_IDL/be/be_visitor_traits.cpp
+++ b/TAO_IDL/be/be_visitor_traits.cpp
@@ -55,7 +55,7 @@ be_visitor_traits::visit_root (be_root *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
@@ -105,6 +105,10 @@ be_visitor_traits::visit_interface (be_interface *node)
       return 0;
     }
 
+  /// Some type of recursion can cause fprintf problems,
+  /// easily avoided by setting the flag before visit_scope().
+  node->cli_traits_gen (true);
+
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Since the three blocks below generate specialized (i.e., non-template)
@@ -115,19 +119,21 @@ be_visitor_traits::visit_interface (be_interface *node)
     {
       os->gen_ifdef_macro (node->flat_name (), "traits", false);
 
-      *os << be_nl << be_nl
+      const char *fname = node->full_name ();
+
+      *os << be_nl_2
           << "template<>" << be_nl
           << "struct " << be_global->stub_export_macro () << " Objref_Traits<"
-          << " ::" << node->name () << ">" << be_nl
+          << " ::" << fname << ">" << be_nl
           << "{" << be_idt_nl
-          << "static ::" << node->name () << "_ptr duplicate ("
+          << "static ::" << fname << "_ptr duplicate ("
           << be_idt << be_idt_nl
-          << "::" << node->name () << "_ptr p);" << be_uidt << be_uidt_nl
+          << "::" << fname << "_ptr p);" << be_uidt << be_uidt_nl
           << "static void release (" << be_idt << be_idt_nl
-          << "::" << node->name () << "_ptr p);" << be_uidt << be_uidt_nl
-          << "static ::" << node->name () << "_ptr nil (void);" << be_nl
+          << "::" << fname << "_ptr p);" << be_uidt << be_uidt_nl
+          << "static ::" << fname << "_ptr nil (void);" << be_nl
           << "static ::CORBA::Boolean marshal (" << be_idt << be_idt_nl
-          << "const ::" << node->name () << "_ptr p," << be_nl
+          << "const ::" << fname << "_ptr p," << be_nl
           << "TAO_OutputCDR & cdr);" << be_uidt  << be_uidt << be_uidt_nl
           << "};";
 
@@ -142,7 +148,6 @@ be_visitor_traits::visit_interface (be_interface *node)
                         -1);
     }
 
-  node->cli_traits_gen (true);
   return 0;
 }
 
@@ -179,6 +184,10 @@ be_visitor_traits::visit_valuetype (be_valuetype *node)
       return 0;
     }
 
+  /// Some type of recursion can cause fprintf problems,
+  /// easily avoided by setting the flag before visit_scope().
+  node->cli_traits_gen (true);
+
   TAO_OutStream *os = this->ctx_->stream ();
 
   // I think we need to generate this only for non-defined forward
@@ -187,7 +196,7 @@ be_visitor_traits::visit_valuetype (be_valuetype *node)
     {
       os->gen_ifdef_macro (node->flat_name (), "traits", false);
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "template<>" << be_nl
           << "struct " << be_global->stub_export_macro () << " Value_Traits<"
           << node->name () << ">" << be_nl
@@ -212,7 +221,6 @@ be_visitor_traits::visit_valuetype (be_valuetype *node)
                         -1);
     }
 
-  node->cli_traits_gen (true);
   return 0;
 }
 
@@ -259,7 +267,7 @@ be_visitor_traits::visit_valuebox (be_valuebox *node)
     {
       os->gen_ifdef_macro (node->flat_name (), "traits", false);
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "template<>" << be_nl
           << "struct " << be_global->stub_export_macro () << " Value_Traits<"
           << node->name () << ">" << be_nl
@@ -312,13 +320,6 @@ int
 be_visitor_traits::visit_field (be_field *node)
 {
   be_type *ft = be_type::narrow_from_decl (node->field_type ());
-  AST_Decl::NodeType nt = ft->node_type ();
-
-  // All we are trying to catch in here are anonymous array members.
-  if (nt != AST_Decl::NT_array)
-    {
-      return 0;
-    }
 
   if (ft->accept (this) == -1)
     {
diff --git a/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp b/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
index c922bca275c..fc5b7e8bc8c 100644
--- a/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
+++ b/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
@@ -45,9 +45,9 @@ TAO::be_visitor_alias_typecode::common (be_type * node,
 {
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
 
diff --git a/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp b/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
index 57a6a651346..b1f18d6c45f 100644
--- a/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
+++ b/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
@@ -26,7 +26,7 @@ TAO::be_visitor_enum_typecode::visit_enum (be_enum * node)
 {
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "// TAO_IDL - Generated from" << be_nl
      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
 
diff --git a/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp b/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
index 8df2556f997..81f4f46d72a 100644
--- a/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
+++ b/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
@@ -12,7 +12,6 @@
  */
 //=============================================================================
 
-
 TAO::be_visitor_objref_typecode::be_visitor_objref_typecode (
   be_visitor_context * ctx)
   : be_visitor_typecode_defn (ctx)
@@ -35,7 +34,7 @@ TAO::be_visitor_objref_typecode::visit_interface (be_interface * node)
 
   if (dynamic_cast<be_component *> (node))
     kind = component;
-  else if (dynamic_cast<be_home *> (node))
+  else if (node->home_equiv ())
     kind = home;
   else if (node->is_abstract ())
     kind = abstract_interface;
@@ -55,11 +54,6 @@ int
 TAO::be_visitor_objref_typecode::visit_native (be_native * /* node */)
 {
   return 0;
-//   return this->visit_i ("native",
-//                         ,
-//                         ,
-//                         ,
-//                         node);
 }
 
 int
@@ -71,9 +65,9 @@ TAO::be_visitor_objref_typecode::visit_i (char const * kind,
 {
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Generate the TypeCode instantiation.
   os
diff --git a/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp b/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
index b8689ce4871..ff4a1ddd970 100644
--- a/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
+++ b/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
@@ -33,11 +33,10 @@ TAO::be_visitor_struct_typecode::visit_structure (be_structure * node)
     this->queue_lookup (this->tc_queue_, node);
 
   ACE_Unbounded_Queue<AST_Type *> recursion_queue;
-
-  if (qnode
-      && node->in_recursion (recursion_queue))
+  bool in_recursion = node->in_recursion (recursion_queue);
+  if (qnode && in_recursion)
     {
-      this->is_recursive_ = true;
+      // we're repeated and we're recursive so just leave
       return 0;
     }
   else if (this->queue_insert (this->tc_queue_, node, 0) == 0)
@@ -54,6 +53,9 @@ TAO::be_visitor_struct_typecode::visit_structure (be_structure * node)
       return 0;
     }
 
+  // as this was no nested visit mark this typecode as recursive
+  this->is_recursive_ = in_recursion;
+
   static bool const is_exception = false;
   return this->visit (node, is_exception);
 }
@@ -79,9 +81,9 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node,
   this->is_nested_ = true;
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   if (this->gen_member_typecodes (node) != 0)
     {
@@ -189,6 +191,9 @@ TAO::be_visitor_struct_typecode::gen_member_typecodes (AST_Structure * node)
           return -1;
         }
 
+/*  MCO@20101020 - this is unnecessary since the check for recursiveness
+ *  of *this* typecode has already been done before calling this method
+
       be_structure *bs = be_structure::narrow_from_decl (node);
       if (bs)
         {
@@ -196,12 +201,14 @@ TAO::be_visitor_struct_typecode::gen_member_typecodes (AST_Structure * node)
             this->queue_lookup (this->tc_queue_, bs);
 
           ACE_Unbounded_Queue<AST_Type *> recursion_queue;
+          recursion_queue.enqueue_tail(node);
           if (qnode
             && member_type->in_recursion (recursion_queue))
             {
               this->is_recursive_ = true;
             }
         }
+*/
     }
 
   return 0;
diff --git a/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp b/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
index aff66b8fae4..f6ca3c543f2 100644
--- a/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
+++ b/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
@@ -35,10 +35,10 @@ be_visitor_typecode_decl::visit_type (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-  
-  // If -GA is used but anyop macro isn't set, defaults to stub macro.    
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+
+  // If -GA is used but anyop macro isn't set, defaults to stub macro.
   const char *export_macro = (be_global->gen_anyop_files ()
                               ? this->ctx_->non_null_export_macro ()
                               : be_global->stub_export_macro ());
diff --git a/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index 5d0da43b4d0..80e73c12434 100644
--- a/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -107,7 +107,7 @@ be_visitor_typecode_defn::gen_typecode_ptr (be_type * node)
                              ACE_TEXT ("Error parsing nested name\n")),
                             -1);
         }
-        
+
       be_util::gen_nested_namespace_begin (&os, module);
 
       os << "::CORBA::TypeCode_ptr const _tc_"
@@ -197,7 +197,7 @@ be_visitor_typecode_defn::gen_forward_declared_typecode (be_type * node)
                              ACE_TEXT ("Error parsing nested name\n")),
                             -1);
         }
-        
+
       be_util::gen_nested_namespace_begin (&os, module);
 
       os << "extern ::CORBA::TypeCode_ptr const _tc_"
@@ -211,7 +211,7 @@ be_visitor_typecode_defn::gen_forward_declared_typecode (be_type * node)
       os << "extern ::CORBA::TypeCode_ptr const "
          << node->tc_name () << ";" << be_uidt;
     }
-    
+
   os << be_nl;
 
   return 0;
@@ -292,9 +292,9 @@ be_visitor_typecode_defn::visit_array (be_array *node)
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // generate typecode for the base type
   this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
@@ -402,7 +402,7 @@ be_visitor_typecode_defn::visit_array (be_array *node)
 
       if (i < ndims - 1)
         {
-          os << be_nl << be_nl;
+          os << be_nl_2;
         }
     }
 
@@ -455,9 +455,9 @@ be_visitor_typecode_defn::visit_sequence (be_sequence * node)
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // generate typecode for the base type
   this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
@@ -528,7 +528,7 @@ be_visitor_typecode_defn::visit_sequence (be_sequence * node)
   os << be_global->core_versioning_end ();
 
   os << "\n#endif /* _TAO_TYPECODE_" << node->flat_name () << "_GUARD */"
-     << be_nl << be_nl;
+     << be_nl_2;
 
   return 0; // this->gen_typecode_ptr (node);
 }
@@ -550,9 +550,9 @@ be_visitor_typecode_defn::visit_string (be_string * node)
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Multiple definition guards.
   // @todo Can we automate duplicate detection within the IDL compiler
@@ -587,7 +587,7 @@ be_visitor_typecode_defn::visit_string (be_string * node)
   os << be_global->core_versioning_end ();
 
   os << "\n#endif /* _TAO_TYPECODE_" << node->flat_name () << "_GUARD */"
-     << be_nl << be_nl;
+     << be_nl_2;
 
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp b/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
index 09119469d31..388c40f0e27 100644
--- a/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
+++ b/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
@@ -34,12 +34,10 @@ TAO::be_visitor_union_typecode::visit_union (be_union * node)
     this->queue_lookup (this->tc_queue_, node);
 
   ACE_Unbounded_Queue<AST_Type *> recursion_queue;
-
-  if (qnode
-      && node->in_recursion (recursion_queue))
+  bool in_recursion = node->in_recursion (recursion_queue);
+  if (qnode && in_recursion)
     {
-      this->is_recursive_ = true;
-
+    // we're repeated and we're recursive so just leave
       return 0;
     }
   else if (this->queue_insert (this->tc_queue_, node, 0) == 0)
@@ -56,13 +54,16 @@ TAO::be_visitor_union_typecode::visit_union (be_union * node)
       return 0;
     }
 
+  // as this was no nested visit mark this typecode as recursive
+  this->is_recursive_ = in_recursion;
+
   this->is_nested_ = true;
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   be_type * const discriminant_type =
     be_type::narrow_from_decl (node->disc_type ());
@@ -148,15 +149,21 @@ TAO::be_visitor_union_typecode::gen_case_typecodes (be_union * node)
           return -1;
         }
 
+/*  MCO@20101020 - this is unnecessary since the check for recursiveness
+ *  of *this* typecode has already been done before calling this method
+
       be_visitor_typecode_defn::QNode const * const qnode =
         this->queue_lookup (this->tc_queue_, node);
 
       ACE_Unbounded_Queue<AST_Type *> recursion_queue;
+      recursion_queue.enqueue_tail (node);
       if (qnode
-        && member_type->in_recursion (recursion_queue))
+        &&
+          member_type->in_recursion (recursion_queue))
         {
           this->is_recursive_ = true;
         }
+*/
     }
 
   return 0;
diff --git a/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp b/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
index a8e6cebdbe2..ace5a6a1ba6 100644
--- a/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
+++ b/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
@@ -33,11 +33,10 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
     this->queue_lookup (this->tc_queue_, node);
 
   ACE_Unbounded_Queue<AST_Type *> recursion_queue;
-  if (qnode
-      && node->in_recursion (recursion_queue))
+  bool in_recursion = node->in_recursion (recursion_queue);
+  if (qnode && in_recursion)
     {
-      this->is_recursive_ = true;
-
+      // we're repeated and we're recursive so just leave
       return 0;
     }
   else if (this->queue_insert (this->tc_queue_, node, 0) == 0)
@@ -54,13 +53,16 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
       return 0;
     }
 
+  // as this was no nested visit mark this typecode as recursive
+  this->is_recursive_ = in_recursion;
+
   this->is_nested_ = true;
 
   TAO_OutStream & os = *this->ctx_->stream ();
 
-  os << be_nl << be_nl
+  os << be_nl_2
      << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   if (this->gen_member_typecodes (node) != 0)
     {
@@ -211,15 +213,20 @@ TAO::be_visitor_value_typecode::gen_member_typecodes (be_valuetype * node)
           return -1;
         }
 
+/*  MCO@20101020 - this is unnecessary since the check for recursiveness
+ *  of *this* typecode has already been done before calling this method
+
       be_visitor_typecode_defn::QNode const * const qnode =
         this->queue_lookup (this->tc_queue_, node);
 
       ACE_Unbounded_Queue<AST_Type *> recursion_queue;
+      recursion_queue.enqueue_tail (node);
       if (qnode
         && member_type->in_recursion (recursion_queue))
         {
           this->is_recursive_ = true;
         }
+*/
     }
 
   return 0;
diff --git a/TAO_IDL/be/be_visitor_typedef.cpp b/TAO_IDL/be/be_visitor_typedef.cpp
index 70f5d759a58..bbb83ef1c9c 100644
--- a/TAO_IDL/be/be_visitor_typedef.cpp
+++ b/TAO_IDL/be/be_visitor_typedef.cpp
@@ -49,6 +49,3 @@
 #include "be_visitor_typedef/any_op_cs.cpp"
 #include "be_visitor_typedef/cdr_op_ch.cpp"
 #include "be_visitor_typedef/cdr_op_cs.cpp"
-#include "be_visitor_typedef/serializer_op_ch.cpp"
-#include "be_visitor_typedef/serializer_op_cs.cpp"
-
diff --git a/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp b/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp
deleted file mode 100644
index 79c90ed799b..00000000000
--- a/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-// ***************************************************************************
-// Typedef visitor for generating Serializer operator declarations in the client header
-// ***************************************************************************
-
-be_visitor_typedef_serializer_op_ch::be_visitor_typedef_serializer_op_ch (
-    be_visitor_context *ctx
-  )
-  : be_visitor_typedef (ctx)
-{
-}
-
-be_visitor_typedef_serializer_op_ch::~be_visitor_typedef_serializer_op_ch (void)
-{
-}
-
-int
-be_visitor_typedef_serializer_op_ch::visit_typedef (be_typedef *node)
-{
-  if (node->cli_hdr_serializer_op_gen () || node->imported ())
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // Generate the Serializer << and >> operator declarations.
-  os->indent ();
-
-  // In general, we may have a chain of typedefs. i.e.,
-  // typedef sequence<long> X;
-  // typedef X Y;
-  // typedef Y Z; and so on
-  // The first time we will be in will be for node Z for which the code
-  // generation has to take place. However, it is not enough to just generate
-  // code that looks like -
-  // typedef Y Z;
-  // For different types (in this case we have a sequence), we will need
-  // typedefs for the _var and _out types for Z. If it had been an array, we
-  // will additionally have the _forcdr type as well as inlined *_alloc, _dup,
-  // and _free methods.
-  //
-  // Finally, we need to differentiate between the case where we were
-  // generating code for
-  // typedef sequence<long> X; and
-  // typedef Y Z; where Y was somehow aliased to the sequence. In the former
-  // case, we will need to generate all the code for sequence<long> or whatever
-  // the type maybe. In the latter, we just need typedefs for the type and all
-  // associated _var, _out, and other types.
-
-  be_type *bt = 0; // base type
-
-  if (this->ctx_->tdef ())
-    {
-      // The fact that we are here indicates that we were generating code for a
-      // typedef node whose base type also happens to be another typedef-ed
-      // (i.e. an alias) node for another (possibly alias) node.
-
-      this->ctx_->alias (node); // save this alias
-
-      // Grab the most primitive base type in the chain to avoid recusrsively
-      // going thru this visit method.
-      bt = node->primitive_base_type ();
-
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_ch::"
-                             "visit_typedef - "
-                             "bad primitive base type\n"),
-                            -1);
-        }
-
-      // Accept on this base type, but generate code for the typedef node.
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_ch::"
-                             "visit_typedef - "
-                             "failed to accept visitor\n"),
-                            -1);
-        }
-
-      this->ctx_->alias (0); // reset
-    }
-  else
-    {
-      // The context has not stored cdr "tdef" node. So we must be in here for
-      // the first time.
-      this->ctx_->tdef (node); // save the typedef node
-
-      // Grab the immediate base type node.
-      bt = be_type::narrow_from_decl (node->base_type ());
-
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_ch::"
-                             "visit_typedef - "
-                             "bad base type\n"),
-                            -1);
-        }
-
-      // Accept on this base type, but generate code for the typedef node.
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_ch::"
-                             "visit_typedef - "
-                             "failed to accept visitor\n"),
-                            -1);
-        }
-
-      this->ctx_->tdef (0);
-    }
-
-  node->cli_hdr_serializer_op_gen (1);
-  return 0;
-}
-
-int
-be_visitor_typedef_serializer_op_ch::visit_array (be_array *node)
-{
-  be_type *bt = 0;
-
-  if (this->ctx_->alias ())
-    {
-      bt = this->ctx_->alias ();
-    }
-  else
-    {
-      bt = node;
-    }
-
-  if (!bt->imported () &&
-      bt->node_type () == AST_Decl::NT_array)
-    {
-      // Let the base class visitor handle this case.
-      if (this->be_visitor_typedef::visit_array (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_ch::"
-                             "visit_array - "
-                             "base class visitor failed\n"),
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_typedef_serializer_op_ch::visit_enum (be_enum *node)
-{
-  be_type *bt = 0;
-
-  if (this->ctx_->alias ())
-    {
-      bt = this->ctx_->alias ();
-    }
-  else
-    {
-      bt = node;
-    }
-
-  if (bt->node_type () == AST_Decl::NT_enum)
-    {
-      // Let the base class visitor handle this case.
-      if (this->be_visitor_typedef::visit_enum (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_ch::"
-                             "visit_enum - "
-                             "base class visitor failed\n"),
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_typedef_serializer_op_ch::visit_sequence (be_sequence *node)
-{
-  be_type *bt = 0;
-
-  if (this->ctx_->alias ())
-    {
-      bt = this->ctx_->alias ();
-    }
-  else
-    {
-      bt = node;
-    }
-
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      // Let the base class visitor handle this case.
-      if (this->be_visitor_typedef::visit_sequence (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_ch::"
-                             "visit_sequence - "
-                             "base class visitor failed\n"),
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_typedef_serializer_op_ch::visit_structure (be_structure *node)
-{
-  be_type *bt = 0;
-
-  if (this->ctx_->alias ())
-    {
-      bt = this->ctx_->alias ();
-    }
-  else
-    {
-      bt = node;
-    }
-
-  if (bt->node_type () == AST_Decl::NT_struct)
-    {
-      // Let the base class visitor handle this case.
-      if (this->be_visitor_typedef::visit_structure (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_ch::"
-                             "visit_structure - "
-                             "base class visitor failed\n"),
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_typedef_serializer_op_ch::visit_union (be_union *node)
-{
-  be_type *bt = 0;
-
-  if (this->ctx_->alias ())
-    {
-      bt = this->ctx_->alias ();
-    }
-  else
-    {
-      bt = node;
-    }
-
-  if (bt->node_type () == AST_Decl::NT_union)
-    {
-      // Let the base class visitor handle this case.
-      if (this->be_visitor_typedef::visit_union (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_op_ch::"
-                             "visit_union - "
-                             "base class visitor failed\n"),
-                            -1);
-        }
-    }
-
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp b/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp
deleted file mode 100644
index 49bc1b62232..00000000000
--- a/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-// ***************************************************************************
-// Typedef visitor for generating Serializer operator declarations in the client
-// stubs file
-// ***************************************************************************
-
-be_visitor_typedef_serializer_op_cs::be_visitor_typedef_serializer_op_cs (
-    be_visitor_context *ctx
-  )
-  : be_visitor_typedef (ctx)
-{
-}
-
-be_visitor_typedef_serializer_op_cs::~be_visitor_typedef_serializer_op_cs (void)
-{
-}
-
-int
-be_visitor_typedef_serializer_op_cs::visit_typedef (be_typedef *node)
-{
-  if (node->cli_stub_serializer_op_gen () || node->imported ())
-    {
-      return 0;
-    }
-
-  // In general, we may have a chain of typedefs. i.e.,
-  // typedef sequence<long> X;
-  // typedef X Y;
-  // typedef Y Z; and so on
-  // The first time we will be in will be for node Z for which the code
-  // generation has to take place. However, it is not enough to just generate
-  // code that looks like -
-  // typedef Y Z;
-  // For different types (in this case we have a sequence), we will need
-  // typedefs for the _var and _out types for Z. If it had been an array, we
-  // will additionally have the _forcdr type as well as inlined *_alloc, _dup,
-  // and _free methods.
-  //
-  // Finally, we need to differentiate between the case where we were
-  // generating code for
-  // typedef sequence<long> X; and
-  // typedef Y Z; where Y was somehow aliased to the sequence. In the former
-  // case, we will need to generate all the code for sequence<long> or whatever
-  // the type maybe. In the latter, we just need typedefs for the type and all
-  // associated _var, _out, and other types.
-
-  be_type *bt = 0; // base type
-
-  if (this->ctx_->tdef ())
-    {
-      // the fact that we are here indicates that we were generating code for a
-      // typedef node whose base type also happens to be another typedef-ed
-      // (i.e. an alias) node for another (possibly alias) node
-
-      this->ctx_->alias (node); // save this alias
-
-      // grab the most primitive base type in the chain to avoid recusrsively
-      // going thru this visit method
-      bt = node->primitive_base_type ();
-
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_cs::"
-                             "visit_typedef - "
-                             "bad primitive base type\n"),
-                            -1);
-        }
-
-      // accept on this base type, but generate code for the typedef node
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_cs::"
-                             "visit_typedef - "
-                             "failed to accept visitor\n"),
-                            -1);
-        }
-
-      this->ctx_->alias (0); // reset
-    }
-  else
-    {
-      // the context has not stored cdr "tdef" node. So we must be in here for
-      // the first time
-      this->ctx_->tdef (node); // save the typedef node
-
-      // grab the immediate base type node
-      bt = be_type::narrow_from_decl (node->base_type ());
-
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_cs::"
-                             "visit_typedef - "
-                             "bad base type\n"),
-                            -1);
-        }
-
-      // accept on this base type, but generate code for the typedef node
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_cs::"
-                             "visit_typedef - "
-                             "failed to accept visitor\n"),
-                            -1);
-        }
-
-      this->ctx_->tdef (0); // reset
-    }
-
-  node->cli_stub_serializer_op_gen (1);
-  return 0;
-}
-
-int
-be_visitor_typedef_serializer_op_cs::visit_array (be_array *node)
-{
-  be_type *bt = 0;
-
-  if (this->ctx_->alias ()) // typedef of a typedef
-    {
-      bt = this->ctx_->alias ();
-    }
-  else
-    {
-      bt = node;
-    }
-
-  if (!bt->imported () &&
-      bt->node_type () == AST_Decl::NT_array) // direct typedef of a base node
-                                              // type
-    {
-      // let the base class visitor handle this case
-      if (this->be_visitor_typedef::visit_array (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_cs::"
-                             "visit_array - "
-                             "base class visitor failed\n"),
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_typedef_serializer_op_cs::visit_sequence (be_sequence *node)
-{
-  be_type *bt = 0;
-
-  if (this->ctx_->alias ()) // typedef of a typedef
-    {
-      bt = this->ctx_->alias ();
-    }
-  else
-    {
-      bt = node;
-    }
-
-  if (bt->node_type () == AST_Decl::NT_sequence) // direct typedef of a base node
-                                              // type
-    {
-      // let the base class visitor handle this case
-      if (this->be_visitor_typedef::visit_sequence (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_cs::"
-                             "visit_sequence - "
-                             "base class visitor failed\n"),
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_typedef_serializer_op_cs::visit_structure (be_structure *node)
-{
-  be_type *bt = 0;
-
-  if (this->ctx_->alias ()) // typedef of a typedef
-    {
-      bt = this->ctx_->alias ();
-    }
-  else
-    {
-      bt = node;
-    }
-
-  if (bt->node_type () == AST_Decl::NT_struct) // direct typedef of a base node
-                                              // type
-    {
-      // let the base class visitor handle this case
-      if (this->be_visitor_typedef::visit_structure (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_cs::"
-                             "visit_structure - "
-                             "base class visitor failed\n"),
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_typedef_serializer_op_cs::visit_union (be_union *node)
-{
-  be_type *bt = 0;
-
-  if (this->ctx_->alias ()) // typedef of a typedef
-    {
-      bt = this->ctx_->alias ();
-    }
-  else
-    {
-      bt = node;
-    }
-
-  if (bt->node_type () == AST_Decl::NT_union) // direct typedef of a base node
-                                              // type
-    {
-      // let the base class visitor handle this case
-      if (this->be_visitor_typedef::visit_union (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_serializer_op_cs::"
-                             "visit_union - "
-                             "base class visitor failed\n"),
-                            -1);
-        }
-    }
-
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_typedef/typedef.cpp b/TAO_IDL/be/be_visitor_typedef/typedef.cpp
index f8ae13522e2..309ac5209a8 100644
--- a/TAO_IDL/be/be_visitor_typedef/typedef.cpp
+++ b/TAO_IDL/be/be_visitor_typedef/typedef.cpp
@@ -89,24 +89,12 @@ be_visitor_typedef::visit_array (be_array *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-      {
-        be_visitor_array_serializer_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
-      {
-        be_visitor_array_serializer_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_typedef::"
                            "visit_array - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
     }
@@ -116,7 +104,7 @@ be_visitor_typedef::visit_array (be_array *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_typedef::"
                          "visit_array - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -171,18 +159,6 @@ be_visitor_typedef::visit_enum (be_enum *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-      {
-        be_visitor_enum_serializer_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
-      {
-        be_visitor_enum_serializer_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     case TAO_CodeGen::TAO_ROOT_CI:
       return 0; // nothing to be done
     default:
@@ -190,7 +166,7 @@ be_visitor_typedef::visit_enum (be_enum *node)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_typedef::"
                            "visit_enum - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
     }
@@ -200,7 +176,7 @@ be_visitor_typedef::visit_enum (be_enum *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_typedef::"
                          "visit_enum - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -259,24 +235,12 @@ be_visitor_typedef::visit_sequence (be_sequence *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-      {
-        be_visitor_sequence_serializer_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
-      {
-        be_visitor_sequence_serializer_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_typedef::"
                            "visit_sequence - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
     }
@@ -286,7 +250,7 @@ be_visitor_typedef::visit_sequence (be_sequence *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_typedef::"
                          "visit_sequence - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -348,24 +312,12 @@ be_visitor_typedef::visit_structure (be_structure *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-      {
-        be_visitor_structure_serializer_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
-      {
-        be_visitor_structure_serializer_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_typedef::"
                            "visit_structure - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
     }
@@ -375,7 +327,7 @@ be_visitor_typedef::visit_structure (be_structure *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_typedef::"
                          "visit_structure - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -436,24 +388,12 @@ be_visitor_typedef::visit_union (be_union *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-      {
-        be_visitor_union_serializer_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
-      {
-        be_visitor_union_serializer_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_typedef::"
                            "visit_union - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
     }
@@ -463,7 +403,7 @@ be_visitor_typedef::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_typedef::"
                          "visit_union - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
diff --git a/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp b/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
index 7dd6f451f11..1eb04106115 100644
--- a/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
+++ b/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
@@ -174,8 +174,8 @@ be_visitor_typedef_ch::visit_array (be_array *node)
     }
   else
     {
-      *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+          << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
       // Base type is simply an alias to an array node. Simply output the
       // required typedefs.
@@ -285,8 +285,8 @@ be_visitor_typedef_ch::visit_enum (be_enum *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // typedef the type and the _slice type.
   *os << "typedef " << bt->nested_type_name (scope)
@@ -316,8 +316,8 @@ be_visitor_typedef_ch::visit_interface (be_interface *node)
       bt = node;
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Typedef the object.
   *os << "typedef " << bt->nested_type_name (scope) << " "
@@ -365,8 +365,8 @@ be_visitor_typedef_ch::visit_predefined_type (be_predefined_type *node)
       bt = node;
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Typedef the type.
   *os << "typedef " << bt->nested_type_name (scope)
@@ -399,8 +399,8 @@ be_visitor_typedef_ch::visit_string (be_string *node)
   be_typedef *tdef = this->ctx_->tdef ();
   be_decl *scope = this->ctx_->scope ()->decl ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   if (node->width () == (long) sizeof (char))
     {
@@ -458,8 +458,8 @@ be_visitor_typedef_ch::visit_sequence (be_sequence *node)
     }
   else
     {
-      *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+          << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
       // Typedef the type.
       *os << "typedef " << bt->nested_type_name (scope)
@@ -511,8 +511,8 @@ be_visitor_typedef_ch::visit_structure (be_structure *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Typedef the type.
   *os << "typedef " << bt->nested_type_name (scope)
@@ -557,8 +557,8 @@ be_visitor_typedef_ch::visit_union (be_union *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Typedef the type.
   *os << "typedef " << bt->nested_type_name (scope)
@@ -590,8 +590,8 @@ be_visitor_typedef_ch::visit_valuebox (be_valuebox *node)
       bt = node;
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Typedef the object.
   *os << "typedef " << bt->nested_type_name (scope) << " "
@@ -626,8 +626,8 @@ be_visitor_typedef_ch::visit_valuetype (be_valuetype *node)
       bt = node;
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Typedef the object.
   *os << "typedef " << bt->nested_type_name (scope) << " "
diff --git a/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp b/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
index d2f6606070e..d7965f5ddee 100644
--- a/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
+++ b/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
@@ -175,7 +175,7 @@ be_visitor_typedef_ci::visit_array (be_array *node)
       *os << tdef->name () << "_alloc (void)" << be_nl;
       *os << "{" << be_idt_nl;
       *os << "return " << bt->name () << "_alloc ();" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
+      *os << "}" << be_nl_2;
 
       // dup method
       *os << "ACE_INLINE " << be_nl
@@ -186,7 +186,7 @@ be_visitor_typedef_ci::visit_array (be_array *node)
           << ")" << be_uidt_nl;
       *os << "{" << be_idt_nl;
       *os << "return " << bt->name () << "_dup (_tao_src);" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
+      *os << "}" << be_nl_2;
 
       // copy method
       *os << "ACE_INLINE" << be_nl
@@ -198,7 +198,7 @@ be_visitor_typedef_ci::visit_array (be_array *node)
           << ")" << be_uidt_nl;
       *os << "{" << be_idt_nl;
       *os << bt->name () << "_copy (_tao_dest, _tao_src);" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
+      *os << "}" << be_nl_2;
 
       // free method
       *os << "ACE_INLINE" << be_nl
@@ -208,7 +208,7 @@ be_visitor_typedef_ci::visit_array (be_array *node)
           << ")" << be_uidt_nl;
       *os << "{" << be_idt_nl;
       *os << bt->name () << "_free (_tao_src);" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
+      *os << "}" << be_nl_2;
     }
 
   bt->cli_inline_gen (true);
diff --git a/TAO_IDL/be/be_visitor_union.cpp b/TAO_IDL/be/be_visitor_union.cpp
index 5304f511c3f..45d36b6c5bf 100644
--- a/TAO_IDL/be/be_visitor_union.cpp
+++ b/TAO_IDL/be/be_visitor_union.cpp
@@ -44,6 +44,3 @@
 #include "be_visitor_union/any_op_cs.cpp"
 #include "be_visitor_union/cdr_op_ch.cpp"
 #include "be_visitor_union/cdr_op_cs.cpp"
-#include "be_visitor_union/serializer_op_ch.cpp"
-#include "be_visitor_union/serializer_op_cs.cpp"
-
diff --git a/TAO_IDL/be/be_visitor_union/any_op_ch.cpp b/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
index 1de1131be30..a7fa30a73c1 100644
--- a/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
@@ -40,11 +40,11 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   be_module *module = 0;
-  
+
   AST_Decl *decl = node;
   if (decl->is_nested ())
     {
@@ -67,14 +67,14 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
                                  "Error parsing nested name\n"),
                                 -1);
             }
-          
+
           // Some compilers handle "any" operators in a namespace
           // corresponding to their module, others do not.
           *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
-          
+
           be_util::gen_nested_namespace_begin (os, module);
-          
-  
+
+
           *os << macro << " void operator<<= (::CORBA::Any &, const ::" << node->name ()
               << " &); // copying version" << be_nl;
           *os << macro << " void operator<<= (::CORBA::Any &, ::" << node->name ()
@@ -83,17 +83,17 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
               << node->name () << " *&); // deprecated\n";
           *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ::"
               << node->name () << " *&);";
-          
+
           be_util::gen_nested_namespace_end (os, module);
-          
+
           // Emit #else.
-          *os << be_nl << be_nl
+          *os << be_nl_2
               << "#else\n\n";
         }
     }
 
   *os << be_global->core_versioning_begin () << be_nl;
-  
+
   *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
       << " &); // copying version" << be_nl;
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
@@ -110,6 +110,30 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
       *os << "\n\n#endif";
     }
 
+  be_visitor_context ctx (*this->ctx_);
+  for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_localtypes);
+       !si.is_done ();
+       si.next ())
+    {
+      AST_Decl *d = si.item ();
+
+      be_enum *e = be_enum::narrow_from_decl (d);
+      if (e != 0)
+        {
+          be_visitor_enum_any_op_ch visitor (&ctx);
+
+          if (e->accept (&visitor) == -1)
+            {
+              ACE_ERROR ((LM_ERROR,
+                          "(%N:%l) be_visitor_union_any_op_ch::visit_union"
+                          " - codegen for enum failed\n"));
+            }
+
+          // Restore the union node in the enum visitor's context.
+          ctx.node (this->ctx_->node ());
+        }
+    }
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
index e70f3b780a7..48c76f9ee74 100644
--- a/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
@@ -40,9 +40,9 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -54,7 +54,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
   // type is inserted into an Any and then marshaled.
   if (node->is_local ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "namespace TAO" << be_nl
           << "{" << be_idt_nl
           << "template<>" << be_nl
@@ -65,7 +65,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
           << "return false;" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "template<>" << be_nl
           << "::CORBA::Boolean" << be_nl
           << "Any_Dual_Impl_T<" << node->name ()
@@ -93,7 +93,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       if (decl->defined_in ()->scope_node_type () == AST_Decl::NT_module)
         {
           module = be_module::narrow_from_scope (decl->defined_in ());
-          
+
           if (!module)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
@@ -128,7 +128,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
               << "::" << node->tc_name () << "," << be_nl
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           // Non-copying insertion.
           *os << "// Non-copying insertion." << be_nl
@@ -144,7 +144,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
               << "::" << node->tc_name () << "," << be_nl
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           // Extraction to non-const pointer (deprecated, just calls the other).
           *os << "// Extraction to non-const pointer (deprecated)." << be_nl
@@ -157,7 +157,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
               << "const ::" << node->name () << " *&> (" << be_nl
               << "_tao_elem" << be_uidt_nl
               << ");" << be_uidt << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           // Extraction to const pointer.
           *os << "// Extraction to const pointer." << be_nl
@@ -177,10 +177,10 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
               << "}";
 
           be_util::gen_nested_namespace_end (os, module);
-      
+
           // Emit #else.
-          *os << be_nl << be_nl
-              << "#else\n";          
+          *os << be_nl_2
+              << "#else\n";
         }
     }
 
@@ -205,7 +205,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << node->tc_name () << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Non-copying insertion.
   *os << "// Non-copying insertion." << be_nl
@@ -221,7 +221,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << node->tc_name () << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Extraction to non-const pointer (deprecated, just calls the other).
   *os << "// Extraction to non-const pointer (deprecated)." << be_nl
@@ -234,7 +234,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << "const " << node->name () << " *&> (" << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Extraction to const pointer.
   *os << "// Extraction to const pointer." << be_nl
@@ -260,6 +260,30 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       *os << "\n\n#endif";
     }
 
+  be_visitor_context ctx (*this->ctx_);
+  for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_localtypes);
+       !si.is_done ();
+       si.next ())
+    {
+      AST_Decl *d = si.item ();
+
+      be_enum *e = be_enum::narrow_from_decl (d);
+      if (e != 0)
+        {
+          be_visitor_enum_any_op_cs visitor (&ctx);
+
+          if (e->accept (&visitor) == -1)
+            {
+              ACE_ERROR ((LM_ERROR,
+                          "(%N:%l) be_visitor_union_any_op_cs::visit_union"
+                          " - codegen for enum failed\n"));
+            }
+
+          // Restore the union node in the enum visitor's context.
+          ctx.node (this->ctx_->node ());
+        }
+    }
+
   // All we have to do is to visit the scope and generate code.
   if (this->visit_scope (node) == -1)
     {
diff --git a/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp b/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
index 3330928c7e0..89b1da64c2d 100644
--- a/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
@@ -32,8 +32,8 @@ be_visitor_union_cdr_op_ch::~be_visitor_union_cdr_op_ch (void)
 int
 be_visitor_union_cdr_op_ch::visit_union (be_union *node)
 {
-  if (node->cli_hdr_cdr_op_gen () 
-      || node->imported () 
+  if (node->cli_hdr_cdr_op_gen ()
+      || node->imported ()
       || node->is_local ())
     {
       return 0;
@@ -41,8 +41,8 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -65,12 +65,36 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *node)
   // Set the substate as generating code for the types defined in our scope.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE);
 
+  be_visitor_context ctx (*this->ctx_);
+  for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_localtypes);
+       !si.is_done ();
+       si.next ())
+    {
+      AST_Decl *d = si.item ();
+
+      be_enum *e = be_enum::narrow_from_decl (d);
+      if (e != 0)
+        {
+          be_visitor_enum_cdr_op_ch visitor (&ctx);
+
+          if (e->accept (&visitor) == -1)
+            {
+              ACE_ERROR ((LM_ERROR,
+                          "(%N:%l) be_visitor_union_cdr_op_ch::visit_union"
+                          " - codegen for enum failed\n"));
+            }
+
+          // Restore the union node in the enum visitor's context.
+          ctx.node (this->ctx_->node ());
+        }
+    }
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_cdr_op_ch::"
                          "visit_union - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
diff --git a/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp b/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
index 8037b830cc5..c133d58d283 100644
--- a/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
@@ -43,6 +43,30 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
   // Set the substate as generating code for the types defined in our scope
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE);
 
+  be_visitor_context ctx (*this->ctx_);
+  for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_localtypes);
+       !si.is_done ();
+       si.next ())
+    {
+      AST_Decl *d = si.item ();
+
+      be_enum *e = be_enum::narrow_from_decl (d);
+      if (e != 0)
+        {
+          be_visitor_enum_cdr_op_cs visitor (&ctx);
+
+          if (e->accept (&visitor) == -1)
+            {
+              ACE_ERROR ((LM_ERROR,
+                          "(%N:%l) be_visitor_union_cdr_op_cs::visit_union"
+                          " - codegen for enum failed\n"));
+            }
+
+          // Restore the union node in the enum visitor's context.
+          ctx.node (this->ctx_->node ());
+        }
+    }
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -54,11 +78,11 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
-  
+
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
 
@@ -94,7 +118,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
   *os << "{" << be_idt_nl
       << "return false;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
-      << "::CORBA::Boolean result = true;" << be_nl << be_nl
+      << "::CORBA::Boolean result = true;" << be_nl_2
       << "switch (_tao_union._d ())" << be_nl
       << "{" << be_idt;
 
@@ -119,9 +143,9 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
       *os << "break;"<< be_uidt;
     }
 
-  *os << be_uidt_nl << "}" << be_nl << be_nl
+  *os << be_uidt_nl << "}" << be_nl_2
       << "return result;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Set the substate as generating code for the input operator.
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
@@ -164,7 +188,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
   *os << "{" << be_idt_nl
       << "return false;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
-      << "::CORBA::Boolean result = true;" << be_nl << be_nl
+      << "::CORBA::Boolean result = true;" << be_nl_2
       << "switch (_tao_discriminant)" << be_nl
       << "{" << be_idt;
 
@@ -194,10 +218,10 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
     }
 
   *os << be_uidt_nl
-      << "}" << be_nl << be_nl
+      << "}" << be_nl_2
       << "return result;" << be_uidt_nl
       << "}" << be_nl;
-      
+
   bool use_underscore = (this->ctx_->tdef () == 0);
 
   if (be_global->gen_ostream_operators ())
diff --git a/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp b/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
index 81140ae85ce..588dc198a65 100644
--- a/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
+++ b/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
@@ -70,11 +70,11 @@ be_visitor_union_discriminant_ch::visit_enum (be_enum *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // The set method.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "void _d (" << bt->nested_type_name (bu) << ");" << be_nl;
   // The get method.
   *os << bt->nested_type_name (bu) << " _d (void) const;";
@@ -103,11 +103,11 @@ be_visitor_union_discriminant_ch::visit_predefined_type (be_predefined_type
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // The set method.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "void _d ( " << bt->nested_type_name (bu) << ");" << be_nl;
   // The get method.
   *os << bt->nested_type_name (bu) << " _d (void) const;";
diff --git a/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp b/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
index 3564be6ade1..171d016df82 100644
--- a/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
+++ b/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
@@ -12,7 +12,6 @@
  */
 //=============================================================================
 
-
 // *************************************************************************
 // be_visitor_discriminant_ci - visitor for discriminant in client inline file
 // *************************************************************************
@@ -52,14 +51,14 @@ be_visitor_union_discriminant_ci::visit_enum (be_enum *node)
   if (bu->default_value (dv) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_discriminant_ci::"
-                         "visit_enum - "
-                         "computing default value failed\n"),
+                         ACE_TEXT ("be_visitor_union_discriminant_ci::")
+                         ACE_TEXT ("visit_enum - ")
+                         ACE_TEXT ("computing default value failed\n")),
                         -1);
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   if ((dv.computed_ != 0) && (bu->default_index () == -1))
     {
@@ -71,10 +70,11 @@ be_visitor_union_discriminant_ci::visit_enum (be_enum *node)
           << "{" << be_idt_nl
           << "this->_reset ();" << be_nl
           << "this->disc_ = ";
- 
+
       // We use one of the enum values that isn't used in this
       // union if one is available.
       UTL_ScopedName *sn = node->value_to_name (dv.u.enum_val);
+
       if (sn)
         {
           // The function value_to_name() takes care of adding
@@ -85,9 +85,11 @@ be_visitor_union_discriminant_ci::visit_enum (be_enum *node)
         {
           // Since CORBA defines enums to be 32bits, use -1 as the
           // out-of-bounds value for the _default() function.
-          *os << "(" << bt->name () << ") -1";
+          *os << "static_cast <" << bt->name () << "> (-1)";
         }
-      *os << ";" << be_uidt_nl << "}" << be_nl << be_nl;
+
+      *os << ";" << be_uidt_nl
+          << "}" << be_nl_2;
     }
 
   // the set method
@@ -98,7 +100,7 @@ be_visitor_union_discriminant_ci::visit_enum (be_enum *node)
       << " discval)" << be_nl
       << "{" << be_idt_nl
       << "this->disc_ = discval;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // the get method
   *os << "// Accessor to get the discriminant." << be_nl
@@ -139,14 +141,14 @@ be_visitor_union_discriminant_ci::visit_predefined_type (
   if (bu->default_value (dv) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_discriminant_ci::"
-                         "visit_enum - "
-                         "computing default value failed\n"),
+                         ACE_TEXT ("be_visitor_union_discriminant_ci::")
+                         ACE_TEXT ("visit_enum - ")
+                         ACE_TEXT ("computing default value failed\n")),
                         -1);
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   if ((dv.computed_ != 0) && (bu->default_index () == -1))
     {
@@ -164,49 +166,43 @@ be_visitor_union_discriminant_ci::visit_predefined_type (
         {
         case AST_Expression::EV_short:
           *os << dv.u.short_val;
-
           break;
         case AST_Expression::EV_ushort:
           *os << dv.u.ushort_val;
-
           break;
         case AST_Expression::EV_long:
           *os << dv.u.long_val;
-
           break;
         case AST_Expression::EV_ulong:
           *os << dv.u.ulong_val;
-
           break;
         case AST_Expression::EV_char:
           os->print ("'\\%o'", dv.u.char_val);
           break;
         case AST_Expression::EV_bool:
           *os << (dv.u.bool_val == 0 ? "false" : "true");
-
           break;
         case AST_Expression::EV_longlong:
           *os << dv.u.longlong_val;
-
           break;
         case AST_Expression::EV_ulonglong:
           *os << dv.u.ulonglong_val;
-
           break;
         default:
           // Error caught earlier.
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_discriminant_ci::"
-                             "visit_predefined_type - "
-                             "bad or unimplemented discriminant type\n"),
-                        -1);
+                             ACE_TEXT ("be_visitor_union_discriminant_ci::")
+                             ACE_TEXT ("visit_predefined_type - ")
+                             ACE_TEXT ("bad or unimplemented ")
+                             ACE_TEXT ("discriminant type\n")),
+                            -1);
         }
 
       *os << ";" << be_uidt_nl << "}";
     }
 
   // The set method.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// Accessor to set the discriminant." << be_nl
       << "ACE_INLINE" << be_nl
       << "void" << be_nl
@@ -214,7 +210,7 @@ be_visitor_union_discriminant_ci::visit_predefined_type (
       << " discval)" << be_nl
       << "{" << be_idt_nl
       << "this->disc_ = discval;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // The get method.
   *os << "// Accessor to get the discriminant." << be_nl
@@ -239,9 +235,9 @@ be_visitor_union_discriminant_ci::visit_typedef (be_typedef *node)
   if (!bt || (bt->accept (this) == -1))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_discriminant_ci::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"),
+                         ACE_TEXT ("be_visitor_union_discriminant_ci::")
+                         ACE_TEXT ("visit_typedef - ")
+                         ACE_TEXT ("Bad primitive type\n")),
                         -1);
     }
 
diff --git a/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp b/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp
deleted file mode 100644
index 9e3f2b37554..00000000000
--- a/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-// ***************************************************************************
-// Union visitor for generating Serializer operator declarations in the client header
-// ***************************************************************************
-
-be_visitor_union_serializer_op_ch::be_visitor_union_serializer_op_ch (
-    be_visitor_context *ctx
-  )
-  : be_visitor_union (ctx)
-{
-}
-
-be_visitor_union_serializer_op_ch::~be_visitor_union_serializer_op_ch (void)
-{
-}
-
-int
-be_visitor_union_serializer_op_ch::visit_union (be_union *node)
-{
-  if (node->cli_hdr_serializer_op_gen () 
-      || node->imported () 
-      || node->is_local ())
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-    //- _dcps_max_marshaled_size(type) method 
-  *os << be_global->stub_export_macro () 
-      << " size_t _dcps_max_marshaled_size (const " 
-      << node->name() << "& _tao_union);" << be_nl;
-  //- _tao_is_bounded_size(type) method 
-  *os << be_global->stub_export_macro () 
-      << " ::CORBA::Boolean _tao_is_bounded_size (const " 
-      << node->name() << "& _tao_union);" << be_nl;
-  //- _dcps_find_size(type) method 
-  *os << be_global->stub_export_macro () 
-      << " size_t _dcps_find_size (const " 
-      << node->name() << "& _tao_union);" << be_nl;
-
-
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator<< (TAO::DCPS::Serializer &, const " << node->name ()
-      << " &);" << be_nl;
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>> (TAO::DCPS::Serializer &, "
-      << node->name () << " &);";
-
-
-  // Set the substate as generating code for the types defined in our scope.
-  this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE);
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_serializer_op_ch::"
-                         "visit_union - "
-                         "codegen for scope failed\n"), 
-                        -1);
-    }
-
-  node->cli_hdr_serializer_op_gen (1);
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp b/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp
deleted file mode 100644
index 082e2e9b5e0..00000000000
--- a/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp
+++ /dev/null
@@ -1,459 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-// ***************************************************************************
-// Union visitor for generating Serializer operator declarations in the client
-// stubs file
-// ***************************************************************************
-
-be_visitor_union_serializer_op_cs::be_visitor_union_serializer_op_cs (
-    be_visitor_context *ctx
-  )
-  : be_visitor_union (ctx)
-{
-}
-
-be_visitor_union_serializer_op_cs::~be_visitor_union_serializer_op_cs (void)
-{
-}
-
-int
-be_visitor_union_serializer_op_cs::visit_union (be_union *node)
-{
-  // already generated and/or we are imported. Don't do anything.
-  if (node->cli_stub_serializer_op_gen ()
-      || node->imported ()
-      || node->is_local ())
-    {
-      return 0;
-    }
-
-  // Set the substate as generating code for the types defined in our scope
-  this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE);
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_serializer_op_cs"
-                         "::visit_union - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  //---------------------------------------------------------------
-  //  Set the sub state as generating code for _dcps_max_marshaled_size.
-  this->ctx_->sub_state(TAO_CodeGen::TAO_MAX_MARSHALED_SIZE);
-
-  *os << "size_t _dcps_max_marshaled_size (" << be_idt << be_idt_nl
-      << "const " << node->name () << " &" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      ;
-  *os << "// do not try getting the _dcps_max_marshaled_size" << be_nl
-      << "// doing so may produce an access violation" << be_nl
-      << "return 100000;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-/*
-      << "size_t max_size = 0;" << be_nl << be_nl;
-
-  *os << "// find the maximum field size." << be_nl;
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_serializer_op_cs::"
-                         "visit_union - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  *os << be_nl << "// now add in the size of the discriminant" << be_nl;
-  switch (node->udisc_type ())
-    {
-      case AST_Expression::EV_bool:
-        *os << "max_size += _dcps_max_marshaled_size ("
-            << "ACE_OutputCDR::from_boolean (_tao_union._d ()));" << be_nl;
-        break;
-      case AST_Expression::EV_char:
-        *os << "max_size += _dcps_max_marshaled_size ("
-            << "ACE_OutputCDR::from_char (_tao_union._d ()));" << be_nl;
-
-        break;
-      case AST_Expression::EV_wchar:
-        *os << "max_size += _dcps_max_marshaled_size ("
-            << "ACE_OutputCDR::from_wchar (_tao_union._d ()));" << be_nl;
-
-        break;
-      default:
-        // no need to cast the other dicriminant types
-        *os << "max_size += _dcps_max_marshaled_size ("
-            << "_tao_union._d ());" << be_nl;
-
-        break;
-    }
-
-  *os << be_nl
-      << "return max_size;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-*/
-
-  //---------------------------------------------------------------
-  //  Set the sub state as generating code for _tao_is_bounded_size.
-  this->ctx_->sub_state(TAO_CodeGen::TAO_IS_BOUNDED_SIZE);
-  *os << "::CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl
-      << "const " << node->name () << " &" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      ;
-  *os << "// Always return false for a union because " << be_nl
-      << "// _dcps_max_marshaled_size may produce an access violation."
-      << be_nl
-      << "return false;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-/*
-      << "CORBA::Boolean is_bounded = true;"
-      << " // all discrimenent types are bounded" << be_nl << be_nl;
-
-  *os << "// bounded if all branches are bounded." << be_nl;
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_serializer_op_cs::"
-                         "visit_union - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  *os << be_nl
-      << "return is_bounded;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-*/
-
-  //---------------------------------------------------------------
-  //  Set the sub state as generating code for _dcps_find_size.
-  this->ctx_->sub_state(TAO_CodeGen::TAO_FIND_SIZE);
-  *os << be_global->stub_export_macro ()
-      << " size_t _dcps_find_size (const "
-      << node->name() << "& _tao_union);" << be_nl;
-
-  *os << "size_t _dcps_find_size (" << be_idt << be_idt_nl
-      << "const " << node->name () << " &_tao_union" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "// all union discriminents are fixed size"
-      <<     "so OK to use _dcps_max_marshaled_size" << be_nl
-      << "size_t result = ";
-
-  switch (node->udisc_type ())
-    {
-      case AST_Expression::EV_bool:
-        *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_boolean (_tao_union._d ()));" << be_nl;
-        break;
-      case AST_Expression::EV_char:
-        *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_char (_tao_union._d ()));" << be_nl;
-        break;
-      case AST_Expression::EV_wchar:
-        *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_wchar (_tao_union._d ()));" << be_nl;
-        break;
-      default:
-        *os << "_dcps_max_marshaled_size (_tao_union._d ());" << be_nl;
-        break;
-    }
-
-  *os << be_nl
-      << "switch (_tao_union._d ())" << be_nl
-      << "{" << be_idt;
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_serializer_op_cs::"
-                         "visit_union - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  // If there is no explicit default case, but there
-  // is an implicit one, and the discriminant is an enum,
-  // we need this to avert warnings in some compilers that
-  // not all case values are included. If there is no
-  // implicit default case, or the discriminator is not
-  // an enum, this does no harm.
-  if (node->gen_empty_default_label ())
-    {
-      *os << be_nl << "default:" << be_idt_nl;
-      *os << "break;"<< be_uidt;
-    }
-
-    *os << be_uidt << be_uidt_nl << "}" << be_nl << be_nl
-      << "return result;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  //---------------------------------------------------------------
-  //  Set the sub state as generating code for the output operator.
-  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
-
-  *os << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl
-      << "TAO::DCPS::Serializer &strm," << be_nl
-      << "const " << node->name () << " &_tao_union" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  switch (node->udisc_type ())
-    {
-      case AST_Expression::EV_bool:
-        *os << "::ACE_OutputCDR::from_boolean tmp (_tao_union._d ());" << be_nl
-            << "if ( !(strm << tmp) )" << be_idt_nl;
-
-        break;
-      case AST_Expression::EV_char:
-        *os << "::ACE_OutputCDR::from_char tmp (_tao_union._d ());" << be_nl
-            << "if ( !(strm << tmp) )" << be_idt_nl;
-
-        break;
-      case AST_Expression::EV_wchar:
-        *os << "::ACE_OutputCDR::from_wchar tmp (_tao_union._d ());" << be_nl
-            << "if ( !(strm << tmp) )" << be_idt_nl;
-
-        break;
-      default:
-        *os << "if ( !(strm << _tao_union._d ()) )" << be_idt_nl;
-
-        break;
-    }
-
-  *os << "{" << be_idt_nl
-      << "return 0;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "::CORBA::Boolean result = true;" << be_nl << be_nl
-      << "switch (_tao_union._d ())" << be_nl
-      << "{" << be_idt;
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_serializer_op_cs::"
-                         "visit_union - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  // If there is no explicit default case, but there
-  // is an implicit one, and the discriminant is an enum,
-  // we need this to avert warnings in some compilers that
-  // not all case values are included. If there is no
-  // implicit default case, or the discriminator is not
-  // an enum, this does no harm.
-  if (node->gen_empty_default_label ())
-    {
-      *os << be_nl << "default:" << be_idt_nl;
-      *os << "break;"<< be_uidt;
-    }
-
-  *os << be_uidt_nl << "}" << be_nl << be_nl
-      << "return result;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  //---------------------------------------------------------------
-  // Set the substate as generating code for the input operator.
-  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
-  *os << "::CORBA::Boolean operator>> (" << be_idt << be_idt_nl
-      << "TAO::DCPS::Serializer &strm," << be_nl
-      << node->name () << " &_tao_union" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  be_type* disc_type =
-    be_type::narrow_from_decl (node->disc_type ());
-
-  // Generate a temporary to store the discriminant
-  *os << disc_type->full_name ()
-      << " " << "_tao_discriminant;" << be_nl;
-
-  switch (node->udisc_type ())
-    {
-      case AST_Expression::EV_bool:
-        *os << "::ACE_InputCDR::to_boolean tmp (_tao_discriminant);" << be_nl
-            << "if ( !(strm >> tmp) )" << be_idt_nl;
-
-        break;
-      case AST_Expression::EV_char:
-        *os << "::ACE_InputCDR::to_char tmp (_tao_discriminant);" << be_nl
-            << "if ( !(strm >> tmp) )" << be_idt_nl;
-
-        break;
-      case AST_Expression::EV_wchar:
-        *os << "::ACE_InputCDR::to_wchar tmp (_tao_discriminant);" << be_nl
-            << "if ( !(strm >> tmp) )" << be_idt_nl;
-
-        break;
-      default:
-        *os << "if ( !(strm >> _tao_discriminant) )" << be_idt_nl;
-
-        break;
-    }
-
-  *os << "{" << be_idt_nl
-      << "return 0;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "::CORBA::Boolean result = true;" << be_nl << be_nl
-      << "switch (_tao_discriminant)" << be_nl
-      << "{" << be_idt;
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_serializer_op_cs::"
-                         "visit_union - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  // If there is no explicit default case, but there
-  // is an implicit one, and the discriminant is an enum,
-  // we need this to avert warnings in some compilers that
-  // not all case values are included. If there is no
-  // implicit default case, or the discriminator is not
-  // an enum, this does no harm.
-  if (node->gen_empty_default_label ())
-    {
-      *os << be_nl;
-      *os << "default:" << be_idt_nl;
-      *os << "_tao_union._default ();" << be_nl;
-      *os << "break;" << be_uidt;
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_nl << be_nl
-      << "return result;" << be_uidt_nl
-      << "}";
-
-  node->cli_stub_serializer_op_gen (1);
-  return 0;
-}
-
-int
-be_visitor_union_serializer_op_cs::pre_process (be_decl *bd)
-{
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      return 0;
-      break;
-
-    case TAO_CodeGen::TAO_FIND_SIZE:
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      {
-  // Enum val nodes are added just to help check reference
-  // clashes, since an enum declared in our scope is not itself
-  // a scope.
-  if (bd->node_type () == AST_Decl::NT_enum_val)
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  be_union_branch* b =
-    be_union_branch::narrow_from_decl (bd);
-
-  *os << be_nl;
-
-  for (unsigned long i = 0; i < b->label_list_length (); ++i)
-    {
-      // check if we are printing the default case
-      if (b->label (i)->label_kind () == AST_UnionLabel::UL_default)
-        {
-          *os << "default:";
-        }
-      else
-        {
-          *os << "case ";
-
-          b->gen_label_value (os, i);
-
-          *os << ":";
-        }
-
-      if (i == (b->label_list_length () - 1))
-        {
-          *os << be_idt_nl;
-        }
-      else
-        {
-          *os << be_nl;
-        }
-    }
-
-  *os << "{" << be_idt_nl;
-      }
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                        "(%N:%l) be_visitor_union_serializer_op_cs::"
-                        "pre_process - "
-                        "bad sub_state.\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_union_serializer_op_cs::post_process (be_decl *bd)
-{
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      return 0;
-      break;
-
-    case TAO_CodeGen::TAO_FIND_SIZE:
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      {
-
-  if (bd->node_type () == AST_Decl::NT_enum_val)
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_uidt_nl << "}" << be_nl
-      << "break;" << be_uidt;
-
-      }
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                        "(%N:%l) be_visitor_union_serializer_op_cs::"
-                        "pre_process - "
-                        "bad sub_state.\n"),
-                        -1);
-    }
-
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_union/union.cpp b/TAO_IDL/be/be_visitor_union/union.cpp
index 7fdb4a0643e..a2d2f06b1fd 100644
--- a/TAO_IDL/be/be_visitor_union/union.cpp
+++ b/TAO_IDL/be/be_visitor_union/union.cpp
@@ -87,24 +87,12 @@ be_visitor_union::visit_union_branch (be_union_branch *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH:
-      {
-        be_visitor_union_branch_serializer_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
-      {
-        be_visitor_union_branch_serializer_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_union::"
                            "visit_union_branch - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
     }
@@ -114,7 +102,7 @@ be_visitor_union::visit_union_branch (be_union_branch *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union::"
                          "visit_union_branch - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -141,8 +129,8 @@ 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.  
+
+  // Could be a type decl.
   if (b == 0)
     {
       return 0;
diff --git a/TAO_IDL/be/be_visitor_union/union_ch.cpp b/TAO_IDL/be/be_visitor_union/union_ch.cpp
index 080347c4782..6ca6420d176 100644
--- a/TAO_IDL/be/be_visitor_union/union_ch.cpp
+++ b/TAO_IDL/be/be_visitor_union/union_ch.cpp
@@ -48,7 +48,7 @@ int be_visitor_union_ch::visit_union (be_union *node)
   // Generate _var and _out class typedefs.
   node->gen_common_varout (os);
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "class " << be_global->stub_export_macro () << " "
       << node->local_name () << be_nl
       << "{" << be_nl
@@ -62,7 +62,7 @@ int be_visitor_union_ch::visit_union (be_union *node)
       << "~" << node->local_name () << " (void);";
 
     // Generate assignment operator.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << node->local_name () << " &operator= (const "
       << node->local_name () << " &);";
 
@@ -123,12 +123,12 @@ int be_visitor_union_ch::visit_union (be_union *node)
 
   if ((dv.computed_ != 0) && (node->default_index () == -1))
     {
-      *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
           << "// " << __FILE__ << ":" << __LINE__;
 
       // Only if all cases are not covered AND there is no explicit
       // default, we get the _default () method.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void _default (void);";
     }
 
@@ -136,8 +136,7 @@ int be_visitor_union_ch::visit_union (be_union *node)
 
   // Now generate the private data members of the union.
   *os << "private:" << be_idt_nl;
-  *os << bt->nested_type_name (node) << " disc_;" << be_nl;
-  *os << bt->nested_type_name (node) << " holder_;" << be_nl << be_nl;
+  *os << bt->nested_type_name (node) << " disc_;" << be_nl_2;
 
   // The members are inside of a union.
   *os << "union" << be_nl;
@@ -159,7 +158,7 @@ int be_visitor_union_ch::visit_union (be_union *node)
   *os << "} u_;";
 
   // The reset method (TAO extension).
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "/// TAO extension - frees any allocated storage." << be_nl;
   *os << "void _reset (void);";
 
diff --git a/TAO_IDL/be/be_visitor_union/union_ci.cpp b/TAO_IDL/be/be_visitor_union/union_ci.cpp
index 9b2805e6c19..de4d7418e46 100644
--- a/TAO_IDL/be/be_visitor_union/union_ci.cpp
+++ b/TAO_IDL/be/be_visitor_union/union_ci.cpp
@@ -38,8 +38,8 @@ int be_visitor_union_ci::visit_union (be_union *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "// *************************************************************"
       << be_nl;
@@ -56,7 +56,7 @@ int be_visitor_union_ci::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_ci::"
                          "visit_union - "
-                         "bad discriminant type\n"), 
+                         "bad discriminant type\n"),
                         -1);
     }
 
@@ -67,7 +67,7 @@ int be_visitor_union_ci::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_ci::"
                          "visit union - "
-                         "codegen for discrminant failed\n"), 
+                         "codegen for discrminant failed\n"),
                         -1);
     }
 
@@ -78,7 +78,7 @@ int be_visitor_union_ci::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_ci::"
                          "visit_union - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
diff --git a/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO_IDL/be/be_visitor_union/union_cs.cpp
index 30be226815e..4e281b1ab79 100644
--- a/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -78,11 +78,11 @@ int be_visitor_union_cs::visit_union (be_union *node)
   // Now generate the operations on the union such as the copy constructor
   // and the assignment operator.
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Generate the copy constructor and the assignment operator here.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << node->name () << "::" << node->local_name () << " (void)" << be_nl
       << "{" << be_idt_nl
       << "ACE_OS::memset (&this->u_, 0, sizeof (this->u_));" << be_nl;
@@ -144,7 +144,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
         }
     }
 
-  *os << be_uidt_nl << "}" << be_nl << be_nl;
+  *os << be_uidt_nl << "}" << be_nl_2;
 
   this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS);
 
@@ -182,14 +182,14 @@ int be_visitor_union_cs::visit_union (be_union *node)
     }
 
   *os << be_uidt_nl << "}" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << node->name () << "::~" << node->local_name ()
       << " (void)" << be_nl
       << "{" << be_idt_nl
       << "// Finalize." << be_nl
       << "this->_reset ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   if (be_global->any_support ())
     {
@@ -201,7 +201,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
           << "static_cast<"
           << node->local_name () << " *> (_tao_void_pointer);" << be_uidt_nl
           << "delete tmp;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
 
   this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS);
@@ -221,7 +221,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
       << "}" << be_uidt_nl << be_nl;
   // Reset and set the discriminant.
   *os << "this->_reset ();" << be_nl;
-  *os << "this->disc_ = u.disc_;" << be_nl << be_nl;
+  *os << "this->disc_ = u.disc_;" << be_nl_2;
   // now switch based on the disc value
   *os << "switch (this->disc_)" << be_nl;
   *os << "{" << be_idt;
@@ -249,9 +249,9 @@ int be_visitor_union_cs::visit_union (be_union *node)
     }
 
   *os << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
   *os << "return *this;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   // The reset method.
   this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_RESET_CS);
diff --git a/TAO_IDL/be/be_visitor_union_branch.cpp b/TAO_IDL/be/be_visitor_union_branch.cpp
index eda97d616d2..82ff2c2de46 100644
--- a/TAO_IDL/be/be_visitor_union_branch.cpp
+++ b/TAO_IDL/be/be_visitor_union_branch.cpp
@@ -50,6 +50,3 @@
 #include "be_visitor_union_branch/public_cs.cpp"
 #include "be_visitor_union_branch/cdr_op_ch.cpp"
 #include "be_visitor_union_branch/cdr_op_cs.cpp"
-#include "be_visitor_union_branch/serializer_op_ch.cpp"
-#include "be_visitor_union_branch/serializer_op_cs.cpp"
-
diff --git a/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp b/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp
index 0df5ee6c9fa..0a42da78f6a 100644
--- a/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp
@@ -39,7 +39,7 @@ be_visitor_union_branch_cdr_op_ch::visit_union_branch (be_union_branch *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_ch::"
                          "visit_union_branch - "
-                         "Bad union_branch type\n"), 
+                         "Bad union_branch type\n"),
                         -1);
     }
 
@@ -50,7 +50,7 @@ be_visitor_union_branch_cdr_op_ch::visit_union_branch (be_union_branch *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_ch::"
                          "visit_union_branch - "
-                         "codegen for union_branch type failed\n"), 
+                         "codegen for union_branch type failed\n"),
                         -1);
     }
 
@@ -79,7 +79,7 @@ be_visitor_union_branch_cdr_op_ch::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_union_branch_cdr_op_ch::"
                              "visit_array - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -104,7 +104,7 @@ be_visitor_union_branch_cdr_op_ch::visit_enum (be_enum *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_union_branch_cdr_op_ch::"
                              "visit_enum - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -128,7 +128,7 @@ be_visitor_union_branch_cdr_op_ch::visit_sequence (be_sequence *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_union_branch_cdr_op_ch::"
                              "visit_sequence - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -152,7 +152,7 @@ be_visitor_union_branch_cdr_op_ch::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_union_branch_cdr_op_ch::"
                              "visit_struct - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -172,7 +172,7 @@ be_visitor_union_branch_cdr_op_ch::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_ch::"
                          "visit_typedef - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     }
 
@@ -196,7 +196,7 @@ be_visitor_union_branch_cdr_op_ch::visit_union (be_union *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_union_branch_cdr_op_ch::"
                              "visit_enum - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
diff --git a/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
index 98af2ab7098..9350aaa83f2 100644
--- a/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
@@ -146,7 +146,7 @@ be_visitor_union_branch_cdr_op_cs::visit_array (be_array *node)
           << be_idt << be_idt_nl
           << "_tao_union_tmp" << be_uidt_nl
           << ");" << be_uidt_nl
-          << "result = strm >> _tao_union_helper;" << be_nl << be_nl
+          << "result = strm >> _tao_union_helper;" << be_nl_2
           << "if (result)" << be_idt_nl
           << "{" << be_idt_nl
           << "_tao_union." << f->local_name ()
@@ -204,7 +204,7 @@ be_visitor_union_branch_cdr_op_cs::visit_enum (be_enum *node)
     case TAO_CodeGen::TAO_CDR_INPUT:
       *os << node->name () << " _tao_union_tmp =" << be_idt_nl
           << "static_cast<" << node->name () << "> (0UL);" << be_uidt_nl
-          << "result = strm >> _tao_union_tmp;" << be_nl << be_nl
+          << "result = strm >> _tao_union_tmp;" << be_nl_2
           << "if (result)" << be_idt_nl
           << "{" << be_idt_nl
           << "_tao_union." << f->local_name ()
@@ -284,7 +284,7 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node)
       else
         {
           *os << node->name () << "_var _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp.inout ();" << be_nl << be_nl
+              << "result = strm >> _tao_union_tmp.inout ();" << be_nl_2
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union."
@@ -364,7 +364,7 @@ be_visitor_union_branch_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node)
       else
         {
           *os << node->name () << "_var _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp.inout ();" << be_nl << be_nl
+              << "result = strm >> _tao_union_tmp.inout ();" << be_nl_2
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union."
@@ -443,7 +443,7 @@ be_visitor_union_branch_cdr_op_cs::emit_valuetype_common (be_type *node)
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
       *os << node->name () << "_var _tao_union_tmp;" << be_nl
-          << "result = strm >> _tao_union_tmp.inout ();" << be_nl << be_nl
+          << "result = strm >> _tao_union_tmp.inout ();" << be_nl_2
           << "if (result)" << be_idt_nl
           << "{" << be_idt_nl
           << "_tao_union."
@@ -507,7 +507,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
         {
           *os << "::CORBA::Object_var _tao_union_tmp;" << be_nl;
 
-          *os << "result = strm >> _tao_union_tmp.out ();" << be_nl << be_nl
+          *os << "result = strm >> _tao_union_tmp.out ();" << be_nl_2
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name () << " (_tao_union_tmp.in ());";
@@ -516,7 +516,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
       else if (pt == AST_PredefinedType::PT_pseudo)
         {
           *os << "::CORBA::TypeCode_var _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp.out ();" << be_nl << be_nl
+              << "result = strm >> _tao_union_tmp.out ();" << be_nl_2
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name () << " (_tao_union_tmp.in ());";
@@ -525,7 +525,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
       else if (pt == AST_PredefinedType::PT_value)
         {
           *os << "::CORBA::ValueBase * _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp;" << be_nl << be_nl
+              << "result = strm >> _tao_union_tmp;" << be_nl_2
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name () << " (_tao_union_tmp);";
@@ -536,7 +536,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
           *os << "::CORBA::Char _tao_union_tmp;" << be_nl
               << "::ACE_InputCDR::to_char _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
-              << "result = strm >> _tao_union_helper;" << be_nl << be_nl
+              << "result = strm >> _tao_union_helper;" << be_nl_2
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name ()
@@ -547,7 +547,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
           *os << "::CORBA::WChar _tao_union_tmp;" << be_nl
               << "::ACE_InputCDR::to_wchar _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
-              << "result = strm >> _tao_union_helper;" << be_nl << be_nl
+              << "result = strm >> _tao_union_helper;" << be_nl_2
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name ()
@@ -558,7 +558,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
           *os << "::CORBA::Octet _tao_union_tmp;" << be_nl
               << "::ACE_InputCDR::to_octet _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
-              << "result = strm >> _tao_union_helper;" << be_nl << be_nl
+              << "result = strm >> _tao_union_helper;" << be_nl_2
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name ()
@@ -569,7 +569,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
           *os << "::CORBA::Boolean _tao_union_tmp;" << be_nl
               << "::ACE_InputCDR::to_boolean _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
-              << "result = strm >> _tao_union_helper;" << be_nl << be_nl
+              << "result = strm >> _tao_union_helper;" << be_nl_2
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name ()
@@ -578,7 +578,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
       else
         {
           *os << node->name () << " _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp;" << be_nl << be_nl
+              << "result = strm >> _tao_union_tmp;" << be_nl_2
               << "if (result)" << be_idt_nl
               << "{" << be_idt_nl
               << "_tao_union." << f->local_name ()
@@ -673,7 +673,7 @@ be_visitor_union_branch_cdr_op_cs::visit_sequence (be_sequence *node)
   // Retrieve the union_branch node.
   be_union_branch *f =
     be_union_branch::narrow_from_decl (this->ctx_->node ());
-    
+
   if (f == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -704,7 +704,7 @@ be_visitor_union_branch_cdr_op_cs::visit_sequence (be_sequence *node)
           }
 
         *os << " _tao_union_tmp;" << be_nl
-            << "result = strm >> _tao_union_tmp;" << be_nl << be_nl
+            << "result = strm >> _tao_union_tmp;" << be_nl_2
             << "if (result)" << be_idt_nl
             << "{" << be_idt_nl
             << "_tao_union."
@@ -774,19 +774,19 @@ be_visitor_union_branch_cdr_op_cs::visit_string (be_string *node)
               *os << "result = strm >> ACE_InputCDR::to_string ("
                   << "_tao_union_tmp.out (), "
                   << node->max_size ()->ev ()->u.ulval << ");"
-                  << be_nl << be_nl;
+                  << be_nl_2;
             }
           else
             {
               *os << "result = strm >> ACE_InputCDR::to_wstring ("
                   << "_tao_union_tmp.out (), "
                   << node->max_size ()->ev ()->u.ulval << ");"
-                  << be_nl << be_nl;
+                  << be_nl_2;
             }
         }
       else
         {
-          *os << "result = strm >> _tao_union_tmp.out ();" << be_nl << be_nl;
+          *os << "result = strm >> _tao_union_tmp.out ();" << be_nl_2;
         }
 
       *os << "if (result)" << be_idt_nl
@@ -882,7 +882,7 @@ be_visitor_union_branch_cdr_op_cs::visit_structure (be_structure *node)
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
       *os << node->name () << " _tao_union_tmp;" << be_nl
-          << "result = strm >> _tao_union_tmp;" << be_nl << be_nl
+          << "result = strm >> _tao_union_tmp;" << be_nl_2
           << "if (result)" << be_idt_nl
           << "{" << be_idt_nl
           << "_tao_union." << f->local_name ()
@@ -980,7 +980,7 @@ be_visitor_union_branch_cdr_op_cs::visit_union (be_union *node)
     case TAO_CodeGen::TAO_CDR_INPUT:
       *os << node->name () << " _tao_union_tmp"
           << ";" << be_nl
-          << "result = strm >> _tao_union_tmp;" << be_nl << be_nl
+          << "result = strm >> _tao_union_tmp;" << be_nl_2
           << "if (result)" << be_idt_nl
           << "{" << be_idt_nl
           << "_tao_union." << f->local_name ()
diff --git a/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp b/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
index 12ff5609cd5..2e3704211ca 100644
--- a/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
+++ b/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
@@ -543,7 +543,7 @@ be_visitor_union_branch_private_ch::visit_structure_fwd (
 {
   be_structure *s =
     be_structure::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_structure (s);
 }
 
@@ -615,7 +615,7 @@ be_visitor_union_branch_private_ch::visit_union_fwd (
 {
   be_union *u =
     be_union::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_union (u);
 }
 
diff --git a/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
index bc33eb7a19a..fe89b58c023 100644
--- a/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
+++ b/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
@@ -769,7 +769,7 @@ be_visitor_union_branch_public_assign_cs::visit_structure_fwd (
 {
   be_structure *s =
     be_structure::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_structure (s);
 }
 
@@ -866,7 +866,7 @@ be_visitor_union_branch_public_assign_cs::visit_union_fwd (
 {
   be_union *u =
     be_union::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_union (u);
 }
 
diff --git a/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
index 3510fbb126f..27dc652a6a2 100644
--- a/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
+++ b/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
@@ -109,12 +109,12 @@ be_visitor_union_branch_public_ch::visit_array (be_array *node)
 
       ctx.state (TAO_CodeGen::TAO_ROOT_CH);
 
-      *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
           << "// " << __FILE__ << ":" << __LINE__;
 
       // Now use this array as a "type" for the subsequent declarator
       // the set method.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void " << ub->local_name () << " ("
           << "_" << bt->local_name () << ");" << be_nl;
       // The get method.
@@ -123,12 +123,12 @@ be_visitor_union_branch_public_ch::visit_array (be_array *node)
     }
   else
     {
-      *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
           << "// " << __FILE__ << ":" << __LINE__;
 
       // Now use this array as a "type" for the subsequent declarator
       // the set method.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void " << ub->local_name () << " ("
           << bt->nested_type_name (bu) << ");"
           << be_nl;
@@ -186,12 +186,12 @@ be_visitor_union_branch_public_ch::visit_enum (be_enum *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Now use this enum as a "type" for the subsequent declarator
   // the set method.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "void " << ub->local_name () << " ("
       << bt->nested_type_name (bu) << ");"
       << be_nl;
@@ -230,11 +230,11 @@ be_visitor_union_branch_public_ch::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Set method.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "void " << ub->local_name () << " ("
       << bt->nested_type_name (bu, "_ptr")
       << ");" << be_nl;
@@ -273,11 +273,11 @@ be_visitor_union_branch_public_ch::visit_interface_fwd (be_interface_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Set method.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "void " << ub->local_name () << " ("
       << bt->nested_type_name (bu, "_ptr")
       << ");" << be_nl;
@@ -316,11 +316,11 @@ be_visitor_union_branch_public_ch::visit_valuebox (be_valuebox *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Set method.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "void " << ub->local_name () << " ("
       << bt->nested_type_name (bu, "*")
       << ");" << be_nl;
@@ -359,11 +359,11 @@ be_visitor_union_branch_public_ch::visit_valuetype (be_valuetype *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Set method.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "void " << ub->local_name () << " ("
       << bt->nested_type_name (bu, "*")
       << ");" << be_nl;
@@ -402,11 +402,11 @@ be_visitor_union_branch_public_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Set method.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "void " << ub->local_name () << " ("
       << bt->nested_type_name (bu, "*")
       << ")" << be_nl;
@@ -446,7 +446,7 @@ be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *no
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   switch (node->pt ())
@@ -454,21 +454,21 @@ be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *no
     case AST_PredefinedType::PT_pseudo:
     case AST_PredefinedType::PT_object:
     case AST_PredefinedType::PT_abstract:
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void " << ub->local_name () << " (const "
           << bt->nested_type_name (bu, "_ptr") << ");" << be_nl;
       *os << bt->nested_type_name (bu, "_ptr") << " "
           << ub->local_name () << " (void) const;";
       break;
     case AST_PredefinedType::PT_value:
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void " << ub->local_name () << " ( "
           << bt->nested_type_name (bu, " *") << ");" << be_nl;
       *os << bt->nested_type_name (bu, " *") << " "
           << ub->local_name () << " (void) const;";
       break;
     case AST_PredefinedType::PT_any:
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void " << ub->local_name () << " (const "
           << bt->nested_type_name (bu) << " &);" << be_nl;
       *os << "const " << bt->nested_type_name (bu) << " &"
@@ -479,7 +479,7 @@ be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *no
     case AST_PredefinedType::PT_void:
       break;
     default:
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void " << ub->local_name () << " ( "
           << bt->nested_type_name (bu) << ");" << be_nl;
       *os << bt->nested_type_name (bu) << " "
@@ -534,21 +534,21 @@ be_visitor_union_branch_public_ch::visit_sequence (be_sequence *node)
                             -1);
         }
 
-      *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
           << "// " << __FILE__ << ":" << __LINE__;
 
       // Generate the anonymous sequence member typedef.
       // This provides a consistent name to use instead of the
       // implementation-specific name.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "typedef " << bt->nested_type_name (bu)
           << " _" << ub->local_name () << "_seq;";
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "void " << ub->local_name () << " (const "
       << bt->nested_type_name (bu) << " &);" << be_nl;
   *os << "const " << bt->nested_type_name (bu) << " &"
@@ -577,13 +577,13 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Three methods to set the string value
   if (node->width () == (long) sizeof (char))
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void " << ub->local_name () << " (char *);" << be_nl;
       *os << "void " << ub->local_name () << " (const char *);"
           << be_nl;
@@ -594,7 +594,7 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node)
     }
   else
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void " << ub->local_name () << " ( ::CORBA::WChar *);" << be_nl;
       *os << "void " << ub->local_name () << " (const ::CORBA::WChar *);"
           << be_nl;
@@ -653,10 +653,10 @@ be_visitor_union_branch_public_ch::visit_structure (be_structure *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "void " << ub->local_name () << " (const "
       << bt->nested_type_name (bu) << " &);" << be_nl
       << "const " << bt->nested_type_name (bu) << " &"
@@ -674,7 +674,7 @@ be_visitor_union_branch_public_ch::visit_structure_fwd (
 {
   be_structure *s =
     be_structure::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_structure (s);
 }
 
@@ -746,10 +746,10 @@ be_visitor_union_branch_public_ch::visit_union (be_union *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "void " << ub->local_name () << " (const "
       << bt->nested_type_name (bu) << " &);" << be_nl
       << "const " << bt->nested_type_name (bu) << " &"
@@ -766,7 +766,7 @@ be_visitor_union_branch_public_ch::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
     be_union::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_union (u);
 }
 
diff --git a/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
index 4c7499eadad..04e9d050ed5 100644
--- a/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
+++ b/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
@@ -154,8 +154,8 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node)
     }
 
   // Set method.
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
@@ -181,7 +181,7 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node)
       << "// Set the value." << be_nl
       << "this->u_." << ub->local_name () << "_ = "
       << fname << "_dup (val);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Get method.
   *os << "/// Retrieve the member." << be_nl
@@ -226,8 +226,8 @@ be_visitor_union_branch_public_ci::visit_enum (be_enum *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Set method.
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
@@ -252,7 +252,7 @@ be_visitor_union_branch_public_ci::visit_enum (be_enum *node)
   *os << ";" << be_nl
       << "// Set the value." << be_nl
       << "this->u_." << ub->local_name () << "_ = val;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Get method.
   *os << "/// Retrieve the member." << be_nl
@@ -297,8 +297,8 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Set method.
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
@@ -342,7 +342,7 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
 
   *os << "duplicate (val)" << be_uidt_nl << ")" << be_uidt << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Get method.
   *os << "/// Retrieve the member." << be_nl
@@ -387,8 +387,8 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Set method.
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
@@ -432,7 +432,7 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
 
   *os << "duplicate (val)" << be_uidt_nl << ")" << be_uidt << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Get method.
   *os << "/// Retrieve the member." << be_nl
@@ -495,8 +495,8 @@ be_visitor_union_branch_public_ci::emit_valuetype_common  (be_type *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Set method.
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
@@ -527,7 +527,7 @@ be_visitor_union_branch_public_ci::emit_valuetype_common  (be_type *node)
       << "this->u_." << ub->local_name () << "_," << be_nl
       << "OBJECT_FIELD (val)" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Get method.
   *os << "/// Retrieve the member." << be_nl
@@ -574,8 +574,8 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Set method.
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
@@ -671,7 +671,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
         break;
     }
 
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   switch (pt)
     {
@@ -724,7 +724,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
             << " (void) const" << be_nl
             << "{" << be_idt_nl
             << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl
-            << "}" << be_nl << be_nl;
+            << "}" << be_nl_2;
 
         // Get method with read/write access
         *os << "/// Retrieve the member." << be_nl
@@ -785,8 +785,8 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // (1) Set from a const.
   *os << "/// Accessor to set the member." << be_nl
@@ -814,7 +814,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
       << "this->u_." << ub->local_name () << "_," << be_nl
       << bt->name () << " (val)" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Readonly get method.
   *os << "/// Readonly get method." << be_nl
@@ -823,7 +823,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
       << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
       << "{" << be_idt_nl
       << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Read/write get method.
   *os << "/// Read/write get method." << be_nl
@@ -859,8 +859,8 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node)
   // Three methods to set the string value.
 
   // (1) Set method from char* or wchar*.
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
@@ -894,7 +894,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node)
 
   *os << ";" << be_nl
       << "this->u_." << ub->local_name () << "_ = val;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // (2) Set method from const char * or const wchar *.
   *os << "// Accessor to set the member." << be_nl
@@ -932,12 +932,12 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node)
   if (node->width () == (long) sizeof (char))
     {
       *os << "::CORBA::string_dup (val);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
   else
     {
       *os << "::CORBA::wstring_dup (val);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
 
   // (3) Set from const String_var& or WString_var&
@@ -985,7 +985,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node)
   *os << "_var = val;" << be_nl
       << "this->u_." << ub->local_name () << "_ = "
       << ub->local_name () << "_var._retn ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "ACE_INLINE" << be_nl;
 
@@ -1062,8 +1062,8 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // (1) Set from a const.
   *os << "/// Accessor to set the member." << be_nl
@@ -1101,7 +1101,7 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node)
       *os << "this->u_." << ub->local_name () << "_ = val;" << be_uidt_nl;
     }
 
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   // Readonly get method.
   *os << "// Readonly get method." << be_nl
@@ -1120,7 +1120,7 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node)
       *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
     }
 
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   // Read/write get method.
   *os << "// Read/write get method." << be_nl
@@ -1149,7 +1149,7 @@ be_visitor_union_branch_public_ci::visit_structure_fwd (be_structure_fwd *node)
 {
   be_structure *s =
     be_structure::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_structure (s);
 }
 
@@ -1229,8 +1229,8 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // (1) Set from a const.
   *os << "// Accessor to set the member." << be_nl
@@ -1258,7 +1258,7 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node)
       << "this->u_." << ub->local_name () << "_," << be_nl
       << bt->name () << " (val)" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Readonly get method.
   *os << "// Readonly get method." << be_nl
@@ -1267,7 +1267,7 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node)
       << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
       << "{" << be_idt_nl
       << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Read/write get method.
   *os << "// Read/write get method." << be_nl
@@ -1286,7 +1286,7 @@ be_visitor_union_branch_public_ci::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
     be_union::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_union (u);
 }
 
diff --git a/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp b/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp
index 8d55e433c9f..f47b7aaf645 100644
--- a/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp
+++ b/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp
@@ -264,7 +264,7 @@ be_visitor_union_branch_public_constructor_cs::visit_structure_fwd (
 {
   be_structure *s =
     be_structure::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_structure (s);
 }
 
@@ -333,7 +333,7 @@ be_visitor_union_branch_public_constructor_cs::visit_union_fwd (
 {
   be_union *u =
     be_union::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_union (u);
 }
 
diff --git a/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp b/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp
index 0f0e0dba2d5..0419304b30c 100644
--- a/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp
+++ b/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp
@@ -37,7 +37,7 @@ be_visitor_union_branch_public_cs::visit_union_branch (be_union_branch *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_cs::"
                          "visit_union_branch - "
-                         "Bad union_branch type\n"), 
+                         "Bad union_branch type\n"),
                         -1);
     }
 
@@ -48,7 +48,7 @@ be_visitor_union_branch_public_cs::visit_union_branch (be_union_branch *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_cs::"
                          "visit_union_branch - "
-                         "codegen for union_branch type failed\n"), 
+                         "codegen for union_branch type failed\n"),
                         -1);
     }
 
@@ -73,7 +73,7 @@ be_visitor_union_branch_public_cs::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_union_branch_public_cs::"
                              "visit_array - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -93,7 +93,7 @@ be_visitor_union_branch_public_cs::visit_enum (be_enum *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_cs::"
                          "visit_enum - "
-                         "codegen failed\n"), 
+                         "codegen failed\n"),
                         -1);
     }
 
@@ -119,7 +119,7 @@ be_visitor_union_branch_public_cs::visit_sequence (be_sequence *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_union_branch_public_cs::"
                              "visit_sequence - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -145,7 +145,7 @@ be_visitor_union_branch_public_cs::visit_structure (be_structure *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_cs::"
                          "visit_struct - "
-                         "codegen failed\n"), 
+                         "codegen failed\n"),
                         -1);
     }
 
@@ -157,7 +157,7 @@ be_visitor_union_branch_public_cs::visit_structure_fwd (be_structure_fwd *node)
 {
   be_structure *s =
     be_structure::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_structure (s);
 }
 
@@ -173,7 +173,7 @@ be_visitor_union_branch_public_cs::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_cs::"
                          "visit_union - "
-                         "codegen failed\n"), 
+                         "codegen failed\n"),
                         -1);
     }
 
@@ -185,7 +185,7 @@ be_visitor_union_branch_public_cs::visit_union_fwd (be_union_fwd *node)
 {
   be_union *u =
     be_union::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_union (u);
 }
 
diff --git a/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp b/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
index a48c03e4e2d..5114ae3b720 100644
--- a/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
+++ b/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
@@ -493,7 +493,7 @@ be_visitor_union_branch_public_reset_cs::visit_structure_fwd (
 {
   be_structure *s =
     be_structure::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_structure (s);
 }
 
@@ -553,7 +553,7 @@ be_visitor_union_branch_public_reset_cs::visit_union_fwd (
 {
   be_union *u =
     be_union::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_union (u);
 }
 
diff --git a/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp b/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp
deleted file mode 100644
index c84240fb34a..00000000000
--- a/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-// **********************************************
-//  Visitor for union_branch in the client header file.
-// **********************************************
-
-be_visitor_union_branch_serializer_op_ch::be_visitor_union_branch_serializer_op_ch (
-    be_visitor_context *ctx
-  )
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_union_branch_serializer_op_ch::~be_visitor_union_branch_serializer_op_ch (void)
-{
-}
-
-int
-be_visitor_union_branch_serializer_op_ch::visit_union_branch (be_union_branch *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_ch::"
-                         "visit_union_branch - "
-                         "Bad union_branch type\n"), 
-                        -1);
-    }
-
-  this->ctx_->node (node);
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_ch::"
-                         "visit_union_branch - "
-                         "codegen for union_branch type failed\n"), 
-                        -1);
-    }
-
-  return 0;
-}
-
-// Visit operations on all possible data types that a union_branch can be.
-
-int
-be_visitor_union_branch_serializer_op_ch::visit_array (be_array *node)
-{
-  // If not a typedef and we are defined in the use scope, we must be defined.
-
-  if (!this->ctx_->alias ()
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      // This is the case for anonymous arrays.
-
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-
-      be_visitor_array_serializer_op_ch visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_serializer_op_ch::"
-                             "visit_array - "
-                             "codegen failed\n"), 
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_op_ch::visit_enum (be_enum *node)
-{
-  // If not a typedef and we are defined in the use scope, we must be defined.
-  if (!this->ctx_->alias ()
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-
-      be_visitor_enum_serializer_op_ch visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_serializer_op_ch::"
-                             "visit_enum - "
-                             "codegen failed\n"), 
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_op_ch::visit_sequence (be_sequence *node)
-{
-  // If not a typedef and we are defined in the use scope, we must be defined.
-  if (!this->ctx_->alias ()
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-      be_visitor_sequence_serializer_op_ch visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_serializer_op_ch::"
-                             "visit_sequence - "
-                             "codegen failed\n"), 
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_op_ch::visit_structure (be_structure *node)
-{
-  // If not a typedef and we are defined in the use scope, we must be defined.
-  if (!this->ctx_->alias ()
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-      be_visitor_structure_serializer_op_ch visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_serializer_op_ch::"
-                             "visit_struct - "
-                             "codegen failed\n"), 
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_op_ch::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-
-  be_type *bt = node->primitive_base_type ();
-
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_ch::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"), 
-                        -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_op_ch::visit_union (be_union *node)
-{
-  // If not a typedef and we are defined in the use scope, we must be defined.
-  if (!this->ctx_->alias ()
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-      be_visitor_union_serializer_op_ch visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_serializer_op_ch::"
-                             "visit_enum - "
-                             "codegen failed\n"), 
-                            -1);
-        }
-    }
-
-  return 0;
-}
diff --git a/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp b/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp
deleted file mode 100644
index 642b22141bb..00000000000
--- a/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp
+++ /dev/null
@@ -1,1359 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    union_branch/serializer_op_cs.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Union_Branch in the client stubs file.
-//
-// = AUTHOR
-//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
-//
-// ============================================================================
-
-// **********************************************
-//  Visitor for union_branch in the client stubs file.
-// **********************************************
-
-be_visitor_union_branch_serializer_op_cs::be_visitor_union_branch_serializer_op_cs (
-    be_visitor_context *ctx
-  )
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_union_branch_serializer_op_cs::~be_visitor_union_branch_serializer_op_cs (void)
-{
-}
-
-int
-be_visitor_union_branch_serializer_op_cs::visit_union_branch (be_union_branch *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_union_branch - "
-                         "Bad union_branch type\n"),
-                        -1);
-    }
-
-  this->ctx_->node (node);
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_union_branch - "
-                         "codegen for union_branch type failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_op_cs::visit_array (be_array *node)
-{
-  // If not a typedef and we are defined in the use scope, we must be defined.
-  if (!this->ctx_->alias ()
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-      be_visitor_array_serializer_op_cs visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                             "visit_array - "
-                             "codegen failed\n"),
-                            -1);
-        }
-    }
-
-  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)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_array - "
-                         "cannot retrieve union_branch node\n"),
-                        -1);
-    }
-
-  // For anonymous arrays, the type name has a _ prepended. We compute the
-  // fullname with or without the underscore and use it later on.
-  char fname [NAMEBUFSIZE];  // to hold the full and
-
-  // Save the node's local name and full name in a buffer for quick
-  // use later on.
-  ACE_OS::memset (fname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  if (!this->ctx_->alias () // not a typedef
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      // For anonymous arrays ...
-      // we have to generate a name for us that has an underscore
-      // prepended to our local name. This needs to be inserted after
-      // the parents's name.
-      if (node->is_nested ())
-        {
-          be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname,
-                           "%s::_%s",
-                           parent->full_name (),
-                           node->local_name ()->get_string ());
-        }
-      else
-        {
-          ACE_OS::sprintf (fname,
-                           "_%s",
-                           node->full_name ());
-        }
-    }
-  else
-    {
-      // Typedefed node.
-      ACE_OS::sprintf (fname, "%s", node->full_name ());
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      {
-        //SHH - TBD - could avoid the counter by enclosing in {}
-        //     But this code is currently dead anyway because
-        //     unions always return false for _dcps_is_bounded and a large
-        //     number for _dcsp_max_marshaled_size.
-        //     This note applies to multiple locations in this file.
-        static int tmp_counter = 0;
-        char tmp_val_name[30];
-        ACE_OS::sprintf(tmp_val_name, "tmp_array_val%d", tmp_counter++);
-        *os << fname << "_forany " << tmp_val_name << " (" << be_idt << be_idt_nl
-            << "_tao_union."
-            << f->local_name () << " ()" << be_uidt_nl
-            <<");" << be_uidt_nl;
-        *os << "is_bounded = is_bounded && "
-            << "_tao_is_bounded_size (" << tmp_val_name << ");"
-            << be_nl;
-      }
-      break;
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      {
-        static int tmp_counter = 0;
-        char tmp_size_name[30];
-        char tmp_val_name[30];
-        ACE_OS::sprintf(tmp_size_name, "tmp_array_size%d", tmp_counter);
-        ACE_OS::sprintf(tmp_val_name, "tmp_array_val%d", tmp_counter++);
-        *os << f->field_type ()->name() << "_forany " << tmp_val_name
-            << "; // is type of " << f->local_name () << be_nl;
-        *os << "size_t " << tmp_size_name
-            << " = _dcps_max_marshaled_size (" << tmp_val_name << ");" << be_nl
-            << "if (" << tmp_size_name << " > max_size) " << be_idt_nl
-            << "max_size = " << tmp_size_name << ";" << be_uidt_nl << be_nl;
-      }
-      break;
-    case TAO_CodeGen::TAO_FIND_SIZE:
-      *os << fname << "_forany _tao_union_tmp (" << be_idt << be_idt_nl
-          << "_tao_union."
-          << f->local_name () << " ()" << be_uidt_nl
-          <<");" << be_uidt_nl;
-      *os << "result += _dcps_find_size (_tao_union_tmp);";
-      break;
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << fname << " _tao_union_tmp;" << be_nl
-          << fname << "_forany _tao_union_helper ("
-          << be_idt << be_idt_nl
-          << "_tao_union_tmp" << be_uidt_nl
-          << ");" << be_uidt_nl
-          << "result = strm >> _tao_union_helper;" << be_nl << be_nl
-          << "if (result)" << be_idt_nl
-          << "{" << be_idt_nl
-          << "_tao_union." << f->local_name ()
-          << " (_tao_union_tmp);" << be_nl
-          << "_tao_union._d (_tao_discriminant);" << be_uidt_nl
-          << "}" << be_uidt;
-
-      return 0;
-
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << fname << "_forany _tao_union_tmp (" << be_idt << be_idt_nl
-          << "_tao_union."
-          << f->local_name () << " ()" << be_uidt_nl
-          <<");" << be_uidt_nl
-          << "result = strm << _tao_union_tmp;";
-      return 0;
-
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // This is done in serializer_op_cs.cpp  and hacked into *.i.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_array - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-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 ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_array - "
-                         "cannot retrieve union_branch node\n"),
-                        -1);
-    }
-
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      *os << "// " << f->local_name ()
-          << " is of an enum type; hence is bounded" << be_nl;
-      return 0; // all done
-      break;
-    case TAO_CodeGen::TAO_FIND_SIZE:
-      // enums are serialized as CORBA::ULong
-      *os << "result +=  _dcps_max_marshaled_size_ulong (); /* enum */"
-          << be_nl;
-      return 0; // all done
-      break;
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      // enums are serialized as CORBA::ULong
-      *os << "if (_dcps_max_marshaled_size_ulong () > max_size)" << be_idt_nl
-          << "max_size = _dcps_max_marshaled_size_ulong (); /* enum */"
-          << be_uidt_nl << be_nl;
-      return 0; // all done
-      break;
-    default:
-      // do code in the rest of this method.
-      break;
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << node->name () << " _tao_union_tmp"
-          << ";" << be_nl
-          << "result = strm >> _tao_union_tmp;" << be_nl
-          << "if (result)" << be_idt_nl
-          << "{" << be_idt_nl
-          << "_tao_union." << f->local_name ()
-          << " (_tao_union_tmp);" << be_nl
-          << "_tao_union._d (_tao_discriminant);" << be_uidt_nl
-          << "}" << be_uidt;
-
-      return 0;
-
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result = strm << _tao_union." << f->local_name () << " ();";
-      return 0;
-
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Proceed further.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_enum - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  // Not a typedef and node is defined inside the union. Otherwise the
-  // Serializer operator is generated elsewhere.
-  if (node->node_type () != AST_Decl::NT_typedef
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      // 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);
-      be_visitor_enum_serializer_op_cs visitor (&ctx);
-
-      if (visitor.visit_enum (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                             "visit_enum - "
-                             "codegen failed\n"),
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-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 ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_interface - "
-                         "cannot retrieve union_branch node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      if (node->is_local ())
-        {
-          *os << "result = 0;";
-        }
-      else
-        {
-          *os << node->name () << "_var _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp.inout ();" << be_nl << be_nl
-              << "if (result)" << be_idt_nl
-              << "{" << be_idt_nl
-              << "_tao_union."
-              << f->local_name () << " (_tao_union_tmp.in ());" << be_nl
-              << "_tao_union._d (_tao_discriminant);" << be_uidt_nl
-              << "}" << be_uidt;
-        }
-
-      break;
-
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      if (node->is_defined ())
-        {
-          if (f->is_abstract ())
-            {
-              *os << "(strm << _tao_union."
-                  << f->local_name () << " ());";
-            }
-          else
-            {
-              *os << "::CORBA::Object::marshal (" << be_idt << be_idt_nl
-                  << "_tao_union." << f->local_name () << " ()," << be_nl
-                  << "strm" << be_uidt_nl
-                  << ");" << be_uidt;
-            }
-        }
-      else
-        {
-          *os << "result =" << be_idt_nl
-              << "TAO::Objref_Traits<" << node->name () << ">::marshal ("
-              << be_idt << be_idt_nl
-              << "_tao_union." << f->local_name () << " ()," << be_nl
-              << "strm" << be_uidt_nl
-              << ");" << be_uidt << be_uidt;
-        }
-
-      break;
-
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Nothing to be done because an interface cannot be declared inside a
-      // union.
-      break;
-
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_interface - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_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 ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_interface_fwd - "
-                         "cannot retrieve union_branch node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      if (node->is_local ())
-        {
-          *os << "result = 0;";
-        }
-      else
-        {
-          *os << node->name () << "_var _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp.inout ();" << be_nl << be_nl
-              << "if (result)" << be_idt_nl
-              << "{" << be_idt_nl
-              << "_tao_union."
-              << f->local_name () << " (_tao_union_tmp.in ());" << be_nl
-              << "_tao_union._d (_tao_discriminant);" << be_uidt_nl
-              << "}" << be_uidt;
-        }
-
-      break;
-
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result = _tao_union."
-          << f->local_name () << " ()->marshal (strm);";
-      break;
-
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Nothing to be done because an interface cannot be forward declared
-      // inside a union.
-      break;
-
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_interface_fwd - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-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 ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_valuetype - "
-                         "cannot retrieve union_branch node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << node->name () << "_var _tao_union_tmp;" << be_nl
-          << "result = strm >> _tao_union_tmp.inout ();" << be_nl << be_nl
-          << "if (result)" << be_idt_nl
-          << "{" << be_idt_nl
-          << "_tao_union."
-          << f->local_name () << " (_tao_union_tmp.in ());" << be_nl
-          << "_tao_union._d (_tao_discriminant);" << be_uidt_nl
-          << "}" << be_uidt;
-
-      break;
-
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result = strm << _tao_union."
-          << f->local_name () << " ();";
-      break;
-
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Nothing to be done because an interface cannot be declared inside a
-      // union.
-      break;
-
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_valuetype - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_op_cs::visit_valuetype_fwd (be_valuetype_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 ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_valuetype_fwd - "
-                         "cannot retrieve union_branch node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << node->name () << "_var _tao_union_tmp;" << be_nl
-          << "result = strm >> _tao_union_tmp.inout ();" << be_nl << be_nl
-          << "if (result)" << be_idt_nl
-          << "{" << be_idt_nl
-          << "_tao_union."
-          << f->local_name () << " (_tao_union_tmp.in ());" << be_nl
-          << "_tao_union._d (_tao_discriminant);" << be_uidt_nl
-          << "}" << be_uidt;
-
-      break;
-
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result  = strm << _tao_union."
-          << f->local_name () << " ();";
-      break;
-
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Nothing to be done because an interface cannot be forward declared
-      // inside a union.
-      break;
-
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_valuetype_fwd - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_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 ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_predefined_type - "
-                         "cannot retrieve union_branch node\n"),
-                        -1);
-    }
-
-  AST_PredefinedType::PredefinedType pt = node->pt ();
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      {
-      static int tmp_counter = 0;
-      char tmp_name[10];
-      ACE_OS::sprintf(tmp_name, "tmp%d", tmp_counter++);
-
-      if (pt == AST_PredefinedType::PT_pseudo
-          || pt == AST_PredefinedType::PT_object)
-        {
-          *os << "PT_pseudo and PT_object not supported by -Gdcps";
-          *os << be_nl << be_nl << "// above error is from " << be_nl
-              << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-        }
-      else if (pt == AST_PredefinedType::PT_char)
-        {
-          *os << "size_t " << tmp_name << " = _dcps_max_marshaled_size ("
-              << "::ACE_OutputCDR::from_char (_tao_union."
-              << f->local_name () << " ()));" << be_nl
-              << "if (" << tmp_name << " > max_size) max_size = "
-              << tmp_name << ";" << be_nl;
-        }
-      else if (pt == AST_PredefinedType::PT_wchar)
-        {
-          *os << "size_t " << tmp_name << " = _dcps_max_marshaled_size ("
-              << "::ACE_OutputCDR::from_wchar (_tao_union."
-              << f->local_name () << " ()));" << be_nl
-              << "if (" << tmp_name << " > max_size) max_size = "
-              << tmp_name << ";" << be_nl;
-        }
-      else if (pt == AST_PredefinedType::PT_octet)
-        {
-          *os << "size_t " << tmp_name << " = _dcps_max_marshaled_size ("
-              << "::ACE_OutputCDR::from_octet (_tao_union."
-              << f->local_name () << " ()));" << be_nl
-              << "if (" << tmp_name << " > max_size) max_size = "
-              << tmp_name << ";" << be_nl;
-        }
-      else if (pt == AST_PredefinedType::PT_boolean)
-        {
-          *os << "size_t " << tmp_name << " = _dcps_max_marshaled_size ("
-              << "::ACE_OutputCDR::from_boolean (_tao_union."
-              << f->local_name () << " ()));" << be_nl
-              << "if (" << tmp_name << " > max_size) max_size = "
-              << tmp_name << ";" << be_nl;
-        }
-      else
-        {
-          *os << "size_t " << tmp_name
-              << " = _dcps_max_marshaled_size (_tao_union."
-              << f->local_name () << " ());" << be_nl
-              << "if (" << tmp_name << " > max_size)" << be_idt_nl
-              << "max_size = "<< tmp_name << ";" << be_uidt_nl << be_nl;
-        }
-      }
-      break;
-
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      if (pt == AST_PredefinedType::PT_pseudo
-          || pt == AST_PredefinedType::PT_object)
-        {
-          *os << "PT_pseudo and PT_object not supported by -Gdcps";
-          *os << be_nl << be_nl << "// above error is from " << be_nl
-              << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-        }
-      else
-        {
-          *os << "// " << f->local_name ()
-              << " is of a predefined type; hence is bounded" << be_nl;
-        }
-      break;
-
-    case TAO_CodeGen::TAO_FIND_SIZE:
-
-      *os << "result += ";
-
-      if (pt == AST_PredefinedType::PT_pseudo
-          || pt == AST_PredefinedType::PT_object)
-        {
-          *os << "PT_pseudo and PT_object not supported by -Gdcps";
-          *os << be_nl << be_nl << "// above error is from " << be_nl
-              << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-        }
-      else if (pt == AST_PredefinedType::PT_char)
-        {
-          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_char (_tao_union."
-              << f->local_name () << " ()));";
-        }
-      else if (pt == AST_PredefinedType::PT_wchar)
-        {
-          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_wchar (_tao_union."
-              << f->local_name () << " ()));";
-        }
-      else if (pt == AST_PredefinedType::PT_octet)
-        {
-          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_octet (_tao_union."
-              << f->local_name () << " ()));";
-        }
-      else if (pt == AST_PredefinedType::PT_boolean)
-        {
-          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_boolean (_tao_union."
-              << f->local_name () << " ()));";
-        }
-      else
-        {
-          // is predefined so _find_size = _dcps_max_marshaled_size
-          *os << "_dcps_max_marshaled_size (_tao_union." << f->local_name () << " ());";
-        }
-
-      break;
-
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      if (pt == AST_PredefinedType::PT_object)
-        {
-          *os << "::CORBA::Object_var _tao_union_tmp;" << be_nl;
-
-          *os << "result = strm >> _tao_union_tmp.out ();" << be_nl << be_nl
-              << "if (result)" << be_idt_nl
-              << "{" << be_idt_nl
-              << "_tao_union." << f->local_name () << " (_tao_union_tmp.in ());";
-
-        }
-      else if (pt == AST_PredefinedType::PT_abstract)
-        {
-          *os << "::CORBA::AbstractBase_var _tao_union_tmp;" << be_nl;
-
-          *os << "result = strm >> _tao_union_tmp.out ();" << be_nl << be_nl
-              << "if (result)" << be_idt_nl
-              << "{" << be_idt_nl
-              << "_tao_union." << f->local_name () << " (_tao_union_tmp.in ());";
-
-        }
-      else if (pt == AST_PredefinedType::PT_pseudo)
-        {
-          *os << "::CORBA::TypeCode_var _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp.out ();" << be_nl << be_nl
-              << "if (result)" << be_idt_nl
-              << "{" << be_idt_nl
-              << "_tao_union." << f->local_name () << " (_tao_union_tmp.in ());";
-
-        }
-      else if (pt == AST_PredefinedType::PT_value)
-        {
-          *os << "::CORBA::ValueBase * _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp;" << be_nl << be_nl
-              << "if (result)" << be_idt_nl
-              << "{" << be_idt_nl
-              << "_tao_union." << f->local_name () << " (_tao_union_tmp);";
-
-        }
-      else if (pt == AST_PredefinedType::PT_char)
-        {
-          *os << "::CORBA::Char _tao_union_tmp;" << be_nl
-              << "::ACE_InputCDR::to_char _tao_union_helper "
-              << "(_tao_union_tmp);" << be_nl
-              << "result = strm >> _tao_union_helper;" << be_nl << be_nl
-              << "if (result)" << be_idt_nl
-              << "{" << be_idt_nl
-              << "_tao_union." << f->local_name ()
-              << " (_tao_union_tmp);";
-        }
-      else if (pt == AST_PredefinedType::PT_wchar)
-        {
-          *os << "::CORBA::WChar _tao_union_tmp;" << be_nl
-              << "::ACE_InputCDR::to_wchar _tao_union_helper "
-              << "(_tao_union_tmp);" << be_nl
-              << "result = strm >> _tao_union_helper;" << be_nl << be_nl
-              << "if (result)" << be_idt_nl
-              << "{" << be_idt_nl
-              << "_tao_union." << f->local_name ()
-              << " (_tao_union_tmp);";
-        }
-      else if (pt == AST_PredefinedType::PT_octet)
-        {
-          *os << "::CORBA::Octet _tao_union_tmp;" << be_nl
-              << "::ACE_InputCDR::to_octet _tao_union_helper "
-              << "(_tao_union_tmp);" << be_nl
-              << "result = strm >> _tao_union_helper;" << be_nl << be_nl
-              << "if (result)" << be_idt_nl
-              << "{" << be_idt_nl
-              << "_tao_union." << f->local_name ()
-              << " (_tao_union_tmp);";
-        }
-      else if (pt == AST_PredefinedType::PT_boolean)
-        {
-          *os << "::CORBA::Boolean _tao_union_tmp;" << be_nl
-              << "::ACE_InputCDR::to_boolean _tao_union_helper "
-              << "(_tao_union_tmp);" << be_nl
-              << "result = strm >> _tao_union_helper;" << be_nl << be_nl
-              << "if (result)" << be_idt_nl
-              << "{" << be_idt_nl
-              << "_tao_union." << f->local_name ()
-              << " (_tao_union_tmp);";
-        }
-      else
-        {
-          *os << node->name () << " _tao_union_tmp;" << be_nl
-              << "result = strm >> _tao_union_tmp;" << be_nl << be_nl
-              << "if (result)" << be_idt_nl
-              << "{" << be_idt_nl
-              << "_tao_union." << f->local_name ()
-              << " (_tao_union_tmp);";
-        }
-
-      *os << be_nl;
-      *os << "_tao_union._d (_tao_discriminant);" << be_uidt_nl;
-      *os << "}" << be_uidt;
-
-      break;
-
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-
-      *os << "result = ";
-
-      if (pt == AST_PredefinedType::PT_pseudo
-          || pt == AST_PredefinedType::PT_object)
-        {
-          *os << "strm << _tao_union." << f->local_name () << " ();";
-        }
-      else if (pt == AST_PredefinedType::PT_char)
-        {
-          *os << "strm << ::ACE_OutputCDR::from_char (_tao_union."
-              << f->local_name () << " ());";
-        }
-      else if (pt == AST_PredefinedType::PT_wchar)
-        {
-          *os << "strm << ::ACE_OutputCDR::from_wchar (_tao_union."
-              << f->local_name () << " ());";
-        }
-      else if (pt == AST_PredefinedType::PT_octet)
-        {
-          *os << "strm << ::ACE_OutputCDR::from_octet (_tao_union."
-              << f->local_name () << " ());";
-        }
-      else if (pt == AST_PredefinedType::PT_boolean)
-        {
-          *os << "strm << ::ACE_OutputCDR::from_boolean (_tao_union."
-              << f->local_name () << " ());";
-        }
-      else
-        {
-          *os << "strm << _tao_union." << f->local_name () << " ();";
-        }
-
-      break;
-
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Nothing to be done.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_array - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_op_cs::visit_sequence (be_sequence *node)
-{
-  // If the sequence is defined in this scope, generate its Serializer stream
-  // operators heree.
-  if (node->node_type () != AST_Decl::NT_typedef
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      // Anonymous sequence
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-      be_visitor_sequence_serializer_op_cs visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                             "visit_sequence - "
-                             "codegen failed\n"),
-                            -1);
-        }
-    }
-
-  // Now generate the Serializer stream operators for the sequence as a
-  // union branch.
-
-  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)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_sequence - "
-                         "cannot retrieve union_branch node\n"
-                         ), -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      {
-        static int tmp_counter = 0;
-        char tmp_val_name[30];
-        ACE_OS::sprintf(tmp_val_name, "tmp_seq_val%d", tmp_counter++);
-        *os << f->field_type ()->name() << " " << tmp_val_name
-            << "; // is type of " << f->local_name () << be_nl;
-        *os << "is_bounded = is_bounded && "
-            << "_tao_is_bounded_size (" << tmp_val_name << ");"
-            << be_nl;
-      }
-      break;
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      {
-        static int tmp_counter = 0;
-        char tmp_size_name[30];
-        char tmp_val_name[30];
-        ACE_OS::sprintf(tmp_size_name, "tmp_seq_size%d", tmp_counter);
-        ACE_OS::sprintf(tmp_val_name,  "tmp_seq_val%d", tmp_counter++);
-        *os << f->field_type ()->name() << " " << tmp_val_name
-            << "; // is type of " << f->local_name () << be_nl;
-        *os << "size_t " << tmp_size_name
-            << " = _dcps_max_marshaled_size (" << tmp_val_name << ");" << be_nl
-            << "if (" << tmp_size_name << " > max_size) " << be_idt_nl
-            << "max_size = " << tmp_size_name << ";" << be_uidt_nl << be_nl;
-      }
-      break;
-    case TAO_CodeGen::TAO_FIND_SIZE:
-      //SHH - TBD - make sure this is a shallow copy.
-      //     But this code is currently dead anyway because
-      //     unions always return false for _dcps_is_bounded and a large
-      //     number for _dcsp_max_marshaled_size.
-      //     This note applies to multiple locations in this file.
-      *os << f->field_type ()->name() << " tmp (_tao_union."
-          << f->local_name () << " ());" << be_nl;
-      *os << "result += _dcps_find_size (tmp);" << be_nl;
-      break;
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      {
-        // If the typedef'd sequence is included from another
-        // file, node->name() won't work. The following works
-        // for all typedefs, external or not.
-        be_typedef *td = this->ctx_->alias ();
-
-        if (td)
-          {
-            *os << td->name ();
-          }
-        else
-          {
-            *os << node->name ();
-          }
-
-        *os << " _tao_union_tmp;" << be_nl
-            << "result = strm >> _tao_union_tmp;" << be_nl << be_nl
-            << "if (result)" << be_idt_nl
-            << "{" << be_idt_nl
-            << "_tao_union."
-            << f->local_name () << " (_tao_union_tmp);" << be_nl
-            << "_tao_union._d (_tao_discriminant);" << be_uidt_nl
-            << "}" << be_uidt;
-
-        return 0;
-      }
-
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result = strm << _tao_union."
-          << f->local_name () << " ();";
-      return 0;
-
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Proceed further.
-      break;
-    default:
-      // Error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_sequence - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-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 ());
-
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_string - "
-                         "cannot retrieve union_branch node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-       if (0 == node->max_size ()->ev ()->u.ulval)
-         *os << "is_bounded = is_bounded && false; /* unbounded string */"
-             << be_nl;
-       else
-         *os << "// bounded string " << f->local_name ()
-             << be_nl;
-      break;
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      {
-        static int tmp_counter = 0;
-        char tmp_size_name[30];
-        ACE_OS::sprintf(tmp_size_name, "tmp_string_size%d", tmp_counter++);
-
-        char buff[15];
-        ACE_OS::sprintf(buff, "%ld", node->max_size ()->ev ()->u.ulval);
-        *os << "size_t " << tmp_size_name
-            << " = _dcps_max_marshaled_size_ulong () + " << buff << ";" << be_nl
-            << "if (" << tmp_size_name << ")" << be_idt_nl
-            << "max_size = " << tmp_size_name << ";" << be_uidt_nl;
-      }
-      break;
-    case TAO_CodeGen::TAO_FIND_SIZE:
-      *os << "result += _dcps_max_marshaled_size_ulong() + " << be_idt_nl
-          << "(_tao_union." << f->local_name () << " () ? ACE_OS::strlen(_tao_union."
-          << f->local_name () << " ()) : 0);" << be_uidt_nl;
-      break;
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      if (node->width () == (long) sizeof (char))
-        {
-          *os << "::CORBA::String_var _tao_union_tmp;" << be_nl;
-        }
-      else
-        {
-          *os << "::CORBA::WString_var _tao_union_tmp;" << be_nl;
-        }
-
-      *os << "result = strm >> _tao_union_tmp.out ();" << be_nl << be_nl
-          << "if (result)" << be_idt_nl
-          << "{" << be_idt_nl
-          << "_tao_union."
-          << f->local_name () << " (_tao_union_tmp);" << be_nl
-          << "_tao_union._d (_tao_discriminant);" << be_uidt_nl
-          << "}" << be_uidt;
-
-      break;
-
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result = strm << _tao_union."
-          << f->local_name () << " ();";
-      break;
-
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Nothing to be done.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_array - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_op_cs::visit_structure (be_structure *node)
-{
-  // If the structure is defined in this scope. generate its Serializer
-  // stream operators here.
-  if (node->node_type () != AST_Decl::NT_typedef
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-      be_visitor_structure_serializer_op_cs visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                             "visit_struct - "
-                             "codegen failed\n"),
-                            -1);
-        }
-    }
-
-  // How generate the Serializer stream operators for the structure as
-  // a union branch.
-
-  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)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_structure - "
-                         "cannot retrieve union_branch node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-      {
-        static int tmp_counter = 0;
-        char tmp_size_name[30];
-        char tmp_val_name[30];
-        ACE_OS::sprintf(tmp_size_name, "tmp_struct_size%d", tmp_counter);
-        ACE_OS::sprintf(tmp_val_name, "tmp_struct_val%d", tmp_counter++);
-
-        *os << f->field_type ()->name() << " " << tmp_val_name
-            << "; // is type of " << f->local_name () << be_nl;
-        *os << "size_t " << tmp_size_name
-            << " = _dcps_max_marshaled_size (" << tmp_val_name << ");" << be_nl
-            << "if (" << tmp_size_name << " > max_size) " << be_idt_nl
-            << "max_size = " << tmp_size_name << ";" << be_uidt_nl << be_nl;
-      }
-      break;
-
-    case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      {
-        static int tmp_counter = 0;
-        char tmp_size_name[30];
-        char tmp_val_name[30];
-        ACE_OS::sprintf(tmp_size_name, "tmp_struct_size%d", tmp_counter);
-        ACE_OS::sprintf(tmp_val_name, "tmp_struct_val%d", tmp_counter++);
-
-        *os << f->field_type ()->name() << " " << tmp_val_name
-            << "; // is type of " << f->local_name () << be_nl;
-        *os << "is_bounded = is_bounded && _tao_is_bounded_size ("
-            << tmp_val_name << ");" << be_nl;
-      }
-      break;
-
-    case TAO_CodeGen::TAO_FIND_SIZE:
-      *os << "result += _dcps_find_size (_tao_union."
-          << f->local_name () << " ());" << be_nl;
-      break;
-
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << node->name () << " _tao_union_tmp;" << be_nl
-          << "result = strm >> _tao_union_tmp;" << be_nl << be_nl
-          << "if (result)" << be_idt_nl
-          << "{" << be_idt_nl
-          << "_tao_union." << f->local_name ()
-          << " (_tao_union_tmp);" << be_nl
-          << "_tao_union._d (_tao_discriminant);" << be_uidt_nl
-          << "}" << be_uidt;
-
-      return 0;
-
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result = strm << _tao_union."
-          << f->local_name () << " ();";
-      return 0;
-
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Proceed further.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_structure - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_op_cs::visit_structure_fwd (
-  be_structure_fwd *node)
-{
-  be_structure *s =
-    be_structure::narrow_from_decl (node->full_definition ());
-    
-  return this->visit_structure (s);
-}
-
-int
-be_visitor_union_branch_serializer_op_cs::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-
-  // The node to be visited in the base primitve type that gets typedefed.
-  be_type *bt = node->primitive_base_type ();
-
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ci::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"),
-                        -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_op_cs::visit_union (be_union *node)
-{
-  // If the union is defined in this scope, generate its Serializer
-  // stream operators here.
-  if (node->node_type () != AST_Decl::NT_typedef
-      && node->is_child (this->ctx_->scope ()->decl ()))
-    {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node);
-      be_visitor_union_serializer_op_cs visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                             "visit_union - "
-                             "codegen failed\n"),
-                            -1);
-        }
-    }
-
-  // Now generate the Serializer stream operators for the union as
-  // a union branch.
-
-  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)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_union - "
-                         "cannot retrieve union_branch node\n"),
-                        -1);
-    }
-
-  // Check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << node->name () << " _tao_union_tmp"
-          << ";" << be_nl
-          << "result = strm >> _tao_union_tmp;" << be_nl << be_nl
-          << "if (result)" << be_idt_nl
-          << "{" << be_idt_nl
-          << "_tao_union." << f->local_name ()
-          << " (_tao_union_tmp);" << be_nl
-          << "_tao_union._d (_tao_discriminant);" << be_uidt_nl
-          << "}" << be_uidt_nl;
-
-      return 0;
-
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result = strm << _tao_union."
-          << f->local_name () << " ();";
-      return 0;
-
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Proceed further.
-      break;
-    default:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
-                         "visit_union - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_op_cs::explicit_default (void)
-{
-  be_union *bu =
-    be_union::narrow_from_decl (this->ctx_->scope ()->decl ());
-  int def_index = bu->default_index ();
-
-  if (def_index != -1)
-    {
-      be_union_branch *ub =
-        be_union_branch::narrow_from_decl (this->ctx_->node ());
-
-      int i = 0;
-
-      // Instantiate a scope iterator.
-      for (UTL_ScopeActiveIterator si (bu, UTL_Scope::IK_decls);
-           !si.is_done ();
-           si.next ())
-        {
-          be_union_branch *bub = 0; // union branch node
-
-          AST_Decl *d = si.item ();
-
-          if (!d->imported ())
-            {
-              bub = be_union_branch::narrow_from_decl (d);
-            }
-
-          if (bub == ub)
-            {
-              return (i == def_index);
-            }
-          else
-            {
-              ++i;
-            }
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_serializer_op_cs::visit_union_fwd (
-  be_union_fwd *node)
-{
-  be_union *u =
-    be_union::narrow_from_decl (node->full_definition ());
-    
-  return this->visit_union (u);
-}
-
diff --git a/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp b/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
index d05451062c7..858e6b50245 100644
--- a/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
@@ -41,8 +41,8 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   be_module *module = 0;
 
@@ -82,12 +82,12 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node)
       be_util::gen_nested_namespace_end (os, module);
 
       // Emit #else.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "#else\n\n";
     }
 
   *os << be_global->core_versioning_begin () << be_nl;
-  
+
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << " *); // copying" << be_nl;
 
@@ -98,7 +98,7 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node)
       << node->name () << " *&);";
 
   *os << be_global->core_versioning_end () << be_nl;
-  
+
   if (module != 0)
     {
       *os << "\n\n#endif";
diff --git a/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp b/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
index 2f7a47d11d5..f55a453c572 100644
--- a/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
@@ -44,14 +44,14 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
 
   // Generate the Any <<= and >>= operator declarations
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
   // All template specializations must be generated before the instantiations
   // in the operators.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "namespace TAO" << be_nl
       << "{" << be_idt_nl
       << "template<>" << be_nl
@@ -65,7 +65,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
       << "_tao_elem = this->value_;" << be_nl
       << "return true;" << be_uidt_nl
       << "}" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << be_global->core_versioning_end () << be_nl;
 
@@ -100,7 +100,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
           << "{" << be_idt_nl
           << "::CORBA::add_ref (_tao_elem);" << be_nl
           << "_tao_any <<= &_tao_elem;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       *os << "// Non-copying insertion." << be_nl
           << "void" << be_nl
@@ -114,7 +114,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
           << node->local_name () << "::_tao_any_destructor," << be_nl
           << node->tc_name ()->last_component () << "," << be_nl
           << "*_tao_elem);" << be_uidt << be_uidt << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       *os << "::CORBA::Boolean" << be_nl
           << "operator>>= (" << be_idt << be_idt_nl
@@ -130,12 +130,12 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
           << node->tc_name ()->last_component () << "," << be_nl
           << "_tao_elem" << be_uidt_nl
           << ");" << be_uidt << be_uidt << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       be_util::gen_nested_namespace_end (os, module);
 
       // Emit #else.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "#else\n\n";
     }
 
@@ -150,7 +150,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
       << "{" << be_idt_nl
       << "::CORBA::add_ref (_tao_elem);" << be_nl
       << "_tao_any <<= &_tao_elem;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "// Non-copying insertion." << be_nl
       << "void" << be_nl
@@ -166,7 +166,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
       << node->tc_name () << "," << be_nl
       << "*_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean" << be_nl
       << "operator>>= (" << be_idt << be_idt_nl
@@ -182,7 +182,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
       << node->tc_name () << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << be_global->core_versioning_end () << be_nl;
 
diff --git a/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp b/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
index d6b8d913fae..236792352b8 100644
--- a/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
@@ -36,9 +36,9 @@ be_visitor_valuebox_cdr_op_ch::visit_valuebox (be_valuebox *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp b/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
index e062b8d7e7b..a01faeb9dab 100644
--- a/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
@@ -39,8 +39,8 @@ be_visitor_valuebox_cdr_op_cs::visit_valuebox (be_valuebox *node)
   TAO_OutStream *os = this->ctx_->stream ();
   node->cli_stub_cdr_op_gen (true);
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
 *os << be_global->core_versioning_begin () << be_nl;
 
@@ -62,7 +62,7 @@ be_visitor_valuebox_cdr_op_cs::visit_valuebox (be_valuebox *node)
       << node->full_name () << "::_downcast)"
       << be_uidt_nl
       << ");" << be_uidt << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean" << be_nl
       << "operator>> (" << be_idt << be_idt_nl
@@ -74,7 +74,7 @@ be_visitor_valuebox_cdr_op_cs::visit_valuebox (be_valuebox *node)
   *os << "return " << node->full_name ()
       << "::_tao_unmarshal (strm, _tao_valuebox);"
       << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << be_global->core_versioning_end () << be_nl;
 
diff --git a/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp b/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp
index 3f7777665ad..53af1feb1c7 100644
--- a/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp
+++ b/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp
@@ -124,8 +124,8 @@ be_visitor_valuebox_field_ch::visit_array (be_array *node)
     }
 
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "void " << field->local_name () << " (" << fname << ");" << be_nl;
 
@@ -162,8 +162,8 @@ be_visitor_valuebox_field_ch::visit_enum (be_enum *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "", "");
   this->emit_member_get (field, bt, "", "", "const");
@@ -198,8 +198,8 @@ be_visitor_valuebox_field_ch::visit_interface (be_interface *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "", "_ptr");
   this->emit_member_get (field, bt, "", "_ptr", "const");
@@ -234,8 +234,8 @@ be_visitor_valuebox_field_ch::visit_interface_fwd (be_interface_fwd *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "", "_ptr");
   this->emit_member_get (field, bt, "", "_ptr", "const");
@@ -284,8 +284,8 @@ be_visitor_valuebox_field_ch::visit_predefined_type (be_predefined_type *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   switch (node->pt ())
     {
@@ -337,8 +337,8 @@ be_visitor_valuebox_field_ch::visit_sequence (be_sequence *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const");
@@ -375,8 +375,8 @@ be_visitor_valuebox_field_ch::visit_string (be_string *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "", "");
   this->emit_member_set (field, bt, "const ", "");
@@ -426,8 +426,8 @@ be_visitor_valuebox_field_ch::visit_structure (be_structure *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const");
@@ -486,8 +486,8 @@ be_visitor_valuebox_field_ch::visit_union (be_union *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const");
diff --git a/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp b/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
index 5e3a895d68b..8551727f662 100644
--- a/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
+++ b/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
@@ -121,8 +121,8 @@ be_visitor_valuebox_field_ci::visit_array (be_array *node)
                        bt->full_name ());
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "/// Modifier to set the member." << be_nl;
 
@@ -133,7 +133,7 @@ be_visitor_valuebox_field_ci::visit_array (be_array *node)
       << fname << "_copy ("
       << "this->_pd_value->" << field->local_name ()
       << ", val);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "/// Accessor to retrieve the member." << be_nl;
 
@@ -143,7 +143,7 @@ be_visitor_valuebox_field_ci::visit_array (be_array *node)
       << "{" << be_idt_nl
       << "return this->_pd_value->" << field->local_name ()
       << ";" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   return 0;
 }
@@ -175,8 +175,8 @@ be_visitor_valuebox_field_ci::visit_enum (be_enum *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
 
   this->emit_member_set (field, bt, "", "");
@@ -212,8 +212,8 @@ be_visitor_valuebox_field_ci::visit_interface (be_interface *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "// Modifier to set the member." << be_nl;
 
@@ -224,7 +224,7 @@ be_visitor_valuebox_field_ci::visit_interface (be_interface *node)
       << "this->_pd_value->" << field->local_name ()
       << " = " << "TAO::Objref_Traits< ::" << bt->name ()
       << ">::duplicate (val);" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   this->emit_member_get (field, bt, "", "_ptr", "const", ".in ()");
 
@@ -258,8 +258,8 @@ be_visitor_valuebox_field_ci::visit_interface_fwd (be_interface_fwd *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "// Modifier to set the member." << be_nl;
 
@@ -270,7 +270,7 @@ be_visitor_valuebox_field_ci::visit_interface_fwd (be_interface_fwd *node)
       << "this->_pd_value->" << field->local_name ()
       << " = " << "TAO::Objref_Traits< ::" << bt->name ()
       << ">::duplicate (val);" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   this->emit_member_get (field, bt, "", "_ptr", "const", ".in ()");
 
@@ -332,8 +332,8 @@ be_visitor_valuebox_field_ci::visit_predefined_type (be_predefined_type *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   switch (node->pt ())
   {
@@ -347,7 +347,7 @@ be_visitor_valuebox_field_ci::visit_predefined_type (be_predefined_type *node)
           << be_nl << "{" << be_idt_nl
           << "this->_pd_value->" << field->local_name ()
           << " = ::" << bt->name() << "::_duplicate (val);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       this->emit_member_get (field, bt, " ::", "_ptr", "const", ".in ()");
       break;
@@ -394,8 +394,8 @@ be_visitor_valuebox_field_ci::visit_sequence (be_sequence *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const", "");
@@ -431,8 +431,8 @@ be_visitor_valuebox_field_ci::visit_string (be_string *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "", "");
   this->emit_member_set (field, bt, "const ", "");
@@ -455,7 +455,7 @@ be_visitor_valuebox_field_ci::visit_string (be_string *node)
       << be_nl << "{" << be_idt_nl
       << "this->_pd_value->" << field->local_name ()
       << " = val;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   this->emit_member_get (field, bt, "const ", "", "const", "");
 
@@ -489,8 +489,8 @@ be_visitor_valuebox_field_ci::visit_structure (be_structure *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const", "");
@@ -545,8 +545,8 @@ be_visitor_valuebox_field_ci::visit_union (be_union *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const", "");
@@ -571,7 +571,7 @@ be_visitor_valuebox_field_ci::emit_member_set (be_decl *field,
       << be_nl << "{" << be_idt_nl
       << "this->_pd_value->" << field->local_name ()
       << " = val;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
 }
 
@@ -594,5 +594,5 @@ be_visitor_valuebox_field_ci::emit_member_get (be_decl *field,
       << "{" << be_idt_nl
       << "return this->_pd_value->" << field->local_name () << access_modifier
       << ";" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 }
diff --git a/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp b/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp
index efa1d618333..021f29bbe2f 100644
--- a/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp
+++ b/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp
@@ -119,8 +119,8 @@ be_visitor_valuebox_union_member_ci::visit_array (be_array *node)
                        bt->full_name ());
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "/// Modifier to set the member." << be_nl;
 
@@ -130,7 +130,7 @@ be_visitor_valuebox_union_member_ci::visit_array (be_array *node)
       << "{" << be_idt_nl
       << "this->_pd_value->" << field->local_name ()
       << " (val);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "/// Accessor to retrieve the member." << be_nl;
 
@@ -140,7 +140,7 @@ be_visitor_valuebox_union_member_ci::visit_array (be_array *node)
       << "{" << be_idt_nl
       << "return this->_pd_value->" << field->local_name ()
       << " ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   return 0;
 }
@@ -172,8 +172,8 @@ be_visitor_valuebox_union_member_ci::visit_enum (be_enum *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
 
   this->emit_member_set (field, bt, "", "");
@@ -209,8 +209,8 @@ be_visitor_valuebox_union_member_ci::visit_interface (be_interface *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "", "_ptr");
   this->emit_member_get (field, bt, "", "_ptr", "const");
@@ -245,8 +245,8 @@ be_visitor_valuebox_union_member_ci::visit_interface_fwd (be_interface_fwd *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "", "_ptr");
   this->emit_member_get (field, bt, "", "_ptr", "const");
@@ -295,8 +295,8 @@ be_visitor_valuebox_union_member_ci::visit_predefined_type (be_predefined_type *
 
   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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   switch (node->pt ())
   {
@@ -348,8 +348,8 @@ be_visitor_valuebox_union_member_ci::visit_sequence (be_sequence *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const");
@@ -385,8 +385,8 @@ be_visitor_valuebox_union_member_ci::visit_string (be_string *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "", "");
   this->emit_member_set (field, bt, "const ", "");
@@ -409,7 +409,7 @@ be_visitor_valuebox_union_member_ci::visit_string (be_string *node)
       << be_nl << "{" << be_idt_nl
       << "this->_pd_value->" << field->local_name ()
       << " (val);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   this->emit_member_get (field, bt, "const ", "", "const");
 
@@ -443,8 +443,8 @@ be_visitor_valuebox_union_member_ci::visit_structure (be_structure *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const");
@@ -499,8 +499,8 @@ be_visitor_valuebox_union_member_ci::visit_union (be_union *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_member_set (field, bt, "const ", " &");
   this->emit_member_get (field, bt, "const ", " &", "const");
@@ -526,7 +526,7 @@ be_visitor_valuebox_union_member_ci::emit_member_set (
       << be_nl << "{" << be_idt_nl
       << "this->_pd_value->" << field->local_name ()
       << " (val);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
 }
 
@@ -549,5 +549,5 @@ be_visitor_valuebox_union_member_ci::emit_member_get (
       << "{" << be_idt_nl
       << "return this->_pd_value->" << field->local_name ()
       << " ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 }
diff --git a/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp b/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
index bd55e9d8ea5..5af1303fe8f 100644
--- a/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
+++ b/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
@@ -39,14 +39,14 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
 
   this->ctx_->node (node); // save the node
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "class " << node->local_name () << ";" ;
 
   // Generate the _var and _out template class declarations.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "typedef" << be_idt_nl
       << "TAO_Value_Var_T<" << be_idt << be_idt_nl
       << node->local_name () << be_uidt_nl
@@ -58,33 +58,33 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
       << ">" << be_uidt_nl
       << node->local_name () << "_out;" << be_uidt;
 
-  *os << be_nl << be_nl << "class " << be_global->stub_export_macro ()
+  *os << be_nl_2 << "class " << be_global->stub_export_macro ()
       << " " << node->local_name ();
   *os << be_idt_nl <<": public virtual ::CORBA::DefaultValueRefCountBase";
 
   *os << be_uidt << be_nl
       << "{" << be_nl
       << "public:" << be_idt;
-      
+
   node->gen_stub_decls (os);
 
   // _downcast method
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "static " << node->local_name () << "* "
       << "_downcast ( ::CORBA::ValueBase *);" << be_nl;
 
   // _copy_value method
-  *os << "::CORBA::ValueBase * _copy_value (void);" << be_nl << be_nl;
+  *os << "::CORBA::ValueBase * _copy_value (void);" << be_nl_2;
 
   // repository id methods
   *os << "virtual const char* "
       << "_tao_obv_repository_id (void) const;"
-      << be_nl << be_nl
+      << be_nl_2
       << "virtual void "
       << "_tao_obv_truncatable_repo_ids (Repository_Id_List &ids) const;"
-      << be_nl << be_nl
+      << be_nl_2
       << "static const char* "
-      << "_tao_obv_static_repository_id (void);" << be_nl << be_nl;
+      << "_tao_obv_static_repository_id (void);" << be_nl_2;
 
   // unmarshal method
   *os << "static ::CORBA::Boolean _tao_unmarshal (" << be_idt << be_idt_nl
@@ -95,7 +95,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
   if (be_global->tc_support ())
     {
       *os << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;"
-          << be_nl << be_nl;
+          << be_nl_2;
     }
 
   be_type *bt = be_type::narrow_from_decl (node->boxed_type ());
@@ -110,7 +110,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
                         -1);
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Generate the "protected" destructor
@@ -163,7 +163,7 @@ be_visitor_valuebox_ch::visit_array (be_array *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl;
 
   this->emit_default_constructor();
@@ -188,7 +188,7 @@ be_visitor_valuebox_ch::visit_array (be_array *node)
   *os << node->full_name () << "_slice* " << "_value (void);" << be_nl;
 
   *os << "void" << " _value (const " << node->full_name () << " val);"
-      << be_nl << be_nl;
+      << be_nl_2;
 
   // Overloaded subscript operators
   *os << "const " << node->full_name ()
@@ -196,7 +196,7 @@ be_visitor_valuebox_ch::visit_array (be_array *node)
 
   *os << node->full_name ()
       << "_slice &  operator[] ( ::CORBA::ULong index);"
-      << be_nl << be_nl;
+      << be_nl_2;
 
   // Explicit conversion functions
   *os << "const " << node->full_name ()
@@ -282,7 +282,7 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node)
   // Indicate that this type has been used as a sequence element.
   bt->seen_in_sequence (true);
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   this->emit_default_constructor();
@@ -361,10 +361,10 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node)
                         -1);
     }
 
-  *os << "& operator[] ( ::CORBA::ULong index) const;" << be_nl << be_nl
+  *os << "& operator[] ( ::CORBA::ULong index) const;" << be_nl_2
       << "::CORBA::ULong maximum (void) const;" << be_nl
       << "::CORBA::ULong length (void) const;" << be_nl
-      << "void length ( ::CORBA::ULong len);" << be_nl << be_nl;
+      << "void length ( ::CORBA::ULong len);" << be_nl_2;
 
   // Member variable of underlying type;
   this->emit_boxed_member_var (node, "_var");
@@ -402,7 +402,7 @@ be_visitor_valuebox_ch::visit_string (be_string *node)
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
   be_decl * vb_node = this->ctx_->node ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   this->emit_default_constructor ();
@@ -429,13 +429,13 @@ be_visitor_valuebox_ch::visit_string (be_string *node)
   // Public assignment operator with one argument of type
   // const CORBA::String_var&
   *os << vb_node->local_name () << "& operator= (const ::CORBA::"
-      << string_type << "_var& var);" << be_nl << be_nl;
+      << string_type << "_var& var);" << be_nl_2;
 
   *os << "// Accessor" << be_nl;
 
   // Accessor function takes no arguments and returns a const char *
   *os << "const " << node->full_name ()
-      << " _value (void) const;" << be_nl << be_nl;
+      << " _value (void) const;" << be_nl_2;
 
   *os << "// Modifiers" << be_nl;
 
@@ -448,7 +448,7 @@ be_visitor_valuebox_ch::visit_string (be_string *node)
 
   // Modifier function with one argument of type const CORBA::String_var&
   *os << "void _value (const ::CORBA::" << string_type << "_var& var);"
-      << be_nl << be_nl;
+      << be_nl_2;
 
   // Access to the boxed value for method signatures
   this->emit_boxed_access (node, "", "const ", "", "");
@@ -456,7 +456,7 @@ be_visitor_valuebox_ch::visit_string (be_string *node)
   // Overloaded subscript operators
   *os << "// Allows access and modification using a slot." << be_nl
       << char_type << " & operator[] ( ::CORBA::ULong slot);"
-      << be_nl << be_nl
+      << be_nl_2
       << "// Allows only accessing thru a slot." << be_nl
       << char_type << " operator[] ( ::CORBA::ULong slot) const;"
       << be_nl;
@@ -474,7 +474,7 @@ be_visitor_valuebox_ch::visit_structure (be_structure *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   this->emit_default_constructor();
@@ -542,7 +542,7 @@ be_visitor_valuebox_ch::visit_structure (be_structure *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Member variable of underlying type;
@@ -576,7 +576,7 @@ be_visitor_valuebox_ch::visit_union (be_union *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   this->emit_default_constructor();
@@ -668,7 +668,7 @@ be_visitor_valuebox_ch::visit_union (be_union *node)
                         -1);
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
 
@@ -686,7 +686,7 @@ be_visitor_valuebox_ch::emit_for_predef_enum (be_type *node,
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   this->emit_default_constructor ();
@@ -728,7 +728,7 @@ be_visitor_valuebox_ch::emit_for_predef_enum (be_type *node,
           << " _value (void) const;" << be_nl;
 
       *os << "void" << " _value (" << node->full_name () << type_suffix
-          << " val);" << be_nl << be_nl;
+          << " val);" << be_nl_2;
 
       // Access to the boxed value for method signatures
       this->emit_boxed_access (node, type_suffix, "", "", "");
@@ -748,7 +748,7 @@ be_visitor_valuebox_ch::emit_default_constructor (void)
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
   be_decl * vb_node = this->ctx_->node ();
 
-  *os << be_nl << be_nl << "// Constructors" << be_nl;
+  *os << be_nl_2 << "// Constructors" << be_nl;
 
   // Public default constructor
   *os << vb_node->local_name () << " (void);" << be_nl;
@@ -796,7 +796,7 @@ be_visitor_valuebox_ch::emit_assignment (be_decl *node,
 
   *os << vb_node->local_name () << "& operator= (" << const_prefix
       << node->full_name () << type_suffix << ref_modifier << " val);"
-      << be_nl << be_nl;
+      << be_nl_2;
 }
 
 void
@@ -835,7 +835,7 @@ be_visitor_valuebox_ch::emit_accessor_modifier (be_decl *node)
 
   // Public modifier method
   *os << "void" << " _value (const " << node->full_name () << "& val);"
-      << be_nl << be_nl;
+      << be_nl_2;
 }
 
 
diff --git a/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
index f2940c3c9a3..748e9bba6c1 100644
--- a/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
+++ b/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
@@ -47,14 +47,14 @@ be_visitor_valuebox_ci::visit_valuebox (be_valuebox *node)
                         -1);
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl;
 
   *os << "ACE_INLINE const char* " << be_nl
       << node->name () << "::_tao_obv_static_repository_id ()" << be_nl
       << "{" << be_idt_nl
       << "return \"" << node->repoID () << "\";" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Indicate that code is already generated for this node.
   node->cli_inline_gen (true);
@@ -70,15 +70,15 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
   be_decl * vb_node = this->ctx_->node ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Public default constructor
   *os << "ACE_INLINE" << be_nl
       << vb_node->name () << "::" << vb_node->local_name () << " (void)"
       << be_nl << "{" << be_idt_nl
       << "this->_pd_value = " << node->full_name () << "_alloc ();"
-      << be_uidt_nl << "}" << be_nl << be_nl;
+      << be_uidt_nl << "}" << be_nl_2;
 
   // Public constructor that takes a const array argument
   *os << "ACE_INLINE" << be_nl
@@ -87,7 +87,7 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
       << "{" << be_idt_nl
       << "this->_pd_value = " << node->full_name () << "_dup (val);"
       << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Public copy constructor
   *os << "ACE_INLINE" << be_nl
@@ -99,7 +99,7 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
       << "{" << be_idt_nl
       << "this->_pd_value = " << node->full_name ()
       << "_dup (val._pd_value.in ());" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Public assignment operator that takes a const array argument
   *os << "ACE_INLINE " << vb_node->name () << " &" << be_nl
@@ -109,20 +109,20 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
       << "this->_pd_value = " << node->full_name ()
       << "_dup (val);" << be_nl
       << "return *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Public accessor and modifier methods
   *os << "ACE_INLINE const " << node->full_name () << "_slice*" << be_nl
       << vb_node->name () << "::_value (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << node->full_name () << "_slice*" << be_nl
       << vb_node->name () << "::_value (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "ACE_INLINE void" << be_nl
       << vb_node->name () << "::_value (const " << node->full_name ()
@@ -130,7 +130,7 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
       << "{" << be_idt_nl
       << "this->_pd_value = " << node->full_name () << "_dup (val);"
       << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Overloaded subscript operators
   *os << "ACE_INLINE const " << node->full_name () << "_slice &" << be_nl
@@ -138,32 +138,32 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
       << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value[index];" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "ACE_INLINE "<< node->full_name () << "_slice &" << be_nl
       << vb_node->name () << "::operator[] ( ::CORBA::ULong index)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value[index];" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Explicit conversion functions
   *os << "ACE_INLINE const " << node->full_name () << "_slice *" << be_nl
       << vb_node->name () << "::_boxed_in (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << node->full_name () << "_slice *" << be_nl
       << vb_node->name () << "::_boxed_inout (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << node->full_name () << "_slice *" << be_nl
       << vb_node->name () << "::_boxed_out (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.out ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   return 0;
 }
@@ -183,34 +183,27 @@ be_visitor_valuebox_ci::visit_interface (be_interface *node)
 int
 be_visitor_valuebox_ci::visit_predefined_type (be_predefined_type *node)
 {
-  const char *marshal_arg;
   bool is_any = false;
 
   switch (node->pt())
     {
     case AST_PredefinedType::PT_boolean:
-      marshal_arg = "::ACE_OutputCDR::from_boolean (this->_pd_value)";
       break;
 
     case AST_PredefinedType::PT_char:
-      marshal_arg = "::ACE_OutputCDR::from_char (this->_pd_value)";
       break;
 
     case AST_PredefinedType::PT_wchar:
-      marshal_arg = "::ACE_OutputCDR::from_wchar (this->_pd_value)";
       break;
 
     case AST_PredefinedType::PT_octet:
-      marshal_arg = "::ACE_OutputCDR::from_octet (this->_pd_value)";
       break;
 
     case AST_PredefinedType::PT_any:
-      marshal_arg = "this->_pd_value.in ()";
       is_any = true;
       break;
 
     default:
-      marshal_arg = "this->_pd_value";
       break;
     }
 
@@ -225,8 +218,8 @@ be_visitor_valuebox_ci::visit_sequence (be_sequence *node)
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
   be_decl * vb_node = this->ctx_->node ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_default_constructor_alloc (node);
   this->emit_constructor_one_arg_alloc (node);
@@ -240,21 +233,21 @@ be_visitor_valuebox_ci::visit_sequence (be_sequence *node)
       << vb_node->name () << "::maximum (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value->maximum ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Generate length() accessor
   *os << "ACE_INLINE ::CORBA::ULong " << be_nl
       << vb_node->name () << "::length (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value->length ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Generate length() setter
   *os << "ACE_INLINE void " << be_nl
       << vb_node->name () << "::length ( ::CORBA::ULong length)" << be_nl
       << "{" << be_idt_nl
       << "this->_pd_value->length (length);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   return 0;
 }
@@ -287,8 +280,8 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
   be_decl * vb_node = this->ctx_->node ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_default_constructor ();
   this->emit_constructor_one_arg (node, "");
@@ -301,7 +294,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
       << node->full_name () << " val)" << be_nl
       << "{" << be_idt_nl
       << "this->_pd_value = val;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
 
   // Public constructor with one argument of type const CORBA::String_var&
@@ -310,7 +303,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
       << " (const ::CORBA::" << string_type << "_var& var)" << be_nl
       << "{" << be_idt_nl
       << "this->_pd_value = var;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Public assignment operator with one argument of type const char *
   *os << "ACE_INLINE " << vb_node->name () << " &" << be_nl
@@ -319,7 +312,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
       << "{" << be_idt_nl
       << "this->_pd_value = val;" << be_nl
       << "return *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Public assignment operator with one argument of type
   // const CORBA::String_var&
@@ -330,14 +323,14 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
       << "{" << be_idt_nl
       << "this->_pd_value = var;" << be_nl
       << "return *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Accessor function takes no arguments and returns a const char *
   *os << "ACE_INLINE const " << node->full_name () << be_nl
       << vb_node->name () << "::_value (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Modifier function with one argument of type char *
   *os << "ACE_INLINE void" << be_nl
@@ -345,7 +338,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
       << node->full_name () << " val)" << be_nl
       << "{" << be_idt_nl
       << "this->_pd_value = val;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Modifier function with one argument of type const char *
   *os << "ACE_INLINE void" << be_nl
@@ -353,7 +346,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
       << node->full_name () << " val)" << be_nl
       << "{" << be_idt_nl
       << "this->_pd_value = val;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Modifier function with one argument of type const CORBA::String_var&
   *os << "ACE_INLINE void" << be_nl
@@ -361,39 +354,39 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
       << "_var& var)" << be_nl
       << "{" << be_idt_nl
       << "this->_pd_value = var;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Access to the boxed value for method signatures
   *os << "ACE_INLINE const " << node->full_name () << be_nl
       << vb_node->name () << "::_boxed_in (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << node->full_name () << "&" << be_nl
       << vb_node->name () << "::_boxed_inout (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << node->full_name () << "&" << be_nl
       << vb_node->name () << "::_boxed_out (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.out ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Overloaded subscript operators
   *os << "ACE_INLINE " << char_type << " &" << be_nl
       << vb_node->name () << "::operator[] ( ::CORBA::ULong slot)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value[slot];" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << char_type << be_nl
       << vb_node->name () << "::operator[] ( ::CORBA::ULong slot) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value[slot];" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   return 0;
 }
@@ -403,15 +396,15 @@ be_visitor_valuebox_ci::visit_structure (be_structure *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_default_constructor_alloc (node);
   this->emit_constructor_one_arg_alloc (node);
   this->emit_copy_constructor_alloc (node);
   this->emit_assignment_alloc (node);
   this->emit_accessor_modifier (node);
-  
+
   // Access to the boxed value for method signatures
   if (node->size_type() == AST_Type::FIXED)
     {
@@ -428,7 +421,7 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node)
   AST_Decl *d;
   be_field *field;
   be_visitor_context ctx (*this->ctx_);
-  
+
   for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
        !si.is_done ();
         si.next ())
@@ -453,8 +446,8 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node)
                              "visit_field failed\n"
                          ), -1);
         }
-        
-      // Restore the valuebox node in the field visitor's context.  
+
+      // Restore the valuebox node in the field visitor's context.
       ctx.node (this->ctx_->node ());
     }
 
@@ -484,18 +477,18 @@ be_visitor_valuebox_ci::visit_union (be_union *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_default_constructor_alloc (node);
   this->emit_constructor_one_arg_alloc (node);
   this->emit_copy_constructor_alloc (node);
   this->emit_assignment_alloc (node);
   this->emit_accessor_modifier (node);
-  
+
   be_valuebox *vb_node =
     be_valuebox::narrow_from_decl (this->ctx_->node ());
-  
+
   if (node->size_type() == AST_Type::FIXED)
     {
       this->emit_boxed_access (node, "");
@@ -510,7 +503,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node)
   AST_Decl *d;
   be_union_branch *member;
   be_visitor_context ctx (*this->ctx_);
-  
+
   for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
        !si.is_done ();
         si.next ())
@@ -535,7 +528,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node)
                              "visit_field failed\n"
                          ), -1);
         }
-        
+
       // Restore the valuebox node to the union member visitor's
       // context.
       ctx.node (vb_node);
@@ -561,13 +554,13 @@ be_visitor_valuebox_ci::visit_union (be_union *node)
       << be_nl
       << "{" << be_idt_nl
       << "this->_pd_value->_d (val);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << bt->nested_type_name (node) << be_nl
       << vb_node->name () << "::_d (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value->_d ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   return 0;
 }
@@ -584,8 +577,8 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
   // Retrieve the node being visited by this be_visitor_valuebox_ci.
   be_decl * vb_node = this->ctx_->node ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   if (is_any)
     {
@@ -608,7 +601,7 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
           << vb_node->name () << "::_value (void) const" << be_nl
           << "{" << be_idt_nl
           << "return this->_pd_value;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       // Public modifier method
       *os << "ACE_INLINE void" << be_nl
@@ -617,26 +610,26 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
           << type_suffix << " val)" << be_nl
           << "{" << be_idt_nl
           << "this->_pd_value = val;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       // Explicit conversion functions
       *os << "ACE_INLINE " << node->full_name () << type_suffix << be_nl
           << vb_node->name () << "::_boxed_in (void) const" << be_nl
           << "{" << be_idt_nl
           << "return this->_pd_value;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       *os << "ACE_INLINE " << node->full_name () << type_suffix << "&" << be_nl
           << vb_node->name () << "::_boxed_inout (void)" << be_nl
           << "{" << be_idt_nl
           << "return this->_pd_value;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       *os << "ACE_INLINE " << node->full_name () << type_suffix << "&" << be_nl
           << vb_node->name () << "::_boxed_out (void)" << be_nl
           << "{" << be_idt_nl
           << "return this->_pd_value;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
     }
 
@@ -655,7 +648,7 @@ be_visitor_valuebox_ci::emit_default_constructor (void)
   *os << "ACE_INLINE" << be_nl;
   *os << vb_node->name () << "::" << vb_node->local_name ()
       << " (void)" << be_nl;
-  *os << "{}" << be_nl << be_nl;
+  *os << "{}" << be_nl_2;
 }
 
 void
@@ -678,7 +671,7 @@ be_visitor_valuebox_ci::emit_default_constructor_alloc (be_decl *node)
       << node->full_name ()
       << (node_not_pod ? " ()" : "") << ");" << be_uidt_nl
       << "this->_pd_value = p;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 }
 
 void
@@ -696,7 +689,7 @@ be_visitor_valuebox_ci::emit_constructor_one_arg (be_decl *node,
       << node->full_name () << type_suffix << " val)" << be_nl
       << "{" << be_idt_nl
       << "this->_pd_value = val;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 }
 
 void
@@ -717,7 +710,7 @@ be_visitor_valuebox_ci::emit_constructor_one_arg_alloc (be_decl *node)
       << "p," << be_nl
       << node->full_name () << " (value));" << be_uidt_nl
       << "this->_pd_value = p;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 }
 
 void
@@ -737,7 +730,7 @@ be_visitor_valuebox_ci::emit_copy_constructor (void)
       << be_uidt_nl
       << "{" << be_idt_nl
       << "this->_pd_value = val._pd_value;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 }
 
 void
@@ -761,7 +754,7 @@ be_visitor_valuebox_ci::emit_copy_constructor_alloc (be_decl *node)
       << "p," << be_nl
       << node->full_name () << " (val._pd_value.in ()));" << be_uidt_nl
       << "this->_pd_value = p;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 }
 
 
@@ -781,7 +774,7 @@ be_visitor_valuebox_ci::emit_assignment (be_decl *node,
       << "{" << be_idt_nl
       << "this->_pd_value = val;" << be_nl
       << "return *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 }
 
 void
@@ -804,7 +797,7 @@ be_visitor_valuebox_ci::emit_assignment_alloc (be_decl *node)
       << "*this);" << be_uidt_nl << be_nl
       << "this->_pd_value = p;" << be_nl
       << "return *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 }
 
 
@@ -821,14 +814,14 @@ be_visitor_valuebox_ci::emit_accessor_modifier (be_decl *node)
       << vb_node->name () << "::_value (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Public accessor method
   *os << "ACE_INLINE " << node->full_name () << " &" << be_nl
       << vb_node->name () << "::_value (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Public modifier method
   *os << "ACE_INLINE void" << be_nl
@@ -840,7 +833,7 @@ be_visitor_valuebox_ci::emit_accessor_modifier (be_decl *node)
       << "p," << be_nl
       << node->full_name () << " (value));" << be_uidt_nl
       << "this->_pd_value = p;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 }
 
 void
@@ -857,18 +850,18 @@ be_visitor_valuebox_ci::emit_boxed_access (be_decl *node,
       << vb_node->name () << "::_boxed_in (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << node->full_name () << "&" << be_nl
       << vb_node->name () << "::_boxed_inout (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "ACE_INLINE " << node->full_name ()
       << out_ref_modifier << "&" << be_nl
       << vb_node->name () << "::_boxed_out (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.out ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 }
diff --git a/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp b/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
index 721e6a2780c..9e7f86080e6 100644
--- a/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
+++ b/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
@@ -50,12 +50,12 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
 
   this->ctx_->node (node); // save the node
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   if (node->is_defined ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void" << be_nl
           << "TAO::Value_Traits<" << node->name  () << ">::add_ref ("
           << be_idt << be_idt_nl
@@ -65,7 +65,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
           << "::CORBA::add_ref (p);" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void" << be_nl
           << "TAO::Value_Traits<" << node->name () << ">::remove_ref ("
           << be_idt << be_idt_nl
@@ -75,7 +75,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
           << "::CORBA::remove_ref (p);" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void" << be_nl
           << "TAO::Value_Traits<" << node->name () << ">::release ("
           << be_idt << be_idt_nl
@@ -87,12 +87,12 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
     }
 
   // The _downcast method.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << node->name () << " *" << be_nl
       << node->name () << "::_downcast ( ::CORBA::ValueBase *v)" << be_nl
       << "{" << be_idt_nl
       << "return dynamic_cast< ::" << node->name () << " * > (v);"
-      << be_uidt_nl << "}" << be_nl << be_nl;
+      << be_uidt_nl << "}" << be_nl_2;
 
   // _copy_value method
   *os << "::CORBA::ValueBase *" << be_nl
@@ -104,14 +104,14 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       << node->local_name () << " (*this)," << be_nl
       << "0);" << be_nl << be_uidt_nl
       << "return result;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // The _tao_obv_repository_id method.
   *os << "const char *" << be_nl
       << node->name () << "::_tao_obv_repository_id (void) const"
       << be_nl << "{" << be_idt_nl
       << "return this->_tao_obv_static_repository_id ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "void" << be_nl
       << node->name ()
@@ -120,7 +120,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       << "{" << be_idt_nl
       << "ids.push_back (this->_tao_obv_static_repository_id ());"
       << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // _tao_match_formal_type method.  Generated because ValueBase interface
   // requires it. Since value boxes do not support inheritence, this can
@@ -130,8 +130,8 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       << "::_tao_match_formal_type (ptrdiff_t ) const" << be_nl
       << "{" << be_idt_nl
       << "return true;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-      
+      << "}" << be_nl_2;
+
 
   if (be_global->any_support ())
     {
@@ -144,7 +144,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
           << node->local_name () << " *> ("
           << "_tao_void_pointer);" << be_uidt << be_uidt_nl
           << "::CORBA::remove_ref (_tao_tmp_pointer);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
 
   // Switch streams to the *A.cpp file if we are using this option.
@@ -160,7 +160,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
           << "::_tao_type (void) const" << be_nl;
       *os << "{" << be_idt_nl;
       *os << "return ::" << node->tc_name () << ";" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
+      *os << "}" << be_nl_2;
     }
 
   // Make sure we are generating to *C.cpp regardless of the above.
@@ -181,7 +181,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
   bool is_array = false;
   const char * unmarshal_arg;
   be_predefined_type *bpt = be_predefined_type::narrow_from_decl (bt);
-  
+
   if (bpt != 0)
     {
       switch (bpt->pt())
@@ -256,7 +256,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       << "{" << be_idt_nl
       << "return " << node->name () << "::_tao_unmarshal (" << be_idt
       << be_idt << be_idt_nl
-      << " indrected_strm, vb_object);" 
+      << " indrected_strm, vb_object);"
       << be_uidt << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "ACE_NEW_RETURN (" << be_idt_nl
@@ -269,7 +269,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       *os << at->full_name()
           << "_forany temp (vb_object->_boxed_inout ());" << be_nl;
     }
-    
+
   *os << "return (strm >> ";
 
   be_string *str = be_string::narrow_from_decl (bt);
@@ -295,7 +295,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
     }
 
   *os << ");" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // _tao_unmarshal_v method.  Generated because ValueBase interface
   // requires it.  But there is nothing for it to do in the valuebox
@@ -305,7 +305,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       << "::_tao_unmarshal_v (TAO_InputCDR &)" << be_nl
       << "{" << be_idt_nl
       << "return true;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Emit the type specific elements.  The visit_* methods in this
   // module do that work.
@@ -331,8 +331,8 @@ be_visitor_valuebox_cs::visit_array (be_array * node)
   // Retrieve the node being visited by this be_visitor_valuebox_cs.
   be_decl * const vb_node = this->ctx_->node ();
 
-  os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_destructor ();
 
@@ -344,7 +344,7 @@ be_visitor_valuebox_cs::visit_array (be_array * node)
      << node->name () << "_forany temp (this->_pd_value.ptr ());"
      << be_nl
      << "return (strm << temp);" << be_uidt_nl
-     << "}" << be_nl << be_nl;
+     << "}" << be_nl_2;
 
   return 0;
 }
@@ -357,8 +357,8 @@ be_visitor_valuebox_cs::visit_enum (be_enum *)
   // Retrieve the node being visited by this be_visitor_valuebox_cs.
   be_decl * const vb_node = this->ctx_->node ();
 
-  os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_destructor ();
 
@@ -370,7 +370,7 @@ be_visitor_valuebox_cs::visit_enum (be_enum *)
      << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
      << "{" << be_idt_nl
      << "return (strm << " << marshal_arg << ");" << be_uidt_nl
-     << "}" << be_nl << be_nl;
+     << "}" << be_nl_2;
 
   return 0;
 }
@@ -451,7 +451,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
   // Retrieve the base type since we will need to do some code
   // generation for it.
   be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  
+
   if (bt == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -464,8 +464,8 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
   ctx.state (TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH);
   be_visitor_sequence_buffer_type bt_visitor (&ctx);
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   if (node->unbounded ())
     {
@@ -478,7 +478,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
           << "p," << be_nl
           << node->full_name () << " (max));" << be_uidt_nl
           << "this->_pd_value = p;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
 
   // Public constructor for sequence with supplied buffer
@@ -517,7 +517,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
 
   *os << "length, buf, release));" << be_uidt_nl
       << "this->_pd_value = p;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // end: Public constructor for sequence with supplied buffer
 
@@ -549,11 +549,11 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
     }
 
   *os << "&) this->_pd_value->operator[] (index);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // Accessor: const
   *os << "const ";
-  
+
   if (bt->accept (&bt_visitor) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -562,7 +562,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
                          "base type visit failed\n"),
                         -1);
     }
-    
+
   *os << " &" << be_nl;
   *os << vb_node->name ()
       << "::operator[] ( ::CORBA::ULong index) const" << be_nl
@@ -597,7 +597,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
       *os << "&) this->_pd_value->operator[] (index);" << be_uidt_nl;
     }
 
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   // _tao_marshal_v method
   *os << "::CORBA::Boolean " << be_nl
@@ -605,7 +605,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
       << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
       << "{" << be_idt_nl
       << "return (strm << this->_pd_value.in ());" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   return 0;
 }
@@ -618,8 +618,8 @@ be_visitor_valuebox_cs::visit_string (be_string *str)
   // Retrieve the node being visited by this be_visitor_valuebox_cs.
   be_decl * const vb_node = this->ctx_->node ();
 
-  os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_destructor ();
 
@@ -651,7 +651,7 @@ be_visitor_valuebox_cs::visit_string (be_string *str)
     }
 
   os << ");" << be_uidt_nl
-     << "}" << be_nl << be_nl;
+     << "}" << be_nl_2;
 
   return 0;
 }
@@ -664,8 +664,8 @@ be_visitor_valuebox_cs::visit_structure (be_structure *)
   // Retrieve the node being visited by this be_visitor_valuebox_cs.
   be_decl * const vb_node = this->ctx_->node ();
 
-  os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_destructor ();
 
@@ -675,7 +675,7 @@ be_visitor_valuebox_cs::visit_structure (be_structure *)
      << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
      << "{" << be_idt_nl
      << "return (strm << this->_pd_value.in ());" << be_uidt_nl
-     << "}" << be_nl << be_nl;
+     << "}" << be_nl_2;
 
   return 0;
 }
@@ -706,8 +706,8 @@ be_visitor_valuebox_cs::visit_union (be_union *)
   // Retrieve the node being visited by this be_visitor_valuebox_cs.
   be_decl * const vb_node = this->ctx_->node ();
 
-  os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_destructor ();
 
@@ -717,7 +717,7 @@ be_visitor_valuebox_cs::visit_union (be_union *)
      << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
      << "{" << be_idt_nl
      << "return (strm << this->_pd_value.in ());" << be_uidt_nl
-     << "}" << be_nl << be_nl;
+     << "}" << be_nl_2;
 
   return 0;
 }
@@ -732,7 +732,7 @@ be_visitor_valuebox_cs::emit_destructor (void)
 
   // Protected destructor
   os << vb_node->name () << "::~" << vb_node->local_name () << " (void)"
-     << be_nl << "{" << be_nl << "}" << be_nl << be_nl;
+     << be_nl << "{" << be_nl << "}" << be_nl_2;
 }
 
 int
@@ -743,8 +743,8 @@ be_visitor_valuebox_cs::emit_for_predef_enum (char const * marshal_arg)
   // Retrieve the node being visited by this be_visitor_valuebox_cs.
   be_decl * const vb_node = this->ctx_->node ();
 
-  os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   this->emit_destructor ();
 
@@ -754,7 +754,7 @@ be_visitor_valuebox_cs::emit_for_predef_enum (char const * marshal_arg)
      << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
      << "{" << be_idt_nl
      << "return (strm << " << marshal_arg << ");" << be_uidt_nl
-     << "}" << be_nl << be_nl;
+     << "}" << be_nl_2;
 
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp b/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
index 24a0c7aab73..604a9597d54 100644
--- a/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
@@ -41,8 +41,8 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node)
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   be_module *module = 0;
 
@@ -82,7 +82,7 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node)
       be_util::gen_nested_namespace_end (os, module);
 
       // Emit #else.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "#else\n\n";
     }
 
diff --git a/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
index 61815c79198..f91c1330d7c 100644
--- a/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
@@ -44,14 +44,14 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
 
   // Generate the Any <<= and >>= operator declarations
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
   // All template specializations must be generated before the instantiations
   // in the operators.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "namespace TAO" << be_nl
       << "{" << be_idt_nl
       << "template<>" << be_nl
@@ -65,7 +65,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << "_tao_elem = this->value_;" << be_nl
       << "return true;" << be_uidt_nl
       << "}" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << be_global->core_versioning_end () << be_nl;
 
@@ -101,7 +101,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
           << "{" << be_idt_nl
           << "::CORBA::add_ref (_tao_elem);" << be_nl
           << "_tao_any <<= &_tao_elem;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       *os << "// Non-copying insertion." << be_nl
           << "void" << be_nl
@@ -117,7 +117,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
           << "(*_tao_elem)->_tao_type ()," << be_nl
           << "*_tao_elem" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       *os << "::CORBA::Boolean" << be_nl
           << "operator>>= (" << be_idt << be_idt_nl
@@ -133,12 +133,12 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
           << node->tc_name ()->last_component () << "," << be_nl
           << "_tao_elem" << be_uidt_nl
           << ");" << be_uidt << be_uidt << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       be_util::gen_nested_namespace_end (os, module);
 
       // Emit #else.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "#else\n\n";
     }
 
@@ -153,7 +153,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << "{" << be_idt_nl
       << "::CORBA::add_ref (_tao_elem);" << be_nl
       << "_tao_any <<= &_tao_elem;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "// Non-copying insertion." << be_nl
       << "void" << be_nl
@@ -169,7 +169,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << "(*_tao_elem)->_tao_type ()," << be_nl
       << "*_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean" << be_nl
       << "operator>>= (" << be_idt << be_idt_nl
@@ -185,7 +185,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << node->tc_name () << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << be_global->core_versioning_end () << be_nl;
 
diff --git a/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
index 04a380e5d87..c0d670a8dd8 100644
--- a/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
@@ -131,7 +131,7 @@ be_visitor_obv_operation_arglist::visit_argument (be_argument *node)
       op =
         be_operation::narrow_from_scope (this->ctx_->scope ());
     }
-        
+
   if (op == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp b/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
index 0af487a7841..2c5073da982 100644
--- a/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
@@ -46,9 +46,9 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
                         -1);
     }
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
index df5adfef359..e2c6ce33998 100644
--- a/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
@@ -58,8 +58,8 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
                         -1);
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -81,7 +81,7 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
       << node->full_name () << "::_downcast)"
       << be_uidt_nl
       << ");" << be_uidt << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean" << be_nl
       << "operator>> (" << be_idt << be_idt_nl
@@ -93,7 +93,7 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
   *os << "return " << node->full_name ()
       << "::_tao_unmarshal (strm, _tao_valuetype);"
       << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   if (be_global->gen_ostream_operators ())
     {
diff --git a/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp b/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp
index f6596ae982f..a47d0530d4a 100644
--- a/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp
@@ -21,7 +21,7 @@ be_visitor_valuetype_field_cdr_ch::be_visitor_valuetype_field_cdr_ch (
     be_visitor_context *ctx
   )
   : be_visitor_decl (ctx),
-    pre_ (""), 
+    pre_ (""),
     post_ ("")
 {
 }
@@ -40,7 +40,7 @@ be_visitor_valuetype_field_cdr_ch::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_ch::"
                          "visit_field - "
-                         "Bad field type\n"), 
+                         "Bad field type\n"),
                         -1);
     }
 
@@ -51,7 +51,7 @@ be_visitor_valuetype_field_cdr_ch::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_ch::"
                          "visit_field - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -77,7 +77,7 @@ be_visitor_valuetype_field_cdr_ch::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_valuetype_field_cdr_ch::"
                              "visit_array - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -101,7 +101,7 @@ be_visitor_valuetype_field_cdr_ch::visit_enum (be_enum *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_valuetype_field_cdr_ch::"
                              "visit_enum - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -125,7 +125,7 @@ be_visitor_valuetype_field_cdr_ch::visit_sequence (be_sequence *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_valuetype_field_cdr_ch::"
                              "visit_sequence - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -149,7 +149,7 @@ be_visitor_valuetype_field_cdr_ch::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_valuetype_field_cdr_ch::"
                              "visit_struct - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -173,7 +173,7 @@ be_visitor_valuetype_field_cdr_ch::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_ch::"
                          "visit_typedef - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     }
 
@@ -197,7 +197,7 @@ be_visitor_valuetype_field_cdr_ch::visit_union (be_union *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_valuetype_field_cdr_ch::"
                              "visit_enum - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
diff --git a/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
index d153538c37f..45f2c303de5 100644
--- a/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
@@ -86,8 +86,8 @@ be_visitor_valuetype_field_ch::visit_array (be_array *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   if (bt->node_type () != AST_Decl::NT_typedef
       && bt->is_child (bu))
@@ -169,8 +169,8 @@ be_visitor_valuetype_field_ch::visit_enum (be_enum *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   if (bt->node_type () != AST_Decl::NT_typedef
       && bt->is_child (bu))
@@ -228,8 +228,8 @@ be_visitor_valuetype_field_ch::visit_interface (be_interface *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Set method.
   *os << pre_op () << "void " << ub->local_name () << " ( ::"
@@ -271,8 +271,8 @@ be_visitor_valuetype_field_ch::visit_interface_fwd (be_interface_fwd *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Set method.
   *os << pre_op () << "void " << ub->local_name () << " ("
@@ -314,8 +314,8 @@ be_visitor_valuetype_field_ch::visit_valuebox (be_valuebox *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Set method.
   *os << pre_op () << "void " << ub->local_name () << " ("
@@ -357,8 +357,8 @@ be_visitor_valuetype_field_ch::visit_valuetype (be_valuetype *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Set method.
   *os << pre_op () << "void " << ub->local_name () << " ("
@@ -406,8 +406,8 @@ be_visitor_valuetype_field_ch::visit_valuetype_fwd (be_valuetype_fwd *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Set method.
   *os << pre_op () << "void " << ub->local_name () << " ("
@@ -455,8 +455,8 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   switch (node->pt ())
     {
@@ -529,8 +529,8 @@ be_visitor_valuetype_field_ch::visit_sequence (be_sequence *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Not a typedef and bt is defined here.
   if (bt->node_type () != AST_Decl::NT_typedef
@@ -567,7 +567,7 @@ be_visitor_valuetype_field_ch::visit_sequence (be_sequence *node)
       // Generate the anonymous sequence member typedef.
       // This provides a consistent name to use instead of the
       // implementation-specific name.
-      *os << be_nl << be_nl << "typedef " << bt->nested_type_name (bu)
+      *os << be_nl_2 << "typedef " << bt->nested_type_name (bu)
           << " _" << ub->local_name () << "_seq;" << be_nl;
     }
 
@@ -604,8 +604,8 @@ be_visitor_valuetype_field_ch::visit_string (be_string *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_2<< "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Three methods to set the string value.
   if (node->width () == (long) sizeof (char))
@@ -670,8 +670,8 @@ be_visitor_valuetype_field_ch::visit_structure (be_structure *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_2<< "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Not a typedef and bt is defined here.
   if (bt->node_type () != AST_Decl::NT_typedef
@@ -755,8 +755,8 @@ be_visitor_valuetype_field_ch::visit_union (be_union *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_2<< "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Not a typedef and bt is defined here.
   if (bt->node_type () != AST_Decl::NT_typedef
diff --git a/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
index a00b41e4e54..dac42b42556 100644
--- a/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
@@ -141,8 +141,8 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
                        bt->full_name ());
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
@@ -217,8 +217,8 @@ be_visitor_valuetype_field_cs::visit_enum (be_enum *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "/// Accessor to set the member." << be_nl
       << this->pre_op() << "void" << be_nl;
@@ -286,8 +286,8 @@ be_visitor_valuetype_field_cs::visit_interface (be_interface *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
@@ -304,7 +304,7 @@ be_visitor_valuetype_field_cs::visit_interface (be_interface *node)
       << bu->field_pd_postfix () << " =" << be_idt_nl
       << "TAO::Objref_Traits< ::" << bt->name ()
       << ">::duplicate (val);" << be_uidt << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   *os << "/// Retrieve the member." << be_nl
       << this->pre_op () << bt->name () << "_ptr " << be_nl;
@@ -355,8 +355,8 @@ be_visitor_valuetype_field_cs::visit_interface_fwd (be_interface_fwd *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
@@ -372,7 +372,7 @@ be_visitor_valuetype_field_cs::visit_interface_fwd (be_interface_fwd *node)
       << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << " = " << bt->name () << "::_duplicate (val);" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   *os << "/// Retrieve the member" << be_nl
       << this->pre_op () << bt->name () << "_ptr " << be_nl;
@@ -429,8 +429,8 @@ be_visitor_valuetype_field_cs::valuetype_common (be_type *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
@@ -447,7 +447,7 @@ be_visitor_valuetype_field_cs::valuetype_common (be_type *node)
       << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << " = val;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   *os << "/// Retrieve the member" << be_nl
       << this->pre_op () << bt->name () << " *" << be_nl;
@@ -510,8 +510,8 @@ be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
@@ -528,7 +528,7 @@ be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
       << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << " = val;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   *os << "/// Retrieve the member." << be_nl
       << this->pre_op () << bt->name () << " *" << be_nl;
@@ -586,8 +586,8 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
@@ -640,7 +640,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
       break;
   }
 
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   switch (node->pt ())
   {
@@ -675,7 +675,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
           << bu->field_pd_prefix () << ub->local_name ()
           << bu->field_pd_postfix ()
           << ";" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       *os << "// Retrieve the member" << be_nl
           << this->pre_op () << "::" << bt->name () << " &" << be_nl;
@@ -761,8 +761,8 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // (1) set from a const
   *os << "// Accessor to set the member." << be_nl
@@ -779,7 +779,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
       << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << " = val;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   *os << "// Readonly get method." << be_nl
       << this->pre_op () << "const " << bt->name () << " &" << be_nl;
@@ -794,7 +794,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
       << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << ";" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "// Read/write get method." << be_nl
       << this->pre_op () << bt->name () << " &" << be_nl;
@@ -833,8 +833,8 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
 
   // Three methods to set the string value.
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
@@ -857,7 +857,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
       << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << " = (val);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // (2) Set method from const char * or const wchar*.
   *os << "// Accessor to set the member." << be_nl
@@ -893,7 +893,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
       *os << "::CORBA::wstring_dup (val);" << be_uidt_nl;
     }
 
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   // (3) Set from const String_var&.
   *os << "// Accessor to set the member." << be_nl
@@ -930,7 +930,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
       << bu->field_pd_postfix ()
       << " = "
       << ub->local_name () << "_var._retn ();" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   if (node->width () == (long) sizeof (char))
     {
@@ -1002,8 +1002,8 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // (1) Set from a const.
   *os << "// Accessor to set the member." << be_nl
@@ -1119,8 +1119,8 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node)
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "// Accessor to set the member" << be_nl
       << this->pre_op () << "void" << be_nl;
diff --git a/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
index 8a6e3c08018..4da86d449bd 100644
--- a/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
@@ -32,7 +32,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
 
   *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "::CORBA::Boolean" << be_nl;
 
@@ -96,7 +96,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_marshal_cs::"
                          "visit_valuetype - "
-                         "codegen for field out cdr scope failed\n"), 
+                         "codegen for field out cdr scope failed\n"),
                         -1);
     }
 
@@ -125,7 +125,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
     }
 
   *os << "return true;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << "}" << be_nl_2;
 
   // Set the substate as generating code for the input operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_INPUT);
@@ -205,7 +205,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
     }
     else
       *os << "return true;";
-  *os << be_uidt_nl << "}" << be_nl << be_nl;
+  *os << be_uidt_nl << "}" << be_nl_2;
 
   *os << "void" << be_nl;
 
@@ -214,7 +214,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
   *os << "::truncation_hook (void)" << be_nl
       << "{" << be_idt_nl
       << "this->require_truncation_ = true;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   return 0;
 }
@@ -267,9 +267,13 @@ be_visitor_valuetype_marshal_cs::gen_fields (be_valuetype *node,
                             -1);
         }
 
+      // (JP) 2010-10-21
+      // be_attribute now inherits from be_field, so we need this check.
+      be_attribute *attr = be_attribute::narrow_from_decl (d);
+
       be_field *field = be_field::narrow_from_decl (d);
 
-      if (field)
+      if (field != 0 && attr == 0)
         {
           if (n_processed > 0)
             {
diff --git a/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp b/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
index 82c62ac1892..d6890bcb1e3 100644
--- a/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
@@ -41,8 +41,8 @@ be_visitor_obv_module::visit_module (be_module *node)
 
       if (this->ctx_->state () == TAO_CodeGen::TAO_MODULE_OBV_CH)
         {
-          *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-              << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+          *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+              << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
           *os << "namespace ";
 
@@ -65,7 +65,7 @@ be_visitor_obv_module::visit_module (be_module *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_obv_module::"
                              "visit_module - "
-                             "codegen for scope failed\n"), 
+                             "codegen for scope failed\n"),
                             -1);
         }
 
@@ -119,7 +119,7 @@ be_visitor_obv_module::visit_valuetype (be_valuetype *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_obv_module::"
                          "visit_valuetype - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
diff --git a/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
index 5f3d7fde7d2..370f72e5712 100644
--- a/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
@@ -110,7 +110,7 @@ be_visitor_valuetype::visit_attribute (be_attribute *node)
                          "codegen for get_attribute failed\n"),
                         -1);
     }
-    
+
   get_op.destroy ();
 
   if (node->readonly ())
@@ -153,7 +153,7 @@ be_visitor_valuetype::visit_attribute (be_attribute *node)
                          "codegen for set_attribute failed\n"),
                         -1);
     }
-    
+
   set_op.destroy ();
   rt.destroy ();
 
@@ -685,8 +685,9 @@ be_visitor_valuetype::gen_pd (be_valuetype *node)
         }
 
       be_field *field = be_field::narrow_from_decl (d);
+      be_attribute *attr = be_attribute::narrow_from_decl (d);
 
-      if (!field)
+      if (field == 0 || attr != 0)
         {
           continue;
         }
@@ -780,9 +781,13 @@ be_visitor_valuetype::gen_obv_init_constructor_args (be_valuetype *node,
        !si.is_done ();
        si.next())
     {
+      // be_attribute inherits from be_field
+      // so we have to also screen out attributes
       be_field *f = be_field::narrow_from_decl (si.item ());
+      be_attribute *attr =
+        be_attribute::narrow_from_decl (si.item ());
 
-      if (f == 0)
+      if (f == 0 || attr != 0)
         {
           continue;
         }
@@ -803,7 +808,7 @@ be_visitor_valuetype::gen_obv_init_constructor_args (be_valuetype *node,
                        &sn);
       ft->seen_in_operation (seen);
       visitor.visit_argument (&arg);
-      
+
       // AST_Argument inherits from AST_Field, which will destroy
       // its field type if it is anonymous - we don't want that.
       arg.be_decl::destroy ();
@@ -823,8 +828,8 @@ be_visitor_valuetype::gen_init_defn (be_valuetype *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "class " << be_global->stub_export_macro ()
       << " " << node->local_name ()
@@ -904,14 +909,14 @@ be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node)
 
   // If we inherit from CORBA::Object and/or CORBA::AbstractBase
   // (in addition to CORBA::ValueBase) we have to override _add_ref()
-  // and _remove_ref() by calling the one in DefaultValueRefCountBase 
+  // and _remove_ref() by calling the one in DefaultValueRefCountBase
   // to avoid ambiguity.
   if (node->n_supports () > 0)
     {
       return true;
     }
 
-  // VT needs RefCounter if it has concrete factory. 
+  // VT needs RefCounter if it has concrete factory.
   if (be_valuetype::FS_CONCRETE_FACTORY == node->determine_factory_style ())
     {
       return true;
diff --git a/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
index 2579e9e9243..c6ebd76e1f9 100644
--- a/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -47,19 +47,19 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   TAO_OutStream *os = this->ctx_->stream ();
   int status = 0;
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   if (node->node_type () == AST_Decl::NT_eventtype)
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "class " << node->local_name () << "Consumer;" << be_nl
           << "typedef " << node->local_name () << "Consumer *"
           << node->local_name () << "Consumer_ptr;";
     }
 
   // Now generate the class definition.
-  *os << be_nl << be_nl << "class " << be_global->stub_export_macro ()
+  *os << be_nl_2 << "class " << be_global->stub_export_macro ()
       << " " << node->local_name ();
 
   // Node valuetype inherits from other valuetypes (OMG 20.17.9)
@@ -167,40 +167,40 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   *os << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "public:" << be_idt;
-      
+
   node->gen_stub_decls (os);
 
   if (is_an_amh_exception_holder)
     {
       // Generate the constructor and destructor.
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << node->local_name () << " ( ::CORBA::Exception *ex)" << be_idt_nl
           << ": exception (ex)" << be_uidt_nl
-          << "{}" << be_nl << be_nl
+          << "{}" << be_nl_2
           << "virtual ~" << node->local_name () << " (void);";
     }
 
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "static " << node->local_name () << "* "
       << "_downcast ( ::CORBA::ValueBase *v);" << be_nl
       << be_nl
-      << "// (TAO extensions or internals)" << be_nl
+      << "/// TAO extensions or internals" << be_nl
       << "static ::CORBA::Boolean _tao_unmarshal (" << be_idt << be_idt_nl
       << "TAO_InputCDR &strm," << be_nl
-      << node->local_name () << " *&new_object" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl
+      << node->local_name () << " *&new_object);" << be_uidt
+      << be_uidt_nl << be_nl
       << "virtual const char* "
       << "_tao_obv_repository_id (void) const;"
-      << be_nl << be_nl
+      << be_nl_2
       << "virtual void "
       << "_tao_obv_truncatable_repo_ids (Repository_Id_List &) const;"
-      << be_nl << be_nl
+      << be_nl_2
       << "static const char* "
       << "_tao_obv_static_repository_id (void);";
 
   if (be_global->tc_support ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;";
     }
 
@@ -234,7 +234,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
                         -1);
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // If we inherit from CORBA::Object and/or CORBA::AbstractBase
@@ -257,7 +257,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   if (!is_an_amh_exception_holder)
     {
       *os << "virtual ~" << node->local_name () << " (void);"
-          << be_nl << be_nl;
+          << be_nl_2;
     }
 
   // Support for marshalling.
@@ -270,7 +270,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
       *os << "virtual ::CORBA::Boolean "
           << "_tao_match_formal_type (ptrdiff_t ) const;" << be_nl;
     }
-    
+
   if (be_global->gen_ostream_operators ())
     {
       *os << "virtual std::ostream &_tao_stream_v (std::ostream &) const;"
@@ -324,7 +324,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
               *os << "virtual ::CORBA::Boolean" << be_nl
                   << "_tao_marshal__" << node->flat_name ()
                   << " (TAO_OutputCDR &, TAO_ChunkInfo &) const;"
-                  << be_nl << be_nl;
+                  << be_nl_2;
               *os << "virtual ::CORBA::Boolean" << be_nl
                   << "_tao_unmarshal__" << node->flat_name ()
                   << " (TAO_InputCDR &, TAO_ChunkInfo &);";
@@ -334,7 +334,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
               *os << "virtual ::CORBA::Boolean" << be_nl
                   << "_tao_marshal__" << node->flat_name ()
                   << " (TAO_OutputCDR &, TAO_ChunkInfo &) const = 0;"
-                  << be_nl << be_nl;
+                  << be_nl_2;
               *os << "virtual ::CORBA::Boolean" << be_nl
                   << "_tao_unmarshal__" << node->flat_name ()
                   << " (TAO_InputCDR &, TAO_ChunkInfo &) = 0;";
@@ -392,7 +392,7 @@ be_visitor_valuetype_ch::visit_operation (be_operation *node)
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node); // save the node
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl;
 
   // Every operation is declared public and virtual in the client code.
diff --git a/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
index 42588cdc747..8dc3923c7bd 100644
--- a/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
@@ -42,8 +42,8 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *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_2 << "// TAO_IDL - Generated from " << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << "ACE_INLINE" << be_nl;
   *os << node->name () << "::" << node->local_name () << " (void)" << be_nl;
@@ -52,10 +52,10 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
     {
       *os << "{" << be_idt_nl
           << "this->is_truncatable_ = true;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
   else
-    *os << "{}" << be_nl << be_nl;
+    *os << "{}" << be_nl_2;
 
 
   *os << "ACE_INLINE const char* " << be_nl
diff --git a/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index 89ccc543ffe..2183de6ee02 100644
--- a/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -51,50 +51,50 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   if (node->is_defined ())
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void" << be_nl
           << "TAO::Value_Traits<" << node->name  () << ">::add_ref ("
           << be_idt << be_idt_nl
-          << node->name () << " * p" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->name () << " * p)" << be_uidt
+          << be_uidt_nl
           << "{" << be_idt_nl
           << "::CORBA::add_ref (p);" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void" << be_nl
           << "TAO::Value_Traits<" << node->name () << ">::remove_ref ("
           << be_idt << be_idt_nl
-          << node->name () << " * p" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->name () << " * p)" << be_uidt
+          << be_uidt_nl
           << "{" << be_idt_nl
           << "::CORBA::remove_ref (p);" << be_uidt_nl
           << "}";
 
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "void" << be_nl
           << "TAO::Value_Traits<" << node->name () << ">::release ("
           << be_idt << be_idt_nl
-          << node->name () << " * p" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->name () << " * p)" << be_uidt
+          << be_uidt_nl
           << "{" << be_idt_nl
           << "::CORBA::remove_ref (p);" << be_uidt_nl
           << "}";
     }
 
   // The _downcast method.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << node->name () << " *" << be_nl << node->name ()
       << "::_downcast ( ::CORBA::ValueBase *v)" << be_nl
       << "{" << be_idt_nl
       << "return dynamic_cast< ::" << node->name ()
       << " * > (v);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   // The _tao_obv_repository_id method.
   *os << "const char *" << be_nl
@@ -103,7 +103,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << "{" << be_idt_nl
       << "return this->_tao_obv_static_repository_id ();"
       << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}" << be_nl_2;
 
   *os << "void" << be_nl
       << node->name ()
@@ -117,11 +117,11 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       *os << be_nl
           << node->inherits_concrete ()->name ()
           << "::_tao_obv_truncatable_repo_ids (ids);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
   else
     {
-      *os << be_uidt_nl << "}" << be_nl << be_nl;
+      *os << be_uidt_nl << "}" << be_nl_2;
     }
 
   if (be_global->any_support ())
@@ -135,7 +135,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << node->local_name () << " *> ("
           << "_tao_void_pointer);" << be_uidt << be_uidt_nl
           << "::CORBA::remove_ref (_tao_tmp_pointer);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
 
   // Switch streams to the *A.cpp file if we are using this option.
@@ -151,7 +151,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << "::_tao_type (void) const" << be_nl;
       *os << "{" << be_idt_nl;
       *os << "return ::" << node->tc_name () << ";" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
+      *os << "}" << be_nl_2;
     }
 
   // Make sure we are generating to *C.cpp regardless of the above.
@@ -165,7 +165,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   //    "-fvisibility-inlines-hidden" command line option is used.
   *os << node->name () << "::~" << node->local_name () << " (void)"
       << be_nl
-      << "{}" << be_nl << be_nl;
+      << "{}" << be_nl_2;
 
   bool is_an_amh_exception_holder =
     this->is_amh_exception_holder (node);
@@ -197,7 +197,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
               << " (strm, ci);" << be_uidt_nl;
         }
 
-      *os << "}" << be_nl << be_nl;
+      *os << "}" << be_nl_2;
 
       // The virtual _tao_unmarshal_v method.
       *os << "::CORBA::Boolean " << be_nl
@@ -224,7 +224,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
               << " (strm,ci);" << be_uidt_nl;
         }
 
-      *os << "}" << be_nl << be_nl;
+      *os << "}" << be_nl_2;
 
       *os << "::CORBA::Boolean " << be_nl
           << node->name ()
@@ -233,7 +233,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << "{" << be_idt_nl
           << "return formal_type_id == reinterpret_cast<ptrdiff_t> ("
           << node->name() << "::_downcast);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
     }
   else if (is_an_amh_exception_holder)
@@ -249,7 +249,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << be_nl
           << "{" << be_idt_nl
           << "return true;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       // The virtual _tao_unmarshal_v method.
       *os << "::CORBA::Boolean" << be_nl
@@ -257,7 +257,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << be_nl
           << "{" << be_idt_nl
           << "return true;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       // The virtual _tao_match_formal_type method.
       *os << "::CORBA::Boolean " << be_nl
@@ -266,7 +266,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << be_nl
           << "{" << be_idt_nl
           << "return false;"<< be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
 
       if (!node->opt_accessor () && !node->is_abstract ())
@@ -276,17 +276,17 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
               << " (TAO_OutputCDR &, TAO_ChunkInfo&) const" << be_nl
               << "{" << be_idt_nl
               << "return true;" << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
 
           *os << "::CORBA::Boolean" << be_nl
               << node->name () << "::_tao_unmarshal__" << node->flat_name ()
               << " (TAO_InputCDR &, TAO_ChunkInfo&)" << be_nl
               << "{" << be_idt_nl
               << "return true;" << be_uidt_nl
-              << "}" << be_nl << be_nl;
+              << "}" << be_nl_2;
         }
     }
-    
+
   if (be_global->gen_ostream_operators ())
     {
       *os << "std::ostream &" << be_nl
@@ -294,19 +294,19 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << be_nl
           << "{" << be_idt_nl
           << "strm << \"" << node->name () << "(\"";
-          
-      unsigned long index = 0;         
+
+      unsigned long index = 0;
       this->gen_ostream_operator_r (node, index);
-        
+
       *os << be_nl
-          << "     << \")\";" << be_nl << be_nl
+          << "     << \")\";" << be_nl_2
           << "return strm;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
 
   // The static T::_tao_unmarshal method
 
-  *os << "::CORBA::Boolean " << node->name()
+  *os << "::CORBA::Boolean " << be_nl << node->name()
       << "::_tao_unmarshal (" << be_idt << be_idt_nl
       << "TAO_InputCDR &strm," << be_nl
       << node->local_name () << " *&new_object" << be_uidt_nl
@@ -322,19 +322,20 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << "base," << be_nl
       << node->local_name () << "::_tao_obv_static_repository_id ()," << be_nl
       << "is_null_object," << be_nl
-      << "is_indirected" << be_uidt_nl << be_nl
+      << "is_indirected" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl << be_nl
-      << "::CORBA::ValueBase_var owner (base);" << be_nl << be_nl
+      << "::CORBA::ValueBase_var owner (base);" << be_nl_2
       << "if (!retval)" << be_idt_nl
       << "return false;" << be_uidt_nl << be_nl
-      << "if (is_null_object)"  << be_idt_nl
+      << "if (is_null_object)" << be_idt_nl
       << "return true;" << be_uidt_nl << be_nl
-      << "if (!is_indirected && base != 0 && ! base->_tao_unmarshal_v (strm))" << be_idt_nl
+      << "if (!is_indirected && !base->_tao_unmarshal_v (strm))" << be_idt_nl
       << "return false;" << be_uidt_nl << be_nl
-      << "// Now base must be null or point to the unmarshaled object."
-      << be_nl
+      << "// Now base must point to the unmarshaled object." << be_nl
       << "// Align the pointer to the right subobject." << be_nl
       << "new_object = " << node->local_name () << "::_downcast (base);" << be_nl
+      << "if (0 == new_object)" << be_idt_nl
+      << "return false;" << be_uidt_nl << be_nl
       << "if (is_indirected)" << be_idt_nl
       << "new_object->_add_ref ();" << be_uidt_nl << be_nl
       << "owner._retn ();" << be_nl
@@ -346,7 +347,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   // to avoid ambiguity.
   if (node->n_supports () > 0)
     {
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "::CORBA::ValueBase *" << be_nl
           << node->name () << "::_tao_to_value (void)" << be_nl
           << "{" << be_idt_nl
@@ -405,8 +406,8 @@ be_visitor_valuetype_cs::visit_operation (be_operation *node)
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // STEP I: Generate the return type.
   be_type *bt = be_type::narrow_from_decl (node->return_type ());
@@ -476,35 +477,39 @@ be_visitor_valuetype_cs::gen_ostream_operator_r (be_valuetype *node,
 {
   TAO_OutStream *os = this->ctx_->stream ();
   AST_Type *parent = node->inherits_concrete ();
-    
-  // Recurse up the parent chain.  
+
+  // Recurse up the parent chain.
   if (parent != 0)
     {
       this->gen_ostream_operator_r (be_valuetype::narrow_from_decl (parent),
                                     index);
     }
-  
+
   // Generate output for the members of whichever recursion we are in.
   for (UTL_ScopeActiveIterator i (node, UTL_Scope::IK_decls);
        !i.is_done ();
        i.next ())
     {
       be_field *f = be_field::narrow_from_decl (i.item ());
-      
+      be_attribute *attr =
+        be_attribute::narrow_from_decl (i.item ());
+
       // No way to access the private members from generated code.
-      if (f == 0 || f->visibility () != AST_Field::vis_PUBLIC)
+      if (f == 0
+          || f->visibility () != AST_Field::vis_PUBLIC
+          || attr != 0)
         {
           continue;
         }
-        
+
       if (index++ != 0)
         {
           *os << " << \", \"";
         }
-        
+
       *os << be_nl
           << "     << ";
-          
+
       ACE_CString instance_name ("this->");
       instance_name += f->local_name ()->get_string ();
       f->gen_member_ostream_operator (os,
diff --git a/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
index 3a917287957..4ccabe42e9d 100644
--- a/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
@@ -55,8 +55,8 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   //@@ If I'm generating concrete class I need a RefCounter.
   os << "class " << be_global->stub_export_macro ()
@@ -85,7 +85,7 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
     }
 
   // Generate _downcast method.
-  os << be_nl << be_nl
+  os << be_nl_2
      << "static " << node->local_name () << "_init* "
      << "_downcast ( ::CORBA::ValueFactoryBase *);";
 
@@ -93,19 +93,19 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
     {
       //@@ Boris: create_for_unmarshal is still public...
       // generate create_for_unmarshal
-      os << be_nl << be_nl
+      os << be_nl_2
          << "virtual ::CORBA::ValueBase *" << be_nl
          << "create_for_unmarshal (void);";
 
       if (node->supports_abstract ())
         {
-          os << be_nl << be_nl
+          os << be_nl_2
              << "virtual ::CORBA::AbstractBase_ptr" << be_nl
              << "create_for_unmarshal_abstract (void);" << be_uidt;
         }
     }
 
-  os << be_nl << be_nl;
+  os << be_nl_2;
 
     // Proprietary extensions.
   os << "// TAO-specific extensions"
@@ -148,7 +148,7 @@ be_visitor_valuetype_init_ch::visit_factory (be_factory *node)
 
 
   // STEP I: Generate preambule.
-  os << be_nl << be_nl
+  os << be_nl_2
      << "virtual " << vt->local_name () << "* ";
 
   // STEP 2: Generate the operation name.
diff --git a/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp b/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
index 3e2360aa06a..0e7cb2a5d37 100644
--- a/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
@@ -71,21 +71,21 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
                    "%s_init",
                    node->local_name ());
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // ctor
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << fname << "::" << lname << " (void)" << be_nl
       << "{" << be_nl << "}";
 
   // dtor
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << fname << "::~" << lname << " (void)" << be_nl
       << "{" << be_nl << "}";
 
   // The _downcast method.
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << node->name () << "_init *" << be_nl << node->name ()
       << "_init::_downcast ( ::CORBA::ValueFactoryBase *v)" << be_nl
       << "{" << be_idt_nl
@@ -94,7 +94,7 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
       << "}";
 
   // tao_repository_id
-  *os << be_nl << be_nl
+  *os << be_nl_2
       << "const char* " << be_nl
       << fname << "::tao_repository_id (void)" << be_nl
       << "{" << be_idt_nl
@@ -106,7 +106,7 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
   if (factory_style == be_valuetype::FS_CONCRETE_FACTORY)
     {
       // generate create_for_unmarshal()
-      *os << be_nl << be_nl
+      *os << be_nl_2
           << "::CORBA::ValueBase *" << be_nl
           << fname << "::create_for_unmarshal (void)" << be_nl
           << "{" << be_idt_nl
@@ -121,7 +121,7 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
 
         if (node->supports_abstract ())
           {
-            *os << be_nl << be_nl
+            *os << be_nl_2
                 << "::CORBA::AbstractBase_ptr" << be_nl
                 << fname << "::create_for_unmarshal_abstract (void)" << be_nl
                 << "{" << be_idt_nl
diff --git a/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
index 7d96840e76c..eef7e416cc7 100644
--- a/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
@@ -45,13 +45,13 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ ;
 
   // OBV_ class maps only to a typedef if we are optimizing accessors.
   if (node->opt_accessor ())
     {
-      *os << be_nl << be_nl << "typedef " << node->full_name () << " ";
+      *os << be_nl_2 << "typedef " << node->full_name () << " ";
 
       if (!node->is_nested ())
         {
@@ -62,7 +62,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
     }
   else
     {
-      *os << be_nl << be_nl << "// OBV_ class" << be_nl;
+      *os << be_nl_2 << "// OBV_ class" << be_nl;
       *os << "class " << be_global->stub_export_macro() << " ";;
 
       if (!node->is_nested())
@@ -147,10 +147,10 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
       // to avoid ambiguity.
       if (node->n_supports () > 0)
         {
-          *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+          *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
               << "// " << __FILE__ << ":" << __LINE__ ;
 
-          *os << be_nl << be_nl << "virtual void _add_ref (void);" << be_nl;
+          *os << be_nl_2 << "virtual void _add_ref (void);" << be_nl;
           *os << "virtual void _remove_ref (void);";
         }
 
@@ -209,11 +209,11 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
 
           *os << "virtual ::CORBA::Boolean" << be_nl
               << "_tao_marshal__" << node->flat_name ()
-              << " (TAO_OutputCDR &, TAO_ChunkInfo &) const;" << be_nl << be_nl;
+              << " (TAO_OutputCDR &, TAO_ChunkInfo &) const;" << be_nl_2;
 
           *os << "virtual ::CORBA::Boolean" << be_nl
               << "_tao_unmarshal__" << node->flat_name ()
-              << " (TAO_InputCDR &, TAO_ChunkInfo &);" << be_nl << be_nl;
+              << " (TAO_InputCDR &, TAO_ChunkInfo &);" << be_nl_2;
 
           *os << "::CORBA::Boolean "
               << "_tao_marshal_state (TAO_OutputCDR &, TAO_ChunkInfo &) const;"
diff --git a/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp b/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
index 198fcdf617d..f55ee58087c 100644
--- a/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
@@ -62,7 +62,7 @@ be_visitor_valuetype_obv_ci::visit_valuetype (be_valuetype *node)
                              ), -1);
         }
     } // if !opt_accessor ()
-    
+
   return 0;
 }
 
@@ -77,9 +77,9 @@ be_visitor_valuetype_obv_ci::visit_field (be_field *node)
 {
   be_visitor_context new_ctx (*this->ctx_);
   be_visitor_valuetype_field_ci visitor (&new_ctx);
-  
+
   visitor.in_obv_space_ = 1;
-  
+
   if (visitor.visit_field (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -88,6 +88,6 @@ be_visitor_valuetype_obv_ci::visit_field (be_field *node)
                          "visit_field failed\n"),
                         -1);
     }
-    
+
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
index 867dac9cd00..69c39553917 100644
--- a/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
@@ -44,8 +44,8 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *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_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Default constructor.
   *os << node->full_obv_skel_name () << "::";
@@ -57,7 +57,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
 
   *os << node->local_name () << " (void)" << be_nl;
   *os << ": require_truncation_ (false)" << be_nl
-      << "{}" << be_nl << be_nl;
+      << "{}" << be_nl_2;
 
   // Initializing constructor.
   if (node->has_member ())
@@ -82,7 +82,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
       this->gen_obv_init_constructor_inits (node);
 
       *os << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
     }
 
   // Destructor.
@@ -101,13 +101,13 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
   // or the valuetype is abstract.
   if (!node->opt_accessor ())
     {
-      *os << be_nl << be_nl << "::CORBA::Boolean" << be_nl
+      *os << be_nl_2 << "::CORBA::Boolean" << be_nl
           << node->full_obv_skel_name ()
           << "::_tao_marshal__" << node->flat_name ()
           <<    " (TAO_OutputCDR &strm, TAO_ChunkInfo& ci) const" << be_nl
           << "{" << be_idt_nl
           << "return _tao_marshal_state (strm, ci);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}" << be_nl_2;
 
       *os << "::CORBA::Boolean" << be_nl
           << node->full_obv_skel_name ()
@@ -131,7 +131,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
       // to avoid ambiguity.
       if (node->n_supports () > 0)
         {
-          *os << be_nl << be_nl << "void" << be_nl
+          *os << be_nl_2 << "void" << be_nl
               << node->full_obv_skel_name ()
               << "::_add_ref (void)" << be_nl
               << "{" << be_idt_nl
@@ -198,11 +198,13 @@ be_visitor_valuetype_obv_cs::gen_obv_init_base_constructor_args (
        !si.is_done ();
        si.next())
     {
-      // be_attribute doesn't inherit from be_field (unlike the
-      // AST_* counterparts, so this screens attributes and operations.
+      // be_attribute inherits from be_field
+      // so we have to also screen out attributes
       be_field *f = be_field::narrow_from_decl (si.item ());
+      be_attribute *attr =
+        be_attribute::narrow_from_decl (si.item ());
 
-      if (f == 0)
+      if (f == 0 || attr != 0)
         {
           continue;
         }
@@ -231,11 +233,13 @@ be_visitor_valuetype_obv_cs::gen_obv_init_constructor_inits (
        !si.is_done ();
        si.next())
     {
+      // be_attribute inherits from be_field
+      // so we have to also screen out attributes
       be_field *f = be_field::narrow_from_decl (si.item ());
+      be_attribute *attr =
+        be_attribute::narrow_from_decl (si.item ());
 
-      // be_attribute doesn't inherit from be_field (unlike the
-      // AST_* counterparts, so this screens attributes and operations.
-      if (f == 0)
+      if (f == 0 || attr != 0)
         {
           continue;
         }
diff --git a/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp b/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp
index 247650ef5d6..a7b20bd1351 100644
--- a/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp
@@ -61,7 +61,7 @@ be_visitor_valuetype_sh::visit_valuetype (be_valuetype *node)
     }
 
   *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Generate the skeleton class name.
   *os << "class " << class_name.c_str () << ";" << be_nl;
@@ -102,14 +102,14 @@ be_visitor_valuetype_sh::visit_valuetype (be_valuetype *node)
       << "public:" << be_idt_nl;
 
   *os << "virtual ~" << class_name.c_str () << " (void);" << be_nl << be_uidt_nl;
-  
+
   // No copy constructor for locality constraint interface.
   *os << "private:" << be_idt_nl
       << class_name.c_str () << " (const " << class_name.c_str ()
       << "& rhs);" << be_uidt_nl;
-      
 
-  *os << "};" << be_nl << be_nl;
+
+  *os << "};" << be_nl_2;
 
   return 0;
 }
diff --git a/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp b/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
index 49b03c8d9b5..e813b7b2190 100644
--- a/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
@@ -59,7 +59,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
     this->generate_flat_name (node);
 
   *os << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // Find if we are at the top scope or inside some module,
   // pre-compute the prefix that must be added to the local name in
@@ -79,7 +79,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
   *os << full_skel_name << "::"
       << local_name_prefix << node_local_name
       << " (void)" << be_nl
-      << "{}" << be_nl << be_nl;
+      << "{}" << be_nl_2;
 
 // @@@ (JP) I'm commenting out the copy constructor for now. The
 // declaration in the skeleton header file has been made private. These
@@ -112,7 +112,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
     }
 
   *os << "ValueBase (rhs)" << be_uidt << be_uidt_nl
-      << "{}" << be_nl << be_nl;
+      << "{}" << be_nl_2;
 */
 
   *os << full_skel_name << "::~"
diff --git a/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
index aca619a2558..a3b81444abc 100644
--- a/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
@@ -53,8 +53,8 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd (
   TAO_OutStream *os = this->ctx_->stream ();
   const char *macro = this->ctx_->export_macro ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   be_module *module = 0;
 
@@ -91,14 +91,14 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd (
           << node->local_name () << " *&);";
 
       be_util::gen_nested_namespace_end (os, module);
-      
+
       *os << be_nl
           << be_global->core_versioning_end () << be_nl;
-      
+
       // emit #else
       *os << "#else\n\n";
     }
-  
+
   *os << be_global->core_versioning_begin () << be_nl;
 
   *os << macro << " void"
@@ -110,7 +110,7 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd (
   *os << macro << " ::CORBA::Boolean"
       << " operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&);";
-  
+
   *os << be_global->core_versioning_end () << be_nl;
   if (module != 0)
     {
diff --git a/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp b/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
index 1d2939f23de..902dff4ec3b 100644
--- a/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
@@ -65,7 +65,7 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_valuetype_fwd (
   // generate the CDR << and >> operator declarations (prototypes)
 
   *os << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
diff --git a/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp b/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp
index fe495eac0ae..eb3864ef6f5 100644
--- a/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp
@@ -68,9 +68,9 @@ be_visitor_valuetype_fwd_cdr_op_ci::visit_valuetype_fwd (
 
   //@@ Boris: Can I move this to be_valuetype? (as with _var, _out, etc?)
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ 
-      << be_nl << be_nl;
+  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__
+      << be_nl_2;
 
   //This is just declaration so no ACE_INLINE
   *os << be_global->stub_export_macro ()
diff --git a/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp b/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp
index 58930abbfac..9e25f9a64fc 100644
--- a/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp
+++ b/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp
@@ -37,6 +37,7 @@
 #include "utl_namelist.h"
 #include "utl_labellist.h"
 #include "utl_exprlist.h"
+#include "utl_exceptlist.h"
 
 #include "fe_obv_header.h"
 #include "nr_extern.h"
@@ -97,6 +98,9 @@ be_visitor_xplicit_pre_proc::visit_home (be_home *node)
   i->original_interface (node);
   i->set_imported (node->imported ());
 
+  // So we can generate the proper typecode.
+  i->home_equiv (true);
+
   idl_global->scopes ().push (i);
 
   if (this->visit_scope (node) != 0)
@@ -143,7 +147,11 @@ be_visitor_xplicit_pre_proc::visit_operation (be_operation *node)
                                 false),
                   -1);
 
-  home_op->be_add_exceptions (node->exceptions ());
+  UTL_ExceptList *excep_list = node->exceptions ();
+  if (0 != excep_list)
+    {
+      home_op->be_add_exceptions (excep_list->copy ());
+    }
 
   idl_global->scopes ().top ()->add_to_scope (home_op);
   idl_global->scopes ().push (home_op);
@@ -964,4 +972,3 @@ be_visitor_xplicit_pre_proc::xplicit_iface_rel_name (AST_Decl *d)
 
   return 0;
 }
-
diff --git a/TAO_IDL/be_include/be_argument.h b/TAO_IDL/be_include/be_argument.h
index 369b6fc3587..f33f53d57d4 100644
--- a/TAO_IDL/be_include/be_argument.h
+++ b/TAO_IDL/be_include/be_argument.h
@@ -33,7 +33,7 @@ public:
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/be_include/be_array.h b/TAO_IDL/be_include/be_array.h
index e359bac54bc..de0fd106a80 100644
--- a/TAO_IDL/be_include/be_array.h
+++ b/TAO_IDL/be_include/be_array.h
@@ -40,7 +40,7 @@ public:
   /// definition.
   int gen_dimensions (TAO_OutStream *os,
                       unsigned short slice = 0);
-  
+
   /// Overridden from class be_type.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
@@ -51,7 +51,7 @@ public:
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/be_include/be_attribute.h b/TAO_IDL/be_include/be_attribute.h
index 90f9770193c..a71bf7bf44f 100644
--- a/TAO_IDL/be_include/be_attribute.h
+++ b/TAO_IDL/be_include/be_attribute.h
@@ -18,13 +18,13 @@
 #define BE_ATTRIBUTE_H
 
 #include "ast_attribute.h"
-#include "be_decl.h"
+#include "be_field.h"
 
 class AST_Type;
 class be_visitor;
 
 class be_attribute : public virtual AST_Attribute,
-                     public virtual be_decl
+                     public virtual be_field
 {
 public:
   be_attribute (bool ro,
diff --git a/TAO_IDL/be_include/be_codegen.h b/TAO_IDL/be_include/be_codegen.h
index 82b04c8b877..826c3f66dc1 100644
--- a/TAO_IDL/be_include/be_codegen.h
+++ b/TAO_IDL/be_include/be_codegen.h
@@ -18,6 +18,8 @@
 
 #include "ace/Singleton.h"
 #include "ace/Synch_Traits.h"
+#include "ace/Unbounded_Queue.h"
+
 #include "TAO_IDL_BE_Export.h"
 
 class TAO_OutStream;
@@ -135,9 +137,6 @@ public:
       TAO_ROOT_CDR_OP_CH,
       TAO_ROOT_CDR_OP_CS,
 
-      TAO_ROOT_SERIALIZER_OP_CH,
-      TAO_ROOT_SERIALIZER_OP_CS,
-
       // Emitting code for sequence base type.
       TAO_SEQUENCE_BASE_CH,
 
@@ -176,11 +175,6 @@ public:
       TAO_CDR_OUTPUT,
       TAO_CDR_SCOPE,
 
-      // DDS DCPS Serializer support methods
-      TAO_MAX_MARSHALED_SIZE,
-      TAO_IS_BOUNDED_SIZE,
-      TAO_FIND_SIZE,
-
       // These are for typecode generation.
       TAO_TC_DEFN_TYPECODE,                   // top level typecode
       TAO_TC_DEFN_TYPECODE_NESTED,            // nested tc
@@ -246,7 +240,7 @@ public:
 
   /// Set the anyop source stream.
   int start_anyop_source (const char *fname);
-  
+
   int start_ciao_svnt_header (const char *fname);
   int start_ciao_svnt_source (const char *fname);
   int start_ciao_exec_header (const char *fname);
@@ -255,8 +249,6 @@ public:
   int start_ciao_conn_header (const char *fname);
   int start_ciao_conn_source (const char *fname);
   int start_ciao_ami_conn_idl (const char *fname);
-  int start_ciao_ami_rh_impl_header (const char *fname);
-  int start_ciao_ami_rh_impl_source (const char *fname);
 
   /// Generate code at the end such as the <<= and >>= operators along
   /// with the ending #endif statement.
@@ -294,7 +286,7 @@ public:
 
   /// Make sure we end with a newline.
   int end_anyop_source (void);
-  
+
   int end_ciao_svnt_header (void);
   int end_ciao_svnt_source (void);
   int end_ciao_exec_header (void);
@@ -303,8 +295,6 @@ public:
   int end_ciao_conn_header (void);
   int end_ciao_conn_source (void);
   int end_ciao_ami_conn_idl (void);
-  int end_ciao_ami_rh_impl_header (void);
-  int end_ciao_ami_rh_impl_source (void);
 
   /// Get the client header stream.
   TAO_OutStream *client_header (void);
@@ -365,16 +355,10 @@ public:
 
   /// Get the CIAO connector impl source stream.
   TAO_OutStream *ciao_conn_source (void);
-  
+
   /// Get the CIAO AMI connector IDL stream.
   TAO_OutStream *ciao_ami_conn_idl (void);
 
-  /// Get the CIAO connector impl header stream.
-  TAO_OutStream *ciao_ami_rh_impl_header (void);
-
-  /// Get the CIAO connector impl source stream.
-  TAO_OutStream *ciao_ami_rh_impl_source (void);
-  
   /// Set the gperf input file stream.
   void gperf_input_stream (TAO_OutStream *gperf_input);
 
@@ -398,11 +382,11 @@ public:
 
   /// Pass along the #ident string, if any, from the IDL file.
   void gen_ident_string (TAO_OutStream *stream) const;
-  
+
   /// Generates the export files selected on the command line.
   void gen_export_files (void);
 
-  /// Generate file include, with optional empty comment to 
+  /// Generate file include, with optional empty comment to
   /// short-circuit DOxygen.
   void gen_standard_include (TAO_OutStream *stream,
                              const char *included_file,
@@ -430,7 +414,7 @@ private:
                               const char *filepath,
                               TAO_OutStream *stream);
   void gen_typecode_includes (TAO_OutStream * stream);
-  
+
   /// Used if one or both of the CIAO code gen flags are set.
   void gen_svnt_hdr_includes (void);
   void gen_svnt_src_includes (void);
@@ -440,14 +424,16 @@ private:
   void gen_conn_hdr_includes (void);
   void gen_conn_src_includes (void);
   void gen_ami_conn_idl_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);
 
+  void gen_conn_ts_includes (ACE_Unbounded_Queue<char *> &ts_files);
+
 private:
   /// Client header stream.
   TAO_OutStream *client_header_;
@@ -512,12 +498,6 @@ private:
   /// Component connector impl source file.
   TAO_OutStream *ciao_ami_conn_idl_;
 
-  /// Component connector impl header file.
-  TAO_OutStream *ciao_ami_rh_impl_header_;
-
-  /// Component connector impl source file.
-  TAO_OutStream *ciao_ami_rh_impl_source_;
-
   /**
    * 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
diff --git a/TAO_IDL/be_include/be_component.h b/TAO_IDL/be_include/be_component.h
index 4c49b12f4a8..0122cdb0f15 100644
--- a/TAO_IDL/be_include/be_component.h
+++ b/TAO_IDL/be_include/be_component.h
@@ -22,14 +22,12 @@
 
 class AST_PortType;
 
+/**
+ * The back end extension of the AST_Component class
+ */
 class be_component : public virtual AST_Component,
                      public virtual be_interface
 {
-  // = TITLE
-  //   The back end extension of the AST_Component class
-  //
-  // = DESCRIPTION
-  //
 public:
   be_component (UTL_ScopedName *n,
                 AST_Component *base_component,
@@ -39,7 +37,7 @@ public:
                 long n_supports_flat);
 
   ~be_component (void);
-  
+
   /// Override of the AST method to eliminate narrowing of
   /// the return value. Non-virtual.
   be_component *base_component (void) const;
@@ -66,31 +64,31 @@ public:
   ACE_CDR::ULong n_publishes (void) const;
   ACE_CDR::ULong n_consumes (void) const;
   ACE_CDR::ULong n_emits (void) const;
-  
+
   /// Update the has_* members.
   void scan (UTL_Scope *s);
-  
+
   /// Generate the "public virtual" entries in the stub header.
   virtual void gen_stub_inheritance (TAO_OutStream *os);
-  
+
   /// Generate the "public virtual" entries in the skel header.
   virtual void gen_skel_inheritance (TAO_OutStream *os);
-  
+
   /// Generate the string compares for ancestors in _is_a().
   virtual int gen_is_a_ancestors (TAO_OutStream *os);
-  
+
   /// Generate setup_collocation() for base component, if any.
   virtual void gen_parent_collocation (TAO_OutStream *os);
-  
+
   // Narrowing.
 
   DEF_NARROW_FROM_DECL (be_component);
   DEF_NARROW_FROM_SCOPE (be_component);
-  
+
 private:
   /// Specialized version for mirror ports.
   void mirror_scan (AST_PortType *p);
-  
+
 private:
   /// Used by visitors to reduce footprint.
   ACE_CDR::ULong n_provides_;
diff --git a/TAO_IDL/be_include/be_connector.h b/TAO_IDL/be_include/be_connector.h
index 65cbc2d7dd0..27c5ee7d74d 100644
--- a/TAO_IDL/be_include/be_connector.h
+++ b/TAO_IDL/be_include/be_connector.h
@@ -27,13 +27,13 @@ public:
 
   /// Visiting.
   virtual int accept (be_visitor *visitor);
-  
+
   bool dds_connector (void);
   bool ami_connector (void);
-  
+
 private:
   void check_ancestors (void);
-  
+
 private:
   bool dds_connector_;
   bool ami_connector_;
diff --git a/TAO_IDL/be_include/be_consumes.h b/TAO_IDL/be_include/be_consumes.h
index 9e09c3cdc64..0aa8cfa1aea 100644
--- a/TAO_IDL/be_include/be_consumes.h
+++ b/TAO_IDL/be_include/be_consumes.h
@@ -17,18 +17,18 @@ class be_consumes : public virtual AST_Consumes,
 public:
   be_consumes (UTL_ScopedName *n,
                AST_Type *consumes_type);
-            
+
   virtual ~be_consumes (void);
-  
+
   // Non-virtual override of frontend method.
   be_eventtype *consumes_type (void) const;
-  
+
   // Narrowing.
   DEF_NARROW_FROM_DECL (be_consumes);
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 };
diff --git a/TAO_IDL/be_include/be_decl.h b/TAO_IDL/be_include/be_decl.h
index de059fdb059..8230e37a051 100644
--- a/TAO_IDL/be_include/be_decl.h
+++ b/TAO_IDL/be_include/be_decl.h
@@ -82,11 +82,6 @@ public:
   bool cli_stub_cdr_op_gen (void);
   bool cli_inline_cdr_op_gen (void);
   bool cli_inline_cdr_decl_gen (void);
-  bool cli_hdr_serializer_op_gen (void);
-  bool cli_stub_serializer_op_gen (void);
-  bool cli_inline_serializer_op_gen (void);
-  bool cli_inline_serializer_decl_gen (void);
-
   bool cli_traits_gen (void);
   bool cli_arg_traits_gen (void);
   bool srv_arg_traits_gen (void);
@@ -134,11 +129,6 @@ public:
   void cli_stub_cdr_op_gen (bool);
   void cli_inline_cdr_op_gen (bool);
   void cli_inline_cdr_decl_gen (bool);
-  void cli_hdr_serializer_op_gen (bool);
-  void cli_stub_serializer_op_gen (bool);
-  void cli_inline_serializer_op_gen (bool);
-  void cli_inline_serializer_decl_gen (bool);
-
   void cli_traits_gen (bool);
   void cli_arg_traits_gen (bool);
   void srv_arg_traits_gen (bool);
@@ -196,11 +186,6 @@ private:
   bool cli_stub_cdr_op_gen_;
   bool cli_inline_cdr_op_gen_;
   bool cli_inline_cdr_decl_gen_;
-  bool cli_hdr_serializer_op_gen_;
-  bool cli_stub_serializer_op_gen_;
-  bool cli_inline_serializer_op_gen_;
-  bool cli_inline_serializer_decl_gen_;
-
   bool cli_traits_gen_;
   bool cli_arg_traits_gen_;
   bool srv_arg_traits_gen_;
diff --git a/TAO_IDL/be_include/be_emits.h b/TAO_IDL/be_include/be_emits.h
index b8aa5d2b66a..d14d665455a 100644
--- a/TAO_IDL/be_include/be_emits.h
+++ b/TAO_IDL/be_include/be_emits.h
@@ -17,18 +17,18 @@ class be_emits : public virtual AST_Emits,
 public:
   be_emits (UTL_ScopedName *n,
             AST_Type *emits_type);
-            
+
   virtual ~be_emits (void);
-  
+
   // Non-virtual override of frontend method.
   be_eventtype *emits_type (void) const;
-  
+
   // Narrowing.
   DEF_NARROW_FROM_DECL (be_emits);
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 };
diff --git a/TAO_IDL/be_include/be_enum.h b/TAO_IDL/be_include/be_enum.h
index 95eeb8217d1..1dbba85d447 100644
--- a/TAO_IDL/be_include/be_enum.h
+++ b/TAO_IDL/be_include/be_enum.h
@@ -32,7 +32,7 @@ public:
   be_enum (UTL_ScopedName *n,
            bool local,
            bool abstract);
-  
+
   /// Overridden from class be_type.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
diff --git a/TAO_IDL/be_include/be_eventtype.h b/TAO_IDL/be_include/be_eventtype.h
index 1a4a4582c6d..95d8573f087 100644
--- a/TAO_IDL/be_include/be_eventtype.h
+++ b/TAO_IDL/be_include/be_eventtype.h
@@ -19,15 +19,14 @@
 #include "be_valuetype.h"
 #include "ast_eventtype.h"
 
+/**
+ * Backend-class for eventtypes
+ *
+ * Extends be_valuetype.
+ */
 class be_eventtype : public virtual be_valuetype,
                      public virtual AST_EventType
 {
-  // = TITLE
-  //    Backend-class for eventtypes
-  //
-  // = DESCRIPTION
-  //    Extends be_valuetype.
-  //
 public:
   be_eventtype (UTL_ScopedName *n,
                 AST_Type **inherits,
diff --git a/TAO_IDL/be_include/be_extended_port.h b/TAO_IDL/be_include/be_extended_port.h
index 1b7951db43f..e69ce8cb1f5 100644
--- a/TAO_IDL/be_include/be_extended_port.h
+++ b/TAO_IDL/be_include/be_extended_port.h
@@ -24,27 +24,23 @@
 
 class be_visitor;
 
+/**
+ * Extension of class AST_Extended_Port for C++ code generation.
+ */
 class be_extended_port : public virtual AST_Extended_Port,
                          public virtual be_field
 {
-  //
-  // = TITLE
-  //   be_extended_port
-  //
-  // = DESCRIPTION
-  //   Extension of class AST_Extended_Port for C++ code generation.
-  //
 public:
   be_extended_port (
     UTL_ScopedName *n,
     AST_PortType *porttype_ref);
-    
+
   virtual ~be_extended_port (void);
-  
+
   be_porttype *port_type (void) const;
-  
+
   virtual void destroy (void);
-  
+
   virtual int accept (be_visitor *visitor);
 
   DEF_NARROW_FROM_DECL (be_extended_port);
diff --git a/TAO_IDL/be_include/be_field.h b/TAO_IDL/be_include/be_field.h
index a2654588c19..8aa3910e3e0 100644
--- a/TAO_IDL/be_include/be_field.h
+++ b/TAO_IDL/be_include/be_field.h
@@ -30,30 +30,30 @@ public:
   be_field (AST_Type *ft,
             UTL_ScopedName *n,
             Visibility vis = vis_NA);
-            
+
   // Non-virtual override of frontend method.
   be_type *field_type (void) const;
-  
+
   // Generate debugging ostream operator for members.
   void gen_member_ostream_operator (TAO_OutStream *os,
                                     const char *instance_name,
                                     bool use_underscore,
                                     bool accessor = false);
-        
-  // Accessors for the member.                                  
+
+  // Accessors for the member.
   bool port_name_prefixed (void) const;
   void port_name_prefixed (bool val);
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
   // Narrowing.
 
   DEF_NARROW_FROM_DECL (be_field);
-  
+
 private:
   // If the name of a provides or uses node has already been
   // prefixed with the (mirror)port name(s), we don't want
diff --git a/TAO_IDL/be_include/be_generator.h b/TAO_IDL/be_include/be_generator.h
index 358ac3eb084..4f199e83947 100644
--- a/TAO_IDL/be_include/be_generator.h
+++ b/TAO_IDL/be_include/be_generator.h
@@ -276,24 +276,24 @@ public:
 
   virtual
   AST_PortType *create_porttype (UTL_ScopedName *n);
-    
+
   virtual
   AST_Provides *create_provides (UTL_ScopedName *n,
                                  AST_Type *provides_type);
-                                 
+
   virtual
   AST_Uses *create_uses (UTL_ScopedName *n,
                          AST_Type *uses_type,
                          bool is_multiple);
-    
+
   virtual
   AST_Publishes *create_publishes (UTL_ScopedName *n,
                                    AST_Type *publishes_type);
-    
+
   virtual
   AST_Emits *create_emits (UTL_ScopedName *n,
                            AST_Type *emits_type);
-    
+
   virtual
   AST_Consumes *create_consumes (UTL_ScopedName *n,
                                  AST_Type *consumes_type);
@@ -301,34 +301,34 @@ public:
   AST_Extended_Port *create_extended_port (
     UTL_ScopedName *n,
     AST_PortType *porttype_ref);
-    
+
   virtual
   AST_Mirror_Port *create_mirror_port (
     UTL_ScopedName *n,
     AST_PortType *porttype_ref);
-    
+
   virtual
   AST_Connector *create_connector (
     UTL_ScopedName *n,
     AST_Connector *base_connector);
-    
+
   virtual
   AST_Template_Module *create_template_module (
     UTL_ScopedName *n,
     FE_Utils::T_PARAMLIST_INFO *template_params);
-    
+
   virtual
   AST_Template_Module_Inst *create_template_module_inst (
     UTL_ScopedName *n,
     AST_Template_Module *ref,
     FE_Utils::T_ARGLIST *template_args);
-    
+
   virtual
   AST_Template_Module_Ref *create_template_module_ref (
     UTL_ScopedName *n,
     AST_Template_Module *ref,
     UTL_StrList *param_refs);
-    
+
   virtual
   AST_Param_Holder *create_param_holder (
     UTL_ScopedName *parameter_name,
diff --git a/TAO_IDL/be_include/be_global.h b/TAO_IDL/be_include/be_global.h
index ec6ac40ff4b..ba52b8e1656 100644
--- a/TAO_IDL/be_include/be_global.h
+++ b/TAO_IDL/be_include/be_global.h
@@ -51,10 +51,11 @@ public:
   /// connectors.
   enum DDS_IMPL
   {
-    NONE,
+    DDS_NONE,
     NDDS,
     OPENSPLICE,
-    OPENDDS
+    OPENDDS,
+    COREDX
   };
 
   BE_GlobalData (void);
@@ -486,25 +487,25 @@ public:
   /// 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);
   const char* ciao_svnt_source_ending (void) const;
-  
+
   void ciao_exec_header_ending (const char* s);
   const char* ciao_exec_header_ending (void) const;
-  
+
   void ciao_exec_source_ending (const char* s);
   const char* ciao_exec_source_ending (void) const;
-  
+
   void ciao_exec_stub_header_ending (const char* s);
   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;
 
@@ -526,6 +527,10 @@ public:
   void ciao_ami_conn_impl_src_ending (const char* s);
   const char* ciao_ami_conn_impl_src_ending (void) const;
 
+  /// For optionally controlling the container type, default is Session
+  void ciao_container_type (const char* s);
+  const char* ciao_container_type (void) const;
+
   /// Set the clonable_in_args.
   void use_clonable_in_args (bool clonable);
 
@@ -558,6 +563,14 @@ public:
    */
   const char* output_dir (void) const;
 
+  /// Set the path for all *C.* file includes.
+  /// Default is local directory or $TAO_ROOT/tao.
+  void stub_include_dir (const char* s);
+
+  /// Get the path for all *C.* file includes.
+  /// Default is local directory or $TAO_ROOT/tao.
+  const char* stub_include_dir (void) const;
+
   /// Set the directory where all the *S.* files are
   /// to be kept. Default is output_dir_.
   void skel_output_dir (const char* s);
@@ -640,6 +653,12 @@ public:
   /// Check if we want to generate for Minimum CORBA
   bool gen_minimum_corba (void) const;
 
+  /// Set whether we want to generate for noeventCCM
+  void gen_noeventccm (bool);
+
+  /// Check if we want to generate for noeventCCM
+  bool gen_noeventccm (void) const;
+
   /// Set whether we want to generate for LwCCM
   void gen_lwccm (bool);
 
@@ -691,18 +710,6 @@ public:
   bool gen_inline_constants (void) const;
 
   /// Set the flag.
-  void gen_dcps_type_support (bool value);
-
-  /// Return the flag.
-  bool gen_dcps_type_support (void) const;
-
-  /// Set the flag.
-  void gen_dcps_type_support_only (bool value);
-
-  /// Return the flag.
-  bool gen_dcps_type_support_only (void) const;
-
-  /// Set the flag.
   void gen_orb_h_include (bool value);
 
   /// Return the flag.
@@ -728,6 +735,12 @@ public:
   /// Default is NDDS.
   DDS_IMPL dds_impl (void) const;
 
+  /// Set the suffix of OpenDDS-specific native sequences.
+  void opendds_sequence_suffix (const char *val);
+
+  /// Return the suffix of OpenDDS-specific native sequences.
+  const char *opendds_sequence_suffix (void) const;
+
   /// Cleanup function.
   void destroy (void);
 
@@ -789,21 +802,27 @@ public:
   /// Accessors for the member gen_unique_guards_.
   bool gen_unique_guards (void) const;
   void gen_unique_guards (bool val);
-  
+
   /// 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_exec_reactor_impl (void) const;
+  void gen_ciao_exec_reactor_impl (bool val);
+
   bool gen_ciao_conn_impl (void) const;
   void gen_ciao_conn_impl (bool val);
 
+  bool gen_dds_typesupport_idl (void) const;
+  void gen_dds_typesupport_idl (bool val);
+
   bool gen_ciao_valuefactory_reg (void) const;
   void gen_ciao_valuefactory_reg (bool val);
 
@@ -824,10 +843,13 @@ public:
 
   bool gen_lem_force_all (void) const;
   void gen_lem_force_all (bool val);
-  
+
   bool alt_mapping (void) const;
   void alt_mapping (bool val);
 
+  bool in_facet_servant (void) const;
+  void in_facet_servant (bool val);
+
   unsigned long tab_size (void) const;
   void tab_size (unsigned long val);
 
@@ -957,7 +979,7 @@ private:
 
   /// CIAO AMI connector IDL file name ending. Default is "A.idl".
   char* ciao_ami_conn_idl_ending_;
-  
+
   /// CIAO AMI reply handler impl header file name ending.
   /// Default is "A_impl.h".
   char* ciao_ami_conn_impl_hdr_ending_;
@@ -966,6 +988,10 @@ private:
   /// Default is "A_impl.cpp".
   char* ciao_ami_conn_impl_src_ending_;
 
+  /// CIAO container type
+  /// Default is "Session".
+  char* ciao_container_type_;
+
   /**
    * Directory where all the IDL-Compiler-Generated files are to be
    * kept. Default value is 0 for this string which means the current
@@ -974,6 +1000,12 @@ private:
   char* output_dir_;
 
   /**
+   * Path for all *C.* includes. Default value is 0, in which case
+   * the local directory or $TAO_ROOT/tao is used.
+   */
+  char* stub_include_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.
@@ -1023,6 +1055,9 @@ private:
   /// are we generating for LwCCM
   bool gen_lwccm_;
 
+  /// are we generating for noeventCCM
+  bool gen_noeventccm_;
+
   /// do we generate optimized typecodes?
   bool opt_tc_;
 
@@ -1052,14 +1087,6 @@ private:
   /// generation that pleases the C++ compiler better on some platforms.
   bool gen_inline_constants_;
 
-  /// 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 only definitions.
-  /// Only generate DDS Serializer operators for tao/*Seq.pidl.
-  bool gen_dcps_type_support_only_;
-
   /// Flag to indicate whether ORB.h include should be generated, needed for
   /// regenerating the pidl files.
   bool gen_orb_h_include_;
@@ -1073,6 +1100,10 @@ private:
   /// The enumerated value indicating the DDS implementation.
   DDS_IMPL dds_impl_;
 
+  /// Option to customize the suffix of OpenDDS-specific sequences,
+  /// for use with CIAO's dds4ccm implementation.
+  ACE_CString opendds_sequence_suffix_;
+
   /// Used for void operation return types.
   AST_PredefinedType *void_type_;
 
@@ -1144,11 +1175,15 @@ private:
   bool gen_ciao_svnt_;
   bool gen_ciao_exec_idl_;
   bool gen_ciao_exec_impl_;
+  bool gen_ciao_exec_reactor_impl_;
 
   /// False by default, this flag triggers code generation
   /// for CCM connector implementations.
   bool gen_ciao_conn_impl_;
 
+  /// Used for DDS implementations other than OpenDDS.
+  bool gen_dds_typesupport_idl_;
+
   /// Generate automatic valuetype factory registration in
   /// CIAO servants.
   bool gen_ciao_valuefactory_reg_;
@@ -1166,9 +1201,12 @@ private:
 
   /// 2 spaces by default, can be set from the command line.
   unsigned int tab_size_;
-  
+
+  /// Are we generating STL types?
   bool alt_mapping_;
-  // Are we generating STL types?
+
+  /// Are we generating a facet servant?
+  bool in_facet_servant_;
 };
 
 #endif /* _BE_GLOBAL_H */
diff --git a/TAO_IDL/be_include/be_helper.h b/TAO_IDL/be_include/be_helper.h
index 18883539ede..fa1938ef12a 100644
--- a/TAO_IDL/be_include/be_helper.h
+++ b/TAO_IDL/be_include/be_helper.h
@@ -31,35 +31,39 @@ struct TAO_NL
   TAO_NL (void);
 };
 
+struct TAO_NL_2
+{
+  TAO_NL_2 (void);
+};
+
+/**
+ * Operates like a manipulator, increasing the indentation level.
+ *
+ * Increase the indentation level, if the "do_now" parameter is
+ * not zero then the <indent> method is called on the stream.
+ */
 struct TAO_INDENT
 {
-  // = TITLE
-  //   Operates like a manipulator, increasing the indentation level.
-  //
-  // = DESCRIPTION
-  //   Increase the indentation level, if the "do_now" parameter is
-  //   not zero then the <indent> method is called on the stream.
-  //
   TAO_INDENT (int do_now = 0);
 
   const int do_now_;
 };
 
+/**
+ * Operates like a manipulator, decreasing the indentation level.
+ *
+ * Decrease the indentation level, if the "do_now" parameter is
+ * not zero then the <indent> method is called on the stream.
+ */
 struct TAO_UNINDENT
 {
-  // = TITLE
-  //   Operates like a manipulator, decreasing the indentation level.
-  //
-  // = DESCRIPTION
-  //   Decrease the indentation level, if the "do_now" parameter is
-  //   not zero then the <indent> method is called on the stream.
-  //
   TAO_UNINDENT (int do_now = 0);
 
   const int do_now_;
 };
 
 extern const TAO_NL be_nl;
+extern const TAO_NL_2 be_nl_2;
 extern const TAO_INDENT be_idt;
 extern const TAO_INDENT be_idt_nl;
 extern const TAO_UNINDENT be_uidt;
@@ -78,9 +82,7 @@ struct TAO_ACE_CHECK
 
 /**
  * @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
@@ -91,7 +93,7 @@ class TAO_OutStream
 {
 public:
 
-  // Enumerated type to indicate the stream type
+  /// Enumerated type to indicate the stream type
   enum STREAM_TYPE
     {
       TAO_CLI_HDR,
@@ -153,7 +155,8 @@ public:
   int nl (void);
 
   /// "printf" style variable argument print
-  int print (const char *format, ...);
+  int print (const char *format, ...)
+    ACE_GCC_FORMAT_ATTRIBUTE (printf, 2, 3);
 
   /// Generate a #if !defined, #defined macro
   int gen_ifdef_macro (const char *flat_name,
@@ -166,6 +169,7 @@ public:
   // =overloaded operators
 
   TAO_OutStream &operator<< (const char *str);
+  TAO_OutStream &operator<< (const ACE_CString &str);
   TAO_OutStream &operator<< (const ACE_CDR::UShort num);
   TAO_OutStream &operator<< (const ACE_CDR::Short num);
   TAO_OutStream &operator<< (const ACE_CDR::ULong num);
@@ -176,6 +180,7 @@ public:
   // = MANIPULATORS
 
   TAO_OutStream &operator<< (const TAO_NL& nl);
+  TAO_OutStream &operator<< (const TAO_NL_2& nl_twice);
   TAO_OutStream &operator<< (const TAO_INDENT& i);
   TAO_OutStream &operator<< (const TAO_UNINDENT& i);
 
@@ -205,10 +210,9 @@ protected:
 
   /// Indentation level
   int indent_level_;
-  
+
   /// Used to set tab spaces.
   ACE_CString tab_unit_str_;
-  const char *tab_unit_;
 };
 
 #endif // if !defined
diff --git a/TAO_IDL/be_include/be_home.h b/TAO_IDL/be_include/be_home.h
index af11c149844..89cae16df3a 100644
--- a/TAO_IDL/be_include/be_home.h
+++ b/TAO_IDL/be_include/be_home.h
@@ -39,7 +39,7 @@ public:
            long n_supports_flat);
 
   virtual ~be_home (void);
-  
+
   void scan (UTL_Scope *s);
 
   // Cleanup function.
diff --git a/TAO_IDL/be_include/be_identifier_helper.h b/TAO_IDL/be_include/be_identifier_helper.h
index c0d20a5718e..5ef99d01291 100644
--- a/TAO_IDL/be_include/be_identifier_helper.h
+++ b/TAO_IDL/be_include/be_identifier_helper.h
@@ -30,25 +30,20 @@ class Identifier;
 class be_type;
 class be_visitor;
 
+/**
+ * 1) keeps escape (leading underscore character in generated identifier in IDL
+ * 2) removes the '_' escape character when the identifier is
+ * part of another identifier such as in provides_XXX
+ * 3) removes any '_cxx_' in generated IDL
+ */
 struct TAO_IDL_BE_Export IdentifierHelper
 {
-  //
-  // = TITLE
-  //    IdentifierHelper.
-  //
-  // = DESCRIPTION
-  //    1) keeps escape (leading underscore character in generated
-  //       identifier in IDL
-  //    2) removes the '_' escape character when the identifier is
-  //       part of another identifier such as in provides_XXX
-  //    3) removes any '_cxx_' in generated IDL
-  
   static const char *
   type_name (be_type *t, be_visitor *visitor);
-  
-  static Identifier * 
+
+  static Identifier *
   original_local_name (Identifier * local_name);
-  
+
   // Removes '_cxx_ from segments of a scoped name, and optionally
   // de-escape the last segment, if it's to be appended to.
   static ACE_CString
@@ -57,12 +52,12 @@ struct TAO_IDL_BE_Export IdentifierHelper
   // Detects case-insensitive match with IDL keyword.
   static bool
   is_idl_keyword (Identifier * local_name);
-  
+
   // Preserves the 'escape' (leading underscore) in a
   // generated identifier if necessary.
-  static ACE_CString 
+  static ACE_CString
   try_escape (Identifier * local_name);
-  
+
   static ACE_CString tmp_retval_;
 };
 
diff --git a/TAO_IDL/be_include/be_interface.h b/TAO_IDL/be_include/be_interface.h
index 72b5b0027f7..2591251a3b8 100644
--- a/TAO_IDL/be_include/be_interface.h
+++ b/TAO_IDL/be_include/be_interface.h
@@ -31,15 +31,13 @@ class be_visitor;
 
 class UTL_ExceptList;
 
+/**
+ * The back end extension of the AST_Interface class
+ */
 class be_interface : public virtual AST_Interface,
                      public virtual be_scope,
                      public virtual be_type
 {
-  // = TITLE
-  //   The back end extension of the AST_Interface class
-  //
-  // = DESCRIPTION
-  //
 public:
   // Used to pass functions to the template method.
   typedef int (*tao_code_emitter) (be_interface *,
@@ -85,10 +83,10 @@ public:
   /// proxy implementation.
   virtual const char *full_remote_proxy_impl_name (void);
 
-  /// retrieve the name of the Directx  proxy implementation.
+  /// retrieve the name of the direct proxy implementation.
   virtual const char *direct_proxy_impl_name (void);
 
-  /// retrieve the fully qualified name of the Directx  proxy
+  /// retrieve the fully qualified name of the direct proxy
   /// implementation.
   virtual const char *full_direct_proxy_impl_name (void);
 
@@ -141,7 +139,7 @@ public:
   virtual void gen_def_ctors (TAO_OutStream* os);
 
   /// Generated the global hooks used for non-defined forward
-  /// declared interfaces, and the contructor from stub object.
+  /// declared interfaces, and the constructor from stub object.
   virtual void gen_stub_ctor (TAO_OutStream* os);
 
   /// Generate the declarations used by the template _var, _out
@@ -310,9 +308,6 @@ public:
   /// applies only to implied IDL
   be_interface *original_interface (void);
 
-  /// Is Components::SessionComponent an immediate parent?
-  int session_component_child (void);
-
   /// Is EventConsumerBase our parent?
   bool is_event_consumer (void);
 
@@ -326,7 +321,7 @@ public:
                           TAO_OutStream &os);
   int gen_facet_svnt_src (be_visitor *visitor,
                           TAO_OutStream &os);
-                
+
   /// Used with ami4ccm.
   int gen_ami4ccm_idl (TAO_OutStream *os);
 
@@ -335,23 +330,23 @@ public:
 
   bool is_ami4ccm_rh (void) const;
   void is_ami4ccm_rh (bool val);
-  
+
   /// Accessors for the member.
   bool dds_connector_traits_done (void) const;
   void dds_connector_traits_done (bool val);
-  
+
   /// Generate the "public virtual" entries in the stub header.
   virtual void gen_stub_inheritance (TAO_OutStream *os);
-  
+
   /// Generate the "public virtual" entries in the skel header.
   virtual void gen_skel_inheritance (TAO_OutStream *os);
-  
+
   /// Generate the string compares for ancestors in _is_a().
   virtual int gen_is_a_ancestors (TAO_OutStream *os);
-  
+
   /// Generate setup_collocation() for base component, if any.
   virtual void gen_parent_collocation (TAO_OutStream *os);
-  
+
 protected:
   /**
    * CDreate a new string made by the concatenation
@@ -454,7 +449,7 @@ private:
    */
   void enqueue_base_component_r (AST_Component *node);
   void enqueue_base_home_r (AST_Home *node);
-  
+
 protected:
   /// Have these been done already?
   bool var_out_seq_decls_gen_;
@@ -471,9 +466,6 @@ protected:
   /// applies only to implied IDL
   be_interface *original_interface_;
 
-  /// Are we a direct child of Components::SessionComponent?
-  int session_component_child_;
-  
   /// Are we an AMI reply handler?
   bool is_ami_rh_;
 
@@ -493,8 +485,8 @@ protected:
 
   /// Used to suppress generation of some CCM servant methods/
   bool has_rw_attributes_;
-  
-  /// Flags to ensure that DDS connector impl traits members
+
+  /// Flag to ensure that DDS connector impl traits members
   /// are generated only once per port interface.
   bool dds_connector_traits_done_;
 };
diff --git a/TAO_IDL/be_include/be_mirror_port.h b/TAO_IDL/be_include/be_mirror_port.h
index cbfedd91d42..418517cb177 100644
--- a/TAO_IDL/be_include/be_mirror_port.h
+++ b/TAO_IDL/be_include/be_mirror_port.h
@@ -23,25 +23,21 @@
 
 class be_visitor;
 
+/**
+ * Extension of class AST_Mirror_Port for C++ code generation.
+ */
 class be_mirror_port : public virtual AST_Mirror_Port,
                        public virtual be_extended_port
 {
-  //
-  // = TITLE
-  //   be_mirror_port
-  //
-  // = DESCRIPTION
-  //   Extension of class AST_Mirror_Port for C++ code generation.
-  //
 public:
   be_mirror_port (
     UTL_ScopedName *n,
     AST_PortType *porttype_ref);
-    
+
   virtual ~be_mirror_port (void);
-  
+
   virtual void destroy (void);
-  
+
   virtual int accept (be_visitor *visitor);
 
   DEF_NARROW_FROM_DECL (be_mirror_port);
diff --git a/TAO_IDL/be_include/be_native.h b/TAO_IDL/be_include/be_native.h
index f3b032f5187..a5368147cf6 100644
--- a/TAO_IDL/be_include/be_native.h
+++ b/TAO_IDL/be_include/be_native.h
@@ -20,7 +20,7 @@
 
 class be_visitor;
 
-// Representation of "native" IDL type. It may be used as a 
+// Representation of "native" IDL type. It may be used as a
 // return type, parameter type, or in an operation's
 // exception list. This last usage creates special problems
 // with both syntax checking and code generation. Letting
@@ -40,7 +40,7 @@ public:
 
   /// Return typecode size.
   virtual long tc_size (void);
-  
+
   /// Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/be_include/be_null_return_emitter.h b/TAO_IDL/be_include/be_null_return_emitter.h
index ecdc9ff019d..5d3e24ac2d7 100644
--- a/TAO_IDL/be_include/be_null_return_emitter.h
+++ b/TAO_IDL/be_include/be_null_return_emitter.h
@@ -27,9 +27,9 @@ class be_null_return_emitter
 public:
   be_null_return_emitter (be_visitor_context *ctx);
   ~be_null_return_emitter (void);
-  
+
   int emit (be_type *node);
-  
+
 private:
   be_visitor_context *ctx_;
   TAO_OutStream &os_;
diff --git a/TAO_IDL/be_include/be_operation.h b/TAO_IDL/be_include/be_operation.h
index 964b0ccc8e6..268d289a944 100644
--- a/TAO_IDL/be_include/be_operation.h
+++ b/TAO_IDL/be_include/be_operation.h
@@ -51,10 +51,10 @@ public:
 
   /// Insert an exception at the head of the list.
   int be_insert_exception (AST_Exception *ex);
-  
+
   bool is_sendc_ami (void) const;
   void is_sendc_ami (bool val);
-  
+
   bool is_excep_ami (void) const;
   void is_excep_ami (bool val);
 
diff --git a/TAO_IDL/be_include/be_param_holder.h b/TAO_IDL/be_include/be_param_holder.h
index 9065dbecb3f..1be9a6a2568 100644
--- a/TAO_IDL/be_include/be_param_holder.h
+++ b/TAO_IDL/be_include/be_param_holder.h
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- *  Place holder referenced by AST_Field (or subclass) 
+ *  Place holder referenced by AST_Field (or subclass)
  *  representing a corresponding template parameter in IDL.
  *
  *
@@ -30,7 +30,7 @@ public:
                    FE_Utils::T_Param_Info *info);
 
   virtual ~be_param_holder (void);
-  
+
   // Narrowing.
   DEF_NARROW_FROM_DECL (be_param_holder);
 
diff --git a/TAO_IDL/be_include/be_porttype.h b/TAO_IDL/be_include/be_porttype.h
index aabdda78772..a664985f2ca 100644
--- a/TAO_IDL/be_include/be_porttype.h
+++ b/TAO_IDL/be_include/be_porttype.h
@@ -24,24 +24,20 @@
 
 class be_visitor;
 
+/**
+ * Extension of class AST_PortType for C++ code generation.
+ */
 class be_porttype : public virtual AST_PortType,
                     public virtual be_scope,
                     public virtual be_type
 {
-  //
-  // = TITLE
-  //   be_porttype
-  //
-  // = DESCRIPTION
-  //   Extension of class AST_PortType for C++ code generation.
-  //
 public:
   be_porttype (UTL_ScopedName *n);
-    
+
   virtual ~be_porttype (void);
-  
+
   virtual void destroy (void);
-  
+
   virtual int accept (be_visitor *visitor);
 
   DEF_NARROW_FROM_DECL (be_porttype);
diff --git a/TAO_IDL/be_include/be_predefined_type.h b/TAO_IDL/be_include/be_predefined_type.h
index a99a423e2d5..102679e5dca 100644
--- a/TAO_IDL/be_include/be_predefined_type.h
+++ b/TAO_IDL/be_include/be_predefined_type.h
@@ -29,7 +29,7 @@ class be_predefined_type : public virtual AST_PredefinedType,
 public:
   be_predefined_type (AST_PredefinedType::PredefinedType t,
                       UTL_ScopedName *n);
-                      
+
   // Overridden from class be_type.
   virtual void gen_member_ostream_operator (TAO_OutStream *os,
                                             const char *instance_name,
diff --git a/TAO_IDL/be_include/be_provides.h b/TAO_IDL/be_include/be_provides.h
index 317f597f76a..0effaf3ce33 100644
--- a/TAO_IDL/be_include/be_provides.h
+++ b/TAO_IDL/be_include/be_provides.h
@@ -18,22 +18,22 @@ class be_provides : public virtual AST_Provides,
 public:
   be_provides (UTL_ScopedName *n,
                AST_Type *provides_type);
-            
+
   virtual ~be_provides (void);
-  
+
   // Non-virtual override of frontend method.
   be_type *provides_type (void) const;
-  
+
   // Common code called by visitors.
   int gen_facet_svnt_decl (TAO_OutStream &os);
   int gen_facet_svnt_defn (TAO_OutStream &os);
-  
+
   // Narrowing.
   DEF_NARROW_FROM_DECL(be_provides);
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 };
@@ -45,11 +45,11 @@ class be_facet_op_attr_defn_helper
 {
 public:
   be_facet_op_attr_defn_helper (be_interface *op_scope);
-  
+
   virtual int emit (be_interface *derived_interface,
                     TAO_OutStream *os,
                     be_interface *base_interface);
-                    
+
 private:
   be_interface *op_scope_;
 };
diff --git a/TAO_IDL/be_include/be_publishes.h b/TAO_IDL/be_include/be_publishes.h
index 42e0d82ebcf..64c7279bd88 100644
--- a/TAO_IDL/be_include/be_publishes.h
+++ b/TAO_IDL/be_include/be_publishes.h
@@ -17,18 +17,18 @@ class be_publishes : public virtual AST_Publishes,
 public:
   be_publishes (UTL_ScopedName *n,
                 AST_Type *publishes_type);
-            
+
   virtual ~be_publishes (void);
-  
+
   // Non-virtual override of frontend method.
   be_eventtype *publishes_type (void) const;
-  
+
   // Narrowing.
   DEF_NARROW_FROM_DECL(be_publishes);
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 };
diff --git a/TAO_IDL/be_include/be_root.h b/TAO_IDL/be_include/be_root.h
index 7044df489ed..a233ed0a3c4 100644
--- a/TAO_IDL/be_include/be_root.h
+++ b/TAO_IDL/be_include/be_root.h
@@ -22,17 +22,15 @@
 
 class be_visitor;
 
+/**
+ * The back end extension of the AST_Root class
+ */
 class be_root : public virtual AST_Root,
                 public virtual be_module
 {
-  // = TITLE
-  //    The back end extension of the AST_Root class
-  //
-  // = DESCRIPTION
-  //
 public:
   be_root (UTL_ScopedName *n);
-  
+
   virtual ~be_root (void);
 
   /// Cleanup method.
diff --git a/TAO_IDL/be_include/be_sequence.h b/TAO_IDL/be_include/be_sequence.h
index 7fb1e13588e..af3f98c86b8 100644
--- a/TAO_IDL/be_include/be_sequence.h
+++ b/TAO_IDL/be_include/be_sequence.h
@@ -58,7 +58,7 @@ 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);
@@ -71,7 +71,7 @@ public:
 
   /// Overridden method on the be_scope class.
   virtual be_decl *decl (void);
-  
+
   /// Overridden from class be_type.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
diff --git a/TAO_IDL/be_include/be_structure.h b/TAO_IDL/be_include/be_structure.h
index 4a36b7e63a5..920365f0275 100644
--- a/TAO_IDL/be_include/be_structure.h
+++ b/TAO_IDL/be_include/be_structure.h
@@ -37,11 +37,11 @@ public:
                 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);
-  
+
   /// Overridden from class be_type.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
diff --git a/TAO_IDL/be_include/be_template_module.h b/TAO_IDL/be_include/be_template_module.h
index 787a04ba555..c2f66101de6 100644
--- a/TAO_IDL/be_include/be_template_module.h
+++ b/TAO_IDL/be_include/be_template_module.h
@@ -23,15 +23,13 @@
 
 #include "ast_template_module.h"
 
+/**
+ * The back end extension of the AST_Template_Module class
+ */
 class be_template_module : public virtual AST_Template_Module,
                            public virtual be_scope,
                            public virtual be_decl
 {
-  // = TITLE
-  //   The back end extension of the AST_Template_Module class
-  //
-  // = DESCRIPTION
-  //
 public:
   be_template_module (
     UTL_ScopedName *n,
diff --git a/TAO_IDL/be_include/be_template_module_inst.h b/TAO_IDL/be_include/be_template_module_inst.h
index 206683ed87e..aed486e3437 100644
--- a/TAO_IDL/be_include/be_template_module_inst.h
+++ b/TAO_IDL/be_include/be_template_module_inst.h
@@ -17,7 +17,7 @@ public:
                            FE_Utils::T_ARGLIST *template_args);
 
   virtual ~be_template_module_inst (void);
-  
+
   // Narrowing.
   DEF_NARROW_FROM_DECL (be_template_module_inst);
 
diff --git a/TAO_IDL/be_include/be_template_module_ref.h b/TAO_IDL/be_include/be_template_module_ref.h
index ab8bc4a4478..cd8a020461e 100644
--- a/TAO_IDL/be_include/be_template_module_ref.h
+++ b/TAO_IDL/be_include/be_template_module_ref.h
@@ -18,7 +18,7 @@ public:
                            UTL_StrList *param_refs);
 
   virtual ~be_template_module_ref (void);
-  
+
   // Narrowing.
   DEF_NARROW_FROM_DECL (be_template_module_ref);
 
diff --git a/TAO_IDL/be_include/be_type.h b/TAO_IDL/be_include/be_type.h
index 2add00a446d..b8317c63c9d 100644
--- a/TAO_IDL/be_include/be_type.h
+++ b/TAO_IDL/be_include/be_type.h
@@ -48,7 +48,7 @@ public:
 
   /// Compute the value of the member.
   void gen_fwd_helper_name (void);
-  
+
   /// No-op, overridden in derived classes.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
@@ -65,7 +65,7 @@ public:
 
   /// Generate _var and _out typedefs for structs and unions.
   void gen_common_varout (TAO_OutStream *os);
-  
+
   /// Generate common typedef and any destructor decl.
   void gen_stub_decls (TAO_OutStream *os);
 
diff --git a/TAO_IDL/be_include/be_union_branch.h b/TAO_IDL/be_include/be_union_branch.h
index 33341ef8d22..a356e1128a6 100644
--- a/TAO_IDL/be_include/be_union_branch.h
+++ b/TAO_IDL/be_include/be_union_branch.h
@@ -44,7 +44,7 @@ public:
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/be_include/be_union_label.h b/TAO_IDL/be_include/be_union_label.h
index 1c5c6855398..7ad8a751570 100644
--- a/TAO_IDL/be_include/be_union_label.h
+++ b/TAO_IDL/be_include/be_union_label.h
@@ -15,7 +15,7 @@ public:
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 };
diff --git a/TAO_IDL/be_include/be_util.h b/TAO_IDL/be_include/be_util.h
index 6b3f93f4acc..e5a4933f3f6 100644
--- a/TAO_IDL/be_include/be_util.h
+++ b/TAO_IDL/be_include/be_util.h
@@ -39,7 +39,7 @@ public:
   static void
   gen_nesting_open (TAO_OutStream &os,
                     AST_Decl *node);
-  
+
   static void
   gen_nesting_close (TAO_OutStream &os,
                      AST_Decl *node);
diff --git a/TAO_IDL/be_include/be_valuetype.h b/TAO_IDL/be_include/be_valuetype.h
index d0e1441986f..b060aa3d62e 100644
--- a/TAO_IDL/be_include/be_valuetype.h
+++ b/TAO_IDL/be_include/be_valuetype.h
@@ -22,16 +22,15 @@
 
 class TAO_OutStream;
 
+/**
+ * Backend-class for valuetypes
+ *
+ * Extends be_interface and overrides member functions for valuetype
+ * mapping.
+ */
 class be_valuetype : public virtual be_interface,
                      public virtual AST_ValueType
 {
-  // = TITLE
-  //    Backend-class for valuetypes
-  //
-  // = DESCRIPTION
-  //    Extends be_interface and overrides member functions for valuetype
-  //    mapping.
-  //
 public:
   be_valuetype (UTL_ScopedName *n,
                 AST_Type **inherits,
@@ -179,7 +178,7 @@ private:
 
   /// Have these been done already?
   bool var_out_seq_decls_gen_;
-  
+
   /// To differentiate from the interface skeleton name.
   char *full_obv_skel_name_;
 };
diff --git a/TAO_IDL/be_include/be_visitor_amh_pre_proc.h b/TAO_IDL/be_include/be_visitor_amh_pre_proc.h
index e362eb94d23..50c0b4ec8b7 100644
--- a/TAO_IDL/be_include/be_visitor_amh_pre_proc.h
+++ b/TAO_IDL/be_include/be_visitor_amh_pre_proc.h
@@ -29,7 +29,7 @@
 class be_visitor_amh_pre_proc : public be_visitor_scope
 {
 private:
-  typedef enum 
+  typedef enum
   {
     NORMAL,
     GET_OPERATION,
diff --git a/TAO_IDL/be_include/be_visitor_ami_pre_proc.h b/TAO_IDL/be_include/be_visitor_ami_pre_proc.h
index 9485504c86f..1b3b23f78c6 100644
--- a/TAO_IDL/be_include/be_visitor_ami_pre_proc.h
+++ b/TAO_IDL/be_include/be_visitor_ami_pre_proc.h
@@ -34,7 +34,7 @@ class AST_Type;
 class be_visitor_ami_pre_proc : public be_visitor_scope
 {
 private:
- typedef enum 
+ typedef enum
  {
    NORMAL,
    GET_OPERATION,
@@ -95,7 +95,7 @@ private:
   /// Create an inheritance list for the reply handler.
   AST_Type **create_inheritance_list (be_interface *node,
                                       long &n_parents);
-                                      
+
   /// Generate an *A.idl file for AMI4CCM.
   int generate_ami4ccm_idl (void);
 };
diff --git a/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h b/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h
index ff779a649e5..65ae2a29c10 100644
--- a/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h
+++ b/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h
@@ -13,7 +13,6 @@
  */
 //=============================================================================
 
-
 #ifndef BE_VISITOR_ANY_EXTRACTED_TYPE_DECL_H
 #define BE_VISITOR_ANY_EXTRACTED_TYPE_DECL_H
 
@@ -34,7 +33,7 @@ class be_visitor_any_extracted_type_decl : public be_visitor_decl
 public:
   be_visitor_any_extracted_type_decl (be_visitor_context *ctx);
   virtual ~be_visitor_any_extracted_type_decl (void);
-  
+
   virtual int visit_array (be_array *);
   virtual int visit_component (be_component *);
   virtual int visit_enum (be_enum *);
@@ -49,9 +48,8 @@ public:
   virtual int visit_union (be_union *);
   virtual int visit_valuebox (be_valuebox *);
   virtual int visit_valuetype (be_valuetype *);
-  
+
 protected:
-  TAO_OutStream & os_;
   const char * var_name_;
   const char * tmp_name_;
 };
diff --git a/TAO_IDL/be_include/be_visitor_argument/arglist.h b/TAO_IDL/be_include/be_visitor_argument/arglist.h
index d14caa1c84c..5eb53b587c9 100644
--- a/TAO_IDL/be_include/be_visitor_argument/arglist.h
+++ b/TAO_IDL/be_include/be_visitor_argument/arglist.h
@@ -101,13 +101,13 @@ public:
 
   /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
-  
+
   /// Set the member.
   void unused (bool val);
 
 private:
   int emit_common (be_type *node);
-  
+
 private:
   bool unused_;
 };
diff --git a/TAO_IDL/be_include/be_visitor_argument/argument.h b/TAO_IDL/be_include/be_visitor_argument/argument.h
index 811d0697a1d..655a12719f4 100644
--- a/TAO_IDL/be_include/be_visitor_argument/argument.h
+++ b/TAO_IDL/be_include/be_visitor_argument/argument.h
@@ -44,7 +44,7 @@ public:
   //= helper
   /// helper that produces either a nested name for
   /// header files or full name for others.
-  virtual const char *type_name (be_type *type, 
+  virtual const char *type_name (be_type *type,
                                  const char *suffix = 0);
 
   /// return the direction of the argument node
@@ -54,7 +54,7 @@ public:
   virtual int visit_argument (be_argument *node);
 
   void set_fixed_direction (AST_Argument::Direction direction);
-  
+
 protected:
   /// Consolidation of common code from invoke_cs and marshal_ss
   /// for predefined type args.
diff --git a/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h b/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h
index 88a7c7f4c0c..e1038ca8763 100644
--- a/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h
+++ b/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h
@@ -1,23 +1,18 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    invoke_cs.h
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Arguments for passing the arguments
-//    to the CDR << and >> operators
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    invoke_cs.h
+ *
+ *  $Id$
+ *
+ *  Visitors for generation of code for Arguments for passing the arguments
+ *  to the CDR << and >> operators
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef _BE_VISITOR_ARGUMENT_INVOKE_CS_H_
 #define _BE_VISITOR_ARGUMENT_INVOKE_CS_H_
@@ -26,79 +21,79 @@
 // class be_visitor_args_invoke_cs
 // ************************************************************
 
+/**
+ * @class be_visitor_args_invoke_cs
+ *
+ * @brief be_visitor_args_invoke_cs
+ *
+ * Code to be generated when making the invocation
+ */
 class be_visitor_args_invoke_cs : public be_visitor_args
 {
-  //
-  // = TITLE
-  //   be_visitor_args_invoke_cs
-  //
-  // = DESCRIPTION
-  //   Code to be generated when making the invocation
-  //
 public:
+  /// constructor
   be_visitor_args_invoke_cs (be_visitor_context *ctx);
-  // constructor
 
+  /// destructor
   virtual ~be_visitor_args_invoke_cs (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
+  /// visit a component node
   virtual int visit_typedef (be_typedef *node);
-  // visit the typedef type
   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_IDL/be_include/be_visitor_array.h b/TAO_IDL/be_include/be_visitor_array.h
index 7ed6fb67c1e..415f25915f8 100644
--- a/TAO_IDL/be_include/be_visitor_array.h
+++ b/TAO_IDL/be_include/be_visitor_array.h
@@ -27,7 +27,5 @@
 #include "be_visitor_array/any_op_cs.h"
 #include "be_visitor_array/cdr_op_ch.h"
 #include "be_visitor_array/cdr_op_cs.h"
-#include "be_visitor_array/serializer_op_ch.h"
-#include "be_visitor_array/serializer_op_cs.h"
 
 #endif /* TAO_BE_VISITOR_ARRAY_H */
diff --git a/TAO_IDL/be_include/be_visitor_array/serializer_op_ch.h b/TAO_IDL/be_include/be_visitor_array/serializer_op_ch.h
deleted file mode 100644
index 8696cde3e46..00000000000
--- a/TAO_IDL/be_include/be_visitor_array/serializer_op_ch.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-#ifndef _BE_VISITOR_ARRAY_serializer_op_CH_H_
-#define _BE_VISITOR_ARRAY_serializer_op_CH_H_
-
-// ************************************************************
-// 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
-{
-
-public:
-  /// constructor
-  be_visitor_array_serializer_op_ch (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_array_serializer_op_ch (void);
-
-  /// helper - common code
-  void gen_arg_ref(be_array *node);
-
-  /// visit array
-  virtual int visit_array (be_array *node);
-};
-
-#endif /* _BE_VISITOR_ARRAY_serializer_op_CH_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_array/serializer_op_cs.h b/TAO_IDL/be_include/be_visitor_array/serializer_op_cs.h
deleted file mode 100644
index 1df99890299..00000000000
--- a/TAO_IDL/be_include/be_visitor_array/serializer_op_cs.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-//=============================================================================
-/**
- *  @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>
- */
-//=============================================================================
-
-
-#ifndef _BE_VISITOR_ARRAY_serializer_op_CS_H_
-#define _BE_VISITOR_ARRAY_serializer_op_CS_H_
-
-// ************************************************************
-// 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
-{
-
-public:
-  /// constructor
-  be_visitor_array_serializer_op_cs (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_array_serializer_op_cs (void);
-
-  /// visit array
-  virtual int visit_array (be_array *node);
-
-  // = Visitor methods on array types
-
-  /// visit an enum
-  virtual int visit_enum (be_enum *node);
-
-  /// visit an interface
-  virtual int visit_interface (be_interface *node);
-
-  /// visit an interface forward node
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-
-  /// visit a valuetype
-  virtual int visit_valuetype (be_valuetype *node);
-
-  /// visit a valuetype forward node
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-
-  /// visit a predefined type node
-  virtual int visit_predefined_type (be_predefined_type *node);
-
-  /// visit sequence
-  virtual int visit_sequence (be_sequence *node);
-
-  /// visit string
-  virtual int visit_string (be_string *node);
-
-  /// visit structure
-  virtual int visit_structure (be_structure *node);
-
-  /// visit typedef
-  virtual int visit_typedef (be_typedef *node);
-
-  /// visit union
-  virtual int visit_union (be_union *node);
-
-protected:
-  /// helper that does the common job
-  int visit_node (be_type *);
-};
-
-#endif /* _BE_VISITOR_ARRAY_serializer_op_CS_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_attr_assign.h b/TAO_IDL/be_include/be_visitor_attr_assign.h
new file mode 100644
index 00000000000..f850d96226e
--- /dev/null
+++ b/TAO_IDL/be_include/be_visitor_attr_assign.h
@@ -0,0 +1,59 @@
+/* -*- c++ -*- */
+//=============================================================================
+/**
+ *  @file    be_visitor_attr_assign.h
+ *
+ *  $Id$
+ *
+ *  Encapsulation of rules for component attribute assignment.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+#ifndef BE_VISITOR_ATTR_ASSIGN_H
+#define BE_VISITOR_ATTR_ASSIGN_H
+
+#include "be_visitor_decl.h"
+
+class TAO_OutStream;
+
+/**
+ * @class be_visitor_attr_assign
+ *
+ * @brief be_visitor_attr_assign
+ *
+ * Contains overloaded methods that generate assignment
+ * statements in component attribute set operations.
+ */
+class be_visitor_attr_assign : public be_visitor_decl
+{
+public:
+  be_visitor_attr_assign (be_visitor_context *ctx);
+  virtual ~be_visitor_attr_assign (void);
+
+  virtual int visit_array (be_array *);
+  virtual int visit_component (be_component *);
+  virtual int visit_enum (be_enum *);
+  virtual int visit_eventtype (be_eventtype *);
+  virtual int visit_home (be_home *);
+  virtual int visit_interface (be_interface *);
+  virtual int visit_predefined_type (be_predefined_type *);
+  virtual int visit_sequence (be_sequence *);
+  virtual int visit_string (be_string *);
+  virtual int visit_structure (be_structure *);
+  virtual int visit_typedef (be_typedef *);
+  virtual int visit_union (be_union *);
+  virtual int visit_valuebox (be_valuebox *);
+  virtual int visit_valuetype (be_valuetype *);
+
+  void attr_name (const char *name);
+
+private:
+  const char *attr_name_;
+  ACE_CString attr_name_string_;
+};
+
+#endif /* BE_VISITOR_ATTR_ASSIGN_H */
+
diff --git a/TAO_IDL/be_include/be_visitor_attr_init.h b/TAO_IDL/be_include/be_visitor_attr_init.h
new file mode 100644
index 00000000000..03e0ab4a0f0
--- /dev/null
+++ b/TAO_IDL/be_include/be_visitor_attr_init.h
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+//=============================================================================
+/**
+ *  @file    be_visitor_attr_init.h
+ *
+ *  $Id$
+ *
+ *  Encapsulation of rules for generating attribute initializatin
+ *
+ *  @author Johnny Willemsen
+ */
+//=============================================================================
+
+
+#ifndef BE_VISITOR_ATTR_INIT_H
+#define BE_VISITOR_ATTR_INIT_H
+
+#include "be_visitor_decl.h"
+
+class TAO_OutStream;
+
+/**
+ * @class be_visitor_attr_init
+ *
+ * @brief be_visitor_attr_init
+ *
+ * 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_attr_init : public be_visitor_decl
+{
+public:
+  be_visitor_attr_init (be_visitor_context *ctx);
+  virtual ~be_visitor_attr_init (void);
+
+  virtual int visit_array (be_array *);
+  virtual int visit_component (be_component *);
+  virtual int visit_enum (be_enum *);
+  virtual int visit_eventtype (be_eventtype *);
+  virtual int visit_home (be_home *);
+  virtual int visit_interface (be_interface *);
+  virtual int visit_predefined_type (be_predefined_type *);
+  virtual int visit_sequence (be_sequence *);
+  virtual int visit_string (be_string *);
+  virtual int visit_structure (be_structure *);
+  virtual int visit_typedef (be_typedef *);
+  virtual int visit_union (be_union *);
+  virtual int visit_valuebox (be_valuebox *);
+  virtual int visit_valuetype (be_valuetype *);
+
+protected:
+  TAO_OutStream & os_;
+};
+
+#endif /* BE_VISITOR_ATTR_INIT_H */
diff --git a/TAO_IDL/be_include/be_visitor_attr_return.h b/TAO_IDL/be_include/be_visitor_attr_return.h
new file mode 100644
index 00000000000..2f799991253
--- /dev/null
+++ b/TAO_IDL/be_include/be_visitor_attr_return.h
@@ -0,0 +1,58 @@
+/* -*- c++ -*- */
+//=============================================================================
+/**
+ *  @file    be_visitor_attr_return.h
+ *
+ *  $Id$
+ *
+ *  Encapsulation of rules for component attribute accessor.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+#ifndef BE_VISITOR_ATTR_RETURN_H
+#define BE_VISITOR_ATTR_RETURN_H
+
+#include "be_visitor_decl.h"
+
+class TAO_OutStream;
+
+/**
+ * @class be_visitor_attr_return
+ *
+ * @brief be_visitor_attr_return
+ *
+ * Contains overloaded methods that generate return
+ * statements in component attribute get operations.
+ */
+class be_visitor_attr_return : public be_visitor_decl
+{
+public:
+  be_visitor_attr_return (be_visitor_context *ctx);
+  virtual ~be_visitor_attr_return (void);
+
+  virtual int visit_array (be_array *);
+  virtual int visit_component (be_component *);
+  virtual int visit_enum (be_enum *);
+  virtual int visit_eventtype (be_eventtype *);
+  virtual int visit_home (be_home *);
+  virtual int visit_interface (be_interface *);
+  virtual int visit_predefined_type (be_predefined_type *);
+  virtual int visit_sequence (be_sequence *);
+  virtual int visit_string (be_string *);
+  virtual int visit_structure (be_structure *);
+  virtual int visit_typedef (be_typedef *);
+  virtual int visit_union (be_union *);
+  virtual int visit_valuebox (be_valuebox *);
+  virtual int visit_valuetype (be_valuetype *);
+
+  void attr_name (const char *name);
+
+private:
+  ACE_CString attr_name_string_;
+};
+
+#endif /* BE_VISITOR_ATTR_RETURN_H */
+
diff --git a/TAO_IDL/be_include/be_visitor_attr_setarg_type.h b/TAO_IDL/be_include/be_visitor_attr_setarg_type.h
new file mode 100644
index 00000000000..b5cabffa0a7
--- /dev/null
+++ b/TAO_IDL/be_include/be_visitor_attr_setarg_type.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+//=============================================================================
+/**
+ *  @file    be_visitor_attr_setarg_type.h
+ *
+ *  $Id$
+ *
+ *  Encapsulation of rules for component attribute set arg.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+#ifndef BE_VISITOR_ATTR_SETARG_TYPE_H
+#define BE_VISITOR_ATTR_SETARG_TYPE_H
+
+#include "be_visitor_decl.h"
+
+class TAO_OutStream;
+
+/**
+ * @class be_visitor_attr_setarg_type
+ *
+ * @brief be_visitor_attr_setarg_type
+ *
+ * Contains overloaded methods that generate argument type
+ * names for component attribute set operations.
+ */
+class be_visitor_attr_setarg_type : public be_visitor_decl
+{
+public:
+  be_visitor_attr_setarg_type (be_visitor_context *ctx);
+  virtual ~be_visitor_attr_setarg_type (void);
+
+  virtual int visit_array (be_array *);
+  virtual int visit_component (be_component *);
+  virtual int visit_enum (be_enum *);
+  virtual int visit_eventtype (be_eventtype *);
+  virtual int visit_home (be_home *);
+  virtual int visit_interface (be_interface *);
+  virtual int visit_predefined_type (be_predefined_type *);
+  virtual int visit_sequence (be_sequence *);
+  virtual int visit_string (be_string *);
+  virtual int visit_structure (be_structure *);
+  virtual int visit_typedef (be_typedef *);
+  virtual int visit_union (be_union *);
+  virtual int visit_valuebox (be_valuebox *);
+  virtual int visit_valuetype (be_valuetype *);
+};
+
+#endif /* BE_VISITOR_ATTR_SETARG_TYPE_H */
+
diff --git a/TAO_IDL/be_include/be_visitor_attribute/attribute.h b/TAO_IDL/be_include/be_visitor_attribute/attribute.h
index a18cd89c116..441dccbc387 100644
--- a/TAO_IDL/be_include/be_visitor_attribute/attribute.h
+++ b/TAO_IDL/be_include/be_visitor_attribute/attribute.h
@@ -48,7 +48,7 @@ public:
 private:
   bool for_facets_;
   be_decl *op_scope_;
-  
+
   /// Defaults to "exec_i" but in special cases we want to
   /// modify it.
   ACE_CString exec_class_extension_;
diff --git a/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h b/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h
index c5c39c74ba7..41cd0478800 100644
--- a/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h
+++ b/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h
@@ -16,22 +16,16 @@
 #ifndef BE_VISITOR_ATTRIBUTE_CCM_INIT_H
 #define BE_VISITOR_ATTRIBUTE_CCM_INIT_H
 
+/**
+ * Generates the body of a CIAO component or home's set_attributes() method.
+ */
 class be_visitor_attribute_ccm_init
   : public be_visitor_any_extracted_type_decl
 {
-  //
-  // = TITLE
-  //   be_visitor_attribute_ccm_init
-  //
-  // = DESCRIPTION
-  //   Generates the body of a
-  //   CIAO component or home's set_attributes() method.
-  //
-  //
 public:
   be_visitor_attribute_ccm_init (be_visitor_context *ctx);
   ~be_visitor_attribute_ccm_init (void);
-  
+
   virtual int visit_attribute (be_attribute *node);
 
   virtual int visit_array (be_array *node);
@@ -48,13 +42,13 @@ public:
   virtual int visit_union (be_union *node);
   virtual int visit_valuebox (be_valuebox *node);
   virtual int visit_valuetype (be_valuetype *node);
-  
+
 private:
   void emit_init_block (void);
   void emit_error (const char *);
   void open_if_block (void);
   void close_if_block (void);
-  
+
 private:
   be_attribute *attr_;
 };
diff --git a/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h b/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h
index d94353030b6..debda50c534 100644
--- a/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h
+++ b/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h
@@ -17,22 +17,17 @@
 #ifndef BE_VISITOR_ATTRIBUTE_SET_FROM_EXTRACTED_H
 #define BE_VISITOR_ATTRIBUTE_SET_FROM_EXTRACTED_H
 
+/**
+ * Contains overloaded methods that emit arg values to be
+ * passed to an attribute mutator
+ */
 class be_visitor_attribute_set_from_extracted
   : public be_visitor_any_extracted_type_decl
 {
-  //
-  // = TITLE
-  //   be_visitor_attribute_set_from_extracted
-  //
-  // = DESCRIPTION
-  //   Contains overloaded methods that emit arg values to be
-  //   passed to an attribute mutator
-  //
-  //
 public:
   be_visitor_attribute_set_from_extracted (be_visitor_context *ctx);
   virtual ~be_visitor_attribute_set_from_extracted (void);
-  
+
   virtual int visit_array (be_array *);
   virtual int visit_component (be_component *);
   virtual int visit_enum (be_enum *);
diff --git a/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h b/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
index fc4ac5c4a18..0667048ba6f 100644
--- a/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
+++ b/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
@@ -53,7 +53,7 @@ public:
   virtual int visit_home (be_home *node);
   virtual int visit_eventtype (be_eventtype *node);
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
-  
+
 protected:
   // Utility methods to handle the corresponding IDL declarations.
   int gen_implicit_ops (be_home *node,
@@ -103,7 +103,7 @@ protected:
                                       const char *suffix,
                                       AST_Decl *parent);
   UTL_NameList *compute_inheritance (be_home *node);
-  
+
 protected:
   /// These are created for operations implied by 'uses multiple' declarations.
   Identifier module_id_;
@@ -120,18 +120,18 @@ protected:
   be_exception *invalid_key_;
   be_exception *unknown_key_value_;
   be_exception *duplicate_key_value_;
-  
+
   /// Working nodes.
   be_component *comp_;
   be_home *home_;
-  
+
   /// So we can look up Cookie and the CCM exceptions
   /// once when the first component is seen (then we
   /// know that Components.idl is included and the
   /// lookups will succeed).
   bool ccm_lookups_done_;
-  
-private:                                  
+
+private:
   /// Generate a sendc_* receptacle for AMI4CCM.
   int generate_ami4ccm_uses (void);
 };
diff --git a/TAO_IDL/be_include/be_visitor_component.h b/TAO_IDL/be_include/be_visitor_component.h
index 481302dced0..deb945c9eab 100644
--- a/TAO_IDL/be_include/be_visitor_component.h
+++ b/TAO_IDL/be_include/be_visitor_component.h
@@ -34,10 +34,14 @@
 #include "be_visitor_component/context_ex_idl.h"
 #include "be_visitor_component/component_exh.h"
 #include "be_visitor_component/facet_exh.h"
-#include "be_visitor_component/facet_private_exh.h"
+#include "be_visitor_component/executor_private_exh.h"
 #include "be_visitor_component/executor_exh.h"
 #include "be_visitor_component/component_exs.h"
 #include "be_visitor_component/facet_exs.h"
 #include "be_visitor_component/executor_exs.h"
+#include "be_visitor_component/executor_exs_attr_init.h"
+#include "be_visitor_component/component_ami_rh_ex_base.h"
+#include "be_visitor_component/component_ami_rh_exh.h"
+#include "be_visitor_component/component_ami_rh_exs.h"
 
 #endif /* TAO_BE_VISITOR_COMPONENT_H */
diff --git a/TAO_IDL/be_include/be_visitor_component/component.h b/TAO_IDL/be_include/be_visitor_component/component.h
index a349c8bf6d5..566419de2f7 100644
--- a/TAO_IDL/be_include/be_visitor_component/component.h
+++ b/TAO_IDL/be_include/be_visitor_component/component.h
@@ -22,7 +22,7 @@
  *
  * @brief be_visitor_component
  *
- * This is a concrete visitor for component 
+ * This is a concrete visitor for component
  * that abstracts all common tasks.
  */
 class be_visitor_component : public be_visitor_interface
@@ -44,7 +44,7 @@ public:
   /// declarations.
   virtual int visit_structure (be_structure *node);
   virtual int visit_typedef (be_typedef *node);
-  
+
   /// Overridden to pick up attribute declarations from a porrttype.
   virtual int visit_extended_port (be_extended_port *node);
   virtual int visit_mirror_port (be_mirror_port *node);
diff --git a/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h b/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h
new file mode 100644
index 00000000000..6406e5deb4d
--- /dev/null
+++ b/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h
@@ -0,0 +1,72 @@
+/* -*- c++ -*- */
+//=============================================================================
+/**
+ *  @file    component_ami_rh_ex_base.h
+ *
+ *  $Id$
+ *
+ *  Base class visitor for the AMI4CCM reply handler
+ *  implementation concrete visitors.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+#ifndef _BE_COMPONENT_AMI_RH_EX_BASE_H_
+#define _BE_COMPONENT_AMI_RH_EX_BASE_H_
+
+class be_visitor_context;
+
+/// This class inherits from the AMI connector visitor that its
+/// code generation tracks closely.
+class be_visitor_component_ami_rh_ex_base
+  : public be_visitor_scope
+{
+  // = DESCRIPTION
+  //   This is a base class visitor for the AMI4CCM reply
+  //   handler implementation concrete visitors.
+  //
+  //
+public:
+  be_visitor_component_ami_rh_ex_base (be_visitor_context *ctx);
+  ~be_visitor_component_ami_rh_ex_base (void);
+
+  virtual int post_process (be_decl *node);
+
+protected:
+  void init (void);
+  void gen_excep_op (const char *prefix,
+                     be_decl *node,
+                     bool for_defn);
+  virtual void gen_op_body (void);
+  int gen_attr_op (be_attribute *node, bool for_defn);
+
+protected:
+  be_interface *iface_;
+  be_uses *port_;
+  ACE_CString class_name_;
+  ACE_CString base_class_name_;
+};
+
+// ======================================================
+
+/// Worker class passed to traverse_inheritance_graph(),
+/// collects operations and attributes.
+class Exec_ReplyHandler_Op_Attr_Generator
+  : public TAO_IDL_Inheritance_Hierarchy_Worker
+{
+public:
+  Exec_ReplyHandler_Op_Attr_Generator (
+    be_visitor_scope * visitor);
+
+  virtual int emit (be_interface * derived_interface,
+                    TAO_OutStream * os,
+                    be_interface * base_interface);
+
+private:
+  be_visitor_scope * visitor_;
+};
+
+#endif /* _BE_COMPONENT_AMI_RH_EX_BASE_H_ */
+
diff --git a/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h b/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h
new file mode 100644
index 00000000000..edb85d6a958
--- /dev/null
+++ b/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+//=============================================================================
+/**
+ *  @file    component_ami_rh_exh.h
+ *
+ *  $Id$
+ *
+ *  Concrete visitor for the AMI4CCM Component node.
+ *  This provides for code generation of the AMI4CCM reply
+ *  handler implementation header, triggered by the presence
+ *  of a '#pragma ciao ami4ccm receptacle' directive in
+ *  the component's IDL file.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+#ifndef _BE_COMPONENT_AMI_RH_EXH_H_
+#define _BE_COMPONENT_AMI_RH_EXH_H_
+
+class be_visitor_context;
+
+/**
+ * This class inherits from the AMI connector visitor that its
+ * code generation tracks closely.
+ *
+ * This is a concrete visitor to generate
+ * the implementation header for AMI4CCM reply handlers.
+ */
+
+class be_visitor_component_ami_rh_exh
+  : public be_visitor_component_ami_rh_ex_base
+{
+public:
+  be_visitor_component_ami_rh_exh (be_visitor_context *ctx);
+  ~be_visitor_component_ami_rh_exh (void);
+
+  virtual int visit_uses (be_uses *node);
+  virtual int visit_attribute (be_attribute *node);
+  virtual int visit_operation (be_operation *node);
+  virtual int visit_argument (be_argument *node);
+
+private:
+  ACE_CString export_macro_;
+};
+
+#endif /* _BE_COMPONENT_AMI_RH_EXH_H_ */
+
diff --git a/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h b/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h
new file mode 100644
index 00000000000..8e0fbd1e877
--- /dev/null
+++ b/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h
@@ -0,0 +1,47 @@
+/* -*- c++ -*- */
+//=============================================================================
+/**
+ *  @file    component_ami_rh_exs.h
+ *
+ *  $Id$
+ *
+ *  Concrete visitor for the AMI4CCM component receptacle.
+ *  This provides for code generation of the AMI4CCM reply
+ *  handler implementation source.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+#ifndef _BE_COMPONENT_AMI_RH_EXS_H_
+#define _BE_COMPONENT_AMI_RH_EXS_H_
+
+class be_visitor_context;
+
+/**
+ * This is a concrete visitor to generate
+ * the stencil of the implementation source for
+ * AMI4CCM reply handlers.
+ */
+class be_visitor_component_ami_rh_exs
+  : public be_visitor_component_ami_rh_ex_base
+{
+public:
+  be_visitor_component_ami_rh_exs (be_visitor_context *ctx);
+  ~be_visitor_component_ami_rh_exs (void);
+
+  virtual int visit_uses (be_uses *node);
+  virtual int visit_operation (be_operation *node);
+  virtual int visit_attribute (be_attribute *node);
+  virtual int visit_argument (be_argument *node);
+
+private:
+  virtual void gen_op_body (void);
+
+private:
+  const char *your_code_here_;
+};
+
+#endif /* _BE_COMPONENT_AMI_RH_EXS_H_ */
+
diff --git a/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h b/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h
index 6aa5c0b2867..99d4904bf48 100644
--- a/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h
+++ b/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h
@@ -21,7 +21,7 @@
  *
  * @brief be_visitor_component_ex_idl
  *
- * This is a concrete visitor to generate the 
+ * This is a concrete visitor to generate the
  * CIAO executor IDL for component.
  */
 class be_visitor_component_ex_idl : public be_visitor_decl
@@ -33,7 +33,7 @@ public:
 
   virtual int visit_component (be_component *node);
   virtual int visit_connector (be_connector *node);
-  
+
 private:
   TAO_OutStream &os_;
 };
diff --git a/TAO_IDL/be_include/be_visitor_component/component_exh.h b/TAO_IDL/be_include/be_visitor_component/component_exh.h
index bd853dc8c8a..98591ce9d69 100644
--- a/TAO_IDL/be_include/be_visitor_component/component_exh.h
+++ b/TAO_IDL/be_include/be_visitor_component/component_exh.h
@@ -17,23 +17,18 @@
 #ifndef _BE_COMPONENT_COMPONENT_EXH_H_
 #define _BE_COMPONENT_COMPONENT_EXH_H_
 
+/**
+ * This is a concrete visitor to generate
+ * the executor implementation header for components.
+ */
 class be_visitor_component_exh
   : public be_visitor_component_scope
 {
-  //
-  // = TITLE
-  //   be_visitor_component_exh
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate
-  //   the executor implementation header for components.
-  //
-  //
 public:
   be_visitor_component_exh (be_visitor_context *ctx);
-  
+
   ~be_visitor_component_exh (void);
-  
+
   virtual int visit_component (be_component *node);
 };
 
diff --git a/TAO_IDL/be_include/be_visitor_component/component_exs.h b/TAO_IDL/be_include/be_visitor_component/component_exs.h
index 4eb779927ef..c394e82639e 100644
--- a/TAO_IDL/be_include/be_visitor_component/component_exs.h
+++ b/TAO_IDL/be_include/be_visitor_component/component_exs.h
@@ -17,23 +17,18 @@
 #ifndef _BE_COMPONENT_COMPONENT_EXS_H_
 #define _BE_COMPONENT_COMPONENT_EXS_H_
 
+/**
+ * This is a concrete visitor to generate the exec
+ * impl for component.
+ */
 class be_visitor_component_exs
   : public be_visitor_component_scope
 {
-  //
-  // = TITLE
-  //   be_visitor_component_exs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the exec
-  //   impl for component.
-  //
-  //
 public:
   be_visitor_component_exs (be_visitor_context *ctx);
-  
+
   ~be_visitor_component_exs (void);
-  
+
   virtual int visit_component (be_component *node);
 };
 
@@ -48,7 +43,7 @@ class Component_Exec_Op_Attr_Generator
 {
 public:
   Component_Exec_Op_Attr_Generator (be_visitor_scope * visitor);
-  
+
   virtual int emit (be_interface * derived_interface,
                     TAO_OutStream * os,
                     be_interface * base_interface);
@@ -56,6 +51,6 @@ public:
 private:
   be_visitor_scope * visitor_;
 };
-                     
+
 #endif /* _BE_COMPONENT_COMPONENT_EXS_H_ */
 
diff --git a/TAO_IDL/be_include/be_visitor_component/component_svh.h b/TAO_IDL/be_include/be_visitor_component/component_svh.h
index e9d957a3c2e..95c9850896d 100644
--- a/TAO_IDL/be_include/be_visitor_component/component_svh.h
+++ b/TAO_IDL/be_include/be_visitor_component/component_svh.h
@@ -27,15 +27,15 @@ class be_visitor_component_svh : public be_visitor_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);
-                  
+
 private:
   TAO_OutStream &os_;
   ACE_CString export_macro_;
diff --git a/TAO_IDL/be_include/be_visitor_component/component_svs.h b/TAO_IDL/be_include/be_visitor_component/component_svs.h
index 3040bcffe65..8e4f2d07e91 100644
--- a/TAO_IDL/be_include/be_visitor_component/component_svs.h
+++ b/TAO_IDL/be_include/be_visitor_component/component_svs.h
@@ -28,19 +28,19 @@ class be_visitor_component_svs : public be_visitor_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);
-  
+
 private:
   TAO_OutStream &os_;
   ACE_CString export_macro_;
 };
-        
+
 #endif /* _BE_COMPONENT_COMPONENT_SVS_H_ */
 
diff --git a/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h b/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h
index 8247bcc7f0b..fcb6a6fdf0c 100644
--- a/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h
+++ b/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h
@@ -16,18 +16,13 @@
 #ifndef _BE_COMPONENT_CONTEXT_EX_IDL_H_
 #define _BE_COMPONENT_CONTEXT_EX_IDL_H_
 
+/**
+ * This is a concrete visitor to generate the
+ * CIAO context IDL.
+ */
 class be_visitor_context_ex_idl
   : public be_visitor_component_scope
 {
-  //
-  // = TITLE
-  //   be_visitor_context_ex_idl
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the
-  //   CIAO context IDL.
-  //
-  //
 public:
   be_visitor_context_ex_idl (be_visitor_context *ctx);
 
diff --git a/TAO_IDL/be_include/be_visitor_component/context_svh.h b/TAO_IDL/be_include/be_visitor_component/context_svh.h
index c13ca8bc334..9384a0d0c2f 100644
--- a/TAO_IDL/be_include/be_visitor_component/context_svh.h
+++ b/TAO_IDL/be_include/be_visitor_component/context_svh.h
@@ -29,9 +29,9 @@ class be_visitor_context_svh : public be_visitor_component_scope
 {
 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);
diff --git a/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h b/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h
index 0f4b928c185..59a431f0bd8 100644
--- a/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h
+++ b/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h
@@ -15,18 +15,13 @@
 #ifndef _BE_COMPONENT_EXECUTOR_EX_IDL_H_
 #define _BE_COMPONENT_EXECUTOR_EX_IDL_H_
 
+/**
+ * This is a concrete visitor to generate the
+ * CIAO executor class IDL.
+ */
 class be_visitor_executor_ex_idl
   : public be_visitor_component_scope
 {
-  //
-  // = TITLE
-  //   be_visitor_executor_ex_idl
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the
-  //   CIAO executor class IDL.
-  //
-  //
 public:
   be_visitor_executor_ex_idl (be_visitor_context *ctx);
 
diff --git a/TAO_IDL/be_include/be_visitor_component/executor_exh.h b/TAO_IDL/be_include/be_visitor_component/executor_exh.h
index 05870f4ed9a..39de3ef3b7d 100644
--- a/TAO_IDL/be_include/be_visitor_component/executor_exh.h
+++ b/TAO_IDL/be_include/be_visitor_component/executor_exh.h
@@ -16,27 +16,45 @@
 #ifndef _BE_COMPONENT_EXECUTOR_EXH_H_
 #define _BE_COMPONENT_EXECUTOR_EXH_H_
 
+/**
+ * This is a concrete visitor to generate
+ * the executor implementation class declaration.
+ */
 class be_visitor_executor_exh
   : public be_visitor_component_scope
 {
-  //
-  // = TITLE
-  //   be_visitor_executor_exh
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate
-  //   the executor implementation class declaration.
-  //
-  //
 public:
   be_visitor_executor_exh (be_visitor_context *ctx);
-  
+
   ~be_visitor_executor_exh (void);
-  
+
   virtual int visit_attribute (be_attribute *node);
   virtual int visit_component (be_component *node);
   virtual int visit_provides (be_provides *node);
   virtual int visit_consumes (be_consumes *node);
+private:
+  const char *comment_start_border_;
+  const char *comment_end_border_;
+};
+
+// =============================================
+
+/// Worker class passed to traverse_inheritance_graph(),
+/// generates code to declare attribute members in
+/// the executor impl class.
+class Exec_Attr_Decl_Generator
+  : public TAO_IDL_Inheritance_Hierarchy_Worker
+{
+public:
+  Exec_Attr_Decl_Generator (
+    be_visitor_scope * visitor);
+
+  virtual int emit (be_interface * derived_interface,
+                    TAO_OutStream * os,
+                    be_interface * base_interface);
+
+private:
+  be_visitor_scope * visitor_;
 };
 
 #endif /* _BE_COMPONENT_EXECUTOR_EXH_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_component/executor_exs.h b/TAO_IDL/be_include/be_visitor_component/executor_exs.h
index 23afac20bd6..efa4c204eb7 100644
--- a/TAO_IDL/be_include/be_visitor_component/executor_exs.h
+++ b/TAO_IDL/be_include/be_visitor_component/executor_exs.h
@@ -16,34 +16,50 @@
 #ifndef _BE_COMPONENT_EXECUTOR_EXS_H_
 #define _BE_COMPONENT_EXECUTOR_EXS_H_
 
+/**
+ * This is a concrete visitor to generate
+ * the executor implementation source.
+ */
 class be_visitor_executor_exs
   : public be_visitor_component_scope
 {
-  //
-  // = TITLE
-  //   be_visitor_executor_exs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate
-  //   the executor implementation source.
-  //
-  //
 public:
   be_visitor_executor_exs (be_visitor_context *ctx);
-  
+
   ~be_visitor_executor_exs (void);
-  
+
   virtual int visit_operation (be_operation *node);
   virtual int visit_attribute (be_attribute *node);
   virtual int visit_component (be_component *node);
   virtual int visit_provides (be_provides *node);
   virtual int visit_consumes (be_consumes *node);
-  
+
 private:
   be_interface *op_scope_;
-  const char *comment_border_;
+  const char *comment_start_border_;
+  const char *comment_end_border_;
   const char *your_code_here_;
 };
 
+// =============================================
+
+/// Worker class passed to traverse_inheritance_graph(),
+/// generates code to initialize attribute members in
+/// the executor impl constructor.
+class Component_Exec_Attr_Init_Generator
+  : public TAO_IDL_Inheritance_Hierarchy_Worker
+{
+public:
+  Component_Exec_Attr_Init_Generator (
+    be_visitor_scope * visitor);
+
+  virtual int emit (be_interface * derived_interface,
+                    TAO_OutStream * os,
+                    be_interface * base_interface);
+
+private:
+  be_visitor_scope * visitor_;
+};
+
 #endif /* _BE_COMPONENT_EXECUTOR_EXS_H_ */
 
diff --git a/TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h b/TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h
new file mode 100644
index 00000000000..bf8ef5f9583
--- /dev/null
+++ b/TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h
@@ -0,0 +1,43 @@
+/* -*- c++ -*- */
+//=============================================================================
+/**
+ *  @file    executor_exs_attr_init.h
+ *
+ *  $Id$
+ *
+ *  This provides code generation in the exec impl source for
+ *  the attribute members' initialization in the constructor.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef _BE_COMPONENT_EXECUTOR_EXS_ATTR_INIT_H_
+#define _BE_COMPONENT_EXECUTOR_EXS_ATTR_INIT_H_
+
+/**
+ * This is a concrete visitor to generate
+ * the executor attribute members' initialization
+ * in the constructor.
+ */
+class be_visitor_executor_exs_attr_init
+  : public be_visitor_component_scope
+{
+public:
+  be_visitor_executor_exs_attr_init (be_visitor_context *ctx);
+  ~be_visitor_executor_exs_attr_init (void);
+
+  virtual int visit_attribute (be_attribute *node);
+
+  virtual int pre_process (be_decl *);
+
+  bool attr_generated (void) const;
+
+private:
+  bool semicolon_generated_;
+};
+
+#endif /* _BE_COMPONENT_EXECUTOR_EXS_ATTR_INIT_H_ */
+
diff --git a/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h b/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h
new file mode 100644
index 00000000000..00b8925e2da
--- /dev/null
+++ b/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h
@@ -0,0 +1,37 @@
+/* -*- c++ -*- */
+//=============================================================================
+/**
+ *  @file    executor_private_exh.h
+ *
+ *  $Id$
+ *
+ *  This provides code generation for private members
+ *  in the exec impl header,
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+#ifndef _BE_COMPONENT_EXECUTOR_PRIVATE_EXH_H_
+#define _BE_COMPONENT_EXECUTOR_PRIVATE_EXH_H_
+
+/**
+ * This is a concrete visitor to generate
+ * the executor implementation's private facet
+ * executor member(s).
+ */
+class be_visitor_executor_private_exh
+  : public be_visitor_component_scope
+{
+public:
+  be_visitor_executor_private_exh (be_visitor_context *ctx);
+
+  ~be_visitor_executor_private_exh (void);
+
+  virtual int visit_provides (be_provides *node);
+  virtual int visit_attribute (be_attribute *node);
+};
+
+#endif /* _BE_COMPONENT_EXECUTOR_PRIVATE_EXH_H_ */
+
diff --git a/TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h b/TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h
index 244872ccb9a..9d0d502ad09 100644
--- a/TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h
+++ b/TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h
@@ -16,18 +16,13 @@
 #ifndef _BE_COMPONENT_FACET_EX_IDL_H_
 #define _BE_COMPONENT_FACET_EX_IDL_H_
 
+/**
+ * This is a concrete visitor to generate the
+ * CIAO executor IDL for facets.
+ */
 class be_visitor_facet_ex_idl
   : public be_visitor_component_scope
 {
-  //
-  // = TITLE
-  //   be_visitor_facet_ex_idl
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the
-  //   CIAO executor IDL for facets.
-  //
-  //
 public:
   be_visitor_facet_ex_idl (be_visitor_context *ctx);
 
diff --git a/TAO_IDL/be_include/be_visitor_component/facet_exh.h b/TAO_IDL/be_include/be_visitor_component/facet_exh.h
index d93327b055f..b78803ae15e 100644
--- a/TAO_IDL/be_include/be_visitor_component/facet_exh.h
+++ b/TAO_IDL/be_include/be_visitor_component/facet_exh.h
@@ -15,24 +15,27 @@
 #ifndef _BE_COMPONENT_FACET_EXH_H_
 #define _BE_COMPONENT_FACET_EXH_H_
 
+/**
+ * This is a concrete visitor to generate
+ * the executor implementation header for facets.
+ */
 class be_visitor_facet_exh
   : public be_visitor_component_scope
 {
-  //
-  // = TITLE
-  //   be_visitor_facet_exh
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate
-  //   the executor implementation header for facets.
-  //
-  //
 public:
   be_visitor_facet_exh (be_visitor_context *ctx);
-  
+
   ~be_visitor_facet_exh (void);
-  
+
   virtual int visit_provides (be_provides *node);
+
+  static int method_helper (be_interface *derived,
+                            be_interface *node,
+                            TAO_OutStream *os);
+
+private:
+  const char *comment_start_border_;
+  const char *comment_end_border_;
 };
 
 #endif /* _BE_COMPONENT_FACET_EXH_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_component/facet_exs.h b/TAO_IDL/be_include/be_visitor_component/facet_exs.h
index 1b4b5e83e81..230594d8b50 100644
--- a/TAO_IDL/be_include/be_visitor_component/facet_exs.h
+++ b/TAO_IDL/be_include/be_visitor_component/facet_exs.h
@@ -16,30 +16,26 @@
 #ifndef _BE_COMPONENT_FACET_EXS_H_
 #define _BE_COMPONENT_FACET_EXS_H_
 
+/**
+ * This is a concrete visitor to generate
+ * the executor implementation source for facets.
+ */
 class be_visitor_facet_exs
   : public be_visitor_component_scope
 {
-  //
-  // = TITLE
-  //   be_visitor_facet_exs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate
-  //   the executor implementation source for facets.
-  //
-  //
 public:
   be_visitor_facet_exs (be_visitor_context *ctx);
-  
+
   ~be_visitor_facet_exs (void);
-  
+
   virtual int visit_operation (be_operation *node);
   virtual int visit_attribute (be_attribute *node);
   virtual int visit_provides (be_provides *node);
-  
+
 private:
-  be_provides *op_scope_;
-  const char *comment_border_;
+  be_decl *op_scope_;
+  const char *comment_start_border_;
+  const char *comment_end_border_;
 };
 
 #endif /* _BE_COMPONENT_FACET_EXS_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_component/facet_private_exh.h b/TAO_IDL/be_include/be_visitor_component/facet_private_exh.h
deleted file mode 100644
index 93adfbce4b8..00000000000
--- a/TAO_IDL/be_include/be_visitor_component/facet_private_exh.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    facet_private_exh.h
- *
- *  $Id$
- *
- *  This provides code generation for private facet members
- *  in the exec impl header,
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef _BE_COMPONENT_FACET_PRIVATE_EXH_H_
-#define _BE_COMPONENT_FACET_PRIVATE_EXH_H_
-
-class be_visitor_facet_private_exh
-  : public be_visitor_component_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_facet_private_exh
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate
-  //   the executor implementation's private facet
-  //   executor member(s).
-  //
-  //
-public:
-  be_visitor_facet_private_exh (be_visitor_context *ctx);
-  
-  ~be_visitor_facet_private_exh (void);
-  
-  virtual int visit_provides (be_provides *node);
-};
-
-#endif /* _BE_COMPONENT_FACET_PRIVATE_EXH_H_ */
-
diff --git a/TAO_IDL/be_include/be_visitor_component/facet_svh.h b/TAO_IDL/be_include/be_visitor_component/facet_svh.h
index 395b394693f..93d83b4eb57 100644
--- a/TAO_IDL/be_include/be_visitor_component/facet_svh.h
+++ b/TAO_IDL/be_include/be_visitor_component/facet_svh.h
@@ -29,9 +29,9 @@ class be_visitor_facet_svh : public be_visitor_component_scope
 {
 public:
   be_visitor_facet_svh (be_visitor_context *ctx);
-  
+
   ~be_visitor_facet_svh (void);
-  
+
   virtual int visit_provides (be_provides *node);
 };
 
diff --git a/TAO_IDL/be_include/be_visitor_component/facet_svs.h b/TAO_IDL/be_include/be_visitor_component/facet_svs.h
index f8dd0988b39..46658f60257 100644
--- a/TAO_IDL/be_include/be_visitor_component/facet_svs.h
+++ b/TAO_IDL/be_include/be_visitor_component/facet_svs.h
@@ -29,9 +29,9 @@ class be_visitor_facet_svs : public be_visitor_component_scope
 {
 public:
   be_visitor_facet_svs (be_visitor_context *ctx);
-  
+
   ~be_visitor_facet_svs (void);
-  
+
   virtual int visit_provides (be_provides *node);
 };
 
diff --git a/TAO_IDL/be_include/be_visitor_component/servant_svh.h b/TAO_IDL/be_include/be_visitor_component/servant_svh.h
index e1ce49b94bb..71340afd5b9 100644
--- a/TAO_IDL/be_include/be_visitor_component/servant_svh.h
+++ b/TAO_IDL/be_include/be_visitor_component/servant_svh.h
@@ -29,9 +29,9 @@ class be_visitor_servant_svh : public be_visitor_component_scope
 {
 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);
@@ -40,9 +40,9 @@ public:
   virtual int visit_publishes (be_publishes *node);
   virtual int visit_emits (be_emits *node);
   virtual int visit_consumes (be_consumes *node);
-  
+
 private:
-  /// Base class overrides and CIAO-specific code.                
+  /// Base class overrides and CIAO-specific code.
   void gen_non_type_specific (void);
 };
 
diff --git a/TAO_IDL/be_include/be_visitor_component/servant_svs.h b/TAO_IDL/be_include/be_visitor_component/servant_svs.h
index 1b92a4971a1..3a86824b7c4 100644
--- a/TAO_IDL/be_include/be_visitor_component/servant_svs.h
+++ b/TAO_IDL/be_include/be_visitor_component/servant_svs.h
@@ -17,23 +17,18 @@
 #ifndef _BE_COMPONENT_SERVANT_SVS_H_
 #define _BE_COMPONENT_SERVANT_SVS_H_
 
+/**
+ * This is a concrete visitor to generate the servant class decl
+ * for a component.
+ */
 class be_visitor_servant_svs
   : public be_visitor_component_scope
 {
-  //
-  // = TITLE
-  //   be_visitor_servant_svs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the servant class decl
-  //   for a component.
-  //
-  //
 public:
   be_visitor_servant_svs (be_visitor_context *ctx);
-  
+
   ~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);
@@ -43,13 +38,13 @@ public:
   virtual int visit_publishes (be_publishes *node);
   virtual int visit_emits (be_emits *node);
   virtual int visit_consumes (be_consumes *node);
-  
+
 private:
   void gen_provides_top (void);
   void gen_uses_top (void);
   void gen_publishes_top (void);
   void gen_emits_top (void);
-  
+
   /// This method gets generated (unless we are
   /// generating the LwCCM profile) whether the
   /// comonent has any emitters or not.
@@ -66,13 +61,13 @@ class be_visitor_obv_factory_reg
 {
 public:
   be_visitor_obv_factory_reg (be_visitor_context *ctx);
-  
+
   ~be_visitor_obv_factory_reg (void);
-  
+
   virtual int visit_publishes (be_publishes *node);
   virtual int visit_emits (be_emits *node);
   virtual int visit_consumes (be_consumes *node);
-  
+
 private:
   void gen_obv_factory_registration (AST_Type *t);
 };
@@ -83,9 +78,9 @@ class be_visitor_attr_set : public be_visitor_component_scope
 {
 public:
   be_visitor_attr_set (be_visitor_context *ctx);
-  
+
   ~be_visitor_attr_set (void);
-  
+
   virtual int visit_attribute (be_attribute *node);
 };
 
@@ -96,9 +91,9 @@ class be_visitor_facet_executor_block
 {
 public:
   be_visitor_facet_executor_block (be_visitor_context *ctx);
-  
+
   ~be_visitor_facet_executor_block (void);
-  
+
   virtual int visit_provides (be_provides *node);
 };
 
@@ -109,9 +104,9 @@ class be_visitor_connect_block
 {
 public:
   be_visitor_connect_block (be_visitor_context *ctx);
-  
+
   ~be_visitor_connect_block (void);
-  
+
   virtual int visit_uses (be_uses *node);
 };
 
@@ -122,9 +117,9 @@ class be_visitor_disconnect_block
 {
 public:
   be_visitor_disconnect_block (be_visitor_context *ctx);
-  
+
   ~be_visitor_disconnect_block (void);
-  
+
   virtual int visit_uses (be_uses *node);
 };
 
@@ -134,14 +129,16 @@ class be_visitor_receptacle_desc
   : public be_visitor_component_scope
 {
 public:
-  be_visitor_receptacle_desc (be_visitor_context *ctx);
-  
+  be_visitor_receptacle_desc (be_visitor_context *ctx,
+                              be_component *node);
+
   ~be_visitor_receptacle_desc (void);
-  
+
   virtual int visit_uses (be_uses *node);
-  
+
 private:
   ACE_CDR::ULong slot_;
+  be_component *comp_;
 };
 
 // ======================================================
@@ -151,9 +148,9 @@ class be_visitor_subscribe_block
 {
 public:
   be_visitor_subscribe_block (be_visitor_context *ctx);
-  
+
   ~be_visitor_subscribe_block (void);
-  
+
   virtual int visit_publishes (be_publishes *node);
 };
 
@@ -164,9 +161,9 @@ class be_visitor_unsubscribe_block
 {
 public:
   be_visitor_unsubscribe_block (be_visitor_context *ctx);
-  
+
   ~be_visitor_unsubscribe_block (void);
-  
+
   virtual int visit_publishes (be_publishes *node);
 };
 
@@ -177,11 +174,11 @@ class be_visitor_event_source_desc
 {
 public:
   be_visitor_event_source_desc (be_visitor_context *ctx);
-  
+
   ~be_visitor_event_source_desc (void);
-  
+
   virtual int visit_publishes (be_publishes *node);
-  
+
 private:
   ACE_CDR::ULong slot_;
 };
@@ -193,9 +190,9 @@ class be_visitor_connect_consumer_block
 {
 public:
   be_visitor_connect_consumer_block (be_visitor_context *ctx);
-  
+
   ~be_visitor_connect_consumer_block (void);
-  
+
   virtual int visit_emits (be_emits *node);
 };
 
@@ -206,9 +203,9 @@ class be_visitor_disconnect_consumer_block
 {
 public:
   be_visitor_disconnect_consumer_block (be_visitor_context *ctx);
-  
+
   ~be_visitor_disconnect_consumer_block (void);
-  
+
   virtual int visit_emits (be_emits *node);
 };
 
@@ -219,11 +216,11 @@ class be_visitor_emitter_desc
 {
 public:
   be_visitor_emitter_desc (be_visitor_context *ctx);
-  
+
   ~be_visitor_emitter_desc (void);
-  
+
   virtual int visit_emits (be_emits *node);
-  
+
 private:
   ACE_CDR::ULong slot_;
 };
@@ -235,11 +232,11 @@ class be_visitor_populate_port_tables
 {
 public:
   be_visitor_populate_port_tables (be_visitor_context *ctx);
-  
+
   ~be_visitor_populate_port_tables (void);
-  
+
   virtual int visit_provides (be_provides *node);
-  
+
   virtual int visit_consumes (be_consumes *node);
 };
 
@@ -252,7 +249,7 @@ class Component_Op_Attr_Generator
 {
 public:
   Component_Op_Attr_Generator (be_visitor_scope * visitor);
-  
+
   virtual int emit (be_interface * derived_interface,
                     TAO_OutStream * os,
                     be_interface * base_interface);
@@ -260,6 +257,6 @@ public:
 private:
   be_visitor_scope * visitor_;
 };
-                     
+
 #endif /* _BE_COMPONENT_SERVANT_SVS_H_ */
 
diff --git a/TAO_IDL/be_include/be_visitor_component_scope.h b/TAO_IDL/be_include/be_visitor_component_scope.h
index 1544c8f2e76..52a41b74823 100644
--- a/TAO_IDL/be_include/be_visitor_component_scope.h
+++ b/TAO_IDL/be_include/be_visitor_component_scope.h
@@ -64,6 +64,7 @@ protected:
   be_component *node_;
   TAO_OutStream &os_;
   ACE_CString export_macro_;
+  bool in_ext_port_;
 };
 
 #endif /* _BE_COMPONENT_COMPONENT_SCOPE_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_connector.h b/TAO_IDL/be_include/be_visitor_connector.h
index ed3f3116202..ff7fc6009da 100644
--- a/TAO_IDL/be_include/be_visitor_connector.h
+++ b/TAO_IDL/be_include/be_visitor_connector.h
@@ -33,7 +33,5 @@
 #include "be_visitor_connector/facet_ami_exs.h"
 #include "be_visitor_connector/executor_ami_exh.h"
 #include "be_visitor_connector/executor_ami_exs.h"
-#include "be_visitor_connector/connector_ami_rh_exh.h"
-#include "be_visitor_connector/connector_ami_rh_exs.h"
 
 #endif /* TAO_BE_VISITOR_CONNECTOR_H */
diff --git a/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h b/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h
index 897a3384a86..d7e8d69b906 100644
--- a/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h
+++ b/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h
@@ -33,11 +33,11 @@ class be_visitor_connector_ami_exh
   //
 public:
   be_visitor_connector_ami_exh (be_visitor_context *ctx);
-  
+
   ~be_visitor_connector_ami_exh (void);
-  
+
   virtual int visit_connector (be_connector *node);
-  
+
 private:
   void gen_entrypoint (void);
 };
diff --git a/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h b/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h
index 728f06676ec..ac03efd9545 100644
--- a/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h
+++ b/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h
@@ -34,11 +34,11 @@ class be_visitor_connector_ami_exs
   //
 public:
   be_visitor_connector_ami_exs (be_visitor_context *ctx);
-  
+
   ~be_visitor_connector_ami_exs (void);
-  
+
   virtual int visit_connector (be_connector *node);
-  
+
 private:
   void gen_entrypoint (void);
 };
diff --git a/TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exh.h b/TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exh.h
deleted file mode 100644
index a3bb3ce026d..00000000000
--- a/TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exh.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    connector_ami_rh_exh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the AMI4CCM Connector node.
- *  This provides for code generation of the AMI4CCM reply
- *  handler implementation header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef _BE_CONNECTOR_CONNECTOR_AMI_EXH_RH_H_
-#define _BE_CONNECTOR_CONNECTOR_AMI_EXH_RH_H_
-
-class be_visitor_context;
-
-/// This class inherits from the AMI connector visitor that its
-/// code generation tracks closely.
-class be_visitor_connector_ami_rh_exh
-  : public be_visitor_facet_ami_exh
-{
-  //
-  // = TITLE
-  //   be_visitor_connector_ami_rh_exh
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate
-  //   the implementation header for
-  //   AMI4CCM reply handers.
-  //
-  //
-public:
-  be_visitor_connector_ami_rh_exh (be_visitor_context *ctx);
-  
-  ~be_visitor_connector_ami_rh_exh (void);
-  
-  virtual int visit_component (be_component *node);
-  
-  virtual int visit_provides (be_provides *node);
-  
-  virtual int visit_attribute (be_attribute *node);
-};
-
-// ======================================================
-
-/// Worker class passed to traverse_inheritance_graph(),
-/// collects operations and attributes.
-class ReplyHandler_Op_Attr_Decl_Generator
-  : public TAO_IDL_Inheritance_Hierarchy_Worker
-{
-public:
-  ReplyHandler_Op_Attr_Decl_Generator (be_visitor_scope * visitor);
-  
-  virtual int emit (be_interface * derived_interface,
-                    TAO_OutStream * os,
-                    be_interface * base_interface);
-
-private:
-  be_visitor_scope * visitor_;
-};
-                     
-#endif /* _BE_CONNECTOR_CONNECTOR_AMI_EXH_RH_H_ */
-
diff --git a/TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exs.h b/TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exs.h
deleted file mode 100644
index b40fd6d8420..00000000000
--- a/TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exs.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    connector_ami_rh_exs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the AMI4CCM Connector node.
- *  This provides for code generation of the AMI4CCM reply
- *  handler implementation source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef _BE_CONNECTOR_CONNECTOR_AMI_EXS_RH_H_
-#define _BE_CONNECTOR_CONNECTOR_AMI_EXS_RH_H_
-
-class be_visitor_context;
-
-/// This class inherits from the AMI connector visitor that its
-/// code generation tracks closely.
-class be_visitor_connector_ami_rh_exs
-  : public be_visitor_facet_ami_exh
-{
-  //
-  // = TITLE
-  //   be_visitor_connector_ami_rh_exs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate
-  //   the stencil of the implementation source for
-  //   AMI4CCM reply handers.
-  //
-  //
-public:
-  be_visitor_connector_ami_rh_exs (be_visitor_context *ctx);
-  
-  ~be_visitor_connector_ami_rh_exs (void);
-  
-  virtual int visit_component (be_component *node);
-  
-  virtual int visit_provides (be_provides *node);
-  
-  virtual int visit_operation (be_operation *node);
-  
-  virtual int visit_attribute (be_attribute *node);
-};
-
-// ======================================================
-
-/// Worker class passed to traverse_inheritance_graph(),
-/// collects operations and attributes.
-class ReplyHandler_Op_Attr_Defn_Generator
-  : public TAO_IDL_Inheritance_Hierarchy_Worker
-{
-public:
-  ReplyHandler_Op_Attr_Defn_Generator (be_visitor_scope * visitor);
-  
-  virtual int emit (be_interface * derived_interface,
-                    TAO_OutStream * os,
-                    be_interface * base_interface);
-
-private:
-  be_visitor_scope * visitor_;
-};
-                     
-#endif /* _BE_CONNECTOR_CONNECTOR_AMI_EXS_RH_H_ */
-
diff --git a/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h b/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h
index 3bcc9912b78..5a7ec54c0ea 100644
--- a/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h
+++ b/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h
@@ -17,6 +17,7 @@
 #define _BE_CONNECTOR_CONNECTOR_DDS_EX_BASE_H_
 
 class be_visitor_context;
+class AST_Template_Module;
 
 class be_visitor_connector_dds_ex_base
   : public be_visitor_component_scope
@@ -32,25 +33,30 @@ class be_visitor_connector_dds_ex_base
   //
 public:
   be_visitor_connector_dds_ex_base (be_visitor_context *ctx);
-  
+
   ~be_visitor_connector_dds_ex_base (void);
-  
+
 protected:
   bool begin (be_connector *node);
-  
+
+  bool is_dds_type (be_connector *node, AST_Decl *d);
+
 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_;
-  
+  AST_Template_Module_Ref *t_ref_;
+  FE_Utils::T_ARGLIST t_args_;
+  FE_Utils::T_PARAMLIST_INFO *t_params_;
+
   // Derives from the DDS datatype, so we want to calculate it
   // once and store it.
   ACE_CString dds_traits_name_;
   const char *base_tname_;
-  
+
 private:
   void process_template_args (AST_Connector *node);
+  void match_template_args (void);
 };
 
 #endif /* _BE_CONNECTOR_CONNECTOR_DDS_EX_BASE_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h b/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h
index 1b96d896876..cd4245174c2 100644
--- a/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h
+++ b/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h
@@ -33,25 +33,30 @@ class be_visitor_connector_dds_exh
   //
 public:
   be_visitor_connector_dds_exh (be_visitor_context *ctx);
-  
+
   ~be_visitor_connector_dds_exh (void);
-  
+
   virtual int visit_connector (be_connector *node);
-  
+
+  /// Override which also calls the base class version.
+  virtual int visit_mirror_port (be_mirror_port *node);
+
   /// Used to generate the traits structures.
   virtual int visit_provides (be_provides *node);
   virtual int visit_uses (be_uses *node);
-  
+  virtual int visit_attribute (be_attribute *node);
+
 private:
   /// Generate application-specific instantiations of
   /// middleware templates containing traits constructs.
-  void gen_dds_traits (void);
+  void gen_dds_traits (AST_Decl *datatype);
   void gen_connector_traits (void);
-  
+
   /// Common code triggered by provides and uses ports.
   void gen_interface_connector_trait (be_interface *iface,
+                                      be_field *port_elem,
                                       bool for_facet);
-  
+
   /// Have to keep a list of port interfaces so their
   /// dds
   ACE_Unbounded_Queue<be_interface *> port_ifaces_;
diff --git a/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h b/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h
index 0f3184b1597..a976c2beab9 100644
--- a/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h
+++ b/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h
@@ -31,9 +31,9 @@ class be_visitor_connector_dds_exs
   //
 public:
   be_visitor_connector_dds_exs (be_visitor_context *ctx);
-  
+
   ~be_visitor_connector_dds_exs (void);
-  
+
   virtual int visit_connector (be_connector *node);
 };
 
diff --git a/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h b/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h
index 521bb5b0ffe..f9bdd4695de 100644
--- a/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h
+++ b/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h
@@ -31,9 +31,9 @@ class be_visitor_executor_ami_exh
   //
 public:
   be_visitor_executor_ami_exh (be_visitor_context *ctx);
-  
+
   ~be_visitor_executor_ami_exh (void);
-  
+
   virtual int visit_connector (be_connector *node);
   virtual int visit_provides (be_provides *node);
 };
diff --git a/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h b/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h
index 20864ef3154..a125c4ff6bd 100644
--- a/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h
+++ b/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h
@@ -31,9 +31,9 @@ class be_visitor_executor_ami_exs
   //
 public:
   be_visitor_executor_ami_exs (be_visitor_context *ctx);
-  
+
   ~be_visitor_executor_ami_exs (void);
-  
+
   virtual int visit_connector (be_connector *node);
   virtual int visit_provides (be_provides *node);
 };
diff --git a/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h b/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h
index 5f87a3537a0..1ab59a3edef 100644
--- a/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h
+++ b/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h
@@ -30,17 +30,17 @@ class be_visitor_facet_ami_exh
   //
 public:
   be_visitor_facet_ami_exh (be_visitor_context *ctx);
-  
+
   ~be_visitor_facet_ami_exh (void);
-  
+
   virtual int visit_component (be_component *node);
   virtual int visit_provides (be_provides *node);
   virtual int visit_operation (be_operation *node);
-  
+
 protected:
   /// Common the this class and derived class.
   void init (bool for_impl);
-  
+
 protected:
   be_interface *iface_;
   be_interface *callback_iface_;
@@ -48,7 +48,7 @@ protected:
   const char *scope_name_;
   const char *iface_name_;
   const char *smart_scope_;
-  
+
 private:
   int gen_reply_handler_class (void);
   int gen_facet_executor_class (void);
diff --git a/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h b/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h
index 523e1aa3bff..525e9cfa439 100644
--- a/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h
+++ b/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h
@@ -30,26 +30,26 @@ class be_visitor_facet_ami_exs
   //
 public:
   be_visitor_facet_ami_exs (be_visitor_context *ctx);
-  
+
   ~be_visitor_facet_ami_exs (void);
-  
+
   virtual int visit_component (be_component *node);
   virtual int visit_provides (be_provides *node);
   virtual int visit_operation (be_operation *node);
   virtual int visit_argument (be_argument *node);
-  
+
   virtual int post_process (be_decl *node);
-  
+
 private:
   int gen_reply_handler_class (void);
   int gen_facet_executor_class (void);
   int gen_reply_hander_op (be_operation *node);
   int gen_facet_executor_op (be_operation *node);
-  
+
 private:
   /// Storage for the interface type of the facet.
   be_interface *iface_;
-  
+
   /// Flag to tell us which operation body (reply handler
   /// or sendc_* class) we are generating.
   bool for_reply_handler_;
@@ -64,7 +64,7 @@ class Facet_AMI_Exec_Op_Attr_Generator
 {
 public:
   Facet_AMI_Exec_Op_Attr_Generator (be_visitor_scope * visitor);
-  
+
   virtual int emit (be_interface * derived_interface,
                     TAO_OutStream * os,
                     be_interface * base_interface);
@@ -72,6 +72,6 @@ public:
 private:
   be_visitor_scope * visitor_;
 };
-                     
+
 #endif /* _BE_CONNECTOR_FACET_AMI_EXS_H_ */
 
diff --git a/TAO_IDL/be_include/be_visitor_context.h b/TAO_IDL/be_include/be_visitor_context.h
index 2e62555ecdd..1b0240d38df 100644
--- a/TAO_IDL/be_include/be_visitor_context.h
+++ b/TAO_IDL/be_include/be_visitor_context.h
@@ -128,10 +128,10 @@ public:
    */
   be_interface *interface (void) const;
   void interface (be_interface *);
-  
+
   /// Accessor for the member.
   ACE_CString &port_prefix (void);
-  
+
   /// return the export macro currently in force
   const char *export_macro (void) const;
 
@@ -171,7 +171,7 @@ private:
 
   /// See the method declaration above.
   be_interface *interface_;
-  
+
   /// Used in enough visitors to put it here.
   ACE_CString port_prefix_;
 };
diff --git a/TAO_IDL/be_include/be_visitor_dds_ts_idl.h b/TAO_IDL/be_include/be_visitor_dds_ts_idl.h
new file mode 100644
index 00000000000..5984030a962
--- /dev/null
+++ b/TAO_IDL/be_include/be_visitor_dds_ts_idl.h
@@ -0,0 +1,59 @@
+/* -*- c++ -*- */
+
+//=============================================================================
+/**
+ *  @file    be_visitor_dds_ts_idl.h
+ *
+ *  $Id$
+ *
+ *  Concrete visitor.
+ *  This one provides code generation for
+ *  DDS type support IDL files.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+#ifndef _BE_VISITOR_DDS_TS_IDL_H_
+#define _BE_VISITOR_DDS_TS_IDL_H_
+
+#include "be_visitor_scope.h"
+
+/**
+ * @class be_visitor_dds_ts_idl
+ *
+ * @brief be_visitor_dds_ts_idl
+ *
+ * This is a concrete visitor to generate the DDS type support IDL
+ */
+class be_visitor_dds_ts_idl : public be_visitor_scope
+{
+public:
+  be_visitor_dds_ts_idl (be_visitor_context *ctx);
+
+  ~be_visitor_dds_ts_idl (void);
+
+  virtual int visit_root (be_root *node);
+  virtual int visit_module (be_module *node);
+
+  /// The only types recognized so far as DDS datatypes.
+  virtual int visit_structure (be_structure *node);
+  virtual int visit_union (be_union *node);
+  virtual int visit_valuetype (be_valuetype *node);
+
+/// Common code for processing all datatypes.
+private:
+  int process_node (be_type *node);
+  void gen_datawriter (be_type *node);
+  void gen_datareader (be_type *node);
+
+  /// Manage streams and files.
+  int init_file (void);
+  void fini_file (void);
+
+private:
+  TAO_OutStream *os_ptr_;
+};
+
+#endif /* _BE_VISITOR_DDS_TS_IDL_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_decl.h b/TAO_IDL/be_include/be_visitor_decl.h
index fda016def9f..c7260d6f4ce 100644
--- a/TAO_IDL/be_include/be_visitor_decl.h
+++ b/TAO_IDL/be_include/be_visitor_decl.h
@@ -33,7 +33,7 @@ public:
   be_visitor_decl (be_visitor_context *ctx);
 
   ~be_visitor_decl (void);
-  
+
   be_visitor_context *ctx (void);
 
 protected:
@@ -44,8 +44,8 @@ protected:
   /// contained by another.
   int gen_anonymous_base_type (be_type *bt,
                                TAO_CodeGen::CG_STATE cg_state);
-     
-  /// Our file stream.                             
+
+  /// Our file stream.
   TAO_OutStream &os_;
 };
 
diff --git a/TAO_IDL/be_include/be_visitor_enum.h b/TAO_IDL/be_include/be_visitor_enum.h
index 782536e6431..40a4ca1fea8 100644
--- a/TAO_IDL/be_include/be_visitor_enum.h
+++ b/TAO_IDL/be_include/be_visitor_enum.h
@@ -24,7 +24,5 @@
 #include "be_visitor_enum/any_op_cs.h"
 #include "be_visitor_enum/cdr_op_ch.h"
 #include "be_visitor_enum/cdr_op_cs.h"
-#include "be_visitor_enum/serializer_op_ch.h"
-#include "be_visitor_enum/serializer_op_cs.h"
 
 #endif /* TAO_BE_VISITOR_ENUM_H */
diff --git a/TAO_IDL/be_include/be_visitor_enum/serializer_op_ch.h b/TAO_IDL/be_include/be_visitor_enum/serializer_op_ch.h
deleted file mode 100644
index 61660264c86..00000000000
--- a/TAO_IDL/be_include/be_visitor_enum/serializer_op_ch.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- 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
- */
-//=============================================================================
-
-
-#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
-{
-
-public:
-  /// constructor
-  be_visitor_enum_serializer_op_ch (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_enum_serializer_op_ch (void);
-
-  /// visit enum
-  virtual int visit_enum (be_enum *node);
-};
-
-#endif /* _BE_VISITOR_ENUM_serializer_op_CH_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_enum/serializer_op_cs.h b/TAO_IDL/be_include/be_visitor_enum/serializer_op_cs.h
deleted file mode 100644
index 2187dea092f..00000000000
--- a/TAO_IDL/be_include/be_visitor_enum/serializer_op_cs.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- 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
- */
-//=============================================================================
-
-
-#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
-{
-
-public:
-  /// constructor
-  be_visitor_enum_serializer_op_cs (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_enum_serializer_op_cs (void);
-
-  /// visit enum
-  virtual int visit_enum (be_enum *node);
-};
-
-#endif /* _BE_VISITOR_ENUM_serializer_op_CS_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_exception/ctor.h b/TAO_IDL/be_include/be_visitor_exception/ctor.h
index 05f4611b87b..87f2e6a1720 100644
--- a/TAO_IDL/be_include/be_visitor_exception/ctor.h
+++ b/TAO_IDL/be_include/be_visitor_exception/ctor.h
@@ -20,9 +20,7 @@
 
 /**
  * @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
diff --git a/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h b/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h
index ac4db665d2b..7d7ebc5b49a 100644
--- a/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h
+++ b/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h
@@ -20,9 +20,7 @@
 
 /**
  * @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
diff --git a/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h b/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
index b9bfe9f59c5..f3beedde63b 100644
--- a/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
+++ b/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
@@ -19,9 +19,7 @@
 
 /**
  * @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
diff --git a/TAO_IDL/be_include/be_visitor_field.h b/TAO_IDL/be_include/be_visitor_field.h
index fc916d21e02..a6f61f6ff05 100644
--- a/TAO_IDL/be_include/be_visitor_field.h
+++ b/TAO_IDL/be_include/be_visitor_field.h
@@ -24,7 +24,5 @@
 #include "be_visitor_field/field_cs.h"
 #include "be_visitor_field/cdr_op_ch.h"
 #include "be_visitor_field/cdr_op_cs.h"
-#include "be_visitor_field/serializer_op_ch.h"
-#include "be_visitor_field/serializer_op_cs.h"
 
 #endif /* TAO_BE_VISITOR_FIELD_H */
diff --git a/TAO_IDL/be_include/be_visitor_field/serializer_op_ch.h b/TAO_IDL/be_include/be_visitor_field/serializer_op_ch.h
deleted file mode 100644
index fb80e261ae8..00000000000
--- a/TAO_IDL/be_include/be_visitor_field/serializer_op_ch.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- 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
- */
-//=============================================================================
-
-
-#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
-{
-public:
-  /// constructor
-  be_visitor_field_serializer_op_ch (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_field_serializer_op_ch (void);
-
-  /// visit the field node
-  virtual int visit_field (be_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 enum type
-  virtual int visit_enum (be_enum *node);
-
-  /// visit sequence type
-  virtual int visit_sequence (be_sequence *node);
-
-  /// visit structure type
-  virtual int visit_structure (be_structure *node);
-
-  /// visit typedefed type
-  virtual int visit_typedef (be_typedef *node);
-
-  /// visit union type
-  virtual int visit_union (be_union *node);
-};
-
-#endif /*  _BE_VISITOR_FIELD_serializer_op_CH_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_field/serializer_op_cs.h b/TAO_IDL/be_include/be_visitor_field/serializer_op_cs.h
deleted file mode 100644
index efca16be2ec..00000000000
--- a/TAO_IDL/be_include/be_visitor_field/serializer_op_cs.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- 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
- */
-//=============================================================================
-
-
-#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
-{
-public:
-  /// constructor
-  be_visitor_field_serializer_op_cs (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_field_serializer_op_cs (void);
-
-  /// visit the field node
-  virtual int visit_field (be_field *node);
-
-  // =visit operations on all possible data types that a field can be
-
-  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_component (be_component *node);
-  virtual int visit_component_fwd (be_component_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_predefined_type (be_predefined_type *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_typedef (be_typedef *node);
-  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
-{
-public:
-  /// constructor
-  be_visitor_serializer_op_field_decl (be_visitor_context *ctx);
-
-  /// visit the field node
-  virtual int visit_field (be_field *node);
-
-  // = visit operations for data types that require a local variable.
-
-  /// visit array type
-  virtual int visit_array (be_array *node);
-
-  /// visit typedef type
-  virtual int visit_typedef (be_typedef *node);
-};
-
-#endif /*  _BE_VISITOR_FIELD_serializer_op_CS_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h b/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h
index b3988c894f1..8d721db108f 100644
--- a/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h
+++ b/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h
@@ -22,7 +22,7 @@
  *
  * @brief be_visitor_home_ex_idl
  *
- * This is a concrete visitor to generate the 
+ * This is a concrete visitor to generate the
  * CIAO executor IDL for home.
  */
 class be_visitor_home_ex_idl : public be_visitor_scope
@@ -33,37 +33,37 @@ public:
   ~be_visitor_home_ex_idl (void);
 
   virtual int visit_home (be_home *node);
-  
+
   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.
   virtual int visit_sequence (be_sequence *node);
   virtual int visit_string (be_string *node);
-  
+
 private:
   void gen_implicit (void);
   void gen_explicit (void);
   void gen_derived (void);
-  
+
   void gen_supported (void);
-  
+
   void gen_exception_list (UTL_ExceptList *exceptions,
                            const char *prefix = "",
                            bool init_op = false);
-                           
+
   void gen_home_executor (void);
-  
+
   /// The CCM preproc visitor changed the scoped name and the
   /// defined_in() for the home's members to the implied
   /// *Explicit interface, which isn't a problem unless
   /// they include exceptions raised by a contained operation.
   /// factory or finder. So we restore the members just in case.
   void restore_scope (void);
-                           
+
 private:
   be_home *node_;
   TAO_OutStream &os_;
diff --git a/TAO_IDL/be_include/be_visitor_home/home_exh.h b/TAO_IDL/be_include/be_visitor_home/home_exh.h
index f09f0a654f0..38d714516e6 100644
--- a/TAO_IDL/be_include/be_visitor_home/home_exh.h
+++ b/TAO_IDL/be_include/be_visitor_home/home_exh.h
@@ -29,25 +29,25 @@ class be_visitor_home_exh : public be_visitor_scope
 {
 public:
   be_visitor_home_exh (be_visitor_context *ctx);
-  
+
   ~be_visitor_home_exh (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_factory (be_factory *node);
-  
+
   /// Helper method passed to traverse_inheritance_graph(),
   /// collects supported operations and attributes.
   static int op_attr_decl_helper (be_interface *,
                                   be_interface *,
                                   TAO_OutStream *);
-                     
+
 private:
   int gen_exec_class (void);
-  
+
   void gen_entrypoint (void);
-  
+
 private:
   be_home *node_;
   AST_Component *comp_;
diff --git a/TAO_IDL/be_include/be_visitor_home/home_exs.h b/TAO_IDL/be_include/be_visitor_home/home_exs.h
index 53faae2b1fe..69dd4b32cfd 100644
--- a/TAO_IDL/be_include/be_visitor_home/home_exs.h
+++ b/TAO_IDL/be_include/be_visitor_home/home_exs.h
@@ -29,24 +29,25 @@ class be_visitor_home_exs : public be_visitor_scope
 {
 public:
   be_visitor_home_exs (be_visitor_context *ctx);
-  
+
   ~be_visitor_home_exs (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_factory (be_factory *node);
-  
+
 private:
   int gen_exec_class (void);
-  
+
   void gen_entrypoint (void);
-  
+
 private:
   be_home *node_;
   AST_Component *comp_;
   TAO_OutStream &os_;
-  const char *comment_border_;
+  const char *comment_start_border_;
+  const char *comment_end_border_;
   const char *your_code_here_;
   ACE_CString export_macro_;
 };
@@ -58,7 +59,7 @@ class Home_Exec_Op_Attr_Generator
 {
 public:
   Home_Exec_Op_Attr_Generator (be_visitor_scope * visitor);
-  
+
   virtual int emit (be_interface * derived_interface,
                     TAO_OutStream * os,
                     be_interface * base_interface);
@@ -66,6 +67,6 @@ public:
 private:
   be_visitor_scope * visitor_;
 };
-                     
+
 #endif /* _BE_HOME_HOME_EXS_H_ */
 
diff --git a/TAO_IDL/be_include/be_visitor_home/home_svh.h b/TAO_IDL/be_include/be_visitor_home/home_svh.h
index b4c79bf8076..650e3ec52c2 100644
--- a/TAO_IDL/be_include/be_visitor_home/home_svh.h
+++ b/TAO_IDL/be_include/be_visitor_home/home_svh.h
@@ -28,26 +28,26 @@ class be_visitor_home_svh : public be_visitor_scope
 {
 public:
   be_visitor_home_svh (be_visitor_context *ctx);
-  
+
   ~be_visitor_home_svh (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_factory (be_factory *node);
   virtual int visit_finder (be_finder *node);
-  
+
 private:
   int gen_servant_class (void);
-  
+
   void gen_entrypoint (void);
-  
+
   /// Helper method passed to traverse_inheritance_graph(),
   /// collects supported operations and attributes.
   static int op_attr_decl_helper (be_interface *,
                                   be_interface *,
                                   TAO_OutStream *);
-                     
+
 private:
   be_home *node_;
   AST_Component *comp_;
diff --git a/TAO_IDL/be_include/be_visitor_home/home_svs.h b/TAO_IDL/be_include/be_visitor_home/home_svs.h
index 46236b5fe46..80a7620ca5a 100644
--- a/TAO_IDL/be_include/be_visitor_home/home_svs.h
+++ b/TAO_IDL/be_include/be_visitor_home/home_svs.h
@@ -71,9 +71,9 @@ class be_visitor_home_attr_set : public be_visitor_decl
 {
 public:
   be_visitor_home_attr_set (be_visitor_context *ctx);
-  
+
   ~be_visitor_home_attr_set (void);
-  
+
   virtual int visit_home (be_home *node);
   virtual int visit_attribute (be_attribute *node);
 };
diff --git a/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h b/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h
index 54013f43791..56415e49996 100644
--- a/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h
+++ b/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h
@@ -4,7 +4,7 @@
  *
  *  $Id$
  *
- *  Specialized visitor for AMH-ResponseHandler that generates code for the 
+ *  Specialized visitor for AMH-ResponseHandler that generates code for the
  *  RH in the skeleton source file
  *
  *  @author Mayur Deshpande <mayur@ics.uci.edu>
diff --git a/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h b/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h
index b5f04553078..911f631d7b7 100644
--- a/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h
+++ b/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h
@@ -32,7 +32,7 @@ public:
   ~be_visitor_ami4ccm_conn_ex_idl (void);
 
   virtual int visit_interface (be_interface *node);
-  
+
 private:
   TAO_OutStream &os_;
 };
diff --git a/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h b/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h
index 8616f14e762..e00c8f464a5 100644
--- a/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h
+++ b/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h
@@ -37,13 +37,13 @@ public:
   virtual int visit_argument (be_argument *node);
   virtual int visit_string (be_string *node);
   virtual int visit_sequence (be_sequence *node);
-  
+
   virtual int pre_process (be_decl *node);
-  
+
 private:
   void gen_attr_rh_ops (bool is_set_op,
                         be_attribute *node);
-  
+
 private:
   TAO_OutStream &os_;
   bool seen_in_or_inout_arg_;
diff --git a/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h b/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h
index 38bb668440f..b051f721f20 100644
--- a/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h
+++ b/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h
@@ -36,9 +36,9 @@ public:
   virtual int visit_argument (be_argument *node);
   virtual int visit_string (be_string *node);
   virtual int visit_sequence (be_sequence *node);
-  
+
   virtual int pre_process (be_decl *node);
-  
+
 private:
   TAO_OutStream &os_;
   be_interface *iface_;
diff --git a/TAO_IDL/be_include/be_visitor_interface/interface_sh.h b/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
index 995c09314af..5e51ccd2c8b 100644
--- a/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
+++ b/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
@@ -28,11 +28,11 @@ class be_visitor_interface_sh : public be_visitor_interface
 public:
   be_visitor_interface_sh (be_visitor_context *ctx);
   ~be_visitor_interface_sh (void);
-  
+
   virtual int visit_interface (be_interface *node);
   virtual int visit_component (be_component *node);
   virtual int visit_connector (be_connector *node);
-    
+
   /// Helper to generate the declarations for the operations
   /// of any abstract parents we may have.
   static int gen_abstract_ops_helper (be_interface *node,
diff --git a/TAO_IDL/be_include/be_visitor_member_type_decl.h b/TAO_IDL/be_include/be_visitor_member_type_decl.h
new file mode 100644
index 00000000000..d76fd55e896
--- /dev/null
+++ b/TAO_IDL/be_include/be_visitor_member_type_decl.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+//=============================================================================
+/**
+ *  @file    be_visitor_member_type_decl.h
+ *
+ *  $Id$
+ *
+ *  Encapsulation of rules for declaring C++ class members
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+#ifndef BE_VISITOR_MEMBER_TYPE_DECL_H
+#define BE_VISITOR_MEMBER_TYPE_DECL_H
+
+#include "be_visitor_decl.h"
+
+class TAO_OutStream;
+
+/**
+ * @class be_visitor_member_type_decl
+ *
+ * @brief be_visitor_member_type_decl
+ *
+ * Contains overloaded methods that generate declarations of
+ * CORBA typenames for C++ class members.
+ */
+class be_visitor_member_type_decl : public be_visitor_decl
+{
+public:
+  be_visitor_member_type_decl (be_visitor_context *ctx);
+  virtual ~be_visitor_member_type_decl (void);
+
+  virtual int visit_array (be_array *);
+  virtual int visit_component (be_component *);
+  virtual int visit_enum (be_enum *);
+  virtual int visit_eventtype (be_eventtype *);
+  virtual int visit_home (be_home *);
+  virtual int visit_interface (be_interface *);
+  virtual int visit_predefined_type (be_predefined_type *);
+  virtual int visit_sequence (be_sequence *);
+  virtual int visit_string (be_string *);
+  virtual int visit_structure (be_structure *);
+  virtual int visit_typedef (be_typedef *);
+  virtual int visit_union (be_union *);
+  virtual int visit_valuebox (be_valuebox *);
+  virtual int visit_valuetype (be_valuetype *);
+};
+
+#endif /* BE_VISITOR_MEMBER_TYPE_DECL_H */
+
diff --git a/TAO_IDL/be_include/be_visitor_module.h b/TAO_IDL/be_include/be_visitor_module.h
index 6af50f862eb..430983d1b91 100644
--- a/TAO_IDL/be_include/be_visitor_module.h
+++ b/TAO_IDL/be_include/be_visitor_module.h
@@ -24,6 +24,5 @@
 #include "be_visitor_module/module_ih.h"
 #include "be_visitor_module/any_op.h"
 #include "be_visitor_module/cdr_op.h"
-#include "be_visitor_module/serializer_op.h"
 
 #endif // TAO_BE_VISITOR_MODULE_H
diff --git a/TAO_IDL/be_include/be_visitor_module/serializer_op.h b/TAO_IDL/be_include/be_visitor_module/serializer_op.h
deleted file mode 100644
index 2481284b5cb..00000000000
--- a/TAO_IDL/be_include/be_visitor_module/serializer_op.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- 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
- */
-//=============================================================================
-
-
-#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
-{
-
-public:
-  /// constructor
-  be_visitor_module_serializer_op (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_module_serializer_op (void);
-
-  /// visit module
-  virtual int visit_module (be_module *node);
-};
-
-#endif /* _BE_VISITOR_MODULE_serializer_op_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_null_return_value.h b/TAO_IDL/be_include/be_visitor_null_return_value.h
index 879ae5621ad..1c7f0a42b91 100644
--- a/TAO_IDL/be_include/be_visitor_null_return_value.h
+++ b/TAO_IDL/be_include/be_visitor_null_return_value.h
@@ -34,7 +34,7 @@ class be_visitor_null_return_value : public be_visitor_decl
 public:
   be_visitor_null_return_value (be_visitor_context *ctx);
   virtual ~be_visitor_null_return_value (void);
-  
+
   virtual int visit_array (be_array *);
   virtual int visit_component (be_component *);
   virtual int visit_enum (be_enum *);
@@ -49,7 +49,7 @@ public:
   virtual int visit_union (be_union *);
   virtual int visit_valuebox (be_valuebox *);
   virtual int visit_valuetype (be_valuetype *);
-  
+
 protected:
   TAO_OutStream & os_;
 };
diff --git a/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h b/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h
index 84dc944af6e..9d3d1c566c6 100644
--- a/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h
+++ b/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h
@@ -26,13 +26,13 @@ class be_visitor_amh_rh_operation_ss : public be_visitor_operation
 {
  public:
     be_visitor_amh_rh_operation_ss (be_visitor_context *ctx);
-    
+
     ~be_visitor_amh_rh_operation_ss (void);
-    
+
     int visit_operation (be_operation *node);
 
  private:
-    int marshal_params (be_operation *node);   
+    int marshal_params (be_operation *node);
 };
 
 #endif /* AMH_RH_OPERATION_SS_H */
diff --git a/TAO_IDL/be_include/be_visitor_operation/arglist.h b/TAO_IDL/be_include/be_visitor_operation/arglist.h
index e3e00e96b33..9cfba6530bc 100644
--- a/TAO_IDL/be_include/be_visitor_operation/arglist.h
+++ b/TAO_IDL/be_include/be_visitor_operation/arglist.h
@@ -41,10 +41,10 @@ public:
 
   /// Stuff to output after each element of the scope is handled.
   virtual int post_process (be_decl *);
-  
+
   /// Set the member.
   void unused (bool val);
-  
+
 private:
   bool unused_;
 };
diff --git a/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h b/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
index a42ef19565d..660be684a42 100644
--- a/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
+++ b/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
@@ -22,17 +22,13 @@
 // generic operation visitor for docall, upcall, pre/post
 // ************************************************************
 
+/**
+ * This is a visitor to generate a variable declaration of an operation
+ * return type
+ */
 class be_visitor_operation_argument_marshal
   : public be_visitor_operation_argument
 {
-  //
-  // = TITLE
-  //   be_compiled_visitor_operation_argument_marshal
-  //
-  // = DESCRIPTION
-  //   This is a visitor to generate a variable declaration of an operation
-  //   return type
-  //
 public:
   /// constructor
   be_visitor_operation_argument_marshal (be_visitor_context *ctx);
diff --git a/TAO_IDL/be_include/be_visitor_operation/operation_exs.h b/TAO_IDL/be_include/be_visitor_operation/operation_exs.h
index be9e7a56199..b3727279f85 100644
--- a/TAO_IDL/be_include/be_visitor_operation/operation_exs.h
+++ b/TAO_IDL/be_include/be_visitor_operation/operation_exs.h
@@ -36,13 +36,13 @@ public:
   ~be_visitor_operation_exs (void);
 
   virtual int visit_operation (be_operation *node);
-  
+
   void scope (be_decl *node);
   void class_extension (const char *extension);
 
 private:
   int gen_op_body (be_type *return_type);
-  
+
 private:
   TAO_OutStream &os_;
   be_decl *scope_;
diff --git a/TAO_IDL/be_include/be_visitor_operation/rettype.h b/TAO_IDL/be_include/be_visitor_operation/rettype.h
index 5549615b9bb..bf56ac72d00 100644
--- a/TAO_IDL/be_include/be_visitor_operation/rettype.h
+++ b/TAO_IDL/be_include/be_visitor_operation/rettype.h
@@ -93,10 +93,10 @@ public:
 
   /// visit a valuebox node
   int visit_valuebox (be_valuebox *node);
-  
+
 private:
   const char *type_name (be_type *node);
-  
+
 private:
   TAO_OutStream *os;
 };
diff --git a/TAO_IDL/be_include/be_visitor_root.h b/TAO_IDL/be_include/be_visitor_root.h
index 0d86b3ba1ae..7cd109881cb 100644
--- a/TAO_IDL/be_include/be_visitor_root.h
+++ b/TAO_IDL/be_include/be_visitor_root.h
@@ -38,6 +38,5 @@
 #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"
 
 #endif // TAO_BE_VISITOR_ROOT_H
diff --git a/TAO_IDL/be_include/be_visitor_root/root_ch.h b/TAO_IDL/be_include/be_visitor_root/root_ch.h
index ba0af627fe3..564947e2b3b 100644
--- a/TAO_IDL/be_include/be_visitor_root/root_ch.h
+++ b/TAO_IDL/be_include/be_visitor_root/root_ch.h
@@ -32,13 +32,13 @@ public:
   be_visitor_root_ch (be_visitor_context *ctx);
 
   ~be_visitor_root_ch (void);
-  
+
   virtual int visit_root (be_root *node);
 
 private:
   /// Open file and initialize stream.
   int init (void);
-  
+
   /// Encapsulating various bits of code generation peculiar
   /// to the client header file, done either before or after
   /// the main scope traversal.
@@ -51,8 +51,7 @@ private:
   int gen_template_exports (be_root *node);
   int gen_any_ops (be_root *node);
   int gen_cdr_ops (be_root *node);
-  int gen_dds_serializer_ops (be_root *node);
-  
+
 private:
   /// Can't use base class be_visitor_decl's member since
   /// its constructor is called too soon to initialize the
diff --git a/TAO_IDL/be_include/be_visitor_root/root_ci.h b/TAO_IDL/be_include/be_visitor_root/root_ci.h
index 0125bec7840..aec8003bf45 100644
--- a/TAO_IDL/be_include/be_visitor_root/root_ci.h
+++ b/TAO_IDL/be_include/be_visitor_root/root_ci.h
@@ -38,7 +38,7 @@ public:
 private:
   /// Open file and initialize stream.
   int init (void);
-  
+
   /// Generate OBV definitions in the client inline
   /// file, done after the main scope traversal.
   int gen_obv_defns (be_root *node);
diff --git a/TAO_IDL/be_include/be_visitor_root/root_cs.h b/TAO_IDL/be_include/be_visitor_root/root_cs.h
index e6a3a4daae9..42f4f44c09a 100644
--- a/TAO_IDL/be_include/be_visitor_root/root_cs.h
+++ b/TAO_IDL/be_include/be_visitor_root/root_cs.h
@@ -46,7 +46,6 @@ private:
   int gen_obv_defns (be_root *node);
   int gen_any_ops (be_root *node);
   int gen_cdr_ops (be_root *node);
-  int gen_dds_serializer_ops (be_root *node);
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_CS_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_root/root_exh.h b/TAO_IDL/be_include/be_visitor_root/root_exh.h
index 1b2eff7b6fd..1161835f43e 100644
--- a/TAO_IDL/be_include/be_visitor_root/root_exh.h
+++ b/TAO_IDL/be_include/be_visitor_root/root_exh.h
@@ -32,7 +32,7 @@ public:
   be_visitor_root_exh (be_visitor_context *ctx);
 
   ~be_visitor_root_exh (void);
-  
+
   virtual int visit_root (be_root *node);
 
 private:
diff --git a/TAO_IDL/be_include/be_visitor_root/root_exs.h b/TAO_IDL/be_include/be_visitor_root/root_exs.h
index 8d61719030c..2da966b7eda 100644
--- a/TAO_IDL/be_include/be_visitor_root/root_exs.h
+++ b/TAO_IDL/be_include/be_visitor_root/root_exs.h
@@ -32,7 +32,7 @@ public:
   be_visitor_root_exs (be_visitor_context *ctx);
 
   ~be_visitor_root_exs (void);
-  
+
   virtual int visit_root (be_root *node);
 
 private:
diff --git a/TAO_IDL/be_include/be_visitor_root/root_ss.h b/TAO_IDL/be_include/be_visitor_root/root_ss.h
index 03944b9e4cf..50b67208471 100644
--- a/TAO_IDL/be_include/be_visitor_root/root_ss.h
+++ b/TAO_IDL/be_include/be_visitor_root/root_ss.h
@@ -37,7 +37,7 @@ public:
 private:
   /// Open file and initialize stream.
   int init (void);
-  
+
   /// Generate arg template trait specializations in
   /// the skeleton source file, done before the main
   /// scope traversal.
diff --git a/TAO_IDL/be_include/be_visitor_root/root_svs.h b/TAO_IDL/be_include/be_visitor_root/root_svs.h
index bbacfeb73ea..80b5698b09c 100644
--- a/TAO_IDL/be_include/be_visitor_root/root_svs.h
+++ b/TAO_IDL/be_include/be_visitor_root/root_svs.h
@@ -32,7 +32,7 @@ public:
   be_visitor_root_svs (be_visitor_context *ctx);
 
   ~be_visitor_root_svs (void);
-  
+
   virtual int visit_root (be_root *node);
 
 private:
diff --git a/TAO_IDL/be_include/be_visitor_root/serializer_op.h b/TAO_IDL/be_include/be_visitor_root/serializer_op.h
deleted file mode 100644
index 448c4002286..00000000000
--- a/TAO_IDL/be_include/be_visitor_root/serializer_op.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- 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
- */
-//=============================================================================
-
-
-#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
-{
-
-public:
-  /// constructor
-  be_visitor_root_serializer_op (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_root_serializer_op (void);
-
-  /// visit root
-  virtual int visit_root (be_root *node);
-};
-
-#endif /* _BE_VISITOR_ROOT_serializer_op_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_sequence.h b/TAO_IDL/be_include/be_visitor_sequence.h
index 227df533003..92dd035bca4 100644
--- a/TAO_IDL/be_include/be_visitor_sequence.h
+++ b/TAO_IDL/be_include/be_visitor_sequence.h
@@ -17,7 +17,5 @@
 #include "be_visitor_sequence/any_op_cs.h"
 #include "be_visitor_sequence/cdr_op_ch.h"
 #include "be_visitor_sequence/cdr_op_cs.h"
-#include "be_visitor_sequence/serializer_op_ch.h"
-#include "be_visitor_sequence/serializer_op_cs.h"
 
 #endif /* TAO_BE_VISITOR_SEQUENCE_H */
diff --git a/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h b/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
index 6a683f50e37..5f28258ec40 100644
--- a/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
+++ b/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
@@ -40,7 +40,7 @@ public:
   virtual int visit_sequence (be_sequence *node);
 
   /// Generate the typedefs for our _var and _out template classes.
-  void gen_varout_typedefs (be_sequence *node, 
+  void gen_varout_typedefs (be_sequence *node,
                             be_type *elem);
 };
 
diff --git a/TAO_IDL/be_include/be_visitor_sequence/serializer_op_ch.h b/TAO_IDL/be_include/be_visitor_sequence/serializer_op_ch.h
deleted file mode 100644
index ae89e7f82e9..00000000000
--- a/TAO_IDL/be_include/be_visitor_sequence/serializer_op_ch.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- 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
- */
-//=============================================================================
-
-
-#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
-{
-
-public:
-  /// constructor
-  be_visitor_sequence_serializer_op_ch (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_sequence_serializer_op_ch (void);
-
-  /// visit sequence
-  virtual int visit_sequence (be_sequence *node);
-};
-
-#endif /* _BE_VISITOR_SEQUENCE_serializer_op_CH_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_sequence/serializer_op_cs.h b/TAO_IDL/be_include/be_visitor_sequence/serializer_op_cs.h
deleted file mode 100644
index 7f898d992b8..00000000000
--- a/TAO_IDL/be_include/be_visitor_sequence/serializer_op_cs.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-#ifndef _BE_VISITOR_SEQUENCE_serializer_op_CS_H_
-#define _BE_VISITOR_SEQUENCE_serializer_op_CS_H_
-
-// ************************************************************
-// 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
-{
-
-public:
-  /// constructor
-  be_visitor_sequence_serializer_op_cs (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_sequence_serializer_op_cs (void);
-
-  /// visit sequence
-  virtual int visit_sequence (be_sequence *node);
-
-  // = Visitor methods on sequence types
-
-  /// visit sequence
-  virtual int visit_array (be_array *node);
-
-  /// visit an enum
-  virtual int visit_enum (be_enum *node);
-
-  /// visit an interface
-  virtual int visit_interface (be_interface *node);
-
-  /// visit an interface forward node
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-
-  /// visit a component
-  virtual int visit_component (be_component *node);
-
-  /// visit a component forward node
-  virtual int visit_component_fwd (be_component_fwd *node);
-
-  /// visit a home
-  virtual int visit_home (be_home *node);
-
-  /// visit a valuetype
-  virtual int visit_valuetype (be_valuetype *node);
-
-  /// visit a valuetype forward node
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-
-  /// visit an eventtype
-  virtual int visit_eventtype (be_eventtype *node);
-
-  /// visit an eventtype forward node
-  virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
-
-  /// visit a predefined type node
-  virtual int visit_predefined_type (be_predefined_type *node);
-
-  /// visit string
-  virtual int visit_string (be_string *node);
-
-  /// visit structure
-  virtual int visit_structure (be_structure *node);
-
-  /// visit typedef
-  virtual int visit_typedef (be_typedef *node);
-
-  /// visit union
-  virtual int visit_union (be_union *node);
-
-protected:
-
-  /// helper that does the common job
-  int visit_node (be_type *);
-
-};
-
-#endif /* _BE_VISITOR_SEQUENCE_serializer_op_CS_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_structure.h b/TAO_IDL/be_include/be_visitor_structure.h
index 773c5ceff49..e16e5cdbcc9 100644
--- a/TAO_IDL/be_include/be_visitor_structure.h
+++ b/TAO_IDL/be_include/be_visitor_structure.h
@@ -31,7 +31,6 @@
 #include "be_visitor_structure/any_op_cs.h"
 #include "be_visitor_structure/cdr_op_ch.h"
 #include "be_visitor_structure/cdr_op_cs.h"
-#include "be_visitor_structure/serializer_op_ch.h"
-#include "be_visitor_structure/serializer_op_cs.h"
+
 
 #endif // TAO_BE_VISITOR_STRUCTURE_H
diff --git a/TAO_IDL/be_include/be_visitor_structure/serializer_op_ch.h b/TAO_IDL/be_include/be_visitor_structure/serializer_op_ch.h
deleted file mode 100644
index 249c23f780b..00000000000
--- a/TAO_IDL/be_include/be_visitor_structure/serializer_op_ch.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- 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
- */
-//=============================================================================
-
-
-#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
-{
-
-public:
-  /// constructor
-  be_visitor_structure_serializer_op_ch (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_structure_serializer_op_ch (void);
-
-  /// visit structure
-  virtual int visit_structure (be_structure *node);
-};
-
-#endif /* _BE_VISITOR_STRUCTURE_serializer_op_CH_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_structure/serializer_op_cs.h b/TAO_IDL/be_include/be_visitor_structure/serializer_op_cs.h
deleted file mode 100644
index bb553f914ef..00000000000
--- a/TAO_IDL/be_include/be_visitor_structure/serializer_op_cs.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- 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
- */
-//=============================================================================
-
-
-#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
-{
-
-public:
-  /// constructor
-  be_visitor_structure_serializer_op_cs (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_structure_serializer_op_cs (void);
-
-  /// visit structure
-  virtual int visit_structure (be_structure *node);
-
-  /// any post processing that needs to be done after a field is handled
-  virtual int post_process (be_decl *);
-
-  /// any preprocessing that needs to be done before a field is handled
-  virtual int pre_process (be_decl *bd);
-};
-
-#endif /* _BE_VISITOR_STRUCTURE_serializer_op_CS_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h b/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
index ef1a75d1f3e..b1076c723bc 100644
--- a/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
+++ b/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
@@ -92,7 +92,7 @@ protected:
    * to generate a TypeCode for its members or content type.
    */
   bool is_typecode_generation_required (be_type * node);
-  
+
   /// Generate nested namespaces for anonymous type typecodes.
   /**
    * Utility methods to generate enclosing namespaces for
diff --git a/TAO_IDL/be_include/be_visitor_typedef.h b/TAO_IDL/be_include/be_visitor_typedef.h
index 6a20704f6ac..be3d0be6f2f 100644
--- a/TAO_IDL/be_include/be_visitor_typedef.h
+++ b/TAO_IDL/be_include/be_visitor_typedef.h
@@ -26,7 +26,5 @@
 #include "be_visitor_typedef/any_op_cs.h"
 #include "be_visitor_typedef/cdr_op_ch.h"
 #include "be_visitor_typedef/cdr_op_cs.h"
-#include "be_visitor_typedef/serializer_op_ch.h"
-#include "be_visitor_typedef/serializer_op_cs.h"
 
 #endif // TAO_BE_VISITOR_TYPEDEF_H
diff --git a/TAO_IDL/be_include/be_visitor_typedef/serializer_op_ch.h b/TAO_IDL/be_include/be_visitor_typedef/serializer_op_ch.h
deleted file mode 100644
index 889393517a9..00000000000
--- a/TAO_IDL/be_include/be_visitor_typedef/serializer_op_ch.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-#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
-{
-
-public:
-  /// constructor
-  be_visitor_typedef_serializer_op_ch (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_typedef_serializer_op_ch (void);
-
-  /// visit typedef
-  virtual int visit_typedef (be_typedef *node);
-
-  // =visit methods on all elements syntactically valid as types that can be
-  // typedefed.
-
-  /// visit a array
-  virtual int visit_array (be_array *node);
-
-  /// visit an enum
-  virtual int visit_enum (be_enum *node);
-
-  /// visit a sequence
-  virtual int visit_sequence (be_sequence *node);
-
-  /// visit a structure
-  virtual int visit_structure (be_structure *node);
-
-  /// visit a union
-  virtual int visit_union (be_union *node);
-};
-
-#endif /* _BE_VISITOR_TYPEDEF_serializer_op_CH_H_*/
diff --git a/TAO_IDL/be_include/be_visitor_typedef/serializer_op_cs.h b/TAO_IDL/be_include/be_visitor_typedef/serializer_op_cs.h
deleted file mode 100644
index 071be68e67e..00000000000
--- a/TAO_IDL/be_include/be_visitor_typedef/serializer_op_cs.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @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
- */
-//=============================================================================
-
-
-#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
-{
-
-public:
-  /// constructor
-  be_visitor_typedef_serializer_op_cs (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_typedef_serializer_op_cs (void);
-
-  /// visit typedef
-  virtual int visit_typedef (be_typedef *node);
-
-  // =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 sequence
-  virtual int visit_sequence (be_sequence *node);
-
-  /// visit a structure
-  virtual int visit_structure (be_structure *node);
-
-  /// visit a union
-  virtual int visit_union (be_union *node);
-};
-
-#endif /* _BE_VISITOR_TYPEDEF_serializer_op_CS_H_*/
diff --git a/TAO_IDL/be_include/be_visitor_union.h b/TAO_IDL/be_include/be_visitor_union.h
index 292fcaaffc5..49ae6e8e9ee 100644
--- a/TAO_IDL/be_include/be_visitor_union.h
+++ b/TAO_IDL/be_include/be_visitor_union.h
@@ -35,7 +35,5 @@
 #include "be_visitor_union/any_op_cs.h"
 #include "be_visitor_union/cdr_op_ch.h"
 #include "be_visitor_union/cdr_op_cs.h"
-#include "be_visitor_union/serializer_op_ch.h"
-#include "be_visitor_union/serializer_op_cs.h"
 
 #endif // TAO_BE_VISITOR_UNION_H
diff --git a/TAO_IDL/be_include/be_visitor_union/serializer_op_ch.h b/TAO_IDL/be_include/be_visitor_union/serializer_op_ch.h
deleted file mode 100644
index f7dd09dce74..00000000000
--- a/TAO_IDL/be_include/be_visitor_union/serializer_op_ch.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- 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
- */
-//=============================================================================
-
-
-#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
-{
-
-public:
-  /// constructor
-  be_visitor_union_serializer_op_ch (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_union_serializer_op_ch (void);
-
-  /// visit union
-  virtual int visit_union (be_union *node);
-
-};
-
-#endif /* _BE_VISITOR_UNION_serializer_op_CH_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_union/serializer_op_cs.h b/TAO_IDL/be_include/be_visitor_union/serializer_op_cs.h
deleted file mode 100644
index 6a851a58509..00000000000
--- a/TAO_IDL/be_include/be_visitor_union/serializer_op_cs.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- 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
- */
-//=============================================================================
-
-
-#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
-{
-
-public:
-  /// constructor
-  be_visitor_union_serializer_op_cs (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_union_serializer_op_cs (void);
-
-  /// visit union
-  virtual int visit_union (be_union *node);
-
-  virtual int pre_process (be_decl *);
-  virtual int post_process (be_decl *);
-};
-
-#endif /* _BE_VISITOR_UNION_serializer_op_CS_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_union_branch.h b/TAO_IDL/be_include/be_visitor_union_branch.h
index 6f184a3696e..6ddc682550b 100644
--- a/TAO_IDL/be_include/be_visitor_union_branch.h
+++ b/TAO_IDL/be_include/be_visitor_union_branch.h
@@ -28,7 +28,6 @@
 #include "be_visitor_union_branch/private_ch.h"
 #include "be_visitor_union_branch/cdr_op_ch.h"
 #include "be_visitor_union_branch/cdr_op_cs.h"
-#include "be_visitor_union_branch/serializer_op_ch.h"
-#include "be_visitor_union_branch/serializer_op_cs.h"
+
 
 #endif // TAO_BE_VISITOR_UNION_BRANCH_H
diff --git a/TAO_IDL/be_include/be_visitor_union_branch/serializer_op_ch.h b/TAO_IDL/be_include/be_visitor_union_branch/serializer_op_ch.h
deleted file mode 100644
index cf80c408427..00000000000
--- a/TAO_IDL/be_include/be_visitor_union_branch/serializer_op_ch.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- 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
- */
-//=============================================================================
-
-
-#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
-{
-public:
-  /// constructor
-  be_visitor_union_branch_serializer_op_ch (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_union_branch_serializer_op_ch (void);
-
-  /// visit the union_branch node
-  virtual int visit_union_branch (be_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 enum type
-  virtual int visit_enum (be_enum *node);
-
-  /// visit sequence type
-  virtual int visit_sequence (be_sequence *node);
-
-  /// visit structure type
-  virtual int visit_structure (be_structure *node);
-
-  /// visit typedefed type
-  virtual int visit_typedef (be_typedef *node);
-
-  /// visit union type
-  virtual int visit_union (be_union *node);
-
-};
-
-#endif /*  _BE_VISITOR_UNION_BRANCH_serializer_op_CH_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_union_branch/serializer_op_cs.h b/TAO_IDL/be_include/be_visitor_union_branch/serializer_op_cs.h
deleted file mode 100644
index 1b19fb7f2f1..00000000000
--- a/TAO_IDL/be_include/be_visitor_union_branch/serializer_op_cs.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- 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
- */
-//=============================================================================
-
-#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
-{
-public:
-  be_visitor_union_branch_serializer_op_cs (be_visitor_context *ctx);
-  ~be_visitor_union_branch_serializer_op_cs (void);
-
-  virtual int visit_union_branch (be_union_branch *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_predefined_type (be_predefined_type *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_structure_fwd (be_structure_fwd *node);
-  virtual int visit_typedef (be_typedef *node);
-  virtual int visit_union (be_union *node);
-  virtual int visit_union_fwd (be_union_fwd *node);
-
-  /// extra code generation for an explicit default case
-  virtual int explicit_default (void);
-};
-
-#endif /*  _BE_VISITOR_UNION_BRANCH_serializer_op_CS_H_ */
diff --git a/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h b/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
index cd34ca0e8ee..da4e8178899 100644
--- a/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
+++ b/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
@@ -36,7 +36,7 @@ public:
 
   /// Called only by AMH exceptions.
   virtual int visit_operation (be_operation *node);
-  
+
 private:
   /// Recursive to generate for inherited members.
   void gen_ostream_operator_r (be_valuetype *node, unsigned long &index);
diff --git a/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h b/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h
index 33b59575fb2..a598735fc38 100644
--- a/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h
+++ b/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h
@@ -29,10 +29,10 @@ class be_visitor_valuetype_sh : public be_visitor_valuetype
 public:
   /// constructor
   be_visitor_valuetype_sh (be_visitor_context *ctx);
-  
+
   /// destructor
   ~be_visitor_valuetype_sh (void);
-  
+
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
 };
diff --git a/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h b/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h
index 4ccf5d485f0..dd3f23bd1b6 100644
--- a/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h
+++ b/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h
@@ -32,14 +32,14 @@ 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);
@@ -65,11 +65,11 @@ public:
 
   // 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_;
diff --git a/TAO_IDL/driver/drv_args.cpp b/TAO_IDL/driver/drv_args.cpp
index ee69f2cf69a..be33bb1eba8 100644
--- a/TAO_IDL/driver/drv_args.cpp
+++ b/TAO_IDL/driver/drv_args.cpp
@@ -144,17 +144,17 @@ DRV_usage (void)
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -ae\t\t\tError if anonymous type is seen ")
-      ACE_TEXT ("(default is silent)\n")
+      ACE_TEXT ("(default)\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -aw\t\t\tWarning if anonymous type is seen ")
-      ACE_TEXT ("(default is silent)\n")
+      ACE_TEXT ("(default is error)\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -as\t\t\tSilences the anonymous type diagnostic ")
-      ACE_TEXT ("(default)\n")
+      ACE_TEXT ("(default is error)\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
@@ -297,7 +297,7 @@ DRV_parse_args (long ac, char **av)
                       ACE_TEXT_CHAR_TO_TCHAR (av[i])
                     ));
                  }
-                 
+
                break;
             // Temp directory for the IDL compiler to keep its files.
             case 't':
diff --git a/TAO_IDL/driver/drv_preproc.cpp b/TAO_IDL/driver/drv_preproc.cpp
index 70c451a056e..da7d481e881 100644
--- a/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO_IDL/driver/drv_preproc.cpp
@@ -110,7 +110,8 @@ char const DIR_DOT_DOT[] = "..";
 static char tmp_file [MAXPATHLEN + 1] = { 0 };
 static char tmp_ifile[MAXPATHLEN + 1] = { 0 };
 
-// Lines can be 1024 chars long intially - it will expand as required.
+// Lines can be 1024 chars long intially -
+// it will expand as required.
 #define LINEBUF_SIZE 1024
 char* drv_line = 0;
 static size_t drv_line_size = LINEBUF_SIZE + 1;
@@ -120,7 +121,8 @@ void
 DRV_cpp_new_location (char const * new_loc)
 {
   ACE::strdelete (const_cast<ACE_TCHAR *> (DRV_arglist[0]));
-  DRV_arglist[0] = ACE::strnew (ACE_TEXT_CHAR_TO_TCHAR (new_loc));
+  DRV_arglist[0] =
+    ACE::strnew (ACE_TEXT_CHAR_TO_TCHAR (new_loc));
 }
 
 // Push an argument into the DRV_arglist.
@@ -137,7 +139,8 @@ DRV_cpp_putarg (const char *str)
       throw Bailout ();
     }
 
-  DRV_arglist[DRV_argcount++] = ACE::strnew (ACE_TEXT_CHAR_TO_TCHAR (str));
+  DRV_arglist[DRV_argcount++] =
+    ACE::strnew (ACE_TEXT_CHAR_TO_TCHAR (str));
 }
 
 // Expand the output argument with the given filename.
@@ -146,7 +149,8 @@ DRV_cpp_expand_output_arg (const char *filename)
 {
   if (output_arg_format != 0)
     {
-      ACE::strdelete (const_cast<ACE_TCHAR *> (DRV_arglist[output_arg_index]));
+      ACE::strdelete (const_cast<ACE_TCHAR *> (
+                        DRV_arglist[output_arg_index]));
       DRV_arglist[output_arg_index] = 0;
 
       ACE_NEW (DRV_arglist[output_arg_index],
@@ -154,12 +158,27 @@ DRV_cpp_expand_output_arg (const char *filename)
                      + ACE_OS::strlen (filename)
                      + 1]);
 
-      ACE_OS::sprintf (const_cast<ACE_TCHAR *> (DRV_arglist[output_arg_index]),
+      ACE_OS::sprintf (const_cast<ACE_TCHAR *> (
+                         DRV_arglist[output_arg_index]),
                        ACE_TEXT_CHAR_TO_TCHAR (output_arg_format),
                        ACE_TEXT_CHAR_TO_TCHAR (filename));
     }
 }
 
+// calculate the total size of all commandline arguments
+unsigned int
+DRV_cpp_calc_total_argsize(void)
+{
+  unsigned long size = 0;
+  unsigned long ix = 0;
+  while (DRV_arglist[ix] != 0)
+    {
+      size += ACE_OS::strlen (DRV_arglist[ix]) + 1;
+      ++ix;
+    }
+  return size;
+}
+
 // Get a line from stdin.
 static bool
 DRV_get_line (FILE *file)
@@ -185,6 +204,7 @@ DRV_get_line (FILE *file)
           len-= 2;
           drv_line [len]= '\0';
         }
+
       // Check for end-of-line
       if (len && '\n' == drv_line [len-1])
         {
@@ -231,8 +251,8 @@ DRV_cpp_init (void)
   DRV_cpp_putarg (cpp_loc);
 
   // Add an option to the IDL compiler to make the TAO version
-  // available to the user. A XX.YY.ZZ release gets version 0xXXYYZZ,
-  // for example, 5.1.14 gets 0x050114.
+  // available to the user. A XX.YY.ZZ release gets
+  // version 0xXXYYZZ, for example, 5.1.14 gets 0x050114.
   char version_option[128];
   ACE_OS::sprintf (version_option,
                    "-D__TAO_IDL=0x%2.2d%2.2d%2.2d",
@@ -243,7 +263,8 @@ DRV_cpp_init (void)
   DRV_cpp_putarg (version_option);
   DRV_cpp_putarg ("-I.");
 
-  const char *platform_cpp_args = FE_get_cpp_args_from_env ();
+  const char *platform_cpp_args =
+    FE_get_cpp_args_from_env ();
 
   if (platform_cpp_args == 0)
     {
@@ -265,8 +286,15 @@ DRV_cpp_init (void)
 
       if (TAO_ROOT != 0)
         {
-            DRV_add_include_path (include_path1, TAO_ROOT, 0, true);
-            DRV_add_include_path (include_path2, TAO_ROOT, "/tao", true);
+            DRV_add_include_path (include_path1,
+                                  TAO_ROOT,
+                                  0,
+                                  true);
+
+            DRV_add_include_path (include_path2,
+                                  TAO_ROOT,
+                                  "/tao",
+                                  true);
         }
       else
         {
@@ -274,8 +302,15 @@ DRV_cpp_init (void)
 
           if (ACE_ROOT != 0)
             {
-              DRV_add_include_path (include_path1, ACE_ROOT, "/TAO", true);
-              DRV_add_include_path (include_path2, ACE_ROOT, "/TAO/tao", true);
+              DRV_add_include_path (include_path1,
+                                    ACE_ROOT,
+                                    "/TAO",
+                                    true);
+
+              DRV_add_include_path (include_path2,
+                                    ACE_ROOT,
+                                    "/TAO/tao",
+                                    true);
             }
           else
             {
@@ -292,7 +327,10 @@ DRV_cpp_init (void)
                                     "/tao",
                                     true);
 #else
-              DRV_add_include_path (include_path1, ".", 0, true);
+              DRV_add_include_path (include_path1,
+                                    ".",
+                                    0,
+                                    true);
 #endif  /* TAO_IDL_INCLUDE_DIR */
             }
         }
@@ -301,15 +339,18 @@ DRV_cpp_init (void)
     }
 
   // Add any flags in platform_cpp_args to cpp's DRV_arglist.
-  ACE_ARGV platform_arglist (ACE_TEXT_CHAR_TO_TCHAR (platform_cpp_args));
+  ACE_ARGV platform_arglist (
+    ACE_TEXT_CHAR_TO_TCHAR (platform_cpp_args));
 
   for (int i = 0; i < platform_arglist.argc (); ++i)
     {
-      // Check for an argument that specifies the preprocessor's output file.
+      // Check for an argument that specifies
+      // the preprocessor's output file.
       if (ACE_OS::strstr (platform_arglist[i], ACE_TEXT ("%s")) != 0
           && output_arg_format == 0)
         {
-          output_arg_format = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (platform_arglist[i]));
+          output_arg_format =
+            ACE::strnew (ACE_TEXT_ALWAYS_CHAR (platform_arglist[i]));
           output_arg_index = DRV_argcount;
           DRV_cpp_putarg (0);
         }
@@ -351,7 +392,9 @@ DRV_sweep_dirs (const char *rel_path,
     {
       // Skip the ".." and "." files in each directory.
       if (ACE::isdotdir (dir_entry->d_name) == true)
-        continue;
+        {
+          continue;
+        }
 
 #if defined (ACE_HAS_TCHAR_DIRENT)
       ACE_CString lname (ACE_TEXT_ALWAYS_CHAR (dir_entry->d_name));
@@ -363,7 +406,8 @@ DRV_sweep_dirs (const char *rel_path,
       if (ACE_OS::lstat (lname.c_str (), &stat_buf) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "DRV_sweep_dirs: ACE_OS::lstat (%s) failed\n",
+                             "DRV_sweep_dirs: ACE_OS::lstat"
+                             " (%C) failed\n",
                              lname.c_str ()),
                             -1);
         }
@@ -379,15 +423,21 @@ DRV_sweep_dirs (const char *rel_path,
             {
               if (!include_added)
                 {
-                  ACE_CString incl_arg ("-I");
+                  /// Surround the path name with quotes, in
+                  /// case the original path argument included
+                  /// spaces. If it didn't, no harm done.
+                  ACE_CString incl_arg ("-I ");
+                  incl_arg += '\"';
                   incl_arg += bname;
+                  incl_arg += '\"';
                   DRV_cpp_putarg (incl_arg.c_str ());
                   idl_global->add_rel_include_path (bname.c_str ());
                   full_path = ACE_OS::realpath ("", abspath);
 
                   if (full_path != 0)
                     {
-                      idl_global->add_include_path (full_path, false);
+                      idl_global->add_include_path (full_path,
+                                                    false);
                     }
 
                   include_added = true;
@@ -413,7 +463,8 @@ DRV_sweep_dirs (const char *rel_path,
   if (ACE_OS::chdir (DIR_DOT_DOT) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "DRV_sweep_dirs: chdir .. (from %C) failed\n",
+                         "DRV_sweep_dirs: chdir "
+                         ".. (from %C) failed\n",
                          rel_path),
                         -1);
     }
@@ -422,27 +473,34 @@ DRV_sweep_dirs (const char *rel_path,
 }
 
 ACE_CString&
-DRV_add_include_path (ACE_CString& include_path, const char *path,
-                      const char *suffix, bool is_system)
+DRV_add_include_path (ACE_CString& include_path,
+                      const char *path,
+                      const char *suffix,
+                      bool is_system)
 {
-  if (!path)
-    return include_path;
+  if (path == 0)
+    {
+      return include_path;
+    }
 
-  const bool needToQuote= (('"' == *path) || ACE_OS::strchr (path, ' '));
-  const size_t pathLength= ACE_OS::strlen (path);
+  const bool needToQuote =
+    (('"' == *path) || ACE_OS::strchr (path, ' '));
+  const size_t pathLength = ACE_OS::strlen (path);
   const char
 #if defined (ACE_WIN32)
-    nativeDir=  '\\',
-    foreignDir= '/';
+    nativeDir =  '\\',
+    foreignDir = '/';
 #else
-    nativeDir=  '/',
-    foreignDir= '\\';
+    nativeDir =  '/',
+    foreignDir = '\\';
 #endif
 
-  // Eliminate possible enclosing quotes from the path, and since some compilers
-  // choke on double directory separators in paths, ensure that the path does not
+  // Eliminate possible enclosing quotes
+  // from the path, and since some compilers
+  // choke on double directory separators in
+  // paths, ensure that the path does not
   // end with a directory slash.
-  include_path=
+  include_path =
     ACE_CString (path + ('"' == *path),     // Skip leading Quote
                  pathLength
                  - ('"' == *path)           // Don't count leading Quote
@@ -458,28 +516,49 @@ DRV_add_include_path (ACE_CString& include_path, const char *path,
                    ) )
                 );
 
-  if (suffix)
+  if (suffix != 0)
     {
-      if (!include_path.length () && ((nativeDir == *suffix) || (foreignDir == *suffix)))
-        ++suffix; // Path is empty, don't add the suffix's leading directory seporator
+      if (!include_path.length ()
+          && ((nativeDir == *suffix) || (foreignDir == *suffix)))
+        {
+          // Path is empty, don't add the
+          // suffix's leading directory separator.
+          ++suffix;
+        }
 
-      if (include_path.length () && *suffix && (nativeDir != *suffix) && (foreignDir != *suffix))
-        include_path+= nativeDir; // Force a directory seporator
+      if (include_path.length ()
+          && (*suffix != '\0')
+          && (nativeDir != *suffix)
+          && (foreignDir != *suffix))
+        {
+          // Force a directory separator.
+          include_path += nativeDir;
+        }
 
-      // Add the suffix string to the path, ensuring that foreign directory slashes
+      // Add the suffix string to the path,
+      // ensuring that foreign directory slashes
       // are added as the native type.
-      for ( ; *suffix; ++suffix)
-        include_path+= (foreignDir == *suffix) ? nativeDir : *suffix;
+      for ( ; *suffix != '\0'; ++suffix)
+        {
+          include_path += (foreignDir == *suffix)
+                             ? nativeDir
+                             : *suffix;
+        }
     }
 
   // Build up the include string from the new path+suffix
   ACE_CString include_option ("-I\"", 2 + needToQuote);
   include_option+= include_path;
+
   if (needToQuote)
-    include_option+= '"';
+    {
+      include_option+= '"';
+    }
 
   DRV_cpp_putarg (include_option.c_str ());
-  idl_global->add_include_path (include_path.c_str (), is_system);
+
+  idl_global->add_include_path (include_path.c_str (),
+                                is_system);
 
   return include_path;
 }
@@ -498,7 +577,10 @@ DRV_cpp_post_init (void)
   // FE_Utils::validate_orb_include accordingly.
   if (TAO_ROOT != 0)
     {
-      DRV_add_include_path (include_path3, TAO_ROOT, "/orbsvcs", true);
+      DRV_add_include_path (include_path3,
+                            TAO_ROOT,
+                            "/orbsvcs",
+                            true);
     }
   else
     {
@@ -507,7 +589,10 @@ DRV_cpp_post_init (void)
 
       if (ACE_ROOT != 0)
         {
-          DRV_add_include_path (include_path3, ACE_ROOT, "/TAO/orbsvcs", true);
+          DRV_add_include_path (include_path3,
+                                ACE_ROOT,
+                                "/TAO/orbsvcs",
+                                true);
         }
       else
         {
@@ -519,7 +604,10 @@ DRV_cpp_post_init (void)
 #else
           // If ACE_ROOT isn't defined either, there will already
           // be a warning from DRV_preproc().
-          DRV_add_include_path (include_path3, ".", 0, true);
+          DRV_add_include_path (include_path3,
+                                ".",
+                                0,
+                                true);
 #endif  /* TAO_IDL_INCLUDE_DIR */
         }
     }
@@ -531,16 +619,39 @@ DRV_cpp_post_init (void)
   // FE_Utils::validate_orb_include accordingly.
   if (CIAO_ROOT != 0)
     {
-      DRV_add_include_path (include_path4, CIAO_ROOT, 0, true);
-      DRV_add_include_path (include_path5, CIAO_ROOT, "/ciao", true);
-      DRV_add_include_path (include_path5, CIAO_ROOT, "/ccm", true);
+      DRV_add_include_path (include_path4,
+                            CIAO_ROOT,
+                            0,
+                            true);
+
+      DRV_add_include_path (include_path5,
+                            CIAO_ROOT,
+                            "/ciao",
+                            true);
+
+      DRV_add_include_path (include_path5,
+                            CIAO_ROOT,
+                            "/ccm",
+                            true);
     }
   else if (TAO_ROOT != 0)
     {
-      // If CIAO_ROOT hasn't been set, maybe it's nested under TAO_ROOT.
-      DRV_add_include_path (include_path4, TAO_ROOT, "/CIAO", true);
-      DRV_add_include_path (include_path5, TAO_ROOT, "/CIAO/ciao", true);
-      DRV_add_include_path (include_path5, TAO_ROOT, "/CIAO/ccm", true);
+      // If CIAO_ROOT hasn't been set,
+      // maybe it's nested under TAO_ROOT.
+      DRV_add_include_path (include_path4,
+                            TAO_ROOT,
+                            "/CIAO",
+                            true);
+
+      DRV_add_include_path (include_path5,
+                            TAO_ROOT,
+                            "/CIAO/ciao",
+                            true);
+
+      DRV_add_include_path (include_path5,
+                            TAO_ROOT,
+                            "/CIAO/ccm",
+                            true);
     }
   else
     {
@@ -549,9 +660,20 @@ DRV_cpp_post_init (void)
 
       if (ACE_ROOT != 0)
         {
-          DRV_add_include_path (include_path4, ACE_ROOT, "/TAO/CIAO", true);
-          DRV_add_include_path (include_path5, ACE_ROOT, "/TAO/CIAO/ciao", true);
-          DRV_add_include_path (include_path5, ACE_ROOT, "/TAO/CIAO/ccm", true);
+          DRV_add_include_path (include_path4,
+                                ACE_ROOT,
+                                "/TAO/CIAO",
+                                true);
+
+          DRV_add_include_path (include_path5,
+                                ACE_ROOT,
+                                "/TAO/CIAO/ciao",
+                                true);
+
+          DRV_add_include_path (include_path5,
+                                ACE_ROOT,
+                                "/TAO/CIAO/ccm",
+                                true);
         }
       else
         {
@@ -560,10 +682,12 @@ DRV_cpp_post_init (void)
                                 TAO_IDL_INCLUDE_DIR,
                                 0,
                                 true);
+
           DRV_add_include_path (include_path5,
                                 TAO_IDL_INCLUDE_DIR,
                                 "/ciao",
                                 true);
+
           DRV_add_include_path (include_path5,
                                 TAO_IDL_INCLUDE_DIR,
                                 "/ccm",
@@ -571,16 +695,26 @@ DRV_cpp_post_init (void)
 #else
           // If ACE_ROOT isn't defined either, there will already
           // be a warning from DRV_preproc().
-          DRV_add_include_path (include_path4, ACE_ROOT, ".", true);
-          DRV_add_include_path (include_path5, ACE_ROOT, ".", true);
+          DRV_add_include_path (include_path4,
+                                ACE_ROOT,
+                                ".",
+                                true);
+
+          DRV_add_include_path (include_path5,
+                                ACE_ROOT,
+                                ".",
+                                true);
 #endif  /* TAO_IDL_INCLUDE_DIR */
         }
     }
 
-  // Save path of current directory, in case the call to DRV_sweep_dirs()
-  // below is not a no-op - then the current working directory will
+  // Save path of current directory, in case
+  // the call to DRV_sweep_dirs()
+  // below is not a no-op - then the current
+  // working directory will
   // have to be restored.
   char cwd_path[MAXPATHLEN];
+
   if (ACE_OS::getcwd (cwd_path, sizeof (cwd_path)) == 0)
     {
       ACE_ERROR ((LM_ERROR,
@@ -613,20 +747,21 @@ DRV_cpp_post_init (void)
     }
 }
 
-namespace // local/internal helper function
+// Local/internal helper function.
+namespace
 {
   // Advances the input char buffer to the first non-white
   // space character, handles /**/ comments as well.
   char
   DRV_skip_over_white_spaces (const char *&input)
   {
-    while (*input)
+    while (*input != 0)
       {
         // Skip the spaces, tabs, vertical-tabs and form feeds.
         while (' ' == *input ||
               '\t' == *input ||
               '\v' == *input ||
-              '\f' == *input   )
+              '\f' == *input)
           {
             ++input;
           }
@@ -640,6 +775,7 @@ namespace // local/internal helper function
             // end of line).
             return *input;
           }
+
         if ('*' != *++input)
           {
             // Wasn't the start of a comment so / was the first non-white space character.
@@ -653,11 +789,13 @@ namespace // local/internal helper function
             // Looking for the closing "*/" characters
             while ('*' != *++input && *input)
               {}
+
             while ('*' == *input)
               {
                 ++input;
               }
           } while ('/' != *input && *input);
+
           if ('/' == *input)
             {
               ++input;
@@ -678,17 +816,22 @@ namespace // local/internal helper function
       {
         return false;
       }
+
     // Only want #include to match
     const char *include_str = "include";
+
     if (*include_str != DRV_skip_over_white_spaces (++input))
       {
         return false;
       }
+
     while (*++include_str == *++input && *input)
       {}
+
     if (*include_str || !*input)
       {
-        return false; // Not #include (or it ends before filename given)
+        // Not #include (or it ends before filename given).
+        return false;
       }
 
     // Next thing is finding the file that has been `#include'd. Skip
@@ -697,9 +840,12 @@ namespace // local/internal helper function
     return ('"' == start_char || '<' == start_char);
   }
 
-  // We really need to know whether this line is a "#include ...". If
-  // so, we would like to separate the "file name" and keep that in the
-  // idl_global. We need them to produce "#include's in the stubs and
+  // We really need to know whether
+  // this line is a "#include ...". If
+  // so, we would like to separate the
+  // "file name" and keep that in the
+  // idl_global. We need them to produce
+  // "#include's in the stubs and
   // skeletons.
   void
   DRV_check_for_include (const char *buf)
@@ -709,41 +855,51 @@ namespace // local/internal helper function
         return;
       }
 
-    // Skip over this leading " or < and copy the filename upto the
+    // Skip over this leading " or < and
+    // copy the filename upto the
     // closing " or > character.
     const char
       start_char = *buf++,
       end_char   = ('<' == start_char) ? '>' : start_char;
+
     char
       incl_file[MAXPATHLEN + 1],
       *fi = incl_file;
-    while (*buf && *buf != end_char)
+
+    while (*buf != '\0' && *buf != end_char)
       {
         // Put Microsoft-style pathnames into a canonical form.
         if ('\\' == buf[0] && '\\' == buf [1])
           {
             ++buf;
           }
+
         *fi++ = *buf++;
-        if (fi == incl_file + sizeof(incl_file)-1)
+
+        if (fi == incl_file + sizeof (incl_file) - 1)
           {
-            break; // Safety valve, filename given was too long!
+            // Safety valve, filename given was too long!
+            break;
           }
       }
+
     *fi= '\0';
     const size_t len = fi - incl_file;
-    if (!len)
+
+    if (len == 0)
     {
       return; // Null filename not allowed.
     }
- 
+
     ACE_CString const name_str (incl_file);
     ACE_CString const simple ("orb.idl");
     ACE_CString const nix_path ("tao/orb.idl");
     ACE_CString const win_path ("tao\\orb.idl");
 
     // Some backends pass this file through, others don't.
-    if (name_str == simple || name_str == nix_path || name_str == win_path)
+    if (name_str == simple
+        || name_str == nix_path
+        || name_str == win_path)
       {
         if (idl_global->pass_orb_idl ())
           {
@@ -754,14 +910,13 @@ namespace // local/internal helper function
             DRV_get_orb_idl_includes ();
           }
       }
-
     // We have special lookup for orb.idl (TAO_ROOT/tao) that
     // also kicks in for .pidl files. If one of the latter is
     // included as a local name only, we add the 'tao/' prefix
     // so the generated C++ include files will be correct.
     else if ((5 <= len && !ACE_OS::strcmp (incl_file + len - 5, ".pidl"))
-            && !ACE_OS::strchr (incl_file, '/')
-            && !ACE_OS::strchr (incl_file, '\\'))
+             && !ACE_OS::strchr (incl_file, '/')
+             && !ACE_OS::strchr (incl_file, '\\'))
       {
         ACE_CString fixed_name ("tao/");
         fixed_name += incl_file;
@@ -780,19 +935,24 @@ namespace // local/internal helper function
   DRV_convert_includes (char *buf)
   {
     const char *input = buf;
+
     if (!DRV_find_include_filename (input) || '"' != *input)
       {
         return; // Only interested in #include "" type
       }
+
     buf = const_cast<char *> (input);
 
     // Find the closing '"' character.
     char *open_quote= buf;
-    while ('"' != *++buf && *buf)
+
+    while ('"' != *++buf && *buf != '\0')
       {
         if ('>' == *buf)
           {
-            return; // Can't change to #include <> as it has a > character in the filename!
+            // Can't change to #include <> as it
+            // has a > character in the filename!
+            return;
           }
       }
     if ('"' == *buf)
@@ -990,6 +1150,7 @@ DRV_pre_proc (const char *myfile)
   ACE_OS::strcat (tmp_ifile, tao_idli_template);
 
   ACE_HANDLE const ti_fd = ACE_OS::mkstemp (tmp_ifile);
+
   if (ti_fd == ACE_INVALID_HANDLE)
     {
       ACE_ERROR ((LM_ERROR,
@@ -1001,6 +1162,7 @@ DRV_pre_proc (const char *myfile)
     }
 
   ACE_HANDLE const tf_fd = ACE_OS::mkstemp (tmp_file);
+
   if (tf_fd == ACE_INVALID_HANDLE)
     {
       ACE_ERROR ((LM_ERROR,
@@ -1008,6 +1170,7 @@ DRV_pre_proc (const char *myfile)
                   idl_global->prog_name (),
                   tmp_file));
 
+      (void) ACE_OS::unlink (tmp_ifile);
       throw Bailout ();
     }
 
@@ -1030,12 +1193,25 @@ DRV_pre_proc (const char *myfile)
   // by the preprocessor.
 
   FILE * const file = ACE_OS::fopen (myfile, "r");
+
+  if (file == 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "%C: Unable to open file : %p\n",
+                  idl_global->prog_name (),
+                  myfile));
+
+      (void) ACE_OS::unlink (tmp_ifile);
+      (void) ACE_OS::unlink (tmp_file);
+      throw Bailout ();
+    }
+
   DRV_copy_input (file,
                   ACE_OS::fdopen (ti_fd, ACE_TEXT("w")),
                   tmp_ifile,
                   myfile);
   ACE_OS::fclose (file);
-  
+
   UTL_String *utl_string = 0;
 
 #if defined (ACE_OPENVMS)
@@ -1045,46 +1221,71 @@ DRV_pre_proc (const char *myfile)
     char *main_fullpath =
       ACE_OS::realpath (IDL_GlobalData::translateName (myfile, trans_path),
                         main_abspath);
+
+    if (main_fullpath == 0)
+      {
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("Unable to construct full file pathname\n")));
+
+        (void) ACE_OS::unlink (tmp_ifile);
+        (void) ACE_OS::unlink (tmp_file);
+        throw Bailout ();
+      }
+
     ACE_NEW (utl_string,
              UTL_String (main_fullpath, true));
+
     idl_global->set_main_filename (utl_string);
   }
 #else
   ACE_NEW (utl_string,
            UTL_String (myfile, true));
+
   idl_global->set_main_filename (utl_string);
 #endif
 
   ACE_Auto_String_Free safety (ACE_OS::strdup (myfile));
+
   UTL_String *stripped_tmp = 0;
   ACE_NEW (stripped_tmp,
            UTL_String (DRV_stripped_name (safety.get ()), true));
+
   idl_global->set_stripped_filename (stripped_tmp);
 
   UTL_String *real_tmp = 0;
   ACE_NEW (real_tmp,
            UTL_String (t_ifile, true));
+
   idl_global->set_real_filename (real_tmp);
 
   // We use ACE instead of the (low level) fork facilities, this also
   // works on NT.
   ACE_Process process;
 
-  // For complex builds, the default command line buffer size of 1024
-  // is sometimes not enough. We use 8192 here.
-  ACE_Process_Options cpp_options (1,       // Inherit environment.
-                                   TAO_IDL_COMMAND_LINE_BUFFER_SIZE);
-
   DRV_cpp_expand_output_arg (t_file);
   DRV_cpp_putarg (t_ifile);
   DRV_cpp_putarg (0); // Null terminate the DRV_arglist.
 
+  // For complex builds, the default
+  // command line buffer size of 1024
+  // is often not enough. We determine
+  // the required space and arg nr
+  // dynamically here.
+  ACE_Process_Options cpp_options (1,       // Inherit environment.
+                                   DRV_cpp_calc_total_argsize (),
+                                   16 * 1024,
+                                   512,
+                                   DRV_argcount);
+
   if (cpp_options.command_line (DRV_arglist) != 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%C: command line processing \"%s\" failed\n",
+                  ACE_TEXT ("%C: command line processing \"%s\" failed\n"),
                   idl_global->prog_name (),
                   DRV_arglist[0]));
+
+      (void) ACE_OS::unlink (tmp_ifile);
+      (void) ACE_OS::unlink (tmp_file);
       throw Bailout ();
     }
 
@@ -1094,23 +1295,29 @@ DRV_pre_proc (const char *myfile)
   if (ACE_OS::rename (tmp_file, t_file) != 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%C: Unable to rename temporary file \"%C\" to \"%C\": %p\n",
+                  "%C: Unable to rename temporary "
+                  "file \"%C\" to \"%C\": %p\n",
                   idl_global->prog_name (),
                   tmp_file,
                   t_file));
 
 
+      (void) ACE_OS::unlink (tmp_ifile);
+      (void) ACE_OS::unlink (tmp_file);
       throw Bailout ();
     }
+
   if (ACE_OS::rename (tmp_ifile, t_ifile) != 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%C: Unable to rename temporary file \"%C\" to \"%C\": %p\n",
+                  "%C: Unable to rename temporary "
+                  "file \"%C\" to \"%C\": %p\n",
                   idl_global->prog_name (),
                   tmp_ifile,
                   t_ifile));
 
-
+      (void) ACE_OS::unlink (tmp_ifile);
+      (void) ACE_OS::unlink (t_file);
       throw Bailout ();
     }
 
@@ -1139,10 +1346,13 @@ DRV_pre_proc (const char *myfile)
       if (fd == ACE_INVALID_HANDLE)
         {
           ACE_ERROR ((LM_ERROR,
-                      "%C: cannot open temp file \"%C\" for writing: %p\n",
+                      "%C: cannot open temp file"
+                      " \"%C\" for writing: %p\n",
                       idl_global->prog_name (),
                       t_file));
 
+          (void) ACE_OS::unlink (t_file);
+          (void) ACE_OS::unlink (t_ifile);
           throw Bailout ();
         }
 
@@ -1155,6 +1365,7 @@ DRV_pre_proc (const char *myfile)
                   idl_global->prog_name (),
                   cpp_options.command_line_buf ()));
     }
+
   if (process.spawn (cpp_options) == ACE_INVALID_PID)
     {
       ACE_ERROR ((LM_ERROR,
@@ -1163,6 +1374,8 @@ DRV_pre_proc (const char *myfile)
                   DRV_arglist[0]));
 
 
+      (void) ACE_OS::unlink (t_file);
+      (void) ACE_OS::unlink (t_ifile);
       throw Bailout ();
     }
 
@@ -1176,14 +1389,18 @@ DRV_pre_proc (const char *myfile)
                       idl_global->prog_name (),
                       t_file));
 
+          (void) ACE_OS::unlink (t_file);
+          (void) ACE_OS::unlink (t_ifile);
           throw Bailout ();
         }
     }
 
-  // Remove the null termination and the input file from the DRV_arglist,
+  // Remove the null termination and the
+  // input file from the DRV_arglist,
   // the next file will the previous args.
   DRV_argcount -= 2;
-  ACE::strdelete (const_cast<ACE_TCHAR *> (DRV_arglist[DRV_argcount]));
+  ACE::strdelete (
+    const_cast<ACE_TCHAR *> (DRV_arglist[DRV_argcount]));
   DRV_arglist[DRV_argcount] = 0;
   ACE_exitcode status = 0;
 
@@ -1193,6 +1410,8 @@ DRV_pre_proc (const char *myfile)
                   "%C: wait for child process failed\n",
                   idl_global->prog_name ()));
 
+      (void) ACE_OS::unlink (t_file);
+      (void) ACE_OS::unlink (t_ifile);
       throw Bailout ();
     }
 
@@ -1204,10 +1423,13 @@ DRV_pre_proc (const char *myfile)
           errno = WEXITSTATUS ((status));
 
           ACE_ERROR ((LM_ERROR,
-                      "%C: preprocessor \"%s\" returned with an error\n",
+                      "%C: preprocessor \"%s\" "
+                      "returned with an error\n",
                       idl_global->prog_name (),
                       DRV_arglist[0]));
 
+          (void) ACE_OS::unlink (t_file);
+          (void) ACE_OS::unlink (t_ifile);
           throw Bailout ();
         }
     }
@@ -1222,10 +1444,14 @@ DRV_pre_proc (const char *myfile)
                   idl_global->prog_name (),
                   DRV_arglist[0]));
 
+      (void) ACE_OS::unlink (t_file);
+      (void) ACE_OS::unlink (t_ifile);
       throw Bailout ();
     }
-  // TODO: Manage problems in the pre-processor, in the previous
-  // version the current process would exit if the pre-processor
+  // TODO: Manage problems in the
+  // pre-processor, in the previous
+  // version the current process
+  // would exit if the pre-processor
   // returned with error.
 
 #if defined (ACE_OPENVMS)
@@ -1237,10 +1463,13 @@ DRV_pre_proc (const char *myfile)
   if (yyin == 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%C: Could not open cpp output file \"%C\": %p\n",
+                  "%C: Could not open cpp "
+                  "output file \"%C\": %p\n",
                   idl_global->prog_name (),
                   t_file));
 
+      (void) ACE_OS::unlink (t_file);
+      (void) ACE_OS::unlink (t_ifile);
       throw Bailout ();
     }
 
@@ -1255,10 +1484,13 @@ DRV_pre_proc (const char *myfile)
       if (preproc == 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      "%C: Could not open cpp output file \"$C\": %p\n",
+                      "%C: Could not open cpp "
+                      "output file \"$C\": %p\n",
                       idl_global->prog_name (),
                       t_file));
 
+          (void) ACE_OS::unlink (t_file);
+          (void) ACE_OS::unlink (t_ifile);
           throw Bailout ();
         }
 
@@ -1276,10 +1508,9 @@ DRV_pre_proc (const char *myfile)
                                      sizeof (char),
                                      ACE_MAXLOGMSGLEN - 1,
                                      preproc))
-          != 0)
+               != 0)
         {
           buffer[bytes] = 0;
-
           ACE_DEBUG ((LM_DEBUG, buffer));
         }
 
@@ -1289,7 +1520,8 @@ DRV_pre_proc (const char *myfile)
   if (ACE_OS::unlink (t_ifile) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%C: Could not remove cpp input file \"%C\": %p\n",
+                  "%C: Could not remove cpp "
+                  "input file \"%C\": %p\n",
                   idl_global->prog_name (),
                   t_ifile));
 
@@ -1299,7 +1531,8 @@ DRV_pre_proc (const char *myfile)
   if (ACE_OS::unlink (t_file) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%C: Could not remove cpp output file \"%C\": %p\n",
+                  "%C: Could not remove cpp "
+                  "output file \"%C\": %p\n",
                   idl_global->prog_name (),
                   t_file));
 
diff --git a/TAO_IDL/fe/fe_declarator.cpp b/TAO_IDL/fe/fe_declarator.cpp
index 324f2dd4628..7365f1930da 100644
--- a/TAO_IDL/fe/fe_declarator.cpp
+++ b/TAO_IDL/fe/fe_declarator.cpp
@@ -100,7 +100,7 @@ FE_Declarator::compose (AST_Decl *d)
     {
       AST_Param_Holder *ph =
         AST_Param_Holder::narrow_from_decl (ct);
-        
+
       // Every other template parameter kind is legal.
       if (ph->info ()->type_ == AST_Decl::NT_const)
         {
@@ -110,7 +110,7 @@ FE_Declarator::compose (AST_Decl *d)
     }
 
   AST_Decl::NodeType nt = d->node_type ();
-  
+
   if (nt == AST_Decl::NT_struct_fwd
       || nt == AST_Decl::NT_union_fwd
       || nt == AST_Decl::NT_struct
diff --git a/TAO_IDL/fe/fe_extern.cpp b/TAO_IDL/fe/fe_extern.cpp
index a03b151e796..c1070defaeb 100644
--- a/TAO_IDL/fe/fe_extern.cpp
+++ b/TAO_IDL/fe/fe_extern.cpp
@@ -101,7 +101,7 @@ FE_yyparse (void)
 #else
   ACE_OS::fclose (tao_yyin);
 #endif /* USE_MCPP_BUFFER_LEXING */
-  
+
   return result;
 }
 
diff --git a/TAO_IDL/fe/fe_home_header.cpp b/TAO_IDL/fe/fe_home_header.cpp
index 05b8f624e9d..33fec49c214 100644
--- a/TAO_IDL/fe/fe_home_header.cpp
+++ b/TAO_IDL/fe/fe_home_header.cpp
@@ -166,16 +166,16 @@ FE_HomeHeader::compile_primary_key (UTL_ScopedName *primary_key)
             {
               AST_Param_Holder *ph =
                 AST_Param_Holder::narrow_from_decl (d);
-                
+
               nt = ph->info ()->type_;
-              
+
               if (nt != AST_Decl::NT_type
                   && nt != AST_Decl::NT_valuetype)
                 {
                   idl_global->err ()->mismatched_template_param (
                     ph->info ()->name_.c_str ());
                 }
-                
+
               break;
             }
           default:
diff --git a/TAO_IDL/fe/fe_init.cpp b/TAO_IDL/fe/fe_init.cpp
index 370cc756c16..5ff00a90d6e 100644
--- a/TAO_IDL/fe/fe_init.cpp
+++ b/TAO_IDL/fe/fe_init.cpp
@@ -92,25 +92,25 @@ fe_populate_global_scope (void)
 
   Identifier void_id ("void");
   UTL_ScopedName void_name (&void_id, 0);
-  
+
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_void,
       &void_name);
-      
+
   root->fe_add_predefined_type (pdt);
-  
+
   /// Put this prefix in force while we're creating the
   /// CORBA module and its contents.
   char *prefix = ACE::strnew ("omg.org");
   idl_global->pragma_prefixes ().push (prefix);
-  
+
   Identifier corba_id ("CORBA");
   UTL_ScopedName sn (&corba_id, 0);
-  
+
   AST_Module *m =
     idl_global->gen ()->create_module (root, &sn);
-    
+
   root->fe_add_module (m);
   idl_global->corba_module (m);
 
@@ -118,142 +118,142 @@ fe_populate_global_scope (void)
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_long,
       0);
-      
+
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_ulong,
       0);
-      
+
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_longlong,
       0);
-      
+
   m->fe_add_predefined_type(pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_ulonglong,
       0);
-      
+
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_short,
       0);
-      
+
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_ushort,
       0);
-      
+
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_float,
       0);
-      
+
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_double,
       0);
-      
+
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_longdouble,
       0);
-      
+
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_char,
       0);
-      
+
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_wchar,
       0);
-      
+
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_octet,
       0);
-      
+
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_any,
       0);
-      
+
   m->fe_add_predefined_type (pdt);
 
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_boolean,
       0);
-      
+
   m->fe_add_predefined_type (pdt);
 
   Identifier Object_id ("Object");
   UTL_ScopedName Object_name (&Object_id, 0);
-  
+
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_object,
       &Object_name);
-      
+
   m->fe_add_predefined_type (pdt);
 
 // Add these to make all keywords protected even in different spellings
 
   Identifier ValueBase_id ("ValueBase");
   UTL_ScopedName ValueBase_name (&ValueBase_id, 0);
-  
+
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_value,
       &ValueBase_name);
-      
+
   m->fe_add_predefined_type (pdt);
 
   Identifier AbstractBase_id ("AbstractBase");
   UTL_ScopedName AbstractBase_name (&AbstractBase_id, 0);
-  
+
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_abstract,
       &AbstractBase_name);
-      
+
   m->fe_add_predefined_type (pdt);
 
   Identifier TypeCode_id ("TypeCode");
   UTL_ScopedName TypeCode_name (&TypeCode_id, 0);
-  
+
   pdt =
     idl_global->gen ()->create_predefined_type (
       AST_PredefinedType::PT_pseudo,
       &TypeCode_name);
-      
+
   m->fe_add_predefined_type (pdt);
-  
+
   char *trash = 0;
   idl_global->pragma_prefixes ().pop (trash);
   ACE::strdelete (trash);
diff --git a/TAO_IDL/fe/fe_interface_header.cpp b/TAO_IDL/fe/fe_interface_header.cpp
index 73978c4b195..764fd9f4b3c 100644
--- a/TAO_IDL/fe/fe_interface_header.cpp
+++ b/TAO_IDL/fe/fe_interface_header.cpp
@@ -292,7 +292,7 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
           // We will crash if we continue from here.
           throw Bailout ();
         }
-        
+
       // Look it up.
       d = s->lookup_by_name  (item,
                               true); // full_def_only
diff --git a/TAO_IDL/fe/fe_utils.cpp b/TAO_IDL/fe/fe_utils.cpp
index b0643ba061e..15438ba3301 100644
--- a/TAO_IDL/fe/fe_utils.cpp
+++ b/TAO_IDL/fe/fe_utils.cpp
@@ -2,6 +2,7 @@
 
 #include "fe_utils.h"
 #include "fe_private.h"
+#include "fe_extern.h"
 
 #include "ast_uses.h"
 #include "ast_component.h"
@@ -10,6 +11,7 @@
 #include "ast_structure.h"
 #include "ast_valuetype.h"
 #include "ast_sequence.h"
+#include "ast_template_module.h"
 
 #include "global_extern.h"
 
@@ -63,21 +65,19 @@ void
 FE_Utils::T_ARGLIST::destroy (void)
 {
   AST_Decl **d = 0;
-  AST_Decl *tmp = 0;
 
   for (T_ARGLIST::ITERATOR i (this->begin ());
        !i.done ();
        i.advance ())
     {
       i.next (d);
-      tmp = *d;
-      
       /// This is a problem - nodes that aren't NT_const have
       /// already been destroyed. Must find some other way of
       /// ferreting out the NT_const arglist nodes.
 /*
       // These were created on the fly and not part of any scope
       // so we manage their lifetime here.
+      AST_Decl *tmp = *d;
       if (tmp->node_type () == AST_Decl::NT_const)
         {
           tmp->destroy ();
@@ -174,7 +174,7 @@ FE_Utils::ExprTypeToPredefinedType (AST_Expression::ExprType et)
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("FE_Utils::ExprTypeToPredefinedType - ")
                   ACE_TEXT ("no pathing PredefinedType enum value\n")));
-           
+
       /// A deliberately odd return value, so the caller can check
       /// it and take further action if necessary.
       return AST_PredefinedType::PT_pseudo;
@@ -262,16 +262,16 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c,
   struct_name += "Connection";
   Identifier struct_id (struct_name.c_str ());
   UTL_ScopedName sn (&struct_id, 0);
-  
+
   // In case this call comes from the backend. We
   // will pop the scope before returning.
   idl_global->scopes ().push (c);
-  
+
   AST_Structure *connection =
     idl_global->gen ()->create_structure (&sn, 0, 0);
 
   struct_id.destroy ();
-  
+
   /// If the field type is a param holder, we want
   /// to use the lookup to create a fresh one,
   /// since the field will own it and destroy it.
@@ -296,7 +296,7 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c,
   Identifier module_id ("Components");
   UTL_ScopedName scoped_name (&module_id,
                               &local_name);
-                              
+
   d = c->lookup_by_name (&scoped_name, true);
   local_id.destroy ();
   module_id.destroy ();
@@ -346,7 +346,7 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c,
   seq_id.destroy ();
 
   (void) c->fe_add_typedef (connections);
-  
+
   // In case this call comes from the backend.
   idl_global->scopes ().pop ();
 }
@@ -372,15 +372,15 @@ FE_Utils::create_implied_ami_uses_stuff (void)
 
       AST_Decl *d =
         idl_global->root ()->lookup_by_name (sn, true);
-            
+
       if (d == 0)
         {
           idl_global->err ()->lookup_error (sn);
-          
+
           sn->destroy ();
           delete sn;
           sn = 0;
-          
+
           continue;
         }
 
@@ -397,18 +397,18 @@ FE_Utils::create_implied_ami_uses_stuff (void)
                       ACE_TEXT ("implied_ami_uses_stuff - ")
                       ACE_TEXT ("narrow to receptacle ")
                       ACE_TEXT ("failed\n")));
-                      
+
           continue;
         }
-      
+
       if (!u->is_multiple ())
         {
           continue;
         }
-        
+
       AST_Component *c =
         AST_Component::narrow_from_scope (u->defined_in ());
-        
+
       if (c == 0)
         {
           ACE_ERROR ((LM_ERROR,
@@ -416,13 +416,13 @@ FE_Utils::create_implied_ami_uses_stuff (void)
                       ACE_TEXT ("implied_ami_uses_stuff - ")
                       ACE_TEXT ("receptacle not defined")
                       ACE_TEXT ("in a component\n")));
-                      
+
           continue;
         }
-        
+
       FE_Utils::create_uses_multiple_stuff (c, u, "sendc");
     }
-    
+
   idl_global->included_ami_receps_done (true);
 }
 
@@ -539,7 +539,7 @@ FE_Utils::is_include_file_found (ACE_CString & inc_file,
   // If the include path has literal "s (because of an include
   // of a Windows path with spaces), we must remove them here.
   const char *tmp_inc_file = inc_file.c_str ();
-  
+
   if (tmp_inc_file
       && FE_Utils::hasspace (tmp_inc_file)
       && tmp_inc_file[0] == '\"')
@@ -556,7 +556,7 @@ FE_Utils::is_include_file_found (ACE_CString & inc_file,
   if (full_path != 0)
     {
       FILE *test = ACE_OS::fopen (abspath, "r");
-      
+
       if (test == 0)
         {
           return false;
@@ -581,26 +581,26 @@ FE_Utils::validate_included_idl_files (void)
 {
   // Flag to make sure we don't repeat things.
   static bool already_done = false;
-  
+
   if (already_done)
     {
       return;
     }
-    
+
   already_done = true;
 
   // New number of included_idl_files.
   size_t newj = 0;
-  
+
   size_t n_pre_preproc_includes =
     idl_global->n_included_idl_files ();
-    
+
   char **pre_preproc_includes =
     idl_global->included_idl_files ();
-    
+
   size_t n_post_preproc_includes =
     idl_global->n_include_file_names ();
-    
+
   UTL_String **post_preproc_includes =
     idl_global->include_file_names ();
 
@@ -616,12 +616,12 @@ FE_Utils::validate_included_idl_files (void)
   // @see bug TAO#711 / Bugzilla #3513 for more
   char** ordered_include_files =
     new char* [n_pre_preproc_includes];
-  
+
   for (size_t i = 0u; i < n_post_preproc_includes; ++i)
     {
       post_tmp = post_preproc_includes [i]->get_string ();
       full_path = ACE_OS::realpath (post_tmp, post_abspath);
-      
+
       if (full_path)
         {
           for (size_t j = 0u; j < n_pre_preproc_includes; ++j)
@@ -662,7 +662,7 @@ FE_Utils::validate_included_idl_files (void)
                   full_path =
                     ACE_OS::realpath (pre_partial.c_str (),
                                       pre_abspath);
-                  
+
                   if (full_path &&
                       FE_Utils::path_cmp (pre_abspath, post_abspath) == 0 &&
                       ACE_OS::access (post_abspath, R_OK) == 0)
@@ -815,7 +815,7 @@ FE_Utils::can_be_redefined (AST_Decl *prev_decl,
 {
   AST_Decl::NodeType pnt = prev_decl->node_type ();
   AST_Decl::NodeType cnt = curr_decl->node_type ();
-  
+
   switch (cnt)
   {
     /// For these, any non-zero previous decl
@@ -832,22 +832,32 @@ FE_Utils::can_be_redefined (AST_Decl *prev_decl,
     default:
       break;
   }
-    
+
   UTL_Scope *prev_scope = prev_decl->defined_in ();
   UTL_Scope *curr_scope = curr_decl->defined_in ();
   AST_Structure *s = 0;
   AST_StructureFwd *s_fwd = 0;
   AST_Interface *i = 0;
   AST_InterfaceFwd *i_fwd = 0;
-  
+  AST_Template_Module *ptm = 0;
+  AST_Template_Module *ctm = 0;
+
   bool nt_eq = (pnt == cnt);
   bool s_eq = (prev_scope == curr_scope);
 
   switch (pnt)
   {
     case AST_Decl::NT_module:
-      /// Just need to check that both are modules.
-      return (cnt == AST_Decl::NT_module);
+      /// Need to check that both are modules.
+      if (cnt != AST_Decl::NT_module)
+        {
+          return false;
+        }
+
+      /// Neither can be a template module.
+      ptm = AST_Template_Module::narrow_from_decl (prev_decl);
+      ctm = AST_Template_Module::narrow_from_decl (curr_decl);
+      return (ptm == 0 && ctm == 0);
     /// For the *_fwd types, if scopes aren't related, it's ok.
     /// If they are related, then we need another fwd or a full decl.
     case AST_Decl::NT_component_fwd:
@@ -897,6 +907,46 @@ FE_Utils::can_be_redefined (AST_Decl *prev_decl,
   }
 }
 
+void
+FE_Utils::tmpl_mod_ref_check (AST_Decl *context,
+                              AST_Decl *ref)
+{
+  if (ref == 0
+      || ref->node_type () == AST_Decl::NT_param_holder
+      || idl_global->in_tmpl_mod_alias ())
+    {
+      return;
+    }
+
+  bool ok = true;
+
+  if (ref->in_tmpl_mod_not_aliased ())
+    {
+      if (! context->in_tmpl_mod_not_aliased ())
+        {
+          ok = false;
+        }
+      else
+        {
+          AST_Template_Module *context_tm =
+            FE_Utils::get_tm_container (context);
+          AST_Template_Module *ref_tm =
+            FE_Utils::get_tm_container (ref);
+
+          if (context_tm != ref_tm)
+            {
+              ok = false;
+            }
+        }
+    }
+
+  if (! ok)
+    {
+      idl_global->err ()->template_scope_ref_not_aliased (ref);
+      throw Bailout ();
+    }
+}
+
 bool
 FE_Utils::check_one_seq_of_param (FE_Utils::T_PARAMLIST_INFO *list,
                                   ACE_CString &param_id,
@@ -925,3 +975,23 @@ FE_Utils::check_one_seq_of_param (FE_Utils::T_PARAMLIST_INFO *list,
   return false;
 }
 
+AST_Template_Module *
+FE_Utils::get_tm_container (AST_Decl *contained)
+{
+  AST_Decl *d = contained;
+
+  while (d != 0)
+    {
+      AST_Template_Module *tm =
+        AST_Template_Module::narrow_from_decl (d);
+
+      if (tm != 0)
+        {
+          return tm;
+        }
+
+      d = ScopeAsDecl (d->defined_in ());
+    }
+
+  return 0;
+}
diff --git a/TAO_IDL/fe/idl.ll b/TAO_IDL/fe/idl.ll
index 7adb3521a9d..dfe41a3e039 100644
--- a/TAO_IDL/fe/idl.ll
+++ b/TAO_IDL/fe/idl.ll
@@ -280,7 +280,7 @@ oneway          return IDL_ONEWAY;
                   }
                   tmp[ACE_OS::strlen (tmp) - 1] = '\0';
                   ACE_NEW_RETURN (yylval.sval,
-                                  UTL_String (tmp + 1),
+                                  UTL_String (tmp + 1, true),
                                   IDL_STRING_LITERAL);
                   return IDL_STRING_LITERAL;
                 }
@@ -493,7 +493,7 @@ idl_parse_line_and_file (char *buf)
       if (temp_h) h = temp_h;
 #endif
       ACE_NEW (tmp,
-               UTL_String (h));
+               UTL_String (h, true));
       idl_global->update_prefix (tmp->get_string ());
       idl_global->set_filename (tmp);
     }
@@ -541,7 +541,7 @@ idl_parse_line_and_file (char *buf)
       ACE_NEW (nm,
                UTL_String (
                  FE_Utils::stripped_preproc_include (
-                   fname->get_string ())));
+                   fname->get_string ()), true));
 
       // This call also manages the #pragma prefix.
       idl_global->store_include_file_name (nm);
@@ -620,13 +620,13 @@ idl_store_pragma (char *buf)
           // We replace the prefix only if there is a prefix already
           // associated with this file, otherwise we add the prefix.
           char *ext_id = idl_global->filename ()->get_string ();
-          char *int_id = 0;
+          ACE_Hash_Map_Entry<char *, char *> *entry = 0;
           int const status =
-            idl_global->file_prefixes ().find (ext_id, int_id);
+            idl_global->file_prefixes ().find (ext_id, entry);
 
           if (status == 0)
             {
-              if (ACE_OS::strcmp (int_id, "") != 0)
+              if (ACE_OS::strcmp (entry->int_id_, "") != 0)
                 {
                   char *trash = 0;
                   idl_global->pragma_prefixes ().pop (trash);
@@ -635,11 +635,11 @@ idl_store_pragma (char *buf)
               else if (depth == 1)
                 {
                   // Remove the default "" and bind the new prefix.
-                  (void) idl_global->file_prefixes ().unbind (ext_id);
-                  ext_id = ACE::strnew (ext_id);
-                  int_id = ACE::strnew (new_prefix);
-                  (void) idl_global->file_prefixes ().bind (ext_id,
-                                                            int_id);
+                  ACE::strdelete (entry->ext_id_);
+                  ACE::strdelete (entry->int_id_);
+                  (void) idl_global->file_prefixes ().unbind (entry);
+                  (void) idl_global->file_prefixes ().bind (ACE::strnew (ext_id),
+                                                            ACE::strnew (new_prefix));
                 }
             }
 
@@ -666,10 +666,8 @@ idl_store_pragma (char *buf)
 
           if (status != 0)
             {
-              ext_id = ACE::strnew (ext_id);
-              int_id = ACE::strnew (new_prefix);
-              (void) idl_global->file_prefixes ().bind (ext_id,
-                                                        int_id);
+              (void) idl_global->file_prefixes ().bind (ACE::strnew (ext_id),
+                                                        ACE::strnew (new_prefix));
             }
         }
     }
@@ -775,6 +773,9 @@ idl_store_pragma (char *buf)
     {
       char *sample_type = idl_get_pragma_string (buf);
       idl_global->add_dcps_data_type (sample_type);
+
+      // Delete sample_type since add_dcps_data_type() doesn't take its ownership.
+      delete [] sample_type;
     }
   else if (ACE_OS::strncmp (buf + 8, "DCPS_DATA_KEY", 13) == 0)
     {
@@ -801,6 +802,9 @@ idl_store_pragma (char *buf)
           ACE_ERROR((LM_ERROR, "DCPS_DATA_TYPE \"%C\" not found for key \"%C\"\n",
             sample_type, key));
         }
+
+      // Delete sample_type since add_dcps_data_key() doesn't take its ownership.
+      delete [] sample_type;
     }
   else if (ACE_OS::strncmp (buf + 8, "DCPS_SUPPORT_ZERO_COPY_READ", 27) == 0)
     {
@@ -814,21 +818,33 @@ idl_store_pragma (char *buf)
     {
       char *tmp = idl_get_pragma_string (buf);
       idl_global->add_ciao_lem_file_names (tmp);
+
+      // Delete tmp since add_ciao_lem_file_names() doesn't take its ownership.
+      delete [] tmp;
     }
-  else if (ACE_OS::strncmp (buf + 8, "ndds typesupport", 15) == 0)
+  else if (ACE_OS::strncmp (buf + 8, "ndds typesupport", 16) == 0)
     {
       char *tmp = idl_get_pragma_string (buf);
       idl_global->add_ciao_rti_ts_file_names (tmp);
+
+      // Delete tmp since add_ciao_rti_ts_file_names() doesn't take its ownership.
+      delete [] tmp;
     }
-  else if (ACE_OS::strncmp (buf + 8, "opendds typesupport", 18) == 0)
+  else if (ACE_OS::strncmp (buf + 8, "opendds typesupport", 19) == 0)
     {
       char *tmp = idl_get_pragma_string (buf);
       idl_global->add_ciao_oci_ts_file_names (tmp);
+
+      // Delete tmp since add_ciao_oci_ts_file_names() doesn't take its ownership.
+      delete [] tmp;
     }
-  else if (ACE_OS::strncmp (buf + 8, "splice typesupport", 17) == 0)
+  else if (ACE_OS::strncmp (buf + 8, "splice typesupport", 18) == 0)
     {
       char *tmp = idl_get_pragma_string (buf);
       idl_global->add_ciao_spl_ts_file_names (tmp);
+
+      // Delete tmp since add_ciao_spl_ts_file_names() doesn't take its ownership.
+      delete [] tmp;
     }
   else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm interface", 22) == 0)
     {
@@ -836,6 +852,9 @@ idl_store_pragma (char *buf)
         {
           char *tmp = idl_get_pragma_string (buf);
           idl_global->add_ciao_ami_iface_names (tmp);
+
+          // Delete tmp since add_ciao_ami_iface_names() doesn't take its ownership.
+          delete [] tmp;
         }
     }
   else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm receptacle", 23) == 0)
@@ -853,6 +872,9 @@ idl_store_pragma (char *buf)
           /// it will do no harm in other cases.
           idl_global->add_included_ami_recep_names (tmp);
         }
+
+      // Delete tmp since add_ciao_spl_ts_file_names() doesn't take its ownership.
+      delete [] tmp;
     }
   else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm idl", 16) == 0)
     {
@@ -867,12 +889,18 @@ idl_store_pragma (char *buf)
         {
           idl_global->add_ciao_ami_idl_fnames (tmp);
         }
+
+      // Delete tmp since add_ciao_ami_idl_fnames() doesn't take its ownership.
+      delete [] tmp;
     }
   else if (ACE_OS::strncmp (buf + 8, "dds4ccm impl", 12) == 0)
     {
       char *tmp = idl_get_pragma_string (buf);
 
       idl_global->add_dds4ccm_impl_fnames (tmp);
+
+      // Delete tmp since add_dds4ccm_impl_fnames() doesn't take its ownership.
+      delete [] tmp;
     }
 }
 
diff --git a/TAO_IDL/fe/idl.yy b/TAO_IDL/fe/idl.yy
index c4bc88c7d5c..831a4dbf972 100644
--- a/TAO_IDL/fe/idl.yy
+++ b/TAO_IDL/fe/idl.yy
@@ -564,6 +564,10 @@ module
               (void) s->fe_add_module (m);
             }
 
+          $1->destroy ();
+          delete $1;
+          $1 = 0;
+
           /*
            * Push it on the stack
            */
@@ -586,6 +590,7 @@ module
           /*
            * Finished with this module - pop it from the scope stack.
            */
+
           idl_global->scopes ().pop ();
         }
         ;
@@ -633,15 +638,24 @@ template_module
                                                         $3);
 
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
+          AST_Module *m = s->fe_add_module (tm);
 
-          (void) s->fe_add_module (tm);
+          // We've probably tried to reopen a template module,
+          // going further will cause a crash.
+          if (m == 0)
+            {
+              return 1;
+            }
 
           /*
            * Push it on the stack
            */
           idl_global->scopes ().push (tm);
 
-          // Store these for reference as we parse the scope 
+          // Contained items not part of an alias will get flag set.
+          idl_global->in_tmpl_mod_no_alias (true);
+
+          // Store these for reference as we parse the scope
           // of the template module.
           idl_global->current_params ($3);
         }
@@ -655,13 +669,18 @@ template_module
         }
         '}'
         {
+//      '}'
           idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleQsSeen);
 
           /*
            * Finished with this module - pop it from the scope stack.
            */
           idl_global->scopes ().pop ();
-          
+
+          // Unset the flag, the no_alias version because any scope
+          // traversal triggered by an alias would have ended by now.
+          idl_global->in_tmpl_mod_no_alias (false);
+
           // Clear the pointer so scoped name lookup will know
           // that we are no longer in a template module scope.
           idl_global->current_params (0);
@@ -745,6 +764,11 @@ template_module_ref
           delete $2;
           $2 = 0;
 
+          // Save the current flag value to be restored below.
+          bool itmna_flag = idl_global->in_tmpl_mod_no_alias ();
+          idl_global->in_tmpl_mod_no_alias (false);
+          idl_global->in_tmpl_mod_alias (true);
+
           ast_visitor_context ctx;
           ctx.template_params (ref->template_params ());
           ast_visitor_tmpl_module_ref v (&ctx);
@@ -754,7 +778,7 @@ template_module_ref
           // 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)
@@ -765,6 +789,9 @@ template_module_ref
 
               idl_global->set_err_count (idl_global->err_count () + 1);
             }
+
+          idl_global->in_tmpl_mod_no_alias (itmna_flag);
+          idl_global->in_tmpl_mod_alias (false);
         }
         ;
 
@@ -1094,7 +1121,7 @@ value_concrete_decl :
                   false,
                   $1->truncatable (),
                   false);
-                  
+
               i = AST_Interface::narrow_from_decl (v);
               AST_Interface::fwd_redefinition_helper (i,
                                                       s);
@@ -1181,6 +1208,11 @@ value_abs_decl :
                */
               v = AST_ValueType::narrow_from_decl (i);
               (void) s->fe_add_valuetype (v);
+
+              // FE_OBVHeader is not automatically destroyed in the AST
+              $2->destroy ();
+              delete $2;
+              $2 = 0;
             }
 
           /*
@@ -1931,7 +1963,7 @@ const_type
             {
               idl_global->err ()->lookup_error (sn);
             }
- 
+
           sn->destroy ();
           delete sn;
           sn = 0;
@@ -2937,7 +2969,38 @@ union_type
         '('
         {
 //      '('
+          UTL_Scope *s = idl_global->scopes ().top_non_null ();
+          UTL_ScopedName n ($1,
+                            0);
+          AST_Union *u = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_SwitchOpenParSeen);
+
+          /*
+           * Create a node representing an empty union. Add it to its enclosing
+           * scope.
+           */
+          if (s != 0)
+            {
+              u = idl_global->gen ()->create_union (0,
+                                                    &n,
+                                                    s->is_local (),
+                                                    s->is_abstract ());
+
+              AST_Structure *st = AST_Structure::narrow_from_decl (u);
+              AST_Structure::fwd_redefinition_helper (st,
+                                                      s);
+              u = AST_Union::narrow_from_decl (st);
+              (void) s->fe_add_union (u);
+            }
+
+          /*
+           * Push the scope of the union on the scopes stack
+           */
+          idl_global->scopes ().push (u);
+
+          /*
+           * Don't delete $1 yet; we'll need it a bit later.
+           */
         }
         switch_type_spec
         {
@@ -2947,15 +3010,26 @@ union_type
         ')'
         {
 //      ')'
+          /*
+           * The top of the scopes must an empty union we added after we
+           * encountered 'union <id> switch ('. Now we are ready to add a
+           * correct one. Temporarily remove the top so that we setup the
+           * correct union in a right scope. But first save pragma prefix
+           * since UTL_ScopeStack::pop() removes it.
+           */
+          char *prefix = 0;
+          idl_global->pragma_prefixes ().top (prefix);
+          prefix = ACE::strnew (prefix);
+          UTL_Scope *top = idl_global->scopes ().top_non_null ();
+          idl_global->scopes ().pop ();
+
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ($1,
                             0);
-          AST_Union *u = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_SwitchCloseParSeen);
 
           /*
-           * Create a node representing a union. Add it to its enclosing
-           * scope.
+           * Create a node representing a union.
            */
           if ($6 != 0
               && s != 0)
@@ -2969,23 +3043,27 @@ union_type
                 }
               else
                 {
+                  /* Create a union with a correct discriminator. */
+                  AST_Union *u = 0;
                   u = idl_global->gen ()->create_union (tp,
                                                         &n,
                                                         s->is_local (),
                                                         s->is_abstract ());
-                }
+                  /* Narrow the enclosing scope. */
+                  AST_Union *e = AST_Union::narrow_from_scope (top);
 
-              AST_Structure *st = AST_Structure::narrow_from_decl (u);
-              AST_Structure::fwd_redefinition_helper (st,
-                                                      s);
-              u = AST_Union::narrow_from_decl (st);
-              (void) s->fe_add_union (u);
+                  e->redefine (u);
+
+                  u->destroy ();
+                  delete u;
+                }
             }
 
           /*
-           * Push the scope of the union on the scopes stack
+           * Restore the top.
            */
-          idl_global->scopes ().push (u);
+          idl_global->scopes ().push (top);
+          idl_global->pragma_prefixes ().push (prefix);
 
           $1->destroy ();
           delete $1;
@@ -3564,7 +3642,7 @@ sequence_type_spec
             {
               param_holder =
                 $4->param_holder ();
-                
+
               ev = $4->coerce (AST_Expression::EV_ulong);
             }
 
@@ -3604,7 +3682,7 @@ sequence_type_spec
                                             s->is_local (),
                                             s->is_abstract ()
                                           );
-                      
+
                   if (!idl_global->in_typedef ()
                       && !idl_global->anon_silent ())
                     {
@@ -3664,7 +3742,7 @@ sequence_type_spec
                         s->is_local (),
                         s->is_abstract ()
                       );
-                      
+
                   if (!idl_global->in_typedef ()
                       && !idl_global->anon_silent ())
                     {
@@ -3743,6 +3821,12 @@ string_type_spec
                                                   $$
                                                 )
                                             );
+
+              if (!idl_global->in_typedef ()
+                  && !idl_global->anon_silent ())
+                {
+                  idl_global->err ()->anonymous_type_diagnostic ();
+                }
             }
 
           delete ev;
@@ -3756,7 +3840,7 @@ string_type_spec
            * Create a node representing a string.
            */
           ACE_CDR::ULong bound = 0UL;
-          
+
           $$ =
             idl_global->gen ()->create_string (
                 idl_global->gen ()->create_expr (bound,
@@ -3770,12 +3854,6 @@ string_type_spec
                                               $$
                                             )
                                         );
-                      
-          if (!idl_global->in_typedef ()
-              && !idl_global->anon_silent ())
-            {
-              idl_global->err ()->anonymous_type_diagnostic ();
-            }
         }
         ;
 
@@ -3823,6 +3901,12 @@ wstring_type_spec
               (void) idl_global->root ()->fe_add_string (
                                               AST_String::narrow_from_decl ($$)
                                             );
+
+              if (!idl_global->in_typedef ()
+                  && !idl_global->anon_silent ())
+                {
+                  idl_global->err ()->anonymous_type_diagnostic ();
+                }
             }
         }
         | wstring_head
@@ -3834,7 +3918,7 @@ wstring_type_spec
            * Create a node representing a wstring.
            */
           ACE_CDR::ULong bound = 0UL;
-          
+
           $$ =
             idl_global->gen ()->create_wstring (
                 idl_global->gen ()->create_expr (bound,
@@ -3889,7 +3973,7 @@ array_declarator :
               $3 = 0;
 
               sn.destroy ();
-              
+
               if (!idl_global->in_typedef ()
                   && !idl_global->anon_silent ())
                 {
@@ -3982,15 +4066,15 @@ array_dim :
                 {
                   AST_Expression::ExprType et =
                     param_holder->info ()->const_type_;
-                    
+
                   // If the bound expression represents a
                   // template parameter, it must be a const
-                  // and of type unsigned long.  
+                  // and of type unsigned long.
                   if (et != AST_Expression::EV_ulong)
                     {
                       idl_global->err ()->mismatched_template_param (
                         param_holder->info ()->name_.c_str ());
-                        
+
                       delete ev;
                       ev = 0;
                       return 1;
@@ -5303,7 +5387,7 @@ provides_decl : IDL_PROVIDES interface_type id
 
               (void) s->fe_add_provides (p);
             }
- 
+
           $2->destroy ();
           delete $2;
           $2 = 0;
@@ -5358,7 +5442,7 @@ uses_decl : uses_opt_multiple interface_type id
 
           AST_Decl *d =
             s->lookup_by_name ($2, true, false);
-            
+
           if (d == 0)
             {
               idl_global->err ()->lookup_error ($2);
@@ -5376,7 +5460,7 @@ uses_decl : uses_opt_multiple interface_type id
                   case AST_Decl::NT_param_holder:
                     ph = AST_Param_Holder::narrow_from_decl (d);
                     nt = ph->info ()->type_;
- 
+
                     if (nt != AST_Decl::NT_type
                        && nt != AST_Decl::NT_interface)
                       {
@@ -5427,7 +5511,7 @@ uses_decl : uses_opt_multiple interface_type id
                                                  $1);
 
               (void) s->fe_add_uses (u);
- 
+
               AST_Component *c =
                 AST_Component::narrow_from_scope (s);
 
@@ -6444,14 +6528,16 @@ formal_parameter
 
           $<pival>$->type_ = nt;
           $<pival>$->name_ = $2;
+          ACE::strdelete ($2);
+          $2 = 0;
 
           if (nt == AST_Decl::NT_const)
             {
               $<pival>$->const_type_ = t_param_const_type;
               $<pival>$->enum_const_type_decl_ =
                 tao_enum_constant_decl;
- 
-              // Reset these values.  
+
+              // Reset these values.
               t_param_const_type = AST_Expression::EV_none;
               tao_enum_constant_decl = 0;
             }
@@ -6837,7 +6923,7 @@ connector_decl
 connector_header
         : IDL_CONNECTOR
         {
-// connector_header : IDL_CONNECTOR 
+// connector_header : IDL_CONNECTOR
           idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen);
         }
         IDENTIFIER
diff --git a/TAO_IDL/fe/lex.yy.cpp b/TAO_IDL/fe/lex.yy.cpp
index 9eb8e97dd62..1ba2ff65fac 100644
--- a/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO_IDL/fe/lex.yy.cpp
@@ -17,6 +17,7 @@
 
 /* begin standard C headers. */
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
 
 /* end standard C headers. */
 
@@ -138,7 +139,15 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef TAO_YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, TAO_YY_BUF_SIZE is 2*TAO_YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define TAO_YY_BUF_SIZE 32768
+#else
 #define TAO_YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -1019,7 +1028,7 @@ static void                 idl_parse_line_and_file (char *);
 static void                 idl_store_pragma (char *);
 static char *               idl_get_pragma_string (char *);
 static bool                 idl_valid_version (char *);
-static AST_Decl *           idl_find_node (char *);
+static AST_Decl *           idl_find_node (const char *);
 
 #define ace_tao_yytext tao_yytext
 
@@ -1108,7 +1117,12 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef TAO_YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define TAO_YY_READ_BUF_SIZE 16384
+#else
 #define TAO_YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -1727,7 +1741,7 @@ case 86:
 TAO_YY_RULE_SETUP
 {
                   // octal character constant
-                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
+                  tao_yylval.cval = idl_escape_reader (ace_tao_yytext + 1);
                   return IDL_CHARACTER_LITERAL;
                 }
         TAO_YY_BREAK
@@ -1735,14 +1749,14 @@ case 87:
 TAO_YY_RULE_SETUP
 {
                   // hexadecimal character constant
-                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
+                  tao_yylval.cval = idl_escape_reader (ace_tao_yytext + 1);
                   return IDL_CHARACTER_LITERAL;
                 }
         TAO_YY_BREAK
 case 88:
 TAO_YY_RULE_SETUP
 {
-                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
+                  tao_yylval.cval = idl_escape_reader (ace_tao_yytext + 1);
                   return IDL_CHARACTER_LITERAL;
                 }
         TAO_YY_BREAK
@@ -2976,7 +2990,18 @@ idl_parse_line_and_file (char *buf)
       // possibly produced VMS-style paths here.
       char trans_path[MAXPATHLEN] = "";
       char *temp_h = IDL_GlobalData::translateName (h, trans_path);
-      if (temp_h) h = temp_h;
+
+      if (temp_h)
+        {
+          h = temp_h;
+        }
+      else
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("Unable to construct full file pathname\n")));
+
+          throw Bailout ();
+        }
 #endif
       ACE_NEW (tmp,
                UTL_String (h, true));
@@ -3106,13 +3131,13 @@ idl_store_pragma (char *buf)
           // We replace the prefix only if there is a prefix already
           // associated with this file, otherwise we add the prefix.
           char *ext_id = idl_global->filename ()->get_string ();
-          char *int_id = 0;
+          ACE_Hash_Map_Entry<char *, char *> *entry = 0;
           int const status =
-            idl_global->file_prefixes ().find (ext_id, int_id);
+            idl_global->file_prefixes ().find (ext_id, entry);
 
           if (status == 0)
             {
-              if (ACE_OS::strcmp (int_id, "") != 0)
+              if (ACE_OS::strcmp (entry->int_id_, "") != 0)
                 {
                   char *trash = 0;
                   idl_global->pragma_prefixes ().pop (trash);
@@ -3121,11 +3146,11 @@ idl_store_pragma (char *buf)
               else if (depth == 1)
                 {
                   // Remove the default "" and bind the new prefix.
-                  (void) idl_global->file_prefixes ().unbind (ext_id);
-                  ext_id = ACE::strnew (ext_id);
-                  int_id = ACE::strnew (new_prefix);
-                  (void) idl_global->file_prefixes ().bind (ext_id,
-                                                            int_id);
+                  ACE::strdelete (entry->ext_id_);
+                  ACE::strdelete (entry->int_id_);
+                  (void) idl_global->file_prefixes ().unbind (entry);
+                  (void) idl_global->file_prefixes ().bind (ACE::strnew (ext_id),
+                                                            ACE::strnew (new_prefix));
                 }
             }
 
@@ -3152,10 +3177,8 @@ idl_store_pragma (char *buf)
 
           if (status != 0)
             {
-              ext_id = ACE::strnew (ext_id);
-              int_id = ACE::strnew (new_prefix);
-              (void) idl_global->file_prefixes ().bind (ext_id,
-                                                        int_id);
+              (void) idl_global->file_prefixes ().bind (ACE::strnew (ext_id),
+                                                        ACE::strnew (new_prefix));
             }
         }
     }
@@ -3235,7 +3258,10 @@ idl_store_pragma (char *buf)
           ++tmp;
         }
 
-      AST_Decl *d = idl_find_node (tmp);
+      ACE_CString work (tmp);
+      work = work.substr (0, work.find (' '));
+
+      AST_Decl *d = idl_find_node (work.c_str ());
 
       if (d == 0)
         {
@@ -3261,6 +3287,9 @@ idl_store_pragma (char *buf)
     {
       char *sample_type = idl_get_pragma_string (buf);
       idl_global->add_dcps_data_type (sample_type);
+
+      // Delete sample_type since add_dcps_data_type() doesn't take its ownership.
+      delete [] sample_type;
     }
   else if (ACE_OS::strncmp (buf + 8, "DCPS_DATA_KEY", 13) == 0)
     {
@@ -3287,6 +3316,9 @@ idl_store_pragma (char *buf)
           ACE_ERROR((LM_ERROR, "DCPS_DATA_TYPE \"%C\" not found for key \"%C\"\n",
             sample_type, key));
         }
+
+      // Delete sample_type since add_dcps_data_key() doesn't take its ownership.
+      delete [] sample_type;
     }
   else if (ACE_OS::strncmp (buf + 8, "DCPS_SUPPORT_ZERO_COPY_READ", 27) == 0)
     {
@@ -3300,21 +3332,41 @@ idl_store_pragma (char *buf)
     {
       char *tmp = idl_get_pragma_string (buf);
       idl_global->add_ciao_lem_file_names (tmp);
+
+      // Delete tmp since add_ciao_lem_file_names() doesn't take its ownership.
+      delete [] tmp;
     }
   else if (ACE_OS::strncmp (buf + 8, "ndds typesupport", 16) == 0)
     {
       char *tmp = idl_get_pragma_string (buf);
       idl_global->add_ciao_rti_ts_file_names (tmp);
+
+      // Delete tmp since add_ciao_rti_ts_file_names() doesn't take its ownership.
+      delete [] tmp;
+    }
+  else if (ACE_OS::strncmp (buf + 8, "coredx typesupport", 18) == 0)
+    {
+      char *tmp = idl_get_pragma_string (buf);
+      idl_global->add_ciao_coredx_ts_file_names (tmp);
+
+      // Delete tmp since add_ciao_rti_ts_file_names() doesn't take its ownership.
+      delete [] tmp;
     }
   else if (ACE_OS::strncmp (buf + 8, "opendds typesupport", 19) == 0)
     {
       char *tmp = idl_get_pragma_string (buf);
       idl_global->add_ciao_oci_ts_file_names (tmp);
+
+      // Delete tmp since add_ciao_oci_ts_file_names() doesn't take its ownership.
+      delete [] tmp;
     }
   else if (ACE_OS::strncmp (buf + 8, "splice typesupport", 18) == 0)
     {
       char *tmp = idl_get_pragma_string (buf);
       idl_global->add_ciao_spl_ts_file_names (tmp);
+
+      // Delete tmp since add_ciao_spl_ts_file_names() doesn't take its ownership.
+      delete [] tmp;
     }
   else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm interface", 22) == 0)
     {
@@ -3322,6 +3374,9 @@ idl_store_pragma (char *buf)
         {
           char *tmp = idl_get_pragma_string (buf);
           idl_global->add_ciao_ami_iface_names (tmp);
+
+          // Delete tmp since add_ciao_ami_iface_names() doesn't take its ownership.
+          delete [] tmp;
         }
     }
   else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm receptacle", 23) == 0)
@@ -3339,6 +3394,9 @@ idl_store_pragma (char *buf)
           /// it will do no harm in other cases.
           idl_global->add_included_ami_recep_names (tmp);
         }
+
+      // Delete tmp since add_ciao_spl_ts_file_names() doesn't take its ownership.
+      delete [] tmp;
     }
   else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm idl", 16) == 0)
     {
@@ -3353,12 +3411,18 @@ idl_store_pragma (char *buf)
         {
           idl_global->add_ciao_ami_idl_fnames (tmp);
         }
+
+      // Delete tmp since add_ciao_ami_idl_fnames() doesn't take its ownership.
+      delete [] tmp;
     }
   else if (ACE_OS::strncmp (buf + 8, "dds4ccm impl", 12) == 0)
     {
       char *tmp = idl_get_pragma_string (buf);
 
       idl_global->add_dds4ccm_impl_fnames (tmp);
+
+      // Delete tmp since add_dds4ccm_impl_fnames() doesn't take its ownership.
+      delete [] tmp;
     }
 }
 
@@ -3412,10 +3476,10 @@ idl_atoi (char *s, long b)
  * idl_atoui - Convert a string of digits into an unsigned integer according to base b
  */
 static ACE_CDR::ULongLong
-idl_atoui (char *s, long b)
+idl_atoui(char *s, long b)
 {
   ACE_CDR::ULongLong r = 0;
-  
+
   if (b == 8 && *s == '0')
     {
       ++s;
@@ -3739,7 +3803,7 @@ idl_valid_version (char *s)
 }
 
 static AST_Decl *
-idl_find_node (char *s)
+idl_find_node (const char *s)
 {
   UTL_ScopedName * node = FE_Utils::string_to_scoped_name (s);
   AST_Decl * d = 0;
diff --git a/TAO_IDL/fe/y.tab.cpp b/TAO_IDL/fe/y.tab.cpp
index 82a566d4e04..7688d2ffabd 100644
--- a/TAO_IDL/fe/y.tab.cpp
+++ b/TAO_IDL/fe/y.tab.cpp
@@ -357,8 +357,8 @@ typedef union TAO_YYSTYPE
   AST_Operation::Flags          ofval;          /* Operation flags      */
   FE_Declarator                 *deval;         /* Declarator value     */
   ACE_CDR::Boolean              bval;           /* Boolean value        */
-  ACE_CDR::LongLong             ival;           /* Long value           */
-  ACE_CDR::ULongLong            uival;          /* Unsigned long value  */
+  ACE_CDR::LongLong             ival;           /* Long Long value      */
+  ACE_CDR::ULongLong            uival;          /* Unsigned long long   */
   ACE_CDR::Double               dval;           /* Double value         */
   ACE_CDR::Float                fval;           /* Float value          */
   ACE_CDR::Char                 cval;           /* Char value           */
@@ -2057,7 +2057,7 @@ int tao_yydebug;
 # define TAO_YYMAXDEPTH 10000
 #endif
 
-
+
 
 #if TAO_YYERROR_VERBOSE
 
@@ -2268,7 +2268,7 @@ tao_yysyntax_error (char *tao_yyresult, int tao_yystate, int tao_yychar)
     }
 }
 #endif /* TAO_YYERROR_VERBOSE */
-
+
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -2293,7 +2293,7 @@ tao_yydestruct (tao_yymsg, tao_yytype, tao_yyvaluep)
     tao_yymsg = "Deleting";
   TAO_YY_SYMBOL_PRINT (tao_yymsg, tao_yytype, tao_yyvaluep, tao_yylocationp);
 }
-
+
 
 /* Prevent warnings from -Wmissing-prototypes.  */
 
@@ -2883,6 +2883,10 @@ tao_yyreduce:
               (void) s->fe_add_module (m);
             }
 
+          (tao_yyvsp[(1) - (1)].idlist)->destroy ();
+          delete (tao_yyvsp[(1) - (1)].idlist);
+          (tao_yyvsp[(1) - (1)].idlist) = 0;
+
           /*
            * Push it on the stack
            */
@@ -2914,6 +2918,7 @@ tao_yyreduce:
           /*
            * Finished with this module - pop it from the scope stack.
            */
+
           idl_global->scopes ().pop ();
         }
     break;
@@ -2967,14 +2972,23 @@ tao_yyreduce:
                                                         (tao_yyvsp[(3) - (5)].plval));
 
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
+          AST_Module *m = s->fe_add_module (tm);
 
-          (void) s->fe_add_module (tm);
+          // We've probably tried to reopen a template module,
+          // going further will cause a crash.
+          if (m == 0)
+            {
+              return 1;
+            }
 
           /*
            * Push it on the stack
            */
           idl_global->scopes ().push (tm);
 
+          // Contained items not part of an alias will get flag set.
+          idl_global->in_tmpl_mod_no_alias (true);
+
           // Store these for reference as we parse the scope
           // of the template module.
           idl_global->current_params ((tao_yyvsp[(3) - (5)].plval));
@@ -3005,6 +3019,10 @@ tao_yyreduce:
            */
           idl_global->scopes ().pop ();
 
+          // Unset the flag, the no_alias version because any scope
+          // traversal triggered by an alias would have ended by now.
+          idl_global->in_tmpl_mod_no_alias (false);
+
           // Clear the pointer so scoped name lookup will know
           // that we are no longer in a template module scope.
           idl_global->current_params (0);
@@ -3080,6 +3098,11 @@ tao_yyreduce:
           delete (tao_yyvsp[(2) - (8)].idlist);
           (tao_yyvsp[(2) - (8)].idlist) = 0;
 
+          // Save the current flag value to be restored below.
+          bool itmna_flag = idl_global->in_tmpl_mod_no_alias ();
+          idl_global->in_tmpl_mod_no_alias (false);
+          idl_global->in_tmpl_mod_alias (true);
+
           ast_visitor_context ctx;
           ctx.template_params (ref->template_params ());
           ast_visitor_tmpl_module_ref v (&ctx);
@@ -3100,6 +3123,9 @@ tao_yyreduce:
 
               idl_global->set_err_count (idl_global->err_count () + 1);
             }
+
+          idl_global->in_tmpl_mod_no_alias (itmna_flag);
+          idl_global->in_tmpl_mod_alias (false);
         }
     break;
 
@@ -3539,6 +3565,11 @@ tao_yyreduce:
                */
               v = AST_ValueType::narrow_from_decl (i);
               (void) s->fe_add_valuetype (v);
+
+              // FE_OBVHeader is not automatically destroyed in the AST
+              (tao_yyvsp[(2) - (2)].vhval)->destroy ();
+              delete (tao_yyvsp[(2) - (2)].vhval);
+              (tao_yyvsp[(2) - (2)].vhval) = 0;
             }
 
           /*
@@ -5452,7 +5483,38 @@ tao_yyreduce:
 
     {
 //      '('
+          UTL_Scope *s = idl_global->scopes ().top_non_null ();
+          UTL_ScopedName n ((tao_yyvsp[(1) - (4)].idval),
+                            0);
+          AST_Union *u = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_SwitchOpenParSeen);
+
+          /*
+           * Create a node representing an empty union. Add it to its enclosing
+           * scope.
+           */
+          if (s != 0)
+            {
+              u = idl_global->gen ()->create_union (0,
+                                                    &n,
+                                                    s->is_local (),
+                                                    s->is_abstract ());
+
+              AST_Structure *st = AST_Structure::narrow_from_decl (u);
+              AST_Structure::fwd_redefinition_helper (st,
+                                                      s);
+              u = AST_Union::narrow_from_decl (st);
+              (void) s->fe_add_union (u);
+            }
+
+          /*
+           * Push the scope of the union on the scopes stack
+           */
+          idl_global->scopes ().push (u);
+
+          /*
+           * Don't delete $1 yet; we'll need it a bit later.
+           */
         }
     break;
 
@@ -5468,15 +5530,22 @@ tao_yyreduce:
 
     {
 //      ')'
+          /*
+           * The top of the scopes must an empty union we added after we
+           * encountered 'union <id> switch ('. Now we are ready to add a
+           * correct one. Temporarily remove the top so that we setup the
+           * correct union in a right scope.
+           */
+          UTL_Scope *top = idl_global->scopes ().top_non_null ();
+          idl_global->scopes ().pop ();
+
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((tao_yyvsp[(1) - (8)].idval),
                             0);
-          AST_Union *u = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_SwitchCloseParSeen);
 
           /*
-           * Create a node representing a union. Add it to its enclosing
-           * scope.
+           * Create a node representing a union.
            */
           if ((tao_yyvsp[(6) - (8)].dcval) != 0
               && s != 0)
@@ -5490,23 +5559,26 @@ tao_yyreduce:
                 }
               else
                 {
+                  /* Create a union with a correct discriminator. */
+                  AST_Union *u = 0;
                   u = idl_global->gen ()->create_union (tp,
                                                         &n,
                                                         s->is_local (),
                                                         s->is_abstract ());
-                }
+                  /* Narrow the enclosing scope. */
+                  AST_Union *e = AST_Union::narrow_from_scope (top);
 
-              AST_Structure *st = AST_Structure::narrow_from_decl (u);
-              AST_Structure::fwd_redefinition_helper (st,
-                                                      s);
-              u = AST_Union::narrow_from_decl (st);
-              (void) s->fe_add_union (u);
+                  e->redefine (u);
+
+                  u->destroy ();
+                  delete u;
+                }
             }
 
           /*
-           * Push the scope of the union on the scopes stack
+           * Restore the top.
            */
-          idl_global->scopes ().push (u);
+          idl_global->scopes ().push (top);
 
           (tao_yyvsp[(1) - (8)].idval)->destroy ();
           delete (tao_yyvsp[(1) - (8)].idval);
@@ -6180,7 +6252,7 @@ tao_yyreduce:
                                             s->is_local (),
                                             s->is_abstract ()
                                           );
-              
+
                   if (!idl_global->in_typedef ()
                       && !idl_global->anon_silent ())
                     {
@@ -6242,7 +6314,7 @@ tao_yyreduce:
                         s->is_local (),
                         s->is_abstract ()
                       );
-              
+
                   if (!idl_global->in_typedef ()
                       && !idl_global->anon_silent ())
                     {
@@ -6332,7 +6404,7 @@ tao_yyreduce:
                                                   (tao_yyval.dcval)
                                                 )
                                             );
-                      
+
               if (!idl_global->in_typedef ()
                   && !idl_global->anon_silent ())
                 {
@@ -6420,6 +6492,12 @@ tao_yyreduce:
               (void) idl_global->root ()->fe_add_string (
                                               AST_String::narrow_from_decl ((tao_yyval.dcval))
                                             );
+
+              if (!idl_global->in_typedef ()
+                  && !idl_global->anon_silent ())
+                {
+                  idl_global->err ()->anonymous_type_diagnostic ();
+                }
             }
         }
     break;
@@ -6492,7 +6570,7 @@ tao_yyreduce:
               (tao_yyvsp[(3) - (3)].elval) = 0;
 
               sn.destroy ();
-              
+
               if (!idl_global->in_typedef ()
                   && !idl_global->anon_silent ())
                 {
@@ -8141,7 +8219,7 @@ tao_yyreduce:
 
           AST_Decl *d =
             s->lookup_by_name ((tao_yyvsp[(2) - (3)].idlist), true, false);
-            
+
           if (d == 0)
             {
               idl_global->err ()->lookup_error ((tao_yyvsp[(2) - (3)].idlist));
@@ -9317,6 +9395,8 @@ tao_yyreduce:
 
           (tao_yyval.pival)->type_ = nt;
           (tao_yyval.pival)->name_ = (tao_yyvsp[(2) - (2)].strval);
+          ACE::strdelete ((tao_yyvsp[(2) - (2)].strval));
+          (tao_yyvsp[(2) - (2)].strval) = 0;
 
           if (nt == AST_Decl::NT_const)
             {
diff --git a/TAO_IDL/include/ast_argument.h b/TAO_IDL/include/ast_argument.h
index 602be943cc9..d50831a9395 100644
--- a/TAO_IDL/include/ast_argument.h
+++ b/TAO_IDL/include/ast_argument.h
@@ -102,10 +102,10 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
-  
+
   static AST_Decl::NodeType const NT;
 
 private:
diff --git a/TAO_IDL/include/ast_array.h b/TAO_IDL/include/ast_array.h
index 5ba744a4fe0..f9d94826178 100644
--- a/TAO_IDL/include/ast_array.h
+++ b/TAO_IDL/include/ast_array.h
@@ -105,7 +105,7 @@ public:
   // a primary key. Overridden for valuetype, struct, sequence,
   // union, array, typedef, and interface.
   virtual bool legal_for_primary_key (void) const;
-  
+
   // Cleanup.
   virtual void destroy (void);
 
@@ -118,9 +118,9 @@ 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.
@@ -136,7 +136,7 @@ private:
 
   AST_Type *pd_base_type;
   // Base type of array.
-  
+
   bool owns_base_type_;
   // If our base type is anonymous array or sequence, we're
   // responsible for destroying it.
diff --git a/TAO_IDL/include/ast_attribute.h b/TAO_IDL/include/ast_attribute.h
index abdcbdc85ce..c8ebf245889 100644
--- a/TAO_IDL/include/ast_attribute.h
+++ b/TAO_IDL/include/ast_attribute.h
@@ -99,7 +99,7 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
@@ -108,7 +108,7 @@ public:
   UTL_ExceptList *be_add_set_exceptions (UTL_ExceptList *t);
 
   static AST_Decl::NodeType const NT;
-  
+
 private:
   // Data.
 
diff --git a/TAO_IDL/include/ast_component.h b/TAO_IDL/include/ast_component.h
index d40746b9b62..2d22f2562a1 100644
--- a/TAO_IDL/include/ast_component.h
+++ b/TAO_IDL/include/ast_component.h
@@ -46,10 +46,11 @@ public:
   AST_Type **supports (void) const;
 
   long n_supports (void) const;
-  
+
   // Override for component of UTL_Scope method.
   virtual AST_Decl *special_lookup (UTL_ScopedName *e,
-                                    bool full_def_only);
+                                    bool full_def_only,
+                                    AST_Decl *&final_parent_decl);
 
   // Cleanup function.
   virtual void destroy (void);
@@ -73,7 +74,7 @@ public:
 
   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_IDL/include/ast_concrete_type.h b/TAO_IDL/include/ast_concrete_type.h
index 44e961be886..79a8ff55fab 100644
--- a/TAO_IDL/include/ast_concrete_type.h
+++ b/TAO_IDL/include/ast_concrete_type.h
@@ -79,7 +79,7 @@ public:
                     UTL_ScopedName *n);
 
   virtual ~AST_ConcreteType (void);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/include/ast_connector.h b/TAO_IDL/include/ast_connector.h
index 33c39f352e8..895f0b00376 100644
--- a/TAO_IDL/include/ast_connector.h
+++ b/TAO_IDL/include/ast_connector.h
@@ -17,12 +17,12 @@ public:
                  AST_Connector *base_connector);
 
   virtual ~AST_Connector (void);
-  
+
   AST_Connector *base_connector (void) const;
 
   // Cleanup function.
   virtual void destroy (void);
-  
+
   // Narrowing.
 
   DEF_NARROW_FROM_DECL (AST_Connector);
diff --git a/TAO_IDL/include/ast_consumes.h b/TAO_IDL/include/ast_consumes.h
index df6f3b0fe9f..6dd17285520 100644
--- a/TAO_IDL/include/ast_consumes.h
+++ b/TAO_IDL/include/ast_consumes.h
@@ -13,9 +13,9 @@ class TAO_IDL_FE_Export AST_Consumes : public virtual AST_Field
 public:
   AST_Consumes (UTL_ScopedName *n,
                 AST_Type *consumes_type);
-            
+
   virtual ~AST_Consumes (void);
-  
+
   // Data Accessor.
   AST_Type *consumes_type (void) const;
 
@@ -27,7 +27,7 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/include/ast_decl.h b/TAO_IDL/include/ast_decl.h
index f5f7e619d18..4580643e84c 100644
--- a/TAO_IDL/include/ast_decl.h
+++ b/TAO_IDL/include/ast_decl.h
@@ -108,7 +108,7 @@ public:
   // Accessor needs to get overridden for a few types.
   virtual bool is_local (void);
   void is_local (bool val);
-  
+
   bool is_abstract (void) const;
   void is_abstract (bool val);
 
@@ -299,12 +299,16 @@ public:
   // Useful for GIOP to know if a wstring is being marshaled.
   virtual int contains_wstring (void);
   void contains_wstring (int val);
-  
+
   // Additional checks when we think we have caught an IDL
   // masking scope error in a lookup, which starts simply with
   // a comparison of names in a scope masking queue.
   bool masking_checks (AST_Decl *mod);
-  
+
+  // Accessors for the member.
+  bool in_tmpl_mod_not_aliased (void) const;
+  void in_tmpl_mod_not_aliased (bool val);
+
 protected:
   // These are not private because they're used by
   // be_predefined_type' constructor and can be called
@@ -385,6 +389,9 @@ private:
   // The scope in which our prefix, if any, was assigned.
   UTL_Scope *prefix_scope_;
 
+  bool in_tmpl_mod_not_aliased_;
+  // false by default - if true, we can't be referenced.
+
 private:
   void compute_full_name (UTL_ScopedName *n);
   // Compute the full name of an AST node.
diff --git a/TAO_IDL/include/ast_emits.h b/TAO_IDL/include/ast_emits.h
index d1aba825406..b8e0a450e95 100644
--- a/TAO_IDL/include/ast_emits.h
+++ b/TAO_IDL/include/ast_emits.h
@@ -13,9 +13,9 @@ class TAO_IDL_FE_Export AST_Emits : public virtual AST_Field
 public:
   AST_Emits (UTL_ScopedName *n,
              AST_Type *emits_type);
-            
+
   virtual ~AST_Emits (void);
-  
+
   // Data Accessor.
   AST_Type *emits_type (void) const;
 
@@ -27,7 +27,7 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/include/ast_exception.h b/TAO_IDL/include/ast_exception.h
index f70a512353c..a1a50b4a64f 100644
--- a/TAO_IDL/include/ast_exception.h
+++ b/TAO_IDL/include/ast_exception.h
@@ -99,7 +99,7 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/include/ast_expression.h b/TAO_IDL/include/ast_expression.h
index 70f49839ca0..468203c94da 100644
--- a/TAO_IDL/include/ast_expression.h
+++ b/TAO_IDL/include/ast_expression.h
@@ -119,7 +119,9 @@ public:
       , EK_longlong
       , EK_ulonglong
       , EK_octet
-      , EK_floating_point
+      , EK_float
+      , EK_double
+      , EK_longdouble
     };
 
   // Enum to define expression type.
@@ -168,26 +170,31 @@ public:
           ACE_CDR::Long       lval;     // Contains long expression value.
           ACE_CDR::ULong      ulval;    // Contains unsigned long expr value.
           ACE_CDR::Boolean    bval;     // Contains boolean expression value.
-          ACE_CDR::LongLong   llval;   // Contains long long expr value.
+          ACE_CDR::LongLong   llval;    // Contains long long expr value.
 #if  defined (ACE_LACKS_UNSIGNEDLONGLONG_T) && ! defined (ACE_LACKS_LONGLONG_T)
-          ACE_CDR::LongLong   ullval; // Contains unsigned long long expr value
+          ACE_CDR::LongLong   ullval;   // Contains unsigned long long expr value
 #elif ! defined (ACE_LACKS_LONGLONG_T)
-          ACE_CDR::ULongLong  ullval;  // Contains unsigned long long expr value.
+          ACE_CDR::ULongLong  ullval;   // Contains unsigned long long expr value.
 #endif /* defined (ACE_LACKS_UNSIGNEDLONGLONG_T) && ! defined (ACE_LACKS_LONGLONG_T) */
           ACE_CDR::Float      fval;     // Contains 32-bit float expr value.
           ACE_CDR::Double     dval;     // Contains 64-bit float expr value.
           ACE_CDR::Char       cval;     // Contains char expression value.
-          ACE_CDR::WChar      wcval;    // Contains wchar expression value.
+          ACE_CDR::WChar      wcval;    // Contains wchar expression value. 
           ACE_CDR::Octet      oval;     // Contains octet expr value.
           UTL_String          *strval;  // Contains String * expr value.
           char                *wstrval; // Contains wide string expr value.
           ACE_CDR::ULong      eval;     // Contains enumeration value.
+#if defined (NONNATIVE_LONGDOUBLE)
+          ACE_CDR::LongDouble::NativeImpl ldval; // Contains long double value.
+#else
+          ACE_CDR::LongDouble ldval;    // Contains long double value.
+#endif // defined (NONNATIVE_LONGDOUBLE)
         } u;
 
       ExprType et;
     };
 
- // Operations.
+  // Operations.
 
   // Constructor(s).
   AST_Expression (AST_Expression *v,
@@ -202,7 +209,7 @@ public:
   AST_Expression (ACE_CDR::UShort us);
 
   AST_Expression (ACE_CDR::Long l);
-  
+
   AST_Expression (ACE_CDR::LongLong ll);
 
   AST_Expression (ACE_CDR::Boolean b);
@@ -286,7 +293,7 @@ public:
 
   // Accessor for the member.
   AST_Decl *get_tdef (void) const;
-  
+
   // Accessor for the member.
   AST_Param_Holder *param_holder (void) const;
 
@@ -331,10 +338,10 @@ private:
 
   AST_Decl *tdef;
   // Propagates aliased constant type.
-  
+
   AST_Param_Holder *param_holder_;
   // Non-zero if we were created from a reference template param.
-  
+
 private:
   // Fill out the lineno, filename and definition scope details.
   void fill_definition_details (void);
diff --git a/TAO_IDL/include/ast_field.h b/TAO_IDL/include/ast_field.h
index 8641de10063..9cbfcecf02c 100644
--- a/TAO_IDL/include/ast_field.h
+++ b/TAO_IDL/include/ast_field.h
@@ -123,7 +123,7 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
@@ -137,7 +137,7 @@ protected:
 
   Visibility visibility_;
   // Used with valuetype and eventtype fields.
-  
+
   bool owns_base_type_;
   // If our field type is anonymous array or sequence, we're
   // responsible for destroying it.
diff --git a/TAO_IDL/include/ast_generator.h b/TAO_IDL/include/ast_generator.h
index bc8e6dda13d..0624b2f4e78 100644
--- a/TAO_IDL/include/ast_generator.h
+++ b/TAO_IDL/include/ast_generator.h
@@ -365,60 +365,60 @@ public:
 
   virtual
   AST_PortType *create_porttype (UTL_ScopedName *n);
-    
+
   virtual
   AST_Provides *create_provides (UTL_ScopedName *n,
                                  AST_Type *provides_type);
-                                 
+
   virtual
   AST_Uses *create_uses (UTL_ScopedName *n,
                          AST_Type *uses_type,
                          bool is_multiple);
-    
+
   virtual
   AST_Publishes *create_publishes (UTL_ScopedName *n,
                                    AST_Type *publishes_type);
-    
+
   virtual
   AST_Emits *create_emits (UTL_ScopedName *n,
                            AST_Type *emits_type);
-    
+
   virtual
   AST_Consumes *create_consumes (UTL_ScopedName *n,
                                  AST_Type *consumes_type);
-                                 
+
   virtual
   AST_Extended_Port *create_extended_port (
     UTL_ScopedName *n,
     AST_PortType *porttype_ref);
-    
+
   virtual
   AST_Mirror_Port *create_mirror_port (
     UTL_ScopedName *n,
     AST_PortType *porttype_ref);
-    
+
   virtual
   AST_Connector *create_connector (
     UTL_ScopedName  *n,
     AST_Connector *base_connector);
-    
+
   virtual
   AST_Template_Module *create_template_module (
     UTL_ScopedName *n,
     FE_Utils::T_PARAMLIST_INFO *template_params);
-    
+
   virtual
   AST_Template_Module_Inst *create_template_module_inst (
     UTL_ScopedName *n,
     AST_Template_Module *ref,
     FE_Utils::T_ARGLIST *template_args);
-    
+
   virtual
   AST_Template_Module_Ref *create_template_module_ref (
     UTL_ScopedName *n,
     AST_Template_Module *ref,
     UTL_StrList *param_refs);
-    
+
   virtual
   AST_Param_Holder *create_param_holder (
     UTL_ScopedName *parameter_name,
diff --git a/TAO_IDL/include/ast_home.h b/TAO_IDL/include/ast_home.h
index df69e21c001..6a94d995f51 100644
--- a/TAO_IDL/include/ast_home.h
+++ b/TAO_IDL/include/ast_home.h
@@ -31,10 +31,11 @@ public:
   // Extend lookup to the supported interfaces.
   virtual AST_Decl *look_in_supported (UTL_ScopedName *e,
                                        bool full_def_only);
-     
-  // Overridden for homes from the UTL_Scope method.                                     
+
+  // Overridden for homes from the UTL_Scope method.
   virtual AST_Decl *special_lookup (UTL_ScopedName *,
-                                    bool full_def_only);
+                                    bool full_def_only,
+                                    AST_Decl *&final_parent_decl);
 
   // Accessors.
 
@@ -48,6 +49,8 @@ public:
 
   AST_Type *primary_key (void) const;
 
+  void transfer_scope_elements (AST_Interface *dst);
+
   // Cleanup function.
   virtual void destroy (void);
 
@@ -63,10 +66,10 @@ public:
   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;
 
diff --git a/TAO_IDL/include/ast_interface.h b/TAO_IDL/include/ast_interface.h
index 6dbf5be957d..c688884cfbe 100644
--- a/TAO_IDL/include/ast_interface.h
+++ b/TAO_IDL/include/ast_interface.h
@@ -123,7 +123,7 @@ public:
   // Accessors for the member.
   bool home_equiv (void) const;
   void home_equiv (bool val);
-  
+
   // Accessors for the member.
   AST_InterfaceFwd *fwd_decl (void) const;
   void fwd_decl (AST_InterfaceFwd *node);
@@ -131,7 +131,7 @@ public:
   // Look through inherited interfaces.
   virtual AST_Decl *look_in_inherited (UTL_ScopedName *e,
                                        bool full_def_only);
-                                       
+
   AST_Decl *look_in_inherited_local (Identifier *e,
                                      bool full_def_only = false);
 
@@ -146,11 +146,12 @@ public:
   // a primary key. Overridden for valuetype, struct, sequence,
   // union, array, typedef, and interface.
   virtual bool legal_for_primary_key (void) const;
-  
+
   virtual AST_Decl *special_lookup (UTL_ScopedName *e,
-                                    bool full_def_only);
-       
-  /// Accessors for the members.                                  
+                                    bool full_def_only,
+                                    AST_Decl *&final_parent_decl);
+
+  /// Accessors for the members.
   AST_Interface *ami_handler (void) const;
   void ami_handler (AST_Interface *handler);
   AST_Interface *ami4ccm_uses (void) const;
@@ -201,12 +202,12 @@ protected:
 
   // Are we the equivalent interface of a home?
   bool home_equiv_;
-  
+
   // The forward declaration we may have been created from.
   AST_InterfaceFwd *fwd_decl_;
-  
+
   // Must keep these base interface placeholders in a separate
-  // container, so they can be destroyed. Iterating over 
+  // container, so they can be destroyed. Iterating over
   // pd_inherits won't work because the real interfaces will
   // probably already be destroyed and the pointers will be
   // garbage.
@@ -214,7 +215,7 @@ protected:
 
   /// Do we have both abstract and concrete parents?
   int has_mixed_parentage_;
-  
+
   /// Store here for quick retrieval without an AST lookup.
   AST_Interface *ami_handler_;
   AST_Interface *ami4ccm_uses_;
diff --git a/TAO_IDL/include/ast_interface_fwd.h b/TAO_IDL/include/ast_interface_fwd.h
index 91e9591d7dc..887bcd68777 100644
--- a/TAO_IDL/include/ast_interface_fwd.h
+++ b/TAO_IDL/include/ast_interface_fwd.h
@@ -89,7 +89,7 @@ public:
   virtual bool is_local (void);
   virtual bool is_valuetype (void);
   virtual bool is_abstract_valuetype (void);
-  
+
   bool full_def_seen (void);
 
   // Cleanup function.
@@ -118,7 +118,7 @@ public:
 private:
   AST_Interface *pd_full_definition;
   // The interface this is a forward declaration of.
-  
+
   bool is_defined_;
   // Checking the member above isn't good enough.
 };
diff --git a/TAO_IDL/include/ast_mirror_port.h b/TAO_IDL/include/ast_mirror_port.h
index 60d926ecc33..9f2a280c6af 100644
--- a/TAO_IDL/include/ast_mirror_port.h
+++ b/TAO_IDL/include/ast_mirror_port.h
@@ -15,7 +15,7 @@ public:
     AST_PortType *porttype_ref);
 
   virtual ~AST_Mirror_Port (void);
-  
+
   // Cleanup function.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/include/ast_module.h b/TAO_IDL/include/ast_module.h
index 91c6b48ea5a..12e2e23e434 100644
--- a/TAO_IDL/include/ast_module.h
+++ b/TAO_IDL/include/ast_module.h
@@ -76,6 +76,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // enums are inserted in the enclosing scope.
 
 class AST_Template_Module_Inst;
+class AST_Template_Module_Ref;
 
 class TAO_IDL_FE_Export AST_Module : public virtual AST_Decl,
                                      public virtual UTL_Scope
@@ -128,18 +129,24 @@ public:
   // Called to look up some declaration
   // in a previous opening of this module.
   AST_Decl *look_in_prev_mods (UTL_ScopedName *e,
-                               bool full_def_only = false);
+                               bool full_def_only,
+                               AST_Decl *&final_parent_decl);
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-  
+
   // Accessors for the member.
   AST_Template_Module_Inst *from_inst (void) const;
   void from_inst (AST_Template_Module_Inst *node);
 
+  // Accessors for the member.
+  AST_Template_Module_Ref *from_ref (void) const;
+  void from_ref (AST_Template_Module_Ref *node);
+
   // Override that looks in previous openings.
   virtual AST_Decl *special_lookup (UTL_ScopedName *e,
-                                    bool full_def_only);
+                                    bool full_def_only,
+                                    AST_Decl *&final_parent_decl);
 
   // We actually want to match the LAST module found in
   // the scope being searched not the FIRST one in the
@@ -235,6 +242,9 @@ private: // Data
 
   AST_Template_Module_Inst *from_inst_;
   /// Reference to the instantiation that created us, if any.
+
+  AST_Template_Module_Ref *from_ref_;
+  /// Reference to the 'alias' type that created us, if any.
 };
 
 #endif           // _AST_MODULE_AST_MODULE_HH
diff --git a/TAO_IDL/include/ast_native.h b/TAO_IDL/include/ast_native.h
index 7b831c8f419..cf3ff280d92 100644
--- a/TAO_IDL/include/ast_native.h
+++ b/TAO_IDL/include/ast_native.h
@@ -6,7 +6,7 @@
 
 #include "ast_exception.h"
 
-// Representation of "native" IDL type. It may be used as a 
+// Representation of "native" IDL type. It may be used as a
 // return type, parameter type, or in an operation's
 // exception list. This last usage creates special problems
 // with both syntax checking and code generation. Letting
@@ -18,7 +18,7 @@ public:
   AST_Native (UTL_ScopedName *n);
 
   virtual ~AST_Native (void);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/include/ast_porttype.h b/TAO_IDL/include/ast_porttype.h
index a4ae64ffc2b..7b810151039 100644
--- a/TAO_IDL/include/ast_porttype.h
+++ b/TAO_IDL/include/ast_porttype.h
@@ -37,12 +37,12 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   static AST_Decl::NodeType const NT;
-  
+
 protected:
   virtual AST_Provides *fe_add_provides (AST_Provides *p);
 
   virtual AST_Uses *fe_add_uses (AST_Uses *p);
-  
+
   virtual AST_Attribute *fe_add_attribute (AST_Attribute *a);
 };
 
diff --git a/TAO_IDL/include/ast_publishes.h b/TAO_IDL/include/ast_publishes.h
index a6208a1f59f..483c59ad755 100644
--- a/TAO_IDL/include/ast_publishes.h
+++ b/TAO_IDL/include/ast_publishes.h
@@ -13,9 +13,9 @@ class TAO_IDL_FE_Export AST_Publishes : public virtual AST_Field
 public:
   AST_Publishes (UTL_ScopedName *n,
                  AST_Type *publishes_type);
-            
+
   virtual ~AST_Publishes (void);
-  
+
   // Data Accessor.
   AST_Type *publishes_type (void) const;
 
@@ -27,7 +27,7 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/include/ast_sequence.h b/TAO_IDL/include/ast_sequence.h
index f0a9e7dfedb..dee65422b5e 100644
--- a/TAO_IDL/include/ast_sequence.h
+++ b/TAO_IDL/include/ast_sequence.h
@@ -99,11 +99,11 @@ public:
   // a primary key. Overridden for valuetype, struct, sequence,
   // union, array, typedef, and interface.
   virtual bool legal_for_primary_key (void) const;
-  
+
   // Is the element type a forward declared struct or union
   // that hasn't yet been fully defined?
   virtual bool is_defined (void);
-  
+
   // Cleanup method.
   virtual void destroy (void);
 
@@ -129,7 +129,7 @@ private:
 
   bool unbounded_;
   // Whether we are bounded or unbounded.
-  
+
   bool owns_base_type_;
   // If our base type is anonymous array or sequence, we're
   // responsible for destroying it.
diff --git a/TAO_IDL/include/ast_structure.h b/TAO_IDL/include/ast_structure.h
index 7539b64c5a7..e61c09fb52e 100644
--- a/TAO_IDL/include/ast_structure.h
+++ b/TAO_IDL/include/ast_structure.h
@@ -137,7 +137,7 @@ public:
   // a primary key. Overridden for valuetype, struct, sequence,
   // union, array, typedef, and interface.
   virtual bool legal_for_primary_key (void) const;
-  
+
   // Accessors for the member.
   AST_StructureFwd *fwd_decl (void) const;
   void fwd_decl (AST_StructureFwd *node);
@@ -150,7 +150,7 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-  
+
   // Accessor for the member.
   ACE_Unbounded_Queue<AST_Field *> &fields (void);
 
@@ -188,7 +188,7 @@ private:
 
   int local_struct_;
   // We also need to determine whether we contain any local type.
-  
+
   AST_StructureFwd *fwd_decl_;
   // The forward declaration we may have been created from.
 };
diff --git a/TAO_IDL/include/ast_structure_fwd.h b/TAO_IDL/include/ast_structure_fwd.h
index 6315e24ce2e..25bfbbdcaa5 100644
--- a/TAO_IDL/include/ast_structure_fwd.h
+++ b/TAO_IDL/include/ast_structure_fwd.h
@@ -49,7 +49,7 @@ public:
 private:
   AST_Structure *pd_full_definition;
   // The structure this is a forward declaration of.
-  
+
   bool is_defined_;
   // Checking the member above isn't good enough.
 };
diff --git a/TAO_IDL/include/ast_template_module.h b/TAO_IDL/include/ast_template_module.h
index 41a51e9fda1..d271accf7c8 100644
--- a/TAO_IDL/include/ast_template_module.h
+++ b/TAO_IDL/include/ast_template_module.h
@@ -21,10 +21,10 @@ public:
 
   FE_Utils::T_PARAMLIST_INFO *
   template_params (void) const;
-  
+
   // Checks for errors in the template args of an instantiation.
   bool match_arg_names (FE_Utils::T_ARGLIST *args);
-  
+
   // Checks for errors in the template param refs of an alias.
   bool match_param_refs (UTL_StrList *refs, UTL_Scope *decl_scope);
 
@@ -50,15 +50,15 @@ public:
 
 protected:
   FE_Utils::T_PARAMLIST_INFO * template_params_;
-  
+
 private:
   // Match with a template arg.
   bool match_one_param (FE_Utils::T_Param_Info *param,
                         AST_Decl *d);
-   
-  // Find one of our params by name.                       
+
+  // Find one of our params by name.
   FE_Utils::T_Param_Info *find_param (UTL_String *name);
-  
+
   // Match a param with an aliased id by type.
   bool match_param_by_type (FE_Utils::T_Param_Info *param);
 };
diff --git a/TAO_IDL/include/ast_template_module_inst.h b/TAO_IDL/include/ast_template_module_inst.h
index ebe5e3c0d6c..431efa333dd 100644
--- a/TAO_IDL/include/ast_template_module_inst.h
+++ b/TAO_IDL/include/ast_template_module_inst.h
@@ -18,18 +18,18 @@ public:
                             FE_Utils::T_ARGLIST *template_args);
 
   virtual ~AST_Template_Module_Inst (void);
-  
+
   AST_Template_Module *ref (void) const;
 
-  FE_Utils::T_ARGLIST *
+  FE_Utils::T_ARGLIST const *
   template_args (void) const;
-  
+
   // Narrowing.
   DEF_NARROW_FROM_DECL (AST_Template_Module_Inst);
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
-  
+
   // Cleanup function.
   virtual void destroy (void);
 
@@ -37,7 +37,7 @@ public:
   virtual int ast_accept (ast_visitor *visitor);
 
   static AST_Decl::NodeType const NT;
-  
+
 private:
   FE_Utils::T_ARGLIST * template_args_;
 };
diff --git a/TAO_IDL/include/ast_template_module_ref.h b/TAO_IDL/include/ast_template_module_ref.h
index d00cd3509b6..7543d7df08d 100644
--- a/TAO_IDL/include/ast_template_module_ref.h
+++ b/TAO_IDL/include/ast_template_module_ref.h
@@ -21,7 +21,7 @@ public:
 
   AST_Template_Module *ref (void) const;
 
-  UTL_StrList const * param_refs (void) const;
+  UTL_StrList *param_refs (void) const;
 
   // Narrowing.
   DEF_NARROW_FROM_DECL (AST_Template_Module_Ref);
@@ -43,10 +43,18 @@ public:
   // adjustment we return no match.
   virtual AST_Decl *adjust_found (bool ignore_fwd, bool full_def_only);
 
+  /// Accessors for the member.
+  bool processed (void) const;
+  void processed (bool val);
+
   static AST_Decl::NodeType const NT;
 
 private:
-  UTL_StrList * param_refs_;
+  UTL_StrList *param_refs_;
+
+  /// Flag to prevent multiple module creations when we encounter
+  /// 'chained' alias declarations.
+  bool processed_;
 };
 
 #endif           // AST_TEMPLATE_MODULE_REF_H
diff --git a/TAO_IDL/include/ast_type.h b/TAO_IDL/include/ast_type.h
index 1e77d023486..e4071cf9e49 100644
--- a/TAO_IDL/include/ast_type.h
+++ b/TAO_IDL/include/ast_type.h
@@ -96,7 +96,8 @@ public:
   virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Determine if we are involved in some kind of limited recursion.
   // Most types cannot be involved except structs and unions.
-  // If the parameter is 0, we are trying to determine this for ourselves.
+  // The head element of the list the possibly recursed type we are checking for.
+  // If the list is empty, we are trying to determine this for ourselves.
 
   virtual void size_type (SIZE_TYPE);
   // Set the size type.
diff --git a/TAO_IDL/include/ast_union.h b/TAO_IDL/include/ast_union.h
index 9be71f68e60..fb2927c4760 100644
--- a/TAO_IDL/include/ast_union.h
+++ b/TAO_IDL/include/ast_union.h
@@ -145,7 +145,7 @@ protected:
 
   virtual AST_UnionBranch *fe_add_union_branch (AST_UnionBranch *b);
   // Moved out of private section so it can be called from subclass.
-  
+
 private:
   // Data.
 
@@ -174,7 +174,7 @@ private:
 
   friend int tao_yyparse (void);
   friend class ast_visitor_tmpl_module_inst;
-  
+
   // Scope Management Protocol.
 
   virtual AST_Union *fe_add_union (AST_Union *u);
diff --git a/TAO_IDL/include/ast_union_branch.h b/TAO_IDL/include/ast_union_branch.h
index 55f74848e89..3310ffb4238 100644
--- a/TAO_IDL/include/ast_union_branch.h
+++ b/TAO_IDL/include/ast_union_branch.h
@@ -88,15 +88,15 @@ public:
   virtual ~AST_UnionBranch (void);
 
   UTL_LabelList *labels (void) const;
-  
+
   AST_UnionLabel *label (unsigned long index = 0);
 
   unsigned long label_list_length (void);
-  
+
   // Called if our labels are enum values - adds them to the
   // enclosing scope's name_referenced list.
   void add_labels (AST_Union *u);
-  
+
   // Integer literals create a ulonglong AST_Expression. If
   // our union's discriminator type is some other kind of
   // integer, and we have more than one label, only the first
@@ -113,7 +113,7 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/include/ast_union_label.h b/TAO_IDL/include/ast_union_label.h
index ac25a7ca945..33df6970673 100644
--- a/TAO_IDL/include/ast_union_label.h
+++ b/TAO_IDL/include/ast_union_label.h
@@ -82,7 +82,7 @@ public:
   enum UnionLabel
     {
         UL_default
-      , UL_label 
+      , UL_label
     };
 
   AST_UnionLabel (UnionLabel lk,
@@ -99,7 +99,7 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/include/ast_uses.h b/TAO_IDL/include/ast_uses.h
index 0d3b7f00eba..5de26d74997 100644
--- a/TAO_IDL/include/ast_uses.h
+++ b/TAO_IDL/include/ast_uses.h
@@ -12,9 +12,9 @@ public:
   AST_Uses (UTL_ScopedName *n,
             AST_Type *uses_type,
             bool is_multiple);
-            
+
   virtual ~AST_Uses (void);
-  
+
   // Data Accessors.
   AST_Type *uses_type (void) const;
   bool is_multiple (void) const;
@@ -27,12 +27,12 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
   static AST_Decl::NodeType const NT;
-  
+
 private:
   bool is_multiple_;
 };
diff --git a/TAO_IDL/include/ast_valuebox.h b/TAO_IDL/include/ast_valuebox.h
index 450d42c29b6..77213527a0b 100644
--- a/TAO_IDL/include/ast_valuebox.h
+++ b/TAO_IDL/include/ast_valuebox.h
@@ -11,12 +11,12 @@ class TAO_IDL_FE_Export AST_ValueBox :  public virtual AST_ConcreteType
 public:
   AST_ValueBox (UTL_ScopedName *n,
                 AST_Type       *boxed_type);
-  
+
   virtual ~AST_ValueBox (void);
 
   // Data Accessors.
   AST_Type            *boxed_type (void) const;
-   
+
   // Narrowing.
   DEF_NARROW_FROM_DECL(AST_ValueBox);
 
@@ -25,7 +25,7 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/include/ast_valuetype.h b/TAO_IDL/include/ast_valuetype.h
index 35ea20f10ae..e65b495dc23 100644
--- a/TAO_IDL/include/ast_valuetype.h
+++ b/TAO_IDL/include/ast_valuetype.h
@@ -48,10 +48,11 @@ public:
   // Look up a scoped name in the supported interface list.
   virtual AST_Decl *look_in_supported (UTL_ScopedName *,
                                        bool full_def_only);
-    
+
   // Overridden for valuetype from UTL_Scope method.
   virtual AST_Decl *special_lookup (UTL_ScopedName *,
-                                    bool full_def_only);
+                                    bool full_def_only,
+                                    AST_Decl *&final_parent_decl);
 
   // Recursively called on valuetype to check for legal use as
   // a primary key. Overridden for valuetype, struct, sequence,
diff --git a/TAO_IDL/include/ast_visitor.h b/TAO_IDL/include/ast_visitor.h
index ceb9ef5a7b8..fdad96a9445 100644
--- a/TAO_IDL/include/ast_visitor.h
+++ b/TAO_IDL/include/ast_visitor.h
@@ -139,7 +139,7 @@ public:
   virtual int visit_root (AST_Root *node) = 0;
   virtual int visit_native (AST_Native *node) = 0;
   virtual int visit_valuebox (AST_ValueBox *node) = 0;
-  
+
 protected:
   // For abstract class.
   ast_visitor (void);
diff --git a/TAO_IDL/include/ast_visitor_context.h b/TAO_IDL/include/ast_visitor_context.h
index dbab0020f3a..f24026d529e 100644
--- a/TAO_IDL/include/ast_visitor_context.h
+++ b/TAO_IDL/include/ast_visitor_context.h
@@ -36,14 +36,14 @@ public:
 
   FE_Utils::T_PARAMLIST_INFO *template_params (void) const;
   void template_params (FE_Utils::T_PARAMLIST_INFO *args);
-  
-  FE_Utils::T_ARGLIST *template_args (void) const;
-  void template_args (FE_Utils::T_ARGLIST *args);
 
-protected:  
+  FE_Utils::T_ARGLIST const *template_args (void) const;
+  void template_args (FE_Utils::T_ARGLIST const *args);
+
+protected:
   // Storage for the current template module params and args.
   FE_Utils::T_PARAMLIST_INFO *template_params_;
-  FE_Utils::T_ARGLIST *template_args_;
+  FE_Utils::T_ARGLIST const *template_args_;
 };
 
 #endif /* AST_VISITOR_CONTEXT_H */
diff --git a/TAO_IDL/include/ast_visitor_tmpl_module_inst.h b/TAO_IDL/include/ast_visitor_tmpl_module_inst.h
index fbe95c55a63..2cdbd402856 100644
--- a/TAO_IDL/include/ast_visitor_tmpl_module_inst.h
+++ b/TAO_IDL/include/ast_visitor_tmpl_module_inst.h
@@ -94,32 +94,36 @@ public:
   virtual int visit_field (AST_Field *node);
   virtual int visit_factory (AST_Factory *node);
   virtual int visit_finder (AST_Finder *node);
-  
+
+protected:
+  // Store for passing on to subsequent create modules.
+  AST_Template_Module_Inst *tmi_;
+
 private:
   // If arg is a param holder, return the matching template arg,
   // otherwise return arg unchanged. If the arg is declared in
   // the scope of a template module, the returned node will be a
   // copy created in the scope of the template module instantiation.
   AST_Decl *reify_type (AST_Decl *d);
-  
+
   // Utility method used for attributes and operations.
   UTL_ExceptList *reify_exception_list (UTL_ExceptList *orig);
-  
+
   // Utility method to create a NameList from a list of inherited
   // or supported types that may contain a template param ref.
   UTL_NameList *create_name_list (AST_Type **list, long length);
-  
+
 private:
   ast_visitor_context *ctx_;
 
   // Flag to branch in visit_valuetype() where we create an
   // 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_IDL/include/ast_visitor_tmpl_module_ref.h b/TAO_IDL/include/ast_visitor_tmpl_module_ref.h
index efd09595c90..f93ca55bcd2 100644
--- a/TAO_IDL/include/ast_visitor_tmpl_module_ref.h
+++ b/TAO_IDL/include/ast_visitor_tmpl_module_ref.h
@@ -20,19 +20,15 @@
 
 #include "ast_visitor_tmpl_module_inst.h"
 
+/**
+ * Adds implied IDL code to the AST related to the
+ * alias of a template module. This class reuses all
+ * the methods from the base class except the no-op
+ * visit_template_module_ref(), which it overrides.
+ */
 class ast_visitor_tmpl_module_ref
   : public ast_visitor_tmpl_module_inst
 {
-  //
-  // = TITLE
-  //   ast_visitor_tmpl_module_ref
-  //
-  // = DESCRIPTION
-  //   Adds implied IDL code to the AST related to the
-  //   alias of a template module. This class reuses all
-  //   the methods from the base class except the no-op
-  //   visit_template_module_ref(), which it overrides.
-  //
 public:
   ast_visitor_tmpl_module_ref (ast_visitor_context *ctx);
 
diff --git a/TAO_IDL/include/drv_extern.h b/TAO_IDL/include/drv_extern.h
index 0b38dcd2ac3..57697e78af7 100644
--- a/TAO_IDL/include/drv_extern.h
+++ b/TAO_IDL/include/drv_extern.h
@@ -67,9 +67,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _DRV_EXTERN_DRV_EXTERN_HH
 #define _DRV_EXTERN_DRV_EXTERN_HH
 
-// The ACE_Process_Options default size of 1024 is sometimes not enough.
-const unsigned long TAO_IDL_COMMAND_LINE_BUFFER_SIZE = 8 * 1024;
-
 // External functions for the IDL compiler driver program.
 extern void DRV_parse_args (long, char **);
 extern void DRV_usage (void);
diff --git a/TAO_IDL/include/fe_home_header.h b/TAO_IDL/include/fe_home_header.h
index ea5b5eeed90..7f276821639 100644
--- a/TAO_IDL/include/fe_home_header.h
+++ b/TAO_IDL/include/fe_home_header.h
@@ -24,7 +24,7 @@ public:
                  UTL_NameList *supports,
                  UTL_ScopedName *managed_component,
                  UTL_ScopedName *primary_key);
-                 
+
   virtual ~FE_HomeHeader (void);
 
   // Data Accessors.
diff --git a/TAO_IDL/include/fe_interface_header.h b/TAO_IDL/include/fe_interface_header.h
index c56843d00ec..2e332ddd936 100644
--- a/TAO_IDL/include/fe_interface_header.h
+++ b/TAO_IDL/include/fe_interface_header.h
@@ -122,9 +122,9 @@ protected:
   void add_inheritance_flat (AST_Interface *i);
   bool already_seen (AST_Type *ip);
   bool already_seen_flat (AST_Interface *ip);
-  
+
   void install_in_header (void);
-  
+
   void destroy_flat_arrays (void);
 
   // Data.
diff --git a/TAO_IDL/include/fe_obv_header.h b/TAO_IDL/include/fe_obv_header.h
index 78ac265ca17..ed3b71c4886 100644
--- a/TAO_IDL/include/fe_obv_header.h
+++ b/TAO_IDL/include/fe_obv_header.h
@@ -28,7 +28,7 @@ public:
   AST_Type *inherits_concrete (void) const;
   AST_Type *supports_concrete (void) const;
   bool truncatable (void) const;
-  
+
   virtual void destroy (void);
   // Destroy anything allocated for this class.
 
diff --git a/TAO_IDL/include/fe_private.h b/TAO_IDL/include/fe_private.h
index 0c975ff65b2..405d3963619 100644
--- a/TAO_IDL/include/fe_private.h
+++ b/TAO_IDL/include/fe_private.h
@@ -76,16 +76,17 @@ struct TAO_IDL_FE_Export TAO_IDL_CPP_Keyword_Entry
   const char *mapping_;
 };
 
+/**
+ * Define a table that provides the lookup for the C++
+ * keyword. The lookup uses a perfect hash function
+ */
 class TAO_IDL_FE_Export TAO_IDL_CPP_Keyword_Table
 {
-  // = TITLE
-  //   Define a table that provides the lookup for the C++
-  //   keyword. The lookup uses a perfect hash function
 private:
-  unsigned int hash (const char *str, 
+  unsigned int hash (const char *str,
                      unsigned int len);
 public:
-  const TAO_IDL_CPP_Keyword_Entry *lookup (const char *str, 
+  const TAO_IDL_CPP_Keyword_Entry *lookup (const char *str,
                                            unsigned int len);
 };
 
diff --git a/TAO_IDL/include/fe_utils.h b/TAO_IDL/include/fe_utils.h
index 3abce8470f7..5333c4754e8 100644
--- a/TAO_IDL/include/fe_utils.h
+++ b/TAO_IDL/include/fe_utils.h
@@ -17,6 +17,7 @@ class AST_PortType;
 class AST_Enum;
 class AST_Component;
 class AST_Uses;
+class AST_Template_Module;
 
 struct TAO_IDL_FE_Export FE_Utils
 {
@@ -65,7 +66,7 @@ struct TAO_IDL_FE_Export FE_Utils
   create_uses_multiple_stuff (AST_Component *c,
                               AST_Uses *u,
                               const char *prefix = "");
-  
+
   /// For the executor IDL file, when a pragma ciao ami receptacle
   /// name is multiplex.
   static void
@@ -94,7 +95,7 @@ struct TAO_IDL_FE_Export FE_Utils
   static bool
   is_include_file_found (ACE_CString & inc_file,
                          UTL_String * idl_file_name);
-  
+
   /// Validate the included idl files, somefiles might have been
   /// ignored by the preprocessor.
   static void
@@ -107,19 +108,29 @@ struct TAO_IDL_FE_Export FE_Utils
   /// Strips _cxx_ prefix for use in port names.
   static void
   original_local_name (Identifier *local_name);
-  
+
   /// Types, constants and exceptions can be redefined in
   /// derived interfaces, modules may be reopened, forward
   /// declarations may be repeated, etc.
   static bool
   can_be_redefined (AST_Decl *prev_dec,
                     AST_Decl *curr_decl);
-  
+
+  /// Called any time there is a possible error from
+  /// referencing a decl contained in a template module,
+  /// but not via an alias.
+  static void
+  tmpl_mod_ref_check (AST_Decl *context,
+                      AST_Decl *ref);
+
 private:
   static bool
   check_one_seq_of_param (FE_Utils::T_PARAMLIST_INFO *list,
                           ACE_CString &param_id,
                           size_t index);
+
+  static AST_Template_Module *
+  get_tm_container (AST_Decl *contained);
 };
 
 #endif /* FE_UTILS_H */
diff --git a/TAO_IDL/include/idl_global.h b/TAO_IDL/include/idl_global.h
index 00c0b456cd5..ccf11aa7d1c 100644
--- a/TAO_IDL/include/idl_global.h
+++ b/TAO_IDL/include/idl_global.h
@@ -437,13 +437,13 @@ public:
 
   // = Types & methods supporting DDS DCPS data type/key definition (from #pragma)
   typedef ACE_Unbounded_Queue<ACE_TString> DCPS_Key_List;
-  
+
   struct DCPS_Data_Type_Info
   {
     UTL_ScopedName *name_;
     DCPS_Key_List   key_list_;
   };
-  
+
   typedef ACE_Unbounded_Queue_Iterator<ACE_TString> DCPS_Data_Type_Info_Iter;
 
   typedef ACE_Hash_Map_Manager_Ex< const char*,
@@ -455,22 +455,22 @@ public:
 
   // FE calls when #pragma DCPS_DATA_TYPE is processed
   void add_dcps_data_type (const char* id);
-  
+
   // FE calls when #pragma DCPS_DATA_KEY is processed
   bool add_dcps_data_key (const char* id, const char* key);
-  
+
   // returns null if not matching; otherwise pointer to the info
   DCPS_Data_Type_Info* is_dcps_type (UTL_ScopedName* target);
-  
+
   // FE calls when #pragma DCPS_SUPPORT_ZERO_COPY_READ is processed
   void dcps_support_zero_copy_read (bool value);
-  
+
   // BE calls to check the status of zero-copy read support
   bool dcps_support_zero_copy_read (void) const;
-  
+
   // FE calls when #pragma DCPS_GEN_ZERO_COPY_READ is processed
   void dcps_gen_zero_copy_read (bool value);
-  
+
   // BE calls to check the status of zero-copy read support
   bool dcps_gen_zero_copy_read (void) const;
 
@@ -607,7 +607,11 @@ public:
   void add_ciao_oci_ts_file_names (const char *s);
   ACE_Unbounded_Queue<char *> & ciao_oci_ts_file_names (void);
   // Accessor/mutator for the ciao_oci_ts_file_names_ member.
-  
+
+    void add_ciao_coredx_ts_file_names (const char *s);
+  ACE_Unbounded_Queue<char *> & ciao_coredx_ts_file_names (void);
+  // Accessor/mutator for the ciao_coredx_ts_file_names_ member.
+
   void add_ciao_ami_iface_names (const char *s);
   ACE_Unbounded_Queue<char *> & ciao_ami_iface_names (void);
   // Accessor/mutator for the ciao_ami_iface_names_ member.
@@ -615,25 +619,22 @@ public:
   void add_ciao_ami_recep_names (const char *s);
   ACE_Unbounded_Queue<char *> & ciao_ami_recep_names (void);
   // Accessor/mutator for the ciao_ami_recep_names_ member.
-  
+
   void add_included_ami_recep_names (const char *s);
   ACE_Unbounded_Queue<char *> & included_ami_recep_names (void);
   // Accessor/mutator for the included_ami_recep_names_ member.
-  
+
   bool included_ami_receps_done (void) const;
   void included_ami_receps_done (bool val);
-  
+
   void add_ciao_ami_idl_fnames (const char *s);
   ACE_Unbounded_Queue<char *> & ciao_ami_idl_fnames (void);
   // Accessor/mutator for the included_ami_idl_fnames_ member.
-  
+
   void add_dds4ccm_impl_fnames (const char *s);
   ACE_Unbounded_Queue<char *> & dds4ccm_impl_fnames (void);
   // Accessor mutator for the dds4ccm_impl_fnames_ member.
-  
-  ACE_Unbounded_Queue<AST_Decl *> & masking_scopes (void);
-  // Accessor for the member
-  
+
   ACE_Unbounded_Queue<AST_Interface *> & mixed_parentage_interfaces (void);
   // Accessor for the member
 
@@ -688,6 +689,20 @@ public:
   // referenced template parameter of the eclosing template
   // module.
 
+  UTL_StrList const *alias_params (void) const;
+  void alias_params (UTL_StrList *params);
+  // Accessors for the member. If we are parsing a template
+  // module reference, we traverse the scope of the referenced
+  // template module, but create param holders with the
+  // alias names.
+
+  UTL_StrList const *for_new_holder (void) const;
+  void for_new_holder (UTL_StrList *params);
+  // Accessors for the member. If a lookup matches something
+  // from current_params(), the actual created param holder must
+  // match the corresponding element on this list, if it is
+  // non-zero.
+
 #if defined (ACE_OPENVMS)
   static char* translateName (const char* name, char *name_buf);
 #endif
@@ -706,10 +721,10 @@ public:
     Unbounded_Paths_Queue;
   typedef ACE_Unbounded_Queue_Iterator<Include_Path_Info>
     Unbounded_Paths_Queue_Iterator;
-    
+
   Unbounded_Paths_Queue &include_paths (void);
   // Accessor for the member.
-  
+
   enum ANON_TYPE_DIAGNOSTIC
   {
     ANON_TYPE_ERROR,
@@ -718,19 +733,27 @@ public:
   };
   // Determines which type of diagnostic to emit, if any, upon
   // detecting the presence of an anonymous IDL construct.
-  
+
   void anon_type_diagnostic (ANON_TYPE_DIAGNOSTIC val);
   // Mutator for the member.
-  
-  bool anon_error (void) const; 
+
+  bool anon_error (void) const;
   bool anon_warning (void) const;
   bool anon_silent (void) const;
   // Simple checks for the value of anon_type_diagnostic_.
-  
+
   bool in_typedef (void) const;
   void in_typedef (bool val);
   // Accessors for the member.
 
+  bool in_tmpl_mod_no_alias (void) const;
+  void in_tmpl_mod_no_alias (bool val);
+  // Accessors for the member.
+
+  bool in_tmpl_mod_alias (void) const;
+  void in_tmpl_mod_alias (bool val);
+  // Accessors for the member.
+
 private:
   // Data
   UTL_ScopeStack             pd_scopes;              // Store scopes stack
@@ -850,7 +873,20 @@ private:
 
   FE_Utils::T_PARAMLIST_INFO *current_params_;
   // Stored if we are parsing the scope of a template module,
-  // 0 otherwise.
+  // 0 otherwise. Contains the params of the referenced
+  // template module if we are traversing an alias.
+
+  UTL_StrList *alias_params_;
+  // Stored if we are parsing a template module reference. The
+  // scope traversed will be that of the referenced template
+  // module, but the param holder(s) created will use the
+  // aliased names.
+
+  UTL_StrList *for_new_holder_;
+  // Stored if we are traversing an alias, this is a list of
+  // the enclosing template module's params. When we create
+  // a param holder, it will need this name rather than the
+  // name of the alias's referenced param.
 
   ACE_Unbounded_Queue<char *> ciao_lem_file_names_;
   // Files parsed with ciao lem pragma
@@ -863,44 +899,52 @@ private:
 
   ACE_Unbounded_Queue<char *> ciao_oci_ts_file_names_;
   // Files parsed with OpenDDS typesupport pragma
-  
+
+  ACE_Unbounded_Queue<char *> ciao_coredx_ts_file_names_;
+  // Files parsed with CoreDX typesupport pragma
+
   ACE_Unbounded_Queue<char *> ciao_ami_iface_names_;
   // Interfaces that get a reply handler generated for AMI4CCM.
-  
+
   ACE_Unbounded_Queue<char *> ciao_ami_recep_names_;
   // Receptacles that get a sendc_ version added for AMI4CCM.
-  
+
   ACE_Unbounded_Queue<char *> included_ami_recep_names_;
   // We need to do something different with these...
-  
+
   bool included_ami_receps_done_;
   // ...but we need to do it only once.
-  
+
   ACE_Unbounded_Queue<char *> ciao_ami_idl_fnames_;
   // Stores directives from #pragma ciao ami4ccm idl "xxx".
-  
+
   ACE_Unbounded_Queue<char *> dds4ccm_impl_fnames_;
   // Stores directives from #pragma dds4ccm impl "xxx".
-  
-  ACE_Unbounded_Queue<AST_Decl *> masking_scopes_;
-  // Used to check for an incorrect lookup success that should
-  // have been masked by an inner scope of the same name.
-  
+
   /**
    * 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<AST_Interface *> mixed_parentage_interfaces_;
-  
+
   /// For quick access.
   AST_Module *corba_module_;
-  
+
   ANON_TYPE_DIAGNOSTIC anon_type_diagnostic_;
-  
+
   /// Flag set in parser so we can decide whether to emit
   /// an anonymous type diagnostic.
   bool in_typedef_;
+
+  /// Used during AST creation, corresponding flag in each
+  /// AST_Decl created is set to this flag's value.
+  bool in_tmpl_mod_no_alias_;
+
+  /// Disables the error check faciliated by the above flag.
+  /// No errors are possible because created nodes are all
+  /// implied IDL.
+  bool in_tmpl_mod_alias_;
 };
 
 #endif  //_IDL_IDL_GLOBAL_HH
diff --git a/TAO_IDL/include/utl_decllist.h b/TAO_IDL/include/utl_decllist.h
index 45492f4dce7..7f0ead854c7 100644
--- a/TAO_IDL/include/utl_decllist.h
+++ b/TAO_IDL/include/utl_decllist.h
@@ -86,7 +86,7 @@ public:
   // Operations
 
   // Constructor(s)
-  UTL_DeclList (FE_Declarator *s, 
+  UTL_DeclList (FE_Declarator *s,
                 UTL_DeclList *cdr);
 
   // Get element
diff --git a/TAO_IDL/include/utl_err.h b/TAO_IDL/include/utl_err.h
index 1c7ac5d3f9b..04b40186f7f 100644
--- a/TAO_IDL/include/utl_err.h
+++ b/TAO_IDL/include/utl_err.h
@@ -130,7 +130,7 @@ public:
     EIDL_ENUM_VAL_EXPECTED,     // Expected an enumerator
     EIDL_ENUM_VAL_NOT_FOUND,    // Didnt find an enumerator with that name
     EIDL_EVAL_ERROR,            // Error in evaluating expression
-    EIDL_INCOMPATIBLE_TYPE,     // Assign floating pt. to integer or vice versa
+    EIDL_INCOMPATIBLE_TYPE,     // Assign floating pt. to int or vice versa
     EIDL_AMBIGUOUS,             // Ambiguous name definition
     EIDL_DECL_NOT_DEFINED,      // Forward declared but never defined
     EIDL_FWD_DECL_LOOKUP,       // Tried to lookup in fwd declared intf
@@ -146,10 +146,11 @@ public:
     EIDL_TC_SUPPRESSION_WARNING,// -St option used with exception decl
     EIDL_ILLEGAL_BOXED_TYPE,    // Valuetype not allowed for box value type
     EIDL_ILLEGAL_PRIMARY_KEY,   // Primary key doesn't meet spec constraints
-    EIDL_MISMATCHED_T_PARAM,    // Between defined & referenced template interfaces
-    EIDL_DUPLICATE_T_PARAM,     // A template interface's param ids must be unique
+    EIDL_MISMATCHED_T_PARAM,    // Between def'd & ref'd template interfaces
+    EIDL_DUPLICATE_T_PARAM,     // A tmpl module's param ids must be unique
     EIDL_T_ARG_LENGTH,          // Wrong # of template args
     EIDL_MISMATCHED_SEQ_PARAM,  // 'sequence<T>' must match a previous param
+    EIDL_TEMPLATE_NOT_ALIASED,  // ref to tmpl module scope must be via alias
     EIDL_OK                     // No error
   };
 
@@ -364,19 +365,23 @@ public:
 
   // Referenced template parameter not matched in param list.
   void mismatched_template_param (const char *name);
-  
+
   // Given a template param of the form 'sequence<T>', the
   // 'T' must match a previous param in the list.
   void mismatch_seq_of_param (const char *param_id);
-  
+
   // Informative message when a lookup fails because a
   // masking scope has not been correctly differentiated
   // in the scoped name from the scope it masks.
   void scope_masking_error (AST_Decl *masked,
                             AST_Decl *loc);
-          
-  // Error (default) or warning (set by command line option).                        
+
+  // Error (default) or warning (set by command line option).
   void anonymous_type_diagnostic (void);
+
+  // Reference to an item in the scope of a template
+  // module was not via an alias.
+  void template_scope_ref_not_aliased (AST_Decl *d);
 };
 
 #endif           // _UTL_ERR_UTL_ERR_HH
diff --git a/TAO_IDL/include/utl_exceptlist.h b/TAO_IDL/include/utl_exceptlist.h
index 5598f08c8c9..53e935571f4 100644
--- a/TAO_IDL/include/utl_exceptlist.h
+++ b/TAO_IDL/include/utl_exceptlist.h
@@ -82,15 +82,15 @@ class AST_Type;
 class TAO_IDL_FE_Export UTL_ExceptList : public UTL_List
 {
 public:
-  UTL_ExceptList (AST_Type *s, 
+  UTL_ExceptList (AST_Type *s,
                   UTL_ExceptList *cdr);
 
   // Get list item.
   AST_Type *head (void);
-  
+
   // Cleanup.
   virtual void destroy (void);
-  
+
   // Copies the UTL_ExceptList pointers but not the
   // contained AST_Exceptions.
   virtual UTL_ExceptList *copy (void);
diff --git a/TAO_IDL/include/utl_exprlist.h b/TAO_IDL/include/utl_exprlist.h
index 4b8108bbb58..4220a0e9008 100644
--- a/TAO_IDL/include/utl_exprlist.h
+++ b/TAO_IDL/include/utl_exprlist.h
@@ -82,7 +82,7 @@ class AST_Expression;
 class TAO_IDL_FE_Export UTL_ExprList : public UTL_List
 {
 public:
-  UTL_ExprList (AST_Expression *s, 
+  UTL_ExprList (AST_Expression *s,
                 UTL_ExprList *cdr);
 
   // Get list item.
diff --git a/TAO_IDL/include/utl_idlist.h b/TAO_IDL/include/utl_idlist.h
index 626a909a5e7..e66ddc6efd1 100644
--- a/TAO_IDL/include/utl_idlist.h
+++ b/TAO_IDL/include/utl_idlist.h
@@ -131,8 +131,8 @@ class TAO_IDL_FE_Export UTL_IdListActiveIterator
 public:
   UTL_IdListActiveIterator (UTL_IdList *s);
 
+  /// Retrieves the next item.
   Identifier *item (void);
-  // Retrieves the next item.
 };
 
 #endif          // _UTL_IDLIST_UTL_IDLIST_HH
diff --git a/TAO_IDL/include/utl_labellist.h b/TAO_IDL/include/utl_labellist.h
index 1c365b59cfb..24e5c76e9ed 100644
--- a/TAO_IDL/include/utl_labellist.h
+++ b/TAO_IDL/include/utl_labellist.h
@@ -82,15 +82,15 @@ class AST_UnionLabel;
 class TAO_IDL_FE_Export UTL_LabelList : public UTL_List
 {
 public:
-  UTL_LabelList (AST_UnionLabel *s, 
+  UTL_LabelList (AST_UnionLabel *s,
                  UTL_LabelList *cdr);
 
   // Get list item.
   AST_UnionLabel *head (void);
-  
+
   // Override of base class method.
   virtual UTL_LabelList *copy (void);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/include/utl_namelist.h b/TAO_IDL/include/utl_namelist.h
index 275e442f47b..e36ac200319 100644
--- a/TAO_IDL/include/utl_namelist.h
+++ b/TAO_IDL/include/utl_namelist.h
@@ -89,7 +89,7 @@ public:
   // Accessors.
   bool truncatable (void) const;
   void truncatable (bool val);
-  
+
   // Cleanup.
   virtual void destroy (void);
 
diff --git a/TAO_IDL/include/utl_scope.h b/TAO_IDL/include/utl_scope.h
index 82886e43d20..4d2bdbfb9b3 100644
--- a/TAO_IDL/include/utl_scope.h
+++ b/TAO_IDL/include/utl_scope.h
@@ -179,10 +179,14 @@ public:
   AST_Decl *lookup_by_name (UTL_ScopedName *,
                             bool full_def_only = false,
                             bool for_add = true);
-                            
+
   AST_Decl *lookup_by_name_r (UTL_ScopedName *,
                               bool full_def_only);
 
+  AST_Decl *lookup_by_name_r (UTL_ScopedName *,
+                              bool full_def_only,
+                              AST_Decl *&final_parent_decl);
+
   // Look up the Identifier * specified only in the local scope.
   AST_Decl *lookup_by_name_local (Identifier *,
                                   bool full_def_only = false);
@@ -195,21 +199,22 @@ public:
 
   virtual AST_Decl *look_in_prev_mods_local (Identifier *e,
                                              bool ignore_fwd = false);
-     
+
   // A no-op here, overridden for types like interface
-  // (look_in_inherited), modules (look_in_prev_mods) etc.                                     
+  // (look_in_inherited), modules (look_in_prev_mods) etc.
   virtual AST_Decl *special_lookup (UTL_ScopedName *e,
-                                    bool ful_def_only);
+                                    bool ful_def_only,
+                                    AST_Decl *&final_parent_decl);
 
   // How many entries are used?
   virtual unsigned long nmembers (void);
 
   // If the Identifier string (from the scoped name which has been
   // already determined to be of length 1) matches a param,
-  // create and return a param holder AST node, otherwise 
+  // create and return a param holder AST node, otherwise
   // return 0.
   static AST_Param_Holder *match_param (UTL_ScopedName *e);
-  
+
   // Add to decls. Node represents a local declaration
   // The new decl e is inserted after ex if ex is not 0.
   // This one is public because the case of a reopened
@@ -284,7 +289,7 @@ protected:
   void check_for_predef_seq (AST_Decl *d);
   // Set the appropriate *_seen_ flag if we are seeing a spec-defined
   // sequence of a basic type.
-  
+
 protected:
   // Data.
 
@@ -316,7 +321,7 @@ protected:
 
   // Have we seen a #pragma prefix declaration in this scope?
   bool has_prefix_;
-  
+
   // Used in lookup of various CORBA pseudo objects, which also
   // determines generation of specific #include headers.
   enum WHICH_PSEUDO
@@ -326,37 +331,37 @@ protected:
     PSEUDO_VALUEBASE,
     PSEUDO_ABSTRACTBASE
   };
-  
+
   WHICH_PSEUDO which_pseudo_;
-  
+
 public:
   /// 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.
-  
+
   virtual
   AST_PredefinedType *fe_add_predefined_type (
     AST_PredefinedType *t);
 
   virtual
   AST_Module *fe_add_module (AST_Module *m);
-  
+
   virtual
   AST_Template_Module_Inst *fe_add_template_module_inst (
     AST_Template_Module_Inst *m);
@@ -457,7 +462,7 @@ public:
 
   virtual
   AST_Factory *fe_add_factory (AST_Factory *f);
-  
+
   virtual
   AST_Finder *fe_add_finder (AST_Finder *f);
 
@@ -487,7 +492,7 @@ public:
 
   virtual
   AST_Mirror_Port *fe_add_mirror_port (AST_Mirror_Port *mp);
-  
+
 protected:
   /// Quick check on the head of a name to see if it's global.
   bool is_global_name (Identifier *i);
@@ -497,11 +502,11 @@ private:
   /// (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);
-  
+
   /// Helper function for lookup_by_name(). Iterates doing local
   /// lookups of subsequent components of a scoped name.
   AST_Decl *
diff --git a/TAO_IDL/include/utl_strlist.h b/TAO_IDL/include/utl_strlist.h
index a00d3f15325..1229cbe1a00 100644
--- a/TAO_IDL/include/utl_strlist.h
+++ b/TAO_IDL/include/utl_strlist.h
@@ -83,7 +83,7 @@ class UTL_String;
 class TAO_IDL_FE_Export UTL_StrList : public UTL_List
 {
 public:
-  UTL_StrList (UTL_String *s, 
+  UTL_StrList (UTL_String *s,
                UTL_StrList *cdr);
 
   virtual ~UTL_StrList (void);
diff --git a/TAO_IDL/tao_idl.cpp b/TAO_IDL/tao_idl.cpp
index 514bda44ac8..2125f730f01 100644
--- a/TAO_IDL/tao_idl.cpp
+++ b/TAO_IDL/tao_idl.cpp
@@ -198,7 +198,7 @@ DRV_drive (const char *s)
   UTL_String *utl_string = 0;
   ACE_NEW (utl_string,
            UTL_String (s, true));
-           
+
   idl_global->idl_src_file (utl_string);
 
   // Pass through CPP.
@@ -376,7 +376,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       // Does various things in various backends.
       BE_post_init (DRV_files, DRV_nfiles);
-      
+
       FILE *output_file = 0;
 
       if (idl_global->multi_file_input ())
@@ -400,7 +400,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
               DRV_drive (DRV_files[DRV_file_index]);
             }
         }
-        
+
       if (idl_global->multi_file_input ())
         {
           ACE_OS::fclose (output_file);
diff --git a/TAO_IDL/tao_idl.mpc b/TAO_IDL/tao_idl.mpc
index 0b023ae1f41..eb639ab384f 100644
--- a/TAO_IDL/tao_idl.mpc
+++ b/TAO_IDL/tao_idl.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-cr
 // $Id$
 
-project(TAO_IDL_EXE) : aceexe, install, tao_output, crosscompile, tao_idl_fe {
+project(TAO_IDL_EXE) : aceexe, install, tao_output, tao_idl_fe {
   exename      = tao_idl
   libs        += TAO_IDL_BE
   exeout       = $(ACE_ROOT)/bin
@@ -36,8 +36,10 @@ project(TAO_IDL_EXE) : aceexe, install, tao_output, crosscompile, tao_idl_fe {
   }
 
   verbatim(gnuace, postinstall) {
-"	@$(MKDIR) $(INSTALL_PREFIX)/share/ace/bin"
-"	ln -sf $(INSTALL_PREFIX)/bin/tao_idl $(INSTALL_PREFIX)/share/ace/bin"
+"	@$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
+"	ln -sf $(INSTALL_PREFIX)/bin/tao_idl $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
+"	@$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/$(INSTALL_LIB)"
+"	ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_[FB]E.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/$(INSTALL_LIB)"
   }
 
   Source_Files {
diff --git a/TAO_IDL/tao_idl_be.mpc b/TAO_IDL/tao_idl_be.mpc
index 9ddc3b9f51b..cb3b1ab0aa6 100644
--- a/TAO_IDL/tao_idl_be.mpc
+++ b/TAO_IDL/tao_idl_be.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(TAO_IDL_BE) : acelib, conv_lib, tao_output, crosscompile, tao_vc8warnings, tao_idl_fe {
+project(TAO_IDL_BE) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe {
   sharedname   = TAO_IDL_BE
   dynamicflags += TAO_IDL_BE_BUILD_DLL
   includes    += $(TAO_ROOT)
@@ -15,7 +15,7 @@ project(TAO_IDL_BE) : acelib, conv_lib, tao_output, crosscompile, tao_vc8warning
   specific {
     // Override the template value for optimize.  Building the backend
     // with optimization turned on doesn't seem to work (at least not with
-    // vc6 or vc71).  This is due to the use of addresses of static objecs
+    // vc6 or vc71).  This is due to the use of addresses of static objects
     // within the code.
     optimize =
   }
diff --git a/TAO_IDL/util/utl_err.cpp b/TAO_IDL/util/utl_err.cpp
index af81e591ee9..de08a4830eb 100644
--- a/TAO_IDL/util/utl_err.cpp
+++ b/TAO_IDL/util/utl_err.cpp
@@ -183,7 +183,7 @@ error_string (UTL_Error::ErrorCode c)
     case UTL_Error::EIDL_KEYWORD_WARNING:
       return "Warning - spelling differs from IDL keyword only in case: ";
     case UTL_Error::EIDL_ANONYMOUS_ERROR:
-      return "anonymous types are deprecated by OMG spec";
+      return "Error: anonymous types are deprecated by OMG spec";
     case UTL_Error::EIDL_ANONYMOUS_WARNING:
       return "Warning - anonymous tyes are deprecated by OMG spec";
     case UTL_Error::EIDL_ENUM_VAL_EXPECTED:
@@ -232,6 +232,8 @@ error_string (UTL_Error::ErrorCode c)
       return "wrong # of template args";
     case UTL_Error::EIDL_MISMATCHED_SEQ_PARAM:
       return "no match for identifier";
+    case UTL_Error::EIDL_TEMPLATE_NOT_ALIASED:
+      return "ref to template module scope must be via alias";
   }
 
   return 0;
@@ -244,7 +246,7 @@ idl_error_header (UTL_Error::ErrorCode c,
                   ACE_CString s)
 {
   ACE_ERROR ((LM_ERROR,
-              "%C: \"%C\", line %d: %C",
+              "Error - %C: \"%C\", line %d: %C",
               idl_global->prog_name (),
               s.c_str (),
               lineno == -1 ? idl_global->lineno () : lineno,
@@ -1552,23 +1554,24 @@ UTL_Error::scope_masking_error (AST_Decl *masked,
   const char *masking_file = masking->file_name ().c_str ();
 
   ACE_ERROR ((LM_ERROR,
-              ACE_TEXT ("%C: \"%C\", line %d: Did you mean \"::%C\"\n")
+              ACE_TEXT ("Error - %C: \"%C\", line %d: ")
+              ACE_TEXT ("Did you mean \"::%C\"\n")
               ACE_TEXT ("   declared at "),
               idl_global->prog_name (),
               this_file,
               idl_global->lineno (),
               masked->full_name () ));
-              
+
   const bool same_file =
     (0 == ACE_OS::strcmp (this_file, masked_file));
-            
+
   if (!same_file)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("%C "),
                   masked_file));
     }
-    
+
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("line %d but hidden by local \""),
               masked->line ()));
@@ -1576,11 +1579,11 @@ UTL_Error::scope_masking_error (AST_Decl *masked,
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("::%C\""),
               masking->full_name ()));
-    
+
   const bool same_file_again =
     (same_file
      && 0 == ACE_OS::strcmp (this_file, masking_file));
-            
+
   if (!same_file_again)
     {
       ACE_ERROR ((LM_ERROR,
@@ -1593,11 +1596,11 @@ UTL_Error::scope_masking_error (AST_Decl *masked,
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT (" at ")));
     }
-    
+
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("line %d ?\n"),
               masking->line () ));
-}                                
+}
 
 void
 UTL_Error::anonymous_type_diagnostic (void)
@@ -1606,26 +1609,39 @@ UTL_Error::anonymous_type_diagnostic (void)
     {
       return;
     }
-    
+
   bool aw = idl_global->anon_warning ();
   bool nw = (idl_global->compile_flags () & IDL_CF_NOWARNINGS);
-  
+
   if (aw && nw)
     {
       return;
     }
-  
+
   ErrorCode ec =
     (aw ? EIDL_ANONYMOUS_WARNING : EIDL_ANONYMOUS_ERROR);
-    
+
   idl_error_header (ec,
                     idl_global->lineno (),
                     idl_global->filename ()->get_string ());
-                    
+
   ACE_ERROR ((LM_ERROR, "\n"));
-  
+
   if (ec == EIDL_ANONYMOUS_ERROR)
     {
       idl_global->set_err_count (idl_global->err_count () + 1);
     }
 }
+
+void
+UTL_Error::template_scope_ref_not_aliased (AST_Decl *d)
+{
+  idl_error_header (EIDL_TEMPLATE_NOT_ALIASED,
+                    idl_global->lineno (),
+                    d->file_name ());
+  ACE_ERROR ((LM_ERROR, " - "));
+  d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
+  ACE_ERROR ((LM_ERROR, "\n"));
+  idl_global->set_err_count (idl_global->err_count () + 1);
+}
+
diff --git a/TAO_IDL/util/utl_global.cpp b/TAO_IDL/util/utl_global.cpp
index 2f0bc4362b9..6a7fbb6f75d 100644
--- a/TAO_IDL/util/utl_global.cpp
+++ b/TAO_IDL/util/utl_global.cpp
@@ -102,7 +102,7 @@ char* IDL_GlobalData::translateName(const char* name, char *name_buf)
       ACE_OS::strcpy (name_buf, transName);
       transName = name_buf;
     }
-    
+
   return (transName == 0 || ((int)transName) == -1 ) ? 0 : transName;
 }
 #endif
@@ -150,10 +150,14 @@ IDL_GlobalData::IDL_GlobalData (void)
     multi_file_input_ (false),
     big_file_name_ ("PICML_IDL_file_bag"),
     current_params_ (0),
+    alias_params_ (0),
+    for_new_holder_ (0),
     included_ami_receps_done_ (false),
     corba_module_ (0),
-    anon_type_diagnostic_ (ANON_TYPE_SILENT),
-    in_typedef_ (false)
+    anon_type_diagnostic_ (ANON_TYPE_ERROR),
+    in_typedef_ (false),
+    in_tmpl_mod_no_alias_ (false),
+    in_tmpl_mod_alias_ (false)
 {
   // Path for the perfect hash generator(gperf) program.
   // Default is $ACE_ROOT/bin/gperf unless ACE_GPERF is defined.
@@ -206,7 +210,7 @@ IDL_GlobalData::IDL_GlobalData (void)
                        ace_root);
 #endif /* ACE_GPERF */
     }
-    
+
 #if defined (IDL_ANON_ERROR)
   this->anon_type_diagnostic_ = ANON_TYPE_ERROR;
 #elif defined (IDL_ANON_WARNING)
@@ -1122,6 +1126,18 @@ IDL_GlobalData::ciao_oci_ts_file_names (void)
 }
 
 void
+IDL_GlobalData::add_ciao_coredx_ts_file_names (const char *s)
+{
+  this->ciao_coredx_ts_file_names_.enqueue_tail (ACE::strnew (s));
+}
+
+ACE_Unbounded_Queue<char *> &
+IDL_GlobalData::ciao_coredx_ts_file_names (void)
+{
+  return this->ciao_coredx_ts_file_names_;
+}
+
+void
 IDL_GlobalData::add_ciao_ami_iface_names (const char *s)
 {
   this->ciao_ami_iface_names_.enqueue_tail (ACE::strnew (s));
@@ -1193,12 +1209,6 @@ IDL_GlobalData::dds4ccm_impl_fnames (void)
   return this->dds4ccm_impl_fnames_;
 }
 
-ACE_Unbounded_Queue<AST_Decl *> &
-IDL_GlobalData::masking_scopes (void)
-{
-  return this->masking_scopes_;
-}
-
 ACE_Unbounded_Queue<AST_Interface *> &
 IDL_GlobalData::mixed_parentage_interfaces (void)
 {
@@ -1300,7 +1310,7 @@ IDL_GlobalData::check_gperf (void)
   if (ACE_OS::strcmp (this->gperf_path_, "ace_gperf") != 0)
 #endif /* ACE_GPERF */
     {
-      // It is absolute path. Check the existance, permissions and
+      // It is absolute path. Check the existence, permissions and
       // the modes.
       if (ACE_OS::access (this->gperf_path_,
                           F_OK | X_OK) == -1)
@@ -1345,7 +1355,7 @@ IDL_GlobalData::check_gperf (void)
     }
   else
     {
-      // Wait is sucessful, we will check the exit code from the
+      // Wait is successful, we will check the exit code from the
       // spawned process.
       if (WIFEXITED (wait_status))
         {
@@ -1357,7 +1367,7 @@ IDL_GlobalData::check_gperf (void)
           // to <errno> again, so that it can be used to print error
           // messages.
           errno = WEXITSTATUS (wait_status);
-          
+
           if (errno)
             {
               // <exec> has failed.
@@ -1522,23 +1532,23 @@ IDL_GlobalData::fini (void)
       ACE::strdelete (entry->ext_id_);
       ACE::strdelete (entry->int_id_);
     }
-    
+
   DCPS_Type_Info_Map::ENTRY *dcps_entry = 0;
-    
+
   for (DCPS_Type_Info_Map::ITERATOR dcps_iter (
          this->dcps_type_info_map_);
        !dcps_iter.done ();
        dcps_iter.advance ())
     {
       dcps_iter.next (dcps_entry);
-      
+
       dcps_entry->int_id_->name_->destroy ();
       delete dcps_entry->int_id_->name_;
       dcps_entry->int_id_->name_ = 0;
-      
+
       delete dcps_entry->int_id_;
       dcps_entry->int_id_ = 0;
-      
+
       delete [] dcps_entry->ext_id_;
       dcps_entry->ext_id_ = 0;
     }
@@ -1583,19 +1593,19 @@ void
 IDL_GlobalData::recursion_start (const char *val)
 {
   ACE::strdelete (this->recursion_start_);
-  
+
   /// Strip off any trailing slashes (not needed
   /// for further processing).
   ACE_CString tmp (val);
   ACE_CString::size_type len = tmp.length ();
   ACE_TCHAR c = tmp[len - 1];
-  
+
   while (c == '\\' || c == '/')
     {
       tmp = tmp.substr (0, --len);
       c = tmp[len - 1];
     }
-    
+
   this->recursion_start_ = ACE::strnew (tmp.c_str ());
 }
 
@@ -1624,17 +1634,44 @@ IDL_GlobalData::current_params (void) const
 }
 
 void
-IDL_GlobalData::current_params (FE_Utils::T_PARAMLIST_INFO *params)
+IDL_GlobalData::current_params (
+FE_Utils::T_PARAMLIST_INFO *params)
 {
   this->current_params_ = params;
 }
 
+UTL_StrList const *
+IDL_GlobalData::alias_params (void) const
+{
+  return this->alias_params_;
+}
+
+void
+IDL_GlobalData::alias_params (
+UTL_StrList *params)
+{
+  this->alias_params_ = params;
+}
+
+UTL_StrList const *
+IDL_GlobalData::for_new_holder (void) const
+{
+  return this->for_new_holder_;
+}
+
+void
+IDL_GlobalData::for_new_holder (
+  UTL_StrList *params)
+{
+  this->for_new_holder_ = params;
+}
+
 void
 IDL_GlobalData::add_dcps_data_type (const char* id)
 {
   // Check if the type already exists.
   DCPS_Data_Type_Info* newinfo ;
-  
+
   if (this->dcps_type_info_map_.find (id, newinfo) != 0)
     {
       // No existing entry, add one.
@@ -1645,7 +1682,7 @@ IDL_GlobalData::add_dcps_data_type (const char* id)
 
       UTL_ScopedName* t1 =
         FE_Utils::string_to_scoped_name (foo_type);
-        
+
       // Chained with null Identifier required!!
       UTL_ScopedName* target =
         new UTL_ScopedName (new Identifier (""), t1);
@@ -1654,7 +1691,7 @@ IDL_GlobalData::add_dcps_data_type (const char* id)
       newinfo->name_ = target;
 
       // Add the newly formed entry to the map.
-      if (this->dcps_type_info_map_.bind (id, newinfo) != 0)
+      if (this->dcps_type_info_map_.bind (foo_type, newinfo) != 0)
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("Unable to insert type into ")
@@ -1698,7 +1735,7 @@ IDL_GlobalData::is_dcps_type (UTL_ScopedName* target)
 {
   // Traverse the entire map.
   DCPS_Type_Info_Map::ENTRY* entry ;
-  
+
   for (DCPS_Type_Info_Map::ITERATOR current (
          this->dcps_type_info_map_);
        current.next (entry);
@@ -1770,3 +1807,27 @@ IDL_GlobalData::in_typedef (bool val)
 {
   this->in_typedef_ = val;
 }
+
+bool
+IDL_GlobalData::in_tmpl_mod_no_alias (void) const
+{
+  return this->in_tmpl_mod_no_alias_;
+}
+
+void
+IDL_GlobalData::in_tmpl_mod_no_alias (bool val)
+{
+  this->in_tmpl_mod_no_alias_ = val;
+}
+
+bool
+IDL_GlobalData::in_tmpl_mod_alias (void) const
+{
+  return this->in_tmpl_mod_alias_;
+}
+
+void
+IDL_GlobalData::in_tmpl_mod_alias (bool val)
+{
+  this->in_tmpl_mod_alias_ = val;
+}
diff --git a/TAO_IDL/util/utl_identifier.cpp b/TAO_IDL/util/utl_identifier.cpp
index baff5a6a2a7..f8a410b05b4 100644
--- a/TAO_IDL/util/utl_identifier.cpp
+++ b/TAO_IDL/util/utl_identifier.cpp
@@ -109,13 +109,13 @@ Identifier::Identifier (const char *s)
           const char *eh_suffix = "_excep";
           ACE_CString::size_type pos =
             str.length () - ACE_OS::strlen (eh_suffix);
-            
+
           // If we have an AMI exception holder suffix, strip it off.
           if (str.find (eh_suffix) == pos)
             {
               str = str.substr (0, pos);
             }
-            
+
           TAO_IDL_CPP_Keyword_Table cpp_key_tbl;
           unsigned int len =
             static_cast<unsigned int> (str.length ());
diff --git a/TAO_IDL/util/utl_labellist.cpp b/TAO_IDL/util/utl_labellist.cpp
index 87a9c834bfc..aef844b80ef 100644
--- a/TAO_IDL/util/utl_labellist.cpp
+++ b/TAO_IDL/util/utl_labellist.cpp
@@ -100,16 +100,16 @@ UTL_LabelList *
 UTL_LabelList::copy (void)
 {
   AST_Expression *val = this->pd_car_data->label_val ();
-  
+
   AST_Expression *val_copy = 0;
   ACE_NEW_RETURN (val_copy,
                   AST_Expression (val, val->ev ()->et),
                   0);
-                  
+
   AST_UnionLabel *label_copy =
     idl_global->gen ()->create_union_label (this->pd_car_data->label_kind (),
                                             val_copy);
-    
+
   UTL_LabelList *retval = 0;
   ACE_NEW_RETURN (retval,
                   UTL_LabelList (label_copy,
diff --git a/TAO_IDL/util/utl_namelist.cpp b/TAO_IDL/util/utl_namelist.cpp
index 1cf623cb90d..e5ff59333fb 100644
--- a/TAO_IDL/util/utl_namelist.cpp
+++ b/TAO_IDL/util/utl_namelist.cpp
@@ -107,7 +107,7 @@ UTL_NameList::destroy (void)
   this->pd_car_data->destroy ();
   delete this->pd_car_data;
   this->pd_car_data = 0;
-  
+
   this->UTL_List::destroy ();
 }
 
diff --git a/TAO_IDL/util/utl_scope.cpp b/TAO_IDL/util/utl_scope.cpp
index 1d37dad6748..34671122a9c 100644
--- a/TAO_IDL/util/utl_scope.cpp
+++ b/TAO_IDL/util/utl_scope.cpp
@@ -69,6 +69,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_err.h"
 #include "utl_indenter.h"
 #include "utl_string.h"
+#include "utl_strlist.h"
 #include "ast_valuebox.h"
 #include "ast_valuetype.h"
 #include "ast_valuetype_fwd.h"
@@ -480,7 +481,7 @@ UTL_Scope::fe_add_decl (AST_Decl *t)
 {
   // Already defined and cannot be redefined? Or already used?
   AST_Decl *d = this->lookup_for_add (t);
-  
+
   if (d)
     {
       if (!FE_Utils::can_be_redefined (d, t))
@@ -576,7 +577,7 @@ AST_Structure *
 UTL_Scope::fe_add_full_struct_type (AST_Structure *t)
 {
   AST_Decl *predef = this->lookup_for_add (t);
-  
+
   if (predef)
     {
       if (!FE_Utils::can_be_redefined (predef, t))
@@ -587,7 +588,7 @@ UTL_Scope::fe_add_full_struct_type (AST_Structure *t)
                                       predef);
           return 0;
         }
-        
+
       if (referenced (predef, t->local_name ()) && !t->is_defined ())
         {
           idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
@@ -953,7 +954,7 @@ UTL_Scope::lookup_pseudo (Identifier *e)
   bool *seen = 0;
   char *name_string = e->get_string ();
   UTL_Scope *start_scope = idl_global->corba_module ();
-  
+
   if (ACE_OS::strcasecmp (name_string, "TypeCode") == 0
       || ACE_OS::strcasecmp (name_string, "TCKind") == 0)
     {
@@ -980,13 +981,13 @@ UTL_Scope::lookup_pseudo (Identifier *e)
     {
       return 0;
     }
-  
+
   for (UTL_ScopeActiveIterator i (start_scope, IK_decls);
        !i.is_done ();
        i.next ())
     {
       AST_Decl *d = i.item ();
-      
+
       if (e->case_compare (d->local_name ()))
         {
           // These have to be located here because we are just looking
@@ -1003,7 +1004,7 @@ UTL_Scope::lookup_pseudo (Identifier *e)
   if (this->which_pseudo_ == PSEUDO_TYPECODE)
     {
       AST_Decl *d = this->look_in_prev_mods_local (e);
-      
+
       if (d != 0)
         {
           // Generation of #includes for Typecode.h
@@ -1025,7 +1026,8 @@ UTL_Scope::look_in_prev_mods_local (Identifier *,
 
 AST_Decl *
 UTL_Scope::special_lookup (UTL_ScopedName *,
-                           bool /* full_def_only */)
+                           bool /* full_def_only */,
+                           AST_Decl *&/*final_parent_decl*/)
 {
   return 0;
 }
@@ -1035,17 +1037,17 @@ AST_Decl *
 UTL_Scope::lookup_primitive_type (AST_Expression::ExprType et)
 {
   UTL_Scope *search = idl_global->corba_module ();
-  
+
   AST_PredefinedType::PredefinedType pdt =
     FE_Utils::ExprTypeToPredefinedType (et);
-    
+
   /// This return value means there was no PredefinedType match
-  /// for the ExprType.  
+  /// for the ExprType.
   if (pdt == AST_PredefinedType::PT_pseudo)
     {
       return 0;
     }
-  
+
   /// The only 'predefined type' not in the CORBA module.
   if (pdt == AST_PredefinedType::PT_void)
     {
@@ -1057,12 +1059,12 @@ UTL_Scope::lookup_primitive_type (AST_Expression::ExprType et)
        i.next ())
     {
       AST_Decl *as_decl = i.item ();
-      
+
       if (as_decl->node_type () == AST_Decl::NT_pre_defined)
         {
           AST_PredefinedType *t =
             AST_PredefinedType::narrow_from_decl (as_decl);
-            
+
           if (t->pt () == pdt)
             {
               if (idl_global->in_main_file ())
@@ -1211,7 +1213,6 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
   // scope-expanding iteration below.
   Identifier *name = e->head ();
   const bool global_scope_name = work->is_global_name (name);
-  
   if (global_scope_name)
     {
       // Remove the preceeding "::" or "" from the scopename
@@ -1222,8 +1223,11 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
       work = idl_global->root ();
     }
 
-  AST_Decl *d = work->lookup_by_name_r (e, full_def_only);
-  
+  AST_Decl *first_found_final_parent_decl= 0;
+  const bool searching_module_path= (e->length () != 1);
+  AST_Decl *d = searching_module_path ?
+    work->lookup_by_name_r (e, full_def_only, first_found_final_parent_decl) :
+    work->lookup_by_name_r (e, full_def_only);
   if (d == 0)
     {
       // If all else fails, look though each outer scope.
@@ -1231,47 +1235,28 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
            outer;
            outer = ScopeAsDecl (outer)->defined_in ())
         {
-          d = outer->lookup_by_name_r (e, full_def_only);
-          
+          AST_Decl *next_found_final_parent_decl= 0;
+          d = outer->lookup_by_name_r (e, full_def_only, next_found_final_parent_decl);
           if (d != 0)
             {
               work = outer;
-              break; // Ok found it, stop searching.
-            }
-        }
-    }
-
-  ACE_Unbounded_Queue<AST_Decl *> &masks =
-    idl_global->masking_scopes ();
-    
-  if (d != 0 && !global_scope_name)
-    {
-      ACE_Unbounded_Queue<AST_Decl *>::CONST_ITERATOR i (masks);
-      AST_Decl **item = 0;
-      
-      if (i.next (item))
-        {
-          // The first queue item (last enqueued) will always
-          // match "name", but does not indicate an error.
-          AST_Decl *outer_decl = *item;
-
-          // Now check that the rest of the names don't collide
-          const char *const name_str = name->get_string ();
-          
-          while (i.advance ())
-            {
-              i.next (item);
-              const char *const item_name_str =
-                (*item)->local_name ()->get_string ();
-                
-              if (!ACE_OS::strcmp (item_name_str, name_str)
-                  && !(*item)->masking_checks (outer_decl))
+              if (first_found_final_parent_decl)
                 {
-                  idl_global->err ()->scope_masking_error (d, *item);
-                  d = 0; // Hidden scopes can't be used indirectly.
-                  break;
+                  // Hidden scopes can't be used indirectly, therefore we didn't actually
+                  // find this one because the "first_found_final_parent_decl" was found and
+                  // this one just found is hidden by it.
+                  idl_global->err ()->scope_masking_error (d, first_found_final_parent_decl);
+                  d = 0; // Ignore this one; continue searching to report other ambiguous matches.
+                }
+              else
+                {
+                  break; // Ok found it, stop searching.
                 }
             }
+          else if (searching_module_path && !first_found_final_parent_decl)
+            {
+              first_found_final_parent_decl = next_found_final_parent_decl;
+            }
         }
     }
 
@@ -1280,8 +1265,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
       /// Doesn't add if d == 0.
       work->add_to_referenced (d, false, name);
     }
-    
-  masks.reset ();
+
   return d;
 }
 
@@ -1289,9 +1273,19 @@ AST_Decl *
 UTL_Scope::lookup_by_name_r (UTL_ScopedName *e,
                              bool full_def_only)
 {
+  AST_Decl *ignored= 0;
+  return UTL_Scope::lookup_by_name_r (e, full_def_only, ignored);
+}
+
+AST_Decl *
+UTL_Scope::lookup_by_name_r (UTL_ScopedName *e,
+                             bool full_def_only,
+                             AST_Decl *&final_parent_decl)
+{
   bool work_another_level;
   UTL_Scope *work = this;
-  
+  final_parent_decl= (e->length () == 1) ? ScopeAsDecl (work) : 0;
+
   do
     {
       // Will catch Object, TypeCode, TCKind, ValueBase and
@@ -1299,7 +1293,6 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e,
       // generation of some #includes and, whether successful or not,
       // incurs no extra overhead.
       AST_Decl *d = work->lookup_pseudo (e->head ());
-      
       if (d)
         {
           return d;
@@ -1314,7 +1307,7 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e,
       // matches a template module parameter. If so, the return
       // value is created on the heap and is owned by the caller
       // of this lookup.
-      if (e->length () == 1)
+      if (final_parent_decl)
         {
           // Since we are inside the scope of a template module, any
           // single-segment scoped name that matches a template
@@ -1324,7 +1317,7 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e,
           // lookup.
           AST_Param_Holder *param_holder =
             UTL_Scope::match_param (e);
-            
+
           if (param_holder)
             {
               return param_holder;
@@ -1334,7 +1327,7 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e,
       work_another_level = false; // Until we find something.
       bool in_corba =
         (ACE_OS::strcmp (e->head ()->get_string (), "CORBA") == 0);
-        
+
       for (UTL_ScopeActiveIterator i (work, IK_decls);
            !i.is_done ();
            i.next ())
@@ -1350,19 +1343,19 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e,
               && d->local_name ()->case_compare (e->head ()))
             {
               // Ok we found a match, is there any more to find?
-              if (e->length () == 1)
+              if (final_parent_decl)
                 {
                   return d; // Last scope name matched
                 }
 
               UTL_Scope *next = DeclAsScope (d); // The next scope to search
-              
+
               if (next)
                 {
                   work = next;
                   work_another_level = true;
-                  idl_global->masking_scopes ().enqueue_head (d);
                   e = static_cast<UTL_ScopedName *> (e->tail ());
+                  final_parent_decl= (e->length () == 1) ? d : 0;
                   break;
                 }
 
@@ -1375,14 +1368,14 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e,
   // A rare enough case that it's worth it to separate it and
   // do it as a last resort. Catches anonymnous types, enums
   // and members with their types defined all in one statement.
-  if (e->length () == 1)
+  if (final_parent_decl)
     {
       for (UTL_ScopeActiveIterator i (work, IK_localtypes);
            !i.is_done ();
            i.next ())
         {
           AST_Decl *d = i.item ();
-          
+
           if (d->local_name ()->case_compare (e->head ()))
             {
               return d;
@@ -1391,7 +1384,7 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e,
     }
 
   // Last resort, check other module openings of working scope.
-  return work->special_lookup (e, full_def_only);
+  return work->special_lookup (e, full_def_only, final_parent_decl);
 }
 
 // Add a node to set of nodes referenced in this scope.
@@ -1830,7 +1823,7 @@ UTL_Scope::dump (ACE_OSTREAM_TYPE &o)
            i.next ())
         {
           AST_Decl *d = i.item ();
-          
+
           if (!d->imported ())
             {
               idl_global->indent ()->skip_to (o);
@@ -1849,7 +1842,7 @@ UTL_Scope::dump (ACE_OSTREAM_TYPE &o)
            j.next ())
         {
           AST_Decl *d = j.item ();
-          
+
           if (!d->imported ())
             {
               idl_global->indent ()->skip_to (o);
@@ -1882,20 +1875,66 @@ UTL_Scope::match_param (UTL_ScopedName *e)
   // of a template module.
   FE_Utils::T_PARAMLIST_INFO const *params =
     idl_global->current_params ();
-  if (!params)
+
+  if (params == 0)
     {
       return 0;
     }
 
   const char *name = e->first_component ()->get_string ();
   FE_Utils::T_Param_Info *param = 0;
+  unsigned long index = 0;
+
+  UTL_StrList *alias_params =
+    const_cast<UTL_StrList *> (idl_global->for_new_holder ());
+
+  if (alias_params == 0)
+    {
+      alias_params =
+        const_cast<UTL_StrList *> (idl_global->alias_params ());
+    }
+
+  UTL_String *alias_param = 0;
+
   for (FE_Utils::T_PARAMLIST_INFO::CONST_ITERATOR i (*params);
        i.next (param);
-       i.advance ())
+       i.advance (), ++index)
     {
       if (param->name_ == name)
         {
-          return idl_global->gen ()->create_param_holder (e, param);
+          /// If we are parsing this template module as a
+          /// reference, the param holder we create must have
+          /// the name of the corresponding aliased param.
+          if (alias_params != 0)
+            {
+              unsigned long slot = 0;
+
+              for (UTL_StrlistActiveIterator iter (alias_params);
+                   !iter.is_done ();
+                   iter.next (), ++slot)
+                {
+                  if (slot == index)
+                    {
+                      alias_param = iter.item ();
+                      break;
+                    }
+                }
+
+              Identifier id (alias_param->get_string ());
+              UTL_ScopedName sn (&id, 0);
+
+              return
+                idl_global->gen ()->create_param_holder (
+                  &sn,
+                  param);
+            }
+          else
+            {
+              return
+                idl_global->gen ()->create_param_holder (
+                  e,
+                  param);
+            }
         }
     }
 
diff --git a/VERSION b/VERSION
index 234b3e04150..3547629a5f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1,11 +1,8 @@
-This is TAO version 1.8.1, released Sun Aug 01 11:30:54 CEST 2010
+This is TAO version 2.0.2, released Wed Apr 20 09:52:52 CEST 2011
 
 If you have any problems with or questions about TAO, please send
-e-mail to the TAO mailing list (tao-users@cs.wustl.edu), using the
-form found in the file TAO/PROBLEM-REPORT-FORM.  To ensure that you
-see responses, please do one of the following:
+e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu),
+using the form found in the file TAO/PROBLEM-REPORT-FORM. In order
+to post to the list you must subscribe to it.
 
-    1) Subscribe to the tao-users mail list, by sending email with
-       contents "subscribe tao-users" to majordomo@cs.wustl.edu.
-
-    2) Or, monitor the comp.soft-sys.ace newsgroup for responses.
+See http://www.cs.wustl.edu/~schmidt/ACE-mail.html
\ No newline at end of file
diff --git a/bin/corba-boolean.pl b/bin/corba-boolean.pl
deleted file mode 100755
index 92e793fc941..00000000000
--- a/bin/corba-boolean.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -pi -S $0 ${1+"$@"}'
-    & eval 'exec perl -pi -S $0 $argv:q'
-    if 0;
-
-# $Id$
-#
-# You may want to run the "find" command with this script, which maybe
-# something like this:
-#
-# find . -type f \( -name "*.i" -o -name "*.h" -o -name "*.C" -o -name "*.cc" -o -name "*.c" -o -name "*.cpp" -o -name "*.hpp" -o -name "*.ipp" \) -print | xargs $ACE_ROOT/bin/corba-boolean.perl
-
-# The first three lines above let this script run without specifying the
-# full path to perl, as long as it is in the user's PATH.
-# Taken from perlrun man page.
-
-s/CORBA::B_FALSE/0/g;
-s/CORBA::B_TRUE/1/g;
-s/CORBA_B_FALSE/0/g;
-s/CORBA_B_TRUE/1/g;
diff --git a/bin/rm_exception_macros.pl b/bin/rm_exception_macros.pl
index 7f3691380a1..e9ae6b2d82e 100755
--- a/bin/rm_exception_macros.pl
+++ b/bin/rm_exception_macros.pl
@@ -136,7 +136,7 @@ sub process_file {
           if ($ats && index($val, ';') == 0 &&
               !($lines[$#lines] =~ /\/\/.*$/ ||
                 $lines[$#lines] =~ /\/\*.*\*\/$/)) {
-            $lines[$#lines] .= $val;                          
+            $lines[$#lines] .= $val;
             $line = '';
           }
           else {
@@ -226,7 +226,7 @@ sub process_file {
               $line = $sp . $line;
             }
             else {
-              $lines[$#lines] .= $line;                          
+              $lines[$#lines] .= $line;
               $line = '';
             }
           }
diff --git a/bin/subst_env.pl b/bin/subst_env.pl
deleted file mode 100755
index be4007b7a61..00000000000
--- a/bin/subst_env.pl
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/perl
-#
-# $Id$
-# 
-# This script eases the transition from the CORBA::Environment& ACE_TRY_ENV
-# declarations and method parameters to the ACE_ENV_ARG macros.
-# It was used for converting TAO between versions 1.2.1 and 1.2.2.
-# The converted output is written to stdout. 
-# Typical usage would be as follows:
-#   perl subst_env.pl file_with_acetryenv.cpp >file_with_taoenvarg.cpp
-#
-$linenum = 0;
-$last="";
-$corbaenv = 'CORBA(::|_)Environment';
-$envdecl = 'CORBA(::|_)Environment *& *\w*[Ee][Nn][Vv]\w*';
-$default = '(TAO_|CORBA\::Environment\::)default_environment *\(\)';
-$envvar = '(ACE|TAO)_TRY_ENV';
-while (($l = <>)) {
-  $linenum++;
-  if ($l =~ /$corbaenv/) {
-    my $single = "SINGLE_";
-    if ($last =~ /,\s*$/) {
-      $last =~ s/,\s*$/\n/;
-      $single = "";
-    } elsif ($l =~ /,\s*$corbaenv/) {
-      $l =~ s/,\s*$corbaenv/  CORBA_Environment/;  # Preparation.
-      $single = "";
-    }
-    unless ($l =~ /${corbaenv}.*\)/) {  # Need the method's closing paren.
-      chop $l;
-      my $nxt = <>;
-      $linenum++;
-      $nxt =~ s/^\s+//;
-      $l .= $nxt;
-    }
-    if ($l =~ /$envdecl/) {
-      if ($l =~ /$envdecl *= *$default/) {
-        $l =~ s/$envdecl *= *$default/ACE_ENV_${single}ARG_DECL_WITH_DEFAULTS/;
-      } else {
-        $l =~ s/$envdecl/ACE_ENV_${single}ARG_DECL/;
-      }
-    } else {
-      $l =~ s/$corbaenv *& */ACE_ENV_${single}ARG_DECL_NOT_USED/;
-    }
-    print $last;
-    print $l;
-    $last = "";
-  } elsif ($l =~ /$envvar/) {
-    my $single = "SINGLE_";
-    if ($last =~ /,\s*$/) {
-      $last =~ s/,\s*$/\n/;
-      $single = "";
-    } elsif ($l =~ /,\s*$envvar/) {
-      $l =~ s/,\s*$envvar/  ACE_TRY_ENV/;  # Preparation.
-      $single = "";
-    }
-    $l =~ s/$envvar/ACE_ENV_${single}ARG_PARAMETER/;
-    print $last;
-    print $l;
-    $last = "";
-  } else {
-    print $last;
-    $last = $l;
-  }
-}
-print $last;
-
diff --git a/bin/tao_env.pl b/bin/tao_env.pl
deleted file mode 100755
index 0ac889ef308..00000000000
--- a/bin/tao_env.pl
+++ /dev/null
@@ -1,17 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -pi -S $0 ${1+"$@"}'
-    & eval 'exec perl -pi -S $0 $argv:q'
-    if 0;
-
-# $Id$
-#
-# You may want to run the "find" command with this script, which maybe
-# something like this:
-#
-# find . -type f \( -name "*.i" -o -name "*.h" -o -name "*.C" -o -name "*.cc" -o -name "*.c" -o -name "*.cpp" -o -name "*.hpp" -o -name "*.ipp" \) -print | xargs $ACE_ROOT/bin/auto_ptr.perl
-
-# The first three lines above let this script run without specifying the
-# full path to perl, as long as it is in the user's PATH.
-# Taken from perlrun man page.
-
-s/^_env/TAO_IN_ENV/;
-s/([^_A-Za-z])_env/$1TAO_IN_ENV/g;
diff --git a/bin/tao_orb_tests.lst b/bin/tao_orb_tests.lst
index a4e6e3ee7eb..8fc623c3e5f 100644
--- a/bin/tao_orb_tests.lst
+++ b/bin/tao_orb_tests.lst
@@ -27,6 +27,8 @@ TAO/tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl: !ST !STATIC
 TAO/tests/Param_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/tests/Param_Test/run_test_dii.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/tests/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/AMI/run_test.pl -exclusive: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/AMI/run_mt_noupcall.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/AMI_Timeouts/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
 TAO/tests/AMH_Exceptions/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
 TAO/tests/AMH_Oneway/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
@@ -108,13 +110,14 @@ TAO/tests/Bug_2768_Regression/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO
 TAO/tests/Bug_2791_Regression/run_test.pl: !MINIMUM !CORBA_E_MICRO
 TAO/tests/Bug_2792_Regression/run_test.pl:
 TAO/tests/Bug_2795_Regression/run_test.pl:
-TAO/tests/Bug_2804_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !FIXED_BUGS_ONLY
+TAO/tests/Bug_2804_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Bug_2805_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Bug_2809_Regression/run_test.pl:
 TAO/tests/Bug_2826_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Bug_2869_Regression/run_test.pl: !VxWorks
-TAO/tests/Bug_2844_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !FIXED_BUGS_ONLY
+TAO/tests/Bug_2844_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Bug_2909_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/Bug_2918_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Bug_2935_Regression/run_test.pl:
 TAO/tests/Bug_2936_Regression/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS !STATIC
 TAO/tests/Bug_2953_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
@@ -141,6 +144,7 @@ TAO/tests/Bug_3499_Regression/run_test.pl: !STATIC
 TAO/tests/Bug_3506_Regression/run_test.pl:
 TAO/tests/Bug_3524_Regression/run_test.pl: !CORBA_E_MICRO
 TAO/tests/Bug_3531_Regression/run_test.pl: !ST !NO_MESSAGING !CORBA_E_MICRO !FIXED_BUGS_ONLY
+TAO/tests/Bug_3531b_Regression/run_test.pl: !ST !FIXED_BUGS_ONLY
 TAO/tests/Bug_3542_Regression/run_test.pl: !STATIC !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 #TAO/tests/Bug_3543_Regression/run_test.pl: !ST
 TAO/tests/Bug_3548_Regression/run_test.pl:
@@ -170,6 +174,10 @@ TAO/tests/Bug_3746_Regression/run_test.pl:
 TAO/tests/Bug_3748_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
 TAO/tests/Bug_3755_Regression/run_test.pl: !STATIC !CORBA_E_COMPACT !CORBA_E_MICRO !ST
 TAO/tests/Bug_3755_Ext_Regression/run_test.pl : !STATIC !MINIMUM !LynxOS
+TAO/tests/Bug_3755_Ext_Regression/run_test.pl -rt: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS
+TAO/tests/Bug_3755_Ext_Regression/run_test.pl -rtsched: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !LynxOS
+TAO/tests/Bug_3755_Ext_Regression/run_test.pl -endpoint: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS
+TAO/tests/Bug_3755_Ext_Regression/run_test.pl -diffserv: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS
 TAO/tests/Bug_3755_Ext_Regression/run_test.pl -bidir: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !GIOP10 !DISABLE_BIDIR !LynxOS
 TAO/tests/Bug_3755_Ext_Regression/run_test.pl -messaging: !STATIC !NO_MESSAGING !CORBA_E_MICRO !LynxOS
 TAO/tests/Bug_3755_Ext_Regression/run_test.pl -csd: !STATIC !ST !CORBA_E_MICRO !LynxOS
@@ -181,6 +189,13 @@ TAO/tests/Bug_3826_Regression/run_test.pl:
 TAO/tests/Bug_3827_Regression/run_test.pl: !ST !CORBA_E_MICRO
 TAO/tests/Bug_3837_Regression/run_test.pl: !STATIC
 TAO/tests/Bug_3845_Regression/run_test.pl:
+TAO/tests/Bug_3896_Regression/run_test.pl: !ST !NO_MESSAGING !CORBA_E_MICRO
+TAO/tests/Bug_3919_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/Bug_3926_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
+TAO/tests/Bug_3941_Regression/run_test.pl: !CORBA_E_MICRO
+TAO/tests/Bug_3942_Regression/run_test.pl: !FIXED_BUGS_ONLY
+TAO/tests/Bug_3953_Regression/run_test.pl: !CORBA_E_MICRO
+TAO/tests/Bug_3954_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
@@ -251,6 +266,7 @@ TAO/tests/CallbackTest/run_test_mixed_ip.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !COR
 TAO/tests/Crashed_Callback/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash
 # Disabled Crash On Write on Win32, see bugzilla 959 why !LabVIEW_RT !WinCE
 TAO/tests/Crash_On_Write/run_test.pl: !ST !Win32
+TAO/tests/MT_NoUpcall_Client_Leader/run_test.pl: !ST !CORBA_E_MICRO !NO_MESSAGING
 TAO/tests/Nested_Upcall_Crash/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash !QUICK
 TAO/tests/Nested_Upcall_Crash/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash QUICK
 TAO/tests/NestedUpcall/Simple/run_test.pl: !ST
@@ -280,7 +296,7 @@ TAO/tests/POA/POAManagerFactory/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_
 TAO/tests/POA/EndpointPolicy/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/POA/EndpointPolicy/run_test_dh.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/POA/EndpointPolicy/run_test_lh.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !VxWorks
-TAO/tests/POA/Adapter_Activator/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !SUNCC5_1 !ACE_FOR_TAO
+TAO/tests/POA/Adapter_Activator/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/tests/POA/POA_BiDir/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_BIDIR
 TAO/tests/POA/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/POA/Default_Servant2/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
@@ -289,7 +305,7 @@ TAO/tests/POA/FindPOA/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/POA/NewPOA/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/POA/On_Demand_Activation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO
 TAO/tests/POA/On_Demand_Loading/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !KCC_Linux !ACE_FOR_TAO
-TAO/tests/POA/Reference_Counted_Servant/run_test.pl: !SUNCC5_1 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
+TAO/tests/POA/Reference_Counted_Servant/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/tests/POA/Loader/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !KCC_Linux !ACE_FOR_TAO
 TAO/tests/POA/RootPOA/run_test.pl:
 TAO/tests/DiffServ/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
@@ -342,7 +358,7 @@ TAO/tests/Queued_Message_Test/run_test.pl:
 TAO/tests/DLL_ORB/run_test.pl: !ST !STATIC
 TAO/tests/IDL_Inherited_Operation/run_test.pl
 TAO/tests/InterOp-Naming/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Multiple/run_test.pl: !SUNCC5_1
+TAO/tests/Multiple/run_test.pl:
 TAO/tests/Exposed_Policies/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO
 TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
 TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST
@@ -427,17 +443,17 @@ TAO/tests/Collocated_Forwarding/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_
 TAO/tests/ZIOP/run_test.pl: ZIOP ZLIB
 TAO/tests/ForwardUponObjectNotExist/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
 TAO/tests/ForwardOnceUponException/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !ST
-TAO/tests/Bug_3853_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO 
+TAO/tests/Bug_3853_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
 TAO/DevGuideExamples/BiDirectionalGIOP/run_test.pl: !MINIMUM !CORBA_E_MICRO
 TAO/DevGuideExamples/GettingStarted/run_test.pl:
 TAO/DevGuideExamples/LocalObjects/Messenger/run_test.pl:
 TAO/DevGuideExamples/LocalObjects/ServantLocator/run_test.pl: !MINIMUM !CORBA_E_MICRO !CORBA_E_COMPACT
 TAO/DevGuideExamples/Messaging/AMIcallback/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO
 TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO
-TAO/DevGuideExamples/PortableInterceptors/Auth/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
-TAO/DevGuideExamples/PortableInterceptors/IOR/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
-TAO/DevGuideExamples/PortableInterceptors/PICurrent/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
-TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/DevGuideExamples/PortableInterceptors/Auth/run_test.pl:  !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
+TAO/DevGuideExamples/PortableInterceptors/IOR/run_test.pl:  !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
+TAO/DevGuideExamples/PortableInterceptors/PICurrent/run_test.pl:  !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
+TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/run_test.pl:  !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
 TAO/DevGuideExamples/RTCORBA/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !STATIC
 TAO/DevGuideExamples/SmartProxies/run_test.pl: !NO_SMARTPROXIES !NO_MESSAGING !CORBA_E_MICRO
 TAO/DevGuideExamples/Multithreading/Reactive/run_test.pl: !STATIC !MINIMUM !LynxOS
diff --git a/bin/tao_other_tests.lst b/bin/tao_other_tests.lst
index 6672f4ed04d..b72c4809398 100644
--- a/bin/tao_other_tests.lst
+++ b/bin/tao_other_tests.lst
@@ -25,6 +25,7 @@ TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPAC
 TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS
 TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS
 TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS
+TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS
 TAO/performance-tests/Throughput/run_test.pl: !Win32 !ACE_FOR_TAO !OpenVMS
 TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl: !Win32 !ACE_FOR_TAO !OpenVMS !CORBA_E_MICRO
 TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !OpenVMS !LynxOS
@@ -34,7 +35,7 @@ TAO/examples/Simple/grid/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO
 TAO/examples/Simple/time/run_test.pl: !NO_MESSAGING !Win32 !CORBA_E_MICRO
 TAO/examples/Simple/time-date/run_test.pl: !ST !STATIC !NO_MESSAGING !Win32
 TAO/examples/Quoter/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO
-TAO/examples/Load_Balancing/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !SUNCC5_1 !ACE_FOR_TAO
+TAO/examples/Load_Balancing/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !LynxOS !ACE_FOR_TAO
 TAO/examples/OBV/Typed_Events/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/examples/Buffered_AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
@@ -58,28 +59,29 @@ TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CO
 TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO !WCHAR
 TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl: !NO_IFR !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !WCHAR
 TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !NO_MESSAGING
+TAO/orbsvcs/tests/Bug_2112_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
 TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
 TAO/orbsvcs/tests/Bug_2285_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
 TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
 TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !SUNCC5_1
+TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC
 TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC
 TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl: !MINIMUM !CORBA_E_MICRO !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl: !MINIMUM !CORBA_E_MICRO !ACE_FOR_TAO !NO_MESSAGING !STATIC
 TAO/orbsvcs/tests/Bug_3215_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
 TAO/orbsvcs/tests/Bug_3216_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Bug_3418_Regression/run_test.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_3418_Regression/run_test.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO  !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/orbsvcs/tests/Bug_3486_Regression/run_test.pl: !NO_MESSAGING !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/tests/Bug_3598b_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
 TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/orbsvcs/tests/HTIOP/Hello/run_test.pl: !NO_UUID !ST !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/tests/HTIOP/AMI/run_test.pl: !NO_UUID !ST !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl: !NO_UUID !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !LynxOS
-TAO/orbsvcs/tests/Simple_Naming/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING !ACE_FOR_TAO !LynxOS !CORBA_E_MICRO !DISTRIBUTED
-TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: !ST !SUNCC5_1 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO !DISTRIBUTED
-TAO/orbsvcs/tests/Redundant_Naming/run_test.pl: !ST !SUNCC5_1 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISTRIBUTED
-TAO/orbsvcs/tests/Trading/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !SUNCC5_1
+TAO/orbsvcs/tests/Simple_Naming/run_test.pl: !ST !NO_MESSAGING !ACE_FOR_TAO !LynxOS !CORBA_E_MICRO !DISTRIBUTED
+TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO !DISTRIBUTED
+TAO/orbsvcs/tests/Redundant_Naming/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISTRIBUTED
+TAO/orbsvcs/tests/Trading/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl: !CORBA_E_MICRO
 TAO/orbsvcs/tests/Event/Basic/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/orbsvcs/tests/Event/Performance/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
@@ -168,21 +170,22 @@ TAO/orbsvcs/tests/Property/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICR
 TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !LynxOS
 #HANGS TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane
 #HANGS'TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane_ir
-TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Security/Bug_1107_Regression/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Security/Bug_2908_Regression/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !FIXED_BUGS_ONLY
-TAO/orbsvcs/tests/Security/Big_Request/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Security/Callback/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
+TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Security/Bug_1107_Regression/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Security/Bug_2908_Regression/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !FIXED_BUGS_ONLY !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Security/Big_Request/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Security/Callback/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 #Bug 1647. run_test_harsh.pl takes 5 minutes; but there aren't many SSL builds !VxWorks !VxWorks_RTP !LabVIEW_RT
-TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Security/InsecureReferences/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Security/EndpointPolicy/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Security/Null_Cipher/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO
-TAO/orbsvcs/tests/Miop/McastHello/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !SUNCC5_1 !NO_MCAST
+TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl: SSL !QUICK !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl -quick: SSL QUICK !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Security/InsecureReferences/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Security/EndpointPolicy/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Security/Null_Cipher/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Miop/McastHello/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !NO_MCAST
 # The following 2 tests use dynamic loading to change the default reactor on Windows !VxWorks !VxWorks_RTP !LabVIEW_RT
 TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC !ACE_FOR_TAO !LynxOS !ST
 TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC !ACE_FOR_TAO !LynxOS
@@ -193,13 +196,14 @@ TAO/examples/RTCORBA/Activity/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MI
 TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS  !STATIC !ST !ACE_FOR_TAO !LynxOS
 TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC !ST !ACE_FOR_TAO !LynxOS
 TAO/examples/ior_corbaloc/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICRO !LynxOS
-TAO/utils/nslist/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICRO
+TAO/utils/nslist/run_test.pl: !ST !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICRO
 TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICRO
 TAO/orbsvcs/tests/IOR_MCast/run_test_ipv6.pl: IPV6 !NO_MCAST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !ST
 TAO/orbsvcs/tests/Bug_2800_Regression/run_test.pl: !ST !CORBA_E_MICRO
 TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl: !ST !CORBA_E_MICRO
 TAO/orbsvcs/tests/Bug_3673_Regression/run_test.pl: !ST !CORBA_E_MICRO
+TAO/orbsvcs/tests/Bug_3891_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/orbsvcs/examples/Notify/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/orbsvcs/tests/Bug_2925_Regression/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC
@@ -220,7 +224,7 @@ TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl:
 TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl:
 TAO/orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl:
 TAO/orbsvcs/tests/Notify/MC/run_test.pl: !ST !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl: IPV6 !ST !SUNCC5_1 !NO_MESSAGING !ACE_FOR_TAO !LynxOS !CORBA_E_MICRO !DISTRIBUTED
+TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl: IPV6 !ST !NO_MESSAGING !ACE_FOR_TAO !LynxOS !CORBA_E_MICRO !DISTRIBUTED
 TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS
 TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl: !MINIMUM !NO_MESSAGING !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS
 TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !NO_IFR !LynxOS
@@ -236,9 +240,9 @@ TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl: !ST !
 TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS
 TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS
 TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl: !ST !MINIMUM !STATIC !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS
-TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS
-TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS
-TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS
+TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS
 TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS
 TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS
@@ -247,4 +251,4 @@ TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl: !CORB
 TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS
 TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS
 TAO/orbsvcs/DevGuideExamples/InterfaceRepo/run_test.pl: !MINIMUM !NO_IFR !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO
-TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !LynxOS
+TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !LynxOS !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index c04ab636622..00000000000
--- a/configure.ac
+++ /dev/null
@@ -1,999 +0,0 @@
-dnl $Id$
-
-dnl An autoconf script to automatically configure TAO.
-dnl Process this file with autoconf to produce a configure script.
-
-dnl Statically (i.e. at autoconf-time) determine the version of TAO.
-dnl This is necessary since the version argument to AC_INIT is
-dnl supposed to be a static value, not a dynamic (e.g. a shell
-dnl variable).
-dnl
-dnl Note that this macro removes the newline output by the M4
-dnl "esyscmd" built-in.  Unless you understand what you're doing,
-dnl particularly with M4, do not modify this macro definition.
-define([TAO_VERSION], patsubst(esyscmd(grep TAO_VERSION tao/Version.h | sed 's/.*\" *\(.*\)\".*/\1/'), [
-]))dnl remove newline ending every `esyscmd' answer
-
-AC_INIT([TAO],
-        TAO_VERSION,
-        [tao-bugs@cs.wustl.edu],
-        [tao])
-
-AC_REVISION([$Id$])
-
-AC_COPYRIGHT([ACE(TM), TAO(TM), CIAO(TM), and CoSMIC(TM) (henceforth
-referred to as "DOC software") are copyrighted by Douglas C.
-Schmidt and his research group at Washington University,
-University of California, Irvine, and Vanderbilt University,
-Copyright (c) 1993-2005, all rights reserved. Since DOC software is
-open-source, free software, you are free to use, modify, copy, and
-distribute--perpetually and irrevocably--the DOC software source code
-and object code produced from the source, as well as copy and
-distribute modified versions of this software. You must, however,
-include this copyright statement along with code built using DOC
-software.
-
-Please see the file `COPYING' in the top level ACE directory for
-additional details.])
-
-
-dnl Require GNU Autoconf 2.58 or better.  Previous versions did not
-dnl correctly support HP-UX.
-AC_PREREQ([2.58])
-
-AC_CONFIG_SRCDIR([tao/TAO_Internal.cpp])
-
-AC_CONFIG_AUX_DIR([../aux_config])
-AC_CONFIG_MACRO_DIR([../m4])
-
-dnl Check what platform we are running on.
-AC_CANONICAL_TARGET([])
-
-dnl Initialize GNU Automake, and require Automake 1.9 or better.
-AM_INIT_AUTOMAKE([1.9 foreign no-define])
-
-
-dnl Add maintainer mode option to the option list.
-dnl AM_MAINTAINER_MODE
-
-dnl The maintainer of this configure script.
-ACE_CONFIGURE_MAINTAINER='tao-users@cs.wustl.edu'
-
-
-dnl Until autoconf support in ACE is complete, prevent this script
-dnl from running unless the user explictly forces the configure script
-dnl to run using the "--enable-maintainer-mode" configure script
-dnl option.
-dnl if test $USE_MAINTAINER_MODE != yes; then
-dnl   AC_MSG_ERROR([
-dnl     ACE autoconf support is currently disabled by default since it is
-dnl     still under development.  Please use the stock ACE build procedure
-dnl     detailed in the file \`ACE-INSTALL.html'.
-dnl
-dnl     If you wish to experiment with ACE's autoconf support then use the
-dnl     \"--enable-maintainer-mode\" configure script option to enable
-dnl     autoconf support.  For more details see the file
-dnl     \`ACE-configuration.txt'.])
-dnl fi  dnl  test $USE_MAINTAINER_MODE != yes
-
-dnl Should we use "egrep" or "grep -E"?  This sets the "$EGREP" shell
-dnl variable.
-AC_PROG_EGREP
-
-dnl If we are configuring in a CVS controlled directory then don't
-dnl continue any further.  The idea is to prevent automatically
-dnl generated files from being checked into the repository.  This
-dnl will prevent accidental overwrites of ACE's current Makefiles by
-dnl the automatically generated ones, for example.
-dnl ACE_CHECK_FOR_CVS_DIR
-
-dnl Prevent the configure script from continuing any further if
-dnl configuration is being performed in the top-level directory.  The
-dnl idea is to prevent files generated during configuration and build
-dnl from overwriting the stock files of the same name.
-ACE_CHECK_TOP_SRCDIR
-
-dnl Prepare the `tao/config.h.in' header template.
-ACE_PREP_CONFIG_HEADER
-
-dnl Allow the standard program name transformations.
-dnl We probably don't need AC_ARG_PROGRAM any longer since AM_INIT_AUTOMAKE
-dnl handles this functionality.  -- Ossama
-dnl AC_ARG_PROGRAM
-
-dnl Generate a header file with all settings.
-AC_CONFIG_HEADERS([tao/config.h])
-
-dnl Move before the AC_ARG_ENABLE stuff to prevent autoconf complaints.
-dnl This is a bit messy but it makes life easier for me.
-dnl                          -Ossama
-dnl
-dnl SECTION: checks for programs
-dnl
-
-dnl Check if system supports "#! /bin/sh" line in scripts
-AC_SYS_INTERPRETER
-
-dnl Check the C compiler and preprocessor.
-dnl AC_PROG_CC
-dnl AC_PROG_CPP
-dnl AC_PROG_CC_C_O
-
-dnl Check the C++ compiler and preprocessor.
-AC_PROG_CXX
-AC_PROG_CXXCPP
-
-ACE_CHECK_THREADS
-
-dnl Set the test language as C++
-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 Look for the best awk-style program available.
-AC_PROG_AWK
-
-dnl Parse the version information argument.
-dnl Note that "TAO_VERSION" is an m4 macro.
-tao_version_temp=TAO_VERSION
-tao_save_ifs="$IFS"; IFS='.'
-set dummy $tao_version_temp 0 0 0
-IFS="$tao_save_ifs"
-
-TAO_MAJOR=$2
-TAO_MINOR=$3
-TAO_BETA=$4
-
-AC_SUBST([TAO_MAJOR])
-AC_SUBST([TAO_MINOR])
-AC_SUBST([TAO_BETA])
-
-dnl We should have --with/--enable flags for these options.
-dnl Until we do, set them to reasonable defaults.
-TAO_ENABLE_MINIMUM_CORBA
-AM_CONDITIONAL(TEMPLATES_REQUIRE_SOURCE, false)
-AM_CONDITIONAL(BUILD_ACE_FOR_TAO, false)
-AM_CONDITIONAL(BUILD_RT_CORBA, true)
-AM_CONDITIONAL(BUILD_CORBA_MESSAGING, true)
-AM_CONDITIONAL(BUILD_INTERCEPTORS, true)
-AM_CONDITIONAL(BUILD_ACE_UUID, true)
-AM_CONDITIONAL(BUILD_AMI, true)
-AM_CONDITIONAL(BUILD_REPO, false)
-AM_CONDITIONAL(BUILD_THREADS, true)
-AM_CONDITIONAL(BUILD_EC_TYPED_EVENTS, true)
-AM_CONDITIONAL(BUILD_WFMO, false)
-AM_CONDITIONAL(BUILD_WINCE, false)
-AM_CONDITIONAL(BUILD_WINNT, false)
-AM_CONDITIONAL(BUILD_WXWINDOWS, false)
-AM_CONDITIONAL(BUILD_STL, false)
-AM_CONDITIONAL(BUILD_BOOST, false)
-AM_CONDITIONAL(BUILD_JAVA, false)
-AM_CONDITIONAL(BUILD_TRANSPORT_CURRENT,true)
-
-ACE_ENABLE_ACEXML
-ACE_ENABLE_SSL
-ACE_ENABLE_FL_REACTOR
-ACE_ENABLE_QT_REACTOR
-ACE_ENABLE_TK_REACTOR
-ACE_ENABLE_XT_REACTOR
-ACE_ENABLE_FOX_REACTOR
-ACE_PATH_ZZIP
-ACE_PATH_ZLIB
-ACE_PATH_BZIP2
-
-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...])
-dnl
-dnl
-dnl We can finally create all the files listed here; Makefile is
-dnl created from Makefile.in, etc.  Top-level Makefiles should be
-dnl created first.
-
-AC_CONFIG_FILES([
-  Makefile
-  TAO_IDL/Makefile
-  tao/Makefile
-  tao/ETCL/Makefile
-  orbsvcs/Makefile
-  orbsvcs/orbsvcs/Makefile
-  orbsvcs/Concurrency_Service/Makefile
-  orbsvcs/CosEvent_Service/Makefile
-  orbsvcs/Dump_Schedule/Makefile
-  orbsvcs/Event_Service/Makefile
-  orbsvcs/FTRT_Event_Service/Makefile
-  orbsvcs/FTRT_Event_Service/Event_Service/Makefile
-  orbsvcs/FTRT_Event_Service/Factory_Service/Makefile
-  orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile
-  orbsvcs/FT_ReplicationManager/Makefile
-  orbsvcs/Fault_Detector/Makefile
-  orbsvcs/Fault_Notifier/Makefile
-  orbsvcs/IFR_Service/Makefile
-  orbsvcs/ImplRepo_Service/Makefile
-  orbsvcs/LifeCycle_Service/Makefile
-  orbsvcs/LoadBalancer/Makefile
-  orbsvcs/Logging_Service/Makefile
-  orbsvcs/Logging_Service/Basic_Logging_Service/Makefile
-  orbsvcs/Logging_Service/Event_Logging_Service/Makefile
-  orbsvcs/Logging_Service/Notify_Logging_Service/Makefile
-  orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile
-  orbsvcs/Naming_Service/Makefile
-  orbsvcs/Notify_Service/Makefile
-  orbsvcs/Scheduling_Service/Makefile
-  orbsvcs/TAO_Service/Makefile
-  orbsvcs/Time_Service/Makefile
-  orbsvcs/Trading_Service/Makefile
-  docs/Makefile
-  docs/tutorials/Makefile
-  docs/tutorials/Quoter/Makefile
-  docs/tutorials/Quoter/AMI/Makefile
-  docs/tutorials/Quoter/Event_Service/Makefile
-  docs/tutorials/Quoter/idl/Makefile
-  docs/tutorials/Quoter/Naming_Service/Makefile
-  docs/tutorials/Quoter/On_Demand_Activation/Makefile
-  docs/tutorials/Quoter/RTCORBA/Makefile
-  docs/tutorials/Quoter/RT_Event_Service/Makefile
-  docs/tutorials/Quoter/Simple/Makefile
-  docs/tutorials/Quoter/Simple/Client/Makefile
-  docs/tutorials/Quoter/Simple/Impl-Repo/Makefile
-  docs/tutorials/Quoter/Simple/ImprovedServer/Makefile
-  docs/tutorials/Quoter/Simple/Persistent/Makefile
-  docs/tutorials/Quoter/Simple/Server/Makefile
-  utils/Makefile
-  utils/catior/Makefile
-  utils/monitor/Makefile
-  utils/nslist/Makefile
-  utils/wxNamingViewer/Makefile
- ])
-
-if test $tao_build_examples = yes; then
-  AC_CONFIG_FILES([
-    examples/Makefile
-    examples/AMH/Makefile
-    examples/AMH/Sink_Server/Makefile
-    examples/AMI/Makefile
-    examples/AMI/FL_Callback/Makefile
-    examples/Advanced/Makefile
-    examples/Advanced/ch_3/Makefile
-    examples/Buffered_AMI/Makefile
-    examples/Buffered_Oneways/Makefile
-    examples/CSD_Strategy/Makefile
-    examples/CSD_Strategy/ThreadPool/Makefile
-    examples/CSD_Strategy/ThreadPool2/Makefile
-    examples/CSD_Strategy/ThreadPool3/Makefile
-    examples/CSD_Strategy/ThreadPool4/Makefile
-    examples/CSD_Strategy/ThreadPool5/Makefile
-    examples/CSD_Strategy/ThreadPool6/Makefile
-    examples/Callback_Quoter/Makefile
-    examples/Content_Server/Makefile
-    examples/Content_Server/AMI_Iterator/Makefile
-    examples/Content_Server/AMI_Observer/Makefile
-    examples/Content_Server/SMI_Iterator/Makefile
-    examples/Event_Comm/Makefile
-    examples/Kokyu_dsrt_schedulers/Makefile
-    examples/Kokyu_dsrt_schedulers/fp_example/Makefile
-    examples/Kokyu_dsrt_schedulers/mif_example/Makefile
-    examples/Kokyu_dsrt_schedulers/muf_example/Makefile
-    examples/Load_Balancing/Makefile
-    examples/Load_Balancing_persistent/Makefile
-    examples/Logging/Makefile
-    examples/OBV/Makefile
-    examples/OBV/Typed_Events/Makefile
-    examples/Persistent_Grid/Makefile
-    examples/PluggableUDP/Makefile
-    examples/PluggableUDP/tests/Makefile
-    examples/PluggableUDP/tests/Performance/Makefile
-    examples/PluggableUDP/tests/SimplePerformance/Makefile
-    examples/Quoter/Makefile
-    examples/RTCORBA/Makefile
-    examples/RTCORBA/Activity/Makefile
-    examples/RTScheduling/Makefile
-    examples/RTScheduling/MIF_Scheduler/Makefile
-    examples/RTScheduling/Fixed_Priority_Scheduler/Makefile
-    examples/Simple/Makefile
-    examples/Simple/bank/Makefile
-    examples/Simple/chat/Makefile
-    examples/Simple/echo/Makefile
-    examples/Simple/grid/Makefile
-    examples/Simple/time-date/Makefile
-    examples/Simple/time/Makefile
-    examples/Simulator/Makefile
-    examples/Simulator/Event_Supplier/Makefile
-    examples/TypeCode_Creation/Makefile
-    examples/ior_corbaloc/Makefile
-    examples/mfc/Makefile
-    orbsvcs/examples/Makefile
-    orbsvcs/examples/CosEC/Makefile
-    orbsvcs/examples/CosEC/Factory/Makefile
-    orbsvcs/examples/CosEC/RtEC_Based/Makefile
-    orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile
-    orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile
-    orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile
-    orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile
-    orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile
-    orbsvcs/examples/CosEC/Simple/Makefile
-    orbsvcs/examples/CosEC/TypedSimple/Makefile
-    orbsvcs/examples/FaultTolerance/Makefile
-    orbsvcs/examples/FaultTolerance/RolyPoly/Makefile
-    orbsvcs/examples/ImR/Makefile
-    orbsvcs/examples/ImR/Advanced/Makefile
-    orbsvcs/examples/ImR/Combined_Service/Makefile
-    orbsvcs/examples/LoadBalancing/Makefile
-    orbsvcs/examples/Log/Makefile
-    orbsvcs/examples/Log/Basic/Makefile
-    orbsvcs/examples/Log/Event/Makefile
-    orbsvcs/examples/Log/Notify/Makefile
-    orbsvcs/examples/Log/RTEvent/Makefile
-    orbsvcs/examples/Notify/Makefile
-    orbsvcs/examples/Notify/Federation/Makefile
-    orbsvcs/examples/Notify/Federation/Gate/Makefile
-    orbsvcs/examples/Notify/Federation/Agent/Makefile
-    orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile
-    orbsvcs/examples/Notify/Filter/Makefile
-  ])
-fi
-
-if test $tao_build_tests = yes; then
-  AC_CONFIG_FILES([
-    interop-tests/Makefile
-    interop-tests/wchar/Makefile
-    orbsvcs/tests/Makefile
-    orbsvcs/tests/Notify/Makefile
-    orbsvcs/tests/Notify/lib/Makefile
-    orbsvcs/examples/Notify/Lanes/Makefile
-    orbsvcs/examples/Notify/MC/Makefile
-    orbsvcs/examples/Notify/MC/monitor/Makefile
-    orbsvcs/examples/Notify/Subscribe/Makefile
-    orbsvcs/examples/Notify/ThreadPool/Makefile
-    orbsvcs/examples/ORT/Makefile
-    orbsvcs/examples/RtEC/Makefile
-    orbsvcs/examples/RtEC/IIOPGateway/Makefile
-    orbsvcs/examples/RtEC/Kokyu/Makefile
-    orbsvcs/examples/RtEC/MCast/Makefile
-    orbsvcs/examples/RtEC/Schedule/Makefile
-    orbsvcs/examples/RtEC/Simple/Makefile
-    orbsvcs/examples/Security/Makefile
-    orbsvcs/examples/Security/Send_File/Makefile
-    orbsvcs/performance-tests/Makefile
-    orbsvcs/performance-tests/LoadBalancing/Makefile
-    orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile
-    orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile
-    orbsvcs/performance-tests/RTEvent/Makefile
-    orbsvcs/performance-tests/RTEvent/lib/Makefile
-    orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile
-    orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile
-    orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile
-    orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile
-    orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile
-    orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile
-    orbsvcs/tests/AVStreams/Makefile
-    orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile
-    orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile
-    orbsvcs/tests/AVStreams/Component_Switching/Makefile
-    orbsvcs/tests/AVStreams/Full_Profile/Makefile
-    orbsvcs/tests/AVStreams/Latency/Makefile
-    orbsvcs/tests/AVStreams/Modify_QoS/Makefile
-    orbsvcs/tests/AVStreams/Multicast/Makefile
-    orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
-    orbsvcs/tests/AVStreams/Multiple_Flows/Makefile
-    orbsvcs/tests/AVStreams/Pluggable/Makefile
-    orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile
-    orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile
-    orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile
-    orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile
-    orbsvcs/tests/BiDir_CORBALOC/Makefile
-    orbsvcs/tests/Bug_1334_Regression/Makefile
-    orbsvcs/tests/Bug_1393_Regression/Makefile
-    orbsvcs/tests/Bug_1395_Regression/Makefile
-    orbsvcs/tests/Bug_1630_Regression/Makefile
-    orbsvcs/tests/Bug_2074_Regression/Makefile
-    orbsvcs/tests/Bug_2137_Regression/Makefile
-    orbsvcs/tests/Bug_2247_Regression/Makefile
-    orbsvcs/tests/Bug_2248_Regression/Makefile
-    orbsvcs/tests/Bug_2285_Regression/Makefile
-    orbsvcs/tests/Bug_2287_Regression/Makefile
-    orbsvcs/tests/Bug_2316_Regression/Makefile
-    orbsvcs/tests/Bug_2377_Regression/Makefile
-    orbsvcs/tests/Bug_2615_Regression/Makefile
-    orbsvcs/tests/Bug_2709_Regression/Makefile
-    orbsvcs/tests/Bug_2800_Regression/Makefile
-    orbsvcs/tests/Bug_2925_Regression/Makefile
-    orbsvcs/tests/Bug_3215_Regression/Makefile
-    orbsvcs/tests/Bug_3216_Regression/Makefile
-    orbsvcs/tests/COIOP_Naming_Test/Makefile
-    orbsvcs/tests/Concurrency/Makefile
-    orbsvcs/tests/CosEvent/Makefile
-    orbsvcs/tests/CosEvent/lib/Makefile
-    orbsvcs/tests/CosEvent/Basic/Makefile
-    orbsvcs/tests/CosEvent/Timeout/Makefile
-    orbsvcs/tests/EC_Custom_Marshal/Makefile
-    orbsvcs/tests/EC_MT_Mcast/Makefile
-    orbsvcs/tests/EC_Mcast/Makefile
-    orbsvcs/tests/EC_Multiple/Makefile
-    orbsvcs/tests/EC_Throughput/Makefile
-    orbsvcs/tests/Event/Makefile
-    orbsvcs/tests/Event/lib/Makefile
-    orbsvcs/tests/Event/Basic/Makefile
-    orbsvcs/tests/Event/Mcast/Makefile
-    orbsvcs/tests/Event/Mcast/AddrServer/Makefile
-    orbsvcs/tests/Event/Mcast/Common/Makefile
-    orbsvcs/tests/Event/Mcast/Complex/Makefile
-    orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile
-    orbsvcs/tests/Event/Mcast/Simple/Makefile
-    orbsvcs/tests/Event/Mcast/Two_Way/Makefile
-    orbsvcs/tests/Event/Performance/Makefile
-    orbsvcs/tests/Event/ThreadFlags/Makefile
-    orbsvcs/tests/Event/UDP/Makefile
-    orbsvcs/tests/FT_App/Makefile
-    orbsvcs/tests/FaultTolerance/Makefile
-    orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile
-    orbsvcs/tests/FaultTolerance/IOGR/Makefile
-    orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
-    orbsvcs/tests/FtRtEvent/Makefile
-    orbsvcs/tests/HTIOP/Makefile
-    orbsvcs/tests/HTIOP/AMI/Makefile
-    orbsvcs/tests/HTIOP/BiDirectional/Makefile
-    orbsvcs/tests/HTIOP/Hello/Makefile
-    orbsvcs/tests/IOR_MCast/Makefile
-    orbsvcs/tests/ImplRepo/Makefile
-    orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile
-    orbsvcs/tests/ImplRepo/Bug_689_Regression/Makefile
-    orbsvcs/tests/ImplRepo/NameService/Makefile
-    orbsvcs/tests/ImplRepo/scale/Makefile
-    orbsvcs/tests/InterfaceRepo/Makefile
-    orbsvcs/tests/InterfaceRepo/Application_Test/Makefile
-    orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile
-    orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile
-    orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Makefile
-    orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Makefile
-    orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile
-    orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile
-    orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile
-    orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile
-    orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile
-    orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile
-    orbsvcs/tests/Interoperable_Naming/Makefile
-    orbsvcs/tests/LoadBalancing/Makefile
-    orbsvcs/tests/LoadBalancing/GenericFactory/Makefile
-    orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile
-    orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile
-    orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile
-    orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile
-    orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile
-    orbsvcs/tests/Log/Makefile
-    orbsvcs/tests/Log/Basic_Log_Test/Makefile
-    orbsvcs/tests/Miop/Makefile
-    orbsvcs/tests/Miop/McastHello/Makefile
-    orbsvcs/tests/Notify/Basic/Makefile
-    orbsvcs/tests/Notify/Blocking/Makefile
-    orbsvcs/tests/Notify/Bug_1385_Regression/Makefile
-    orbsvcs/tests/Notify/Bug_2561_Regression/Makefile
-    orbsvcs/tests/Notify/Bug_3252_Regression/Makefile
-    orbsvcs/tests/Notify/Destroy/Makefile
-    orbsvcs/tests/Notify/Discarding/Makefile
-    orbsvcs/tests/Notify/Driver/Makefile
-    orbsvcs/tests/Notify/MC/Makefile
-    orbsvcs/tests/Notify/MT_Dispatching/Makefile
-    orbsvcs/tests/Notify/Ordering/Makefile
-    orbsvcs/tests/Notify/Persistent_Filter/Makefile
-    orbsvcs/tests/Notify/Persistent_POA/Makefile
-    orbsvcs/tests/Notify/PluggableTopology/Makefile
-    orbsvcs/tests/Notify/RT_lib/Makefile
-    orbsvcs/tests/Notify/Reconnecting/Makefile
-    orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
-    orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
-    orbsvcs/tests/Notify/Structured_Filter/Makefile
-    orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
-    orbsvcs/tests/Notify/Test_Filter/Makefile
-    orbsvcs/tests/Notify/XML_Persistence/Makefile
-    orbsvcs/tests/Notify/performance-tests/Makefile
-    orbsvcs/tests/Notify/performance-tests/Filter/Makefile
-    orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
-    orbsvcs/tests/Notify/performance-tests/Throughput/Makefile
-    orbsvcs/tests/Notify/Timeout/Makefile
-    orbsvcs/tests/Notify/Validate_Client/Makefile
-    orbsvcs/tests/Property/Makefile
-    orbsvcs/tests/Redundant_Naming/Makefile
-    orbsvcs/tests/Sched/Makefile
-    orbsvcs/tests/Sched_Conf/Makefile
-    orbsvcs/tests/Security/Makefile
-    orbsvcs/tests/Security/BiDirectional/Makefile
-    orbsvcs/tests/Security/Big_Request/Makefile
-    orbsvcs/tests/Security/Bug_1107_Regression/Makefile
-    orbsvcs/tests/Security/Bug_2908_Regression/Makefile
-    orbsvcs/tests/Security/Callback/Makefile
-    orbsvcs/tests/Security/Crash_Test/Makefile
-    orbsvcs/tests/Security/EndpointPolicy/Makefile
-    orbsvcs/tests/Security/InsecureReferences/Makefile
-    orbsvcs/tests/Security/MT_IIOP_SSL/Makefile
-    orbsvcs/tests/Security/MT_SSLIOP/Makefile
-    orbsvcs/tests/Security/Secure_Invocation/Makefile
-    orbsvcs/tests/Security/mixed_security_test/Makefile
-    orbsvcs/tests/Security/ssliop_CSD/Makefile
-    orbsvcs/tests/Security/ssliop_corbaloc/Makefile
-    orbsvcs/tests/Simple_Naming/Makefile
-    orbsvcs/tests/Time/Makefile
-    orbsvcs/tests/Trading/Makefile
-    orbsvcs/tests/ior_corbaname/Makefile
-    orbsvcs/tests/tests_svc_loader/Makefile
-    orbsvcs/tests/unit/Makefile
-    orbsvcs/tests/unit/Notify/Makefile
-    orbsvcs/tests/unit/Notify/MC/Makefile
-    orbsvcs/tests/unit/Notify/MC/Control/Makefile
-    orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile
-    orbsvcs/tests/unit/Notify/MC/MonitorManager/Makefile
-    orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/Makefile
-    orbsvcs/tests/unit/Notify/MC/Statistic/Makefile
-    orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Makefile
-    orbsvcs/tests/unit/Trading/Makefile
-    orbsvcs/tests/unit/Trading/Interpreter/Makefile
-    performance-tests/Makefile
-    performance-tests/Anyop/Makefile
-    performance-tests/CSD_Strategy/Makefile
-    performance-tests/CSD_Strategy/TestInf/Makefile
-    performance-tests/CSD_Strategy/TestServant/Makefile
-    performance-tests/CSD_Strategy/TestApps/Makefile
-    performance-tests/Callback/Makefile
-    performance-tests/Cubit/Makefile
-    performance-tests/Cubit/TAO/Makefile
-    performance-tests/Cubit/TAO/IDL_Cubit/Makefile
-    performance-tests/Cubit/TAO/DII_Cubit/Makefile
-    performance-tests/Cubit/TAO/MT_Cubit/Makefile
-    performance-tests/Latency/Makefile
-    performance-tests/Latency/AMH_Single_Threaded/Makefile
-    performance-tests/Latency/AMI/Makefile
-    performance-tests/Latency/Collocation/Makefile
-    performance-tests/Latency/DII/Makefile
-    performance-tests/Latency/DSI/Makefile
-    performance-tests/Latency/Deferred/Makefile
-    performance-tests/Latency/Single_Threaded/Makefile
-    performance-tests/Latency/Thread_Per_Connection/Makefile
-    performance-tests/Latency/Thread_Pool/Makefile
-    performance-tests/Memory/Makefile
-    performance-tests/Memory/IORsize/Makefile
-    performance-tests/Memory/Single_Threaded/Makefile
-    performance-tests/POA/Makefile
-    performance-tests/POA/Create_Reference/Makefile
-    performance-tests/POA/Demux/Makefile
-    performance-tests/POA/Implicit_Activation/Makefile
-    performance-tests/POA/Object_Creation_And_Registration/Makefile
-    performance-tests/Pluggable/Makefile
-    performance-tests/Protocols/Makefile
-    performance-tests/RTCorba/Makefile
-    performance-tests/RTCorba/Multiple_Endpoints/Makefile
-    performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile
-    performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile
-    performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile
-    performance-tests/RTCorba/Oneways/Makefile
-    performance-tests/RTCorba/Oneways/Reliable/Makefile
-    performance-tests/RTCorba/Thread_Pool/Makefile
-    performance-tests/Sequence_Latency/Makefile
-    performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile
-    performance-tests/Sequence_Latency/AMI/Makefile
-    performance-tests/Sequence_Latency/DII/Makefile
-    performance-tests/Sequence_Latency/DSI/Makefile
-    performance-tests/Sequence_Latency/Deferred/Makefile
-    performance-tests/Sequence_Latency/Single_Threaded/Makefile
-    performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile
-    performance-tests/Sequence_Latency/Thread_Pool/Makefile
-    performance-tests/Throughput/Makefile
-    tests/Makefile
-    tests/AMH_Exceptions/Makefile
-    tests/AMH_Oneway/Makefile
-    tests/AMI/Makefile
-    tests/AMI_Buffering/Makefile
-    tests/AMI_Timeouts/Makefile
-    tests/Abstract_Interface/Makefile
-    tests/Any/Makefile
-    tests/Any/Recursive/Makefile
-    tests/BiDirectional/Makefile
-    tests/BiDirectional_DelayedUpcall/Makefile
-    tests/BiDirectional_MultipleORB/Makefile
-    tests/BiDirectional_NestedUpcall/Makefile
-    tests/Big_AMI/Makefile
-    tests/Big_Oneways/Makefile
-    tests/Big_Reply/Makefile
-    tests/Big_Request_Muxing/Makefile
-    tests/Big_Twoways/Makefile
-    tests/Blocking_Sync_None/Makefile
-    tests/Bug_1020_Basic_Regression/Makefile
-    tests/Bug_1020_Regression/Makefile
-    tests/Bug_1254_Regression/Makefile
-    tests/Bug_1269_Regression/Makefile
-    tests/Bug_1270_Regression/Makefile
-    tests/Bug_1330_Regression/Makefile
-    tests/Bug_1361_Regression/Makefile
-    tests/Bug_1383_Regression/Makefile
-    tests/Bug_1476_Regression/Makefile
-    tests/Bug_1476_Test/Makefile
-    tests/Bug_1482_Regression/Makefile
-    tests/Bug_1495_Regression/Makefile
-    tests/Bug_1535_Regression/Makefile
-    tests/Bug_1551_Regression/Makefile
-    tests/Bug_1568_Regression/Makefile
-    tests/Bug_1627_Regression/Makefile
-    tests/Bug_1635_Regression/Makefile
-    tests/Bug_1636_Regression/Makefile
-    tests/Bug_1639_Regression/Makefile
-    tests/Bug_1670_Regression/Makefile
-    tests/Bug_1676_Regression/Makefile
-    tests/Bug_1693_Test/Makefile
-    tests/Bug_1812_Regression/Makefile
-    tests/Bug_1813_Regression/Makefile
-    tests/Bug_1869_Regression/Makefile
-    tests/Bug_1904_Regression/Makefile
-    tests/Bug_2084_Regression/Makefile
-    tests/Bug_2085_Regression/Makefile
-    tests/Bug_2119_Regression/Makefile
-    tests/Bug_2122_Regression/Makefile
-    tests/Bug_2124_Regression/Makefile
-    tests/Bug_2126_Regression/Makefile
-    tests/Bug_2134_Regression/Makefile
-    tests/Bug_2144_Regression/Makefile
-    tests/Bug_2174_Regression/Makefile
-    tests/Bug_2183_Regression/Makefile
-    tests/Bug_2186_Regression/Makefile
-    tests/Bug_2188_Regression/Makefile
-    tests/Bug_2201_Regression/Makefile
-    tests/Bug_2222_Regression/Makefile
-    tests/Bug_2234_Regression/Makefile
-    tests/Bug_2243_Regression/Makefile
-    tests/Bug_2289_Regression/Makefile
-    tests/Bug_2319_Regression/Makefile
-    tests/Bug_2328_Regression/Makefile
-    tests/Bug_2345_Regression/Makefile
-    tests/Bug_2349_Regression/Makefile
-    tests/Bug_2356_Regression/Makefile
-    tests/Bug_2375_Regression/Makefile
-    tests/Bug_2399_Regression/Makefile
-    tests/Bug_2417_Regression/Makefile
-    tests/Bug_2419_Regression/Makefile
-    tests/Bug_2424_Regression/Makefile
-    tests/Bug_2429_Regression/Makefile
-    tests/Bug_2494_Regression/Makefile
-    tests/Bug_2503_Regression/Makefile
-    tests/Bug_2542_Regression/Makefile
-    tests/Bug_2543_Regression/Makefile
-    tests/Bug_2549_Regression/Makefile
-    tests/Bug_2560_Regression/Makefile
-    tests/Bug_2593_Regression/Makefile
-    tests/Bug_2595_Regression/Makefile
-    tests/Bug_2654_Regression/Makefile
-    tests/Bug_2669_Regression/Makefile
-    tests/Bug_2677_Regression/Makefile
-    tests/Bug_2678_Regression/Makefile
-    tests/Bug_2683_Regression/Makefile
-    tests/Bug_2702_Regression/Makefile
-    tests/Bug_2734_Regression/Makefile
-    tests/Bug_2735_Regression/Makefile
-    tests/Bug_2768_Regression/Makefile
-    tests/Bug_2791_Regression/Makefile
-    tests/Bug_2792_Regression/Makefile
-    tests/Bug_2795_Regression/Makefile
-    tests/Bug_2804_Regression/Makefile
-    tests/Bug_2805_Regression/Makefile
-    tests/Bug_2809_Regression/Makefile
-    tests/Bug_2826_Regression/Makefile
-    tests/Bug_2844_Regression/Makefile
-    tests/Bug_2869_Regression/Makefile
-    tests/Bug_2909_Regression/Makefile
-    tests/Bug_2918_Regression/Makefile
-    tests/Bug_2935_Regression/Makefile
-    tests/Bug_2936_Regression/Makefile
-    tests/Bug_2953_Regression/Makefile
-    tests/Bug_2966_Regression/Makefile
-    tests/Bug_3000_Regression/Makefile
-    tests/Bug_3042_Regression/Makefile
-    tests/Bug_3108_Regression/Makefile
-    tests/Bug_3163_Regression/Makefile
-    tests/Bug_3171_Regression/Makefile
-    tests/Bug_3198_Regression/Makefile
-    tests/Bug_3251_Regression/Makefile
-    tests/Bug_3276_Regression/Makefile
-    tests/Bug_3299_Regression/Makefile
-    tests/Bug_3311_Regression/Makefile
-    tests/Bug_3315_Regression/Makefile
-    tests/Bug_3321_Regression/Makefile
-    tests/Bug_933_Regression/Makefile
-    tests/CDR/Makefile
-    tests/COIOP/Makefile
-    tests/CORBA_e_Implicit_Activation/Makefile
-    tests/CSD_Collocation/Makefile
-    tests/CSD_Strategy_Tests/Makefile
-    tests/CSD_Strategy_Tests/TP_Common/Makefile
-    tests/CSD_Strategy_Tests/TP_Foo_B/Makefile
-    tests/CSD_Strategy_Tests/Broken/Makefile
-    tests/CSD_Strategy_Tests/TP_Foo_A/Makefile
-    tests/CSD_Strategy_Tests/TP_Foo_C/Makefile
-    tests/CSD_Strategy_Tests/TP_Test_1/Makefile
-    tests/CSD_Strategy_Tests/TP_Test_2/Makefile
-    tests/CSD_Strategy_Tests/TP_Test_3/Makefile
-    tests/CSD_Strategy_Tests/TP_Test_4/Makefile
-    tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile
-    tests/CSD_Strategy_Tests/TP_Test_Static/Makefile
-    tests/Cache_Growth_Test/Makefile
-    tests/CallbackTest/Makefile
-    tests/Client_Leaks/Makefile
-    tests/CodeSets/Makefile
-    tests/CodeSets/libs/Makefile
-    tests/CodeSets/libs/IBM1047_ISO8859/Makefile
-    tests/CodeSets/libs/UCS4_UTF16/Makefile
-    tests/CodeSets/libs/UTF16_UCS2/Makefile
-    tests/CodeSets/simple/Makefile
-    tests/Codec/Makefile
-    tests/Collocated_Forwarding/Makefile
-    tests/Collocation/Makefile
-    tests/CollocationLockup/Makefile
-    tests/Collocation_Exception_Test/Makefile
-    tests/Collocation_Oneway_Tests/Makefile
-    tests/Collocation_Opportunities/Makefile
-    tests/Collocation_Tests/Makefile
-    tests/Compression/Makefile
-    tests/Connect_Strategy_Test/Makefile
-    tests/Connection_Failure/Makefile
-    tests/Connection_Purging/Makefile
-    tests/Connection_Timeout/Makefile
-    tests/Crash_On_Write/Makefile
-    tests/Crashed_Callback/Makefile
-    tests/DII_AMI_Forward/Makefile
-    tests/DII_Collocation_Tests/Makefile
-    tests/DII_Collocation_Tests/oneway/Makefile
-    tests/DII_Collocation_Tests/twoway/Makefile
-    tests/DIOP/Makefile
-    tests/DLL_ORB/Makefile
-    tests/DSI_AMH/Makefile
-    tests/DSI_AMI_Gateway/Makefile
-    tests/DSI_Gateway/Makefile
-    tests/DiffServ/Makefile
-    tests/DynAny_Test/Makefile
-    tests/DynUnion_Test/Makefile
-    tests/Explicit_Event_Loop/Makefile
-    tests/Exposed_Policies/Makefile
-    tests/FL_Cube/Makefile
-    tests/Faults/Makefile
-    tests/File_IO/Makefile
-    tests/Forwarding/Makefile
-    tests/GIOP_Fragments/Makefile
-    tests/GIOP_Fragments/Java_Big_Reply/Makefile
-    tests/GIOP_Fragments/Java_Big_Request/Makefile
-    tests/GIOP_Fragments/PMB_With_Fragments/Makefile
-    tests/HandleExhaustion/Makefile
-    tests/Hang_Shutdown/Makefile
-    tests/Hello/Makefile
-    tests/ICMG_Any_Bug/Makefile
-    tests/IDL_Test/Makefile
-    tests/IORManipulation/Makefile
-    tests/IORManipulation/filter/Makefile
-    tests/IOR_Endpoint_Hostnames/Makefile
-    tests/IPV6/Makefile
-    tests/InterOp-Naming/Makefile
-    tests/Leader_Followers/Makefile
-    tests/LongDouble/Makefile
-    tests/LongUpcalls/Makefile
-    tests/MProfile/Makefile
-    tests/MProfile_Connection_Timeout/Makefile
-    tests/MProfile_Forwarding/Makefile
-    tests/MT_BiDir/Makefile
-    tests/MT_Client/Makefile
-    tests/MT_Server/Makefile
-    tests/MT_Timeout/Makefile
-    tests/Monitor/Makefile
-    tests/Monitor/Marshal_Buffer/Makefile
-    tests/Multiple/Makefile
-    tests/Multiple_Inheritance/Makefile
-    tests/Muxed_GIOP_Versions/Makefile
-    tests/Muxing/Makefile
-    tests/Native_Exceptions/Makefile
-    tests/NestedUpcall/Makefile
-    tests/NestedUpcall/MT_Client_Test/Makefile
-    tests/NestedUpcall/Simple/Makefile
-    tests/NestedUpcall/Triangle_Test/Makefile
-    tests/Nested_Event_Loop/Makefile
-    tests/Nested_Upcall_Crash/Makefile
-    tests/No_Server_MT_Connect_Test/Makefile
-    tests/OBV/Makefile
-    tests/OBV/Any/Makefile
-    tests/OBV/Collocated/Makefile
-    tests/OBV/Collocated/Forward/Makefile
-    tests/OBV/Factory/Makefile
-    tests/OBV/Forward/Makefile
-    tests/OBV/Simple/Makefile
-    tests/OBV/TC_Alignment/Makefile
-    tests/OBV/Truncatable/Makefile
-    tests/OBV/ValueBox/Makefile
-    tests/ORB_Local_Config/Makefile
-    tests/ORB_Local_Config/Bug_1459/Makefile
-    tests/ORB_Local_Config/Bug_2612/Makefile
-    tests/ORB_Local_Config/Bunch/Makefile
-    tests/ORB_Local_Config/Separation/Makefile
-    tests/ORB_Local_Config/Service_Dependency/Makefile
-    tests/ORB_Local_Config/Shared/Makefile
-    tests/ORB_Local_Config/Simple/Makefile
-    tests/ORB_Local_Config/Two_DLL_ORB/Makefile
-    tests/ORB_destroy/Makefile
-    tests/ORB_init/Makefile
-    tests/ORB_init/Portspan/Makefile
-    tests/ORB_shutdown/Makefile
-    tests/ORT/Makefile
-    tests/Object_Loader/Makefile
-    tests/Objref_Sequence_Test/Makefile
-    tests/OctetSeq/Makefile
-    tests/Ondemand_Write/Makefile
-    tests/Oneway_Buffering/Makefile
-    tests/Oneway_Send_Timeouts/Makefile
-    tests/Oneway_Timeouts/Makefile
-    tests/Oneways_Invoking_Twoways/Makefile
-    tests/Optimized_Connection/Makefile
-    tests/POA/Makefile
-    tests/POA/Generic_Servant/Makefile
-    tests/POA/Adapter_Activator/Makefile
-    tests/POA/Bug_1592_Regression/Makefile
-    tests/POA/Bug_2511_Regression/Makefile
-    tests/POA/Current/Makefile
-    tests/POA/DSI/Makefile
-    tests/POA/Deactivate_Object/Makefile
-    tests/POA/Default_Servant/Makefile
-    tests/POA/Default_Servant2/Makefile
-    tests/POA/EndpointPolicy/Makefile
-    tests/POA/Etherealization/Makefile
-    tests/POA/Excessive_Object_Deactivations/Makefile
-    tests/POA/Explicit_Activation/Makefile
-    tests/POA/Explicit_Activation/Alt_Resources/Makefile
-    tests/POA/FindPOA/Makefile
-    tests/POA/Forwarding/Makefile
-    tests/POA/Identity/Makefile
-    tests/POA/Loader/Makefile
-    tests/POA/MT_Servant_Locator/Makefile
-    tests/POA/Nested_Non_Servant_Upcalls/Makefile
-    tests/POA/NewPOA/Makefile
-    tests/POA/Non_Servant_Upcalls/Makefile
-    tests/POA/Object_Reactivation/Makefile
-    tests/POA/On_Demand_Activation/Makefile
-    tests/POA/On_Demand_Loading/Makefile
-    tests/POA/POAManagerFactory/Makefile
-    tests/POA/POA_BiDir/Makefile
-    tests/POA/POA_Destruction/Makefile
-    tests/POA/Persistent_ID/Makefile
-    tests/POA/Policies/Makefile
-    tests/POA/Reference_Counted_Servant/Makefile
-    tests/POA/Reference_Counting/Makefile
-    tests/POA/RootPOA/Makefile
-    tests/POA/Single_Threaded_POA/Makefile
-    tests/POA/TIE/Makefile
-    tests/POA/wait_for_completion/Makefile
-    tests/Parallel_Connect_Strategy/Makefile
-    tests/Param_Test/Makefile
-    tests/Permanent_Forward/Makefile
-    tests/Policies/Makefile
-    tests/Portable_Interceptors/Makefile
-    tests/Portable_Interceptors/AMI/Makefile
-    tests/Portable_Interceptors/AdvSlot/Makefile
-    tests/Portable_Interceptors/AdvSlotDblCpy/Makefile
-    tests/Portable_Interceptors/AdvSlotExt/Makefile
-    tests/Portable_Interceptors/Benchmark/Makefile
-    tests/Portable_Interceptors/Bug_1559/Makefile
-    tests/Portable_Interceptors/Bug_2088/Makefile
-    tests/Portable_Interceptors/Bug_2133/Makefile
-    tests/Portable_Interceptors/Bug_2510_Regression/Makefile
-    tests/Portable_Interceptors/Bug_3079/Makefile
-    tests/Portable_Interceptors/Bug_3080/Makefile
-    tests/Portable_Interceptors/Collocated/Makefile
-    tests/Portable_Interceptors/Collocated/Dynamic/Makefile
-    tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile
-    tests/Portable_Interceptors/Dynamic/Makefile
-    tests/Portable_Interceptors/ForwardRequest/Makefile
-    tests/Portable_Interceptors/IORInterceptor/Makefile
-    tests/Portable_Interceptors/ORB_Shutdown/Makefile
-    tests/Portable_Interceptors/PICurrent/Makefile
-    tests/Portable_Interceptors/PolicyFactory/Makefile
-    tests/Portable_Interceptors/Processing_Mode_Policy/Makefile
-    tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile
-    tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile
-    tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile
-    tests/Portable_Interceptors/Redirection/Makefile
-    tests/Portable_Interceptors/Register_Initial_References/Makefile
-    tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile
-    tests/Portable_Interceptors/Service_Context_Manipulation/Makefile
-    tests/Portable_Interceptors/Slot/Makefile
-    tests/QtTests/Makefile
-    tests/Queued_Message_Test/Makefile
-    tests/RTCORBA/Makefile
-    tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile
-    tests/RTCORBA/Banded_Connections/Makefile
-    tests/RTCORBA/Client_Propagated/Makefile
-    tests/RTCORBA/Client_Protocol/Makefile
-    tests/RTCORBA/Collocation/Makefile
-    tests/RTCORBA/Destroy_Thread_Pool/Makefile
-    tests/RTCORBA/Diffserv/Makefile
-    tests/RTCORBA/Dynamic_Thread_Pool/Makefile
-    tests/RTCORBA/Explicit_Binding/Makefile
-    tests/RTCORBA/Linear_Priority/Makefile
-    tests/RTCORBA/MT_Client_Protocol_Priority/Makefile
-    tests/RTCORBA/ORB_init/Makefile
-    tests/RTCORBA/Persistent_IOR/Makefile
-    tests/RTCORBA/Policies/Makefile
-    tests/RTCORBA/Policy_Combinations/Makefile
-    tests/RTCORBA/Priority_Inversion_With_Bands/Makefile
-    tests/RTCORBA/Private_Connection/Makefile
-    tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile
-    tests/RTCORBA/RTMutex/Makefile
-    tests/RTCORBA/Server_Declared/Makefile
-    tests/RTCORBA/Server_Protocol/Makefile
-    tests/RTCORBA/Thread_Pool/Makefile
-    tests/RTScheduling/Makefile
-    tests/RTScheduling/Current/Makefile
-    tests/RTScheduling/DT_Spawn/Makefile
-    tests/RTScheduling/Scheduling_Interceptor/Makefile
-    tests/RTScheduling/Thread_Cancel/Makefile
-    tests/RTScheduling/VoidData/Makefile
-    tests/Reliable_Oneways/Makefile
-    tests/Sequence_Unit_Tests/Makefile
-    tests/Servant_To_Reference_Test/Makefile
-    tests/Server_Connection_Purging/Makefile
-    tests/Server_Leaks/Makefile
-    tests/Server_Port_Zero/Makefile
-    tests/Single_Read/Makefile
-    tests/Smart_Proxies/Makefile
-    tests/Smart_Proxies/Benchmark/Makefile
-    tests/Smart_Proxies/Collocation/Makefile
-    tests/Smart_Proxies/On_Demand/Makefile
-    tests/Smart_Proxies/Policy/Makefile
-    tests/Smart_Proxies/dtor/Makefile
-    tests/Stack_Recursion/Makefile
-    tests/Strategies/Makefile
-    tests/Timed_Buffered_Oneways/Makefile
-    tests/Timeout/Makefile
-    tests/TransportCurrent/Makefile
-    tests/TransportCurrent/lib/Makefile
-    tests/TransportCurrent/Framework/Makefile
-    tests/TransportCurrent/IIOP/Makefile
-    tests/Two_Objects/Makefile
-    tests/Typedef_String_Array/Makefile
-    tests/UNKNOWN_Exception/Makefile
-    tests/Xt_Stopwatch/Makefile
-    tests/objref_comparison_test/Makefile
-  ])
-  AC_CONFIG_COMMANDS([bug_2399], [
-      mkdir -p tests/Bug_2399_Regression/mytmp
-   ],[])
-fi
-
-dnl Note that the "TAO_VERSION" in the message below is an M4 macro
-dnl that expands to the version of TAO being configured.
-AC_CONFIG_COMMANDS([default],[
-  echo ""
-  echo "Configuration of TAO TAO_VERSION is now complete."
-  echo ""
- ],[])
-AC_OUTPUT
diff --git a/docs/Makefile.am b/docs/Makefile.am
deleted file mode 100644
index 0c191d44985..00000000000
--- a/docs/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        tutorials
-
diff --git a/docs/Options.html b/docs/Options.html
index 25aaa913c81..fd8b5147c48 100644
--- a/docs/Options.html
+++ b/docs/Options.html
@@ -702,8 +702,8 @@ is <code>0</code>. This option is disabled (<code>0</code>) by default.</td>
         specifies the third lane of that thread pool.  Note that
         <code>0</code> should be used for the lane when specifying
         endpoints for thread pools without lanes. <code>*:*</code>
-	can be used to specify all pools and lanes, <code>1:*</code> means 
- 	all lanes from pool <code>1</code>, and <code>*:1</code> 
+	can be used to specify all pools and lanes, <code>1:*</code> means
+ 	all lanes from pool <code>1</code>, and <code>*:1</code>
         means lane <code>1</code> from all pools.
 
         <p>Sets of endpoints may be specified using multiple
@@ -890,54 +890,54 @@ Repository</a>. </td>
       <tr>
         <td><code>-ORBDaemon</code></td>
         <td>Specifies that the ORB should <em>daemonize</em> itself, <em>i.e.</em>,
-run as a background process. Note, that this changes the working directory to 
+run as a background process. Note, that this changes the working directory to
 be the root directory "/". This especially affects relative paths specified at the command line.
 This option is only meaningful on OS platforms that support daemonization.</td>
       </tr>
       <tr>
         <td><code>-ORBForwardInvocationOnObjectNotExist</code> <em>boolean (0|1)</em></td>
-        <td>If this option is 1, the ORB forwards the request to next available profile when 
-        receiving OBJECT_NOT_EXIST exception reply. The default value is <CODE>0</CODE>  
-        which means the request is not forwarded upon OBJECT_NOT_EXIST exception.  
+        <td>If this option is 1, the ORB forwards the request to next available profile when
+        receiving OBJECT_NOT_EXIST exception reply. The default value is <CODE>0</CODE>
+        which means the request is not forwarded upon OBJECT_NOT_EXIST exception.
         </td>
       </tr>
       <tr>
         <td><code>-ORBForwardOnceOnObjectNotExist</code> <em>boolean (0|1)</em></td>
-        <td>If this option is 1, the ORB forwards the request if it 
+        <td>If this option is 1, the ORB forwards the request if it
         receives OBJECT_NOT_EXIST exception reply. If it receives one of the exceptions
        (OBJECT_NOT_EXIST, COMM_FAILURE, TRANSIENT, INV_OBJREF) during forwarding,
-        the request is not forwarded again and exception is propagated to the client 
-        code. The default value is <CODE>0</CODE> which means the request 
-        is not forwarded upon OBJECT_NOT_EXIST exception.  
+        the request is not forwarded again and exception is propagated to the client
+        code. The default value is <CODE>0</CODE> which means the request
+        is not forwarded upon OBJECT_NOT_EXIST exception.
         </td>
       </tr>
       <tr>
         <td><code>-ORBForwardOnceOnCommFailure</code> <em>boolean (0|1)</em></td>
-        <td>If this option is 1, the ORB forwards the request if it 
+        <td>If this option is 1, the ORB forwards the request if it
         receives COMM_FAILURE exception reply. If it receives one of the exceptions
         (OBJECT_NOT_EXIST, COMM_FAILURE, TRANSIENT, INV_OBJREF) during forwarding,
         the request is not forwarded again and exception is propagated to the client
-        code. The default value is <CODE>0</CODE> which means the request is not forwarded upon 
+        code. The default value is <CODE>0</CODE> which means the request is not forwarded upon
         COMM_FAILURE exception.
         </td>
       </tr>
       <tr>
         <td><code>-ORBForwardOnceOnTransient</code> <em>boolean (0|1)</em></td>
-        <td>If this option is 1, the ORB forwards the request if it 
+        <td>If this option is 1, the ORB forwards the request if it
         receives TRANSIENT exception reply. If it receives one of the exceptions
        (OBJECT_NOT_EXIST, COMM_FAILURE, TRANSIENT, INV_OBJREF) during forwarding,
-        the request is not forwarded again and exception is propagated to the client 
-        code. The default value is <CODE>0</CODE> which means the request 
+        the request is not forwarded again and exception is propagated to the client
+        code. The default value is <CODE>0</CODE> which means the request
         is not forwarded upon TRANSIENT exception.
         </td>
       </tr>
       <tr>
         <td><code>-ORBForwardOnceOnInvObjref</code> <em>boolean (0|1)</em></td>
-        <td>If this option is 1, the ORB forwards the request if it 
+        <td>If this option is 1, the ORB forwards the request if it
         receives INV_OBJREF exception reply. If it receives one of the exceptions
        (OBJECT_NOT_EXIST, COMM_FAILURE, TRANSIENT, INV_OBJREF) during forwarding,
-        the request is not forwarded again and exception is propagated to the client 
-        code. The default value is <CODE>0</CODE> which means the request 
+        the request is not forwarded again and exception is propagated to the client
+        code. The default value is <CODE>0</CODE> which means the request
         is not forwarded upon INV_OBJREF exception.
         </td>
       </tr>
@@ -1161,32 +1161,6 @@ used to guarantee exclusive access, and <code>null</code>, which
 specifies that no locking be performed. The default is thread. </td>
       </tr>
       <tr>
-        <td><code>-ORBCorbaObjectLock</code> <em>locktype</em></td>
-        <td><a name="-ORBCorbaObjectLock"></a> Specify the type of lock
-to be used by CORBA::Object. The lock is needed within the CORBA object
-to synchronize the state when the same object is shared by multiple
-threads. Possible values for lock type are <code>thread</code>, which
-specifies that an inter-thread mutex is used to guarantee exclusive
-access, and <code>null</code>, which specifies that no locking be
-performed. The default is thread. The <code>null</code> lock option is
-useful when there is only one thread in the system. This option can be
-used to minimize the amount of memory consumed by the locks in
-applications where locks are not needed. The memory growth problem gets
-particularly exacerbated for applications dealing with hundreds and
-thousands of objects. </td>
-      </tr>
-      <tr>
-        <td><code>-ORBObjectKeyTableLock</code> <em>locktype</em></td>
-        <td><a name="-ORBObjectKeyTableLock"></a> Specify the type of
-lock to be used by the ObjectKey table. ObjectKey table keeps track of
-the ObjectKeys that are generated and made available through IORs. The
-table manages the life time of the object keys within the ORB through a
-reference counting mechanism. Possible values for lock type are <code>thread</code>,
-which specifies that an inter-thread mutex is used to guarantee
-exclusive access, and <code>null</code>, which specifies that no
-locking be performed. The default is thread. </td>
-      </tr>
-      <tr>
         <td><code>-ORBFlushingStrategy</code> <em>type</em></td>
         <td><a name="-ORBFlushingStrategy"></a>By default TAO provides
 three strategies to flush queued messages. The <code>leader_follower</code>
@@ -1520,14 +1494,6 @@ any logical-OR combination of <code>THR_DETACHED</code>, <code>THR_BOUND</code>,
         <code>THR_NEW_LWP</code>, <code>THE_SUSPENDED</code>. The
 default is <code>THR_BOUND | THR_DETACHED</code> . </td>
       </tr>
-      <tr>
-        <td><code>-ORBPOALock</code> <em>lock type</em></td>
-        <td><a name="-ORBPOALock"></a>Specify the type of lock to be
-used for POA accesses. Possible values for <em>lock type</em> are <code>thread</code>,
-which specifies that an inter-thread mutex is used to guarantee
-exclusive access, and <code>null</code>, which specifies that no
-locking be performed. The default is <code>thread</code>.</td>
-      </tr>
     </tbody>
   </table>
   </p>
@@ -1562,15 +1528,6 @@ file.</p>
         <th>Description</th>
       </tr>
       <tr>
-        <td><code><a name="#-ORBProfileLock">-ORBProfileLock</a></code>
-        <em>which</em></td>
-        <td>Specify the kind of synchronization primitive for the
-Profiles. Default is <em>thread</em>, which means that a regular
-thread mutex is used. The second option is <em>null</em>, which means
-a null lock is used. This makes sense in case of optimizations and is
-allowed when no forwarding is used or only a single threaded client. </td>
-      </tr>
-      <tr>
         <td><code>-ORBClientConnectionHandler</code> <em>MT | ST | RW
         / MT_NOUPCALL</em><br>
         <code>-ORBWaitStrategy</code> <em>MT / ST / RW / MT_NOUPCALL
diff --git a/tao/PP_Memory_Management.txt b/docs/PP_Memory_Management.txt
index f9516139582..f9516139582 100644
--- a/tao/PP_Memory_Management.txt
+++ b/docs/PP_Memory_Management.txt
diff --git a/docs/compiler.html b/docs/compiler.html
index 5e64664e075..2add0d21c33 100644
--- a/docs/compiler.html
+++ b/docs/compiler.html
@@ -30,10 +30,10 @@ Developer's Guide</A>.<P>
 <HR><P>
 <h3>Optional CIAO Functionality</h3>
 
-For users of the <b>Component Integrated ACE ORB</b> 
+For users of the <b>Component Integrated ACE ORB</b>
 (<a href="http://www.cs.wustl.edu/~schmidt/CIAO.html"> CIAO</a>), it is
 important to note that, in keeping with recent developements in
-the OMG's Lightweight CORBA Component Model 
+the OMG's Lightweight CORBA Component Model
 (<a href="http://www.omg.org/technology/documents/formal/components.htm"> LwCCM</a>) specification,
 CIAO's <i>Component Implementation Definition Language</i> (CIDL) compiler,
 along with the .cidl files it processed, have been eliminated, and replaced
@@ -85,14 +85,14 @@ these files:) <P>
       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 
+      Optionally generated files defining export/import macros as well as
       corresponding macros related to singletons and tracing, all in terms of
       existing ACE macros. Note that, while these files must have the
       "_export.h" suffix, the base name of the file is usually not derived
       from the IDL filename, as is the stem of the other file groups above.
       There can be as many as 4 of these files per build, for stub, skeleton,
       servant, and executor export macros, and they may also be generated by
-      the Perl script <tt>generate_export_file.pl</tt>, located in 
+      the Perl script <tt>generate_export_file.pl</tt>, located in
       <tt>$ACE_ROOT/bin</tt>.
 </UL>
 
@@ -283,7 +283,7 @@ also receives other options that are specific to it.<p>
         files. If CIAO servant code is being generated (see <tt>-Gsv</tt> option below),
         and <tt>svnt_export_macro</tt> (see below) isn't set, this macro will also
         appear in the generated CIAO servant (*_svnt.h) files, since skeleton and
-        CIAO servant files are often compiled together. 
+        CIAO servant files are often compiled together.
         This macro is 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>
@@ -345,12 +345,12 @@ also receives other options that are specific to it.<p>
         macro. This option works in conjuction with the -GA option, which generates Any
         operators and typecodes into a separate set of files.</td>
   </tr>
-  
+
   <tr><a name="svnt_export_macro"></a>
     <td></td>
-    
+
     <td><tt>svnt_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 servant code, if such
         code is being generated (see <tt>-Gsv</tt> option below). Since skeleton
@@ -363,9 +363,9 @@ also receives other options that are specific to it.<p>
 
   <tr><a name="svnt_export_include"></a>
     <td></td>
-    
+
     <td><tt>svnt_export_macro=</tt><i>include_path</i></td>
-    
+
     <td>The compiler will generate code to include <i>include_path</i> at the
         top of the CIAO servant file header, if this file is being generated
         (see <tt>-Gsv</tt> option below). This is usually a good place to define the export
@@ -374,9 +374,9 @@ also receives other options that are specific to it.<p>
 
   <tr><a name="exec_export_macro"></a>
     <td></td>
-    
+
     <td><tt>exec_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 executor implmentation header
         (*_exec.h) files, if such
@@ -387,9 +387,9 @@ also receives other options that are specific to it.<p>
 
   <tr><a name="exec_export_include"></a>
     <td></td>
-    
+
     <td><tt>exec_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 executor implementation header (*_exec.h) file, if this file is being generated
         (see <tt>-Gex</tt> option below). This is usually a good place to define the export
@@ -398,9 +398,9 @@ also receives other options that are specific to it.<p>
 
   <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
@@ -411,9 +411,9 @@ also receives other options that are specific to it.<p>
 
   <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
@@ -526,6 +526,14 @@ also receives other options that are specific to it.<p>
         Useful for regenerating the *_include pidl files in the archive.</td>
   </tr>
 
+  <tr><a name="ciao_container_type">
+    <td></td>
+
+    <td><tt>ciao_container_type=</tt><i>file</i></td>
+
+    <td>Type of container we are going to use, Session by default.</td>.
+  </tr>
+
   <tr><a name="E">
     <td><tt>-E</tt></td>
 
@@ -637,11 +645,17 @@ also receives other options that are specific to it.<p>
   <tr><a name="g">
     <td><tt>-g </tt><i>path</i></td>
 
-    <td>To specify the path for the perfect hasing program (GPERF). Default
+    <td>To specify the path for the perfect hashing program (GPERF). Default
         is $ACE_ROOT/bin/ace_gperf.&nbsp;</td>
     <td>&nbsp;</td>
   </tr>
 
+  <TR><A NAME="iC">
+    <TD><TT>-iC </TT><i>path</i></TD>
+    <TD> Generate #included stubs in *A.h prefixed with this path. </TD>
+    <td>Default is local filename only (no prefix).&nbsp;</td>
+  </TR>
+
   <tr><a name="o">
     <td><tt>-o </tt><i>path</i></td>
 
@@ -762,7 +776,7 @@ also receives other options that are specific to it.<p>
         deprecated by the OMG spec (default is no output).</td>
 
     <td>This behavior can be selected globally by defining IDL_ANON_ERROR in
-        config.h. It may then be overridden locally by 
+        config.h. It may then be overridden locally by
         <tt>-aw</tt> or <tt>-as</tt></td>
   </tr>
 
@@ -773,7 +787,7 @@ also receives other options that are specific to it.<p>
         deprecated by the OMG spec (default is no output).</td>
 
     <td>This behavior can be selected globally by defining IDL_ANON_WARNING in
-        config.h. It may then be overridden locally by 
+        config.h. It may then be overridden locally by
         <tt>-ae</tt> or <tt>-as</tt></td>
   </tr>
 
@@ -783,7 +797,7 @@ also receives other options that are specific to it.<p>
     <td>Silence any diagnostic output for anonymous types (default).</td>
 
     <td>This behavior can be selected globally by defining IDL_ANON_SILENT in
-        config.h. It may then be overridden locally by 
+        config.h. It may then be overridden locally by
         <tt>-aw</tt> or <tt>-ae</tt></td>
   </tr>
 
@@ -990,6 +1004,18 @@ also receives other options that are specific to it.<p>
     to be filled in by the developer.</td>
   </tr>
 
+  <tr><a name="Gexr">
+    <td><tt>-Gexr</tt></td>
+
+    <td>Generate CIAO executor implementation code for component and home IDL declarations, including
+      an implementation of the ACE_Reactor</td>
+    <td>When applying <tt>-Gexr</tt>, the TAO IDL compiler will generate an extra method which
+      retrieves the ACE_Reactor from the ORB. One should use this option when an ACE_reactor.
+      In code, use 'this-&gt;reactor ()' to get the ACE_Reactor. A CORBA::INTERNAL
+      exception is thrown when the ACE_Reactor cannot be retrieved.<br/>
+      The goal of this method is to prevent memory leaks.</td>
+  </tr>
+
   <tr><a name="Gcn">
     <td><tt>-Gcn</tt></td>
 
@@ -998,6 +1024,13 @@ also receives other options that are specific to it.<p>
     for DDS connectors.</td>
   </tr>
 
+  <tr><a name="Gts">
+    <td><tt>-Gts</tt></td>
+
+    <td>Generate DDS type support IDL in a separate IDL file</td>
+    <td>Not used with OpenDDS, since OpenDDS's IDL processor does this already.</td>
+  </tr>
+
   <tr><a name="Glem">
     <td><tt>-Glem</tt></td>
 
@@ -1198,7 +1231,7 @@ also receives other options that are specific to it.<p>
   </tr>
   <tr><a name="TS">
     <td><tt>-TS <i>value</i></tt></td>
-    
+
     <td>Set tab size for generated files</td>
     <td>Default is 2 spaces</td>
   </tr>
diff --git a/docs/configurations.html b/docs/configurations.html
index c5d2dc5fa1c..3afdb17ad9b 100644
--- a/docs/configurations.html
+++ b/docs/configurations.html
@@ -141,7 +141,7 @@ Roadmap</h3>
 
 <ul>
   <li><a name="orb"><b>Number of ORBs</b> -- </a></li>
-      TAO can assign multiple endpoints to an ORB.  
+      TAO can assign multiple endpoints to an ORB.
       It is therefore not necessary to create multiple ORBs to accept
       requests from multiple endpoints.  However, multiple ORBs can be
       used to support different policies within the same process,
@@ -182,7 +182,7 @@ Roadmap</h3>
         <li><tt>reactive</tt>: In this approach, each thread
         in the thread pool has an ORB that accepts and processes
         requests reactively. This is also called as the
-        "ORB-per-thread" model <P>  
+        "ORB-per-thread" model <P>
 
         <li><P><tt>leader/followers</tt>: In this model, the user must
 	  create several threads, all of which invoke
@@ -193,7 +193,7 @@ Roadmap</h3>
 	  doing so the ORB will selects another thread in the pool to
 	  become the leader.
 	  In other words the threads in the pool take turns to
-	  process the events. 
+	  process the events.
 	</p>
 
 	</li>
@@ -226,23 +226,7 @@ Roadmap</h3>
       -ORBCollocation </a></code> flag as an argument of <code>
       ORB_init </code> (most often thru the command line flags.) <p>
 
-  <li> <a NAME="profile"></a><b>Forwarding Profile</b> --
-      When multiple threads using the same
-      <tt>CORBA::Object</tt> and using forwarding, it is necessary to
-      protect the forwarding <tt>Profile</tt>, which is part of the
-      CORBA::Object, against multiple access. Therefore a mutex lock
-      is used by default to ensure proper access. <P>
-
-      Using the switch <tt><a href="Options.html#-ORBProfileLock">
-      -ORBProfileLock </a></tt> this policy can be deactivated
-      specifying <tt>-ORBProfileLock null</tt>.
-      The primary reason for doing this is to improve performance
-      when no forwarding is used or no multithreading with access to
-      shared <tt>CORBA::Object</tt>'s.  Using a null mutex reduces
-      the overhead compared with using a regular mutex
-      lock.</li><P>
-
-  <li> <a NAME="orbsvcs"></a><b>orbsvcs Library</b> -- 
+  <li> <a NAME="orbsvcs"></a><b>orbsvcs Library</b> --
       By default,
       TAO's Makefiles build all the services that TAO
       supports.
@@ -329,7 +313,6 @@ The following are common ORB configurations used by TAO applications.<P>
               select_st</tt>, <tt>-ORBInputCDRAllocator null</tt>
               <br><tt>TAO_Server_Strategy_Factory</tt>:
               <tt>-ORBconcurrency reactive</tt> (default),
-              <tt>-ORBPOALock null</tt>
               <br><tt>TAO_Client_Strategy_Factory</tt>:
               <tt>-ORBConnectorLock null</tt></td>
           </td>
@@ -337,10 +320,10 @@ The following are common ORB configurations used by TAO applications.<P>
       </table>
 
       <P>Check out the <tt><a href="../examples/Simple/grid/">Grid</a></tt>
-      for an example of a default configuration and 
-      <tt><a href="../performance-tests/Latency/Single_Threaded/">this</a></tt> 
+      for an example of a default configuration and
+      <tt><a href="../performance-tests/Latency/Single_Threaded/">this</a></tt>
       for an example of settings that would provide better performance.
-      
+
       <P>
 
   <li> <a NAME="tpc"></a><B>Multiple threads, single ORB, thread-per-connection
@@ -468,7 +451,7 @@ The following are common ORB configurations used by TAO applications.<P>
 
         <td>This model implements a highly optimized <A HREF="rtcorba/">Real-time CORBA</A> thread pool that minimizes
             context switching, and thread creation costs.  In this
-            model, the application is responsible for starting up the ORB and then 
+            model, the application is responsible for starting up the ORB and then
             calling the Real-time CORBA thread pool factory methods that
             internally spawn a pool of threads.  When a request comes in, one
             of these waiting threads in the pool will handle the
diff --git a/docs/interfacerepo/index.html b/docs/interfacerepo/index.html
index 8bd63ecadb3..ef7e6623308 100644
--- a/docs/interfacerepo/index.html
+++ b/docs/interfacerepo/index.html
@@ -187,7 +187,7 @@ can now be used instead of relying on IP multicast to resolve the IFR service.</
 Naming Service</a>.<br><br>
 
 <b>
-IFR_Service -ORBEndpoint iiop://[hostname]:[port] <br><br>
+tao_ifr_service -ORBEndpoint iiop://[hostname]:[port] <br><br>
 
 tao_ifr -ORBInitRef InterfaceRepository=corbaloc:iiop:[hostname]:[port]/InterfaceRepository [idl file] <br><br>
 </b>
diff --git a/docs/notification/monitor.html b/docs/notification/monitor.html
index 9c302c23f26..d2e84391ff8 100644
--- a/docs/notification/monitor.html
+++ b/docs/notification/monitor.html
@@ -160,8 +160,8 @@ appear on two lines):
     "-o monitor.ior 
     -ORBArg \"-ORBInitRef -ORBArg NameService=corbaloc:iiop:localhost:10637/NameService\""
     
-  dynamic TAO_MC_Notify_Service Service_Object * 
-    TAO_CosNotification_MC_Ext:_make_TAO_MC_Notify_Service () 
+  dynamic TAO_MC_Notify_Service Service_Object *
+    TAO_CosNotification_MC_Ext:_make_TAO_MC_Notify_Service ()
     "-DispatchingThreads 1"
     
 </pre></li></ul>  you should replace them with
diff --git a/docs/orbsvcs.html b/docs/orbsvcs.html
index e79eb4f411e..ddb68173bc9 100644
--- a/docs/orbsvcs.html
+++ b/docs/orbsvcs.html
@@ -185,24 +185,24 @@ bgcolor="#ffffff">
     </P>
 
     <UL>
-      <LI>Concurrency_Service</LI>
-      <LI>Dump_Schedule</LI>
-      <LI>LifeCycle_Service</LI>
-      <LI>LoadBalancer</LI>
-      <LI>CosEvent_Service</LI>
-      <LI>Event_Service</LI>
-      <LI>FTRT_Event_Service</LI>
-      <LI>FTRT_Event_Service</LI>
-      <LI>FT_ReplicationManager </LI>
-      <LI>FT_Service</LI>
-      <LI>Fault_Detector</LI>
-      <LI>Fault_Notifier</LI>
-      <LI>Naming_Service</LI>
-      <LI>Scheduling_Service</LI>
-      <LI>Trading_Service</LI>
-      <LI>Time_Service</LI>
-      <LI>ImplRepo_Service *(see below)*</LI>
-      <LI>Notify_Service</LI>
+      <LI>Concurrency_Service/tao_cosconcurrency</LI>
+      <LI>Dump_Schedule/tao_dump_schedule</LI>
+      <LI>LifeCycle_Service/tao_coslifecycle</LI>
+      <LI>LoadBalancer/tao_loadmanager</LI>
+      <LI>CosEvent_Service/tao_cosevent</LI>
+      <LI>Event_Service/tao_rtevent</LI>
+      <LI>FTRT_Event_Service/Event_Service/ftrt_eventservice</LI>
+      <LI>FTRT_Event_Service/Factory_Service/ftrtec_factory_service</LI>
+      <LI>FTRT_Event_Service/Gateway_Service/ftrtec_gateway_service</LI>
+      <LI>FT_ReplicationManager/tao_ft_replicationmanager</LI>
+      <LI>Fault_Detector/tao_fault_detector</LI>
+      <LI>Fault_Notifier/tao_fault_notifier</LI>
+      <LI>Naming_Service/tao_cosnaming</LI>
+      <LI>Scheduling_Service/tao_cosscheduling</LI>
+      <LI>Trading_Service/tao_costrading</LI>
+      <LI>Time_Service/tao_costime_server</LI>
+      <LI>ImplRepo_Service/tao_imr_locator *(see below)*</LI>
+      <LI>Notify_Service/tao_cosnotification</LI>
     </UL>
 
     <P>In the future we plan to use a single binary and ACE Service
diff --git a/docs/performance.html b/docs/performance.html
index 687b9ae0ce1..133649ad5dd 100644
--- a/docs/performance.html
+++ b/docs/performance.html
@@ -254,25 +254,6 @@
 	<ul>
 	  <li>
 	    <p>
-	      A single-threaded client application may not require
-	      the internal thread synchronization performed by TAO.
-	      It may therefore be useful to add the following line to your
-	      <code>svc.conf</code> file:
-	    </p>
-
-	    <blockquote>
-	      <code>static <a href = "Options.html#DefaultClient">Client_Strategy_Factory</a> "<a href="Options.html#-ORBProfileLock">-ORBProfileLock</a> null"</code>
-	    </blockquote>
-
-	    <p>
-	      If such an entry already exists in your
-	      <code>svc.conf</code> file, then just add
-	      <code>-ORBProfileLock null</code> to the list options
-	      between the quotes found after
-	      <code>Client_Strategy_Factory</code>.
-	    </p>
-
-	    <p>
 	      Other options include disabling synchronization in the
 	      components of TAO responsible for constructing and sending
 	      requests to the target and for receiving replies.  These
@@ -608,7 +589,7 @@ CC 5.x compiler gives a big footprint reduction of the order of 40%.</P>
 <P>Also footprint can be saved by specifying the following in your
 platform_macros.GNU file: </P>
 <P>
-<code> 
+<code>
 <pre>
 optimize=1
 debug=0
@@ -618,8 +599,8 @@ CPPFLAGS += -DACE_USE_RCSID=0 -DACE_NLOGGING=1
 
 <P>
 If portable interceptors aren't needed, code around line 729 in
-<code>$TAO_ROOT/tao/orbconf.h</code> can be modified to hard-code 
-<code>TAO_HAS_INTERCEPTORS</code> as <code>0</code>, and all interceptor 
+<code>$TAO_ROOT/tao/orbconf.h</code> can be modified to hard-code
+<code>TAO_HAS_INTERCEPTORS</code> as <code>0</code>, and all interceptor
 code will be skipped by the preprocessor.
 
 <P>
@@ -630,7 +611,7 @@ code will be skipped by the preprocessor.
   <TR>
     <TD><code>-Sc</code>
     <TD>Suppresses generation of the TIE classes (template classes used
-    to delegate request dispatching when IDL interface inheritance 
+    to delegate request dispatching when IDL interface inheritance
     would cause a 'ladder' of inheritance if the servant classe had
     corresponding inheritance). This option can be used almost all the
     time.
diff --git a/docs/releasenotes/ec.html b/docs/releasenotes/ec.html
index 34311012efe..a87016dee38 100644
--- a/docs/releasenotes/ec.html
+++ b/docs/releasenotes/ec.html
@@ -85,8 +85,8 @@ and the IDL compiler in <TT>$TAO_ROOT/TAO_IDL</TT>.</LI>
 the test in <TT>$TAO_ROOT/TAO/orbsvcs/tests/Event_Latency</TT>.
 As in:
 <P><TT>$ cd $TAO_ROOT/orbsvcs</TT>
-<P><TT>$ cd Naming_Service ; ./Naming_Service &amp;</TT>
-<P><TT>$ cd Event_Service ; ./Event_Service &amp;</TT>
+<P><TT>$ cd Naming_Service ; ./tao_cosnaming &amp;</TT>
+<P><TT>$ cd Event_Service ; ./tao_rtevent &amp;</TT>
 <P><TT>$ cd tests/Event_Latency ; ./Event_Latency -m 20 -j &amp;</TT>
 <P>You may want to run each program in a separate window. Try using a fixed
 port number for the <TT>Naming Service</TT> so you can use the <TT>NameService</TT>
diff --git a/docs/releasenotes/ftrt_ec.html b/docs/releasenotes/ftrt_ec.html
index 1a398627da9..358350d2dcf 100644
--- a/docs/releasenotes/ftrt_ec.html
+++ b/docs/releasenotes/ftrt_ec.html
@@ -80,7 +80,7 @@ Quick start:</h3>
 <br>&nbsp;
 <p>&nbsp; 1. Start Naming_Service
 <p>
-<br>&nbsp;&nbsp; $ $TAO_ROOT/orbsvcs/Naming_Service/Naming_Service -m 1
+<br>&nbsp;&nbsp; $ $TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming -m 1
 <br>&nbsp;&nbsp;&nbsp;&nbsp; or you can use the shell script NameService
 in this directory to start it.
 <p>&nbsp; 2. Start the ftrt_eventservice. Use the "-p" option to start
diff --git a/docs/releasenotes/index.html b/docs/releasenotes/index.html
index ee93e683c2a..a529f697ec9 100644
--- a/docs/releasenotes/index.html
+++ b/docs/releasenotes/index.html
@@ -1532,16 +1532,16 @@ The Logging_Service (<tt>$TAO_ROOT/orbsvcs/Logging_Service</tt>) contains
 
 <ul>
 <li>
-Basic_Logging_Service <tt>$TAO_ROOT/orbsvcs/Logging_Service/Basic_Logging_Service</tt></li>
+tao_tls_basic <tt>$TAO_ROOT/orbsvcs/Logging_Service/tao_tls_basic</tt></li>
 
 <li>
-Event_Logging_Service <tt>$TAO_ROOT/orbsvcs/Logging_Service/Event_Logging_Service</tt></li>
+tao_tls_event <tt>$TAO_ROOT/orbsvcs/Logging_Service/tao_tls_event</tt></li>
 
 <li>
-Notify_Logging_Service <tt>$TAO_ROOT/orbsvcs/Logging_Service/Notify_Logging_Service</tt></li>
+tao_tls_notify <tt>$TAO_ROOT/orbsvcs/Logging_Service/tao_tls_notify</tt></li>
 
 <li>
-RTEvent_Logging_Service <tt>$TAO_ROOT/orbsvcs/Logging_Service/RTEvent_Logging_Service</tt></li></ul>
+tao_tls_rtevent <tt>$TAO_ROOT/orbsvcs/Logging_Service/tao_tls_rtevent</tt></li></ul>
 
 <li>
 Each service registers with the Naming Service as
diff --git a/docs/releasenotes/orbcore.html b/docs/releasenotes/orbcore.html
index 78ee249f584..8a4ed62cc67 100644
--- a/docs/releasenotes/orbcore.html
+++ b/docs/releasenotes/orbcore.html
@@ -68,7 +68,7 @@ Point of contact: <a href="mailto: bala@cs.wustl.edu">Balchandran Natarajan</a>
       leads to crash failures. <p>
   </li>
 
-      
+
 </ul>
 <!-- --------------------- -->
 <a href="#toc">Back to TOC</a>
@@ -84,7 +84,7 @@ Point of contact: <a href="mailto: bala@cs.wustl.edu">Balchandran Natarajan</a>
   <li><p>Improvement to connection cache on the acceptor side so that
       it will purge old connections when there are no more slots or
       sockets are available. The connection cache does good job of
-      purging things on the connector side</p> 
+      purging things on the connector side</p>
   </li>
 
   <li><p> Prevent unbounded stack growth that leads to a failure in
@@ -106,14 +106,14 @@ Point of contact: <a href="mailto: bala@cs.wustl.edu">Balchandran Natarajan</a>
         TAO has slowed down a bit over the past two betas. Need to
         identify the bottlenecks before improving the performance.</p>
         </li>
-        
+
         <li><p> Its a known fact that thread-per-connection is faster
         than the reactive model, even for single threaded cases. Need
         to identify portions of the reactor that slows down things and
         fix them or create a fast path in the ORB just using plain
         vanilla select for the server.</p>
         </li>
-        
+
         <li><p> In the output data path, the CDR creates the message
         block and all other associted things on TSS. If we could
         change the CDR to first create them on the stack and then move
@@ -125,7 +125,7 @@ Point of contact: <a href="mailto: bala@cs.wustl.edu">Balchandran Natarajan</a>
   <li>Features:</li>
       <ol>
         <li><p>Implement DP-CORBA specification</p></li>
-        
+
         <li><p>Implement TII specification.</p></li>
       </ol>
 
@@ -150,7 +150,7 @@ Point of contact: <a href="mailto: bala@cs.wustl.edu">Balchandran Natarajan</a>
         <code>$TAO_ROOT/tests/Connection_Timeout</code> for an example
         of how to use this feature.<p>
     </li>
-        
+
     <li><p> Implemented non-blocking connects with three different
         strategies for connection establishment. The details of the
         strategies and the related documentation can be found <A
@@ -161,11 +161,11 @@ Point of contact: <a href="mailto: bala@cs.wustl.edu">Balchandran Natarajan</a>
     option -ORBConnectionPurgingStrategy fills in the role of the
     deprecated strategy.</p>
     </li>
-    
+
     <li><p> Deprecated the option -ORBResources.</p></li>
 
     <li><p> The connectors have been moved to the lanes.</p> </li>
-    
+
     <li><p> Fixed stack recursion problems that occurs, when a thread
         flushing a reply by entering the reactor starts processing
         incoming requests.</p>
@@ -188,7 +188,7 @@ Point of contact: <a href="mailto: bala@cs.wustl.edu">Balchandran Natarajan</a>
         optimization. This is useful for RTCORBA server threads to
         avoid priority inversions. Buffering messages and sending
         notifications to the reactor, that does not know or honour
-        priority could lead to priority inversions. 
+        priority could lead to priority inversions.
         </p>
     </li>
 
@@ -210,7 +210,7 @@ Point of contact: <a href="mailto: bala@cs.wustl.edu">Balchandran Natarajan</a>
 	  All of the following protocols were updated: DIOP, IIOP,
           SCIOP, SHMIOP, SSLIOP, UIOP, UIPMC. </p>
     </li>
-    
+
     <li><p> Support for the ORB methods create_value_tc, create_component_tc,
             create_event_tc, create_home_tc and create_recursive_tc added. </p>
     </li>
diff --git a/docs/tutorials/Makefile.am b/docs/tutorials/Makefile.am
deleted file mode 100644
index 324e1e3c1ed..00000000000
--- a/docs/tutorials/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Quoter
-
diff --git a/docs/tutorials/Quoter/AMI/Makefile.am b/docs/tutorials/Quoter/AMI/Makefile.am
deleted file mode 100644
index cec47827554..00000000000
--- a/docs/tutorials/Quoter/AMI/Makefile.am
+++ /dev/null
@@ -1,135 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Quoter_AMI_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl
-
-CLEANFILES = \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Quoter.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Quoter.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Quoter_AMI_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Handler_i.cpp \
-  QuoterC.cpp \
-  QuoterS.cpp \
-  client.cpp \
-  Handler_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Quoter_AMI_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  QuoterC.cpp \
-  QuoterS.cpp \
-  Stock_Factory_i.cpp \
-  Stock_i.cpp \
-  server.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/docs/tutorials/Quoter/Event_Service/Makefile.am b/docs/tutorials/Quoter/Event_Service/Makefile.am
deleted file mode 100644
index 2640dec9d5a..00000000000
--- a/docs/tutorials/Quoter/Event_Service/Makefile.am
+++ /dev/null
@@ -1,126 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Quoter_Event_Service_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl
-
-CLEANFILES = \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Quoter.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Quoter.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Quoter_Event_Service_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-client_SOURCES = \
-  QuoterC.cpp \
-  Stock_Consumer.cpp \
-  client.cpp \
-  Stock_Consumer.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Quoter_Event_Service_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-server_SOURCES = \
-  QuoterC.cpp \
-  QuoterS.cpp \
-  Stock_Factory_i.cpp \
-  Stock_i.cpp \
-  server.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/docs/tutorials/Quoter/Event_Service/ec.conf b/docs/tutorials/Quoter/Event_Service/ec.conf
index 395b9a6c724..0409ff533bd 100644
--- a/docs/tutorials/Quoter/Event_Service/ec.conf
+++ b/docs/tutorials/Quoter/Event_Service/ec.conf
@@ -1,3 +1,4 @@
 # $Id$
-# static EC_Factory "-ECfiltering null" 
+
+# static EC_Factory "-ECfiltering null"
 # -ECproxyconsumerlock thread " #-ECproxysupplierlock thread" # -ECsupplierfiltering per-supplier"
diff --git a/docs/tutorials/Quoter/Event_Service/index.html b/docs/tutorials/Quoter/Event_Service/index.html
index 6a27dd4e750..8124b44a3e5 100644
--- a/docs/tutorials/Quoter/Event_Service/index.html
+++ b/docs/tutorials/Quoter/Event_Service/index.html
@@ -330,12 +330,12 @@ Quoter_Stock_i::disconnect_push_supplier (void)
     <P>To test your changes you need to run four programs,
       first TAO's Naming Service:
 <PRE>
-$ $TAO_ROOT/orbsvcs/Naming_Service/Naming_Service -m 1
+$ $TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming -m 1
 </PRE>
     <P>The CORBA Event Service
     </P>
 <PRE>
-$ $TAO_ROOT/orbsvcs/CosEvent_Service/CosEvent_Service
+$ $TAO_ROOT/orbsvcs/CosEvent_Service/tao_cosevent
 </PRE>
 
     <P>Now you can run your client:
diff --git a/docs/tutorials/Quoter/Makefile.am b/docs/tutorials/Quoter/Makefile.am
deleted file mode 100644
index 83aa0ad74b0..00000000000
--- a/docs/tutorials/Quoter/Makefile.am
+++ /dev/null
@@ -1,20 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AMI \
-        Event_Service \
-        On_Demand_Activation \
-        RTCORBA \
-        RT_Event_Service \
-        idl \
-        Simple \
-        Naming_Service
-
diff --git a/docs/tutorials/Quoter/Naming_Service/Makefile.am b/docs/tutorials/Quoter/Naming_Service/Makefile.am
deleted file mode 100644
index 8a775425861..00000000000
--- a/docs/tutorials/Quoter/Naming_Service/Makefile.am
+++ /dev/null
@@ -1,94 +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:
-## ../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.Quoter_Naming_Service_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../idl \
-  -I../idl
-
-client_SOURCES = \
-  client.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-client_LDFLAGS = \
-  -L../idl
-
-client_LDADD = \
-  $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Quoter_Naming_Service_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../idl \
-  -I../idl
-
-server_SOURCES = \
-  Stock_Factory_i.cpp \
-  Stock_i.cpp \
-  server.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-server_LDFLAGS = \
-  -L../idl
-
-server_LDADD = \
-  $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/docs/tutorials/Quoter/Naming_Service/index.html b/docs/tutorials/Quoter/Naming_Service/index.html
index 345ba22be93..4c4b09b62db 100644
--- a/docs/tutorials/Quoter/Naming_Service/index.html
+++ b/docs/tutorials/Quoter/Naming_Service/index.html
@@ -148,7 +148,7 @@ $ setenv NameServicePort `expr 10000 + $uid`
     <P>Now we can start the Naming Service provided with TAO:
     </P>
 <PRE>
-$ $TAO_ROOT/orbsvcs/Naming_Service/Naming_Service
+$ $TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming
 </PRE>
     <P>and your server:
     </P>
@@ -183,7 +183,7 @@ $ client MSFT RHAT RHAT MSFT
       file, as in:
     </P>
 <PRE>
-$ $TAO_ROOT/orbsvcs/Naming_Service/Naming_Service -o ns.ior
+$ $TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming -o ns.ior
 </PRE>
     <P>and then use the <CODE>-ORBInitRef</CODE> to that IOR
       instead of the multicast protocol:
@@ -211,7 +211,7 @@ $ server -ORBInitRef NameService=corbaloc:iiop:ace.cs.wustl.edu:12345/NameServic
       <CODE>-ORBEndPoint</CODE> option:
     </P>
 <PRE>
-$ $TAO_ROOT/orbsvcs/Naming_Service/Naming_Service -ORBEndPoint iiop://ace.cs.wustl.edu:12345
+$ $TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming -ORBEndPoint iiop://ace.cs.wustl.edu:12345
 </PRE>
     <P>Of course, this only works if you are running the program in
       <CODE>ace.cs.wustl.edu</CODE> and the <CODE>12345</CODE> port is
@@ -240,7 +240,7 @@ $ $TAO_ROOT/orbsvcs/Naming_Service/Naming_Service -ORBEndPoint iiop://ace.cs.wus
       <STRONG>not</STRONG> persistent, but it is a matter of using a
       flag to save its state on a file:
 <PRE>
-$ $TAO_ROOT/orbsvcs/Naming_Service/Naming_Service -f name_service.dat
+$ $TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming -f name_service.dat
 </PRE>
     </P>
 
diff --git a/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am b/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am
deleted file mode 100644
index 8f38b84b7cd..00000000000
--- a/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am
+++ /dev/null
@@ -1,143 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Quoter_On_Demand_Activation_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl
-
-CLEANFILES = \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Quoter.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Quoter.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Quoter_On_Demand_Activation_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Handler_i.cpp \
-  QuoterC.cpp \
-  QuoterS.cpp \
-  client.cpp \
-  Handler_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Quoter_On_Demand_Activation_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  QuoterC.cpp \
-  QuoterS.cpp \
-  Stock_Factory_Locator_i.cpp \
-  Stock_Factory_i.cpp \
-  Stock_i.cpp \
-  server.cpp \
-  Stock_Factory_Locator_i.h \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp b/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp
index 23a2bb46f12..49d5a8b7c8e 100644
--- a/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp
+++ b/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp
@@ -37,7 +37,7 @@ Quoter_Stock_i::get_price_and_names (CORBA::String_out symbol,
 {
   symbol = CORBA::string_dup (this->symbol_.c_str ());
   full_name = CORBA::string_dup (this->full_name_.c_str ());
-  
+
   return this->price_;
 }
 
diff --git a/docs/tutorials/Quoter/RTCORBA/Broker.idl b/docs/tutorials/Quoter/RTCORBA/Broker.idl
index 388c75bac83..2620d6901ea 100644
--- a/docs/tutorials/Quoter/RTCORBA/Broker.idl
+++ b/docs/tutorials/Quoter/RTCORBA/Broker.idl
@@ -16,7 +16,7 @@
 
 module Stock
 {
-  /** 
+  /**
    * @class StockBroker
    * @brief Provides interfaces for stock broker clients.
    */
@@ -33,7 +33,7 @@ module Stock
 
     /// Gets the current quoter connection.
     StockQuoter get_connection_quoter_info ();
-    
+
     /// Shutdown the object and terminate the application
     oneway void shutdown ();
   };
@@ -42,12 +42,12 @@ module Stock
    * @class StockBrokerHome
    * @brief Interface that aids in managing StockBroker lifecycles.
    */
-  interface StockBrokerHome 
+  interface StockBrokerHome
   {
     /// Create a StockBroker object.
     StockBroker create (in StockDistributor dist,
                         in string stock_name);
-  }; 
+  };
 };
 
 #endif
diff --git a/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp b/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
index 794606956a0..bda7ce45f5c 100644
--- a/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
+++ b/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
@@ -39,19 +39,19 @@ Stock_StockBroker_i::Stock_StockBroker_i (CORBA::ORB_ptr orb,
   // Create a child POA with CLIENT_PROPAGATED policies. The name of
   // the POA will be <StockNameConsumer_POA>.  Instances of the
   // Stock_StockNameConsumer_i will be activated under this POA.
-  PortableServer::POA_var child_poa = 
-    poa->create_POA ("StockNameConsumer_POA", 
+  PortableServer::POA_var child_poa =
+    poa->create_POA ("StockNameConsumer_POA",
                      poa_mgr. in(),
                      consumer_policies);
-  
+
   // Narrow the POA to a <RTPortableServer::POA>.
   RTPortableServer::POA_var rt_poa =
     RTPortableServer::POA::_narrow (child_poa.in ());
 
   // Create and activate the <consumer_>.
-  this->consumer_ = 
+  this->consumer_ =
     new Stock_StockNameConsumer_i (*this, stock_name);
-  PortableServer::ServantBase_var nameconsumer_owner_transfer = 
+  PortableServer::ServantBase_var nameconsumer_owner_transfer =
     this->consumer_;
   rt_poa->activate_object (this->consumer_);
 }
@@ -84,20 +84,20 @@ void Stock_StockBroker_i::connect_quoter_info (::Stock::StockQuoter_ptr c)
   return Stock::StockQuoter::_duplicate (this->quoter_.in ());
 }
 
-void 
+void
 Stock_StockBroker_i::shutdown (void)
 {
   // Unsubscribe
   ACE_DEBUG ((LM_DEBUG, "Shutdown unsubscribing notifiers\n"));
   this->distributor_->unsubscribe_notifier
     (this->consumer_->cookie_ ());
-  
+
   ACE_DEBUG ((LM_DEBUG, "Shutdown deactivating object\n"));
   ::Stock::StockBroker_var broker = this->_this ();
-  PortableServer::ObjectId_var oid = 
+  PortableServer::ObjectId_var oid =
     this->_default_POA ()->reference_to_id (broker.in ());
-  
-  this->_default_POA ()->deactivate_object (oid.in ());  
+
+  this->_default_POA ()->deactivate_object (oid.in ());
 }
 
 // Implementation skeleton constructor
@@ -119,11 +119,11 @@ Stock_StockBrokerHome_i::Stock_StockBrokerHome_i (CORBA::ORB_ptr orb)
                                cookie_factory);
 
   Stock::Priority_Mapping::register_mapping (orb);
-  
+
   // Register this class as an event handler with the ORB to catch
-  // ctrl-c from the command line. 
+  // ctrl-c from the command line.
   if (orb_->orb_core ()->reactor ()->register_handler (SIGINT, this) == -1)
-    ACE_DEBUG ((LM_DEBUG, "ERROR: Failed to register as a signal handler: %p\n", 
+    ACE_DEBUG ((LM_DEBUG, "ERROR: Failed to register as a signal handler: %p\n",
                 "register_handler\n"));
 }
 
@@ -132,7 +132,7 @@ Stock_StockBrokerHome_i::~Stock_StockBrokerHome_i (void)
 {
 }
 
-::Stock::StockBroker_ptr 
+::Stock::StockBroker_ptr
 Stock_StockBrokerHome_i::create (Stock::StockDistributor_ptr dist,
                                  const char *stock_name)
 {
@@ -143,7 +143,7 @@ Stock_StockBrokerHome_i::create (Stock::StockDistributor_ptr dist,
       // is the <RootPOA>.
       Stock_StockBroker_i *broker =
         new Stock_StockBroker_i (orb_.in (), dist, stock_name);
-      PortableServer::ServantBase_var owner_transfer 
+      PortableServer::ServantBase_var owner_transfer
         = broker;
       this->broker_ = broker->_this ();
     }
@@ -151,18 +151,18 @@ Stock_StockBrokerHome_i::create (Stock::StockDistributor_ptr dist,
   return Stock::StockBroker::_duplicate (this->broker_.in ());
 }
 
-int 
+int
 Stock_StockBrokerHome_i::handle_signal (int,
                                         siginfo_t *,
                                         ucontext_t *)
 {
   ACE_DEBUG ((LM_DEBUG, "Disconnecting all brokers..\n"));
-  
+
   this->broker_->shutdown ();
-  
+
   ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n"));
-  
+
   this->orb_->shutdown (0);
-  
+
   return 0;
 }
diff --git a/docs/tutorials/Quoter/RTCORBA/Broker_i.h b/docs/tutorials/Quoter/RTCORBA/Broker_i.h
index fddf03be3a2..9b840d93e78 100644
--- a/docs/tutorials/Quoter/RTCORBA/Broker_i.h
+++ b/docs/tutorials/Quoter/RTCORBA/Broker_i.h
@@ -66,7 +66,7 @@ public:
    * Return the StockQuoter object.
    *
    * @return Returns the StockQuoter object reference that has been
-   *         created by connect_quoter_info (). 
+   *         created by connect_quoter_info ().
    */
   virtual ::Stock::StockQuoter_ptr get_connection_quoter_info ();
 
@@ -74,11 +74,11 @@ public:
    * Shutdown the object and destroy the application.
    */
   virtual void shutdown ();
-  
+
 private:
   // Cached ORB pointer
   CORBA::ORB_var orb_;
-  
+
   /// A StockQuoter object reference that is used to get detailed
   /// stock information.
   Stock::StockQuoter_var quoter_;
@@ -86,7 +86,7 @@ private:
   /// A StockNameConsumer servant that is used to get notification of
   /// updates.
   Stock_StockNameConsumer_i *consumer_;
-  
+
   /// The distributor that we are registered with, useful for shutdown.
   Stock::StockDistributor_var distributor_;
 };
@@ -97,12 +97,12 @@ private:
  */
 class  Stock_StockBrokerHome_i
   : public virtual POA_Stock::StockBrokerHome,
-    public ACE_Event_Handler  
+    public ACE_Event_Handler
 {
 public:
   /**
    * Constructor.
-   * Register the necessary factories and mappings with the specified orb and 
+   * Register the necessary factories and mappings with the specified orb and
    * Create a new instance of the StockBroker object.
    *
    * @param orb
@@ -127,7 +127,7 @@ public:
 private:
   /// The StockDistributor object created by its home.
   Stock::StockBroker_var broker_;
-  
+
   /// Cache a reference to the ORB.
   CORBA::ORB_var orb_;
 };
diff --git a/docs/tutorials/Quoter/RTCORBA/Common.idl b/docs/tutorials/Quoter/RTCORBA/Common.idl
index f044cbc95a7..9db8b4dcf1d 100644
--- a/docs/tutorials/Quoter/RTCORBA/Common.idl
+++ b/docs/tutorials/Quoter/RTCORBA/Common.idl
@@ -16,7 +16,7 @@
 
 module Stock
 {
-  exception Invalid_Stock 
+  exception Invalid_Stock
   {
   };
 
@@ -53,7 +53,7 @@ module Stock
   interface StockNameConsumer
   {
     void push_StockName (in StockNames the_stocknames);
-    
+
     attribute Cookie cookie_;
   };
 
@@ -61,7 +61,7 @@ module Stock
    * @class StockQuoter
    * @brief Provides an interface for brokers to get detailed stock information.
    */
-  interface StockQuoter 
+  interface StockQuoter
   {
     /// Returns detailed stock information to brokers.
     /// @param stockname A valid name for a stock.
@@ -70,4 +70,4 @@ module Stock
   };
 };
 
-#endif  
+#endif
diff --git a/docs/tutorials/Quoter/RTCORBA/Distributor.idl b/docs/tutorials/Quoter/RTCORBA/Distributor.idl
index 9ad0eb583cb..347a7470331 100644
--- a/docs/tutorials/Quoter/RTCORBA/Distributor.idl
+++ b/docs/tutorials/Quoter/RTCORBA/Distributor.idl
@@ -30,12 +30,12 @@ module Stock
     /// Event source operation to establish connectivity.
     /// @param c An object reference to the consumer the distributor should notify
     /// @returns A cookie used to identify the subscription.
-    Cookie subscribe_notifier (in Stock::StockNameConsumer c, 
+    Cookie subscribe_notifier (in Stock::StockNameConsumer c,
                                in RTCORBA::Priority priority);
 
     /// Opteration to discontinue connectivity.
     /// @param ck The cookie that identifies the connection to be terminated.
-    Stock::StockNameConsumer unsubscribe_notifier (in Cookie ck) 
+    Stock::StockNameConsumer unsubscribe_notifier (in Cookie ck)
       raises (Invalid_Subscription);
 
     /// Factory operation to return StockQuoter object reference.
@@ -46,7 +46,7 @@ module Stock
 
     /// Controls rate of updates.
     attribute long notification_rate;
-    
+
     /// Shutdown the object and terminate the application
     oneway void shutdown ();
   };
@@ -59,7 +59,7 @@ module Stock
   {
     /// Create a StockDistributor object.
     StockDistributor create ();
-  }; 
+  };
 };
 
 #endif
diff --git a/docs/tutorials/Quoter/RTCORBA/Distributor_i.h b/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
index 888727905b6..42cf2eda881 100644
--- a/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
+++ b/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
@@ -48,20 +48,20 @@ public:
   virtual ~StockDistributor_i (void);
 
   /**
-   * Insert StockNameConsumer object and its priority into the StockDistributor 
+   * Insert StockNameConsumer object and its priority into the StockDistributor
    * object's subscribers' map.
    *
-   * @param c The StockNameConsumer object to be inserted into the StockDistributor 
+   * @param c The StockNameConsumer object to be inserted into the StockDistributor
    * object's subscribers' map.
    * @param priority The priority of the StockNameConsumer object.
    * @return A Cookie object that records this subscription.
    */
-  virtual ::Stock::Cookie * subscribe_notifier (::Stock::StockNameConsumer_ptr c, 
+  virtual ::Stock::Cookie * subscribe_notifier (::Stock::StockNameConsumer_ptr c,
                                                 ::RTCORBA::Priority priority);
 
   /**
    * Erase the StockNameConsumer object from the StockDistributor object's subscribers' map.
-   * 
+   *
    * @param ck The Cookie object that records the subscription.
    * @param The reference of the StockNameConsumer object that has been erased.
    */
@@ -89,7 +89,7 @@ public:
   virtual void notification_rate (::CORBA::Long notification_rate);
 
   /**
-   * Set the active state of the StockDistributor object to true and create a thread 
+   * Set the active state of the StockDistributor object to true and create a thread
    * to publish the stock information to the Stock Broker clients.
    */
   virtual void start (void);
@@ -98,14 +98,14 @@ public:
    * Set the active state of StockDistributor object to false.
    */
   virtual void stop (void);
-  
+
   virtual void shutdown ();
-  
+
   /// Callback for stock database.
   void operator () (std::vector <std::string> &stocks);
-  
+
   int svn (void);
-  
+
   /// The map that stores the subscribed StockNameConsumer object.
   typedef std::map <std::string,
                     std::pair <Stock::StockNameConsumer_var,
@@ -122,7 +122,7 @@ private:
 
   /// The active state of the  StockDistributor object.
   bool active_;
-  
+
   /// Cache a copy of the RTCORBA::POA.
   RTPortableServer::POA_var rt_poa_;
 
@@ -164,7 +164,7 @@ class  StockDistributorHome_i
 public:
   /**
    * Constructor.
-   * Register the necessary factories and mappings with the specified orb and 
+   * Register the necessary factories and mappings with the specified orb and
    * Create a new instance of the StockDistributor object.
    *
    * @param orb
@@ -176,23 +176,23 @@ public:
 
   /**
    * Return the StockDistributor object created by the Constructor.
-   * 
+   *
    * @return The StockDistributor object created by the Constructor.
    */
   virtual ::Stock::StockDistributor_ptr create ();
-  
+
   virtual int handle_signal (int signum,
                              siginfo_t * = 0,
                              ucontext_t * = 0);
 private:
   void create_distributor (void);
-  
+
   /// Cached ORB used to shut down the system
   CORBA::ORB_var orb_;
-  
+
   /// Cached POA created during object construction
   RTPortableServer::POA_var rt_poa_;
-  
+
   /// The StockDistributor servant created by its home.
   PortableServer::ObjectId_var dist_id_;
 };
diff --git a/docs/tutorials/Quoter/RTCORBA/Makefile.am b/docs/tutorials/Quoter/RTCORBA/Makefile.am
deleted file mode 100644
index 9cb45437f05..00000000000
--- a/docs/tutorials/Quoter/RTCORBA/Makefile.am
+++ /dev/null
@@ -1,249 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-noinst_PROGRAMS =
-BUILT_SOURCES =
-
-## Makefile.RTCORBA_Quoter_Common.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES += \
-  DistributorC.cpp \
-  DistributorC.h \
-  DistributorC.inl \
-  DistributorS.inl
-
-CLEANFILES += \
-  Distributor-stamp \
-  DistributorC.cpp \
-  DistributorC.h \
-  DistributorC.inl \
-  DistributorS.inl
-
-DistributorC.cpp DistributorC.h DistributorC.inl DistributorS.inl: Distributor-stamp
-
-Distributor-stamp: $(srcdir)/Distributor.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Distributor.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  BrokerC.cpp \
-  BrokerC.h \
-  BrokerC.inl \
-  BrokerS.inl
-
-CLEANFILES += \
-  Broker-stamp \
-  BrokerC.cpp \
-  BrokerC.h \
-  BrokerC.inl \
-  BrokerS.inl
-
-BrokerC.cpp BrokerC.h BrokerC.inl BrokerS.inl: Broker-stamp
-
-Broker-stamp: $(srcdir)/Broker.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Broker.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CommonC.cpp \
-  CommonC.h \
-  CommonC.inl \
-  CommonS.h \
-  CommonS.inl
-
-CLEANFILES += \
-  Common-stamp \
-  CommonC.cpp \
-  CommonC.h \
-  CommonC.inl \
-  CommonS.h \
-  CommonS.inl
-
-CommonC.cpp CommonC.h CommonC.inl CommonS.h CommonS.inl: Common-stamp
-
-Common-stamp: $(srcdir)/Common.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Common.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libRTCORBA_Quoter_Common.la
-
-libRTCORBA_Quoter_Common_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DRTCORBA_QUOTER_COMMON_BUILD_DLL
-
-libRTCORBA_Quoter_Common_la_SOURCES = \
-  BrokerC.cpp \
-  CommonC.cpp \
-  DistributorC.cpp \
-  Stock_PriorityMapping.cpp
-
-noinst_HEADERS = \
-  Broker.idl \
-  BrokerC.h \
-  BrokerC.inl \
-  BrokerS.inl \
-  Common.idl \
-  CommonC.h \
-  CommonC.inl \
-  CommonS.h \
-  CommonS.inl \
-  Distributor.idl \
-  DistributorC.h \
-  DistributorC.inl \
-  DistributorS.inl \
-  Stock_PriorityMapping.h
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Quoter_Admin.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if BUILD_STL
-
-noinst_PROGRAMS += admin
-
-admin_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-admin_SOURCES = \
-  Admin.cpp
-
-admin_LDADD = \
-  libRTCORBA_Quoter_Common.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_STL
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Quoter_Broker.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if BUILD_STL
-
-noinst_PROGRAMS += broker
-
-broker_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-broker_SOURCES = \
-  Broker.cpp \
-  BrokerS.cpp \
-  Broker_i.cpp \
-  CommonS.cpp \
-  StockNameConsumer_i.cpp \
-  BrokerS.h \
-  Broker_i.h \
-  StockNameConsumer_i.h \
-  Stock_Database.h
-
-broker_LDADD = \
-  libRTCORBA_Quoter_Common.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_STL
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Quoter_Distributor.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if BUILD_STL
-
-noinst_PROGRAMS += distributor
-
-distributor_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-distributor_SOURCES = \
-  CommonS.cpp \
-  Distributor.cpp \
-  DistributorS.cpp \
-  Distributor_i.cpp \
-  DistributorS.h \
-  Distributor_i.h \
-  Stock_Database.h
-
-distributor_LDADD = \
-  libRTCORBA_Quoter_Common.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_STL
-endif BUILD_RT_CORBA
-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/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h b/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
index bcaf14b5ac6..02045e1bd37 100644
--- a/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
+++ b/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
@@ -30,12 +30,12 @@ class Stock_StockBroker_i;
 
 /**
  * @class Stock_StockNameConsumer_i
- * @brief This class is used as a callback interface used by the 
+ * @brief This class is used as a callback interface used by the
  * distributor to notify brokers of updates. This class is ALSO used as a
  * signal handler to catch SIGINT and properly unsubscribe from the
  * distributor.
  */
-class  Stock_StockNameConsumer_i : 
+class  Stock_StockNameConsumer_i :
   public virtual POA_Stock::StockNameConsumer
 {
 public:
@@ -57,7 +57,7 @@ public:
    * @param the_stockname The name of the stock that will be provided to the context StockBroker object.
    */
   virtual void push_StockName (::Stock::StockNames *the_stockname);
-  
+
   /**
    * Get the cookie attribute.
    *
@@ -78,7 +78,7 @@ private:
 
   /// Name of the stock to listen to.
   CORBA::String_var stock_name_;
-  
+
   Stock::Cookie_var cookie__;
 };
 
diff --git a/docs/tutorials/Quoter/RTCORBA/Stock_Database.h b/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
index 1b9aaa75273..705b8a02b1e 100644
--- a/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
+++ b/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
@@ -22,7 +22,7 @@
 
 /**
  * @class Stock_Database
- * @brief This class is used to install, update and publish the information of 
+ * @brief This class is used to install, update and publish the information of
  * all the stocks. It uses the singleton design pattern.
  * The parameter type may be any type that has a method called "updated_stocks" and
  * accepts a std::vector of std::strings as an argument.
@@ -39,49 +39,49 @@ public:
   /// Constructor.
   /// @param file The name of a file to read initial stocks and values from.
   Stock_Database (const char *file, u_int rate = 1);
-  
+
   typedef std::map <std::string,
                     unsigned int> Init_Map;
-  
+
   /// Constructor
   /// @param stockmap  A map containing stocks and initial values.  An initial value
   /// of 0 will be assigned a random start value.
   Stock_Database (const Init_Map &stockmap, u_int rate = 0);
-  
+
   typedef std::string Cookie;
-  
+
   /**
    * Register a callback object with the database. The callback object must have
    * the () operator defined accepting a std::vector of strings as the argument.
    * @returns A cookie to identify the registration
    */
   Cookie register_callback (CALLBACK &obj);
-  
+
   /**
    * Removes a callback from the notification queue.
    * @returns false if the provided cookie is not found.
    */
   bool remove_callback (const Cookie &);
-  
+
   /// Raised if an invalid stock name is requested.
   class Invalid_Stock {};
-    
+
   struct StockInfo
   {
     StockInfo (void)
       : name_(""), high_ (0), low_ (0), last_ (0)
     {};
-    
+
     StockInfo (const std::string name)
       : name_ (name), high_ (0), low_(0), last_(0)
     {};
-    
+
     std::string name_;
     int high_;
     int low_;
     int last_;
   };
-    
+
   /**
    * Create a StockInfo object stored in the database with the given name.
    *
@@ -89,47 +89,47 @@ public:
    * @return A StockInfo object.
    */
   StockInfo get_stock_info (const char *name);
-  
+
   /**
    * This function is used to calculate the new high, low and last values
-   * for each stock in the stock database randomly. 
+   * for each stock in the stock database randomly.
    */
   virtual int svc (void);
-  
+
   /// Change the rate at which database updates are made
   void update_rate (u_int rate);
-  
+
   /// Launch the active object
   void start (void);
-  
+
   /// Stop the active object
   void stop (void);
-  
+
   typedef std::map <std::string, StockInfo> Stock_Map;
-  
+
   /// This method is not intended to be called by clients of this class,
-  /// it is public only by necessity. 
+  /// it is public only by necessity.
   virtual int handle_signal (int signum,
                              siginfo_t * = 0,
                              ucontext_t * = 0);
-  
+
   typedef std::map <Cookie, CALLBACK *> Callback_Map;
 
 private:
   /// The filname initialized from, if any.
   const std::string filename_;
-  
+
   /// Keep track of the stock names and information about them.
   Stock_Map stock_map_;
-  
+
   /// Lock to protect concurrent access to the <stock_map_>.
   ACE_RW_Thread_Mutex lock_;
-  
+
   /// Rate at which updates are made.
   u_int rate_;
 
   Callback_Map callbacks_;
-  
+
   bool active_;
 };
 
diff --git a/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp b/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp
index 7b019efa254..0a34e87a184 100644
--- a/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp
+++ b/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp
@@ -18,20 +18,20 @@ struct Map_Init
     : map_ (map)
   {
   }
-  
+
   void operator () (const typename Stock_Database<CALLBACK>::Init_Map::value_type &item)
   {
     typename Stock_Database<CALLBACK>::StockInfo stock_info (item.first.c_str ());
-    
-    // If the initial value is nonzero, use that - otherwise, use a number 
+
+    // If the initial value is nonzero, use that - otherwise, use a number
     // between 0 and 100
-    stock_info.low_ = 
-      stock_info.last_ = 
+    stock_info.low_ =
+      stock_info.last_ =
       stock_info.high_ = item.second ? item.second : ACE_OS::rand () % 100;
-    
+
     map_[item.first] = stock_info;
   }
-  
+
   typename Stock_Database<CALLBACK>::Stock_Map &map_;
 };
 
@@ -45,7 +45,7 @@ Stock_Database<CALLBACK>::Stock_Database (u_int rate)
   map["IBM"] = 0;
   map["MSFT"] = 0;
   map["INTEL"] = 0;
-  
+
   std::for_each (map.begin (),
                  map.end (),
                  Map_Init<CALLBACK> (this->stock_map_));
@@ -61,7 +61,7 @@ Stock_Database<CALLBACK>::Stock_Database (const char *file, u_int rate)
 }
 
 template <typename CALLBACK>
-Stock_Database<CALLBACK>::Stock_Database (const Init_Map &stockmap, 
+Stock_Database<CALLBACK>::Stock_Database (const Init_Map &stockmap,
                                           u_int rate)
   : rate_ (rate),
     active_ (false)
@@ -73,18 +73,18 @@ Stock_Database<CALLBACK>::Stock_Database (const Init_Map &stockmap,
 
 // get_stock_info
 template <typename CALLBACK>
-typename Stock_Database<CALLBACK>::StockInfo 
+typename Stock_Database<CALLBACK>::StockInfo
 Stock_Database<CALLBACK>::get_stock_info(const char *name)
 {
   ACE_READ_GUARD_RETURN (ACE_RW_Thread_Mutex,
                          guard,
                          this->lock_,
                          StockInfo ("Error"));
-  
+
   // Locate the <stock_name> in the database.
   ACE_DEBUG ((LM_DEBUG,
               "*** message: searching the stock_map_ for the stock_name\n"));
-  
+
   typename Stock_Map::iterator iter = this->stock_map_.find (std::string (name));
 
   if (iter == this->stock_map_.end ())
@@ -101,21 +101,21 @@ Stock_Database<CALLBACK>::register_callback (CALLBACK &obj)
 {
   ACE_Utils::UUID uuid;
   ACE_Utils::UUID_GENERATOR::instance ()->generate_UUID (uuid);
-  
+
   this->callbacks_[uuid.to_string ()->c_str ()] = &obj;
-  
+
   return uuid.to_string ()->c_str ();
 }
 
 template <typename CALLBACK>
-void 
+void
 Stock_Database<CALLBACK>::update_rate (u_int rate)
 {
   this->rate_ = rate;
 }
 
 template <typename CALLBACK>
-void 
+void
 Stock_Database<CALLBACK>::start (void)
 {
   if (!this->active_)
@@ -132,7 +132,7 @@ Stock_Database<CALLBACK>::start (void)
 }
 
 template <typename CALLBACK>
-void 
+void
 Stock_Database<CALLBACK>::stop (void)
 {
   ACE_WRITE_GUARD (ACE_RW_Thread_Mutex,
@@ -143,7 +143,7 @@ Stock_Database<CALLBACK>::stop (void)
 }
 
 template <typename CALLBACK>
-int 
+int
 Stock_Database<CALLBACK>::handle_signal (int,
                                          siginfo_t *,
                                          ucontext_t *)
@@ -154,89 +154,89 @@ Stock_Database<CALLBACK>::handle_signal (int,
                           -1);
 
   std::ifstream input (this->filename_.c_str ());
-  
+
   std::string name;
   u_int value = 0;
-  
+
   typename Stock_Database<CALLBACK>::Init_Map map;
-  
+
   while (input.good ())
     {
       input >> name;
       input >> value;
       map[name] = value;
     }
-  
+
   input.close ();
-  
+
   std::for_each (map.begin (),
                  map.end (),
                  Map_Init<CALLBACK> (this->stock_map_));
-  
+
   return 0;
 }
 
 
 template <typename CALLBACK>
 struct Stock_Updater
-{  
+{
   void operator () (typename Stock_Database<CALLBACK>::Stock_Map::value_type &item)
   {
     // Determine if the stock has changed.
     if (ACE_OS::rand () % 2)
       return; // Nope! On to the next!
-    
+
     changed_.push_back (item.first);
-    
+
     // Determine the amount of change of the stock. We will
     // only permit a 5 point change at a time in either direction
     int delta = ACE_OS::rand () % 10 - 5;
-    
+
     // We don't want negative stock values!
     if (item.second.last_ <= delta)
       delta *= -1;
-    
+
     // Calculate the new values for the stock.
     item.second.last_ += delta;
-    
+
     if (item.second.last_ < item.second.low_)
       item.second.low_ = item.second.last_;
     else if (item.second.last_ > item.second.high_)
       item.second.high_ = item.second.last_;
   }
-  
+
   void operator () (typename Stock_Database<CALLBACK>::Callback_Map::value_type &item)
   {
     (*item.second)  (changed_);
   }
-  
+
 private:
   std::vector <std::string> changed_;
-};  
-  
+};
+
 template <typename CALLBACK>
-int 
+int
 Stock_Database<CALLBACK>::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "tock!\n"));
-  
-  while (this->active_) 
+
+  while (this->active_)
     {
       {
         // Init our functor
         Stock_Updater<CALLBACK> updater;
-        
+
         { // Control the scope of our mutex to avoid deadlock.
           ACE_WRITE_GUARD_RETURN (ACE_RW_Thread_Mutex,
                                   guard,
                                   this->lock_,
                                   -1);
-          
+
           updater = std::for_each (this->stock_map_.begin (),
                                    this->stock_map_.end (),
                                    updater);
         }
-      
+
         // Update stock prices
         // notify callbacks
         std::for_each (this->callbacks_.begin (),
diff --git a/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h b/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
index 4326b43401f..931ba509498 100644
--- a/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
+++ b/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
@@ -50,7 +50,7 @@ namespace Stock
     /// Register mapping.
     static void register_mapping (CORBA::ORB_ptr orb);
   };
- 
+
 }
 
 #endif  // !defined STOCK_PRIORITYMAPPING_
diff --git a/docs/tutorials/Quoter/RT_Event_Service/Makefile.am b/docs/tutorials/Quoter/RT_Event_Service/Makefile.am
deleted file mode 100644
index b703e285f20..00000000000
--- a/docs/tutorials/Quoter/RT_Event_Service/Makefile.am
+++ /dev/null
@@ -1,144 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Quoter_RT_Event_Service_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl
-
-CLEANFILES = \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Quoter.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Quoter.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Quoter_RT_Event_Service_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  QuoterC.cpp \
-  Stock_Consumer.cpp \
-  client.cpp \
-  Stock_Consumer.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Quoter_RT_Event_Service_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  QuoterC.cpp \
-  QuoterS.cpp \
-  Stock_Factory_i.cpp \
-  Stock_i.cpp \
-  server.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/docs/tutorials/Quoter/RT_Event_Service/index.html b/docs/tutorials/Quoter/RT_Event_Service/index.html
index 694e195d65d..20046fb66c9 100644
--- a/docs/tutorials/Quoter/RT_Event_Service/index.html
+++ b/docs/tutorials/Quoter/RT_Event_Service/index.html
@@ -330,12 +330,12 @@ Quoter_Stock_i::disconnect_push_supplier (void)
     <P>To test your changes you need to run three programs,
       first TAO's Naming Service:
 <PRE>
-$ $TAO_ROOT/orbsvcs/Naming_Service/Naming_Service
+$ $TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming
 </PRE>
     <P>then run TAO's Real-time Event Service
     </P>
 <PRE>
-$ $TAO_ROOT/orbsvcs/Event_Service/Event_Service
+$ $TAO_ROOT/orbsvcs/Event_Service/tao_rtevent
 </PRE>
 
     <P>Now you can run your client:
diff --git a/docs/tutorials/Quoter/Simple/Client/Makefile.am b/docs/tutorials/Quoter/Simple/Client/Makefile.am
deleted file mode 100644
index eae36425c09..00000000000
--- a/docs/tutorials/Quoter/Simple/Client/Makefile.am
+++ /dev/null
@@ -1,52 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Quoter_Simple_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../../idl \
-  -I../../idl
-
-client_SOURCES = \
-  client.cpp
-
-client_LDFLAGS = \
-  -L../../idl
-
-client_LDADD = \
-  $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am b/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am
deleted file mode 100644
index 98e25eb9335..00000000000
--- a/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am
+++ /dev/null
@@ -1,111 +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:
-## ../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.Quoter_Simple_Impl_Repo_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../../idl \
-  -I../../idl
-
-client_SOURCES = \
-  client.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-client_LDFLAGS = \
-  -L../../idl
-
-client_LDADD = \
-  $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Quoter_Simple_Impl_Repo_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../../idl \
-  -I../../idl
-
-server_SOURCES = \
-  Stock_Factory_i.cpp \
-  Stock_i.cpp \
-  server.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-server_LDFLAGS = \
-  -L../../idl
-
-server_LDADD = \
-  $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/docs/tutorials/Quoter/Simple/Impl-Repo/index.html b/docs/tutorials/Quoter/Simple/Impl-Repo/index.html
index 6a4bac0895c..513eab85ff9 100644
--- a/docs/tutorials/Quoter/Simple/Impl-Repo/index.html
+++ b/docs/tutorials/Quoter/Simple/Impl-Repo/index.html
@@ -79,13 +79,13 @@
       so that both the activator and the client can find the locator.
     </P>
     <PRE>
-       $ $TAO_ROOT/orbsvcs/ImplRepo_Service/ImplRepo_Service -o implrepo.ior -d 0 -ORBobjrefstyle URL &
+       $ $TAO_ROOT/orbsvcs/ImplRepo_Service/tao_imr_locator -o implrepo.ior -d 0 -ORBobjrefstyle URL &
     </PRE>
     
     <P>Second, we start the activator, pointing it to the locator's IOR file.
     </P>
     <PRE>
-       $ $TAO_ROOT/orbsvcs/ImplRepo_Service/ImR_Activator -ORBInitRef ImplRepoService=file://implrepo.ior
+       $ $TAO_ROOT/orbsvcs/ImplRepo_Service/tao_imr_activator -ORBInitRef ImplRepoService=file://implrepo.ior
 
           ImR Activator: Starting doc.ece.uci.edu
           ImR Activator: Registered with ImR.
@@ -93,12 +93,12 @@
 
     <P> Next, we need to register our server with the implementation
       repository. We can use the
-      <CODE>$TAO_ROOT/orbsvcs/ImplRepo_Service/tao_imr</CODE>
+      <CODE>$TAO_ROOT/orbsvcs/ImplRepo_Service/tao_imr_locator</CODE>
       application provided with TAO to add our server to the server
       database in the implementation repository. 
     </P>
     <PRE>
-       $ $TAO_ROOT/orbsvcs/ImplRepo_Service/tao_imr -ORBInitRef 
+       $ $TAO_ROOT/orbsvcs/ImplRepo_Service/tao_imr_locator -ORBInitRef 
          ImplRepoService=file://implrepo.ior add childPOA -c
          "./server -ORBUseIMR 1 -ORBobjrefstyle URL -ORBInitRef 
          ImplRepoService=file://implrepo.ior"
diff --git a/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp b/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
index b5a7838526c..eb0b39105a3 100644
--- a/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
+++ b/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
@@ -1,18 +1,18 @@
-// $Id$
-
-//===========================================================================
-//
-// = FILENAME
-//     server.cpp
-//
-// = DESCRIPTION
-//     In this example,
-//        - Example showing the working of implementation repository.
-//
-// = AUTHOR
-//     Priyanka Gontla
-//
-//============================================================================
+
+//=============================================================================
+/**
+ *  @file     server.cpp
+ *
+ *  $Id$
+ *
+ *   In this example,
+ *      - Example showing the working of implementation repository.
+ *
+ *
+ *  @author  Priyanka Gontla
+ */
+//=============================================================================
+
 
 #include "Stock_Factory_i.h"
 #include "tao/IORTable/IORTable.h"
diff --git a/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am b/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am
deleted file mode 100644
index 58182a5fa8d..00000000000
--- a/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am
+++ /dev/null
@@ -1,56 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Quoter_Simple_ImprovedServer.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../../idl \
-  -I../../idl
-
-server_SOURCES = \
-  Stock_Factory_i.cpp \
-  Stock_i.cpp \
-  server.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-server_LDFLAGS = \
-  -L../../idl
-
-server_LDADD = \
-  $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp b/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp
index 0623650f173..6a225a70048 100644
--- a/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp
+++ b/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp
@@ -22,5 +22,5 @@ Quoter_Stock_Factory_i::get_stock (const char *symbol)
   }
   catch (PortableServer::POA::ObjectNotActive &) {
     throw Quoter::Invalid_Stock_Symbol ();
-  } 
+  }
 }
diff --git a/docs/tutorials/Quoter/Simple/Makefile.am b/docs/tutorials/Quoter/Simple/Makefile.am
deleted file mode 100644
index dbb1885fecd..00000000000
--- a/docs/tutorials/Quoter/Simple/Makefile.am
+++ /dev/null
@@ -1,17 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Client \
-        Impl-Repo \
-        ImprovedServer \
-        Persistent \
-        Server
-
diff --git a/docs/tutorials/Quoter/Simple/Persistent/Makefile.am b/docs/tutorials/Quoter/Simple/Persistent/Makefile.am
deleted file mode 100644
index a6eb2dcc9a5..00000000000
--- a/docs/tutorials/Quoter/Simple/Persistent/Makefile.am
+++ /dev/null
@@ -1,88 +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:
-## ../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.Quoter_Simple_Persistent_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../../idl \
-  -I../../idl
-
-client_SOURCES = \
-  client.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-client_LDFLAGS = \
-  -L../../idl
-
-client_LDADD = \
-  $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Quoter_Simple_Persistent_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../../idl \
-  -I../../idl
-
-server_SOURCES = \
-  Stock_Factory_i.cpp \
-  Stock_i.cpp \
-  server.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-server_LDFLAGS = \
-  -L../../idl
-
-server_LDADD = \
-  $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/docs/tutorials/Quoter/Simple/Persistent/server.cpp b/docs/tutorials/Quoter/Simple/Persistent/server.cpp
index 95cc2869e69..c42f81726a5 100644
--- a/docs/tutorials/Quoter/Simple/Persistent/server.cpp
+++ b/docs/tutorials/Quoter/Simple/Persistent/server.cpp
@@ -1,19 +1,19 @@
-// $Id$
-
-//===========================================================================
-//
-// = FILENAME
-//     server.cpp
-//
-// = DESCRIPTION
-//
-//     In this example, a new POA (childPOA) is created and its
-//     policy is set so that it object references are persistent.
-//
-// = AUTHOR
-//     Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//============================================================================
+
+//=============================================================================
+/**
+ *  @file     server.cpp
+ *
+ *  $Id$
+ *
+ *
+ *   In this example, a new POA (childPOA) is created and its
+ *   policy is set so that it object references are persistent.
+ *
+ *
+ *  @author  Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #include "Stock_Factory_i.h"
 #include "ace/streams.h"
diff --git a/docs/tutorials/Quoter/Simple/Server/Makefile.am b/docs/tutorials/Quoter/Simple/Server/Makefile.am
deleted file mode 100644
index db646ef4305..00000000000
--- a/docs/tutorials/Quoter/Simple/Server/Makefile.am
+++ /dev/null
@@ -1,56 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Quoter_Simple_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../../idl \
-  -I../../idl
-
-server_SOURCES = \
-  Stock_Factory_i.cpp \
-  Stock_i.cpp \
-  server.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-server_LDFLAGS = \
-  -L../../idl
-
-server_LDADD = \
-  $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/docs/tutorials/Quoter/idl/Makefile.am b/docs/tutorials/Quoter/idl/Makefile.am
deleted file mode 100644
index 3177e5f0a8d..00000000000
--- a/docs/tutorials/Quoter/idl/Makefile.am
+++ /dev/null
@@ -1,82 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Quoter_Idl_Lib.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h
-
-CLEANFILES = \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,export_macro=QUOTER_COMMON_Export -Wb,export_include=quoter_common_export.h -GT $(srcdir)/Quoter.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libQuoter_Idl_Lib.la
-
-libQuoter_Idl_Lib_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DQUOTER_COMMON_BUILD_DLL
-
-libQuoter_Idl_Lib_la_SOURCES = \
-  QuoterC.cpp \
-  QuoterS.cpp
-
-noinst_HEADERS = \
-  Quoter.idl \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  quoter_common_export.h
-
-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/etc/tao.doxygen b/etc/tao.doxygen
index 3f56f63c2f8..d76d4730168 100644
--- a/etc/tao.doxygen
+++ b/etc/tao.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao
+HTML_OUTPUT           = html/libtao-doc
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -125,18 +125,18 @@ PREDEFINED            = __ACE_INLINE__ \
                         ACE_END_VERSIONED_NAMESPACE_DECL \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
-                        ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_INLINE \
+                        TAO_Export=
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
+
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../ace
-GENERATE_TAGFILE      = html/tao/TAO.tag
+TAGFILES              = html/libace-doc/ACE.tag=../libace-doc
+GENERATE_TAGFILE      = html/libtao-doc/TAO.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_anytypecode.doxygen b/etc/tao_anytypecode.doxygen
index fa36cd4a586..0e5ab250a70 100644
--- a/etc/tao_anytypecode.doxygen
+++ b/etc/tao_anytypecode.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/anytypecode
+HTML_OUTPUT           = html/libtao-doc/anytypecode
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -126,18 +126,16 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/anytypecode/TAO_AnyTypeCode.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/anytypecode/TAO_AnyTypeCode.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_av.doxygen b/etc/tao_av.doxygen
index 6c71587e09c..2c4ef8757a5 100644
--- a/etc/tao_av.doxygen
+++ b/etc/tao_av.doxygen
@@ -50,9 +50,9 @@ WARN_FORMAT           = "$file:$line: $text"
 #---------------------------------------------------------------------------
 
 INPUT                 = TAO/orbsvcs/orbsvcs/AVStreams.idl \
-			TAO/orbsvcs/orbsvcs/Null_MediaCtrl.idl \
-			TAO/orbsvcs/orbsvcs/sfp.idl \
-			TAO/orbsvcs/orbsvcs/AV
+                        TAO/orbsvcs/orbsvcs/Null_MediaCtrl.idl \
+                        TAO/orbsvcs/orbsvcs/sfp.idl \
+                        TAO/orbsvcs/orbsvcs/AV
 FILE_PATTERNS         = *.cpp *.h *.inl *.pidl *.idl
 RECURSIVE             =
 EXCLUDE               =
@@ -75,7 +75,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/av
+HTML_OUTPUT           = html/libtao-doc/av
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -129,19 +129,17 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=.. \
-			html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/av/TAO_AV.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver
+GENERATE_TAGFILE      = html/libtao-doc/av/TAO_AV.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_compression.doxygen b/etc/tao_compression.doxygen
index b35b09ade56..deec0a17d30 100644
--- a/etc/tao_compression.doxygen
+++ b/etc/tao_compression.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/compression
+HTML_OUTPUT           = html/libtao-doc/compression
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -126,18 +126,16 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/compression/TAO_Compression.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/compression/TAO_Compression.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_cosevent.doxygen b/etc/tao_cosevent.doxygen
index 99eedacce2f..f8e63aa3aa6 100644
--- a/etc/tao_cosevent.doxygen
+++ b/etc/tao_cosevent.doxygen
@@ -50,9 +50,9 @@ WARN_FORMAT           = "$file:$line: $text"
 #---------------------------------------------------------------------------
 
 INPUT                 = \
-	TAO/orbsvcs/orbsvcs/CosEventComm.idl \
-	TAO/orbsvcs/orbsvcs/CosEventChannelAdmin.idl \
-	TAO/orbsvcs/orbsvcs/CosEvent
+                        TAO/orbsvcs/orbsvcs/CosEventComm.idl \
+                        TAO/orbsvcs/orbsvcs/CosEventChannelAdmin.idl \
+                        TAO/orbsvcs/orbsvcs/CosEvent
 FILE_PATTERNS         = CEC_*.cpp CEC_*.h CEC_*.inl CEC_*.pidl *.idl
 RECURSIVE             =
 EXCLUDE               =
@@ -75,7 +75,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/cosevent
+HTML_OUTPUT           = html/libtao-doc/cosevent
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -129,20 +129,18 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-	html/tao/TAO.tag=.. \
-	html/tao/portableserver/TAO_PortableServer.tag=../portableserver \
-	html/tao/esf/TAO_ESF.tag=../esf
-GENERATE_TAGFILE      = html/tao/cosevent/TAO_CosEvent.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver \
+                        html/libtao-doc/esf/TAO_ESF.tag=../esf
+GENERATE_TAGFILE      = html/libtao-doc/cosevent/TAO_CosEvent.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_cosnaming.doxygen b/etc/tao_cosnaming.doxygen
index 7d3cddf3062..b6eca6ff7ef 100644
--- a/etc/tao_cosnaming.doxygen
+++ b/etc/tao_cosnaming.doxygen
@@ -50,7 +50,7 @@ WARN_FORMAT           = "$file:$line: $text"
 #---------------------------------------------------------------------------
 
 INPUT                 = TAO/orbsvcs/orbsvcs/CosNaming.idl \
-                TAO/orbsvcs/orbsvcs/Naming
+                        TAO/orbsvcs/orbsvcs/Naming
 FILE_PATTERNS         = *.cpp *.h *.inl *.pidl *.idl
 RECURSIVE             =
 EXCLUDE               =
@@ -73,7 +73,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/cosnaming
+HTML_OUTPUT           = html/libtao-doc/cosnaming
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -127,18 +127,16 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-        html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/cosnaming/TAO_CosNaming.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/cosnaming/TAO_CosNaming.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_cosnotification.doxygen b/etc/tao_cosnotification.doxygen
index 1cb221a6e07..f43b3bcc951 100644
--- a/etc/tao_cosnotification.doxygen
+++ b/etc/tao_cosnotification.doxygen
@@ -50,14 +50,14 @@ WARN_FORMAT           = "$file:$line: $text"
 #---------------------------------------------------------------------------
 
 INPUT                 = \
-	TAO/orbsvcs/orbsvcs/CosNotification.idl \
-	TAO/orbsvcs/orbsvcs/CosNotifyFilter.idl \
-	TAO/orbsvcs/orbsvcs/CosNotifyComm.idl \
-	TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl \
-        TAO/orbsvcs/orbsvcs/Notify \
-        TAO/orbsvcs/orbsvcs/Notify/Any \
-        TAO/orbsvcs/orbsvcs/Notify/Sequence \
-        TAO/orbsvcs/orbsvcs/Notify/Structured
+                        TAO/orbsvcs/orbsvcs/CosNotification.idl \
+                        TAO/orbsvcs/orbsvcs/CosNotifyFilter.idl \
+                        TAO/orbsvcs/orbsvcs/CosNotifyComm.idl \
+                        TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl \
+                        TAO/orbsvcs/orbsvcs/Notify \
+                        TAO/orbsvcs/orbsvcs/Notify/Any \
+                        TAO/orbsvcs/orbsvcs/Notify/Sequence \
+                        TAO/orbsvcs/orbsvcs/Notify/Structured
 FILE_PATTERNS         = *.cpp *.h *.inl *.idl
 RECURSIVE             =
 EXCLUDE               =
@@ -80,7 +80,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/cosnotification
+HTML_OUTPUT           = html/libtao-doc/cosnotification
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -134,21 +134,19 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-	html/tao/TAO.tag=.. \
-	html/tao/portableserver/TAO_PortableServer.tag=../portableserver \
-	html/tao/cosevent/TAO_CosEvent.tag=../cosevent \
-	html/tao/esf/TAO_ESF.tag=../esf
-GENERATE_TAGFILE      = html/tao/cosnotification/TAO_CosNotification.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver \
+                        html/libtao-doc/cosevent/TAO_CosEvent.tag=../cosevent \
+                        html/libtao-doc/esf/TAO_ESF.tag=../esf
+GENERATE_TAGFILE      = html/libtao-doc/cosnotification/TAO_CosNotification.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_costime.doxygen b/etc/tao_costime.doxygen
index 0eb0431c649..b94477dadea 100644
--- a/etc/tao_costime.doxygen
+++ b/etc/tao_costime.doxygen
@@ -50,7 +50,7 @@ WARN_FORMAT           = "$file:$line: $text"
 #---------------------------------------------------------------------------
 
 INPUT                 = TAO/orbsvcs/orbsvcs/TimeService.idl \
-                TAO/orbsvcs/orbsvcs/Time
+                        TAO/orbsvcs/orbsvcs/Time
 FILE_PATTERNS         = *.cpp *.h *.inl *.pidl *.idl
 RECURSIVE             =
 EXCLUDE               =
@@ -73,7 +73,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/costime
+HTML_OUTPUT           = html/libtao-doc/costime
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -127,19 +127,17 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-                        html/tao/TAO.tag=.. \
-                        html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/costime/TAO_CosTime.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver
+GENERATE_TAGFILE      = html/libtao-doc/costime/TAO_CosTime.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_costrader.doxygen b/etc/tao_costrader.doxygen
index 7e78a9761db..a7f565d9ea8 100644
--- a/etc/tao_costrader.doxygen
+++ b/etc/tao_costrader.doxygen
@@ -49,11 +49,10 @@ WARN_FORMAT           = "$file:$line: $text"
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 
-INPUT                 = \
-	TAO/orbsvcs/orbsvcs/CosTrading.idl \
-	TAO/orbsvcs/orbsvcs/CosTradingDynamic.idl \
-	TAO/orbsvcs/orbsvcs/CosTradingRepos.idl \
-	TAO/orbsvcs/orbsvcs/Trader
+INPUT                 = TAO/orbsvcs/orbsvcs/CosTrading.idl \
+                        TAO/orbsvcs/orbsvcs/CosTradingDynamic.idl \
+                        TAO/orbsvcs/orbsvcs/CosTradingRepos.idl \
+                        TAO/orbsvcs/orbsvcs/Trader
 FILE_PATTERNS         = *.cpp *.h *.inl *.idl
 RECURSIVE             =
 EXCLUDE               =
@@ -76,7 +75,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/costrader
+HTML_OUTPUT           = html/libtao-doc/costrader
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -130,19 +129,17 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-	html/tao/TAO.tag=.. \
-	html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/costrader/TAO_CosTrader.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver
+GENERATE_TAGFILE      = html/libtao-doc/costrader/TAO_CosTrader.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_dynamicany.doxygen b/etc/tao_dynamicany.doxygen
index afaaed9257b..16d2bed576c 100644
--- a/etc/tao_dynamicany.doxygen
+++ b/etc/tao_dynamicany.doxygen
@@ -73,7 +73,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/dynamicany
+HTML_OUTPUT           = html/libtao-doc/dynamicany
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -127,17 +127,15 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/dynamicany/TAO_DynamicAny.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/dynamicany/TAO_DynamicAny.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_dynamicinterface.doxygen b/etc/tao_dynamicinterface.doxygen
index 68ee2127606..47141d66893 100644
--- a/etc/tao_dynamicinterface.doxygen
+++ b/etc/tao_dynamicinterface.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/dynamicinterface
+HTML_OUTPUT           = html/libtao-doc/dynamicinterface
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -126,17 +126,15 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/dynamicinterface/TAO_DynamicInterface.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/dynamicinterface/TAO_DynamicInterface.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_esf.doxygen b/etc/tao_esf.doxygen
index 34300d4d0d1..946642ed299 100644
--- a/etc/tao_esf.doxygen
+++ b/etc/tao_esf.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/esf
+HTML_OUTPUT           = html/libtao-doc/esf
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -126,19 +126,17 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=.. \
-			html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/esf/TAO_ESF.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver
+GENERATE_TAGFILE      = html/libtao-doc/esf/TAO_ESF.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_ifr.doxygen b/etc/tao_ifr.doxygen
index b57e6cc4fe7..4c5016191a7 100644
--- a/etc/tao_ifr.doxygen
+++ b/etc/tao_ifr.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/ifr
+HTML_OUTPUT           = html/libtao-doc/ifr
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -126,21 +126,19 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=.. \
-			html/tao/portableserver/TAO_PortableServer.tag=../portableserver \
-			html/tao/iortable/TAO_IORTable.tag=../iortable \
-			html/tao/cosnaming/TAO_CosNaming.tag=../cosnaming
-GENERATE_TAGFILE      = html/tao/ifr/TAO_IFR.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver \
+                        html/libtao-doc/iortable/TAO_IORTable.tag=../iortable \
+                        html/libtao-doc/cosnaming/TAO_CosNaming.tag=../cosnaming
+GENERATE_TAGFILE      = html/libtao-doc/ifr/TAO_IFR.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_implrepo.doxygen b/etc/tao_implrepo.doxygen
index 20945ae8917..ebf1f644752 100644
--- a/etc/tao_implrepo.doxygen
+++ b/etc/tao_implrepo.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/implrepo_service
+HTML_OUTPUT           = html/libtao-doc/implrepo_service
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -126,20 +126,18 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-	html/tao/TAO.tag=.. \
-	html/tao/portableserver/TAO_PortableServer.tag=../portableserver \
-        html/tao/iortable/TAO_IORTable.tag=../iortable
-GENERATE_TAGFILE      = html/tao/implrepo_service/TAO_ImplRepo.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver \
+                        html/libtao-doc/iortable/TAO_IORTable.tag=../iortable
+GENERATE_TAGFILE      = html/libtao-doc/implrepo_service/TAO_ImplRepo.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_iormanip.doxygen b/etc/tao_iormanip.doxygen
index 7f3881789aa..035065a69da 100644
--- a/etc/tao_iormanip.doxygen
+++ b/etc/tao_iormanip.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/iormanipulation
+HTML_OUTPUT           = html/libtao-doc/iormanipulation
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -126,18 +126,16 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/iormanipulation/TAO_IORManipulation.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/iormanipulation/TAO_IORManipulation.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_iortable.doxygen b/etc/tao_iortable.doxygen
index d0674c716c4..89c0d8e7e4a 100644
--- a/etc/tao_iortable.doxygen
+++ b/etc/tao_iortable.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/iortable
+HTML_OUTPUT           = html/libtao-doc/iortable
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -126,18 +126,16 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/iortable/TAO_IORTable.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/iortable/TAO_IORTable.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_pi.doxygen b/etc/tao_pi.doxygen
index 1529a593c0a..4574c930d52 100644
--- a/etc/tao_pi.doxygen
+++ b/etc/tao_pi.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/pi
+HTML_OUTPUT           = html/libtao-doc/pi
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -125,19 +125,18 @@ PREDEFINED            = __ACE_INLINE__ \
                         ACE_END_VERSIONED_NAMESPACE_DECL \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
-                        ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_INLINE=inline \
+                        TAO_HAS_INTERCEPTORS=1
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/pi/TAO_PI.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/pi/TAO_PI.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_pi_server.doxygen b/etc/tao_pi_server.doxygen
index 974a1114598..7e423a29c28 100644
--- a/etc/tao_pi_server.doxygen
+++ b/etc/tao_pi_server.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/pi_server
+HTML_OUTPUT           = html/libtao-doc/pi_server
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -125,19 +125,18 @@ PREDEFINED            = __ACE_INLINE__ \
                         ACE_END_VERSIONED_NAMESPACE_DECL \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
-                        ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_INLINE=inline \
+                        TAO_HAS_INTERCEPTORS=1
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/pi_server/TAO_PI_Server.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/pi_server/TAO_PI_Server.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_portablegroup.doxygen b/etc/tao_portablegroup.doxygen
index 6ddcfded6d6..87ff0db81f2 100644
--- a/etc/tao_portablegroup.doxygen
+++ b/etc/tao_portablegroup.doxygen
@@ -50,9 +50,9 @@ WARN_FORMAT           = "$file:$line: $text"
 #---------------------------------------------------------------------------
 
 INPUT                 = \
-	TAO/orbsvcs/orbsvcs/miop.idl \
-	TAO/orbsvcs/orbsvcs/PortableGroup.idl \
-	TAO/orbsvcs/orbsvcs/PortableGroup
+                        TAO/orbsvcs/orbsvcs/miop.idl \
+                        TAO/orbsvcs/orbsvcs/PortableGroup.idl \
+                        TAO/orbsvcs/orbsvcs/PortableGroup
 FILE_PATTERNS         = *.cpp *.h *.inl *.pidl
 RECURSIVE             =
 EXCLUDE               =
@@ -75,7 +75,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/portablegroup
+HTML_OUTPUT           = html/libtao-doc/portablegroup
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -129,19 +129,17 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-	html/tao/TAO.tag=.. \
-	html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/portablegroup/TAO_PortableGroup.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver
+GENERATE_TAGFILE      = html/libtao-doc/portablegroup/TAO_PortableGroup.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_portableserver.doxygen b/etc/tao_portableserver.doxygen
index a98e74baf7b..abe30e36444 100644
--- a/etc/tao_portableserver.doxygen
+++ b/etc/tao_portableserver.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/portableserver
+HTML_OUTPUT           = html/libtao-doc/portableserver
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -125,19 +125,18 @@ PREDEFINED            = __ACE_INLINE__ \
                         ACE_END_VERSIONED_NAMESPACE_DECL \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
-                        ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_INLINE \
+                        TAO_NAMESPACE_STORAGE_CLASS=
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/portableserver/TAO_PortableServer.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/portableserver/TAO_PortableServer.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_pss.doxygen b/etc/tao_pss.doxygen
deleted file mode 100644
index bffd82fca7d..00000000000
--- a/etc/tao_pss.doxygen
+++ /dev/null
@@ -1,169 +0,0 @@
-# Doxyfile 1.1.5
-#
-# $Id$
-#
-
-PROJECT_NAME          = TAO_PSS
-PROJECT_NUMBER        = Snapshot
-OUTPUT_DIRECTORY      = .
-OUTPUT_LANGUAGE       = English
-DISABLE_INDEX         = NO
-EXTRACT_ALL           = YES
-EXTRACT_PRIVATE       = YES
-EXTRACT_STATIC        = YES
-HIDE_UNDOC_MEMBERS    = NO
-HIDE_UNDOC_CLASSES    = NO
-BRIEF_MEMBER_DESC     = YES
-REPEAT_BRIEF          = YES
-ALWAYS_DETAILED_SEC   = NO
-FULL_PATH_NAMES       = NO
-STRIP_FROM_PATH       =
-INTERNAL_DOCS         = YES
-CLASS_DIAGRAMS        = YES
-SOURCE_BROWSER        = YES
-INLINE_SOURCES        = YES
-STRIP_CODE_COMMENTS   = NO
-CASE_SENSE_NAMES      = YES
-HIDE_SCOPE_NAMES      = NO
-VERBATIM_HEADERS      = YES
-SHOW_INCLUDE_FILES    = YES
-JAVADOC_AUTOBRIEF     = NO
-INHERIT_DOCS          = YES
-INLINE_INFO           = YES
-SORT_MEMBER_DOCS      = YES
-DISTRIBUTE_GROUP_DOC  = YES
-TAB_SIZE              = 8
-ENABLED_SECTIONS      =
-SHORT_NAMES           = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-QUIET                 = YES
-WARNINGS              = NO
-WARN_IF_UNDOCUMENTED  = YES
-WARN_FORMAT           = "$file:$line: $text"
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-INPUT                 = TAO/orbsvcs/PSS
-FILE_PATTERNS         = *.cpp *.h *.inl *.pidl *.idl
-RECURSIVE             =
-EXCLUDE               =
-EXCLUDE_PATTERNS      =
-EXAMPLE_PATH          =
-EXAMPLE_PATTERNS      =
-IMAGE_PATH            =
-INPUT_FILTER          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-ALPHABETICAL_INDEX    = YES
-COLS_IN_ALPHA_INDEX   = 1
-IGNORE_PREFIX         =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/pss
-HTML_HEADER           =
-HTML_FOOTER           =
-HTML_STYLESHEET       =
-HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-GENERATE_LATEX        = NO
-LATEX_OUTPUT          = latex
-COMPACT_LATEX         = NO
-PAPER_TYPE            = a4wide
-EXTRA_PACKAGES        =
-LATEX_HEADER          =
-PDF_HYPERLINKS        = NO
-LATEX_BATCHMODE       = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-GENERATE_RTF          = NO
-RTF_OUTPUT            = rtf
-COMPACT_RTF           = NO
-RTF_HYPERLINKS        = NO
-RTF_STYLESHEET_FILE   =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-GENERATE_MAN          = NO
-MAN_OUTPUT            = man
-MAN_EXTENSION         = .3
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-ENABLE_PREPROCESSING  = YES
-MACRO_EXPANSION       = YES
-EXPAND_ONLY_PREDEF    = YES
-SEARCH_INCLUDES       = YES
-INCLUDE_PATH          = TAO .
-PREDEFINED            = __ACE_INLINE__ \
-                        ACE_TEMPLATES_REQUIRE_SOURCE \
-                        ACE_BEGIN_VERSIONED_NAMESPACE_DECL \
-                        ACE_END_VERSIONED_NAMESPACE_DECL \
-                        TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
-                        TAO_END_VERSIONED_NAMESPACE_DECL \
-                        ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=.. \
-			html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/pss/TAO_PSS.tag
-ALLEXTERNALS          = NO
-PERL_PATH             = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz
-
-HAVE_DOT              = YES
-CLASS_GRAPH           = YES
-COLLABORATION_GRAPH   = YES
-INCLUDE_GRAPH         = NO
-INCLUDED_BY_GRAPH     = NO
-GRAPHICAL_HIERARCHY   = YES
-DOT_MULTI_TARGETS     = YES
-MAX_DOT_GRAPH_DEPTH   = 3
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found on the path.
-DOT_PATH              =
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-
-SEARCHENGINE          = YES
-
diff --git a/etc/tao_rtcorba.doxygen b/etc/tao_rtcorba.doxygen
index 0b6d9e684a1..4bd083c73b7 100644
--- a/etc/tao_rtcorba.doxygen
+++ b/etc/tao_rtcorba.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/rtcorba
+HTML_OUTPUT           = html/libtao-doc/rtcorba
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -125,19 +125,18 @@ PREDEFINED            = __ACE_INLINE__ \
                         ACE_END_VERSIONED_NAMESPACE_DECL \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
-                        ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_INLINE=inline \
+                        TAO_HAS_CORBA_MESSAGING=1
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/rtcorba/TAO_RTCORBA.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/rtcorba/TAO_RTCORBA.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_rtevent.doxygen b/etc/tao_rtevent.doxygen
index 3cfb3b9ec4c..d432e2ee3d0 100644
--- a/etc/tao_rtevent.doxygen
+++ b/etc/tao_rtevent.doxygen
@@ -50,15 +50,15 @@ WARN_FORMAT           = "$file:$line: $text"
 #---------------------------------------------------------------------------
 
 INPUT                 = TAO/orbsvcs/orbsvcs/RtecEventComm.idl \
-	TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl \
-	TAO/orbsvcs/orbsvcs/RtecBase.idl \
-	TAO/orbsvcs/orbsvcs/RtecDefaultEventData.idl \
-	TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl \
-	TAO/orbsvcs/orbsvcs/Event_Utilities.h \
-        TAO/orbsvcs/orbsvcs/Event_Utilities.inl \
-	TAO/orbsvcs/orbsvcs/Event_Utilities.cpp \
-	TAO/orbsvcs/orbsvcs/Event_Service_Constants.h \
-	TAO/orbsvcs/orbsvcs/Event
+                        TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl \
+                        TAO/orbsvcs/orbsvcs/RtecBase.idl \
+                        TAO/orbsvcs/orbsvcs/RtecDefaultEventData.idl \
+                        TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl \
+                        TAO/orbsvcs/orbsvcs/Event_Utilities.h \
+                        TAO/orbsvcs/orbsvcs/Event_Utilities.inl \
+                        TAO/orbsvcs/orbsvcs/Event_Utilities.cpp \
+                        TAO/orbsvcs/orbsvcs/Event_Service_Constants.h \
+                        TAO/orbsvcs/orbsvcs/Event
 FILE_PATTERNS         = EC_*.cpp EC_*.h EC_*.inl EC_*.pidl ECG_*.cpp ECG_*.h *.idl
 RECURSIVE             =
 EXCLUDE               =
@@ -81,7 +81,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/rtevent
+HTML_OUTPUT           = html/libtao-doc/rtevent
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,20 +135,18 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-	html/tao/TAO.tag=.. \
-	html/tao/portableserver/TAO_PortableServer.tag=../portableserver \
-	html/tao/esf/TAO_ESF.tag=../esf
-GENERATE_TAGFILE      = html/tao/rtevent/TAO_RTEvent.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver \
+                        html/libtao-doc/esf/TAO_ESF.tag=../esf
+GENERATE_TAGFILE      = html/libtao-doc/rtevent/TAO_RTEvent.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_rtportableserver.doxygen b/etc/tao_rtportableserver.doxygen
index 965d132bc34..b740a3bed35 100644
--- a/etc/tao_rtportableserver.doxygen
+++ b/etc/tao_rtportableserver.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/rtportableserver
+HTML_OUTPUT           = html/libtao-doc/rtportableserver
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -125,19 +125,18 @@ PREDEFINED            = __ACE_INLINE__ \
                         ACE_END_VERSIONED_NAMESPACE_DECL \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
-                        ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_INLINE=inline \
+                        TAO_HAS_CORBA_MESSAGING=1
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/rtportableserver/TAO_RTPortableServer.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/rtportableserver/TAO_RTPortableServer.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_security.doxygen b/etc/tao_security.doxygen
index adfd5e8fd96..64e1f3a9ce2 100644
--- a/etc/tao_security.doxygen
+++ b/etc/tao_security.doxygen
@@ -50,11 +50,11 @@ WARN_FORMAT           = "$file:$line: $text"
 #---------------------------------------------------------------------------
 
 INPUT                 = TAO/orbsvcs/orbsvcs/Security.idl \
-			TAO/orbsvcs/orbsvcs/SecurityLevel1.idl \
-			TAO/orbsvcs/orbsvcs/SecurityLevel2.idl \
-			TAO/orbsvcs/orbsvcs/SecurityAdmin.idl \
-			TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl \
-			TAO/orbsvcs/orbsvcs/Security
+                        TAO/orbsvcs/orbsvcs/SecurityLevel1.idl \
+                        TAO/orbsvcs/orbsvcs/SecurityLevel2.idl \
+                        TAO/orbsvcs/orbsvcs/SecurityAdmin.idl \
+                        TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl \
+                        TAO/orbsvcs/orbsvcs/Security
 FILE_PATTERNS         = *.cpp *.h *.inl *.pidl *.idl
 RECURSIVE             =
 EXCLUDE               =
@@ -77,7 +77,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/security
+HTML_OUTPUT           = html/libtao-doc/security
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -131,19 +131,17 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=.. \
-			html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/security/TAO_Security.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver
+GENERATE_TAGFILE      = html/libtao-doc/security/TAO_Security.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_smartproxies.doxygen b/etc/tao_smartproxies.doxygen
index 4ed9a156755..83894b34ad1 100644
--- a/etc/tao_smartproxies.doxygen
+++ b/etc/tao_smartproxies.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/smartproxies
+HTML_OUTPUT           = html/libtao-doc/smartproxies
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -126,17 +126,15 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/smartproxies/TAO_SmartProxies.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/smartproxies/TAO_SmartProxies.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_ssliop.doxygen b/etc/tao_ssliop.doxygen
index 83d45f72911..d0b761a7fbc 100644
--- a/etc/tao_ssliop.doxygen
+++ b/etc/tao_ssliop.doxygen
@@ -50,11 +50,11 @@ WARN_FORMAT           = "$file:$line: $text"
 #---------------------------------------------------------------------------
 
 INPUT                 = TAO/orbsvcs/orbsvcs/Security.idl \
-			TAO/orbsvcs/orbsvcs/SecurityLevel1.idl \
-			TAO/orbsvcs/orbsvcs/SecurityLevel2.idl \
-			TAO/orbsvcs/orbsvcs/Security \
-			TAO/orbsvcs/orbsvcs/SSLIOP.idl \
-			TAO/orbsvcs/orbsvcs/SSLIOP
+                        TAO/orbsvcs/orbsvcs/SecurityLevel1.idl \
+                        TAO/orbsvcs/orbsvcs/SecurityLevel2.idl \
+                        TAO/orbsvcs/orbsvcs/Security \
+                        TAO/orbsvcs/orbsvcs/SSLIOP.idl \
+                        TAO/orbsvcs/orbsvcs/SSLIOP
 FILE_PATTERNS         = *.cpp *.h *.inl *.pidl *.idl
 RECURSIVE             =
 EXCLUDE               =
@@ -77,7 +77,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/ssliop
+HTML_OUTPUT           = html/libtao-doc/ssliop
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -131,20 +131,18 @@ PREDEFINED            = __ACE_INLINE__ \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
                         ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=.. \
-			html/tao/portableserver/TAO_PortableServer.tag=../portableserver \
-			html/tao/security/TAO_Security.tag=../security
-GENERATE_TAGFILE      = html/tao/ssliop/TAO_SSLIOP.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver \
+                        html/libtao-doc/security/TAO_Security.tag=../security
+GENERATE_TAGFILE      = html/libtao-doc/ssliop/TAO_SSLIOP.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_strategies.doxygen b/etc/tao_strategies.doxygen
index 131390d24a4..2ac0de9e15f 100644
--- a/etc/tao_strategies.doxygen
+++ b/etc/tao_strategies.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/strategies
+HTML_OUTPUT           = html/libtao-doc/strategies
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -125,18 +125,21 @@ PREDEFINED            = __ACE_INLINE__ \
                         ACE_END_VERSIONED_NAMESPACE_DECL \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
-                        ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_INLINE=inline \
+                        TAO_HAS_COIOP=1 \
+                        TAO_HAS_DIOP=1 \
+                        TAO_HAS_SCIOP=1 \
+                        TAO_HAS_SHMIOP=1 \
+                        TAO_HAS_UIOP=1
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/strategies/TAO_Strategies.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/strategies/TAO_Strategies.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_transportcurrent.doxygen b/etc/tao_transportcurrent.doxygen
index c3e66c02ccf..470407c0d70 100644
--- a/etc/tao_transportcurrent.doxygen
+++ b/etc/tao_transportcurrent.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/transportcurrent
+HTML_OUTPUT           = html/libtao-doc/transportcurrent
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -125,20 +125,19 @@ PREDEFINED            = __ACE_INLINE__ \
                         ACE_END_VERSIONED_NAMESPACE_DECL \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
-                        ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_INLINE=inline \
+                        TAO_HAS_TRANSPORT_CURRENT=1
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-                        html/tao/TAO.tag=.. \
-                        html/tao/pi/TAO_PI.tag=../pi
-GENERATE_TAGFILE      = html/tao/transportcurrent/TAO_TransportCurrent.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/pi/TAO_PI.tag=../pi
+GENERATE_TAGFILE      = html/libtao-doc/transportcurrent/TAO_TransportCurrent.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/etc/tao_ziop.doxygen b/etc/tao_ziop.doxygen
index 11f5a1df166..f4c5dcbe874 100644
--- a/etc/tao_ziop.doxygen
+++ b/etc/tao_ziop.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/ziop
+HTML_OUTPUT           = html/libtao-doc/ziop
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -125,20 +125,19 @@ PREDEFINED            = __ACE_INLINE__ \
                         ACE_END_VERSIONED_NAMESPACE_DECL \
                         TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
                         TAO_END_VERSIONED_NAMESPACE_DECL \
-                        ACE_INLINE
-EXPAND_AS_DEFINED     = ACE_RCSID \
-                        ACE_UNIMPLEMENTED_FUNC \
-                        ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC
+                        ACE_INLINE=inline \
+                        TAO_HAS_CORBA_MESSAGING=1
+EXPAND_AS_DEFINED     = ACE_UNIMPLEMENTED_FUNC \
+                        ACE_CACHE_MAP_MANAGER
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-                        html/tao/TAO.tag=.. \
-                        html/tao/compression/TAO_Compression.tag=../compression
-GENERATE_TAGFILE      = html/tao/ziop/TAO_ZIOP.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/compression/TAO_Compression.tag=../compression
+GENERATE_TAGFILE      = html/libtao-doc/ziop/TAO_ZIOP.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/examples/AMH/Makefile.am b/examples/AMH/Makefile.am
deleted file mode 100644
index ca360d86a6b..00000000000
--- a/examples/AMH/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Sink_Server
-
diff --git a/examples/AMH/Sink_Server/Client_Task.cpp b/examples/AMH/Sink_Server/Client_Task.cpp
index fc3a4ce8f07..bbbf8f7a0fb 100644
--- a/examples/AMH/Sink_Server/Client_Task.cpp
+++ b/examples/AMH/Sink_Server/Client_Task.cpp
@@ -53,7 +53,7 @@ Client_Task::parse_args (void)
             break;
           }
       }
-    // Indicates sucessful parsing of the command line
+    // Indicates successful parsing of the command line
     return 1;
 }
 
diff --git a/examples/AMH/Sink_Server/Makefile.am b/examples/AMH/Sink_Server/Makefile.am
deleted file mode 100644
index 9eceeb94d73..00000000000
--- a/examples/AMH/Sink_Server/Makefile.am
+++ /dev/null
@@ -1,175 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Sink_Server_IDL.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Sink_Server_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Base_Server.inl \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Sink_Server_Mt_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += mt_server
-
-mt_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-mt_server_SOURCES = \
-  AMH_Servant.cpp \
-  Base_Server.cpp \
-  MT_AMH_Server.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Timer_Handler.cpp \
-  mt_server.cpp \
-  AMH_Servant.h \
-  Base_Server.h \
-  Base_Server.inl \
-  MT_AMH_Server.h \
-  Timer_Handler.h
-
-mt_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Sink_Server_St_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += st_server
-
-st_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-st_server_SOURCES = \
-  AMH_Servant.cpp \
-  Base_Server.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Timer_Handler.cpp \
-  st_server.cpp \
-  AMH_Servant.h \
-  Base_Server.h \
-  Base_Server.inl \
-  Timer_Handler.h
-
-st_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/examples/AMH/Sink_Server/st_server.conf b/examples/AMH/Sink_Server/st_server.conf
index c09dab002f1..75f547672a1 100644
--- a/examples/AMH/Sink_Server/st_server.conf
+++ b/examples/AMH/Sink_Server/st_server.conf
@@ -8,4 +8,4 @@
 # http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/configurations.html#concurrency
 #
 static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null"
-static Server_Strategy_Factory "-ORBconcurrency reactive  -ORBPOALock null"
+static Server_Strategy_Factory "-ORBconcurrency reactive"
diff --git a/examples/AMH/Sink_Server/st_server.conf.xml b/examples/AMH/Sink_Server/st_server.conf.xml
index 561e3220175..981d619d165 100644
--- a/examples/AMH/Sink_Server/st_server.conf.xml
+++ b/examples/AMH/Sink_Server/st_server.conf.xml
@@ -10,5 +10,5 @@
  <!--  http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/configurations.html#concurrency -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null"/>
- <static id="Server_Strategy_Factory" params="-ORBconcurrency reactive  -ORBPOALock null"/>
+ <static id="Server_Strategy_Factory" params="-ORBconcurrency reactive"/>
 </ACE_Svc_Conf>
diff --git a/examples/AMI/FL_Callback/Makefile.am b/examples/AMI/FL_Callback/Makefile.am
deleted file mode 100644
index 1b8575d84e0..00000000000
--- a/examples/AMI/FL_Callback/Makefile.am
+++ /dev/null
@@ -1,159 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.FL_Callback_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.FL_Callback_Peer.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += peer
-
-peer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-peer_SOURCES = \
-  Peer_i.cpp \
-  peer.cpp \
-  testC.cpp \
-  testS.cpp \
-  Peer_i.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-peer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.FL_Callback_Progress.am
-
-if BUILD_ACE_FLREACTOR
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_FL
-if BUILD_GL
-if BUILD_TAO_FLRESOURCE
-if BUILD_X11
-
-noinst_PROGRAMS += progress
-
-progress_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_FLTK_CPPFLAGS)
-
-progress_SOURCES = \
-  Progress_i.cpp \
-  progress.cpp \
-  testC.cpp \
-  testS.cpp \
-  Progress_i.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-progress_LDFLAGS = \
- $(ACE_FLTK_LDFLAGS)
-
-progress_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_FlResource.la \
-  $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_FLTK_LIBS)
-
-endif BUILD_X11
-endif BUILD_TAO_FLRESOURCE
-endif BUILD_GL
-endif BUILD_FL
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-endif BUILD_ACE_FLREACTOR
-
-## 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/examples/AMI/FL_Callback/Peer_i.cpp b/examples/AMI/FL_Callback/Peer_i.cpp
index 60c59f02396..5b7120d0b94 100644
--- a/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/examples/AMI/FL_Callback/Peer_i.cpp
@@ -3,8 +3,6 @@
 #include "Peer_i.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(FL_Callback, Peer_i, "$Id$")
-
 Peer_Handler_i::Peer_Handler_i (Peer_i *peer)
   : peer_ (peer)
 {
diff --git a/examples/AMI/FL_Callback/Peer_i.h b/examples/AMI/FL_Callback/Peer_i.h
index f778761bb69..df8af1b50db 100644
--- a/examples/AMI/FL_Callback/Peer_i.h
+++ b/examples/AMI/FL_Callback/Peer_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/examples/AMI/FL_Callback
-//
-// = FILENAME
-//   Peer_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Peer_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef PEER_I_H
 #define PEER_I_H
@@ -24,8 +21,8 @@ class Peer_i;
 class Peer_Handler_i : public POA_AMI_PeerHandler
 {
 public:
+  /// The peer
   Peer_Handler_i (Peer_i *peer);
-  // The peer
 
   virtual void request (CORBA::Long retval);
 
@@ -36,26 +33,26 @@ public:
   virtual void shutdown (void);
 
 private:
+  /// The real implementation
   Peer_i *peer_;
-  // The real implementation
 };
 
 class Peer_i : public POA_Peer
 {
 public:
+  /// Constructor
   Peer_i (void);
-  // Constructor
 
+  /// Destructor
   virtual ~Peer_i (void);
-  // Destructor
 
   void init (CORBA::ORB_ptr orb,
              Progress_ptr progress,
              const ACE_Time_Value &delay);
 
+  /// Used by the Reply_Handler to indicate that a reply has been
+  /// received.
   void reply (CORBA::Long result);
-  // Used by the Reply_Handler to indicate that a reply has been
-  // received.
 
    // = See test.idl for an explanation of these methods.
   CORBA::Long request (CORBA::Long id);
@@ -66,26 +63,29 @@ public:
   void shutdown (void);
 
 private:
+  /// The reply_handler
   Peer_Handler_i reply_handler_;
-  // The reply_handler
 
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 
+  /// The interface to report back progress.
   Progress_var progress_;
-  // The interface to report back progress.
 
+  /// The delay on each request
   ACE_Time_Value delay_;
-  // The delay on each request
 
+  /// The id assigned by the progress interface
   CORBA::Long id_;
-  // The id assigned by the progress interface
 };
 
+/**
+ * @class Peer_Task
+ *
+ * Run a "start" request on a separate thread.
+ */
 class Peer_Task : public ACE_Task_Base
 {
-  // = DESCRIPTION
-  //   Run a "start" request on a separate thread.
 public:
   Peer_Task (const PeerSet& the_peers,
              CORBA::Long iterations,
@@ -93,24 +93,24 @@ public:
              AMI_PeerHandler_ptr handler,
              CORBA::Long id);
 
+  /// The thread entry point
   virtual int svc (void);
-  // The thread entry point
 
 private:
+  /// The peers
   PeerSet the_peers_;
-  // The peers
 
+  /// The number of iterations
   CORBA::Long iterations_;
-  // The number of iterations
 
+  /// To report progress
   Progress_var progress_;
-  // To report progress
 
+  /// To issue async requests
   AMI_PeerHandler_var handler_;
-  // To issue async requests
 
+  /// Our id
   CORBA::Long id_;
-  // Our id
 };
 
 #endif /* PEER_I_H */
diff --git a/examples/AMI/FL_Callback/Progress_i.cpp b/examples/AMI/FL_Callback/Progress_i.cpp
index d0994ce93b7..de12b1e1fab 100644
--- a/examples/AMI/FL_Callback/Progress_i.cpp
+++ b/examples/AMI/FL_Callback/Progress_i.cpp
@@ -5,10 +5,6 @@
 #include <FL/Fl_Slider.H>
 #include <FL/Fl_Button.H>
 
-ACE_RCSID (FL_Cube,
-           test_i,
-           "$Id$")
-
 Progress_i::Progress_i (Progress_Window *window)
   :  window_ (window)
 {
diff --git a/examples/AMI/FL_Callback/Progress_i.h b/examples/AMI/FL_Callback/Progress_i.h
index 1b17a0b95d5..7fbe8ef8db4 100644
--- a/examples/AMI/FL_Callback/Progress_i.h
+++ b/examples/AMI/FL_Callback/Progress_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/examples/AMI/FL_Callback
-//
-// = FILENAME
-//   Progress_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Progress_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef PROGRESS_I_H
 #define PROGRESS_I_H
@@ -23,54 +20,55 @@
 class Progress_Window : public Fl_Box
 {
 public:
+  /// Constructor
   Progress_Window (int n_peers,
                    int n_iterations,
                    int x, int y,
                    int w, int h,
                    const char* l = 0);
-  // Constructor
 
+  /// Keep track of the progress on each peer
   void sent_request (CORBA::Long id);
   void recv_reply (CORBA::Long id);
-  // Keep track of the progress on each peer
 
+  /// One of the peers has bound to the server
   CORBA::Long bind (Peer_ptr a_peer);
-  // One of the peers has bound to the server
 
+  /// Start the peers...
   void start (void);
-  // Start the peers...
 
 private:
+  /// The callback method
   static void start_callback (Fl_Widget* widget, void *data);
-  // The callback method
 
 private:
+  /// The total number of peers
   int n_peers_;
-  // The total number of peers
 
+  /// The peers
   PeerSet peers_;
-  // The peers
 
+  /// The number of iterations;
   int n_iterations_;
-  // The number of iterations;
 
+  /// The set of sliders where we keep track of each client
   Fl_Widget** request_progress_;
   Fl_Widget** reply_progress_;
-  // The set of sliders where we keep track of each client
 };
 
+/**
+ * @class Progress_i
+ *
+ * @brief Progress server implementation
+ *
+ * Implements the Progress interface in test.idl, forward the
+ * calls to the Progress_Window class
+ */
 class Progress_i : public POA_Progress
 {
-  // = TITLE
-  //   Progress server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Progress interface in test.idl, forward the
-  //   calls to the Progress_Window class
-  //
 public:
+  /// ctor
   Progress_i (Progress_Window* window);
-  // ctor
 
   // = The Progress methods.
   void sent_request (CORBA::Long id);
@@ -78,8 +76,8 @@ public:
   CORBA::Long bind (Peer_ptr a_peer);
 
 private:
+  /// Display the graphics...
   Progress_Window* window_;
-  // Display the graphics...
 };
 
 #endif /* PROGRESS_I_H */
diff --git a/examples/AMI/FL_Callback/peer.cpp b/examples/AMI/FL_Callback/peer.cpp
index 9344f9b88f3..39a19803ca3 100644
--- a/examples/AMI/FL_Callback/peer.cpp
+++ b/examples/AMI/FL_Callback/peer.cpp
@@ -6,10 +6,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (FL_Callback,
-           peer,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://progress.ior");
 int nthreads = 4;
 int interval = 0; // microseconds
@@ -46,28 +42,27 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
+  /// ctor
   Worker (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// The thread entry point.
   virtual int svc (void);
-  // The thread entry point.
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 };
 
 int
diff --git a/examples/AMI/FL_Callback/progress.cpp b/examples/AMI/FL_Callback/progress.cpp
index a1363e7a56d..341b6af910f 100644
--- a/examples/AMI/FL_Callback/progress.cpp
+++ b/examples/AMI/FL_Callback/progress.cpp
@@ -5,10 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/FlResource/FlResource_Loader.h"
 
-ACE_RCSID (FL_Callback,
-           progress,
-           "$Id$")
-
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 
@@ -48,7 +44,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/examples/AMI/Makefile.am b/examples/AMI/Makefile.am
deleted file mode 100644
index 66e37fc0b72..00000000000
--- a/examples/AMI/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        FL_Callback
-
diff --git a/examples/Advanced/Makefile.am b/examples/Advanced/Makefile.am
deleted file mode 100644
index 1118bffdf3b..00000000000
--- a/examples/Advanced/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        ch_3
-
diff --git a/examples/Advanced/ch_12/CCS.idl b/examples/Advanced/ch_12/CCS.idl
index 23f39993b0c..c727d0bff96 100644
--- a/examples/Advanced/ch_12/CCS.idl
+++ b/examples/Advanced/ch_12/CCS.idl
@@ -1,34 +1,28 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_12
-//
-// = FILENAME
-//    CCS.idl
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the
-//   code provided in the book, "Advanced CORBA Programming with C++"
-//   by Michi Henning and Steve Vinoski. Copyright
-//   1999. Addison-Wesley, Reading, MA.  Used with permission of
-//   Addison-Wesley.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CCS.idl
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from thecode provided in the book
+ *  @author "Advanced CORBA Programming with C++"by Michi Henning and Steve Vinoski. Copyright1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.  Used with permission ofAddison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #pragma prefix "acme.com"
 
-module CCS 
+module CCS
 {
   typedef unsigned long AssetType;
   typedef string ModelType;
   typedef short TempType;
   typedef string LocType;
 
-  interface Thermometer 
+  interface Thermometer
     {
       readonly attribute ModelType model;
       readonly attribute AssetType asset_num;
@@ -38,9 +32,9 @@ module CCS
       void remove ();
     };
 
-  interface Thermostat : Thermometer 
+  interface Thermostat : Thermometer
     {
-      struct BtData 
+      struct BtData
       {
         TempType requested;
         TempType min_permitted;
@@ -54,7 +48,7 @@ module CCS
         raises (BadTemp);
     };
 
-  interface Controller 
+  interface Controller
     {
       exception DuplicateAsset {};
 
@@ -72,7 +66,7 @@ module CCS
 
       enum SearchCriterion { ASSET, LOCATION, MODEL };
 
-      union KeyType switch (SearchCriterion) 
+      union KeyType switch (SearchCriterion)
         {
         case ASSET:
           AssetType asset_num;
@@ -82,7 +76,7 @@ module CCS
           ModelType model_desc;
         };
 
-      struct SearchType 
+      struct SearchType
       {
         KeyType key;
         Thermometer device;
@@ -90,7 +84,7 @@ module CCS
 
       typedef sequence<SearchType> SearchSeq;
 
-      struct ErrorDetails 
+      struct ErrorDetails
       {
         Thermostat tmstat_ref;
         Thermostat::BtData info;
@@ -105,6 +99,6 @@ module CCS
       ThermometerSeq list ();
       void find (inout SearchSeq slist);
       void change (in ThermostatSeq tlist, in short delta)
-        raises (EChange);        
+        raises (EChange);
     };
 };
diff --git a/examples/Advanced/ch_12/client.cpp b/examples/Advanced/ch_12/client.cpp
index d6e85f69ef8..97801bea1a1 100644
--- a/examples/Advanced/ch_12/client.cpp
+++ b/examples/Advanced/ch_12/client.cpp
@@ -1,23 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_12
-//
-// = FILENAME
-//    client.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the
-//   code provided in the book, "Advanced CORBA Programming with C++"
-//   by Michi Henning and Steve Vinoski. Copyright
-//   1999. Addison-Wesley, Reading, MA.  Used with permission of
-//   Addison-Wesley.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from thecode provided in the book
+ *  @author "Advanced CORBA Programming with C++"by Michi Henning and Steve Vinoski. Copyright1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.  Used with permission ofAddison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "CCSC.h"        // ORB-specific
 #include <ace/streams.h>
diff --git a/examples/Advanced/ch_12/icp.cpp b/examples/Advanced/ch_12/icp.cpp
index 8b8d4ceaa07..e06a0739beb 100644
--- a/examples/Advanced/ch_12/icp.cpp
+++ b/examples/Advanced/ch_12/icp.cpp
@@ -1,23 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_12
-//
-// = FILENAME
-//    icp.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the
-//   code provided in the book, "Advanced CORBA Programming with C++"
-//   by Michi Henning and Steve Vinoski. Copyright
-//   1999. Addison-Wesley, Reading, MA.  Used with permission of
-//   Addison-Wesley.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    icp.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from thecode provided in the book
+ *  @author "Advanced CORBA Programming with C++"by Michi Henning and Steve Vinoski. Copyright1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.  Used with permission ofAddison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include    <string>
 #include    <map>
diff --git a/examples/Advanced/ch_12/icp.h b/examples/Advanced/ch_12/icp.h
index fc080d49823..628b09b4969 100644
--- a/examples/Advanced/ch_12/icp.h
+++ b/examples/Advanced/ch_12/icp.h
@@ -1,29 +1,21 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_12
-//
-// = FILENAME
-//    icp.h
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the
-//   code provided in the book, "Advanced CORBA Programming with C++"
-//   by Michi Henning and Steve Vinoski. Copyright
-//   1999. Addison-Wesley, Reading, MA.  Used with permission of
-//   Addison-Wesley.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    icp.h
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from thecode provided in the book
+ *  @author "Advanced CORBA Programming with C++"by Michi Henning and Steve Vinoski. Copyright1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.  Used with permission ofAddison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _ICP_H
 #define _ICP_H
 
-#include "ace/OS.h"
-
 extern "C"
 {
   int ICP_online (unsigned long id);   // Add device
diff --git a/examples/Advanced/ch_12/run_test.pl b/examples/Advanced/ch_12/run_test.pl
index 0e61abce82c..42d1271e24a 100755
--- a/examples/Advanced/ch_12/run_test.pl
+++ b/examples/Advanced/ch_12/run_test.pl
@@ -42,7 +42,7 @@ if ($client->TimedWait (60) == -1) {
 
 
 
-$server->Terminate (); 
+$server->Terminate ();
 if ($server->TimedWait (5) == -1) {
   print STDERR "ERROR: cannot terminate the server\n";
   $server->Kill (); $server->TimedWait (1);
diff --git a/examples/Advanced/ch_12/server.cpp b/examples/Advanced/ch_12/server.cpp
index e81977633ce..2fa85c30ee1 100644
--- a/examples/Advanced/ch_12/server.cpp
+++ b/examples/Advanced/ch_12/server.cpp
@@ -1,23 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_12
-//
-// = FILENAME
-//    server.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the
-//   code provided in the book, "Advanced CORBA Programming with C++"
-//   by Michi Henning and Steve Vinoski. Copyright
-//   1999. Addison-Wesley, Reading, MA.  Used with permission of
-//   Addison-Wesley.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from thecode provided in the book
+ *  @author "Advanced CORBA Programming with C++"by Michi Henning and Steve Vinoski. Copyright1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.  Used with permission ofAddison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include <ace/streams.h>
 #include <strstream>
diff --git a/examples/Advanced/ch_12/server.h b/examples/Advanced/ch_12/server.h
index 5a5a3729fd2..45850f8705a 100644
--- a/examples/Advanced/ch_12/server.h
+++ b/examples/Advanced/ch_12/server.h
@@ -1,23 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_12
-//
-// = FILENAME
-//    server.h
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the
-//   code provided in the book, "Advanced CORBA Programming with C++"
-//   by Michi Henning and Steve Vinoski. Copyright
-//   1999. Addison-Wesley, Reading, MA.  Used with permission of
-//   Addison-Wesley.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.h
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from thecode provided in the book
+ *  @author "Advanced CORBA Programming with C++"by Michi Henning and Steve Vinoski. Copyright1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.  Used with permission ofAddison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef server_HH_
 #define server_HH_
diff --git a/examples/Advanced/ch_18/CCS.idl b/examples/Advanced/ch_18/CCS.idl
index c0daa0f995f..00e171ebba0 100644
--- a/examples/Advanced/ch_18/CCS.idl
+++ b/examples/Advanced/ch_18/CCS.idl
@@ -1,21 +1,16 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_18
-//
-// = FILENAME
-//    CCS.idl
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    CCS.idl
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 
 
@@ -98,6 +93,6 @@ module CCS {
         void            change(
                             in ThermostatSeq tlist, in short delta
                         ) raises(EChange);
-        
+
     };
 };
diff --git a/examples/Advanced/ch_18/client.cpp b/examples/Advanced/ch_18/client.cpp
index 2b85967e1bc..42c8d8a5cc5 100644
--- a/examples/Advanced/ch_18/client.cpp
+++ b/examples/Advanced/ch_18/client.cpp
@@ -1,21 +1,16 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_18
-//
-// = FILENAME
-//    client.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "CCSC.h"        // ORB-specific
 #include "assert.h"
diff --git a/examples/Advanced/ch_18/icp.cpp b/examples/Advanced/ch_18/icp.cpp
index e8eb768bb3b..0d8f2d10a2b 100644
--- a/examples/Advanced/ch_18/icp.cpp
+++ b/examples/Advanced/ch_18/icp.cpp
@@ -1,21 +1,16 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_18
-//
-// = FILENAME
-//    icp.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    icp.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 
 
diff --git a/examples/Advanced/ch_18/icp.h b/examples/Advanced/ch_18/icp.h
index fb2d9d182de..49389e8ce7e 100644
--- a/examples/Advanced/ch_18/icp.h
+++ b/examples/Advanced/ch_18/icp.h
@@ -1,27 +1,20 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_18
-//
-// = FILENAME
-//    icp.h
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    icp.h
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _ICP_H
 #define _ICP_H
 
-#include "ace/OS.h"
-
 extern "C" {
     int ICP_online(unsigned long id);   // Add device
     int ICP_offline(unsigned long id);  // Remove device
diff --git a/examples/Advanced/ch_18/run_test.pl b/examples/Advanced/ch_18/run_test.pl
index f167dafbaec..bbf8bec9e2d 100755
--- a/examples/Advanced/ch_18/run_test.pl
+++ b/examples/Advanced/ch_18/run_test.pl
@@ -24,7 +24,7 @@ sub name_server
              "..$DIR_SEPARATOR".
              "orbsvcs$DIR_SEPARATOR".
              "Naming_Service$DIR_SEPARATOR".
-             "Naming_Service$EXE_EXT";
+             "tao_cosnaming$EXE_EXT";
   $NS = Process::Create ($prog,"");
 }
 
@@ -50,7 +50,7 @@ if ($client->TimedWait (60) == -1) {
 
 
 # gracefully kill the server
-$server->Terminate (); 
+$server->Terminate ();
 if ($server->TimedWait (5) == -1) {
   print STDERR "ERROR: cannot terminate the server\n";
   $server->Kill (); $server->TimedWait (1);
@@ -58,7 +58,7 @@ if ($server->TimedWait (5) == -1) {
 }
 
 # gracefully kill the Naming Service
-$NS->Terminate (); 
+$NS->Terminate ();
 if ($NS->TimedWait (5) == -1) {
   print STDERR "ERROR: cannot terminate the server\n";
   $NS->Kill (); $server->TimedWait (1);
diff --git a/examples/Advanced/ch_18/server.cpp b/examples/Advanced/ch_18/server.cpp
index d61fa852c25..cdedd259072 100644
--- a/examples/Advanced/ch_18/server.cpp
+++ b/examples/Advanced/ch_18/server.cpp
@@ -1,23 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_18
-//
-// = FILENAME
-//    server.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the
-//   code provided in the book, "Advanced CORBA Programming with C++"
-//   by Michi Henning and Steve Vinoski. Copyright
-//   1999. Addison-Wesley, Reading, MA.  Used with permission of
-//   Addison-Wesley.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from thecode provided in the book
+ *  @author "Advanced CORBA Programming with C++"by Michi Henning and Steve Vinoski. Copyright1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.  Used with permission ofAddison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include <ace/streams.h>
 #include <strstream>
diff --git a/examples/Advanced/ch_18/server.h b/examples/Advanced/ch_18/server.h
index fc6f1680259..a43c11d44c7 100644
--- a/examples/Advanced/ch_18/server.h
+++ b/examples/Advanced/ch_18/server.h
@@ -1,21 +1,16 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_18
-//
-// = FILENAME
-//    server.h
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    server.h
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 
 
diff --git a/examples/Advanced/ch_21/CCS.idl b/examples/Advanced/ch_21/CCS.idl
index 05e22799459..c119c3faa40 100644
--- a/examples/Advanced/ch_21/CCS.idl
+++ b/examples/Advanced/ch_21/CCS.idl
@@ -1,21 +1,16 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_21
-//
-// = FILENAME
-//    CCS.idl
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    CCS.idl
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 
 
@@ -99,6 +94,6 @@ module CCS {
         void            change(
                             in ThermostatSeq tlist, in short delta
                         ) raises(EChange);
-        
+
     };
 };
diff --git a/examples/Advanced/ch_21/client.cpp b/examples/Advanced/ch_21/client.cpp
index 0a45d6ed64e..cc9db916187 100644
--- a/examples/Advanced/ch_21/client.cpp
+++ b/examples/Advanced/ch_21/client.cpp
@@ -1,22 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_12
-//
-// = FILENAME
-//    client.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "CCSC.h"        // ORB-specific
 #include <ace/streams.h>
diff --git a/examples/Advanced/ch_21/icp.cpp b/examples/Advanced/ch_21/icp.cpp
index 4c3bb1c076a..0fa1f6deadb 100644
--- a/examples/Advanced/ch_21/icp.cpp
+++ b/examples/Advanced/ch_21/icp.cpp
@@ -1,21 +1,16 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_21
-//
-// = FILENAME
-//    icp.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    icp.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 
 
diff --git a/examples/Advanced/ch_21/icp.h b/examples/Advanced/ch_21/icp.h
index b93d94193f2..171b55e89a1 100644
--- a/examples/Advanced/ch_21/icp.h
+++ b/examples/Advanced/ch_21/icp.h
@@ -1,27 +1,20 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_21
-//
-// = FILENAME
-//    icp.h
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    icp.h
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _ICP_H
 #define _ICP_H
 
-#include "ace/OS.h"
-
 extern "C" {
     int ICP_online(unsigned long id);   // Add device
     int ICP_offline(unsigned long id);  // Remove device
diff --git a/examples/Advanced/ch_21/run_test.pl b/examples/Advanced/ch_21/run_test.pl
index 0e61abce82c..42d1271e24a 100755
--- a/examples/Advanced/ch_21/run_test.pl
+++ b/examples/Advanced/ch_21/run_test.pl
@@ -42,7 +42,7 @@ if ($client->TimedWait (60) == -1) {
 
 
 
-$server->Terminate (); 
+$server->Terminate ();
 if ($server->TimedWait (5) == -1) {
   print STDERR "ERROR: cannot terminate the server\n";
   $server->Kill (); $server->TimedWait (1);
diff --git a/examples/Advanced/ch_21/server.cpp b/examples/Advanced/ch_21/server.cpp
index 93ab672566a..417cd098b83 100644
--- a/examples/Advanced/ch_21/server.cpp
+++ b/examples/Advanced/ch_21/server.cpp
@@ -1,27 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_21
-//
-// = FILENAME
-//    server.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include <ace/streams.h>
 #include <strstream>
 #include "server.h"
-#include <ace/Synch_T.h>
 #include <algorithm>
 #include "icp.h"
 
@@ -148,8 +142,8 @@ Thermometer_impl::
 void
 Thermometer_impl::_add_ref ()
 {
-    ACE_Guard<ACE_Mutex> guard (m_count_mutex);
-    m_ref_count++;
+    ACE_GUARD (ACE_Mutex, ace_mon, m_count_mutex);
+    ++m_ref_count++;
 }
 
 void
@@ -157,7 +151,7 @@ Thermometer_impl::_remove_ref ()
 {
     bool del = false;
     {
-    ACE_Guard<ACE_Mutex> guard (m_count_mutex);
+    ACE_GUARD (ACE_Mutex, ace_mon, m_count_mutex);
     if (--m_ref_count == 0)
         del = true;
     }
@@ -379,7 +373,7 @@ CCS::Thermometer_ptr
 Controller_impl::create_thermometer (CCS::AssetType anum, const char * loc)
 {
     {
-    ACE_Guard<ACE_Mutex> guard (m_assets_mutex);
+    ACE_GUARD (ACE_Mutex, ace_mon, m_assets_mutex);
 
     if (anum % 2 == 0)
         throw CORBA::BAD_PARAM ();   // Thermometers have odd numbers
@@ -401,8 +395,9 @@ create_thermostat (
     const char*     loc,
     CCS::TempType       temp)
 {
-    {
-    ACE_Guard<ACE_Mutex> guard (m_assets_mutex);
+  {
+    ACE_GUARD (ACE_Mutex, ace_mon, m_assets_mutex);
+
 
     if (anum % 2 != 0)
         throw CORBA::BAD_PARAM ();   // Thermostats have even numbers
@@ -433,10 +428,10 @@ create_thermostat (
     }
 
     add_impl (anum);
-    }
+  }
 
-    CORBA::Object_var obj = make_dref (m_poa.in (), anum);
-    return CCS::Thermostat::_narrow (obj.in ());
+  CORBA::Object_var obj = make_dref (m_poa.in (), anum);
+  return CCS::Thermostat::_narrow (obj.in ());
 }
 
 // IDL list operation.
@@ -453,7 +448,7 @@ Controller_impl::list ()
 
     AssetSet tmp_assets;
     {
-        ACE_Guard<ACE_Mutex> guard (m_assets_mutex);
+        ACE_GUARD (ACE_Mutex, ace_mon, m_assets_mutex);
         tmp_assets = m_assets;
     }
 
@@ -532,7 +527,7 @@ find (CCS::Controller::SearchSeq & slist)
             bool make = false;
             CCS::AssetType num = 0;
                 {
-                ACE_Guard<ACE_Mutex> guard (m_assets_mutex);
+                ACE_GUARD (ACE_Mutex, ace_mon, m_assets_mutex);
                 where = m_assets.find (slist[i].key.asset_num ());
                 if (where != m_assets.end ()) {
                 num = *where;
@@ -612,7 +607,7 @@ preinvoke (
     if (istr.fail ())
         throw CORBA::OBJECT_NOT_EXIST ();
 
-    ACE_Guard<ACE_Mutex> guard (m_ctrl->m_assets_mutex);
+    ACE_GUARD (ACE_Mutex, ace_mon, m_ctrl->m_assets_mutex);
 
     // Check whether the device is known.
     if (!m_ctrl->exists (anum))
diff --git a/examples/Advanced/ch_21/server.h b/examples/Advanced/ch_21/server.h
index 6ddaca5bb97..ced2bfb7641 100644
--- a/examples/Advanced/ch_21/server.h
+++ b/examples/Advanced/ch_21/server.h
@@ -1,21 +1,16 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_21
-//
-// = FILENAME
-//    server.h
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    server.h
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 
 
@@ -25,7 +20,6 @@
 
 #include "CCSS.h"
 #include "icp.h"
-#include <ace/Synch_T.h>
 #include <set>
 #include <list>
 #include <map>
@@ -180,7 +174,7 @@ public:
                     const PortableServer::ObjectId & oid,
                     PortableServer::POA_ptr          /* poa */ ,
                     const char *                     operation,
-                    void * &                         /* cookie */ 
+                    void * &                         /* cookie */
                 );
 
     virtual void
diff --git a/examples/Advanced/ch_3/Makefile.am b/examples/Advanced/ch_3/Makefile.am
deleted file mode 100644
index 0eb0d1019b5..00000000000
--- a/examples/Advanced/ch_3/Makefile.am
+++ /dev/null
@@ -1,111 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Advanced_Ch_3_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  timeC.cpp \
-  timeC.h \
-  timeC.inl \
-  timeS.cpp \
-  timeS.h \
-  timeS.inl
-
-CLEANFILES = \
-  time-stamp \
-  timeC.cpp \
-  timeC.h \
-  timeC.inl \
-  timeS.cpp \
-  timeS.h \
-  timeS.inl
-
-timeC.cpp timeC.h timeC.inl timeS.cpp timeS.h timeS.inl: time-stamp
-
-time-stamp: $(srcdir)/time.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/time.idl
-	@touch $@
-
-noinst_HEADERS = \
-  time.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Advanced_Ch_3_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  timeC.cpp \
-  server.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Advanced_Ch_3_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  timeC.cpp \
-  timeS.cpp \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/examples/Advanced/ch_3/client.cpp b/examples/Advanced/ch_3/client.cpp
index 6a2646bb8f9..37f11b0cc30 100644
--- a/examples/Advanced/ch_3/client.cpp
+++ b/examples/Advanced/ch_3/client.cpp
@@ -1,23 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_3
-//
-// = FILENAME
-//    client.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the
-//   code provided in the book, "Advanced CORBA Programming with C++"
-//   by Michi Henning and Steve Vinoski. Copyright
-//   1999. Addison-Wesley, Reading, MA.  Used with permission of
-//   Addison-Wesley.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from thecode provided in the book
+ *  @author "Advanced CORBA Programming with C++"by Michi Henning and Steve Vinoski. Copyright1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.  Used with permission ofAddison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "timeC.h"
 #include <ace/streams.h>
diff --git a/examples/Advanced/ch_3/run_test.pl b/examples/Advanced/ch_3/run_test.pl
index 0e61abce82c..42d1271e24a 100755
--- a/examples/Advanced/ch_3/run_test.pl
+++ b/examples/Advanced/ch_3/run_test.pl
@@ -42,7 +42,7 @@ if ($client->TimedWait (60) == -1) {
 
 
 
-$server->Terminate (); 
+$server->Terminate ();
 if ($server->TimedWait (5) == -1) {
   print STDERR "ERROR: cannot terminate the server\n";
   $server->Kill (); $server->TimedWait (1);
diff --git a/examples/Advanced/ch_3/server.cpp b/examples/Advanced/ch_3/server.cpp
index 48cdc56defc..bace6362305 100644
--- a/examples/Advanced/ch_3/server.cpp
+++ b/examples/Advanced/ch_3/server.cpp
@@ -1,23 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_3
-//
-// = FILENAME
-//    server.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the
-//   code provided in the book, "Advanced CORBA Programming with C++"
-//   by Michi Henning and Steve Vinoski. Copyright
-//   1999. Addison-Wesley, Reading, MA.  Used with permission of
-//   Addison-Wesley.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from thecode provided in the book
+ *  @author "Advanced CORBA Programming with C++"by Michi Henning and Steve Vinoski. Copyright1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.  Used with permission ofAddison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "server.h"
 #include <ace/streams.h>
diff --git a/examples/Advanced/ch_3/server.h b/examples/Advanced/ch_3/server.h
index a4510fd1637..207cc33c69d 100644
--- a/examples/Advanced/ch_3/server.h
+++ b/examples/Advanced/ch_3/server.h
@@ -1,30 +1,25 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_3
-//
-// = FILENAME
-//    server.h
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.  Used with permission of Addison-Wesley.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    server.h
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.  Used with permission of Addison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef server_HH_
 #define server_HH_
 
 #include "timeS.h"
 
-class Time_impl : public virtual POA_Time 
-{ 
+class Time_impl : public virtual POA_Time
+{
 public:
   virtual TimeOfDay get_gmt (void);
 };
diff --git a/examples/Advanced/ch_3/time.idl b/examples/Advanced/ch_3/time.idl
index de8582dc048..5143dd6c9ec 100644
--- a/examples/Advanced/ch_3/time.idl
+++ b/examples/Advanced/ch_3/time.idl
@@ -1,31 +1,26 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_3
-//
-// = FILENAME
-//    time.idl
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.  Used with permission of Addison-Wesley.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    time.idl
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.  Used with permission of Addison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
 
-struct TimeOfDay 
+
+struct TimeOfDay
 {
   short hour;       // 0 - 23
   short minute;     // 0 - 59
   short second;     // 0 - 59
 };
 
-interface Time 
+interface Time
 {
   TimeOfDay get_gmt ();
 };
diff --git a/examples/Advanced/ch_8_and_10/CCS.idl b/examples/Advanced/ch_8_and_10/CCS.idl
index 7ab254d6eec..0ff3f693625 100644
--- a/examples/Advanced/ch_8_and_10/CCS.idl
+++ b/examples/Advanced/ch_8_and_10/CCS.idl
@@ -1,21 +1,16 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_8_and_10
-//
-// = FILENAME
-//    CCS.idl
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    CCS.idl
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 
 
diff --git a/examples/Advanced/ch_8_and_10/client.cpp b/examples/Advanced/ch_8_and_10/client.cpp
index 8d8203cf140..6f236100f90 100644
--- a/examples/Advanced/ch_8_and_10/client.cpp
+++ b/examples/Advanced/ch_8_and_10/client.cpp
@@ -1,21 +1,16 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_8_and_10
-//
-// = FILENAME
-//    client.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include    "CCSC.h"        // ORB-specific
 #include    <iostream>
diff --git a/examples/Advanced/ch_8_and_10/icp.cpp b/examples/Advanced/ch_8_and_10/icp.cpp
index 2ccfc38a70e..5d867e1125c 100644
--- a/examples/Advanced/ch_8_and_10/icp.cpp
+++ b/examples/Advanced/ch_8_and_10/icp.cpp
@@ -1,21 +1,16 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_8_and_10
-//
-// = FILENAME
-//    icp.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    icp.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 
 
diff --git a/examples/Advanced/ch_8_and_10/icp.h b/examples/Advanced/ch_8_and_10/icp.h
index a884c51d769..49389e8ce7e 100644
--- a/examples/Advanced/ch_8_and_10/icp.h
+++ b/examples/Advanced/ch_8_and_10/icp.h
@@ -1,27 +1,20 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_8_and_10
-//
-// = FILENAME
-//    icp.h
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    icp.h
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _ICP_H
 #define _ICP_H
 
-#include "ace/OS.h"
-
 extern "C" {
     int ICP_online(unsigned long id);   // Add device
     int ICP_offline(unsigned long id);  // Remove device
@@ -32,7 +25,7 @@ extern "C" {
             size_t          len
         );
     int ICP_set(                        // Set attribute
-            unsigned long   id, 
+            unsigned long   id,
             const char *    attr,
             const void *    value
         );
diff --git a/examples/Advanced/ch_8_and_10/run_test.pl b/examples/Advanced/ch_8_and_10/run_test.pl
index 0e61abce82c..42d1271e24a 100755
--- a/examples/Advanced/ch_8_and_10/run_test.pl
+++ b/examples/Advanced/ch_8_and_10/run_test.pl
@@ -42,7 +42,7 @@ if ($client->TimedWait (60) == -1) {
 
 
 
-$server->Terminate (); 
+$server->Terminate ();
 if ($server->TimedWait (5) == -1) {
   print STDERR "ERROR: cannot terminate the server\n";
   $server->Kill (); $server->TimedWait (1);
diff --git a/examples/Advanced/ch_8_and_10/server.cpp b/examples/Advanced/ch_8_and_10/server.cpp
index 1db6a9afcbc..9e7e83ff769 100644
--- a/examples/Advanced/ch_8_and_10/server.cpp
+++ b/examples/Advanced/ch_8_and_10/server.cpp
@@ -1,22 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_8_and_10
-//
-// = FILENAME
-//    server.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include    "server.h"
 #include    <algorithm>
diff --git a/examples/Advanced/ch_8_and_10/server.h b/examples/Advanced/ch_8_and_10/server.h
index aa353e97b44..43267c5e8eb 100644
--- a/examples/Advanced/ch_8_and_10/server.h
+++ b/examples/Advanced/ch_8_and_10/server.h
@@ -1,21 +1,16 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Advanced/ch_8_and_10
-//
-// = FILENAME
-//    server.h
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    server.h
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 
 
diff --git a/examples/Borland/ORBThread.h b/examples/Borland/ORBThread.h
index fb680fcc8fe..8c4e50d6b50 100644
--- a/examples/Borland/ORBThread.h
+++ b/examples/Borland/ORBThread.h
@@ -8,7 +8,7 @@
 class PACKAGE TORBThread : public TThread
 {
   // Class for running the orb in a separate thread.
-public: 
+public:
   // = Initialization and termination methods.
   __fastcall TORBThread (CORBA::ORB_ptr orb);
   // Constructor.
diff --git a/examples/Buffered_AMI/Makefile.am b/examples/Buffered_AMI/Makefile.am
deleted file mode 100644
index e6fb76a45f2..00000000000
--- a/examples/Buffered_AMI/Makefile.am
+++ /dev/null
@@ -1,132 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Buffered_AMI_IDL.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Buffered_AMI_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Buffered_AMI_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/examples/Buffered_AMI/client.cpp b/examples/Buffered_AMI/client.cpp
index 4531522297e..a020c3d3edc 100644
--- a/examples/Buffered_AMI/client.cpp
+++ b/examples/Buffered_AMI/client.cpp
@@ -1,17 +1,17 @@
-// $Id$
-
-// ================================================================
-//
-// = FILENAME
-//     client.cpp
-//
-// = DESCRIPTION
-//     This is a client that uses buffered AMI calls.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *   This is a client that uses buffered AMI calls.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
 #include "tao/Messaging/Messaging.h"
@@ -20,10 +20,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
-ACE_RCSID (Buffered_AMI,
-           client,
-           "$Id$")
-
 // Name of file contains ior.
 static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 
diff --git a/examples/Buffered_AMI/server.cpp b/examples/Buffered_AMI/server.cpp
index 77e1e434698..6657488c8c4 100644
--- a/examples/Buffered_AMI/server.cpp
+++ b/examples/Buffered_AMI/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "test_i.h"
 
-ACE_RCSID (Buffered_AMI,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/examples/Buffered_AMI/test_i.cpp b/examples/Buffered_AMI/test_i.cpp
index 188952f828e..5907b23948a 100644
--- a/examples/Buffered_AMI/test_i.cpp
+++ b/examples/Buffered_AMI/test_i.cpp
@@ -2,8 +2,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID(Buffered_AMI, test_i, "$Id$")
-
 test_i::test_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/examples/Buffered_AMI/test_i.h b/examples/Buffered_AMI/test_i.h
index d136bfb0567..db145c802d8 100644
--- a/examples/Buffered_AMI/test_i.h
+++ b/examples/Buffered_AMI/test_i.h
@@ -1,31 +1,30 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/examples/Buffered_AMI/
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Irfan Pyarali
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
 
 #ifndef TAO_BUFFERED_AMI_TEST_I_H
 #define TAO_BUFFERED_AMI_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class test_i
+ *
+ * @brief Simple implementation.
+ */
 class test_i : public POA_test
 {
-  // = TITLE
-  //   Simple implementation.
-  //
 public:
+  /// ctor.
   test_i (CORBA::ORB_ptr orb);
-  // ctor.
 
   // = The test interface methods.
   void method (CORBA::ULong request_number,
@@ -34,8 +33,8 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB.
   CORBA::ORB_var orb_;
-  // The ORB.
 };
 
 #endif /* TAO_BUFFERED_AMI_TEST_I_H */
diff --git a/examples/Buffered_Oneways/Makefile.am b/examples/Buffered_Oneways/Makefile.am
deleted file mode 100644
index 273962f2129..00000000000
--- a/examples/Buffered_Oneways/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Buffered_Oneways_IDL.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Buffered_Oneways_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Buffered_Oneways_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/examples/Buffered_Oneways/client.cpp b/examples/Buffered_Oneways/client.cpp
index 4be028a65fb..5b02d2c2ca2 100644
--- a/examples/Buffered_Oneways/client.cpp
+++ b/examples/Buffered_Oneways/client.cpp
@@ -1,17 +1,17 @@
-// $Id$
-
-// ================================================================
-//
-// = FILENAME
-//     client.cpp
-//
-// = DESCRIPTION
-//     This is a client that uses buffered oneways.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *   This is a client that uses buffered oneways.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testC.h"
 #include "tao/Messaging/Messaging.h"
@@ -20,7 +20,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
-ACE_RCSID(Buffered_Oneways, client, "$Id$")
+
 
 // Name of file contains ior.
 static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
diff --git a/examples/Buffered_Oneways/server.cpp b/examples/Buffered_Oneways/server.cpp
index 11dd3efe656..365d3550e6c 100644
--- a/examples/Buffered_Oneways/server.cpp
+++ b/examples/Buffered_Oneways/server.cpp
@@ -4,7 +4,7 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Buffered_Oneways, server, "$Id$")
+
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/examples/Buffered_Oneways/test_i.cpp b/examples/Buffered_Oneways/test_i.cpp
index 08011a0f403..f3333908a56 100644
--- a/examples/Buffered_Oneways/test_i.cpp
+++ b/examples/Buffered_Oneways/test_i.cpp
@@ -2,7 +2,7 @@
 
 #include "test_i.h"
 
-ACE_RCSID(Buffered_Oneways, test_i, "$Id$")
+
 
 test_i::test_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/examples/Buffered_Oneways/test_i.h b/examples/Buffered_Oneways/test_i.h
index bed392b0324..0c0818c991b 100644
--- a/examples/Buffered_Oneways/test_i.h
+++ b/examples/Buffered_Oneways/test_i.h
@@ -1,31 +1,30 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/examples/Buffered_Oneways/
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Irfan Pyarali
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
 
 #ifndef TAO_BUFFERED_ONEWAYS_TEST_I_H
 #define TAO_BUFFERED_ONEWAYS_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class test_i
+ *
+ * @brief Simple implementation.
+ */
 class test_i : public POA_test
 {
-  // = TITLE
-  //   Simple implementation.
-  //
 public:
+  /// ctor.
   test_i (CORBA::ORB_ptr orb);
-  // ctor.
 
   // = The test interface methods.
   void method (CORBA::ULong request_number);
@@ -33,8 +32,8 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB.
   CORBA::ORB_var orb_;
-  // The ORB.
 };
 
 #endif /* TAO_BUFFERED_ONEWAYS_TEST_I_H */
diff --git a/examples/CSD_Strategy/Makefile.am b/examples/CSD_Strategy/Makefile.am
deleted file mode 100644
index 26d99e9e042..00000000000
--- a/examples/CSD_Strategy/Makefile.am
+++ /dev/null
@@ -1,18 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        ThreadPool \
-        ThreadPool2 \
-        ThreadPool3 \
-        ThreadPool4 \
-        ThreadPool5 \
-        ThreadPool6
-
diff --git a/examples/CSD_Strategy/ThreadPool/Foo_i.cpp b/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
index 83ecc32166d..ab94d4f520a 100644
--- a/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
+++ b/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
@@ -1,7 +1,6 @@
 // $Id$
 #include "Foo_i.h"
 #include "OrbShutdownTask.h"
-#include "ace/OS.h"
 
 Foo_i::Foo_i(unsigned num_clients)
   : value_(0),
diff --git a/examples/CSD_Strategy/ThreadPool/Makefile.am b/examples/CSD_Strategy/ThreadPool/Makefile.am
deleted file mode 100644
index a1ee09aa5ad..00000000000
--- a/examples/CSD_Strategy/ThreadPool/Makefile.am
+++ /dev/null
@@ -1,117 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CSD_Test_ThreadPool_Idl.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.CSD_Test_ThreadPool_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_Test_ThreadPool_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_main_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  ServerApp.h
-
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp b/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
index dd808cd767f..ad87e0cc2e1 100644
--- a/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
+++ b/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
@@ -2,8 +2,6 @@
 #include "FooServantList.h"
 #include "Foo_i.h"
 #include "OrbShutdownTask.h"
-#include "ace/OS.h"
-
 
 FooServantList::FooServantList(const ACE_TCHAR* prefix,
                                unsigned    num_servants,
@@ -74,12 +72,7 @@ FooServantList::create_and_activate(PortableServer::POA_ptr poa)
 void
 FooServantList::client_done(void)
 {
-  unsigned num_left;
-
-  {
-    GuardType guard(this->num_clients_lock_);
-    num_left = --this->num_clients_;
-  }
+  unsigned num_left = --this->num_clients_;
 
   if (num_left == 0)
     {
diff --git a/examples/CSD_Strategy/ThreadPool2/FooServantList.h b/examples/CSD_Strategy/ThreadPool2/FooServantList.h
index 4526211d80a..94a4c970852 100644
--- a/examples/CSD_Strategy/ThreadPool2/FooServantList.h
+++ b/examples/CSD_Strategy/ThreadPool2/FooServantList.h
@@ -25,15 +25,11 @@ class FooServantList
 
   private:
 
-    typedef TAO_SYNCH_MUTEX     LockType;
-    typedef ACE_Guard<LockType> GuardType;
-
     PortableServer::ServantBase_var* servants_;
     ACE_TString prefix_;
     unsigned num_servants_;
 
-    LockType num_clients_lock_;
-    unsigned num_clients_;
+    ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> num_clients_;
 
     CORBA::ORB_var  orb_;
 };
diff --git a/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp b/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
index 95a768fc0c7..8b86406037e 100644
--- a/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
+++ b/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
@@ -1,7 +1,6 @@
 // $Id$
 #include "Foo_i.h"
 #include "FooServantList.h"
-#include "ace/OS.h"
 
 Foo_i::Foo_i(const ACE_TCHAR* servant_name,FooServantList* mgr)
   : value_(0),
diff --git a/examples/CSD_Strategy/ThreadPool2/Makefile.am b/examples/CSD_Strategy/ThreadPool2/Makefile.am
deleted file mode 100644
index 1a1a470251a..00000000000
--- a/examples/CSD_Strategy/ThreadPool2/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CSD_Test_ThreadPool2_Idl.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.CSD_Test_ThreadPool2_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_Test_ThreadPool2_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_main_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  FooServantList.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
-  FooServantList.h \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  ServerApp.h
-
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/examples/CSD_Strategy/ThreadPool2/run_test.pl b/examples/CSD_Strategy/ThreadPool2/run_test.pl
index 6f43ddda407..f6a2b76631e 100755
--- a/examples/CSD_Strategy/ThreadPool2/run_test.pl
+++ b/examples/CSD_Strategy/ThreadPool2/run_test.pl
@@ -45,7 +45,7 @@ for ($i = 0; $i < $num_servants; $i++) {
 my @CLS = ();
 my @clients_iorfile = ();
 $count = 0;
-for ($i = 0; $i < $num_servants; $i++) { 
+for ($i = 0; $i < $num_servants; $i++) {
     for ($j = 0; $j < $num_clients_per_servant; $j++) {
         $clients_iorfile[$count] = $clients[$count]->LocalFile($iorfiles[$i]);
         $clients[$count]->DeleteFile($iorfiles[$i]);
@@ -81,7 +81,7 @@ for ($i = 0; $i < $num_servants; $i++) {
 }
 
 $count = 0;
-for ($i = 0; $i < $num_servants; $i++) { 
+for ($i = 0; $i < $num_servants; $i++) {
     for ($j = 0; $j < $num_clients_per_servant; $j++) {
         if ($clients[$count]->PutFile ($iorfiles[$i]) == -1) {
             print STDERR "ERROR: client $count cannot set file <$clients_iorfile[$count]>\n";
@@ -94,7 +94,7 @@ for ($i = 0; $i < $num_servants; $i++) {
 
 $count = 0;
 
-for ($i = 0; $i < $num_servants; $i++) { 
+for ($i = 0; $i < $num_servants; $i++) {
     for ($j = 0; $j < $num_clients_per_servant; $j++) {
         my $client_status = $CLS[$count]->Spawn();
         if ($client_status != 0) {
@@ -128,7 +128,7 @@ for ($i = 0; $i < $num_servants; $i++) {
 }
 
 $count = 0;
-for ($i = 0; $i < $num_servants; $i++) { 
+for ($i = 0; $i < $num_servants; $i++) {
     for ($j = 0; $j < $num_clients_per_servant; $j++) {
         $clients[$count]->DeleteFile($iorfiles[$i]);
         $count++;
diff --git a/examples/CSD_Strategy/ThreadPool3/Makefile.am b/examples/CSD_Strategy/ThreadPool3/Makefile.am
deleted file mode 100644
index 00142133978..00000000000
--- a/examples/CSD_Strategy/ThreadPool3/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CSD_Test_ThreadPool3_Idl.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.CSD_Test_ThreadPool3_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_Test_ThreadPool3_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_main_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  OrbTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  OrbTask.h \
-  ServerApp.h
-
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/examples/CSD_Strategy/ThreadPool4/Callback.idl b/examples/CSD_Strategy/ThreadPool4/Callback.idl
index 49be42260cb..717d74adea5 100644
--- a/examples/CSD_Strategy/ThreadPool4/Callback.idl
+++ b/examples/CSD_Strategy/ThreadPool4/Callback.idl
@@ -2,7 +2,7 @@
 #ifndef CALLBACK_IDL
 #define CALLBACK_IDL
 
-interface Callback 
+interface Callback
 {
   void test_method();
 };
diff --git a/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp b/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
index 637f5b9b587..361116f7eea 100644
--- a/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
+++ b/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
@@ -12,8 +12,6 @@
 
 #include "ClientTask.h"
 #include "ace/SString.h"
-#include "ace/OS.h"
-
 
 ClientTask::ClientTask(Foo_ptr foo,
                        Callback_ptr callback)
diff --git a/examples/CSD_Strategy/ThreadPool4/ClientTask.h b/examples/CSD_Strategy/ThreadPool4/ClientTask.h
index 2f0aa572f8a..5489c2577a9 100644
--- a/examples/CSD_Strategy/ThreadPool4/ClientTask.h
+++ b/examples/CSD_Strategy/ThreadPool4/ClientTask.h
@@ -21,7 +21,7 @@ class ClientTask : public ACE_Task_Base
 {
   public:
 
-    ClientTask(Foo_ptr foo, 
+    ClientTask(Foo_ptr foo,
                Callback_ptr callback);
 
     virtual ~ClientTask();
diff --git a/examples/CSD_Strategy/ThreadPool4/Foo.idl b/examples/CSD_Strategy/ThreadPool4/Foo.idl
index b3085f3f079..845d9ccfab7 100644
--- a/examples/CSD_Strategy/ThreadPool4/Foo.idl
+++ b/examples/CSD_Strategy/ThreadPool4/Foo.idl
@@ -6,7 +6,7 @@
 
 exception FooException {};
 exception TestException {};
-  
+
 typedef sequence<char, 32> Bounded_Var_Size;
 typedef sequence<char> Unbounded_Var_Size;
 typedef long Fixed_Array[20];
@@ -46,7 +46,7 @@ interface Foo
   oneway void test_fixed_array_arg(in Fixed_Array message);
 
   oneway void test_var_array_arg(in Var_Array messages);
-    
+
   oneway void test_bounded_var_size_arg(in Bounded_Var_Size message);
 
   oneway void test_unbounded_var_size_arg(in Unbounded_Var_Size message);
diff --git a/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp b/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
index 4e1c687bc54..8271798514e 100644
--- a/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
+++ b/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
@@ -1,7 +1,6 @@
 // $Id$
 #include "Foo_i.h"
 #include "OrbShutdownTask.h"
-#include "ace/OS.h"
 
 Foo_i::Foo_i(const char* servant_name)
 :   value_(0),
diff --git a/examples/CSD_Strategy/ThreadPool4/Makefile.am b/examples/CSD_Strategy/ThreadPool4/Makefile.am
deleted file mode 100644
index d514c0912b0..00000000000
--- a/examples/CSD_Strategy/ThreadPool4/Makefile.am
+++ /dev/null
@@ -1,129 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.CSD_Test_ThreadPool4_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES += \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES += \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CallbackC.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.cpp \
-  CallbackS.h \
-  CallbackS.inl
-
-CLEANFILES += \
-  Callback-stamp \
-  CallbackC.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.cpp \
-  CallbackS.h \
-  CallbackS.inl
-
-CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl: Callback-stamp
-
-Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl
-	@touch $@
-
-noinst_PROGRAMS = server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_main_SOURCES = \
-  CallbackC.cpp \
-  CallbackS.cpp \
-  Callback_i.cpp \
-  ClientTask.cpp \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.h \
-  CallbackS.inl \
-  Callback_i.h \
-  ClientTask.h \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  ServerApp.h
-
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/examples/CSD_Strategy/ThreadPool4/run_test.pl b/examples/CSD_Strategy/ThreadPool4/run_test.pl
index 22eb04e358f..3d6cfd5964a 100755
--- a/examples/CSD_Strategy/ThreadPool4/run_test.pl
+++ b/examples/CSD_Strategy/ThreadPool4/run_test.pl
@@ -19,7 +19,7 @@ foreach $i (@ARGV) {
 
 $synch_with_server_option = "";
 
-if ($ARGV[0] eq 'synch_with_server') { 
+if ($ARGV[0] eq 'synch_with_server') {
     $synch_with_server_option = "-s";
 }
 elsif ($ARGV[0] eq '') {
diff --git a/examples/CSD_Strategy/ThreadPool5/Callback.idl b/examples/CSD_Strategy/ThreadPool5/Callback.idl
index 49be42260cb..717d74adea5 100644
--- a/examples/CSD_Strategy/ThreadPool5/Callback.idl
+++ b/examples/CSD_Strategy/ThreadPool5/Callback.idl
@@ -2,7 +2,7 @@
 #ifndef CALLBACK_IDL
 #define CALLBACK_IDL
 
-interface Callback 
+interface Callback
 {
   void test_method();
 };
diff --git a/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp b/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
index e168976bd08..495c482c827 100644
--- a/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
+++ b/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
@@ -12,8 +12,7 @@
 
 #include "ClientTask.h"
 #include "ace/SString.h"
-#include "ace/OS.h"
-
+#include "ace/OS_NS_unistd.h"
 
 ClientTask::ClientTask(CORBA::ORB_ptr orb,
                        Foo_ptr foo,
diff --git a/examples/CSD_Strategy/ThreadPool5/ClientTask.h b/examples/CSD_Strategy/ThreadPool5/ClientTask.h
index aec109d9ed6..bc6a5585e4f 100644
--- a/examples/CSD_Strategy/ThreadPool5/ClientTask.h
+++ b/examples/CSD_Strategy/ThreadPool5/ClientTask.h
@@ -21,8 +21,8 @@ class ClientTask : public ACE_Task_Base
 {
   public:
 
-    ClientTask(CORBA::ORB_ptr orb, 
-               Foo_ptr foo, 
+    ClientTask(CORBA::ORB_ptr orb,
+               Foo_ptr foo,
                Callback_ptr callback,
                bool         collocated = false);
 
diff --git a/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp b/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
index 61323f1d1a6..1035c897cab 100644
--- a/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
+++ b/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
@@ -4,8 +4,7 @@
 #include "Callback_i.h"
 #include "ClientTask.h"
 #include "OrbShutdownTask.h"
-#include "ace/OS.h"
-
+#include "ace/OS_NS_unistd.h"
 
 FooServantList::FooServantList(const ACE_TCHAR* prefix,
                                unsigned    num_servants,
@@ -137,7 +136,7 @@ FooServantList::client_done(void)
   unsigned num_left;
 
   {
-    GuardType guard(this->num_clients_lock_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->num_clients_lock_);
     num_left = --this->num_clients_;
   }
 
@@ -199,7 +198,7 @@ FooServantList::deactivate_servant (void)
                 }
               else
                 {
-                  GuardType guard(this->num_clients_lock_);
+                  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->num_clients_lock_);
                   // The clients that requests this deactivated servant
                   // will catch exception due to the deactivated servant.
                   // We need descrease the num_clients so the alived
diff --git a/examples/CSD_Strategy/ThreadPool5/FooServantList.h b/examples/CSD_Strategy/ThreadPool5/FooServantList.h
index f0a7ccc1198..13ec1db2ede 100644
--- a/examples/CSD_Strategy/ThreadPool5/FooServantList.h
+++ b/examples/CSD_Strategy/ThreadPool5/FooServantList.h
@@ -32,16 +32,12 @@ class FooServantList
     void deactivate_servant (void);
 
   private:
-
-    typedef TAO_SYNCH_MUTEX     LockType;
-    typedef ACE_Guard<LockType> GuardType;
-
     Foo_i** servants_;
     PortableServer::ServantBase_var* safe_servants_;
     ACE_TString prefix_;
     unsigned num_servants_;
 
-    LockType num_clients_lock_;
+    TAO_SYNCH_MUTEX num_clients_lock_;
     unsigned num_clients_;
     unsigned init_num_clients_;
     int      collocated_test_;
diff --git a/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp b/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
index dfcf34799a5..74f53da07f8 100644
--- a/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
+++ b/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
@@ -1,7 +1,6 @@
 // $Id$
 #include "Foo_i.h"
 #include "FooServantList.h"
-#include "ace/OS.h"
 
 Foo_i::Foo_i(const char* servant_name,FooServantList* mgr)
   : value_(0),
diff --git a/examples/CSD_Strategy/ThreadPool5/Makefile.am b/examples/CSD_Strategy/ThreadPool5/Makefile.am
deleted file mode 100644
index 02424073eb4..00000000000
--- a/examples/CSD_Strategy/ThreadPool5/Makefile.am
+++ /dev/null
@@ -1,164 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CSD_Test_ThreadPool5_Idl.am
-
-BUILT_SOURCES = \
-  CallbackC.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.cpp \
-  CallbackS.h \
-  CallbackS.inl
-
-CLEANFILES = \
-  Callback-stamp \
-  CallbackC.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.cpp \
-  CallbackS.h \
-  CallbackS.inl
-
-CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl: Callback-stamp
-
-Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Callback.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES += \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Callback.idl \
-  Foo.idl
-
-## Makefile.CSD_Test_ThreadPool5_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  CallbackC.cpp \
-  CallbackS.cpp \
-  Callback_i.cpp \
-  ClientApp.cpp \
-  ClientTask.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  Callback_i.h \
-  ClientApp.h \
-  ClientTask.h
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_Test_ThreadPool5_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_main_SOURCES = \
-  CallbackC.cpp \
-  CallbackS.cpp \
-  Callback_i.cpp \
-  ClientTask.cpp \
-  FooC.cpp \
-  FooS.cpp \
-  FooServantList.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  OrbTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
-  Callback_i.h \
-  ClientTask.h \
-  FooServantList.h \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  OrbTask.h \
-  ServerApp.h
-
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/examples/CSD_Strategy/ThreadPool5/run_test.pl b/examples/CSD_Strategy/ThreadPool5/run_test.pl
index bdd96e9c7fb..941e9fceadd 100755
--- a/examples/CSD_Strategy/ThreadPool5/run_test.pl
+++ b/examples/CSD_Strategy/ThreadPool5/run_test.pl
@@ -18,30 +18,30 @@ $num_csd_threads=1;
 $collocated_test=0;
 $servant_cancellation_option="";
 
-if ($ARGV[0] eq 'collocated') { 
-    # 1 servant, 1 collocated client, 1 orb thread, 2 strategy working threads    
+if ($ARGV[0] eq 'collocated') {
+    # 1 servant, 1 collocated client, 1 orb thread, 2 strategy working threads
     $num_clients_per_servant=1;
     $collocated_test=1;
     $num_csd_threads=2;
 }
-elsif ($ARGV[0] eq 'multiple_servants') { 
+elsif ($ARGV[0] eq 'multiple_servants') {
     # multiple servants and single orb thread.
-    # 10 servant, 40 client, 1 orb thread, 10 strategy working threads  
+    # 10 servant, 40 client, 1 orb thread, 10 strategy working threads
     $num_servants=10;
     $num_csd_threads=10;
     $num_clients_per_servant=4;
 }
-elsif ($ARGV[0] eq 'multiple_orb_threads') { 
+elsif ($ARGV[0] eq 'multiple_orb_threads') {
     # multiple servants and multiple orb threads.
-    # 10 servant, 40 client, 4 orb thread, 10 strategy working threads 
+    # 10 servant, 40 client, 4 orb thread, 10 strategy working threads
     $num_servants=10;
     $num_csd_threads=10;
     $num_clients_per_servant=4;
     $num_orb_threads=4;
 }
-elsif ($ARGV[0] eq 'cancel_servant') { 
+elsif ($ARGV[0] eq 'cancel_servant') {
     # Cancel one servant and leave the other alive.
-    # 2 servant, 10 client, 5 orb thread, 1 strategy working threads 
+    # 2 servant, 10 client, 5 orb thread, 1 strategy working threads
     $num_clients_per_servant=5;
     $num_servants=2;
     $num_csd_threads=2;
@@ -49,7 +49,7 @@ elsif ($ARGV[0] eq 'cancel_servant') {
     $servant_cancellation_option = " -d 1 ";
 }
 elsif ($ARGV[0] eq '') {
-    # default test - 1 servant, 40 clients , 1 orb thread, 1 csd thread  
+    # default test - 1 servant, 40 clients , 1 orb thread, 1 csd thread
 }
 else {
     print STDERR "ERROR: invalid parameter $ARGV[0] \n";
@@ -68,7 +68,7 @@ $num_clients = $num_servants * $num_clients_per_servant;
 
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 
-$SV  = $server->CreateProcess("server_main", 
+$SV  = $server->CreateProcess("server_main",
                               "-p $iorfname_prefix -s $num_servants ".
                               "-c $num_clients -t $num_orb_threads -n $num_csd_threads ".
                               "-l $collocated_test $servant_cancellation_option");
@@ -92,7 +92,7 @@ for ($i = 0; $i < $num_servants; $i++) {
 my @CLS = ();
 my @clients_iorfile = ();
 $count = 0;
-for ($i = 0; $i < $num_servants; $i++) { 
+for ($i = 0; $i < $num_servants; $i++) {
     for ($j = 0; $j < $num_clients_per_servant; $j++) {
         $clients_iorfile[$count] = $clients[$count]->LocalFile($iorfiles[$i]);
         $clients[$count]->DeleteFile($iorfiles[$i]);
@@ -128,7 +128,7 @@ for ($i = 0; $i < $num_servants; $i++) {
 }
 
 $count = 0;
-for ($i = 0; $i < $num_servants; $i++) { 
+for ($i = 0; $i < $num_servants; $i++) {
     for ($j = 0; $j < $num_clients_per_servant; $j++) {
         if ($clients[$count]->PutFile ($iorfiles[$i]) == -1) {
             print STDERR "ERROR: client $count cannot set file <$clients_iorfile[$count]>\n";
@@ -142,7 +142,7 @@ for ($i = 0; $i < $num_servants; $i++) {
 $count = 0;
 
 if ($collocated_test == 0) {
-    for ($i = 0; $i < $num_servants; $i++) { 
+    for ($i = 0; $i < $num_servants; $i++) {
         for ($j = 0; $j < $num_clients_per_servant; $j++) {
             my $client_status = $CLS[$count]->Spawn();
             if ($client_status != 0) {
@@ -177,7 +177,7 @@ for ($i = 0; $i < $num_servants; $i++) {
 }
 
 $count = 0;
-for ($i = 0; $i < $num_servants; $i++) { 
+for ($i = 0; $i < $num_servants; $i++) {
     for ($j = 0; $j < $num_clients_per_servant; $j++) {
         $clients[$count]->DeleteFile($iorfiles[$i]);
         $count++;
diff --git a/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp b/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
index 336c96d8b53..84807a8b9f0 100644
--- a/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
+++ b/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
@@ -1,7 +1,6 @@
 // $Id$
 #include "Foo_i.h"
 #include "OrbShutdownTask.h"
-#include "ace/OS.h"
 
 Foo_i::Foo_i(unsigned num_clients)
   : value_(0),
diff --git a/examples/CSD_Strategy/ThreadPool6/Makefile.am b/examples/CSD_Strategy/ThreadPool6/Makefile.am
deleted file mode 100644
index 6e20e4aa513..00000000000
--- a/examples/CSD_Strategy/ThreadPool6/Makefile.am
+++ /dev/null
@@ -1,121 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CSD_Test_ThreadPool6_Idl.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GT $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.CSD_Test_ThreadPool6_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_Test_ThreadPool6_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_main_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  ServerApp.h
-
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/examples/Callback_Quoter/Consumer_Handler.cpp b/examples/Callback_Quoter/Consumer_Handler.cpp
index 083f0b4cd56..4348b1cad22 100644
--- a/examples/Callback_Quoter/Consumer_Handler.cpp
+++ b/examples/Callback_Quoter/Consumer_Handler.cpp
@@ -1,21 +1,17 @@
-// $Id$
-
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    Consumer_Input_Handler.cpp
-//
-// = DESCRIPTION
-//    Implementation of the Consumer_Handler class.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Consumer_Handler.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the Consumer_Handler class.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Consumer_Handler.h"
 
@@ -26,9 +22,9 @@
 #include "ace/Read_Buffer.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
-#include "ace/OS.h"
 #include "ace/Reactor.h"
 #include "ace/Event_Handler.h"
+#include "ace/OS_NS_fcntl.h"
 
 Consumer_Handler::Consumer_Handler (void)
   : stock_name_ ("Unknown"),
diff --git a/examples/Callback_Quoter/Consumer_Handler.h b/examples/Callback_Quoter/Consumer_Handler.h
index bea9924b250..16bef8e8210 100644
--- a/examples/Callback_Quoter/Consumer_Handler.h
+++ b/examples/Callback_Quoter/Consumer_Handler.h
@@ -1,22 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    Consumer_Handler.h
-//
-// = DESCRIPTION
-//    Definition of the Callback_Qouter Consumer Client class, Consumer_Handler.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Consumer_Handler.h
+ *
+ *  $Id$
+ *
+ *  Definition of the Callback_Qouter Consumer Client class, Consumer_Handler.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef CONSUMER_HANDLER_H
 #define CONSUMER_HANDLER_H
@@ -39,100 +35,102 @@
 class Consumer_Input_Handler;
 class Consumer_Signal_Handler;
 
+/**
+ * @class Consumer_Handler
+ *
+ * @brief Callback Quoter Consumer Client class.
+ *
+ * Connects to the Callback Quoter server and
+ * registers the Consumer object with the it
+ * and receives the stock status from the Notifier.
+ */
 class Consumer_Handler
 {
-  // = TITLE
-  //    Callback Quoter Consumer Client class.
-  //
-  // = DESCRIPTION
-  //    Connects to the Callback Quoter server and
-  //    registers the Consumer object with the it
-  //    and receives the stock status from the Notifier.
 
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Consumer_Handler (void);
-  // Constructor.
 
+  /// Destructor.
   ~Consumer_Handler (void);
-  // Destructor.
 
+  /// Initialize the client communication with the server.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize the client communication with the server.
 
+  /// Start the ORB object.
   int run (void);
-  // Start the ORB object.
 
+  /// the name of the stock the consumer is interested in.
   ACE_CString stock_name_;
-  // the name of the stock the consumer is interested in.
 
+  /// the desired price of the stock.
   int threshold_value_;
-  // the desired price of the stock.
 
+  /// Server object ptr.
   Notifier_var server_;
-  // Server object ptr.
 
+  /// The consumer object.
   Consumer_i *consumer_servant_;
-  // The consumer object.
 
+  /// Pointer to the consumer object registered with the ORB.
   Callback_Quoter::Consumer_var consumer_var_;
-  // Pointer to the consumer object registered with the ORB.
 
+  /// This method gives the reactor pointer.
   ACE_Reactor* reactor_used (void) const;
-  // This method gives the reactor pointer.
 
+  /// Flag which notes whether the consumer has got registered with the
+  /// Notifier-server.
   int registered_;
-  // Flag which notes whether the consumer has got registered with the
-  // Notifier-server.
 
+  /// Flag which notes whether the consumer has got unregistered from
+  /// the Notifier-server.
   int unregistered_;
-  // Flag which notes whether the consumer has got unregistered from
-  // the Notifier-server.
 
 private:
 
+  /// Our orb.
   CORBA::ORB_var orb_;
-  // Our orb.
 
+  /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the server IOR from a file.
 
+  /// Parse the command line arguments.  Returns 0 on success, -1 on
+  /// error.
   int parse_args (void);
-  // Parse the command line arguments.  Returns 0 on success, -1 on
-  // error.
 
+  /// This method initialises the naming service and registers the
+  /// object with the POA.
   int via_naming_service (void);
-  // This method initialises the naming service and registers the
-  // object with the POA.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// IOR of the obj ref of the server.
   ACE_TCHAR *ior_;
-  // IOR of the obj ref of the server.
 
+  /// Flag for server shutdown.
   int shutdown_;
-  // Flag for server shutdown.
 
+  /// An instance of the name client used for resolving the factory
+  /// objects.
   TAO_Naming_Client naming_services_client_;
-  // An instance of the name client used for resolving the factory
-  // objects.
 
+  /// This variable denotes whether the naming service
+  /// is used or not.
   int use_naming_service_;
-  // This variable denotes whether the naming service
-  // is used or not.
 
+  /// Reference to the input_event_handler.
   Consumer_Input_Handler *consumer_input_handler_;
-  // Reference to the input_event_handler.
 
+  /// Reference to the signal_event_handler.
   Consumer_Signal_Handler *consumer_signal_handler_;
-  // Reference to the signal_event_handler.
 
+  /// Is the example interactive?
   int interactive_;
-  // Is the example interactive?
 };
 
 #endif /* CONSUMER_HANDLER_H */
diff --git a/examples/Callback_Quoter/Consumer_Input_Handler.cpp b/examples/Callback_Quoter/Consumer_Input_Handler.cpp
index 2b8df7edfbc..c5164c84b2b 100644
--- a/examples/Callback_Quoter/Consumer_Input_Handler.cpp
+++ b/examples/Callback_Quoter/Consumer_Input_Handler.cpp
@@ -1,20 +1,16 @@
-// $Id$
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    Consumer_Input_Handler.cpp
-//
-// = DESCRIPTION
-//    Implementation of the Consumer_Input_Handler class.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
+//=============================================================================
+/**
+ *  @file    Consumer_Input_Handler.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the Consumer_Input_Handler class.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Consumer_Input_Handler.h"
 #include "ace/Read_Buffer.h"
diff --git a/examples/Callback_Quoter/Consumer_Input_Handler.h b/examples/Callback_Quoter/Consumer_Input_Handler.h
index 463a2c80271..0bb703909b7 100644
--- a/examples/Callback_Quoter/Consumer_Input_Handler.h
+++ b/examples/Callback_Quoter/Consumer_Input_Handler.h
@@ -1,22 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    Consumer_Input_Handler.h
-//
-// = DESCRIPTION
-//    Definition of the Callback_Qouter Consumer Client class, Consumer_Input_Handler.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Consumer_Input_Handler.h
+ *
+ *  $Id$
+ *
+ *  Definition of the Callback_Qouter Consumer Client class, Consumer_Input_Handler.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef CONSUMER_INPUT_HANDLER_H
 #define CONSUMER_INPUT_HANDLER_H
@@ -35,31 +31,33 @@
 
 class Consumer_Handler;
 
+/**
+ * @class Consumer_Input_Handler
+ *
+ * @brief Callback Quoter Consumer Client class.
+ *
+ * Connects to the Callback Quoter server and
+ * registers the Consumer object with the it
+ * and receives the stock status from the Notifier.
+ */
 class Consumer_Input_Handler : public ACE_Event_Handler
 {
-  // = TITLE
-  //    Callback Quoter Consumer Client class.
-  //
-  // = DESCRIPTION
-  //    Connects to the Callback Quoter server and
-  //    registers the Consumer object with the it
-  //    and receives the stock status from the Notifier.
 
 public:
+  /// Constructor.
   Consumer_Input_Handler (Consumer_Handler *consumer_handler);
-  // Constructor.
 
+  /// Handle the user input.
   int handle_input (ACE_HANDLE);
-  // Handle the user input.
 
+  /// Registration with the notifier.
   int register_consumer (void);
-  // Registration with the notifier.
 
+  /// Cancelling the registration with the notifier.
   int unregister_consumer (void);
-  // Cancelling the registration with the notifier.
 
+  /// Ends the consumer process.
   int quit_consumer_process (void);
-  // Ends the consumer process.
 
   enum
   {
@@ -85,12 +83,12 @@ public:
   };
 
 protected:
+  /// the destructor.
   ~Consumer_Input_Handler (void);
-  // the destructor.
 
 private:
+  /// The Consumer_Handler object.
   Consumer_Handler *consumer_handler_;
-  // The Consumer_Handler object.
 };
 
 #endif /* CONSUMER_INPUT_HANDLER_H */
diff --git a/examples/Callback_Quoter/Consumer_Signal_Handler.cpp b/examples/Callback_Quoter/Consumer_Signal_Handler.cpp
index 82e2d6e3570..c1ee3032ed7 100644
--- a/examples/Callback_Quoter/Consumer_Signal_Handler.cpp
+++ b/examples/Callback_Quoter/Consumer_Signal_Handler.cpp
@@ -1,22 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    Consumer_Input_Handler.cpp
-//
-// = DESCRIPTION
-//    Implementation of the Consumer_Signal_Handler class.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
+//=============================================================================
+/**
+ *  @file    Consumer_Signal_Handler.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the Consumer_Signal_Handler class.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Consumer_Signal_Handler.h"
 
diff --git a/examples/Callback_Quoter/Consumer_Signal_Handler.h b/examples/Callback_Quoter/Consumer_Signal_Handler.h
index 8a288c117e2..43865faf4b0 100644
--- a/examples/Callback_Quoter/Consumer_Signal_Handler.h
+++ b/examples/Callback_Quoter/Consumer_Signal_Handler.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    Consumer_Input_Handler.h
-//
-// = DESCRIPTION
-//    Definition of the Consumer_Signal_Handler class.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
+//=============================================================================
+/**
+ *  @file    Consumer_Signal_Handler.h
+ *
+ *  $Id$
+ *
+ *  Definition of the Consumer_Signal_Handler class.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef CONSUMER_SIGNAL_HANDLER_H
 #define CONSUMER_SIGNAL_HANDLER_H
@@ -26,43 +23,47 @@
 
 class Consumer_Handler;
 
+/**
+ * @class Consumer_Signal_Handler
+ *
+ * @brief Creating a class to handle signal events.
+ *
+ * Since only signals need to be handled, only the <handle_signal> method
+ * is overlaoded.
+ */
 class Consumer_Signal_Handler : public ACE_Event_Handler
 {
-  // = TITLE
-  //   Creating a class to handle signal events.
-  //
-  // = DESCRIPTION
-  //   Since only signals need to be handled, only the <handle_signal> method
-  //   is overlaoded.
 public:
 
+  /// The consumer_handler refernce will be used to access the servant
+  /// methods.
   Consumer_Signal_Handler (Consumer_Handler *consumer_handler);
-  // The consumer_handler refernce will be used to access the servant
-  // methods.
 
+  /// This method takes action on an signal event.
   int handle_signal (int signum,
                      siginfo_t*,
                      ucontext_t*);
-  // This method takes action on an signal event.
 
+  /**
+   * For removal of the signal handler from the dispatch tables.  When
+   * the handle_signal () returns < 0 this method will be executed
+   * automatically.
+   */
   int handle_close (ACE_HANDLE handle,
                     ACE_Reactor_Mask close_mask);
-  // For removal of the signal handler from the dispatch tables.  When
-  // the handle_signal () returns < 0 this method will be executed
-  // automatically.
 
 protected:
+  /// Protected destructor so that the signal handler is always created
+  /// dynamically and hence the heap doesnt get corrupted.
   ~Consumer_Signal_Handler (void);
-  // Protected destructor so that the signal handler is always created
-  // dynamically and hence the heap doesnt get corrupted.
 
 private:
+  /// Exit gracefully on a signal.
   int quit_on_signal (void);
-  // Exit gracefully on a signal.
 
+  /// Reference to the Consumer_Handler which is used in accessing the
+  /// servant methods.
   Consumer_Handler *consumer_handler_;
-  // Reference to the Consumer_Handler which is used in accessing the
-  // servant methods.
 };
 
 #endif /* CONSUMER_SIGNAL_HANDLER_H */
diff --git a/examples/Callback_Quoter/Consumer_i.cpp b/examples/Callback_Quoter/Consumer_i.cpp
index 266f9796c60..64ad94f6fe8 100644
--- a/examples/Callback_Quoter/Consumer_i.cpp
+++ b/examples/Callback_Quoter/Consumer_i.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    Consumer_i.cpp
-//
-// = DESCRIPTION
-//    Implements the Consumer_i class, which is used by the
-//    callback quoter client.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Consumer_i.cpp
+ *
+ *  $Id$
+ *
+ *  Implements the Consumer_i class, which is used by the
+ *  callback quoter client.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Consumer_i.h"
 
diff --git a/examples/Callback_Quoter/Consumer_i.h b/examples/Callback_Quoter/Consumer_i.h
index 0645b3962c9..14cfadfddd0 100644
--- a/examples/Callback_Quoter/Consumer_i.h
+++ b/examples/Callback_Quoter/Consumer_i.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    Consumer_i.h
-//
-// = DESCRIPTION
-//    Defines the implementation header for the Consumer interface.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Consumer_i.h
+ *
+ *  $Id$
+ *
+ *  Defines the implementation header for the Consumer interface.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef CONSUMER_I_H
 #define CONSUMER_I_H
@@ -23,41 +20,43 @@
 #include "ConsumerC.h"
 #include "NotifierS.h"
 
+/**
+ * @class Consumer_i
+ *
+ * @brief Consumer object implementation.
+ *
+ * This class has methods that are called by the callback quoter
+ * server.
+ */
 class Consumer_i : public POA_Callback_Quoter::Consumer
 {
-  // = TITLE
-  //    Consumer object implementation.
-  //
-  // = DESCRIPTION
-  //    This class has methods that are called by the callback quoter
-  //    server.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Consumer_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~Consumer_i (void);
-  // Destructor.
 
+  /// Gets the stock information from the Notifier.
   void push (const Callback_Quoter::Info & data);
-  // Gets the stock information from the Notifier.
 
+  /// Used to get the consumer to shut down.
   virtual void shutdown (void);
-  // Used to get the consumer to shut down.
 
+  /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
 
 private:
+  /// ORB pointer.
   CORBA::ORB_var orb_;
-  // ORB pointer.
 
+  /// If 1 denotes that the consumer is dead else alive.
   int quit_;
-  // If 1 denotes that the consumer is dead else alive.
 
   // @@ Please rename to Notifier.
+  /// Smart pointer to the Notifier object.
   Notifier_var server_;
-  // Smart pointer to the Notifier object.
 };
 
 #endif /* CONSUMER_I_H  */
diff --git a/examples/Callback_Quoter/Makefile.am b/examples/Callback_Quoter/Makefile.am
deleted file mode 100644
index 08c23dea155..00000000000
--- a/examples/Callback_Quoter/Makefile.am
+++ /dev/null
@@ -1,187 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Callback_Quoter_IDL.am
-
-BUILT_SOURCES = \
-  ConsumerC.cpp \
-  ConsumerC.h \
-  ConsumerC.inl \
-  ConsumerS.cpp \
-  ConsumerS.h \
-  ConsumerS.inl
-
-CLEANFILES = \
-  Consumer-stamp \
-  ConsumerC.cpp \
-  ConsumerC.h \
-  ConsumerC.inl \
-  ConsumerS.cpp \
-  ConsumerS.h \
-  ConsumerS.inl
-
-ConsumerC.cpp ConsumerC.h ConsumerC.inl ConsumerS.cpp ConsumerS.h ConsumerS.inl: Consumer-stamp
-
-Consumer-stamp: $(srcdir)/Consumer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Consumer.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  NotifierC.cpp \
-  NotifierC.h \
-  NotifierC.inl \
-  NotifierS.cpp \
-  NotifierS.h \
-  NotifierS.inl
-
-CLEANFILES += \
-  Notifier-stamp \
-  NotifierC.cpp \
-  NotifierC.h \
-  NotifierC.inl \
-  NotifierS.cpp \
-  NotifierS.h \
-  NotifierS.inl
-
-NotifierC.cpp NotifierC.h NotifierC.inl NotifierS.cpp NotifierS.h NotifierS.inl: Notifier-stamp
-
-Notifier-stamp: $(srcdir)/Notifier.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Notifier.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Consumer.idl \
-  Notifier.idl
-
-## Makefile.Callback_Quoter_consumer.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += consumer
-
-consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-consumer_SOURCES = \
-  ConsumerC.cpp \
-  ConsumerS.cpp \
-  Consumer_Handler.cpp \
-  Consumer_Input_Handler.cpp \
-  Consumer_Signal_Handler.cpp \
-  Consumer_i.cpp \
-  NotifierC.cpp \
-  consumer.cpp \
-  Consumer_Handler.h \
-  Consumer_Input_Handler.h \
-  Consumer_Signal_Handler.h \
-  Consumer_i.h
-
-consumer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Callback_Quoter_notifier.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += notifier
-
-notifier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-notifier_SOURCES = \
-  ConsumerC.cpp \
-  NotifierC.cpp \
-  NotifierS.cpp \
-  Notifier_Input_Handler.cpp \
-  Notifier_i.cpp \
-  notifier.cpp \
-  Notifier_Input_Handler.h \
-  Notifier_i.h
-
-notifier_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Callback_Quoter_supplier.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += supplier
-
-supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-supplier_SOURCES = \
-  ConsumerC.cpp \
-  ConsumerS.cpp \
-  Consumer_i.cpp \
-  NotifierC.cpp \
-  Supplier_Timer_Handler.cpp \
-  Supplier_i.cpp \
-  supplier.cpp \
-  Consumer_i.h \
-  Supplier_Timer_Handler.h \
-  Supplier_i.h
-
-supplier_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/examples/Callback_Quoter/Notifier_Input_Handler.cpp
index d2ae843ec17..f3b1cb32dec 100644
--- a/examples/Callback_Quoter/Notifier_Input_Handler.cpp
+++ b/examples/Callback_Quoter/Notifier_Input_Handler.cpp
@@ -1,21 +1,17 @@
-// $Id$
-
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    Notifier_Input_Handler.cpp
-//
-// = DESCRIPTION
-//    Implementation of the callback quoter Notifier_Input_Handler class.
-//
-// = AUTHOR
-//   Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Notifier_Input_Handler.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the callback quoter Notifier_Input_Handler class.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Notifier_Input_Handler.h"
 #include "tao/debug.h"
diff --git a/examples/Callback_Quoter/Notifier_Input_Handler.h b/examples/Callback_Quoter/Notifier_Input_Handler.h
index 16385d1da55..3c3c5f17ad9 100644
--- a/examples/Callback_Quoter/Notifier_Input_Handler.h
+++ b/examples/Callback_Quoter/Notifier_Input_Handler.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    Notifier_Input_Handler.h
-//
-// = DESCRIPTION
-//    Definition of the Callback_Quoter Notifier_Input_Handler class.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
+//=============================================================================
+/**
+ *  @file    Notifier_Input_Handler.h
+ *
+ *  $Id$
+ *
+ *  Definition of the Callback_Quoter Notifier_Input_Handler class.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef SUPPLIER_INPUT_HANDLER_H
 #define SUPPLIER_INPUT_HANDLER_H
@@ -26,66 +23,68 @@
 #include "orbsvcs/CosNamingS.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 
+/**
+ * @class Notifier_Input_Handler
+ *
+ * @brief The class defines the callback quoter Notifier initialization
+ * and run methods.
+ *
+ * This class handles initialization tasks, as well, such as
+ * setting up the Orb manager and registers the Notifier servant
+ * object.
+ */
 class Notifier_Input_Handler : public ACE_Event_Handler
 {
-  // = TITLE
-  //   The class defines the callback quoter Notifier initialization
-  //   and run methods.
-  //
-  // = DESCRIPTION
-  //   This class handles initialization tasks, as well, such as
-  //   setting up the Orb manager and registers the Notifier servant
-  //   object.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Notifier_Input_Handler (void);
-  // Constructor.
 
+  /// Destructor.
   ~Notifier_Input_Handler (void);
-  // Destructor.
 
+  /// Initialize the Notifier who plays the role of the server here.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the Notifier who plays the role of the server here.
 
+  /// Run the ORB.
   int run (void);
-  // Run the ORB.
 
+  /// Handle the user input.
    virtual int handle_input (ACE_HANDLE);
-  // Handle the user input.
 
 private:
 
+  /// The tao orb manager object.
   TAO_ORB_Manager orb_manager_;
-  // The tao orb manager object.
 
+  /// Parses the command line arguments.
   int parse_args (void);
-  // Parses the command line arguments.
 
+  /// Initialises the name server and registers the Notifier object
+  /// name with the name server.
   int init_naming_service (void);
-  // Initialises the name server and registers the Notifier object
-  // name with the name server.
 
+  /// File where the IOR of the Notifier object is stored.
   FILE *ior_output_file_;
-  // File where the IOR of the Notifier object is stored.
 
+  /// Number of command line arguments.
   int argc_;
-  // Number of command line arguments.
 
+  /// The command line arguments.
   ACE_TCHAR **argv_;
-  // The command line arguments.
 
+  /// Naming context for the naming service.
   CosNaming::NamingContext_var naming_context_;
-  // Naming context for the naming service.
 
+  /// helper class for getting access to Naming Service.
   TAO_Naming_Client naming_server_;
-  // helper class for getting access to Naming Service.
 
+  /// The servant object registered with the orb.
   Notifier_i notifier_i_;
-  // The servant object registered with the orb.
 
+  /// This specifies whether the naming service is to be used.
   int using_naming_service_;
-  // This specifies whether the naming service is to be used.
 };
 
 #endif /* NOTIFIER_INPUT_HANDLER_H */
diff --git a/examples/Callback_Quoter/Notifier_i.cpp b/examples/Callback_Quoter/Notifier_i.cpp
index 0be7b18cb98..a0c2c20e96b 100644
--- a/examples/Callback_Quoter/Notifier_i.cpp
+++ b/examples/Callback_Quoter/Notifier_i.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    Notifier_i.cpp
-//
-// = DESCRIPTION
-//   Implementation of the Notifier_i class. This class is the servant
-//   object for the callback quoter server.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Notifier_i.cpp
+ *
+ *  $Id$
+ *
+ * Implementation of the Notifier_i class. This class is the servant
+ * object for the callback quoter server.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Notifier_i.h"
 
diff --git a/examples/Callback_Quoter/Notifier_i.h b/examples/Callback_Quoter/Notifier_i.h
index 769d2c02ad9..e4cb79eeff2 100644
--- a/examples/Callback_Quoter/Notifier_i.h
+++ b/examples/Callback_Quoter/Notifier_i.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    Notifier.h
-//
-// = DESCRIPTION
-//    Defines the implementation header for the Supplier interface.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Notifier_i.h
+ *
+ *  $Id$
+ *
+ *  Defines the implementation header for the Supplier interface.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFIER_I_H
 #define NOTIFIER_I_H
@@ -32,63 +29,67 @@
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 
+/**
+ * @class Notifier_i
+ *
+ * @brief Notifier servant class.
+ *
+ * The implementation of the Notifier class, which is the servant
+ * object for the callback quoter server.
+ */
 class Notifier_i : public POA_Notifier
 {
-  // = TITLE
-  //   Notifier servant class.
-  //
-  // = DESCRIPTION
-  //   The implementation of the Notifier class, which is the servant
-  //   object for the callback quoter server.
-  //
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Notifier_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~Notifier_i (void);
-  // Destructor.
 
+  /// Register a distributed callback handler that is invoked when the
+  /// given stock reaches the desired threshold value.
   virtual void register_callback (const char *stock_name,
                                   CORBA::Long threshold_value,
                                   Callback_Quoter::Consumer_ptr consumer_handler);
-  // Register a distributed callback handler that is invoked when the
-  // given stock reaches the desired threshold value.
 
+  /// Remove the consumer object.
   virtual void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler);
-  // Remove the consumer object.
 
+  /// Get the market status.
   virtual void market_status (const char *stock_name,
                               CORBA::Long stock_value);
-  // Get the market status.
 
+  /// Get the orb pointer.
   void orb (CORBA::ORB_ptr orb);
-  // Get the orb pointer.
 
+  /// Shutdown the Notifier.
   virtual void shutdown (void);
-  // Shutdown the Notifier.
 
   // CONSUMER_MAP* get_consumer_map_ptr ();
   // Returns the consumer map ptr.
 
   //private:
 public:
+  /// The ORB manager.
   CORBA::ORB_ptr orb_;
-  // The ORB manager.
 
+  /**
+   * @class Consumer_Data
+   *
+   * @brief Saves the Consumer_var and the threshold stock value.
+   */
   class Consumer_Data
   {
-    // = TITLE
-    //   Saves the Consumer_var and the threshold stock value.
   public:
+    /// Comparison operator.
     bool operator== (const Consumer_Data &rhs) const;
-    // Comparison operator.
 
+    /// Stores the consumer object reference.
     Callback_Quoter::Consumer_var consumer_;
-    // Stores the consumer object reference.
 
+    /// Stores the stock threshold value.
     CORBA::Long desired_value_;
-    // Stores the stock threshold value.
   };
 
   typedef ACE_Unbounded_Set<Consumer_Data>
@@ -97,13 +98,13 @@ public:
   typedef ACE_Hash_Map_Manager<ACE_CString, CONSUMERS *, ACE_Null_Mutex>
           CONSUMER_MAP;
 
+  /// This is the hash map with each hash_entry consisting of the stockname
+  /// and an unbounded set of consumer object pointer and the desired stockvalue.
   CONSUMER_MAP consumer_map_;
-  // This is the hash map with each hash_entry consisting of the stockname
-  // and an unbounded set of consumer object pointer and the desired stockvalue.
 
+  ///This marks the exit of the notifier. This should be taken care of
+  /// before the consumer tries to unregister after the notifier quits.
   int notifier_exited_;
-  //This marks the exit of the notifier. This should be taken care of
-  // before the consumer tries to unregister after the notifier quits.
 
 
 };
diff --git a/examples/Callback_Quoter/Supplier_Timer_Handler.cpp b/examples/Callback_Quoter/Supplier_Timer_Handler.cpp
index 549dbd3945d..5a83a86406d 100644
--- a/examples/Callback_Quoter/Supplier_Timer_Handler.cpp
+++ b/examples/Callback_Quoter/Supplier_Timer_Handler.cpp
@@ -1,28 +1,17 @@
-// $Id$
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//  Supplier_Time _Handler.cpp
-//
-// = DESCRIPTION
-//    Implementation of the Supplier_Time_Handler class.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
-
-#include "ace/OS.h"
-#include "ace/ACE.h"
+//=============================================================================
+/**
+ *  Implementation of the Supplier_Time_Handler class.
+ *
+ *  $Id$
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
 
-#include "Supplier_Timer_Handler.h"
 
+#include "ace/ACE.h"
 
-ACE_RCSID(Callback_Quoter, Supplier, "$Id$")
+#include "Supplier_Timer_Handler.h"
 
 // The supplier refernce is got so that the mathods in the supplier
 // can be accessed.
diff --git a/examples/Callback_Quoter/Supplier_Timer_Handler.h b/examples/Callback_Quoter/Supplier_Timer_Handler.h
index b359a59e40c..40799b73a52 100644
--- a/examples/Callback_Quoter/Supplier_Timer_Handler.h
+++ b/examples/Callback_Quoter/Supplier_Timer_Handler.h
@@ -1,22 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    Consumer_Input_Handler.h
-//
-// = DESCRIPTION
-//    Definition of the Supplier_Timer_Handler class.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Supplier_Timer_Handler.h
+ *
+ *  $Id$
+ *
+ *  Definition of the Supplier_Timer_Handler class.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef SUPPLIER_TIMER_HANDLER_H
 #define SUPPLIER_TIMER_HANDLER_H
@@ -31,47 +27,49 @@
 
 class Supplier;
 
+/**
+ * @class Supplier_Timer_Handler
+ *
+ * @brief Feeds stock information to the Callback Quoter notifier
+ * periodically.
+ * = Description
+ * Create a class to handle timer events.  Since only timer events
+ * need to be handled, only the handle_timeout method is overlaoded.
+ */
 class Supplier_Timer_Handler : public ACE_Event_Handler
 {
-  // = TITLE
-  //    Feeds stock information to the Callback Quoter notifier
-  //    periodically.
-  //
-  // = Description
-  //   Create a class to handle timer events.  Since only timer events
-  // need to be handled, only the handle_timeout method is overlaoded.
 public:
+  /// Initilization.
   Supplier_Timer_Handler (Supplier *supplier,
-                          ACE_Reactor *reactor, 
+                          ACE_Reactor *reactor,
                           FILE *file_ptr);
-  // Initilization.
 
+  /// Destructor.
   ~Supplier_Timer_Handler (void);
-  // Destructor.
- 
+
+  /// Method which will be called by the Reactor when timeout occurs.
   virtual int handle_timeout (const ACE_Time_Value &tv,
                               const void *arg = 0);
-  // Method which will be called by the Reactor when timeout occurs.
 
 private:
 
+  /// The values of the stock and its rate are got from the file.
   int get_stock_information (void);
-  // The values of the stock and its rate are got from the file.
 
+  /// The supplier instance.
   Supplier *supplier_obj_;
-  // The supplier instance.
 
+  /// Reactor used by the supplier.
   ACE_Reactor *reactor_;
-  // Reactor used by the supplier. 
 
+  /// The file handle of the file from where the stock input is obtained.
   FILE* file_ptr_;
-  // The file handle of the file from where the stock input is obtained.
 
+  /// The name of the stock.
   char stockname_[BUFSIZ];
-  // The name of the stock.
 
+  /// The market value of the stock.It will be typecasted to long later.
   long value_;
-  // The market value of the stock.It will be typecasted to long later.
 };
 
 #endif /* SUPPLIER_TIMER_HANDLER_H */
diff --git a/examples/Callback_Quoter/Supplier_i.cpp b/examples/Callback_Quoter/Supplier_i.cpp
index bfbe6a7e00a..589e9bad462 100644
--- a/examples/Callback_Quoter/Supplier_i.cpp
+++ b/examples/Callback_Quoter/Supplier_i.cpp
@@ -1,20 +1,16 @@
-// $Id$
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    Supplier_i.cpp
-//
-// = DESCRIPTION
-//    Implementation of the Supplier class.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ===========================================================
+//=============================================================================
+/**
+ *  @file    Supplier_i.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the Supplier class.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Supplier_i.h"
 #include "tao/debug.h"
diff --git a/examples/Callback_Quoter/Supplier_i.h b/examples/Callback_Quoter/Supplier_i.h
index 181e1771c75..28b259ddbff 100644
--- a/examples/Callback_Quoter/Supplier_i.h
+++ b/examples/Callback_Quoter/Supplier_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Callback_Quoter
-//
-// = FILENAME
-//    MarketFeed.h
-//
-// = DESCRIPTION
-//    This class implements a simple CORBA server that keeps
-//     on sending stock values to the Notifier.
-//
-// = AUTHORS
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Supplier_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements a simple CORBA server that keeps
+ *   on sending stock values to the Notifier.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 #ifndef SUPPLIER_I_H
 #define SUPPLIER_I_H
 
@@ -30,85 +27,87 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Supplier
+ *
+ * @brief Market feed  daemon implementation.
+ *
+ * This class feeds stock information to the Callback Quoter
+ * notifier.
+ */
 class Supplier_Timer_Handler;
 class Supplier
 {
-  // = TITLE
-  //     Market feed  daemon implementation.
-  //
-  // = DESCRIPTION
-  //    This class feeds stock information to the Callback Quoter
-  //    notifier.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Supplier (void);
-  // Constructor.
 
+  /// Destructor.
   ~Supplier (void);
-  // Destructor.
 
+  /// Execute  the daemon.
   int run (void);
-  // Execute  the daemon.
 
+  /// Initialize the client communication endpoint with Notifier.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize the client communication endpoint with Notifier.
 
+  /// Sends the stock name and its value.
   int send_market_status (const char *stock_name,
                           long value);
-  // Sends the stock name and its value.
 
+  /// The timer handler used to send the market status to the notifier
+  /// periodically.
   Supplier_Timer_Handler *supplier_timer_handler_;
-  // The timer handler used to send the market status to the notifier
-  // periodically.
 
 private:
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
+  /// Function to read the Notifier IOR from a file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the Notifier IOR from a file.
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// This method initialises the naming service and registers the
+  /// object with the POA.
   int via_naming_service(void);
-  // This method initialises the naming service and registers the
-  // object with the POA.
 
+  /// returns the TAO instance of the singleton Reactor.
    ACE_Reactor *reactor_used (void) const;
-  // returns the TAO instance of the singleton Reactor.
 
+  /// This method used for getting stock information from a file.
   int read_file (ACE_TCHAR *filename);
-  // This method used for getting stock information from a file.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// IOR of the obj ref of the Notifier.
   ACE_TCHAR *ior_;
-  // IOR of the obj ref of the Notifier.
 
+  /// An instance of the name client used for resolving the factory
+  /// objects.
   TAO_Naming_Client naming_services_client_;
-  // An instance of the name client used for resolving the factory
-  // objects.
 
+  /// This variable denotes whether the naming service
+  /// is used or not.
   int use_naming_service_;
-  // This variable denotes whether the naming service
-  // is used or not.
 
+  /// Notifier object reference.
   Notifier_var notifier_;
-  // Notifier object reference.
 
+  /// The pointer for accessing the input stream.
   FILE  *f_ptr_;
-  // The pointer for accessing the input stream.
 
+  /// Iteration count.
   int loop_count_;
-  // Iteration count.
 
+  /// Time period between two succesive market feeds to the Notifier.
   long  period_value_;
-  // Time period between two succesive market feeds to the Notifier.
 };
 
 #endif /*SUPPLIER_I_H */
diff --git a/examples/Callback_Quoter/notifier.cpp b/examples/Callback_Quoter/notifier.cpp
index 0ad0f34bf7a..71f37e18d99 100644
--- a/examples/Callback_Quoter/notifier.cpp
+++ b/examples/Callback_Quoter/notifier.cpp
@@ -2,8 +2,6 @@
 
 #include "Notifier_Input_Handler.h"
 
-ACE_RCSID(notifier, Callback_Quoter, "$Id$")
-
 // This is the main driver program for the Callback Quoter Notifier.
 
 int
diff --git a/examples/Callback_Quoter/run_test.pl b/examples/Callback_Quoter/run_test.pl
index 0b6f3736642..e0d91599927 100755
--- a/examples/Callback_Quoter/run_test.pl
+++ b/examples/Callback_Quoter/run_test.pl
@@ -41,7 +41,7 @@ $starget->DeleteFile($nsiorbase);
 # Programs that are run
 
 $NS = $nstarget->CreateProcess (
-    "../../orbsvcs/Naming_Service/Naming_Service",
+    "../../orbsvcs/Naming_Service/tao_cosnaming",
     "-o $nstarget_nsiorfile");
 $N = $ntarget->CreateProcess (
     "notifier",
@@ -59,7 +59,7 @@ print STDERR "================ Remote test\n";
 $ns_status = $NS->Spawn ();
 
 if ($ns_status != 0) {
-    print STDERR "ERROR: Naming_Service returned $ns_status\n";
+    print STDERR "ERROR: tao_cosnaming returned $ns_status\n";
     exit 1;
 }
 
@@ -136,7 +136,7 @@ if ($n_status != 0) {
 $ns_status = $NS->TerminateWaitKill ($nstarget->ProcessStopWaitInterval());
 
 if ($ns_status != 0) {
-    print STDERR "ERROR: Naming_Service returned $ns_status\n";
+    print STDERR "ERROR: tao_cosnaming returned $ns_status\n";
     $status = 1;
 }
 
diff --git a/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index c411ba10cd2..d9d6b766b42 100644
--- a/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -7,7 +7,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "Content_Iterator_i.h"
 
-ACE_RCSID (AMI_Iterator, Content_Iterator_i, "$Id$")
+
 
 Content_Iterator_i::Content_Iterator_i (const char *pathname,
                                         CORBA::ULongLong file_size)
diff --git a/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h b/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
index c5f475d069b..cc1c1052be3 100644
--- a/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
+++ b/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//     AMI_Iterator
-//
-// = FILENAME
-//     Content_Iterator_i.h
-//
-// = DESCRIPTION
-//     Header file for the Web_Server::Content_Iterator implementation.
-//
-// = AUTHOR
-//     Ossama Othman <ossama@uci.edu>
-//
-// ============================================================================
+
+
+//=============================================================================
+/**
+ *  @file     Content_Iterator_i.h
+ *
+ *  $Id$
+ *
+ *   Header file for the Web_Server::Content_Iterator implementation.
+ *
+ *
+ *  @author  Ossama Othman <ossama@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef CONTENT_ITERATOR_I_H
 #define CONTENT_ITERATOR_I_H
@@ -45,39 +42,39 @@ class Content_Iterator_i :
   friend class Iterator_Factory_i;
 public:
 
+  /// Constructor
   Content_Iterator_i (const char *filename, CORBA::ULongLong file_size);
-  // Constructor
 
+  /// Destructor
   ~Content_Iterator_i (void);
-  // Destructor
 
+  /// This operation returns the next <chunk> of the file starting at
+  /// <offset>.  If there are no more bindings, false is returned.
   virtual CORBA::Boolean next_chunk (CORBA::ULongLong offset,
                                      Web_Server::Chunk_Type_out chunk);
-  // This operation returns the next <chunk> of the file starting at
-  // <offset>.  If there are no more bindings, false is returned.
 
+  /// Destroy the iterator.
   virtual void destroy (void);
-  // Destroy the iterator.
 
 private:
 
+  /// Initialize the Content_Iterator.
   int init (void);
-  // Initialize the Content_Iterator.
 
 private:
 
+  /// The Addr representing the requested file.
   ACE_FILE_Addr file_;
-  // The Addr representing the requested file.
 
+  /// Object that handles all IO operations on the requested file.
   ACE_FILE_IO file_io_;
-  // Object that handles all IO operations on the requested file.
 
+  /// The size of the file being iterated over.
   CORBA::ULongLong file_size_;
-  // The size of the file being iterated over.
 
+  /// The number of the current chunk of data being sent.  (Used only
+  /// for debugging purposes.)
   CORBA::ULongLong chunk_index_;
-  // The number of the current chunk of data being sent.  (Used only
-  // for debugging purposes.)
 };
 
 #endif  /* CONTENT_ITERATOR_I_H */
diff --git a/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp b/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
index 12bd4208dd6..ce3f466f560 100644
--- a/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
+++ b/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
@@ -9,12 +9,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (AMI_Iterator,
-           Iterator_Factory_i,
-           "$Id$")
-
-
 void
 Iterator_Factory_i::get_iterator (const char *pathname,
                                   Web_Server::Content_Iterator_out contents,
diff --git a/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h b/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
index dcf30076d82..01ecacc983d 100644
--- a/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
+++ b/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     AMI_Iterator
-//
-// = FILENAME
-//     Iterator_Factory_i.h
-//
-// = DESCRIPTION
-//     Header file for the Web_Server::Iterator_Factory implementation.
-//
-// = AUTHOR
-//     Ossama Othman <ossama@uci.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file     Iterator_Factory_i.h
+ *
+ *  $Id$
+ *
+ *   Header file for the Web_Server::Iterator_Factory implementation.
+ *
+ *
+ *  @author  Ossama Othman <ossama@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef ITERATOR_FACTORY_I_H
 #define ITERATOR_FACTORY_I_H
@@ -31,33 +28,37 @@
 // Forward declarations
 class Content_Iterator_i;
 
+/**
+ * @class Iterator_Factory_i
+ *
+ * @brief Factory that creates a Content_Iterator that retrieves fixed
+ * size chunks of data from Content server.
+ *
+ * This class creates a Content_Iterator that is set up to
+ * iteratively download a specific file.  This same factory can
+ * be used to create Content_Iterators for other files.
+ */
 class Iterator_Factory_i : virtual public POA_Web_Server::Iterator_Factory
 {
-  // = TITLE
-  //    Factory that creates a Content_Iterator that retrieves fixed
-  //    size chunks of data from Content server.
-  //
-  // = DESCRIPTION
-  //    This class creates a Content_Iterator that is set up to
-  //    iteratively download a specific file.  This same factory can
-  //    be used to create Content_Iterators for other files.
 public:
 
+  /**
+   * This factory method returns a <Content_Iterator> that can be used
+   * to read the <contents> associated with <pathname> one ``chunk''
+   * at a time.  The <metadata> reports information about the
+   * <contents>.
+   */
   virtual void get_iterator (const char *pathname,
                              Web_Server::Content_Iterator_out contents,
                              Web_Server::Metadata_Type_out metadata);
-  // This factory method returns a <Content_Iterator> that can be used
-  // to read the <contents> associated with <pathname> one ``chunk''
-  // at a time.  The <metadata> reports information about the
-  // <contents>.
 
+  /// Set the file modification date in the metadata structure.
   int modification_date (ACE_stat *file_status,
                          Web_Server::Metadata_Type_out metadata);
-  // Set the file modification date in the metadata structure.
 
+  /// Set the type of file content in the metadata structure.
   int content_type (const char *filename,
                     Web_Server::Metadata_Type_out metadata);
-  // Set the type of file content in the metadata structure.
 };
 
 #endif  /* ITERATOR_FACTORY_I_H */
diff --git a/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
index 32e79cf6724..e9280f93f83 100644
--- a/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
+++ b/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
@@ -10,12 +10,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (AMI_Iterator,
-           Iterator_Handler,
-           "$Id$")
-
-
 Iterator_Handler::Iterator_Handler (void)
   : file_ (ACE_sap_any_cast (const ACE_FILE_Addr &)),
     file_io_ (),
diff --git a/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
index bc63b1361f8..d2d9ae964eb 100644
--- a/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
+++ b/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     AMI_Iterator
-//
-// = FILENAME
-//     Iterator_Handler.h
-//
-// = DESCRIPTION
-//     Header file for the Web_Server::AMI_Content_IteratorHandler
-//     implementation.
-//
-// = AUTHOR
-//     Ossama Othman <ossama@uci.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file     Iterator_Handler.h
+ *
+ *  $Id$
+ *
+ *   Header file for the Web_Server::AMI_Content_IteratorHandler
+ *   implementation.
+ *
+ *
+ *  @author  Ossama Othman <ossama@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef ITERATOR_HANDLER_H
 #define ITERATOR_HANDLER_H
@@ -43,14 +40,14 @@ class Iterator_Handler
   //    received in the proper order, and also takes advantage of
   //    asyncronous method invocations.
 
+  /// Dummy friend class declaration to quiet down a warning.
   friend class Iterator_Handler_Friend;
-  // Dummy friend class declaration to quiet down a warning.
 
 public:
 
+  /// Constructor that creates a content iterator corresponding to the
+  /// name of the file being retrieved from the web server.
   Iterator_Handler (void);
-  // Constructor that creates a content iterator corresponding to the
-  // name of the file being retrieved from the web server.
 
   virtual void next_chunk (CORBA::Boolean pending_data,
                    const Web_Server::Chunk_Type & chunk);
@@ -65,61 +62,65 @@ public:
       ::Messaging::ExceptionHolder *)
     {}
 
+  /**
+   * Activate and run this Reply Handler.  The contents (not the
+   * pointer itself) of the <request_count> parameter will be
+   * incremented when file retrieval begins, and decremented when file
+   * retrieval completes.
+   */
   void run (int *request_count,
             const char *pathname,
             Web_Server::Iterator_Factory_ptr factory);
-  // Activate and run this Reply Handler.  The contents (not the
-  // pointer itself) of the <request_count> parameter will be
-  // incremented when file retrieval begins, and decremented when file
-  // retrieval completes.
 
 private:
+  /// Destructor (private to ensure that Iterator_Handler is allocated
+  /// on the heap).
   ~Iterator_Handler (void);
-  // Destructor (private to ensure that Iterator_Handler is allocated
-  // on the heap).
 
+  /// Initialize the Content Iterator used to retrieve the file.
   void initialize_content_iterator (const char *pathname,
                                     Web_Server::Iterator_Factory_ptr factory);
-  // Initialize the Content Iterator used to retrieve the file.
 
+  /// Deactivate this reply handler.
   void deactivate (void);
-  // Deactivate this reply handler.
 
+  /// Get the name of the viewer associated with the file being
+  /// retrieved.
   int get_viewer (char *viewer, size_t length);
-  // Get the name of the viewer associated with the file being
-  // retrieved.
 
+  /// Spawn an external view to display the retrieved file.
   int spawn_viewer (void);
-  // Spawn an external view to display the retrieved file.
 
 private:
 
+  /// The Addr corresponding to the retrieved file.
   ACE_FILE_Addr file_;
-  // The Addr corresponding to the retrieved file.
 
+  /// The object that provides all file related IO operations
+  /// (e.g. read, write, etc).
   ACE_FILE_IO file_io_;
-  // The object that provides all file related IO operations
-  // (e.g. read, write, etc).
 
+  /// The iterator used to obtain individual chunks of data from the
+  /// web server.
   Web_Server::Content_Iterator_var contents_;
-  // The iterator used to obtain individual chunks of data from the
-  // web server.
 
+  /// The metadata associated with the file being retrieved from the
+  /// web server.
   Web_Server::Metadata_Type_var metadata_;
-  // The metadata associated with the file being retrieved from the
-  // web server.
 
+  /// The offset from the beginning of the file, the next chunk of data
+  /// should be read from.
   CORBA::ULong offset_;
-  // The offset from the beginning of the file, the next chunk of data
-  // should be read from.
 
+  /// Reference to this Reply Handler's self.
   Web_Server::AMI_Content_IteratorHandler_var ami_handler_;
-  // Reference to this Reply Handler's self.
 
+  /**
+   * Pointer to external status monitoring variable. The contents (not
+   * the pointer itself) of the<pending_data> parameter will be
+   * decremented when file retrieval has completed.
+   */
   int *request_count_;
-  // Pointer to external status monitoring variable. The contents (not
-  // the pointer itself) of the<pending_data> parameter will be
-  // decremented when file retrieval has completed.
 };
 
 #endif  /* ITERATOR_HAHNDLER_H */
diff --git a/examples/Content_Server/AMI_Iterator/Makefile.am b/examples/Content_Server/AMI_Iterator/Makefile.am
deleted file mode 100644
index 21e23f6b43d..00000000000
--- a/examples/Content_Server/AMI_Iterator/Makefile.am
+++ /dev/null
@@ -1,145 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AMI_Iterator_IDL.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.cpp \
-  Web_ServerS.h \
-  Web_ServerS.inl
-
-CLEANFILES = \
-  Web_Server-stamp \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.cpp \
-  Web_ServerS.h \
-  Web_ServerS.inl
-
-Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl: Web_Server-stamp
-
-Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Web_Server.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Web_Server.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Iterator_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Iterator_Handler.cpp \
-  Web_ServerC.cpp \
-  Web_ServerS.cpp \
-  client.cpp \
-  Iterator_Handler.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Iterator_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Content_Iterator_i.cpp \
-  Iterator_Factory_i.cpp \
-  Web_ServerC.cpp \
-  Web_ServerS.cpp \
-  server.cpp \
-  Content_Iterator_i.h \
-  Iterator_Factory_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/examples/Content_Server/AMI_Iterator/client.cpp b/examples/Content_Server/AMI_Iterator/client.cpp
index 9c9d3183828..87a83637077 100644
--- a/examples/Content_Server/AMI_Iterator/client.cpp
+++ b/examples/Content_Server/AMI_Iterator/client.cpp
@@ -9,10 +9,6 @@
 #include "Web_ServerC.h"
 #include "Iterator_Handler.h"
 
-ACE_RCSID (AMI_Iterator,
-           client,
-           "$Id$")
-
 // Obtain reference to Iterator_Factory
 Web_Server::Iterator_Factory_ptr
 get_iterator (CORBA::ORB_ptr orb);
diff --git a/examples/Content_Server/AMI_Iterator/server.cpp b/examples/Content_Server/AMI_Iterator/server.cpp
index 0dc4dae6f81..3f8ad1f65a4 100644
--- a/examples/Content_Server/AMI_Iterator/server.cpp
+++ b/examples/Content_Server/AMI_Iterator/server.cpp
@@ -8,10 +8,6 @@
 
 #include "Iterator_Factory_i.h"
 
-ACE_RCSID (AMI_Iterator,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
index dbf9f55dddd..be9f9f1f6e4 100644
--- a/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
+++ b/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
@@ -7,8 +7,6 @@
 #include "ace/Log_Msg.h"
 #include "Callback_Handler.h"
 
-ACE_RCSID (AMI_Observer, Callback_Handler, "$Id$")
-
 Callback_Handler::Callback_Handler (const char *pathname,
                                     Web_Server::Callback_ptr client_callback)
   : file_ (ACE_TEXT_CHAR_TO_TCHAR(pathname)),
diff --git a/examples/Content_Server/AMI_Observer/Callback_Handler.h b/examples/Content_Server/AMI_Observer/Callback_Handler.h
index 90f05d3e1e6..27621ec6d3d 100644
--- a/examples/Content_Server/AMI_Observer/Callback_Handler.h
+++ b/examples/Content_Server/AMI_Observer/Callback_Handler.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     AMI_Observer
-//
-// = FILENAME
-//     Callback_Handler.h
-//
-// = DESCRIPTION
-//     Header file for the Web_Server::AMI_CallbackHandler
-//     implementation.
-//
-// = AUTHOR
-//     Ossama Othman <ossama@uci.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file     Callback_Handler.h
+ *
+ *  $Id$
+ *
+ *   Header file for the Web_Server::AMI_CallbackHandler
+ *   implementation.
+ *
+ *
+ *  @author  Ossama Othman <ossama@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef CALLBACK_HANDLER_H
 #define CALLBACK_HANDLER_H
@@ -68,63 +65,65 @@ class Callback_Handler
   //    application level, yet concurrency is achieved due to the fact
   //    that all operations are performed asynchronously.
 
+  /// Dummy friend class declaration to quiet down a warning.
   friend class Callback_Handler_Friend;
-  // Dummy friend class declaration to quiet down a warning.
 
 public:
+  /// Constructor that creates a content iterator corresponding to the
+  /// name of the file being retrieved from the web server.
   Callback_Handler (const char *pathname,
                     Web_Server::Callback_ptr callback);
-  // Constructor that creates a content iterator corresponding to the
-  // name of the file being retrieved from the web server.
 
+  /// The callback for this reply handler.
   virtual void next_chunk (void);
-  // The callback for this reply handler.
 
   virtual void next_chunk_excep (::Messaging::ExceptionHolder *);
 
+  /**
+   * Activate and run this Reply Handler.  The contents (not the
+   * pointer itself) of the <request_count> parameter will be
+   * incremented when file retrieval begins, and decremented when file
+   * retrieval completes.
+   */
   void run (void);
-  // Activate and run this Reply Handler.  The contents (not the
-  // pointer itself) of the <request_count> parameter will be
-  // incremented when file retrieval begins, and decremented when file
-  // retrieval completes.
 
 private:
+  /// Destructor (private to ensure that Callback_Handler is allocated
+  /// on the heap).
   ~Callback_Handler (void);
-  // Destructor (private to ensure that Callback_Handler is allocated
-  // on the heap).
 
+  /// Open the file to be uploaded to the client callback.
   void open_file (void);
-  // Open the file to be uploaded to the client callback.
 
+  /// Deactivate this reply handler.
   void deactivate (void);
-  // Deactivate this reply handler.
 
 private:
 
+  /// The Addr corresponding to the retrieved file.
   ACE_FILE_Addr file_;
-  // The Addr corresponding to the retrieved file.
 
+  /// The object that provides all file related IO operations
+  /// (e.g. read, write, etc).
   ACE_FILE_IO file_io_;
-  // The object that provides all file related IO operations
-  // (e.g. read, write, etc).
 
+  /// The iterator used to obtain individual chunks of data from the
+  /// web server.
   Web_Server::Callback_var callback_;
-  // The iterator used to obtain individual chunks of data from the
-  // web server.
 
+  /// Reference to this Reply Handler's self.
   Web_Server::AMI_CallbackHandler_var ami_handler_;
-  // Reference to this Reply Handler's self.
 
+  /// The chunk of data that is sent to the client callback during each
+  /// callback invocation.
   Web_Server::Chunk_Type_var chunk_;
-  // The chunk of data that is sent to the client callback during each
-  // callback invocation.
 
+  /// The number of the current chunk of data being sent.  (Used only
+  /// for debugging purposes.)
   CORBA::ULong chunk_index_;
-  // The number of the current chunk of data being sent.  (Used only
-  // for debugging purposes.)
 
+  /// Flag that indicates all chunks of data have been sent.
   int last_chunk_;
-  // Flag that indicates all chunks of data have been sent.
 };
 
 #endif  /* CALLBACK_HANDLER_H */
diff --git a/examples/Content_Server/AMI_Observer/Callback_i.cpp b/examples/Content_Server/AMI_Observer/Callback_i.cpp
index 778bc7d16a6..9dcf50f26c6 100644
--- a/examples/Content_Server/AMI_Observer/Callback_i.cpp
+++ b/examples/Content_Server/AMI_Observer/Callback_i.cpp
@@ -10,12 +10,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (AMI_Observer,
-           Callback_i,
-           "$Id$")
-
-
 Callback_i::Callback_i (int *request_count)
   : file_ (ACE_sap_any_cast (ACE_FILE_Addr &)),
     file_io_ (),
diff --git a/examples/Content_Server/AMI_Observer/Callback_i.h b/examples/Content_Server/AMI_Observer/Callback_i.h
index 5105bd46689..07de50edf11 100644
--- a/examples/Content_Server/AMI_Observer/Callback_i.h
+++ b/examples/Content_Server/AMI_Observer/Callback_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     AMI_Observer
-//
-// = FILENAME
-//     Callback_i.h
-//
-// = DESCRIPTION
-//     Header file for the Web_Server::Callback implementation.
-//
-// = AUTHOR
-//     Ossama Othman <ossama@uci.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file     Callback_i.h
+ *
+ *  $Id$
+ *
+ *   Header file for the Web_Server::Callback implementation.
+ *
+ *
+ *  @author  Ossama Othman <ossama@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef CALLBACK_I_H
 #define CALLBACK_I_H
@@ -53,73 +50,75 @@ class Callback_i :
   //    concurrently running threads attempt to update the state
   //    contained within a given <Callback> object.
 
+  /// Dummy friend class declaration to quiet down a warning.
   friend class Callback_i_Friend;
-  // Dummy friend class declaration to quiet down a warning.
 
 public:
+  /// Constructor
   Callback_i (int *request_count);
-  // Constructor
 
+  /// This operation returns the next <chunk> of the file starting at
+  /// <offset>.  If there are no more bindings, false is returned.
   virtual void next_chunk (const Web_Server::Chunk_Type &chunk,
                            CORBA::Boolean last_chunk);
-  // This operation returns the next <chunk> of the file starting at
-  // <offset>.  If there are no more bindings, false is returned.
 
+  /// Set metadata associated with received data.
   void metadata (const Web_Server::Metadata_Type &metadata);
-  // Set metadata associated with received data.
 
 private:
 
+  /// Destructor must be private to ensure that this object is
+  /// allocated on the heap.
   ~Callback_i (void);
-  // Destructor must be private to ensure that this object is
-  // allocated on the heap.
 
+  /// Returns one if the metadata was received, and zero otherwise.
   int metadata_received (void);
-  // Returns one if the metadata was received, and zero otherwise.
 
+  /// Returns one if the entire content was received, and zero
+  /// otherwise.
   int content_received (void);
-  // Returns one if the entire content was received, and zero
-  // otherwise.
 
+  /// Get the name of the viewer associated with the file being
+  /// retrieved.
   int get_viewer (char *viewer, size_t length);
-  // Get the name of the viewer associated with the file being
-  // retrieved.
 
+  /// Spawn an external view to display the retrieved file.
   int spawn_viewer (void);
-  // Spawn an external view to display the retrieved file.
 
 private:
 
+  /// Deactivate this Callback servant.
   void deactivate (void);
-  // Deactivate this Callback servant.
 
 private:
 
+  /// The Addr corresponding to the retrieved file.
   ACE_FILE_Addr file_;
-  // The Addr corresponding to the retrieved file.
 
+  /// The object that provides all file related IO operations
+  /// (e.g. read, write, etc).
   ACE_FILE_IO file_io_;
-  // The object that provides all file related IO operations
-  // (e.g. read, write, etc).
 
+  /// Reference to this Reply Handler's self.
   Web_Server::AMI_CallbackHandler_var ami_handler_;
-  // Reference to this Reply Handler's self.
 
+  /// The metadata associated with the file being retrieved from the
+  /// web server.
   Web_Server::Metadata_Type metadata_;
-  // The metadata associated with the file being retrieved from the
-  // web server.
 
+  /// Flag that indicates entire data content has been received.
   int last_chunk_;
-  // Flag that indicates entire data content has been received.
 
+  /// Lock used to prevent race conditions when checking to see if
+  /// metadata or entire content has been received.
   TAO_SYNCH_MUTEX lock_;
-  // Lock used to prevent race conditions when checking to see if
-  // metadata or entire content has been received.
 
+  /**
+   * Pointer to external status monitoring variable. The contents (not
+   * the pointer itself) of the <pending_data> parameter will be
+   * decremented when file retrieval has completed.
+   */
   int *request_count_;
-  // Pointer to external status monitoring variable. The contents (not
-  // the pointer itself) of the <pending_data> parameter will be
-  // decremented when file retrieval has completed.
 };
 
 #endif  /* CALLBACK_I_H */
diff --git a/examples/Content_Server/AMI_Observer/Makefile.am b/examples/Content_Server/AMI_Observer/Makefile.am
deleted file mode 100644
index e4a2e4d0c48..00000000000
--- a/examples/Content_Server/AMI_Observer/Makefile.am
+++ /dev/null
@@ -1,147 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AMI_Observer_IDL.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  Push_Web_ServerC.cpp \
-  Push_Web_ServerC.h \
-  Push_Web_ServerC.inl \
-  Push_Web_ServerS.cpp \
-  Push_Web_ServerS.h \
-  Push_Web_ServerS.inl
-
-CLEANFILES = \
-  Push_Web_Server-stamp \
-  Push_Web_ServerC.cpp \
-  Push_Web_ServerC.h \
-  Push_Web_ServerC.inl \
-  Push_Web_ServerS.cpp \
-  Push_Web_ServerS.h \
-  Push_Web_ServerS.inl
-
-Push_Web_ServerC.cpp Push_Web_ServerC.h Push_Web_ServerC.inl Push_Web_ServerS.cpp Push_Web_ServerS.h Push_Web_ServerS.inl: Push_Web_Server-stamp
-
-Push_Web_Server-stamp: $(srcdir)/Push_Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Push_Web_Server.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Push_Web_Server.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Observer_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Callback_i.cpp \
-  Push_Iterator_Handler.cpp \
-  Push_Web_ServerC.cpp \
-  Push_Web_ServerS.cpp \
-  client.cpp \
-  Callback_i.h \
-  Push_Iterator_Handler.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Observer_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Callback_Handler.cpp \
-  Push_Iterator_Factory_i.cpp \
-  Push_Web_ServerC.cpp \
-  Push_Web_ServerS.cpp \
-  server.cpp \
-  Callback_Handler.h \
-  Push_Iterator_Factory_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp b/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
index 4ade42df50b..5fddbc0a6a5 100644
--- a/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
+++ b/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
@@ -9,12 +9,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (AMI_Observer,
-           Push_Iterator_Factory_i,
-           "$Id$")
-
-
 Web_Server::Metadata_Type *
 Push_Iterator_Factory_i::register_callback
   (const char *pathname,
diff --git a/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h b/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
index 1ccd1880e53..8bf570c08b7 100644
--- a/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
+++ b/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
-// $Id$
 
 
-// ============================================================================
-//
-// = LIBRARY
-//     AMI_Observer
-//
-// = FILENAME
-//     Push_Iterator_Factory_i.h
-//
-// = DESCRIPTION
-//     Header file for the push Web_Server::Iterator_Factory implementation.
-//
-// = AUTHOR
-//     Ossama Othman <ossama@uci.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file     Push_Iterator_Factory_i.h
+ *
+ *  $Id$
+ *
+ *   Header file for the push Web_Server::Iterator_Factory implementation.
+ *
+ *
+ *  @author  Ossama Othman <ossama@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef PUSH_ITERATOR_FACTORY_I_H
 #define PUSH_ITERATOR_FACTORY_I_H
@@ -51,25 +48,27 @@ class Push_Iterator_Factory_i :
   //    to explicitly use threads at the application level.
 
 public:
+  /**
+   * This registration method passes a <Callback> that the Web server
+   * uses to ``push'' data associated with <pathname> one ``chunk'' at
+   * a time.  The <metadata> reports information about the <pathname>.
+   */
   Web_Server::Metadata_Type *register_callback
     (const char *pathname,
      Web_Server::Callback_ptr client_callback);
-  // This registration method passes a <Callback> that the Web server
-  // uses to ``push'' data associated with <pathname> one ``chunk'' at
-  // a time.  The <metadata> reports information about the <pathname>.
 
+  /// Set the file modification date in the metadata structure.
   int modification_date (ACE_stat *file_status,
                          Web_Server::Metadata_Type &metadata);
-  // Set the file modification date in the metadata structure.
 
+  /// Set the type of file content in the metadata structure.
   int content_type (const char *filename,
                     Web_Server::Metadata_Type &metadata);
-  // Set the type of file content in the metadata structure.
 
 private:
+  /// Reference to the object that is used by the server to push chunks
+  /// of data to the client.
   Web_Server::Callback_var client_callback_;
-  // Reference to the object that is used by the server to push chunks
-  // of data to the client.
 };
 
 #include /**/ "ace/post.h"
diff --git a/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
index 85033aa0412..85674d453df 100644
--- a/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
+++ b/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
@@ -8,8 +8,6 @@
 #include "Push_Iterator_Handler.h"
 #include "Callback_i.h"
 
-ACE_RCSID (AMI_Observer, Push_Iterator_Handler, "$Id$")
-
 Push_Iterator_Handler::Push_Iterator_Handler (void)
   : callback_servant_ (0),
     callback_ (),
diff --git a/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h b/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
index 5e973a68824..3d4bbe18053 100644
--- a/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
+++ b/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     AMI_Observer
-//
-// = FILENAME
-//     Push_Iterator_Handler.h
-//
-// = DESCRIPTION
-//     Header file for the AMI_Iterator_FactoryHandler implementation.
-//
-// = AUTHOR
-//     Ossama Othman <ossama@uci.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file     Push_Iterator_Handler.h
+ *
+ *  $Id$
+ *
+ *   Header file for the AMI_Iterator_FactoryHandler implementation.
+ *
+ *
+ *  @author  Ossama Othman <ossama@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef PUSH_ITERATOR_HANDLER_H
 #define PUSH_ITERATOR_HANDLER_H
@@ -52,49 +49,51 @@ class Push_Iterator_Handler
   //    use for this <Push_Iterator_Handler> object, and it is
   //    deactivated.
 
+  /// Dummy friend class declaration to quiet down a warning.
   friend class Push_Iterator_Handler_Friend;
-  // Dummy friend class declaration to quiet down a warning.
 
 public:
+  /// Constructor that creates a content iterator corresponding to the
+  /// name of the file being retrieved from the web server.
   Push_Iterator_Handler (void);
-  // Constructor that creates a content iterator corresponding to the
-  // name of the file being retrieved from the web server.
 
+  /**
+   * Activate and run this Reply Handler.  The contents (not the
+   * pointer itself) of the <request_count> parameter will be
+   * incremented when file retrieval begins, and decremented when file
+   * retrieval completes.
+   */
   void run (int *request_count,
             const char *pathname,
             Web_Server::Iterator_Factory_ptr factory);
-  // Activate and run this Reply Handler.  The contents (not the
-  // pointer itself) of the <request_count> parameter will be
-  // incremented when file retrieval begins, and decremented when file
-  // retrieval completes.
 
 private:
 
+  /// Destructor  (private to ensure that Iterator_Handler is allocated
+  /// on the heap).
   ~Push_Iterator_Handler (void);
-  // Destructor  (private to ensure that Iterator_Handler is allocated
-  // on the heap).
 
+  /// AMI callback that is invoked when a response from the
+  /// corresponding server method is received.
   virtual void register_callback
   (const Web_Server::Metadata_Type &metadata);
-  // AMI callback that is invoked when a response from the
-  // corresponding server method is received.
 
   virtual void register_callback_excep
   (::Messaging::ExceptionHolder *)
     {}
 
+  /// Deactivate this handler.
   void deactivate (void);
-  // Deactivate this handler.
 
 private:
+  /// The servant that accepts data pushed from the content server.
   Callback_i *callback_servant_;
-  // The servant that accepts data pushed from the content server.
 
+  /// Reference to the callback object the server sends data to.
   Web_Server::Callback_var callback_;
-  // Reference to the callback object the server sends data to.
 
+  /// Reference to this Reply Handler's self.
   Web_Server::AMI_Iterator_FactoryHandler_var ami_handler_;
-  // Reference to this Reply Handler's self.
 };
 
 #endif  /* PUSH_ITERATOR_HANDLER_H */
diff --git a/examples/Content_Server/AMI_Observer/Push_Web_Server.idl b/examples/Content_Server/AMI_Observer/Push_Web_Server.idl
index 06d821c9b27..96e0b8be4e4 100644
--- a/examples/Content_Server/AMI_Observer/Push_Web_Server.idl
+++ b/examples/Content_Server/AMI_Observer/Push_Web_Server.idl
@@ -15,7 +15,7 @@ module Web_Server
                        in boolean last_chunk);
     };
 
-  exception Error_Result 
+  exception Error_Result
     {
       // Status of the <register_callback> operation.  These
       // values should map onto the normal HTTP
diff --git a/examples/Content_Server/AMI_Observer/client.cpp b/examples/Content_Server/AMI_Observer/client.cpp
index d5f35ddcf0a..08cf6ab48e1 100644
--- a/examples/Content_Server/AMI_Observer/client.cpp
+++ b/examples/Content_Server/AMI_Observer/client.cpp
@@ -9,10 +9,6 @@
 #include "Push_Web_ServerC.h"
 #include "Push_Iterator_Handler.h"
 
-ACE_RCSID (AMI_Observer,
-           client,
-           "$Id$")
-
 // Obtain reference to Iterator_Factory
 Web_Server::Iterator_Factory_ptr
 get_iterator (CORBA::ORB_ptr orb);
diff --git a/examples/Content_Server/AMI_Observer/server.cpp b/examples/Content_Server/AMI_Observer/server.cpp
index 7bf6a562b4f..260b304f23e 100644
--- a/examples/Content_Server/AMI_Observer/server.cpp
+++ b/examples/Content_Server/AMI_Observer/server.cpp
@@ -7,10 +7,6 @@
 #include "Push_Web_ServerS.h"
 #include "Push_Iterator_Factory_i.h"
 
-ACE_RCSID (AMI_Observer,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/examples/Content_Server/Makefile.am b/examples/Content_Server/Makefile.am
deleted file mode 100644
index 1e9e7090841..00000000000
--- a/examples/Content_Server/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AMI_Iterator \
-        AMI_Observer \
-        SMI_Iterator
-
diff --git a/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index 7e90eac9815..6c65b16a9fa 100644
--- a/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -7,9 +7,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "Content_Iterator_i.h"
 
-ACE_RCSID(SMI_Iterator, Content_Iterator_i, "$Id$")
-
-
 Content_Iterator_i::Content_Iterator_i (const char *pathname,
                                         CORBA::ULongLong file_size)
   : file_ (ACE_TEXT_CHAR_TO_TCHAR(pathname)),
diff --git a/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h b/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
index 0f8579ff5bd..cc1c1052be3 100644
--- a/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
+++ b/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//     SMI_ITERATOR
-//
-// = FILENAME
-//     Content_Iterator_i.h
-//
-// = DESCRIPTION
-//     Header file for the Web_Server::Content_Iterator implementation.
-//
-// = AUTHOR
-//     Ossama Othman <ossama@uci.edu>
-//
-// ============================================================================
+
+
+//=============================================================================
+/**
+ *  @file     Content_Iterator_i.h
+ *
+ *  $Id$
+ *
+ *   Header file for the Web_Server::Content_Iterator implementation.
+ *
+ *
+ *  @author  Ossama Othman <ossama@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef CONTENT_ITERATOR_I_H
 #define CONTENT_ITERATOR_I_H
@@ -45,39 +42,39 @@ class Content_Iterator_i :
   friend class Iterator_Factory_i;
 public:
 
+  /// Constructor
   Content_Iterator_i (const char *filename, CORBA::ULongLong file_size);
-  // Constructor
 
+  /// Destructor
   ~Content_Iterator_i (void);
-  // Destructor
 
+  /// This operation returns the next <chunk> of the file starting at
+  /// <offset>.  If there are no more bindings, false is returned.
   virtual CORBA::Boolean next_chunk (CORBA::ULongLong offset,
                                      Web_Server::Chunk_Type_out chunk);
-  // This operation returns the next <chunk> of the file starting at
-  // <offset>.  If there are no more bindings, false is returned.
 
+  /// Destroy the iterator.
   virtual void destroy (void);
-  // Destroy the iterator.
 
 private:
 
+  /// Initialize the Content_Iterator.
   int init (void);
-  // Initialize the Content_Iterator.
 
 private:
 
+  /// The Addr representing the requested file.
   ACE_FILE_Addr file_;
-  // The Addr representing the requested file.
 
+  /// Object that handles all IO operations on the requested file.
   ACE_FILE_IO file_io_;
-  // Object that handles all IO operations on the requested file.
 
+  /// The size of the file being iterated over.
   CORBA::ULongLong file_size_;
-  // The size of the file being iterated over.
 
+  /// The number of the current chunk of data being sent.  (Used only
+  /// for debugging purposes.)
   CORBA::ULongLong chunk_index_;
-  // The number of the current chunk of data being sent.  (Used only
-  // for debugging purposes.)
 };
 
 #endif  /* CONTENT_ITERATOR_I_H */
diff --git a/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp b/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
index 955a83df379..e7acb5611c0 100644
--- a/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
+++ b/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
@@ -9,8 +9,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (SMI_Iterator, Iterator_Factory_i, "$Id$")
-
 void
 Iterator_Factory_i::get_iterator (const char *pathname,
                                   Web_Server::Content_Iterator_out contents,
diff --git a/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h b/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
index 7b7bfb5164f..8e466a5bf4e 100644
--- a/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
+++ b/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//     SMI_ITERATOR
-//
-// = FILENAME
-//     Iterator_Factory_i.h
-//
-// = DESCRIPTION
-//     Header file for the Web_Server::Iterator_Factory implementation.
-//
-// = AUTHOR
-//     Ossama Othman <ossama@uci.edu>
-//
-// ============================================================================
+
+
+//=============================================================================
+/**
+ *  @file     Iterator_Factory_i.h
+ *
+ *  $Id$
+ *
+ *   Header file for the Web_Server::Iterator_Factory implementation.
+ *
+ *
+ *  @author  Ossama Othman <ossama@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef ITERATOR_FACTORY_I_H
 #define ITERATOR_FACTORY_I_H
@@ -32,34 +29,38 @@
 // Forward declarations
 class Content_Iterator_i;
 
+/**
+ * @class Iterator_Factory_i
+ *
+ * @brief Factory that creates a Content_Iterator that retrieves fixed
+ * size chunks of data from Content server.
+ *
+ * This class creates a Content_Iterator that is set up to
+ * iteratively download a specific file.  This same factory can
+ * be used to create Content_Iterators for other files.
+ */
 class Iterator_Factory_i : virtual public POA_Web_Server::Iterator_Factory
 {
-  // = TITLE
-  //    Factory that creates a Content_Iterator that retrieves fixed
-  //    size chunks of data from Content server.
-  //
-  // = DESCRIPTION
-  //    This class creates a Content_Iterator that is set up to
-  //    iteratively download a specific file.  This same factory can
-  //    be used to create Content_Iterators for other files.
 
 public:
 
+  /**
+   * This factory method returns a <Content_Iterator> that can be used
+   * to read the <contents> associated with <pathname> one ``chunk''
+   * at a time.  The <metadata> reports information about the
+   * <contents>.
+   */
   virtual void get_iterator (const char *pathname,
                              Web_Server::Content_Iterator_out contents,
                              Web_Server::Metadata_Type_out metadata);
-  // This factory method returns a <Content_Iterator> that can be used
-  // to read the <contents> associated with <pathname> one ``chunk''
-  // at a time.  The <metadata> reports information about the
-  // <contents>.
 
+  /// Set the file modification date in the metadata structure.
   int modification_date (ACE_stat *file_status,
                          Web_Server::Metadata_Type_out metadata);
-  // Set the file modification date in the metadata structure.
 
+  /// Set the type of file content in the metadata structure.
   int content_type (const char *filename,
                     Web_Server::Metadata_Type_out metadata);
-  // Set the type of file content in the metadata structure.
 
 };
 
diff --git a/examples/Content_Server/SMI_Iterator/Makefile.am b/examples/Content_Server/SMI_Iterator/Makefile.am
deleted file mode 100644
index 9f5b38aa5ba..00000000000
--- a/examples/Content_Server/SMI_Iterator/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.SMI_Iterator_IDL.am
-
-BUILT_SOURCES = \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.cpp \
-  Web_ServerS.h \
-  Web_ServerS.inl
-
-CLEANFILES = \
-  Web_Server-stamp \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.cpp \
-  Web_ServerS.h \
-  Web_ServerS.inl
-
-Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl: Web_Server-stamp
-
-Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Web_Server.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Web_Server.idl
-
-## Makefile.SMI_Iterator_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Web_ServerC.cpp \
-  client.cpp \
-  Content_Iterator_i.h \
-  Iterator_Factory_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.SMI_Iterator_Server.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Content_Iterator_i.cpp \
-  Iterator_Factory_i.cpp \
-  Web_ServerC.cpp \
-  Web_ServerS.cpp \
-  server.cpp \
-  Content_Iterator_i.h \
-  Iterator_Factory_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/examples/Content_Server/SMI_Iterator/client.cpp b/examples/Content_Server/SMI_Iterator/client.cpp
index 7d2ce5f2f18..d89d9cd7370 100644
--- a/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/examples/Content_Server/SMI_Iterator/client.cpp
@@ -10,17 +10,10 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (SMI_Iterator,
-           client,
-           "$Id$")
-
-
 // Retrieve the data from the server
 int retrieve_data (const char *content_type,
                    Web_Server::Content_Iterator_ptr contents);
 
-
 // Map content type to viewer.
 int external_viewer (const char *content_type,
                      char *viewer,
@@ -41,9 +34,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                           -1);
 
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "Mighty ORB");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB");
 
       // Get a reference to the Name Service.
       CORBA::Object_var obj =
diff --git a/examples/Content_Server/SMI_Iterator/server.cpp b/examples/Content_Server/SMI_Iterator/server.cpp
index 1d4ac8fa72f..da1af33a3e1 100644
--- a/examples/Content_Server/SMI_Iterator/server.cpp
+++ b/examples/Content_Server/SMI_Iterator/server.cpp
@@ -8,10 +8,6 @@
 
 #include "Iterator_Factory_i.h"
 
-ACE_RCSID (SMI_Iterator,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/examples/Event_Comm/Consumer_Handler.cpp b/examples/Event_Comm/Consumer_Handler.cpp
index 7e70334ebc4..3041d1afbb5 100644
--- a/examples/Event_Comm/Consumer_Handler.cpp
+++ b/examples/Event_Comm/Consumer_Handler.cpp
@@ -3,8 +3,6 @@
 #include "Consumer_Handler.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Consumer, Consumer_Handler, "$Id$")
-
 Consumer_Handler::Consumer_Handler (void)
   : receiver_ (0),
     notifier_ (0),
diff --git a/examples/Event_Comm/Consumer_Handler.h b/examples/Event_Comm/Consumer_Handler.h
index 765e73ab4b8..4cc83ad5f6c 100644
--- a/examples/Event_Comm/Consumer_Handler.h
+++ b/examples/Event_Comm/Consumer_Handler.h
@@ -1,23 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    EventComm
-//
-// = FILENAME
-//    Consumer_Handler.h
-//
-// = DESCRIPTION
-//    Subclass of Corba_Handler that sets up the Consumer handler
-//    for use with the ACE ACE_Reactor.
-//
-// = AUTHOR
-//    Douglas C. Schmidt (schmidt@cs.wustl.edu) and Pradeep Gore
-//    (pradeep@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Consumer_Handler.h
+ *
+ *  $Id$
+ *
+ *  Subclass of Corba_Handler that sets up the Consumer handler
+ *  for use with the ACE ACE_Reactor.
+ *
+ *
+ *  @author Douglas C. Schmidt (schmidt@cs.wustl.edu) and Pradeep Gore (pradeep@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef _CONSUMER_HANDLER_H
 #define _CONSUMER_HANDLER_H
@@ -26,66 +22,68 @@
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/CosNamingC.h"
 
+/**
+ * @class Consumer_Handler
+ *
+ * @brief The Consumer_Handler class.
+ *
+ * Starts up the ORB, registers the <Event_Comm::Consumer>
+ * servant with the orb and gets a reference to a <Notifier>
+ * from the Naming Service.
+ */
 class Consumer_Handler
 {
-  // = TITLE
-  //    The Consumer_Handler class.
-  //
-  // = DESCRIPTION
-  //     Starts up the ORB, registers the <Event_Comm::Consumer>
-  //     servant with the orb and gets a reference to a <Notifier>
-  //     from the Naming Service.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Consumer_Handler (void);
-  // Constructor.
 
+  /// Destructor.
  virtual ~Consumer_Handler (void);
-  // Destructor.
 
+  /// Initializes the ORB, gets the Notifier reference from the Naming
+  /// Service, and starts the servant for the Consumer object.
   int init (int argc, ACE_TCHAR *argv[], ShutdownCallback *_shutdowncallback);
-  // Initializes the ORB, gets the Notifier reference from the Naming
-  // Service, and starts the servant for the Consumer object.
 
+  /// runs the ORB.
   int run (void);
-  // runs the ORB.
 
+  /// shutdown the orb.
   void close (void);
-  // shutdown the orb.
 
+  /// called to shutdown the consumer application.
   void shutdown (void);
-  // called to shutdown the consumer application.
 
   // = Accessors
   Event_Comm::Consumer *receiver (void);
   Event_Comm::Notifier *notifier (void);
 
+  /// returns the ORB's reactor.
   ACE_Reactor *reactor (void);
-  // returns the ORB's reactor.
 
 private:
+  /// gets the notifier reference from the naming service.
+  /// returns 0 on success, -1 on error.
   int get_notifier (void);
-  // gets the notifier reference from the naming service.
-  // returns 0 on success, -1 on error.
 
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
+  /// The <Consumer> implementation.
   Consumer_i receiver_i_;
-  // The <Consumer> implementation.
 
+  /// Pointer to an IDL <Consumer> proxy object.
   Event_Comm::Consumer_var receiver_;
-  // Pointer to an IDL <Consumer> proxy object.
 
+  /// Pointer to an IDL <Notifier> proxy object.
   Event_Comm::Notifier_var notifier_;
-  // Pointer to an IDL <Notifier> proxy object.
 
+  /// An instance of the name client used for resolving the factory
+  /// objects.
   TAO_Naming_Client naming_services_client_;
-  // An instance of the name client used for resolving the factory
-  // objects.
 
+  /// The Shutdown callback used to shutdown the consumer application.
   ShutdownCallback* shutdowncallback;
-  // The Shutdown callback used to shutdown the consumer application.
 };
 
 #define NOTIFIER_BIND_NAME "Notifier"
diff --git a/examples/Event_Comm/Consumer_Input_Handler.cpp b/examples/Event_Comm/Consumer_Input_Handler.cpp
index f6ce490ee8c..914bfed034d 100644
--- a/examples/Event_Comm/Consumer_Input_Handler.cpp
+++ b/examples/Event_Comm/Consumer_Input_Handler.cpp
@@ -5,8 +5,6 @@
 
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Consumer, Consumer_Input_Handler, "$Id$")
-
 Consumer_Input_Handler::Consumer_Input_Handler (void)
   : receiver_handler_ (0),
     consumer_initiated_shutdown_ (0)
diff --git a/examples/Event_Comm/Consumer_Input_Handler.h b/examples/Event_Comm/Consumer_Input_Handler.h
index 0a98278ffae..8fd169a7c32 100644
--- a/examples/Event_Comm/Consumer_Input_Handler.h
+++ b/examples/Event_Comm/Consumer_Input_Handler.h
@@ -1,18 +1,15 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    EventComm
-//
-// = FILENAME
-//    Consumer_Input_Handler.h
-//
-// = AUTHOR
-//    Douglas C. Schmidt (schmidt@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Consumer_Input_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Douglas C. Schmidt (schmidt@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef CONSUMER_INPUT_HANDLER_H
 #define CONSUMER_INPUT_HANDLER_
@@ -28,46 +25,48 @@
 // Forward declaration.
 class Consumer_Handler;
 
+/**
+ * @class Consumer_Input_Handler
+ *
+ * @brief Handles input events generated from a keyboard.
+ *
+ * This class holds a <Consumer_Handler> object. It accepts input
+ * from the user and passes events to the <Notifier>. It also
+ * initiates shutdown.
+ */
 class Consumer_Input_Handler : public ACE_Event_Handler
 {
-  // = TITLE
-  //   Handles input events generated from a keyboard.
-  //
-  // = DESCRIPTION
-  //    This class holds a <Consumer_Handler> object. It accepts input
-  //    from the user and passes events to the <Notifier>. It also
-  //    initiates shutdown.
 public:
   // Initialization and termination methods.
+  /// Constructor.
   Consumer_Input_Handler(void);
-  // Constructor.
 
+  /// Destructor.
   ~Consumer_Input_Handler (void);
-  // Destructor.
 
+  /// registers the input event handler.
+  /// returns 0 on success, -1 on error.
   int initialize (Consumer_Handler *);
-  // registers the input event handler.
-  // returns 0 on success, -1 on error.
 
+  /// Dispatch the callback when events occur.
   virtual int handle_input (ACE_HANDLE);
-  // Dispatch the callback when events occur.
 
+  /// Close down the handler.
   int close (void);
-  // Close down the handler.
 
+  /// Report whether the Consumer initiated the shutdown.
   int consumer_initiated_shutdown (void);
-  // Report whether the Consumer initiated the shutdown.
 
+  /// Indicate that the Consumer initiated the shutdown.
   void consumer_initiated_shutdown (int);
-  // Indicate that the Consumer initiated the shutdown.
 
 private:
+  /// Pointer to the <Consumer_Handler> that receives notifications
+  /// from the <Event_Comm::Notifier>.
     Consumer_Handler *receiver_handler_;
-  // Pointer to the <Consumer_Handler> that receives notifications
-  // from the <Event_Comm::Notifier>.
 
+  /// Keep track of whether the Consumer initiated the shutdown.
   int consumer_initiated_shutdown_;
-  // Keep track of whether the Consumer initiated the shutdown.
 };
 
 #endif /* CONSUMER_INPUT_HANDLER_H */
diff --git a/examples/Event_Comm/Event_Comm.idl b/examples/Event_Comm/Event_Comm.idl
index c0cebd339dc..efa77ae1cff 100644
--- a/examples/Event_Comm/Event_Comm.idl
+++ b/examples/Event_Comm/Event_Comm.idl
@@ -1,22 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    EventComm
-//
-// = FILENAME
-//    Event_Comm.idl
-//
-// = DESCRIPTION
-//    The CORBA IDL module for distributed event notification.
-//
-// = AUTHOR
-//    Douglas C. Schmidt (schmidt@cs.wustl.edu) and
-//    Pradeep Gore (pradeep@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Event_Comm.idl
+ *
+ *  $Id$
+ *
+ *  The CORBA IDL module for distributed event notification.
+ *
+ *
+ *  @author Douglas C. Schmidt (schmidt@cs.wustl.edu) and Pradeep Gore (pradeep@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #if !defined (_EVENT_COMM_IDL)
 #define _EVENT_COMM_IDL
diff --git a/examples/Event_Comm/Event_Comm_i.cpp b/examples/Event_Comm/Event_Comm_i.cpp
index aefb7d8c723..a657a17d73c 100644
--- a/examples/Event_Comm/Event_Comm_i.cpp
+++ b/examples/Event_Comm/Event_Comm_i.cpp
@@ -1,18 +1,14 @@
 // $Id$
 
 #include "Event_Comm_i.h"
-#if defined (ACE_HAS_REGEX)
-# include "ace/OS_NS_regex.h"
-#endif
-
-ACE_RCSID(Event_Comm, Event_Comm_i, "$Id$")
-
+#include "ace/OS_NS_regex.h"
 
+/**
+ * Keeps track of context information associated with
+ * a <Event_Comm::Consumer> entry.
+ */
 class Consumer_Entry
 {
-  // = TITLE
-  //   Keeps track of context information associated with
-  //   a <Event_Comm::Consumer> entry.
 public:
   // = Initialization and termination methods.
   Consumer_Entry (Event_Comm::Consumer *consumer,
diff --git a/examples/Event_Comm/Event_Comm_i.h b/examples/Event_Comm/Event_Comm_i.h
index 1df87e6751e..8c13c8435a9 100644
--- a/examples/Event_Comm/Event_Comm_i.h
+++ b/examples/Event_Comm/Event_Comm_i.h
@@ -1,23 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    EventComm
-//
-// = FILENAME
-//    Event_Comm_i.h
-//
-// = DESCRIPTION
-//    Class interface for the implementation of the distributed
-//    event notification mechanism.
-//
-// = AUTHOR
-//    Douglas C. Schmidt (schmidt@cs.wustl.edu) and Pradeep Gore
-//    <pradeep@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Event_Comm_i.h
+ *
+ *  $Id$
+ *
+ *  Class interface for the implementation of the distributed
+ *  event notification mechanism.
+ *
+ *
+ *  @author Douglas C. Schmidt (schmidt@cs.wustl.edu) and Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _EVENT_COMM_I_H
 #define _EVENT_COMM_I_H
@@ -34,56 +30,65 @@
 #include "ace/Reactor.h"
 #include "ace/Null_Mutex.h"
 
+/**
+ * @class ShutdownCallback
+ *
+ * @brief Helper callback class to shutdown the application.
+ */
 class ShutdownCallback
 {
-  // = TITLE
-  //   Helper callback class to shutdown the application.
 public:
   /// Destructor.
   virtual ~ShutdownCallback (void);
 
+  /// This method is to be called to shutdown the application.
   virtual void close (void) = 0;
-  // This method is to be called to shutdown the application.
 };
 
+/**
+ * @class Consumer_i
+ *
+ * @brief Defines the implementation class for event <Consumers>.
+ */
 class Consumer_i : public POA_Event_Comm::Consumer
 {
-  // = TITLE
-  //   Defines the implementation class for event <Consumers>.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Consumer_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~Consumer_i (void);
-  // Destructor.
 
+  /// set the <ACE_Reactor> to use when quitting.
   void set_reactor (ACE_Reactor *reactor);
-  // set the <ACE_Reactor> to use when quitting.
 
+  /// Pass the <event> to the <Consumer>.
   virtual void push (const Event_Comm::Event & event);
-  // Pass the <event> to the <Consumer>.
 
   virtual void disconnect (const char * reason);
 
   // Disconnect the <Consumer> from the <Notifier>, giving it the
   // <reason>.
 
+  /// Set the Shutdown callback.
   void set (ShutdownCallback *_shutdown);
-  // Set the Shutdown callback.
 
 private:
+  /// The callback to shutdown the consumer application.
   ShutdownCallback *shutdown;
-  // The callback to shutdown the consumer application.
 };
 
 // Forward reference.
 class Consumer_Entry;
 
+/**
+ * @class Notifier_i
+ *
+ * @brief Defines the implementation class for event <Notifiers>.
+ */
 class Notifier_i : public POA_Event_Comm::Notifier
 {
-  // = TITLE
-  //   Defines the implementation class for event <Notifiers>.
 public:
   enum
   {
@@ -91,24 +96,24 @@ public:
     // Default max number of Event_Comm::Consumers.
   };
 
+  /// Initialize a Notifier_i object with the specified size hint.
   Notifier_i (size_t size_hint = Notifier_i::DEFAULT_SIZE);
-  // Initialize a Notifier_i object with the specified size hint.
 
+  /// Disconnect all the receivers, giving them the <reason>.
   virtual void disconnect (const char *reason);
-  // Disconnect all the receivers, giving them the <reason>.
 
+  /// Send the <event> to all the consumers who have subscribed and who
+  /// match the filtering criteria.
   virtual void push (const Event_Comm::Event &event);
-  // Send the <event> to all the consumers who have subscribed and who
-  // match the filtering criteria.
 
+  /// Subscribe the <Consumer> to receive events that match
+  /// <filtering_criteria> applied by the <Notifier>.
    virtual void subscribe (Event_Comm::Consumer_ptr Consumer,
                            const char * filtering_criteria);
-  // Subscribe the <Consumer> to receive events that match
-  // <filtering_criteria> applied by the <Notifier>.
 
+  /// Unsubscribe the <Consumer>.
  void unsubscribe (Event_Comm::Consumer *consumer,
                     const char *filtering_criteria);
-  // Unsubscribe the <Consumer>.
 
 private:
   typedef ACE_Map_Manager <Event_Comm::Consumer_ptr, Consumer_Entry *, ACE_Null_Mutex>
@@ -118,8 +123,8 @@ private:
   typedef ACE_Map_Entry <Event_Comm::Consumer_ptr, Consumer_Entry *>
           MAP_ENTRY;
 
+  /// Table that maps a <Event_Comm::Consumer *> to a <Consumer_Entry *>.
   MAP_MANAGER map_;
-  // Table that maps a <Event_Comm::Consumer *> to a <Consumer_Entry *>.
 };
 
 #endif /* _EVENT_COMM_I_H */
diff --git a/examples/Event_Comm/Makefile.am b/examples/Event_Comm/Makefile.am
deleted file mode 100644
index f1200ee128f..00000000000
--- a/examples/Event_Comm/Makefile.am
+++ /dev/null
@@ -1,160 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Event_Comm_IDL.am
-
-BUILT_SOURCES = \
-  Event_CommC.cpp \
-  Event_CommC.h \
-  Event_CommC.inl \
-  Event_CommS.cpp \
-  Event_CommS.h \
-  Event_CommS.inl
-
-CLEANFILES = \
-  Event_Comm-stamp \
-  Event_CommC.cpp \
-  Event_CommC.h \
-  Event_CommC.inl \
-  Event_CommS.cpp \
-  Event_CommS.h \
-  Event_CommS.inl
-
-Event_CommC.cpp Event_CommC.h Event_CommC.inl Event_CommS.cpp Event_CommS.h Event_CommS.inl: Event_Comm-stamp
-
-Event_Comm-stamp: $(srcdir)/Event_Comm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Event_Comm.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Event_Comm.idl
-
-## Makefile.Event_Comm_Consumer.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += consumer
-
-consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-consumer_SOURCES = \
-  Consumer_Handler.cpp \
-  Consumer_Input_Handler.cpp \
-  Event_CommC.cpp \
-  Event_CommS.cpp \
-  Event_Comm_i.cpp \
-  consumer.cpp \
-  Consumer_Handler.h \
-  Consumer_Input_Handler.h \
-  Event_Comm_i.h
-
-consumer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Event_Comm_Notifier.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += notifier
-
-notifier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-notifier_SOURCES = \
-  Event_CommC.cpp \
-  Event_CommS.cpp \
-  Event_Comm_i.cpp \
-  Notifier_Server.cpp \
-  notifier.cpp \
-  Event_Comm_i.h \
-  Notifier_Server.h \
-  notifier.h
-
-notifier_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Event_Comm_Supplier.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += supplier
-
-supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-supplier_SOURCES = \
-  Event_CommC.cpp \
-  Event_CommS.cpp \
-  Event_Comm_i.cpp \
-  Notifier_Handler.cpp \
-  Supplier_Input_Handler.cpp \
-  supplier.cpp \
-  Event_Comm_i.h \
-  Notifier_Handler.h \
-  Supplier_Input_Handler.h \
-  supplier.h
-
-supplier_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/examples/Event_Comm/Notifier_Handler.cpp b/examples/Event_Comm/Notifier_Handler.cpp
index 00cd5c92746..9f900949038 100644
--- a/examples/Event_Comm/Notifier_Handler.cpp
+++ b/examples/Event_Comm/Notifier_Handler.cpp
@@ -3,8 +3,6 @@
 #include "Notifier_Handler.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Supplier, Notifier_Handler, "$Id$")
-
 Notifier_Handler::Notifier_Handler (void)
 {
   // No-Op.
diff --git a/examples/Event_Comm/Notifier_Handler.h b/examples/Event_Comm/Notifier_Handler.h
index f7aaababeb3..e8be0e6d357 100644
--- a/examples/Event_Comm/Notifier_Handler.h
+++ b/examples/Event_Comm/Notifier_Handler.h
@@ -1,19 +1,15 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    EventComm
-//
-// = FILENAME
-//    Notifier_Handler.h
-//
-// = AUTHOR
-//    Douglas C. Schmidt (schmidt@cs.wustl.edu) and
-//    Pradeep Gore (pradeep@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Notifier_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Douglas C. Schmidt (schmidt@cs.wustl.edu) and Pradeep Gore (pradeep@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef _NOTIFIER_HANDLER_H
 #define _NOTIFIER_HANDLER_H
@@ -27,52 +23,55 @@
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/CosNamingC.h"
 
+/**
+ * @class Notifier_Handler
+ *
+ * @brief Holds the <Event_Comm::Notifier> object which is obtained from
+ * the naming service.
+ */
 class Notifier_Handler
 {
-  // = TITLE
-  //  Holds the <Event_Comm::Notifier> object which is obtained from
-  //  the naming service.
 public:
   // = Initialization and termination methods.
+  /// This constructor gets the notifier object from the Naming
+  /// Service.
   Notifier_Handler (void);
-  // This constructor gets the notifier object from the Naming
-  // Service.
 
+  /// Destructor.
   virtual ~Notifier_Handler (void);
-  // Destructor.
 
+  /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR *argv[], ShutdownCallback* _shutdowncallback);
-  // Initialize the client communication endpoint with server.
 
   // = Accessors.
   Event_Comm::Notifier *notifier (void);
   void notifier (Event_Comm::Notifier *);
 
+  /// runs the ORB.
   int run (void);
-  // runs the ORB.
 
+  /// Close down the handler.
   int close (void);
-  // Close down the handler.
 
+  /// called to request application shutdown.
   void shutdown (void);
-  // called to request application shutdown.
 
+  /// returns the ORB's reactor.
   ACE_Reactor *reactor (void);
-  // returns the ORB's reactor.
 
 private:
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
+  /// Pointer to an <Event_Comm::Notifier> object.
   Event_Comm::Notifier *notifier_;
-  // Pointer to an <Event_Comm::Notifier> object.
 
+  /// An instance of the name client used for resolving the factory
+  /// objects.
  TAO_Naming_Client naming_client_;
-  // An instance of the name client used for resolving the factory
-  // objects.
 
+  /// The handler to shutdown the app.
   ShutdownCallback *shutdowncallback;
-  // The handler to shutdown the app.
 };
 
 #define NOTIFIER_BIND_NAME "Notifier"
diff --git a/examples/Event_Comm/Notifier_Server.cpp b/examples/Event_Comm/Notifier_Server.cpp
index c3b3e515cf2..dac24dbb822 100644
--- a/examples/Event_Comm/Notifier_Server.cpp
+++ b/examples/Event_Comm/Notifier_Server.cpp
@@ -5,10 +5,7 @@
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Echo, Server_i, "$Id$")
-
 // Constructor.
-
 Notifier_Server::Notifier_Server (void)
 {
   // no-op.
diff --git a/examples/Event_Comm/Notifier_Server.h b/examples/Event_Comm/Notifier_Server.h
index 853f32b7be6..d95d5172273 100644
--- a/examples/Event_Comm/Notifier_Server.h
+++ b/examples/Event_Comm/Notifier_Server.h
@@ -1,18 +1,15 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    EventComm
-//
-// = FILENAME
-//    Notifier_Server.h
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Notifier_Server.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _NOTIFIER_SERVER_H
 #define _NOTIFIER_SERVER_H
@@ -22,47 +19,50 @@
 #include "orbsvcs/CosNamingS.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 
+/**
+ * @class Notifier_Server
+ *
+ * @brief The Notifier Server that handles CORBA operations from
+ * Consumers and Suppliers.
+ */
 class Notifier_Server
 {
-  // = TITLE
-  //    The Notifier Server that handles CORBA operations from
-  //    Consumers and Suppliers.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Notifier_Server (void);
-  // Constructor.
 
+  /// Destructor.
   ~Notifier_Server (void);
-  // Destructor.
 
+  /// Initialize the Server state.
  int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize the Server state.
 
+  /// Run the orb.
   int run (void);
-  // Run the orb.
 
+  /// Close the naming service.
   int close (void);
-  // Close the naming service.
 
+  /// Reactor accessor.
   ACE_Reactor *reactor(void);
-  // Reactor accessor.
 
 private:
+  /// Initialises the name server and registers the Notifier server
+  /// object name with the name server.
   int init_naming_service (void);
-  // Initialises the name server and registers the Notifier server
-  // object name with the name server.
 
+  /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
 
+  /// Servant for the Notifier interface.
   Notifier_i servant_;
-  // Servant for the Notifier interface.
 
+  /// Naming context for the naming service.
   CosNaming::NamingContext_var naming_context_;
-  // Naming context for the naming service.
 
+  /// helper class for getting access to Naming Service.
   TAO_Naming_Client naming_server_;
-  // helper class for getting access to Naming Service.
 };
 
 #define NOTIFIER_BIND_NAME "Notifier"
diff --git a/examples/Event_Comm/Supplier_Input_Handler.cpp b/examples/Event_Comm/Supplier_Input_Handler.cpp
index 87907a02e38..94b1b1eda12 100644
--- a/examples/Event_Comm/Supplier_Input_Handler.cpp
+++ b/examples/Event_Comm/Supplier_Input_Handler.cpp
@@ -5,8 +5,6 @@
 #include "Supplier_Input_Handler.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Supplier, Supplier_Input_Handler, "$Id$")
-
 Supplier_Input_Handler::Supplier_Input_Handler ()
   : notifier_ (0)
 {
diff --git a/examples/Event_Comm/Supplier_Input_Handler.h b/examples/Event_Comm/Supplier_Input_Handler.h
index 706e4bc77b7..d7365cd5826 100644
--- a/examples/Event_Comm/Supplier_Input_Handler.h
+++ b/examples/Event_Comm/Supplier_Input_Handler.h
@@ -1,22 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    EventComm
-//
-// = FILENAME
-//    Supplier_Input_Handler.h
-//
-// = DESCRIPTION
-//    Handle input from the keyboard.
-//
-// = AUTHOR
-//    Douglas C. Schmidt (schmidt@cs.wustl.edu) and
-//    Pradeep Gore (pradeep@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Supplier_Input_Handler.h
+ *
+ *  $Id$
+ *
+ *  Handle input from the keyboard.
+ *
+ *
+ *  @author Douglas C. Schmidt (schmidt@cs.wustl.edu) and Pradeep Gore (pradeep@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef SUPPLIER_INPUT_HANDLER_H
 #define SUPPLIER_INPUT_HANDLER_H
@@ -30,36 +26,38 @@
 // Forward declaration.
 class Notifier_Handler;
 
+/**
+ * @class Supplier_Input_Handler
+ *
+ * @brief Handles input events generated from a keyboard.
+ *
+ * The events are currently framed and forwarded to all Consumers.
+ * In the future, we will need to be more selective and only send
+ * to those Consumers whose filtering criteria matches!
+ */
 class Supplier_Input_Handler : public ACE_Event_Handler
 {
-  // = TITLE
-  //   Handles input events generated from a keyboard.
-  //
-  // = DESCRIPTION
-  //   The events are currently framed and forwarded to all Consumers.
-  //   In the future, we will need to be more selective and only send
-  //   to those Consumers whose filtering criteria matches!
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Supplier_Input_Handler (void);
-  // Constructor.
 
+  /// Destructor.
   ~Supplier_Input_Handler (void);
-  // Destructor.
 
+  /// Initialization.
   int initialize (Notifier_Handler *);
-  // Initialization.
 
+  /// Frame input events and notify <Consumers>.
   virtual int handle_input (ACE_HANDLE);
-  // Frame input events and notify <Consumers>.
 
+  /// Close down the handler.
   int close (void);
-  // Close down the handler.
 
 protected:
+  /// Pointer to a <Notifier_Handler> that's used to inform Consumers
+  /// that events of interest have occurred.
     Notifier_Handler *notifier_;
-  // Pointer to a <Notifier_Handler> that's used to inform Consumers
-  // that events of interest have occurred.
 };
 
 #endif /* SUPPLIER_INPUT_HANDLER_H */
diff --git a/examples/Event_Comm/consumer.cpp b/examples/Event_Comm/consumer.cpp
index 86f79af6434..7d088d2b0ed 100644
--- a/examples/Event_Comm/consumer.cpp
+++ b/examples/Event_Comm/consumer.cpp
@@ -3,16 +3,14 @@
 #include "Consumer_Handler.h"
 #include "Consumer_Input_Handler.h"
 
-ACE_RCSID(Consumer, consumer, "$Id$")
-
+/**
+ * Consumer driver for the Publish/Subscribe example.
+ *
+ * The Consumer holds the <Consumer_Input_Handler> and
+ * <Cosumer_Handler> objects.
+ */
 class Consumer : public ACE_Event_Handler, public ShutdownCallback
 {
-  // = TITLE
-  //    Consumer driver for the Publish/Subscribe example.
-  //
-  // = DESCRIPTION
-  //    The Consumer holds the <Consumer_Input_Handler> and
-  //    <Cosumer_Handler> objects.
 public:
   // = Initialization and termination methods.
   Consumer (void);
diff --git a/examples/Event_Comm/notifier.cpp b/examples/Event_Comm/notifier.cpp
index 2492e7205fa..f0ad39d3226 100644
--- a/examples/Event_Comm/notifier.cpp
+++ b/examples/Event_Comm/notifier.cpp
@@ -2,8 +2,6 @@
 
 #include "Notifier_Server.h"
 #include "notifier.h"
-ACE_RCSID(Notifier, notifier, "$Id$")
-
 
 int
 Notifier::handle_signal (int signum, siginfo_t *, ucontext_t *)
diff --git a/examples/Event_Comm/notifier.h b/examples/Event_Comm/notifier.h
index ba1142977a7..eb4f1a2e5f7 100644
--- a/examples/Event_Comm/notifier.h
+++ b/examples/Event_Comm/notifier.h
@@ -1,46 +1,45 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/example/Event_Comm
-//
-// = FILENAME
-//    notifier.h
-//
-// = DESCRIPTION
-//    This class implements notifier  driver for the Publish/Subscribe example
-//
-// = AUTHOR
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    notifier.h
+ *
+ *  $Id$
+ *
+ *  This class implements notifier  driver for the Publish/Subscribe example
+ *
+ *
+ */
+//=============================================================================
 
 
 
+
+ /**
+  * @class Notifier
+  *
+  * @brief Notifier driver for the TAO Publish/Subscribe example.
+  *
+  * The driver class for the <Event_Comm::Notifier> object.
+  */
 class Notifier : public ACE_Event_Handler
 {
-  // = TITLE
-  //   Notifier driver for the TAO Publish/Subscribe example.
-  //
-  // = DESCRIPTION
-  //    The driver class for the <Event_Comm::Notifier> object.
  public:
   // = Initialization and termination methods.
+  /// Constructor.
   Notifier (int argc, ACE_TCHAR *argv[]);
-  // Constructor.
 
+  /// Destructor.
   ~Notifier (void);
-  // Destructor.
 
+  /// Execute the notifier.
   void run (void);
-  // Execute the notifier.
 
  private:
+  /// Handle signals that shut us down.
   virtual int handle_signal (int signum,
                              siginfo_t *,
                              ucontext_t *);
-  // Handle signals that shut us down.
 
+  /// The notifier server.
   Notifier_Server ns_;
-  // The notifier server.
 };
diff --git a/examples/Event_Comm/supplier.cpp b/examples/Event_Comm/supplier.cpp
index 9769666f031..7991b1e4631 100644
--- a/examples/Event_Comm/supplier.cpp
+++ b/examples/Event_Comm/supplier.cpp
@@ -4,7 +4,6 @@
 #include "Supplier_Input_Handler.h"
 #include "supplier.h"
 
-ACE_RCSID(Supplier, supplier, "$Id$")
 Supplier::Supplier (void)
 {
   // No-Op.
diff --git a/examples/Event_Comm/supplier.h b/examples/Event_Comm/supplier.h
index 06a45dfc44a..17bef85d580 100644
--- a/examples/Event_Comm/supplier.h
+++ b/examples/Event_Comm/supplier.h
@@ -1,56 +1,55 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/example/Event_Comm
-//
-// = FILENAME
-//    supplier.h
-//
-// = DESCRIPTION
-//    This class implements  driver for the Publish/Subscribe example
-//
-// = AUTHOR
-//
-// ============================================================================
-
 
+//=============================================================================
+/**
+ *  @file    supplier.h
+ *
+ *  $Id$
+ *
+ *  This class implements  driver for the Publish/Subscribe example
+ *
+ *
+ */
+//=============================================================================
+
+
+
+/**
+ * @class Supplier
+ *
+ * @brief Supplier driver for the TAO Publish/Subscribe example.
+ *
+ * This class starts up the <Supplier_Input_Handler> and
+ * <Notifier_Handler> objects.
+ */
 class Supplier : public ACE_Event_Handler, public ShutdownCallback
 {
-  // = TITLE
-  //   Supplier driver for the TAO Publish/Subscribe example.
-  //
-  // = DESCRIPTION
-  //    This class starts up the <Supplier_Input_Handler> and
-  //    <Notifier_Handler> objects.
 public:
   // Initialization and Termination methods.
+  /// Constructor.
   Supplier (void);
-  // Constructor.
 
+  /// Destructor.
   ~Supplier (void);
-  // Destructor.
 
+  /// Initialization method. returns 0 on success, -1 on error.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialization method. returns 0 on success, -1 on error.
 
+  /// Execute the supplier.
   void run (void);
-  // Execute the supplier.
 
+  /// Shutdown the application.
   virtual void close (void);
-  // Shutdown the application.
 
 private:
+  /// Handle shutdown signals.
   virtual int handle_signal (int signum,
                              siginfo_t *,
                              ucontext_t *);
-  // Handle shutdown signals.
 
+  /// Handler for keyboard input.
   Supplier_Input_Handler ih_;
-  // Handler for keyboard input.
 
+  /// The notifier handler.
   Notifier_Handler nh_;
-  // The notifier handler.
 };
diff --git a/examples/Kokyu_dsrt_schedulers/Makefile.am b/examples/Kokyu_dsrt_schedulers/Makefile.am
deleted file mode 100644
index ff5bc2ba723..00000000000
--- a/examples/Kokyu_dsrt_schedulers/Makefile.am
+++ /dev/null
@@ -1,190 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-SUBDIRS = \
-        . \
-        fp_example \
-        mif_example \
-        muf_example
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Kokyu_DSRT_Schedulers.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES += \
-  FP_SchedulingC.cpp \
-  FP_SchedulingC.h \
-  FP_SchedulingC.inl \
-  FP_SchedulingS.inl
-
-CLEANFILES += \
-  FP_Scheduling-stamp \
-  FP_SchedulingC.cpp \
-  FP_SchedulingC.h \
-  FP_SchedulingC.inl \
-  FP_SchedulingS.inl
-
-FP_SchedulingC.cpp FP_SchedulingC.h FP_SchedulingC.inl FP_SchedulingS.inl: FP_Scheduling-stamp
-
-FP_Scheduling-stamp: $(srcdir)/FP_Scheduling.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/FP_Scheduling.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  MIF_SchedulingC.cpp \
-  MIF_SchedulingC.h \
-  MIF_SchedulingC.inl \
-  MIF_SchedulingS.inl
-
-CLEANFILES += \
-  MIF_Scheduling-stamp \
-  MIF_SchedulingC.cpp \
-  MIF_SchedulingC.h \
-  MIF_SchedulingC.inl \
-  MIF_SchedulingS.inl
-
-MIF_SchedulingC.cpp MIF_SchedulingC.h MIF_SchedulingC.inl MIF_SchedulingS.inl: MIF_Scheduling-stamp
-
-MIF_Scheduling-stamp: $(srcdir)/MIF_Scheduling.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MIF_Scheduling.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Kokyu_qosC.cpp \
-  Kokyu_qosC.h \
-  Kokyu_qosC.inl \
-  Kokyu_qosS.inl
-
-CLEANFILES += \
-  Kokyu_qos-stamp \
-  Kokyu_qosC.cpp \
-  Kokyu_qosC.h \
-  Kokyu_qosC.inl \
-  Kokyu_qosS.inl
-
-Kokyu_qosC.cpp Kokyu_qosC.h Kokyu_qosC.inl Kokyu_qosS.inl: Kokyu_qos-stamp
-
-Kokyu_qos-stamp: $(srcdir)/Kokyu_qos.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/Kokyu_qos.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  MUF_SchedulingC.cpp \
-  MUF_SchedulingC.h \
-  MUF_SchedulingC.inl \
-  MUF_SchedulingS.inl
-
-CLEANFILES += \
-  MUF_Scheduling-stamp \
-  MUF_SchedulingC.cpp \
-  MUF_SchedulingC.h \
-  MUF_SchedulingC.inl \
-  MUF_SchedulingS.inl
-
-MUF_SchedulingC.cpp MUF_SchedulingC.h MUF_SchedulingC.inl MUF_SchedulingS.inl: MUF_Scheduling-stamp
-
-MUF_Scheduling-stamp: $(srcdir)/MUF_Scheduling.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MUF_Scheduling.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  EDF_SchedulingC.cpp \
-  EDF_SchedulingC.h \
-  EDF_SchedulingC.inl \
-  EDF_SchedulingS.inl
-
-CLEANFILES += \
-  EDF_Scheduling-stamp \
-  EDF_SchedulingC.cpp \
-  EDF_SchedulingC.h \
-  EDF_SchedulingC.inl \
-  EDF_SchedulingS.inl
-
-EDF_SchedulingC.cpp EDF_SchedulingC.h EDF_SchedulingC.inl EDF_SchedulingS.inl: EDF_Scheduling-stamp
-
-EDF_Scheduling-stamp: $(srcdir)/EDF_Scheduling.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/EDF_Scheduling.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libKokyu_DSRT_Schedulers.la
-
-libKokyu_DSRT_Schedulers_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(ACE_ROOT)/Kokyu \
-  -DKOKYU_DSRT_SCHEDULERS_BUILD_DLL
-
-libKokyu_DSRT_Schedulers_la_SOURCES = \
-  EDF_SchedulingC.cpp \
-  FP_Scheduler.cpp \
-  FP_SchedulingC.cpp \
-  Kokyu_qosC.cpp \
-  MIF_Scheduler.cpp \
-  MIF_SchedulingC.cpp \
-  MUF_Scheduler.cpp \
-  MUF_SchedulingC.cpp \
-  Task_Stats.cpp \
-  utils.cpp
-
-noinst_HEADERS = \
-  EDF_Scheduling.idl \
-  EDF_SchedulingC.h \
-  EDF_SchedulingC.inl \
-  EDF_SchedulingS.inl \
-  FP_Scheduler.h \
-  FP_Scheduling.idl \
-  FP_SchedulingC.h \
-  FP_SchedulingC.inl \
-  FP_SchedulingS.inl \
-  Kokyu_dsrt_schedulers_export.h \
-  Kokyu_qos.idl \
-  Kokyu_qosC.h \
-  Kokyu_qosC.inl \
-  Kokyu_qosS.inl \
-  MIF_Scheduler.h \
-  MIF_Scheduling.idl \
-  MIF_SchedulingC.h \
-  MIF_SchedulingC.inl \
-  MIF_SchedulingS.inl \
-  MUF_Scheduler.h \
-  MUF_Scheduling.idl \
-  MUF_SchedulingC.h \
-  MUF_SchedulingC.inl \
-  MUF_SchedulingS.inl \
-  Task_Stats.h \
-  Task_Stats.inl \
-  utils.h
-
-endif BUILD_RT_CORBA
-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/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp b/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
index bf7f1acd804..5df23a27801 100644
--- a/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
+++ b/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
@@ -1,8 +1,6 @@
 //$Id$
 #include "Task_Stats.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
-#include "ace/OS_String.h"
 
 #if !defined (__ACE_INLINE__)
 #include "Task_Stats.inl"
@@ -70,7 +68,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
     }
 
   // first dump what the caller has to say.
-  ACE_OS::fprintf (output_file, "%s\n",msg);
+  ACE_OS::fprintf (output_file, "%s\n", ACE_TEXT_ALWAYS_CHAR (msg));
 
   // next, compose and dump what we want to say.
   ACE_UINT32 val_1;
diff --git a/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am b/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
deleted file mode 100644
index b9e58973127..00000000000
--- a/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
+++ /dev/null
@@ -1,139 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.fp_example_IDL.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.fp_client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += fp_client
-
-fp_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
-  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
-
-fp_client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-fp_client_LDFLAGS = \
-  -L$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
-
-fp_client_LDADD = \
-  $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(ACE_BUILDDIR)/Kokyu/libKokyu.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.fp_server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += fp_server
-
-fp_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
-  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
-
-fp_server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-fp_server_LDFLAGS = \
-  -L$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
-
-fp_server_LDADD = \
-  $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/Kokyu/libKokyu.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
index 3bfe75ae31e..84714ec2543 100644
--- a/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
+++ b/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
@@ -8,22 +8,19 @@
 #include "testC.h"
 #include "FP_Scheduler.h"
 
-ACE_RCSID(MT_Server, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int do_shutdown = 0;
 int enable_dynamic_scheduling = 0;
 int enable_yield = 1;
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   Worker (CORBA::ORB_ptr orb,
           Simple_Server_ptr server_ptr,
@@ -90,7 +87,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
index 7eb0de9fbb5..94d6ac16bd5 100644
--- a/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
+++ b/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
@@ -8,8 +8,6 @@
 #include "FP_Scheduler.h"
 #include "Task_Stats.h"
 
-ACE_RCSID(MT_Server, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int nthreads = 2;
@@ -53,18 +51,17 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   Worker (CORBA::ORB_ptr orb);
   // ctor
diff --git a/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp b/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
index e33abf37b70..c4f8f2c095a 100644
--- a/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
+++ b/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
@@ -11,8 +11,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(MT_Server, test_i, "$Id$")
-
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long exec_duration)
 {
diff --git a/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h b/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
index c1fdefe2374..fa0ac967621 100644
--- a/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
+++ b/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Server
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_MT_SERVER_TEST_I_H
 #define TAO_MT_SERVER_TEST_I_H
@@ -20,20 +17,21 @@
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 #include "Task_Stats.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb,
                    RTScheduling::Current_ptr current,
                    Task_Stats&,
                    int);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
@@ -41,11 +39,11 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
   RTScheduling::Current_var current_;
   Task_Stats& task_stats_;
   int enable_yield_;
-  // The ORB
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl b/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl
index 5ce482af7aa..60a08452bc1 100644
--- a/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl
+++ b/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl
@@ -1,13 +1,13 @@
 // $Id$
 
 ACE_INLINE
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, 
+Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
         RTScheduling::Current_ptr current,
         Task_Stats& task_stats,
         int enable_yield)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
      current_ (RTScheduling::Current::_duplicate (current)),
      task_stats_ (task_stats),
-     enable_yield_ (enable_yield)   
+     enable_yield_ (enable_yield)
 {
 }
diff --git a/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am b/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
deleted file mode 100644
index 5952442e577..00000000000
--- a/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
+++ /dev/null
@@ -1,139 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.mif_example_IDL.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.mif_example_client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += mif_client
-
-mif_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
-  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
-
-mif_client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-mif_client_LDFLAGS = \
-  -L$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
-
-mif_client_LDADD = \
-  $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(ACE_BUILDDIR)/Kokyu/libKokyu.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.mif_example_server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += mif_server
-
-mif_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
-  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
-
-mif_server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-mif_server_LDFLAGS = \
-  -L$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
-
-mif_server_LDADD = \
-  $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/Kokyu/libKokyu.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index 1ca7b10650d..0a1f7838295 100644
--- a/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+++ b/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
@@ -8,22 +8,19 @@
 #include "testC.h"
 #include "MIF_Scheduler.h"
 
-ACE_RCSID(MT_Server, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int do_shutdown = 0;
 int enable_dynamic_scheduling = 0;
 int enable_yield = 1;
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   Worker (CORBA::ORB_ptr orb,
           Simple_Server_ptr server_ptr,
@@ -90,7 +87,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
index dad9b581cde..93aabdb657b 100644
--- a/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
+++ b/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
@@ -8,8 +8,6 @@
 #include "MIF_Scheduler.h"
 #include "Task_Stats.h"
 
-ACE_RCSID(MT_Server, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int nthreads = 2;
@@ -53,18 +51,17 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   Worker (CORBA::ORB_ptr orb);
   // ctor
diff --git a/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp b/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
index 98905c46b97..5ef2c2820a5 100644
--- a/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
+++ b/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
@@ -11,8 +11,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(MT_Server, test_i, "$Id$")
-
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long exec_duration)
 {
diff --git a/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h b/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
index c1fdefe2374..fa0ac967621 100644
--- a/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
+++ b/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Server
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_MT_SERVER_TEST_I_H
 #define TAO_MT_SERVER_TEST_I_H
@@ -20,20 +17,21 @@
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 #include "Task_Stats.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb,
                    RTScheduling::Current_ptr current,
                    Task_Stats&,
                    int);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
@@ -41,11 +39,11 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
   RTScheduling::Current_var current_;
   Task_Stats& task_stats_;
   int enable_yield_;
-  // The ORB
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl b/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl
index 5ce482af7aa..60a08452bc1 100644
--- a/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl
+++ b/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl
@@ -1,13 +1,13 @@
 // $Id$
 
 ACE_INLINE
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, 
+Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
         RTScheduling::Current_ptr current,
         Task_Stats& task_stats,
         int enable_yield)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
      current_ (RTScheduling::Current::_duplicate (current)),
      task_stats_ (task_stats),
-     enable_yield_ (enable_yield)   
+     enable_yield_ (enable_yield)
 {
 }
diff --git a/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am b/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
deleted file mode 100644
index bb52c407661..00000000000
--- a/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
+++ /dev/null
@@ -1,142 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.muf_example_IDL.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.muf_client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += muf_client
-
-muf_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
-  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
-
-muf_client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-muf_client_LDFLAGS = \
-  -L$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
-
-muf_client_LDADD = \
-  $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/Kokyu/libKokyu.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.muf_server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += muf_server
-
-muf_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
-  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
-
-muf_server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-muf_server_LDFLAGS = \
-  -L$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
-
-muf_server_LDADD = \
-  $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/Kokyu/libKokyu.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
index 1536960eda0..73284159fa9 100644
--- a/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
+++ b/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
@@ -9,22 +9,19 @@
 #include "MUF_Scheduler.h"
 #include "orbsvcs/Time_Utilities.h"
 
-ACE_RCSID(MT_Server, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int do_shutdown = 0;
 int enable_dynamic_scheduling = 0;
 int enable_yield = 1;
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   Worker (CORBA::ORB_ptr orb,
           Simple_Server_ptr server_ptr,
@@ -95,7 +92,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
index c9b980e5e77..28c209354c9 100644
--- a/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
+++ b/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
@@ -8,8 +8,6 @@
 #include "MUF_Scheduler.h"
 #include "Task_Stats.h"
 
-ACE_RCSID(MT_Server, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int nthreads = 3;
@@ -53,18 +51,17 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   Worker (CORBA::ORB_ptr orb);
   // ctor
diff --git a/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp b/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
index 98905c46b97..5ef2c2820a5 100644
--- a/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
+++ b/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
@@ -11,8 +11,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(MT_Server, test_i, "$Id$")
-
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long exec_duration)
 {
diff --git a/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h b/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
index c1fdefe2374..fa0ac967621 100644
--- a/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
+++ b/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Server
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_MT_SERVER_TEST_I_H
 #define TAO_MT_SERVER_TEST_I_H
@@ -20,20 +17,21 @@
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 #include "Task_Stats.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb,
                    RTScheduling::Current_ptr current,
                    Task_Stats&,
                    int);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
@@ -41,11 +39,11 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
   RTScheduling::Current_var current_;
   Task_Stats& task_stats_;
   int enable_yield_;
-  // The ORB
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl b/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl
index 5ce482af7aa..60a08452bc1 100644
--- a/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl
+++ b/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl
@@ -1,13 +1,13 @@
 // $Id$
 
 ACE_INLINE
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, 
+Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
         RTScheduling::Current_ptr current,
         Task_Stats& task_stats,
         int enable_yield)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
      current_ (RTScheduling::Current::_duplicate (current)),
      task_stats_ (task_stats),
-     enable_yield_ (enable_yield)   
+     enable_yield_ (enable_yield)
 {
 }
diff --git a/examples/Kokyu_dsrt_schedulers/utils.h b/examples/Kokyu_dsrt_schedulers/utils.h
index 5650953ea09..7abf410eb2e 100644
--- a/examples/Kokyu_dsrt_schedulers/utils.h
+++ b/examples/Kokyu_dsrt_schedulers/utils.h
@@ -1,6 +1,5 @@
 //$Id$
 
-#include "ace/OS.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "Kokyu_qosC.h"
 #include "tao/RTScheduling/RTScheduler.h"
diff --git a/examples/Load_Balancing/Identity.idl b/examples/Load_Balancing/Identity.idl
index dfeff0e0c46..9ad4b7582e9 100644
--- a/examples/Load_Balancing/Identity.idl
+++ b/examples/Load_Balancing/Identity.idl
@@ -1,19 +1,19 @@
-// $Id$
 
-// ============================================================================
-//
-// = FILENAME
-//    Identity.idl
-//
-// = DESCRIPTION
-//    Interface for a toy CORBA service useful for
-//    testing/demonstrating functionality of the Load
-//    Balancing service defined in Load_Balancer.idl.
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Identity.idl
+ *
+ *  $Id$
+ *
+ *  Interface for a toy CORBA service useful for
+ *  testing/demonstrating functionality of the Load
+ *  Balancing service defined in Load_Balancer.idl.
+ *
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 interface Identity
 {
diff --git a/examples/Load_Balancing/Identity_Client.cpp b/examples/Load_Balancing/Identity_Client.cpp
index 3d663347fce..a5f07e70478 100644
--- a/examples/Load_Balancing/Identity_Client.cpp
+++ b/examples/Load_Balancing/Identity_Client.cpp
@@ -1,16 +1,13 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Load_Balancing
-//
-// = FILENAME
-//    Identity_Client.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Identity_Client.cpp
+ *
+ *  $Id$
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Identity_Client.h"
 #include "IdentityC.h"
diff --git a/examples/Load_Balancing/Identity_Client.h b/examples/Load_Balancing/Identity_Client.h
index aa8123ad750..88c8d65e758 100644
--- a/examples/Load_Balancing/Identity_Client.h
+++ b/examples/Load_Balancing/Identity_Client.h
@@ -1,23 +1,20 @@
-// $Id$
 // -*- C++ -*-
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Load_Balancing
-//
-// = FILENAME
-//    Identity_Client.h
-//
-// = DESCRIPTION
-//    Code for Identity_Client, which is used in conjunction with
-//    Identity_Server to test/demonstrate the functionality of the
-//    Load Balancing service.
-//
-// = AUTHORS
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Identity_Client.h
+ *
+ *  $Id$
+ *
+ *  Code for Identity_Client, which is used in conjunction with
+ *  Identity_Server to test/demonstrate the functionality of the
+ *  Load Balancing service.
+ *
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef IDENTITY_CLIENT_H_
 #define IDENTITY_CLIENT_H_
@@ -28,55 +25,59 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Identity_Client
+ *
+ * Contacts the <Object_Group_Factory> in th Load Balancing Server
+ * to obtain a reference to the type of the <Object_Group>
+ * specified on the command line.  Then, queries the
+ * <Object_Group> for its id and members, and prints that
+ * information.  Finally, performs <number_of_invocations_>
+ * <Identity::get_name> calls, performing <Object_Group::resolve>
+ * before each <get_name> call in order to get the <Identity>
+ * reference to use for the call.  (This provides an example of
+ * fine-grained, i.e., per call,  Load Balancing among all the
+ * <Identity> objects registered with the <Object_Group> for the
+ * client's <get_name> calls.
+ */
 class Identity_Client
 {
-  // =TITLE
-  //   Contacts the <Object_Group_Factory> in th Load Balancing Server
-  //   to obtain a reference to the type of the <Object_Group>
-  //   specified on the command line.  Then, queries the
-  //   <Object_Group> for its id and members, and prints that
-  //   information.  Finally, performs <number_of_invocations_>
-  //   <Identity::get_name> calls, performing <Object_Group::resolve>
-  //   before each <get_name> call in order to get the <Identity>
-  //   reference to use for the call.  (This provides an example of
-  //   fine-grained, i.e., per call,  Load Balancing among all the
-  //   <Identity> objects registered with the <Object_Group> for the
-  //   client's <get_name> calls.
-  //
 public:
 
+  /// Default constructor.
   Identity_Client (void);
-  // Default constructor.
 
+  /// Destructor.
   ~Identity_Client (void);
-  // Destructor.
 
+  /// Initializes <orb_manager_>, and parses commandline arguments.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initializes <orb_manager_>, and parses commandline arguments.
 
+  /// See TITLE.
   int run (void);
-  // See TITLE.
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parses the commandline arguments.
 
+  /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
 
+  /// The ior of the <Object_Group_Factory> object we shall use to
+  /// to obtain an <Object_Group> object.
   const ACE_TCHAR *group_factory_ior_;
-  // The ior of the <Object_Group_Factory> object we shall use to
-  // to obtain an <Object_Group> object.
 
+  /// Number of times to invoke <get_name> method on <Identity>
+  /// objects.  The default value is 5.
   size_t number_of_invocations_;
-  // Number of times to invoke <get_name> method on <Identity>
-  // objects.  The default value is 5.
 
+  /**
+   * Flag indicating which <Object_Group> to use to obtain references
+   * to <Identity> objects.  Random group should be used if the flag
+   * is set to 1, and round robin group otherwise.  Round robin is the
+   * default.
+   */
   size_t use_random_;
-  // Flag indicating which <Object_Group> to use to obtain references
-  // to <Identity> objects.  Random group should be used if the flag
-  // is set to 1, and round robin group otherwise.  Round robin is the
-  // default.
 };
 
 #endif /* IDENTITY_CLIENT_H_ */
diff --git a/examples/Load_Balancing/Identity_Server.cpp b/examples/Load_Balancing/Identity_Server.cpp
index 536436b2a58..483283e26d4 100644
--- a/examples/Load_Balancing/Identity_Server.cpp
+++ b/examples/Load_Balancing/Identity_Server.cpp
@@ -1,16 +1,13 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Load_Balancing
-//
-// = FILENAME
-//    Identity_Server.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Identity_Server.cpp
+ *
+ *  $Id$
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Identity_Server.h"
 #include "Identity_i.h"
diff --git a/examples/Load_Balancing/Identity_Server.h b/examples/Load_Balancing/Identity_Server.h
index 59c064664ee..bf4f3396a15 100644
--- a/examples/Load_Balancing/Identity_Server.h
+++ b/examples/Load_Balancing/Identity_Server.h
@@ -1,22 +1,19 @@
-// $Id$
 // -*- C++ -*-
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Load_Balancing
-//
-// = FILENAME
-//    Identity_Server.h
-//
-// = DESCRIPTION
-//    Driver for identity server, which is used to test/demonstrate
-//    the functionality of the Load Balancing service.
-//
-// = AUTHORS
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Identity_Server.h
+ *
+ *  $Id$
+ *
+ *  Driver for identity server, which is used to test/demonstrate
+ *  the functionality of the Load Balancing service.
+ *
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef IDENTITY_SERVER_H_
 #define IDENTITY_SERVER_H_
@@ -28,55 +25,59 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Identity_Server
+ *
+ * Contacts the <Object_Group_Factory> in the Load Balancing Server
+ * to create two <Object_Group>s, one round robin and one random.
+ * Then, creates a number of <Identity> objects and registers them with
+ * the created <Object_Group>s in a manner specified by the
+ * commandline arguments.
+ */
 class Identity_Server
 {
-  // =TITLE
-  //   Contacts the <Object_Group_Factory> in the Load Balancing Server
-  //   to create two <Object_Group>s, one round robin and one random.
-  //   Then, creates a number of <Identity> objects and registers them with
-  //   the created <Object_Group>s in a manner specified by the
-  //   commandline arguments.
-  //
 public:
 
+  /// Default constructor.
   Identity_Server (void);
-  // Default constructor.
 
+  /// Destructor.
   ~Identity_Server (void);
-  // Destructor.
 
+  /// Performs all the initializations necessary before going into the
+  /// ORB event loop.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Performs all the initializations necessary before going into the
-  // ORB event loop.
 
+  /// Run the server.
   int run (void);
-  // Run the server.
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parses the commandline arguments.
 
+  /**
+   * Creates the specified number of identity objects, and registers
+   * each one with the provided <Object_Group>.  Identity servants are
+   * given names
+   *"Identity object 1" .... "Identity object <number_of_objects>".
+   */
   void create_objects (size_t number_of_objects,
                        Load_Balancer::Object_Group_ptr group);
-  // Creates the specified number of identity objects, and registers
-  // each one with the provided <Object_Group>.  Identity servants are
-  // given names
-  //"Identity object 1" .... "Identity object <number_of_objects>".
 
+  /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
 
+  /// The ior of the <Object_Group_Factory> object we shall use to
+  /// create <Object_Group>s to load balance our <Identity> objects.
   const ACE_TCHAR *group_factory_ior_;
-  // The ior of the <Object_Group_Factory> object we shall use to
-  // create <Object_Group>s to load balance our <Identity> objects.
 
+  /// Number of <Identity> objects to create for registering with
+  /// the random <Object_Group>.  The default value is 5.
   size_t random_objects_;
-  // Number of <Identity> objects to create for registering with
-  // the random <Object_Group>.  The default value is 5.
 
+  /// Number of <Identity> objects to create for registering with the
+  /// round robin <Object_Group>.  The default value is 5.
   size_t rr_objects_;
-  // Number of <Identity> objects to create for registering with the
-  // round robin <Object_Group>.  The default value is 5.
 };
 
 #endif /* IDENTITY_SERVER_H_ */
diff --git a/examples/Load_Balancing/Identity_i.cpp b/examples/Load_Balancing/Identity_i.cpp
index 72ed692d4b4..780b3f1ebe0 100644
--- a/examples/Load_Balancing/Identity_i.cpp
+++ b/examples/Load_Balancing/Identity_i.cpp
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//   Identity_i.cpp
-//
-// = DESCRIPTION
-//    Implements the interface in Identity.idl.
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Identity_i.cpp
+ *
+ *  $Id$
+ *
+ *  Implements the interface in Identity.idl.
+ *
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 #include "Identity_i.h"
 
 Identity_i::Identity_i (const char *name)
diff --git a/examples/Load_Balancing/Identity_i.h b/examples/Load_Balancing/Identity_i.h
index d6810cb9a7f..860828c7fed 100644
--- a/examples/Load_Balancing/Identity_i.h
+++ b/examples/Load_Balancing/Identity_i.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//   Identity_i.h
-//
-// = DESCRIPTION
-//    Implements the interface in Identity.idl.
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Identity_i.h
+ *
+ *  $Id$
+ *
+ *  Implements the interface in Identity.idl.
+ *
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 #ifndef IDENTITY_I_H_
 #define IDENTITY_I_H_
 
@@ -24,19 +24,19 @@ class Identity_i :
   //    This class implements Identity.idl interface.
 public:
 
+  /// Constructor - initializes the name of this object.
   Identity_i (const char *name);
-  // Constructor - initializes the name of this object.
 
+  /// Destructor.
   ~Identity_i (void);
-  // Destructor.
 
+  /// Returns the name of this object.
   virtual void get_name (CORBA::String_out name);
-  // Returns the name of this object.
 
 private:
 
+  /// Stores the name of this object.
   CORBA::String_var name_;
-  // Stores the name of this object.
 };
 
 #endif /* IDENTITY_I_H_ */
diff --git a/examples/Load_Balancing/Load_Balancer.idl b/examples/Load_Balancing/Load_Balancer.idl
index 408654b42fb..baa62059107 100644
--- a/examples/Load_Balancing/Load_Balancer.idl
+++ b/examples/Load_Balancing/Load_Balancer.idl
@@ -1,24 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Load_Balancer.idl
-//
-// = DESCRIPTION
-//    Interfaces for a simple CORBA Load Balancing service, which can
-//    be used in conjunction with the Naming Service or alone to
-//    improve distributed load balancing.  See README file for a short
-//    discussion of other solution approaches for load balancing as
-//    well as use cases for this approach.
-//
-// = AUTHOR
-//    Interfaces in this file came from OrbixNames Load Balancing
-//    features with modifications by:
-//    Doug Schmidt (schmidt@cs.wustl.edu)
-//    Marina Spivak (marina@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Load_Balancer.idl
+ *
+ *  $Id$
+ *
+ *  Interfaces for a simple CORBA Load Balancing service, which can
+ *  be used in conjunction with the Naming Service or alone to
+ *  improve distributed load balancing.  See README file for a short
+ *  discussion of other solution approaches for load balancing as
+ *  well as use cases for this approach.
+ *
+ *
+ *  @author Interfaces in this file came from OrbixNames Load Balancing features with modifications by: Doug Schmidt (schmidt@cs.wustl.edu) Marina Spivak (marina@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 module Load_Balancer
 {
diff --git a/examples/Load_Balancing/Load_Balancer_i.cpp b/examples/Load_Balancing/Load_Balancer_i.cpp
index efeac91cfa2..55b7042bca5 100644
--- a/examples/Load_Balancing/Load_Balancer_i.cpp
+++ b/examples/Load_Balancing/Load_Balancer_i.cpp
@@ -1,13 +1,13 @@
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//   Load_Balancer_i.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Load_Balancer_i.cpp
+ *
+ *  $Id$
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Load_Balancer_i.h"
 #include "ace/Auto_Ptr.h"
@@ -231,7 +231,7 @@ Object_Group_i::unbind (const char * id)
 {
   ACE_CString member_id (id);
 
-  // Code below works iff list and hash map states are consistent,
+  // Code below works if list and hash map states are consistent,
   // which is the case unless the system experienced major problems,
   // e.g., ran out of memory ...
 
diff --git a/examples/Load_Balancing/Load_Balancer_i.h b/examples/Load_Balancing/Load_Balancer_i.h
index 79b9c8d73a9..6bbe455a259 100644
--- a/examples/Load_Balancing/Load_Balancer_i.h
+++ b/examples/Load_Balancing/Load_Balancer_i.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//   Load_Balancer_i.h
-//
-// = DESCRIPTION
-//    Defines classes that implement interfaces in Load_Balancer.idl
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Load_Balancer_i.h
+ *
+ *  $Id$
+ *
+ *  Defines classes that implement interfaces in Load_Balancer.idl
+ *
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef LOAD_BALANCER_I_H_
 #define LOAD_BALANCER_I_H_
@@ -45,81 +45,97 @@ public:
 
   // = Initialization and termination methods.
 
+  /// Constructor.
   Object_Group_Factory_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~Object_Group_Factory_i (void);
-  // Destructor.
 
   // = Load_Balancer::Object_Group_Factory idl methods.
 
+  /**
+   * Creates an <Object_Group> that resolves requests for arbitrary
+   * members in round robin order.  If an <Object_Group>, of any
+   * type, with Group_ID <id> has already been created by this
+   * factory, and hasn't been destroyed, a <duplicate_group>
+   * exception is thrown.
+   */
   Load_Balancer::Object_Group_ptr make_round_robin (const char * id);
-  // Creates an <Object_Group> that resolves requests for arbitrary
-  // members in round robin order.  If an <Object_Group>, of any
-  // type, with Group_ID <id> has already been created by this
-  // factory, and hasn't been destroyed, a <duplicate_group>
-  // exception is thrown.
 
+  /**
+   * Creates an <Object_Group> that resolves requests for arbitrary
+   * members in random order.  If an <Object_Group>, of any
+   * type, with Group_ID <id> has already been created by this
+   * factory, and hasn't been destroyed, a <duplicate_group>
+   * exception is thrown.
+   */
   Load_Balancer::Object_Group_ptr make_random (const char * id);
-  // Creates an <Object_Group> that resolves requests for arbitrary
-  // members in random order.  If an <Object_Group>, of any
-  // type, with Group_ID <id> has already been created by this
-  // factory, and hasn't been destroyed, a <duplicate_group>
-  // exception is thrown.
 
+  /**
+   * Locates and returns an <Object_Group> by its <Group_ID>.   If
+   * no <Object_Group> has <Group_ID> of <id>, throw a
+   * <no_such_group> exception.
+   */
   Load_Balancer::Object_Group_ptr resolve (const char * id);
-  // Locates and returns an <Object_Group> by its <Group_ID>.   If
-  // no <Object_Group> has <Group_ID> of <id>, throw a
-  // <no_such_group> exception.
 
+  /**
+   * Lists all the round robin <Object_Group>s which were created
+   * by this factory, and haven't been destroyed yet, i.e., return
+   * a sequence of <Group_ID>s of all existing round robin
+   * <Object_Group>s created by this factory.
+   */
   Load_Balancer::Group_List * round_robin_groups (void);
-  // Lists all the round robin <Object_Group>s which were created
-  // by this factory, and haven't been destroyed yet, i.e., return
-  // a sequence of <Group_ID>s of all existing round robin
-  // <Object_Group>s created by this factory.
 
+  /**
+   * Lists all the random <Object_Group>s which were created
+   * by this factory, and haven't been destroyed yet, i.e., return
+   * a sequence of <Group_ID>s of all existing random
+   * <Object_Group>s created by this factory.
+   */
   Load_Balancer::Group_List * random_groups (void);
-  // Lists all the random <Object_Group>s which were created
-  // by this factory, and haven't been destroyed yet, i.e., return
-  // a sequence of <Group_ID>s of all existing random
-  // <Object_Group>s created by this factory.
 
   // = Implementation detail methods.
 
+  /**
+   * This method is invoked by an <Object_Group> with group id <id> when it
+   * is being destroyed.  The method removes entry corresponding to
+   * group <id> from <random_groups_> if <random> is 1 or from
+   * <rr_groups_> if <random> is 0.  This recycles <id>, allowing it
+   * to be used for new <Object_Group>, and prevents the destroyed
+   * group from being included in lists returned from <random_groups>
+   * and <round_robin_groups> methods.
+   */
   void remove_group (const ACE_CString &id, int random);
-  // This method is invoked by an <Object_Group> with group id <id> when it
-  // is being destroyed.  The method removes entry corresponding to
-  // group <id> from <random_groups_> if <random> is 1 or from
-  // <rr_groups_> if <random> is 0.  This recycles <id>, allowing it
-  // to be used for new <Object_Group>, and prevents the destroyed
-  // group from being included in lists returned from <random_groups>
-  // and <round_robin_groups> methods.
 
 private:
   // = Helper methods.
 
+  /**
+   * This function factors out common code in <make_round_robin> and
+   * <make_random>.  Creates a random <Object_Group> if <random> parameter is
+   * set to 1 and round robin <Object_Group> if it is 0.
+   */
   Load_Balancer::Object_Group_ptr make_group (int random,
                                               const char * id);
-  // This function factors out common code in <make_round_robin> and
-  // <make_random>.  Creates a random <Object_Group> if <random> parameter is
-  // set to 1 and round robin <Object_Group> if it is 0.
 
+  /**
+   * This function factors out common code in <random_groups> and
+   * <round_robin_groups>.  Returns a sequence of its random
+   * groups if <random> parameter is set to 1 and a sequence of its
+   * round robin groups if it is 0.
+   */
   Load_Balancer::Group_List * list_groups (int random);
-  // This function factors out common code in <random_groups> and
-  // <round_robin_groups>.  Returns a sequence of its random
-  // groups if <random> parameter is set to 1 and a sequence of its
-  // round robin groups if it is 0.
 
+  /// Typedef for ease of use: hash map associating group ids to
+  /// <Object_Group> references.
   typedef ACE_Hash_Map_Manager<ACE_CString,
     Load_Balancer::Object_Group_var, ACE_Null_Mutex> HASH_MAP;
-  // Typedef for ease of use: hash map associating group ids to
-  // <Object_Group> references.
 
+  /// Map containing all random <Object_Group>s created by this factory.
   HASH_MAP random_groups_;
-  // Map containing all random <Object_Group>s created by this factory.
 
+  /// Map containing all round robin <Object_Group>s created by this factory.
   HASH_MAP rr_groups_;
-  // Map containing all round robin <Object_Group>s created by this factory.
 };
 
 class Object_Group_i : public virtual POA_Load_Balancer::Object_Group
@@ -140,63 +156,73 @@ public:
 
   // = Initialization and termination methods.
 
+  /// Constructor.
   Object_Group_i (const char * id,
                   Object_Group_Factory_i * my_factory);
-  // Constructor.
 
+  /// Destructor.
   ~Object_Group_i (void);
-  // Destructor.
 
   // = Load_Balancer::Object_Group idl methods.
 
+  /// Get group's id.
   char * id (void);
-  // Get group's id.
 
+  /**
+   * Adds a new <member> to the <Object_Group>.  Note that each
+   * <Member_ID> in an <Object_Group> must be unique.  If the
+   * group already contains a member with the same <Member_ID>, a
+   * <duplicate_member> exceptions is thrown.
+   */
   void bind (const Load_Balancer::Member & member);
-  // Adds a new <member> to the <Object_Group>.  Note that each
-  // <Member_ID> in an <Object_Group> must be unique.  If the
-  // group already contains a member with the same <Member_ID>, a
-  // <duplicate_member> exceptions is thrown.
 
+  /**
+   * Removes a member with the specified <Member_ID> from the
+   * <Object_Group>.  If none of the group's members have a
+   * Member_ID of <id>, <no_such_member> exception is thrown.
+   */
   void unbind (const char * id);
-  // Removes a member with the specified <Member_ID> from the
-  // <Object_Group>.  If none of the group's members have a
-  // Member_ID of <id>, <no_such_member> exception is thrown.
 
+  /**
+   * Returns a member object from this <Object_Group> in accordance with
+   * load balancing policy it implements, i.e., ``random'' or
+   * ``round robin.''  If the group contains no members, <no_such_member>
+   * exception is thrown.
+   */
   CORBA::Object_ptr resolve (void)
     = 0;
-  // Returns a member object from this <Object_Group> in accordance with
-  // load balancing policy it implements, i.e., ``random'' or
-  // ``round robin.''  If the group contains no members, <no_such_member>
-  // exception is thrown.
 
+  /**
+   * Returns an object with the specified <Member_ID>.  If this
+   * <Object_Group> contains no members with the specified
+   * <Member_ID>, <no_such_member> exception is thrown.
+   */
   CORBA::Object_ptr resolve_with_id (const char * id);
-  // Returns an object with the specified <Member_ID>.  If this
-  // <Object_Group> contains no members with the specified
-  // <Member_ID>, <no_such_member> exception is thrown.
 
+  /// Return a sequence of <Member_ID>s of all of its members.
   Load_Balancer::Member_ID_List * members (void);
-  // Return a sequence of <Member_ID>s of all of its members.
 
+  /**
+   * Cleanup the resources associated with this <Object_Group>.
+   * Subsequent calls to this <Object_Group> should fail, and its
+   * <id> should become available.  <Object_Group_Factory>
+   * should no longer list this <Object_Group>.
+   */
   void destroy (void);
-  // Cleanup the resources associated with this <Object_Group>.
-  // Subsequent calls to this <Object_Group> should fail, and its
-  // <id> should become available.  <Object_Group_Factory>
-  // should no longer list this <Object_Group>.
 
 protected:
 
+  /// Typedefs for ease of use.
   typedef ACE_DLList<ACE_CString> LIST;
   typedef ACE_DLList_Iterator<ACE_CString> ITERATOR;
   typedef ACE_Hash_Map_Manager<ACE_CString, CORBA::Object_var,
     ACE_Null_Mutex> HASH_MAP;
-  // Typedefs for ease of use.
 
+  /// List of ids of all the members of this group.
   LIST member_id_list_;
-  // List of ids of all the members of this group.
 
+  /// Mapping of member_id to obj for all the members of this group.
   HASH_MAP members_;
-  // Mapping of member_id to obj for all the members of this group.
 
   // Note, we store information redundantly in this implementation,
   // i.e., both <member_id_list_> and <members_> store member ids.
@@ -205,78 +231,90 @@ protected:
   // variations of <resolve> method to implement different policies.
   // <members_> is useful for doing id-based look-up.
 
+  /// This group's id.
   ACE_CString id_;
-  // This group's id.
 
+  /**
+   * Pointer to the <Object_Group_Factory> servant, which created this
+   * <Object_Group> servant.  We need this pointer to be able to
+   * notify the factory when this <Object_Group> is destroyed.  Upon
+   * notification, the factory can update its records and release
+   * resources as necessary.
+   */
   Object_Group_Factory_i *my_factory_;
-  // Pointer to the <Object_Group_Factory> servant, which created this
-  // <Object_Group> servant.  We need this pointer to be able to
-  // notify the factory when this <Object_Group> is destroyed.  Upon
-  // notification, the factory can update its records and release
-  // resources as necessary.
 };
 
 
+/**
+ * @class Random_Object_Group
+ *
+ * @brief This class implements <Object_Group> idl interface with the
+ * random policy for <resolve>.
+ */
 class Random_Object_Group : public Object_Group_i
 {
-  // = TITLE
-  //    This class implements <Object_Group> idl interface with the
-  //    random policy for <resolve>.
-  //
 public:
+  /// Constructor.
   Random_Object_Group (const char *id,
                        Object_Group_Factory_i *my_factory);
-  // Constructor.
 
+  /// Destructor.
   ~Random_Object_Group (void);
-  // Destructor.
 
+  /// Returns a member object from this <Object_Group> in accordance with
+  /// the "random" load balancing policy.
   CORBA::Object_ptr resolve (void);
-  // Returns a member object from this <Object_Group> in accordance with
-  // the "random" load balancing policy.
 
+  /**
+   * Cleanup the resources associated with this <Object_Group>.
+   * Subsequent calls to this <Object_Group> should fail, and its
+   * <id> should become available.  <Object_Group_Factory>
+   * should no longer list this <Object_Group>.
+   */
   void destroy (void);
-  // Cleanup the resources associated with this <Object_Group>.
-  // Subsequent calls to this <Object_Group> should fail, and its
-  // <id> should become available.  <Object_Group_Factory>
-  // should no longer list this <Object_Group>.
 };
 
+/**
+ * @class RR_Object_Group:
+ *
+ * @brief This class implements <Object_Group> idl interface with the
+ * round robin policy for <resolve>.
+ */
 class RR_Object_Group: public Object_Group_i
 {
-  // = TITLE
-  //    This class implements <Object_Group> idl interface with the
-  //    round robin policy for <resolve>.
-  //
 public:
 
+  /// Constructor.
   RR_Object_Group (const char *id,
                    Object_Group_Factory_i *my_factory);
-  // Constructor.
 
+  /// Destructor.
   ~RR_Object_Group (void);
-  // Destructor.
 
+  /**
+   * We need to override the implementation of <unbind> from
+   * Object_Group_i to make sure <resolve>
+   * works correctly.
+   */
   void unbind (const char * id);
-  // We need to override the implementation of <unbind> from
-  // Object_Group_i to make sure <resolve>
-  // works correctly.
 
+  /// Returns a member object from this <Object_Group> in accordance with
+  /// the "round robin" load balancing policy.
   CORBA::Object_ptr resolve (void);
-  // Returns a member object from this <Object_Group> in accordance with
-  // the "round robin" load balancing policy.
 
+  /**
+   * Cleanup the resources associated with this <Object_Group>.
+   * Subsequent calls to this <Object_Group> should fail, and its
+   * <id> should become available.  <Object_Group_Factory>
+   * should no longer list this <Object_Group>.
+   */
   void destroy (void);
-  // Cleanup the resources associated with this <Object_Group>.
-  // Subsequent calls to this <Object_Group> should fail, and its
-  // <id> should become available.  <Object_Group_Factory>
-  // should no longer list this <Object_Group>.
 
 private:
 
+  /// Index into the Object_Group_i::member_id_list_: keeps track of
+  /// the member_id to return on the next invocation of <resolve>.
   size_t next_;
-  // Index into the Object_Group_i::member_id_list_: keeps track of
-  // the member_id to return on the next invocation of <resolve>.
 };
 
 #endif /* LOAD_BALANCER_I_H_  */
diff --git a/examples/Load_Balancing/Load_Balancing_Service.cpp b/examples/Load_Balancing/Load_Balancing_Service.cpp
index ad4264ba54e..cfc79e888bf 100644
--- a/examples/Load_Balancing/Load_Balancing_Service.cpp
+++ b/examples/Load_Balancing/Load_Balancing_Service.cpp
@@ -1,16 +1,13 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Load_Balancing
-//
-// = FILENAME
-//    Load_Balancing_Service.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Load_Balancing_Service.cpp
+ *
+ *  $Id$
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Load_Balancing_Service.h"
 #include "Load_Balancer_i.h"
diff --git a/examples/Load_Balancing/Load_Balancing_Service.h b/examples/Load_Balancing/Load_Balancing_Service.h
index db4c2373723..eb529215889 100644
--- a/examples/Load_Balancing/Load_Balancing_Service.h
+++ b/examples/Load_Balancing/Load_Balancing_Service.h
@@ -1,21 +1,18 @@
-// $Id$
 // -*- C++ -*-
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Load_Balancing
-//
-// = FILENAME
-//    Load_Balancing_Service.h
-//
-// = DESCRIPTION
-//    Driver for Load Balancing service.
-//
-// = AUTHORS
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Load_Balancing_Service.h
+ *
+ *  $Id$
+ *
+ *  Driver for Load Balancing service.
+ *
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef LOAD_BALANCING_SERVICE_H_
 #define LOAD_BALANCING_SERVICE_H_
@@ -26,36 +23,39 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Load_Balancing_Service
+ *
+ * Server, which creates and initializes a
+ * <Load_Balancer::Object_Group_Factory>
+ * object, and runs the orb loop.
+ */
 class Load_Balancing_Service
 {
-  // =TITLE
-  //   Server, which creates and initializes a
-  //   <Load_Balancer::Object_Group_Factory>
-  //   object, and runs the orb loop.
 public:
 
+  /// Default constructor.
   Load_Balancing_Service (void);
-  // Default constructor.
 
+  /// Destructor.
   ~Load_Balancing_Service (void);
-  // Destructor.
 
+  /// Initialize the <Load_Balancing_Service>: initializes the ORB, parses
+  /// arguments, creates a servant ...
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize the <Load_Balancing_Service>: initializes the ORB, parses
-  // arguments, creates a servant ...
 
+  /// Run the server.
   int run (void);
-  // Run the server.
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parses the commandline arguments.
 
+  /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
 
+  /// File to output the <Object_Group_Factory> IOR.
   FILE *ior_output_file_;
-  // File to output the <Object_Group_Factory> IOR.
 };
 
 #endif /* LOAD_BALANCING_SERVICE_H_ */
diff --git a/examples/Load_Balancing/Makefile.am b/examples/Load_Balancing/Makefile.am
deleted file mode 100644
index 3c3090c7062..00000000000
--- a/examples/Load_Balancing/Makefile.am
+++ /dev/null
@@ -1,179 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Load_Balancing_IDL.am
-
-BUILT_SOURCES = \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.cpp \
-  IdentityS.h \
-  IdentityS.inl
-
-CLEANFILES = \
-  Identity-stamp \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.cpp \
-  IdentityS.h \
-  IdentityS.inl
-
-IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.cpp IdentityS.h IdentityS.inl: Identity-stamp
-
-Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Identity.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.cpp \
-  Load_BalancerS.h \
-  Load_BalancerS.inl
-
-CLEANFILES += \
-  Load_Balancer-stamp \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.cpp \
-  Load_BalancerS.h \
-  Load_BalancerS.inl
-
-Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.cpp Load_BalancerS.h Load_BalancerS.inl: Load_Balancer-stamp
-
-Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Load_Balancer.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Identity.idl \
-  Load_Balancer.idl
-
-## Makefile.Load_Balancing_Balancer.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-if !BUILD_REPO
-
-noinst_PROGRAMS += load_balancer
-
-load_balancer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-load_balancer_SOURCES = \
-  Load_BalancerC.cpp \
-  Load_BalancerS.cpp \
-  Load_Balancer_i.cpp \
-  Load_Balancing_Service.cpp \
-  Load_Balancer_i.h \
-  Load_Balancing_Service.h
-
-load_balancer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_REPO
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.Load_Balancing_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_REPO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  IdentityC.cpp \
-  Identity_Client.cpp \
-  Load_BalancerC.cpp \
-  Identity_Client.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_REPO
-endif BUILD_EXCEPTIONS
-
-## Makefile.Load_Balancing_Server.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_REPO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  IdentityC.cpp \
-  IdentityS.cpp \
-  Identity_Server.cpp \
-  Identity_i.cpp \
-  Load_BalancerC.cpp \
-  Identity_Server.h \
-  Identity_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_REPO
-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/examples/Load_Balancing_persistent/Identity.idl b/examples/Load_Balancing_persistent/Identity.idl
index f16f5e410eb..ab387ea8626 100644
--- a/examples/Load_Balancing_persistent/Identity.idl
+++ b/examples/Load_Balancing_persistent/Identity.idl
@@ -1,19 +1,19 @@
-// $Id$
 
-// ============================================================================
-//
-// = FILENAME
-//    Identity.idl
-//
-// = DESCRIPTION
-//    Interface for a toy CORBA service useful for
-//    testing/demonstrating functionality of the Load
-//    Balancing service defined in Load_Balancer.idl.
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    with modifications by Bala Natarajan <bala@cs.wustl.edu>
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Identity.idl
+ *
+ *  $Id$
+ *
+ *  Interface for a toy CORBA service useful for
+ *  testing/demonstrating functionality of the Load
+ *  Balancing service defined in Load_Balancer.idl.
+ *
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu> with modifications by Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 interface Identity
 {
diff --git a/examples/Load_Balancing_persistent/Identity_Client.cpp b/examples/Load_Balancing_persistent/Identity_Client.cpp
index a0b47c5629a..c043de769f1 100644
--- a/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/examples/Load_Balancing_persistent/Identity_Client.cpp
@@ -1,16 +1,13 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Load_Balancing
-//
-// = FILENAME
-//    Identity_Client.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Identity_Client.cpp
+ *
+ *  $Id$
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Identity_Client.h"
 #include "IdentityC.h"
diff --git a/examples/Load_Balancing_persistent/Identity_Client.h b/examples/Load_Balancing_persistent/Identity_Client.h
index 98d07d4a9f6..45bacd56696 100644
--- a/examples/Load_Balancing_persistent/Identity_Client.h
+++ b/examples/Load_Balancing_persistent/Identity_Client.h
@@ -1,23 +1,20 @@
-// $Id$
 // -*- C++ -*-
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Load_Balancing
-//
-// = FILENAME
-//    Identity_Client.h
-//
-// = DESCRIPTION
-//    Code for Identity_Client, which is used in conjunction with
-//    Identity_Server to test/demonstrate the functionality of the
-//    Load Balancing service.
-//
-// = AUTHORS
-//    Marina Spivak <marina@cs.wustl.edu>
-//    with modifications by Bala Natarajan <bala@cs.wustl.edu>
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Identity_Client.h
+ *
+ *  $Id$
+ *
+ *  Code for Identity_Client, which is used in conjunction with
+ *  Identity_Server to test/demonstrate the functionality of the
+ *  Load Balancing service.
+ *
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu> with modifications by Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef IDENTITY_CLIENT_H_
 #define IDENTITY_CLIENT_H_
@@ -28,55 +25,59 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Identity_Client
+ =TITLE
+ * Contacts the <Object_Group_Factory> in th Load Balancing Server
+ * to obtain a reference to the type of the <Object_Group>
+ * specified on the command line.  Then, queries the
+ * <Object_Group> for its id and members, and prints that
+ * information.  Finally, performs <number_of_invocations_>
+ * <Identity::get_name> calls, performing <Object_Group::resolve>
+ * before each <get_name> call in order to get the <Identity>
+ * reference to use for the call.  (This provides an example of
+ * fine-grained, i.e., per call,  Load Balancing among all the
+ * <Identity> objects registered with the <Object_Group> for the
+ * client's <get_name> calls.
+ */
 class Identity_Client
 {
-  // =TITLE
-  //   Contacts the <Object_Group_Factory> in th Load Balancing Server
-  //   to obtain a reference to the type of the <Object_Group>
-  //   specified on the command line.  Then, queries the
-  //   <Object_Group> for its id and members, and prints that
-  //   information.  Finally, performs <number_of_invocations_>
-  //   <Identity::get_name> calls, performing <Object_Group::resolve>
-  //   before each <get_name> call in order to get the <Identity>
-  //   reference to use for the call.  (This provides an example of
-  //   fine-grained, i.e., per call,  Load Balancing among all the
-  //   <Identity> objects registered with the <Object_Group> for the
-  //   client's <get_name> calls.
-  //
 public:
 
+  /// Default constructor.
   Identity_Client (void);
-  // Default constructor.
 
+  /// Destructor.
   ~Identity_Client (void);
-  // Destructor.
 
+  /// Initializes <orb_manager_>, and parses commandline arguments.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initializes <orb_manager_>, and parses commandline arguments.
 
+  /// See TITLE.
   int run (void);
-  // See TITLE.
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parses the commandline arguments.
 
+  /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
 
+  /// The ior of the <Object_Group_Factory> object we shall use to
+  /// to obtain an <Object_Group> object.
   const ACE_TCHAR *group_factory_ior_;
-  // The ior of the <Object_Group_Factory> object we shall use to
-  // to obtain an <Object_Group> object.
 
+  /// Number of times to invoke <get_name> method on <Identity>
+  /// objects.  The default value is 5.
   size_t number_of_invocations_;
-  // Number of times to invoke <get_name> method on <Identity>
-  // objects.  The default value is 5.
 
+  /**
+   * Flag indicating which <Object_Group> to use to obtain references
+   * to <Identity> objects.  Random group should be used if the flag
+   * is set to 1, and round robin group otherwise.  Round robin is the
+   * default.
+   */
   size_t use_random_;
-  // Flag indicating which <Object_Group> to use to obtain references
-  // to <Identity> objects.  Random group should be used if the flag
-  // is set to 1, and round robin group otherwise.  Round robin is the
-  // default.
 
   int iterations_;
 };
diff --git a/examples/Load_Balancing_persistent/Identity_Server.h b/examples/Load_Balancing_persistent/Identity_Server.h
index 711bbd17e89..36f902015cf 100644
--- a/examples/Load_Balancing_persistent/Identity_Server.h
+++ b/examples/Load_Balancing_persistent/Identity_Server.h
@@ -1,22 +1,19 @@
-// $Id$
 // -*- C++ -*-
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Load_Balancing
-//
-// = FILENAME
-//    Identity_Server.h
-//
-// = DESCRIPTION
-//    Driver for identity server, which is used to test/demonstrate
-//    the functionality of the Load Balancing service.
-//
-// = AUTHORS
-//    Marina Spivak <marina@cs.wustl.edu>
-//    with modifications by Bala Natarajan <bala@cs.wustl.edu>
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Identity_Server.h
+ *
+ *  $Id$
+ *
+ *  Driver for identity server, which is used to test/demonstrate
+ *  the functionality of the Load Balancing service.
+ *
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu> with modifications by Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef IDENTITY_SERVER_H_
 #define IDENTITY_SERVER_H_
@@ -28,61 +25,65 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Identity_Server
+ =TITLE
+ * Contacts the <Object_Group_Factory> in the Load Balancing Server
+ * to create two <Object_Group>s, one round robin and one random.
+ * Then, creates a number of <Identity> objects and registers them with
+ * the created <Object_Group>s in a manner specified by the
+ * commandline arguments.
+ */
 class Identity_Server
 {
-  // =TITLE
-  //   Contacts the <Object_Group_Factory> in the Load Balancing Server
-  //   to create two <Object_Group>s, one round robin and one random.
-  //   Then, creates a number of <Identity> objects and registers them with
-  //   the created <Object_Group>s in a manner specified by the
-  //   commandline arguments.
-  //
 public:
 
+  /// Default constructor.
   Identity_Server (void);
-  // Default constructor.
 
+  /// Destructor.
   ~Identity_Server (void);
-  // Destructor.
 
+  /// Parses the commandline arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parses the commandline arguments.
 
+  /// Performs all the initializations necessary before going into the
+  /// ORB event loop.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Performs all the initializations necessary before going into the
-  // ORB event loop.
 
   int register_groups (void);
 
 
+  /// Run the server.
   int run (void);
-  // Run the server.
 
 private:
 
 
+  /**
+   * Creates the specified number of identity objects, and registers
+   * each one with the provided <Object_Group>.  Identity servants are
+   * given names
+   *"Identity object 1" .... "Identity object <number_of_objects>".
+   */
   void create_objects (size_t number_of_objects,
                        Load_Balancer::Object_Group_ptr group);
-  // Creates the specified number of identity objects, and registers
-  // each one with the provided <Object_Group>.  Identity servants are
-  // given names
-  //"Identity object 1" .... "Identity object <number_of_objects>".
 
 
+  /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
 
+  /// The ior of the <Object_Group_Factory> object we shall use to
+  /// create <Object_Group>s to load balance our <Identity> objects.
   const ACE_TCHAR *group_factory_ior_;
-  // The ior of the <Object_Group_Factory> object we shall use to
-  // create <Object_Group>s to load balance our <Identity> objects.
 
+  /// Number of <Identity> objects to create for registering with
+  /// the random <Object_Group>.  The default value is 5.
   size_t random_objects_;
-  // Number of <Identity> objects to create for registering with
-  // the random <Object_Group>.  The default value is 5.
 
+  /// Number of <Identity> objects to create for registering with the
+  /// round robin <Object_Group>.  The default value is 5.
   size_t rr_objects_;
-  // Number of <Identity> objects to create for registering with the
-  // round robin <Object_Group>.  The default value is 5.
 
   PortableServer::POA_var persistent_POA_;
 };
diff --git a/examples/Load_Balancing_persistent/Identity_i.cpp b/examples/Load_Balancing_persistent/Identity_i.cpp
index c71e4c8f293..f1a5a021aad 100644
--- a/examples/Load_Balancing_persistent/Identity_i.cpp
+++ b/examples/Load_Balancing_persistent/Identity_i.cpp
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//   Identity_i.cpp
-//
-// = DESCRIPTION
-//    Implements the interface in Identity.idl.
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Identity_i.cpp
+ *
+ *  $Id$
+ *
+ *  Implements the interface in Identity.idl.
+ *
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 #include "Identity_i.h"
 
 Identity_i::Identity_i (const char *name,
diff --git a/examples/Load_Balancing_persistent/Identity_i.h b/examples/Load_Balancing_persistent/Identity_i.h
index 100750ee4e8..3c8c2a5992f 100644
--- a/examples/Load_Balancing_persistent/Identity_i.h
+++ b/examples/Load_Balancing_persistent/Identity_i.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//   Identity_i.h
-//
-// = DESCRIPTION
-//    Implements the interface in Identity.idl.
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    with modifications by Bala Natarajan <bala@cs.wustl.edu>
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Identity_i.h
+ *
+ *  $Id$
+ *
+ *  Implements the interface in Identity.idl.
+ *
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu> with modifications by Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 #ifndef IDENTITY_I_H_
 #define IDENTITY_I_H_
 
@@ -24,24 +24,24 @@ class Identity_i :
   //    This class implements Identity.idl interface.
 public:
 
+  /// Constructor - initializes the name of this object.
   Identity_i (const char *name,
               PortableServer::POA_ptr poa);
-  // Constructor - initializes the name of this object.
 
+  /// Destructor.
   ~Identity_i (void);
-  // Destructor.
 
+  /// Returns the name of this object.
   virtual void get_name (CORBA::String_out name);
-  // Returns the name of this object.
 
+  /// Method for the POA that will return the persistent POA_ptr stored
+  /// in here..
   PortableServer::POA_ptr _default_POA (void);
-  // Method for the POA that will return the persistent POA_ptr stored
-  // in here..
 
 private:
 
+  /// Stores the name of this object.
   CORBA::String_var name_;
-  // Stores the name of this object.
 
   PortableServer::POA_var poa_;
 };
diff --git a/examples/Load_Balancing_persistent/Load_Balancer.idl b/examples/Load_Balancing_persistent/Load_Balancer.idl
index 5b7cfa3b61a..b907f08d1b8 100644
--- a/examples/Load_Balancing_persistent/Load_Balancer.idl
+++ b/examples/Load_Balancing_persistent/Load_Balancer.idl
@@ -1,24 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Load_Balancer.idl
-//
-// = DESCRIPTION
-//    Interfaces for a simple CORBA Load Balancing service, which can
-//    be used in conjunction with the Naming Service or alone to
-//    improve distributed load balancing.  See README file for a short
-//    discussion of other solution approaches for load balancing as
-//    well as use cases for this approach.
-//
-// = AUTHOR
-//    Interfaces in this file came from OrbixNames Load Balancing
-//    features with modifications by:
-//    Doug Schmidt (schmidt@cs.wustl.edu)
-//    Marina Spivak (marina@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Load_Balancer.idl
+ *
+ *  $Id$
+ *
+ *  Interfaces for a simple CORBA Load Balancing service, which can
+ *  be used in conjunction with the Naming Service or alone to
+ *  improve distributed load balancing.  See README file for a short
+ *  discussion of other solution approaches for load balancing as
+ *  well as use cases for this approach.
+ *
+ *
+ *  @author Interfaces in this file came from OrbixNames Load Balancing features with modifications by: Doug Schmidt (schmidt@cs.wustl.edu) Marina Spivak (marina@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 module Load_Balancer
 {
diff --git a/examples/Load_Balancing_persistent/Load_Balancer_i.h b/examples/Load_Balancing_persistent/Load_Balancer_i.h
index 261f5e2f323..a27519e9259 100644
--- a/examples/Load_Balancing_persistent/Load_Balancer_i.h
+++ b/examples/Load_Balancing_persistent/Load_Balancer_i.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//   Load_Balancer_i.h
-//
-// = DESCRIPTION
-//    Defines classes that implement interfaces in Load_Balancer.idl
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    with modifications by Bala Natarajan <bala@cs.wustl.edu>
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Load_Balancer_i.h
+ *
+ *  $Id$
+ *
+ *  Defines classes that implement interfaces in Load_Balancer.idl
+ *
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu> with modifications by Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef LOAD_BALANCER_I_H_
 #define LOAD_BALANCER_I_H_
@@ -54,103 +54,119 @@ public:
 
   // = Initialization and termination methods.
 
+  /// Constructor.
   Object_Group_Factory_i (CORBA::ORB_ptr orb,
                           PortableServer::POA_ptr poa);
-  // Constructor.
 
+  /// Destructor.
   ~Object_Group_Factory_i (void);
-  // Destructor.
 
 
+  /// Method for the POA that will return the persistent POA_ptr stored
+  /// in here..
   PortableServer::POA_ptr _default_POA (void);
-  // Method for the POA that will return the persistent POA_ptr stored
-  // in here..
 
   // = Load_Balancer::Object_Group_Factory idl methods.
 
+  /**
+   * Creates an <Object_Group> that resolves requests for arbitrary
+   * members in round robin order.  If an <Object_Group>, of any
+   * type, with Group_ID <id> has already been created by this
+   * factory, and hasn't been destroyed, a <duplicate_group>
+   * exception is thrown.
+   */
   Load_Balancer::Object_Group_ptr make_round_robin (const char * id);
-  // Creates an <Object_Group> that resolves requests for arbitrary
-  // members in round robin order.  If an <Object_Group>, of any
-  // type, with Group_ID <id> has already been created by this
-  // factory, and hasn't been destroyed, a <duplicate_group>
-  // exception is thrown.
 
   void unbind_round_robin (const char *id);
 
 
+  /**
+   * Creates an <Object_Group> that resolves requests for arbitrary
+   * members in random order.  If an <Object_Group>, of any
+   * type, with Group_ID <id> has already been created by this
+   * factory, and hasn't been destroyed, a <duplicate_group>
+   * exception is thrown.
+   */
   Load_Balancer::Object_Group_ptr make_random (const char * id);
-  // Creates an <Object_Group> that resolves requests for arbitrary
-  // members in random order.  If an <Object_Group>, of any
-  // type, with Group_ID <id> has already been created by this
-  // factory, and hasn't been destroyed, a <duplicate_group>
-  // exception is thrown.
 
   void unbind_random (const char *id);
 
+  /**
+   * Locates and returns an <Object_Group IOR> by its <Group_ID>.   If
+   * no <Object_Group> has <Group_ID> of <id>, throw a
+   * <no_such_group> exception.
+   */
   Load_Balancer::Object_Group_ptr resolve (const char * id);
-  // Locates and returns an <Object_Group IOR> by its <Group_ID>.   If
-  // no <Object_Group> has <Group_ID> of <id>, throw a
-  // <no_such_group> exception.
 
+  /**
+   * Lists all the round robin <Object_Group>s which were created
+   * by this factory, and haven't been destroyed yet, i.e., return
+   * a sequence of <Group_ID>s of all existing round robin
+   * <Object_Group>s created by this factory.
+   */
   Load_Balancer::Group_List * round_robin_groups (void);
-  // Lists all the round robin <Object_Group>s which were created
-  // by this factory, and haven't been destroyed yet, i.e., return
-  // a sequence of <Group_ID>s of all existing round robin
-  // <Object_Group>s created by this factory.
 
+  /**
+   * Lists all the random <Object_Group>s which were created
+   * by this factory, and haven't been destroyed yet, i.e., return
+   * a sequence of <Group_ID>s of all existing random
+   * <Object_Group>s created by this factory.
+   */
   Load_Balancer::Group_List * random_groups (void);
-  // Lists all the random <Object_Group>s which were created
-  // by this factory, and haven't been destroyed yet, i.e., return
-  // a sequence of <Group_ID>s of all existing random
-  // <Object_Group>s created by this factory.
 
 private:
 
+  /// Our ORB
   CORBA::ORB_var orb_;
-  // Our ORB
 
+  /// Our POA
   PortableServer::POA_var poa_;
-  // Our POA
 
   // = Helper methods.
 
+  /**
+   * This function factors out common code in <make_round_robin> and
+   * <make_random>.  Creates a random <Object_Group> if <random> parameter is
+   * set to 1 and round robin <Object_Group> if it is 0.
+   */
   Load_Balancer::Object_Group_ptr make_group (int random,
                                               const char * id);
-  // This function factors out common code in <make_round_robin> and
-  // <make_random>.  Creates a random <Object_Group> if <random> parameter is
-  // set to 1 and round robin <Object_Group> if it is 0.
 
+  /**
+   * This function factors out common code in <random_groups> and
+   * <round_robin_groups>.  Returns a sequence of its random
+   * groups if <random> parameter is set to 1 and a sequence of its
+   * round robin groups if it is 0.
+   */
   Load_Balancer::Group_List * list_groups (int random);
-  // This function factors out common code in <random_groups> and
-  // <round_robin_groups>.  Returns a sequence of its random
-  // groups if <random> parameter is set to 1 and a sequence of its
-  // round robin groups if it is 0.
 
+  /// The helper that updates the vlaue of the variable flags_
   void update_flags (int random);
-  // The helper that updates the vlaue of the variable flags_
 
+  /// This rolls back the status of the objects in the POA if the
+  /// service had failed..
   void update_objects (void);
-  // This rolls back the status of the objects in the POA if the
-  // service had failed..
 
+  /// Map containing all random <Object_Group>s created by this factory.
   HASH_MAP *random_groups_;
-  // Map containing all random <Object_Group>s created by this factory.
 
+  /// Map containing all round robin <Object_Group>s created by this factory.
   HASH_MAP *rr_groups_;
-  // Map containing all round robin <Object_Group>s created by this factory.
 
+  /// Memory pool that will have the data
   ALLOCATOR *mem_pool_;
-  // Memory pool that will have the data
 
+  /**
+   * This would be kind of a hack.. As I am not able to think of
+   * anything at present let us live with this.. OK.. Here is how it
+   * works.. This value will be stored in the MMAP file. If the value
+   * is 1 then the Round Robin group object is registered with the
+   * Services POA. If the value is 2 then the Random group object is
+   * registered with the POA. If the value is 3 both of them are
+   * registered with the POA.. The initial value would be 0 when this
+   * object initialises and binded as "FLAGS"..
+   */
   CORBA::Short *flags_;
-  // This would be kind of a hack.. As I am not able to think of
-  // anything at present let us live with this.. OK.. Here is how it
-  // works.. This value will be stored in the MMAP file. If the value
-  // is 1 then the Round Robin group object is registered with the
-  // Services POA. If the value is 2 then the Random group object is
-  // registered with the POA. If the value is 3 both of them are
-  // registered with the POA.. The initial value would be 0 when this
-  // object initialises and binded as "FLAGS"..
 
   ACE_Throughput_Stats throughput_;
 
@@ -175,12 +191,12 @@ public:
 
   // = Initialization and termination methods.
 
+  /// Constructor.
   Object_Group_i (const char * id,
                   PortableServer::POA_ptr poa);
-  // Constructor.
 
+  /// Destructor.
   ~Object_Group_i (void);
-  // Destructor.
 
   // Persistent POA
   // Method for the POA
@@ -188,59 +204,69 @@ public:
 
   // = Load_Balancer::Object_Group idl methods.
 
+  /// Get group's id.
   char * id (void);
-  // Get group's id.
 
+  /**
+   * Adds a new <member> to the <Object_Group>.  Note that each
+   * <Member_ID> in an <Object_Group> must be unique.  If the
+   * group already contains a member with the same <Member_ID>, a
+   * <duplicate_member> exceptions is thrown.
+   */
   void bind (const Load_Balancer::Member & member);
-  // Adds a new <member> to the <Object_Group>.  Note that each
-  // <Member_ID> in an <Object_Group> must be unique.  If the
-  // group already contains a member with the same <Member_ID>, a
-  // <duplicate_member> exceptions is thrown.
 
+  /**
+   * Removes a member with the specified <Member_ID> from the
+   * <Object_Group>.  If none of the group's members have a
+   * Member_ID of <id>, <no_such_member> exception is thrown.
+   */
   void unbind (const char * id);
-  // Removes a member with the specified <Member_ID> from the
-  // <Object_Group>.  If none of the group's members have a
-  // Member_ID of <id>, <no_such_member> exception is thrown.
 
+  /**
+   * Returns a member object from this <Object_Group> in accordance with
+   * load balancing policy it implements, i.e., ``random'' or
+   * ``round robin.''  If the group contains no members, <no_such_member>
+   * exception is thrown.
+   */
   char * resolve (void)
     = 0;
-  // Returns a member object from this <Object_Group> in accordance with
-  // load balancing policy it implements, i.e., ``random'' or
-  // ``round robin.''  If the group contains no members, <no_such_member>
-  // exception is thrown.
 
+  /**
+   * Returns an object with the specified <Member_ID>.  If this
+   * <Object_Group> contains no members with the specified
+   * <Member_ID>, <no_such_member> exception is thrown.
+   */
   char * resolve_with_id (const char * id);
-  // Returns an object with the specified <Member_ID>.  If this
-  // <Object_Group> contains no members with the specified
-  // <Member_ID>, <no_such_member> exception is thrown.
 
+  /// Return a sequence of <Member_ID>s of all of its members.
   Load_Balancer::Member_ID_List * members (void);
-  // Return a sequence of <Member_ID>s of all of its members.
 
+  /**
+   * Cleanup the resources associated with this <Object_Group>.
+   * Subsequent calls to this <Object_Group> should fail, and its
+   * <id> should become available.  <Object_Group_Factory>
+   * should no longer list this <Object_Group>.
+   */
   void destroy (void);
-  // Cleanup the resources associated with this <Object_Group>.
-  // Subsequent calls to this <Object_Group> should fail, and its
-  // <id> should become available.  <Object_Group_Factory>
-  // should no longer list this <Object_Group>.
 
 protected:
 
+  /// This will replenish all the pointers that could have been lost
+  /// because of failure
   void read_from_memory (void);
-  // This will replenish all the pointers that could have been lost
-  // because of failure
 
+  /// Our POA
   PortableServer::POA_var poa_;
-  // Our POA
 
+  /// Typedefs for ease of use.
   typedef ACE_DLList<char *> LIST;
   typedef ACE_DLList_Iterator<char *> ITERATOR;
-  // Typedefs for ease of use.
 
+  /// List of ids of all the members of this group.
   LIST *member_id_list_;
-  // List of ids of all the members of this group.
 
+  /// Mapping of member_id to obj for all the members of this group.
   HASH_MAP *members_;
-  // Mapping of member_id to obj for all the members of this group.
 
   // Note, we store information redundantly in this implementation,
   // i.e., both <member_id_list_> and <members_> store member ids.
@@ -249,57 +275,63 @@ protected:
   // variations of <resolve> method to implement different policies.
   // <members_> is useful for doing id-based look-up.
 
+  /// This group's id.
   ACE_CString id_;
-  // This group's id.
 
+  /// Pointer to the location where I can allocate memory...
   ALLOCATOR *allocator_;
-  // Pointer to the location where I can allocate memory...
 };
 
 
+/**
+ * @class Random_Object_Group
+ *
+ * @brief This class implements <Object_Group> idl interface with the
+ * random policy for <resolve>.
+ */
 class Random_Object_Group : public Object_Group_i
 {
-  // = TITLE
-  //    This class implements <Object_Group> idl interface with the
-  //    random policy for <resolve>.
-  //
 public:
+  /// Constructor.
   Random_Object_Group (const char *id,
                        PortableServer::POA_ptr poa);
-  // Constructor.
 
+  /// Returns a member object from this <Object_Group> in accordance with
+  /// the "random" load balancing policy.
   char * resolve (void);
-  // Returns a member object from this <Object_Group> in accordance with
-  // the "random" load balancing policy.
 
 };
 
+/**
+ * @class RR_Object_Group:
+ *
+ * @brief This class implements <Object_Group> idl interface with the
+ * round robin policy for <resolve>.
+ */
 class RR_Object_Group: public Object_Group_i
 {
-  // = TITLE
-  //    This class implements <Object_Group> idl interface with the
-  //    round robin policy for <resolve>.
-  //
 public:
 
+  /// Constructor.
   RR_Object_Group (const char *id,
                    PortableServer::POA_ptr poa);
-  // Constructor.
 
+  /**
+   * We need to override the implementation of <unbind> from
+   * Object_Group_i to make sure <resolve>
+   * works correctly.
+   */
   void unbind (const char * id);
-  // We need to override the implementation of <unbind> from
-  // Object_Group_i to make sure <resolve>
-  // works correctly.
 
+  /// Returns a member object from this <Object_Group> in accordance with
+  /// the "round robin" load balancing policy.
   char * resolve (void);
-  // Returns a member object from this <Object_Group> in accordance with
-  // the "round robin" load balancing policy.
 
 private:
 
+  /// Index into the Object_Group_i::member_id_list_: keeps track of
+  /// the member_id to return on the next invocation of <resolve>.
   size_t next_;
-  // Index into the Object_Group_i::member_id_list_: keeps track of
-  // the member_id to return on the next invocation of <resolve>.
 };
 
 #endif /* LOAD_BALANCER_I_H_  */
diff --git a/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
index 72d0fd3a71b..365823b3eda 100644
--- a/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
+++ b/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
@@ -1,16 +1,13 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Load_Balancing
-//
-// = FILENAME
-//    Load_Balancing_Service.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Load_Balancing_Service.cpp
+ *
+ *  $Id$
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Load_Balancing_Service.h"
 #include "Load_Balancer_i.h"
diff --git a/examples/Load_Balancing_persistent/Load_Balancing_Service.h b/examples/Load_Balancing_persistent/Load_Balancing_Service.h
index f855506d106..bfec42f33f2 100644
--- a/examples/Load_Balancing_persistent/Load_Balancing_Service.h
+++ b/examples/Load_Balancing_persistent/Load_Balancing_Service.h
@@ -1,21 +1,18 @@
-// $Id$
 // -*- C++ -*-
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Load_Balancing
-//
-// = FILENAME
-//    Load_Balancing_Service.h
-//
-// = DESCRIPTION
-//    Driver for Load Balancing service.
-//
-// = AUTHORS
-//    Marina Spivak <marina@cs.wustl.edu>
-//    with modifications by Bala Natarajan <bala@cs.wustl.edu>
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Load_Balancing_Service.h
+ *
+ *  $Id$
+ *
+ *  Driver for Load Balancing service.
+ *
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu> with modifications by Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef LOAD_BALANCING_SERVICE_H_
 #define LOAD_BALANCING_SERVICE_H_
@@ -26,36 +23,39 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Load_Balancing_Service
+ *
+ * Server, which creates and initializes a
+ * <Load_Balancer::Object_Group_Factory>
+ * object, and runs the orb loop.
+ */
 class Load_Balancing_Service
 {
-  // =TITLE
-  //   Server, which creates and initializes a
-  //   <Load_Balancer::Object_Group_Factory>
-  //   object, and runs the orb loop.
 public:
 
+  /// Default constructor.
   Load_Balancing_Service (void);
-  // Default constructor.
 
+  /// Destructor.
   ~Load_Balancing_Service (void);
-  // Destructor.
 
+  /// Initialize the <Load_Balancing_Service>: initializes the ORB, parses
+  /// arguments, creates a servant ...
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize the <Load_Balancing_Service>: initializes the ORB, parses
-  // arguments, creates a servant ...
 
+  /// Run the server.
   int run (void);
-  // Run the server.
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parses the commandline arguments.
 
+  /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
 
+  /// File to output the <Object_Group_Factory> IOR.
   FILE *ior_output_file_;
-  // File to output the <Object_Group_Factory> IOR.
 };
 
 #endif /* LOAD_BALANCING_SERVICE_H_ */
diff --git a/examples/Load_Balancing_persistent/Makefile.am b/examples/Load_Balancing_persistent/Makefile.am
deleted file mode 100644
index ca12e6743f1..00000000000
--- a/examples/Load_Balancing_persistent/Makefile.am
+++ /dev/null
@@ -1,179 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Load_Balancing_Persistent_IDL.am
-
-BUILT_SOURCES = \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.cpp \
-  IdentityS.h \
-  IdentityS.inl
-
-CLEANFILES = \
-  Identity-stamp \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.cpp \
-  IdentityS.h \
-  IdentityS.inl
-
-IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.cpp IdentityS.h IdentityS.inl: Identity-stamp
-
-Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Identity.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.cpp \
-  Load_BalancerS.h \
-  Load_BalancerS.inl
-
-CLEANFILES += \
-  Load_Balancer-stamp \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.cpp \
-  Load_BalancerS.h \
-  Load_BalancerS.inl
-
-Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.cpp Load_BalancerS.h Load_BalancerS.inl: Load_Balancer-stamp
-
-Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Load_Balancer.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Identity.idl \
-  Load_Balancer.idl
-
-## Makefile.Load_Balancing_Persistent_Balancer.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-if !BUILD_REPO
-
-noinst_PROGRAMS += load_balancer
-
-load_balancer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-load_balancer_SOURCES = \
-  Load_BalancerC.cpp \
-  Load_BalancerS.cpp \
-  Load_Balancer_i.cpp \
-  Load_Balancing_Service.cpp \
-  Load_Balancer_i.h \
-  Load_Balancing_Service.h
-
-load_balancer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_REPO
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.Load_Balancing_Persistent_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_REPO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  IdentityC.cpp \
-  Identity_Client.cpp \
-  Load_BalancerC.cpp \
-  Identity_Client.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_REPO
-endif BUILD_EXCEPTIONS
-
-## Makefile.Load_Balancing_Persistent_Server.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_REPO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  IdentityC.cpp \
-  IdentityS.cpp \
-  Identity_Server.cpp \
-  Identity_i.cpp \
-  Load_BalancerC.cpp \
-  Identity_Server.h \
-  Identity_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_REPO
-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/examples/Logging/Logger_i.cpp b/examples/Logging/Logger_i.cpp
index 6de5eb3130d..e0f2f98a515 100644
--- a/examples/Logging/Logger_i.cpp
+++ b/examples/Logging/Logger_i.cpp
@@ -8,8 +8,6 @@
 #include "ace/Log_Record.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID(Log, Logger_i, "$Id$")
-
 Logger_Factory_i::Logger_Factory_i (void)
 {
 }
@@ -21,7 +19,7 @@ Logger_Factory_i::~Logger_Factory_i (void)
 Logger_ptr
 Logger_Factory_i::make_logger (const char *name)
 {
-  Logger_i *result;
+  Logger_i *result = 0;
   // If name is already in the map, <find> will assign <result> to the
   // appropriate value
 
@@ -59,6 +57,9 @@ Logger_Factory_i::make_logger (const char *name)
   // registration attempt.
   // @@ Matt, this code doesn't seem right.  Can you please check with
   // Irfan and Carlos about whether this is the right thing to do?
+  if (!result)
+    return Logger::_nil ();
+
   return result->_this ();
 }
 
diff --git a/examples/Logging/Logger_i.h b/examples/Logging/Logger_i.h
index d5a5a36cc5e..24850228c14 100644
--- a/examples/Logging/Logger_i.h
+++ b/examples/Logging/Logger_i.h
@@ -1,21 +1,17 @@
 // -*- C++ -*-
 
-// ============================================================================
-//
-// $Id$
-//
-// = LIBRARY
-//    TAO services
-//
-// = FILENAME
-//   Logger_i.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>,
-//    Sergio Flores-Gaitan <sergio@cs.wustl.edu>, and
-//    Matthew Braun <mjb2@cec.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Logger_i.h
+ *
+ *  $Id$
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ *  @author Sergio Flores-Gaitan <sergio@cs.wustl.edu>
+ *  @author and Matthew Braun <mjb2@cec.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_ORBSVCS_LOGGER_I_H
 #define TAO_ORBSVCS_LOGGER_I_H
@@ -25,76 +21,88 @@
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 
+/**
+ * @class Logger_i
+ *
+ * @brief Used to log messages to a logging server.
+ */
 class Logger_i : public virtual POA_Logger
 {
-  // = TITLE
-  //   Used to log messages to a logging server.
 public:
+  /// constructor
   Logger_i (const char* name);
-  // constructor
 
+  /// destructor
   virtual ~Logger_i (void);
-  // destructor
 
+  /// Writes the <log_rec> to the standard output.
   virtual void log (const Logger::Log_Record &log_rec);
-  // Writes the <log_rec> to the standard output.
 
+  /// Writes the <log_rec> to the standard output with the given
+  /// verbosity level
   virtual void logv (const Logger::Log_Record &log_rec,
                      Logger::Verbosity_Level verbosity);
-  // Writes the <log_rec> to the standard output with the given
-  // verbosity level
 
+  /// Writes the <log_rec> to the standard output.
   virtual void log_twoway (const Logger::Log_Record &log_rec);
-  // Writes the <log_rec> to the standard output.
 
+  /// Writes the <log_rec> to the standard output with the given
+  /// verbosity level
   virtual void logv_twoway (const Logger::Log_Record &log_rec,
                             Logger::Verbosity_Level verbosity);
-  // Writes the <log_rec> to the standard output with the given
-  // verbosity level
 
+  /// Sets the verbosity level. Valid values are {VERBOSE, VERBOSE_LITE
+  ///  and SILENT}. Defaults to VERBOSE
    void verbosity (Logger::Verbosity_Level level);
-  // Sets the verbosity level. Valid values are {VERBOSE, VERBOSE_LITE
-  //  and SILENT}. Defaults to VERBOSE
 
 private:
+  /// Converts the IDL defined <Log_Priority> enum type to the
+  /// <ACE_Log_Priority> enum type.
   ACE_Log_Priority priority_conversion (Logger::Log_Priority priority);
-  // Converts the IDL defined <Log_Priority> enum type to the
-  // <ACE_Log_Priority> enum type.
 
+  /**
+   * Converts the IDL defined <Verbosity_Level> enum type to a u_long,
+   * which is used by the <ACE_Log_Record> to distinguish the
+   * level of verbosity.
+   */
   u_long verbosity_conversion (Logger::Verbosity_Level verbosity_level);
-  // Converts the IDL defined <Verbosity_Level> enum type to a u_long,
-  // which is used by the <ACE_Log_Record> to distinguish the
-  // level of verbosity.
 
+  /// Logger identification.
   char *name_;
-  // Logger identification.
 
+  /// Keeps track of what our current verbosity level is.  This can be
+  /// reset by the client to a new value at any point.
   Logger::Verbosity_Level verbosity_level_;
-  // Keeps track of what our current verbosity level is.  This can be
-  // reset by the client to a new value at any point.
 };
 
+/**
+ * @class Logger_Factory_i
+ *
+ * @brief Create a <Logger> of type <name>.
+ */
 class Logger_Factory_i : public virtual POA_Logger_Factory
 {
-  // = TITLE
-  //     Create a <Logger> of type <name>.
 public:
+  /// Constructor.
   Logger_Factory_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~Logger_Factory_i (void);
-  // Destructor.
 
+  /**
+   * This function returns a logger with name <name>. If <name> is
+   * unique, a new logger is created; else, a previously created
+   * logger of name <name> is returned
+   */
   virtual Logger_ptr make_logger (const char *name);
-  // This function returns a logger with name <name>. If <name> is
-  // unique, a new logger is created; else, a previously created
-  // logger of name <name> is returned
 
 private:
+  /**
+   * Calls to <make_logger> will create a new instance of <Logger> and
+   * bind into the hash map manager if <name> is unique, else it will
+   * return a previously bound entry.
+   */
   ACE_Hash_Map_Manager<ACE_CString, Logger_i *, ACE_Null_Mutex> hash_map_;
-  // Calls to <make_logger> will create a new instance of <Logger> and
-  // bind into the hash map manager if <name> is unique, else it will
-  // return a previously bound entry.
 };
 
 #endif /* TAO_ORBSVCS_LOGGER_I_H */
diff --git a/examples/Logging/Logging_Service.cpp b/examples/Logging/Logging_Service.cpp
index 5481f7e8500..8bfc668cb41 100644
--- a/examples/Logging/Logging_Service.cpp
+++ b/examples/Logging/Logging_Service.cpp
@@ -3,8 +3,6 @@
 #include "Logging_Service_i.h"
 #include "tao/debug.h"
 
-ACE_RCSID(Logging_Service, Logging_Service, "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/examples/Logging/Logging_Service_i.cpp b/examples/Logging/Logging_Service_i.cpp
index ad35b282a65..0c8c78361a3 100644
--- a/examples/Logging/Logging_Service_i.cpp
+++ b/examples/Logging/Logging_Service_i.cpp
@@ -3,8 +3,6 @@
 #include "Logging_Service_i.h"
 #include "tao/debug.h"
 
-ACE_RCSID(Logging_Service, Logging_Service_i, "$Id$")
-
 Logger_Server::Logger_Server (void)
   :service_name_ (ACE_TEXT("LoggingService"))
 {
diff --git a/examples/Logging/Logging_Service_i.h b/examples/Logging/Logging_Service_i.h
index c30a6eb342b..13e479b9568 100644
--- a/examples/Logging/Logging_Service_i.h
+++ b/examples/Logging/Logging_Service_i.h
@@ -1,24 +1,19 @@
-// -*- c++ -*-
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Logging_Service/
-//
-// = FILENAME
-//    Logging_Service_i.h
-//
-// = DESCRIPTION
-//      This class implements a simple "logger" CORBA server for the Logging
-//      service using skeletons generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//    Nagarajan Surendran <naga@cs.wustl.edu>
-//    Matthew Braun <mjb2@cec.wustl.edu>
-//
-// ============================================================================
+
+
+//=============================================================================
+/**
+ *  @file    Logging_Service_i.h
+ *
+ *  $Id$
+ *
+ *    This class implements a simple "logger" CORBA server for the Logging
+ *    service using skeletons generated by the TAO ORB IDL compiler.
+ *
+ *
+ *  @author Nagarajan Surendran <naga@cs.wustl.edu> Matthew Braun <mjb2@cec.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _LOG_SERVER_H
 #define _LOG_SERVER_H
@@ -30,7 +25,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Log_Msg.h"
-#include "ace/OS.h"
 #include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Client.h"
@@ -38,64 +32,66 @@
 #include "LoggerS.h"
 #include "LoggerC.h"
 
+/**
+ * @class Logger_Server
+ *
+ * @brief Defines a Logger_Server class that implements the functionality
+ * of a server process as an object.
+ *
+ * The interface is quite simple. A server program has to call
+ * init to initialize the logger_server's state and then call run
+ * to run the orb.
+ */
 class Logger_Server
 {
-  // = TITLE
-  //   Defines a Logger_Server class that implements the functionality
-  //   of a server process as an object.
-  //
-  // = DESCRIPTION
-  //   The interface is quite simple. A server program has to call
-  //   init to initialize the logger_server's state and then call run
-  //   to run the orb.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Logger_Server (void);
-  // Constructor.
 
+  /// Destructor.
   ~Logger_Server (void);
-  // Destructor.
 
+  /// Initialize the Logger_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
-  // Initialize the Logger_Server state - parsing arguments and ...
 
+  /// Run the ORB.
   int run (void);
-  // Run the ORB.
 
+  /// This function creates and returns a logger with the given <name>.
+  /// Currently, <name> is unused.
   Logger_ptr make_logger (const char *name);
-  // This function creates and returns a logger with the given <name>.
-  // Currently, <name> is unused.
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// Initialises the name server and registers logger_factory with the
+  /// name server.
   int init_naming_service (void);
-  // Initialises the name server and registers logger_factory with the
-  // name server.
 
+  /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
 
+  /// helper class for getting access to Naming Service.
   TAO_Naming_Client my_name_server_;
-  // helper class for getting access to Naming Service.
 
+  /// Implementation object of the Logger_Factory.
   Logger_Factory_i factory_impl_;
-  // Implementation object of the Logger_Factory.
 
+  /// Factory_var to register with NamingService.
   Logger_Factory_var factory_;
-  // Factory_var to register with NamingService.
 
+  /// Number of commandline arguments.
   int argc_;
-  // Number of commandline arguments.
 
+  /// commandline arguments.
   ACE_TCHAR **argv_;
-  // commandline arguments.
 
+  /// The id to give the Logger_Factory instance (defaults to
+  /// "LoggingService")
   const ACE_TCHAR* service_name_;
-  // The id to give the Logger_Factory instance (defaults to
-  // "LoggingService")
 };
 
 #endif /* _LOG_SERVER_H */
diff --git a/examples/Logging/Logging_Test.cpp b/examples/Logging/Logging_Test.cpp
index 535e3903b51..1a887e5a1db 100644
--- a/examples/Logging/Logging_Test.cpp
+++ b/examples/Logging/Logging_Test.cpp
@@ -2,10 +2,7 @@
 
 #include "Logging_Test_i.h"
 
-ACE_RCSID(Logger, Logging_Test, "$Id$")
-
 // This function runs the Logging service test.
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/examples/Logging/Logging_Test_i.cpp b/examples/Logging/Logging_Test_i.cpp
index 2c1e443afd1..c628af31064 100644
--- a/examples/Logging/Logging_Test_i.cpp
+++ b/examples/Logging/Logging_Test_i.cpp
@@ -11,10 +11,6 @@
 #include "ace/OS_NS_arpa_inet.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID (Logger,
-           Logging_Test_i,
-           "$Id$")
-
   // Constructor
   Logger_Client::Logger_Client (void)
 {
diff --git a/examples/Logging/Logging_Test_i.h b/examples/Logging/Logging_Test_i.h
index ced9e36d3ff..9389298224e 100644
--- a/examples/Logging/Logging_Test_i.h
+++ b/examples/Logging/Logging_Test_i.h
@@ -1,23 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/Logger
-//
-// = FILENAME
-//    client_i.h
-//
-// = DESCRIPTION
-//    This class implements a simple logger CORBA client for the Logger
-//    example using stubs generated by the TAO ORB IDL compiler
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//      Matt Braun <mjb2@cec.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Logging_Test_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements a simple logger CORBA client for the Logger
+ *  example using stubs generated by the TAO ORB IDL compiler
+ *
+ *
+ *  @author   Sergio Flores-Gaitan <sergio@cs.wustl.edu>   Matt Braun <mjb2@cec.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _LOG_CLIENT_H
 #define _LOG_CLIENT_H
@@ -32,72 +28,74 @@
 #include "LoggerC.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 
+/**
+ * @class Logger_Client
+ *
+ * @brief Defines a class that encapsulates behaviour of the Logger
+ * client example.  Provides a better understanding of the logic
+ * in an object oriented way.
+ *
+ * This class declares an interface to run the example client for
+ * Logger CORBA server.  All the complexity for initializing the
+ * server is hidden in the class.  Just the <run> interface is
+ * needed.
+ */
 class Logger_Client
 {
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the Logger
-  //    client example.  Provides a better understanding of the logic
-  //    in an object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    Logger CORBA server.  All the complexity for initializing the
-  //    server is hidden in the class.  Just the <run> interface is
-  //    needed.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.
   Logger_Client (void);
-  // Constructor.
 
+  /// Destructor.
   ~Logger_Client (void);
-  // Destructor.
 
+  /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the client communication endpoint with server.
 
+  /// Execute client example code.
   int run (void);
-  // Execute client example code.
 
 private:
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// Prepares the <Log_Record> for logging.
   void init_record (Logger::Log_Record &newrec,
                     Logger::Log_Priority lp,
                     const char *msg);
-  // Prepares the <Log_Record> for logging.
 
+  /// Initialises the name server and resolves the logger_factory
   int init_naming_service (void);
-  // Initialises the name server and resolves the logger_factory
 
+  /// Instantiates the 2 logger member variables
   int init_loggers (void);
-  // Instantiates the 2 logger member variables
 
+  /// Shows contents of the record (for debugging purposes).
   void show_record (Logger::Log_Record &newrec);
-  // Shows contents of the record (for debugging purposes).
 
+  /// Keep a pointer to the ORB for easy access
   CORBA::ORB_var orb_;
-  // Keep a pointer to the ORB for easy access
 
+  /// An instance of the name client used for resolving the factory
+  /// objects.
   TAO_Naming_Client my_name_client_;
-  // An instance of the name client used for resolving the factory
-  // objects.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// A pointer to the Logger_Factory; used in init_loggers
   Logger_Factory_var factory_;
-  // A pointer to the Logger_Factory; used in init_loggers
 
+  /// Logger obj ref.
   Logger_var logger_1_;
-  // Logger obj ref.
 
+  /// Logger obj ref.
   Logger_var logger_2_;
-  // Logger obj ref.
 };
 
 #endif /* _LOG_CLIENT_H */
diff --git a/examples/Logging/Makefile.am b/examples/Logging/Makefile.am
deleted file mode 100644
index 6ee689e1b9c..00000000000
--- a/examples/Logging/Makefile.am
+++ /dev/null
@@ -1,123 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Logging_IDL.am
-
-BUILT_SOURCES = \
-  LoggerC.cpp \
-  LoggerC.h \
-  LoggerC.inl \
-  LoggerS.cpp \
-  LoggerS.h \
-  LoggerS.inl
-
-CLEANFILES = \
-  Logger-stamp \
-  LoggerC.cpp \
-  LoggerC.h \
-  LoggerC.inl \
-  LoggerS.cpp \
-  LoggerS.h \
-  LoggerS.inl
-
-LoggerC.cpp LoggerC.h LoggerC.inl LoggerS.cpp LoggerS.h LoggerS.inl: Logger-stamp
-
-Logger-stamp: $(srcdir)/Logger.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Logger.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Logger.idl
-
-## Makefile.Logging_Service.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Logging_Service
-
-Logging_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Logging_Service_SOURCES = \
-  LoggerC.cpp \
-  LoggerS.cpp \
-  Logger_i.cpp \
-  Logging_Service.cpp \
-  Logging_Service_i.cpp \
-  Logger_i.h \
-  Logging_Service_i.h
-
-Logging_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Logging_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Logging_Test
-
-Logging_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Logging_Test_SOURCES = \
-  LoggerC.cpp \
-  LoggerS.cpp \
-  Logging_Test.cpp \
-  Logging_Test_i.cpp \
-  Logging_Test_i.h
-
-Logging_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/examples/Makefile.am b/examples/Makefile.am
deleted file mode 100644
index 8e78f3b662d..00000000000
--- a/examples/Makefile.am
+++ /dev/null
@@ -1,36 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AMH \
-        AMI \
-        Advanced \
-        Buffered_AMI \
-        Buffered_Oneways \
-        CSD_Strategy \
-        Callback_Quoter \
-        Content_Server \
-        Event_Comm \
-        Kokyu_dsrt_schedulers \
-        Load_Balancing \
-        Load_Balancing_persistent \
-        Logging \
-        OBV \
-        Persistent_Grid \
-        PluggableUDP \
-        Quoter \
-        RTCORBA \
-        RTScheduling \
-        Simple \
-        Simulator \
-        TypeCode_Creation \
-        ior_corbaloc \
-        mfc
-
diff --git a/examples/OBV/Makefile.am b/examples/OBV/Makefile.am
deleted file mode 100644
index bbe993485ca..00000000000
--- a/examples/OBV/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Typed_Events
-
diff --git a/examples/OBV/Simple_util.h b/examples/OBV/Simple_util.h
index c21104a5118..17ac8c86e37 100644
--- a/examples/OBV/Simple_util.h
+++ b/examples/OBV/Simple_util.h
@@ -1,24 +1,18 @@
-//$Id$
-
-// This version of Simple_Util doesn't need to link against orbsvcs
-// On the other hand it has no naming service.
-
-// ============================================================================
-//
-// = LIBRARY
-//
-//    taken from TAO/tests/Simple
-//
-// = FILENAME
-//    Simple_Util.h
-//
-// = DESCRIPTION
-//    The classe define the templates for the client and server.
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+
+//=============================================================================
+/**
+ *  @file    Simple_util.h
+ *
+ *  $Id$
+ *
+ *  The classe define the templates for the client and server.
+ *
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_UTIL_H
 #define TAO_UTIL_H
@@ -28,134 +22,138 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
+/**
+ * @class Server
+ *
+ * @brief A set of useful class Templates for using the TAO CORBA
+ * implementation.
+ *
+ * A template server definition. This template can be used by
+ * single server/client projects for defintion of their
+ * server/clients.  See the directories time, bank, echo for
+ * further details of implemenatation.
+ */
 template <class Servant>
 class Server
 {
-  // = TITLE
-  //   A set of useful class Templates for using the TAO CORBA
-  //   implementation.
-  //
-  // = DESCRIPTION
-  //   A template server definition. This template can be used by
-  //   single server/client projects for defintion of their
-  //   server/clients.  See the directories time, bank, echo for
-  //   further details of implemenatation.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.
   Server (void);
-  // Constructor.
 
+  /// Destructor.
   ~Server (void);
-  // Destructor.
 
+  /// Initialize the Server state - parsing arguments and waiting.
+  /// interface_name is the name used to register the Servant.
   int init (const char *servant_name,
             int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the Server state - parsing arguments and waiting.
-  // interface_name is the name used to register the Servant.
 
+  /// After calling <init>, this method will register the server with
+  /// the TAO Naming Service using the servant_name passed to <init>.
   int register_name (void);
-  // After calling <init>, this method will register the server with
-  // the TAO Naming Service using the servant_name passed to <init>.
 
+  /// Run the orb.
   int run (void);
-  // Run the orb.
 
 protected:
+  /// Servant class
   Servant servant_;
-  // Servant class
 
+  /// name of the servant to be used for TAO Naming Service
   const char *name;
-  // name of the servant to be used for TAO Naming Service
 
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// The ORB manager - a helper class for accessing the POA and
+  /// registering objects.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager - a helper class for accessing the POA and
-  // registering objects.
 
   // TAO_Naming_Server namingServer;
   // helper class for getting access to Naming Service.
 
+  /// File where the IOR of the server object is stored.
   FILE *ior_output_file_;
-  // File where the IOR of the server object is stored.
 
+  /// Number of command line arguments.
   int argc_;
-  // Number of command line arguments.
 
+  /// The command line arguments.
   ACE_TCHAR **argv_;
-  // The command line arguments.
 };
 
+/**
+ * @class Client
+ *
+ * @brief Template Client class
+ *
+ * A template client implementation for a single server/client
+ * model. The example usage of these usage can be found in the
+ * sub-directories below
+ */
 template <class InterfaceObj, class Var>
 class Client
 {
-  // = TITLE
-  //   Template Client class
-  //
-  // = DESCRIPTION
-  //   A template client implementation for a single server/client
-  //   model. The example usage of these usage can be found in the
-  //   sub-directories below
 public:
 
   // = Initialization and termination methods.
+  /// Constructor.
   Client (void);
-  // Constructor.
 
+  /// Destructor.
   ~Client (void);
-  // Destructor.
 
+  /// Initialize the client communication endpoint with server.
   int init (const char *name,int argc, ACE_TCHAR *argv[]);
-  // Initialize the client communication endpoint with server.
 
+  /// Return the interface object pointer.
   InterfaceObj *operator-> () { return server_.in ();};
-  // Return the interface object pointer.
 
+  /// Returns the shutdown flag.
   int shutdown (void );
-  // Returns the shutdown flag.
 
+  /// Fills in the shutdwon flag.
   void shutdown (int);
-  // Fills in the shutdwon flag.
 
+  /// Initialize naming service
   int obtain_initial_references (void);
-  // Initialize naming service
 
 protected:
+  /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the server IOR from a file.
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
 //  TAO_Naming_Client namingClient;
   // helper class for getting access to Naming Service.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// IOR of the obj ref of the server.
   char *ior_;
-  // IOR of the obj ref of the server.
 
+  /// Name to be usred for the naming service
   char *name_;
-  // Name to be usred for the naming service
 
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
+  /// Server object
   Var server_;
-  // Server object
 
+  /// Flag to use the naming service
   int naming_;
-  // Flag to use the naming service
 
+  /// Flag for shutting down the server
   int shutdown_;
-  // Flag for shutting down the server
 
 };
 
diff --git a/examples/OBV/Typed_Events/Client_i.h b/examples/OBV/Typed_Events/Client_i.h
index 72894ea1a58..e1ea4b9fbbc 100644
--- a/examples/OBV/Typed_Events/Client_i.h
+++ b/examples/OBV/Typed_Events/Client_i.h
@@ -1,26 +1,20 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/OBV/Typed_Events
-//
-// = FILENAME
-//    Client_i.h
-//
-// = DESCRIPTION
-//    This class is a template for a CORBA client.
-//    run () sends some valuetypes to a server and
-//    gets back a list of valuetypes.
-//
-// = AUTHOR
-//
-//   Torsten Kuepper
-//   based on the echo example
-//   from code from Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Client_i.h
+ *
+ *  $Id$
+ *
+ *  This class is a template for a CORBA client.
+ *  run () sends some valuetypes to a server and
+ *  gets back a list of valuetypes.
+ *
+ *
+ *  @author Torsten Kuepperbased on the echo examplefrom code from Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ECHO_CLIENT_I_H
 #define ECHO_CLIENT_I_H
@@ -30,28 +24,30 @@
 
 CORBA::Float random_number (double min, double max);
 
+/**
+ * @class Checkpoint_Client_i
+ *
+ * @brief Checkpoint_Client interface subclass.
+ *
+ * This class implements the interface between the interface
+ * objects and the client .
+ */
 class Checkpoint_Client_i
 {
-  // = TITLE
-  //   Checkpoint_Client interface subclass.
-  //
-  // = DESCRIPTION
-  //   This class implements the interface between the interface
-  //   objects and the client .
 public:
   // = Initialization and termination methods.
+  /// Constructor
   Checkpoint_Client_i (void);
-  // Constructor
 
+  /// Destructor
   virtual  ~Checkpoint_Client_i (void);
-  // Destructor
 
+  /// Execute the methods
   virtual int run (const char *,int, ACE_TCHAR** );
-  // Execute the methods
 
 private:
+  /// Instantiate the checkpoint object.
   Client<Checkpoint, Checkpoint_var> checkpoint;
-  // Instantiate the checkpoint object.
 };
 
 
diff --git a/examples/OBV/Typed_Events/Makefile.am b/examples/OBV/Typed_Events/Makefile.am
deleted file mode 100644
index 72458f55b04..00000000000
--- a/examples/OBV/Typed_Events/Makefile.am
+++ /dev/null
@@ -1,125 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Typed_Events_IDL.am
-
-BUILT_SOURCES = \
-  Event_TypesC.cpp \
-  Event_TypesC.h \
-  Event_TypesC.inl \
-  Event_TypesS.cpp \
-  Event_TypesS.h \
-  Event_TypesS.inl
-
-CLEANFILES = \
-  Event_Types-stamp \
-  Event_TypesC.cpp \
-  Event_TypesC.h \
-  Event_TypesC.inl \
-  Event_TypesS.cpp \
-  Event_TypesS.h \
-  Event_TypesS.inl
-
-Event_TypesC.cpp Event_TypesC.h Event_TypesC.inl Event_TypesS.cpp Event_TypesS.h Event_TypesS.inl: Event_Types-stamp
-
-Event_Types-stamp: $(srcdir)/Event_Types.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa $(srcdir)/Event_Types.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Event_Types.idl
-
-## Makefile.Typed_Events_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ../Simple_util.cpp \
-  Client_i.cpp \
-  Event_TypesC.cpp \
-  Event_TypesS.cpp \
-  Event_Types_impl.cpp \
-  client.cpp \
-  ../Simple_util.h \
-  Client_i.h \
-  Event_Types_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Typed_Events_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ../Simple_util.cpp \
-  Event_TypesC.cpp \
-  Event_TypesS.cpp \
-  Event_Types_impl.cpp \
-  Server_i.cpp \
-  server.cpp \
-  ../Simple_util.h \
-  Event_Types_impl.h \
-  Server_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/examples/OBV/Typed_Events/Server_i.h b/examples/OBV/Typed_Events/Server_i.h
index 8341c26165e..8e6c0002ce3 100644
--- a/examples/OBV/Typed_Events/Server_i.h
+++ b/examples/OBV/Typed_Events/Server_i.h
@@ -1,23 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/OBV/Typed_Events
-//
-// = FILENAME
-//    Server_i.h
-//
-// = DESCRIPTION
-//    This class implements the Event_Types IDL interface.
-//
-// = AUTHOR
-//    Torsten Kuepper
-//    derived from the Echo example TAO/example/Simple/echo
-//    of Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Server_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Event_Types IDL interface.
+ *
+ *
+ *  @author Torsten Kuepper derived from the Echo example TAO/example/Simple/echo of Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ECHO_I_H
 #define ECHO_I_H
@@ -29,11 +24,11 @@ class Checkpoint_i : public POA_Checkpoint
 {
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Checkpoint_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~Checkpoint_i (void);
-  // Destructor.
 
   virtual void put_event (
         Event * e
@@ -42,15 +37,15 @@ public:
   virtual Event_List * get_critical_events (
   );
 
+  /// Shutdown the server.
   virtual void shutdown (void);
-  // Shutdown the server.
 
+  /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
 
 private:
+  /// ORB pointer.
   CORBA::ORB_var orb_;
-  // ORB pointer.
 };
 
 #endif /* ECHO_I_H */
diff --git a/examples/Persistent_Grid/Grid.idl b/examples/Persistent_Grid/Grid.idl
index 1f8b74be7a6..20f885c4978 100644
--- a/examples/Persistent_Grid/Grid.idl
+++ b/examples/Persistent_Grid/Grid.idl
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-interface Grid 
+interface Grid
 {
   // = TITLE
   //   Create a <Grid> of type <name>
@@ -12,7 +12,7 @@ interface Grid
   attribute short width;
   // Width of the grid.
 
-  exception RANGE_ERROR 
+  exception RANGE_ERROR
     {
       // = TITLE
       // The range of parameter values do not fall in the expected
@@ -27,7 +27,7 @@ interface Grid
     raises (RANGE_ERROR);
   // Set the element [n,m] of the grid, to value.
 
-  long get (in short n, in short m) 
+  long get (in short n, in short m)
     raises (RANGE_ERROR);
   // Return element [n,m] of the grid.
 
@@ -45,7 +45,7 @@ interface Grid_Factory
   const short DEFAULT_WIDTH = 10;
 
   Grid make_grid (in short height, in short width);
-  // Returns a new <Grid> instance.  
+  // Returns a new <Grid> instance.
 
   void shutdown ();
   // Shutdown the application.
diff --git a/examples/Persistent_Grid/Grid_Client_i.h b/examples/Persistent_Grid/Grid_Client_i.h
index 082c0d87bbb..1183592b637 100644
--- a/examples/Persistent_Grid/Grid_Client_i.h
+++ b/examples/Persistent_Grid/Grid_Client_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/grid
-//
-// = FILENAME
-//    Grid_Client_i.h
-//
-// = DESCRIPTION
-//    This class implements the interface calls for RMI.
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Grid_Client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the interface calls for RMI.
+ *
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef GRID_CLIENT_I_H
 #define GRID_CLIENT_I_H
@@ -23,49 +20,51 @@
 #include "Simple_util.h"
 #include "GridC.h"
 
+/**
+ * @class Grid_Client_i
+ *
+ * @brief Grid_Client interface subclass.
+ *
+ * This class implements the interface between the interface
+ * objects and the client .
+ */
 class Grid_Client_i
 {
-  // = TITLE
-  //   Grid_Client interface subclass.
-  //
-  // = DESCRIPTION
-  //   This class implements the interface between the interface
-  //   objects and the client .
 public:
   // = Initialization and termination methods.
+  /// Constructor
   Grid_Client_i (void);
-  // Constructor
 
+  /// Destructor
   virtual ~Grid_Client_i (void);
-  // Destructor
 
+  /// Execute the methods.
   virtual int run (const char *, int, ACE_TCHAR *[]);
-  // Execute the methods.
 
+  /// Parses the command line arguments.
   virtual int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parses the command line arguments.
 
 private:
+  /// Instantiate the client object.
   Client<Grid_Factory, Grid_Factory_var> client;
-  // Instantiate the client object.
 
+  /// Height of the grid.
   CORBA::Short height_;
-  // Height of the grid.
 
+  /// Width of the grid.
   CORBA::Short width_;
-  // Width of the grid.
 
+  /// Cell identifier in which a value meeds to be stored.
   CORBA::Short setx_;
-  // Cell identifier in which a value meeds to be stored.
 
+  /// Cell identifier in which a value meeds to be stored.
   CORBA::Short sety_;
-  // Cell identifier in which a value meeds to be stored.
 
+  /// The value that needs to be stored in the cell.
   CORBA::Long value_;
-  // The value that needs to be stored in the cell.
 
+  /// A flag for testing persistence
   CORBA::Short repeat_;
-  // A flag for testing persistence
 };
 
 #endif /* TIME_CLIENT_I_H */
diff --git a/examples/Persistent_Grid/Grid_i.h b/examples/Persistent_Grid/Grid_i.h
index e2711fa24cf..31c3a766303 100644
--- a/examples/Persistent_Grid/Grid_i.h
+++ b/examples/Persistent_Grid/Grid_i.h
@@ -1,26 +1,22 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/grid
-//
-// = FILENAME
-//    Grid_i.h
-//
-// = DESCRIPTION
-//    This class implements the Grid IDL interface.
-//
-// = AUTHOR
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Grid_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Grid IDL interface.
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef GRID_I_H
 #define GRID_I_H
 
 #include "GridS.h"
-#include "ace/OS.h"
 #include "ace/Memory_Pool.h"
 #include "ace/Null_Mutex.h"
 #include "ace/Malloc_T.h"
@@ -29,61 +25,66 @@ typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> pool_t;
 // Memory pool for the persistent stuff
 
 //class Grid_Factory_i;
+/**
+ * @class Grid_Factory_i
+ *
+ * Create a <Grid>.
+ */
 class Grid_Factory_i : public POA_Grid_Factory
 {
-  // =TITLE
-  //   Create a <Grid>.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Grid_Factory_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~Grid_Factory_i (void);
-  // Destructor.
 
+  /// This function creates and returns a <Grid>.
   virtual Grid_ptr make_grid (CORBA::Short,
                               CORBA::Short);
-  // This function creates and returns a <Grid>.
 
+  /// Shutdown the server.
   virtual void shutdown (void);
-  // Shutdown the server.
 
+  /// Do a clean up of the memory map
   virtual void cleanup ( );
-  // Do a clean up of the memory map
 
+  /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
 
+  /// Set the pool pointer
   void pool_name (const ACE_TCHAR *name);
-  // Set the pool pointer
 
 private:
+  /// ORB pointer.
   CORBA::ORB_var orb_;
-  // ORB pointer.
 
+  /// Name of the pool
   ACE_TCHAR *pool_name_;
-  // Name of the pool
 
+  /// Hold the pool of name pool_name_
   pool_t *pool_t_;
-  // Hold the pool of name pool_name_
 
+  /// Keeping g++2.7.2
   ACE_UNIMPLEMENTED_FUNC (void operator= (const Grid_Factory_i &))
-  // Keeping g++2.7.2
 };
 
 
+/**
+ * @class Grid_i:
+ *
+ * @brief Grid object implementation.
+ *
+ * Grid object implementation
+ */
 class Grid_i: public POA_Grid
 {
-  // = TITLE
-  //    Grid object implementation.
-  //
-  // = DESCRIPTION
-  //    Grid object implementation
 public:
   // = Initialization and termination methods.
 
+  /// Constructor
   Grid_i (void);
-  // Constructor
 
   Grid_i (CORBA::Short,
           CORBA::Short,
@@ -91,48 +92,48 @@ public:
 
   // Constructor.
 
+  /// Destructor
   ~Grid_i (void);
-  // Destructor
 
+  /// Returns the width of the grid
   virtual CORBA::Short width (void);
-  // Returns the width of the grid
 
+  /// Returns the height of the grid
   virtual CORBA::Short height (void);
-  // Returns the height of the grid
 
+  /// Sets the width of the grid.
   virtual void width (CORBA::Short);
-  // Sets the width of the grid.
 
+  /// Sets the height of the grid.
   virtual void height (CORBA::Short);
-  // Sets the height of the grid.
 
+  /// Sets the grid value.
   virtual void set (CORBA::Short,
                     CORBA::Short,
                     CORBA::Long);
-  // Sets the grid value.
 
+  /// Gets the grid value.
   virtual CORBA::Long get (CORBA::Short,
                            CORBA::Short);
-  // Gets the grid value.
 
+  /// Destroy the grid.
   virtual void destroy (void);
-  // Destroy the grid.
 
+  /// Set a pointer to the pool
   void set_pool (pool_t *);
-  // Set a pointer to the pool
 
 private:
+  /// Width of the grid.
   CORBA::Short width_;
-  // Width of the grid.
 
+  /// Height of the grid.
   CORBA::Short height_;
-  // Height of the grid.
 
+  /// Pointer to the matrix.  This is organized as an "array of arrays."
   CORBA::Long **array_;
-  // Pointer to the matrix.  This is organized as an "array of arrays."
 
+  ///Pointer to the memory pool..
   pool_t *pool_t_;
-  //Pointer to the memory pool..
 };
 
 
diff --git a/examples/Persistent_Grid/Makefile.am b/examples/Persistent_Grid/Makefile.am
deleted file mode 100644
index 28f79db0a36..00000000000
--- a/examples/Persistent_Grid/Makefile.am
+++ /dev/null
@@ -1,148 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Persistent_Grid_IDL.am
-
-BUILT_SOURCES = \
-  GridC.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.cpp \
-  GridS.h \
-  GridS.inl
-
-CLEANFILES = \
-  Grid-stamp \
-  GridC.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.cpp \
-  GridS.h \
-  GridS.inl
-
-GridC.cpp GridC.h GridC.inl GridS.cpp GridS.h GridS.inl: Grid-stamp
-
-Grid-stamp: $(srcdir)/Grid.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Grid.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Grid.idl
-
-## Makefile.Persistent_Grid_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  GridC.cpp \
-  Grid_Client_i.cpp \
-  Simple_util.cpp \
-  client.cpp \
-  Grid_Client_i.h \
-  Simple_util.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Persistent_Grid_Persistent_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += persistent_client
-
-persistent_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-persistent_client_SOURCES = \
-  GridC.cpp \
-  Persistent_Client_i.cpp \
-  Simple_util.cpp \
-  persistent_client.cpp \
-  Simple_util.h
-
-persistent_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Persistent_Grid_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  GridC.cpp \
-  GridS.cpp \
-  Grid_i.cpp \
-  Simple_util.cpp \
-  server.cpp \
-  Grid_i.h \
-  Simple_util.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/examples/Persistent_Grid/Persistent_Client.h b/examples/Persistent_Grid/Persistent_Client.h
index 93ad2fd9e99..966cf21c66f 100644
--- a/examples/Persistent_Grid/Persistent_Client.h
+++ b/examples/Persistent_Grid/Persistent_Client.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Persistent_Client
-//
-// = FILENAME
-//    Persistent_Client_i.h
-//
-// = DESCRIPTION
-//    This class implements the interface calls for RMI.
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Persistent_Client.h
+ *
+ *  $Id$
+ *
+ *  This class implements the interface calls for RMI.
+ *
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef PERSISTENT_CLIENT_I_H
 #define PERSISTENT_CLIENT_I_H
@@ -23,40 +20,42 @@
 #include "Simple_util.h"
 #include "GridC.h"
 
+/**
+ * @class Persistent_Client_i
+ *
+ * @brief Grid_Client interface subclass.
+ *
+ * This class implements the interface between the interface
+ * objects and the client .
+ */
 class Persistent_Client_i
 {
-  // = TITLE
-  //   Grid_Client interface subclass.
-  //
-  // = DESCRIPTION
-  //   This class implements the interface between the interface
-  //   objects and the client .
 public:
   // = Initialization and termination methods.
+  /// Constructor
   Persistent_Client_i (void);
-  // Constructor
 
+  /// Destructor
   virtual ~Persistent_Client_i (void);
-  // Destructor
 
+  /// Execute the methods.
   virtual int run (const char *, int, ACE_TCHAR *[]);
-  // Execute the methods.
 
+  /// Parses the command line arguments.
   virtual int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parses the command line arguments.
 
 private:
+  /// Instantiate the client object.
   Client<Grid_Factory, Grid_Factory_var> client;
-  // Instantiate the client object.
 
+  /// Height of the grid
   CORBA::Short height_;
-  // Height of the grid
 
+  /// Width of the grid.
   CORBA::Short width_;
-  // Width of the grid.
 
+  /// Flag for the deletion of memory
   CORBA::Short remove_;
-  // Flag for the deletion of memory
 };
 
 #endif /* PERSISTENT_CLIENT_I_H */
diff --git a/examples/Persistent_Grid/Simple_util.h b/examples/Persistent_Grid/Simple_util.h
index b63f79c4eaa..31547676bce 100644
--- a/examples/Persistent_Grid/Simple_util.h
+++ b/examples/Persistent_Grid/Simple_util.h
@@ -1,20 +1,17 @@
-//$Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple
-//
-// = FILENAME
-//    Simple_Util.h
-//
-// = DESCRIPTION
-//    The classe define the templates for the client and server.
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Simple_util.h
+ *
+ *  $Id$
+ *
+ *  The classe define the templates for the client and server.
+ *
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_UTIL_H
 #define TAO_UTIL_H
@@ -23,132 +20,136 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
+/**
+ * @class Server
+ *
+ * @brief A set of useful class Templates for using the TAO CORBA
+ * implementation.
+ *
+ * A template server definition. This template can be used by
+ * single server/client projects for defintion of their
+ * server/clients.  See the directories time, bank, echo for
+ * further details of implemenatation.
+ */
 template <class Servant>
 class Server
 {
-  // = TITLE
-  //   A set of useful class Templates for using the TAO CORBA
-  //   implementation.
-  //
-  // = DESCRIPTION
-  //   A template server definition. This template can be used by
-  //   single server/client projects for defintion of their
-  //   server/clients.  See the directories time, bank, echo for
-  //   further details of implemenatation.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.
   Server (void);
-  // Constructor.
 
+  /// Destructor.
   ~Server (void);
-  // Destructor.
 
+  /// Initialize the Server state - parsing arguments and waiting.
+  /// interface_name is the name used to register the Servant.
   int init (const char *servant_name,
             int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the Server state - parsing arguments and waiting.
-  // interface_name is the name used to register the Servant.
 
   // int register_name (void);
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
+  /// Run the orb.
   int run (void);
-  // Run the orb.
 
  protected:
+  /// Servant class
   Servant servant_;
-  // Servant class
 
+  /// name of the servant to be used for TAO Naming Service
   const char *name;
-  // name of the servant to be used for TAO Naming Service
 
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// The ORB manager - a helper class for accessing the POA and
+  /// registering objects.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager - a helper class for accessing the POA and
-  // registering objects.
 
+  /// File where the IOR of the server object is stored.
   FILE *ior_output_file_;
-  // File where the IOR of the server object is stored.
 
+  /// Memory pool name that stores the state
   ACE_TCHAR* mem_pool_name_;
-  // Memory pool name that stores the state
 
+  /// Number of command line arguments.
   int argc_;
-  // Number of command line arguments.
 
+  /// The command line arguments.
   ACE_TCHAR **argv_;
-  // The command line arguments.
 
 };
 
 
 // Client Class starts here
 
+/**
+ * @class Client
+ *
+ * @brief Template Client class
+ *
+ * A template client implementation for a single server/client
+ * model. The example usage of these usage can be found in the
+ * sub-directories below
+ */
 template <class InterfaceObj, class Var>
 class Client
 {
-  // = TITLE
-  //   Template Client class
-  //
-  // = DESCRIPTION
-  //   A template client implementation for a single server/client
-  //   model. The example usage of these usage can be found in the
-  //   sub-directories below
 public:
 
   // = Initialization and termination methods.
+  /// Constructor.
   Client (void);
-  // Constructor.
 
+  /// Destructor.
   ~Client (void);
-  // Destructor.
 
+  /// Initialize the client communication endpoint with server.
   int init (const char *name,int argc, ACE_TCHAR *argv[]);
-  // Initialize the client communication endpoint with server.
 
+  /// Return the interface object pointer.
   InterfaceObj *operator-> () { return server_.in ();};
-  // Return the interface object pointer.
 
+  /// Returns the shutdown flag.
   int shutdown (void );
-  // Returns the shutdown flag.
 
+  /// Fills in the shutdwon flag.
   void shutdown (int);
-  // Fills in the shutdwon flag.
 
+  /// Initialize naming service
   int obtain_initial_references (void);
-  // Initialize naming service
 
 protected:
+  /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the server IOR from a file.
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// IOR of the obj ref of the server.
   char *ior_;
-  // IOR of the obj ref of the server.
 
+  /// Flag to use the naming service
   int naming_;
-  // Flag to use the naming service
 
+  /// Flag for shutting down the server
   int shutdown_;
-  // Flag for shutting down the server
 
+  /// Server object
   Var server_;
-  // Server object
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/examples/PluggableUDP/Makefile.am b/examples/PluggableUDP/Makefile.am
deleted file mode 100644
index 42c77283640..00000000000
--- a/examples/PluggableUDP/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS =
-
-if BUILD_TESTS
-SUBDIRS += tests
-endif
diff --git a/examples/PluggableUDP/tests/Makefile.am b/examples/PluggableUDP/tests/Makefile.am
deleted file mode 100644
index 1a78b8562d4..00000000000
--- a/examples/PluggableUDP/tests/Makefile.am
+++ /dev/null
@@ -1,14 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Performance \
-        SimplePerformance
-
diff --git a/examples/PluggableUDP/tests/Performance/Makefile.am b/examples/PluggableUDP/tests/Performance/Makefile.am
deleted file mode 100644
index 0f4b09e5a25..00000000000
--- a/examples/PluggableUDP/tests/Performance/Makefile.am
+++ /dev/null
@@ -1,117 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Performance_IDL.am
-
-BUILT_SOURCES = \
-  UDPC.cpp \
-  UDPC.h \
-  UDPC.inl \
-  UDPS.cpp \
-  UDPS.h \
-  UDPS.inl
-
-CLEANFILES = \
-  UDP-stamp \
-  UDPC.cpp \
-  UDPC.h \
-  UDPC.inl \
-  UDPS.cpp \
-  UDPS.h \
-  UDPS.inl
-
-UDPC.cpp UDPC.h UDPC.inl UDPS.cpp UDPS.h UDPS.inl: UDP-stamp
-
-UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sd -Sp $(srcdir)/UDP.idl
-	@touch $@
-
-noinst_HEADERS = \
-  UDP.idl
-
-## Makefile.Performance_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  UDPC.cpp \
-  UDPS.cpp \
-  UDP_PerformanceClient.cpp \
-  UDP_i.cpp \
-  client.cpp \
-  UDP_PerformanceClient.h \
-  UDP_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Performance_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  UDPC.cpp \
-  UDPS.cpp \
-  UDP_i.cpp \
-  server.cpp \
-  UDP_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/examples/PluggableUDP/tests/Performance/UDP.idl b/examples/PluggableUDP/tests/Performance/UDP.idl
index e99e330b09f..23386cbee7c 100644
--- a/examples/PluggableUDP/tests/Performance/UDP.idl
+++ b/examples/PluggableUDP/tests/Performance/UDP.idl
@@ -4,7 +4,7 @@
 interface UDP
 {
   // = TITLE
-  //    Defines an interface that encapsulates operations that 
+  //    Defines an interface that encapsulates operations that
   //    return the current time of day and shuts down the server.
 
   struct LongStruct
diff --git a/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h b/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h
index 36e26668cd3..83ab28e0163 100644
--- a/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h
+++ b/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/PluggableUDP/tests/Performance
-//
-// = FILENAME
-//    UDP_PerformanceClient.h
-//
-// = DESCRIPTION
-//    This class implements the client functionality of the UDP test.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    UDP_PerformanceClient.h
+ *
+ *  $Id$
+ *
+ *  This class implements the client functionality of the UDP test.
+ *
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #ifndef UDP_PERFORMANCECLIENT_H
 #define UDP_PERFORMANCECLIENT_H
@@ -26,7 +23,7 @@
 #include "UDP_i.h"
 #include "UDPC.h"
 
-class UDP_PerformanceClient 
+class UDP_PerformanceClient
   : public ACE_Task_Base
 {
   // = TITLE
@@ -37,14 +34,14 @@ class UDP_PerformanceClient
   //
 public:
   // = Initialization and termination methods.
+  /// Constructor
   UDP_PerformanceClient (CORBA::ORB_ptr orb,
                          UDP_ptr udp,
                          UDP_i *udpHandler,
                          ACE_UINT32 burst_messages);
-  // Constructor
 
+  /// Destructor
   virtual ~UDP_PerformanceClient (void);
-  // Destructor
 
 private:
   // Runs in a separate thread.
diff --git a/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/examples/PluggableUDP/tests/Performance/UDP_i.cpp
index f54abab0265..d09b526d3fb 100644
--- a/examples/PluggableUDP/tests/Performance/UDP_i.cpp
+++ b/examples/PluggableUDP/tests/Performance/UDP_i.cpp
@@ -2,7 +2,7 @@
 
 #include "UDP_i.h"
 
-ACE_RCSID(UDP, UDP_i, "")
+
 
 // Constructor
 UDP_i::UDP_i (void)
diff --git a/examples/PluggableUDP/tests/Performance/UDP_i.h b/examples/PluggableUDP/tests/Performance/UDP_i.h
index 11100ea5f15..42f4cba3c1d 100644
--- a/examples/PluggableUDP/tests/Performance/UDP_i.h
+++ b/examples/PluggableUDP/tests/Performance/UDP_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/PluggableUDP/tests/Performance
-//
-// = FILENAME
-//    UDP_i.h
-//
-// = DESCRIPTION
-//    This class implements the server functionality of the UDP test.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    UDP_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the server functionality of the UDP test.
+ *
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #ifndef UDP_I_H
 #define UDP_I_H
@@ -24,20 +21,21 @@
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Null_Mutex.h"
 
+/**
+ * @class UDP_i:
+ *
+ * @brief UDP Object Implementation
+ *
+ */
 class UDP_i: public POA_UDP
 {
-  // = TITLE
-  //    UDP Object Implementation
-  //
-  // = DESCRIPTION
-  //
 public:
   // = Initialization and termination methods.
+  /// Constructor
   UDP_i (void);
-  // Constructor
 
+  /// Destructor
   ~UDP_i (void);
-  // Destructor
 
   virtual void setResponseHandler (UDP_ptr udpHandler);
 
@@ -46,21 +44,21 @@ public:
 
   virtual void reset (const char * client_name);
 
+  /// Shutdown the server.
   virtual void shutdown (void);
-  // Shutdown the server.
 
+  /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
 
+  /// Return the number of lost messages
   ACE_UINT32 getMessagesCount ();
-  // Return the number of lost messages
 
+  /// Return the number of lost messages
   ACE_UINT32 getWrongMessagesCount ();
-  // Return the number of lost messages
 
 private:
+  /// ORB pointer.
   CORBA::ORB_var orb_;
-  // ORB pointer.
 
   ACE_Hash_Map_Manager_Ex < CORBA::String_var,
                             CORBA::Long,
diff --git a/examples/PluggableUDP/tests/Performance/client.cpp b/examples/PluggableUDP/tests/Performance/client.cpp
index 712fbef8d35..6b5f5297c46 100644
--- a/examples/PluggableUDP/tests/Performance/client.cpp
+++ b/examples/PluggableUDP/tests/Performance/client.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/PluggableUDP/tests/Basic
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//    This is the client for the UDP performance test.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  This is the client for the UDP performance test.
+ *
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 
 #include "ace/Get_Opt.h"
@@ -29,7 +26,7 @@
 // executable and initialized for static builds.
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Performance, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 ACE_UINT32 burst_messages = 1000;
@@ -61,7 +58,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/examples/PluggableUDP/tests/Performance/run_test.pl b/examples/PluggableUDP/tests/Performance/run_test.pl
index cfc8408e88a..016b6f780ca 100755
--- a/examples/PluggableUDP/tests/Performance/run_test.pl
+++ b/examples/PluggableUDP/tests/Performance/run_test.pl
@@ -28,13 +28,13 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBEndpoint diop://:$port_server " .
                               "-o $server_iorfile");
 
 $CL = $client->CreateProcess ("client",
-                              "-ORBEndpoint diop://:$port_client " . 
+                              "-ORBEndpoint diop://:$port_client " .
                               "-k file://$client_iorfile");
 
 $server_status = $SV->Spawn ();
diff --git a/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl b/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl
index 1c4ce05783c..efb07171dd4 100755
--- a/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl
+++ b/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl
@@ -29,13 +29,13 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBEndpoint diop://$hostname:$port_server " .
                               "-o $server_iorfile");
 
 $CL = $client->CreateProcess ("client",
-                              "-ORBEndpoint diop://$hostname:$port_client " . 
+                              "-ORBEndpoint diop://$hostname:$port_client " .
                               "-k file://$client_iorfile");
 
 $server_status = $SV->Spawn ();
diff --git a/examples/PluggableUDP/tests/Performance/server.cpp b/examples/PluggableUDP/tests/Performance/server.cpp
index c56ea3c655a..d7f3cd09ebd 100644
--- a/examples/PluggableUDP/tests/Performance/server.cpp
+++ b/examples/PluggableUDP/tests/Performance/server.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/PluggableUDP/tests/Performance
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    Implementation of the server running the UDP object.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the server running the UDP object.
+ *
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "ace/Thread_Manager.h"
@@ -26,7 +23,7 @@
 #include "tao/Strategies/advanced_resource.h"
 
 
-ACE_RCSID(Performance, server, "$Id$")
+
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 int orb_threads = 1; // Number of threads running inside the ORB.
@@ -56,7 +53,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/examples/PluggableUDP/tests/Performance/svc.conf b/examples/PluggableUDP/tests/Performance/svc.conf
index 47b7280df2a..9b13a1101c9 100644
--- a/examples/PluggableUDP/tests/Performance/svc.conf
+++ b/examples/PluggableUDP/tests/Performance/svc.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 static Advanced_Resource_Factory "-ORBProtocolFactory DIOP_Factory -ORBReactorType tp"
 
diff --git a/examples/PluggableUDP/tests/SimplePerformance/Makefile.am b/examples/PluggableUDP/tests/SimplePerformance/Makefile.am
deleted file mode 100644
index 6ab8712525a..00000000000
--- a/examples/PluggableUDP/tests/SimplePerformance/Makefile.am
+++ /dev/null
@@ -1,113 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.SimplePerformance_IDL.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp -Sd $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.SimplePerformance_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SimplePerformance_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/examples/PluggableUDP/tests/SimplePerformance/client.cpp
index 8189a67528a..ce33fee52f6 100644
--- a/examples/PluggableUDP/tests/SimplePerformance/client.cpp
+++ b/examples/PluggableUDP/tests/SimplePerformance/client.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/PluggableUDP/tests/SimplePerformance
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//    This is the client for the UDP simple performance test.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  This is the client for the UDP simple performance test.
+ *
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
@@ -61,29 +58,30 @@ parse_args (int argc, ACE_TCHAR *argv[])
 ACE_UINT32 niter = 10;
 ACE_UINT32 SIZE_BLOCK= 256;
 
+/**
+ * @class Client
+ *
+ * @brief Run the client thread
+ *
+ * Use the ACE_Task_Base class to run the client threads.
+ */
 class Client
 {
-  // = TITLE
-  //   Run the client thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads.
-  //
 public:
+  /// ctor
   Client (Simple_Server_ptr server, ACE_UINT32 niterations);
-  // ctor
 
   virtual ~Client (void) {};
 
+  /// The thread entry point.
   virtual int svc (void);
-  // The thread entry point.
 
 private:
+  /// The server.
   Simple_Server_var server_;
-  // The server.
 
+  /// The number of iterations on each client thread.
   ACE_UINT32 niterations_;
-  // The number of iterations on each client thread.
 };
 
 
diff --git a/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/examples/PluggableUDP/tests/SimplePerformance/server.cpp
index 6a819b7f730..1e11d5ecefb 100644
--- a/examples/PluggableUDP/tests/SimplePerformance/server.cpp
+++ b/examples/PluggableUDP/tests/SimplePerformance/server.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/PluggableUDP/tests/SimplePerformance
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    Implementation of the server running the UDP object.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the server running the UDP object.
+ *
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 
 #include "ace/Get_Opt.h"
@@ -50,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/examples/PluggableUDP/tests/SimplePerformance/svc.conf b/examples/PluggableUDP/tests/SimplePerformance/svc.conf
index 47b7280df2a..9b13a1101c9 100644
--- a/examples/PluggableUDP/tests/SimplePerformance/svc.conf
+++ b/examples/PluggableUDP/tests/SimplePerformance/svc.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 static Advanced_Resource_Factory "-ORBProtocolFactory DIOP_Factory -ORBReactorType tp"
 
diff --git a/examples/PluggableUDP/tests/SimplePerformance/test_i.h b/examples/PluggableUDP/tests/SimplePerformance/test_i.h
index bfd469f86e4..c303c965370 100644
--- a/examples/PluggableUDP/tests/SimplePerformance/test_i.h
+++ b/examples/PluggableUDP/tests/SimplePerformance/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Client
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_MT_CLIENT_TEST_I_H
 #define TAO_MT_CLIENT_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   void sendCharSeq (const Char_Seq & charSeq);
diff --git a/examples/Quoter/Factory_Finder.cpp b/examples/Quoter/Factory_Finder.cpp
index 7a12ab205ec..4bd72e8ad8e 100644
--- a/examples/Quoter/Factory_Finder.cpp
+++ b/examples/Quoter/Factory_Finder.cpp
@@ -1,24 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    FactoryFinder.cpp
-//
-// = DESCRIPTION
-//    A Factory Finder for the Quoter example. This example conforms
-//    to the CosLifeCycle Factory Finder notion.
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
 
-#include "Factory_Finder.h"
+//=============================================================================
+/**
+ *  @file    Factory_Finder.cpp
+ *
+ *  $Id$
+ *
+ *  A Factory Finder for the Quoter example. This example conforms
+ *  to the CosLifeCycle Factory Finder notion.
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
 
-ACE_RCSID (Quoter,
 
-           Factory_Finder, "$Id$")
+#include "Factory_Finder.h"
 
 Quoter_Factory_Finder_Server::Quoter_Factory_Finder_Server (void)
 :   debug_level_ (1)
diff --git a/examples/Quoter/Factory_Finder.h b/examples/Quoter/Factory_Finder.h
index 5da251a6d3a..19991e1f846 100644
--- a/examples/Quoter/Factory_Finder.h
+++ b/examples/Quoter/Factory_Finder.h
@@ -1,17 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    FactoryFinder.h
-//
-// = DESCRIPTION
-//    Server for the Quoter Factory Finder
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Factory_Finder.h
+ *
+ *  $Id$
+ *
+ *  Server for the Quoter Factory Finder
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 
@@ -25,45 +25,48 @@
 #ifndef QUOTER_FACTORY_FINDER_H
 #define QUOTER_FACTORY_FINDER_H
 
+/**
+ * @class Quoter_Factory_Finder_Server
+ = TILE
+ * Server object for the Quoter Factory Finder
+ */
 class Quoter_Factory_Finder_Server
 {
-  // = TILE
-  //   Server object for the Quoter Factory Finder
 
 public:
+  /// Default constructor
   Quoter_Factory_Finder_Server (void);
-  // Default constructor
 
+  /// Destructor
   ~Quoter_Factory_Finder_Server (void);
-  // Destructor
 
+  /// Initialize the Quoter_Server state - parsing arguments and ...
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize the Quoter_Server state - parsing arguments and ...
 
+  /// Run the orb
   int run (void);
-  // Run the orb
 
+  /// parse the passed parameters
   u_int parse_args (void);
-  // parse the passed parameters
 
 private:
+  /// instance of the ORB Manager
   TAO_ORB_Manager orb_manager_;
-  // instance of the ORB Manager
 
+  /// instance of the Quoter Factory Finder
   Quoter_Factory_Finder_i *quoter_Factory_Finder_i_ptr_;
-  // instance of the Quoter Factory Finder
 
+  /// reference to the Quoter naming context
   CosNaming::NamingContext_var quoterNamingContext_var_;
-  // reference to the Quoter naming context
 
+  /// Number of commandline arguments.
   int argc_;
-  // Number of commandline arguments.
 
+  /// commandline arguments.
   ACE_TCHAR **argv_;
-  // commandline arguments.
 
+  /// debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
   int debug_level_;
-  // debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
 };
 
 #endif /* QUOTER_FACTORY_FINDER_H */
diff --git a/examples/Quoter/Factory_Finder_i.cpp b/examples/Quoter/Factory_Finder_i.cpp
index 278552e3470..fd55987816e 100644
--- a/examples/Quoter/Factory_Finder_i.cpp
+++ b/examples/Quoter/Factory_Finder_i.cpp
@@ -1,18 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    FactoryFinder_i.cpp
-//
-// = DESCRIPTION
-//    A Factory Finder for the Quoter example. This example conforms
-//    to the CosLifeCycle Factory Finder notion.
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Factory_Finder_i.cpp
+ *
+ *  $Id$
+ *
+ *  A Factory Finder for the Quoter example. This example conforms
+ *  to the CosLifeCycle Factory Finder notion.
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "Factory_Finder_i.h"
 #include "QuoterC.h"
@@ -21,10 +21,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Quoter,
-           Factory_Finder_i,
-           "$Id$")
-
 // Constructor
 Quoter_Factory_Finder_i::Quoter_Factory_Finder_i (int debug_level)
 : debug_level_ (debug_level)
diff --git a/examples/Quoter/Factory_Finder_i.h b/examples/Quoter/Factory_Finder_i.h
index bcd6f4c4996..944244e33ad 100644
--- a/examples/Quoter/Factory_Finder_i.h
+++ b/examples/Quoter/Factory_Finder_i.h
@@ -1,41 +1,46 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    FactoryFinder_i.h
-//
-// = DESCRIPTION
-//    Factory Finder Implementation for the Quoter example
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Factory_Finder_i.h
+ *
+ *  $Id$
+ *
+ *  Factory Finder Implementation for the Quoter example
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "QuoterS.h"
 
 #ifndef QUOTER_FACTORY_FINDER_IMPL_H
 #define QUOTER_FACTORY_FINDER_IMPL_H
 
+/**
+ * @class Quoter_Factory_Finder_i
+ = TILE
+ * A CosLifeCycle conforming Factory Finder for the Quoter
+ * example. It uses the Naming Service to find a fitting factory.
+ */
 class Quoter_Factory_Finder_i : public POA_Stock::Quoter_Factory_Finder
 {
-  // = TILE
-  //   A CosLifeCycle conforming Factory Finder for the Quoter
-  //   example. It uses the Naming Service to find a fitting factory.
 
 public:
   Quoter_Factory_Finder_i (int debug_level = 1);
   ~Quoter_Factory_Finder_i (void);
 
+  /**
+   * Returns a sequence of Factories if factories matching the
+   * factory_key were found. If no factory was found, then the
+   * NoFactory exception, defined in CosLifeCycle, is raised.
+   */
   virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key);
-  // Returns a sequence of Factories if factories matching the
-  // factory_key were found. If no factory was found, then the
-  // NoFactory exception, defined in CosLifeCycle, is raised.
 
 private:
+  /// debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
   int debug_level_;
-  // debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
 };
 
 #endif /* QUOTER_FACTORY_FINDER_IMPL_H */
diff --git a/examples/Quoter/Generic_Factory.cpp b/examples/Quoter/Generic_Factory.cpp
index ed6eafbf82e..9609e745600 100644
--- a/examples/Quoter/Generic_Factory.cpp
+++ b/examples/Quoter/Generic_Factory.cpp
@@ -1,26 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Generic_Factory.cpp
-//
-// = DESCRIPTION
-//    The server for the GenericFactory for the quoter example.
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Generic_Factory.cpp
+ *
+ *  $Id$
+ *
+ *  The server for the GenericFactory for the quoter example.
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "Generic_Factory.h"
 
 #include "orbsvcs/LifeCycleServiceC.h"
 
-ACE_RCSID (Quoter,
-           Generic_Factory,
-           "$Id$")
-
 Quoter_Generic_Factory_Server::Quoter_Generic_Factory_Server (void)
 : use_LifeCycle_Service_ (0),
   debug_level_ (1)
diff --git a/examples/Quoter/Generic_Factory.h b/examples/Quoter/Generic_Factory.h
index 67095691205..97ed3dc3025 100644
--- a/examples/Quoter/Generic_Factory.h
+++ b/examples/Quoter/Generic_Factory.h
@@ -1,17 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Generic_Factory.h
-//
-// = DESCRIPTION
-//    A generic factory, customized for the use with the Quoter example.
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Generic_Factory.h
+ *
+ *  $Id$
+ *
+ *  A generic factory, customized for the use with the Quoter example.
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 
@@ -25,49 +25,52 @@
 #ifndef GENERIC_FACTORY_H
 #define GENERIC_FACTORY_H
 
+/**
+ * @class Quoter_Generic_Factory_Server
+ = TILE
+ * Server object for the Quoter Generic Factory
+ */
 class Quoter_Generic_Factory_Server
 {
-  // = TILE
-  //   Server object for the Quoter Generic Factory
 
 public:
+  /// Default constructor
   Quoter_Generic_Factory_Server (void);
-  // Default constructor
 
+  /// Destructor
   ~Quoter_Generic_Factory_Server (void);
-  // Destructor
 
+  /// Initialize the Quoter_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the Quoter_Server state - parsing arguments and ...
 
+  /// Run the orb.
   int run (void);
-  // Run the orb.
 
+  /// Parse the passed parameters.
   u_int parse_args (void);
-  // Parse the passed parameters.
 
 private:
+  /// instance of the ORB Manager
   TAO_ORB_Manager orb_manager_;
-  // instance of the ORB Manager
 
+  /// Instance of the Quoter Generic Factory.
   Quoter_Generic_Factory_i *quoter_Generic_Factory_i_ptr_;
-  // Instance of the Quoter Generic Factory.
 
+  /// Reference to the Quoter naming context.
   CosNaming::NamingContext_var quoterNamingContext_var_;
-  // Reference to the Quoter naming context.
 
+  /// Number of commandline arguments.
   int argc_;
-  // Number of commandline arguments.
 
+  /// commandline arguments.
   ACE_TCHAR **argv_;
-  // commandline arguments.
 
+  /// flag for whether or not to use the lifecycle service
   unsigned char use_LifeCycle_Service_;
-  // flag for whether or not to use the lifecycle service
 
+  /// debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
   int debug_level_;
-  // debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
 };
 
 #endif /* GENERIC_FACTORY_H */
diff --git a/examples/Quoter/Generic_Factory_i.cpp b/examples/Quoter/Generic_Factory_i.cpp
index 74eb8e88b8f..a6b56ed07d8 100644
--- a/examples/Quoter/Generic_Factory_i.cpp
+++ b/examples/Quoter/Generic_Factory_i.cpp
@@ -1,17 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Generic_Factory_i.cpp
-//
-// = DESCRIPTION
-//    The implementation of a LifeCycle Service GenericFactory for the
-//    Quoter example.
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Generic_Factory_i.cpp
+ *
+ *  $Id$
+ *
+ *  The implementation of a LifeCycle Service GenericFactory for the
+ *  Quoter example.
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "Generic_Factory_i.h"
 #include "QuoterC.h"
@@ -20,10 +21,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Quoter,
-           Generic_Factory_i,
-           "$Id$")
-
 // Constructor
 Quoter_Generic_Factory_i::Quoter_Generic_Factory_i (int debug_level)
 : debug_level_ (debug_level)
diff --git a/examples/Quoter/Generic_Factory_i.h b/examples/Quoter/Generic_Factory_i.h
index d5f46a21778..9d46877d917 100644
--- a/examples/Quoter/Generic_Factory_i.h
+++ b/examples/Quoter/Generic_Factory_i.h
@@ -1,17 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Generic_Factory_i.h
-//
-// = DESCRIPTION
-//    A LifeCycle Service Generic Factory for the Quoter example.
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Generic_Factory_i.h
+ *
+ *  $Id$
+ *
+ *  A LifeCycle Service Generic Factory for the Quoter example.
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "QuoterS.h"
 
@@ -19,32 +19,37 @@
 #ifndef QUOTER_GENERIC_FACTORY_IMPL_H
 #define QUOTER_GENERIC_FACTORY_IMPL_H
 
+/**
+ * @class Quoter_Generic_Factory_i
+ = TILE
+ * A CosLifeCycle conforming Generic Factory for the Quoter
+ * example. It uses the Naming Service to find a fitting factory.
+ */
 class Quoter_Generic_Factory_i : public POA_Stock::Quoter_Generic_Factory
 {
-  // = TILE
-  //   A CosLifeCycle conforming Generic Factory for the Quoter
-  //   example. It uses the Naming Service to find a fitting factory.
 
 public:
   Quoter_Generic_Factory_i (int debug_level = 1);
   ~Quoter_Generic_Factory_i (void);
 
+  /// Returns true if the Generic Factory is able to forward a request
+  /// for creating an object described by the <factory_key>.
   CORBA::Boolean supports (const CosLifeCycle::Key &factory_key);
-  // Returns true if the Generic Factory is able to forward a request
-  // for creating an object described by the <factory_key>.
 
+  /**
+   * Returns an object reference to a newly created object, though the
+   * Generic Factory itself cannot create objects, it will forward the
+   * request to a more concrete Factory.
+   */
   CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key,
                                    const CosLifeCycle::Criteria &the_criteria);
-  // Returns an object reference to a newly created object, though the
-  // Generic Factory itself cannot create objects, it will forward the
-  // request to a more concrete Factory.
 
 private:
+  /// a helper to get the proper naming context.
   CosNaming::NamingContext_ptr get_naming_context (const CosLifeCycle::Key &factory_key);
-  // a helper to get the proper naming context.
 
+  /// debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
   int debug_level_;
-  // debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
 };
 
 #endif /* QUOTER_GENERIC_FACTORY_IMPL_H */
diff --git a/examples/Quoter/Makefile.am b/examples/Quoter/Makefile.am
deleted file mode 100644
index 9a16b5eb768..00000000000
--- a/examples/Quoter/Makefile.am
+++ /dev/null
@@ -1,189 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Quoter_IDL.am
-
-BUILT_SOURCES = \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl
-
-CLEANFILES = \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Quoter.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Quoter.idl
-
-## Makefile.Quoter_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  QuoterC.cpp \
-  client.cpp \
-  client.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Quoter_Factory_Finder.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Factory_Finder
-
-Factory_Finder_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Factory_Finder_SOURCES = \
-  Factory_Finder.cpp \
-  Factory_Finder_i.cpp \
-  QuoterC.cpp \
-  QuoterS.cpp \
-  Factory_Finder.h \
-  Factory_Finder_i.h
-
-Factory_Finder_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Quoter_Generic_Factory.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Generic_Factory
-
-Generic_Factory_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Generic_Factory_SOURCES = \
-  Generic_Factory.cpp \
-  Generic_Factory_i.cpp \
-  QuoterC.cpp \
-  QuoterS.cpp \
-  Generic_Factory.h \
-  Generic_Factory_i.h
-
-Generic_Factory_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Quoter_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  QuoterC.cpp \
-  QuoterS.cpp \
-  Quoter_i.cpp \
-  server.cpp \
-  Quoter_i.h \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/examples/Quoter/Quoter.idl b/examples/Quoter/Quoter.idl
index f68c66a0eb3..5cb9ff30332 100644
--- a/examples/Quoter/Quoter.idl
+++ b/examples/Quoter/Quoter.idl
@@ -1,19 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    quoter.idl
-//
-// = DESCRIPTION
-//    Quoter example that illustrate the use of the global POA and
-//    the CosLifeCycle service.
-//
-// = AUTHOR
-//    Darrell Brunsch (brunsch@cs.wustl.edu)
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Quoter.idl
+ *
+ *  $Id$
+ *
+ *  Quoter example that illustrate the use of the global POA and
+ *  the CosLifeCycle service.
+ *
+ *
+ *  @author Darrell Brunsch (brunsch@cs.wustl.edu) Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "orbsvcs/CosLifeCycle.idl"
 
diff --git a/examples/Quoter/Quoter_i.cpp b/examples/Quoter/Quoter_i.cpp
index f0d2ecae026..60f0b808739 100644
--- a/examples/Quoter/Quoter_i.cpp
+++ b/examples/Quoter/Quoter_i.cpp
@@ -1,27 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Quoter
-//
-// = FILENAME
-//    Quoter_i.cpp
-//
-// = AUTHOR
-//    Darrell Brunsch <brunsch@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Quoter_i.cpp
+ *
+ *  $Id$
+ *
+ *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Quoter_i.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (Quoter,
-           Quoter_i,
-           "$Id$")
-
 // Constructor.  Create all the quoter factories.
 
 Quoter_Factory_i::Quoter_Factory_i (size_t num, PortableServer::POA_ptr poa_ptr)
diff --git a/examples/Quoter/Quoter_i.h b/examples/Quoter/Quoter_i.h
index 06d24a017c0..776459631e8 100644
--- a/examples/Quoter/Quoter_i.h
+++ b/examples/Quoter/Quoter_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Quoter
-//
-// = FILENAME
-//    Quoter_i.h
-//
-// = AUTHOR
-//    Darrell Brunsch <brunsch@uci.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Quoter_i.h
+ *
+ *  $Id$
+ *
+ *  @author Darrell Brunsch <brunsch@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef QUOTER_IMPL_H
 #define QUOTER_IMPL_H
@@ -25,47 +22,49 @@ class Quoter_i;
 typedef Quoter_i *Quoter_i_ptr;
 typedef Quoter_i_ptr Quoter_i_ref;
 
+/**
+ * @class Quoter_i:
+ *
+ * @brief Quoter_i
+ *
+ * Actual Quoter Implementation class.  Returns a quoter for a given stock
+ * and provides an example for the lifecycle functionality.
+ */
 class Quoter_i: public POA_Stock::Quoter
 {
-  // = TITLE
-  //   Quoter_i
-  //
-  // = DESCRIPTION
-  //   Actual Quoter Implementation class.  Returns a quoter for a given stock
-  //   and provides an example for the lifecycle functionality.
 public:
+  /// Constructor (use_LifeCycle_Service is 1 if the LifeCycle_Service should be used
+  /// instead of the Quoter Generic_Factory
   Quoter_i (const char *obj_name = "",
             const unsigned char use_LifeCycle_Service = 0,
             PortableServer::POA_ptr poa_ptr = 0);
-  // Constructor (use_LifeCycle_Service is 1 if the LifeCycle_Service should be used
-  // instead of the Quoter Generic_Factory
 
+  /// Destructor
   ~Quoter_i (void);
-  // Destructor
 
+  /// Returns the current quote for the stock <stock_name>
   virtual CORBA::Long get_quote (const char *stock_name);
-  // Returns the current quote for the stock <stock_name>
 
   // = Lifecycle methods
 
+  /// Make a copy of this object
   virtual CosLifeCycle::LifeCycleObject_ptr copy (CosLifeCycle::FactoryFinder_ptr there,
                                                   const CosLifeCycle::Criteria &the_criteria);
-  // Make a copy of this object
 
+  /// Move this object using <there>
   virtual void move (CosLifeCycle::FactoryFinder_ptr there,
                      const CosLifeCycle::Criteria &the_criteria);
-  // Move this object using <there>
 
+  /// Removes the object.
   virtual void remove (void);
-  // Removes the object.
 
 private:
+  /// This flag defines if a Generic Factory is used (0 by default) or
+  /// the more sophisticated LifeCycle Service (1)
   unsigned char use_LifeCycle_Service_;
-  // This flag defines if a Generic Factory is used (0 by default) or
-  // the more sophisticated LifeCycle Service (1)
 
+  /// Keep a reference to the POA for use by the move operation
   PortableServer::POA_var poa_var_;
-  // Keep a reference to the POA for use by the move operation
 };
 
 // Forward declaration.
@@ -73,38 +72,40 @@ class Quoter_Factory_i;
 
 typedef Quoter_Factory_i *Quoter_Factory_i_ptr;
 
+/**
+ * @class Quoter_Factory_i:
+ *
+ * @brief Quoter_Factory_i
+ *
+ * Factory object returning the quoter_impl objrefs.
+ */
 class Quoter_Factory_i: public POA_Stock::Quoter_Factory
 {
-  // = TITLE
-  //   Quoter_Factory_i
-  //
-  // = DESCRIPTION
-  //   Factory object returning the quoter_impl objrefs.
 public:
+  /// Constructor that takes in the number of quoters in the pool.
   Quoter_Factory_i (size_t num, PortableServer::POA_ptr poa_ptr);
-  // Constructor that takes in the number of quoters in the pool.
 
+  /// Destructor.
   ~Quoter_Factory_i (void);
-  // Destructor.
 
+  /// Initialize everything in the factory
   int init (void);
-  // Initialize everything in the factory
 
+  /// Return the quoter by the id <name>.
   virtual Stock::Quoter_ptr create_quoter (const char *name);
-  // Return the quoter by the id <name>.
 
 private:
+  /// Pointer to the poa.
   PortableServer::POA_ptr poa_ptr_;
-  // Pointer to the poa.
 
+  /// Array of quoters.
   Quoter_i **my_quoters_;
-  // Array of quoters.
 
+  /// Number of quoters.
   size_t quoter_num_;
-  // Number of quoters.
 
+  /// Which quoter to return next.
   size_t next_quoter_;
-  // Which quoter to return next.
 };
 
 #endif /* QUOTER_IMPL_H */
diff --git a/examples/Quoter/client.cpp b/examples/Quoter/client.cpp
index cf99fe73df9..82237568e89 100644
--- a/examples/Quoter/client.cpp
+++ b/examples/Quoter/client.cpp
@@ -6,10 +6,6 @@
 
 #include "client.h"
 
-ACE_RCSID (Quoter,
-           client,
-           "$Id$")
-
 Quoter_Task::Quoter_Task (int argc, ACE_TCHAR **argv)
   : argc_ (argc), argv_ (argv)
 {
diff --git a/examples/Quoter/client.h b/examples/Quoter/client.h
index d740c0860a8..0a686b22779 100644
--- a/examples/Quoter/client.h
+++ b/examples/Quoter/client.h
@@ -1,21 +1,17 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Quoter
-//
-// = FILENAME
-//    quoter_client.h
-//
-// = DESCRIPTION
-//    Contains classes that do the work of the client side of the Quoter Test
-//
-// = AUTHORS
-//    Darrell Brunsch
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.h
+ *
+ *  $Id$
+ *
+ *  Contains classes that do the work of the client side of the Quoter Test
+ *
+ *
+ *  @author Darrell Brunsch
+ */
+//=============================================================================
 
 #ifndef QUOTER_CLIENT_H
 #define QUOTER_CLIENT_H
@@ -33,76 +29,80 @@
 #include "ace/Task.h"
 #include "ace/Thread_Manager.h"
 
+/**
+ * @class Quoter_Client
+ *
+ * @brief Quoter_Client
+ *
+ * Does all the work of making the calls on the Quoter server
+ */
 class Quoter_Client
 {
-  // = TITLE
-  //    Quoter_Client
-  //
-  // = DESCRIPTION
-  //    Does all the work of making the calls on the Quoter server
 public:
   // = Constructor and destructor.
   Quoter_Client (void);
   ~Quoter_Client (void);
 
+  /// Execute client example code.
   int run (void);
-  // Execute client example code.
 
+  /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the client communication endpoint with server.
 
 private:
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
+  /// Function to initialize the naming service.
   int init_naming_service (void);
-  // Function to initialize the naming service.
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// Key of factory obj ref.
   char *quoter_factory_key_;
-  // Key of factory obj ref.
 
+  /// Key of the obj ref to be retrieved via the factory.
   char *quoter_key_;
-  // Key of the obj ref to be retrieved via the factory.
 
+  /// Flag to tell server to shutdown.
   int shutdown_;
-  // Flag to tell server to shutdown.
 
+  /// Pointer to a factory finder
   Stock::Quoter_Factory_Finder_var factory_Finder_var_;
-  // Pointer to a factory finder
 
+  /// Pointer to a factory
   Stock::Quoter_Factory_var factory_var_;
-  // Pointer to a factory
 
+  /// Pointer to a generic factory
   CosLifeCycle::GenericFactory_var generic_Factory_var_;
-  // Pointer to a generic factory
 
+  /// Quoter obj ref.
   Stock::Quoter_var quoter_var_;
-  // Quoter obj ref.
 
+  /// Flag to tell if the a Generic Factory is going to be used
+  /// or the LifeCycle Service (0 means Generic Factory, 1 means LCS)
   int useLifeCycleService_;
-  // Flag to tell if the a Generic Factory is going to be used
-  // or the LifeCycle Service (0 means Generic Factory, 1 means LCS)
 
+  /// debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
   int debug_level_;
-  // debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
 };
 
+/**
+ * @class Quoter_Task
+ *
+ * @brief Quoter_Task
+ *
+ * Task that creates a Quoter_Client and uses it
+ */
 class Quoter_Task : public ACE_Task<ACE_SYNCH>
 {
-  // = TITLE
-  //    Quoter_Task
-  //
-  // = DESCRIPTION
-  //    Task that creates a Quoter_Client and uses it
 public:
   Quoter_Task (int argc, ACE_TCHAR **argv);
 
diff --git a/examples/Quoter/run_test.pl b/examples/Quoter/run_test.pl
index 3b326804441..fdee51487df 100755
--- a/examples/Quoter/run_test.pl
+++ b/examples/Quoter/run_test.pl
@@ -89,10 +89,10 @@ $cltarget->DeleteFile($nsiorbase);
 # Programs that are run
 
 $NS = $nstarget->CreateProcess (
-    "../../orbsvcs/Naming_Service/Naming_Service",
+    "../../orbsvcs/Naming_Service/tao_cosnaming",
     "-o $nstarget_nsiorfile");
 $LC = $lctarget->CreateProcess (
-    "../../orbsvcs/LifeCycle_Service/LifeCycle_Service",
+    "../../orbsvcs/LifeCycle_Service/tao_coslifecycle",
     "$debug -ORBInitRef NameService=file://$lctarget_nsiorfile");
 
 $SV = $svtarget->CreateProcess (
@@ -112,7 +112,7 @@ $CL = $cltarget->CreateProcess (
 $ns_status = $NS->Spawn ();
 
 if ($ns_status != 0) {
-    print STDERR "ERROR: Naming_Service returned $ns_status\n";
+    print STDERR "ERROR: tao_cosnaming returned $ns_status\n";
     exit 1;
 }
 
@@ -156,7 +156,7 @@ if ($cltarget->PutFile ($nsiorbase) == -1) {
 $lc_status = $LC->Spawn ();
 
 if ($lc_status != 0) {
-    print STDERR "ERROR: LifeCycle_Service returned $lc_status\n";
+    print STDERR "ERROR: tao_coslifecycle returned $lc_status\n";
     $NS->Kill (); $NS->TimedWait (1);
     exit 1;
 }
@@ -234,14 +234,14 @@ if ($sv_status != 0) {
 $lc_status = $LC->TerminateWaitKill ($lctarget->ProcessStopWaitInterval());
 
 if ($lc_status != 0) {
-    print STDERR "ERROR: LifeCycle_Service returned $lc_status\n";
+    print STDERR "ERROR: tao_coslifecycle returned $lc_status\n";
     $status = 1;
 }
 
 $ns_status = $NS->TerminateWaitKill ($nstarget->ProcessStopWaitInterval());
 
 if ($ns_status != 0) {
-    print STDERR "ERROR: Naming_Service returned $ns_status\n";
+    print STDERR "ERROR: tao_cosnaming returned $ns_status\n";
     $status = 1;
 }
 
diff --git a/examples/Quoter/server.cpp b/examples/Quoter/server.cpp
index fa3c6303749..530793a3355 100644
--- a/examples/Quoter/server.cpp
+++ b/examples/Quoter/server.cpp
@@ -1,23 +1,20 @@
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//    Quoter_Server.cpp
-//
-// = DESCRIPTION
-//    The Server for the Quoter Factory
-//
-// = AUTHOR
-//    Darrell Brunsch (brunsch@cs.wustl.edu)
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  The Server for the Quoter Factory
+ *
+ *
+ *  @author Darrell Brunsch (brunsch@cs.wustl.edu) Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "server.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Quoter, server, "$Id$")
-
 Quoter_Server::Quoter_Server (void)
   : num_of_objs_ (1),
     quoter_Factory_i_ptr_ (0),
diff --git a/examples/Quoter/server.h b/examples/Quoter/server.h
index 354c20e3286..31ffccb356b 100644
--- a/examples/Quoter/server.h
+++ b/examples/Quoter/server.h
@@ -1,22 +1,19 @@
-// $Id$
 // -*- C++ -*-
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Quoter
-//
-// = FILENAME
-//    quoter_server.h
-//
-// = DESCRIPTION
-//    Implements the Quoter_Server class which handles the initialization of
-//    the quoter implementations.
-//
-// = AUTHORS
-//    Darrell Brunsch (brunsch@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    server.h
+ *
+ *  $Id$
+ *
+ *  Implements the Quoter_Server class which handles the initialization of
+ *  the quoter implementations.
+ *
+ *
+ *  @author Darrell Brunsch (brunsch@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef QUOTER_SERVER_H
 #define QUOTER_SERVER_H
@@ -34,58 +31,60 @@
 #include "Quoter_i.h"
 #include "QuoterC.h"
 
+/**
+ * @class Quoter_Server
+ *
+ * Defines a Quoter Server class that implements the functionality
+ * of a server process as an object.
+ * =DESCRIPTION
+ * The interface is quite simple. A server program has to call
+ * init to initialize the quoter_server's state and then call run
+ * to run the orb.
+ */
 class Quoter_Server
 {
-  // =TITLE
-  //   Defines a Quoter Server class that implements the functionality
-  //   of a server process as an object.
-  //
-  // =DESCRIPTION
-  //   The interface is quite simple. A server program has to call
-  //   init to initialize the quoter_server's state and then call run
-  //   to run the orb.
 public:
 
+  /// Default constructor
   Quoter_Server (void);
-  // Default constructor
 
+  /// Destructor
   ~Quoter_Server (void);
-  // Destructor
 
+  /// Initialize the Quoter_Server state - parsing arguments and ...
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize the Quoter_Server state - parsing arguments and ...
 
+  /// Run the server.
   int run (void);
-  // Run the server.
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// Initializes the name server and registers cubit factory with the
+  /// name server.
   int init_naming_service (void);
-  // Initializes the name server and registers cubit factory with the
-  // name server.
 
+  /// Number of quoter objects we export.
   int num_of_objs_;
-  // Number of quoter objects we export.
 
+  /// Naming Service context
   CosNaming::NamingContext_var namingContext_var_;
-  // Naming Service context
 
+  /// Instantiate the Quoter Factory
   Quoter_Factory_i  *quoter_Factory_i_ptr_;
-  // Instantiate the Quoter Factory
 
+  /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
 
+  /// Number of commandline arguments.
   int argc_;
-  // Number of commandline arguments.
 
+  /// commandline arguments.
   ACE_TCHAR **argv_;
-  // commandline arguments.
 
+  /// debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
   int debug_level_;
-  // debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
 };
 
 #endif /* QUOTER_SERVER_H */
diff --git a/examples/RTCORBA/Activity/Makefile.am b/examples/RTCORBA/Activity/Makefile.am
deleted file mode 100644
index 3f4a5f03d54..00000000000
--- a/examples/RTCORBA/Activity/Makefile.am
+++ /dev/null
@@ -1,102 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Activity.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES = \
-  JobC.cpp \
-  JobC.h \
-  JobC.inl \
-  JobS.cpp \
-  JobS.h \
-  JobS.inl
-
-CLEANFILES = \
-  Job-stamp \
-  JobC.cpp \
-  JobC.h \
-  JobC.inl \
-  JobS.cpp \
-  JobS.h \
-  JobS.inl
-
-JobC.cpp JobC.h JobC.inl JobS.cpp JobS.h JobS.inl: Job-stamp
-
-Job-stamp: $(srcdir)/Job.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Job.idl
-	@touch $@
-
-noinst_PROGRAMS = activity
-
-activity_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACTIVITY_BUILD_DLL
-
-activity_SOURCES = \
-  Activity.cpp \
-  Builder.cpp \
-  JobC.cpp \
-  JobS.cpp \
-  Job_i.cpp \
-  POA_Holder.cpp \
-  Periodic_Task.cpp \
-  Task_Stats.cpp \
-  Thread_Task.cpp \
-  Activity.h \
-  Builder.h \
-  JobC.h \
-  JobC.inl \
-  JobS.h \
-  JobS.inl \
-  Job_i.h \
-  POA_Holder.h \
-  Periodic_Task.h \
-  Task_Stats.h \
-  Task_Stats.inl \
-  Thread_Task.h
-
-activity_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/examples/RTCORBA/Activity/README b/examples/RTCORBA/Activity/README
index 32264d094e1..4b43ffb98f3 100644
--- a/examples/RTCORBA/Activity/README
+++ b/examples/RTCORBA/Activity/README
@@ -1,5 +1,5 @@
 //$Id$
-=================== RT CORBA capabilities demo =================== 
+=================== RT CORBA capabilities demo ===================
 
 Table of contents
 -----------------
@@ -20,7 +20,7 @@ In this experiment we show the effect of maintaining end to end priorities.
 
 The experiment consists of the following participants:
 
-Job: A CORBA servant object that performs CPU intensive work. The ammount
+Job: A CORBA servant object that performs CPU intensive work. The amount
 of work depends on a load factor that is conveyed to the object per
 invocation as an argument.
 
@@ -41,18 +41,18 @@ To specify POA options the format is:
 -POA <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)*
 
 e.g.
--POA poa1 -PriorityModel CLIENT 10 -Bands 2 -Band 1 20 -Band 30 85 -Lanes 2 -Lane 10 1 0 -Lane 80 1 0 
+-POA poa1 -PriorityModel CLIENT 10 -Bands 2 -Band 1 20 -Band 30 85 -Lanes 2 -Lane 10 1 0 -Lane 80 1 0
 
-specifes a POA with: 
+specifes a POA with:
 
 Name - poa1
 
 Priority model - client propogated, def. priority = 10
 
 Bands - 2 Bands with Band values as follows -
-	Band 1 :  low priority = 1, high priority = 20 
+	Band 1 :  low priority = 1, high priority = 20
 	Band 2 :  low priority = 30, high priority = 85
- 
+
 Lanes - 2 Lanes with Lane values as follows -
 	Lane 1 : priority = 10, 1 static thread, 0 dynamic threads
 	Lane 2 : priority = 80, 1 static thread, 0 dynamic threads
@@ -72,7 +72,7 @@ The format for specify a Job is:
 
 where, poa_name is the POA that this object is activated in.
 
-e.g. 
+e.g.
 -Job job_10 poa1
 
 specifies a Job with,
@@ -85,12 +85,12 @@ Task Options
 
 The format for specify a Task is:
 
--ThreadTask -JobName <name> -Priority <priority> -Period <period> -ExecTime <exec_time> -Phase <phase> -Iter <iterations> -Load <load_weight>  
+-ThreadTask -JobName <name> -Priority <priority> -Period <period> -ExecTime <exec_time> -Phase <phase> -Iter <iterations> -Load <load_weight>
 
 where,
 -ThreadTask = Specifies a Thread based timer.
 -JobName <name> = Name of the Job object that this task will exec. once every period.
--Priority <priority> = The OS thread priority at which to run this task. 
+-Priority <priority> = The OS thread priority at which to run this task.
 -Period <period> = The period of execution. (in uS)
 -ExecTime <exec_time> = The offline estimate of the worst case execution time for the Job. (uS)
 -Phase <phase> = The phase to start at (uS)
@@ -98,16 +98,16 @@ where,
 -Load <load_weight> = a load factor passed to the job that varies its processing.
 
 e.g.
--ThreadTask -JobName job_10 -Priority 10 -Period 1 -ExecTime 10000 -Phase 0 -Iter 20 -Load 1000 
+-ThreadTask -JobName job_10 -Priority 10 -Period 1 -ExecTime 10000 -Phase 0 -Iter 20 -Load 1000
 
 specifes a Thread Task in which,
 JobName = job_10
 -Priority = 10
--Period = 1uS 
--ExecTime = 10000uS 
+-Period = 1uS
+-ExecTime = 10000uS
 -Phase = 0uS
 -Iter = 20 iterations
--Load = 1000 
+-Load = 1000
 
 4. Command-Line Options
 ----------------------
@@ -121,12 +121,12 @@ other instances of activity can be started.
 
 a). The activated Jobs are registered with a Naming service, so we need an NS running
 e.g. ./Naming_Service -o naming_ior
-  
+
 b). Start one or more instances of ./activity depending on the test configuration that you have designed.
 
 e.g. ./activity -ORBInitRef NameService=file://naming_ior -ORBSvcConf svc.conf.whatever -ORBDebugLevel 1
 
-c) once all the instances exit, the test will generate data files: <job_name>.dat 
+c) once all the instances exit, the test will generate data files: <job_name>.dat
 
 use gen_graph to generate a .png file to view the results in a graphical viewer.
 
diff --git a/examples/RTCORBA/Activity/Task_Stats.cpp b/examples/RTCORBA/Activity/Task_Stats.cpp
index c76d8f1a8a8..c4534c29d3e 100644
--- a/examples/RTCORBA/Activity/Task_Stats.cpp
+++ b/examples/RTCORBA/Activity/Task_Stats.cpp
@@ -1,6 +1,5 @@
 //$Id$
 #include "Task_Stats.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
@@ -61,7 +60,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
   FILE* output_file = ACE_OS::fopen (file_name, "w");
 
   // first dump what the caller has to say.
-  ACE_OS::fprintf (output_file, "%s\n",msg);
+  ACE_OS::fprintf (output_file, "%s\n", ACE_TEXT_ALWAYS_CHAR (msg));
 
   // next, compose and dump what we want to say.
 
@@ -80,7 +79,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
 
   // dump latency stats.
   this->dump_latency_stats (out_msg, scale_factor);
-  ACE_OS::fprintf (output_file, "%s\n",out_msg);
+  ACE_OS::fprintf (output_file, "%s\n", ACE_TEXT_ALWAYS_CHAR (out_msg));
   ACE_OS::fprintf (output_file, "#Invocation time \t Execution time\n");
 
   // dump the samples recorded.
diff --git a/examples/RTCORBA/Activity/client.conf b/examples/RTCORBA/Activity/client.conf
index 196de98c87d..8f9137b9e07 100644
--- a/examples/RTCORBA/Activity/client.conf
+++ b/examples/RTCORBA/Activity/client.conf
@@ -1,5 +1,7 @@
+# $Id$
+
 ## Sanity check Client conf file to be run for SCHED_OTHER policy
- 
+
 static RT_ORB_Loader "-ORBSchedPolicy SCHED_OTHER -ORBScopePolicy PROCESS -ORBPriorityMapping linear"
 
 static Builder "-TaskCount 1 -ThreadTask -JobName job_0 -Priority 0 -Period 1 -ExecTime 10000 -Phase 0 -Iter 20 -Load 1000"
diff --git a/examples/RTCORBA/Activity/run_test.pl b/examples/RTCORBA/Activity/run_test.pl
index 1f0115873e1..6a9be73acda 100755
--- a/examples/RTCORBA/Activity/run_test.pl
+++ b/examples/RTCORBA/Activity/run_test.pl
@@ -43,7 +43,7 @@ $client1->DeleteFile($iorfile);
 my $client2_iorfile = $client2->LocalFile ($iorfile);
 $client2->DeleteFile($iorfile);
 
-$SV = $server->CreateProcess ("../../../orbsvcs/Naming_Service/Naming_Service",
+$SV = $server->CreateProcess ("../../../orbsvcs/Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 
@@ -56,7 +56,7 @@ $CL2 = $client2->CreateProcess ("activity",
                                 "-ORBSvcConf $server_conf " .
                                 "-Started_Flag $client2_flag_file");
 
-print STDERR "Running Naming_Service\n";
+print STDERR "Running tao_cosnaming\n";
 
 $server_status = $SV->Spawn ();
 
diff --git a/examples/RTCORBA/Activity/server.conf b/examples/RTCORBA/Activity/server.conf
index e375a3fb8c1..9330a9b7d39 100644
--- a/examples/RTCORBA/Activity/server.conf
+++ b/examples/RTCORBA/Activity/server.conf
@@ -1,5 +1,7 @@
+# $Id$
+
 ## Sanity check Server conf file to be run for SCHED_OTHER policy
- 
+
 static RT_ORB_Loader "-ORBSchedPolicy SCHED_OTHER -ORBScopePolicy PROCESS -ORBPriorityMapping linear"
 
 static Builder "-POACount 1 -POA poa1 -PriorityModel CLIENT 0 -Lanes 1 -Lane 0 1 0 -JobCount 1 -Job job_0 poa1"
diff --git a/examples/RTCORBA/Activity/svc.conf.client b/examples/RTCORBA/Activity/svc.conf.client
index 83fdc67758a..89ae701d721 100755
--- a/examples/RTCORBA/Activity/svc.conf.client
+++ b/examples/RTCORBA/Activity/svc.conf.client
@@ -1,3 +1,5 @@
+# $Id$
+
 # -- E X A M P L E conf. file --
 
 # Note! priority values are for Linux
diff --git a/examples/RTCORBA/Activity/svc.conf.server b/examples/RTCORBA/Activity/svc.conf.server
index f5944646c05..20de7d0b1d7 100755
--- a/examples/RTCORBA/Activity/svc.conf.server
+++ b/examples/RTCORBA/Activity/svc.conf.server
@@ -1,3 +1,5 @@
+# $Id$
+
 # -- E X A M P L E conf. file --
 # Note! priority values are for Linux
 
diff --git a/examples/RTCORBA/Makefile.am b/examples/RTCORBA/Makefile.am
deleted file mode 100644
index 481bc3e73a0..00000000000
--- a/examples/RTCORBA/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Activity
-
diff --git a/examples/RTScheduling/DT_Creator.cpp b/examples/RTScheduling/DT_Creator.cpp
index d6b6defc0e7..2eafb77e256 100644
--- a/examples/RTScheduling/DT_Creator.cpp
+++ b/examples/RTScheduling/DT_Creator.cpp
@@ -213,7 +213,7 @@ DT_Creator::register_synch_obj (void)
   ACE_Time_Value timestamp = ACE_OS::gettimeofday ();
 
   char buf [BUFSIZ];
-  ACE_OS::sprintf(buf, "%lu", timestamp.sec ());
+  ACE_OS::sprintf(buf, "%lu", static_cast<unsigned long> (timestamp.sec ()));
   synch_name += buf;
 
   name [0].id =
@@ -471,12 +471,13 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current)
 
       if (dt_list_ [i]->start_time () != 0 &&
           (elapsed_time.sec () < dt_list_[i]->start_time ()))
-  {
-    time_t suspension_time = dt_list_[i]->start_time () - elapsed_time.sec ();
-    ACE_OS::sprintf (buf, "suspension_time = %lu\n", suspension_time);
-    log [log_index++] = ACE_OS::strdup (buf);
-    yield (suspension_time, dt_list_[i]);
-  }
+        {
+          time_t suspension_time = dt_list_[i]->start_time () - elapsed_time.sec ();
+          ACE_OS::sprintf (buf, "suspension_time = %lu\n",
+                           static_cast<unsigned long> (suspension_time));
+          log [log_index++] = ACE_OS::strdup (buf);
+          yield (suspension_time, dt_list_[i]);
+        }
 
       sched_param = this->sched_param (dt_list_ [i]->importance ());
       dt_list_ [i]->activate_task (current,
diff --git a/examples/RTScheduling/DT_Creator.h b/examples/RTScheduling/DT_Creator.h
index 3a79f51966d..bc5b01d60c4 100644
--- a/examples/RTScheduling/DT_Creator.h
+++ b/examples/RTScheduling/DT_Creator.h
@@ -10,7 +10,6 @@
 
 #include "tao/RTScheduling/RTScheduler.h"
 #include "orbsvcs/CosNamingC.h"
-#include "tao/Utils/Servant_Var.h"
 
 #include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
@@ -106,7 +105,7 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object
   ACE_TString file_name_;
   ACE_TString log_file_name_;
   ACE_UINT32 gsf_;
-  TAO::Utils::Servant_Var<Synch_i> synch_;
+  PortableServer::Servant_var<Synch_i> synch_;
 };
 
 
diff --git a/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am b/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am
deleted file mode 100644
index 41a785f485a..00000000000
--- a/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am
+++ /dev/null
@@ -1,130 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Fixed_Priority_Scheduler_Starter.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Starter
-
-Starter_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/examples/RTScheduling \
-  -I..
-
-Starter_SOURCES = \
-  ../Starter.cpp \
-  ../Starter.h
-
-Starter_LDFLAGS = \
-  -L..
-
-Starter_LDADD = \
-  $(top_builddir)/examples/RTScheduling/libRTSchedSynch.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Fixed_Priority_Scheduler_Test.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES = \
-  ../FP_SchedulingC.cpp \
-  ../FP_SchedulingC.h \
-  ../FP_SchedulingC.inl
-
-CLEANFILES = \
-  ../FP_Scheduling-stamp \
-  ../FP_SchedulingC.cpp \
-  ../FP_SchedulingC.h \
-  ../FP_SchedulingC.inl
-
-../FP_SchedulingC.cpp ../FP_SchedulingC.h ../FP_SchedulingC.inl: ../FP_Scheduling-stamp
-
-../FP_Scheduling-stamp: $(srcdir)/../FP_Scheduling.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -SS -St -o .. $(srcdir)/../FP_Scheduling.idl
-	@touch $@
-
-noinst_PROGRAMS += test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/examples/RTScheduling \
-  -I..
-
-test_SOURCES = \
-  ../FP_SchedulingC.cpp \
-  FP_DT_Creator.cpp \
-  FP_Scheduler.cpp \
-  FP_Task.cpp \
-  test.cpp \
-  ../FP_SchedulingC.h \
-  ../FP_SchedulingC.inl \
-  FP_DT_Creator.h \
-  FP_Scheduler.h \
-  FP_Task.h \
-  fp_dt_creator_export.h \
-  test.h
-
-test_LDFLAGS = \
-  -L..
-
-test_LDADD = \
-  $(top_builddir)/examples/RTScheduling/libRTSchedTestLib.la \
-  $(top_builddir)/examples/RTScheduling/libJob.la \
-  $(top_builddir)/examples/RTScheduling/libRTSchedSynch.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl b/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl
index 20490fd8247..804303058e4 100755
--- a/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl
+++ b/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl
@@ -40,7 +40,7 @@ $client->DeleteFile($iorbase);
 $nstarget->DeleteFile($iorbase);
 $starter->DeleteFile($iorbase);
 
-$NS = $nstarget->CreateProcess ("../../../orbsvcs/Naming_Service/Naming_Service",
+$NS = $nstarget->CreateProcess ("../../../orbsvcs/Naming_Service/tao_cosnaming",
                                 "-o $nstarget_iorfile");
 $SV = $server->CreateProcess ("test",
                               "-ORBInitRef NameService=file://$server_iorfile ".
diff --git a/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.client b/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.client
index f16ccd6fcd0..0071cce9b32 100644
--- a/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.client
+++ b/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.client
@@ -1,3 +1,5 @@
+# $Id$
+
 # -- E X A M P L E conf. file --
 
 # Note! priority values are for Linux
diff --git a/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.server b/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.server
index baee8854a83..9a1afac76d6 100644
--- a/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.server
+++ b/examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.server
@@ -1,3 +1,5 @@
+# $Id$
+
 # -- E X A M P L E conf. file --
 
 # Note! priority values are for Linux
diff --git a/examples/RTScheduling/Fixed_Priority_Scheduler/test.h b/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
index 565adffb08a..aa7ff8dfb65 100644
--- a/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
+++ b/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
@@ -10,7 +10,6 @@
 #include "ace/Synch.h"
 #include "ace/Task.h"
 #include "FP_DT_Creator.h"
-#include "tao/Utils/Servant_Var.h"
 
 class Task_Stats;
 
@@ -53,7 +52,7 @@ class DT_Test :public ACE_Task <ACE_SYNCH>
   int min_priority_;
   RTScheduling::Current_var current_;
   FP_DT_Creator* dt_creator_;
-  TAO::Utils::Servant_Var<Fixed_Priority_Scheduler> scheduler_;
+  PortableServer::Servant_var<Fixed_Priority_Scheduler> scheduler_;
   RTCORBA::RTORB_var rt_orb_;
   /// Reference to the root poa.
   PortableServer::POA_var root_poa_;
diff --git a/examples/RTScheduling/Job.idl b/examples/RTScheduling/Job.idl
index d6387247eaf..f1aab1c1074 100644
--- a/examples/RTScheduling/Job.idl
+++ b/examples/RTScheduling/Job.idl
@@ -6,6 +6,6 @@ interface Job
 {
   void work (in unsigned long work,
              in short importance);
-  
+
   void shutdown ();
 };
diff --git a/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h b/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h
index 4404293c69b..64c255f6444 100644
--- a/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h
+++ b/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h
@@ -20,7 +20,7 @@ public:
                                         int iter,
                                         int dist,
                                         char *job_name);
-  
+
   virtual void yield (time_t suspend_time,
                       Thread_Task* task);
 
diff --git a/examples/RTScheduling/MIF_Scheduler/Makefile.am b/examples/RTScheduling/MIF_Scheduler/Makefile.am
deleted file mode 100644
index 6fccb5052e3..00000000000
--- a/examples/RTScheduling/MIF_Scheduler/Makefile.am
+++ /dev/null
@@ -1,130 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MIF_Scheduler_Starter.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Starter
-
-Starter_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/examples/RTScheduling \
-  -I..
-
-Starter_SOURCES = \
-  ../Starter.cpp \
-  ../Starter.h
-
-Starter_LDFLAGS = \
-  -L..
-
-Starter_LDADD = \
-  $(top_builddir)/examples/RTScheduling/libRTSchedSynch.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MIF_Scheduler_Test.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES = \
-  ../MIF_SchedulingC.cpp \
-  ../MIF_SchedulingC.h \
-  ../MIF_SchedulingC.inl
-
-CLEANFILES = \
-  ../MIF_Scheduling-stamp \
-  ../MIF_SchedulingC.cpp \
-  ../MIF_SchedulingC.h \
-  ../MIF_SchedulingC.inl
-
-../MIF_SchedulingC.cpp ../MIF_SchedulingC.h ../MIF_SchedulingC.inl: ../MIF_Scheduling-stamp
-
-../MIF_Scheduling-stamp: $(srcdir)/../MIF_Scheduling.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -SS -St -o .. $(srcdir)/../MIF_Scheduling.idl
-	@touch $@
-
-noinst_PROGRAMS += test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/examples/RTScheduling \
-  -I..
-
-test_SOURCES = \
-  ../MIF_SchedulingC.cpp \
-  MIF_DT_Creator.cpp \
-  MIF_Scheduler.cpp \
-  MIF_Task.cpp \
-  test.cpp \
-  ../MIF_SchedulingC.h \
-  ../MIF_SchedulingC.inl \
-  MIF_DT_Creator.h \
-  MIF_Scheduler.h \
-  MIF_Task.h \
-  mif_dt_creator_export.h \
-  test.h
-
-test_LDFLAGS = \
-  -L..
-
-test_LDADD = \
-  $(top_builddir)/examples/RTScheduling/libRTSchedTestLib.la \
-  $(top_builddir)/examples/RTScheduling/libJob.la \
-  $(top_builddir)/examples/RTScheduling/libRTSchedSynch.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/examples/RTScheduling/MIF_Scheduler/run_test.pl b/examples/RTScheduling/MIF_Scheduler/run_test.pl
index f7baaf9b50f..8f70a9bbebe 100755
--- a/examples/RTScheduling/MIF_Scheduler/run_test.pl
+++ b/examples/RTScheduling/MIF_Scheduler/run_test.pl
@@ -40,7 +40,7 @@ $client->DeleteFile($iorbase);
 $nstarget->DeleteFile($iorbase);
 $starter->DeleteFile($iorbase);
 
-$NS = $nstarget->CreateProcess ("../../../orbsvcs/Naming_Service/Naming_Service",
+$NS = $nstarget->CreateProcess ("../../../orbsvcs/Naming_Service/tao_cosnaming",
                                 "-o $nstarget_iorfile");
 $SV = $server->CreateProcess ("test",
                               "-ORBInitRef NameService=file://$server_iorfile ".
diff --git a/examples/RTScheduling/MIF_Scheduler/svc.conf.client b/examples/RTScheduling/MIF_Scheduler/svc.conf.client
index 90735c209d1..fffd9361166 100644
--- a/examples/RTScheduling/MIF_Scheduler/svc.conf.client
+++ b/examples/RTScheduling/MIF_Scheduler/svc.conf.client
@@ -1,3 +1,5 @@
+# $Id$
+
 # -- E X A M P L E conf. file --
 
 # Note! priority values are for Linux
diff --git a/examples/RTScheduling/MIF_Scheduler/svc.conf.server b/examples/RTScheduling/MIF_Scheduler/svc.conf.server
index 97bcc0114a0..20d54c64778 100644
--- a/examples/RTScheduling/MIF_Scheduler/svc.conf.server
+++ b/examples/RTScheduling/MIF_Scheduler/svc.conf.server
@@ -1,3 +1,5 @@
+# $Id$
+
 # -- E X A M P L E conf. file --
 
 # Note! priority values are for Linux
diff --git a/examples/RTScheduling/MIF_Scheduler/test.h b/examples/RTScheduling/MIF_Scheduler/test.h
index fa3e8eec8ae..acb1f249fe8 100644
--- a/examples/RTScheduling/MIF_Scheduler/test.h
+++ b/examples/RTScheduling/MIF_Scheduler/test.h
@@ -9,7 +9,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/Synch.h"
 #include "ace/Task.h"
-#include "tao/Utils/Servant_Var.h"
 
 class Task_Stats;
 
@@ -45,7 +44,7 @@ class DT_Test //:public ACE_Task <ACE_SYNCH>
   int min_priority_;
   RTScheduling::Current_var current_;
   MIF_DT_Creator* dt_creator_;
-  TAO::Utils::Servant_Var<MIF_Scheduler> scheduler_;
+  PortableServer::Servant_var<MIF_Scheduler> scheduler_;
 };
 
 typedef ACE_Singleton <DT_Test, TAO_SYNCH_MUTEX> DT_TEST;
diff --git a/examples/RTScheduling/Makefile.am b/examples/RTScheduling/Makefile.am
deleted file mode 100644
index 40edb6fdbc4..00000000000
--- a/examples/RTScheduling/Makefile.am
+++ /dev/null
@@ -1,172 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-SUBDIRS = \
-        . \
-        MIF_Scheduler \
-        Fixed_Priority_Scheduler
-
-noinst_LTLIBRARIES =
-CLEANFILES =
-BUILT_SOURCES =
-noinst_HEADERS =
-
-## Makefile.RTSchedSynch.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  SynchC.cpp \
-  SynchC.h \
-  SynchC.inl \
-  SynchS.cpp \
-  SynchS.h \
-  SynchS.inl
-
-CLEANFILES += \
-  Synch-stamp \
-  SynchC.cpp \
-  SynchC.h \
-  SynchC.inl \
-  SynchS.cpp \
-  SynchS.h \
-  SynchS.inl
-
-SynchC.cpp SynchC.h SynchC.inl SynchS.cpp SynchS.h SynchS.inl: Synch-stamp
-
-Synch-stamp: $(srcdir)/Synch.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -St -Wb,export_macro=SYNCH_Export -Wb,export_include=synch_export.h $(srcdir)/Synch.idl
-	@touch $@
-
-noinst_LTLIBRARIES += libRTSchedSynch.la
-
-libRTSchedSynch_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DSYNCH_BUILD_DLL
-
-libRTSchedSynch_la_SOURCES = \
-  SynchC.cpp \
-  SynchS.cpp \
-  Synch_i.cpp
-
-noinst_HEADERS += \
-  Synch.idl \
-  SynchC.h \
-  SynchC.inl \
-  SynchS.h \
-  SynchS.inl \
-  Synch_i.h \
-  synch_export.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Job.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  JobC.cpp \
-  JobC.h \
-  JobC.inl \
-  JobS.cpp \
-  JobS.h \
-  JobS.inl
-
-CLEANFILES += \
-  Job-stamp \
-  JobC.cpp \
-  JobC.h \
-  JobC.inl \
-  JobS.cpp \
-  JobS.h \
-  JobS.inl
-
-JobC.cpp JobC.h JobC.inl JobS.cpp JobS.h JobS.inl: Job-stamp
-
-Job-stamp: $(srcdir)/Job.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -St -Wb,export_macro=JOB_Export -Wb,export_include=job_export.h $(srcdir)/Job.idl
-	@touch $@
-
-noinst_LTLIBRARIES += libJob.la
-
-libJob_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DJOB_BUILD_DLL
-
-libJob_la_SOURCES = \
-  JobC.cpp \
-  JobS.cpp
-
-noinst_HEADERS += \
-  Job.idl \
-  JobC.h \
-  JobC.inl \
-  JobS.h \
-  JobS.inl \
-  job_export.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTSchedTestLib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_LTLIBRARIES += libRTSchedTestLib.la
-
-libRTSchedTestLib_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DRTSCHEDTESTLIB_BUILD_DLL
-
-libRTSchedTestLib_la_SOURCES = \
-  DT_Creator.cpp \
-  Job_i.cpp \
-  POA_Holder.cpp \
-  Task_Stats.cpp \
-  Thread_Task.cpp
-
-noinst_HEADERS += \
-  DT_Creator.h \
-  Job_i.h \
-  POA_Holder.h \
-  Task_Stats.h \
-  Task_Stats.inl \
-  Thread_Task.h \
-  rtschedtestlib_export.h
-
-endif BUILD_RT_CORBA
-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/examples/RTScheduling/Task_Stats.cpp b/examples/RTScheduling/Task_Stats.cpp
index 48c841f8687..082f6c37e70 100644
--- a/examples/RTScheduling/Task_Stats.cpp
+++ b/examples/RTScheduling/Task_Stats.cpp
@@ -1,8 +1,6 @@
 //$Id$
 #include "Task_Stats.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
-#include "ace/OS_String.h"
 
 #if !defined (__ACE_INLINE__)
 #include "Task_Stats.inl"
@@ -74,7 +72,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
     }
 
   // first dump what the caller has to say.
-  ACE_OS::fprintf (output_file, "%s\n",msg);
+  ACE_OS::fprintf (output_file, "%s\n", ACE_TEXT_ALWAYS_CHAR (msg));
 
   // next, compose and dump what we want to say.
   ACE_UINT32 val_1;
diff --git a/examples/Simple/Makefile.am b/examples/Simple/Makefile.am
deleted file mode 100644
index 19db928b1da..00000000000
--- a/examples/Simple/Makefile.am
+++ /dev/null
@@ -1,18 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        bank \
-        chat \
-        echo \
-        grid \
-        time-date \
-        time
-
diff --git a/examples/Simple/Simple_util.h b/examples/Simple/Simple_util.h
index 9808d1e1a19..f5b2d188fd8 100644
--- a/examples/Simple/Simple_util.h
+++ b/examples/Simple/Simple_util.h
@@ -1,20 +1,17 @@
-//$Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple
-//
-// = FILENAME
-//    Simple_Util.h
-//
-// = DESCRIPTION
-//    The classe define the templates for the client and server.
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Simple_util.h
+ *
+ *  $Id$
+ *
+ *  The classe define the templates for the client and server.
+ *
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_UTIL_H
 #define TAO_UTIL_H
@@ -25,108 +22,112 @@
 #include "ace/Read_Buffer.h"
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
 
+/**
+ * @class Server
+ *
+ * @brief A set of useful class Templates for using the TAO CORBA
+ * implementation.
+ *
+ * A template server definition. This template can be used by
+ * single server/client projects for defintion of their
+ * server/clients.  See the directories time, bank, echo for
+ * further details of implemenatation.
+ */
 template <class Servant>
 class Server
 {
-  // = TITLE
-  //   A set of useful class Templates for using the TAO CORBA
-  //   implementation.
-  //
-  // = DESCRIPTION
-  //   A template server definition. This template can be used by
-  //   single server/client projects for defintion of their
-  //   server/clients.  See the directories time, bank, echo for
-  //   further details of implemenatation.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.
   Server (void);
-  // Constructor.
 
+  /// Destructor.
   ~Server (void);
-  // Destructor.
 
+  /// Initialize the Server state - parsing arguments and waiting.
+  /// interface_name is the name used to register the Servant.
   int init (const char *servant_name,
             int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the Server state - parsing arguments and waiting.
-  // interface_name is the name used to register the Servant.
 
+  /// After calling <init>, this method will register the server with
+  /// the TAO Naming Service using the name passed to this method.
   int register_name (const char *name);
-  // After calling <init>, this method will register the server with
-  // the TAO Naming Service using the name passed to this method.
 
+  /// Run the orb.
   int run (void);
-  // Run the orb.
 
+  /// Ignore this method if you are not testing the InterOperable
+  /// Naming Service.
   int test_for_ins (const char *ior);
-  // Ignore this method if you are not testing the InterOperable
-  // Naming Service.
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// A holder of the servant that does ref counting for him.
   typedef TAO_Intrusive_Ref_Count_Handle<Servant> Servant_var;
   Servant_var servant_;
-  // A holder of the servant that does ref counting for him.
 
+  /// The ORB manager - a helper class for accessing the POA and
+  /// registering objects.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager - a helper class for accessing the POA and
-  // registering objects.
 
+  /// helper class for getting access to Naming Service.
   TAO_Naming_Client naming_client_;
-  // helper class for getting access to Naming Service.
 
+  /// File where the IOR of the server object is stored.
   ACE_TCHAR *ior_output_file_;
-  // File where the IOR of the server object is stored.
 
+  /// Flag to indicate whether naming service could be used
   int naming_;
-  // Flag to indicate whether naming service could be used
 
+  /// Used test the INS.
   ACE_TCHAR *ins_;
-  // Used test the INS.
 
+  /// Number of command line arguments.
   int argc_;
-  // Number of command line arguments.
 
+  /// The command line arguments.
   ACE_TCHAR **argv_;
-  // The command line arguments.
 };
 
+/**
+ * @class Client
+ *
+ * @brief Template Client class
+ *
+ * A template client implementation for a single server/client
+ * model. The example usage of these usage can be found in the
+ * sub-directories below
+ */
 template <class ServerInterface>
 class Client
 {
-  // = TITLE
-  //   Template Client class
-  //
-  // = DESCRIPTION
-  //   A template client implementation for a single server/client
-  //   model. The example usage of these usage can be found in the
-  //   sub-directories below
 public:
 
   // = Initialization and termination methods.
+  /// Constructor.
   Client (void);
-  // Constructor.
 
+  /// Destructor.
   ~Client (void);
-  // Destructor.
 
+  /// Initialize the client communication endpoint with server.
   int init (const char *name, int argc, ACE_TCHAR *argv[]);
-  // Initialize the client communication endpoint with server.
 
+  /// Return the interface object pointer.
   ServerInterface *operator-> () { return server_.in (); }
-  // Return the interface object pointer.
 
+  /// Returns the shutdown flag.
   int do_shutdown (void);
-  // Returns the shutdown flag.
 
+  /// Fills in the shutdwon flag.
   void do_shutdown (int);
-  // Fills in the shutdwon flag.
 
+  /// Initialize naming service
   int obtain_initial_references (const char *name);
-  // Initialize naming service
 
   CORBA::ORB_ptr orb (void)
     {
@@ -134,36 +135,36 @@ public:
     }
 
 private:
+  /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the server IOR from a file.
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
+  /// helper class for getting access to Naming Service.
   TAO_Naming_Client naming_client_;
-  // helper class for getting access to Naming Service.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// IOR of the obj ref of the server.
   ACE_CString ior_;
-  // IOR of the obj ref of the server.
 
+  /// Server object
   typedef TAO_Intrusive_Ref_Count_Handle<ServerInterface> ServerInterface_var;
   ServerInterface_var server_;
-  // Server object
 
+  /// Flag to use the naming service
   int naming_;
-  // Flag to use the naming service
 
+  /// Flag for shutting down the server
   int do_shutdown_;
-  // Flag for shutting down the server
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/examples/Simple/bank/AccountManager_i.cpp b/examples/Simple/bank/AccountManager_i.cpp
index 1388f51b02b..a3868e35d67 100644
--- a/examples/Simple/bank/AccountManager_i.cpp
+++ b/examples/Simple/bank/AccountManager_i.cpp
@@ -5,8 +5,6 @@
 #include "tao/debug.h"
 #include "tao/Utils/ORB_Manager.h"
 
-ACE_RCSID(AccountManager, AccountManager_i, "$Id$")
-
 // Constructor
 AccountManager_i::AccountManager_i (void)
 {
diff --git a/examples/Simple/bank/AccountManager_i.h b/examples/Simple/bank/AccountManager_i.h
index 9e502bc6e72..ede279c0840 100644
--- a/examples/Simple/bank/AccountManager_i.h
+++ b/examples/Simple/bank/AccountManager_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/Bank
-//
-// = FILENAME
-//    AccountManager_i.h
-//
-// = DESCRIPTION
-//    This class implements the Bank::AccountManager IDL interface.
-//
-// = AUTHOR
-//    Vishal Kachroo  <vishal@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    AccountManager_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Bank::AccountManager IDL interface.
+ *
+ *
+ *  @author Vishal Kachroo  <vishal@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ACCOUNTMANAGER_I_H
 #define ACCOUNTMANAGER_I_H
@@ -29,7 +26,6 @@
 #include "Account_i.h"
 
 #include "ace/Hash_Map_Manager.h"
-#include "ace/OS.h"
 #include "ace/ACE.h"
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
@@ -39,65 +35,69 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_ORB_Manager;
 TAO_END_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class AccountManager_i
+ *
+ * @brief Account Manager object implementation.
+ *
+ * Implementation of a simple object that has two methods, one
+ * that returns an Account Interface and the other that shuts
+ * down the server.
+ */
 class AccountManager_i : public POA_Bank::AccountManager
 {
-  // = TITLE
-  //    Account Manager object implementation.
-  //
-  // = DESCRIPTION
-  //    Implementation of a simple object that has two methods, one
-  //    that returns an Account Interface and the other that shuts
-  //    down the server.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   AccountManager_i (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~AccountManager_i (void);
-  // Destructor.
 
+  /// Return the Account interface with the given name from the server.
+  /// Put the initial balance specified in the new account.
   virtual Bank::Account_ptr open (const char *name,
                                   CORBA::Float initial_balance);
-  // Return the Account interface with the given name from the server.
-  // Put the initial balance specified in the new account.
 
+  /// Close the given account.
   virtual void close (Bank::Account_ptr);
-  // Close the given account.
 
+  /// Shutdown the server.
   virtual void shutdown (void);
-  // Shutdown the server.
 
+  /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
 
+  /// Set the POA pointer.
   void poa (PortableServer::POA_ptr poa);
-  // Set the POA pointer.
 
+  /// Set the ORB Manager.
   void set_orb_manager (TAO_ORB_Manager *orb_manager);
-  // Set the ORB Manager.
 
+  /// The ORB manager.
   TAO_ORB_Manager *orb_manager_;
-  // The ORB manager.
 
 private:
+  /// ORB pointer.
   CORBA::ORB_var orb_;
-  // ORB pointer.
 
+  /// POA pointer.
   PortableServer::POA_var poa_;
-  // POA pointer.
 
   typedef TAO_Intrusive_Ref_Count_Handle<Account_i> Account_i_var;
   typedef ACE_Hash_Map_Manager<ACE_CString,
                                Account_i_var,
                                ACE_Null_Mutex> MAP_MANAGER_TYPE;
 
+  /**
+   * Calls to <open> will create a new instance of <Account_i> and
+   * bind into the hash map manager if <name> is unique, else it will
+   * return a previously bound entry.
+   */
   MAP_MANAGER_TYPE hash_map_;
-  // Calls to <open> will create a new instance of <Account_i> and
-  // bind into the hash map manager if <name> is unique, else it will
-  // return a previously bound entry.
 
+  /// Keeping g++2.7.2
   ACE_UNIMPLEMENTED_FUNC (void operator= (const AccountManager_i &))
-  // Keeping g++2.7.2
 };
 
 #endif /* ACCOUNTMANAGER_I_H */
diff --git a/examples/Simple/bank/Account_i.cpp b/examples/Simple/bank/Account_i.cpp
index 5919b86be8a..ab95ce86fc1 100644
--- a/examples/Simple/bank/Account_i.cpp
+++ b/examples/Simple/bank/Account_i.cpp
@@ -2,8 +2,6 @@
 
 #include "Account_i.h"
 
-ACE_RCSID(Bank, Account_i, "$Id$")
-
 // Constructor
 Account_i::Account_i (void)
 {
diff --git a/examples/Simple/bank/Account_i.h b/examples/Simple/bank/Account_i.h
index 68562fc7cc1..777097e97e8 100644
--- a/examples/Simple/bank/Account_i.h
+++ b/examples/Simple/bank/Account_i.h
@@ -1,74 +1,73 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/Bank
-//
-// = FILENAME
-//    Account_i.h
-//
-// = DESCRIPTION
-//    This class implements the Bank IDL interface.
-//
-// = AUTHOR
-//    Vishal Kachroo <vishal@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Account_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Bank IDL interface.
+ *
+ *
+ *  @author Vishal Kachroo <vishal@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ACCOUNT_I_H
 #define ACCOUNT_I_H
 
 #include "BankS.h"
 
+/**
+ * @class Account_i
+ *
+ * @brief Bank object implementation.
+ *
+ * Implementation of a simple object that has two methods, one
+ * that return the current balance on the server and the other
+ * that shuts down the server.
+ */
 class Account_i : public POA_Bank::Account
 {
-  // = TITLE
-  //    Bank object implementation.
-  //
-  // = DESCRIPTION
-  //    Implementation of a simple object that has two methods, one
-  //    that return the current balance on the server and the other
-  //    that shuts down the server.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Account_i (void);
-  // Constructor.
 
+  /// Constructor.
   Account_i (const char *, CORBA::Float);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Account_i (void);
-  // Destructor.
 
+  /// Get the current balance in the account.
   virtual CORBA::Float balance (void);
-  // Get the current balance in the account.
 
+  /// Get the name of the <Account> holder.
   virtual char *name (void);
-  // Get the name of the <Account> holder.
 
+  /// Set the name of the <Account> holder.
   virtual void name (const char *name);
-  // Set the name of the <Account> holder.
 
+  /// Deposit money in the account.
   virtual void deposit (CORBA::Float);
-  // Deposit money in the account.
 
+  /// Withdraw money in the account.
   virtual void withdraw (CORBA::Float);
-  // Withdraw money in the account.
 
+  /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
 
 private:
+  /// ORB pointer.
   CORBA::ORB_var orb_;
-  // ORB pointer.
 
+  /// balance for this account
   CORBA::Float balance_;
-  // balance for this account
 
+  /// Name of the <Account> holder.
   CORBA::String_var name_;
-  // Name of the <Account> holder.
 };
 
 #endif /* ACCOUNT_I_H */
diff --git a/examples/Simple/bank/Bank_Client_i.h b/examples/Simple/bank/Bank_Client_i.h
index 0a3a0c25c10..5b20c895646 100644
--- a/examples/Simple/bank/Bank_Client_i.h
+++ b/examples/Simple/bank/Bank_Client_i.h
@@ -1,22 +1,18 @@
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/bank
-//
-// = FILENAME
-//    Bank_Client_i.h
-//
-// = DESCRIPTION
-//    This class implements the  interface calls for RMI.
-//
-// = AUTHOR
-//
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Bank_Client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the  interface calls for RMI.
+ *
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef BANK_CLIENT_I_H
 #define BANK_CLIENT_I_H
@@ -24,43 +20,45 @@
 #include "../Simple_util.h"
 #include "BankC.h"
 
+/**
+ * @class Bank_Client_i
+ *
+ * @brief Grid_Client interface subclass.
+ *
+ * This class implements the interface between the interface
+ * objects and the client .
+ */
 class Bank_Client_i
 {
-  // = TITLE
-  //   Grid_Client interface subclass.
-  //
-  // = DESCRIPTION
-  //   This class implements the interface between the interface
-  //   objects and the client .
 public:
   // = Initialization and termination methods.
+  /// Constructor
   Bank_Client_i (void);
-  // Constructor
 
+  /// Destructor
   ~Bank_Client_i (void);
-  // Destructor
 
+  /// Execute the methods.
   int run (const char *, int, ACE_TCHAR *[]);
-  // Execute the methods.
 
 private:
+  /// Method that calls all the test functions
   int check_accounts (void);
-  // Method that calls all the test functions
 
+  /// Tests if accounts opened with different names return a different account
+  /// reference.
   void test_for_different_name (void);
-  // Tests if accounts opened with different names return a different account
-  // reference.
 
+  /// Tests if accounts opened with the same name return the same
+  /// object reference.
   void test_for_same_name (void);
-  // Tests if accounts opened with the same name return the same
-  // object reference.
 
+  /// Tests for the Overdraft Exception when the client tries to
+  /// withdraw more money than the current balance.
   void test_for_overdraft (void);
-  // Tests for the Overdraft Exception when the client tries to
-  // withdraw more money than the current balance.
 
+  /// Instantiate the client object.
   Client<Bank::AccountManager> client_;
-  // Instantiate the client object.
 };
 
 #endif /* TIME_CLIENT_I_H */
diff --git a/examples/Simple/bank/Makefile.am b/examples/Simple/bank/Makefile.am
deleted file mode 100644
index ffe91c1341a..00000000000
--- a/examples/Simple/bank/Makefile.am
+++ /dev/null
@@ -1,132 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.bank_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  BankC.cpp \
-  BankC.h \
-  BankC.inl \
-  BankS.cpp \
-  BankS.h \
-  BankS.inl
-
-CLEANFILES = \
-  Bank-stamp \
-  BankC.cpp \
-  BankC.h \
-  BankC.inl \
-  BankS.cpp \
-  BankS.h \
-  BankS.inl
-
-BankC.cpp BankC.h BankC.inl BankS.cpp BankS.h BankS.inl: Bank-stamp
-
-Bank-stamp: $(srcdir)/Bank.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Bank.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Bank.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.bank_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  ../Simple_util.cpp \
-  BankC.cpp \
-  Bank_Client_i.cpp \
-  client.cpp \
-  ../Simple_util.h \
-  Bank_Client_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.bank_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  ../Simple_util.cpp \
-  AccountManager_i.cpp \
-  Account_i.cpp \
-  BankC.cpp \
-  BankS.cpp \
-  server.cpp \
-  ../Simple_util.h \
-  AccountManager_i.h \
-  Account_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/examples/Simple/chat/Broadcaster_i.cpp b/examples/Simple/chat/Broadcaster_i.cpp
index 3a89e85a703..42aa06b3086 100644
--- a/examples/Simple/chat/Broadcaster_i.cpp
+++ b/examples/Simple/chat/Broadcaster_i.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/chat
-//
-// = FILENAME
-//    Broadcaster_i.cpp
-//
-// = DESCRIPTION
-//   Implementation of the Broadcaster_i class. This class is the servant
-//   object for the chat server.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Broadcaster_i.cpp
+ *
+ *  $Id$
+ *
+ * Implementation of the Broadcaster_i class. This class is the servant
+ * object for the chat server.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Broadcaster_i.h"
 
diff --git a/examples/Simple/chat/Broadcaster_i.h b/examples/Simple/chat/Broadcaster_i.h
index 764bd6e808a..426f0c5ef7b 100644
--- a/examples/Simple/chat/Broadcaster_i.h
+++ b/examples/Simple/chat/Broadcaster_i.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/chat
-//
-// = FILENAME
-//    Broadcaster_i.h
-//
-// = DESCRIPTION
-//    Defines the implementation header for the Broadcaster interface.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Broadcaster_i.h
+ *
+ *  $Id$
+ *
+ *  Defines the implementation header for the Broadcaster interface.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef BROADCASTER_I_H
 #define BROADCASTER_I_H
@@ -31,53 +28,58 @@
 
 #include "ace/SString.h"
 
+/**
+ * @class Broadcaster_i
+ *
+ * @brief The implementation of the Broadcaster class, which is the
+ * servant object for the chat server.
+ */
 class Broadcaster_i : public POA_Broadcaster
 {
-  // = TITLE
-  //    The implementation of the Broadcaster class, which is the
-  //    servant object for the chat server.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Broadcaster_i (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Broadcaster_i (void);
-  // Destructor.
 
+  /// Saves receiver references in a list.
   virtual void add (Receiver_ptr receiver,
                     const char *nickname);
-  // Saves receiver references in a list.
 
+  /// Removes receiver references from the list.
   virtual void remove (Receiver_ptr receiver);
-  // Removes receiver references from the list.
 
+  /// Called by Broadcaster clients to send messages.
   virtual void say (Receiver_ptr receiver,
                     const char *text);
-  // Called by Broadcaster clients to send messages.
 
 public:
+  /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
 
+  /// Broadcasts the text to all registered clients.
   void broadcast (const char* text);
-  // Broadcasts the text to all registered clients.
 
+  /**
+   * @class Receiver_Data
+   *
+   * @brief Per-client info.
+   *
+   * Saves the Receiver_var and user nickname.
+   */
   class Receiver_Data
   {
-    // = TITLE
-    //   Per-client info.
-    //
-    // = DESCRIPTION
-    //   Saves the Receiver_var and user nickname.
   public:
+    /// The == op required by the ACE_Unbounded set.
     bool operator == (const Receiver_Data &receiver_data) const;
-    // The == op required by the ACE_Unbounded set.
 
+    /// Stores the receiver reference.
     Receiver_var receiver_;
-    // Stores the receiver reference.
 
+    /// Stores the client nickname.
     ACE_CString nickname_;
-    // Stores the client nickname.
   };
 
   typedef ACE_Unbounded_Set<Receiver_Data>
@@ -85,8 +87,8 @@ public:
   typedef ACE_Unbounded_Set_Iterator<Receiver_Data>
           RECEIVER_SET_ITERATOR;
 
+  /// Set of registered clients.
   RECEIVER_SET receiver_set_;
-  // Set of registered clients.
 };
 
 #endif /* BROADCASTER_I_H */
diff --git a/examples/Simple/chat/Client_i.cpp b/examples/Simple/chat/Client_i.cpp
index 863a4dc66c4..fad94839bcd 100644
--- a/examples/Simple/chat/Client_i.cpp
+++ b/examples/Simple/chat/Client_i.cpp
@@ -1,21 +1,17 @@
-// $Id$
-
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/tests/Simple/chat
-//
-// = FILENAME
-//    Client_i.cpp
-//
-// = DESCRIPTION
-//    Implementation of the Client_i class.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Client_i.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the Client_i class.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Client_i.h"
 #include "tao/ORB.h"
diff --git a/examples/Simple/chat/Client_i.h b/examples/Simple/chat/Client_i.h
index 7f7fd3bda93..874f7ec9bf3 100644
--- a/examples/Simple/chat/Client_i.h
+++ b/examples/Simple/chat/Client_i.h
@@ -1,22 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/tests/Simple/chat
-//
-// = FILENAME
-//    Client_i.h
-//
-// = DESCRIPTION
-//    Definition of the Chat Client class, Client_i.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Client_i.h
+ *
+ *  $Id$
+ *
+ *  Definition of the Chat Client class, Client_i.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef CLIENT_I_H
 #define CLIENT_I_H
@@ -34,58 +30,60 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
 
+/**
+ * @class Client_i
+ *
+ * @brief Chat Client class.
+ *
+ * Connects to the Chat server and registers the Receiver_i
+ * object with the chat server.  It also takes in user chat
+ * messages and sends them to the server.
+ */
 class Client_i : public ACE_Event_Handler
 {
-  // = TITLE
-  //    Chat Client class.
-  //
-  // = DESCRIPTION
-  //    Connects to the Chat server and registers the Receiver_i
-  //    object with the chat server.  It also takes in user chat
-  //    messages and sends them to the server.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Client_i (void);
-  // Constructor.
 
+  /// Initialize the client communication with the server.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize the client communication with the server.
 
+  /// Start the ORB object.
   int run (void);
-  // Start the ORB object.
 
+  /// Handle the user input.
   virtual int handle_input (ACE_HANDLE);
-  // Handle the user input.
 
 private:
+  /// Parse the command line arguments.
+  /// Returns 0 on success, -1 on error.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parse the command line arguments.
-  // Returns 0 on success, -1 on error.
 
+  /// Function to read the server ior from a file.
   int read_ior (const ACE_TCHAR *filename);
-  // Function to read the server ior from a file.
 
+  /// IOR of the obj ref of the server.
   ACE_CString ior_;
-  // IOR of the obj ref of the server.
 
+  /// The filename that stores the ior of the server
   const ACE_TCHAR* ior_file_name_;
-  // The filename that stores the ior of the server
 
+  /// Nickname of the user chatting.
   ACE_CString nickname_;
-  // Nickname of the user chatting.
 
+  /// Our orb.
   TAO_ORB_Manager orb_manager_;
-  // Our orb.
 
+  /// Server object ptr.
   Broadcaster_var server_;
-  // Server object ptr.
 
+  /// The receiver object.
   typedef TAO_Intrusive_Ref_Count_Handle<Receiver_i> Receiver_i_var;
   Receiver_i_var receiver_i_;
-  // The receiver object.
 
+  /// Pointer to the receiver object registered with the ORB.
   Receiver_var receiver_var_;
-  // Pointer to the receiver object registered with the ORB.
 };
 
 #define QUIT_STRING "quit"
diff --git a/examples/Simple/chat/Makefile.am b/examples/Simple/chat/Makefile.am
deleted file mode 100644
index 4d28b71f234..00000000000
--- a/examples/Simple/chat/Makefile.am
+++ /dev/null
@@ -1,146 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.chat_IDL.am
-
-BUILT_SOURCES = \
-  ReceiverC.cpp \
-  ReceiverC.h \
-  ReceiverC.inl \
-  ReceiverS.cpp \
-  ReceiverS.h \
-  ReceiverS.inl
-
-CLEANFILES = \
-  Receiver-stamp \
-  ReceiverC.cpp \
-  ReceiverC.h \
-  ReceiverC.inl \
-  ReceiverS.cpp \
-  ReceiverS.h \
-  ReceiverS.inl
-
-ReceiverC.cpp ReceiverC.h ReceiverC.inl ReceiverS.cpp ReceiverS.h ReceiverS.inl: Receiver-stamp
-
-Receiver-stamp: $(srcdir)/Receiver.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Receiver.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  BroadcasterC.cpp \
-  BroadcasterC.h \
-  BroadcasterC.inl \
-  BroadcasterS.cpp \
-  BroadcasterS.h \
-  BroadcasterS.inl
-
-CLEANFILES += \
-  Broadcaster-stamp \
-  BroadcasterC.cpp \
-  BroadcasterC.h \
-  BroadcasterC.inl \
-  BroadcasterS.cpp \
-  BroadcasterS.h \
-  BroadcasterS.inl
-
-BroadcasterC.cpp BroadcasterC.h BroadcasterC.inl BroadcasterS.cpp BroadcasterS.h BroadcasterS.inl: Broadcaster-stamp
-
-Broadcaster-stamp: $(srcdir)/Broadcaster.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Broadcaster.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Broadcaster.idl \
-  Receiver.idl
-
-## Makefile.chat_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  BroadcasterC.cpp \
-  Client_i.cpp \
-  ReceiverC.cpp \
-  ReceiverS.cpp \
-  Receiver_i.cpp \
-  client.cpp \
-  Client_i.h \
-  Receiver_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.chat_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  BroadcasterC.cpp \
-  BroadcasterS.cpp \
-  Broadcaster_i.cpp \
-  ReceiverC.cpp \
-  Server_i.cpp \
-  server.cpp \
-  Broadcaster_i.h \
-  Server_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/examples/Simple/chat/Receiver_i.cpp b/examples/Simple/chat/Receiver_i.cpp
index 4156bd8dd78..af8099f89a1 100644
--- a/examples/Simple/chat/Receiver_i.cpp
+++ b/examples/Simple/chat/Receiver_i.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/chat
-//
-// = FILENAME
-//    Receiver_i.cpp
-//
-// = DESCRIPTION
-//    Implements the Receiver_i class, which is used by the chat client.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Receiver_i.cpp
+ *
+ *  $Id$
+ *
+ *  Implements the Receiver_i class, which is used by the chat client.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Receiver_i.h"
 
diff --git a/examples/Simple/chat/Receiver_i.h b/examples/Simple/chat/Receiver_i.h
index 5b07f53e877..9f0bde342c4 100644
--- a/examples/Simple/chat/Receiver_i.h
+++ b/examples/Simple/chat/Receiver_i.h
@@ -1,56 +1,57 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/chat
-//
-// = FILENAME
-//    Receiver_i.h
-//
-// = DESCRIPTION
-//    Defines the implementation header for the Receiver interface.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Receiver_i.h
+ *
+ *  $Id$
+ *
+ *  Defines the implementation header for the Receiver interface.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef RECEIVER_I_H
 #define RECEIVER_I_H
 
 #include "ReceiverS.h"
 
+/**
+ * @class Receiver_i
+ *
+ * @brief Receiver object implementation
+ *
+ * This class has methods that are called by the chat server.
+ */
 class Receiver_i : public POA_Receiver
 {
-  // = TITLE
-  //    Receiver object implementation
-  //
-  // = DESCRIPTION
-  //    This class has methods that are called by the chat server.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Receiver_i (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Receiver_i (void);
-  // Destructor.
 
+  /// Receives a message string.
   virtual void message (const char *msg);
-  // Receives a message string.
 
+  /**
+   * Called when the chat server is going away.  The client
+   * implementation should shutdown the chat client in response to
+   * this.
+   */
   virtual void shutdown (void);
-  // Called when the chat server is going away.  The client
-  // implementation should shutdown the chat client in response to
-  // this.
 
+  /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
 
 private:
+  /// ORB pointer.
   CORBA::ORB_var orb_;
-  // ORB pointer.
 };
 
 #endif /* RECEIVER_I_H  */
diff --git a/examples/Simple/chat/Server.h b/examples/Simple/chat/Server.h
index 4d47a8bf73d..213a914ef03 100644
--- a/examples/Simple/chat/Server.h
+++ b/examples/Simple/chat/Server.h
@@ -1,18 +1,14 @@
-// $Id$
 
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/tests/Simple/chat
-//
-// = FILENAME
-//    Server.h
-//
-// = DESCRIPTION
-//    Definition of the Server class for the chat.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ===========================================================
+//=============================================================================
+/**
+ *  @file    Server.h
+ *
+ *  $Id$
+ *
+ *  Definition of the Server class for the chat.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
diff --git a/examples/Simple/chat/Server_i.cpp b/examples/Simple/chat/Server_i.cpp
index 53bca0ca320..c23bb8ab738 100644
--- a/examples/Simple/chat/Server_i.cpp
+++ b/examples/Simple/chat/Server_i.cpp
@@ -1,21 +1,17 @@
-// $Id$
-
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/tests/Simple/chat
-//
-// = FILENAME
-//    Server_i.cpp
-//
-// = DESCRIPTION
-//    Implementation of the Chat Server_i class.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ===========================================================
+
+//=============================================================================
+/**
+ *  @file    Server_i.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the Chat Server_i class.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Server_i.h"
 #include "ace/Get_Opt.h"
diff --git a/examples/Simple/chat/Server_i.h b/examples/Simple/chat/Server_i.h
index ee16b3dec7b..dd1e4562473 100644
--- a/examples/Simple/chat/Server_i.h
+++ b/examples/Simple/chat/Server_i.h
@@ -1,22 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/tests/Simple/chat
-//
-// = FILENAME
-//    Server_i.h
-//
-// = DESCRIPTION
-//    Definition of the Chat Server_i class.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ===========================================================
+//=============================================================================
+/**
+ *  @file    Server_i.h
+ *
+ *  $Id$
+ *
+ *  Definition of the Chat Server_i class.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef SERVER_I_H
 #define SERVER_I_H
@@ -25,44 +21,47 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
 
+/**
+ * @class Server_i
+ *
+ * @brief The class defines the server for the chat. It sets up the Orb
+ * manager and registers the Broadcaster servant object.
+ */
 class Server_i
 {
-  // = TITLE
-  //    The class defines the server for the chat. It sets up the Orb
-  //    manager and registers the Broadcaster servant object.
 
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Server_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~Server_i (void);
-  // Destructor.
 
+  /// Initialize the server.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the server.
 
+  /// Run the ORB.
   int run (void);
-  // Run the ORB.
 
 private:
+  /// Parses the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parses the command line arguments.
 
+  /// Writes the server ior to a file, for the clients to pick up
+  /// later.
   int write_IOR (const char *ior);
-  // Writes the server ior to a file, for the clients to pick up
-  // later.
 
+  /// The file name to save the ior to.
   const ACE_TCHAR *ior_file_name_;
-  // The file name to save the ior to.
 
+  /// The tao orb manager object.
   TAO_ORB_Manager orb_manager_;
-  // The tao orb manager object.
 
+  /// The servant object registered with the orb.
   typedef TAO_Intrusive_Ref_Count_Handle<Broadcaster_i> Broadcaster_i_var;
   Broadcaster_i_var broadcaster_i_;
-  // The servant object registered with the orb.
 };
 
 #endif /* SERVER_I_H */
diff --git a/examples/Simple/chat/client.cpp b/examples/Simple/chat/client.cpp
index eb9d881440d..e59b3303a44 100644
--- a/examples/Simple/chat/client.cpp
+++ b/examples/Simple/chat/client.cpp
@@ -1,20 +1,17 @@
-// $Id$
 
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/chat
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//    The Chat client program entry point.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ===========================================================
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  The Chat client program entry point.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Client_i.h"
 
diff --git a/examples/Simple/chat/server.cpp b/examples/Simple/chat/server.cpp
index e8913f11f21..f9aafeffeaf 100644
--- a/examples/Simple/chat/server.cpp
+++ b/examples/Simple/chat/server.cpp
@@ -1,21 +1,17 @@
-// $Id$
 
-// ===========================================================
-//
-//
-// = LIBRARY
-//    TAO/tests/Simple/chat
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    Entry point for the chat server.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ===========================================================
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  Entry point for the chat server.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Server_i.h"
 
diff --git a/examples/Simple/echo/Echo_Client_i.h b/examples/Simple/echo/Echo_Client_i.h
index d09df364357..0b888d80dab 100644
--- a/examples/Simple/echo/Echo_Client_i.h
+++ b/examples/Simple/echo/Echo_Client_i.h
@@ -1,22 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/echo
-//
-// = FILENAME
-//    Echo_Client_i.h
-//
-// = DESCRIPTION
-//    This class implements the  interface calls for RMI.
-//
-// = AUTHOR
-//    
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//    
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Echo_Client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the  interface calls for RMI.
+ *
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ECHO_CLIENT_I_H
 #define ECHO_CLIENT_I_H
@@ -24,28 +20,30 @@
 #include "../Simple_util.h"
 #include "EchoC.h"
 
+/**
+ * @class Echo_Client_i
+ *
+ * @brief Echo_Client interface subclass.
+ *
+ * This class implements the interface between the interface
+ * objects and the client .
+ */
 class Echo_Client_i
 {
-  // = TITLE
-  //   Echo_Client interface subclass.
-  //
-  // = DESCRIPTION
-  //   This class implements the interface between the interface
-  //   objects and the client .
 public:
   // = Initialization and termination methods.
+  /// Constructor
   Echo_Client_i (void);
-  // Constructor
 
+  /// Destructor
   ~Echo_Client_i (void);
-  // Destructor
 
+  /// Execute the methods
   int run (const char *, int, ACE_TCHAR **);
-  // Execute the methods
 
 private:
+  /// Instantiate the client object.
   Client<Echo> client_;
-  // Instantiate the client object.
 };
 
 #endif /* TIME_CLIENT_I_H */
diff --git a/examples/Simple/echo/Echo_i.cpp b/examples/Simple/echo/Echo_i.cpp
index 9bb628c8707..f3e45069e40 100644
--- a/examples/Simple/echo/Echo_i.cpp
+++ b/examples/Simple/echo/Echo_i.cpp
@@ -2,8 +2,6 @@
 
 #include "Echo_i.h"
 
-ACE_RCSID(Echo, Echo_i, "$Id$")
-
 // Constructor.
 
 Echo_i::Echo_i (void)
diff --git a/examples/Simple/echo/Echo_i.h b/examples/Simple/echo/Echo_i.h
index b048eeb8357..5afd29de0b1 100644
--- a/examples/Simple/echo/Echo_i.h
+++ b/examples/Simple/echo/Echo_i.h
@@ -1,63 +1,62 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/echo
-//
-// = FILENAME
-//    Echo_i.h
-//
-// = DESCRIPTION
-//    This class implements the Echo IDL interface.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Echo_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Echo IDL interface.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ECHO_I_H
 #define ECHO_I_H
 
 #include "EchoS.h"
 
+/**
+ * @class Echo_i
+ *
+ * @brief Echo Object Implementation
+ *
+ * The object implementation  performs teh following functions:
+ * -- To return the string which needs to be displayed
+ * from the server.
+ * -- shuts down the server
+ */
 class Echo_i : public POA_Echo
 {
-  // = TITLE
-  //    Echo Object Implementation
-  //
-  // = DESCRIPTION
-  //    The object implementation  performs teh following functions:
-  //   -- To return the string which needs to be displayed
-  //      from the server.
-  //   -- shuts down the server
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Echo_i (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Echo_i (void);
-  // Destructor.
 
+  /// Return the mesg string back from the server.
   virtual Echo::List *echo_list (const char *mesg);
-  // Return the mesg string back from the server.
 
+  /// Return the mesg string back from the server.
   virtual char *echo_string (const char *mesg);
-  // Return the mesg string back from the server.
 
+  /// Shutdown the server.
   virtual void shutdown (void);
-  // Shutdown the server.
 
+  /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
 
 private:
+  /// ORB pointer.
   CORBA::ORB_var orb_;
-  // ORB pointer.
 
+  /// Keeping g++ 2.7.2 happy..
   ACE_UNIMPLEMENTED_FUNC (void operator= (const Echo_i&))
-  // Keeping g++ 2.7.2 happy..
 };
 
 #endif /* ECHO_I_H */
diff --git a/examples/Simple/echo/Makefile.am b/examples/Simple/echo/Makefile.am
deleted file mode 100644
index 9f8356bd596..00000000000
--- a/examples/Simple/echo/Makefile.am
+++ /dev/null
@@ -1,126 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.echo_IDL.am
-
-BUILT_SOURCES = \
-  EchoC.cpp \
-  EchoC.h \
-  EchoC.inl \
-  EchoS.cpp \
-  EchoS.h \
-  EchoS.inl
-
-CLEANFILES = \
-  Echo-stamp \
-  EchoC.cpp \
-  EchoC.h \
-  EchoC.inl \
-  EchoS.cpp \
-  EchoS.h \
-  EchoS.inl
-
-EchoC.cpp EchoC.h EchoC.inl EchoS.cpp EchoS.h EchoS.inl: Echo-stamp
-
-Echo-stamp: $(srcdir)/Echo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Echo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Echo.idl
-
-## Makefile.echo_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  ../Simple_util.cpp \
-  EchoC.cpp \
-  Echo_Client_i.cpp \
-  client.cpp \
-  ../Simple_util.h \
-  Echo_Client_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.echo_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  ../Simple_util.cpp \
-  EchoC.cpp \
-  EchoS.cpp \
-  Echo_i.cpp \
-  server.cpp \
-  ../Simple_util.h \
-  Echo_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/examples/Simple/grid/Grid.idl b/examples/Simple/grid/Grid.idl
index 07c7c8b10a0..1a1c14bc1b4 100644
--- a/examples/Simple/grid/Grid.idl
+++ b/examples/Simple/grid/Grid.idl
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-interface Grid 
+interface Grid
 {
   // = TITLE
   //   Create a <Grid> of type <name>
@@ -12,7 +12,7 @@ interface Grid
   attribute short width;
   // Width of the grid.
 
-  exception RANGE_ERROR 
+  exception RANGE_ERROR
     {
       // = TITLE
       // The range of parameter values do not fall in the expected
@@ -27,7 +27,7 @@ interface Grid
     raises (RANGE_ERROR);
   // Set the element [n,m] of the grid, to value.
 
-  long get (in short n, in short m) 
+  long get (in short n, in short m)
     raises (RANGE_ERROR);
   // Return element [n,m] of the grid.
 
@@ -45,7 +45,7 @@ interface Grid_Factory
   const short DEFAULT_WIDTH = 10;
 
   Grid make_grid (in short height, in short width);
-  // Returns a new <Grid> instance.  
+  // Returns a new <Grid> instance.
 
   oneway void shutdown ();
   // Shutdown the application.
diff --git a/examples/Simple/grid/Grid_Client_i.h b/examples/Simple/grid/Grid_Client_i.h
index 5caab3550ac..7359921ffd0 100644
--- a/examples/Simple/grid/Grid_Client_i.h
+++ b/examples/Simple/grid/Grid_Client_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/grid
-//
-// = FILENAME
-//    Grid_Client_i.h
-//
-// = DESCRIPTION
-//    This class implements the interface calls for RMI.
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//    
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Grid_Client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the interface calls for RMI.
+ *
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef GRID_CLIENT_I_H
 #define GRID_CLIENT_I_H
@@ -23,46 +20,48 @@
 #include "../Simple_util.h"
 #include "GridC.h"
 
+/**
+ * @class Grid_Client_i
+ *
+ * @brief Grid_Client interface subclass.
+ *
+ * This class implements the interface between the interface
+ * objects and the client .
+ */
 class Grid_Client_i
 {
-  // = TITLE
-  //   Grid_Client interface subclass.
-  //
-  // = DESCRIPTION
-  //   This class implements the interface between the interface
-  //   objects and the client .
 public:
   // = Initialization and termination methods.
+  /// Constructor
   Grid_Client_i (void);
-  // Constructor
 
+  /// Destructor
   ~Grid_Client_i (void);
-  // Destructor
 
+  /// Execute the methods.
   int run (const char *, int, ACE_TCHAR *[]);
-  // Execute the methods.
 
+  /// Parses the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parses the command line arguments.
 
 private:
+  /// Instantiate the client object.
   Client<Grid_Factory> client_;
-  // Instantiate the client object.
 
+  /// Height of the grid.
   CORBA::Short height_;
-  // Height of the grid.
 
+  /// Width of the grid.
   CORBA::Short width_;
-  // Width of the grid.
 
+  /// Cell identifier in which a value meeds to be stored.
   CORBA::Short setx_;
-  // Cell identifier in which a value meeds to be stored.
 
+  /// Cell identifier in which a value meeds to be stored.
   CORBA::Short sety_;
-  // Cell identifier in which a value meeds to be stored.
 
+  /// The value that needs to be stored in the cell.
   CORBA::Long value_;
-  // The value that needs to be stored in the cell.
 };
 
 #endif /* TIME_CLIENT_I_H */
diff --git a/examples/Simple/grid/Grid_i.h b/examples/Simple/grid/Grid_i.h
index c9055d55408..72166422d8a 100644
--- a/examples/Simple/grid/Grid_i.h
+++ b/examples/Simple/grid/Grid_i.h
@@ -1,20 +1,17 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/grid
-//
-// = FILENAME
-//    Grid_i.h
-//
-// = DESCRIPTION
-//    This class implements the Grid IDL interface.
-//
-// = AUTHOR
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Grid_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Grid IDL interface.
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef GRID_I_H
 #define GRID_I_H
@@ -22,100 +19,105 @@
 #include "GridS.h"
 #include <ace/Vector_T.h>
 
+/**
+ * @class Grid_i:
+ *
+ * @brief Grid object implementation.
+ *
+ * Grid object implementation
+ */
 class Grid_i: public POA_Grid
 {
-  // = TITLE
-  //    Grid object implementation.
-  //
-  // = DESCRIPTION
-  //    Grid object implementation
 public:
   // = Initialization and termination methods.
 
+  /// Constructor
   Grid_i (void);
-  // Constructor
 
+  /// Constructor.
   Grid_i (CORBA::Short,
           CORBA::Short);
-  // Constructor.
 
+  /// Destructor
   virtual ~Grid_i (void);
-  // Destructor
 
+  /// Returns the width of the grid
   virtual CORBA::Short width (void);
-  // Returns the width of the grid
 
+  /// Returns the height of the grid
   virtual CORBA::Short height (void);
-  // Returns the height of the grid
 
+  /// Sets the width of the grid.
   virtual void width (CORBA::Short);
-  // Sets the width of the grid.
 
+  /// Sets the height of the grid.
   virtual void height (CORBA::Short);
-  // Sets the height of the grid.
 
+  /// Sets the grid value.
   virtual void set (CORBA::Short,
                     CORBA::Short,
                     CORBA::Long);
-  // Sets the grid value.
 
+  /// Gets the grid value.
   virtual CORBA::Long get (CORBA::Short,
                            CORBA::Short);
-  // Gets the grid value.
 
+  /// Destroy the grid.
   virtual void destroy (void);
-  // Destroy the grid.
 
 private:
+  /// Allocates array
   static CORBA::Long *allocate_array (CORBA::Short x, CORBA::Short y);
-  // Allocates array
 
+  /// Width of the grid.
   CORBA::Short width_;
-  // Width of the grid.
 
+  /// Height of the grid.
   CORBA::Short height_;
-  // Height of the grid.
 
+  /// Pointer to the matrix.  This is organized as an "array of arrays."
   typedef ACE_Auto_Array_Ptr<CORBA::Long> GridArray;
   GridArray array_;
-  // Pointer to the matrix.  This is organized as an "array of arrays."
 
+  /// Solaris and some Windows compilers don't have min in std namespaces
   static CORBA::UShort ushort_min (CORBA::UShort, CORBA::UShort);
-  // Solaris and some Windows compilers don't have min in std namespaces
 };
 
+/**
+ * @class Grid_Factory_i
+ *
+ * Create a <Grid>.
+ */
 class Grid_Factory_i : public POA_Grid_Factory
 {
-  // =TITLE
-  //   Create a <Grid>.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Grid_Factory_i (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Grid_Factory_i (void);
-  // Destructor.
 
+  /// This function creates and returns a <Grid>.
   virtual Grid_ptr make_grid (CORBA::Short,
                               CORBA::Short);
-  // This function creates and returns a <Grid>.
 
+  /// Shutdown the server.
   virtual void shutdown (void);
-  // Shutdown the server.
 
+  /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
 
 private:
+  /// This container is here only for proper clean up.
   typedef ACE_Vector<PortableServer::ServantBase_var> GridsHolder;
   GridsHolder grids_holder_;
-  // This container is here only for proper clean up.
 
+  /// ORB pointer.
   CORBA::ORB_var orb_;
-  // ORB pointer.
 
+  /// Keeping g++2.7.2
   ACE_UNIMPLEMENTED_FUNC (void operator= (const Grid_Factory_i &))
-  // Keeping g++2.7.2
 };
 
 #endif /* GRID_I_H */
diff --git a/examples/Simple/grid/Makefile.am b/examples/Simple/grid/Makefile.am
deleted file mode 100644
index bd22232bd62..00000000000
--- a/examples/Simple/grid/Makefile.am
+++ /dev/null
@@ -1,126 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.grid_IDL.am
-
-BUILT_SOURCES = \
-  GridC.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.cpp \
-  GridS.h \
-  GridS.inl
-
-CLEANFILES = \
-  Grid-stamp \
-  GridC.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.cpp \
-  GridS.h \
-  GridS.inl
-
-GridC.cpp GridC.h GridC.inl GridS.cpp GridS.h GridS.inl: Grid-stamp
-
-Grid-stamp: $(srcdir)/Grid.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Grid.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Grid.idl
-
-## Makefile.grid_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  ../Simple_util.cpp \
-  GridC.cpp \
-  Grid_Client_i.cpp \
-  client.cpp \
-  ../Simple_util.h \
-  Grid_Client_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.grid_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  ../Simple_util.cpp \
-  GridC.cpp \
-  GridS.cpp \
-  Grid_i.cpp \
-  server.cpp \
-  ../Simple_util.h \
-  Grid_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/examples/Simple/time-date/Makefile.am b/examples/Simple/time-date/Makefile.am
deleted file mode 100644
index 6736f567022..00000000000
--- a/examples/Simple/time-date/Makefile.am
+++ /dev/null
@@ -1,137 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Simple_Time_Date_Lib.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  Time_DateC.cpp \
-  Time_DateC.h \
-  Time_DateC.inl \
-  Time_DateS.cpp \
-  Time_DateS.h \
-  Time_DateS.inl
-
-CLEANFILES = \
-  Time_Date-stamp \
-  Time_DateC.cpp \
-  Time_DateC.h \
-  Time_DateC.inl \
-  Time_DateS.cpp \
-  Time_DateS.h \
-  Time_DateS.inl
-
-Time_DateC.cpp Time_DateC.h Time_DateC.inl Time_DateS.cpp Time_DateS.h Time_DateS.inl: Time_Date-stamp
-
-Time_Date-stamp: $(srcdir)/Time_Date.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,export_macro=Alt_Resource_Factory_Export -Wb,export_include=Alt_Resource_Factory.h $(srcdir)/Time_Date.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libTime_Date.la
-
-libTime_Date_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_BUILD_SVC_DLL \
-  -DAlt_Resource_Factory_BUILD_DLL
-
-libTime_Date_la_SOURCES = \
-  Time_Date.cpp \
-  Time_DateC.cpp \
-  Time_DateS.cpp \
-  Time_Date_i.cpp
-
-noinst_HEADERS = \
-  Alt_Resource_Factory.h \
-  Time_Date.idl \
-  Time_DateC.h \
-  Time_DateC.inl \
-  Time_DateS.h \
-  Time_DateS.inl \
-  Time_Date_i.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Simple_Time_Date_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Time_Date_Client_i.cpp \
-  client.cpp \
-  Time_Date_Client_i.h
-
-client_LDFLAGS = \
-  -L.
-
-client_LDADD = \
-  libTime_Date.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Simple_Time_Date_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/examples/Simple/time-date/Time_Date_Client_i.h b/examples/Simple/time-date/Time_Date_Client_i.h
index fffad2111d6..cb1562d4d4b 100644
--- a/examples/Simple/time-date/Time_Date_Client_i.h
+++ b/examples/Simple/time-date/Time_Date_Client_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/time-date
-//
-// = FILENAME
-//    Time_Date_Client_i.h
-//
-// = DESCRIPTION
-//    This class implements the interface calls for RMI.
-//
-// = AUTHOR
-//   Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Time_Date_Client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the interface calls for RMI.
+ *
+ *
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TIME_DATE_CLIENT_I_H
 #define TIME_DATE_CLIENT_I_H
@@ -23,31 +20,33 @@
 #include "../Simple_util.h"
 #include "Time_DateC.h"
 
+/**
+ * @class Time_Date_Client_i
+ *
+ * @brief Time_Date_Client interface adapter.
+ *
+ * This class implements the interface between the interface
+ * objects and the client.
+ */
 class Time_Date_Client_i
 {
-  // = TITLE
-  //   Time_Date_Client interface adapter.
-  //
-  // = DESCRIPTION
-  //   This class implements the interface between the interface
-  //   objects and the client.
 public:
   // = Initialization and termination methods.
+  /// Constructor
   Time_Date_Client_i (void);
-  // Constructor
 
+  /// Destructor
   virtual ~Time_Date_Client_i (void);
-  // Destructor
 
+  /// Execute the methods.
   virtual int run (const char *, int, ACE_TCHAR *[]);
-  // Execute the methods.
 
+  /// Parses the command line arguments.
   virtual int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parses the command line arguments.
 
 private:
+  /// Instantiate the client object.
   Client<Time_Date> client_;
-  // Instantiate the client object.
 };
 
 #endif /* TIME_CLIENT_I_H */
diff --git a/examples/Simple/time-date/Time_Date_i.h b/examples/Simple/time-date/Time_Date_i.h
index 47e9ef6c792..6b0f1280b65 100644
--- a/examples/Simple/time-date/Time_Date_i.h
+++ b/examples/Simple/time-date/Time_Date_i.h
@@ -1,22 +1,18 @@
 // -*- C++ -*-
-//
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/time_date
-//
-// = FILENAME
-//    Time_Date_i.h
-//
-// = DESCRIPTION
-//    This class implements the Time_Date IDL interface.
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu> and Michael Kircher.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Time_Date_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Time_Date IDL interface.
+ *
+ *
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu> and Michael Kircher.
+ */
+//=============================================================================
+
 
 #ifndef TIME_DATE_I_H
 #define TIME_DATE_I_H
@@ -34,21 +30,21 @@ class Time_Date_i
 public:
   // = Initialization and termination methods.
 
+  /// Obtain the time and date in binary format.
   virtual void bin_date (CORBA::Long_out time_date);
-  // Obtain the time and date in binary format.
 
+  /// Obtain the time and date in string format.
   virtual void str_date (CORBA::String_out time_date);
-  // Obtain the time and date in string format.
 
+  /// Shutdown the server.
   virtual void shutdown (void);
-  // Shutdown the server.
 
+  /// ORB pointer.
   void orb (CORBA::ORB_ptr orb_ptr);
-  // ORB pointer.
 
 private:
+  /// ORB pointer.
   CORBA::ORB_var orb_var_;
-  // ORB pointer.
 };
 
 #endif /* TIME_DATE_I_H */
diff --git a/examples/Simple/time-date/server.cpp b/examples/Simple/time-date/server.cpp
index 97e303796f5..e89de067dc5 100644
--- a/examples/Simple/time-date/server.cpp
+++ b/examples/Simple/time-date/server.cpp
@@ -1,31 +1,24 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    examples/Simple/time-date
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//   This directory contains an example that illustrates how the ACE
-//   Service Configurator can dynamically configure an ORB and its
-//   servants from a svc.conf file.
-//
-// = AUTHOR
-//    Doug Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ * This directory contains an example that illustrates how the ACE
+ * Service Configurator can dynamically configure an ORB and its
+ * servants from a svc.conf file.
+ *
+ *
+ *  @author Doug Schmidt <schmidt@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "ace/Service_Config.h"
 #include "ace/Reactor.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (time_date,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/examples/Simple/time/Makefile.am b/examples/Simple/time/Makefile.am
deleted file mode 100644
index 31fb3882763..00000000000
--- a/examples/Simple/time/Makefile.am
+++ /dev/null
@@ -1,126 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.time_IDL.am
-
-BUILT_SOURCES = \
-  TimeC.cpp \
-  TimeC.h \
-  TimeC.inl \
-  TimeS.cpp \
-  TimeS.h \
-  TimeS.inl
-
-CLEANFILES = \
-  Time-stamp \
-  TimeC.cpp \
-  TimeC.h \
-  TimeC.inl \
-  TimeS.cpp \
-  TimeS.h \
-  TimeS.inl
-
-TimeC.cpp TimeC.h TimeC.inl TimeS.cpp TimeS.h TimeS.inl: Time-stamp
-
-Time-stamp: $(srcdir)/Time.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Time.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Time.idl
-
-## Makefile.time_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  ../Simple_util.cpp \
-  TimeC.cpp \
-  Time_Client_i.cpp \
-  client.cpp \
-  ../Simple_util.h \
-  Time_Client_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.time_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  ../Simple_util.cpp \
-  TimeC.cpp \
-  TimeS.cpp \
-  Time_i.cpp \
-  server.cpp \
-  ../Simple_util.h \
-  Time_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/examples/Simple/time/Time.idl b/examples/Simple/time/Time.idl
index 66521161fab..3d07b80659f 100644
--- a/examples/Simple/time/Time.idl
+++ b/examples/Simple/time/Time.idl
@@ -4,7 +4,7 @@
 interface Time
 {
   // = TITLE
-  //    Defines an interface that encapsulates operations that 
+  //    Defines an interface that encapsulates operations that
   //    return the current time of day and shuts down the server.
 
   long current_time ();
diff --git a/examples/Simple/time/Time_Client_i.h b/examples/Simple/time/Time_Client_i.h
index f0f6aba59c3..41d46e1d306 100644
--- a/examples/Simple/time/Time_Client_i.h
+++ b/examples/Simple/time/Time_Client_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/time
-//
-// = FILENAME
-//    Time_Client_i.h
-//
-// = DESCRIPTION
-//    This class implements the client calls to the Time example.
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//    
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Time_Client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the client calls to the Time example.
+ *
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TIME_CLIENT_I_H
 #define TIME_CLIENT_I_H
@@ -23,28 +20,30 @@
 #include "../Simple_util.h"
 #include "TimeC.h"
 
+/**
+ * @class Time_Client_i
+ *
+ * @brief Time_Client interface subclass.
+ *
+ * This class implements the interface between the interface
+ * objects and the client.
+ */
 class Time_Client_i
 {
-  // = TITLE
-  //   Time_Client interface subclass.
-  //
-  // = DESCRIPTION
-  //   This class implements the interface between the interface
-  //   objects and the client.
 public:
   // = Initialization and termination methods.
+  /// Constructor
   Time_Client_i (void);
-  // Constructor
 
+  /// Destructor
   ~Time_Client_i (void);
-  // Destructor
 
+  /// Execute the methods
   int run (const char *, int, ACE_TCHAR**);
-  // Execute the methods
 
 private:
+  /// Instantiate the client object.
   Client<Time> client_;
-  // Instantiate the client object.
 };
 
 #endif /* TIME_CLIENT_I_H */
diff --git a/examples/Simple/time/Time_i.cpp b/examples/Simple/time/Time_i.cpp
index c426a422e07..1d4fc6c70e0 100644
--- a/examples/Simple/time/Time_i.cpp
+++ b/examples/Simple/time/Time_i.cpp
@@ -3,8 +3,6 @@
 #include "Time_i.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID(Time, Time_i, "$Id$")
-
 // Constructor
 Time_i::Time_i (void)
 {
diff --git a/examples/Simple/time/Time_i.h b/examples/Simple/time/Time_i.h
index 9d1c0a74c5b..2260d52a185 100644
--- a/examples/Simple/time/Time_i.h
+++ b/examples/Simple/time/Time_i.h
@@ -1,59 +1,58 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/time
-//
-// = FILENAME
-//    Time_i.h
-//
-// = DESCRIPTION
-//    This class implements the Time IDL interface.
-//
-// = AUTHOR
-//    Darrell Brunsch <brunsch@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Time_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Time IDL interface.
+ *
+ *
+ *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TIME_I_H
 #define TIME_I_H
 
 #include "TimeS.h"
 
+/**
+ * @class Time_i:
+ *
+ * @brief Time Object Implementation
+ *
+ * Implementation of a simple object that has two methods, one that
+ * return the current time/date on the server and the other that
+ * shuts down the server.
+ */
 class Time_i: public POA_Time
 {
-  // = TITLE
-  //    Time Object Implementation
-  //
-  // = DESCRIPTION
-  //    Implementation of a simple object that has two methods, one that
-  //    return the current time/date on the server and the other that
-  //    shuts down the server.
 public:
   // = Initialization and termination methods.
+  /// Constructor
   Time_i (void);
-  // Constructor
 
+  /// Destructor
   virtual ~Time_i (void);
-  // Destructor
 
+  /// Return the current time/date on the server
   virtual CORBA::Long current_time (void);
-  // Return the current time/date on the server
 
+  /// Shutdown the server.
   virtual void shutdown (void);
-  // Shutdown the server.
 
+  /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
 
 private:
+  /// ORB pointer.
   CORBA::ORB_var orb_;
-  // ORB pointer.
 
+  /// Keeping g++2.7.2
   ACE_UNIMPLEMENTED_FUNC (void operator= (const Time_i &))
-  // Keeping g++2.7.2
 };
 
 #endif /* TIME_I_H */
diff --git a/examples/Simulator/DOVEBrowser/AnswerEvent.java b/examples/Simulator/DOVEBrowser/AnswerEvent.java
index c10ae7d766a..2db9a3bfd43 100644
--- a/examples/Simulator/DOVEBrowser/AnswerEvent.java
+++ b/examples/Simulator/DOVEBrowser/AnswerEvent.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //    AnswerEvent.java
 //
@@ -20,4 +20,4 @@ public class AnswerEvent extends java.util.EventObject {
     this.selected_ = selected;
   }
 }
-    
+
diff --git a/examples/Simulator/DOVEBrowser/AnswerListener.java b/examples/Simulator/DOVEBrowser/AnswerListener.java
index 77d43646729..f66077c915e 100644
--- a/examples/Simulator/DOVEBrowser/AnswerListener.java
+++ b/examples/Simulator/DOVEBrowser/AnswerListener.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //    AnswerListener.java
 //
diff --git a/examples/Simulator/DOVEBrowser/DOVEBrowser.java b/examples/Simulator/DOVEBrowser/DOVEBrowser.java
index 647fd613bff..510c9f73714 100644
--- a/examples/Simulator/DOVEBrowser/DOVEBrowser.java
+++ b/examples/Simulator/DOVEBrowser/DOVEBrowser.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //   DOVEBrowser.java
 //
@@ -17,31 +17,31 @@ import java.awt.*;
 public class DOVEBrowser {
 
   DemoCore demoCore_;
-  
+
   public DOVEBrowser () {
-    super (); 
+    super ();
   }
-  
+
   public void init (String nameServiceIOR, String nameServicePort,
                     String[] args, boolean use_queueing) {
 
-    demoCore_ = new DemoCore (nameServiceIOR, 
-                              nameServicePort, 
-                              args, 
-                              use_queueing, 
-                              null); 
+    demoCore_ = new DemoCore (nameServiceIOR,
+                              nameServicePort,
+                              args,
+                              use_queueing,
+                              null);
     demoCore_.show ();
     demoCore_.run ();
   }
-  
-  public static void main (String[] args) {      
+
+  public static void main (String[] args) {
     String nameServiceIOR = null;
     String nameServicePort = null;
     boolean use_queueing = false;
     int arg_index = 0;
 
     // Loop through command line arguments, acting on relevant options
-    while (args.length > arg_index) 
+    while (args.length > arg_index)
       {
         System.out.println ("args.length [" + args.length + "] arg_index [" +
                             arg_index + "]");
@@ -51,8 +51,8 @@ public class DOVEBrowser {
             ++arg_index;
             use_queueing = true;
           }
-        else if ((args[arg_index].equals ("-nameserviceior")) && 
-            (args.length > arg_index + 1)) 
+        else if ((args[arg_index].equals ("-nameserviceior")) &&
+            (args.length > arg_index + 1))
           {
             System.out.println ("switch [" + args[arg_index] + "]");
             System.out.println ("value [" + args[arg_index + 1] + "]");
@@ -77,11 +77,11 @@ public class DOVEBrowser {
             arg_index ++;
           }
       }
-    
+
     DOVEBrowser doveBrowser = new DOVEBrowser();
     doveBrowser.init (nameServiceIOR, nameServicePort, args, use_queueing);
-  }  
+  }
 }
-  
-  
+
+
 
diff --git a/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java b/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java
index 160eb3a363b..1d77509c3d6 100644
--- a/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java
+++ b/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //   DOVEBrowserApplet.java
 //
@@ -18,15 +18,15 @@ public class DOVEBrowserApplet extends java.applet.Applet {
 
   DemoCore demoCore_;
   static String nameServiceIOR_ = null;
-  
+
   public DOVEBrowserApplet () {
-    super (); 
+    super ();
   }
-  
+
   public void init () {
     // in case of an applet use the following line, else not!
     nameServiceIOR_ = this.getParameter ("NSIOR");
-    
+
     if (nameServiceIOR_ == null) {
       System.out.println ("The DOVE Browser cannot run, because no Naming Service IOR was found!");
       return;
@@ -41,8 +41,8 @@ public class DOVEBrowserApplet extends java.applet.Applet {
     demoCore_.run ();
   }
 }
-  
-  
+
+
 
 
 
diff --git a/examples/Simulator/DOVEBrowser/DataHandler.java b/examples/Simulator/DOVEBrowser/DataHandler.java
index 090cccf089d..c7b336a69e2 100644
--- a/examples/Simulator/DOVEBrowser/DataHandler.java
+++ b/examples/Simulator/DOVEBrowser/DataHandler.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //    DataHandler.java
 //
@@ -15,13 +15,13 @@
 import org.omg.CORBA.*;
 
 public interface DataHandler {
-  
+
   // entry point for an consumer to put data event into the data handler
   public void update (RtecEventComm.Event event);
-  
+
   // get a list of the Observables names to allow selection
   public java.util.Enumeration getObservablesList ();
- 
+
   // get a specific Observable
   public DemoObservable getObservable(String name);
 
@@ -30,5 +30,5 @@ public interface DataHandler {
 }
 
 
-    
-    
+
+
diff --git a/examples/Simulator/DOVEBrowser/DemoCore.java b/examples/Simulator/DOVEBrowser/DemoCore.java
index 272e84f7c84..4fcb542a5ef 100644
--- a/examples/Simulator/DOVEBrowser/DemoCore.java
+++ b/examples/Simulator/DOVEBrowser/DemoCore.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //    DemoCore.java
 //
@@ -8,7 +8,7 @@
 //
 // = DESCRIPTION
 //   This class servers as the core class of the simulation demo.
-//   It connects the push consumer of the event service with 
+//   It connects the push consumer of the event service with
 //   one or several Java Beans.
 //
 // ============================================================================
@@ -31,19 +31,19 @@ public class DemoCore extends Frame {
   private boolean use_queueing_ = false;
   private boolean connections_established_ = false;
 
-  DemoCore (String nameServiceIOR, 
+  DemoCore (String nameServiceIOR,
 	    String nameServicePort,
-            String[] args, 
+            String[] args,
             boolean use_queueing,
 	    java.applet.Applet applet) {
     super ();
-    
+
     use_queueing = use_queueing;
 
     setSize (600,400);
     setBounds (new Rectangle (50,50,800,500));
     setVisible (true);
-    
+
     gridbag_ = new GridBagLayout();
     constraints_ = new GridBagConstraints();
     constraints_.fill = GridBagConstraints.BOTH;
@@ -53,8 +53,8 @@ public class DemoCore extends Frame {
 
     // Instantiate the DataHandler and the PushConsumer
     dataHandler_ = new NavWeapDataHandler ();
-    pushConsumerFactory_ = new PushConsumerFactory (dataHandler_, 
-                                                    nameServiceIOR, 
+    pushConsumerFactory_ = new PushConsumerFactory (dataHandler_,
+                                                    nameServiceIOR,
                                                     nameServicePort,
                                                     args,
                                                     use_queueing_,
@@ -72,20 +72,20 @@ public class DemoCore extends Frame {
     menu_.add (menu_add_item_);
     menu_.add (menu_quit_item_);
     menubar_.add (menu_);
-    
+
     setMenuBar (menubar_);
-    
-    menu_quit_item_.addActionListener (new ActionListener () 
+
+    menu_quit_item_.addActionListener (new ActionListener ()
 				       {
 					 public void actionPerformed (ActionEvent e) {
 					   System.exit (0);
 					 }
-				       });      
-      
-    menu_add_item_.addActionListener (new ActionListener () 
+				       });
+
+    menu_add_item_.addActionListener (new ActionListener ()
 				       {
 					 public void actionPerformed (ActionEvent e) {
-					   ObservablesDialog obsDialog_ = 
+					   ObservablesDialog obsDialog_ =
 					     new ObservablesDialog (DemoCore.this,
 								    dataHandler_.getObservablesList());
 					   obsDialog_.addAnswerListener (new AnswerListener ()
@@ -97,18 +97,18 @@ public class DemoCore extends Frame {
 									});
 					   obsDialog_.setVisible (true);
 					 }
-				       });      
-    
+				       });
+
     // instantiate the Factory for Visualization Components
     visCompFactory_ = new VisCompFactory ();
 
     // Traverse the args looking for switches that determine connections.
     int arg_index = 0;
-    while (args.length > arg_index) 
+    while (args.length > arg_index)
       {
         if (args[arg_index].equals ("-dualECdemo") ||
             args[arg_index].equals ("-dualECdemo1") ||
-            args[arg_index].equals ("-dualECdemo2")) 
+            args[arg_index].equals ("-dualECdemo2"))
           {
             // Use monotonic scales in the double precision data windows
             DoubleVisComp.monotonic_scale (true);
@@ -128,7 +128,7 @@ public class DemoCore extends Frame {
           }
         if (args[arg_index].equals ("-dualECdemo") ||
             args[arg_index].equals ("-dualECdemo1") ||
-            args[arg_index].equals ("-dualECdemo2")) 
+            args[arg_index].equals ("-dualECdemo2"))
           {
             // Use monotonic scales in the double precision data windows
             DoubleVisComp.monotonic_scale (true);
@@ -168,7 +168,7 @@ public class DemoCore extends Frame {
           }
       }
 
-   
+
     // If connections have not been established, set up defaults
     if (! connections_established_)
       {
@@ -181,39 +181,39 @@ public class DemoCore extends Frame {
   }
 
 
-  public boolean addConnection (String selected, int max_in_a_row) {	
+  public boolean addConnection (String selected, int max_in_a_row) {
 		// to not fill too many into it
     if (countVisComp_ < MAX_VIS_COMPS) {
-      
+
       // get a reference to the Observable
       DemoObservable observable_ = dataHandler_.getObservable (selected);
-      
+
       if (observable_ != null) {
-	
+
         VisComp visComp_ = visCompFactory_.getNewVisComp (observable_.getProperty (), selected);
 
 	if (visComp_ != null) {
-	  vis_comp_list_.addElement (visComp_);	 
-	  
+	  vis_comp_list_.addElement (visComp_);
+
 	  // connect the Observer with the Observable
 	  observable_.addObserver (visComp_);
-	  
+
 	  countVisComp_++;
-	  
+
           // not more than three in a row
 	  if (countVisComp_ == max_in_a_row){
 	    constraints_.gridwidth = GridBagConstraints.REMAINDER;
           }
           if (countVisComp_ > max_in_a_row) {
 	    constraints_.gridwidth = 1;
-	  } 
-	  
+	  }
+
 	  gridbag_.setConstraints ((java.awt.Component) visComp_, constraints_);
-	  
+
 	  // add the Visualization Component to the Frame
 	  DemoCore.this.add ((java.awt.Component) visComp_);
 	  DemoCore.this.show ();
-	  
+
           return true;
         }
       }
@@ -224,20 +224,20 @@ public class DemoCore extends Frame {
   public boolean addConnection (String selected) {
     return addConnection (selected, 3);
   }
-  
-  public void init () 
+
+  public void init ()
     {
     }
-  
-  public void paint (Graphics g) 
+
+  public void paint (Graphics g)
     {
     }
-  
-  public void run () 
+
+  public void run ()
     {
       // Wait passive until events come in
       pushConsumerFactory_.run ();
-    } 
+    }
 }
-  
-  
+
+
diff --git a/examples/Simulator/DOVEBrowser/DemoObservable.java b/examples/Simulator/DOVEBrowser/DemoObservable.java
index 81c85b961f8..d89217eddc3 100644
--- a/examples/Simulator/DOVEBrowser/DemoObservable.java
+++ b/examples/Simulator/DOVEBrowser/DemoObservable.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //    DemoObservable.java
 //
diff --git a/examples/Simulator/DOVEBrowser/DoubleVisComp.java b/examples/Simulator/DOVEBrowser/DoubleVisComp.java
index 228d9931fc7..4347fcc2993 100644
--- a/examples/Simulator/DOVEBrowser/DoubleVisComp.java
+++ b/examples/Simulator/DOVEBrowser/DoubleVisComp.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //    DoubleVisComp.java
 //
@@ -23,7 +23,7 @@ public class DoubleVisComp extends Canvas implements VisComp
   private static final int MIN_SPACING = 2;
   private static final int POINT_HISTORY = 200;
   private static final Font FONT = new Font ("Dialog", Font.PLAIN, 10);
-  
+
   private Queue plot_;
   private String title_;
   private Graphics offgraphics_;
@@ -52,19 +52,19 @@ public class DoubleVisComp extends Canvas implements VisComp
     title_ = "";
     max_value_ = 1;
     old_max_value_ = max_value_;
-    
+
     java.util.Random rand = new java.util.Random (System.currentTimeMillis());
     float hue_ = rand.nextFloat();
     float brightness = rand.nextFloat();
 
     hue_ += .075;
-    
+
     if (hue_ > 1.0)
       hue_ -= 1.0;
-    
+
     if (brightness > 0.75)
       brightness -= 0.25;
-    
+
     Color new_color = Color.getHSBColor(hue_, 1, brightness);
 
     this.setBackground(new_color);
@@ -82,7 +82,7 @@ public class DoubleVisComp extends Canvas implements VisComp
   public void setName (String title) {
       title_ = title;
   }
-  
+
   public int getProperty () {
       return Properties.DOUBLE;
     }
@@ -94,7 +94,7 @@ public class DoubleVisComp extends Canvas implements VisComp
   public Dimension getPreferredSize () {
       return new Dimension (175, 175);
     }
-  
+
   public String getName() {
     return title_;
   }
@@ -107,24 +107,24 @@ public class DoubleVisComp extends Canvas implements VisComp
   {
     Double double_temp_;
     try {
-      double_temp_ = (Double) obj;  
+      double_temp_ = (Double) obj;
     }
     catch (Exception excp) {
       double_temp_ = new Double (0.0);
       System.out.println (excp);
       System.out.println ("Visualization Component received wrong data type!");
     }
-        
+
     float new_point = double_temp_.floatValue();
     Float temp = (Float)plot_.dequeue_tail();
     plot_.enqueue_head(new Float(new_point));
-    
+
     if (new_point > local_max_)
       {
         local_max_ = new_point;
         local_max_values_ [local_max_value_index_] = local_max_;
       }
-    
+
     if (monotonic_scale_)
       {
         float global_max = 0;
@@ -132,7 +132,7 @@ public class DoubleVisComp extends Canvas implements VisComp
 
         while (global_max > max_value_)
           max_value_ *= 2;
-    
+
         while ((global_max < max_value_/2) && (max_value_ > old_max_value_))
           max_value_ /= 2;
       }
@@ -140,7 +140,7 @@ public class DoubleVisComp extends Canvas implements VisComp
       {
         while (local_max_ > max_value_)
           max_value_ *= 2;
-    
+
         while ((local_max_ < max_value_/2) && (max_value_ > old_max_value_))
           max_value_ /= 2;
       }
@@ -156,7 +156,7 @@ public class DoubleVisComp extends Canvas implements VisComp
     Enumeration queue_iter = plot_.forward_iterator();
     int x1 = d.width - 8, y1, x2, y2, fheight = fm.getHeight (), i;
     String value =  "Value (of " + max_value_ + "): " + String.valueOf(plot_.head());
-    
+
     if ((offscreen_ == null) ||
 	(offscreensize_.width != d.width - 8) ||
 	(offscreensize_.height != d.height - 8))
@@ -171,12 +171,12 @@ public class DoubleVisComp extends Canvas implements VisComp
     g.draw3DRect (0, 0, d.width - 1, d.height - 1, true);
     g.draw3DRect (1, 1, d.width - 3, d.height - 3, true);
     g.draw3DRect (2, 2, d.width - 5, d.height - 5, true);
-    
+
     local_max_ = 0;
 
     offgraphics_.setColor (getBackground());
     offgraphics_.fillRect (0, 0, offscreensize_.width, offscreensize_.height);
-    offgraphics_.setColor (getForeground());    
+    offgraphics_.setColor (getForeground());
     offgraphics_.drawString(title_, 5, fheight);
     offgraphics_.drawString(value, 5, offscreensize_.height - 5);
 
@@ -184,13 +184,13 @@ public class DoubleVisComp extends Canvas implements VisComp
     while (queue_iter.hasMoreElements())
       {
 	value_2 = ((Float)queue_iter.nextElement()).floatValue();
-	
+
 	if (value_1 > local_max_)
 	  local_max_ = value_1;
-	
+
         y1 = normalize(offscreensize_.height - fheight, value_1);
         y2 = normalize(offscreensize_.height - fheight, value_2);
-	
+
 	tmp = value_2;
 	value_2 = value_1;
 	value_1 = tmp;
@@ -206,13 +206,13 @@ public class DoubleVisComp extends Canvas implements VisComp
 
     g.drawImage(offscreen_, 3, 3, null);
   }
-  
+
   public void paint(Graphics g)
   {
     Dimension d = getSize ();
     int plot_length = plot_.length();
     int num_points = d.width / spacing_;
-    
+
     if (plot_.length() < num_points)
       {
 	for (int i = 0; i < num_points - plot_length; i++)
@@ -223,7 +223,7 @@ public class DoubleVisComp extends Canvas implements VisComp
 	for (int i = 0; i < plot_length - num_points; i++)
 	  plot_.dequeue_tail();
       }
-    
+
     update(g);
   }
 
@@ -244,7 +244,7 @@ public class DoubleVisComp extends Canvas implements VisComp
   private synchronized void local_max_init () {
 
     // Create a new, larger, array to hold the local maxima
-    float new_max_values [] = 
+    float new_max_values [] =
       new float [local_max_value_count_ + 1];
 
     // Copy the previously stored maxima (if any) into the new array.
@@ -267,7 +267,7 @@ public class DoubleVisComp extends Canvas implements VisComp
     float ratio = (float)coord/max_value_;
     float pixels = (float)height*ratio;
     float location = (float)height - pixels;
-    
+
     return Math.round(location);
   }
 }
diff --git a/examples/Simulator/DOVEBrowser/MTDataHandlerAdapter.java b/examples/Simulator/DOVEBrowser/MTDataHandlerAdapter.java
index 6b1c1ddb9dd..3f226234bfd 100644
--- a/examples/Simulator/DOVEBrowser/MTDataHandlerAdapter.java
+++ b/examples/Simulator/DOVEBrowser/MTDataHandlerAdapter.java
@@ -1,6 +1,6 @@
 // $Id$
 
-// This is an adapter class for a data handler to be used in a separate 
+// This is an adapter class for a data handler to be used in a separate
 // thread.  The adapter provides a push method that places an event
 // set into its synchronized internal MTQueue.  It runs a separate thread
 // which blocks until there is an event in the queue, then dequeues the
@@ -38,7 +38,7 @@ public class  MTDataHandlerAdapter extends Thread
         {
           for (int i = 0; i < events.length; ++i)
             {
-              if(events[i].header.type == 
+              if(events[i].header.type ==
                  PushConsumer.ACE_ES_EVENT_NOTIFICATION)
                 {
 		  //                  System.out.println ("MTDataHandlerAdapter.push updating data handler");
@@ -57,12 +57,12 @@ public class  MTDataHandlerAdapter extends Thread
           try
             {
               // Pull an event set from the head of the queue
-             RtecEventComm.Event[] events = 
+             RtecEventComm.Event[] events =
                 (RtecEventComm.Event[]) queue_.dequeue_head ();
 
               for (int i = 0; i < events.length; ++i)
                 {
-                  if(events[i].header.type == 
+                  if(events[i].header.type ==
                      PushConsumer.ACE_ES_EVENT_NOTIFICATION)
                     {
                       dataHandler_.update (events[i]);
diff --git a/examples/Simulator/DOVEBrowser/MTQueue.java b/examples/Simulator/DOVEBrowser/MTQueue.java
index 357c872c4dc..d53bf55408f 100644
--- a/examples/Simulator/DOVEBrowser/MTQueue.java
+++ b/examples/Simulator/DOVEBrowser/MTQueue.java
@@ -10,10 +10,10 @@ public class MTQueue
   // Initially, the head and tail of the queue are null
   MTQueue_Node head_ = null;
   MTQueue_Node tail_ = null;
-  
+
   // Constructor - does nothing.
   public MTQueue ()
-    {     
+    {
     }
 
   // Places a passed Object at the end of the queue.
@@ -44,7 +44,7 @@ public class MTQueue
     {
       // Create a new node to hold the object.
       MTQueue_Node new_node = new MTQueue_Node(new_data);
-	    
+
       // Insert the node into the queue.
       if (head_ == null)
 	{
@@ -61,7 +61,7 @@ public class MTQueue
       // Wake up any waiting threads
       notifyAll ();
     }
-  
+
   // Try to remove an object from the head of the queue - nonblocking.
   public synchronized Object try_dequeue_head()
   {
@@ -84,7 +84,7 @@ public class MTQueue
       // Start with a null reference.
       Object return_value = null;
 
-      // Wait until there's something to dequeue.      
+      // Wait until there's something to dequeue.
       while (head_ == null)
         {
           try
@@ -116,13 +116,13 @@ public class MTQueue
           head_.prev_.next_ = null;
           head_.prev_.prev_ = null;
           head_.prev_.data_ = null;
-	  head_.prev_ = null;	  
+	  head_.prev_ = null;
 	}
 
       // Return the object we dequeued.
       return return_value;
     }
-  
+
   // Try to remove an object from the tail of the queue - nonblocking.
   public synchronized Object try_dequeue_tail ()
   {
@@ -145,7 +145,7 @@ public class MTQueue
       // Start with a null reference.
       Object return_value = null;
 
-      // Wait until there's something to dequeue.      
+      // Wait until there's something to dequeue.
       while (tail_ == null)
         {
           try
@@ -171,13 +171,13 @@ public class MTQueue
 	  head_ = null;
 	}
       else
-	{	  
+	{
 	  return_value = tail_.data_;
 	  tail_ = tail_.prev_;
           tail_.next_.data_ = null;
           tail_.next_.next_ = null;
           tail_.next_.prev_ = null;
-	  tail_.next_ = null;	  
+	  tail_.next_ = null;
 	}
 
       // Return the object we dequeued.
diff --git a/examples/Simulator/DOVEBrowser/MultiDoubleVisComp.java b/examples/Simulator/DOVEBrowser/MultiDoubleVisComp.java
index 1685f25c69a..4961e2aa437 100644
--- a/examples/Simulator/DOVEBrowser/MultiDoubleVisComp.java
+++ b/examples/Simulator/DOVEBrowser/MultiDoubleVisComp.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //    MultiDoubleVisComp.java
 //
@@ -25,7 +25,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
   private static final int MIN_SPACING = 2;
   private static final int POINT_HISTORY = 200;
   private static final Font FONT = new Font ("Dialog", Font.PLAIN, 10);
-  
+
   private Queue plots_ [];
   private int plot_count_ = 0;
   private String title_;
@@ -62,19 +62,19 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
     title_ = "";
     max_value_ = 1;
     old_max_value_ = max_value_;
-    
+
     java.util.Random rand = new java.util.Random (System.currentTimeMillis ());
     float hue_ = rand.nextFloat ();
     float brightness = rand.nextFloat ();
 
     hue_ += .075;
-    
+
     if (hue_ > 1.0)
       hue_ -= 1.0;
-    
+
     if (brightness > 0.75)
       brightness -= 0.25;
-    
+
     Color new_color = Color.getHSBColor (hue_, 1, brightness);
 
     this.setBackground (new_color);
@@ -129,7 +129,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
   public void setName (String title) {
       title_ = title;
   }
-  
+
   public int getProperty () {
       return Properties.MULTIDOUBLE;
     }
@@ -141,7 +141,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
   public Dimension getPreferredSize () {
       return new Dimension (175, 175);
     }
-  
+
   public String getName () {
     return title_;
   }
@@ -154,14 +154,14 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
   {
     Double double_array[];
     try {
-      double_array = (Double[]) obj;  
+      double_array = (Double[]) obj;
     }
     catch (Exception excp) {
       double_array = new Double [plot_count_];
       for (int j = 0; j < plot_count_; ++j)
 	{
           double_array [j] = new Double (0.0);
-	} 
+	}
       System.out.println (excp);
       System.out.println ("Multi Double Visualization Component received wrong data type!");
     }
@@ -171,13 +171,13 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
         float new_point = double_array [i].floatValue ();
         Float temp = (Float) plots_ [i].dequeue_tail ();
         plots_ [i].enqueue_head (new Float (new_point));
-    
+
         if (new_point > local_max_ [i])
           {
             local_max_ [i] = new_point;
             local_max_values_ [local_max_value_index_ [i]] = local_max_ [i];
           }
-     
+
         if (monotonic_scale_)
           {
             float global_max = 0;
@@ -185,7 +185,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
 
             while (global_max > max_value_)
               max_value_ *= 2;
-    
+
             while ((global_max < max_value_/2) && (max_value_ > old_max_value_))
               max_value_ /= 2;
           }
@@ -193,7 +193,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
           {
             while (local_max_ [i] > max_value_)
               max_value_ *= 2;
-    
+
             while ((local_max_ [i] < max_value_/2) && (max_value_ > old_max_value_))
               max_value_ /= 2;
           }
@@ -211,7 +211,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
     FontMetrics fm = g.getFontMetrics ();
     int fheight = fm.getHeight ();
     String value =  "Scale: " + max_value_ ;
-    
+
     if ((offscreen_ == null) ||
 	(offscreensize_.width != d.width - 8) ||
 	(offscreensize_.height != d.height - 8))
@@ -226,10 +226,10 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
     g.draw3DRect (0, 0, d.width - 1, d.height - 1, true);
     g.draw3DRect (1, 1, d.width - 3, d.height - 3, true);
     g.draw3DRect (2, 2, d.width - 5, d.height - 5, true);
-    
+
     offgraphics_.setColor (getBackground ());
     offgraphics_.fillRect (0, 0, offscreensize_.width, offscreensize_.height);
-    offgraphics_.setColor (getForeground ());    
+    offgraphics_.setColor (getForeground ());
     offgraphics_.drawString (title_, 5, fheight);
     offgraphics_.drawString (value, 5, offscreensize_.height - 5);
 
@@ -242,13 +242,13 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
         while (queue_iter.hasMoreElements ())
           {
 	    value_2 = ((Float) queue_iter.nextElement ()).floatValue ();
-	
+
 	    if (value_1 > local_max_ [i])
 	      local_max_ [i] = value_1;
-	
+
             y1 = normalize (offscreensize_.height - fheight, value_1, i);
             y2 = normalize (offscreensize_.height - fheight, value_2, i);
-	
+
 	    tmp = value_2;
 	    value_2 = value_1;
 	    value_1 = tmp;
@@ -265,7 +265,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
 
     g.drawImage (offscreen_, 3, 3, null);
   }
-  
+
   public void paint (Graphics g)
   {
     Dimension d = getSize ();
@@ -274,7 +274,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
       {
         int plot_length = plots_ [i].length ();
         int num_points = d.width / spacing_;
-    
+
         if (plots_[i].length () < num_points)
           {
             for (int j = 0; j < num_points - plot_length; j++)
@@ -309,7 +309,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
     if (new_count > plot_count_)
       {
         // New larger static global array of all local maxima values
-        float local_max_values_temp [] = 
+        float local_max_values_temp [] =
           new float [local_max_value_count_ + new_count - plot_count_];
 
         // Copy the previously stored maxima (if any) into the new array.
@@ -365,7 +365,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp
 
     // Then, subtract the pixel location
     float location = (float) height - pixels;
-    
+
     return Math.round (location);
   }
 }
diff --git a/examples/Simulator/DOVEBrowser/NS_Resolve.java b/examples/Simulator/DOVEBrowser/NS_Resolve.java
index 7ef862e3aea..9a675d22333 100644
--- a/examples/Simulator/DOVEBrowser/NS_Resolve.java
+++ b/examples/Simulator/DOVEBrowser/NS_Resolve.java
@@ -1,8 +1,8 @@
-// $Id$ 
+// $Id$
 
 // ============================================================================
 //
-// 
+//
 // = FILENAME
 //    NS_Resolve.java
 //
@@ -14,7 +14,7 @@
 // = DESCRIPTION
 //   Resolves the initial reference to the Naming service,
 //   the orb has to be given as a parameter to the
-//   resolve_name_service call. 
+//   resolve_name_service call.
 //
 // ============================================================================
 
@@ -79,7 +79,7 @@ public class NS_Resolve
         // Wait 3 seconds for the Naming Service to connect
         listenSocket.setSoTimeout(3000);
         replySocket = listenSocket.accept();
-      
+
         // @@ The restriction right now is that the length of the IOR cannot be longer than 4096
         char[] reply = new char[4096];
 
@@ -91,14 +91,14 @@ public class NS_Resolve
           {
             int c = in.read();
 
-            if (c == -1) 
+            if (c == -1)
               {
                 throw new IOException("Unexpected EOF.");
               }
 
             reply[ length ] = (char) c;
-	    
-            if (c == 0) 
+
+            if (c == 0)
               {
                 break;
               }
@@ -114,36 +114,36 @@ public class NS_Resolve
     catch (java.io.InterruptedIOException e)
       {
         System.err.println ("NS_Resolve: The receive lasted too long");
-      } 
-    catch(org.omg.CORBA.SystemException e) 
+      }
+    catch(org.omg.CORBA.SystemException e)
       {
         System.err.println(e);
-      }	
+      }
     catch (java.io.IOException e)
       {
         System.err.println (e);
       }
-    finally 
+    finally
       {
         // Close the sockets.
 
-        if (sendSocket != null) 
+        if (sendSocket != null)
           {
             sendSocket.close();
           }
 
-        if (listenSocket != null) 
+        if (listenSocket != null)
           {
-            try 
+            try
               {
                 listenSocket.close();
               }
             catch (IOException e) {}
           }
 
-        if (replySocket != null) 
+        if (replySocket != null)
           {
-            try 
+            try
               {
                 replySocket.close();
               }
@@ -152,5 +152,5 @@ public class NS_Resolve
       }
 
     return null;
-  } 
+  }
 }
diff --git a/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java b/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java
index 0e323279598..922ae739cd1 100644
--- a/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java
+++ b/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //    NavWeapDataHandler.java
 //
@@ -8,7 +8,7 @@
 //
 // = DESCRIPTION
 //   This is an implementation of the interface Data Handler,
-//   it handles Navigation and Weapons data, where statistic data is 
+//   it handles Navigation and Weapons data, where statistic data is
 //   part of it. Several Observables are declared, they can be accessed by
 //   any number of Observers, which could reside in a Java Bean for example.
 //
@@ -18,18 +18,18 @@ import org.omg.CORBA.*;
 
 public class NavWeapDataHandler implements DataHandler {
 
-  java.util.Hashtable ObservablesTable; 
+  java.util.Hashtable ObservablesTable;
   int received_events_;
 
 
   // Observable for Persian Recursion data
   class PersianObservable extends DemoObservable {
-    
+
     // to ask which kind of viewer is needed to display data
     public int getProperty () {
 	return Properties.PERSIAN;
     }
-    
+
     public void updatePersianData (PersianRecursion.Data data) {
 
       //      System.out.println ("in PersianObservable.updatePersianData");
@@ -42,20 +42,20 @@ public class NavWeapDataHandler implements DataHandler {
 
   // Observable for Navigation data
   class NavigationObservable extends DemoObservable {
-    
+
     // to ask which kind of viewer is needed to display data
     public int getProperty () {
 	return Properties.NAVIGATION;
-    }    
-    
+    }
+
     public void updateNavigation (Navigation navigation) {
       setChanged ();
       notifyObservers (navigation);
-    }      
+    }
   }
 
   class WeaponsObservable extends DemoObservable {
-    
+
     // to ask which kind of viewer is needed to display data
     public int getProperty () {
 	return Properties.WEAPONS;
@@ -66,13 +66,13 @@ public class NavWeapDataHandler implements DataHandler {
       notifyObservers (weapons);
     }
   }
-  
+
   class Cpu_UsageObservable extends DemoObservable {
-    
+
     public int getProperty () {
       return Properties.DOUBLE;
     }
-    
+
     public void updateCpu_Usage (double utilization) {
       setChanged ();
       Double temp_ = new Double (utilization);
@@ -81,7 +81,7 @@ public class NavWeapDataHandler implements DataHandler {
   }
 
   class OverheadObservable extends DemoObservable {
-    
+
     public int getProperty () {
       return Properties.DOUBLE;
     }
@@ -97,11 +97,11 @@ public class NavWeapDataHandler implements DataHandler {
     double latency = 0.0;
     double avg_latency = 0.0;
     double sample_count = 0.0;
-        
+
     public int getProperty () {
       return Properties.DOUBLE;
     }
-        
+
     public void updateJitter (long completion_time,
 		              long computation_time,
 		              long arrival_time) {
@@ -112,10 +112,10 @@ public class NavWeapDataHandler implements DataHandler {
       latency = latency > 0 ? latency : 0;
 
       sample_count = sample_count + 1.0;
-      avg_latency = (avg_latency * (sample_count - 1.0) + latency) / 
-                    (sample_count);  
+      avg_latency = (avg_latency * (sample_count - 1.0) + latency) /
+                    (sample_count);
 
-      double jitter_ = (double)Math.abs(latency - avg_latency); 
+      double jitter_ = (double)Math.abs(latency - avg_latency);
 
       setChanged ();
       Double temp_ = new Double (jitter_);
@@ -124,28 +124,28 @@ public class NavWeapDataHandler implements DataHandler {
   }
 
   class DeadlinesObservable extends DemoObservable {
-    
+
     public int getProperty () {
       return Properties.DOUBLE;
     }
-    
-    public void updateDeadlines (long deadline_time, 
+
+    public void updateDeadlines (long deadline_time,
 				 long completion_time) {
 
       double missed_ = (deadline_time < completion_time) ? 1.0 : 0.0;
       Double temp_ = new Double (missed_);
       setChanged ();
-      notifyObservers (temp_);	
+      notifyObservers (temp_);
     }
   }
 
   class CriticalDeadlinesObservable extends DeadlinesObservable {
-    
+
     public int getProperty () {
       return Properties.DOUBLE;
     }
-    
-    public void updateDeadlines (long deadline_time, 
+
+    public void updateDeadlines (long deadline_time,
 				 long completion_time,
                                  long criticality) {
 
@@ -153,14 +153,14 @@ public class NavWeapDataHandler implements DataHandler {
                         (deadline_time < completion_time)) ? 1.0 : 0.0;
       Double temp_ = new Double (missed_);
       setChanged ();
-      notifyObservers (temp_);	
+      notifyObservers (temp_);
     }
   }
 
   class LatencyObservable extends DemoObservable {
     double latency = 0.0;
     double last_latency = 0.0;
-    
+
     public int getProperty () {
       return Properties.DOUBLE;
     }
@@ -169,12 +169,12 @@ public class NavWeapDataHandler implements DataHandler {
       last_latency = latency;
       latency = (double)(computation_time);
       latency = latency > 0 ? latency : 0;
-      
+
       setChanged ();
       Double temp_ = new Double(latency);
-      notifyObservers (temp_);	
+      notifyObservers (temp_);
     }
-    
+
     public void updateLatency (long completion_time,
 			       long computation_time,
 			       long arrival_time) {
@@ -183,14 +183,14 @@ public class NavWeapDataHandler implements DataHandler {
                 (double)(computation_time) -
                 (double)(arrival_time);
       latency = latency > 0 ? latency : 0;
-      
+
       setChanged ();
       Double temp_ = new Double(latency);
-      notifyObservers (temp_);	
+      notifyObservers (temp_);
     }
   }
-  
-  
+
+
   public synchronized void update (RtecEventComm.Event event) {
 
     // System.out.println ("in NavWeapDataHandler.update");
@@ -206,7 +206,7 @@ public class NavWeapDataHandler implements DataHandler {
 
         try
 	  {
-            persian_recursion_data = 
+            persian_recursion_data =
               PersianRecursion.DataHelper.extract (any_value);
 	  }
         catch (Exception e)
@@ -231,7 +231,7 @@ public class NavWeapDataHandler implements DataHandler {
 
 	    pobs_hi.updatePersianData (persian_recursion_data);
 
-            // LatencyObservable lobs_hi = 
+            // LatencyObservable lobs_hi =
 	    // (LatencyObservable) ObservablesTable.get ("High Consumer Execution Time (100 ns)");
 
 	    // lobs_hi.updateLatency (persian_recursion_data.computation_time);
@@ -249,7 +249,7 @@ public class NavWeapDataHandler implements DataHandler {
 
 	    //            System.out.println ("updated low priority persian recursion observable");
 
-            // LatencyObservable lobs_lo = 
+            // LatencyObservable lobs_lo =
 	    // (LatencyObservable) ObservablesTable.get ("Low Consumer Execution Time (100 ns)");
 
 	    // lobs_lo.updateLatency (persian_recursion_data.computation_time);
@@ -291,7 +291,7 @@ public class NavWeapDataHandler implements DataHandler {
 	DeadlinesObservable dobs = (DeadlinesObservable)ObservablesTable.get ("Missed Deadlines");
 	dobs.updateDeadlines (navigation_.deadline_time,
 			      navigation_.completion_time);
-	CriticalDeadlinesObservable cdobs = 
+	CriticalDeadlinesObservable cdobs =
           (CriticalDeadlinesObservable)ObservablesTable.get ("Missed Critical Deadlines");
 	cdobs.updateDeadlines (navigation_.deadline_time,
 			       navigation_.completion_time,
@@ -310,7 +310,7 @@ public class NavWeapDataHandler implements DataHandler {
       {
 	Weapons weapons_ = WeaponsHelper.extract (any_value);
 
-        // if the weapons structure's update data flag is set, update 
+        // if the weapons structure's update data flag is set, update
         // itss scheduling data with actual values from the EC
         if (weapons_.update_data > 0)
           {
@@ -350,13 +350,13 @@ public class NavWeapDataHandler implements DataHandler {
                              weapons_.arrival_time);
 	received_events_++;
       }
-    else 
+    else
       {
        	System.out.println ("Received wrong type information");
-  
+
 	System.out.println ("Received any_value.type (): [" +
                             any_value.type() + "]");
-  
+
 	System.out.println ("Expected NavigationHelper.type (): [" +
                             NavigationHelper.type() + "]");
 
@@ -367,7 +367,7 @@ public class NavWeapDataHandler implements DataHandler {
                             PersianRecursion.DataHelper.type() + "]");
       }
   }
-  
+
   NavWeapDataHandler () {
     ObservablesTable = new java.util.Hashtable();
 
@@ -381,27 +381,27 @@ public class NavWeapDataHandler implements DataHandler {
     ObservablesTable.put ("Missed Deadlines", new DeadlinesObservable());
     ObservablesTable.put ("Missed Critical Deadlines", new CriticalDeadlinesObservable());
     ObservablesTable.put ("Latency (100 ns)", new LatencyObservable());
-    ObservablesTable.put ("Weapons Latency (100 ns)", new LatencyObservable()); 
-    ObservablesTable.put ("Navigation Latency (100 ns)", new LatencyObservable()); 
-    ObservablesTable.put ("High Consumer Persian Recursion", new PersianObservable()); 
-    ObservablesTable.put ("Low Consumer Persian Recursion", new PersianObservable()); 
-    ObservablesTable.put ("High Consumer Execution Time (100 ns)", new LatencyObservable()); 
-    ObservablesTable.put ("Low Consumer Execution Time (100 ns)", new LatencyObservable()); 
+    ObservablesTable.put ("Weapons Latency (100 ns)", new LatencyObservable());
+    ObservablesTable.put ("Navigation Latency (100 ns)", new LatencyObservable());
+    ObservablesTable.put ("High Consumer Persian Recursion", new PersianObservable());
+    ObservablesTable.put ("Low Consumer Persian Recursion", new PersianObservable());
+    ObservablesTable.put ("High Consumer Execution Time (100 ns)", new LatencyObservable());
+    ObservablesTable.put ("Low Consumer Execution Time (100 ns)", new LatencyObservable());
   }
-  
+
   public java.util.Enumeration getObservablesList () {
     return ObservablesTable.keys ();
   }
-  
+
   public DemoObservable getObservable(String name) {
     return (DemoObservable)ObservablesTable.get (name);
   }
-  
+
   public int getObservableProperty (String name) {
     DemoObservable obs = (DemoObservable)ObservablesTable.get (name);
     return obs.getProperty ();
   }
 }
 
-    
-    
+
+
diff --git a/examples/Simulator/DOVEBrowser/NavigationVisComp.java b/examples/Simulator/DOVEBrowser/NavigationVisComp.java
index 3d7a217389b..a602945b50b 100644
--- a/examples/Simulator/DOVEBrowser/NavigationVisComp.java
+++ b/examples/Simulator/DOVEBrowser/NavigationVisComp.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //    NavigationVisComp.java
 //
@@ -35,40 +35,40 @@ public class NavigationVisComp extends Panel implements VisComp
   public int getProperty () {
       return Properties.NAVIGATION;
     }
-  
+
   public void update (java.util.Observable observable, java.lang.Object obj) {
     Navigation navigation_ = null;
     try {
-      navigation_ = (Navigation) obj;  
+      navigation_ = (Navigation) obj;
     }
     catch (Exception excp) {
       System.out.println (excp);
       System.out.println ("Visualization Component received wrong data type!");
     }
-    if (navigation_ != null) {            
+    if (navigation_ != null) {
       // make sure all the values are in the proper range.
-      navigation_.roll = (navigation_.roll > 180 || navigation_.roll < -180) ? 
+      navigation_.roll = (navigation_.roll > 180 || navigation_.roll < -180) ?
 	0 :  navigation_.roll;
-      navigation_.pitch = (navigation_.pitch > 90 || navigation_.pitch < -90) ? 
+      navigation_.pitch = (navigation_.pitch > 90 || navigation_.pitch < -90) ?
 	0 :  navigation_.pitch;
 
       // update the artificial horizon
       alt_hor_.update_display (navigation_.roll, navigation_.pitch);
 
-      navigation_.pitch = (navigation_.position_latitude > 90 || navigation_.position_latitude < -90) ? 
+      navigation_.pitch = (navigation_.position_latitude > 90 || navigation_.position_latitude < -90) ?
 	0 :  navigation_.position_latitude;
-      navigation_.pitch = (navigation_.position_longitude > 100 || navigation_.position_longitude < 00) ? 
+      navigation_.pitch = (navigation_.position_longitude > 100 || navigation_.position_longitude < 00) ?
 	0 :  navigation_.position_longitude;
-      navigation_.pitch = (navigation_.altitude > 90 || navigation_.altitude < -90) ? 
+      navigation_.pitch = (navigation_.altitude > 90 || navigation_.altitude < -90) ?
 	0 :  navigation_.altitude;
-      navigation_.pitch = (navigation_.heading > 180 || navigation_.heading < -180) ? 
+      navigation_.pitch = (navigation_.heading > 180 || navigation_.heading < -180) ?
 	0 :  navigation_.heading;
 
       // update the position display
-      pos_.update_display (navigation_.position_latitude, 
-			   navigation_.position_longitude, 
-			   navigation_.altitude, 
-			   navigation_.heading);      
+      pos_.update_display (navigation_.position_latitude,
+			   navigation_.position_longitude,
+			   navigation_.altitude,
+			   navigation_.heading);
     }
   }
 }
@@ -78,13 +78,13 @@ extends Canvas
 {
   private final static Color GREEN = new Color (0, 100, 0),
     BLUE = new Color (30, 144, 255);
-  
+
   private Graphics offgraphics_;
   private Image offscreen_;
   private Dimension offscreensize_;
 
   private int roll_ = 0, pitch_ = 0;
-  
+
   public void update_display (int roll, int pitch)
     {
       roll_ = roll;
@@ -92,7 +92,7 @@ extends Canvas
 
       repaint ();
     }
-  
+
   public Dimension getPreferredSize ()
     {
       return new Dimension (180, 180);
@@ -102,18 +102,18 @@ extends Canvas
     {
       return new Dimension (80, 80);
     }
-  
+
   public void paint (Graphics g)
     {
       update (g);
     }
-  
+
   public void update (Graphics g)
     {
       Dimension d = getSize ();
       int rad, angles[] = { 180, 0 };
       Point center;
-      
+
       if ((offscreen_ == null) || (d.width != offscreensize_.width) ||
 	  (d.height != offscreensize_.height))
 	{
@@ -121,17 +121,17 @@ extends Canvas
 	  offscreensize_ = new Dimension (d.width, d.height);
 	  offgraphics_ = offscreen_.getGraphics ();
 	  offgraphics_.setFont (getFont());
-	  
+
 	  //	  g.setColor (Color.lightGray);
 	  //	  g.draw3DRect (0, 0, d.width - 1, d.height - 1, true);
 	  //	  g.draw3DRect (1, 1, d.width - 3, d.height - 3, true);
 	  //	  g.draw3DRect (2, 2, d.width - 5, d.height - 5, true);
 	}
-      
+
       offgraphics_.setColor (getBackground());
       offgraphics_.fillRect (0, 0, d.width, d.height);
       offgraphics_.setColor (BLUE);
-      
+
       // Calculate from the dimensions, the largest square.
       center = new Point (d.width / 2, d.height / 2);
       rad = ((center.x < center.y) ? center.x : center.y);
@@ -151,7 +151,7 @@ extends Canvas
       // Draw the resulting terrain
       draw_horizon (rad, center, angles);
 
-      // Draw the plotted Image. 
+      // Draw the plotted Image.
       g.drawImage (offscreen_, 0, 0, null);
     }
 
@@ -162,7 +162,7 @@ extends Canvas
 	((angles[0] > angles[1]) ?
 	 (360 - angles[0]) + angles[1] :
 	 (angles[1] - angles[0]));
-      
+
       Polygon remainder = new Polygon ();
 
       offgraphics_.setColor (GREEN);
@@ -181,9 +181,9 @@ extends Canvas
 	  // System.out.println (points[0] + " " + points[1]);
 
 	  // System.out.println (accepted_point);
-	  
+
 	  remainder.addPoint (center.x + polar_to_rect_x (rad, cover_angle),
-			      center.y - polar_to_rect_y (rad, cover_angle)); 
+			      center.y - polar_to_rect_y (rad, cover_angle));
 	  remainder.addPoint (center.x + polar_to_rect_x (rad, angles[0]),
 			      center.y - polar_to_rect_y (rad, angles[0]));
 	  remainder.addPoint (center.x + polar_to_rect_x (rad, angles[1]),
@@ -191,9 +191,9 @@ extends Canvas
 	  offgraphics_.fillPolygon (remainder);
 	  //offgraphics_.setColor (getBackground ());
 	  //offgraphics_.drawPolygon (remainder);
-	}	
+	}
     }
-  
+
   private void pitch_horizon (int rad, int[] angles)
     {
       boolean upside_down = Math.abs (roll_) >= 90;
@@ -203,10 +203,10 @@ extends Canvas
 
       angles[0] += angle_shift;
       angles[1] -= angle_shift;
-      
+
 
     }
-  
+
   private void roll_horizon (int rad, int[] angles)
     {
       // Roll the left and right points of the terrain.
@@ -217,7 +217,7 @@ extends Canvas
 	angles[0] += 360;
 
       if (angles[1] < 0)
-	angles[1] += 360;      
+	angles[1] += 360;
     }
 
   private int polar_to_rect_x (int rad, int angle)
@@ -239,7 +239,7 @@ extends Canvas
 
       return ((double) (y2 - y1)) / ((double) (x2 - x1));
     }
-  
+
   private Point[] line_circle_intesect (int rad, double y_intercept, double slope)
     {
       double r_2 = (double)(rad * rad),
@@ -257,7 +257,7 @@ extends Canvas
 
       return points;
     }
-  
+
   private int calculate_angle (int rad, int x, int y)
     {
       /*
@@ -293,7 +293,7 @@ extends Canvas
     {
       int[] roots = new int [2];
       double body = Math.sqrt (b*b - 4.0*a*c);
-      
+
       roots[0] = (int) Math.round ((-b + body) / (2.0 * a));
       roots[1] = (int) Math.round ((-b - body) / (2.0 * a));
 
@@ -312,17 +312,17 @@ extends Canvas
 class Position extends Panel
 {
   private final static Font FONT = new Font ("Dialog", Font.BOLD, 12);
-  private final static char DEGREE = '\u00B0'; 
-  
+  private final static char DEGREE = '\u00B0';
+
   private Label lat_ = new Label ("0" + DEGREE + " N", Label.RIGHT),
     long_ = new Label ("0" + DEGREE + " S", Label.RIGHT),
     alt_ = new Label ("0 Kft", Label.RIGHT),
     heading_ = new Label ("0" + DEGREE + "  ", Label.RIGHT);
-  
+
   public Position ()
     {
       Panel grid_panel = new Panel ();
-      
+
       lat_.setFont (FONT);
       long_.setFont (FONT);
       alt_.setFont (FONT);
@@ -332,7 +332,7 @@ class Position extends Panel
       add (lat_);
       add (long_);
       add (heading_);
-      add (alt_);      
+      add (alt_);
     }
 
   public void update_display (int lat, int lon, int alt, int heading)
diff --git a/examples/Simulator/DOVEBrowser/ObservablesDialog.java b/examples/Simulator/DOVEBrowser/ObservablesDialog.java
index 2ea856c24e2..b00b798c497 100644
--- a/examples/Simulator/DOVEBrowser/ObservablesDialog.java
+++ b/examples/Simulator/DOVEBrowser/ObservablesDialog.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //    ObservablesDialog.java
 //
@@ -21,7 +21,7 @@ public class ObservablesDialog extends Dialog {
   AnswerListener listener_;
 
   ObservablesDialog (DemoCore parent,java.util.Enumeration enumeration) {
-    
+
     super ((Frame)parent, "Select Observables", true);
     parent_ = parent;
     this.setSize(400, 300);
@@ -32,7 +32,7 @@ public class ObservablesDialog extends Dialog {
     list_.setSize (200,200);
 
     for (; enumeration.hasMoreElements();) {
-      list_.add ((String)enumeration.nextElement());      
+      list_.add ((String)enumeration.nextElement());
     }
 
 
@@ -46,17 +46,17 @@ public class ObservablesDialog extends Dialog {
 
     constraints_.fill = GridBagConstraints.BOTH;
     this.setLayout (gridbag_);
-    
+
     constraints_.weightx = 1.0;
     constraints_.weighty = 1.0;
     constraints_.gridwidth = GridBagConstraints.REMAINDER;
     gridbag_.setConstraints (list_, constraints_);
     this.add (list_);
-    
+
     constraints_.weightx = 1.0;
     constraints_.weighty = 1.0;
     constraints_.gridwidth = GridBagConstraints.RELATIVE;
-    constraints_.fill = GridBagConstraints.NONE; 
+    constraints_.fill = GridBagConstraints.NONE;
     gridbag_.setConstraints (ok_button_, constraints_);
     gridbag_.setConstraints (cancel_button_, constraints_);
     this.add (ok_button_);
@@ -68,7 +68,7 @@ public class ObservablesDialog extends Dialog {
 	String selected_ = ObservablesDialog.this.list_.getSelectedItem ();
 	  if (selected_ != null) {
 	    System.out.println (">>>>> " + selected_);
-	    if (listener_ != null) {	  
+	    if (listener_ != null) {
 	      AnswerEvent ev = new AnswerEvent (ObservablesDialog.this, selected_);
 	      listener_.ok (ev);
 	    }
@@ -76,7 +76,7 @@ public class ObservablesDialog extends Dialog {
 	  }
       }
     });
-  
+
      cancel_button_.addActionListener (new ActionListener () {
       public void actionPerformed (ActionEvent e) {
 	ObservablesDialog.this.setVisible (false);
diff --git a/examples/Simulator/DOVEBrowser/PersianVisComp.java b/examples/Simulator/DOVEBrowser/PersianVisComp.java
index bf29e9aaf19..e0ab6661507 100644
--- a/examples/Simulator/DOVEBrowser/PersianVisComp.java
+++ b/examples/Simulator/DOVEBrowser/PersianVisComp.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //     PersianVisComp.java
 //
@@ -113,7 +113,7 @@ public class PersianVisComp extends Canvas implements VisComp
       return new Dimension (PIXELS_WIDE + 2 * DRAW_OFFSET,
                             PIXELS_WIDE + 2 * DRAW_OFFSET);
     }
-  
+
   public String getName () {
     return title_;
   }
@@ -122,7 +122,7 @@ public class PersianVisComp extends Canvas implements VisComp
   {
     PersianRecursion.Data data_temp_;
     try {
-      data_temp_ = (PersianRecursion.Data) obj;  
+      data_temp_ = (PersianRecursion.Data) obj;
     }
     catch (Exception excp) {
       data_temp_ = null;
@@ -170,7 +170,7 @@ public class PersianVisComp extends Canvas implements VisComp
     FontMetrics fm = g.getFontMetrics ();
     int x1 = d.width - 8, y1, x2, y2, fheight = fm.getHeight (), i;
     PersianRecursion.Data data_temp_;
-    
+
     if ((offscreen_ == null) ||
 	(offscreensize_.width != d.width - 8) ||
 	(offscreensize_.height != d.height - 8))
@@ -185,10 +185,10 @@ public class PersianVisComp extends Canvas implements VisComp
     g.draw3DRect (0, 0, d.width - 1, d.height - 1, true);
     g.draw3DRect (1, 1, d.width - 3, d.height - 3, true);
     g.draw3DRect (2, 2, d.width - 5, d.height - 5, true);
-    
+
     offgraphics_.setColor (getBackground ());
     offgraphics_.fillRect (0, 0, offscreensize_.width, offscreensize_.height);
-    offgraphics_.setColor (getForeground ());    
+    offgraphics_.setColor (getForeground ());
     offgraphics_.drawString (title_, 5, fheight);
 
     Image img = createImage (image_source_);
@@ -198,7 +198,7 @@ public class PersianVisComp extends Canvas implements VisComp
 
     //    System.out.println ("updated.");
   }
-  
+
   public void paint (Graphics g)
   {
     update (g);
diff --git a/examples/Simulator/DOVEBrowser/Properties.java b/examples/Simulator/DOVEBrowser/Properties.java
index 7f537b85e06..d954339e58d 100644
--- a/examples/Simulator/DOVEBrowser/Properties.java
+++ b/examples/Simulator/DOVEBrowser/Properties.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //    Properties.java
 //
@@ -19,4 +19,4 @@ public class Properties {
   public static final int PERSIAN = 3;
   public static final int MULTIDOUBLE = 4;
 }
-  
+
diff --git a/examples/Simulator/DOVEBrowser/PushConsumer.java b/examples/Simulator/DOVEBrowser/PushConsumer.java
index a69f20038bb..6f2ccee6707 100644
--- a/examples/Simulator/DOVEBrowser/PushConsumer.java
+++ b/examples/Simulator/DOVEBrowser/PushConsumer.java
@@ -143,7 +143,7 @@ public class PushConsumer extends RtecEventComm.PushConsumerPOA
         suppliers_ = consumer_admin_.obtain_push_supplier ();
 
         org.omg.CORBA.Object objref = poa_.servant_to_reference (this);
-        RtecEventComm.PushConsumer consumer_ref = 
+        RtecEventComm.PushConsumer consumer_ref =
           RtecEventComm.PushConsumerHelper.narrow (objref);
         suppliers_.connect_push_consumer (consumer_ref, qos);
 
diff --git a/examples/Simulator/DOVEBrowser/PushConsumerFactory.java b/examples/Simulator/DOVEBrowser/PushConsumerFactory.java
index 5c1ce0d3894..34512f08b7a 100644
--- a/examples/Simulator/DOVEBrowser/PushConsumerFactory.java
+++ b/examples/Simulator/DOVEBrowser/PushConsumerFactory.java
@@ -1,7 +1,7 @@
 // $Id$
 //
 // ============================================================================
-// 
+//
 // = FILENAME
 //    PushConsumerFactory.java
 //
@@ -34,18 +34,18 @@ public class PushConsumerFactory {
 
   private boolean use_queueing_ = false;
 
-  public PushConsumerFactory (DataHandler dataHandler, 
-			      String nameServiceIOR, 
-			      String nameServicePort, 
+  public PushConsumerFactory (DataHandler dataHandler,
+			      String nameServiceIOR,
+			      String nameServicePort,
 			      String[] args,
                               boolean use_queueing,
 			      java.applet.Applet applet)
     {
-      try 
+      try
 	{
           use_queueing_ = use_queueing;
 	  dataHandler_ = dataHandler;
-	  
+
 	  // if the DOVE Browser is running as an Applet
 	  if (applet != null) {
 	    orb_ = org.omg.CORBA.ORB.init (applet, null);
@@ -53,27 +53,27 @@ public class PushConsumerFactory {
 	  else { // not running as an Applet, but as an normal Application
 	    orb_ = org.omg.CORBA.ORB.init (args, null);
 	  }
-	  
+
           System.out.println ("Initialized ORB");
-	  
+
           org.omg.CORBA.Object obj =
 	    orb_.resolve_initial_references ("RootPOA");
 
           System.out.println ("Obtained RootPOA");
 
 	  poa_ = org.omg.PortableServer.POAHelper.narrow (obj);
-	  
+
           System.out.println ("Narrowed RootPOA");
 
 	  // Get the Naming Service initial reference
-	  
+
 	  // Name Service Lookup cannot be used when running as an Applet
 	  if (nameServiceIOR == null && applet != null) {
 	    System.out.println (" Name Service Lookup cannot be used when running as an Applet! Quit!");
 	    System.exit (1);
 	  }
-	  
-	  if (nameServiceIOR == null) {  // only used when running via "java" or "vbj"     
+
+	  if (nameServiceIOR == null) {  // only used when running via "java" or "vbj"
 	    System.out.println ("Using the lookup protocol!");
 	    NS_Resolve ns_resolve_ = new NS_Resolve (nameServicePort);
 		naming_service_object_ = ns_resolve_.resolve_name_service (orb_);
@@ -85,11 +85,11 @@ public class PushConsumerFactory {
 
           // Walk through args and count EC and Scheduling Service names.
           int arg_index = 0;
-          while (args.length > arg_index) 
+          while (args.length > arg_index)
             {
               // Count an event service name
-              if ((args[arg_index].equals ("-eventservicename")) && 
-                  (args.length > arg_index + 1)) 
+              if ((args[arg_index].equals ("-eventservicename")) &&
+                  (args.length > arg_index + 1))
                 {
                   System.out.println ("switch [" + args[arg_index] + "]");
                   System.out.println ("value [" + args[arg_index + 1] + "]");
@@ -97,23 +97,23 @@ public class PushConsumerFactory {
                   ++ec_names_count_;
                 }
               // Count a scheduling service name
-              else if ((args[arg_index].equals ("-scheduleservicename")) && 
-                  (args.length > arg_index + 1)) 
+              else if ((args[arg_index].equals ("-scheduleservicename")) &&
+                  (args.length > arg_index + 1))
                 {
                   System.out.println ("switch [" + args[arg_index] + "]");
                   System.out.println ("value [" + args[arg_index + 1] + "]");
                   arg_index += 2;
                   ++ss_names_count_;
                 }
-              else if (args[arg_index].equals ("-dualECdemo")) 
+              else if (args[arg_index].equals ("-dualECdemo"))
                 {
                   System.out.println ("switch [" + args[arg_index] + "]");
                   ++arg_index;
                   ec_names_count_ += 2;
                   ss_names_count_ += 2;
                 }
-              else if ((args[arg_index].equals ("-dualECdemo1")) || 
-                       (args[arg_index].equals ("-dualECdemo2"))) 
+              else if ((args[arg_index].equals ("-dualECdemo1")) ||
+                       (args[arg_index].equals ("-dualECdemo2")))
                 {
                   System.out.println ("switch [" + args[arg_index] + "]");
                   ++arg_index;
@@ -137,30 +137,30 @@ public class PushConsumerFactory {
               ss_names_ = new String [ss_names_count_];
             }
 
-          // Then traverse the args again to allocate and fill in a list 
+          // Then traverse the args again to allocate and fill in a list
           // of EC and Scheduling Service names.
           arg_index = 0;
-          ec_names_count_ = 0; 
-          ss_names_count_ = 0; 
-          while (args.length > arg_index) 
+          ec_names_count_ = 0;
+          ss_names_count_ = 0;
+          while (args.length > arg_index)
             {
               // Set an event service name.
-              if ((args[arg_index].equals ("-eventservicename")) && 
-                  (args.length > arg_index + 1)) 
+              if ((args[arg_index].equals ("-eventservicename")) &&
+                  (args.length > arg_index + 1))
                 {
                   ec_names_[ec_names_count_] = args[arg_index + 1];
-                  ++ec_names_count_;       
+                  ++ec_names_count_;
                   arg_index += 2;
                 }
               // Set a schedule service name.
-              else if ((args[arg_index].equals ("-scheduleservicename")) && 
-                  (args.length > arg_index + 1)) 
+              else if ((args[arg_index].equals ("-scheduleservicename")) &&
+                  (args.length > arg_index + 1))
                 {
                   ss_names_[ss_names_count_] = args[arg_index + 1];
-                  ++ss_names_count_;       
+                  ++ss_names_count_;
                   arg_index += 2;
                 }
-              else if (args[arg_index].equals ("-dualECdemo")) 
+              else if (args[arg_index].equals ("-dualECdemo"))
                 {
                   ss_names_[ss_names_count_] = "DUAL_SCHED_HI";
                   ss_names_[ss_names_count_ + 1] = "DUAL_SCHED_LO";
@@ -170,7 +170,7 @@ public class PushConsumerFactory {
                   ec_names_count_ += 2;
                   ss_names_count_ += 2;
                 }
-              else if (args[arg_index].equals ("-dualECdemo1")) 
+              else if (args[arg_index].equals ("-dualECdemo1"))
                 {
                   ss_names_[ss_names_count_] = "DUAL_SCHED_HI";
                   ec_names_[ec_names_count_] = "DUAL_EC_HI";
@@ -178,7 +178,7 @@ public class PushConsumerFactory {
                   ++ec_names_count_;
                   ++ss_names_count_;
                 }
-              else if (args[arg_index].equals ("-dualECdemo2")) 
+              else if (args[arg_index].equals ("-dualECdemo2"))
                 {
                   ss_names_[ss_names_count_] = "DUAL_SCHED_LO";
                   ec_names_[ec_names_count_] = "DUAL_EC_LO";
@@ -207,7 +207,7 @@ public class PushConsumerFactory {
               ss_names_ = new String [1];
               ss_names_ [0] = "ScheduleService";
             }
-      } 
+      }
       catch (org.omg.CORBA.ORBPackage.InvalidName e)
 	{
 	  System.err.println ("CosNaming.NamingContextPackage.InvalidName");
@@ -216,28 +216,28 @@ public class PushConsumerFactory {
       catch(org.omg.CORBA.SystemException e) {
 	System.err.println ("PushConsumerFactory constructor: ORB and Name Service initialization");
 	System.err.println(e);
-      }	
-      
+      }
+
     }
-  
-  public class Object_is_null_exception extends Exception 
+
+  public class Object_is_null_exception extends Exception
   {
     Object_is_null_exception (String s)
       {
 	super (s);
       }
   }
-  
+
   public void run ()
     {
       try
 	{
-	  
+
 	  // Get the Naming Context to allow resolving the EventService and
 	  // ScheduleService
-	  CosNaming.NamingContext naming_context_ = 
+	  CosNaming.NamingContext naming_context_ =
 	    CosNaming.NamingContextHelper.narrow (naming_service_object_);
-	  
+
 	  if (naming_context_ == null)
 	    {
 	      System.err.println ("The Naming Context is null");
@@ -245,7 +245,7 @@ public class PushConsumerFactory {
 	    }
 	  System.out.println ("Reference to the Naming Service is ok.");
 
-	  // Create Consumers connected to the EventService 
+	  // Create Consumers connected to the EventService
           int ss_number = 0;
           RtecScheduler.Scheduler scheduler_ = null;
           for (int ec_number = 0; ec_number < ec_names_count_; ++ec_number)
@@ -256,24 +256,24 @@ public class PushConsumerFactory {
                 {
                   CosNaming.NameComponent[] ss_name_components_ = new CosNaming.NameComponent[1];
                   ss_name_components_[0] = new CosNaming.NameComponent (ss_names_[ss_number],"");
-                  org.omg.CORBA.Object scheduler_object_ = naming_context_.resolve (ss_name_components_); 
-	  
+                  org.omg.CORBA.Object scheduler_object_ = naming_context_.resolve (ss_name_components_);
+
                   if (scheduler_object_ == null)
                   {
                     throw new Object_is_null_exception(ss_names_[ss_number] +
                                                        " Object is null");
                   }
-	  
+
                   scheduler_ = RtecScheduler.SchedulerHelper.narrow (scheduler_object_);
 
 	          if (scheduler_ == null)
                     {
-                      throw new Object_is_null_exception(ss_names_[ss_number] + 
+                      throw new Object_is_null_exception(ss_names_[ss_number] +
                                                          " narrowed ref is null");
                     }
 
-                  System.out.println ("Reference to " + 
-                                      ss_names_[ss_number] + " is ok.");	  
+                  System.out.println ("Reference to " +
+                                      ss_names_[ss_number] + " is ok.");
 
                   ++ss_number;
                 }
@@ -286,44 +286,44 @@ public class PushConsumerFactory {
 
               if (event_channel_object_ == null)
 	        {
-	          throw new Object_is_null_exception(ec_names_[ec_number] + 
+	          throw new Object_is_null_exception(ec_names_[ec_number] +
                                                      " Object is null");
 	        }
 
-       	      RtecEventChannelAdmin.EventChannel event_channel_ = 
+       	      RtecEventChannelAdmin.EventChannel event_channel_ =
 	        RtecEventChannelAdmin.EventChannelHelper.narrow (event_channel_object_);
 
 	      if (event_channel_ == null)
 	        {
-	          throw new Object_is_null_exception(ec_names_[ec_number] + 
+	          throw new Object_is_null_exception(ec_names_[ec_number] +
                                                      " narrowed ref is null");
 	        }
-	  
-              System.out.println ("Reference to " + 
-                                  ec_names_[ec_number] + " is ok.");	  
-	  
+
+              System.out.println ("Reference to " +
+                                  ec_names_[ec_number] + " is ok.");
+
               // Start the consumer
 	      System.out.println ("Instantiating the Push Consumer for " +
                                   ec_names_[ec_number]  + ": demo_consumer_" +
                                   ec_number + ".");
 
-	      PushConsumer pushConsumer_ = new PushConsumer (orb_, poa_, 
+	      PushConsumer pushConsumer_ = new PushConsumer (orb_, poa_,
                                                              dataHandler_,
                                                              use_queueing_);
 	      System.out.println ("Initializing the Push Consumer for " +
                                   ec_names_[ec_number] + ": demo_consumer_" +
                                   ec_number + ".");
 
-	      pushConsumer_.open_consumer (event_channel_, scheduler_, 
+	      pushConsumer_.open_consumer (event_channel_, scheduler_,
                                            "demo_consumer_" + ec_number);
             }
 
-  
+
   	  // Tell the CORBA environment that we are ready
-	  	  
-	  System.out.println ("PushConsumer registered with POA"); 
+
+	  System.out.println ("PushConsumer registered with POA");
 	  poa_.the_POAManager ().activate ();
-	  System.out.println ("POA Activated"); 
+	  System.out.println ("POA Activated");
 	}
       catch (CosNaming.NamingContextPackage.CannotProceed e)
 	{
@@ -339,7 +339,7 @@ public class PushConsumerFactory {
 	{
 	  System.err.println ("CosNaming.NamingContextPackage.NotFound");
 	  System.err.println (e);
-	
+
 	}
       catch (org.omg.PortableServer.POAManagerPackage.AdapterInactive e)
 	{
@@ -350,14 +350,14 @@ public class PushConsumerFactory {
 	{
 	  System.err.println (e);
 	}
-      catch(org.omg.CORBA.SystemException e) 
+      catch(org.omg.CORBA.SystemException e)
 	{
 	  System.err.println ("PushConsumerFactory.run: Failure");
 	  System.err.println(e);
-	}	
+	}
     }
 
-    
+
 } // public class PushConsumerFactory
 
 
diff --git a/examples/Simulator/DOVEBrowser/Queue.java b/examples/Simulator/DOVEBrowser/Queue.java
index 7ffaba15c52..59e552dbe46 100644
--- a/examples/Simulator/DOVEBrowser/Queue.java
+++ b/examples/Simulator/DOVEBrowser/Queue.java
@@ -8,11 +8,11 @@ public class Queue
   // Friendly?
   Queue_Node head_ = null;
   Queue_Node tail_ = null;
-  
+
   private int length_ = 0;
-  
+
   public Queue()
-    {     
+    {
     }
 
   public Enumeration forward_iterator()
@@ -24,7 +24,7 @@ public class Queue
     {
       return new Queue_Iterator(this, Queue_Iterator.REVERSE);
     }
-  
+
   public void enqueue_tail(Object new_data)
     {
       Queue_Node new_node = new Queue_Node(new_data);
@@ -47,7 +47,7 @@ public class Queue
   public void enqueue_head(Object new_data)
     {
       Queue_Node new_node = new Queue_Node(new_data);
-	    
+
       if (head_ == null)
 	{
 	  tail_ = new_node;
@@ -62,11 +62,11 @@ public class Queue
 
       length_++;
     }
-  
+
   public Object dequeue_head()
     {
       Object return_value = null;
-      
+
       if (head_ == null)
 	return_value = null;
       else if (tail_ == head_)
@@ -79,18 +79,18 @@ public class Queue
 	{
 	  return_value = head_.data_;
 	  head_ = head_.next_;
-	  head_.prev_ = null;	  
+	  head_.prev_ = null;
 	}
 
       length_--;
 
       return return_value;
     }
-  
+
   public Object dequeue_tail()
     {
       Object return_value = null;
-      
+
       if (tail_ == null)
 	return_value = null;
       else if (tail_ == head_)
@@ -100,10 +100,10 @@ public class Queue
 	  head_ = null;
 	}
       else
-	{	  
+	{
 	  return_value = tail_.data_;
 	  tail_ = tail_.prev_;
-	  tail_.next_ = null;	  
+	  tail_.next_ = null;
 	}
 
       length_--;
@@ -149,11 +149,11 @@ class Queue_Iterator implements Enumeration
 {
   public static final boolean FORWARD = true;
   public static final boolean REVERSE = false;
-  
+
   private Queue queue_;
   private Queue_Node queue_ptr_;
   private boolean direction_ = FORWARD;
-  
+
   public Queue_Iterator(Queue queue)
     {
       queue_ = queue;
@@ -174,7 +174,7 @@ class Queue_Iterator implements Enumeration
   public Object nextElement()
     {
       Object data = queue_ptr_.data_;
-      
+
       if (direction_)
 	queue_ptr_ = queue_ptr_.next_;
       else
diff --git a/examples/Simulator/DOVEBrowser/VisComp.java b/examples/Simulator/DOVEBrowser/VisComp.java
index 53294f33ea2..c038286a40a 100644
--- a/examples/Simulator/DOVEBrowser/VisComp.java
+++ b/examples/Simulator/DOVEBrowser/VisComp.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //    VisComp.java
 //
diff --git a/examples/Simulator/DOVEBrowser/VisCompFactory.java b/examples/Simulator/DOVEBrowser/VisCompFactory.java
index b35eccc67a7..c992582277f 100644
--- a/examples/Simulator/DOVEBrowser/VisCompFactory.java
+++ b/examples/Simulator/DOVEBrowser/VisCompFactory.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //    VisCompFactory.java
 //
@@ -12,12 +12,12 @@
 // ============================================================================
 
 import java.beans.*;
-				
+
 class VisCompFactory {
 
-  VisComp getNewVisComp (int property, String name) {    
-           
-    ClassLoader classLoader_ = this.getClass().getClassLoader();	
+  VisComp getNewVisComp (int property, String name) {
+
+    ClassLoader classLoader_ = this.getClass().getClassLoader();
 
     VisComp visComp_ = null;
     String visCompName_ = "VisComp";
diff --git a/examples/Simulator/DOVEBrowser/WeaponsVisComp.java b/examples/Simulator/DOVEBrowser/WeaponsVisComp.java
index 8c81bfc9c11..ef343784cf1 100644
--- a/examples/Simulator/DOVEBrowser/WeaponsVisComp.java
+++ b/examples/Simulator/DOVEBrowser/WeaponsVisComp.java
@@ -1,5 +1,5 @@
 // $Id$
-// 
+//
 // = FILENAME
 //    WeaponsVisComp.java
 //
@@ -57,7 +57,7 @@ public class WeaponsVisComp extends Panel implements VisComp
   public int getProperty () {
     return Properties.WEAPONS;
   }
-  
+
   public Dimension getPreferredSize () {
     return new Dimension (250, 200);
   }
@@ -65,18 +65,18 @@ public class WeaponsVisComp extends Panel implements VisComp
   public Dimension getMinimumSize () {
     return new Dimension (80, 80);
   }
-  
+
   public void update (java.util.Observable observable, java.lang.Object obj) {
     Weapons weapons_ = null;
     try {
-      weapons_ = (Weapons) obj;  
+      weapons_ = (Weapons) obj;
     }
     catch (Exception excp) {
       System.out.println (excp);
       System.out.println ("Visualization Component received wrong data type!");
     }
     if (weapons_ != null)
-    { 
+    {
       for (int i = 0; i < weapons_.number_of_weapons && i < 5; i++)
 	{
 	  String weapon = "";
@@ -85,19 +85,19 @@ public class WeaponsVisComp extends Panel implements VisComp
 	    {
 	    default:
 	      break;
-	    case 0: weapon = weapons_.weapon1_identifier;						      
+	    case 0: weapon = weapons_.weapon1_identifier;
 	      status = weapons_.weapon1_status;
 	      break;
-	    case 1: weapon = weapons_.weapon2_identifier;						      
+	    case 1: weapon = weapons_.weapon2_identifier;
 	      status = weapons_.weapon2_status;
 	      break;
-	    case 2: weapon = weapons_.weapon3_identifier;						      
+	    case 2: weapon = weapons_.weapon3_identifier;
 	      status = weapons_.weapon3_status;
 	      break;
-	    case 3: weapon = weapons_.weapon4_identifier;						      
+	    case 3: weapon = weapons_.weapon4_identifier;
 	      status = weapons_.weapon4_status;
 	      break;
-	    case 4: weapon = weapons_.weapon5_identifier;						      
+	    case 4: weapon = weapons_.weapon5_identifier;
 	      status = weapons_.weapon5_status;
 	      break;
 	    }
@@ -108,7 +108,7 @@ public class WeaponsVisComp extends Panel implements VisComp
 	  if (status_label_ != null)
 	    status_label_.setText ((status == 1) ? ONLINE : OFFLINE);
 	  else
-	    {	 
+	    {
 	      if (count_ == 0)
 		this.removeAll ();
 
@@ -119,7 +119,7 @@ public class WeaponsVisComp extends Panel implements VisComp
 	      status_label_.setFont (FONT_SMALL);
 	      weapon_label_.setFont (FONT_SMALL);
 	      weapon_label_.setForeground (BLUE);
-	      
+
 	      gbc_.gridx = 0;
 	      gbc_.anchor = GridBagConstraints.WEST;
 	      gbl_.setConstraints (weapon_label_, gbc_);
@@ -128,7 +128,7 @@ public class WeaponsVisComp extends Panel implements VisComp
 	      gbc_.anchor = GridBagConstraints.EAST;
 	      gbl_.setConstraints (status_label_, gbc_);
 	      add (status_label_);
-	      
+
 	      gbc_.gridy++;
 	      weapons_table_.put (weapon, status_label_);
 	    }
diff --git a/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
index 654cee6b006..21322c09a05 100644
--- a/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
+++ b/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
@@ -1,26 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    DOVE_Supplier.cpp
-//
-// = DESCRIPTION
-//    A wrapper around the event service initialization and
-//    marshalling
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    DOVE_Supplier.cpp
+ *
+ *  $Id$
+ *
+ *  A wrapper around the event service initialization and
+ *  marshalling
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "DOVE_Supplier.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (Event_Supplier,
-           DOVE_Supplier,
-           "$Id$")
-
 // Static pointer member initialization for Singleton.
 
 ACE_Scheduler_Factory::POD_RT_Info *
diff --git a/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/examples/Simulator/Event_Supplier/DOVE_Supplier.h
index 4061b552e55..68730f98e1d 100644
--- a/examples/Simulator/Event_Supplier/DOVE_Supplier.h
+++ b/examples/Simulator/Event_Supplier/DOVE_Supplier.h
@@ -1,25 +1,24 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    DOVE_Supplier.h
-//
-// = DESCRIPTION
-//    A wrapper around the event service initialization and marshalling.
-//
-// = AUTHORS
-//    Michael Kircher (mk1@cs.wustl.edu)
-//    Chris Gill (cdgill@cs.wustl.edu)
-// ============================================================================
-
-#include "ace/OS.h"
+
+//=============================================================================
+/**
+ *  @file    DOVE_Supplier.h
+ *
+ *  $Id$
+ *
+ *  A wrapper around the event service initialization and marshalling.
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu) Chris Gill (cdgill@cs.wustl.edu)
+ */
+//=============================================================================
+
+
+#include "orbsvcs/RtecEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/RtecEventCommS.h"
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event_Service_Constants.h"
@@ -35,35 +34,35 @@ class DOVE_Supplier
 {
 public:
 
+  /// Constructor.
   DOVE_Supplier ();
-  // Constructor.
 
+  /// Destructor.
   ~DOVE_Supplier (void);
-  // Destructor.
 
+  /// Initialize the ORB and the connection to the Name Service
   int init (void);
-  // Initialize the ORB and the connection to the Name Service
 
+  /// Connect to the event service.
   int connect (const char * MIB_name = 0,
                const char* es_name = 0,
                const char * ss_name = 0,
                ACE_Scheduler_Factory::POD_RT_Info * pod_rt_info = 0);
-  // Connect to the event service.
 
+  /// Perform all post-connection-establishment processing.
   void connected ();
-  // Perform all post-connection-establishment processing.
 
+  /// Disconnect from the event service.
   void disconnect ();
-  // Disconnect from the event service.
 
+  /// Notify the consumer proxy that we have events
   void notify (CORBA::Any& message);
-  // Notify the consumer proxy that we have events
 
+  /// Use the next connection in the list of established connections.
   void use_next_connection ();
-  // Use the next connection in the list of established connections.
 
+  /// Use the previous connection in the list of established connections.
   void use_prev_connection ();
-  // Use the previous connection in the list of established connections.
 
 private:
 
@@ -101,17 +100,17 @@ private:
     ACE_Scheduler_Factory::POD_RT_Info pod_rt_info_;
   };
 
+  /// Get the event channel reference.
   int get_EventChannel ();
-  // Get the event channel reference.
 
+  /// Get the scheduler reference.
   int get_Scheduler ();
-  // Get the scheduler reference.
 
+  /// Connect the the supplier with the event channel.
   int connect_Supplier ();
-  // Connect the the supplier with the event channel.
 
+  /// Access the default rt_info singleton.
   static ACE_Scheduler_Factory::POD_RT_Info * pod_rt_info_instance ();
-  // Access the default rt_info singleton.
 
   static ACE_Scheduler_Factory::POD_RT_Info * pod_rt_info_instance_;
 
@@ -131,8 +130,8 @@ private:
 
   Internal_DOVE_Supplier* internal_DOVE_Supplier_ptr_;
 
+  /// Keep the name of the MIB around.
   const char * MIB_name_;
-  // Keep the name of the MIB around.
 };
 
 #endif /* DOVE_SUPPLIER_H */
diff --git a/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index f3c56dda24a..fcdf12bba92 100644
--- a/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -1,25 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    DualEC_Sup.cpp
-//
-// = DESCRIPTION
-//   Event Supplier for visualizing scheduling behavior, using arrival
-//   and dispatch data logged by an event channel dispatch command object
-//
-// = AUTHOR
-//    Chris Gill (cdgill@cs.wustl.edu)
-//
-//    Adapted from the DOVE simulation event supplier
-//    originally
-//    David Levine (levine@cs.wustl.edu) and
-//    Tim Harrison (harrison@cs.wustl.edu)
-//    modified
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    DualEC_Sup.cpp
+ *
+ *  $Id$
+ *
+ * Event Supplier for visualizing scheduling behavior, using arrival
+ * and dispatch data logged by an event channel dispatch command object
+ *
+ *
+ *  @author Chris Gill (cdgill@cs.wustl.edu) Adapted from the DOVE simulation event supplier originally David Levine (levine@cs.wustl.edu) and Tim Harrison (harrison@cs.wustl.edu) modified Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "DualEC_Sup.h"
 #include "NavWeapC.h"
@@ -37,10 +30,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
-
-ACE_RCSID (Event_Supplier,
-           DualEC_Sup,
-           "$Id$")
+#include "ace/OS_NS_ctype.h"
 
 //FUZZ: disable check_for_lack_ACE_OS
 static const char usage [] =
diff --git a/examples/Simulator/Event_Supplier/DualEC_Sup.h b/examples/Simulator/Event_Supplier/DualEC_Sup.h
index 0762d2b31f6..0cba4a31d20 100644
--- a/examples/Simulator/Event_Supplier/DualEC_Sup.h
+++ b/examples/Simulator/Event_Supplier/DualEC_Sup.h
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    DualEC_Sup.h
-//
-// = DESCRIPTION
-//   Event supplier for visualization of scheduling behavior, using
-//   arrival and dispatch data logged by an EC dispatch command object
-//
-// = AUTHOR
-//    Chris Gill (cdgill@cs.wustl.edu)
-//
-//    Adapted from the orginal DOVE simulation event supplier written by
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    DualEC_Sup.h
+ *
+ *  $Id$
+ *
+ * Event supplier for visualization of scheduling behavior, using
+ * arrival and dispatch data logged by an EC dispatch command object
+ *
+ *
+ *  @author Chris Gill (cdgill@cs.wustl.edu) Adapted from the orginal DOVE simulation event supplier written by Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef DUALEC_SUP_H
 #define DUALEC_SUP_H
@@ -43,66 +40,71 @@ struct Schedule_Viewer_Data
 };
 
 
+/**
+ * @class DualEC_Supplier
+ *
+ * @brief Event Supplier.
+ *
+ * Reads information out of a file and
+ * feeds it with additional navigation and
+ * weapon data into the dove_supplier, which
+ * is connected to the event channel
+ */
 class DualEC_Supplier
 {
-  // = TITLE
-  //    Event Supplier.
-  //
-  // = DESCRIPTION
-  //    Reads information out of a file and
-  //    feeds it with additional navigation and
-  //    weapon data into the dove_supplier, which
-  //    is connected to the event channel
 public:
 
   DualEC_Supplier (int argc, ACE_TCHAR** argv);
 
   ~DualEC_Supplier (void);
 
+  /// Initialize: set up, resolve ORB services,
+  /// connect the DOVE_Suppliers.
   int init (void);
-  // Initialize: set up, resolve ORB services,
-  // connect the DOVE_Suppliers.
 
+  /// Compute schedule priorities, possibly dump
+  /// data into runtime scheduler header files.
   void compute_schedules (void);
-  // Compute schedule priorities, possibly dump
-  // data into runtime scheduler header files.
 
+  /// here is really something going on,
+  /// here we deliver the messages
   void start_generating_events (void);
-  // here is really something going on,
-  // here we deliver the messages
 
+  /// Load the scheduling information into memory
   void load_schedule_data ();
-  // Load the scheduling information into memory
 
 
 private:
 
+/**
+ * @class Terminator
+ *
+ * Private class that implements a termination servant.
+ */
   class Terminator : public POA_NavWeapTerminator
-    // = DESCRIPTION
-    // Private class that implements a termination servant.
   {
     void shutdown (void);
   };
 
+  /// Run the orb event loop.
   static ACE_THR_FUNC_RETURN run_orb (void *);
-  // Run the orb event loop.
 
+  /// Run navigation event generation thread.
   static ACE_THR_FUNC_RETURN run_nav_thread (void *arg);
-  // Run navigation event generation thread.
 
+  /// Run weapons event generation thread.
   static ACE_THR_FUNC_RETURN run_weap_thread (void *arg);
-  // Run weapons event generation thread.
 
+  /// Create two scheduling service instances, registers
+  /// them with the Naming Service.
   int create_schedulers (void);
-  // Create two scheduling service instances, registers
-  // them with the Naming Service.
 
+  /// Create two event service instances, registers
+  /// them with the Naming Service.
   int create_event_channels (void);
-  // Create two event service instances, registers
-  // them with the Naming Service.
 
+  /// Get command line options.
   unsigned int get_options (int argc, ACE_TCHAR *argv []);
-  // Get command line options.
 
   // Time values to pause before notifying the supplier each time.
   ACE_Time_Value nav_pause_;
diff --git a/examples/Simulator/Event_Supplier/Event_Con.cpp b/examples/Simulator/Event_Supplier/Event_Con.cpp
index 0af9a89d627..9bf83416e8d 100644
--- a/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -1,26 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Event_Con.cpp
-//
-// = DESCRIPTION
-//   This demo just tests the basic functionality of the Event Service
-//   One Conumer which inherits from the Rtec Consumer.  One Supplier
-//   with an internal Rtec Consumer and one internal Rtec Supplier.
-//   The internal Supplier is just a demo supplier because the
-//   architecture expects an supplier which has inherited from the
-//   Rtec Supplier.
-//
-// = AUTHOR
-//    originally
-//    David Levine (levine@cs.wustl.edu) and
-//    Tim Harrison (harrison@cs.wustl.edu)
-//    modified
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Event_Con.cpp
+ *
+ *  $Id$
+ *
+ * This demo just tests the basic functionality of the Event Service
+ * One Conumer which inherits from the Rtec Consumer.  One Supplier
+ * with an internal Rtec Consumer and one internal Rtec Supplier.
+ * The internal Supplier is just a demo supplier because the
+ * architecture expects an supplier which has inherited from the
+ * Rtec Supplier.
+ *
+ *
+ *  @author originally David Levine (levine@cs.wustl.edu) and Tim Harrison (harrison@cs.wustl.edu) modified Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "Event_Con.h"
 #include "NavWeapC.h"
@@ -38,8 +34,6 @@
 
 #include "ace/os_include/os_limits.h"
 
-ACE_RCSID(Event_Supplier, Event_Con, "$Id$")
-
 static const char usage [] =
 "[-? |\n"
 "            [-c <consumers> [4]]\n"
diff --git a/examples/Simulator/Event_Supplier/Event_Con.h b/examples/Simulator/Event_Supplier/Event_Con.h
index 89c2b4cd905..b89a1962a67 100644
--- a/examples/Simulator/Event_Supplier/Event_Con.h
+++ b/examples/Simulator/Event_Supplier/Event_Con.h
@@ -1,18 +1,14 @@
-// $Id$
 
-// ============================================================================
-//
-// = FILENAME
-//    Event_Con.h
-//
-// = AUTHOR
-//    originally
-//    David Levine (levine@cs.wustl.edu) and
-//    Tim Harrison (harrison@cs.wustl.edu)
-//    modified
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Event_Con.h
+ *
+ *  $Id$
+ *
+ *  @author originally David Levine (levine@cs.wustl.edu) and Tim Harrison (harrison@cs.wustl.edu) modified Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef EVENT_CON_H
 #define EVENT_CON_H
@@ -27,37 +23,43 @@
 #include "orbsvcs/RtecEventCommS.h"
 #include "orbsvcs/RtecSchedulerC.h"
 
+/**
+ * @class Demo_Consumer
+ *
+ * @brief Demo Consumer
+ *
+ * Simple example of a consumer that registers for supplier
+ * notifications.
+ */
 class Demo_Consumer : public POA_RtecEventComm::PushConsumer
 {
-  // = TITLE
-  //    Demo Consumer
-  //
-  // = DESCRIPTION
-  //    Simple example of a consumer that registers for supplier
-  //    notifications.
 public:
   Demo_Consumer (void);
 
+  /**
+   * Uses the name server to obtain a reference to the <supplier_name>
+   * and registers with channel to receive notifications from the
+   * supplier.  Also registers to receive shutdown messages from the
+   * supplier.  Stores <my_name> for printing out messages.  Returns 0
+   * on success, -1 on failure.
+   */
   int open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
                      const char *my_name);
-  // Uses the name server to obtain a reference to the <supplier_name>
-  // and registers with channel to receive notifications from the
-  // supplier.  Also registers to receive shutdown messages from the
-  // supplier.  Stores <my_name> for printing out messages.  Returns 0
-  // on success, -1 on failure.
 
+  /// The channel is disconnecting.
   virtual void disconnect_push_consumer (void);
-  // The channel is disconnecting.
 
   // = (not protected to allow short-circuiting) protected:
+  /**
+   * If the <events>[0] is a notification, prints out the data from
+   * the supplier.  If its a shutdown message, the consumer
+   * disconnects from the channel.
+   */
   virtual void push (const RtecEventComm::EventSet &events);
-  // If the <events>[0] is a notification, prints out the data from
-  // the supplier.  If its a shutdown message, the consumer
-  // disconnects from the channel.
 
 protected:
+  /// Disconnect from the Event Service.
   void shutdown (void);
-  // Disconnect from the Event Service.
 
   // = Event channel adminstration references.
   RtecEventChannelAdmin::EventChannel_var channel_admin_;
diff --git a/examples/Simulator/Event_Supplier/Event_Sup.cpp b/examples/Simulator/Event_Supplier/Event_Sup.cpp
index 3a796535c97..6eb162dc74d 100644
--- a/examples/Simulator/Event_Supplier/Event_Sup.cpp
+++ b/examples/Simulator/Event_Supplier/Event_Sup.cpp
@@ -1,21 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Event_Sup.cpp
-//
-// = DESCRIPTION
-//   Event Supplier for the flight simulator
-//
-// = AUTHOR
-//    originally
-//    David Levine (levine@cs.wustl.edu) and
-//    Tim Harrison (harrison@cs.wustl.edu)
-//    modified
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Event_Sup.cpp
+ *
+ *  $Id$
+ *
+ * Event Supplier for the flight simulator
+ *
+ *
+ *  @author originally David Levine (levine@cs.wustl.edu) and Tim Harrison (harrison@cs.wustl.edu) modified Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "Event_Sup.h"
 #include "NavWeapC.h"
@@ -32,12 +28,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
-
-#include "ace/os_include/os_ctype.h"
-
-ACE_RCSID (Event_Supplier,
-           Event_Sup,
-           "$Id$")
+#include "ace/OS_NS_ctype.h"
 
 static const char usage [] =
 "[[-?]\n"
diff --git a/examples/Simulator/Event_Supplier/Event_Sup.h b/examples/Simulator/Event_Supplier/Event_Sup.h
index 194bbbf4ab8..96a0e2a33ae 100644
--- a/examples/Simulator/Event_Supplier/Event_Sup.h
+++ b/examples/Simulator/Event_Supplier/Event_Sup.h
@@ -1,17 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Event_Sup.h
-//
-// = DESCRIPTION
-//   Event Supplier for the simulation
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Event_Sup.h
+ *
+ *  $Id$
+ *
+ * Event Supplier for the simulation
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef EVENT_SUP_H
 #define EVENT_SUP_H
@@ -32,37 +32,39 @@ struct Schedule_Viewer_Data
   u_long computation_time;
 };
 
+/**
+ * @class Event_Supplier
+ *
+ * @brief Event Supplier.
+ *
+ * Reads Scheduler information out of a file and
+ * feeds it with additional navigation and
+ * weapon data into the dove_supplier, which
+ * is connected to the event channel
+ */
 class Event_Supplier
 {
-  // = TITLE
-  //    Event Supplier.
-  //
-  // = DESCRIPTION
-  //    Reads Scheduler information out of a file and
-  //    feeds it with additional navigation and
-  //    weapon data into the dove_supplier, which
-  //    is connected to the event channel
 public:
 
   Event_Supplier (int argc, ACE_TCHAR** argv);
 
   ~Event_Supplier (void);
 
+  /// connect the DOVE_Supplier
   int init (void);
-  // connect the DOVE_Supplier
 
+  /// here is really something going on,
+  /// here we deliver the messages
   void start_generating_events (void);
-  // here is really something going on,
-  // here we deliver the messages
 
+  /// Load the scheduling information into memory
   void load_schedule_data (ACE_Unbounded_Queue<Schedule_Viewer_Data *> &schedule_data);
-  // Load the scheduling information into memory
 
 
 private:
+  /// just a helper to put all the information into the CORBA::Any
   void insert_event_data (CORBA::Any &data,
                           ACE_Unbounded_Queue_Iterator<Schedule_Viewer_Data *> &schedule_iter);
-  // just a helper to put all the information into the CORBA::Any
 
   unsigned int get_options (int argc, ACE_TCHAR *argv []);
 
diff --git a/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index 5b897b8638d..72901acca3e 100644
--- a/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -1,25 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Logging_Sup.cpp
-//
-// = DESCRIPTION
-//   Event Supplier for visualizing scheduling behavior, using arrival
-//   and dispatch data logged by an event channel dispatch command object
-//
-// = AUTHOR
-//    Chris Gill (cdgill@cs.wustl.edu)
-//
-//    Adapted from the DOVE simulation event supplier
-//    originally
-//    David Levine (levine@cs.wustl.edu) and
-//    Tim Harrison (harrison@cs.wustl.edu)
-//    modified
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Logging_Sup.cpp
+ *
+ *  $Id$
+ *
+ * Event Supplier for visualizing scheduling behavior, using arrival
+ * and dispatch data logged by an event channel dispatch command object
+ *
+ *
+ *  @author Chris Gill (cdgill@cs.wustl.edu) Adapted from the DOVE simulation event supplier originally David Levine (levine@cs.wustl.edu) and Tim Harrison (harrison@cs.wustl.edu) modified Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "Logging_Sup.h"
 #include "NavWeapC.h"
@@ -36,12 +29,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
-
-#include "ace/os_include/os_ctype.h"
-
-ACE_RCSID (Event_Supplier,
-           Logging_Sup,
-           "$Id$")
+#include "ace/OS_NS_ctype.h"
 
 #if defined (ACE_OPENVMS)
 // need this to circumvent link error on OpenVMS
diff --git a/examples/Simulator/Event_Supplier/Logging_Sup.h b/examples/Simulator/Event_Supplier/Logging_Sup.h
index 208be88cde7..0443c94324b 100644
--- a/examples/Simulator/Event_Supplier/Logging_Sup.h
+++ b/examples/Simulator/Event_Supplier/Logging_Sup.h
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Logging_Sup.h
-//
-// = DESCRIPTION
-//   Event supplier for visualization of scheduling behavior, using
-//   arrival and dispatch data logged by an EC dispatch command object
-//
-// = AUTHOR
-//    Chris Gill (cdgill@cs.wustl.edu)
-//
-//    Adapted from the orginal DOVE simulation event supplier written by
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Logging_Sup.h
+ *
+ *  $Id$
+ *
+ * Event supplier for visualization of scheduling behavior, using
+ * arrival and dispatch data logged by an EC dispatch command object
+ *
+ *
+ *  @author Chris Gill (cdgill@cs.wustl.edu) Adapted from the orginal DOVE simulation event supplier written by Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef LOGGING_SUP_H
 #define LOGGING_SUP_H
@@ -36,37 +33,39 @@ struct Schedule_Viewer_Data
   u_long computation_time;
 };
 
+/**
+ * @class Logging_Supplier
+ *
+ * @brief Event Supplier.
+ *
+ * Reads Scheduler information out of a file and
+ * feeds it with additional navigation and
+ * weapon data into the dove_supplier, which
+ * is connected to the event channel
+ */
 class Logging_Supplier
 {
-  // = TITLE
-  //    Event Supplier.
-  //
-  // = DESCRIPTION
-  //    Reads Scheduler information out of a file and
-  //    feeds it with additional navigation and
-  //    weapon data into the dove_supplier, which
-  //    is connected to the event channel
 public:
 
   Logging_Supplier (int argc, ACE_TCHAR** argv);
 
   ~Logging_Supplier (void);
 
+  /// connect the DOVE_Supplier
   int init (void);
-  // connect the DOVE_Supplier
 
+  /// here is really something going on,
+  /// here we deliver the messages
   void start_generating_events (void);
-  // here is really something going on,
-  // here we deliver the messages
 
+  /// Load the scheduling information into memory
   void load_schedule_data (ACE_Unbounded_Queue<Schedule_Viewer_Data *> &schedule_data);
-  // Load the scheduling information into memory
 
 
 private:
+  /// just a helper to put all the information into the CORBA::Any
   void insert_event_data (CORBA::Any &data,
                           ACE_Unbounded_Queue_Iterator<Schedule_Viewer_Data *> &schedule_iter);
-  // just a helper to put all the information into the CORBA::Any
 
   unsigned int get_options (int argc, ACE_TCHAR *argv []);
 
diff --git a/examples/Simulator/Event_Supplier/Makefile.am b/examples/Simulator/Event_Supplier/Makefile.am
deleted file mode 100644
index 2341a58e12d..00000000000
--- a/examples/Simulator/Event_Supplier/Makefile.am
+++ /dev/null
@@ -1,225 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Event_Supplier_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  ./NavWeapC.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.cpp \
-  ./NavWeapS.h \
-  ./NavWeapS.inl
-
-CLEANFILES = \
-  ./NavWeap-stamp \
-  ./NavWeapC.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.cpp \
-  ./NavWeapS.h \
-  ./NavWeapS.inl
-
-./NavWeapC.cpp ./NavWeapC.h ./NavWeapC.inl ./NavWeapS.cpp ./NavWeapS.h ./NavWeapS.inl: ./NavWeap-stamp
-
-./NavWeap-stamp: $(srcdir)/../NavWeap.idl $(TAO_IDL_DEP)
-	mkdir -p .
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/../NavWeap.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ../NavWeap.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Event_Supplier_DualEC_Sup.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += DualEC_Sup
-
-DualEC_Sup_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-DualEC_Sup_SOURCES = \
-  DOVE_Supplier.cpp \
-  DualEC_Sup.cpp \
-  NavWeapC.cpp \
-  NavWeapS.cpp \
-  DOVE_Supplier.h \
-  DualEC_Sup.h
-
-DualEC_Sup_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Supplier_Event_Con.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Event_Con
-
-Event_Con_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Event_Con_SOURCES = \
-  Event_Con.cpp \
-  NavWeapC.cpp \
-  Event_Con.h
-
-Event_Con_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Supplier_Event_Sup.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Event_Sup
-
-Event_Sup_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Event_Sup_SOURCES = \
-  DOVE_Supplier.cpp \
-  Event_Sup.cpp \
-  NavWeapC.cpp \
-  DOVE_Supplier.h \
-  Event_Sup.h
-
-Event_Sup_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Supplier_Logging_Sup.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Logging_Sup
-
-Logging_Sup_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Logging_Sup_SOURCES = \
-  DOVE_Supplier.cpp \
-  Logging_Sup.cpp \
-  NavWeapC.cpp \
-  DOVE_Supplier.h \
-  Logging_Sup.h
-
-Logging_Sup_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/examples/Simulator/Makefile.am b/examples/Simulator/Makefile.am
deleted file mode 100644
index d6c8532d025..00000000000
--- a/examples/Simulator/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Event_Supplier
-
diff --git a/examples/Simulator/Persian.idl b/examples/Simulator/Persian.idl
index 014dcbb9d4b..cca3dfb14d8 100644
--- a/examples/Simulator/Persian.idl
+++ b/examples/Simulator/Persian.idl
@@ -2,7 +2,7 @@
 
 // ===========================================================================
 //
-// = FILE  
+// = FILE
 //     Persian.idl
 //
 // = DESCRIPTION
@@ -56,7 +56,7 @@ module PersianRecursion
       // = DESCRIPTION
       // This interface specifies a single operation, used
       // to shut down the orb.  This allows the orb to
-      // be shut down cleanly, from within a synchronously 
+      // be shut down cleanly, from within a synchronously
       // servant dispatched servant, but with the request
       // originating from another thread.
   {
diff --git a/examples/TypeCode_Creation/Makefile.am b/examples/TypeCode_Creation/Makefile.am
deleted file mode 100644
index 583d75e97a1..00000000000
--- a/examples/TypeCode_Creation/Makefile.am
+++ /dev/null
@@ -1,76 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.TypeCode_Creation_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = create_tc
-
-create_tc_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-create_tc_SOURCES = \
-  main.cpp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-create_tc_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/examples/TypeCode_Creation/main.cpp b/examples/TypeCode_Creation/main.cpp
index d89a688bec2..93e39c2ac0c 100644
--- a/examples/TypeCode_Creation/main.cpp
+++ b/examples/TypeCode_Creation/main.cpp
@@ -4,7 +4,7 @@
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
 
-ACE_RCSID(TypeCode_Creation, main, "$Id$")
+
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
diff --git a/examples/TypeCode_Creation/test.idl b/examples/TypeCode_Creation/test.idl
index e8fda6b204f..7044da2097c 100644
--- a/examples/TypeCode_Creation/test.idl
+++ b/examples/TypeCode_Creation/test.idl
@@ -1,10 +1,12 @@
-// $Id$
-//===============================================================================
-//
-// = FILENAME
-//     test.idl
-//
-//==================================================================================
+//=============================================================================
+/**
+ *  @file     test.idl
+ *
+ *  $Id$
+ *
+ */
+//=============================================================================
+
 
 // IDL
 
diff --git a/examples/ior_corbaloc/Makefile.am b/examples/ior_corbaloc/Makefile.am
deleted file mode 100644
index 2110045a06b..00000000000
--- a/examples/ior_corbaloc/Makefile.am
+++ /dev/null
@@ -1,137 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.ior_corbaloc_IDL.am
-
-BUILT_SOURCES = \
-  corbalocC.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.cpp \
-  corbalocS.h \
-  corbalocS.inl
-
-CLEANFILES = \
-  corbaloc-stamp \
-  corbalocC.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.cpp \
-  corbalocS.h \
-  corbalocS.inl
-
-corbalocC.cpp corbalocC.h corbalocC.inl corbalocS.cpp corbalocS.h corbalocS.inl: corbaloc-stamp
-
-corbaloc-stamp: $(srcdir)/corbaloc.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/corbaloc.idl
-	@touch $@
-
-noinst_HEADERS = \
-  corbaloc.idl
-
-## Makefile.ior_corbaloc_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  corbalocC.cpp \
-  ior_corbaloc_client_i.cpp \
-  ior_corbaloc_client_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.ior_corbaloc_corbaname_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += corbaname_client
-
-corbaname_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-corbaname_client_SOURCES = \
-  corbalocC.cpp \
-  corbaname_client.cpp \
-  ior_corbaloc_client_i.h \
-  status_i.h
-
-corbaname_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.ior_corbaloc_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  corbalocC.cpp \
-  corbalocS.cpp \
-  server.cpp \
-  status_i.cpp \
-  status_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/examples/ior_corbaloc/client.cpp b/examples/ior_corbaloc/client.cpp
index 828c18a5efe..95cb1c92879 100644
--- a/examples/ior_corbaloc/client.cpp
+++ b/examples/ior_corbaloc/client.cpp
@@ -1,21 +1,18 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/ior_corbaloc/
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//     This implements a simple CORBA client for the
-//     corbaloc: style IOR parser
-//
-// = AUTHOR
-//     Priyanka Gontla <pgontla@ece.uci.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *   This implements a simple CORBA client for the
+ *   corbaloc: style IOR parser
+ *
+ *
+ *  @author  Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #include "ior_corbaloc_client_i.h"
 
diff --git a/examples/ior_corbaloc/corbaloc.idl b/examples/ior_corbaloc/corbaloc.idl
index 296ae9adde0..968fb66e80e 100644
--- a/examples/ior_corbaloc/corbaloc.idl
+++ b/examples/ior_corbaloc/corbaloc.idl
@@ -2,20 +2,20 @@
 
 module corbaloc
 {
-  
+
   interface Status
   {
     // = TITLE
-    //     A simple interface to check the status of 
+    //     A simple interface to check the status of
     //     connection between the client and the server.
     //
     // = DESCRIPTION
     //     Prints out the status.
 
     boolean print_status ();
-    // Return <true == 0> if the server received the 
+    // Return <true == 0> if the server received the
     // request from the client.
-        
+
   };
 };
 
diff --git a/examples/ior_corbaloc/ior_corbaloc_client_i.cpp b/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
index 4211452cc13..61d9191b29a 100644
--- a/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
+++ b/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
@@ -1,22 +1,19 @@
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/tests/ior_corbaloc/
-//
-// = FILENAME
-//    ior_corbaloc_client_i.cpp
-//
-// = DESCRIPTION
-//    This example implements a simple client which sends a corbaloc:
-//    style url to the server and gets a response from the
-//    server to indicate that the server has received the request.
-//
-// = AUTHORS
-//    Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//============================================================
+
+//=============================================================================
+/**
+ *  @file    ior_corbaloc_client_i.cpp
+ *
+ *  $Id$
+ *
+ *  This example implements a simple client which sends a corbaloc:
+ *  style url to the server and gets a response from the
+ *  server to indicate that the server has received the request.
+ *
+ *
+ *  @author Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #include "ior_corbaloc_client_i.h"
 #include "ace/Get_Opt.h"
diff --git a/examples/ior_corbaloc/ior_corbaloc_client_i.h b/examples/ior_corbaloc/ior_corbaloc_client_i.h
index a4488b08a31..b58827ad65b 100644
--- a/examples/ior_corbaloc/ior_corbaloc_client_i.h
+++ b/examples/ior_corbaloc/ior_corbaloc_client_i.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/tests/ior_corbaloc/
-//
-// = FILENAME
-//    ior_corbaloc_client_i.h
-//
-// = DESCRIPTION
-//    This class implements a simple client which sends a corbaloc:
-//    style url to the server and gets a response from the
-//    server to indicate that the server has received the request.
-//
-// = AUTHORS
-//    Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//============================================================
+
+//=============================================================================
+/**
+ *  @file    ior_corbaloc_client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements a simple client which sends a corbaloc:
+ *  style url to the server and gets a response from the
+ *  server to indicate that the server has received the request.
+ *
+ *
+ *  @author Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #if !defined (IOR_CORBALOC_CLIENT_I_H)
 #define IOR_CORBALOC_CLIENT_I_H
@@ -27,24 +24,25 @@
 
 #include "ace/SString.h"
 
+/**
+ * @class IOR_corbaloc_Client_i
+ *
+ * @brief NContextExt Client Implementation
+ *
+ */
 class IOR_corbaloc_Client_i
 {
-  // = TITLE
-  //     NContextExt Client Implementation
-  //
-  // = DESCRIPTION
-  //
 
  public:
   // = Constructor and destructor.
   IOR_corbaloc_Client_i (void);
   ~IOR_corbaloc_Client_i (void);
 
+  /// Execute the client example code.
   int run (void);
-  // Execute the client example code.
 
+  /// Initialize the client communication endpoint with the server.
   int init (int& argc, ACE_TCHAR *argv[]);
-  // Initialize the client communication endpoint with the server.
 
  private:
   /// corbaloc url to test
diff --git a/examples/ior_corbaloc/run_test.pl b/examples/ior_corbaloc/run_test.pl
index d2418fa918b..e3c0eb60e29 100755
--- a/examples/ior_corbaloc/run_test.pl
+++ b/examples/ior_corbaloc/run_test.pl
@@ -27,7 +27,7 @@ my @servers = (
 my @iorbases = ("ns1.ior", "ns2.ior", "ns2.ior");
 my @SV_NAMES = ("STATUS", "STATUS1", "STATUS");
 
-# We run two Naming_Service processes.  One on an arbitrary port,
+# We run two tao_cosnaming processes.  One on an arbitrary port,
 # and one on the corbaloc: default port of 2809
 my @nstargets = (
     (PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"),
@@ -56,7 +56,7 @@ for ($i = 0; $i <= $#nstargets; $i++) {
     }
 
     my $NS = $nstargets[$i]->CreateProcess (
-        "../../orbsvcs/Naming_Service/Naming_Service",
+        "../../orbsvcs/Naming_Service/tao_cosnaming",
         "-ORBListenEndpoints iiop://$TARGETHOSTNAME:$ns_orb_ports[$i] ".
         "-o $ns_iorfile -m 0");
 
diff --git a/examples/mfc/MainFrm.cpp b/examples/mfc/MainFrm.cpp
index 180a783ad6e..2e4f4e1db01 100644
--- a/examples/mfc/MainFrm.cpp
+++ b/examples/mfc/MainFrm.cpp
@@ -61,7 +61,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
     return -1;      // fail to create
   }
 
-  if (!m_wndStatusBar.Create(this) || 
+  if (!m_wndStatusBar.Create(this) ||
       !m_wndStatusBar.SetIndicators(indicators,
                                     sizeof(indicators)/sizeof(UINT)))
   {
diff --git a/examples/mfc/Makefile.am b/examples/mfc/Makefile.am
deleted file mode 100644
index dd0705cd39c..00000000000
--- a/examples/mfc/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.MFC_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  w32_testC.cpp \
-  w32_testC.h \
-  w32_testC.inl \
-  w32_testS.h \
-  w32_testS.inl
-
-CLEANFILES = \
-  w32_test-stamp \
-  w32_testC.cpp \
-  w32_testC.h \
-  w32_testC.inl \
-  w32_testS.h \
-  w32_testS.inl
-
-w32_testC.cpp w32_testC.h w32_testC.inl w32_testS.h w32_testS.inl: w32_test-stamp
-
-w32_test-stamp: $(srcdir)/w32_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,pch_include=StdAfx.h $(srcdir)/w32_test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  w32_testC.cpp \
-  w32_testC.h \
-  w32_testC.inl \
-  w32_testS.h \
-  w32_testS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/examples/mfc/Resource.h b/examples/mfc/Resource.h
index 6d26d3724b4..d0cff0d6290 100644
--- a/examples/mfc/Resource.h
+++ b/examples/mfc/Resource.h
@@ -9,7 +9,7 @@
 #define IDR_SERVERTYPE 129
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS 1
diff --git a/examples/mfc/w32_test_impl.cpp b/examples/mfc/w32_test_impl.cpp
index f9a745539f5..0deb96a2837 100644
--- a/examples/mfc/w32_test_impl.cpp
+++ b/examples/mfc/w32_test_impl.cpp
@@ -24,10 +24,10 @@ W32_Test_Impl::getresponse (CORBA::Long respnr)
     case 1:
       myreturn = CORBA::string_dup ("Parameter 1");
       break;
-    case 2: 
+    case 2:
       myreturn = CORBA::string_dup ("Parameter 2");
       break;
-    default: 
+    default:
       myreturn = CORBA::string_dup ("Parameter unknown!");
       break;
     }
diff --git a/interop-tests/Makefile.am b/interop-tests/Makefile.am
deleted file mode 100644
index ad94502f7dd..00000000000
--- a/interop-tests/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        wchar
-
diff --git a/interop-tests/wchar/Makefile.am b/interop-tests/wchar/Makefile.am
deleted file mode 100644
index bf104387990..00000000000
--- a/interop-tests/wchar/Makefile.am
+++ /dev/null
@@ -1,113 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.interop_wchar_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  interop_wcharC.cpp \
-  interop_wcharC.h \
-  interop_wcharC.inl \
-  interop_wcharS.cpp \
-  interop_wcharS.h \
-  interop_wcharS.inl
-
-CLEANFILES = \
-  interop_wchar-stamp \
-  interop_wcharC.cpp \
-  interop_wcharC.h \
-  interop_wcharC.inl \
-  interop_wcharS.cpp \
-  interop_wcharS.h \
-  interop_wcharS.inl
-
-interop_wcharC.cpp interop_wcharC.h interop_wcharC.inl interop_wcharS.cpp interop_wcharS.h interop_wcharS.inl: interop_wchar-stamp
-
-interop_wchar-stamp: $(srcdir)/interop_wchar.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/interop_wchar.idl
-	@touch $@
-
-noinst_HEADERS = \
-  interop_wchar.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Interop_Wchar_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  interop_wcharC.cpp \
-  wchar_reference.cpp \
-  wchar_reference.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Interop_Wchar_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  interop_wcharC.cpp \
-  interop_wcharS.cpp \
-  interop_wchar_i.cpp \
-  server.cpp \
-  wchar_reference.cpp \
-  interop_wchar_i.h \
-  wchar_reference.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/interop-tests/wchar/WChar_PasserImpl.java b/interop-tests/wchar/WChar_PasserImpl.java
index ee3086bfa1b..497bb2a6c17 100644
--- a/interop-tests/wchar/WChar_PasserImpl.java
+++ b/interop-tests/wchar/WChar_PasserImpl.java
@@ -89,10 +89,10 @@ public class WChar_PasserImpl
                 System.out.println ("wstructseq_to_server FAILED entry " + i);
                 result = false;
             }
-        }            
+        }
         return result;
     }
-    
+
     public wstruct[] wstructseq_from_server (short key)
     {
         wstruct[] wsList = new wstruct[5];
@@ -174,10 +174,10 @@ public class WChar_PasserImpl
         result.st_array = ref.get_warray(key);
         result.st_any = orb.create_any();
         result.st_any.insert_wstring(ref.get_wstring(key));
-          
+
         return result;
     }
-      
+
     // TODO: this should have a home where it's accessable to both
     // client & server, but it doesn't belong in WCharReference
     public boolean match_wstruct (short key, wstruct test )
diff --git a/interop-tests/wchar/client.cpp b/interop-tests/wchar/client.cpp
index 1cadcf12b92..3adc484520f 100644
--- a/interop-tests/wchar/client.cpp
+++ b/interop-tests/wchar/client.cpp
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    interop_test/wchar
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//    C++ client side for testing interoperability with wchar data.
-//
-// = AUTHOR
-//    Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  C++ client side for testing interoperability with wchar data.
+ *
+ *
+ *  @author Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 
 #include "interop_wcharC.h"
 #include "wchar_reference.h"
@@ -290,7 +287,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
   if (tests_to_run == 0)
     tests_to_run = ALL_TESTS;
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/interop-tests/wchar/server.cpp b/interop-tests/wchar/server.cpp
index e0830b030b1..e2ddf9a5fc7 100644
--- a/interop-tests/wchar/server.cpp
+++ b/interop-tests/wchar/server.cpp
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    interop_test/wchar
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    C++ server side for testing interoperability with wchar data.
-//
-// = AUTHOR
-//    Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  C++ server side for testing interoperability with wchar data.
+ *
+ *
+ *  @author Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 #include "interop_wchar_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
@@ -52,7 +49,7 @@ parse_args (int argc, ACE_TCHAR* argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -79,7 +76,7 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
   try
     {
         // Initialize orb
-        CORBA::ORB_var orb = 
+        CORBA::ORB_var orb =
           CORBA::ORB_init( command_line.get_argc(),
                            command_line.get_ASCII_argv() );
         if (parse_args(command_line.get_argc(),
diff --git a/interop-tests/wchar/wchar_reference.cpp b/interop-tests/wchar/wchar_reference.cpp
index 0ca0384c81b..7a7031c904b 100644
--- a/interop-tests/wchar/wchar_reference.cpp
+++ b/interop-tests/wchar/wchar_reference.cpp
@@ -1,25 +1,23 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    interop_test/wchar
-//
-// = FILENAME
-//    wchar_reference.cpp
-//
-// = DESCRIPTION
-//    C++ reference data for testing interoperability with wchars. This is
-//    linked into both clients and servers so that both sides have common
-//    values for testing what is received or sent.
-//
-// = AUTHOR
-//    Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    wchar_reference.cpp
+ *
+ *  $Id$
+ *
+ *  C++ reference data for testing interoperability with wchars. This is
+ *  linked into both clients and servers so that both sides have common
+ *  values for testing what is received or sent.
+ *
+ *
+ *  @author Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 #include "wchar_reference.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_string.h"
 
 #if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
 
diff --git a/interop-tests/wchar/wchar_reference.h b/interop-tests/wchar/wchar_reference.h
index 735eb81563f..beac9b4ae32 100644
--- a/interop-tests/wchar/wchar_reference.h
+++ b/interop-tests/wchar/wchar_reference.h
@@ -1,30 +1,27 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    interop_test/wchar
-//
-// = FILENAME
-//    wchar_reference.cpp
-//
-// = DESCRIPTION
-//    C++ reference data for testing interoperability with wchars. This is
-//    linked into both clients and servers so that both sides have common
-//    values for testing what is received or sent.
-//
-// = AUTHOR
-//    Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    wchar_reference.h
+ *
+ *  $Id$
+ *
+ *  C++ reference data for testing interoperability with wchars. This is
+ *  linked into both clients and servers so that both sides have common
+ *  values for testing what is received or sent.
+ *
+ *
+ *  @author Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef WCHAR_REFERENCE_H
 #define WCHAR_REFERENCE_H
 
-#include "ace/OS.h"
-
 #define NUM_KEYS 1
 
+#include "ace/OS_NS_wchar.h"
+
 class wchar_reference
 {
  public:
diff --git a/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
index 7b30c150c27..141f5e2f51b 100644
--- a/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
+++ b/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
@@ -23,10 +23,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Concurrency_Service,
-          Concurrency_Service,
-          "$Id$")
-
 // Default Constructor.
 
 Concurrency_Service::Concurrency_Service (void)
@@ -81,7 +77,7 @@ Concurrency_Service::parse_args (int argc, ACE_TCHAR** argv)
                            argv[0]),
                            1);
       }
-  // Indicates sucessfull persing of command line.
+  // Indicates successful persing of command line.
   return 0;
 }
 
diff --git a/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
index 15422d03093..06bbc518488 100644
--- a/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
+++ b/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
@@ -2,5 +2,5 @@
 // $Id$
 
 project : orbsvcsexe, install, concurrency_serv, naming, utils, svc_utils {
-  exename  = Concurrency_Service
+  exename  = tao_cosconcurrency
 }
diff --git a/orbsvcs/Concurrency_Service/Makefile.am b/orbsvcs/Concurrency_Service/Makefile.am
deleted file mode 100644
index 76f7a223b12..00000000000
--- a/orbsvcs/Concurrency_Service/Makefile.am
+++ /dev/null
@@ -1,57 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Concurrency_Service.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS = Concurrency_Service
-
-Concurrency_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Concurrency_Service_SOURCES = \
-  Concurrency_Service.cpp \
-  Concurrency_Service.h
-
-Concurrency_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/Concurrency_Service/svc.conf b/orbsvcs/Concurrency_Service/svc.conf
index 2071e54859c..e7d239f39b0 100644
--- a/orbsvcs/Concurrency_Service/svc.conf
+++ b/orbsvcs/Concurrency_Service/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # This service must use a thread-per-connection model to enable the
 # server to block in a dedicated thread, i.e., one for each client.
 # The concurrency service will not run in the reactive model.
diff --git a/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index a9083012a71..95c22c1a3c9 100644
--- a/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -9,10 +9,6 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_main.h"
 
-ACE_RCSID (CosEvent_Service,
-           CosEvent_Service,
-           "$Id$")
-
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
diff --git a/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
index 89d4a75f8a0..3ddfdb0866b 100644
--- a/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
+++ b/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
@@ -2,5 +2,5 @@
 // $Id$
 
 project : orbsvcsexe, install, naming, event_serv, svc_utils, iortable, messaging_optional, portableserver {
-  exename  = CosEvent_Service
+  exename  = tao_cosevent
 }
diff --git a/orbsvcs/CosEvent_Service/Makefile.am b/orbsvcs/CosEvent_Service/Makefile.am
deleted file mode 100644
index 6737aa7475b..00000000000
--- a/orbsvcs/CosEvent_Service/Makefile.am
+++ /dev/null
@@ -1,63 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CosEvent_Service.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS = CosEvent_Service
-
-CosEvent_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-CosEvent_Service_SOURCES = \
-  CosEvent_Service.cpp
-
-CosEvent_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl b/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl
index 42b003b39c0..17957bfe789 100755
--- a/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl
+++ b/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl
@@ -37,11 +37,11 @@ $es->DeleteFile ($esiorfile);
 
 $sleeptime = 10;
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, "-ORBdebuglevel $debug_level -ORBListenEndpoints iiop://:2809 ".
                                         " -o $ns_nsiorfile");
 
-$EventService = "$ENV{TAO_ROOT}/orbsvcs/CosEvent_Service/CosEvent_Service";
+$EventService = "$ENV{TAO_ROOT}/orbsvcs/CosEvent_Service/tao_cosevent";
 $ES = $es->CreateProcess ($EventService, " -o $es_esiorfile ".
                                         "-ORBInitRef NameService=file://$es_nsiorfile");
 $S = $ns->CreateProcess ("EchoEventSupplier", "-ORBInitRef NameService=file://$s_nsiorfile");
@@ -100,7 +100,7 @@ if ($es->WaitForFileTimed ($esiorfile,$es->ProcessStartWaitInterval()) == -1) {
     exit 1;
 }
 
-# start EchoEventSupplier  
+# start EchoEventSupplier
 $S_status = $S->Spawn ();
 
 if ($S_status != 0) {
@@ -108,7 +108,7 @@ if ($S_status != 0) {
     exit 1;
 }
 
-# start EchoEventConsumer  
+# start EchoEventConsumer
 $C_status = $C->Spawn ();
 
 if ($C_status != 0) {
diff --git a/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl b/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl
index d58b9480936..83f43c9c74a 100755
--- a/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl
+++ b/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl
@@ -30,7 +30,7 @@ $ns->DeleteFile ($iorfile);
 $s->DeleteFile ($iorfile);
 $c->DeleteFile ($iorfile);
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, "-ORBdebuglevel $debug_level ".
                                         " -o $ns_iorfile");
 $S = $ns->CreateProcess ("EchoEventSupplier", "-ORBInitRef NameService=file://$s_iorfile");
@@ -67,7 +67,7 @@ if ($c->PutFile ($iorfile) == -1) {
 }
 
 
-# start EchoEventSupplier  
+# start EchoEventSupplier
 $S_status = $S->Spawn ();
 
 if ($S_status != 0) {
@@ -75,7 +75,7 @@ if ($S_status != 0) {
     exit 1;
 }
 
-# start EchoEventConsumer  
+# start EchoEventConsumer
 $C_status = $C->Spawn ();
 
 if ($C_status != 0) {
diff --git a/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc b/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc
index 72a8d1e8b9f..3cda5041e65 100644
--- a/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc
+++ b/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc
@@ -12,6 +12,7 @@ project(*Supplier): namingexe, event_skel {
 project(*Consumer): namingexe, event_skel {
   exename   = Consumer
   includes += ../common
+  after    += *Supplier
 
   Source_Files {
     ConsumerMain.cpp
diff --git a/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl b/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl
index 48885aed884..348f4b9c60d 100755
--- a/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl
+++ b/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl
@@ -49,15 +49,15 @@ $c->DeleteFile ($nsiorfile);
 $s->DeleteFile ($nsiorfile);
 
 
-$IFRService = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/IFR_Service";
+$IFRService = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service";
 $IF = $ifr->CreateProcess ($IFRService,  "-ORBdebuglevel $debug_level ".
                                          "-o $ifr_ifriorfile");
 $TAO_IFR = "$ENV{ACE_ROOT}/bin/tao_ifr";
 $TI = $ti->CreateProcess ($TAO_IFR, "-ORBInitRef InterfaceRepository=file://$ti_ifriorfile ".
-                                    "$idlfile");     
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+                                    "$idlfile");
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile");
-$EventService = "$ENV{TAO_ROOT}/orbsvcs/CosEvent_Service/CosEvent_Service";
+$EventService = "$ENV{TAO_ROOT}/orbsvcs/CosEvent_Service/tao_cosevent";
 $ES = $es->CreateProcess ($EventService, " -t -o $es_esiorfile ".
                                         "-ORBInitRef NameService=file://$es_nsiorfile ".
                                         "-ORBInitRef InterfaceRepository=file://$es_ifriorfile ");
diff --git a/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl b/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl
index fb32874d788..60100101b6e 100755
--- a/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl
+++ b/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl
@@ -35,10 +35,10 @@ $s->DeleteFile ($nsiorfile);
 $c->DeleteFile ($nsiorfile);
 $es->DeleteFile ($esiorfile);
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, "-ORBdebuglevel $debug_level ".
                                         " -o $ns_nsiorfile");
-$EventService = "$ENV{TAO_ROOT}/orbsvcs/Event_Service/Event_Service";
+$EventService = "$ENV{TAO_ROOT}/orbsvcs/Event_Service/tao_rtevent";
 $ES = $es->CreateProcess ($EventService, " -o $es_esiorfile ".
                                         "-ORBInitRef NameService=file://$es_nsiorfile");
 $S = $ns->CreateProcess ("EchoEventSupplier", "-ORBInitRef NameService=file://$s_nsiorfile");
@@ -94,7 +94,7 @@ if ($es->WaitForFileTimed ($esiorfile,$es->ProcessStartWaitInterval()) == -1) {
     exit 1;
 }
 
-# start EchoEventSupplier  
+# start EchoEventSupplier
 $S_status = $S->Spawn ();
 
 if ($S_status != 0) {
@@ -102,7 +102,7 @@ if ($S_status != 0) {
     exit 1;
 }
 
-# start EchoEventConsumer  
+# start EchoEventConsumer
 $C_status = $C->Spawn ();
 
 if ($C_status != 0) {
diff --git a/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl b/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl
index 8dd897e8579..fdf34dc863d 100755
--- a/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl
+++ b/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl
@@ -30,7 +30,7 @@ if ( -e "supplier.conf" ) {
    $supplier_conf_file = "supplier.conf";
 }
 else{
-   $supplier_conf_file = "../supplier.conf";   
+   $supplier_conf_file = "../supplier.conf";
 }
 
 my $ns_nsiorfile = $ns->LocalFile ($nsiorfile);
@@ -48,7 +48,7 @@ $s2->DeleteFile ($nsiorfile);
 $c1->DeleteFile ($nsiorfile);
 $c2->DeleteFile ($nsiorfile);
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, "-ORBdebuglevel $debug_level ".
                                         " -o $ns_nsiorfile");
 $args1 = "-ORBSvcConf $supplier_conf_file -ecname ec1 -gateway ec2";
@@ -107,7 +107,7 @@ if ($c2->PutFile ($nsiorfile) == -1) {
     exit 1;
 }
 
-# start Supplier  
+# start Supplier
 $S1_status = $S1->Spawn ();
 
 if ($S1_status != 0) {
diff --git a/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/supplier.conf b/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/supplier.conf
index 87ebf02489e..0440d1ec2f6 100644
--- a/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/supplier.conf
+++ b/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/supplier.conf
@@ -1,4 +1,5 @@
-# $Id
+# $Id$
+
 # Use 5 dispatching threads and the rw wait strategy to resolve deadlock
 # issues in the gateway at disconnect time.
 static Resource_Factory "-ORBFlushingStrategy blocking"
diff --git a/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/ec.conf b/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/ec.conf
index 0d41159fbd9..96134eb5894 100644
--- a/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/ec.conf
+++ b/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/ec.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECFiltering prefix"
diff --git a/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl b/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl
index 62a7da11bbc..dc481106644 100755
--- a/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl
+++ b/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl
@@ -35,10 +35,10 @@ $s->DeleteFile ($nsiorfile);
 $c->DeleteFile ($nsiorfile);
 $es->DeleteFile ($esiorfile);
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, "-ORBdebuglevel $debug_level ".
                                         " -o $ns_nsiorfile");
-$EventService = "$ENV{TAO_ROOT}/orbsvcs/Event_Service/Event_Service";
+$EventService = "$ENV{TAO_ROOT}/orbsvcs/Event_Service/tao_rtevent";
 $ES = $es->CreateProcess ($EventService, "-ORBdebuglevel $debug_level ".
                                         " -o $es_esiorfile ".
                                         "-ORBInitRef NameService=file://$es_nsiorfile");
@@ -95,7 +95,7 @@ if ($es->WaitForFileTimed ($esiorfile,$es->ProcessStartWaitInterval()) == -1) {
     exit 1;
 }
 
-# start EchoEventSupplier  
+# start EchoEventSupplier
 $S_status = $S->Spawn ();
 
 if ($S_status != 0) {
@@ -103,7 +103,7 @@ if ($S_status != 0) {
     exit 1;
 }
 
-# start EchoEventConsumer  
+# start EchoEventConsumer
 $C_status = $C->Spawn ();
 
 if ($C_status != 0) {
diff --git a/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index b00f7b96444..ad28a202bd2 100644
--- a/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -144,7 +144,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       RtecUDPAdmin::AddrServer::_narrow(addr_srv_obj.in());
 
     // Create and initialize the sender object
-    TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender =
+    PortableServer::Servant_var<TAO_ECG_UDP_Sender> sender =
                                 TAO_ECG_UDP_Sender::create();
     TAO_ECG_UDP_Out_Endpoint endpoint;
     if (endpoint.dgram ().open (ACE_Addr::sap_any) == -1) {
@@ -166,7 +166,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     sender->connect (sub);
 
     // Create and initialize the receiver
-    TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver =
+    PortableServer::Servant_var<TAO_ECG_UDP_Receiver> receiver =
                                       TAO_ECG_UDP_Receiver::create();
 
     // TAO_ECG_UDP_Receiver::init() takes a TAO_ECG_Refcounted_Endpoint.
@@ -187,7 +187,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       auto_ptr<TAO_ECG_Mcast_EH> mcast_eh(new TAO_ECG_Mcast_EH (receiver.in()));
       mcast_eh->reactor (orb->orb_core ()->reactor ());
       mcast_eh->open (ec.in());
-      ACE_AUTO_PTR_RESET(eh,mcast_eh.release(),ACE_Event_Handler);
+      ACE_auto_ptr_reset(eh,mcast_eh.release());
       //eh.reset(mcast_eh.release());
     } else {
       auto_ptr<TAO_ECG_UDP_EH> udp_eh (new TAO_ECG_UDP_EH (receiver.in()));
@@ -196,7 +196,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       if (udp_eh->open (local_addr) == -1) {
         std::cerr << "Cannot open EH" << std::endl;
       }
-      ACE_AUTO_PTR_RESET(eh,udp_eh.release(),ACE_Event_Handler);
+      ACE_auto_ptr_reset(eh,udp_eh.release());
       //eh.reset(udp_eh.release());
     }
 
diff --git a/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl b/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl
index 8ddace59c15..765814c843f 100755
--- a/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl
+++ b/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl
@@ -63,7 +63,7 @@ if ( -e "supplier.conf" ) {
    $supplier_conf_file = "supplier.conf";
 }
 else{
-   $supplier_conf_file = "../supplier.conf";   
+   $supplier_conf_file = "../supplier.conf";
 }
 
 my $ns_nsiorfile = $ns->LocalFile ($nsiorfile);
@@ -88,11 +88,11 @@ my $c1_hostname = $c1->HostName();
 my $c2_hostname = $c2->HostName();
 my $ns_port = $ns->RandomPort();
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, "$flags ".
                                         " -o $ns_nsiorfile ".
                                         "-ORBListenEndpoints iiop://$ns_hostname:$ns_port");
-                                        
+
 my($port1) = $s1->RandomPort() ;
 my($port2) = $s1->RandomPort() ;
 my($mport) = $s1->RandomPort() ;
@@ -102,7 +102,7 @@ if ($udp) {
    $args1 .= " -udp -ecname ec1 -port $port1 -listenport $port2 ";
 } else {
    $args1 .= " -ecname ec1 -address 224.9.9.2 -port $mport ";
-}                        
+}
 $S1 = $s1->CreateProcess ("EchoEventSupplier", "$args1");
 
 
diff --git a/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/supplier.conf b/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/supplier.conf
index d9eeea24f43..68ac2ee61ea 100644
--- a/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/supplier.conf
+++ b/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/supplier.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECobserver basic"
diff --git a/orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl b/orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl
index 658cdce17c0..ed774dc64cf 100755
--- a/orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl
+++ b/orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl
@@ -1,4 +1,4 @@
-# $Id$ 
+# $Id$
 
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
@@ -25,8 +25,8 @@ my $WAIT_TIMEOUT = 2;
 my $DEBUG_LEVEL = 1;
 my $OBJ_REF_STYLE = "-orbobjrefstyle url";
 
-my $implrepo_server = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImplRepo_Service";
-my $imr_activator = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImR_Activator";
+my $implrepo_server = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator";
+my $imr_activator = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator";
 my $tao_imr = "$ENV{ACE_ROOT}/bin/tao_imr";
 
 my $implrepo_ior = "imr.ior";
@@ -97,7 +97,7 @@ $TI->IgnoreExeSubDir(1);
 
 sub RunImRUtil {
     my $cmd = shift;
-    
+
     print ">>> " . $TI->CommandLine() . "\n";
     $TI->Arguments("-ORBInitRef ImplRepoService=file://$ti_imriorfile $cmd");
     return $TI->SpawnWaitKill($ti->ProcessStartWaitInterval());
@@ -128,7 +128,7 @@ if ($ti->PutFile ($implrepo_ior) == -1) {
 }
 
 if (SpawnWait($Act, $activator_ior, $act) != 0) {
-    $ImR->Kill(); $ImR->TimedWait(1); 
+    $ImR->Kill(); $ImR->TimedWait(1);
     exit 1;
 }
 
@@ -136,19 +136,19 @@ if (SpawnWait($Act, $activator_ior, $act) != 0) {
 #we want to run the server once to generate the ior file.
 
 if (SpawnWait($Srv, $messenger_ior, $imr) != 0) {
-    $Act->Kill(); $Act->TimedWait(1); 
-    $ImR->Kill(); $ImR->TimedWait(1);  
+    $Act->Kill(); $Act->TimedWait(1);
+    $ImR->Kill(); $ImR->TimedWait(1);
     exit 1;
 }
 if ($imr->GetFile ($implrepo_ior) == -1) {
     print STDERR "ERROR: cannot retrieve file <$imr_srviorfile>\n";
-    $Act->Kill(); $Act->TimedWait(1); 
+    $Act->Kill(); $Act->TimedWait(1);
     $ImR->Kill (); $ImR->TimedWait (1);
     exit 1;
 }
 if ($c1->PutFile ($implrepo_ior) == -1) {
     print STDERR "ERROR: cannot set file <$c1_srviorfile>\n";
-    $Act->Kill(); $Act->TimedWait(1); 
+    $Act->Kill(); $Act->TimedWait(1);
     $ImR->Kill (); $ImR->TimedWait (1);
     exit 1;
 }
@@ -165,7 +165,7 @@ if ($Srv_status != 0) {
 
 RunImRUtil("list -v");
 
-# Note : If the server registers itself, then it won't set the 
+# Note : If the server registers itself, then it won't set the
 # activator name. If we don't set it here, then the activator
 # won't be able to start the server.
 my $actname = $ti->hostname;
diff --git a/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp b/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp
index 19ec658a911..dd032f72d3a 100644
--- a/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp
+++ b/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -87,10 +87,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       FILE *output_file= ACE_OS::fopen (ACE_TEXT_ALWAYS_CHAR(ior_output_file), "w");
       if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,                                            
-                           "Cannot open output file for writing IOR: %s",       
-                           ior_output_file),              
-                          1);  
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           ior_output_file),
+                          1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
     }
diff --git a/orbsvcs/DevGuideExamples/ImplRepo/Basic/run_test.pl b/orbsvcs/DevGuideExamples/ImplRepo/Basic/run_test.pl
index 258d9c09ff0..5701d91a4c9 100755
--- a/orbsvcs/DevGuideExamples/ImplRepo/Basic/run_test.pl
+++ b/orbsvcs/DevGuideExamples/ImplRepo/Basic/run_test.pl
@@ -24,7 +24,7 @@ my $WAIT_TIMEOUT = 2;
 my $DEBUG_LEVEL = 1;
 my $OBJ_REF_STYLE = "-orbobjrefstyle url";
 
-my $implrepo_server = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImplRepo_Service";
+my $implrepo_server = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator";
 
 my $implrepo_ior = "imr.ior";
 my $messenger_ior = "messenger.ior";
diff --git a/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp b/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp
index e122d875a61..f97b43da4da 100644
--- a/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp
+++ b/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp
@@ -32,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       default:
       ;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/DevGuideExamples/ImplRepo/IORTable/run_test.pl b/orbsvcs/DevGuideExamples/ImplRepo/IORTable/run_test.pl
index 29af3571bd3..f6d2c2baca8 100755
--- a/orbsvcs/DevGuideExamples/ImplRepo/IORTable/run_test.pl
+++ b/orbsvcs/DevGuideExamples/ImplRepo/IORTable/run_test.pl
@@ -24,7 +24,7 @@ my $WAIT_TIMEOUT = 2;
 my $DEBUG_LEVEL = 1;
 my $OBJ_REF_STYLE = "-orbobjrefstyle url";
 
-my $implrepo_server = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImplRepo_Service";
+my $implrepo_server = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator";
 my $tao_imr = "$ENV{ACE_ROOT}/bin/tao_imr";
 
 my $implrepo_ior = "imr.ior";
diff --git a/orbsvcs/DevGuideExamples/ImplRepo/run_test.pl b/orbsvcs/DevGuideExamples/ImplRepo/run_test.pl
index bed41037e93..ee1463141af 100755
--- a/orbsvcs/DevGuideExamples/ImplRepo/run_test.pl
+++ b/orbsvcs/DevGuideExamples/ImplRepo/run_test.pl
@@ -24,8 +24,8 @@ my $ti = PerlACE::TestTarget::create_target (5) || die "Create target 5 failed\n
 my $si = PerlACE::TestTarget::create_target (6) || die "Create target 6 failed\n";
 my $sdn = PerlACE::TestTarget::create_target (7) || die "Create target 7 failed\n";
 
-my $implrepo_server = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImplRepo_Service";
-my $imr_activator = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImR_Activator";
+my $implrepo_server = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator";
+my $imr_activator = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator";
 my $tao_imr = "$ENV{ACE_ROOT}/bin/tao_imr";
 
 # The Tests
@@ -56,7 +56,7 @@ $c1->DeleteFile ($messenger_ior);
 $c2->DeleteFile ($messenger_ior);
 $si->DeleteFile ($messenger_ior);
 
-# Note : We don't actually use SVR, but we need a way to get the 
+# Note : We don't actually use SVR, but we need a way to get the
 #        path to the -ExeSubDir
 $SVR = $imr->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level");
 my $server = $SVR->Executable ();
@@ -154,7 +154,7 @@ $TI->IgnoreExeSubDir (1);
 
 ## Note : Instead of using tao_imr to generate the ior, it's easy enough
 ## to just create one by hand. The ior is just a normal corbaloc ior with
-## the poa_name of the server and ip address of the imr. 
+## the poa_name of the server and ip address of the imr.
 ## (ie corbaloc::localhost:8888/Messengerservice)
 ## Of course, to do this, you'd have to start the imr on port 8888.
 ## We use the "tao_imr ior" command, because we don't know which port was used.
diff --git a/orbsvcs/DevGuideExamples/InterfaceRepo/run_test.pl b/orbsvcs/DevGuideExamples/InterfaceRepo/run_test.pl
index bab252eda1e..f841edbd25b 100755
--- a/orbsvcs/DevGuideExamples/InterfaceRepo/run_test.pl
+++ b/orbsvcs/DevGuideExamples/InterfaceRepo/run_test.pl
@@ -1,4 +1,4 @@
-# $Id$ 
+# $Id$
 
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
@@ -31,7 +31,7 @@ $cli->DeleteFile ($ifriorfile);
 $ti->DeleteFile ($ifriorfile);
 
 
-$ifr_server = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/IFR_Service";
+$ifr_server = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service";
 $tao_ifr = "$ENV{ACE_ROOT}/bin/tao_ifr";
 $test_idl = "test.idl";
 
diff --git a/orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl b/orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl
index 4ede6d3629e..0f2d197fd91 100755
--- a/orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl
+++ b/orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl
@@ -30,7 +30,7 @@ $srv->DeleteFile ($nsiorfile);
 $cli->DeleteFile ($nsiorfile);
 
 # start Naming Service
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile");
 $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ".
                                                "-ORBInitRef NameService=file://$srv_nsiorfile");
@@ -81,7 +81,7 @@ if ($CLI_status != 0) {
     $status = 1;
 }
 
-# clean-up 
+# clean-up
 $SRV_status = $SRV->TerminateWaitKill ($srv->ProcessStopWaitInterval());
 
 if ($SRV_status != 0) {
diff --git a/orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl b/orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl
index 3e4fd9bf1d5..abaaf01565c 100755
--- a/orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl
+++ b/orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl
@@ -29,7 +29,7 @@ $ns->DeleteFile ($nsiorfile);
 $srv->DeleteFile ($nsiorfile);
 $cli->DeleteFile ($nsiorfile);
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile");
 $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ".
                                                "-ORBInitRef NameService=file://$srv_nsiorfile");
@@ -81,7 +81,7 @@ if ($CLI_status != 0) {
     $status = 1;
 }
 
-# clean-up 
+# clean-up
 $SRV_status = $SRV->TerminateWaitKill ($srv->ProcessStopWaitInterval());
 
 if ($SRV_status != 0) {
diff --git a/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp b/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp
index 28716321e81..11a86fe736f 100644
--- a/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp
+++ b/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp
@@ -42,7 +42,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp b/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
index d40e8496387..8215d5e4cef 100644
--- a/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
+++ b/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
@@ -13,12 +13,12 @@
 Messenger_i::Messenger_i (void)
   {
   }
-  
+
 // Implementation skeleton destructor
 Messenger_i::~Messenger_i (void)
   {
   }
-  
+
 CORBA::Boolean Messenger_i::send_message (
     const char * user_name,
     const char * subject,
@@ -31,4 +31,4 @@ CORBA::Boolean Messenger_i::send_message (
     std::cerr << "Message:      " << message << std::endl;
     return 1;
   }
-  
+
diff --git a/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h b/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
index b021dcaa44c..55e623d21ed 100644
--- a/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
+++ b/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
@@ -20,12 +20,12 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
diff --git a/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl b/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl
index 959dd590ba7..9f4551f95bd 100755
--- a/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl
+++ b/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl
@@ -33,7 +33,7 @@ $cli->DeleteFile ($srviorfile);
 $hostname = $ns->HostName ();
 $port = "2809";
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, "-ORBListenEndpoints iiop://$hostname:$port ".
                                         " -o $ns_nsiorfile");
 $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ".
@@ -85,7 +85,7 @@ if ($cli->PutFile ($srviorfile) == -1) {
     $SRV->Kill (); $SRV->TimedWait (1);
     exit 1;
 }
- 
+
 # start MessengerClient
 $CLI_status = $CLI->SpawnWaitKill ($cli->ProcessStartWaitInterval());
 
@@ -94,7 +94,7 @@ if ($CLI_status != 0) {
     $status = 1;
 }
 
-# clean-up 
+# clean-up
 $SRV_status = $SRV->TerminateWaitKill ($srv->ProcessStopWaitInterval());
 
 if ($SRV_status != 0) {
diff --git a/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp b/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
index 21edede8773..f36aae87c0c 100644
--- a/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
+++ b/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
@@ -14,12 +14,12 @@
 Messenger_i::Messenger_i (void)
   {
   }
-  
+
 // Implementation skeleton destructor
 Messenger_i::~Messenger_i (void)
   {
   }
-  
+
 CORBA::Boolean Messenger_i::send_message (
     const char * user_name,
     const char * subject,
@@ -32,4 +32,4 @@ CORBA::Boolean Messenger_i::send_message (
     std::cerr << "Message:      " << message << std::endl;
     return 1;
   }
-  
+
diff --git a/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h b/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
index b021dcaa44c..55e623d21ed 100644
--- a/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
+++ b/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
@@ -20,12 +20,12 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
diff --git a/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp b/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp
index 35c41b37b58..dda5b2b6a36 100644
--- a/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp
+++ b/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp
@@ -2,7 +2,6 @@
 
 #include "NamingTask.h"
 #include "MessengerTask.h"
-#include "ace/OS.h"
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl b/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl
index 3df6d8ec73d..4a1b59065b5 100755
--- a/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl
+++ b/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl
@@ -3,7 +3,7 @@
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
   &  eval 'exec perl -S $0 $argv:q'
   if 0;
-  
+
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::TestTarget;
 
@@ -30,7 +30,7 @@ my $ns_nsiorfile = $ns->LocalFile ($nsiorfile);
 $ns->DeleteFile ($nsiorfile);
 
 # start Naming Service
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, " -ORBListenEndpoints iiop://$TARGETHOSTNAME:$def_port ".
                                         "-o $ns_nsiorfile");
 $NS_status = $NS->Spawn ();
@@ -72,8 +72,8 @@ $nsdel = "$ENV{ACE_ROOT}/bin/tao_nsdel";
 
 $test_number = 0;
 
-foreach $o (@corbaloc_servers) {  
-    # Run messenger server for each test.  
+foreach $o (@corbaloc_servers) {
+    # Run messenger server for each test.
     #print "Start $MessengerServer $o \n";
     $SRV = $srv->CreateProcess ($MessengerServer, "-ORBdebuglevel $debug_level ".
                                                "$o");
@@ -127,7 +127,7 @@ if ($SRV_status != 0) {
 $i = 0;
 foreach $o (@corbaloc_clients) {
 
-    # Run the client for each test.  
+    # Run the client for each test.
     #print "Start $MessengerClient $o \n";
     $CLI = $cli->CreateProcess ($MessengerClient, "$o");
 
@@ -149,7 +149,7 @@ foreach $o (@corbaloc_clients) {
 }
 
 
-# clean up 
+# clean up
 $SRV_status = $SRV->TerminateWaitKill ($srv->ProcessStopWaitInterval());
 
 if ($SRV_status != 0) {
diff --git a/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp b/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp
index cbea180cda8..736549ca88f 100644
--- a/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp
+++ b/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl b/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl
index 0f0aec8306e..29194259604 100755
--- a/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl
+++ b/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl
@@ -3,7 +3,7 @@
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
   &  eval 'exec perl -S $0 $argv:q'
   if 0;
-  
+
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::TestTarget;
 
@@ -32,7 +32,7 @@ $ns->DeleteFile ($nsiorfile);
 $srv->DeleteFile ($msfile);
 
 # start Naming Service
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, " -ORBListenEndpoints iiop://$TARGETHOSTNAME:$def_port ".
                                         "-o $ns_nsiorfile");
 $NS_status = $NS->Spawn ();
@@ -77,10 +77,10 @@ if ($srv->WaitForFileTimed ($msfile,$srv->ProcessStartWaitInterval()) == -1) {
                       "Using default protocol (iiop) and default port ($def_port): \n",
                       "Using Resolve Initial Reference form(must tell ORB where NS is located with -ORBInitRef)\n");
 
-# Run the client for each of the corbaname test. 
+# Run the client for each of the corbaname test.
 $test_number = 0;
 $MessengerClient = "MessengerClient";
-foreach $o (@corbaname_clients) {   
+foreach $o (@corbaname_clients) {
 
     $CLI = $cli->CreateProcess ($MessengerClient, "$o");
 
@@ -91,7 +91,7 @@ foreach $o (@corbaname_clients) {
         $NS->Kill(); $NS->TimedWait (1);
         exit 1;
     }
-   
+
     $test_number++;
 
     print "======================================\n";
@@ -100,7 +100,7 @@ foreach $o (@corbaname_clients) {
     print "======================================\n\n";
 }
 
-# clean up 
+# clean up
 $SRV_status = $SRV->TerminateWaitKill ($srv->ProcessStopWaitInterval());
 
 if ($SRV_status != 0) {
diff --git a/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp b/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
index ca1ef264102..ad055da144b 100644
--- a/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
+++ b/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
@@ -25,7 +25,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       default:
       ;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl b/orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl
index 737f4ab9046..433637ac9c7 100755
--- a/orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl
+++ b/orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl
@@ -43,11 +43,11 @@ $nfs->DeleteFile ($nfsiorfile);
 $srv->DeleteFile ($srviorfile);
 $cli->DeleteFile ($srviorfile);
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile");
 
 
-$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service";
+$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification";
 $NFS = $nfs->CreateProcess ($NotifyService, "-ORBInitRef NameService=file://$nfs_nsiorfile ".
                                             "-IORoutput $nfs_nfsiorfile");
 $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ".
diff --git a/orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl b/orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl
index 3332eeb8e15..1283068c3c3 100755
--- a/orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl
+++ b/orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl
@@ -41,10 +41,10 @@ $cli->DeleteFile ($nsiorfile);
 $nfs->DeleteFile ($nfsiorfile);
 $srv->DeleteFile ($srviorfile);
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile");
 
-$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service";
+$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification";
 $NFS = $nfs->CreateProcess ($NotifyService, "-ORBInitRef NameService=file://$nfs_nsiorfile ".
                                             "-IORoutput $nfs_nfsiorfile");
 $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ".
diff --git a/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp b/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
index 3413f093c09..1fd41b6459e 100644
--- a/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
+++ b/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
@@ -25,7 +25,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       default:
       ;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl b/orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl
index 737f4ab9046..433637ac9c7 100755
--- a/orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl
+++ b/orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl
@@ -43,11 +43,11 @@ $nfs->DeleteFile ($nfsiorfile);
 $srv->DeleteFile ($srviorfile);
 $cli->DeleteFile ($srviorfile);
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile");
 
 
-$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service";
+$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification";
 $NFS = $nfs->CreateProcess ($NotifyService, "-ORBInitRef NameService=file://$nfs_nsiorfile ".
                                             "-IORoutput $nfs_nfsiorfile");
 $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ".
diff --git a/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp b/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp
index b0fff2d36e8..7e335ee5ed3 100644
--- a/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp
+++ b/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp
@@ -25,7 +25,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       default:
       ;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl b/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl
index fa81c4c1f62..78bc07f2564 100755
--- a/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl
+++ b/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl
@@ -41,11 +41,11 @@ $cli->DeleteFile ($nsiorfile);
 $nfs->DeleteFile ($nfsiorfile);
 $srv->DeleteFile ($srviorfile);
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile");
 
 
-$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service";
+$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification";
 $NFS = $nfs->CreateProcess ($NotifyService, "-ORBInitRef NameService=file://$nfs_nsiorfile ".
                                             "-IORoutput $nfs_nfsiorfile");
 $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ".
diff --git a/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp b/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp
index 072bf111c29..7ab9090a365 100644
--- a/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp
+++ b/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp
@@ -26,7 +26,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       default:
       ;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl b/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl
index 737f4ab9046..433637ac9c7 100755
--- a/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl
+++ b/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl
@@ -43,11 +43,11 @@ $nfs->DeleteFile ($nfsiorfile);
 $srv->DeleteFile ($srviorfile);
 $cli->DeleteFile ($srviorfile);
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile");
 
 
-$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service";
+$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification";
 $NFS = $nfs->CreateProcess ($NotifyService, "-ORBInitRef NameService=file://$nfs_nsiorfile ".
                                             "-IORoutput $nfs_nfsiorfile");
 $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ".
diff --git a/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp b/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp
index 39b64f2faae..0b7adaf87a7 100644
--- a/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp
+++ b/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp
@@ -31,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       default:
       ;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -196,7 +196,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       std::ofstream iorFile( ACE_TEXT_ALWAYS_CHAR(output_file) );
       iorFile << "Ready" << std::endl;
       iorFile.close();
-    
+
       orb->run();
     }
   catch(const CORBA::Exception& ex)
diff --git a/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp b/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
index 3413f093c09..1fd41b6459e 100644
--- a/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
+++ b/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
@@ -25,7 +25,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       default:
       ;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h b/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h
index 581af1cb221..8fd79a67cb8 100644
--- a/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h
+++ b/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h
@@ -1,4 +1,4 @@
-// $Id$ 
+// $Id$
 
 #ifndef _PRIORITIES_H_
 #define _PRIORITIES_H_
@@ -7,4 +7,4 @@
 #define HIGH_PRIORITY 0
 #define DEFAULT_PRIORITY LOW_PRIORITY
 
-#endif 
+#endif
diff --git a/orbsvcs/DevGuideExamples/NotifyService/RTNotify/notify.conf b/orbsvcs/DevGuideExamples/NotifyService/RTNotify/notify.conf
index 837d36af6c7..f06099c5e88 100644
--- a/orbsvcs/DevGuideExamples/NotifyService/RTNotify/notify.conf
+++ b/orbsvcs/DevGuideExamples/NotifyService/RTNotify/notify.conf
@@ -1,6 +1,8 @@
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
+# $Id$
+
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 
 # Uncomment this line to use SCHED_FIFO
-#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"         
+#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/DevGuideExamples/NotifyService/RTNotify/nsclient.conf b/orbsvcs/DevGuideExamples/NotifyService/RTNotify/nsclient.conf
index c121382ee7d..e7119d5f110 100644
--- a/orbsvcs/DevGuideExamples/NotifyService/RTNotify/nsclient.conf
+++ b/orbsvcs/DevGuideExamples/NotifyService/RTNotify/nsclient.conf
@@ -1,4 +1,6 @@
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
+# $Id$
+
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 
 # Uncomment this line to use SCHED_FIFO
 #dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl b/orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl
index 227d221bab4..a1dc636f8b7 100755
--- a/orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl
+++ b/orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl
@@ -49,11 +49,11 @@ $srv->DeleteFile ($srviorfile);
 $cli->DeleteFile ($srviorfile);
 $con->DeleteFile ($confile);
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile");
 
 
-$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service";
+$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification";
 $NFS = $nfs->CreateProcess ($NotifyService, "-ORBInitRef NameService=file://$nfs_nsiorfile ".
                                             "-IORoutput $nfs_nfsiorfile ".
                                             "-ORBSvcConf $con_conconf");
diff --git a/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp b/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
index 48fa393279e..58b72ff1f41 100644
--- a/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
+++ b/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
@@ -25,7 +25,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       default:
       ;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/run_test.pl b/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/run_test.pl
index 45e2954e5d8..b509b6b12d8 100755
--- a/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/run_test.pl
+++ b/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/run_test.pl
@@ -35,7 +35,7 @@ $con->DeleteFile ($nsiorfile);
 $cli->DeleteFile ($nsiorfile);
 $srv->DeleteFile ($srviorfile);
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile");
 
 $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ".
diff --git a/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl b/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl
index 98129a9a765..4098f724b0f 100755
--- a/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl
+++ b/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl
@@ -28,7 +28,7 @@ $ns->DeleteFile ($nsiorfile);
 $hostname = $ns->HostName ();
 $PORT=9876;
 
-$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service";
+$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile ".
                                         "-ORBListenEndpoints iiop://$hostname:$PORT");
 
@@ -69,7 +69,7 @@ if ($CLI_status != 0) {
     $status = 1;
 }
 
-# clean-up 
+# clean-up
 $SRV_status = $SRV->TerminateWaitKill ($srv->ProcessStopWaitInterval());
 
 if ($SRV_status != 0) {
diff --git a/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp b/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
index 7fcc7dc1b97..d080abee9b7 100644
--- a/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
+++ b/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/DevGuideExamples/Security/ParticipatingApp/ParticipatingApp.mpc b/orbsvcs/DevGuideExamples/Security/ParticipatingApp/ParticipatingApp.mpc
index a0025ee06d6..a89e037ff89 100644
--- a/orbsvcs/DevGuideExamples/Security/ParticipatingApp/ParticipatingApp.mpc
+++ b/orbsvcs/DevGuideExamples/Security/ParticipatingApp/ParticipatingApp.mpc
@@ -9,6 +9,7 @@ project(*Server): portableserver, orbsvcsexe, security, ssliop {
 
 project(ParticipatingApp_Client): orbsvcsexe, security, ssliop {
   exename = MessengerClient
+  after  += *Server
 
   Source_Files {
     MessengerC.cpp
diff --git a/orbsvcs/DevGuideExamples/Security/ParticipatingApp/run_test.pl b/orbsvcs/DevGuideExamples/Security/ParticipatingApp/run_test.pl
index e4de857f914..95a2811a6ba 100755
--- a/orbsvcs/DevGuideExamples/Security/ParticipatingApp/run_test.pl
+++ b/orbsvcs/DevGuideExamples/Security/ParticipatingApp/run_test.pl
@@ -2,7 +2,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
      & eval 'exec perl -S $0 $argv:q'
      if 0;
 
-# $Id$ 
+# $Id$
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
diff --git a/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp b/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp
index 585dbb67dd9..2a422f96565 100644
--- a/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp
+++ b/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp
@@ -1,6 +1,5 @@
 /* -*- C++ -*- $Id$ */
 
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 
 #include "MessengerC.h"
@@ -103,7 +102,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                                argv [0]),
                               -1);
         break;
-      case '?': 
+      case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Usage:  %s "
@@ -113,7 +112,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerServer.cpp b/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerServer.cpp
index 4bdbd816ed2..3b5616af19e 100644
--- a/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerServer.cpp
+++ b/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerServer.cpp
@@ -24,7 +24,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       default:
       ;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 int
diff --git a/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp b/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
index a92cea8879f..c16cf35e730 100644
--- a/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
+++ b/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
@@ -6,12 +6,12 @@
 Messenger_i::Messenger_i (void)
   {
   }
-  
+
 // Implementation skeleton destructor
 Messenger_i::~Messenger_i (void)
   {
   }
-  
+
 CORBA::Boolean Messenger_i::send_message (
     const char * user_name,
     const char * subject,
diff --git a/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h b/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
index ef9b4a759a2..3ea208dd978 100644
--- a/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
+++ b/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
@@ -13,12 +13,12 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
diff --git a/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/PolicyControllingApp.mpc b/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/PolicyControllingApp.mpc
index e79645474db..87da7227a79 100644
--- a/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/PolicyControllingApp.mpc
+++ b/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/PolicyControllingApp.mpc
@@ -8,6 +8,8 @@ project(*Server): portableserver, orbsvcsexe, security, ssliop {
 }
 
 project(*Client): orbsvcsexe, security, ssliop {
+  after += *Server
+
   Source_Files {
     MessengerC.cpp
     MessengerClient.cpp
diff --git a/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/run_test.pl b/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/run_test.pl
index bb6201a9af4..bfd91c045b6 100755
--- a/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/run_test.pl
+++ b/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/run_test.pl
@@ -1,4 +1,4 @@
-# $Id$ 
+# $Id$
 
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
diff --git a/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerServer.cpp b/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerServer.cpp
index cb99ce025d7..64965cc71aa 100644
--- a/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerServer.cpp
+++ b/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerServer.cpp
@@ -24,7 +24,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       default:
       ;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp b/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
index 809cfcc584f..5c368d02392 100644
--- a/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
+++ b/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
@@ -13,12 +13,12 @@
 Messenger_i::Messenger_i (void)
   {
   }
-  
+
 // Implementation skeleton destructor
 Messenger_i::~Messenger_i (void)
   {
   }
-  
+
 CORBA::Boolean Messenger_i::send_message (
     const char * user_name,
     const char * subject,
diff --git a/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h b/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
index ef9b4a759a2..3ea208dd978 100644
--- a/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
+++ b/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
@@ -13,12 +13,12 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
diff --git a/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/SecurityUnawareApp.mpc b/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/SecurityUnawareApp.mpc
index 09a2598b354..e514b72c58f 100644
--- a/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/SecurityUnawareApp.mpc
+++ b/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/SecurityUnawareApp.mpc
@@ -8,6 +8,8 @@ project(*Server): taoexe, portableserver, security, ssl {
 }
 
 project(*Client): taoexe, security, ssl {
+  after += *Server
+
   Source_Files {
     MessengerC.cpp
     MessengerClient.cpp
diff --git a/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/run_test.pl b/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/run_test.pl
index 1ccc9ab5cbf..b285e341383 100755
--- a/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/run_test.pl
+++ b/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/run_test.pl
@@ -1,4 +1,4 @@
-# $Id$ 
+# $Id$
 
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
diff --git a/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp b/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
index c80e78b1ec9..87918070ec3 100644
--- a/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
+++ b/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
@@ -45,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       default:
       ;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -183,7 +183,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
     notify_ior += ":";
     notify_ior += ACE_TEXT_ALWAYS_CHAR (port);
     notify_ior += "/NotifyEventChannelFactory";
-    
+
     obj = orb->string_to_object(notify_ior.c_str());
     CosNotifyChannelAdmin::EventChannelFactory_var ecf
       = CosNotifyChannelAdmin::EventChannelFactory::_unchecked_narrow(obj.in());
diff --git a/orbsvcs/DevGuideExamples/ValueTypes/Notify/notify.conf b/orbsvcs/DevGuideExamples/ValueTypes/Notify/notify.conf
index 3d7c070a962..bc1fac73734 100644
--- a/orbsvcs/DevGuideExamples/ValueTypes/Notify/notify.conf
+++ b/orbsvcs/DevGuideExamples/ValueTypes/Notify/notify.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 1 -SourceThreads 0 "
 
diff --git a/orbsvcs/DevGuideExamples/ValueTypes/Notify/readme.txt b/orbsvcs/DevGuideExamples/ValueTypes/Notify/readme.txt
index 9b671360a80..8d158eb573a 100644
--- a/orbsvcs/DevGuideExamples/ValueTypes/Notify/readme.txt
+++ b/orbsvcs/DevGuideExamples/ValueTypes/Notify/readme.txt
@@ -1,4 +1,4 @@
 // $Id$
 
 This test uses valuetypes within simple CosEC::Any events passed through the
-notification service. 
+notification service.
diff --git a/orbsvcs/DevGuideExamples/ValueTypes/Notify/run_test.pl b/orbsvcs/DevGuideExamples/ValueTypes/Notify/run_test.pl
index 4f096515287..68bf6c94e06 100755
--- a/orbsvcs/DevGuideExamples/ValueTypes/Notify/run_test.pl
+++ b/orbsvcs/DevGuideExamples/ValueTypes/Notify/run_test.pl
@@ -39,7 +39,7 @@ $nfs->DeleteFile ($nfsiorfile);
 $con->DeleteFile ($eciorfile);
 $sup->DeleteFile ($eciorfile);
 
-$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service";
+$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification";
 $NFS = $nfs->CreateProcess ($NotifyService, " -boot ".
                                             "-orblistenendpoints iiop://:$port ".
                                             "-NoNameSvc ".
diff --git a/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp b/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp
index 06759c263d5..f4996d63f1e 100644
--- a/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp
+++ b/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp
@@ -207,7 +207,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
 
     PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in());
     PortableServer::POAManager_var mgr = poa->the_POAManager();
-    
+
     // "corbaloc::localhost:8888/NotifyEventChannelFactory"
     ACE_CString notify_ior ("corbaloc::");
     notify_ior += ACE_TEXT_ALWAYS_CHAR (hostname);
diff --git a/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
index 5f198de6468..f7177bc7980 100644
--- a/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+++ b/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
@@ -1,4 +1,3 @@
-
 // $Id$
 
 #include "ace/Sched_Params.h"
@@ -9,10 +8,6 @@
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Scheduler_Factory.h"
 
-ACE_RCSID (Dump_Schedule,
-           Dump_Schedule,
-           "$Id$")
-
 // This program dumps the results of one scheduling in a C++ file.
 
 int
@@ -25,7 +20,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (command_line.get_argc(), command_line.get_TCHAR_argv(), "internet");
+        CORBA::ORB_init (argc, argv, "internet");
 
       CORBA::Object_var naming_obj =
         orb->resolve_initial_references ("NameService");
diff --git a/orbsvcs/Dump_Schedule/Dump_Schedule.mpc b/orbsvcs/Dump_Schedule/Dump_Schedule.mpc
index f608137338d..ba972852924 100644
--- a/orbsvcs/Dump_Schedule/Dump_Schedule.mpc
+++ b/orbsvcs/Dump_Schedule/Dump_Schedule.mpc
@@ -2,5 +2,5 @@
 // $Id$
 
 project : orbsvcsexe, install, rtsched, naming, svc_utils, iortable, portableserver {
-  exename  = Dump_Schedule
+  exename  = tao_dump_schedule
 }
diff --git a/orbsvcs/Dump_Schedule/Makefile.am b/orbsvcs/Dump_Schedule/Makefile.am
deleted file mode 100644
index c2aad327503..00000000000
--- a/orbsvcs/Dump_Schedule/Makefile.am
+++ /dev/null
@@ -1,52 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Dump_Schedule.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS = Dump_Schedule
-
-Dump_Schedule_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Dump_Schedule_SOURCES = \
-  Dump_Schedule.cpp
-
-Dump_Schedule_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/Event_Service/Event_Service.cpp b/orbsvcs/Event_Service/Event_Service.cpp
index d2e04683981..75feab63907 100644
--- a/orbsvcs/Event_Service/Event_Service.cpp
+++ b/orbsvcs/Event_Service/Event_Service.cpp
@@ -6,6 +6,7 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_main.h"
+#include "ace/OS_NS_unistd.h"
 
 #include "orbsvcs/Daemon_Utilities.h"
 
@@ -73,17 +74,12 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
       // -ORBDaemon in the ORB core is faulty, see bugzilla 3335
       TAO_Daemon_Utility::check_for_daemon (argc, argv);
 
-      // Make a copy of command line parameter.
-      ACE_Argv_Type_Converter command (argc, argv);
-
       // Initialize ORB.
       this->orb_ =
-        CORBA::ORB_init (command.get_argc (), command.get_ASCII_argv ());
+        CORBA::ORB_init (argc, argv);
 
-      if (this->parse_args (command.get_argc (), command.get_TCHAR_argv ()) == -1)
-        {
-          return 1;
-        }
+      if (this->parse_args (argc, argv) == -1)
+        return 1;
 
       CORBA::Object_var root_poa_object =
         this->orb_->resolve_initial_references("RootPOA");
@@ -130,7 +126,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
       // This is the name we (potentially) register the Scheduling
       // Service in the Naming Service.
       CosNaming::Name schedule_name (1);
-      schedule_name.length (1);
+      schedule_name.resize (1);
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       // The old EC always needs a scheduler. If none is
@@ -293,7 +289,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
       if (bind_to_naming_service_ && !CORBA::is_nil (naming_context.in ()))
         {
           CosNaming::Name channel_name (1);
-          channel_name.length (1);
+          channel_name.resize (1);
           channel_name[0].id =
             CORBA::string_dup (this->service_name_.c_str());
           naming_context->rebind (channel_name, ec.in ());
@@ -308,7 +304,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
       if (bind_to_naming_service_ && !CORBA::is_nil (naming_context.in ()))
         {
           CosNaming::Name channel_name (1);
-          channel_name.length (1);
+          channel_name.resize (1);
           channel_name[0].id = CORBA::string_dup (this->service_name_.c_str());
           naming_context->unbind (channel_name);
         }
diff --git a/orbsvcs/Event_Service/Event_Service.mpc b/orbsvcs/Event_Service/Event_Service.mpc
index ae6b0ae317f..25e20564bef 100644
--- a/orbsvcs/Event_Service/Event_Service.mpc
+++ b/orbsvcs/Event_Service/Event_Service.mpc
@@ -2,5 +2,5 @@
 // $Id$
 
 project : orbsvcsexe, install, rtevent_serv, rtschedevent, bidir_giop, svc_utils {
-  exename  = Event_Service
+  exename  = tao_rtevent
 }
diff --git a/orbsvcs/Event_Service/Makefile.am b/orbsvcs/Event_Service/Makefile.am
deleted file mode 100644
index 25223b729bd..00000000000
--- a/orbsvcs/Event_Service/Makefile.am
+++ /dev/null
@@ -1,65 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Event_Service.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-bin_PROGRAMS = Event_Service
-
-Event_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Event_Service_SOURCES = \
-  Event_Service.cpp \
-  Event_Service.h
-
-Event_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSchedEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/Event_Service/svc.conf b/orbsvcs/Event_Service/svc.conf
index 1645185e704..f773a106c5a 100644
--- a/orbsvcs/Event_Service/svc.conf
+++ b/orbsvcs/Event_Service/svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index 5dc0bd322e2..eade1aa488f 100644
--- a/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -12,10 +12,7 @@
 #include "orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h"
 #include "orbsvcs/FtRtEvent/Utils/Log.h"
 #include "ace/OS_main.h"
-
-ACE_RCSID (Event_Service,
-           FT_EventService,
-           "$Id$")
+#include "ace/OS_NS_strings.h"
 
 int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
@@ -42,15 +39,10 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
 {
   try
   {
-    // Make a copy of command line parameter.
-    ACE_Argv_Type_Converter command(argc, argv);
-
     // Initialize ORB.
-    orb_ = CORBA::ORB_init (command.get_argc(),
-                            command.get_ASCII_argv(),
-                            "");
+    orb_ = CORBA::ORB_init (argc, argv);
 
-    if (this->parse_args (command.get_argc(), command.get_TCHAR_argv()) == -1)
+    if (this->parse_args (argc, argv) == -1)
       return 1;
 
     CORBA::Object_var root_poa_object =
@@ -80,7 +72,6 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
 
     setup_scheduler(naming_context.in());
 
-
     poa_manager->activate();
 
     // Activate the Event channel implementation
diff --git a/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
deleted file mode 100644
index 0a7e92d6399..00000000000
--- a/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
+++ /dev/null
@@ -1,75 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.FTRT_Event_Service.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-bin_PROGRAMS = ftrt_eventservice
-
-ftrt_eventservice_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/FtRtEvent/EventChannel \
-  -I$(TAO_BUILDDIR)/orbsvcs/FtRtEvent/EventChannel \
-  -I$(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
-
-ftrt_eventservice_SOURCES = \
-  FT_EventService.cpp \
-  FT_EventService.h \
-  TP_Task.h
-
-ftrt_eventservice_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_EventChannel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSchedEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index fdcc8f6e225..60988ef91a8 100644
--- a/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -6,11 +6,7 @@
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Stream.h"
 #include "orbsvcs/FtRtEvent/Utils/UUID.h"
-
-ACE_RCSID (Factory_Service,
-           EventChannelFactory_i,
-           "$Id$")
-
+#include "ace/OS_NS_sys_time.h"
 
 const int WAIT_FOR_REGISTRATION_TIME = 10; //sec
 const int MAX_ID_STRING = 10;
diff --git a/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
index 505122dd7d9..862d36c2877 100644
--- a/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
+++ b/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
@@ -5,10 +5,6 @@
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Factory_Service,
-           FTRTEC_Factory_Service,
-           "$Id$")
-
 namespace {
   ACE_CString id, kind;
   ACE_TString output;
diff --git a/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
deleted file mode 100644
index 169545c0e30..00000000000
--- a/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
+++ /dev/null
@@ -1,75 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.FTRTEC_Factory_Service.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-bin_PROGRAMS = ftrtec_factory_service
-
-ftrtec_factory_service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ftrtec_factory_service_SOURCES = \
-  EventChannelFactory_i.cpp \
-  FTRTEC_Factory_Service.cpp \
-  EventChannelFactory_i.h
-
-ftrtec_factory_service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
index 42dc5aada48..1aae289ca4e 100644
--- a/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
+++ b/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
@@ -11,10 +11,6 @@
 /// include this file to statically linked with Transaction Depth
 #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
 
-ACE_RCSID (Gateway_Service,
-           FTRTEC_Gateway_Service,
-           "$Id$")
-
 namespace {
   CORBA::ORB_var orb;
   FtRtecEventChannelAdmin::EventChannel_var ftec;
diff --git a/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
deleted file mode 100644
index 724b01b5f49..00000000000
--- a/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
+++ /dev/null
@@ -1,74 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.FTRTEC_Gateway_Service.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-bin_PROGRAMS = ftrtec_gateway_service
-
-ftrtec_gateway_service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
-
-ftrtec_gateway_service_SOURCES = \
-  FTRTEC_Gateway_Service.cpp
-
-ftrtec_gateway_service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/FTRT_Event_Service/Makefile.am b/orbsvcs/FTRT_Event_Service/Makefile.am
deleted file mode 100644
index f8817324df0..00000000000
--- a/orbsvcs/FTRT_Event_Service/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Event_Service \
-        Factory_Service \
-        Gateway_Service
-
diff --git a/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
index 770d8ef9870..5b4e4c34e88 100644
--- a/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
+++ b/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
@@ -20,11 +20,6 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (FT_DefaultFaultAnalyzer,
-           FT_DefaultFaultAnalyzer,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Default constructor.
@@ -88,7 +83,7 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type (
   //
   //   The filterable_data part of the event body contains the
   //   identity of the crashed object as four name-value pairs: the
-  //   fault tolerance domain identifier, the member’s location
+  //   fault tolerance domain identifier, the member's location
   //   identifier, the repository identifier and the object group
   //   identifier. The Fault Notifier filters events based on the
   //   domain_name, the type_name, and the four identifiers.  All
diff --git a/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp b/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
index bd2d2d8d059..59ca1982e61 100644
--- a/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
+++ b/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
@@ -13,10 +13,6 @@
 
 #include "FT_FaultAnalyzer.h"
 
-ACE_RCSID (FT_FaultAnalyzer,
-           FT_FaultAnalyzer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Default constructor.
diff --git a/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index af82077b9f5..16c935d118f 100644
--- a/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -21,11 +21,6 @@
 #include "orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h"
 #include "tao/debug.h"
 
-ACE_RCSID (FT_FaultConsumer,
-           FT_FaultConsumer,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Default constructor.
diff --git a/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp b/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
index ac26ed56e19..4fe713cc68a 100644
--- a/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
+++ b/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
@@ -19,10 +19,6 @@
 
 #include "ace/SString.h"
 
-ACE_RCSID (FT_FaultEventDescriptor,
-           FT_FaultEventDescriptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Default constructor.
diff --git a/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
index 1d3f14c6732..75d1a7a6218 100644
--- a/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
+++ b/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
@@ -1,13 +1,9 @@
+// $Id$
+
 #include "FT_Property_Validator.h"
 #include "orbsvcs/PortableGroup/PG_Operators.h"
 #include "orbsvcs/FT_ReplicationManagerC.h"
 
-
-ACE_RCSID (PortableGroup,
-           FT_Property_Validator,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::FT_Property_Validator::FT_Property_Validator (void)
diff --git a/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index e47afa445b7..ce0a5032e62 100644
--- a/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -31,11 +31,6 @@
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h"
 
-ACE_RCSID (FT_ReplicationManager,
-           FT_ReplicationManager,
-           "$Id$")
-
-
 // Use this macro at the beginning of CORBA methods
 // to aid in debugging.
 #define METHOD_ENTRY(name)    \
@@ -128,7 +123,7 @@ int TAO::FT_ReplicationManager::parse_args (int argc, ACE_TCHAR * argv[])
       break;
     }
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
index a0c4746509a..c55549bbc2b 100644
--- a/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
+++ b/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
@@ -20,7 +20,7 @@ project(*Lib): orbsvcslib, orbsvcs_output, conv_lib, fault_tolerance, notificati
 }
 
 project : taoserver, orbsvcsexe, fault_tolerance, notification_skel, iormanip, iortable, ftorb, install {
-  exename  = FT_ReplicationManager
+  exename  = tao_ft_replicationmanager
   libs    += TAO_ReplicationManagerLib
   after   += FT_ReplicationManager_Lib
   Source_Files {
diff --git a/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index a017ad1b483..aa3e2e8e9c8 100644
--- a/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
@@ -22,10 +22,6 @@
 #include "tao/debug.h"
 #include <iostream>
 
-ACE_RCSID (FT_ReplicationManagerFaultAnalyzer,
-           FT_ReplicationManagerFaultAnalyzer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Constructor.
diff --git a/orbsvcs/FT_ReplicationManager/Makefile.am b/orbsvcs/FT_ReplicationManager/Makefile.am
deleted file mode 100644
index a633d22b229..00000000000
--- a/orbsvcs/FT_ReplicationManager/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.FT_ReplicationManager_Lib.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_LTLIBRARIES = libTAO_ReplicationManagerLib.la
-
-libTAO_ReplicationManagerLib_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_REPLICATIONMANAGERLIB_BUILD_DLL
-
-libTAO_ReplicationManagerLib_la_SOURCES = \
-  FT_DefaultFaultAnalyzer.cpp \
-  FT_FaultAnalyzer.cpp \
-  FT_FaultConsumer.cpp \
-  FT_FaultEventDescriptor.cpp
-
-noinst_HEADERS = \
-  FT_DefaultFaultAnalyzer.h \
-  FT_FaultAnalyzer.h \
-  FT_FaultConsumer.h \
-  FT_FaultEventDescriptor.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_ReplicationManager.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-bin_PROGRAMS = FT_ReplicationManager
-
-FT_ReplicationManager_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-FT_ReplicationManager_SOURCES = \
-  FT_Property_Validator.cpp \
-  FT_ReplicationManager.cpp \
-  FT_ReplicationManagerFaultAnalyzer.cpp \
-  FT_ReplicationManager_Main.cpp \
-  FT_Property_Validator.h \
-  FT_ReplicationManager.h \
-  FT_ReplicationManagerFaultAnalyzer.h
-
-FT_ReplicationManager_LDADD = \
-  libTAO_ReplicationManagerLib.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index 46b0d49d480..8f11a1aa71b 100644
--- a/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -77,7 +77,7 @@ TAO::FT_FaultDetectorFactory_i::~FT_FaultDetectorFactory_i ()
 {
   //scope the guard
   {
-    InternalGuard guard (this->internals_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->internals_);
 
     // be sure all detectors are gone
     // before this object disappears
@@ -90,7 +90,7 @@ TAO::FT_FaultDetectorFactory_i::~FT_FaultDetectorFactory_i ()
 ////////////////////////////////////////////
 // FT_FaultDetectorFactory_i private methods
 
-void TAO::FT_FaultDetectorFactory_i::shutdown_i()
+void TAO::FT_FaultDetectorFactory_i::shutdown_i(void)
 {
   // assume mutex is locked
   for (size_t nDetector = 0; nDetector < this->detectors_.size(); ++nDetector)
@@ -103,7 +103,7 @@ void TAO::FT_FaultDetectorFactory_i::shutdown_i()
   }
 }
 
-int TAO::FT_FaultDetectorFactory_i::write_ior()
+int TAO::FT_FaultDetectorFactory_i::write_ior(void)
 {
   int result = -1;
   FILE* out = ACE_OS::fopen (this->ior_output_file_, "w");
@@ -177,7 +177,7 @@ int TAO::FT_FaultDetectorFactory_i::parse_args (int argc, ACE_TCHAR * argv[])
       break;
     }
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -340,8 +340,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb)
     this->this_name_.length (1);
     this->this_name_[0].id = CORBA::string_dup (this->ns_name_);
 
-    this->naming_context_->rebind (this->this_name_, this_obj.in()  //CORBA::Object::_duplicate(this_obj)
-                            );
+    this->naming_context_->rebind (this->this_name_, this_obj.in());
   }
 
   return result;
@@ -394,7 +393,8 @@ CORBA::ULong TAO::FT_FaultDetectorFactory_i::allocate_id()
 
 void TAO::FT_FaultDetectorFactory_i::remove_detector(CORBA::ULong id, TAO::Fault_Detector_i * detector)
 {
-  InternalGuard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->internals_);
+
   if (id < this->detectors_.size())
   {
     if(this->detectors_[id] == detector)
@@ -431,8 +431,7 @@ void TAO::FT_FaultDetectorFactory_i::remove_detector(CORBA::ULong id, TAO::Fault
 // FT_FaultDetectorFactory_i CORBA methods
 
 void TAO::FT_FaultDetectorFactory_i::change_properties (
-    const PortableGroup::Properties & property_set
-  )
+    const PortableGroup::Properties & property_set)
 {
   METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::change_properties);
 
@@ -469,7 +468,7 @@ void TAO::FT_FaultDetectorFactory_i::change_properties (
 void TAO::FT_FaultDetectorFactory_i::shutdown (void)
 {
   METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::shutdown);
-  InternalGuard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->internals_);
   shutdown_i ();
   this->quit_requested_ = 1;
   METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::shutdown);
@@ -478,13 +477,12 @@ void TAO::FT_FaultDetectorFactory_i::shutdown (void)
 CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
-    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-  )
+    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id)
 {
   METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::create_object);
 
   ACE_UNUSED_ARG (type_id); //@@ use it
-  InternalGuard guard (this->internals_);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->internals_, CORBA::Object::_nil ());
 
   ::TAO::PG_Property_Set decoder (the_criteria);
 
@@ -630,12 +628,11 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
 }
 
 void TAO::FT_FaultDetectorFactory_i::delete_object (
-    const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-  )
+    const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id)
 {
   METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::delete_object);
 
-  InternalGuard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->internals_);
 
   CORBA::ULong detectorId;
   factory_creation_id >>= detectorId;
diff --git a/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index bab34f3e43b..54365991433 100644
--- a/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -208,7 +208,6 @@ namespace TAO
      * locked if necessary.
      */
     TAO_SYNCH_MUTEX internals_;
-    typedef ACE_Guard<TAO_SYNCH_MUTEX> InternalGuard;
 
     /**
      * The orb
diff --git a/orbsvcs/Fault_Detector/Fault_Detector.mpc b/orbsvcs/Fault_Detector/Fault_Detector.mpc
index f547f4efa48..2fdd0a25426 100644
--- a/orbsvcs/Fault_Detector/Fault_Detector.mpc
+++ b/orbsvcs/Fault_Detector/Fault_Detector.mpc
@@ -1,6 +1,6 @@
 // $Id$
 project : taoserver, orbsvcsexe, install, fault_tolerance {
-  exename  = Fault_Detector
+  exename  = tao_fault_detector
   Source_Files {
     Fault_Detector_i.cpp
     Fault_Detector_Main.cpp
diff --git a/orbsvcs/Fault_Detector/Makefile.am b/orbsvcs/Fault_Detector/Makefile.am
deleted file mode 100644
index 2250699135b..00000000000
--- a/orbsvcs/Fault_Detector/Makefile.am
+++ /dev/null
@@ -1,75 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Fault_Detector.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-bin_PROGRAMS = Fault_Detector
-
-Fault_Detector_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Fault_Detector_SOURCES = \
-  FT_FaultDetectorFactory_i.cpp \
-  Fault_Detector_Main.cpp \
-  Fault_Detector_i.cpp \
-  FT_FaultDetectorFactory_i.h \
-  Fault_Detector_i.h
-
-Fault_Detector_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
index a85b641f606..f712f56b8eb 100644
--- a/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
+++ b/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
@@ -24,7 +24,7 @@
   if (TAO_debug_level > 6)    \
   {                           \
     ACE_DEBUG (( LM_DEBUG,    \
-    "Enter %s\n", #name       \
+    "Enter %C\n", #name       \
       ));                     \
   }
 
@@ -43,7 +43,7 @@
   if (TAO_debug_level > 6)    \
   {                           \
     ACE_DEBUG (( LM_DEBUG,    \
-      "Leave %s\n", #name     \
+      "Leave %C\n", #name     \
       ));                     \
   }                           \
   return /* value goes here */
@@ -185,7 +185,7 @@ int TAO::FT_FaultNotifier_i::parse_args (int argc, ACE_TCHAR * argv[])
       }
     }
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index f4d74716c7d..d1ca7a43407 100644
--- a/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -140,18 +140,6 @@ namespace TAO
     ///////////////
     // Data Members
   private:
-
-    /**
-     * Protect internal state.
-     * Mutex should be locked by corba methods, or by
-     * external (public) methods before calling implementation
-     * methods.
-     * Implementation methods should assume the mutex is
-     * locked if necessary.
-     */
-    TAO_SYNCH_MUTEX internals_;
-    typedef ACE_Guard<TAO_SYNCH_MUTEX> InternalGuard;
-
     /**
      * The orb
      */
diff --git a/orbsvcs/Fault_Notifier/Fault_Notifier.mpc b/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
index e1691d14996..41619023419 100644
--- a/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
+++ b/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
@@ -1,6 +1,6 @@
 // $Id$
 project : taoserver, orbsvcsexe, install, fault_tolerance, notification_serv {
-  exename  = Fault_Notifier
+  exename  = tao_fault_notifier
   Source_Files {
     FT_Notifier_i.cpp
     Fault_Notifier_Main.cpp
diff --git a/orbsvcs/Fault_Notifier/Makefile.am b/orbsvcs/Fault_Notifier/Makefile.am
deleted file mode 100644
index e83cda4db38..00000000000
--- a/orbsvcs/Fault_Notifier/Makefile.am
+++ /dev/null
@@ -1,81 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Fault_Notifier.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-bin_PROGRAMS = Fault_Notifier
-
-Fault_Notifier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Fault_Notifier_SOURCES = \
-  FT_Notifier_i.cpp \
-  Fault_Notifier_Main.cpp \
-  FT_Notifier_i.h
-
-Fault_Notifier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/IFR_Service/IFR_Server.cpp b/orbsvcs/IFR_Service/IFR_Server.cpp
index 80dbe39c996..548a5188d00 100644
--- a/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -5,10 +5,6 @@
 #include "tao/Environment.h"
 #include "orbsvcs/Shutdown_Utilities.h"
 
-ACE_RCSID (IFR_Service,
-           IFR_Server,
-           "$Id$")
-
 class IFR_Service_Shutdown_Functor : public Shutdown_Functor
 {
 public:
diff --git a/orbsvcs/IFR_Service/IFR_Service.cpp b/orbsvcs/IFR_Service/IFR_Service.cpp
index 6b375411a02..ebcfa6933dc 100644
--- a/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -11,10 +11,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (IFR_Service,
-           IFR_Service,
-           "$Id$")
-
 IFR_Service::IFR_Service (void)
 {
 }
diff --git a/orbsvcs/IFR_Service/IFR_Service.h b/orbsvcs/IFR_Service/IFR_Service.h
index a7fc21f7476..b0300bf1973 100644
--- a/orbsvcs/IFR_Service/IFR_Service.h
+++ b/orbsvcs/IFR_Service/IFR_Service.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ========================================================================
-//
-// = LIBRARY
-//    orbsvcs/IFR_Service
-//
-// = FILENAME
-//    IFR_Service.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// =======================================================================
+
+//=============================================================================
+/**
+ *  @file    IFR_Service.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef IFR_SERVICE_H
 #define IFR_SERVICE_H
diff --git a/orbsvcs/IFR_Service/IFR_Service.mpc b/orbsvcs/IFR_Service/IFR_Service.mpc
index ce08954f346..e0a854a079f 100644
--- a/orbsvcs/IFR_Service/IFR_Service.mpc
+++ b/orbsvcs/IFR_Service/IFR_Service.mpc
@@ -4,7 +4,7 @@
 // The ifrservice base project inherits from minimum_corba, so it's no longer
 // necessary to add minimum_corba to 'avoids' here.
 project(IFR_Service) : orbsvcsexe, install, ifrservice, ifr_client, imr_client  {
-  exename = IFR_Service
+  exename = tao_ifr_service
 
   IDL_Files {
   }
diff --git a/orbsvcs/IFR_Service/Makefile.am b/orbsvcs/IFR_Service/Makefile.am
deleted file mode 100644
index c6a5e756281..00000000000
--- a/orbsvcs/IFR_Service/Makefile.am
+++ /dev/null
@@ -1,138 +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:
-## ../bin/mwc.pl -type automake -exclude DDS -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-bin_PROGRAMS =
-
-## Makefile.IFR_Service.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-if !BUILD_USES_WCHAR
-
-bin_PROGRAMS += IFR_Service
-
-IFR_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-IFR_Service_SOURCES = \
-  IFR_Server.cpp \
-  IFR_Service.cpp \
-  IFR_Service.h
-
-IFR_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_IFRService.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_USES_WCHAR
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.TAO_IFR_BE.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libTAO_IFR_BE.la
-
-libTAO_IFR_BE_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/TAO_IDL/include \
-  -I$(TAO_ROOT)/TAO_IDL/fe \
-  -DTAO_IFR_BE_BUILD_DLL
-
-libTAO_IFR_BE_la_SOURCES = \
-  be_global.cpp \
-  be_init.cpp \
-  be_produce.cpp \
-  be_util.cpp \
-  ifr_adding_visitor.cpp \
-  ifr_adding_visitor_exception.cpp \
-  ifr_adding_visitor_operation.cpp \
-  ifr_adding_visitor_structure.cpp \
-  ifr_adding_visitor_union.cpp \
-  ifr_removing_visitor.cpp \
-  ifr_visitor.cpp
-
-noinst_HEADERS = \
-  be_extern.h \
-  be_global.h \
-  be_util.h \
-  ifr_adding_visitor.h \
-  ifr_adding_visitor_exception.h \
-  ifr_adding_visitor_operation.h \
-  ifr_adding_visitor_structure.h \
-  ifr_adding_visitor_union.h \
-  ifr_removing_visitor.h \
-  ifr_visitor.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.TAO_IFR_EXE.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS += tao_ifr
-
-tao_ifr_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs/IFR_Service \
-  -I$(TAO_ROOT)/TAO_IDL/include \
-  -I$(TAO_ROOT)/TAO_IDL/fe \
-  -DTAO_IDL_INCLUDE_DIR="\"$(includedir)/tao\""
-
-tao_ifr_SOURCES = \
-  drv_args.cpp \
-  drv_preproc.cpp \
-  tao_idl.cpp \
-  $(TAO_ROOT)/TAO_IDL/include/drv_extern.h
-
-tao_ifr_LDADD = \
-  libTAO_IFR_BE.la \
-  $(TAO_BUILDDIR)/TAO_IDL/libTAO_IDL_FE.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/IFR_Service/be_global.cpp b/orbsvcs/IFR_Service/be_global.cpp
index a1cf1de6e9b..f010d756b33 100644
--- a/orbsvcs/IFR_Service/be_global.cpp
+++ b/orbsvcs/IFR_Service/be_global.cpp
@@ -1,21 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-//
-// = LIBRARY
-//    TAO_IFR_BE_DLL
-//
-// = FILENAME
-//    be_global.cpp
-//
-// = DESCRIPTION
-//    Stores global data specific to the compiler back end.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    be_global.cpp
+ *
+ *  $Id$
+ *
+ *  Stores global data specific to the compiler back end.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "be_global.h"
 #include "ast_generator.h"
diff --git a/orbsvcs/IFR_Service/be_global.h b/orbsvcs/IFR_Service/be_global.h
index d0c5fb389c0..2935f41d5ea 100644
--- a/orbsvcs/IFR_Service/be_global.h
+++ b/orbsvcs/IFR_Service/be_global.h
@@ -1,21 +1,18 @@
 /* -*- c++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IFR_BE_DLL
-//
-// = FILENAME
-//    be_global.h
-//
-// = DESCRIPTION
-//    Header file for class containing compiler back end global data.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    be_global.h
+ *
+ *  $Id$
+ *
+ *  Header file for class containing compiler back end global data.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IFR_BE_GLOBAL_H
 #define TAO_IFR_BE_GLOBAL_H
@@ -43,11 +40,11 @@ public:
   // = DESCRIPTION
   //    Storage of global data specific to the compiler back end
   //
+  /// Constructor.
   BE_GlobalData (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~BE_GlobalData (void);
-  // Destructor.
 
   // Data accessors.
 
@@ -62,8 +59,8 @@ public:
 
   ACE_Unbounded_Stack<CORBA::Container_ptr> &ifr_scopes (void);
 
+  /// Cleanup function.
   void destroy (void);
-  // Cleanup function.
 
   const char *filename (void) const;
   void filename (char *fname);
@@ -80,43 +77,43 @@ public:
   ACE_CString orb_args (void) const;
   void orb_args (const ACE_CString& args);
 
+  /// 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.
 
 private:
+  /// Are we removing IR objects from the repository?
   bool removing_;
-  // Are we removing IR objects from the repository?
 
+  /// Reference to our ORB.
   CORBA::ORB_var orb_;
-  // Reference to our ORB.
 
+  /// Reference to the interface repository.
   CORBA::Repository_var repository_;
-  // Reference to the interface repository.
 
+  /// Must be something unlikely to clash.
   CORBA::String_var holding_scope_name_;
-  // Must be something unlikely to clash.
 
+  /// IR object scope stack.
   ACE_Unbounded_Stack<CORBA::Container_ptr> ifr_scopes_;
-  // IR object scope stack.
 
+  /// Name of the IDL file we are processing.
   char *filename_;
-  // Name of the IDL file we are processing.
 
+  /// Option to lock at the IDL file level.
   bool enable_locking_;
-  // Option to lock at the IDL file level.
 
+  /// Option to process included IDL files.
   bool do_included_files_;
-  // Option to process included IDL files.
 
+  /// Option to enable duplicate typedefs in parsed IDL.
   bool allow_duplicate_typedefs_;
-  // Option to enable duplicate typedefs in parsed IDL.
 
+  /// Holder for -ORB args saved and passed to DRV_fork.
   ACE_CString orb_args_;
-  // Holder for -ORB args saved and passed to DRV_fork.
 };
 
 #endif /* TAO_IFR_BE_GLOBAL_H */
diff --git a/orbsvcs/IFR_Service/be_produce.cpp b/orbsvcs/IFR_Service/be_produce.cpp
index 7b7772027f4..de1670fbbcb 100644
--- a/orbsvcs/IFR_Service/be_produce.cpp
+++ b/orbsvcs/IFR_Service/be_produce.cpp
@@ -76,10 +76,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ifr_removing_visitor.h"
 #include "ifr_adding_visitor.h"
 
-ACE_RCSID (be,
-           be_produce,
-           "$Id$")
-
 // Clean up before exit, whether successful or not.
 TAO_IFR_BE_Export void
 BE_cleanup (void)
diff --git a/orbsvcs/IFR_Service/drv_init_ifr.cpp b/orbsvcs/IFR_Service/drv_init_ifr.cpp
index a2916004551..0e653bc1ed1 100644
--- a/orbsvcs/IFR_Service/drv_init_ifr.cpp
+++ b/orbsvcs/IFR_Service/drv_init_ifr.cpp
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -71,7 +71,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "drv_private_ifr.h"
 #include "be_extern.h"
 
-ACE_RCSID(IFR_Service, drv_init_ifr, "$Id$")
+
 
 const size_t LOCAL_ESCAPES_BUFFER_SIZE = 1024;
 
@@ -107,8 +107,8 @@ DRV_init (void)
 #endif /* TAO_IDL_PREPROCESSOR */
 
   char local_escapes[LOCAL_ESCAPES_BUFFER_SIZE];
-  ACE_OS::memset (&local_escapes, 
-                  0, 
+  ACE_OS::memset (&local_escapes,
+                  0,
                   LOCAL_ESCAPES_BUFFER_SIZE);
 
   idl_global->set_local_escapes (local_escapes);
@@ -125,6 +125,6 @@ DRV_init (void)
 
   // Initialize driver private data.
   DRV_nfiles = 0;
-  DRV_file_index = 0;  
+  DRV_file_index = 0;
 }
 
diff --git a/orbsvcs/IFR_Service/drv_private_ifr.cpp b/orbsvcs/IFR_Service/drv_private_ifr.cpp
index f83d85a62fa..b5ff1ba822e 100644
--- a/orbsvcs/IFR_Service/drv_private_ifr.cpp
+++ b/orbsvcs/IFR_Service/drv_private_ifr.cpp
@@ -70,7 +70,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "idl_extern.h"
 #include "drv_private_ifr.h"
 
-ACE_RCSID(IFR_Service, drv_private_ifr, "$Id$")
+
 
 // Storage for file names
 
diff --git a/orbsvcs/IFR_Service/drv_private_ifr.h b/orbsvcs/IFR_Service/drv_private_ifr.h
index e901e9a97be..97b66d7c7e1 100644
--- a/orbsvcs/IFR_Service/drv_private_ifr.h
+++ b/orbsvcs/IFR_Service/drv_private_ifr.h
@@ -72,13 +72,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // Data
 
-// The ACE_Process_Options default size of 1024 is sometimes not enough.
-const unsigned long TAO_IDL_COMMAND_LINE_BUFFER_SIZE = 4 * 1024;
-
-extern const char *DRV_files[];   
+extern const char *DRV_files[];
 // All files to be processed.
 
-extern long DRV_nfiles;     
+extern long DRV_nfiles;
 // How many are there?
 
 extern long DRV_file_index;
diff --git a/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 8e980c90a93..2567e4af055 100644
--- a/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -1113,11 +1113,11 @@ ifr_adding_visitor::visit_provides (AST_Provides *node)
   ::CORBA::ComponentIR::ComponentDef_var c =
     ::CORBA::ComponentIR::ComponentDef::_narrow (
       this->ir_current_.in ());
-      
+
   ACE_CString comp_str (c->_interface_repository_id ());
   char *local_name = node->local_name ()->get_string ();
   this->expand_id (comp_str, local_name);
-  
+
   ::CORBA::ComponentIR::ProvidesDef_var new_def =
     c->create_provides (comp_str.fast_rep (),
                         local_name,
@@ -1136,7 +1136,7 @@ ifr_adding_visitor::visit_uses (AST_Uses *node)
 
   ::CORBA::InterfaceDef_var interface_type =
     ::CORBA::InterfaceDef::_narrow (contained.in ());
-    
+
   ::CORBA::ComponentIR::ComponentDef_var c =
     ::CORBA::ComponentIR::ComponentDef::_narrow (
       this->ir_current_.in ());
@@ -1144,7 +1144,7 @@ ifr_adding_visitor::visit_uses (AST_Uses *node)
   ACE_CString comp_str (c->_interface_repository_id ());
   char *local_name = node->local_name ()->get_string ();
   this->expand_id (comp_str, local_name);
-  
+
   ::CORBA::ComponentIR::UsesDef_var new_def =
     c->create_uses (comp_str.fast_rep (),
                     local_name,
@@ -1164,7 +1164,7 @@ ifr_adding_visitor::visit_publishes (AST_Publishes *node)
 
   ::CORBA::ComponentIR::EventDef_var event_type =
     ::CORBA::ComponentIR::EventDef::_narrow (contained.in ());
-    
+
   ::CORBA::ComponentIR::ComponentDef_var c =
     ::CORBA::ComponentIR::ComponentDef::_narrow (
       this->ir_current_.in ());
@@ -1172,7 +1172,7 @@ ifr_adding_visitor::visit_publishes (AST_Publishes *node)
   ACE_CString comp_str (c->_interface_repository_id ());
   char *local_name = node->local_name ()->get_string ();
   this->expand_id (comp_str, local_name);
-  
+
   ::CORBA::ComponentIR::PublishesDef_var new_def =
     c->create_publishes (comp_str.fast_rep (),
                          local_name,
@@ -1191,7 +1191,7 @@ ifr_adding_visitor::visit_emits (AST_Emits *node)
 
   ::CORBA::ComponentIR::EventDef_var event_type =
     ::CORBA::ComponentIR::EventDef::_narrow (contained.in ());
-    
+
   ::CORBA::ComponentIR::ComponentDef_var c =
     ::CORBA::ComponentIR::ComponentDef::_narrow (
       this->ir_current_.in ());
@@ -1199,7 +1199,7 @@ ifr_adding_visitor::visit_emits (AST_Emits *node)
   ACE_CString comp_str (c->_interface_repository_id ());
   char *local_name = node->local_name ()->get_string ();
   this->expand_id (comp_str, local_name);
-  
+
   ::CORBA::ComponentIR::EmitsDef_var new_def =
     c->create_emits (comp_str.fast_rep (),
                      local_name,
@@ -1218,7 +1218,7 @@ ifr_adding_visitor::visit_consumes (AST_Consumes *node)
 
   ::CORBA::ComponentIR::EventDef_var event_type =
     ::CORBA::ComponentIR::EventDef::_narrow (contained.in ());
-    
+
   ::CORBA::ComponentIR::ComponentDef_var c =
     ::CORBA::ComponentIR::ComponentDef::_narrow (
       this->ir_current_.in ());
@@ -1226,7 +1226,7 @@ ifr_adding_visitor::visit_consumes (AST_Consumes *node)
   ACE_CString comp_str (c->_interface_repository_id ());
   char *local_name = node->local_name ()->get_string ();
   this->expand_id (comp_str, local_name);
-  
+
   ::CORBA::ComponentIR::ConsumesDef_var new_def =
     c->create_consumes (comp_str.fast_rep (),
                         local_name,
@@ -1914,7 +1914,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
   try
     {
       AST_Type *type = node->field_type ();
-      
+
       // Save to be replaced later.
       holder =
         ::CORBA::IDLType::_duplicate (this->ir_current_.in ());
@@ -1993,7 +1993,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
 
       return -1;
     }
-    
+
   // Restore entry of component or interface.
   this->ir_current_ =
     ::CORBA::IDLType::_duplicate (holder.in ());
@@ -2746,7 +2746,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
         {
           AST_Interface *intf =
             AST_Interface::narrow_from_decl (parents[i]);
-            
+
           if (intf == 0)
             {
               ACE_ERROR_RETURN ((
@@ -2757,7 +2757,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
                  parents[i]->full_name ()),
                 -1);
             }
-        
+
           result =
             be_global->repository ()->lookup_id (intf->repoID ());
 
@@ -2808,7 +2808,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
         {
           AST_Interface *intf =
             AST_Interface::narrow_from_decl (parents[i]);
-            
+
           if (intf == 0)
             {
               ACE_ERROR_RETURN ((
@@ -2819,7 +2819,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
                  parents[i]->full_name ()),
                 -1);
             }
-        
+
           result =
             be_global->repository ()->lookup_id (intf->repoID ());
 
@@ -3990,14 +3990,14 @@ ifr_adding_visitor::visit_all_factories (AST_Home *node,
     {
       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);
-      
+
       CORBA::ParDescriptionSeq params;
       this->fill_params (params, f);
 
@@ -4026,7 +4026,7 @@ ifr_adding_visitor::visit_all_finders (AST_Home *node,
        h_iter.next ())
     {
       f = AST_Finder::narrow_from_decl (h_iter.item ());
-      
+
       if (f == 0)
         {
           continue;
diff --git a/orbsvcs/IFR_Service/ifr_adding_visitor.h b/orbsvcs/IFR_Service/ifr_adding_visitor.h
index bc42e852620..8ee7c3b46a7 100644
--- a/orbsvcs/IFR_Service/ifr_adding_visitor.h
+++ b/orbsvcs/IFR_Service/ifr_adding_visitor.h
@@ -1,21 +1,18 @@
-// $Id$
 
 /* -*- C++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IFR_BE_DLL
-//
-// = FILENAME
-//    ifr_adding_visitor.h
-//
-// = DESCRIPTION
-//    Header file for class ifr_adding_visitor.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    ifr_adding_visitor.h
+ *
+ *  $Id$
+ *
+ *  Header file for class ifr_adding_visitor.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IFR_ADDING_VISITOR_H
 #define TAO_IFR_ADDING_VISITOR_H
@@ -29,16 +26,16 @@
 
 class UTL_ExceptList;
 
+/**
+ * @class ifr_adding_visitor
+ *
+ * @brief ifr_adding_visitor.
+ *
+ * This visitor adds items found in the IDL file being processed
+ * to the Interface Repository.
+ */
 class ifr_adding_visitor : public ifr_visitor
 {
-  //
-  // = TITLE
-  //    ifr_adding_visitor.
-  //
-  // = DESCRIPTION
-  //    This visitor adds items found in the IDL file being processed
-  //    to the Interface Repository.
-  //
 public:
   ifr_adding_visitor (AST_Decl *scope,
                       CORBA::Boolean in_reopened = 0,
@@ -82,39 +79,39 @@ public:
   virtual int visit_native (AST_Native *node);
 
 protected:
+  /// Conversion functions.
   CORBA::PrimitiveKind expr_type_to_pkind (AST_Expression::ExprType et);
   CORBA::PrimitiveKind predefined_type_to_pkind (AST_PredefinedType *node);
-  // Conversion functions.
 
+  /// Determine the primitive type and insert into the Any.
   void load_any (AST_Expression::AST_ExprValue *ev,
                  CORBA::Any &any);
-  // Determine the primitive type and insert into the Any.
 
+  /// Creates or looks up the element type of an array or sequence,
+  /// and stores the result in ir_current_.
   void element_type (AST_Type *base_type, bool owned = false);
-  // Creates or looks up the element type of an array or sequence,
-  // and stores the result in ir_current_.
 
+  /// Code encapsulated out of visit_interface().
   int create_interface_def (AST_Interface *node);
-  // Code encapsulated out of visit_interface().
 
+  /// Code encapsulated out of visit_valuetype().
   int create_value_def (AST_ValueType *node);
-  // Code encapsulated out of visit_valuetype().
 
+  /// Code encapsulated out of visit_component().
   int create_component_def (AST_Component *node);
-  // Code encapsulated out of visit_component().
 
+  /// Code encapsulated out of visit_home().
   int create_home_def (AST_Home *node);
-  // Code encapsulated out of visit_home().
 
+  /// Code encapsulated out of visit_eventtype().
   int create_event_def (AST_EventType *node);
-  // Code encapsulated out of visit_eventtype().
 
+  /// Conditional call from visit_field().
   int create_value_member (AST_Field *node);
-  // Conditional call from visit_field().
 
+  /// Utility method to update ir_current_ for struct members, union
+  /// members, operation parameters and operation return types.
   void get_referenced_type (AST_Type *node);
-  // Utility method to update ir_current_ for struct members, union
-  // members, operation parameters and operation return types.
 
   void fill_base_value (CORBA::ValueDef_ptr &result,
                         AST_ValueType *node);
@@ -172,20 +169,22 @@ protected:
                   const char *local_name);
 
 protected:
+  /**
+   * Holder for the IR object most recently created or looked up by
+   * the visitor. This makes it accessible by visitor methods that
+   * need the result of a call to another visitor method that
+   * creates an IR object.
+   */
   CORBA::IDLType_var ir_current_;
-  // Holder for the IR object most recently created or looked up by
-  // the visitor. This makes it accessible by visitor methods that
-  // need the result of a call to another visitor method that
-  // creates an IR object.
 
+  /// Store the node whose scope (if any) we will be visiting.
   AST_Decl *scope_;
-  // Store the node whose scope (if any) we will be visiting.
 
+  /// Are we traversing the scope of a reopened module?
   bool in_reopened_;
-  // Are we traversing the scope of a reopened module?
 
+  /// Do we allow duplicate typedefs?
   bool allow_duplicate_typedefs_;
-  // Do we allow duplicate typedefs?
 };
 
 #endif /* TAO_IFR_ADDING_VISITOR_H */
diff --git a/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index 0dca03be5c2..52c791072d7 100644
--- a/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -12,10 +12,6 @@
 #include "ifr_adding_visitor_structure.h"
 #include "ifr_adding_visitor_union.h"
 
-ACE_RCSID (IFR_Service,
-           ifr_adding_visitor_exception,
-           "$Id$")
-
 ifr_adding_visitor_exception::ifr_adding_visitor_exception (
     AST_Decl *scope,
     bool in_reopened
diff --git a/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h b/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h
index 2e716f65d40..7abac7d0051 100644
--- a/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h
+++ b/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h
@@ -1,21 +1,18 @@
-// $Id$
 
 /* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IFR_BE_DLL
-//
-// = FILENAME
-//    ifr_adding_visitor_exception.h
-//
-// = DESCRIPTION
-//    Header file for class ifr_adding_visitor_exception.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    ifr_adding_visitor_exception.h
+ *
+ *  $Id$
+ *
+ *  Header file for class ifr_adding_visitor_exception.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IFR_ADDING_VISITOR_EXCEPTION_H
 #define TAO_IFR_ADDING_VISITOR_EXCEPTION_H
@@ -26,51 +23,51 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class ifr_adding_visitor_exception
+ *
+ * @brief ifr_adding_visitor_exception.
+ *
+ * This visitor overrides a few of the visit methods
+ * for the case when an exception node is seen in the AST.
+ */
 class ifr_adding_visitor_exception : public ifr_adding_visitor
 {
-  //
-  // = TITLE
-  //    ifr_adding_visitor_exception.
-  //
-  // = DESCRIPTION
-  //    This visitor overrides a few of the visit methods
-  //    for the case when an exception node is seen in the AST.
-  //
 public:
+  /// Constructor.
   ifr_adding_visitor_exception (AST_Decl *scope,
                                 CORBA::Boolean in_reopened_);
-  // Constructor.
 
+  /// Destructor.
   virtual ~ifr_adding_visitor_exception (void);
-  // Destructor.
 
+  /// Visit a struct.
   virtual int visit_scope (UTL_Scope *node);
-  // Visit a struct.
 
+  /// Visit a struct.
   virtual int visit_structure (AST_Structure *node);
-  // Visit a struct.
 
+  /// Visit a struct.
   virtual int visit_exception (AST_Exception *node);
-  // Visit a struct.
 
+  /// Visit an enum.
   virtual int visit_enum (AST_Enum *node);
-  // Visit an enum.
 
+  /// Visit union.
   virtual int visit_union (AST_Union *node);
-  // Visit union.
 
+  /// Lets the visitor one level above acess this value.
   virtual CORBA::IDLType_ptr ir_current (void) const;
-  // Lets the visitor one level above acess this value.
 
 private:
+  /// Common code called whether we are creating a new exception
+  /// or filling out a forward declaration.
   int add_members (AST_Exception *node, CORBA::ExceptionDef_ptr except_def);
-  // Common code called whether we are creating a new exception
-  // or filling out a forward declaration.
 
 private:
+  /// Holder for the member list passed to create_struct() or
+  /// create_exception().
   CORBA::StructMemberSeq members_;
-  // Holder for the member list passed to create_struct() or
-  // create_exception().
 
 };
 
diff --git a/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
index cc872100e0e..4ac03717560 100644
--- a/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
+++ b/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
@@ -13,10 +13,6 @@
 #include "utl_strlist.h"
 #include "nr_extern.h"
 
-ACE_RCSID (IFR_Service,
-           ifr_adding_visitor_operation,
-           "$Id$")
-
 ifr_adding_visitor_operation::ifr_adding_visitor_operation (AST_Decl *scope)
   : ifr_adding_visitor (scope),
     index_ (0)
diff --git a/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h b/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h
index 73cc1bb6e95..33f4646614e 100644
--- a/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h
+++ b/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h
@@ -1,21 +1,18 @@
-// $Id$
 
 /* -*- C++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IFR_BE_DLL
-//
-// = FILENAME
-//    ifr_adding_visitor_operation.h
-//
-// = DESCRIPTION
-//    Header file for class ifr_adding_visitor_operation.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    ifr_adding_visitor_operation.h
+ *
+ *  $Id$
+ *
+ *  Header file for class ifr_adding_visitor_operation.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IFR_ADDING_VISITOR_OPERATION_H
 #define TAO_IFR_ADDING_VISITOR_OPERATION_H
@@ -26,36 +23,36 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class ifr_adding_visitor_operation
+ *
+ * @brief ifr_adding_visitor_operation.
+ *
+ * This visitor overrides a few of the visit methods
+ * for the case when an operation node is seen in the AST.
+ */
 class ifr_adding_visitor_operation : public ifr_adding_visitor
 {
-  //
-  // = TITLE
-  //    ifr_adding_visitor_operation.
-  //
-  // = DESCRIPTION
-  //    This visitor overrides a few of the visit methods
-  //    for the case when an operation node is seen in the AST.
-  //
 public:
+  /// Constructor.
   ifr_adding_visitor_operation (AST_Decl *scope);
-  // Constructor.
 
+  /// Destructor.
   virtual ~ifr_adding_visitor_operation (void);
-  // Destructor.
 
+  /// Visit an operation.
   virtual int visit_operation (AST_Operation *node);
-  // Visit an operation.
 
+  /// Visit argument.
   virtual int visit_argument (AST_Argument *node);
-  // Visit argument.
 
 private:
+  /// Holder for the operation parameter info passed to the
+  /// interface repository method create_operation().
   CORBA::ParDescriptionSeq params_;
-  // Holder for the operation parameter info passed to the
-  // interface repository method create_operation().
 
+  /// Counter for building the parameter list.
   CORBA::ULong index_;
-  // Counter for building the parameter list.
 };
 
 #endif /* TAO_IFR_ADDING_VISITOR_OPERATION_H */
diff --git a/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index 5d2abc71809..74a8b36f80d 100644
--- a/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -10,10 +10,6 @@
 #include "ifr_adding_visitor_structure.h"
 #include "ifr_adding_visitor_union.h"
 
-ACE_RCSID (IFR_Service,
-           ifr_adding_visitor_structure,
-           "$Id$")
-
 ifr_adding_visitor_structure::ifr_adding_visitor_structure (AST_Decl *scope)
   : ifr_adding_visitor (scope)
 {
@@ -140,7 +136,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
           dummyMembers.length (0);
 
           CORBA::Container_ptr current_scope = CORBA::Container::_nil ();
-          
+
           if (be_global->ifr_scopes ().top (current_scope) != 0)
             {
               ACE_ERROR_RETURN ((
@@ -208,7 +204,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
           // entries referencing the UnionDef will stay valid.
           // Also we know node->ifr_fwd_added_ is true.
           struct_def = CORBA::StructDef::_narrow (prev_def.in ());
-      
+
           if (be_global->ifr_scopes ().push (struct_def.in ()) != 0)
             {
               ACE_ERROR_RETURN ((
@@ -230,7 +226,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
                 ACE_TEXT (" visit_scope failed\n")),
                -1);
             }
-           
+
           this->ir_current_ = CORBA::IDLType::_narrow (prev_def.in ());
 
           CORBA::Container_ptr used_scope =
diff --git a/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h b/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h
index 41860b51a21..24687da8af1 100644
--- a/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h
+++ b/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h
@@ -1,21 +1,18 @@
-// $Id$
 
 /* -*- C++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IFR_BE_DLL
-//
-// = FILENAME
-//    ifr_adding_visitor_structure.h
-//
-// = DESCRIPTION
-//    Header file for class ifr_adding_visitor_structure.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    ifr_adding_visitor_structure.h
+ *
+ *  $Id$
+ *
+ *  Header file for class ifr_adding_visitor_structure.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IFR_ADDING_VISITOR_STRUCTURE_H
 #define TAO_IFR_ADDING_VISITOR_STRUCTURE_H
@@ -26,16 +23,16 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class ifr_adding_visitor_structure
+ *
+ * @brief ifr_adding_visitor_structure.
+ *
+ * This visitor overrides a few of the visit methods
+ * for the case when a struct or exception node is seen in the AST.
+ */
 class ifr_adding_visitor_structure : public ifr_adding_visitor
 {
-  //
-  // = TITLE
-  //    ifr_adding_visitor_structure.
-  //
-  // = DESCRIPTION
-  //    This visitor overrides a few of the visit methods
-  //    for the case when a struct or exception node is seen in the AST.
-  //
 public:
   ifr_adding_visitor_structure (AST_Decl *scope);
 
@@ -45,19 +42,19 @@ public:
   virtual int visit_structure (AST_Structure *node);
   virtual int visit_enum (AST_Enum *node);
   virtual int visit_union (AST_Union *node);
-  
+
+  /// Lets the visitor one level above acess this value.
   virtual CORBA::IDLType_ptr ir_current (void) const;
-  // Lets the visitor one level above acess this value.
 
 private:
+  /// Common code called whether we are creating a new struct
+  /// or filling out a forward declaration.
   int add_members (AST_Structure *node, CORBA::StructDef_ptr struct_def);
-  // Common code called whether we are creating a new struct
-  // or filling out a forward declaration.
 
 private:
+  /// Holder for the member list passed to create_struct() or
+  /// create_exception().
   CORBA::StructMemberSeq members_;
-  // Holder for the member list passed to create_struct() or
-  // create_exception().
 };
 
 #endif /* TAO_IFR_ADDING_VISITOR_STRUCTURE_H */
diff --git a/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index dc0e8abe288..b331f4ef0a2 100644
--- a/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -14,10 +14,6 @@
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
-ACE_RCSID (IFR_Service,
-           ifr_adding_visitor_union,
-           "$Id$")
-
 ifr_adding_visitor_union::ifr_adding_visitor_union (AST_Decl *scope)
   : ifr_adding_visitor (scope)
 {
@@ -340,7 +336,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
           CORBA::UnionMemberSeq dummyMembers;
           dummyMembers.length (0);
           CORBA::Container_ptr current_scope = CORBA::Container::_nil ();
-          
+
           if (be_global->ifr_scopes ().top (current_scope) != 0)
             {
               ACE_ERROR_RETURN ((
@@ -350,7 +346,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                 ACE_TEXT (" scope stack is empty\n")),
                -1);
             }
-            
+
           // First create the named union without any members.
           union_def =
             current_scope->create_union (
@@ -409,7 +405,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
           // Also we know node->ifr_fwd_added_ is true.
           union_def = CORBA::UnionDef::_narrow (prev_def.in ());
           union_def->discriminator_type_def (this->ir_current_.in ());
-      
+
           if (be_global->ifr_scopes ().push (union_def.in ()) != 0)
             {
               ACE_ERROR_RETURN ((
@@ -431,7 +427,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                 ACE_TEXT (" visit_scope failed\n")),
                -1);
             }
-           
+
           this->ir_current_ = CORBA::IDLType::_narrow (prev_def.in ());
 
           CORBA::Container_ptr used_scope =
diff --git a/orbsvcs/IFR_Service/ifr_adding_visitor_union.h b/orbsvcs/IFR_Service/ifr_adding_visitor_union.h
index 21c3e6475d2..496b7224e3a 100644
--- a/orbsvcs/IFR_Service/ifr_adding_visitor_union.h
+++ b/orbsvcs/IFR_Service/ifr_adding_visitor_union.h
@@ -1,21 +1,18 @@
-// $Id$
 
 /* -*- C++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IFR_BE_DLL
-//
-// = FILENAME
-//    ifr_adding_visitor_union.h
-//
-// = DESCRIPTION
-//    Header file for class ifr_adding_visitor_union.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    ifr_adding_visitor_union.h
+ *
+ *  $Id$
+ *
+ *  Header file for class ifr_adding_visitor_union.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IFR_ADDING_VISITOR_UNION_H
 #define TAO_IFR_ADDING_VISITOR_UNION_H
@@ -26,16 +23,16 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class ifr_adding_visitor_union
+ *
+ * @brief ifr_adding_visitor_exception.
+ *
+ * This visitor overrides a few of the visit methods
+ * for the case when a union node is seen in the AST.
+ */
 class ifr_adding_visitor_union : public ifr_adding_visitor
 {
-  //
-  // = TITLE
-  //    ifr_adding_visitor_exception.
-  //
-  // = DESCRIPTION
-  //    This visitor overrides a few of the visit methods
-  //    for the case when a union node is seen in the AST.
-  //
 public:
   ifr_adding_visitor_union (AST_Decl *scope);
 
@@ -45,24 +42,26 @@ public:
   virtual int visit_structure (AST_Structure *node);
   virtual int visit_enum (AST_Enum *node);
   virtual int visit_union (AST_Union *node);
-  
+
+  /// Lets the visitor one level above acess this value.
   virtual CORBA::IDLType_ptr ir_current (void) const;
-  // Lets the visitor one level above acess this value.
-  
+
 private:
+  /// Common code called whether we are creating a new union
+  /// or filling out a forward declaration.
   int add_members (AST_Union *node, CORBA::UnionDef_ptr union_def);
-  // Common code called whether we are creating a new union
-  // or filling out a forward declaration.
 
 private:
+  /// Holder for the member list passed to create_struct() or
+  /// create_exception().
   CORBA::UnionMemberSeq members_;
-  // Holder for the member list passed to create_struct() or
-  // create_exception().
 
+  /**
+   * Holds the typecode of the discriminator (used only if the
+   * discriminator is an enum type, so we can insert the label
+   * values into Anys for UnionMemberSeq[i].label).
+   */
   CORBA::TypeCode_var disc_tc_;
-  // Holds the typecode of the discriminator (used only if the
-  // discriminator is an enum type, so we can insert the label
-  // values into Anys for UnionMemberSeq[i].label).
 };
 
 #endif /* TAO_IFR_ADDING_VISITOR_UNION_H */
diff --git a/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
index 0a6d92ee0c8..1dd38fffbe3 100644
--- a/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
+++ b/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
@@ -5,10 +5,6 @@
 #include "utl_scope.h"
 #include "ast_root.h"
 
-ACE_RCSID (IFR_Service,
-           ifr_removing_visitor,
-           "$Id$")
-
 ifr_removing_visitor::ifr_removing_visitor (void)
 {
 }
diff --git a/orbsvcs/IFR_Service/ifr_removing_visitor.h b/orbsvcs/IFR_Service/ifr_removing_visitor.h
index 4b6f82fa44e..fafd298476f 100644
--- a/orbsvcs/IFR_Service/ifr_removing_visitor.h
+++ b/orbsvcs/IFR_Service/ifr_removing_visitor.h
@@ -1,21 +1,18 @@
-// $Id$
 
 /* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IFR_BE_DLL
-//
-// = FILENAME
-//    ifr_removing_visitor.h
-//
-// = DESCRIPTION
-//    Header file for class ifr_removing_visitor.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    ifr_removing_visitor.h
+ *
+ *  $Id$
+ *
+ *  Header file for class ifr_removing_visitor.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IFR_REMOVING_VISITOR_H
 #define TAO_IFR_REMOVING_VISITOR_H
@@ -26,28 +23,28 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class ifr_removing_visitor
+ *
+ * @brief ifr_removing_visitor.
+ *
+ * This visitor removes items found in the IDL file being processed
+ * from the Interface Repository.
+ */
 class ifr_removing_visitor : public ifr_visitor
 {
-  //
-  // = TITLE
-  //    ifr_removing_visitor.
-  //
-  // = DESCRIPTION
-  //    This visitor removes items found in the IDL file being processed
-  //    from the Interface Repository.
-  //
 public:
+  /// Constructor.
   ifr_removing_visitor (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~ifr_removing_visitor (void);
-  // Destructor.
 
+  /// Visit the scope.
   virtual int visit_scope (UTL_Scope *node);
-  // Visit the scope.
 
+  /// Visit the root.
   virtual int visit_root (AST_Root *node);
-  // Visit the root.
 };
 
 #endif /* TAO_IFR_REMOVING_VISITOR_H */
diff --git a/orbsvcs/IFR_Service/ifr_visitor.cpp b/orbsvcs/IFR_Service/ifr_visitor.cpp
index 523ee0e5ea9..c349825d1d7 100644
--- a/orbsvcs/IFR_Service/ifr_visitor.cpp
+++ b/orbsvcs/IFR_Service/ifr_visitor.cpp
@@ -216,121 +216,121 @@ ifr_visitor::visit_structure (AST_Structure *)
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_structure_fwd (AST_StructureFwd *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_exception (AST_Exception *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_expression (AST_Expression *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_enum (AST_Enum *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_operation (AST_Operation *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_field (AST_Field *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_argument (AST_Argument *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_attribute (AST_Attribute *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_union (AST_Union *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_union_fwd (AST_UnionFwd *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_union_branch (AST_UnionBranch *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_union_label (AST_UnionLabel *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_constant (AST_Constant *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_enum_val (AST_EnumVal *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_array (AST_Array *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_sequence (AST_Sequence *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_string (AST_String *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_typedef (AST_Typedef *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_root (AST_Root *)
 {
   return 0;
 }
 
-int 
+int
 ifr_visitor::visit_native (AST_Native *)
 {
   return 0;
diff --git a/orbsvcs/IFR_Service/ifr_visitor.h b/orbsvcs/IFR_Service/ifr_visitor.h
index a280bd84101..1074e1c0fbd 100644
--- a/orbsvcs/IFR_Service/ifr_visitor.h
+++ b/orbsvcs/IFR_Service/ifr_visitor.h
@@ -1,21 +1,18 @@
-// $Id$
 
 /* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IFR_BE_DLL
-//
-// = FILENAME
-//    ifr_visitor.h
-//
-// = DESCRIPTION
-//    The Interface Repository administration visitor base class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    ifr_visitor.h
+ *
+ *  $Id$
+ *
+ *  The Interface Repository administration visitor base class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IFR_VISITOR_H
 #define TAO_IFR_VISITOR_H
@@ -28,20 +25,20 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class ifr_visitor
+ *
+ * @brief ifr_visitor.
+ *
+ * Base class for the IfR administration visitors. The methods are
+ * not pure virtual to facilitate the implementation of some
+ * derived visitors that override only a few.
+ */
 class ifr_visitor : public ast_visitor
 {
-  //
-  // = TITLE
-  //    ifr_visitor.
-  //
-  // = DESCRIPTION
-  //    Base class for the IfR administration visitors. The methods are
-  //    not pure virtual to facilitate the implementation of some
-  //    derived visitors that override only a few.
-  //
 public:
   virtual ~ifr_visitor (void);
-  
+
   virtual int visit_decl (AST_Decl *d);
   virtual int visit_scope (UTL_Scope *node);
   virtual int visit_type (AST_Type *node);
@@ -94,16 +91,16 @@ public:
   virtual int visit_native (AST_Native *node);
   virtual int visit_param_holder (AST_Param_Holder *node);
 
+  /// Accessor for our lock.
   ACE_Lock &lock (void) const;
-  // Accessor for our lock.
-  
+
 protected:
   // Not abstract but we want to force subclassing anyway.
   ifr_visitor (void);
 
 private:
+  /// Lock.
   ACE_Lock *lock_;
-  // Lock.
 };
 
 #endif /* TAO_IFR_VISITOR_H */
diff --git a/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
index 12b98e9e7bf..a574bc1576e 100644
--- a/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
+++ b/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
@@ -21,6 +21,14 @@
 #include "tao/ORB_Core.h"
 
 #include "ace/Reactor.h"
+
+const ACE_TCHAR * IMR_ACTIVATOR_SERVICE_NAME =
+  ACE_TEXT("TAOImRActivator");
+const ACE_TCHAR * IMR_ACTIVATOR_DISPLAY_NAME =
+  ACE_TEXT("TAO Implementation Repository Activator");
+const ACE_TCHAR * IMR_ACTIVATOR_DESCRIPTION =
+  ACE_TEXT("Implementation Repository Activator service for TAO");
+
 /**
  * Handles the SERVICE_CONTROL_SHUTDOWN and SERVICE_CONTROL_STOP commands
  * by shutting down the ORB.  Otherwise ACE_NT_Service::handle_control
diff --git a/orbsvcs/ImplRepo_Service/Activator_NT_Service.h b/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
index cfbab1aaef5..243cedb6366 100644
--- a/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
+++ b/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
@@ -28,12 +28,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-static const ACE_TCHAR * IMR_ACTIVATOR_SERVICE_NAME =
-  ACE_TEXT("TAOImRActivator");
-static const ACE_TCHAR * IMR_ACTIVATOR_DISPLAY_NAME =
-  ACE_TEXT("TAO Implementation Repository Activator");
-static const ACE_TCHAR * IMR_ACTIVATOR_DESCRIPTION =
-  ACE_TEXT("Implementation Repository Activator service for TAO");
+extern const ACE_TCHAR * IMR_ACTIVATOR_SERVICE_NAME;
+extern const ACE_TCHAR * IMR_ACTIVATOR_DISPLAY_NAME;
+extern const ACE_TCHAR * IMR_ACTIVATOR_DESCRIPTION;
 
 /**
  * @class Activator_NT_Service
diff --git a/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/orbsvcs/ImplRepo_Service/Activator_Options.cpp
index 7cbe66f8a76..f65379351a6 100644
--- a/orbsvcs/ImplRepo_Service/Activator_Options.cpp
+++ b/orbsvcs/ImplRepo_Service/Activator_Options.cpp
@@ -13,10 +13,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ImplRepo_Service,
-           Activator_Options,
-           "$Id$")
-
 #if defined (ACE_WIN32)
 static const HKEY SERVICE_REG_ROOT = HKEY_LOCAL_MACHINE;
 // This string must agree with the one used in Activator_NT_Service.h
diff --git a/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index af5a05a83d1..4e9843969ea 100644
--- a/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -167,7 +167,7 @@ run_service_command (Activator_Options& opts)
       int ret = SERVICE::instance ()->remove ();
       ACE_DEBUG ((LM_DEBUG, "ImR Activator: Service removed.\n"));
       if (ret == 0)
-        return 1; // If successfull, then we don't want to continue.
+        return 1; // If successful, then we don't want to continue.
     }
   else
     {
diff --git a/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
index f4dde176033..c0b22e1877e 100644
--- a/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
+++ b/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
@@ -124,7 +124,7 @@ private:
 
   /// The default environment buffer length
   int env_buf_len_;
- 
+
   /// Maximum number of environment variables
   int max_env_vars_;
 };
diff --git a/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index e13d1f3e60b..9f5fc0b42c6 100644
--- a/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -149,7 +149,7 @@ run_service_command (Options& opts)
       int ret = SERVICE::instance ()->remove ();
       ACE_DEBUG ((LM_DEBUG, "ImR: Service removed.\n"));
       if (ret == 0)
-        return 1; // If successfull, then we don't want to continue.
+        return 1; // If successful, then we don't want to continue.
     }
   else
     {
diff --git a/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 1aad53134c1..b8204ebca0e 100644
--- a/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -1108,7 +1108,7 @@ ImR_Locator_i::find (const char* server,
   else
     {
       ACE_NEW_THROW_EX (imr_info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ());
-
+      imr_info->startup.activation= ImplementationRepository::NORMAL;
       if (debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR: Cannot find server <%C>\n", server));
     }
diff --git a/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
index 7836342229b..0c7770da4e6 100644
--- a/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
+++ b/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
@@ -94,7 +94,7 @@ project(ImR_Locator) : orbsvcslib, orbsvcs_output, conv_lib, avoids_minimum_corb
 }
 
 project(ImR_Locator_Service) : orbsvcsexe, install_bin, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, iortable, messaging, acexml ,svc_utils, pi_server, imr_client {
-  exename  = ImplRepo_Service
+  exename  = tao_imr_locator
   after   += ImR_Locator ImR_Activator_IDL ImR_Locator_IDL
   libs    += TAO_ImR_Locator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL
   avoids  += uses_wchar
@@ -120,7 +120,7 @@ project(ImR_Locator_Service) : orbsvcsexe, install_bin, avoids_minimum_corba, av
 
 
 project(ImR_Activator_Service) : orbsvcsexe, install_bin, acexml, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, messaging, svc_utils, imr_client {
-  exename  = ImR_Activator
+  exename  = tao_imr_activator
   after   += ImR_Activator ImR_Activator_IDL ImR_Locator_IDL
   libs    += TAO_ImR_Activator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL
   Source_Files {
diff --git a/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
index 32d179e1fca..94b4fbc082a 100644
--- a/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
+++ b/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
@@ -22,6 +22,10 @@
 #include "tao/corba.h"
 #include "ace/Reactor.h"
 
+const ACE_TCHAR* IMR_LOCATOR_SERVICE_NAME = ACE_TEXT("TAOImR");
+const ACE_TCHAR* IMR_LOCATOR_DISPLAY_NAME = ACE_TEXT("TAO Implementation Repository");
+const ACE_TCHAR* IMR_LOCATOR_DESCRIPTION = ACE_TEXT("Implementation Repository Locator service for TAO");
+
 /**
  * Handles the SERVICE_CONTROL_SHUTDOWN and SERVICE_CONTROL_STOP commands
  * by shutting down the ORB.  Otherwise ACE_NT_Service::handle_control
diff --git a/orbsvcs/ImplRepo_Service/Locator_NT_Service.h b/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
index e570bdbe151..0d4d2cfe622 100644
--- a/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
+++ b/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
@@ -24,9 +24,9 @@
 #include "ace/Synch.h"
 #include "tao/orbconf.h"
 
-static const ACE_TCHAR* IMR_LOCATOR_SERVICE_NAME = ACE_TEXT("TAOImR");
-static const ACE_TCHAR* IMR_LOCATOR_DISPLAY_NAME = ACE_TEXT("TAO Implementation Repository");
-static const ACE_TCHAR* IMR_LOCATOR_DESCRIPTION = ACE_TEXT("Implementation Repository Locator service for TAO");
+extern const ACE_TCHAR* IMR_LOCATOR_SERVICE_NAME;
+extern const ACE_TCHAR* IMR_LOCATOR_DISPLAY_NAME;
+extern const ACE_TCHAR* IMR_LOCATOR_DESCRIPTION;
 
 /**
  * @class Locator_NT_Service
diff --git a/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/orbsvcs/ImplRepo_Service/Locator_Options.cpp
index 88408d3108e..8761db1bbaf 100644
--- a/orbsvcs/ImplRepo_Service/Locator_Options.cpp
+++ b/orbsvcs/ImplRepo_Service/Locator_Options.cpp
@@ -13,11 +13,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (ImplRepo_Service,
-           Options,
-           "$Id$")
-
-
 #if defined (ACE_WIN32)
 static const HKEY SERVICE_REG_ROOT = HKEY_LOCAL_MACHINE;
 // This string must agree with the one used in Locator_NT_Service.h
@@ -270,7 +265,7 @@ Options::save_registry_options ()
   LONG err = ACE_TEXT_RegCreateKeyEx (SERVICE_REG_ROOT,
                              SERVICE_REG_PATH,
                              0,
-                             ACE_TEXT(""), // class
+                             const_cast<ACE_TCHAR*> (ACE_TEXT("")), // class
                              REG_OPTION_NON_VOLATILE,
                              KEY_ALL_ACCESS,
                              0,
diff --git a/orbsvcs/ImplRepo_Service/Locator_Options.h b/orbsvcs/ImplRepo_Service/Locator_Options.h
index 2cf290d07c5..50af16887ac 100644
--- a/orbsvcs/ImplRepo_Service/Locator_Options.h
+++ b/orbsvcs/ImplRepo_Service/Locator_Options.h
@@ -145,7 +145,7 @@ private:
   /// The persistent XML file name.
   ACE_TString persist_file_name_;
 
-  /// Should check the server address and remove previous server if 
+  /// Should check the server address and remove previous server if
   /// the address is reused.
   bool unregister_if_address_reused_;
 };
diff --git a/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index 0974d75e53d..9b83c9acb41 100644
--- a/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "Locator_Repository.h"
 #include "Locator_XMLHandler.h"
 #include "utils.h"
@@ -9,8 +11,6 @@
 #include "ACEXML/common/FileCharStream.h"
 #include "ACEXML/common/XML_Util.h"
 
-ACE_RCSID (ImplRepo_Service, Locator_Repository, "$Id$")
-
 static const ACE_TCHAR* STARTUP_COMMAND = ACE_TEXT("StartupCommand");
 static const ACE_TCHAR* WORKING_DIR = ACE_TEXT("WorkingDir");
 static const ACE_TCHAR* ENVIRONMENT = ACE_TEXT("Environment");
@@ -138,8 +138,8 @@ public:
   {
   }
   virtual void next_server (const ACE_CString& server_id,
-    const ACE_CString& name, const ACE_CString& aname, 
-    const ACE_CString& cmdline, const Locator_XMLHandler::EnvList& envlst, 
+    const ACE_CString& name, const ACE_CString& aname,
+    const ACE_CString& cmdline, const Locator_XMLHandler::EnvList& envlst,
     const ACE_CString& dir, const ACE_CString& amodestr, int start_limit,
     const ACE_CString& partial_ior, const ACE_CString& ior)
   {
@@ -356,13 +356,13 @@ Locator_Repository::init(const Options& opts)
 int
 Locator_Repository::unregister_if_address_reused (
   const ACE_CString& server_id,
-  const ACE_CString& name, 
+  const ACE_CString& name,
   const char* partial_ior)
 {
   if (this->debug_ > 0)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)ImR: checking reuse address ")
-      ACE_TEXT ("for server \"%s %s\" ior \"%s\"\n"), 
+      ACE_TEXT ("for server \"%s %s\" ior \"%s\"\n"),
       server_id.c_str(), name.c_str (), partial_ior));
   }
 
@@ -373,16 +373,16 @@ Locator_Repository::unregister_if_address_reused (
   for (; siit.next (sientry); siit.advance() )
   {
     Server_Info_Ptr& info = sientry->int_id_;
-  
+
     if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)ImR: iterating - registered server")
-        ACE_TEXT ("\"%s %s\" ior \"%s\"\n"), info->server_id.c_str(), 
+        ACE_TEXT ("\"%s %s\" ior \"%s\"\n"), info->server_id.c_str(),
         info->name.c_str (), info->partial_ior.c_str ()));
     }
 
-    if (info->partial_ior == partial_ior 
-      && name != info->name 
+    if (info->partial_ior == partial_ior
+      && name != info->name
       && info->server_id != server_id)
     {
       if (this->debug_)
@@ -396,7 +396,7 @@ Locator_Repository::unregister_if_address_reused (
       }
     }
   }
-  
+
   int err = 0;
   for (size_t i = 0; i < srvs.size (); ++i)
   {
diff --git a/orbsvcs/ImplRepo_Service/Locator_Repository.h b/orbsvcs/ImplRepo_Service/Locator_Repository.h
index 302df853cc8..b41e75d4426 100644
--- a/orbsvcs/ImplRepo_Service/Locator_Repository.h
+++ b/orbsvcs/ImplRepo_Service/Locator_Repository.h
@@ -55,7 +55,7 @@ public:
   int init (const Options& opts);
 
   int unregister_if_address_reused (const ACE_CString& server_id,
-                                    const ACE_CString& name, 
+                                    const ACE_CString& name,
                                     const char* partial_ior);
 
   /// Add a new server to the Repository
diff --git a/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp b/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
index 55757e8c97f..cca3d951a82 100644
--- a/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
+++ b/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
@@ -3,8 +3,6 @@
 #include "Locator_XMLHandler.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (ImplRepo_Service,Locator_XMLHandler,"$Id$")
-
 const ACE_TCHAR* Locator_XMLHandler::ROOT_TAG = ACE_TEXT("ImplementationRepository");
 const ACE_TCHAR* Locator_XMLHandler::SERVER_INFO_TAG = ACE_TEXT("Servers");
 const ACE_TCHAR* Locator_XMLHandler::ACTIVATOR_INFO_TAG = ACE_TEXT("Activators");
diff --git a/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h b/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
index 5ab9d4bbc65..643ea3408f3 100644
--- a/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
+++ b/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
@@ -46,10 +46,10 @@ public:
     virtual ~Callback() {}
 
     virtual void next_server (const ACE_CString& server_id,
-      const ACE_CString& server_name, const ACE_CString& aname, 
-      const ACE_CString& startup_cmd, const EnvList& env_vars, 
-      const ACE_CString& working_dir, const ACE_CString& actmode, 
-      int start_limit, const ACE_CString& partial_ior, 
+      const ACE_CString& server_name, const ACE_CString& aname,
+      const ACE_CString& startup_cmd, const EnvList& env_vars,
+      const ACE_CString& working_dir, const ACE_CString& actmode,
+      int start_limit, const ACE_CString& partial_ior,
       const ACE_CString& ior) = 0;
 
     virtual void next_activator (const ACE_CString& activator_name,
diff --git a/orbsvcs/ImplRepo_Service/Makefile.am b/orbsvcs/ImplRepo_Service/Makefile.am
deleted file mode 100644
index 805e88f70b0..00000000000
--- a/orbsvcs/ImplRepo_Service/Makefile.am
+++ /dev/null
@@ -1,462 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_LTLIBRARIES =
-CLEANFILES =
-BUILT_SOURCES =
-bin_PROGRAMS =
-noinst_HEADERS =
-
-## Makefile.ImR_Activator_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  ImR_ActivatorC.cpp \
-  ImR_ActivatorC.h \
-  ImR_ActivatorC.inl \
-  ImR_ActivatorS.cpp \
-  ImR_ActivatorS.h \
-  ImR_ActivatorS.inl
-
-CLEANFILES += \
-  ImR_Activator-stamp \
-  ImR_ActivatorC.cpp \
-  ImR_ActivatorC.h \
-  ImR_ActivatorC.inl \
-  ImR_ActivatorS.cpp \
-  ImR_ActivatorS.h \
-  ImR_ActivatorS.inl
-
-ImR_ActivatorC.cpp ImR_ActivatorC.h ImR_ActivatorC.inl ImR_ActivatorS.cpp ImR_ActivatorS.h ImR_ActivatorS.inl: ImR_Activator-stamp
-
-ImR_Activator-stamp: $(srcdir)/ImR_Activator.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl
-	@touch $@
-
-noinst_LTLIBRARIES += libTAO_ImR_Activator_IDL.la
-
-libTAO_ImR_Activator_IDL_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACTIVATOR_IDL_BUILD_DLL
-
-libTAO_ImR_Activator_IDL_la_SOURCES = \
-  ImR_ActivatorC.cpp \
-  ImR_ActivatorS.cpp
-
-noinst_HEADERS += \
-  ImR_Activator.idl \
-  ImR_ActivatorC.h \
-  ImR_ActivatorC.inl \
-  ImR_ActivatorS.h \
-  ImR_ActivatorS.inl \
-  activator_idl_export.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.ImR_Locator_IDL.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  ImR_LocatorC.cpp \
-  ImR_LocatorC.h \
-  ImR_LocatorC.inl \
-  ImR_LocatorS.cpp \
-  ImR_LocatorS.h \
-  ImR_LocatorS.inl
-
-CLEANFILES += \
-  ImR_Locator-stamp \
-  ImR_LocatorC.cpp \
-  ImR_LocatorC.h \
-  ImR_LocatorC.inl \
-  ImR_LocatorS.cpp \
-  ImR_LocatorS.h \
-  ImR_LocatorS.inl
-
-ImR_LocatorC.cpp ImR_LocatorC.h ImR_LocatorC.inl ImR_LocatorS.cpp ImR_LocatorS.h ImR_LocatorS.inl: ImR_Locator-stamp
-
-ImR_Locator-stamp: $(srcdir)/ImR_Locator.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h $(srcdir)/ImR_Locator.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  AsyncStartupWaiterC.cpp \
-  AsyncStartupWaiterC.h \
-  AsyncStartupWaiterC.inl \
-  AsyncStartupWaiterS.cpp \
-  AsyncStartupWaiterS.h \
-  AsyncStartupWaiterS.inl
-
-CLEANFILES += \
-  AsyncStartupWaiter-stamp \
-  AsyncStartupWaiterC.cpp \
-  AsyncStartupWaiterC.h \
-  AsyncStartupWaiterC.inl \
-  AsyncStartupWaiterS.cpp \
-  AsyncStartupWaiterS.h \
-  AsyncStartupWaiterS.inl
-
-AsyncStartupWaiterC.cpp AsyncStartupWaiterC.h AsyncStartupWaiterC.inl AsyncStartupWaiterS.cpp AsyncStartupWaiterS.h AsyncStartupWaiterS.inl: AsyncStartupWaiter-stamp
-
-AsyncStartupWaiter-stamp: $(srcdir)/AsyncStartupWaiter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h -GH $(srcdir)/AsyncStartupWaiter.idl
-	@touch $@
-
-noinst_LTLIBRARIES += libTAO_ImR_Locator_IDL.la
-
-libTAO_ImR_Locator_IDL_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DLOCATOR_IDL_BUILD_DLL
-
-libTAO_ImR_Locator_IDL_la_SOURCES = \
-  AsyncStartupWaiterC.cpp \
-  AsyncStartupWaiterS.cpp \
-  ImR_LocatorC.cpp \
-  ImR_LocatorS.cpp
-
-noinst_HEADERS += \
-  AsyncStartupWaiter.idl \
-  AsyncStartupWaiterC.h \
-  AsyncStartupWaiterC.inl \
-  AsyncStartupWaiterS.h \
-  AsyncStartupWaiterS.inl \
-  ImR_Locator.idl \
-  ImR_LocatorC.h \
-  ImR_LocatorC.inl \
-  ImR_LocatorS.h \
-  ImR_LocatorS.inl \
-  locator_idl_export.h
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.ImR_Activator.am
-
-if BUILD_ACEXML
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_LTLIBRARIES += libTAO_ImR_Activator.la
-
-libTAO_ImR_Activator_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(ACE_ROOT)/ACEXML/common \
-  -DACTIVATOR_BUILD_DLL
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-libTAO_ImR_Activator_la_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
-libTAO_ImR_Activator_la_SOURCES = \
-  Activator_Loader.cpp \
-  Activator_Options.cpp \
-  ImR_Activator_i.cpp
-
-libTAO_ImR_Activator_la_LDFLAGS = 
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-libTAO_ImR_Activator_la_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
-noinst_HEADERS += \
-  Activator_Loader.h \
-  Activator_Options.h \
-  ImR_Activator_i.h \
-  activator_export.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACEXML
-
-## Makefile.ImR_Activator_Service.am
-
-if BUILD_ACEXML
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-bin_PROGRAMS += ImR_Activator
-
-ImR_Activator_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(ACE_ROOT)/ACEXML/common \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-ImR_Activator_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
-ImR_Activator_SOURCES = \
-  Activator_NT_Service.cpp \
-  ImR_Activator.cpp \
-  Activator_NT_Service.h
-
-ImR_Activator_LDFLAGS = 
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-ImR_Activator_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
-ImR_Activator_LDADD = \
-  libTAO_ImR_Activator.la \
-  libTAO_ImR_Activator_IDL.la \
-  libTAO_ImR_Locator_IDL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
-  $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-ImR_Activator_LDADD += \
-  $(ACE_ZZIP_LIBS) \
-  $(ACE_ZLIB_LIBS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACEXML
-
-## Makefile.ImR_Locator.am
-
-if BUILD_ACEXML
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_LTLIBRARIES += libTAO_ImR_Locator.la
-
-libTAO_ImR_Locator_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(ACE_ROOT)/ACEXML/common \
-  -DLOCATOR_BUILD_DLL
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-libTAO_ImR_Locator_la_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
-libTAO_ImR_Locator_la_SOURCES = \
-  Activator_Info.cpp \
-  Adapter_Activator.cpp \
-  AsyncStartupWaiter_i.cpp \
-  Forwarder.cpp \
-  INS_Locator.cpp \
-  ImR_Locator_i.cpp \
-  Iterator.cpp \
-  Locator_Loader.cpp \
-  Locator_Options.cpp \
-  Locator_Repository.cpp \
-  Locator_XMLHandler.cpp \
-  Server_Info.cpp
-
-libTAO_ImR_Locator_la_LDFLAGS = 
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-libTAO_ImR_Locator_la_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
-noinst_HEADERS += \
-  Activator_Info.h \
-  Adapter_Activator.h \
-  AsyncStartupWaiter_i.h \
-  Forwarder.h \
-  INS_Locator.h \
-  ImR_Locator_i.h \
-  Iterator.h \
-  Locator_Loader.h \
-  Locator_Options.h \
-  Locator_Repository.h \
-  Locator_XMLHandler.h \
-  Server_Info.h \
-  locator_export.h \
-  utils.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACEXML
-
-## Makefile.ImR_Locator_Service.am
-
-if BUILD_ACEXML
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-bin_PROGRAMS += ImplRepo_Service
-
-ImplRepo_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(ACE_ROOT)/ACEXML/common \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-ImplRepo_Service_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
-ImplRepo_Service_SOURCES = \
-  ImR_Locator.cpp \
-  Locator_NT_Service.cpp \
-  Locator_NT_Service.h
-
-ImplRepo_Service_LDFLAGS =
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-ImplRepo_Service_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
-ImplRepo_Service_LDADD = \
-  libTAO_ImR_Locator.la \
-  libTAO_ImR_Activator_IDL.la \
-  libTAO_ImR_Locator_IDL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
-  $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-ImplRepo_Service_LDADD += \
-  $(ACE_ZZIP_LIBS) \
-  $(ACE_ZLIB_LIBS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACEXML
-
-## Makefile.tao_imr.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS += tao_imr
-
-tao_imr_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-tao_imr_SOURCES = \
-  tao_imr.cpp \
-  tao_imr_i.cpp \
-  tao_imr_i.h
-
-tao_imr_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/ImplRepo_Service/README.txt b/orbsvcs/ImplRepo_Service/README.txt
index f6f8082f21b..9579012f2d7 100644
--- a/orbsvcs/ImplRepo_Service/README.txt
+++ b/orbsvcs/ImplRepo_Service/README.txt
@@ -186,9 +186,9 @@ Commandline Arguments that can be passed to ImplRepo_Service
 -o  generate the ior.
 -x  support persistence to the ImplRepo_Service. We use XML to support
     persistence. Names of the activators registered with the locator,
-	their IORs, and the servers registered with each of the activators are 
-	saved to the xml file. Use this option to pass the name of the file 
-	where the data has to be saved. 
+	their IORs, and the servers registered with each of the activators are
+	saved to the xml file. Use this option to pass the name of the file
+	where the data has to be saved.
 
 	And, ofcourse, the ORB Options.
 
@@ -510,18 +510,18 @@ The Implementation Repository supports start and stop but not pause.
 When the Activator is installed using ImR_Activator -c install, it is added
 with a dependency on a locator service. If you don't wish to also install
 the locator on the same machine, then you must use the -c install_no_imr
-option instead. 
+option instead.
 
 @subsection serviceopts Service Options
 
 Any options that are specified along with -c install, will be saved in
-the registry under 
+the registry under
 HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TAOIMRActivator\Parameters and
-HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TAOIMRLocator\Parameters. 
+HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TAOIMRLocator\Parameters.
 For example:
 ImR_Activator -c install -d 3 -l -m -o activator.ior -x persist.xml -t 30 -orbendpoint iiop://:9988 -orbdebuglevel 1
 
-The order of arguments makes no difference, but you must run 
+The order of arguments makes no difference, but you must run
 -c remove and then -c install if you want to change the parameters.
 
 You can also manually change these using the typical regedit utility.
diff --git a/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index 1d7be573714..3c80579dd5f 100644
--- a/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -11,7 +11,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_strings.h"
-#include "ace/OS.h"
+#include "ace/os_include/os_netdb.h"
+#include "ace/OS_NS_unistd.h"
 
 TAO_IMR_i::TAO_IMR_i (void)
 : imr_ (ImplementationRepository::Administration::_nil ())
@@ -1017,6 +1018,7 @@ TAO_IMR_Op_Register::run (void)
             ACE_DEBUG((LM_DEBUG, "Adding Server <%C> on update command.\n", this->server_name_.c_str ()));
             is_add_ = true;
           }
+          local.activation= ImplementationRepository::NORMAL;
           options = &local;
         }
 
diff --git a/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
index bb6be70b13c..c56a9ec5ee6 100644
--- a/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
+++ b/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
@@ -1,22 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Criteria_Evaluator.cpp
-//
-// = DESCRIPTION
-//    An Evaluator for the CosLifeCycle Criteria
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Criteria_Evaluator.cpp
+ *
+ *  $Id$
+ *
+ *  An Evaluator for the CosLifeCycle Criteria
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "Criteria_Evaluator.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(LifeCycle_Service, Criteria_Evaluator, "$Id$")
+
 
 Criteria_Evaluator::Criteria_Evaluator (const CosLifeCycle::Criteria &criteria)
 : criteria_ (criteria)
diff --git a/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
index 346685a6993..ff2550745cf 100644
--- a/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
+++ b/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
@@ -1,17 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Criteria_Evaluaotr.h
-//
-// = DESCRIPTION
-//    An Evaluator for the CosLifeCycle Criteria
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Criteria_Evaluator.h
+ *
+ *  $Id$
+ *
+ *  An Evaluator for the CosLifeCycle Criteria
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 
 #include "orbsvcs/CosLifeCycleC.h"
@@ -20,10 +20,12 @@
 #ifndef CRITERIA_EVALUATOR_H_H
 #define CRITERIA_EVALUATOR_H_H
 
+/**
+ * @class Criteria_Evaluator//
+ *
+ */
 class Criteria_Evaluator// : public LifeCycleService::Criteria_Evaluator
 {
-  // = TITLE
-  //
 public:
   Criteria_Evaluator (const CosLifeCycle::Criteria &criteria);
   ~Criteria_Evaluator (void);
diff --git a/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
index 311a4876080..aced8420040 100644
--- a/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
+++ b/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
@@ -1,31 +1,25 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//   Factory_Trader.cpp
-//
-// = DESCRIPTION
-//   A colocated instance of the Trading Service, only part of
-//   the functionality provided is used. This class serves
-//   as Wrapper around the Trading Service and provides
-//   smaller interfaces.
-//   TRADER_AVAILABLE is defined via compiler switch in the Makefile
-//
-// = AUTHOR
-//   Michael Kircher  (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Factory_Trader.cpp
+ *
+ *  $Id$
+ *
+ * A colocated instance of the Trading Service, only part of
+ * the functionality provided is used. This class serves
+ * as Wrapper around the Trading Service and provides
+ * smaller interfaces.
+ * TRADER_AVAILABLE is defined via compiler switch in the Makefile
+ *
+ *
+ *  @author Michael Kircher  (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "Factory_Trader.h"
 #include "orbsvcs/CosTradingC.h"
 
-ACE_RCSID (LifeCycle_Service,
-           Factory_Trader,
-           "$Id$")
-
 // This const char * is used for adding a new type to the service repository
 // the added types will be subclasses of this.
 const char * Factory_Trader::GENERIC_FACTORY_INTERFACE_REPOSITORY_ID =
diff --git a/orbsvcs/LifeCycle_Service/Factory_Trader.h b/orbsvcs/LifeCycle_Service/Factory_Trader.h
index ebf8a024d32..430a5c3f65c 100644
--- a/orbsvcs/LifeCycle_Service/Factory_Trader.h
+++ b/orbsvcs/LifeCycle_Service/Factory_Trader.h
@@ -1,18 +1,14 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//   Factory_Trader.cpp
-//
-// = DESCRIPTION
-//   Factory Trader for the Generic Factory.
-//
-// = AUTHOR
-//   Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Factory_Trader.h
+ *
+ *  $Id$
+ *
+ * Factory Trader for the Generic Factory.
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
 
 #ifndef FACTORY_TRADER_H
 #define FACTORY_TRADER_H
@@ -21,24 +17,23 @@
 #include "orbsvcs/Trader/Service_Type_Repository.h"
 #include "orbsvcs/CosLifeCycleC.h"
 
-
 class Factory_Trader
 {
 public:
   Factory_Trader (int debug_level = 1);
   ~Factory_Trader ();
 
+  /// Add a the Factory type to the repository
   void add_type ();
-  // Add a the Factory type to the repository
 
+  /// export a specific factory
   void _cxx_export (const char * name,
                     const char * location,
                     const char * description,
                     const CORBA::Object_ptr object_ptr);
-  // export a specific factory
 
+  /// query for a specific factory using a constraint
   CORBA::Object_ptr query (const char* constraint);
-  // query for a specific factory using a constraint
 
   static const char * GENERIC_FACTORY_INTERFACE_REPOSITORY_ID;
 private:
@@ -47,8 +42,8 @@ private:
   TAO_Trading_Components_i *trading_Components_ptr_;
   TAO_Support_Attributes_i *support_Attributes_ptr_;
 
+  /// debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
   int debug_level_;
-  // debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
 };
 
 #endif // FACTORY_TRADER_H
diff --git a/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
index 4a1dd636eeb..fad363a4c76 100644
--- a/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+++ b/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
@@ -1,27 +1,23 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Life_Cycle_Service.cpp
-//
-// = DESCRIPTION
-//    The server for the LifeCycleService of the quoter example.
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    LifeCycle_Service.cpp
+ *
+ *  $Id$
+ *
+ *  The server for the LifeCycleService of the quoter example.
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "LifeCycle_Service.h"
 
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_main.h"
 
-ACE_RCSID (LifeCycle_Service,
-           LifeCycle_Service,
-           "$Id$")
-
 Life_Cycle_Service_Server::Life_Cycle_Service_Server (void)
 :   debug_level_ (1)
 {
diff --git a/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
index 112c0e431b5..553be958ec7 100644
--- a/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
+++ b/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
@@ -1,17 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    LifeCycle_Service.h
-//
-// = DESCRIPTION
-//    A creation service for objects using the CosLifeCycle GenericFactory.
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    LifeCycle_Service.h
+ *
+ *  $Id$
+ *
+ *  A creation service for objects using the CosLifeCycle GenericFactory.
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 
@@ -25,41 +25,44 @@
 #ifndef LIFECYCLE_SERVICE_H
 #define LIFECYCLE_SERVICE_H
 
+/**
+ * @class Life_Cycle_Service_Server
+ = TILE
+ * Server object for the LifeCycle Service
+ */
 class Life_Cycle_Service_Server
 {
-  // = TILE
-  //   Server object for the LifeCycle Service
 
 public:
+  /// Default constructor
   Life_Cycle_Service_Server (void);
-  // Default constructor
 
+  /// Destructor
   ~Life_Cycle_Service_Server (void);
-  // Destructor
 
+  /// Initialize the Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the Server state - parsing arguments and ...
 
+  /// Run the orb.
   int run (void);
-  // Run the orb.
 
+  /// Parse the passed parameters.
   u_int parse_args (int argc,
                     ACE_TCHAR* argv[]);
-  // Parse the passed parameters.
 
 private:
+  /// instance of the ORB Manager
   TAO_ORB_Manager orb_manager_;
-  // instance of the ORB Manager
 
+  /// Instance of the creation service
   Life_Cycle_Service_i *life_Cycle_Service_i_ptr_;
-  // Instance of the creation service
 
+  /// reference to the naming service
   CosNaming::NamingContext_var namingContext_var_;
-  // reference to the naming service
 
+  /// debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
   int debug_level_;
-  // debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
 };
 
 #endif /* LIFECYCLE_SERVICE_H */
diff --git a/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
index 2d723964e3a..82dac4d7097 100644
--- a/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
+++ b/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
@@ -2,5 +2,5 @@
 // $Id$
 
 project : orbsvcsexe, lifecycle_skel, naming, trading_serv, avoids_minimum_corba, utils, install {
-  exename  = LifeCycle_Service
+  exename  = tao_coslifecycle
 }
diff --git a/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
index 198090406b5..fed71de5836 100644
--- a/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
+++ b/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
@@ -1,17 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Life_Cycle_Service_i.cpp
-//
-// = DESCRIPTION
-//    The implementation of a LifeCycle Service GenericFactory.
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    LifeCycle_Service_i.cpp
+ *
+ *  $Id$
+ *
+ *  The implementation of a LifeCycle Service GenericFactory.
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 
@@ -19,10 +19,6 @@
 
 #include "LifeCycle_Service_i.h"
 
-ACE_RCSID (LifeCycle_Service,
-           LifeCycle_Service_i,
-           "$Id$")
-
 // Constructor
 Life_Cycle_Service_i::Life_Cycle_Service_i (int debug_level)
   : factory_trader_ptr_ (0),
diff --git a/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
index 2d0aa105925..9be8a4d7077 100644
--- a/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
+++ b/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
@@ -1,17 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    LifeCycle_Service_i.h
-//
-// = DESCRIPTION
-//    A Life Cycle Service for the Quoter example.
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    LifeCycle_Service_i.h
+ *
+ *  $Id$
+ *
+ *  A Life Cycle Service for the Quoter example.
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "orbsvcs/LifeCycleServiceS.h"
 #include "Factory_Trader.h"
@@ -20,24 +20,29 @@
 #ifndef LIFECYCLE_SERVICE_IMPL_H
 #define LIFECYCLE_SERVICE_IMPL_H
 
+/**
+ * @class Life_Cycle_Service_i
+ = TILE
+ * A CosLifeCycle conforming Generic Factory.
+ */
 class Life_Cycle_Service_i : public POA_LifeCycleService::Life_Cycle_Service
 {
-  // = TILE
-  //   A CosLifeCycle conforming Generic Factory.
 
 public:
   Life_Cycle_Service_i (int debug_level = 1);
   ~Life_Cycle_Service_i (void);
 
+  /// Returns true if the Generic Factory is able to forward a request
+  /// for creating an object described by the <factory_key>.
   CORBA::Boolean supports (const CosLifeCycle::Key &factory_key);
-  // Returns true if the Generic Factory is able to forward a request
-  // for creating an object described by the <factory_key>.
 
+  /**
+   * Returns an object reference to a newly created object, though the
+   * Generic Factory itself cannot create objects, it will forward the
+   * request to a more concrete Factory.
+   */
   CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key,
                                    const CosLifeCycle::Criteria &the_criteria);
-  // Returns an object reference to a newly created object, though the
-  // Generic Factory itself cannot create objects, it will forward the
-  // request to a more concrete Factory.
 
   void register_factory (const char * name,
                          const char * location,
@@ -49,8 +54,8 @@ public:
 private:
   Factory_Trader *factory_trader_ptr_;
 
+  /// debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
   int debug_level_;
-  // debug level (0 = quiet, 1 = default, informative, 2+ = noisy);
 };
 
 #endif /* LIFECYCLE_SERVICE_IMPL_H */
diff --git a/orbsvcs/LifeCycle_Service/Makefile.am b/orbsvcs/LifeCycle_Service/Makefile.am
deleted file mode 100644
index d57e20688f3..00000000000
--- a/orbsvcs/LifeCycle_Service/Makefile.am
+++ /dev/null
@@ -1,67 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.LifeCycle_Service.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS = LifeCycle_Service
-
-LifeCycle_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-LifeCycle_Service_SOURCES = \
-  Criteria_Evaluator.cpp \
-  Factory_Trader.cpp \
-  LifeCycle_Service.cpp \
-  LifeCycle_Service_i.cpp \
-  Criteria_Evaluator.h \
-  Factory_Trader.h \
-  LifeCycle_Service.h \
-  LifeCycle_Service_i.h
-
-LifeCycle_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/LoadBalancer/LoadBalancer.mpc b/orbsvcs/LoadBalancer/LoadBalancer.mpc
index 2308fcc514c..c4fac513cd1 100644
--- a/orbsvcs/LoadBalancer/LoadBalancer.mpc
+++ b/orbsvcs/LoadBalancer/LoadBalancer.mpc
@@ -4,7 +4,7 @@
 
 
 project(LoadManager): namingexe, portableserver, install, iortable, iormanip, loadbalancing {
-  exename  = LoadManager
+  exename  = tao_loadmanager
   requires += ami interceptors
   Source_Files {
     LoadManager.cpp
@@ -14,7 +14,7 @@ project(LoadManager): namingexe, portableserver, install, iortable, iormanip, lo
 
 project(LoadMonitor): namingexe, portableserver, install, loadbalancing {
   requires += ami interceptors
-  exename  = LoadMonitor
+  exename  = tao_loadmonitor
   Source_Files {
     LoadMonitor.cpp
     Push_Handler.cpp
diff --git a/orbsvcs/LoadBalancer/LoadManager.cpp b/orbsvcs/LoadBalancer/LoadManager.cpp
index 9f150cd7159..237047cce37 100644
--- a/orbsvcs/LoadBalancer/LoadManager.cpp
+++ b/orbsvcs/LoadBalancer/LoadManager.cpp
@@ -1,9 +1,8 @@
-#include "Signal_Handler.h"
+// $Id$
 
+#include "Signal_Handler.h"
 #include "orbsvcs/LoadBalancing/LB_LoadManager.h"
-
 #include "tao/ORB_Core.h"
-
 #include "ace/Get_Opt.h"
 #include "ace/OS_main.h"
 #include "ace/OS_NS_strings.h"
@@ -14,15 +13,9 @@
 # include "ace/Signal.h"
 #endif /* linux && ACE_HAS_THREADS */
 
-
-ACE_RCSID (LoadBalancer,
-           LoadBalancer,
-           "$Id$")
-
-
 static const ACE_TCHAR *lm_ior_file = ACE_TEXT("lm.ior");
 static int ping_timeout_milliseconds = 2000;
-static int ping_interval_seconds = 0; 
+static int ping_interval_seconds = 0;
 
 void
 usage (const ACE_TCHAR * cmd)
diff --git a/orbsvcs/LoadBalancer/LoadMonitor.cpp b/orbsvcs/LoadBalancer/LoadMonitor.cpp
index 838c077e17e..7f6e6b8f473 100644
--- a/orbsvcs/LoadBalancer/LoadMonitor.cpp
+++ b/orbsvcs/LoadBalancer/LoadMonitor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "Push_Handler.h"
 #include "Monitor_Signal_Handler.h"
 
@@ -11,12 +13,6 @@
 #include "ace/OS_main.h"
 #include "ace/OS_NS_strings.h"
 
-
-ACE_RCSID (LoadBalancer,
-           LoadMonitor,
-           "$Id$")
-
-
 static const ACE_TCHAR * location_id = 0;
 static const ACE_TCHAR * location_kind = 0;
 static const ACE_TCHAR * mtype = ACE_TEXT("CPU");
@@ -283,14 +279,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                reactor,
                                timer_id);
 
-      CosLoadBalancing::LoadManager_ptr tmp;;
-
-      if (timer_id == -1)
-        tmp = load_manager.in ();   // PULL monitoring
-      else
-        tmp = CosLoadBalancing::LoadManager::_nil ();  // PUSH
-                                                       // monitoring
-
 #if defined (linux) && defined (ACE_HAS_THREADS)
       if (ACE_Thread_Manager::instance ()->spawn (::TAO_LB_run_load_monitor,
                                                   orb.in ()) == -1)
@@ -329,6 +317,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // ensure graceful shutdown of the LoadMonitor so that
       // LoadMonitors registered with the LoadManager can be
       // deregistered.
+      CosLoadBalancing::LoadManager_ptr tmp;
+
+      if (timer_id == -1)
+        tmp = load_manager.in ();   // PULL monitoring
+      else
+        tmp = CosLoadBalancing::LoadManager::_nil ();  // PUSH
+                                                       // monitoring
       TAO_LB_Monitor_Signal_Handler signal_handler (
          orb.in (),
          root_poa.in (),
diff --git a/orbsvcs/LoadBalancer/Makefile.am b/orbsvcs/LoadBalancer/Makefile.am
deleted file mode 100644
index d3634c76188..00000000000
--- a/orbsvcs/LoadBalancer/Makefile.am
+++ /dev/null
@@ -1,117 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-bin_PROGRAMS =
-
-## Makefile.LoadManager.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-bin_PROGRAMS += LoadManager
-
-LoadManager_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-LoadManager_SOURCES = \
-  LoadManager.cpp \
-  Signal_Handler.cpp \
-  Signal_Handler.h
-
-LoadManager_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LoadMonitor.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-bin_PROGRAMS += LoadMonitor
-
-LoadMonitor_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-LoadMonitor_SOURCES = \
-  LoadMonitor.cpp \
-  Monitor_Signal_Handler.cpp \
-  Push_Handler.cpp \
-  Signal_Handler.cpp \
-  Monitor_Signal_Handler.h \
-  Push_Handler.h \
-  Signal_Handler.h
-
-LoadMonitor_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp b/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
index 1d333942057..985cf5267be 100644
--- a/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
+++ b/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
@@ -1,10 +1,6 @@
-#include "Monitor_Signal_Handler.h"
-
-
-ACE_RCSID (LoadBalancer,
-           Monitor_Signal_Handler,
-           "$Id$")
+// $Id$
 
+#include "Monitor_Signal_Handler.h"
 
 TAO_LB_Monitor_Signal_Handler::TAO_LB_Monitor_Signal_Handler (
   CORBA::ORB_ptr orb,
diff --git a/orbsvcs/LoadBalancer/Push_Handler.cpp b/orbsvcs/LoadBalancer/Push_Handler.cpp
index f63d8e11bc4..a11f4723eeb 100644
--- a/orbsvcs/LoadBalancer/Push_Handler.cpp
+++ b/orbsvcs/LoadBalancer/Push_Handler.cpp
@@ -1,13 +1,8 @@
-#include "Push_Handler.h"
+// $Id$
 
+#include "Push_Handler.h"
 #include "tao/debug.h"
 
-
-ACE_RCSID (LoadBalancing,
-           Push_Handler,
-           "$Id$")
-
-
 TAO_LB_Push_Handler::TAO_LB_Push_Handler (
   CosLoadBalancing::LoadMonitor_ptr monitor,
   const PortableGroup::Location & location,
diff --git a/orbsvcs/LoadBalancer/Signal_Handler.cpp b/orbsvcs/LoadBalancer/Signal_Handler.cpp
index 24fda5bcdea..dc1f3acf257 100644
--- a/orbsvcs/LoadBalancer/Signal_Handler.cpp
+++ b/orbsvcs/LoadBalancer/Signal_Handler.cpp
@@ -1,13 +1,9 @@
-#include "Signal_Handler.h"
+// $Id$
 
+#include "Signal_Handler.h"
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
 
-ACE_RCSID (LoadBalancer,
-           Signal_Handler,
-           "$Id$")
-
-
 TAO_LB_Signal_Handler::TAO_LB_Signal_Handler (CORBA::ORB_ptr orb,
                                               PortableServer::POA_ptr poa)
   :
diff --git a/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp b/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
index bc99c5e9ed0..7ca6044c88c 100644
--- a/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
+++ b/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
@@ -1,14 +1,11 @@
+// $Id$
+
 #include "Basic_Logging_Service.h"
 #include "ace/OS_main.h"
 
 #include "orbsvcs/Shutdown_Utilities.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Basic_Logging_Service,
-           Basic_Logging_Server,
-           "$Id$")
-
-
 class Logging_Svc_Shutdown
   : public Shutdown_Functor
 {
diff --git a/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
index c10fdccfbe2..5df01ba1da6 100644
--- a/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
+++ b/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "Basic_Logging_Service.h"
 #include "ace/Get_Opt.h"
 #include "orbsvcs/Log/BasicLogFactory_i.h"
@@ -5,11 +7,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (Basic_Logging_Service,
-           Basic_Logging_Service,
-           "$Id$")
-
-
 Basic_Logging_Service::Basic_Logging_Service (void)
   : service_name_ ("BasicLogFactory"),
     ior_file_name_ (0),
diff --git a/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc b/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
index 96b23dc90ff..7525cb07301 100644
--- a/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
+++ b/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
@@ -1,5 +1,5 @@
 // $Id$
 
 project: namingexe, iortable, install, dslogadmin_serv, valuetype {
-  exename   = Basic_Logging_Service
+  exename   = tao_tls_basic
 }
diff --git a/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
deleted file mode 100644
index 107b0ec0130..00000000000
--- a/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
+++ /dev/null
@@ -1,64 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Basic_Logging_Service.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS = Basic_Logging_Service
-
-Basic_Logging_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Basic_Logging_Service_SOURCES = \
-  Basic_Logging_Server.cpp \
-  Basic_Logging_Service.cpp \
-  Basic_Logging_Service.h
-
-Basic_Logging_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp b/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
index 87cc3001423..a17b9eb00f1 100644
--- a/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
+++ b/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
@@ -1,14 +1,11 @@
+// $Id$
+
 #include "Event_Logging_Service.h"
 #include "ace/OS_main.h"
 
 #include "orbsvcs/Shutdown_Utilities.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Event_Logging_Service,
-           Event_Logging_Server,
-           "$Id$")
-
-
 class Logging_Svc_Shutdown
   : public Shutdown_Functor
 {
diff --git a/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
index 682a0c79ab9..4e0fa703fc0 100644
--- a/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
+++ b/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "Event_Logging_Service.h"
 #include "ace/Get_Opt.h"
 #include "orbsvcs/Log/EventLogFactory_i.h"
@@ -6,11 +8,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (Event_Logging_Service,
-           Event_Logging_Service,
-           "$Id$")
-
-
 Event_Logging_Service::Event_Logging_Service (void)
   : service_name_ ("EventLogFactory"),
     ior_file_name_ (0),
diff --git a/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc b/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc
index acd7db3bb72..b334a0094ba 100644
--- a/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc
+++ b/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc
@@ -1,5 +1,5 @@
 // $Id$
 
 project: namingexe, iortable, install, dseventlogadmin_serv, valuetype {
-  exename   = Event_Logging_Service
+  exename   = tao_tls_event
 }
diff --git a/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
deleted file mode 100644
index 71ba73190cf..00000000000
--- a/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
+++ /dev/null
@@ -1,76 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Event_Logging_Service.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS = Event_Logging_Service
-
-Event_Logging_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Event_Logging_Service_SOURCES = \
-  Event_Logging_Server.cpp \
-  Event_Logging_Service.cpp \
-  Event_Logging_Service.h
-
-Event_Logging_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/Logging_Service/Makefile.am b/orbsvcs/Logging_Service/Makefile.am
deleted file mode 100644
index 12d820f5b52..00000000000
--- a/orbsvcs/Logging_Service/Makefile.am
+++ /dev/null
@@ -1,16 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Basic_Logging_Service \
-        Event_Logging_Service \
-        Notify_Logging_Service \
-        RTEvent_Logging_Service
-
diff --git a/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
deleted file mode 100644
index 5d8828a0b45..00000000000
--- a/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
+++ /dev/null
@@ -1,75 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Notify_Logging_Service.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS = Notify_Logging_Service
-
-Notify_Logging_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Notify_Logging_Service_SOURCES = \
-  Notify_Logging_Server.cpp \
-  Notify_Logging_Service.cpp \
-  Notify_Logging_Service.h
-
-Notify_Logging_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp b/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
index db653aadbbb..4d40592098a 100644
--- a/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
+++ b/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
@@ -1,14 +1,10 @@
 //$Id$
+
 #include "Notify_Logging_Service.h"
 #include "ace/OS_main.h"
 #include "orbsvcs/Shutdown_Utilities.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Notify_Logging_Service,
-           Notify_Logging_Server,
-           "$Id$")
-
-
 class Logging_Svc_Shutdown
   : public Shutdown_Functor
 {
diff --git a/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index e165dee7c6b..8ffcc60902d 100644
--- a/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "Notify_Logging_Service.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
@@ -6,11 +8,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (Notify_Logging_Service,
-           Notify_Logging_Service,
-           "$Id$")
-
-
 Notify_Logging_Service::Notify_Logging_Service (void)
   : service_name_ (NOTIFY_KEY),
     ior_file_name_ (0),
diff --git a/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc b/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
index 262cc2a4339..c13b36fb8aa 100644
--- a/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
+++ b/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
@@ -1,5 +1,5 @@
 // $Id$
 
 project: namingexe, iortable, install, dsnotifylogadmin_serv, valuetype {
-  exename   = Notify_Logging_Service
+  exename   = tao_tls_notify
 }
diff --git a/orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf b/orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf
index 8ffdb5ee8f1..f58e8235c08 100755
--- a/orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf
+++ b/orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf
@@ -1,3 +1,4 @@
 ##$Id$
+
 ## Load the static Cos Notification Service
 static Notify_Default_Event_Manager_Objects_Factory "-MTDispatching -DispatchingThreads 1"
diff --git a/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
deleted file mode 100644
index 0184deed0a6..00000000000
--- a/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
+++ /dev/null
@@ -1,76 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RTEvent_Logging_Service.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-bin_PROGRAMS = RTEvent_Logging_Service
-
-RTEvent_Logging_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-RTEvent_Logging_Service_SOURCES = \
-  RTEvent_Logging_Server.cpp \
-  RTEvent_Logging_Service.cpp \
-  RTEvent_Logging_Service.h
-
-RTEvent_Logging_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp b/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
index d8abedffe36..533ff147b66 100644
--- a/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
+++ b/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "RTEvent_Logging_Service.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "ace/OS_main.h"
@@ -5,11 +7,6 @@
 #include "orbsvcs/Shutdown_Utilities.h"
 #include "tao/debug.h"
 
-ACE_RCSID (RTEvent_Logging_Service,
-           RTEvent_Logging_Server,
-           "$Id$")
-
-
 class Logging_Svc_Shutdown
   : public Shutdown_Functor
 {
diff --git a/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
index 8078f8690ed..76f6a1b22bb 100644
--- a/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+++ b/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
@@ -1,14 +1,11 @@
+// $Id$
+
 #include "RTEvent_Logging_Service.h"
 #include "tao/IORTable/IORTable.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (RTEvent_Logging_Service,
-           RTEvent_Logging_Service,
-           "$Id$")
-
-
 RTEvent_Logging_Service::RTEvent_Logging_Service (void)
   : service_name_ ("RTEventLogFactory"),
     ior_file_name_ (0),
diff --git a/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc b/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
index c52ca82d501..99d165afa7e 100644
--- a/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
+++ b/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
@@ -1,5 +1,5 @@
 // $Id$
 
 project: namingexe, iortable, install, rteventlogadmin_serv, valuetype {
-  exename   = RTEvent_Logging_Service
+  exename   = tao_tls_rtevent
 }
diff --git a/orbsvcs/Makefile.am b/orbsvcs/Makefile.am
deleted file mode 100644
index 80086d04c5a..00000000000
--- a/orbsvcs/Makefile.am
+++ /dev/null
@@ -1,39 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        TAO_Service \
-        orbsvcs \
-        Trading_Service \
-        Time_Service \
-        Scheduling_Service \
-        Notify_Service \
-        Naming_Service \
-        Logging_Service \
-        LoadBalancer \
-        LifeCycle_Service \
-        ImplRepo_Service \
-        IFR_Service \
-        Fault_Notifier \
-        Fault_Detector \
-        FT_ReplicationManager \
-        FTRT_Event_Service \
-        Event_Service \
-        Dump_Schedule \
-        CosEvent_Service \
-        Concurrency_Service
-
-if BUILD_TESTS
-SUBDIRS += performance-tests tests
-endif
-
-if BUILD_EXAMPLES
-SUBDIRS += examples
-endif
diff --git a/orbsvcs/Naming_Service/Makefile.am b/orbsvcs/Naming_Service/Makefile.am
deleted file mode 100644
index 90259c70bd6..00000000000
--- a/orbsvcs/Naming_Service/Makefile.am
+++ /dev/null
@@ -1,101 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-bin_PROGRAMS =
-
-## Makefile.NT_Naming_Service.am
-
-if BUILD_EXCEPTIONS
-if BUILD_WINNT
-
-bin_PROGRAMS += NT_Naming_Service
-
-NT_Naming_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-NT_Naming_Service_SOURCES = \
-  NT_Naming_Server.cpp \
-  NT_Naming_Service.cpp \
-  Naming_Service.cpp \
-  NT_Naming_Service.h \
-  Naming_Service.h
-
-NT_Naming_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_WINNT
-endif BUILD_EXCEPTIONS
-
-## Makefile.Naming_Service.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS += Naming_Service
-
-Naming_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Naming_Service_SOURCES = \
-  Naming_Server.cpp \
-  Naming_Service.cpp \
-  Naming_Service.h
-
-Naming_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/orbsvcs/Naming_Service/NT_Naming_Server.cpp
index f2415410a31..f13ebbcbe59 100644
--- a/orbsvcs/Naming_Service/NT_Naming_Server.cpp
+++ b/orbsvcs/Naming_Service/NT_Naming_Server.cpp
@@ -1,31 +1,24 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    NT_Naming_Server.cpp
-//
-//
-// = DESCRIPTION
-//    Driver program that runs the TAO Naming Service as a Windows NT
-//    Service.
-//
-// = AUTHORS
-//    John Tucker <jtucker@infoglide.com> and
-//    Mike Vitalo <mvitalo@infoglide.com>
-//
-// ============================================================================
-
-#include "ace/OS.h"
 
-#if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES)
+//=============================================================================
+/**
+ *  @file    NT_Naming_Server.cpp
+ *
+ *  $Id$
+ *
+ *  Driver program that runs the TAO Naming Service as a Windows NT
+ *  Service.
+ *
+ *
+ *  @author John Tucker <jtucker@infoglide.com> and Mike Vitalo <mvitalo@infoglide.com>
+ */
+//=============================================================================
+
 
 #include "ace/Log_Msg.h"
 
+#if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES)
+
 int
 ACE_TMAIN(int, ACE_TCHAR *[])
 {
@@ -45,10 +38,13 @@ ACE_TMAIN(int, ACE_TCHAR *[])
 // Default for the -i (install) option
 #define DEFAULT_SERVICE_INIT_STARTUP SERVICE_DEMAND_START
 
+/**
+ * @class Options
+ *
+ * @brief Keeps track of the command-line options for this program.
+ */
 class Options
 {
-  // = TITLE
-  //   Keeps track of the command-line options for this program.
 public:
   Options (void);
   ~Options (void);
diff --git a/orbsvcs/Naming_Service/NT_Naming_Service.h b/orbsvcs/Naming_Service/NT_Naming_Service.h
index a5c17d7995f..1a6c81d6369 100644
--- a/orbsvcs/Naming_Service/NT_Naming_Service.h
+++ b/orbsvcs/Naming_Service/NT_Naming_Service.h
@@ -18,11 +18,10 @@
 #ifndef TAO_NT_NAMING_SERVICE_H
 #define TAO_NT_NAMING_SERVICE_H
 
-#include /**/ "ace/OS.h"
+#include /**/ "ace/NT_Service.h"
 
 #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
-#include /**/ "ace/NT_Service.h"
 #include /**/ "ace/Singleton.h"
 #include /**/ "ace/Synch.h"
 #include /**/ "tao/orbconf.h"
diff --git a/orbsvcs/Naming_Service/Naming_Service.cpp b/orbsvcs/Naming_Service/Naming_Service.cpp
index c5b2f62b0ad..bb1a7fe56d7 100644
--- a/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -5,19 +5,19 @@
 #include "orbsvcs/Daemon_Utilities.h"
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
-
-ACE_RCSID(Naming_Service, Naming_Service, "$Id$")
+#include "ace/Task.h"
 
 // Default Constructor.
-
 TAO_Naming_Service::TAO_Naming_Service (void)
-  : time_ (0)
+  : time_ (0),
+    num_threads_ (1)
 {
 }
 
 // Constructor taking command-line arguments.
 TAO_Naming_Service::TAO_Naming_Service (int argc, ACE_TCHAR* argv[])
-  : time_ (0)
+  : time_ (0),
+    num_threads_ (1)
 {
   this->init (argc, argv);
 }
@@ -62,7 +62,7 @@ TAO_Naming_Service::init (int argc, ACE_TCHAR* argv[])
 int
 TAO_Naming_Service::parse_args (int &argc, ACE_TCHAR* argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("-t:"));
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("-t:n:"));
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -85,6 +85,23 @@ TAO_Naming_Service::parse_args (int &argc, ACE_TCHAR* argv[])
             argc = argc - 2;
             break;
           }
+        case 'n':
+          {
+            int const nt = ACE_OS::atoi (get_opts.opt_arg ());
+            if (nt >= 1)
+              this->num_threads_ = nt;
+
+            // Remove the option '-n' from argv []
+            // to avoid any confusion that might result.
+            for (int i = get_opts.opt_ind (); i != argc; ++i)
+              argv [i-2 ] = argv [i];
+
+            // Decrement the value of argc to reflect the removal
+            // of '-n' option.
+            argc = argc - 2;
+            break;
+          }
+
         case '?':
         default:
           // Don't do anything. The TAO_Naming_Server::parse_args ()
@@ -96,9 +113,17 @@ TAO_Naming_Service::parse_args (int &argc, ACE_TCHAR* argv[])
 }
 
 // Run the ORB event loop.
-int
-TAO_Naming_Service::run (void)
+
+class ORB_Runner : public ACE_Task_Base
 {
+public:
+  ORB_Runner (CORBA::ORB_ptr o, long t)
+    : orb_(CORBA::ORB::_duplicate (o)),
+      time_(t)
+  {}
+
+  int svc (void)
+  {
   if (!CORBA::is_nil (orb_.in ()))
     {
       if (time_ == 0)
@@ -113,6 +138,26 @@ TAO_Naming_Service::run (void)
     }
 
   return 0;
+  }
+
+private:
+  CORBA::ORB_var orb_;
+  long time_;
+};
+
+int
+TAO_Naming_Service::run (void)
+{
+  ORB_Runner runner (this->orb_.in(), time_);
+  if (this->num_threads_ == 1)
+    return runner.svc();
+  else
+    {
+      runner.activate ( THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED,
+                        this->num_threads_);
+      runner.wait();
+    }
+  return 0;
 }
 
 void
diff --git a/orbsvcs/Naming_Service/Naming_Service.h b/orbsvcs/Naming_Service/Naming_Service.h
index 5503c9648cf..71a2eb6e211 100644
--- a/orbsvcs/Naming_Service/Naming_Service.h
+++ b/orbsvcs/Naming_Service/Naming_Service.h
@@ -1,5 +1,6 @@
+// -*- C++ -*-
 
-//=============================================================================
+//==========================================================================
 /**
  *  @file    Naming_Service.h
  *
@@ -10,7 +11,7 @@
  *
  *  @author Nagarajan Surendran (naga@cs.wustl.edu) Marina Spivak <marina@cs.wustl.edu>
  */
-//=============================================================================
+//==========================================================================
 
 
 #ifndef TAO_NAMING_SERVICE_H
@@ -66,6 +67,9 @@ protected:
   /// After how long the server should stop listening to requests (in
   /// seconds).
   long time_;
+
+  /// Number of threads for running the ORB. Default is 1
+  int num_threads_;
 };
 
 #endif /* TAO_NAMING_SERVICE_H */
diff --git a/orbsvcs/Naming_Service/Naming_Service.mpc b/orbsvcs/Naming_Service/Naming_Service.mpc
index cbf8d927e2c..0c9dde417f2 100644
--- a/orbsvcs/Naming_Service/Naming_Service.mpc
+++ b/orbsvcs/Naming_Service/Naming_Service.mpc
@@ -2,7 +2,7 @@
 // $Id$
 
 project : orbsvcsexe, install, naming_serv, imr_client, svc_utils {
-  exename  = Naming_Service
+  exename  = tao_cosnaming
   Source_Files {
     Naming_Server.cpp
     Naming_Service.cpp
@@ -11,7 +11,7 @@ project : orbsvcsexe, install, naming_serv, imr_client, svc_utils {
 
 project(NT_Naming_Service) : orbsvcsexe, install, naming_serv, svc_utils {
   requires += winnt
-  exename  = NT_Naming_Service
+  exename  = tao_nt_cosnaming
   Source_Files {
     Naming_Service.cpp
     NT_Naming_Server.cpp
diff --git a/orbsvcs/Notify_Service/Makefile.am b/orbsvcs/Notify_Service/Makefile.am
deleted file mode 100644
index 28b6d119b8a..00000000000
--- a/orbsvcs/Notify_Service/Makefile.am
+++ /dev/null
@@ -1,122 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-bin_PROGRAMS =
-
-## Makefile.NT_Notify_Service.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_WINNT
-if !BUILD_ACE_FOR_TAO
-
-bin_PROGRAMS += NT_Notify_Service
-
-NT_Notify_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-NT_Notify_Service_SOURCES = \
-  NT_Notify_Server.cpp \
-  NT_Notify_Service.cpp \
-  Notify_Service.cpp \
-  NT_Notify_Service.h \
-  Notify_Service.h
-
-NT_Notify_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_WINNT
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Notify_Service.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS += Notify_Service
-
-Notify_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Notify_Service_SOURCES = \
-  Notify_Server.cpp \
-  Notify_Service.cpp \
-  Notify_Service.h
-
-Notify_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/orbsvcs/Notify_Service/NT_Notify_Server.cpp
index 44e68a9443d..703e27f02a2 100644
--- a/orbsvcs/Notify_Service/NT_Notify_Server.cpp
+++ b/orbsvcs/Notify_Service/NT_Notify_Server.cpp
@@ -1,32 +1,26 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    NT_Notify_Server.cpp
-//
-//
-// = DESCRIPTION
-//    Driver program that runs the TAO Notification Service as a Windows NT
-//    Service.
-//
-// = AUTHORS
-//    John Tucker <jtucker@infoglide.com>,
-//    Mike Vitalo <mvitalo@infoglide.com>, and
-//    David Robison <drrobison@openroadsconsulting.com>
-//
-// ============================================================================
-
-#include "ace/OS.h"
 
-#if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES)
+//=============================================================================
+/**
+ *  @file    NT_Notify_Server.cpp
+ *
+ *  $Id$
+ *
+ *  Driver program that runs the TAO Notification Service as a Windows NT
+ *  Service.
+ *
+ *
+ *  @author John Tucker <jtucker@infoglide.com>
+ *  @author Mike Vitalo <mvitalo@infoglide.com>
+ *  @author and David Robison <drrobison@openroadsconsulting.com>
+ */
+//=============================================================================
+
 
 #include "ace/Log_Msg.h"
 
+#if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES)
+
 int
 ACE_TMAIN(int, ACE_TCHAR *[])
 {
@@ -49,10 +43,13 @@ ACE_TMAIN(int, ACE_TCHAR *[])
 // Default for the -i (install) option
 #define DEFAULT_SERVICE_INIT_STARTUP SERVICE_DEMAND_START
 
+/**
+ * @class Options
+ *
+ * @brief Keeps track of the command-line options for this program.
+ */
 class Options
 {
-  // = TITLE
-  //   Keeps track of the command-line options for this program.
 public:
   Options (void);
   ~Options (void);
diff --git a/orbsvcs/Notify_Service/NT_Notify_Service.h b/orbsvcs/Notify_Service/NT_Notify_Service.h
index e3b6b8396a1..a2e102a842b 100644
--- a/orbsvcs/Notify_Service/NT_Notify_Service.h
+++ b/orbsvcs/Notify_Service/NT_Notify_Service.h
@@ -19,11 +19,10 @@
 #ifndef TAO_NT_NOTIFY_SERVICE_H
 #define TAO_NT_NOTIFY_SERVICE_H
 
-#include /**/ "ace/OS.h"
+#include /**/ "ace/NT_Service.h"
 
 #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
-#include /**/ "ace/NT_Service.h"
 #include /**/ "ace/Singleton.h"
 #include /**/ "ace/Synch.h"
 #include /**/ "tao/orbconf.h"
diff --git a/orbsvcs/Notify_Service/Notify_Service.cpp b/orbsvcs/Notify_Service/Notify_Service.cpp
index 776e1f32475..c23a5471344 100644
--- a/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -338,17 +338,31 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[])
 int
 TAO_Notify_Service_Driver::resolve_naming_service (void)
 {
-  CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService");
-
-  // Need to check return value for errors.
-  if (CORBA::is_nil (naming_obj.in ()))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       " (%P|%t) Unable to resolve the Naming Service.\n"),
-                      -1);
+  try
+    {
+      CORBA::Object_var naming_obj =
+        this->orb_->resolve_initial_references ("NameService");
 
-  this->naming_ = CosNaming::NamingContextExt::_narrow (naming_obj.in ());
+      // Need to check return value for errors.
+      if (CORBA::is_nil (naming_obj.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to resolve the Naming Service.\n"),
+                          -1);
 
+      this->naming_ = CosNaming::NamingContextExt::_narrow (naming_obj.in ());
+    }
+  catch (CORBA::Exception &)
+    {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to resolve the Naming Service.\n"),
+                          -1);
+    }
+  catch (...)
+    {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to resolve the Naming Service.\n"),
+                          -1);
+    }
   return 0;
 }
 
diff --git a/orbsvcs/Notify_Service/Notify_Service.mpc b/orbsvcs/Notify_Service/Notify_Service.mpc
index 5d3536e9ee6..ffa18ca3302 100644
--- a/orbsvcs/Notify_Service/Notify_Service.mpc
+++ b/orbsvcs/Notify_Service/Notify_Service.mpc
@@ -17,7 +17,7 @@ project(TAO_Notify_Service) : orbsvcslib, orbsvcs_output, install, valuetype, or
 }
 
 project(Notify_Service) : orbsvcsexe, install, tao_notify_service, notify_monitor_control {
-  exename  = Notify_Service
+  exename  = tao_cosnotification
   Source_Files {
     Notify_Server.cpp
   }
@@ -26,7 +26,7 @@ project(Notify_Service) : orbsvcsexe, install, tao_notify_service, notify_monito
 project(NT_Notify_Service) : orbsvcsexe, install, tao_notify_service, notify_monitor_control {
   avoids += ace_for_tao
   requires += winnt
-  exename  = NT_Notify_Service
+  exename  = tao_nt_cosnotification
   Source_Files {
     NT_Notify_Server.cpp
     NT_Notify_Service.cpp
diff --git a/orbsvcs/PSS/Dump_Visitor.cpp b/orbsvcs/PSS/Dump_Visitor.cpp
deleted file mode 100644
index 0f9514e78e7..00000000000
--- a/orbsvcs/PSS/Dump_Visitor.cpp
+++ /dev/null
@@ -1,1651 +0,0 @@
-// $Id$
-
-#include "Dump_Visitor.h"
-#include "ace/streams.h"
-
-Dump_Visitor::Dump_Visitor (int depth)
-  : depth_ (depth)
-{
-}
-
-Dump_Visitor::~Dump_Visitor ()
-{
-
-}
-
-int
-Dump_Visitor::visit_module (TAO_PSDL_Module *module)
-{
-  print_depth (this->depth_ + 10);
-
-  cout << "MODULE {" << endl;
-  if (module->identifier ()->accept (this) == -1)
-    return -1;
-
-  Dump_Visitor body_visitor (this->depth_ + 1);
-  if (module->specification ()->accept (&body_visitor) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_identifier (TAO_PSDL_Identifier *identifier)
-{
-  print_depth (this->depth_ + 40);
-  cout << "IDENTIFIER {" << identifier->value () << "}\n" << endl;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_specification (TAO_PSDL_Specification *specification)
-{
-  cout << "SPECIFICATION {" << endl;
-  if (specification->definition ()->accept (this) == -1)
-    return -1;
-  if (specification->specification () != 0)
-    {
-      Dump_Visitor body_visitor (this->depth_ + 1);
-      if (specification->specification ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-Dump_Visitor::visit_definition (TAO_PSDL_Definition *definition)
-{
-  print_depth (this->depth_ + 5);
-  cout << "DEFINITION {" << endl;
-  if (definition->definition_type ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagetype (TAO_PSDL_Abstract_Storagetype *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagetype_dcl (TAO_PSDL_Abstract_Storagetype_Dcl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagetype_fwd_dcl (TAO_PSDL_Abstract_Storagetype_Fwd_Dcl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagetype_header (TAO_PSDL_Abstract_Storagetype_Header *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagetype_body (TAO_PSDL_Abstract_Storagetype_Body *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagetype_member (TAO_PSDL_Abstract_Storagetype_Member *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagetype_inh_spec (TAO_PSDL_Abstract_Storagetype_Inh_Spec *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagetype_name (TAO_PSDL_Abstract_Storagetype_Name *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_psdl_state_dcl (TAO_PSDL_Psdl_State_Dcl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_psdl_state_type_spec (TAO_PSDL_Psdl_State_Type_Spec *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagetype_ref_type (TAO_PSDL_Abstract_Storagetype_Ref_Type)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagehome (TAO_PSDL_Abstract_Storagehome *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagehome_fwd_dcl (TAO_PSDL_Abstract_Storagehome_Fwd_Dcl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagehome_dcl (TAO_PSDL_Abstract_Storagehome_Dcl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagehome_header (TAO_PSDL_Abstract_Storagehome_Header *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagehome_body (TAO_PSDL_Abstract_Storagehome_Body  *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagehome_member (TAO_PSDL_Abstract_Storagehome_Member *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagehome_inh_spec (TAO_PSDL_Abstract_Storagehome_Inh_Spec *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_abstract_storagehome_name (TAO_PSDL_Abstract_Storagehome_Name *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_local_op_dcl (TAO_PSDL_Local_Op_Dcl *local_op_dcl)
-{
-  print_depth (this->depth_);
-
-  cout << "LOCAL_OP_DCL {" << endl;
-  if (local_op_dcl->op_type_spec ()->accept (this) == -1)
-    return -1;
-
-  if (local_op_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  Dump_Visitor body_visitor (this->depth_ + 1);
-
-  if (local_op_dcl->parameter_dcls ()->accept (this) == -1)
-    return -1;
-
-  if (local_op_dcl->raises_expr () != 0)
-    {
-      if (local_op_dcl->raises_expr ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-Dump_Visitor::visit_key_dcl (TAO_PSDL_Key_Dcl *key_dcl)
-{
-  print_depth (this->depth_);
-
-  cout << "KEY_DCL {" << endl;
-  if (key_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (key_dcl->simple_declarator () != 0)
-    if (key_dcl->simple_declarator ()->accept (this) == -1)
-      return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_catalog (TAO_PSDL_Catalog *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_catalog_inh_spec (TAO_PSDL_Catalog_Inh_Spec *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_catalog_name (TAO_PSDL_Catalog_Name *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_catalog_body (TAO_PSDL_Catalog_Body *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_catalog_member (TAO_PSDL_Catalog_Member *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagetype_member (TAO_PSDL_Storagetype_Member *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagetype_inh_spec (TAO_PSDL_Storagetype_Inh_Spec *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagetype_name (TAO_PSDL_Storagetype_Name *storagetype_name)
-{
-  print_depth (this->depth_ + 10);
-
-  cout << "STORAGETYPE_NAME {" << endl;
-  if (storagetype_name->scoped_name ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagetype_impl_spec (TAO_PSDL_Storagetype_Impl_Spec *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagetype_ref_type (TAO_PSDL_Storagetype_Ref_Type *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_store_directive (TAO_PSDL_Store_Directive *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_psdl_concrete_state_type (TAO_PSDL_Psdl_Concrete_State_Type *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_ref_rep_directive (TAO_PSDL_Ref_Rep_Directive *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagehome (TAO_PSDL_Storagehome *storagehome)
-{
-  print_depth (this->depth_ + 10);
-
-  cout << "STORAGEHOME {" << endl;
-  if (storagehome->storagehome_header ()->accept (this) == -1)
-    return -1;
-
-  Dump_Visitor body_visitor (this->depth_ + 1);
-  if (storagehome->storagehome_body () != 0)
-    if (storagehome->storagehome_body ()->accept (&body_visitor) == -1)
-      return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagehome_header (TAO_PSDL_Storagehome_Header *sh_header)
-{
-  print_depth (this->depth_ + 10);
-
-  cout << "STORAGEHOME_HEADER {" << endl;
-  if (sh_header->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (sh_header->storagetype_name ()->accept (this) == -1)
-    return -1;
-
-  Dump_Visitor body_visitor (this->depth_ + 1);
-  if (sh_header->storagehome_inh_spec () != 0)
-    if (sh_header->storagehome_inh_spec ()->accept (&body_visitor) == -1)
-      return -1;
-
-  if (sh_header->storagehome_impl_spec () != 0)
-    if (sh_header->storagehome_impl_spec ()->accept (&body_visitor) == -1)
-      return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagehome_body  (TAO_PSDL_Storagehome_Body *sh_body)
-{
-  print_depth (this->depth_ + 10);
-
-  cout << "STORAGEHOME_BODY {" << endl;
-  if (sh_body->storagehome_member ()->accept (this) == -1)
-    return -1;
-
-  Dump_Visitor body_visitor (this->depth_ + 1);
-  if (sh_body->storagehome_body () != 0)
-    if (sh_body->storagehome_body ()->accept (&body_visitor) == -1)
-      return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagehome_member  (TAO_PSDL_Storagehome_Member *sh_member)
-{
-  print_depth (this->depth_ + 10);
-
-  cout << "STORAGEHOME_MEMBER {" << endl;
-  if (sh_member->key_dcl ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagehome_inh_spec  (TAO_PSDL_Storagehome_Inh_Spec *sh_inh_spec)
-{
-  print_depth (this->depth_ + 10);
-
-  cout << "STORAGEHOME_INH_SPEC {" << endl;
-  if (sh_inh_spec->storagehome_name ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagehome_name  (TAO_PSDL_Storagehome_Name *sh_name)
-{
-  print_depth (this->depth_ + 10);
-
-  cout << "STORAGEHOME_NAME {" << endl;
-  if (sh_name->scoped_name ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagehome_impl_spec (TAO_PSDL_Storagehome_Impl_Spec *sh_impl_spec)
-{
-  print_depth (this->depth_ + 10);
-
-  cout << "STORAGEHOME_IMPL_SPEC {" << endl;
-  if (sh_impl_spec->abstract_storagehome_name ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_primary_key_dcl (TAO_PSDL_Primary_Key_Dcl *primary_key_dcl)
-{
-  print_depth (this->depth_ + 10);
-
-  cout << "PRIMARY_KEY_DCL {" << endl;
-  if (primary_key_dcl->identifier ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_type_dcl (TAO_PSDL_Type_Dcl *type_dcl)
-{
-  print_depth (this->depth_ + 10);
-  cout << "TYPE_DCL {" << endl;
-
-  print_depth (this->depth_ + 15);
-  if (type_dcl->key_word () != 0)
-    {
-      cout << "KEY_WORD------------------------ {";
-      cout << type_dcl->key_word () << "}" << endl;
-    }
-
-  if (type_dcl->type_of_type_dcl ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_type_declarator (TAO_PSDL_Type_Declarator *type_declarator)
-{
-  print_depth (this->depth_ + 15);
-  cout << "TYPE_DECLARATOR {" << endl;
-
-  if (type_declarator->type_spec ()->accept (this) == -1)
-    return -1;
-
-  Dump_Visitor body_visitor (this->depth_);
-  if (type_declarator->declarators ()->accept (&body_visitor) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_type_spec (TAO_PSDL_Type_Spec *type_spec)
-{
-  print_depth (this->depth_ + 20);
-  cout << "TYPE_SPEC {" << endl;
-  if (type_spec->type_of_type_spec ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_simple_type_spec  (TAO_PSDL_Simple_Type_Spec *simple_type_spec)
-{
-  print_depth (this->depth_ + 25);
-  cout << "SIMPLE TYPE_SPEC {" << endl;
-  if (simple_type_spec->type_of_simple_type_spec ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_base_type_spec  (TAO_PSDL_Base_Type_Spec *base_type_spec)
-{
-  print_depth (this->depth_ + 25);
-  cout << "BASE TYPE_SPEC " << endl;
-  if (base_type_spec->type_of_base_type_spec ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_template_type_spec  (TAO_PSDL_Template_Type_Spec *template_type_spec)
-{
-  print_depth (this->depth_ + 30);
-  cout << "TEMPLATE_TYPE_SPEC {" << endl;
-
-  if (template_type_spec->type_of_template_type_spec ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_constr_type_spec  (TAO_PSDL_Constr_Type_Spec *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_declarators  (TAO_PSDL_Declarators *declarators)
-{
-  print_depth (this->depth_ + 15);
-  cout << "DECLARATORS {" << endl;
-
-  if (declarators->declarator ()->accept (this) == -1)
-    return -1;
-
-  if (declarators->set_of_declarators () != 0)
-    {
-      Dump_Visitor body_visitor (this->depth_ + 1);
-
-      if (declarators->set_of_declarators ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-Dump_Visitor::visit_declarator  (TAO_PSDL_Declarator *declarator)
-{
-  print_depth (this->depth_ + 20);
-  cout << "DECLARATOR {" << endl;
-  if (declarator->type_of_declarator ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_simple_declarator  (TAO_PSDL_Simple_Declarator *simple_declarator)
-{
-  print_depth (this->depth_ + 25);
-  cout << "SIMPLE_DECLARATOR {" << endl;
-
-  if (simple_declarator->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (simple_declarator->simple_declarator () != 0)
-    {
-      Dump_Visitor body_visitor (this->depth_ + 1);
-      if (simple_declarator->simple_declarator ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-Dump_Visitor::visit_simple_declarator_list  (TAO_PSDL_Simple_Declarator_List *simple_decl_list)
-{
-  print_depth (this->depth_ + 25);
-  cout << "SIMPLE_DECLARATOR_LIST {" << endl;
-
-  if (simple_decl_list-> simple_declarator ()->accept (this) == -1)
-    return -1;
-
-  if (simple_decl_list->simple_declarator_list () != 0)
-    {
-      Dump_Visitor body_visitor (this->depth_ + 1);
-      if (simple_decl_list->simple_declarator_list ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Dump_Visitor::visit_complex_declarator  (TAO_PSDL_Complex_Declarator *complex_declarator)
-{
-  print_depth (this->depth_ + 25);
-  cout << "COMPLEX_DECLARATOR {" << endl;
-
-  if (complex_declarator->array_declarator ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Dump_Visitor::visit_predefined_type  (TAO_PSDL_Predefined_Type *predefined_type)
-{
-  print_depth (this->depth_ + 40);
-  cout << "PREDEFINED_TYPE " ;
-
-  if (predefined_type->type_one () != 0)
-    cout << "{" << predefined_type->type_one () << "}" << endl;
-
-  if (predefined_type->type_two () != 0)
-    cout << "{" << predefined_type->type_two () << "}" << endl;
-
-  if (predefined_type->type_three () != 0)
-    cout << "{" << predefined_type->type_three () << "}" << endl;
-
-  Dump_Visitor body_visitor (this->depth_ + 1);
-  if (predefined_type->type_of_variable_one () != 0)
-    {
-      cout << endl;
-      if (predefined_type->type_of_variable_one ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  if (predefined_type->type_of_variable_two () != 0)
-    {
-      cout << endl;
-      if (predefined_type->type_of_variable_two ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  if (predefined_type->type_of_variable_three () != 0)
-    {
-      cout << endl;
-      if (predefined_type->type_of_variable_three ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Dump_Visitor::visit_member_list (TAO_PSDL_Member_List *member_list)
-{
-  print_depth (this->depth_ + 15);
-
-  cout << "MEMBER_LIST {" << endl;
-  if (member_list->member ()->accept (this) == -1)
-    return -1;
-
-  if (member_list->member_list () != 0)
-    {
-      Dump_Visitor body_visitor (this->depth_ + 1);
-
-      if (member_list->member_list ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Dump_Visitor::visit_member (TAO_PSDL_Member *member)
-{
-  print_depth (this->depth_ + 15);
-
-  cout << "MEMBER {" << endl;
-  if (member->type_spec ()->accept (this) == -1)
-    return -1;
-
-  Dump_Visitor body_visitor (this->depth_ + 1);
-
-  if (member->declarators ()->accept (&body_visitor) == -1)
-    return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_union_type (TAO_PSDL_Union_Type *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_switch_type_spec (TAO_PSDL_Switch_Type_Spec *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_switch_body (TAO_PSDL_Switch_Body *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_case_case (TAO_PSDL_Case *)
-{
- // @@ NOT YET SUPPORTED
- return 0;
-}
-
-int
-Dump_Visitor::visit_case_label (TAO_PSDL_Case_Label *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_element_spec (TAO_PSDL_Element_Spec *)
-{
-  // @@ NOT YET SUPPORTED
- return 0;
- }
-
-int
-Dump_Visitor::visit_const_dcl (TAO_PSDL_Const_Dcl *const_dcl)
-{
-  print_depth (this->depth_ + 10);
-
-  cout << "CONST_DCL" << endl;
-
-  if (const_dcl->const_type () != 0)
-    {
-      if (const_dcl->const_type ()->accept (this) == -1)
-        return -1;
-    }
-
-  Dump_Visitor body_visitor (this->depth_ + 1);
-  if (const_dcl->identifier ()->accept (&body_visitor) == -1)
-    return -1;
-
-  if (const_dcl->const_exp ()->accept (&body_visitor) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_const_type (TAO_PSDL_Const_Type *const_type)
-{
-  print_depth (this->depth_);
-
-  cout << "CONST_TYPE";
-  if (const_type->type ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_const_exp (TAO_PSDL_Const_Exp *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_or_expr (TAO_PSDL_Or_Expr *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_xor_expr (TAO_PSDL_Xor_Expr *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_and_expr (TAO_PSDL_And_Expr *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_shift_expr (TAO_PSDL_Shift_Expr *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_add_expr (TAO_PSDL_Add_Expr *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_mult_expr (TAO_PSDL_Mult_Expr *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_unary_expr (TAO_PSDL_Unary_Expr *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_primary_expr (TAO_PSDL_Primary_Expr *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_except_dcl (TAO_PSDL_Except_Dcl *except_dcl)
-{
-  print_depth (this->depth_ + 10);
-
-  cout << "EXCEPT_DCL " << endl;
-  if (except_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  Dump_Visitor body_visitor (this->depth_ + 1);
-  if (except_dcl->member_list () != 0)
-    {
-      if (except_dcl->member_list ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-Dump_Visitor::visit_op_dcl (TAO_PSDL_Op_Dcl *op_dcl)
-{
-  print_depth (this->depth_);
-
-  cout << "OP_DCL {" << endl;
-
-  if (op_dcl->op_attribute () != 0)
-    if (op_dcl->op_attribute ()->accept (this) == -1)
-      return -1;
-
-  if (op_dcl->op_type_spec ()->accept (this) == -1)
-    return -1;
-
-  if (op_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  Dump_Visitor body_visitor (this->depth_ + 1);
-
-  if (op_dcl->parameter_dcls ()->accept (this) == -1)
-    return -1;
-
-  if (op_dcl->raises_expr () != 0)
-    if (op_dcl->raises_expr ()->accept (&body_visitor) == -1)
-      return -1;
-
-  if (op_dcl->context_expr () != 0)
-    if (op_dcl->context_expr ()->accept (&body_visitor) == -1)
-      return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagetype (TAO_PSDL_Storagetype *storagetype)
-{
-  print_depth (this->depth_ + 10);
-
-  cout << "STORAGETYPE {" << endl;
-
-  if (storagetype->declaration () != 0)
-    if (storagetype->declaration ()->accept (this) == -1)
-      return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagetype_dcl (TAO_PSDL_Storagetype_Dcl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagetype_fwd_dcl (TAO_PSDL_Storagetype_Fwd_Dcl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagetype_header (TAO_PSDL_Storagetype_Header *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagetype_body (TAO_PSDL_Storagetype_Body *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_storagehome_scope (TAO_PSDL_Storagehome_Scope *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_provides_dcl (TAO_PSDL_Provides_Dcl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_op_type_spec (TAO_PSDL_Op_Type_Spec *op_type_spec)
-{
-  print_depth (this->depth_);
-
-  cout << "OP_TYPE_SPEC {" << endl;
-  if (op_type_spec->type () != 0)
-    {
-      cout << "Type {" << op_type_spec->type () << "}" << endl;
-    }
-
-  if (op_type_spec->type_spec () != 0)
-    if (op_type_spec->type_spec ()->accept (this) == -1)
-      return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_parameter_dcls (TAO_PSDL_Parameter_Dcls *parameter_dcls)
-{
-  print_depth (this->depth_);
-
-  cout << "PARAMETER_DCLS {" << endl;
-  if (parameter_dcls->param_dcl () != 0)
-    if (parameter_dcls->param_dcl ()->accept (this) == -1)
-      return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_param_dcl (TAO_PSDL_Param_Dcl *param_dcl)
-{
-  print_depth (this->depth_);
-
-  cout << "PARAM_DCL {" << endl;
-  if (param_dcl->param_attribute ()->accept (this) == -1)
-    return -1;
-
-  Dump_Visitor body_visitor (this->depth_ + 1);
-
-  if (param_dcl->param_type_spec ()->accept (&body_visitor) == -1)
-    return -1;
-
-  Dump_Visitor body_visitor_two (this->depth_ + 2);
-
-  if (param_dcl->simple_declarator ()->accept (&body_visitor) == -1)
-    return -1;
-
-  if (param_dcl->param_dcl () != 0)
-    if (param_dcl->param_dcl ()->accept (&body_visitor) == -1)
-      return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_raises_expr (TAO_PSDL_Raises_Expr *raises_expr)
-{
-  print_depth (this->depth_);
-
-  cout << "RAISES_EXPR ";
-  if (raises_expr->first_scoped_name ()->accept (this) == -1)
-    return -1;
-
-  if (raises_expr->second_scoped_name () != 0)
-    if (raises_expr->first_scoped_name ()->accept (this) == -1)
-      return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_context_expr (TAO_PSDL_Context_Expr *context_expr)
-{
-  print_depth (this->depth_);
-
-  cout << "CONTEXT_EXPR ";
-  if (context_expr->string_literal ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_param_type_spec (TAO_PSDL_Param_Type_Spec *param_type_spec)
-{
-  print_depth (this->depth_);
-
-  cout << "PARAM_TYPE_SPEC {" << endl;
-  if (param_type_spec->type_of_param ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-Dump_Visitor::visit_fixed_pt_type (TAO_PSDL_Fixed_Pt_Type *fixed_pt_type)
-{
-  print_depth (this->depth_);
-
-  cout << "FIXED_PT_TYPE ";
-  if (fixed_pt_type->positive_int_const_one ()->accept (this) == -1)
-    return -1;
-
-  if (fixed_pt_type->positive_int_const_two ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_constr_forward_decl (TAO_PSDL_Constr_Forward_Decl *constr_fwd_dcl)
-{
-  print_depth (this->depth_);
-
-  cout << "CONSTR_FWD_DCL ";
-  if (constr_fwd_dcl->type ()->accept (this) == -1)
-    return -1;
-
-  if (constr_fwd_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_interface (TAO_PSDL_Interface *interface)
-{
-  print_depth (this->depth_ + 10);
-
-  cout << "INTERFACE {" << endl;
-  if (interface->type_of_dcl ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_interface_body (TAO_PSDL_Interface_Body *interface_body)
-{
-  print_depth (this->depth_ + 15);
-
-  cout << "INTERFACE_BODY {" << endl;
-  if (interface_body->export_variable ()->accept (this) == -1)
-    return -1;
-
-  if (interface_body->interface_body () != 0)
-    {
-      Dump_Visitor body_visitor (this->depth_ + 1);
-      if (interface_body->interface_body ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-Dump_Visitor::visit_interface_dcl (TAO_PSDL_Interface_Dcl *interface_dcl)
-{
-  print_depth (this->depth_ + 15);
-
-  cout << "INTERFACE_DCL {" << endl;
-  if (interface_dcl->interface_header ()->accept (this) == -1)
-    return -1;
-
-  if (interface_dcl->interface_body () != 0)
-    {
-      Dump_Visitor body_visitor (this->depth_ + 1);
-      if (interface_dcl->interface_body ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-Dump_Visitor::visit_forward_dcl (TAO_PSDL_Forward_Dcl *forward_dcl)
-{
-  print_depth (this->depth_ + 15);
-
-  cout << "FORWARD_DCL {" << endl;
-  if (forward_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (forward_dcl->type () != 0)
-    {
-      cout << "{" << forward_dcl->type () << "}" << endl;
-    }
-  return 0;
-}
-
-int
-Dump_Visitor::visit_interface_header (TAO_PSDL_Interface_Header *interface_header)
-{
-  print_depth (this->depth_ + 15);
-
-  cout << "INTERFACE_HEADER {" << endl;
-  if (interface_header->identifier ()->accept (this) == -1)
-    return -1;
-
-  Dump_Visitor body_visitor (this->depth_ + 1);
-  if (interface_header->type () != 0)
-    {
-      if (interface_header->type ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-
-  if (interface_header->interface_inheritance_spec () != 0)
-    {
-      if (interface_header->interface_inheritance_spec ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-Dump_Visitor::visit_export_dcl (TAO_PSDL_Export_Dcl *export_dcl)
-{
-  print_depth (this->depth_ + 15);
-
-  cout << "EXPORT_DCL {" << endl;
-  print_depth (this->depth_ + 5);
-  if (export_dcl->type_of_export_one ()->accept (this) == -1)
-    return -1;
-
-  if (export_dcl->type_of_export_two () != 0)
-    {
-      Dump_Visitor body_visitor (this->depth_ + 1);
-      if (export_dcl->type_of_export_two ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-Dump_Visitor::visit_interface_inheritance_spec (TAO_PSDL_Interface_Inheritance_Spec *interface_inh_spec)
-{
-  print_depth (this->depth_);
-
-  cout << "INTERFACE_INH_SPEC ";
-  if (interface_inh_spec->interface_name ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_interface_name (TAO_PSDL_Interface_Name *interface_name)
-{
-  print_depth (this->depth_);
-
-  cout << "INTERFACE_NAME ";
-  if (interface_name->scoped_name ()->accept (this) == -1)
-    return -1;
-
-  if (interface_name->interface_name () != 0)
-    {
-      Dump_Visitor body_visitor (this->depth_ + 1);
-      if (interface_name->interface_name ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-Dump_Visitor::visit_scoped_name (TAO_PSDL_Scoped_Name *scoped_name)
-{
-  print_depth (this->depth_ + 40);
-
-  cout << "SCOPED_NAME " << endl;
-  if (scoped_name->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (scoped_name->scoped_name () != 0)
-    {
-      Dump_Visitor body_visitor (this->depth_ + 1);
-      if (scoped_name->scoped_name ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-Dump_Visitor::visit_value (TAO_PSDL_Value *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_value_common_base (TAO_PSDL_Value_Common_Base *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_value_forward_dcl (TAO_PSDL_Value_Forward_Dcl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_value_box_dcl (TAO_PSDL_Value_Box_Dcl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_value_abs_dcl (TAO_PSDL_Value_Abs_Dcl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_value_dcl (TAO_PSDL_Value_Dcl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_value_header (TAO_PSDL_Value_Header *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_value_inheritance_spec (TAO_PSDL_Value_Inheritance_Spec *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_value_name (TAO_PSDL_Value_Name *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_value_element (TAO_PSDL_Value_Element *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_array_declarator (TAO_PSDL_Array_Declarator *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_fixed_array_size (TAO_PSDL_Fixed_Array_Size *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_enumerator (TAO_PSDL_Enumerator *enumerator)
-{
-  print_depth (this->depth_ + 15);
-
-  cout << "ENUMERATOR {" << endl;
-  if (enumerator->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (enumerator->enumerator () != 0)
-    {
-      Dump_Visitor body_visitor (this->depth_);
-      if (enumerator->enumerator ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-Dump_Visitor::visit_literal (TAO_PSDL_Literal *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_state_member (TAO_PSDL_State_Member *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_init_dcl (TAO_PSDL_Init_Dcl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_init_param_decls (TAO_PSDL_Init_Param_Decls *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_init_param_decl (TAO_PSDL_Init_Param_Decl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_factory_parameters (TAO_PSDL_Factory_Parameters *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_attr_dcl (TAO_PSDL_Attr_Dcl *attr_dcl)
-{
-  print_depth (this->depth_);
-
-  cout << "ATTR_DCL ";
-
-  if (attr_dcl->readonly () != 0)
-    {
-      cout << "{" << attr_dcl->readonly () << "}" << endl;
-    }
-
-  if (attr_dcl->param_type_spec ()->accept (this) == -1)
-    return -1;
-
-  Dump_Visitor body_visitor (this->depth_ + 1);
-
-  if (attr_dcl->simple_declarator ()->accept (&body_visitor) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-Dump_Visitor::visit_factory_dcl (TAO_PSDL_Factory_Dcl *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-int
-Dump_Visitor::visit_positive_int_const (TAO_PSDL_Positive_Int_Const *)
-{
-  // @@ NOT YET SUPPORTED
-  return 0;
-}
-
-void
-Dump_Visitor::print_depth (int depth)
-{
-  for (int i = 0; i != depth; ++i)
-    {
-      cout << " ";
-    }
-}
diff --git a/orbsvcs/PSS/Dump_Visitor.h b/orbsvcs/PSS/Dump_Visitor.h
deleted file mode 100644
index 501b28c211f..00000000000
--- a/orbsvcs/PSS/Dump_Visitor.h
+++ /dev/null
@@ -1,155 +0,0 @@
-// $Id$
-
-#include "PSDL_Node_Visitor.h"
-
-class Dump_Visitor : public TAO_PSDL_Node_Visitor
-{
-public:
-
-  Dump_Visitor (int depth);
-
-  ~Dump_Visitor ();
-
-  // The following methods help print the parse tree. Each method
-  // will invoke the 'accept' methods of the private members (accessed
-  // via the public accessor methods) of the class. Again, we are
-  // making using of the visitor pattern here.
-  int visit_specification (TAO_PSDL_Specification *);
-  int visit_definition (TAO_PSDL_Definition *);
-  int visit_module (TAO_PSDL_Module *);
-  int visit_abstract_storagetype (TAO_PSDL_Abstract_Storagetype *);
-  int visit_abstract_storagetype_dcl (TAO_PSDL_Abstract_Storagetype_Dcl *);
-  int visit_abstract_storagetype_fwd_dcl (TAO_PSDL_Abstract_Storagetype_Fwd_Dcl *);
-  int visit_abstract_storagetype_header (TAO_PSDL_Abstract_Storagetype_Header *);
-  int visit_abstract_storagetype_body (TAO_PSDL_Abstract_Storagetype_Body *);
-  int visit_abstract_storagetype_member (TAO_PSDL_Abstract_Storagetype_Member *);
-  int visit_abstract_storagetype_inh_spec (TAO_PSDL_Abstract_Storagetype_Inh_Spec *);
-  int visit_abstract_storagetype_name (TAO_PSDL_Abstract_Storagetype_Name *);
-  int visit_psdl_state_dcl (TAO_PSDL_Psdl_State_Dcl *);
-  int visit_psdl_state_type_spec (TAO_PSDL_Psdl_State_Type_Spec *);
-
-  int visit_abstract_storagetype_ref_type (TAO_PSDL_Abstract_Storagetype_Ref_Type);
-
-  int visit_abstract_storagehome (TAO_PSDL_Abstract_Storagehome *);
-  int visit_abstract_storagehome_fwd_dcl (TAO_PSDL_Abstract_Storagehome_Fwd_Dcl *);
-  int visit_abstract_storagehome_dcl (TAO_PSDL_Abstract_Storagehome_Dcl *);
-
-  int visit_abstract_storagehome_header (TAO_PSDL_Abstract_Storagehome_Header *);
-  int visit_abstract_storagehome_body (TAO_PSDL_Abstract_Storagehome_Body  *);
-  int visit_abstract_storagehome_member (TAO_PSDL_Abstract_Storagehome_Member *);
-  int visit_abstract_storagehome_inh_spec (TAO_PSDL_Abstract_Storagehome_Inh_Spec *);
-  int visit_abstract_storagehome_name (TAO_PSDL_Abstract_Storagehome_Name *);
-  int visit_local_op_dcl (TAO_PSDL_Local_Op_Dcl *);
-  int visit_key_dcl (TAO_PSDL_Key_Dcl *);
-  int visit_catalog (TAO_PSDL_Catalog *);
-  int visit_catalog_inh_spec (TAO_PSDL_Catalog_Inh_Spec *);
-  int visit_catalog_name (TAO_PSDL_Catalog_Name *);
-  int visit_catalog_body (TAO_PSDL_Catalog_Body *);
-  int visit_catalog_member (TAO_PSDL_Catalog_Member *);
-  int visit_storagetype_member (TAO_PSDL_Storagetype_Member *);
-  int visit_storagetype_inh_spec (TAO_PSDL_Storagetype_Inh_Spec *);
-  int visit_storagetype_name (TAO_PSDL_Storagetype_Name *);
-  int visit_storagetype_impl_spec (TAO_PSDL_Storagetype_Impl_Spec *);
-  int visit_storagetype_ref_type (TAO_PSDL_Storagetype_Ref_Type *);
-  int visit_store_directive (TAO_PSDL_Store_Directive *);
-  int visit_psdl_concrete_state_type (TAO_PSDL_Psdl_Concrete_State_Type *) ;
-  int visit_ref_rep_directive (TAO_PSDL_Ref_Rep_Directive *) ;
-  int visit_storagehome (TAO_PSDL_Storagehome *) ;
-  int visit_storagehome_header (TAO_PSDL_Storagehome_Header *) ;
-  int visit_storagehome_body  (TAO_PSDL_Storagehome_Body *) ;
-  int visit_storagehome_member  (TAO_PSDL_Storagehome_Member *) ;
-  int visit_storagehome_inh_spec  (TAO_PSDL_Storagehome_Inh_Spec *) ;
-  int visit_storagehome_name  (TAO_PSDL_Storagehome_Name *) ;
-
-  int visit_storagehome_impl_spec (TAO_PSDL_Storagehome_Impl_Spec *) ;
-  int visit_primary_key_dcl (TAO_PSDL_Primary_Key_Dcl *);
-  int visit_identifier (TAO_PSDL_Identifier *);
-
-  int visit_type_dcl (TAO_PSDL_Type_Dcl *) ;
-  int visit_type_declarator (TAO_PSDL_Type_Declarator *) ;
-  int visit_type_spec (TAO_PSDL_Type_Spec *) ;
-  int visit_simple_type_spec  (TAO_PSDL_Simple_Type_Spec *) ;
-  int visit_base_type_spec  (TAO_PSDL_Base_Type_Spec *) ;
-  int visit_template_type_spec  (TAO_PSDL_Template_Type_Spec *) ;
-  int visit_constr_type_spec  (TAO_PSDL_Constr_Type_Spec *) ;
-  int visit_declarators  (TAO_PSDL_Declarators *) ;
-  int visit_declarator  (TAO_PSDL_Declarator *) ;
-  int visit_simple_declarator  (TAO_PSDL_Simple_Declarator *) ;
-  int visit_simple_declarator_list  (TAO_PSDL_Simple_Declarator_List *) ;
-  int visit_complex_declarator  (TAO_PSDL_Complex_Declarator *) ;
-  int visit_predefined_type  (TAO_PSDL_Predefined_Type *) ;
-  int visit_member_list (TAO_PSDL_Member_List *) ;
-  int visit_member (TAO_PSDL_Member *) ;
-  int visit_union_type (TAO_PSDL_Union_Type *) ;
-  int visit_switch_type_spec (TAO_PSDL_Switch_Type_Spec *) ;
-  int visit_switch_body (TAO_PSDL_Switch_Body *) ;
-  int visit_case_case (TAO_PSDL_Case *) ;
-  int visit_case_label (TAO_PSDL_Case_Label *) ;
-  int visit_element_spec (TAO_PSDL_Element_Spec *) ;
-  int visit_const_dcl (TAO_PSDL_Const_Dcl *) ;
-  int visit_const_type (TAO_PSDL_Const_Type *) ;
-  int visit_const_exp (TAO_PSDL_Const_Exp *) ;
-  int visit_or_expr (TAO_PSDL_Or_Expr *) ;
-  int visit_xor_expr (TAO_PSDL_Xor_Expr *) ;
-  int visit_and_expr (TAO_PSDL_And_Expr *) ;
-  int visit_shift_expr (TAO_PSDL_Shift_Expr *) ;
-  int visit_add_expr (TAO_PSDL_Add_Expr *) ;
-  int visit_mult_expr (TAO_PSDL_Mult_Expr *) ;
-  int visit_unary_expr (TAO_PSDL_Unary_Expr *) ;
-  int visit_primary_expr (TAO_PSDL_Primary_Expr *) ;
-  int visit_except_dcl (TAO_PSDL_Except_Dcl *) ;
-  int visit_op_dcl (TAO_PSDL_Op_Dcl *) ;
-  int visit_storagetype (TAO_PSDL_Storagetype *) ;
-  int visit_storagetype_dcl (TAO_PSDL_Storagetype_Dcl *) ;
-  int visit_storagetype_fwd_dcl (TAO_PSDL_Storagetype_Fwd_Dcl *);
-  int visit_storagetype_header (TAO_PSDL_Storagetype_Header *);
-  int visit_storagetype_body (TAO_PSDL_Storagetype_Body *);
-  int visit_storagehome_scope (TAO_PSDL_Storagehome_Scope *);
-  int visit_provides_dcl (TAO_PSDL_Provides_Dcl *);
-  int visit_op_type_spec (TAO_PSDL_Op_Type_Spec *);
-  int visit_parameter_dcls (TAO_PSDL_Parameter_Dcls *);
-  int visit_param_dcl (TAO_PSDL_Param_Dcl *);
-  int visit_raises_expr (TAO_PSDL_Raises_Expr *);
-  int visit_context_expr (TAO_PSDL_Context_Expr *);
-  int visit_param_type_spec (TAO_PSDL_Param_Type_Spec *);
-  int visit_fixed_pt_type (TAO_PSDL_Fixed_Pt_Type *);
-  int visit_constr_forward_decl (TAO_PSDL_Constr_Forward_Decl *);
-  int visit_interface (TAO_PSDL_Interface *);
-  int visit_interface_body (TAO_PSDL_Interface_Body *);
-  int visit_interface_dcl (TAO_PSDL_Interface_Dcl *);
-  int visit_forward_dcl (TAO_PSDL_Forward_Dcl *);
-  int visit_interface_header (TAO_PSDL_Interface_Header *);
-  int visit_export_dcl (TAO_PSDL_Export_Dcl *);
-  int visit_interface_inheritance_spec (TAO_PSDL_Interface_Inheritance_Spec *);
-  int visit_interface_name (TAO_PSDL_Interface_Name *);
-  int visit_scoped_name (TAO_PSDL_Scoped_Name *);
-  int visit_value (TAO_PSDL_Value *);
-  int visit_value_common_base (TAO_PSDL_Value_Common_Base *);
-  int visit_value_forward_dcl (TAO_PSDL_Value_Forward_Dcl *);
-  int visit_value_box_dcl (TAO_PSDL_Value_Box_Dcl *);
-  int visit_value_abs_dcl (TAO_PSDL_Value_Abs_Dcl *);
-  int visit_value_dcl (TAO_PSDL_Value_Dcl *);
-  int visit_value_header (TAO_PSDL_Value_Header *);
-  int visit_value_inheritance_spec (TAO_PSDL_Value_Inheritance_Spec *);
-  int visit_value_name (TAO_PSDL_Value_Name *);
-  int visit_value_element (TAO_PSDL_Value_Element *);
-  int visit_array_declarator (TAO_PSDL_Array_Declarator *);
-  int visit_fixed_array_size (TAO_PSDL_Fixed_Array_Size *);
-  int visit_enumerator (TAO_PSDL_Enumerator *);
-  int visit_literal (TAO_PSDL_Literal *);
-  int visit_state_member (TAO_PSDL_State_Member *);
-  int visit_init_dcl (TAO_PSDL_Init_Dcl *);
-  int visit_init_param_decls (TAO_PSDL_Init_Param_Decls *);
-  int visit_init_param_decl (TAO_PSDL_Init_Param_Decl *);
-  int visit_factory_parameters (TAO_PSDL_Factory_Parameters *);
-  int visit_attr_dcl (TAO_PSDL_Attr_Dcl *);
-  int visit_factory_dcl (TAO_PSDL_Factory_Dcl *);
-  int visit_positive_int_const (TAO_PSDL_Positive_Int_Const *);
-
- private:
-
-  void print_depth (int depth);
-
-private:
-  int depth_;
-};
diff --git a/orbsvcs/PSS/PSDL.ll b/orbsvcs/PSS/PSDL.ll
deleted file mode 100644
index 50f292ce752..00000000000
--- a/orbsvcs/PSS/PSDL.ll
+++ /dev/null
@@ -1,209 +0,0 @@
-%option noyywrap
-
-%{
-// $Id$
-// ========================================================================
-//
-// = LIBRARY
-//   orbsvcs/PSS
-//
-// = FILENAME
-//   PSDL.ll
-//
-// = AUTHOR
-//   Priyanka Gontla <gontla_p@ociweb.com>
-// ========================================================================
-
-#include "ace/OS.h"
-
-#include "PSDL_Interpreter.h"
-#include "PSDL_Node.h"
-#include "PSDL_y.h"
-
-static const char * extract_string(char*);
-
-//#define TAO_YY_LEX_DEBUG
-
-#define TAO_YY_LEX_DEBUG ACE_OS::fprintf(stderr, "%s\n", yytext)
-
-#define YY_DECL int TAO_PSDL_yylex (TAO_PSDL_Node **lvalp, void* )
-
-#define YY_BREAK
-#define YY_NO_UNPUT
-
-%}
-
-white_space     \t
-letter		[a-zA-Z]
-digit		[0-9]
-alpha_num	({letter}|{digit})
-integer		{digit}+
-float		({digit}*\.{digit}+)([eE][-+]?{digit}+)?
-string		'(([^'\\]*)|([^'\\]*\\')|([^'\\]*\\\\))*'
-base		{letter}({alpha_num}|[_])*
-ident		{base}|\\{base}
-newline		\n
-
-%%
-
-";"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_SEMI; }
-":"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_COLON; }
-"{"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OPEN_CURLY_BRACE; }
-"}"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CLOSE_CURLY_BRACE; }
-"("		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OPEN_BRACE; }
-")"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CLOSE_BRACE; }
-"<"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OPEN_ANGULAR_BRACE; }
-">"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CLOSE_ANGULAR_BRACE; }
-","		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_COMMA; }
-"+"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_PLUS; }
-"-"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_MINUS; }
-"^"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_XOR; }
-"&"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_AND; }
-"*"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_MULT; }
-">>"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_RIGHT_SHIFT; }
-"<<"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_LEFT_SHIFT; }
-"/"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_DIV; }
-"%"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_PERCENT; }
-"~"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_TILDA; }
-"="		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_EQUAL; }
-"|"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OR; }
-"::"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_DOUBLE_COLON; }
-"["		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OPEN_SQUARE_BRACE; }
-"]"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CLOSE_SQUARE_BRACE; }
-"in"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_IN; }
-"as"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_AS; }
-"of"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OF; }
-"key"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_KEY; }
-"ref"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_REF; }
-"any"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_ANY; }
-"out"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OUT; }
-"case"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CASE; }
-"inout"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_INOUT; }
-"catalog"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CATALOG; }
-"provides"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_PROVIDES; }
-"char"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CHAR; }
-"implements"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_IMPLEMENTS; }
-"scope"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_SCOPE; }
-"stores"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_STORES; }
-"state"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_STATE; }
-"abstract"      { TAO_YY_LEX_DEBUG; return TAO_PSDL_ABSTRACT; }
-"storagetype"   { TAO_YY_LEX_DEBUG; return TAO_PSDL_STORAGETYPE; }
-"storagehome"   { TAO_YY_LEX_DEBUG; return TAO_PSDL_STORAGEHOME; }
-"strong"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_STRONG; }
-"primary"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_PRIMARY; }
-"readonly"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_READONLY; }
-"union"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_UNION; }
-"switch"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_SWITCH; }
-"wchar"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_WCHAR; }
-"boolean"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_BOOLEAN; }
-"octet"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OCTET; }
-"Object"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OBJECT; }
-"struct"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_STRUCT; }
-"default"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_DEFAULT; }
-"float"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_FLOAT; }
-"double"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_DOUBLE; }
-"long"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_LONG; }
-"short"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_SHORT; }
-"unsigned"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_UNSIGNED; }
-"typedef"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_TYPEDEF; }
-"native"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_NATIVE; }
-"module"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_MODULE; }
-"oneway"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_ONEWAY; }
-"const"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CONST; }
-"void"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_VOID; }
-"raises"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_RAISES; }
-"context"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CONTEXT; }
-"fixed"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_FIXED; }
-"ValueBase"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_VALUEBASE; }
-"exception"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_EXCEPTION; }
-"interface"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_INTERFACE; }
-"local"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_LOCAL; }
-"valuetype"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_VALUETYPE; }
-"custom"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CUSTOM; }
-"truncatable"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_TRUNCATABLE; }
-"supports"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_SUPPORTS; }
-"string"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_STRING; }
-"wstring"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_WSTRING; }
-"attribute"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_ATTRIBUTE; }
-"enum"		{ TAO_YY_LEX_DEBUG; return TAO_PSDL_ENUM; }
-"sequence" 	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_SEQUENCE; }
-"private"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_PRIVATE; }
-"public"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_PUBLIC; }
-"factory"	{ TAO_YY_LEX_DEBUG; return TAO_PSDL_FACTORY; }
-"TRUE"		{
-		  *lvalp =
-		    new TAO_PSDL_Literal ((CORBA::Boolean) 1);
-		  TAO_YY_LEX_DEBUG; return TAO_PSDL_TRUE;
-		}
-"FALSE"		{
-		  *lvalp =
-		    new TAO_PSDL_Literal ((CORBA::Boolean) 0);
-		  TAO_YY_LEX_DEBUG; return TAO_PSDL_FALSE;
-		}
-{integer}	{
-		  *lvalp =
-			new TAO_PSDL_Literal (ACE_OS::atoi (yytext));
-		  TAO_YY_LEX_DEBUG; return TAO_PSDL_INTEGER;
-		}
-{float}		{
-	  	  double v;
-		  sscanf (yytext, "%lf", &v);
-		  *lvalp =
-		    new TAO_PSDL_Literal (v);
-		  TAO_YY_LEX_DEBUG; return TAO_PSDL_FLOATING_PT;
-		}
-{ident}		{
-		  *lvalp =
-		    new TAO_PSDL_Identifier (yytext);
-		  TAO_YY_LEX_DEBUG; return TAO_PSDL_IDENT;
-		}
-{string}	{
-		  *lvalp =
-		    new TAO_PSDL_Literal (extract_string (yytext));
-		  TAO_YY_LEX_DEBUG; return TAO_PSDL_STRING;
-		}
-{white_space}   {
-                  TAO_YY_LEX_DEBUG; break; // Ignore
-                }
-{newline}	{
-		  TAO_YY_LEX_DEBUG; break; // Ignore
-		}
-.               {
-                  TAO_YY_LEX_DEBUG; break; // @@ TODO
-                }
-%%
-
-const char*
-extract_string(char* str)
-{
-  char *t = str;
-  for (char * i = str + 1; *i != '\''; ++i, ++t)
-    {
-      if (*i == '\\')
-        {
-          ++i;
-          if (*i == 0)
-            return 0;
-          else if (*i == 't')
-            *t = '\t';
-          else if (*i == 'n')
-            *t = '\n';
-          else if (*i == '\\')
-            *t = '\\';
-          else
-            *t = *i;
-          continue;
-        }
-
-      *t = *i;
-    }
-
-  *t = '\0';
-  return str;
-}
-
-int
-yywrap ()
-{
-  return 1;
-}
diff --git a/orbsvcs/PSS/PSDL.mpc b/orbsvcs/PSS/PSDL.mpc
deleted file mode 100644
index 57669e3426f..00000000000
--- a/orbsvcs/PSS/PSDL.mpc
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, tao_output {
-  requires += dummy_label
-  sharedname    = TAO_PSDL
-  dynamicflags += TAO_PSDL_BUILD_DLL
-  source_files {
-    PSDL_Node.cpp
-    PSDL_Interpreter.cpp
-    PSDL_Visitor_Factory.cpp
-    PSDL_Node_Visitor.cpp
-    PSDL_Module_Visitor.cpp
-    PSDL_Type_Dcl_Visitor.cpp
-    PSDL_Struct_Visitor.cpp
-    PSDL_Enum_Type_Visitor.cpp
-    PSDL_Interface_Visitor.cpp
-    PSDL_Exception_Visitor.cpp
-    PSDL_Typecode_Defn.cpp
-    PSDL_Scope.cpp
-    PSDL_Root_Scope.cpp
-    PSDL_Simple_Scope.cpp
-    PSDL_Module_Scope.cpp
-    PSDL_Interface_Scope.cpp
-    PSDL_Struct_Scope.cpp
-    PSDL_Exception_Scope.cpp
-    PSDL_Op_Dcl_Scope.cpp
-    PSDL_Scope_Visitor.cpp
-    PSDL_Stream.cpp
-    PSDL_Extern.cpp
-    PSDL_l.cpp
-    PSDL_y.cpp
-  }
-}
-
-project(*Datastore) : taolib, tao_output {
-  requires += dummy_label
-  sharedname = TAO_PSDL_Datastore
-  dynamicflags += TAO_PSDL_BUILD_DLL
-  source_files {
-    PSDL_Code_Gen.cpp
-    PSDL_OctetSeq.cpp
-    PSDL_String.cpp
-    PSDL_Datastore.cpp
-  }
-}
-
-project(*Parser) : taoexe {
-  requires += dummy_label
-  after += PSDL
-  libs  += TAO_PSDL
-  install = .
-  source_files {
-    Dump_Visitor.cpp
-    psdl_tao.cpp
-  }
-}
diff --git a/orbsvcs/PSS/PSDL.yy b/orbsvcs/PSS/PSDL.yy
deleted file mode 100644
index 3a973035561..00000000000
--- a/orbsvcs/PSS/PSDL.yy
+++ /dev/null
@@ -1,1364 +0,0 @@
-%{
-// $Id$
-// ========================================================================
-//
-// = LIBRARY
-//   orbsvcs / Persistent State Definition Language parser.
-//
-// = FILENAME
-//   PSDL.yy
-//
-// = AUTHOR
-//   Priyanka Gontla <pgontla@doc.ece.uci.edu>
-//
-// ========================================================================
-
-#include "PSDL_y.h"
-#include "PSDL_Node.h"
-#include "PSDL_Interpreter.h"
-#include "PSDL_Scope.h"
-#include "PSDL_Module_Scope.h"
-
-#define YYPARSE_PARAM lex_state
-#define YYLEX_PARAM lex_state
-
-//extern int yylex (TAO_PSDL_Node **, void *);
-extern int yylex (void);
-
-static void yyerror (const char *error)
-{
-  printf ("Error %s\n", error);	
-}
-
-%}
-
-%token TAO_PSDL_SEMI TAO_PSDL_MODULE TAO_PSDL_COLON
-%token TAO_PSDL_OPEN_CURLY_BRACE TAO_PSDL_CLOSE_CURLY_BRACE
-%token TAO_PSDL_OPEN_BRACE TAO_PSDL_CLOSE_BRACE
-%token TAO_PSDL_ABSTRACT TAO_PSDL_STORAGETYPE
-%token TAO_PSDL_STORAGEHOME
-%token TAO_PSDL_CATALOG TAO_PSDL_PROVIDES
-%token TAO_PSDL_IMPLEMENTS
-%token TAO_PSDL_SCOPE TAO_PSDL_STORES TAO_PSDL_STATE
-%token TAO_PSDL_AS TAO_PSDL_PRIMARY
-%token TAO_PSDL_STRONG TAO_PSDL_REF TAO_PSDL_OF
-%token TAO_PSDL_OPEN_ANGULAR_BRACE TAO_PSDL_CLOSE_ANGULAR_BRACE
-%token TAO_PSDL_COMMA TAO_PSDL_KEY TAO_PSDL_READONLY
-%token TAO_PSDL_UNION TAO_PSDL_SWITCH TAO_PSDL_CASE
-%token TAO_PSDL_WCHAR TAO_PSDL_BOOLEAN TAO_PSDL_OCTET
-%token TAO_PSDL_ANY TAO_PSDL_OBJECT TAO_PSDL_STRUCT
-%token TAO_PSDL_DEFAULT TAO_PSDL_FLOAT TAO_PSDL_DOUBLE
-%token TAO_PSDL_LONG TAO_PSDL_SHORT TAO_PSDL_UNSIGNED
-%token TAO_PSDL_CHAR TAO_PSDL_IDENT TAO_PSDL_TYPEDEF
-%token TAO_PSDL_NATIVE TAO_PSDL_PLUS TAO_PSDL_MINUS
-%token TAO_PSDL_XOR TAO_PSDL_AND TAO_PSDL_MULT
-%token TAO_PSDL_RIGHT_SHIFT TAO_PSDL_LEFT_SHIFT
-%token TAO_PSDL_DIV TAO_PSDL_PERCENT TAO_PSDL_TILDA
-%token TAO_PSDL_ONEWAY TAO_PSDL_CONST TAO_PSDL_EQUAL TAO_PSDL_OR
-%token TAO_PSDL_VOID TAO_PSDL_IN TAO_PSDL_OUT TAO_PSDL_INOUT
-%token TAO_PSDL_RAISES TAO_PSDL_CONTEXT TAO_PSDL_FIXED
-%token TAO_PSDL_VALUEBASE TAO_PSDL_EXCEPTION
-%token TAO_PSDL_INTERFACE
-%token TAO_PSDL_LOCAL TAO_PSDL_DOUBLE_COLON TAO_PSDL_VALUETYPE
-%token TAO_PSDL_CUSTOM TAO_PSDL_TRUNCATABLE TAO_PSDL_SUPPORTS
-%token TAO_PSDL_STRING TAO_PSDL_WSTRING TAO_PSDL_ATTRIBUTE
-%token TAO_PSDL_OPEN_SQUARE_BRACE TAO_PSDL_CLOSE_SQUARE_BRACE
-%token TAO_PSDL_ENUM TAO_PSDL_SEQUENCE
-%token TAO_PSDL_TRUE TAO_PSDL_FALSE
-%token TAO_PSDL_INTEGER TAO_PSDL_FLOATING
-%token TAO_PSDL_PRIVATE TAO_PSDL_PUBLIC TAO_PSDL_FACTORY
-%token TAO_PSDL_FLOATING_PT TAO_PSDL_CHAR_LITERAL
-%token TAO_PSDL_FIXED_PT
-
-%pure_parser
-%start psdl_specification
-
-%%
-
-psdl_specification: 	psdl_definition
-		{ $$ = new TAO_PSDL_Specification ($1); }
-			|
-			 psdl_specification psdl_definition
-		{ $$ = new TAO_PSDL_Specification ($1, $2); }
-			;
-
-psdl_definition: 	type_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Definition ($1); }
-			|
-			const_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Definition ($1); }
-			|
-			except_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Definition ($1); }
-			|
-			interface TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Definition ($1); }
-			|
-		        psdl_module TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Definition ($1); }
-			|
-			catalog TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Definition ($1); }
-			|
-			storagehome TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Definition ($1); }
-			|
-			abstract_storagehome TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Definition ($1); }
-			|
-			storagetype TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Definition ($1); }
-			|
-			abstract_storagetype TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Definition ($1); }
-			|
-			value TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Definition ($1); }
-			;
-
-psdl_module : TAO_PSDL_MODULE identifier
-	       {
-		 int good_module_name = TAO_PSDL_Scope::instance ()->pop_top_scope ()->add_module (TAO_PSDL_Scope::instance ()->get_identifier ());
-	         if (good_module_name == -1)
-		    YYABORT;
-	        }
-              TAO_PSDL_OPEN_CURLY_BRACE psdl_specification TAO_PSDL_CLOSE_CURLY_BRACE
-	        {
-		  TAO_PSDL_Scope::instance ()->set_module_scope ();
-		  $$ = new TAO_PSDL_Module (TAO_PSDL_MODULE, $2, $5); }
-			;
-
-abstract_storagetype : abstract_storagetype_dcl
-		{ TAO_PSDL_Scope::instance ()->set_scope ();
-		  $$ = new TAO_PSDL_Abstract_Storagetype ($1); }
-			|
-			abstract_storagetype_fwd_dcl
-		{ $$ = new TAO_PSDL_Abstract_Storagetype ($1); }
-			;
-
-abstract_storagetype_dcl: abstract_storagetype_header TAO_PSDL_OPEN_CURLY_BRACE abstract_storagetype_body TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Abstract_Storagetype_Dcl ($1, $3); }
-			  |
-			 abstract_storagetype_header TAO_PSDL_OPEN_CURLY_BRACE TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Abstract_Storagetype_Dcl ($1); }
-			  ;
-
-abstract_storagetype_fwd_dcl: TAO_PSDL_ABSTRACT TAO_PSDL_STORAGETYPE identifier
-		{ $$ = new TAO_PSDL_Abstract_Storagetype_Fwd_Dcl ($3); }
-			  ;
-
-storagetype_identifier:  TAO_PSDL_STORAGETYPE identifier
-		{
-		  int good_storagetype_name = TAO_PSDL_Scope::instance ()->pop_top_scope ()->add_interface (TAO_PSDL_Scope::instance ()->get_identifier ());
-		  if (good_storagetype_name == -1)
-		      YYABORT;
-
-		  $$ = $2;
-		}
-			  ;
-
-abstract_storagetype_header:
-                        TAO_PSDL_ABSTRACT storagetype_identifier abstract_storagetype_inh_spec
-		{ $$ = new TAO_PSDL_Abstract_Storagetype_Header ($2, $3); }
-			|
-		        TAO_PSDL_ABSTRACT storagetype_identifier
-		{ $$ = new TAO_PSDL_Abstract_Storagetype_Header ($2); }
-			;
-
-abstract_storagetype_body:
-     			abstract_storagetype_member
-		{ $$ = new TAO_PSDL_Abstract_Storagetype_Body ($1); }
-			|
-		   	abstract_storagetype_member abstract_storagetype_body
-		{ $$ = new TAO_PSDL_Abstract_Storagetype_Body ($1, $2); }
-			;
-
-abstract_storagetype_member:
-		   	psdl_state_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Abstract_Storagetype_Member ($1); }
-			|
-		   	local_op_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Abstract_Storagetype_Member ($1); }
-			;
-
-abstract_storagetype_inh_spec:
-			TAO_PSDL_COLON abstract_storagetype_name
-		{ $$ = new TAO_PSDL_Abstract_Storagetype_Inh_Spec ($2); }
-			;
-
-abstract_storagetype_name:
-			scoped_name
-		{ $$ = new TAO_PSDL_Abstract_Storagetype_Name ($1); }
-			|
-			scoped_name TAO_PSDL_COMMA abstract_storagetype_name
-		{ $$ = new TAO_PSDL_Abstract_Storagetype_Name ($1, $3); }
-			;
-
-psdl_state_dcl : 	TAO_PSDL_READONLY TAO_PSDL_STATE psdl_state_type_spec simple_declarator
-		{ $$ = new TAO_PSDL_Psdl_State_Dcl ($1, $3, $4); }
-		 	|
-			TAO_PSDL_STATE psdl_state_type_spec simple_declarator
-		{ $$ = new TAO_PSDL_Psdl_State_Dcl ($2, $3); }
-			;
-
-psdl_state_type_spec :  base_type_spec
-		{ $$ = new TAO_PSDL_Psdl_State_Type_Spec ($1); }
-			|
-			string_type
-		{ $$ = new TAO_PSDL_Psdl_State_Type_Spec ($1); }
-			|
-		        wide_string_type
-		{ $$ = new TAO_PSDL_Psdl_State_Type_Spec ($1); }
-			|
-		        abstract_storagetype_ref_type
-		{ $$ = new TAO_PSDL_Psdl_State_Type_Spec ($1); }
-			|
-		        scoped_name
-		{ $$ = new TAO_PSDL_Psdl_State_Type_Spec ($1); }
-			;
-
-abstract_storagetype_ref_type:
-			TAO_PSDL_STRONG TAO_PSDL_REF TAO_PSDL_OPEN_ANGULAR_BRACE abstract_storagetype_name TAO_PSDL_CLOSE_ANGULAR_BRACE
-		{ $$ = new TAO_PSDL_Abstract_Storagetype_Ref_Type ($1, $4); }
-			|
-			TAO_PSDL_REF TAO_PSDL_OPEN_ANGULAR_BRACE abstract_storagetype_name TAO_PSDL_CLOSE_ANGULAR_BRACE
-		{ $$ = new TAO_PSDL_Abstract_Storagetype_Ref_Type ($3); }
-			;
-
-abstract_storagehome :  abstract_storagehome_dcl
-		{ $$ = new TAO_PSDL_Abstract_Storagehome ($1); }
-			|
-			abstract_storagehome_fwd_dcl
-		{ $$ = new TAO_PSDL_Abstract_Storagehome ($1); }
-			;
-
-abstract_storagehome_fwd_dcl:
-			TAO_PSDL_ABSTRACT TAO_PSDL_STORAGEHOME identifier
-		{ $$ = new TAO_PSDL_Abstract_Storagehome_Fwd_Dcl ($3); }
-			;
-
-abstract_storagehome_dcl:
-			abstract_storagehome_header TAO_PSDL_OPEN_CURLY_BRACE abstract_storagehome_body TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Abstract_Storagehome_Dcl ($1, $3); }
-			|
-			abstract_storagehome_header TAO_PSDL_OPEN_CURLY_BRACE TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Abstract_Storagehome_Dcl ($1); }
-			;
-
-abstract_storagehome_header:
-			TAO_PSDL_ABSTRACT TAO_PSDL_STORAGEHOME identifier TAO_PSDL_OF abstract_storagetype_name abstract_storagehome_inh_spec
-		{ $$ = new TAO_PSDL_Abstract_Storagehome_Header ($3, $5, $6); }
-			|
-			TAO_PSDL_ABSTRACT TAO_PSDL_STORAGEHOME identifier TAO_PSDL_OF abstract_storagetype_name
-		{ $$ = new TAO_PSDL_Abstract_Storagehome_Header ($3, $5); }
-			;
-
-abstract_storagehome_body:
-                        abstract_storagehome_member
-		{ $$ = new TAO_PSDL_Abstract_Storagehome_Body ($1); }
-			|
-			abstract_storagehome_member abstract_storagehome_body
-		{ $$ = new TAO_PSDL_Abstract_Storagehome_Body ($1, $2); }
-			;
-
-abstract_storagehome_member:
-			local_op_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Abstract_Storagehome_Member ($1); }
-			|
-			key_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Abstract_Storagehome_Member ($1); }
-			|
-			factory_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Abstract_Storagehome_Member ($1); }
-			;
-
-abstract_storagehome_inh_spec:
-			TAO_PSDL_COLON abstract_storagehome_name
-		{ $$ = new TAO_PSDL_Abstract_Storagehome_Inh_Spec ($2); }
-			;
-
-abstract_storagehome_name:
-			scoped_name
-		{ $$ = new TAO_PSDL_Abstract_Storagehome_Name ($1); }
-			|
-			scoped_name TAO_PSDL_COMMA abstract_storagehome_name
-		{ $$ = new TAO_PSDL_Abstract_Storagehome_Name ($1, $3); }
-			;
-
-local_op_dcl : 	 	op_type_spec op_name parameter_dcls raises_expr
-		{ TAO_PSDL_Scope::instance ()->set_scope ();
-		  $$ = new TAO_PSDL_Op_Dcl ($1, $2, $3, $4); }
-			|
-			op_type_spec op_name parameter_dcls
-		{ TAO_PSDL_Scope::instance ()->set_scope ();
-		  $$ = new TAO_PSDL_Op_Dcl ($1, $2, $3); }
-			;
-
-key_dcl : 		TAO_PSDL_KEY identifier TAO_PSDL_OPEN_BRACE simple_declarator_list TAO_PSDL_CLOSE_BRACE
-		{ $$ = new TAO_PSDL_Key_Dcl ($2, $4); }
-			|
-			TAO_PSDL_KEY identifier
-		{ $$ = new TAO_PSDL_Key_Dcl ($2); }
-			;
-
-catalog : 		TAO_PSDL_CATALOG identifier catalog_inh_spec TAO_PSDL_OPEN_CURLY_BRACE catalog_body TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Catalog ($2, $3, $5); }
-	 		|
-			TAO_PSDL_CATALOG identifier TAO_PSDL_OPEN_CURLY_BRACE catalog_body TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Catalog ($2, $4); }
-			|
-			TAO_PSDL_CATALOG identifier TAO_PSDL_OPEN_CURLY_BRACE TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Catalog ($2); }
-			|
-			TAO_PSDL_CATALOG identifier catalog_inh_spec TAO_PSDL_OPEN_CURLY_BRACE TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Catalog ($2, $3); }
-			;
-
-catalog_inh_spec : 	TAO_PSDL_COLON catalog_name
-		{ $$ = new TAO_PSDL_Catalog_Inh_Spec ($2); }
-			;
-
-catalog_name : 		scoped_name
-		{ $$ = new TAO_PSDL_Catalog_Name ($1); }
-			|
-			scoped_name TAO_PSDL_COMMA catalog_name
-		{ $$ = new TAO_PSDL_Catalog_Name ($1, $3); }
-			;
-
-catalog_body : 		catalog_member
-		{ $$ = new TAO_PSDL_Catalog_Body ($1); }
-			|
-			catalog_member catalog_body
-		{ $$ = new TAO_PSDL_Catalog_Body ($1, $2); }
-			;
-
-catalog_member :	provides_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Catalog_Member ($1); }
-			|
-		        local_op_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Catalog_Member ($1); }
-			;
-
-provides_dcl : 		TAO_PSDL_PROVIDES abstract_storagehome_name simple_declarator
-		{ $$ = new TAO_PSDL_Provides_Dcl ($2, $3); }
-			;
-
-storagetype : 		storagetype_dcl
-		{ $$ = new TAO_PSDL_Storagetype ($1); }
-			|
-		        storagetype_fwd_dcl
-		{ $$ = new TAO_PSDL_Storagetype ($1); }
-			;
-
-storagetype_dcl : 	storagetype_header TAO_PSDL_OPEN_CURLY_BRACE storagetype_body TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Storagetype_Dcl ($1, $3); }
-			|
-			storagetype_header TAO_PSDL_OPEN_CURLY_BRACE TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Storagetype_Dcl ($1); }
-			;
-
-storagetype_fwd_dcl :	TAO_PSDL_STORAGETYPE identifier
-		{ $$ = new TAO_PSDL_Storagetype_Fwd_Dcl ($2); }
-			;
-
-storagetype_header : 	TAO_PSDL_STORAGETYPE identifier storagetype_inh_spec storagetype_impl_spec
-		{ $$ = new TAO_PSDL_Storagetype_Header ($2, $3, $4); }
-			|
-			TAO_PSDL_STORAGETYPE identifier storagetype_inh_spec
-		{ $$ = new TAO_PSDL_Storagetype_Header ($2, $3); }
-			|
-			TAO_PSDL_STORAGETYPE identifier storagetype_impl_spec
-		{ $$ = new TAO_PSDL_Storagetype_Header ($2, $3); }
-			;
-
-storagetype_body : 	storagetype_member
-		{ $$ = new TAO_PSDL_Storagetype_Body ($1); }
-			|
-			storagetype_member storagetype_body
-		{ $$ = new TAO_PSDL_Storagetype_Body ($1, $2); }
-			;
-
-storagetype_member : 	psdl_state_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Storagetype_Member ($1); }
-			|
-		        store_directive TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Storagetype_Member ($1); }
-			|
-		        ref_rep_directive TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Storagetype_Member ($1); }
-			;
-
-storagetype_inh_spec :  TAO_PSDL_COLON storagetype_name
-		{ $$ = new TAO_PSDL_Storagetype_Inh_Spec ($2); }
-			;
-
-storagetype_name : 	scoped_name
-		{ $$ = new TAO_PSDL_Storagetype_Name ($1); }
-			;
-
-storagetype_impl_spec : TAO_PSDL_IMPLEMENTS abstract_storagetype_name
-		{ $$ = new TAO_PSDL_Storagetype_Impl_Spec ($2); }
-			;
-
-storagetype_ref_type :  TAO_PSDL_REF TAO_PSDL_OPEN_ANGULAR_BRACE storagetype_name TAO_PSDL_CLOSE_ANGULAR_BRACE
-		{ $$ = new TAO_PSDL_Storagetype_Ref_Type ($3); }
-			;
-
-storagehome_scope : 	TAO_PSDL_SCOPE storagehome_name
-		{ $$ = new TAO_PSDL_Storagehome_Scope ($2); }
-			;
-
-store_directive : 	TAO_PSDL_STORES simple_declarator TAO_PSDL_AS psdl_concrete_state_type storagehome_scope
-		{ $$ = new TAO_PSDL_Store_Directive ($2, $4, $5); }
-			|
-			TAO_PSDL_STORES simple_declarator TAO_PSDL_AS psdl_concrete_state_type
-		{ $$ = new TAO_PSDL_Store_Directive ($2, $4); }
-			;
-
-psdl_concrete_state_type:
-			storagetype_name
-		{ $$ = new TAO_PSDL_Psdl_Concrete_State_Type ($1); }
-			|
-			storagetype_ref_type
-		{ $$ = new TAO_PSDL_Psdl_Concrete_State_Type ($1); }
-			;
-
-ref_rep_directive : 	TAO_PSDL_REF TAO_PSDL_OPEN_BRACE simple_declarator TAO_PSDL_CLOSE_BRACE
-		{ $$ = new TAO_PSDL_Ref_Rep_Directive ($3); }
-			;
-
-storagehome : 		storagehome_header TAO_PSDL_OPEN_CURLY_BRACE storagehome_body TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Storagehome ($1, $3); }
-			|
-			storagehome_header TAO_PSDL_OPEN_CURLY_BRACE TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Storagehome ($1); }
-			;
-
-storagehome_header : 	TAO_PSDL_STORAGEHOME identifier TAO_PSDL_OF storagetype_name storagehome_inh_spec storagehome_impl_spec
-		{ $$ = new TAO_PSDL_Storagehome_Header ($2, $4, $5, $6); }
-			|
-			TAO_PSDL_STORAGEHOME identifier TAO_PSDL_OF storagetype_name storagehome_inh_spec
-		{ $$ = new TAO_PSDL_Storagehome_Header ($2, $4, $5); }
-			|
-			TAO_PSDL_STORAGEHOME identifier TAO_PSDL_OF storagetype_name storagehome_impl_spec
-		{ $$ = new TAO_PSDL_Storagehome_Header ($2, $4, $5); }
-			|
-			TAO_PSDL_STORAGEHOME identifier TAO_PSDL_OF storagetype_name
-		{ $$ = new TAO_PSDL_Storagehome_Header ($2, $4); }
-			;
-
-storagehome_body : 	storagehome_member
-		{ $$ = new TAO_PSDL_Storagehome_Body ($1); }
-		   	|
-		   	storagehome_member storagehome_body
-		{ $$ = new TAO_PSDL_Storagehome_Body ($1, $2); }
-			;
-
-storagehome_member :  	key_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Storagehome_Member ($1); }
-			|
-		        primary_key_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Storagehome_Member ($1); }
-			;
-
-storagehome_inh_spec : TAO_PSDL_COLON storagehome_name
-		{ $$ = new TAO_PSDL_Storagehome_Inh_Spec ($2); }
-			;
-
-storagehome_name : 	scoped_name
-		{ $$ = new TAO_PSDL_Storagehome_Name ($1); }
-			;
-
-storagehome_impl_spec : TAO_PSDL_IMPLEMENTS abstract_storagehome_name
-		{ $$ = new TAO_PSDL_Storagehome_Impl_Spec ($2); }
-			;
-
-primary_key_dcl : 	TAO_PSDL_PRIMARY TAO_PSDL_KEY identifier
-		{ $$ = new TAO_PSDL_Primary_Key_Dcl ($3); }
-			|
-			TAO_PSDL_PRIMARY TAO_PSDL_KEY TAO_PSDL_REF
-		{ $$ = new TAO_PSDL_Primary_Key_Dcl (); }
-			;
-
-identifier: 		TAO_PSDL_IDENT
-		{ $$ = $1; }
-			;
-
-type_dcl : 		TAO_PSDL_TYPEDEF type_declarator
-		{ $$ = new TAO_PSDL_Type_Dcl (TAO_PSDL_TYPEDEF, $2); }
-			|
-		    	struct_type
-		{ $$ = new TAO_PSDL_Type_Dcl ($1); }
-			|
-			union_type
-		{ $$ = new TAO_PSDL_Type_Dcl ($1); }
-			|
-		    	enum_type
-		{ $$ = new TAO_PSDL_Type_Dcl ($1); }
-			|
-			TAO_PSDL_NATIVE simple_declarator
-		{ $$ = new TAO_PSDL_Type_Dcl (TAO_PSDL_NATIVE, $2); }
-			|
-		    	constr_forward_decl
-		{ $$ = new TAO_PSDL_Type_Dcl ($1); }
-			;
-
-type_declarator : 	type_spec declarators
-		{ $$ = new TAO_PSDL_Type_Declarator ($1, $2); }
-			;
-
-type_spec : 		simple_type_spec
-		{ $$ = new TAO_PSDL_Type_Spec ($1); }
-			|
-			constr_type_spec
-		{ $$ = new TAO_PSDL_Type_Spec ($1); }
-			;
-
-simple_type_spec : 	base_type_spec
-		{ $$ = new TAO_PSDL_Simple_Type_Spec ($1); }
-			|
-			template_type_spec
-		{ $$ = new TAO_PSDL_Simple_Type_Spec ($1); }
-			|
-		        scoped_name
-		{ $$ = new TAO_PSDL_Simple_Type_Spec ($1); }
-			;
-
-base_type_spec : 	floating_pt_type
-		{ $$ = new TAO_PSDL_Base_Type_Spec ($1); }
-			|
-		    	integer_type
-		{ $$ = new TAO_PSDL_Base_Type_Spec ($1); }
-			|
-			char_type
-		{ $$ = new TAO_PSDL_Base_Type_Spec ($1); }
-			|
-			wide_char_type
-		{ $$ = new TAO_PSDL_Base_Type_Spec ($1); }
-			|
-			boolean_type
-		{ $$ = new TAO_PSDL_Base_Type_Spec ($1); }
-			|
-			octet_type
-		{ $$ = new TAO_PSDL_Base_Type_Spec ($1); }
-			|
-			any_type
-		{ $$ = new TAO_PSDL_Base_Type_Spec ($1); }
-			|
-			object_type
-		{ $$ = new TAO_PSDL_Base_Type_Spec ($1); }
-			|
-			value_base_type
-		{ $$ = new TAO_PSDL_Base_Type_Spec ($1); }
-			;
-
-template_type_spec : 	sequence_type
-		{ $$ = new TAO_PSDL_Template_Type_Spec ($1); }
-			|
-			string_type
-		{ $$ = new TAO_PSDL_Template_Type_Spec ($1); }
-			|
-			wide_string_type
-		{ $$ = new TAO_PSDL_Template_Type_Spec ($1); }
-			|
-			fixed_pt_type
-		{ $$ = new TAO_PSDL_Template_Type_Spec ($1); }
-			;
-
-constr_type_spec : 	struct_type
-		{ $$ = new TAO_PSDL_Constr_Type_Spec ($1); }
-			|
-			union_type
-		{ $$ = new TAO_PSDL_Constr_Type_Spec ($1); }
-			|
-			enum_type
-		{ $$ = new TAO_PSDL_Constr_Type_Spec ($1); }
-			;
-
-declarators : 		declarator
-		{ $$ = new TAO_PSDL_Declarators ($1); }
-			|
-			declarator TAO_PSDL_COMMA declarators
-		{ $$ = new TAO_PSDL_Declarators ($1, $3); }
-			;
-
-declarator : 		simple_declarator
-		{ $$ = new TAO_PSDL_Declarator ($1); }
-			|
-			complex_declarator
-		{ $$ = new TAO_PSDL_Declarator ($1); }
-			;
-
-simple_declarator : 	identifier
-		{ $$ = $1; }
-			;
-
-simple_declarator_list : simple_declarator
-		{ $$ = new TAO_PSDL_Simple_Declarator_List ($1); }
-			|
-			simple_declarator_list TAO_PSDL_COMMA simple_declarator
-		{ $$ = new TAO_PSDL_Simple_Declarator_List ($1, $3); }
-			;
-
-complex_declarator : array_declarator
-		{ $$ = new TAO_PSDL_Complex_Declarator ($1); }
-			;
-
-floating_pt_type : 	TAO_PSDL_FLOAT
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_FLOAT); }
-		   	|
-		   	TAO_PSDL_DOUBLE
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_DOUBLE); }
-		    	|
-			TAO_PSDL_LONG TAO_PSDL_DOUBLE
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_LONG, TAO_PSDL_DOUBLE); }
-			;
-
-integer_type : 		signed_int
-		{ $$ = $1; }
-			|
-			unsigned_int
-		{ $$ = $1; }
-			;
-
-signed_int : 		signed_short_int
-		{ $$ = $1; }
-			|
-			signed_long_int
-		{ $$ = $1; }
-			|
-			signed_longlong_int
-		{ $$ = $1; }
-			;
-
-signed_short_int : 	TAO_PSDL_SHORT
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_SHORT); }
-			;
-
-signed_long_int : 	TAO_PSDL_LONG
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_LONG); }
-			;
-
-signed_longlong_int : 	TAO_PSDL_LONG TAO_PSDL_LONG
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_LONG, TAO_PSDL_LONG); }
-			;
-
-unsigned_int : 		unsigned_short_int
-		{ $$ = new TAO_PSDL_Predefined_Type ($1); }
-			|
-			unsigned_long_int
-		{ $$ = new TAO_PSDL_Predefined_Type ($1); }
-			|
-			unsigned_longlong_int
-		{ $$ = new TAO_PSDL_Predefined_Type ($1); }
-			;
-
-unsigned_short_int : 	TAO_PSDL_UNSIGNED TAO_PSDL_SHORT
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_UNSIGNED, TAO_PSDL_SHORT); }
-			;
-
-unsigned_long_int : TAO_PSDL_UNSIGNED TAO_PSDL_LONG
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_UNSIGNED, TAO_PSDL_LONG); }
-			;
-
-unsigned_longlong_int : TAO_PSDL_UNSIGNED TAO_PSDL_LONG TAO_PSDL_LONG
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_UNSIGNED, TAO_PSDL_LONG, TAO_PSDL_LONG); }
-			;
-
-char_type : 		TAO_PSDL_CHAR
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_CHAR); }
-			;
-
-wide_char_type : 	TAO_PSDL_WCHAR
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_WCHAR); }
-			;
-
-boolean_type : 		TAO_PSDL_BOOLEAN
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_BOOLEAN); }
-			;
-
-octet_type : 		TAO_PSDL_OCTET
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_OCTET); }
-			;
-
-any_type : 		TAO_PSDL_ANY
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_ANY); }
-			;
-
-object_type : 		TAO_PSDL_OBJECT
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_OBJECT); }
-			;
-
-struct_type : 		TAO_PSDL_STRUCT identifier
-		{
-		  int good_struct_name = TAO_PSDL_Scope::instance ()->pop_top_scope ()->add_struct (TAO_PSDL_Scope::instance ()->get_identifier ());
-
-		  if (good_struct_name == -1)
-			YYABORT;
-		}
-			TAO_PSDL_OPEN_CURLY_BRACE member_list TAO_PSDL_CLOSE_CURLY_BRACE
-		{
-  		  TAO_PSDL_Scope::instance ()->set_scope ();
-		  $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_STRUCT, $2, $5); }
-			;
-
-member_list : 		member
-		{ $$ = new TAO_PSDL_Member_List ($1); }
-			|
-			member member_list
-		{ $$ = new TAO_PSDL_Member_List ($1, $2); }
-			;
-
-member : 		type_spec declarators TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Member ($1, $2); }
-			;
-
-union_type : 		TAO_PSDL_UNION identifier TAO_PSDL_SWITCH TAO_PSDL_OPEN_BRACE switch_type_spec TAO_PSDL_CLOSE_BRACE TAO_PSDL_OPEN_CURLY_BRACE switch_body TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Predefined_Type ($2, $5, $8); }
-			;
-
-switch_type_spec : 	integer_type
-		{ $$ = new TAO_PSDL_Switch_Type_Spec ($1); }
-			|
-			char_type
-		{ $$ = new TAO_PSDL_Switch_Type_Spec ($1); }
-			|
-			boolean_type
-		{ $$ = new TAO_PSDL_Switch_Type_Spec ($1); }
-			|
-			enum_type
-		{ $$ = new TAO_PSDL_Switch_Type_Spec ($1); }
-			|
-			scoped_name
-		{ $$ = new TAO_PSDL_Switch_Type_Spec ($1); }
-			;
-
-switch_body : 		case
-		{ $$ = new TAO_PSDL_Switch_Body ($1); }
-			|
-			case switch_body
-		{ $$ = new TAO_PSDL_Switch_Body ($1, $2); }
-			;
-
-case : 			case_label element_spec TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Case ($1, $2); }
-			;
-
-case_label : 		TAO_PSDL_CASE const_exp TAO_PSDL_COLON
-		{ $$ = new TAO_PSDL_Case_Label ($1, $2); }
-			|
-			TAO_PSDL_DEFAULT TAO_PSDL_COLON
-		{ $$ = new TAO_PSDL_Case_Label ($1); }
-			|
-			TAO_PSDL_CASE const_exp TAO_PSDL_COLON case_label
-		{ $$ = new TAO_PSDL_Case_Label ($1, $2, $4); }
-			|
-			TAO_PSDL_DEFAULT TAO_PSDL_COLON case_label
-		{ $$ = new TAO_PSDL_Case_Label ($1, $3); }
-			;
-
-element_spec : 		type_spec declarator
-		{ $$ = new TAO_PSDL_Element_Spec ($1, $2); }
-			;
-
-const_dcl : 		TAO_PSDL_CONST const_type identifier TAO_PSDL_EQUAL const_exp
-		{ $$ = new TAO_PSDL_Const_Dcl ($2, $3, $5); }
-			;
-
-const_type : 		integer_type
-		{ $$ = new TAO_PSDL_Predefined_Type($1); }
-			|
-			char_type
-		{ $$ = new TAO_PSDL_Predefined_Type($1); }
-			|
-			wide_char_type
-		{ $$ = new TAO_PSDL_Predefined_Type($1); }
-			|
-		    	boolean_type
-		{ $$ = new TAO_PSDL_Predefined_Type($1); }
-			|
-			floating_pt_type
-		{ $$ = new TAO_PSDL_Predefined_Type($1); }
-			|
-			string_type
-		{ $$ = new TAO_PSDL_Predefined_Type($1); }
-			|
-			wide_string_type
-		{ $$ = new TAO_PSDL_Predefined_Type($1); }
-			|
-			fixed_pt_const_type
-		{ $$ = new TAO_PSDL_Predefined_Type($1); }
-			|
-			scoped_name
-		{ $$ = new TAO_PSDL_Predefined_Type($1); }
-			|
-			octet_type
-		{ $$ = new TAO_PSDL_Predefined_Type($1); }
-			;
-
-const_exp : 		or_expr
-		{ $$ = new TAO_PSDL_Const_Exp ($1); }
-			;
-
-or_expr : 		xor_expr
-		{ $$ = new TAO_PSDL_Or_Expr ($1); }
-			|
-			or_expr TAO_PSDL_OR xor_expr
-		{ $$ = new TAO_PSDL_Or_Expr ($1, $3); }
-			;
-
-xor_expr :		and_expr
-		{ $$ = new TAO_PSDL_Xor_Expr ($1); }
-			|
-			xor_expr TAO_PSDL_XOR and_expr
-		{ $$ = new TAO_PSDL_Xor_Expr ($1, $3); }
-			;
-
-and_expr : 		shift_expr
-		{ $$ = new TAO_PSDL_And_Expr ($1); }
-			|
-			and_expr TAO_PSDL_AND shift_expr
-		{ $$ = new TAO_PSDL_And_Expr ($1, $3); }
-			;
-
-shift_expr : 		add_expr
-		{ $$ = new TAO_PSDL_Shift_Expr ($1); }
-			|
-			shift_expr TAO_PSDL_RIGHT_SHIFT add_expr
-		{ $$ = new TAO_PSDL_Shift_Expr ($1, $2, $3); }
-			|
-			shift_expr TAO_PSDL_LEFT_SHIFT add_expr
-		{ $$ = new TAO_PSDL_Shift_Expr ($1, $2, $3); }
-			;
-
-add_expr : 		mult_expr
-		{ $$ = new TAO_PSDL_Add_Expr ($1); }
-			|
-			add_expr TAO_PSDL_PLUS mult_expr
-		{ $$ = new TAO_PSDL_Add_Expr ($1, $2, $3); }
-			|
-			add_expr TAO_PSDL_MINUS mult_expr
-		{ $$ = new TAO_PSDL_Add_Expr ($1, $2, $3); }
-			;
-
-mult_expr : 		unary_expr
-		{ $$ = new TAO_PSDL_Mult_Expr ($1); }
-			|
-			mult_expr TAO_PSDL_MULT unary_expr
-		{ $$ = new TAO_PSDL_Mult_Expr ($1, $3); }
-			|
-			mult_expr TAO_PSDL_DIV unary_expr
-		{ $$ = new TAO_PSDL_Mult_Expr ($1, $3); }
-			|
-			mult_expr TAO_PSDL_PERCENT unary_expr
-		{ $$ = new TAO_PSDL_Mult_Expr ($1, $3); }
-			;
-
-unary_expr : 		unary_operator primary_expr
-		{ $$ = new TAO_PSDL_Unary_Expr ($1, $2); }
-			|
-			primary_expr
-		{ $$ = new TAO_PSDL_Unary_Expr ($1); }
-			;
-
-unary_operator : 	TAO_PSDL_MINUS
-		{ $$ = $1; }
-			|
-			TAO_PSDL_PLUS
-		{ $$ = $1; }
-			|
-			TAO_PSDL_TILDA
-		{ $$ = $1; }
-			;
-
-primary_expr : 		scoped_name
-		{ $$ = new TAO_PSDL_Primary_Expr ($1); }
-			|
-			literal
-		{ $$ = new TAO_PSDL_Primary_Expr ($1); }
-			|
-			TAO_PSDL_OPEN_BRACE const_exp TAO_PSDL_CLOSE_BRACE
-		{ $$ = new TAO_PSDL_Primary_Expr ($2); }
-			;
-
-except_header : 	TAO_PSDL_EXCEPTION identifier
-		{
-		  int good_except_name = TAO_PSDL_Scope::instance ()->pop_top_scope ()->add_exception (TAO_PSDL_Scope::instance ()->get_identifier ());
-	          if (good_except_name == -1)
-		    YYABORT;
-	    	  $$ = $2;
-		}
-			;
-
-except_dcl : 		except_header TAO_PSDL_OPEN_CURLY_BRACE member_list TAO_PSDL_CLOSE_CURLY_BRACE
-		{
-		  TAO_PSDL_Scope::instance ()->set_scope ();
-		  $$ = new TAO_PSDL_Except_Dcl ($1, $3);
-		}
-			|
-			except_header TAO_PSDL_OPEN_CURLY_BRACE TAO_PSDL_CLOSE_CURLY_BRACE
-		{
-		  TAO_PSDL_Scope::instance ()->set_scope ();
-		  $$ = new TAO_PSDL_Except_Dcl ($1);
-		}
-			;
-
-op_name :		identifier
-		{
-		  int good_op_dcl_name = TAO_PSDL_Scope::instance ()->pop_top_scope ()->add_op_dcl (TAO_PSDL_Scope::instance ()->get_identifier ());
-
-	          if (good_op_dcl_name == -1)
-		    YYABORT;
-	
-		  $$ = $1;
-		}
-			;
-
-op_dcl : 		op_attribute op_type_spec op_name parameter_dcls raises_expr context_expr
-		{ TAO_PSDL_Scope::instance ()->set_scope ();
-		  $$ = new TAO_PSDL_Op_Dcl ($1, $2, $3, $4, $5, $6); }
-			|
-			op_type_spec op_name parameter_dcls raises_expr context_expr
-		{ TAO_PSDL_Scope::instance ()->set_scope (); 
-		  $$ = new TAO_PSDL_Op_Dcl ($1, $2, $3, $4, $5); }
-			|
-			 op_attribute op_type_spec op_name parameter_dcls raises_expr
-		{ TAO_PSDL_Scope::instance ()->set_scope ();
-		  $$ = new TAO_PSDL_Op_Dcl ($1, $2, $3, $4, $5); }
-			|
-			 op_attribute op_type_spec op_name parameter_dcls context_expr
-		{ TAO_PSDL_Scope::instance ()->set_scope ();
-		  $$ = new TAO_PSDL_Op_Dcl ($1, $2, $3, $4, $5); }
-			|
-			op_type_spec op_name parameter_dcls raises_expr
-		{ TAO_PSDL_Scope::instance ()->set_scope ();
-                  $$ = new TAO_PSDL_Op_Dcl ($1, $2, $3, $4); }
-			|
-			op_type_spec op_name parameter_dcls context_expr
-		{ TAO_PSDL_Scope::instance ()->set_scope ();
-		  $$ = new TAO_PSDL_Op_Dcl ($1, $2, $3, $4); }
-			|
-			op_type_spec op_name parameter_dcls
-		{ TAO_PSDL_Scope::instance ()->set_scope ();
-                  $$ = new TAO_PSDL_Op_Dcl ($1, $2, $3); }
-			;
-
-op_attribute : 		TAO_PSDL_ONEWAY
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_ONEWAY); }
-			;
-
-op_type_spec : 		param_type_spec
-		{ $$ = new TAO_PSDL_Op_Type_Spec ($1); }
-			|
-		 	TAO_PSDL_VOID
-		{ $$ = new TAO_PSDL_Op_Type_Spec (TAO_PSDL_VOID); }
-			;
-
-parameter_dcls : 	TAO_PSDL_OPEN_BRACE param_dcl TAO_PSDL_CLOSE_BRACE
-		{ $$ = new TAO_PSDL_Parameter_Dcls ($2); }
-			|
-			TAO_PSDL_OPEN_BRACE TAO_PSDL_CLOSE_BRACE
-		{ $$ = new TAO_PSDL_Parameter_Dcls (); }
-			;
-
-param_dcl : 		param_attribute param_type_spec simple_declarator
-		{ $$ = new TAO_PSDL_Param_Dcl ($1, $2, $3); }
-			|
-			param_attribute param_type_spec simple_declarator TAO_PSDL_COMMA param_dcl
-		{ $$ = new TAO_PSDL_Param_Dcl ($1, $2, $3, $5); }
-			;
-
-param_attribute : 	TAO_PSDL_IN
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_IN); }
-			|
-			TAO_PSDL_OUT
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_OUT); }
-			|
-			TAO_PSDL_INOUT
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_INOUT); }
-			;
-
-raises_expr : 		TAO_PSDL_RAISES TAO_PSDL_OPEN_BRACE scoped_name TAO_PSDL_CLOSE_BRACE
-		{ $$ = new TAO_PSDL_Raises_Expr ($3); }
-			|
-			TAO_PSDL_RAISES TAO_PSDL_OPEN_BRACE scoped_name TAO_PSDL_COMMA comma_scoped_name TAO_PSDL_CLOSE_BRACE
-		{ $$ = new TAO_PSDL_Raises_Expr ($3, $4); }
-			;
-
-context_expr : 		TAO_PSDL_CONTEXT TAO_PSDL_OPEN_BRACE string_literal TAO_PSDL_CLOSE_BRACE
-		{ $$ = new TAO_PSDL_Context_Expr ($3); }
-			;
-
-param_type_spec : 	base_type_spec
-		{ $$ = new TAO_PSDL_Param_Type_Spec ($1); }
-			|
-			string_type
-		{ $$ = new TAO_PSDL_Param_Type_Spec ($1); }
-			|
-			wide_string_type
-		{ $$ = new TAO_PSDL_Param_Type_Spec ($1); }
-			|
-			scoped_name
-		{ $$ = new TAO_PSDL_Param_Type_Spec ($1); }
-			;
-
-fixed_pt_type : 	TAO_PSDL_FIXED TAO_PSDL_OPEN_ANGULAR_BRACE positive_int_const TAO_PSDL_COMMA positive_int_const TAO_PSDL_CLOSE_ANGULAR_BRACE
-		{ $$ = new TAO_PSDL_Predefined_Type ($3, $5); }
-			;
-
-fixed_pt_const_type : 	TAO_PSDL_FIXED
-		{ $$ = $1; }
-			;
-
-value_base_type : 	TAO_PSDL_VALUEBASE
-		{ $$ = $1; }
-			;
-
-constr_forward_decl : 	TAO_PSDL_STRUCT identifier
-		{ $$ = new TAO_PSDL_Constr_Forward_Decl ($1, $2); }
-			|
-			TAO_PSDL_UNION identifier
-		{ $$ = new TAO_PSDL_Constr_Forward_Decl ($1, $2); }
-			;
-
-interface : 		interface_dcl
-		{ $$ = new TAO_PSDL_Interface ($1); }
-			|
-			forward_dcl
-		{ $$ = new TAO_PSDL_Interface ($1); }
-			;
-
-interface_dcl : 	interface_header TAO_PSDL_OPEN_CURLY_BRACE interface_body TAO_PSDL_CLOSE_CURLY_BRACE
-		{
-		  TAO_PSDL_Scope::instance ()->set_interface_scope ();
-		  $$ = new TAO_PSDL_Interface_Dcl ($1, $3);
-		}
-			|
-			interface_header TAO_PSDL_OPEN_CURLY_BRACE TAO_PSDL_CLOSE_CURLY_BRACE
-		{
-		  TAO_PSDL_Scope::instance ()->set_interface_scope ();
-		  $$ = new TAO_PSDL_Interface_Dcl ($1);
-		}
-			;
-
-forward_dcl : 		TAO_PSDL_ABSTRACT TAO_PSDL_INTERFACE identifier
-		{ $$ = new TAO_PSDL_Forward_Dcl (TAO_PSDL_ABSTRACT, $3); }
-			|
-			TAO_PSDL_LOCAL TAO_PSDL_INTERFACE identifier
-		{ $$ = new TAO_PSDL_Forward_Dcl (TAO_PSDL_LOCAL, $3); }
-			|
-			TAO_PSDL_INTERFACE identifier
-		{ $$ = new TAO_PSDL_Forward_Dcl ($2); }
-			;
-
-interface_identifier:    TAO_PSDL_INTERFACE identifier
-		{
-		  int good_interface_name = TAO_PSDL_Scope::instance ()->pop_top_scope ()->add_interface (TAO_PSDL_Scope::instance ()->get_identifier ());
-		  if (good_interface_name == -1)
-		      YYABORT;
-
-		  $$ = $2;
-		}
-			;
-
-interface_header : 	TAO_PSDL_ABSTRACT interface_identifier
-		{ $$ = new TAO_PSDL_Interface_Header ($1, $2); }
-			|
-			TAO_PSDL_LOCAL interface_identifier
-		{ $$ = new TAO_PSDL_Interface_Header ($1, $2); }
-			|
-			interface_identifier
-		{ $$ = new TAO_PSDL_Interface_Header ($1); }
-			|
-	 		TAO_PSDL_ABSTRACT interface_identifier interface_inheritance_spec
-		{ $$ = new TAO_PSDL_Interface_Header ($1, $2, $3); }
-			|
-			TAO_PSDL_LOCAL interface_identifier interface_inheritance_spec
-		{ $$ = new TAO_PSDL_Interface_Header ($1, $2, $3); }
-			|
-			interface_identifier interface_inheritance_spec
-		{ $$ = new TAO_PSDL_Interface_Header ($2, $1); }
-			;
-
-interface_body : 	export
-		{ $$ = new TAO_PSDL_Interface_Body ($1); }
-			|
-			export interface_body
-		{ $$ = new TAO_PSDL_Interface_Body ($1, $2); }
-			;
-
-export : 		type_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Export_Dcl ($1); }
-			|
-			const_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Export_Dcl ($1); }
-			|
-			except_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Export_Dcl ($1); }
-			|
-			attr_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Export_Dcl ($1); }
-			|
-			op_dcl TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Export_Dcl ($1); }
-			;
-
-interface_inheritance_spec:
-			TAO_PSDL_COLON interface_name
-		{ $$ = new TAO_PSDL_Interface_Inheritance_Spec ($2); }
-			;
-
-interface_name : 	scoped_name
-		{ $$ = new TAO_PSDL_Interface_Name ($1); }
-			|
-			scoped_name TAO_PSDL_COMMA interface_name
-		{ $$ = new TAO_PSDL_Interface_Name ($1, $2); }
-			;
-
-scoped_name : 		identifier TAO_PSDL_DOUBLE_COLON scoped_name
-		{ $$ = new TAO_PSDL_Scoped_Name ($1, $3); }
-			|
-			identifier
-		{ $$ = $1; }
-			;
-
-comma_scoped_name: 	identifier TAO_PSDL_COMMA comma_scoped_name
-		{ $$ = new TAO_PSDL_Scoped_Name ($1, $3); }
-			|
-			identifier
-		{ $$ = $1; }
-			;
-
-value  :  		value_dcl
-		{ $$ = new TAO_PSDL_Value ($1); }
-			|
-			value_abs_dcl
-		{ $$ = new TAO_PSDL_Value ($1); }
-			|
-			value_box_dcl
-		{ $$ = new TAO_PSDL_Value ($1); }
-			|
-			value_forward_dcl
-		{ $$ = new TAO_PSDL_Value ($1); }
-			;
-
-value_common_base:  	TAO_PSDL_VALUETYPE identifier
-		{ $$ = new TAO_PSDL_Value_Common_Base ($2); }
-			;
-
-value_forward_dcl:	TAO_PSDL_ABSTRACT value_common_base
-		{ $$ = new TAO_PSDL_Value_Forward_Dcl ($1, $2); }
-			|
-			value_common_base
-		{ $$ = new TAO_PSDL_Value_Forward_Dcl ($1); }
-			;
-
-value_box_dcl  : 	value_common_base type_spec
-		{ $$ = new TAO_PSDL_Value_Box_Dcl ($1, $2); }
-			;
-
-value_abs_dcl : 	TAO_PSDL_ABSTRACT value_common_base value_inheritance_spec TAO_PSDL_OPEN_CURLY_BRACE export TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Value_Abs_Dcl ($2, $3, $5); }
-			|
-			TAO_PSDL_ABSTRACT value_common_base TAO_PSDL_OPEN_CURLY_BRACE export TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Value_Abs_Dcl ($2, $4); }
-			;
-
-value_dcl   : value_header TAO_PSDL_OPEN_CURLY_BRACE value_element TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Value_Dcl ($1, $3); }
-			;
-
-value_header  : 	TAO_PSDL_CUSTOM value_common_base value_inheritance_spec
-		{ $$ = new TAO_PSDL_Value_Header ($1, $2, $3); }
-			|
-			value_common_base value_inheritance_spec
-		{ $$ = new TAO_PSDL_Value_Header ($1, $2); }
-			|
-			TAO_PSDL_CUSTOM value_common_base
-		{ $$ = new TAO_PSDL_Value_Header ($1, $2); }
-			;
-
-value_inheritance_spec  :  	TAO_PSDL_COLON TAO_PSDL_TRUNCATABLE value_name TAO_PSDL_SUPPORTS interface_name
-		{ $$ = new TAO_PSDL_Value_Inheritance_Spec ($2, $3, $5); }
-				|
-				TAO_PSDL_COLON value_name TAO_PSDL_SUPPORTS interface_name
-		{ $$ = new TAO_PSDL_Value_Inheritance_Spec ($2, $4); }
-				|
-				TAO_PSDL_SUPPORTS interface_name
-		{ $$ = new TAO_PSDL_Value_Inheritance_Spec ($2); }
-				|
-				TAO_PSDL_COLON TAO_PSDL_TRUNCATABLE value_name
-		{ $$ = new TAO_PSDL_Value_Inheritance_Spec ($2, $3); }
-				|
-				TAO_PSDL_COLON value_name
-		{ $$ = new TAO_PSDL_Value_Inheritance_Spec ($2); }
-				;
-
-
-string_type: 			TAO_PSDL_STRING TAO_PSDL_OPEN_ANGULAR_BRACE positive_int_const TAO_PSDL_CLOSE_ANGULAR_BRACE
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_STRING, $3); }
-				|
-				TAO_PSDL_STRING
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_STRING); }
-				;
-
-wide_string_type : 		TAO_PSDL_WSTRING TAO_PSDL_OPEN_ANGULAR_BRACE positive_int_const TAO_PSDL_CLOSE_ANGULAR_BRACE
-		{ $$ = new TAO_PSDL_Predefined_Type ($3); }
-				|
-				TAO_PSDL_WSTRING
-		{ $$ = $1; }
-				;
-
-array_declarator : 		identifier fixed_array_size
-		{ $$ = new TAO_PSDL_Array_Declarator ($1, $2); }
-				;
-
-fixed_array_size : 		TAO_PSDL_OPEN_SQUARE_BRACE positive_int_const TAO_PSDL_CLOSE_SQUARE_BRACE
-		{ $$ = new TAO_PSDL_Fixed_Array_Size ($2); }
-				;
-
-attr_dcl : 			TAO_PSDL_READONLY TAO_PSDL_ATTRIBUTE param_type_spec simple_declarator
-		{ $$ = new TAO_PSDL_Attr_Dcl (TAO_PSDL_READONLY, $3, $4); }
-				|
-				TAO_PSDL_ATTRIBUTE param_type_spec simple_declarator
-		{ $$ = new TAO_PSDL_Attr_Dcl ($2, $3); }
-				;
-
-enum_type : 			TAO_PSDL_ENUM identifier TAO_PSDL_OPEN_CURLY_BRACE enumerator TAO_PSDL_CLOSE_CURLY_BRACE
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_ENUM, $2, $4); }
-				;
-
-enumerator : 			identifier
-		{ $$ = new TAO_PSDL_Enumerator ($1); }
-				|
-				identifier TAO_PSDL_COMMA enumerator
-		{ $$ = new TAO_PSDL_Enumerator ($1, $3); }
-				;
-
-sequence_type : 		TAO_PSDL_SEQUENCE TAO_PSDL_OPEN_ANGULAR_BRACE simple_type_spec TAO_PSDL_COMMA positive_int_const TAO_PSDL_CLOSE_ANGULAR_BRACE
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_SEQUENCE, $3, $5); }
-				|
-				TAO_PSDL_SEQUENCE TAO_PSDL_OPEN_ANGULAR_BRACE simple_type_spec TAO_PSDL_CLOSE_ANGULAR_BRACE
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_SEQUENCE, $3); }
-				;
-
-literal : 			integer_literal
-		{ $$ = $1; }
-				|
-			 	string_literal
-		{ $$ = $1; }
-				|
-				wide_string_literal
-		{ $$ = $1; }
-				|
-				character_literal
-		{ $$ = $1; }
-				|
-				wide_character_literal
-		{ $$ = $1; }
-				|
-				fixed_pt_literal
-		{ $$ = $1; }
-				|
-				floating_pt_literal
-		{ $$ = $1; }
-				|
-				boolean_literal
-		{ $$ = $1; }
-				;
-
-boolean_literal : 		TAO_PSDL_TRUE
-		{ $$ = $1; }
-				|
-				TAO_PSDL_FALSE
-		{ $$ = $1; }
-				;
-
-integer_literal: 		TAO_PSDL_INTEGER
-		{ $$ = $1; }
-				;
-
-floating_pt_literal: 		TAO_PSDL_FLOATING_PT
-		{ $$ = $1; }
-				;
-
-character_literal: 		TAO_PSDL_CHAR_LITERAL
-		{ $$ = $1; }
-				;
-
-wide_character_literal: 	TAO_PSDL_WCHAR
-		{ $$ = $1; }
-				;
-
-string_literal: 		TAO_PSDL_STRING
-		{ $$ = $1; }
-				;
-
-wide_string_literal: 		TAO_PSDL_WSTRING
-		{ $$ = $1; }
-				;
-
-fixed_pt_literal: 		TAO_PSDL_FIXED_PT
-		{ $$ = $1; }
-				;
-
-value_name: 			scoped_name
-		{ $$ = new TAO_PSDL_Value_Name ($1); }
-				|
-				scoped_name TAO_PSDL_COMMA value_name
-		{ $$ = new TAO_PSDL_Value_Name ($1, $3); }
-				;
-
-value_element : 		export
-		{ $$ = new TAO_PSDL_Value_Element ($1); }
-				|
-				state_member
-		{ $$ = new TAO_PSDL_Value_Element ($1); }
-				|
-				init_dcl
-		{ $$ = new TAO_PSDL_Value_Element ($1); }
-				;
-
-state_member : 			TAO_PSDL_PUBLIC type_spec declarators TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_State_Member ($1, $2, $3); }
-				|
-				TAO_PSDL_PRIVATE type_spec declarators TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_State_Member ($1, $2, $3); }
-				;
-
-init_dcl : 			TAO_PSDL_FACTORY identifier TAO_PSDL_OPEN_BRACE init_param_decls TAO_PSDL_CLOSE_BRACE TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Init_Dcl ($2, $4); }
-				|
-				TAO_PSDL_FACTORY identifier TAO_PSDL_OPEN_BRACE  TAO_PSDL_CLOSE_BRACE TAO_PSDL_SEMI
-		{ $$ = new TAO_PSDL_Init_Dcl ($2); }
-				;
-
-init_param_decls: 		init_param_decl
-		{ $$ = new TAO_PSDL_Init_Param_Decls ($1); }
-				|
-				init_param_decl TAO_PSDL_COMMA init_param_decls
-		{ $$ = new TAO_PSDL_Init_Param_Decls ($1, $2); }
-				;
-
-init_param_decl : 		init_param_attribute param_type_spec simple_declarator
-		{ $$ = new TAO_PSDL_Init_Param_Decl ($1, $2, $3); }
-				;
-
-init_param_attribute : 		TAO_PSDL_IN
-		{ $$ = new TAO_PSDL_Predefined_Type (TAO_PSDL_IN); }
-				;
-
-positive_int_const : 		const_exp
-		{ $$ = new TAO_PSDL_Positive_Int_Const ($1); }
-				;
-
-factory_dcl :			 TAO_PSDL_FACTORY identifier factory_parameters
-		{ $$ = new TAO_PSDL_Factory_Dcl ($2, $3); }
-				;
-
-factory_parameters: 		 TAO_PSDL_OPEN_BRACE simple_declarator TAO_PSDL_CLOSE_BRACE
-		{ $$ = new TAO_PSDL_Factory_Parameters ($2); }
-				 |
-				 TAO_PSDL_OPEN_BRACE TAO_PSDL_CLOSE_BRACE
-		{ $$ = new TAO_PSDL_Factory_Parameters (); }
-				 ;
diff --git a/orbsvcs/PSS/PSDL_Code_Gen.cpp b/orbsvcs/PSS/PSDL_Code_Gen.cpp
deleted file mode 100644
index 5148e9085d5..00000000000
--- a/orbsvcs/PSS/PSDL_Code_Gen.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Code_Gen.h"
-#include "PSDL_Datastore.h"
-#include "tao/OctetSeqC.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/CodecFactory/CodecFactory.h"
-
-ACE_RCSID (PSS, PSDL_Code_Gen, "$Id$")
-
-TAO_PSDL_Code_Gen::TAO_PSDL_Code_Gen (CORBA::ORB_ptr orb)
-  : file_name_ ("Data_Store"),
-    psdl_datastore_ (),
-    orb_ (orb),
-    codec_ (0)
-{
-  this->set_codec ();
-  ACE_NEW (this->psdl_datastore_,
-           TAO_PSDL_Datastore);
-
-}
-
-TAO_PSDL_Code_Gen::~TAO_PSDL_Code_Gen (void)
-{
-  delete this->psdl_datastore_;
-}
-
-int
-TAO_PSDL_Code_Gen::set_codec (void)
-{
-
-  // Obtain a reference to the CodecFactory.
-  CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("CodecFactory");
-
-  IOP::CodecFactory_var codec_factory =
-    IOP::CodecFactory::_narrow (obj.in ());
-
-  // Set up a structure that contains information necessary to
-  // create a GIOP 1.1 CDR encapsulation Codec.
-  IOP::Encoding encoding;
-  encoding.format = IOP::ENCODING_CDR_ENCAPS;
-  encoding.major_version = 1;
-  encoding.minor_version = 1;
-
-  // Obtain the CDR encapsulation Codec.
-  this->codec_ =
-    codec_factory->create_codec (encoding);
-
-  if (this->codec_.in () == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "codec pointer not set correctly\n"));
-      return -1;
-    }
-  return 0;
-}
-
-int
-TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name,
-                                     const char *string_obj_ref)
-{
-  // Invoke the helper encode method which will
-  // convert the stringified object reference to a CORBA::OctetSeq.
-  // Insert the name-CORBA::OCtetSeq pair to a hash_map and save the
-  // hash_map to the database.
-
-  // Encode the stringified object reference to a CORBA::OctetSeq *
-  CORBA::OctetSeq_var octet_seq = this->encode (string_obj_ref);
-
-  // Insert the new entry to the hash map which contains all the
-  // name-octet_seq entries. And, write the hash_map to a file.
-  int result = this->psdl_datastore_->bind (name,
-                                            octet_seq.in ());
-
-  if (result == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Bind not done successfully\n"));
-    }
-  else if (result == 1)
-    {
-      /*ACE_DEBUG ((LM_DEBUG,
-                    "Bind already done.\n"));
-      */
-      return 0;
-    }
-
-  return result;
-}
-
-const char *
-TAO_PSDL_Code_Gen::get_obj_ref (const char *name)
-{
-  // Get from the hash_map saved in the database, the corresponding entry
-  // (CORBA::OctetSeq *) for the name. Then, decode the octetseq to
-  // get the stringified object reference and return it.
-
-  CORBA::OctetSeq octet_seq;
-
-  // Find the octet_seq for the name.
-  int result = this->psdl_datastore_->find (name,
-                                            octet_seq);
-
-  if (result == 0)
-    {
-      // Decode the octet_seq.
-      const char *obj_ref = this->decode (octet_seq);
-
-      return CORBA::string_dup (obj_ref);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "An entry for name %s is not found\n",
-                  name));
-      return 0;
-    }
-}
-
-
-CORBA::OctetSeq *
-TAO_PSDL_Code_Gen::encode (const char *string_obj_ref)
-{
-  CORBA::Any data;
-  data <<= string_obj_ref;
-
-  CORBA::OctetSeq *encoded_data = 0;
-
-  encoded_data = this->codec_->encode (data);
-
-  CORBA::OctetSeq_var safe_encoded_data = encoded_data;
-
-  return safe_encoded_data._retn ();
-}
-
-const char *
-TAO_PSDL_Code_Gen::decode (const CORBA::OctetSeq &data)
-{
-  const char *extracted_value;
-
-  // Extract the data from the octet sequence.
-  CORBA::Any_var decoded_data =
-    this->codec_->decode (data);
-
-  decoded_data.in() >>= extracted_value;
-
-  return CORBA::string_dup (extracted_value);
-}
diff --git a/orbsvcs/PSS/PSDL_Code_Gen.h b/orbsvcs/PSS/PSDL_Code_Gen.h
deleted file mode 100644
index ac461c40611..00000000000
--- a/orbsvcs/PSS/PSDL_Code_Gen.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ==================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Code_Gen
-//
-// = DESCRIPTION
-//    This class acts as an interface to the database which is used
-//    for the saving the state of the objects. Right now, the database
-//    is a normal file.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ==================================================================
-
-#ifndef TAO_PSDL_CODE_GEN_H
-#define TAO_PSDL_CODE_GEN_H
-
-#include /**/ "ace/pre.h"
-
-#include "psdl_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/IOPC.h"
-#include "tao/ORB.h"
-
-class TAO_PSDL_Datastore;
-
-class TAO_PSDL_Export TAO_PSDL_Code_Gen
-{
- public:
-
-  TAO_PSDL_Code_Gen (CORBA::ORB_ptr orb);
-
-  ~TAO_PSDL_Code_Gen (void);
-
-  /// Initializes a IOP::CodecFactory and IOP::Codec to take care of
-  /// the marshalling and demarshalling of data.
-  int set_codec (void);
-
-  /// Method to save the name-stringified object reference pair
-  /// to the database. Returns -1 on failure.
-  int set_name_obj_ref (const char *name,
-                        const char *string_obj_ref);
-
-  /// Get the stringified form of the object reference given the name
-  /// of the object.
-  const char *get_obj_ref (const char *name);
-
- private:
-
-  /// Helper method which serializes the data and saves it to the
-  /// database.
-  CORBA::OctetSeq *encode (const char *string_obj_ref);
-
-
-  /// Helper method to get the octet sequence
-  const char *decode (const CORBA::OctetSeq &data);
-
-  /// File where the persistent data is stored.
-  const char *file_name_;
-
-  /// Pointer to the class which accesses the database
-  TAO_PSDL_Datastore *psdl_datastore_;
-
-  /// Pointer to ORB
-  CORBA::ORB_var orb_;
-
-  /// CDR encapsulation codec useful for encoding and decoding the
-  /// data
-  IOP::Codec_var codec_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_CODE_GEN_H */
diff --git a/orbsvcs/PSS/PSDL_Datastore.cpp b/orbsvcs/PSS/PSDL_Datastore.cpp
deleted file mode 100644
index 0a57e27c9b3..00000000000
--- a/orbsvcs/PSS/PSDL_Datastore.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-// $Id$
-
-#include "PSDL_Datastore.h"
-#include "PSDL_OctetSeq.h"
-#include "PSDL_String.h"
-#include "ace/SString.h"
-#include "ace/OS_NS_unistd.h"
-
-#include "tao/debug.h"
-#include "tao/OctetSeqC.h"
-
-#include "ace/Auto_Ptr.h"
-
-ACE_RCSID (PSS, PSDL_Datastore, "$Id$")
-
-TAO_PSDL_Datastore::TAO_PSDL_Datastore ()
-  : allocator_ (0),
-    obj_ref_map_ (0),
-    index_file_ ("Data_Store"),
-    base_address_ (ACE_DEFAULT_BASE_ADDR)
-{
-  this->open (this->index_file_,
-              this->base_address_);
-}
-
-TAO_PSDL_Datastore::~TAO_PSDL_Datastore (void)
-{
-  // delete allocator_;
-  // ACE_OS::free (const_cast<ACE_TCHAR *> (this->index_file_));
-}
-
-int
-TAO_PSDL_Datastore::unbind (const char *name)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
-
-  TAO_PSDL_String psdl_string (this->allocator_);
-
-  psdl_string = name;
-
-  if (this->obj_ref_map_->unbind (psdl_string, this->allocator_) != 0)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Datastore::bind (const char *name,
-                          const CORBA::OctetSeq &octet_seq)
-{
-  int result = -1;
-
-  TAO_PSDL_OctetSeq psdl_octet_seq (this->allocator_);
-
-  psdl_octet_seq = octet_seq;
-
-  TAO_PSDL_String psdl_string (this->allocator_);
-
-  psdl_string = name;
-
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
-
-  // Do a normal bind.  This will fail if there's already an
-  // entry with the same name
-  result = this->obj_ref_map_->bind (psdl_string,
-                                     psdl_octet_seq,
-                                     this->allocator_);
-
-  // if (result == 1): Entry already exists.
-  // if (result == -1): Bind failed.
-  // if (result == 0) success.
-  return result;
-}
-
-int
-TAO_PSDL_Datastore::find (const char *name,
-                          CORBA::OctetSeq &octet_seq)
-{
-  TAO_PSDL_OctetSeq psdl_seq;
-
-  TAO_PSDL_String psdl_string (this->allocator_);
-
-  psdl_string = CORBA::string_dup (name);
-
-  int result = this->obj_ref_map_->find (psdl_string,
-                                         psdl_seq,
-                                         this->allocator_);
-
-  if (result == 0)
-    {
-      octet_seq.replace (psdl_seq.length_,
-                         psdl_seq.length_,
-                         psdl_seq.buffer_);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_ERROR,
-                  "Couldnt find the entry in the Database. stopping",
-                  -1));
-    }
-
-  return result;
-}
-
-ACE_Allocator*
-TAO_PSDL_Datastore::allocator (void)
-{
-  return allocator_;
-}
-
-int
-TAO_PSDL_Datastore::open (const ACE_TCHAR *file_name,
-                          void *base_address)
-{
-  this->base_address_ = base_address;
-
-  this->index_file_ = ACE_OS::strdup (file_name);
-  if (this->index_file_ == 0)
-    return -1;
-
-  return create_index ();
-}
-
-int
-TAO_PSDL_Datastore::create_index (void)
-{
-  // Make sure that the file name is of the legal length.
-  if (ACE_OS::strlen (this->index_file_) >= MAXNAMELEN + MAXPATHLEN)
-    {
-      errno = ENAMETOOLONG;
-      return -1;
-    }
-
-#if !defined (CHORUS)
-  ACE_MMAP_Memory_Pool::OPTIONS options (this->base_address_);
-#else
-  // Use base address == 0, don't use a fixed address.
-  ACE_MMAP_Memory_Pool::OPTIONS options (0,
-                                         0,
-                                         0,
-                                         ACE_CHORUS_LOCAL_NAME_SPACE_T_SIZE);
-#endif /* CHORUS */
-
-  // Create the allocator with the appropriate options.  The name used
-  // for  the lock is the same as one used for the file.
-  ACE_NEW_RETURN (this->allocator_,
-                  ALLOCATOR (this->index_file_,
-                             this->index_file_,
-                             &options),
-                  -1);
-
-#if !defined (ACE_LACKS_ACCESS)
-  // Now check if the backing store has been created successfully.
-  if (ACE_OS::access (this->index_file_, F_OK) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "create_index\n"),
-                      -1);
-#endif /* ACE_LACKS_ACCESS */
-
-  void *name_obj_map = 0;
-
-  // This is the easy case since if we find hash table in the
-  // memory-mapped file we know it's already initialized.
-  if (this->allocator_->find (TAO_PERSISTENT_NAME_OBJ_MAP, name_obj_map) == 0)
-    {
-      this->obj_ref_map_ = static_cast<NAME_OBJ_REF_MAP *> (name_obj_map);
-    }
-  else
-    {
-      // Create a new <name_obj_map_> (because we've just created a new
-      // memory-mapped file).
-
-      size_t index_size = sizeof (NAME_OBJ_REF_MAP);
-      name_obj_map = this->allocator_->malloc (index_size);
-
-      if (name_obj_map == 0
-          || create_index_helper (name_obj_map) == -1
-          || this->allocator_->bind (TAO_PERSISTENT_NAME_OBJ_MAP,
-                                     name_obj_map) == -1)
-        {
-          // Attempt to clean up.
-          ACE_ERROR ((LM_ERROR,
-                      "create_index\n"));
-          this->allocator_->remove ();
-          return -1;
-        }
-    }
-  return 0;
-}
-
-int
-TAO_PSDL_Datastore::create_index_helper (void *buffer)
-{
-  this->obj_ref_map_ = new(buffer) NAME_OBJ_REF_MAP(this->allocator_) ;
-  return 0;
-}
diff --git a/orbsvcs/PSS/PSDL_Datastore.h b/orbsvcs/PSS/PSDL_Datastore.h
deleted file mode 100644
index c08e9afecf4..00000000000
--- a/orbsvcs/PSS/PSDL_Datastore.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    PSDL_Datastore.h
- *
- *  $Id$
- *
- *  @author Priyanka Gontla <gontla_p@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_PSDL_DATASTORE_H
-#define TAO_PSDL_DATASTORE_H
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Code_Gen.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// The name under which the index of naming contexts is stored in
-// persistent naming service.
-#if !defined (TAO_PERSISTENT_NAME_OBJ_MAP)
-#  define TAO_PERSISTENT_NAME_OBJ_MAP "Persistent_Name_Obj_Map"
-#endif /* ! TAO_PERSISTENT_NAME_OBJ_MAP */
-
-#include "ace/Malloc.h"
-#include "ace/Hash_Map_With_Allocator_T.h"
-
-/**
- * @class TAO_PSDL_Datastore
- *
- * @brief This class facilitates implementation of Persistent
- * Service. Helps perform the bind and find to the hash_map
- **/
-
-// Forward declarations.
-class TAO_PSDL_OctetSeq;
-class TAO_PSDL_String;
-
-class TAO_PSDL_Export TAO_PSDL_Datastore
-{
-public:
-  // = Some typedefs for convenience.
-
-  /// Hash map used by Persistent Naming Context to keep its state.
-  typedef ACE_Hash_Map_With_Allocator<TAO_PSDL_String, TAO_PSDL_OctetSeq> NAME_OBJ_REF_MAP;
-
-  typedef ACE_Hash_Map_Entry <TAO_PSDL_String, TAO_PSDL_OctetSeq> NAME_OBJ_REF_ENTRY;
-
-  /// Allocator we will be using to make the Naming Service persistent.
-  typedef ACE_Allocator_Adapter <ACE_Malloc <ACE_MMAP_MEMORY_POOL, TAO_SYNCH_MUTEX>
-  > ALLOCATOR;
-
-  // = Initialization and termination methods.
-
-  /// Constructor.
-  TAO_PSDL_Datastore ();
-
-  /**
-   * Create ACE_Allocator, open/create memory-mapped file with the
-   * specified file name/base address.  Find or allocate <index_>.
-   * Return 0 on success or -1 on failure.
-   */
-  int open (const ACE_TCHAR *file_name,
-            void * base_address = ACE_DEFAULT_BASE_ADDR);
-
-  /**
-   * If <index_> contains no entries (i.e., was just created), create
-   * a root Persistent servant with table of size
-   * <context_size>, and make an entry for it
-   * in the <index_>.  If <index_> contains entries, create a
-   * Persistent servant for each entry.  Return 0 on
-   * success and -1 on failure.
-   */
-  int init (size_t context_size);
-
-  /**
-   * Destructor.  The memory mapped file that was opened/created is
-   * not deleted, since we want it to keep the state of the Database
-   * until the next run.
-   */
-  ~TAO_PSDL_Datastore (void);
-
-  // = Accessors.
-  int bind (const char *name,
-            const CORBA::OctetSeq &octetseq);
-
-  int unbind (const char *name);
-
-  int find (const char *name,
-            CORBA::OctetSeq &octet_seq);
-
-  /// Return allocator.
-  ACE_Allocator *allocator (void);
-
-private:
-
-  /// Helper for the <init> method.  Iterates over <index_>, and
-  /// creates a servant for each entry.
-  int recreate_all (void);
-
-  /// Helper for the <open> method.
-  int create_index (void);
-
-  /// Helper for <create_index> method: places hash table into an
-  /// allocated space.
-  int create_index_helper (void *buffer);
-
-  /// Lock to prevent multiple threads from modifying entries in the
-  /// <index_> simultanneously.
-  TAO_SYNCH_MUTEX lock_;
-
-  /**
-   * Allocator that deals out memory from a memory-mapped file.  We
-   * use it whenever we
-   * deal with data that should be kept in persistent store.
-   */
-  ALLOCATOR *allocator_;
-
-  /// Hash map where we keep entries for all Persistent entries
-  NAME_OBJ_REF_MAP *obj_ref_map_;
-
-  /// Name of the memory-mapped file used by <allocator_>.
-  const ACE_TCHAR *index_file_;
-
-  /// Base address for the memory-mapped file.
-  void *base_address_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PSDL_DATASTORE_H */
diff --git a/orbsvcs/PSS/PSDL_Enum_Type_Visitor.cpp b/orbsvcs/PSS/PSDL_Enum_Type_Visitor.cpp
deleted file mode 100644
index 865af26a348..00000000000
--- a/orbsvcs/PSS/PSDL_Enum_Type_Visitor.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Enum_Type_Visitor.h"
-#include "PSDL_Stream.h"
-
-ACE_RCSID (PSS, PSDL_Enum_Type_Visitor, "$Id$")
-
-TAO_PSDL_Enum_Type_Visitor::TAO_PSDL_Enum_Type_Visitor (void)
-{
-}
-
-TAO_PSDL_Enum_Type_Visitor::~TAO_PSDL_Enum_Type_Visitor (void)
-{
-}
-
-int
-TAO_PSDL_Enum_Type_Visitor::visit_identifier (TAO_PSDL_Identifier *identifier)
-{
-  // Save the identifiers for future use.
-  this->identifiers_.size (this->count_ + 1);
-
-  this->identifiers_ [this->count_] = identifier->value ();
-
-  ++this->count_;
-  return 0;
-}
-
-int
-TAO_PSDL_Enum_Type_Visitor::visit_enumerator (TAO_PSDL_Enumerator *enumerator)
-{
-  // Gets the enum name and saves it in the global array of
-  // identifiers.
-  if (enumerator->identifier ()->accept (this) == -1)
-    return -1;
-
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-  
-  *ps_sh<< "  " << this->identifiers_ [this->count_ - 1]
-       << ";\n";
-
-  // Get the enum members and save them.
-  if (enumerator->enumerator () != 0)
-    if (enumerator->enumerator ()->accept (this) == -1)
-      return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Enum_Type_Visitor::visit_predefined_type (TAO_PSDL_Predefined_Type *predefined_type)
-{
-  if (predefined_type->type_of_variable_one () != 0)
-    {
-      if (predefined_type->type_of_variable_one ()->accept (this) == -1)
-          return -1;
-    }
-
-  ACE_CString enum_type_name = this->identifiers_ [this->count_ - 1];
-
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-  
-  *ps_sh<< "enum " << enum_type_name.c_str () << "\n";
-  *ps_sh<< "{\n";
-
-  if (predefined_type->type_of_variable_two () != 0)
-    {
-      if (predefined_type->type_of_variable_two ()->accept (this) == -1)
-        return -1;
-    }
-
-  *ps_sh<< "};\n";
-
-  // Print the code that should go into the generated header file.
-  // @@ Update this method to get the code that should go to
-  // implementation method (as applies).
-  this->print_class_for_enum_type (enum_type_name);
-
-  return 0;
-}
-
-void
-TAO_PSDL_Enum_Type_Visitor::print_class_for_enum_type (ACE_CString enum_type_name)
-{
-// Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-  
-  ps_sh->nl ();
-
-  *ps_sh << "typedef " << enum_type_name << " &"
-         << enum_type_name << "_out;\n";
-
-  *ps_sh<< "TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr "
-       << "_tc_" << enum_type_name << ";\n";
-
-  ps_sh->nl ();
-
-}
diff --git a/orbsvcs/PSS/PSDL_Enum_Type_Visitor.h b/orbsvcs/PSS/PSDL_Enum_Type_Visitor.h
deleted file mode 100644
index 22d0d2472c3..00000000000
--- a/orbsvcs/PSS/PSDL_Enum_Type_Visitor.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Enum_Type_Visitor.h
-//
-// = DESCRIPTION
-//    This class, as the name suggests, is for the generated code for
-//    the enum types.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_ENUM_TYPE_VISITOR_H
-#define TAO_PSDL_ENUM_TYPE_VISITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Node_Visitor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PSDL_Enum_Type_Visitor : public TAO_PSDL_Node_Visitor
-{
- public:
-
-  TAO_PSDL_Enum_Type_Visitor ();
-
-  ~TAO_PSDL_Enum_Type_Visitor ();
-
-  // Override the necessary methods for the enum types.
-  int visit_identifier (TAO_PSDL_Identifier *identifier);
-
-  int visit_enumerator (TAO_PSDL_Enumerator *enumerator);
-
-  int visit_predefined_type (TAO_PSDL_Predefined_Type *predefined_type);
-
- private:
-
-  void print_class_for_enum_type (ACE_CString enum_type_name);
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_ENUM_TYPE_VISITOR_H */
diff --git a/orbsvcs/PSS/PSDL_Exception_Scope.cpp b/orbsvcs/PSS/PSDL_Exception_Scope.cpp
deleted file mode 100644
index 6771165044f..00000000000
--- a/orbsvcs/PSS/PSDL_Exception_Scope.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Exception_Scope.h"
-
-
-ACE_RCSID (PSS, PSDL_Exception_Scope, "$Id$")
-
-TAO_PSDL_Exception_Scope::TAO_PSDL_Exception_Scope (TAO_PSDL_Scope *parent_scope)
-  : scope_map_ (),
-    parent_scope_ (parent_scope)
-{
-  // Constructor.
-}
-
-int
-TAO_PSDL_Exception_Scope::add_member_decl (ACE_CString identifier,
-                                           ACE_CString identifier_type)
-{
-  // Add member declarations to this scope.
-  return TAO_PSDL_Scope::instance ()->add_member_decl_to_scope (identifier,
-                                                                identifier_type,
-                                                                this);
-}
-
-void
-TAO_PSDL_Exception_Scope::dump (CORBA::ULong depth)
-{
-  depth = depth + 5;
-
-  for (Scope_Map_Iterator i = this->scope_map_.begin ();
-       i != this->scope_map_.end ();
-       ++i)
-    {
-      this->print_depth (depth);
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s (%s)\n",
-                  (*i).ext_id_.c_str (), (*i).int_id_));
-    }
-}
-
-int
-TAO_PSDL_Exception_Scope::find (const ACE_CString &identifier_name,
-                             ACE_CString &identifier_type)
-{
-  for (Scope_Map_Iterator i = this->scope_map_.begin ();
-       i != this->scope_map_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          identifier_type = (*i).int_id_->identifier_type ();
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->find (identifier_name,
-                                  identifier_type) == 0)
-            {
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-int
-TAO_PSDL_Exception_Scope::find (const ACE_CString &identifier_name)
-{
-  for (Scope_Map_Iterator i = this->scope_map_.begin ();
-       i != this->scope_map_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->find (identifier_name) == 0)
-            {
-              // #@@@@ deal
-              //      identifier_type = identifier_info->type;
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-TAO_PSDL_Scope *
-TAO_PSDL_Exception_Scope::parent_scope (void)
-{
-  return this->parent_scope_;
-}
-
-Scope_Map *
-TAO_PSDL_Exception_Scope::scope_map (void)
-{
-  return &this->scope_map_;
-}
-
-ACE_CString
-TAO_PSDL_Exception_Scope::identifier_type (void)
-{
-  return this->identifier_type_;
-}
-
-ACE_CString
-TAO_PSDL_Exception_Scope::module_name (void)
-{
-  return this->module_name_;
-}
-
-ACE_CString
-TAO_PSDL_Exception_Scope::interface_name (void)
-{
-  return this->interface_name_;
-}
diff --git a/orbsvcs/PSS/PSDL_Exception_Scope.h b/orbsvcs/PSS/PSDL_Exception_Scope.h
deleted file mode 100644
index 979f21fbc43..00000000000
--- a/orbsvcs/PSS/PSDL_Exception_Scope.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Exception_Scope
-//
-// = DESCRIPTION
-//    Scope class for the Exception type helpful for building the AST.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_EXCEPTION_SCOPE_H
-#define TAO_PSDL_EXCEPTION_SCOPE_H
-
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Scope.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PSDL_Export TAO_PSDL_Exception_Scope : public TAO_PSDL_Scope
-{
- public:
-
-  TAO_PSDL_Exception_Scope (TAO_PSDL_Scope *parent_scope);
-
-  // Add member declaration to the exception's scope. Didnt override
-  // any other add method since exceptions have only member
-  // declarations with in them.
-  int add_member_decl (ACE_CString identifier,
-                       ACE_CString identifier_type);
-
-  // See the PSDL_Scope.h for description.
-  void dump (CORBA::ULong depth);
-
-  int find (const ACE_CString &identifier_name,
-            ACE_CString &identifier_type);
-
-  int find (const ACE_CString &identifier_name);
-
-  TAO_PSDL_Scope *parent_scope (void);
-
-  Scope_Map *scope_map (void);
-
-  ACE_CString identifier_type (void);
-  ACE_CString module_name (void);
-  ACE_CString interface_name (void);
-
-protected:
-
-  Scope_Map scope_map_;
-  TAO_PSDL_Scope *parent_scope_;
-  ACE_CString identifier_type_;
-  ACE_CString module_name_;
-  ACE_CString interface_name_;
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_MODULE_SCOPE_H */
diff --git a/orbsvcs/PSS/PSDL_Exception_Visitor.cpp b/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
deleted file mode 100644
index 06b73624aef..00000000000
--- a/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Exception_Visitor.h"
-#include "PSDL_Stream.h"
-
-ACE_RCSID (PSS, PSDL_Exception_Visitor, "$Id$")
-
-TAO_PSDL_Exception_Visitor::TAO_PSDL_Exception_Visitor (void)
-  : exception_name_ ()
-{
-  // Constructor
-}
-
-TAO_PSDL_Exception_Visitor::~TAO_PSDL_Exception_Visitor (void)
-{
-  // Destructor
-}
-
-int
-TAO_PSDL_Exception_Visitor::visit_identifier (TAO_PSDL_Identifier *identifier)
-{
-  // Save the identifiers for future use.
-  this->identifiers_.size (this->count_ +1);
-
-  this->identifiers_ [this->count_] = identifier->value ();
-
-  // Increment the count..for future purposes.
-  ++this->count_;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Exception_Visitor::visit_except_dcl (TAO_PSDL_Except_Dcl *except_dcl)
-{
-  // This is where the control first comes to this class. Set the
-  // initial size of this->identifiers_
-  this->identifiers_.size (1);
-
-  if (except_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  // Save the exception name.
-  this->exception_name_ = this->identifiers_ [this->count_ - 1];
-
-  if (except_dcl->member_list () != 0)
-    if (except_dcl->member_list ()->accept (this) == -1)
-      return -1;
-
-  // Print the code that should go into the generated header file.
-  // @@ Update this method to get the code that should go to
-  // implementation method (as applies).
-  this->print_class_for_exception ();
-
-  return 0;
-}
-
-int
-TAO_PSDL_Exception_Visitor::visit_member_list (TAO_PSDL_Member_List *member_list)
-{
-  if (member_list->member ()->accept (this) == -1)
-    return -1;
-
-  if (member_list->member_list () != 0)
-    {
-      if (member_list->member_list ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-TAO_PSDL_Exception_Visitor::visit_predefined_type (TAO_PSDL_Predefined_Type *predefined_type)
-{
-  if (predefined_type->type_one () != 0)
-    {
-      this->identifiers_.size (this->count_ +1);
-
-      // Save the type of the identifier.
-      this->identifiers_ [this->count_] =
-        TAO_PSDL_Scope::instance ()->convert_str (predefined_type->type_one ());
-      ++this->count_;
-    }
-  return 0;
-}
-
-void
-TAO_PSDL_Exception_Visitor::print_class_for_exception (void)
-{
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
-  // Code that should be generated to the stub (idlC.h) according to
-  // the specification.
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  ACE_CString name_space =
-    TAO_PSDL_Scope::instance ()->get_name_space ();
-
-  ACE_CString interface_name =
-    TAO_PSDL_Scope::instance ()->get_interface_name ();
-
-  *ps_sh << "#if !defined (_" << name_space << "_"
-       << interface_name << "_" << this->exception_name_ << "_CH_)\n";
-  *ps_sh << "#define _" << name_space << "_" << interface_name
-       << "_" << this->exception_name_ << "_CH_\n";
-    ps_sh->nl ();
-  *ps_sh << "    class  " << this->exception_name_
-       << " : public CORBA::UserException\n";
-  *ps_sh << "    {\n";
-
-  *ps_sh << "    public:\n";
-
-  ACE_CString type;
-  for (unsigned int i = 1; i < this->count_; ++i)
-    {
-      if (this->base_type (this->identifiers_[i], type))
-        {
-          if (ACE_OS::strcmp (type.c_str (), "char *") == 0)
-            {
-              *ps_sh << "      " << "TAO::String_Manager"
-                   << " " << this->identifiers_[i+1]
-                   << ";\n";
-            }
-          else
-            {
-              *ps_sh << "      " << this->version_for_stub (type)
-               << " " << this->identifiers_[i+1]
-               << ";\n";
-            }
-        }
-      else
-        {
-          // Types defined previously in the idl.
-          *ps_sh << "      ACE_NESTED_CLASS ("
-            //@@@deal      << base_node_info.module_name << "::"
-            //@@@deal   << base_node_info.interface_name
-               << ", " << this->identifiers_[i]
-               << ") " << this->identifiers_[i+1]
-               << ";\n";
-        }
-      ++i;
-    }
-
-  *ps_sh << "      " << this->exception_name_
-       << " (void);\n";
-  *ps_sh << "      " << this->exception_name_
-       << " (const " << this->exception_name_ << " &);\n";
-  *ps_sh << "      ~" << this->exception_name_ << " (void);\n";
-  *ps_sh << "\n";
-  *ps_sh << "      " << this->exception_name_
-         << " &operator= (const " << this->exception_name_ << " &);\n";
-  *ps_sh << "\n";
-  *ps_sh << "      static void _tao_any_destructor (void*);\n";
-  *ps_sh << "\n";
-  *ps_sh << "      static " << this->exception_name_
-       << " *_downcast (CORBA::Exception *);\n";
-  *ps_sh << "      static CORBA::Exception *_alloc (void);\n";
-  *ps_sh << "\n";
-  *ps_sh << "      virtual CORBA::Exception *_tao_duplicate (void) const;\n";
-  *ps_sh << "\n";
-  *ps_sh << "      virtual void _raise (void);\n";
-  *ps_sh << "\n";
-  *ps_sh << "      virtual void _tao_encode (\n";
-  *ps_sh << "          TAO_OutputCDR &\n";
-  *ps_sh << "\n";
-  *ps_sh << "        ) const;\n";
-  *ps_sh << "     \n";
-  *ps_sh << "      virtual void _tao_decode (\n";
-  *ps_sh << "          TAO_InputCDR &\n";
-  *ps_sh << "\n";
-  *ps_sh << "        );\n";
-  *ps_sh << "     \n";
-
-  if (this->identifiers_.size () > 1)
-    {
-      *ps_sh << "      " << this->exception_name_ << " (\n";
-
-      for (unsigned int i = 1; i < this->count_; ++i)
-        {
-          if (this->base_type (this->identifiers_[i], type))
-            {
-              if (ACE_OS::strcmp (type.c_str (), "char *") == 0)
-                {
-                  *ps_sh << "      " << "const char *"
-                       << " " << this->identifiers_[i+1]
-                       << ";\n";
-                }
-              else
-                {
-                  *ps_sh << "      " << this->version_for_stub (type)
-                       << " " << this->identifiers_[i+1]
-                       << ";\n";
-                }
-            }
-          else
-            {
-              // Types defined previously in the idl.
-              *ps_sh << "      ACE_NESTED_CLASS ("
-                   << name_space << "::" << interface_name
-                   << ", " << this->identifiers_[i]
-                   << ") " << this->identifiers_[i+1]
-                   << ";\n";
-            }
-          ++i;
-        }
-    }
-
-  *ps_sh << "     \n";
-  *ps_sh << "      virtual CORBA::TypeCode_ptr _type (void) const;\n";
-  *ps_sh << "    };\n";
-  *ps_sh << "\n";
-  *ps_sh << "static ::CORBA::TypeCode_ptr _tc_"
-       << this->exception_name_ << ";\n";
-  *ps_sh << "   \n";
-  *ps_sh << "   \n";
-  *ps_sh << "#endif /* end #if !defined */\n";
-  *ps_sh << "   \n";
-}
diff --git a/orbsvcs/PSS/PSDL_Exception_Visitor.h b/orbsvcs/PSS/PSDL_Exception_Visitor.h
deleted file mode 100644
index f6115d55e55..00000000000
--- a/orbsvcs/PSS/PSDL_Exception_Visitor.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Exception_Visitor.h
-//
-// = DESCRIPTION
-//    Visitor class for the generated code for exceptions.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_EXCEPTION_VISITOR_H
-#define TAO_PSDL_EXCEPTION_VISITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Node_Visitor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PSDL_Exception_Visitor : public TAO_PSDL_Node_Visitor
-{
- public:
-
-  TAO_PSDL_Exception_Visitor ();
-
-  ~TAO_PSDL_Exception_Visitor ();
-
-  // Override the necessary methods for the exceptions.
-  int visit_identifier (TAO_PSDL_Identifier *identifier);
-
-  int visit_except_dcl (TAO_PSDL_Except_Dcl *except_dcl);
-
-  int visit_member_list (TAO_PSDL_Member_List *member_list);
-
-  int visit_predefined_type (TAO_PSDL_Predefined_Type *predefined_type);
-
- private:
-
-  void print_class_for_exception (void);
-  ACE_CString exception_name_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_EXCEPTION_VISITOR_H */
diff --git a/orbsvcs/PSS/PSDL_Extern.cpp b/orbsvcs/PSS/PSDL_Extern.cpp
deleted file mode 100644
index b13196cbaef..00000000000
--- a/orbsvcs/PSS/PSDL_Extern.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-#include "PSDL_Extern.h"
-#include "PSDL_Node.h"
-
-extern int TAO_PSDL_yyparse (void *);
-extern FILE *TAO_PSDL_yyin;
-extern TAO_PSDL_Node *yyval;
-
-TAO_PSDL_Extern::TAO_PSDL_Extern (void)
-{
-  // Constructor
-}
-
-int
-TAO_PSDL_Extern::TAO_PSDL_Extern_yyparse (void *result)
-{
-  return TAO_PSDL_yyparse (result);
-}
-
-void
-TAO_PSDL_Extern::TAO_PSDL_Extern_yyin (FILE *fp)
-{
-  TAO_PSDL_yyin = fp;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Extern::TAO_PSDL_Extern_yyval (void)
-{
-  return yyval;
-}
diff --git a/orbsvcs/PSS/PSDL_Extern.h b/orbsvcs/PSS/PSDL_Extern.h
deleted file mode 100644
index 9ee62e240d0..00000000000
--- a/orbsvcs/PSS/PSDL_Extern.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ==================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Extern
-//
-// = DESCRIPTION
-//    Wrapper to make available yacc/lex related parameters outside
-//    the PSDL library.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ==================================================================
-
-#ifndef TAO_PSDL_EXTERN_H
-#define TAO_PSDL_EXTERN_H
-#include /**/ "ace/pre.h"
-
-#include "psdl_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/FILE.h"
-
-//Forward declaration
-class TAO_PSDL_Node;
-
-class TAO_PSDL_Export TAO_PSDL_Extern
-{
-public:
-
-  TAO_PSDL_Extern (void);
-
-  int TAO_PSDL_Extern_yyparse (void *);
-
-  void TAO_PSDL_Extern_yyin (FILE *);
-
-  TAO_PSDL_Node *TAO_PSDL_Extern_yyval (void);
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PSDL_EXTERN_H */
diff --git a/orbsvcs/PSS/PSDL_Interface_Scope.cpp b/orbsvcs/PSS/PSDL_Interface_Scope.cpp
deleted file mode 100644
index a0015737d6f..00000000000
--- a/orbsvcs/PSS/PSDL_Interface_Scope.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Module_Scope.h"
-#include "PSDL_Interface_Scope.h"
-
-ACE_RCSID (PSS, PSDL_Interface_Scope, "$Id$")
-
-TAO_PSDL_Interface_Scope::TAO_PSDL_Interface_Scope (TAO_PSDL_Scope *parent_scope)
-  : interface_scope_ (),
-    parent_scope_ (parent_scope)
-{
-  // Constructor
-}
-
-TAO_PSDL_Interface_Scope::~TAO_PSDL_Interface_Scope (void)
-{
-  // destructor
-}
-
-int
-TAO_PSDL_Interface_Scope::add_interface (ACE_CString interface_name)
-{
-  return TAO_PSDL_Scope::instance ()->add_interface_to_scope (interface_name,
-                                                              this);
-}
-
-int
-TAO_PSDL_Interface_Scope::add_struct (ACE_CString struct_name)
-{
-  return TAO_PSDL_Scope::instance ()->add_struct_to_scope (struct_name,
-                                                           this);
-}
-
-int
-TAO_PSDL_Interface_Scope::add_typedef (ACE_CString identifier,
-                                       ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_typedef_to_scope (identifier,
-                                                            identifier_type,
-                                                            this);
-}
-
-int
-TAO_PSDL_Interface_Scope::add_const_decl (ACE_CString identifier,
-                                       ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_const_decl_to_scope (identifier,
-                                                               identifier_type,
-                                                               this);
-}
-
-int
-TAO_PSDL_Interface_Scope::add_except_decl (ACE_CString identifier,
-                                        ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_except_decl_to_scope (identifier,
-                                                                identifier_type,
-                                                                this);
-}
-
-int
-TAO_PSDL_Interface_Scope::add_exception (ACE_CString identifier)
-{
-  return TAO_PSDL_Scope::instance ()->add_exception_to_scope (identifier,
-                                                              this);
-}
-
-int
-TAO_PSDL_Interface_Scope::add_op_dcl (ACE_CString identifier)
-{
-  return TAO_PSDL_Scope::instance ()->add_op_dcl_to_scope (identifier,
-                                                           this);
-}
-
-void
-TAO_PSDL_Interface_Scope::dump (CORBA::ULong depth)
-{
-  depth = depth + 5;
-
-  for (Scope_Map_Iterator i = this->interface_scope_.begin ();
-       i != this->interface_scope_.end ();
-       ++i)
-    {
-      this->print_depth (depth);
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s (interface/exception/struct)\n",
-                  (*i).ext_id_.c_str ()));
-      (*i).int_id_->dump (depth);
-    }
-}
-
-int
-TAO_PSDL_Interface_Scope::find (const ACE_CString &identifier_name,
-                                ACE_CString &identifier_type)
-{
-  for (Scope_Map_Iterator i = this->interface_scope_.begin ();
-       i != this->interface_scope_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          identifier_type = (*i).int_id_->identifier_type ();
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->find (identifier_name,
-                                  identifier_type) == 0)
-            {
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-int
-TAO_PSDL_Interface_Scope::find (const ACE_CString &identifier_name)
-{
-  for (Scope_Map_Iterator i = this->interface_scope_.begin ();
-       i != this->interface_scope_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->find (identifier_name) == 0)
-            {
-              // #@@@@ deal
-              //      identifier_type = identifier_info->type;
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-int
-TAO_PSDL_Interface_Scope::get_module_name (const ACE_CString &identifier_name,
-                                           ACE_CString &module_name)
-{
-  for (Scope_Map_Iterator i = this->interface_scope_.begin ();
-       i != this->interface_scope_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          module_name = (*i).int_id_->module_name ();
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->get_module_name (identifier_name,
-                                  module_name) == 0)
-            {
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-int
-TAO_PSDL_Interface_Scope::get_interface_name (const ACE_CString &identifier_name,
-                                              ACE_CString &interface_name)
-{
-  for (Scope_Map_Iterator i = this->interface_scope_.begin ();
-       i != this->interface_scope_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          interface_name = (*i).int_id_->interface_name ();
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->get_interface_name (identifier_name,
-                                                interface_name) == 0)
-            {
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-TAO_PSDL_Scope *
-TAO_PSDL_Interface_Scope::parent_scope (void)
-{
-  return this->parent_scope_;
-}
-
-Scope_Map *
-TAO_PSDL_Interface_Scope::scope_map (void)
-{
-  return &this->interface_scope_;
-}
-
-ACE_CString
-TAO_PSDL_Interface_Scope::identifier_type (void)
-{
-  return this->identifier_type_;
-}
-
-ACE_CString
-TAO_PSDL_Interface_Scope::module_name (void)
-{
-  return this->module_name_;
-}
-
-ACE_CString
-TAO_PSDL_Interface_Scope::interface_name (void)
-{
-  return this->interface_name_;
-}
diff --git a/orbsvcs/PSS/PSDL_Interface_Scope.h b/orbsvcs/PSS/PSDL_Interface_Scope.h
deleted file mode 100644
index 3f28e08a3a3..00000000000
--- a/orbsvcs/PSS/PSDL_Interface_Scope.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Interface_Scope
-//
-// = DESCRIPTION
-//    Scope class for Interfaces helpful for building the ASTs.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_INTERFACE_SCOPE_H
-#define TAO_PSDL_INTERFACE_SCOPE_H
-
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Scope.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PSDL_Export TAO_PSDL_Interface_Scope : public TAO_PSDL_Scope
-{
- public:
-
-  TAO_PSDL_Interface_Scope (TAO_PSDL_Scope *parent_scope);
-
-  ~TAO_PSDL_Interface_Scope (void);
-
-  // Override the add methods which will be useful in the interface
-  // scope. Interfaces can have other inteface declarations,
-  // interfaces, structs, typedefs, constant declarations, exceptions
-  // and operations. If the interfaces can have any other types,
-  // corresponding add methods should also go here.
-  int add_interface (ACE_CString identifier);
-
-  int add_struct (ACE_CString identifier);
-
-  int add_typedef (ACE_CString identifier,
-                   ACE_CString identifier_type);
-
-  int add_const_decl (ACE_CString identifier,
-                      ACE_CString identifier_type);
-
-  int add_except_decl (ACE_CString identifier,
-                       ACE_CString identifier_type);
-
-  int add_exception (ACE_CString identifier);
-
-  int add_op_dcl (ACE_CString identifier);
-
-  // See PSDL_Scope.h
-  void dump (CORBA::ULong depth);
-
-  int find (const ACE_CString &identifier_name,
-            ACE_CString &identifier_type);
-
-  int find (const ACE_CString &identifier_name);
-
-  int get_module_name (const ACE_CString &identifier_name,
-                       ACE_CString &module_name);
-  
-  int get_interface_name (const ACE_CString &identifier_name,
-                          ACE_CString &interface_name);
-
-  // Helper methods to get a pointer to the private variables.
-  TAO_PSDL_Scope *parent_scope (void);
-
-  Scope_Map *scope_map (void);
-
-  ACE_CString identifier_type (void);
-  ACE_CString module_name (void);
-  ACE_CString interface_name (void);
-
-private:
-
-  Scope_Map interface_scope_;
-  TAO_PSDL_Scope *parent_scope_;
-  ACE_CString identifier_type_;
-  ACE_CString module_name_;
-  ACE_CString interface_name_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_INTERFACE_SCOPE_H */
diff --git a/orbsvcs/PSS/PSDL_Interface_Visitor.cpp b/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
deleted file mode 100644
index e90926cd1fa..00000000000
--- a/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
+++ /dev/null
@@ -1,2365 +0,0 @@
-#include "PSDL_Interface_Visitor.h"
-#include "PSDL_Stream.h"
-
-ACE_RCSID (PSS,
-           PSDL_Interface_Visitor,
-           "$Id$")
-
-TAO_PSDL_Interface_Visitor::TAO_PSDL_Interface_Visitor (void)
-  : forward_dcl_ (0),
-    interface_name_ ()
-{
-  // constructor.
-}
-
-TAO_PSDL_Interface_Visitor::~TAO_PSDL_Interface_Visitor (void)
-{
-  // destructor.
-}
-
-int
-TAO_PSDL_Interface_Visitor::visit_identifier (TAO_PSDL_Identifier *identifier)
-{
-  this->identifiers_.size (1);
-  this->count_ = 0;
-
-  // Save the identifier.
-  this->identifiers_ [this->count_] = identifier->value ();
-
-  return 0;
-}
-
-int
-TAO_PSDL_Interface_Visitor::visit_forward_dcl (TAO_PSDL_Forward_Dcl *forward_dcl)
-{
-  if (forward_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  this->interface_name_ = this->identifiers_[this->count_];
-
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
-  ps_sh->reset ();
-
-  *ps_sh << "class " << this->interface_name_ << ";";
-  ps_sh->nl ();
-
-  this->forward_dcl_ = 1;
-  this->print_for_forward_dcl ();
-
-  return 0;
-}
-
-int
-TAO_PSDL_Interface_Visitor::visit_interface_dcl (TAO_PSDL_Interface_Dcl *interface_dcl)
-{
-  if (interface_dcl->interface_header ()->accept (this) == -1)
-    return -1;
-
-  if (interface_dcl->interface_body () != 0)
-    {
-      if (interface_dcl->interface_body ()->accept (this) == -1)
-        return -1;
-    }
-
-  // The generated code for interfaces.
-  this->print_end_for_interface ();
-  return 0;
-}
-
-int
-TAO_PSDL_Interface_Visitor::visit_interface_header (TAO_PSDL_Interface_Header *interface_header)
-{
-  if (interface_header->identifier ()->accept (this) == -1)
-    return -1;
-
-  this->interface_name_ = this->identifiers_[this->count_];
-  TAO_PSDL_Scope::instance ()->set_interface_name (this->interface_name_);
-  this->print_class_for_interface ();
-
-  if (interface_header->type () != 0)
-    {
-      if (interface_header->type ()->accept (this) == -1)
-        return -1;
-    }
-
-  if (interface_header->interface_inheritance_spec () != 0)
-    {
-      if (interface_header->interface_inheritance_spec ()->accept (this) == -1)
-        return -1;
-    }
-
-  return 0;
-}
-
-void
-TAO_PSDL_Interface_Visitor::print_for_forward_dcl (void)
-{
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
-  ps_sh->reset ();
-
-  ps_sh->nl ();
-
-  ACE_CString name_space = TAO_PSDL_Scope::instance ()->get_name_space ();
-
-  *ps_sh << "#if !defined (_" << name_space << "_" << this->interface_name_
-         << "___PTR_CH_)";  ps_sh->nl ();
-
-  *ps_sh << "#define _" << name_space << "_"
-         << this->interface_name_ << "___PTR_CH_";
-
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  if (this->forward_dcl_ != 1)
-    {
-      *ps_sh << "class " << this->interface_name_ << ";";  ps_sh->nl ();
-    }
-
-  *ps_sh << "typedef " << this->interface_name_ << "*"
-         << this->interface_name_ << "_ptr;";
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "#endif /* end #if !defined */" << "\n\n";  ps_sh->nl ();
-
-  *ps_sh << "#if !defined (_" << name_space << "_"
-         << this->interface_name_ << "___VAR_CH_)";
-  ps_sh->nl ();
-
-  *ps_sh << "#define _" << name_space << "_"
-         << this->interface_name_ << "___VAR_CH_";
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "class " << this->interface_name_.c_str ()
-         << "_var : public TAO_Base_Var";  ps_sh->nl ();
-
-  *ps_sh << "{";
-  ps_sh->nl ();
-  ps_sh->incr_indent (0);
-
-  *ps_sh << "public:";
-  ps_sh->nl ();
-
-  *ps_sh  <<  this->interface_name_ << "_var (void);"
-          << "// default constructor";
-  ps_sh->nl ();
-
-  *ps_sh  <<  this->interface_name_ << "_var (" << this->interface_name_
-          << "_ptr p) : ptr_ (p) {}";
-  ps_sh->nl ();
-
-  *ps_sh  <<  this->interface_name_ << "_var (const "
-          << this->interface_name_
-          << "_var &);" << "// copy constructor";
-  ps_sh->nl ();
-
-  *ps_sh << " ~" << this->interface_name_ << "_var (void"
-         << "); // destructor";
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << this->interface_name_ << "_var"
-         << "&operator= (" << this->interface_name_
-         << "_ptr);";  ps_sh->nl ();
-
-  *ps_sh  << this->interface_name_ << "_var"
-          << "&operator= (const " << this->interface_name_
-          << "_var &);";
-  ps_sh->nl ();
-
-  *ps_sh  << this->interface_name_
-          << "_ptr operator-> (void) const;";
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "operator const "
-         << this->interface_name_ << "_ptr &() const;";  ps_sh->nl ();
-
-  *ps_sh << "operator "
-         << this->interface_name_ << "_ptr &();";
-
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "// in, inout, out, _retn";  ps_sh->nl ();
-
-  *ps_sh << this->interface_name_ << "_ptr in (void) const;";
-  ps_sh->nl ();
-
-  *ps_sh << this->interface_name_ << "_ptr &inout (void);";
-  ps_sh->nl ();
-
-  *ps_sh << this->interface_name_ << "_ptr &out (void);";
-  ps_sh->nl ();
-
-  *ps_sh << this->interface_name_ << "_ptr _retn (void);";
-  ps_sh->nl ();
-
-  *ps_sh <<  this->interface_name_ << "_ptr ptr (void) const;";
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "// Hooks used by template sequence and object manager classes";
-  ps_sh->nl ();
-
-  *ps_sh << "// for non-defined forward declared interfaces.";  ps_sh->nl ();
-
-  *ps_sh << "static " << this->interface_name_ << "_ptr tao_duplicate ("
-         << this->interface_name_ << "_ptr);";
-  ps_sh->nl ();
-
-  *ps_sh << "static void tao_release ("
-         << this->interface_name_ << "_ptr);";
-  ps_sh->nl ();
-
-  *ps_sh << "static " << this->interface_name_
-         << "_ptr tao_nil (void);";  ps_sh->nl ();
-
-  *ps_sh << "static " << this->interface_name_ << "_ptr tao_narrow (";
-  ps_sh->incr_indent (0);
-  ps_sh->nl ();
-
-  *ps_sh << "CORBA::Object *";
-  ps_sh->nl ();
-  *ps_sh << "";
-
-  ps_sh->decr_indent (0);
-  ps_sh->nl ();
-
-  *ps_sh << ");";
-  ps_sh->nl ();
-
-  *ps_sh << "static CORBA::Object * tao_upcast (void *);";
-
-  ps_sh->reset ();
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "private:";
-  ps_sh->incr_indent (0);
-  ps_sh->nl ();
-
-  *ps_sh << this->interface_name_ << "_ptr ptr_;";
-  ps_sh->nl ();
-
-  *ps_sh << "// Unimplemented - prevents widening assignment.";
-  ps_sh->nl ();
-
-  *ps_sh << this->interface_name_ << "_var (const TAO_Base_var &rhs);";
-  ps_sh->nl ();
-
-  *ps_sh << this->interface_name_
-         << "_var &operator= (const TAO_Base_var &rhs);";
-  ps_sh->nl ();
-
-  ps_sh->decr_indent (0);
-  ps_sh->nl ();
-
-  *ps_sh << "};";
-  ps_sh->nl ();
-
-  *ps_sh << "#endif /* end #if !defined */";
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  ps_sh->reset ();
-
-  *ps_sh << "#if !defined (_" << name_space
-         << "_" << this->interface_name_ << "___OUT_CH_)";
-  ps_sh->nl ();
-
-  *ps_sh << "#define _" << name_space
-         << "_" << this->interface_name_ << "___OUT_CH_";
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "class  " << this->interface_name_ << "_out";  ps_sh->nl ();
-  *ps_sh << "{";
-  ps_sh->nl ();
-  ps_sh->incr_indent (0);
-
-  *ps_sh << "public:";  ps_sh->nl ();
-  *ps_sh << this->interface_name_ << "_out (" << this->interface_name_
-         << "_ptr &);";  ps_sh->nl ();
-  *ps_sh << this->interface_name_ << "_out (" << this->interface_name_
-         << "_var &);";  ps_sh->nl ();
-  *ps_sh << this->interface_name_ << "_out (const "
-         << this->interface_name_ << "_out &);";  ps_sh->nl ();
-  *ps_sh << this->interface_name_ << "_out &operator= (const "
-         << this->interface_name_ << "_out &);";  ps_sh->nl ();
-  *ps_sh << this->interface_name_ << "_out &operator= (const "
-         << this->interface_name_ << "_var &);";  ps_sh->nl ();
-  *ps_sh << this->interface_name_ << "_out &operator= ("
-         << this->interface_name_ << "_ptr);";  ps_sh->nl ();
-  *ps_sh << "operator " << this->interface_name_ << "_ptr &();";  ps_sh->nl ();
-  *ps_sh << this->interface_name_ << "_ptr &ptr (void);";  ps_sh->nl ();
-
-  *ps_sh << this->interface_name_ << "_ptr operator-> (void);";
-
-  ps_sh->reset ();
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "private:";
-  ps_sh->incr_indent (0);
-  ps_sh->nl ();
-  *ps_sh << this->interface_name_ << "_ptr &ptr_;";  ps_sh->nl ();
-
-  ps_sh->decr_indent (0);
-  ps_sh->nl ();
-
-  *ps_sh << "};\n";
-
-  *ps_sh << "#endif /* end #if !defined */";
-
-  ps_sh->reset ();
-
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-
-  *ps_sh << "// External declarations for undefined interface";
-  ps_sh->nl ();
-  *ps_sh << "//" << this->interface_name_;
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << this->interface_name_ << "_ptr";
-  ps_sh->nl ();
-
-  *ps_sh << "tao_" << this->interface_name_ << "_duplicate (";
-  ps_sh->incr_indent (0);
-  ps_sh->nl ();
-
-  *ps_sh << this->interface_name_ << "_ptr";
-
-  ps_sh->decr_indent (0);
-  ps_sh->nl ();
-  *ps_sh << ");";
-
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "void";
-  ps_sh->nl ();
-  *ps_sh << "tao_" << this->interface_name_ << "_release (";
-  ps_sh->incr_indent (0);
-  ps_sh->nl ();
-  *ps_sh << this->interface_name_ << "_ptr";
-  ps_sh->decr_indent (0);
-  ps_sh->nl ();
-  *ps_sh << ");";
-
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << this->interface_name_ << "_ptr";
-  ps_sh->nl ();
-
-  *ps_sh << "tao_" << this->interface_name_ << "_nil (";
-  ps_sh->incr_indent (0);
-  ps_sh->nl ();
-  *ps_sh << "void";
-  ps_sh->decr_indent (0);
-  ps_sh->nl ();
-  *ps_sh << ");";
-
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << this->interface_name_ << "_ptr";
-  ps_sh->nl ();
-
-  *ps_sh << "tao_" << this->interface_name_ << "_narrow (";
-  ps_sh->incr_indent (0);
-  ps_sh->nl ();
-
-  *ps_sh << "CORBA::Object *";
-  ps_sh->nl ();
-
-  *ps_sh << "";
-
-  ps_sh->decr_indent (0);
-  ps_sh->nl ();
-  *ps_sh << ");";
-
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "CORBA::Object *";
-  ps_sh->nl ();
-  *ps_sh << "tao_" << this->interface_name_ << "_upcast (";
-  ps_sh->incr_indent (0);
-  ps_sh->nl ();
-  *ps_sh << "void *";
-  ps_sh->decr_indent (0);
-  ps_sh->nl ();
-  *ps_sh << ");";
-
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "// Any operators for interface " << this->interface_name_;
-  ps_sh->nl ();
-
-  *ps_sh << "void operator<<= (CORBA::Any &, " << this->interface_name_ << "_ptr);";
-  ps_sh->nl ();
-
-  *ps_sh << "CORBA::Boolean operator>>= (const CORBA::Any &, " << this->interface_name_ << " *&);";
-  ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << "#ifndef __ACE_INLINE__";
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << " CORBA::Boolean operator<< (TAO_OutputCDR &, const " << this->interface_name_ << "_ptr );";
-  ps_sh->nl ();
-  *ps_sh << " CORBA::Boolean operator>> (TAO_InputCDR &, " << this->interface_name_ << "_ptr &);";
-  ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << "#endif /* __ACE_INLINE__ */";
-  ps_sh->nl ();
-
-}
-
-void
-TAO_PSDL_Interface_Visitor::print_class_for_interface (void)
-{
-  this->print_for_forward_dcl ();
-
-  ACE_CString name_space = TAO_PSDL_Scope::instance ()->get_name_space ();
-
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
-  *ps_sh << "#if !defined (_" << name_space << "_" << this->interface_name_
-         << "_CH_)";  ps_sh->nl ();
-  *ps_sh << "#define _" << name_space << this->interface_name_
-         << "_CH_";  ps_sh->nl ();
-
-  *ps_sh << "// Forward Classes Declaration.";  ps_sh->nl ();
-  *ps_sh << "class _TAO_" << this->interface_name_ << "_Proxy_Impl;";  ps_sh->nl ();
-  *ps_sh << "class _TAO_" << this->interface_name_ << "_Remote_Proxy_Impl;";  ps_sh->nl ();
-  *ps_sh << "class _TAO_" << this->interface_name_ << "_Proxy_Broker;";  ps_sh->nl ();
-  *ps_sh << "class _TAO_" << this->interface_name_ << "_Remote_Proxy_Broker;";  ps_sh->nl ();
-
-
-  *ps_sh << "class  " << this->interface_name_;
-  *ps_sh << ": public virtual CORBA::Object";  ps_sh->nl ();
-
-  *ps_sh << "{";
-  ps_sh->nl ();
-  ps_sh->incr_indent (0);
-
-  *ps_sh << "public:";  ps_sh->nl ();
-
-  *ps_sh << "typedef " << this->interface_name_ << "_ptr _ptr_type;";  ps_sh->nl ();
-  *ps_sh << "typedef " << this->interface_name_ << "_var _var_type;";  ps_sh->nl ();
-
-  *ps_sh << "static int _tao_class_id;";  ps_sh->nl ();
-
-  *ps_sh << "// The static operations.";  ps_sh->nl ();
-  *ps_sh << "static " << this->interface_name_
-         << "_ptr _duplicate ("
-         << this->interface_name_ << "_ptr obj);"
-    ;
-
-  *ps_sh << "static " << this->interface_name_ << "_ptr _narrow (";  ps_sh->nl ();
-  *ps_sh << "CORBA::Object_ptr obj";  ps_sh->nl ();
-  *ps_sh << "";  ps_sh->nl ();
-  *ps_sh << ");";  ps_sh->nl ();
-
-  *ps_sh << "static " << this->interface_name_
-         << "_ptr _unchecked_narrow (";  ps_sh->nl ();
-  *ps_sh << "CORBA::Object_ptr obj";  ps_sh->nl ();
-  *ps_sh << "";  ps_sh->nl ();
-  *ps_sh << ");";  ps_sh->nl ();
-
-  *ps_sh << "static " << this->interface_name_ << "_ptr _nil (void)";  ps_sh->nl ();
-  *ps_sh << "{";  ps_sh->nl ();
-  *ps_sh << "return (" << this->interface_name_ << "_ptr)0;";
-
-  ps_sh->decr_indent (0);
-  ps_sh->nl ();
-
-  *ps_sh << "}";  ps_sh->nl ();
-
-  *ps_sh << "static void _tao_any_destructor (void*);";  ps_sh->nl ();
-
-
-}
-
-void
-TAO_PSDL_Interface_Visitor::print_end_for_interface (void)
-{
-  ACE_CString name_space = TAO_PSDL_Scope::instance ()->get_name_space ();
-
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
-  *ps_sh << "virtual CORBA::Boolean _is_a (";  ps_sh->nl ();
-  *ps_sh << "const CORBA::Char *type_id";  ps_sh->nl ();
-  *ps_sh << "";  ps_sh->nl ();
-  *ps_sh << ");";  ps_sh->nl ();
-
-  *ps_sh << "virtual void *_tao_QueryInterface (ptrdiff_t type);";  ps_sh->nl ();
-
-  *ps_sh << "virtual const char* _interface_repository_id (void) const;";  ps_sh->nl ();
-
-  *ps_sh << "private:";  ps_sh->nl ();
-  *ps_sh << "_TAO_" << this->interface_name_ << "_Proxy_Broker *the_TAO_" << this->interface_name_ << "_Proxy_Broker_;";  ps_sh->nl ();
-
-  *ps_sh << "protected:";  ps_sh->nl ();
-  *ps_sh << this->interface_name_ << "(int collocated = 0);";  ps_sh->nl ();
-
-  *ps_sh << "// These methods travese the inheritance tree and set the";  ps_sh->nl ();
-  *ps_sh << "// parents piece of the given class in the right mode";  ps_sh->nl ();
-  *ps_sh << "virtual void " << name_space << "_" << this->interface_name_
-         << "_setup_collocation (int collocated);";  ps_sh->nl ();
-
-  *ps_sh << this->interface_name_ << "(";  ps_sh->nl ();
-  *ps_sh << "TAO_Stub *objref, ";  ps_sh->nl ();
-  *ps_sh << "CORBA::Boolean _tao_collocated = 0,";  ps_sh->nl ();
-  *ps_sh << "TAO_Abstract_ServantBase *servant = 0";  ps_sh->nl ();
-  *ps_sh << ");";  ps_sh->nl ();
-
-  *ps_sh << "friend class _TAO_" << this->interface_name_ << "_Remote_Proxy_Impl;";  ps_sh->nl ();
-  *ps_sh << "friend class _TAO_" << this->interface_name_ << "_ThruPOA_Proxy_Impl;";  ps_sh->nl ();
-  *ps_sh << "friend class _TAO_" << this->interface_name_ << "_Direct_Proxy_Impl;";  ps_sh->nl ();
-
-  *ps_sh << "virtual ~" << this->interface_name_ << "(void);";  ps_sh->nl ();
-
-  *ps_sh << "private:";  ps_sh->nl ();
-  *ps_sh << this->interface_name_ << "(const " << this->interface_name_ << "&);";  ps_sh->nl ();
-  *ps_sh << "void operator= (const " << this->interface_name_ << "&);";  ps_sh->nl ();
-  *ps_sh << "};";  ps_sh->nl ();
-
-  *ps_sh << "// The Proxy Implementations are used by each interface to";  ps_sh->nl ();
-  *ps_sh << "// perform a call. Each different implementation encapsulate";  ps_sh->nl ();
-  *ps_sh << "// an invocation logics.";  ps_sh->nl ();
-
-
-  *ps_sh << "///////////////////////////////////////////////////////////////////////";  ps_sh->nl ();
-  *ps_sh << "//                    Base Proxy Impl. Declaration";  ps_sh->nl ();
-  *ps_sh << "//";  ps_sh->nl ();
-
-  *ps_sh << "class  _TAO_" << this->interface_name_ << "_Proxy_Impl";  ps_sh->nl ();
-  *ps_sh << ": public virtual TAO_Object_Proxy_Impl";  ps_sh->nl ();
-
-  *ps_sh << "{";
-  ps_sh->nl ();
-  ps_sh->incr_indent (0);
-
-  *ps_sh << "public:";  ps_sh->nl ();
-  *ps_sh << "virtual ~_TAO_" << this->interface_name_ << "_Proxy_Impl (void) { }";  ps_sh->nl ();
-
-  *ps_sh << "protected:";  ps_sh->nl ();
-  *ps_sh << "_TAO_" << this->interface_name_ << "_Proxy_Impl (void);";  ps_sh->nl ();
-  *ps_sh << "};";  ps_sh->nl ();
-
-  *ps_sh << "//";  ps_sh->nl ();
-  *ps_sh << "//               End Base Proxy Impl. Declaration";  ps_sh->nl ();
-  *ps_sh << "///////////////////////////////////////////////////////////////////////";  ps_sh->nl ();
-
-
-  *ps_sh << "///////////////////////////////////////////////////////////////////////";  ps_sh->nl ();
-  *ps_sh << "//                Remote Proxy Impl. Declaration";  ps_sh->nl ();
-  *ps_sh << "//";  ps_sh->nl ();
-
-  *ps_sh << "class  _TAO_" << this->interface_name_ << "_Remote_Proxy_Impl";  ps_sh->nl ();
-  *ps_sh << ": public virtual _TAO_" << this->interface_name_ << "_Proxy_Impl,";  ps_sh->nl ();
-  *ps_sh << "public virtual TAO_Remote_Object_Proxy_Impl";  ps_sh->nl ();
-
-  *ps_sh << "{";
-  ps_sh->nl ();
-  ps_sh->incr_indent (0);
-
-  *ps_sh << "public:";
-  ps_sh->nl ();
-
-  *ps_sh << "_TAO_" << this->interface_name_
-         << "_Remote_Proxy_Impl (void);";
-  ps_sh->nl ();
-
-  *ps_sh << "virtual ~_TAO_" << this->interface_name_
-         << "_Remote_Proxy_Impl (void) { }";
-
-  ps_sh->decr_indent (0);
-  ps_sh->nl ();
-
-  *ps_sh << "};";  ps_sh->nl ();
-
-  *ps_sh << "//";  ps_sh->nl ();
-  *ps_sh << "//             End Remote Proxy Impl. Declaration";  ps_sh->nl ();
-  *ps_sh << "///////////////////////////////////////////////////////////////////////";  ps_sh->nl ();
-
-  *ps_sh << "// The Proxy Brokers are used by each interface to get";  ps_sh->nl ();
-  *ps_sh << "// the right proxy for performing a call. In the new ";  ps_sh->nl ();
-  *ps_sh << "// collocation scheme, the proxy to be used can vary on";  ps_sh->nl ();
-  *ps_sh << "// a call by call basis.";  ps_sh->nl ();
-
-
-  *ps_sh << "///////////////////////////////////////////////////////////////////////";  ps_sh->nl ();
-  *ps_sh << "//                 Base Proxy Broker Declaration ";  ps_sh->nl ();
-  *ps_sh << "//";  ps_sh->nl ();
-
-  *ps_sh << "class  _TAO_" << this->interface_name_ << "_Proxy_Broker";
-  ps_sh->nl ();
-
-  *ps_sh << "{";
-  ps_sh->incr_indent (0);
-  ps_sh->nl ();
-
-  *ps_sh << "public:";
-  ps_sh->nl ();
-  *ps_sh << "virtual ~_TAO_" << this->interface_name_ << "_Proxy_Broker (void);";  ps_sh->nl ();
-  *ps_sh << "virtual _TAO_" << this->interface_name_ << "_Proxy_Impl &select_proxy (";  ps_sh->nl ();
-  *ps_sh << this->interface_name_ << "*object";  ps_sh->nl ();
-  *ps_sh << "";  ps_sh->nl ();
-  *ps_sh << ") = 0;";  ps_sh->nl ();
-
-  *ps_sh << "protected:";  ps_sh->nl ();
-  *ps_sh << "_TAO_" << this->interface_name_ << "_Proxy_Broker (void);";
-  ps_sh->nl ();
-
-  *ps_sh << "};";  ps_sh->nl ();
-
-  *ps_sh << "//";  ps_sh->nl ();
-  *ps_sh << "//              End Base Proxy Broker Declaration ";  ps_sh->nl ();
-  *ps_sh << "///////////////////////////////////////////////////////////////";
-  ps_sh->nl ();
-
-
-  *ps_sh << "///////////////////////////////////////////////////////////////";
-  ps_sh->nl ();
-  *ps_sh << "//                 Remote Proxy Broker Declaration ";
-  ps_sh->nl ();
-  *ps_sh << "//";
-  ps_sh->nl ();
-
-  *ps_sh << "class  _TAO_" << this->interface_name_ << "_Remote_Proxy_Broker";
-  ps_sh->nl ();
-  *ps_sh << ": public virtual _TAO_" << this->interface_name_
-         << "_Proxy_Broker";
-  ps_sh->nl ();
-
-  *ps_sh << "{";
-  ps_sh->incr_indent (0);
-  ps_sh->nl ();
-
-  *ps_sh << "public: ";  ps_sh->nl ();
-  *ps_sh << "_TAO_" << this->interface_name_ << "_Remote_Proxy_Broker (void);";  ps_sh->nl ();
-
-  *ps_sh << "virtual ~_TAO_" << this->interface_name_ << "_Remote_Proxy_Broker (void);";  ps_sh->nl ();
-
-  *ps_sh << "virtual _TAO_" << this->interface_name_ << "_Proxy_Impl &select_proxy (";  ps_sh->nl ();
-  *ps_sh << this->interface_name_ << "*object";  ps_sh->nl ();
-  *ps_sh << "";  ps_sh->nl ();
-  *ps_sh << ");";  ps_sh->nl ();
-
-  *ps_sh << "private:";  ps_sh->nl ();
-  *ps_sh << "_TAO_" << this->interface_name_ << "_Remote_Proxy_Impl remote_proxy_impl_;";  ps_sh->nl ();
-
-  *ps_sh << "public:";  ps_sh->nl ();
-  *ps_sh << "// This member function is used to get an handle to the unique instance";  ps_sh->nl ();
-  *ps_sh << "// of the Remote Proxy Broker that is available for a given";  ps_sh->nl ();
-  *ps_sh << "// interface.";  ps_sh->nl ();
-  *ps_sh << "static _TAO_" << this->interface_name_ << "_Remote_Proxy_Broker *the_TAO_" << this->interface_name_ << "_Remote_Proxy_Broker (void);";  ps_sh->nl ();
-  *ps_sh << "};";  ps_sh->nl ();
-
-  *ps_sh << "//";  ps_sh->nl ();
-  *ps_sh << "//              End Remote Proxy Broker Declaration ";  ps_sh->nl ();
-  *ps_sh << "//////////////////////////////////////////////////////////////";
-  ps_sh->nl ();
-
-  *ps_sh << "#endif /* end #if !defined */";  ps_sh->nl ();
-
-  *ps_sh << "TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_"
-         << this->interface_name_ << ";";
-  ps_sh->nl ();
-}
-
-void
-TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
-{
-  TAO_PSDL_Stream *ps_si = TAO_PSDL_Scope::instance ()->get_si ();
-
-  ps_si->reset ();
-  ps_si->indent (); // start from current indentation level
-
-  *ps_si << "int " << this->interface_name_ << "::_tao_class_id = 0;";
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_ptr";
-  ps_si->nl ();
-  *ps_si << "tao_" << this->interface_name_ << "_duplicate (";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << this->interface_name_ << "_ptr p";
-  ps_si->nl ();
-  *ps_si << ")";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "return " << this->interface_name_ << "::_duplicate (p);";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-  ps_si->nl ();
-
-  ps_si->nl ();
-
-  *ps_si << "void";
-  ps_si->nl ();
-
-  *ps_si << "tao_" << this->interface_name_ << "_release (";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_ptr p";
-  ps_si->nl ();
-
-  *ps_si << ")";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "{";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "CORBA::release (p);";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_ptr";
-  ps_si->nl ();
-  *ps_si << "tao_" << this->interface_name_ << "_nil (";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "void";
-  ps_si->nl ();
-  *ps_si << ")";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "return " << this->interface_name_ << "::_nil ();";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-  ps_si->nl ();
-
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_ptr";
-  ps_si->nl ();
-  *ps_si << "tao_" << this->interface_name_ << "_narrow (";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "CORBA::Object *p";
-  ps_si->nl ();
-
-  *ps_si << "";   ps_si->nl ();
-  *ps_si << ")";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "{";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return " << this->interface_name_
-         << "::_narrow (p);";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "CORBA::Object *";   ps_si->nl ();
-  *ps_si << "tao_" << this->interface_name_ << "_upcast (";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "void *src";   ps_si->nl ();
-  *ps_si << ")";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << " **tmp =";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "ACE_static_cast (" << this->interface_name_ << " **, src);";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "return *tmp;";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "// ***********************************************************";
-  ps_si->nl ();
-  *ps_si << "// " << this->interface_name_ << "_var";   ps_si->nl ();
-  *ps_si << "// ***********************************************************";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_var::"
-         << this->interface_name_
-         << "_var (void) // default constructor";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << ": ptr_ (" << this->interface_name_ << "::_nil ())";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "{}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "::" << this->interface_name_ << "_ptr";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_var::ptr (void) const";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "return this->ptr_;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_var::"
-         << this->interface_name_ << "_var (const ::"
-         << this->interface_name_ << "_var &p) // copy constructor";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << ": TAO_Base_var (),";
-
-  ps_si->incr_indent (0); ps_si->nl ();
-  *ps_si << "ptr_ (" << this->interface_name_
-         << "::_duplicate (p.ptr ()))";
-
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "{}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_var::~"
-         << this->interface_name_ << "_var (void) // destructor";
-
-  ps_si->nl ();
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "CORBA::release (this->ptr_);";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_var &";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_var::operator= ("
-         << this->interface_name_ << "_ptr p)";
-
-  ps_si->nl ();
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "this->ptr_ = p;";   ps_si->nl ();
-  *ps_si << "return *this;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_var &";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_var::operator= (const ::"
-         << this->interface_name_ << "_var &p)";
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "if (this != &p)";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "{";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "CORBA::release (this->ptr_);";   ps_si->nl ();
-  *ps_si << "this->ptr_ = ::" << this->interface_name_
-         << "::_duplicate (p.ptr ());";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return *this;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_var::operator const ::"
-         << this->interface_name_ << "_ptr &() const // cast";   ps_si->nl ();
-  *ps_si << "{";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "return this->ptr_;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_var::operator ::"
-         << this->interface_name_ << "_ptr &() // cast ";   ps_si->nl ();
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return this->ptr_;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "::" << this->interface_name_ << "_ptr";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_var::operator-> (void) const";
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return this->ptr_;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "::" << this->interface_name_ << "_ptr";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_var::in (void) const";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return this->ptr_;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "::" << this->interface_name_ << "_ptr &";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_var::inout (void)";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return this->ptr_;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "::" << this->interface_name_ << "_ptr &";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_var::out (void)";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "CORBA::release (this->ptr_);";   ps_si->nl ();
-  *ps_si << "this->ptr_ = ::" << this->interface_name_ << "::_nil ();";
-  ps_si->nl ();
-  *ps_si << "return this->ptr_;";
-
-  ps_si->nl ();
-  ps_si->decr_indent (0);
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "::" << this->interface_name_ << "_ptr";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_var::_retn (void)";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "// yield ownership of managed obj reference";   ps_si->nl ();
-  *ps_si << "::" << this->interface_name_ << "_ptr val = this->ptr_;";
-  ps_si->nl ();
-  *ps_si << "this->ptr_ = ::" << this->interface_name_ << "::_nil ();";
-  ps_si->nl ();
-  *ps_si << "return val;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "::" << this->interface_name_ << "_ptr";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_var::tao_duplicate ("
-         << this->interface_name_ << "_ptr p)";
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return ::" << this->interface_name_ << "::_duplicate (p);";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "void";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_var::tao_release ("
-         << this->interface_name_ << "_ptr p)";
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "CORBA::release (p);";
-
-  ps_si->nl ();
-  ps_si->decr_indent (0);
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "::" << this->interface_name_ << "_ptr";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_var::tao_nil (void)";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return ::" << this->interface_name_ << "::_nil ();";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "::" << this->interface_name_ << "_ptr";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_var::tao_narrow (";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "CORBA::Object *p";   ps_si->nl ();
-  *ps_si << "";   ps_si->nl ();
-  *ps_si << ")";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return ::" << this->interface_name_
-         << "::_narrow (p);";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "CORBA::Object *";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_var::tao_upcast (void *src)";
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << " **tmp =";   ps_si->nl ();
-  *ps_si << "ACE_static_cast (" << this->interface_name_ << " **, src);";
-  ps_si->nl ();
-  *ps_si << "return *tmp;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "// **********************************************************";
-  ps_si->nl ();
-  *ps_si << "// " << this->interface_name_ << "_out";   ps_si->nl ();
-  *ps_si << "// **********************************************************";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_out::"
-         << this->interface_name_ << "_out ("
-         << this->interface_name_ << "_ptr &p)";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << ": ptr_ (p)";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "this->ptr_ = ::" << this->interface_name_ << "::_nil ();";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_out::"
-         << this->interface_name_ << "_out ("
-         << this->interface_name_
-         << "_var &p) // constructor from _var";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << ": ptr_ (p.out ())";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "CORBA::release (this->ptr_);";   ps_si->nl ();
-  *ps_si << "this->ptr_ = ::" << this->interface_name_ << "::_nil ();";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_out::"
-         << this->interface_name_ << "_out (const ::"
-         << this->interface_name_ << "_out &p) // copy constructor";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << ": ptr_ (ACE_const_cast ("
-         << this->interface_name_
-         << "_out &, p).ptr_)";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "::" << this->interface_name_ << "_out &";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_out::operator= (const ::"
-         << this->interface_name_ << "_out &p)";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "this->ptr_ = ACE_const_cast ("
-         << this->interface_name_ << "_out&, p).ptr_;";   ps_si->nl ();
-  *ps_si << "return *this;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_out &";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_out::operator= (const ::"
-         << this->interface_name_ << "_var &p)";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "this->ptr_ = ::" << this->interface_name_
-         << "::_duplicate (p.ptr ());";   ps_si->nl ();
-  *ps_si << "return *this;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_out &";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_out::operator= ("
-         << this->interface_name_ << "_ptr p)";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "this->ptr_ = p;";   ps_si->nl ();
-  *ps_si << "return *this;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_out::operator ::"
-         << this->interface_name_ << "_ptr &() // cast";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-   ps_si->nl ();
-
-  *ps_si << "return this->ptr_;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "::" << this->interface_name_ << "_ptr &";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_out::ptr (void) // ptr";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return this->ptr_;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "::" << this->interface_name_ << "_ptr";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_out::operator-> (void)";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return this->ptr_;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "#if (TAO_HAS_INTERCEPTORS == 1)";   ps_si->nl ();
-  *ps_si << "#endif /* TAO_HAS_INTERCEPTORS */";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "///////////////////////////////////////////////////////////////";   ps_si->nl ();
-  *ps_si << "//                Base & Remote Proxy  Implementation. ";
-  ps_si->nl ();
-  *ps_si << "//";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "_TAO_" << this->interface_name_ << "_Proxy_Impl::_TAO_"
-         << this->interface_name_ << "_Proxy_Impl (void)";   ps_si->nl ();
-  *ps_si << "{}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "_TAO_" << this->interface_name_
-         << "_Remote_Proxy_Impl::_TAO_" << this->interface_name_
-         << "_Remote_Proxy_Impl (void)";   ps_si->nl ();
-  *ps_si << "{}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "// Remote Implementation of the IDL interface methods";
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "//";   ps_si->nl ();
-  *ps_si << "//            End  Base & Remote  Proxy Implemeentation. ";
-  ps_si->nl ();
-
-  *ps_si << "///////////////////////////////////////////////////////////////";
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "///////////////////////////////////////////////////////////////";   ps_si->nl ();
-  *ps_si << "//           Remote & Base  Proxy Broker Implementation";
-  ps_si->nl ();
-  *ps_si << "//";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "_TAO_" << this->interface_name_ << "_Proxy_Broker::_TAO_"
-         << this->interface_name_ << "_Proxy_Broker (void)";   ps_si->nl ();
-  *ps_si << "{";   ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "_TAO_" << this->interface_name_ << "_Proxy_Broker::~_TAO_"
-         << this->interface_name_ << "_Proxy_Broker (void)";   ps_si->nl ();
-  *ps_si << "{";   ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "_TAO_" << this->interface_name_
-         << "_Proxy_Broker * (*_TAO_"
-         << this->interface_name_
-         << "_Proxy_Broker_Factory_function_pointer) (";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "CORBA::Object_ptr obj";
-
-  ps_si->nl ();
-  *ps_si << ") = 0;";
-
-  ps_si->decr_indent (0);
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "// Factory Member function Implementation.";   ps_si->nl ();
-  *ps_si << "_TAO_" << this->interface_name_ << "_Remote_Proxy_Broker *";
-  ps_si->nl ();
-  *ps_si << "_TAO_" << this->interface_name_
-         << "_Remote_Proxy_Broker::the_TAO_"
-         << this->interface_name_
-         << "_Remote_Proxy_Broker (void)";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "static ::_TAO_" << this->interface_name_
-         << "_Remote_Proxy_Broker remote_proxy_broker;";   ps_si->nl ();
-  *ps_si << "return &remote_proxy_broker;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "_TAO_" << this->interface_name_
-         << "_Remote_Proxy_Broker::_TAO_"
-         << this->interface_name_ << "_Remote_Proxy_Broker (void)";   ps_si->nl ();
-  *ps_si << "{";   ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "_TAO_" << this->interface_name_
-         << "_Remote_Proxy_Broker::~_TAO_"
-         << this->interface_name_ << "_Remote_Proxy_Broker (void)";   ps_si->nl ();
-  *ps_si << "{";   ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "_TAO_" << this->interface_name_ << "_Proxy_Impl&";   ps_si->nl ();
-  *ps_si << "_TAO_" << this->interface_name_
-         << "_Remote_Proxy_Broker::select_proxy (";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "::" << this->interface_name_ << " *";   ps_si->nl ();
-  *ps_si << "";   ps_si->nl ();
-  *ps_si << ")";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return this->remote_proxy_impl_;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "//";   ps_si->nl ();
-  *ps_si << "//           End Remote & Base Proxy Broker Implementation";   ps_si->nl ();
-  *ps_si << "///////////////////////////////////////////////////////////////";   ps_si->nl ();
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "::"
-         << this->interface_name_ << " (int collocated)";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "this->" << this->interface_name_
-         << "_setup_collocation (collocated);";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "::~"
-         << this->interface_name_ << " (void)";   ps_si->nl ();
-  *ps_si << "{}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "void";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "::"
-         << this->interface_name_
-         << "_setup_collocation (int collocated)";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "if (collocated)";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "this->the_TAO_"
-         << this->interface_name_ << "_Proxy_Broker_ =";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "::_TAO_" << this->interface_name_
-         << "_Proxy_Broker_Factory_function_pointer (this);";
-
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "else";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "this->the_TAO_"
-         << this->interface_name_
-         << "_Proxy_Broker_ =";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "::_TAO_" << this->interface_name_
-         << "_Remote_Proxy_Broker::the_TAO_"
-         << this->interface_name_
-         << "_Remote_Proxy_Broker ();";
-
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "void " << this->interface_name_
-         << "::_tao_any_destructor (void *_tao_void_pointer)";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_
-         << " *tmp = ACE_static_cast ("
-         << this->interface_name_ << "*, _tao_void_pointer);";   ps_si->nl ();
-  *ps_si << "CORBA::release (tmp);";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_ptr "
-         << this->interface_name_ << "::_narrow (";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "CORBA::Object_ptr obj";   ps_si->nl ();
-  *ps_si << "";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << ")";
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "if (CORBA::is_nil (obj))";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return " << this->interface_name_ << "::_nil ();";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "if (! obj->_is_local ())";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "CORBA::Boolean is_a = obj->_is_a (\"IDL:"
-         << this->interface_name_ << ":1.0\");";
-  ps_si->nl ();
-
-  *ps_si << "if (is_a == 0)";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "return " << this->interface_name_ << "::_nil ();";
-
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return " << this->interface_name_
-         << "::_unchecked_narrow (obj);";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_ptr ";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "::_unchecked_narrow (";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "CORBA::Object_ptr obj";   ps_si->nl ();
-  *ps_si << "";   ps_si->nl ();
-  *ps_si << ")";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "if (CORBA::is_nil (obj))";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return " << this->interface_name_ << "::_nil ();";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "if (! obj->_is_local ())";   ps_si->nl ();
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "TAO_Stub* stub = obj->_stubobj ();";   ps_si->nl ();
-
-  *ps_si << "if (stub)";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << " stub->_incr_refcnt ();";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_ptr default_proxy = "
-         << this->interface_name_ << "::_nil ();";   ps_si->nl ();
-  ps_si->nl ();
-  *ps_si << "if (";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "!CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&";   ps_si->nl ();
-  *ps_si << "stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&";   ps_si->nl ();
-  *ps_si << "obj->_is_collocated () &&";   ps_si->nl ();
-  *ps_si << "_TAO_" << this->interface_name_
-         << "_Proxy_Broker_Factory_function_pointer != 0";   ps_si->nl ();
-  *ps_si << ")";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << " {";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << " ACE_NEW_RETURN (";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "default_proxy,";   ps_si->nl ();
-  *ps_si << "::" << this->interface_name_ << " (";
-  ps_si->incr_indent (0);
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "stub,";   ps_si->nl ();
-  *ps_si << "1,";   ps_si->nl ();
-  *ps_si << "obj->_servant ()";   ps_si->nl ();
-  *ps_si << "),";
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << this->interface_name_ << "::_nil ()";   ps_si->nl ();
-
-  *ps_si << ");";
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << " }";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "if (CORBA::is_nil (default_proxy))";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "{";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "ACE_NEW_RETURN (";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "default_proxy,";   ps_si->nl ();
-
-  *ps_si << "::" << this->interface_name_ << " (";
-  ps_si->incr_indent (0);
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "stub,";   ps_si->nl ();
-  *ps_si << "0,";   ps_si->nl ();
-  *ps_si << "obj->_servant ()";   ps_si->nl ();
-  *ps_si << "),";
-
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "::_nil ()";   ps_si->nl ();
-  *ps_si << ");";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << " }";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return default_proxy;";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "}";   ps_si->nl ();
-  *ps_si << "else";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "return";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "ACE_reinterpret_cast";   ps_si->nl ();
-  *ps_si << "(";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << this->interface_name_ << "_ptr,";   ps_si->nl ();
-  *ps_si << "obj->_tao_QueryInterface";   ps_si->nl ();
-  *ps_si << "(";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "ACE_reinterpret_cast";   ps_si->nl ();
-  *ps_si << "(";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "ptrdiff_t,";   ps_si->nl ();
-  *ps_si << "&" << this->interface_name_ << "::_tao_class_id";
-  ps_si->nl ();
-
-  *ps_si << ")";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << ")";
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << " );";
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << this->interface_name_ << "_ptr";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "::_duplicate ("
-         << this->interface_name_ << "_ptr obj)";   ps_si->nl ();
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "if (!CORBA::is_nil (obj))";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "obj->_add_ref ();";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return obj;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "CORBA::Boolean " << this->interface_name_
-         << "::_is_a (const CORBA::Char *value)";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "if (";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "(!ACE_OS::strcmp ((char *)value, \"IDL:"
-         << this->interface_name_ << ":1.0\")) ||";   ps_si->nl ();
-  *ps_si << "(!ACE_OS::strcmp ((char *)value,"
-         << "\"IDL:omg.org/CORBA/Object:1.0\")))";   ps_si->nl ();
-
-  *ps_si << "return 1; // success using local knowledge";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "else";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "return this->Object::_is_a (value);";
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "void *" << this->interface_name_
-         << "::_tao_QueryInterface (ptrdiff_t type)";   ps_si->nl ();
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "void *retv = 0;";   ps_si->nl ();
-  *ps_si << "if (type == ACE_reinterpret_cast";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "(ptrdiff_t,";   ps_si->nl ();
-  *ps_si << "&" << this->interface_name_ << "::_tao_class_id))";   ps_si->nl ();
-  *ps_si << "retv = reinterpret_cast<void*> (this);";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "else if (type == ACE_reinterpret_cast "
-         << "(ptrdiff_t, &CORBA::Object::_tao_class_id))";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "retv = ACE_reinterpret_cast (void *,";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "static_cast<CORBA::Object_ptr> (this));";
-
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-
-  ps_si->nl ();
-  ps_si->nl ();
-  *ps_si << "if (retv)";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "this->_add_ref ();";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "return retv;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "const char* " << this->interface_name_
-         << "::_interface_repository_id (void) const";   ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "return \"IDL:" << this->interface_name_ << ":1.0\";";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "static const CORBA::Long _oc_"
-         << this->interface_name_ << "[] =";   ps_si->nl ();
-  *ps_si << "{";   ps_si->nl ();
-  *ps_si << "// typecode related information goes here";
-
-  ps_si->nl ();
-  *ps_si << "};";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-
-  *ps_si << "static CORBA::TypeCode _tc_TAO_tc_"
-         << this->interface_name_ << " (";
-
-  ps_si->incr_indent (0);
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "CORBA::tk_objref,";   ps_si->nl ();
-  *ps_si << "sizeof (_oc_" << this->interface_name_ << "),";   ps_si->nl ();
-  *ps_si << "(char *) &_oc_" << this->interface_name_ << ",";   ps_si->nl ();
-  *ps_si << "0,";   ps_si->nl ();
-  *ps_si << "sizeof (" << this->interface_name_ << ")";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << ");";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "::CORBA::TypeCode_ptr _tc_" << this->interface_name_ << " =";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "&_tc_TAO_tc_" << this->interface_name_ << ";";
-  ps_si->decr_indent (0);
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "void operator<<= (";
-  ps_si->incr_indent (0);
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "CORBA::Any &_tao_any,";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_ptr _tao_elem";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << ")";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "TAO_OutputCDR stream;";
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "if (stream << _tao_elem)";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "_tao_any._tao_replace (";
-  ps_si->incr_indent (0);
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "_tc_" << this->interface_name_ << ", ";   ps_si->nl ();
-  *ps_si << "TAO_ENCAP_BYTE_ORDER,";   ps_si->nl ();
-  *ps_si << "stream.begin (),";   ps_si->nl ();
-  *ps_si << "1,";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "::_duplicate (_tao_elem),";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "::_tao_any_destructor";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << ");";
-
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "void operator<<= (";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "CORBA::Any &_tao_any,";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_ptr *_tao_elem";
-  ps_si->nl ();
-
-  *ps_si << ")";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "TAO_OutputCDR stream;";
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "if (stream << *_tao_elem)";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "_tao_any._tao_replace (";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "_tc_" << this->interface_name_ << ", ";   ps_si->nl ();
-  *ps_si << "TAO_ENCAP_BYTE_ORDER,";   ps_si->nl ();
-  *ps_si << "stream.begin (),";   ps_si->nl ();
-  *ps_si << "1,";   ps_si->nl ();
-  *ps_si << "*_tao_elem,";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "::_tao_any_destructor";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << ");";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "CORBA::Boolean operator>>= (";
-  ps_si->incr_indent (0);
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "const CORBA::Any &_tao_any,";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_ptr &_tao_elem";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << ")";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "ACE_TRY_NEW_ENV";   ps_si->nl ();
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "_tao_elem = " << this->interface_name_ << "::_nil ();";
-  ps_si->nl ();
-  *ps_si << "CORBA::TypeCode_var type = _tao_any.type ();";
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "CORBA::Boolean result =";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "type->equivalent (";
-  ps_si->incr_indent (0);
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "_tc_" << this->interface_name_ << "";   ps_si->nl ();
-  *ps_si << "";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << ");";
-
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-;
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "if (!result)";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "return 0; // not equivalent";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "TAO_InputCDR stream (";
-  ps_si->incr_indent (0);
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "_tao_any._tao_get_cdr (),";
-  ps_si->nl ();
-  *ps_si << "_tao_any._tao_byte_order ()";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << ");";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "if (stream >> _tao_elem)";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "((CORBA::Any *)&_tao_any)->_tao_replace (";
-  ps_si->incr_indent (0);
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "_tc_" << this->interface_name_ << ",";   ps_si->nl ();
-  *ps_si << "1,";   ps_si->nl ();
-  *ps_si << "_tao_elem,";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "::_tao_any_destructor";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << ");";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  ps_si->nl ();
-  *ps_si << "return 1;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-  ps_si->nl ();
-
-  *ps_si << "ACE_CATCHANY";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "{";   ps_si->nl ();
-  *ps_si << "}";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "ACE_ENDTRY;";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "_tao_elem = " << this->interface_name_ << "::_nil ();";
-  ps_si->nl ();
-  *ps_si << "return 0;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "CORBA::Boolean operator<< (";
-
-  ps_si->incr_indent (0);
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "TAO_OutputCDR &strm,";   ps_si->nl ();
-  *ps_si << "const " << this->interface_name_ << "_ptr _tao_objref";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << ")";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "CORBA::Object_ptr _tao_corba_obj = _tao_objref;";   ps_si->nl ();
-  *ps_si << "return (strm << _tao_corba_obj);";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "CORBA::Boolean operator>> (";
-  ps_si->incr_indent (0);
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "TAO_InputCDR &strm,";   ps_si->nl ();
-  *ps_si << this->interface_name_ << "_ptr &_tao_objref";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << ")";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "ACE_TRY_NEW_ENV";   ps_si->nl ();
-  *ps_si << "{";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "CORBA::Object_var obj;";   ps_si->nl ();
-  *ps_si << "if ((strm >> obj.inout ()) == 0)";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "return 0;";
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "// narrow to the right type";   ps_si->nl ();
-  *ps_si << "_tao_objref =";
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << this->interface_name_ << "::_unchecked_narrow (";
-
-  ps_si->incr_indent (0);
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "obj.in ()";   ps_si->nl ();
-  *ps_si << "";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << ");";
-
-  ps_si->decr_indent (0);
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-;   ps_si->nl ();
-  *ps_si << "return 1;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  *ps_si << "ACE_CATCHANY";   ps_si->nl ();
-  *ps_si << "{";
-
-  ps_si->incr_indent (0);
-  ps_si->nl ();
-  *ps_si << "// do nothing";
-
-  ps_si->decr_indent (0);ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-  *ps_si << "ACE_ENDTRY;";   ps_si->nl ();
-  *ps_si << "return 0;";
-
-  ps_si->decr_indent (0);
-  ps_si->nl ();
-
-  *ps_si << "}";
-
-  ps_si->nl ();
-  ps_si->nl ();
-
-}
diff --git a/orbsvcs/PSS/PSDL_Interface_Visitor.h b/orbsvcs/PSS/PSDL_Interface_Visitor.h
deleted file mode 100644
index 936167922c1..00000000000
--- a/orbsvcs/PSS/PSDL_Interface_Visitor.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Interface_Visitor.h
-//
-// = DESCRIPTION
-//    Visitor class for the generated code for interfaces.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_INTERFACE_VISITOR_H
-#define TAO_PSDL_INTERFACE_VISITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Node_Visitor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PSDL_Interface_Visitor : public TAO_PSDL_Node_Visitor
-{
- public:
-
-  TAO_PSDL_Interface_Visitor ();
-
-  ~TAO_PSDL_Interface_Visitor ();
-
-  // Override the necessary methods for interfaces (including forward
-  // declarations).
-  int visit_identifier (TAO_PSDL_Identifier *identifier);
-
-  int visit_forward_dcl (TAO_PSDL_Forward_Dcl *forward_dcl);
-
-  int visit_interface_dcl (TAO_PSDL_Interface_Dcl *interface_dcl);
-
-  int visit_interface_header (TAO_PSDL_Interface_Header *interface_header);
-
-  // Generate the code that should go into the stub implementation
-  // file for the type_declarators.
-  void gen_code_for_si (void);
-
- private:
-
-  void print_for_forward_dcl (void);
-  void print_class_for_interface (void);
-  void print_end_for_interface (void);
-
-  CORBA::Boolean forward_dcl_;
-  ACE_CString interface_name_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_INTERFACE_VISITOR_H */
diff --git a/orbsvcs/PSS/PSDL_Interpreter.cpp b/orbsvcs/PSS/PSDL_Interpreter.cpp
deleted file mode 100644
index c3bf8d7a1c0..00000000000
--- a/orbsvcs/PSS/PSDL_Interpreter.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Interpreter.h"
-#include "PSDL_Node.h"
-#include "PSDL_y.h"
-
-ACE_RCSID(PSDL, PSDL_Interpreter, "$Id$")
-
-TAO_SYNCH_MUTEX TAO_PSDL_Interpreter::parserMutex__;
-
-TAO_PSDL_Interpreter::TAO_PSDL_Interpreter (void)
-  : root_ (0)
-{
-}
-
-TAO_PSDL_Interpreter::~TAO_PSDL_Interpreter (void)
-{
-  delete this->root_;
-}
-
-int
-TAO_PSDL_Interpreter::build_tree (const char* nodes)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    guard,
-                    TAO_PSDL_Interpreter::parserMutex__,
-                    -1);
-
-  TAO_Lex_String_Input::reset ((char*)nodes);
-
-  yyval = 0;
-  void *result_ptr = 0;
-  int return_value = TAO_PSDL_yyparse (result_ptr);
-
-  if (return_value == 0 && yyval != 0)
-    {
-      this->root_ = yyval;
-    }
-  else
-    {
-      this->root_ = 0;
-    }
-
-  return return_value;
-}
-
-int
-TAO_PSDL_Interpreter::is_empty_string (const char* str)
-{
-  int return_value = 0;
-
-  if (str != 0)
-    {
-      int i = 0;
-
-      while (str[i] != '\0')
-        {
-          if (str[i] != ' ')
-            {
-              break;
-            }
-
-          i++;
-        }
-
-      if (str[i] == '\0')
-        {
-          return_value = 1;
-        }
-    }
-
-  return return_value;
-}
-
-char* TAO_Lex_String_Input::string_ = 0;
-char* TAO_Lex_String_Input::current_ = 0;
-char* TAO_Lex_String_Input::end_ = 0;
-
-// Routine to have Lex read its input from the node string.
-
-int
-TAO_Lex_String_Input::copy_into (char* buf,
-                                 int max_size)
-{
-  int chars_left =  TAO_Lex_String_Input::end_ - TAO_Lex_String_Input::current_;
-  int n = max_size > chars_left ? chars_left : max_size;
-
-  if (n > 0)
-    {
-      ACE_OS::memcpy (buf,
-                      TAO_Lex_String_Input::current_,
-                      n);
-      TAO_Lex_String_Input::current_ += n;
-    }
-
-  return n;
-}
-
-void
-TAO_Lex_String_Input::reset (char* input_string)
-{
-  TAO_Lex_String_Input::string_ = input_string;
-  TAO_Lex_String_Input::current_ = input_string;
-  TAO_Lex_String_Input::end_ =
-    input_string + ACE_OS::strlen (TAO_Lex_String_Input::string_);
-}
diff --git a/orbsvcs/PSS/PSDL_Interpreter.h b/orbsvcs/PSS/PSDL_Interpreter.h
deleted file mode 100644
index f023f79b467..00000000000
--- a/orbsvcs/PSS/PSDL_Interpreter.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ========================================================================
-//
-// = LIBRARY
-//    orbsvcs/PSS
-//
-// = FILENAME
-//    PSDL_Interpreter.h
-//
-// = AUTHOR
-//    Priyanka Gontla <pgontla@doc.ece.uci.edu>
-//
-// ========================================================================
-
-#ifndef TAO_PSDL_INTERPRETER_H
-#define TAO_PSDL_INTERPRETER_H
-#include /**/ "ace/pre.h"
-
-#include "psdl_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-#include "ace/Synch.h"
-
-class TAO_PSDL_Node;
-
-class TAO_PSDL_Export TAO_PSDL_Interpreter
-{
-  // = TITLE
-  //      TAO_PSDL_Interpreter is the superclass for all PSDL interpreters.
-  //      Its build tree method invokes the yacc parser to parse a constraint
-  //      or preference string.
-protected:
-  // = Initialization and termination methods.
-  TAO_PSDL_Interpreter (void);
-  // Constructor.
-
-  ~TAO_PSDL_Interpreter (void);
-  // Destructor.
-
-  int build_tree (const char* constraints);
-  // Using the Yacc generated parser, construct an expression tree
-  // representing <nodes> from the tokens returned by it.
-
-  static int is_empty_string (const char* str);
-
-  TAO_PSDL_Node* root_;
-  // The root of the expression tree, not equal to null if build_tree
-  // successfully builds a tree from the constraints.
-private:
-  static TAO_SYNCH_MUTEX parserMutex__;
-  // This mutex protects the <build_tree> method from reentrance.
-};
-
-
-// Functions we need for parsing.
-extern int TAO_PSDL_yyparse (void *);
-extern void yyrestart (FILE*);
-extern int yylex (TAO_PSDL_Node **, void *);
-
-// Have yylex read from the node string, not from stdin.
-//#undef YY_INPUT
-//#define YY_INPUT(b, r, ms) (r = TAO_Lex_String_Input::copy_into(b, ms))
-
-class TAO_Lex_String_Input
-{
-  // = TITLE
-  //   Have Lex read from a string and not from stdin. Essentially,
-  //   the interpreter needs to call yylex() until EOF, and call
-  //   TAO_Lex_String_Input::reset() with the new string, prior to
-  //   calling yyparse.
-public:
-  static void reset (char* input_string);
-  // Reset the lex input.
-
-  static int copy_into (char* buf, int max_size);
-  // Method lex will call to read from the input string.
-
-private:
-
-  static char* string_;
-  static char* current_;
-  static char* end_;
-  // Pointers to keep track of the input string.
-};
-
-// The union used by lex and bison to build the Abstract Syntax Tree.
-#define YYSTYPE TAO_PSDL_Node *
-
-extern YYSTYPE yylval;
-extern YYSTYPE yyval;
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PSDL_INTERPRETER_H */
diff --git a/orbsvcs/PSS/PSDL_Module_Scope.cpp b/orbsvcs/PSS/PSDL_Module_Scope.cpp
deleted file mode 100644
index bda3bbb4ff8..00000000000
--- a/orbsvcs/PSS/PSDL_Module_Scope.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Module_Scope.h"
-#include "PSDL_Interface_Scope.h"
-
-ACE_RCSID (PSS, PSDL_Module_Scope, "$Id$")
-
-TAO_PSDL_Module_Scope::TAO_PSDL_Module_Scope (TAO_PSDL_Scope *parent_scope)
-  : module_scope_ (),
-    parent_scope_ (parent_scope),
-    identifier_type_ ("module")
-{
-}
-
-TAO_PSDL_Module_Scope::~TAO_PSDL_Module_Scope (void)
-{
-}
-
-int
-TAO_PSDL_Module_Scope::add_module (ACE_CString identifier)
-{
-  return TAO_PSDL_Scope::instance ()->add_module_to_scope (identifier,
-                                                           this);
-}
-
-int
-TAO_PSDL_Module_Scope::add_interface (ACE_CString interface_name)
-{
-  return TAO_PSDL_Scope::instance ()->add_interface_to_scope (interface_name,
-                                                              this);
-}
-
-int
-TAO_PSDL_Module_Scope::add_struct (ACE_CString struct_name)
-{
-  return TAO_PSDL_Scope::instance ()->add_struct_to_scope (struct_name,
-                                                              this);
-}
-
-int
-TAO_PSDL_Module_Scope::add_typedef (ACE_CString identifier,
-                                    ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_typedef_to_scope (identifier,
-                                                            identifier_type,
-                                                            this);
-}
-
-int
-TAO_PSDL_Module_Scope::add_const_decl (ACE_CString identifier,
-                                       ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_const_decl_to_scope (identifier,
-                                                               identifier_type,
-                                                               this);
-}
-
-int
-TAO_PSDL_Module_Scope::add_except_decl (ACE_CString identifier,
-                                        ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_except_decl_to_scope (identifier,
-                                                                identifier_type,
-                                                                this);
-}
-
-int
-TAO_PSDL_Module_Scope::add_exception (ACE_CString identifier)
-{
-  return TAO_PSDL_Scope::instance ()->add_exception_to_scope (identifier,
-                                                              this);
-}
-
-int
-TAO_PSDL_Module_Scope::add_enum_decl (ACE_CString identifier,
-                                      ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_enum_decl_to_scope (identifier,
-                                                              identifier_type,
-                                                              this);
-}
-
-int
-TAO_PSDL_Module_Scope::add_op_dcl (ACE_CString identifier)
-{
-  return TAO_PSDL_Scope::instance ()->add_op_dcl_to_scope (identifier,
-                                                           this);
-}
-
-void
-TAO_PSDL_Module_Scope::dump (CORBA::ULong depth)
-{
-  depth = depth + 5;
-
-  for (Scope_Map_Iterator i = this->module_scope_.begin ();
-       i != this->module_scope_.end ();
-       ++i)
-    {
-      this->print_depth (depth);
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s (module/interface/storagebase/struct)\n",
-                  (*i).ext_id_.c_str ()));
-      (*i).int_id_->dump (depth);
-    }
-}
-
-int
-TAO_PSDL_Module_Scope::find (const ACE_CString &identifier_name,
-                             ACE_CString &identifier_type)
-{
-  for (Scope_Map_Iterator i = this->module_scope_.begin ();
-       i != this->module_scope_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          identifier_type = (*i).int_id_->identifier_type ();
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->find (identifier_name,
-                                  identifier_type) == 0)
-            {
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-int
-TAO_PSDL_Module_Scope::find (const ACE_CString &identifier_name)
-{
-  for (Scope_Map_Iterator i = this->module_scope_.begin ();
-       i != this->module_scope_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->find (identifier_name) == 0)
-            {
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-int
-TAO_PSDL_Module_Scope::get_module_name (const ACE_CString &identifier_name,
-                                        ACE_CString &module_name)
-{
-  for (Scope_Map_Iterator i = this->module_scope_.begin ();
-       i != this->module_scope_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          module_name = (*i).int_id_->module_name ();
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->get_module_name (identifier_name,
-                                             module_name) == 0)
-            {
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-int
-TAO_PSDL_Module_Scope::get_interface_name (const ACE_CString &identifier_name,
-                                           ACE_CString &interface_name)
-{
-  for (Scope_Map_Iterator i = this->module_scope_.begin ();
-       i != this->module_scope_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          interface_name = (*i).int_id_->interface_name ();
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->get_interface_name (identifier_name,
-                                                interface_name) == 0)
-            {
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-TAO_PSDL_Scope *
-TAO_PSDL_Module_Scope::parent_scope (void)
-{
-  return this->parent_scope_;
-}
-
-Scope_Map *
-TAO_PSDL_Module_Scope::scope_map (void)
-{
-  return &this->module_scope_;
-}
-
-ACE_CString
-TAO_PSDL_Module_Scope::identifier_type (void)
-{
-  return this->identifier_type_;
-}
-
-ACE_CString
-TAO_PSDL_Module_Scope::module_name (void)
-{
-  return this->module_name_;
-}
-
-ACE_CString
-TAO_PSDL_Module_Scope::interface_name (void)
-{
-  return this->interface_name_;
-}
diff --git a/orbsvcs/PSS/PSDL_Module_Scope.h b/orbsvcs/PSS/PSDL_Module_Scope.h
deleted file mode 100644
index 283a1067bb6..00000000000
--- a/orbsvcs/PSS/PSDL_Module_Scope.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Module_Scope
-//
-// = DESCRIPTION
-//    Scope class for the Exception type helpful for building the AST.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_MODULE_SCOPE_H
-#define TAO_PSDL_MODULE_SCOPE_H
-
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Scope.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PSDL_Export TAO_PSDL_Module_Scope : public TAO_PSDL_Scope
-{
- public:
-
-  TAO_PSDL_Module_Scope (TAO_PSDL_Scope *parent_scope);
-
-  ~TAO_PSDL_Module_Scope (void);
-
-  // Override the necessary methods for the modules.
-  int add_module (ACE_CString identifier);
-
-  int add_interface (ACE_CString identifier);
-
-  int add_struct (ACE_CString identifier);
-
-  int add_typedef (ACE_CString identifier,
-                   ACE_CString identifier_type);
-
-  int add_const_decl (ACE_CString identifier,
-                      ACE_CString identifier_type);
-
-  int add_except_decl (ACE_CString identifier,
-                       ACE_CString identifier_type);
-
-  int add_exception (ACE_CString identifier);
-
-  int add_enum_decl (ACE_CString identifier,
-                     ACE_CString identifier_type);
-
-  int add_op_dcl (ACE_CString identifier);
-
-  void dump (CORBA::ULong depth);
-
-  int find (const ACE_CString &identifier_name,
-            ACE_CString &identifier_type);
-
-  int find (const ACE_CString &identifier_name);
-  
-  int get_module_name (const ACE_CString &identifier_name,
-                       ACE_CString &module_name);
-  
-  int get_interface_name (const ACE_CString &identifier_name,
-                          ACE_CString &interface_name);
-
-  TAO_PSDL_Scope *parent_scope (void);
-
-  Scope_Map *scope_map (void);
-
-  ACE_CString identifier_type (void);
-  ACE_CString module_name (void);
-  ACE_CString interface_name (void);
-
-protected:
-
-  Scope_Map module_scope_;
-  TAO_PSDL_Scope *parent_scope_;
-
-  // Type of this scope. Useful later when needed to find the type of
-  // a particular PSDL_Scope *
-  ACE_CString identifier_type_;
-  ACE_CString module_name_;
-  ACE_CString interface_name_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_MODULE_SCOPE_H */
diff --git a/orbsvcs/PSS/PSDL_Module_Visitor.cpp b/orbsvcs/PSS/PSDL_Module_Visitor.cpp
deleted file mode 100644
index 23c7d29490c..00000000000
--- a/orbsvcs/PSS/PSDL_Module_Visitor.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Module_Visitor.h"
-#include "PSDL_Scope.h"
-#include "PSDL_Stream.h"
-
-ACE_RCSID (PSS, PSDL_Module_Visitor, "$Id$")
-
-TAO_PSDL_Module_Visitor::TAO_PSDL_Module_Visitor (void)
-{
-}
-
-TAO_PSDL_Module_Visitor::~TAO_PSDL_Module_Visitor (void)
-{
-}
-
-int
-TAO_PSDL_Module_Visitor::visit_module (TAO_PSDL_Module *module)
-{
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
-  // The visitor method for the modules. We invoke the accept method
-  // of the TAO_PSDL_Module. This method is going to invoke the chain
-  // of visitor methods for members in the module scope.
-  *ps_sh << "TAO_NAMESPACE "
-         << module->identifier_name ().c_str ()
-         << " {";
-
-  ps_sh->nl ();
-
-  ps_sh->incr_indent ();
-  TAO_PSDL_Scope::instance ()->set_name_space (module->identifier_name ());
-
-  if (module->specification ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) PSDL_Module_Visitor::"
-                         "visit_module - "
-                         "codegen for scope failed\n"), -1);
-    }
-
-  ps_sh->decr_indent ();
-  ps_sh->nl ();
-
-  *ps_sh << "} TAO_NAMESPACE_CLOSE // module "
-         << module->identifier_name ().c_str ()
-         << "\n\n";
-
-  return 0;
-}
diff --git a/orbsvcs/PSS/PSDL_Module_Visitor.h b/orbsvcs/PSS/PSDL_Module_Visitor.h
deleted file mode 100644
index 2419b4fb5ea..00000000000
--- a/orbsvcs/PSS/PSDL_Module_Visitor.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Module_Visitor.h
-//
-// = DESCRIPTION
-//    Visitor class for the generated code for modules.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_MODULE_VISITOR_H
-#define TAO_PSDL_MODULE_VISITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Node_Visitor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PSDL_Module_Visitor : public TAO_PSDL_Node_Visitor
-{
- public:
-
-  TAO_PSDL_Module_Visitor ();
-
-  ~TAO_PSDL_Module_Visitor ();
-
-  // Override the visit_module method.
-  int visit_module (TAO_PSDL_Module *node);
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_MODULE_VISITOR_H */
diff --git a/orbsvcs/PSS/PSDL_Node.cpp b/orbsvcs/PSS/PSDL_Node.cpp
deleted file mode 100644
index 2562abf32c9..00000000000
--- a/orbsvcs/PSS/PSDL_Node.cpp
+++ /dev/null
@@ -1,5211 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Node.h"
-#include "PSDL_Scope.h"
-#include "PSDL_Scope_Visitor.h"
-#include "PSDL_Node_Visitor.h"
-#include "PSDL_y.h"
-
-#include "PSDL_Stream.h"
-#include "tao/CORBA_String.h"
-
-ACE_RCSID (PSS, PSDL_Node, "$Id$")
-
-TAO_PSDL_Node::TAO_PSDL_Node (void)
-  : identifiers_ (),
-    count_ (0),
-    predefined_type_ (0),
-    psdl_scope_ (0),
-    psdl_scope_visitor_ (0)
-{
-}
-
-TAO_PSDL_Node::~TAO_PSDL_Node (void)
-{
-}
-
-int
-TAO_PSDL_Node::type_of_node (void) const
-{
-  return this->type_;
-}
-
-
-TAO_PSDL_Scope_Visitor *
-TAO_PSDL_Node::psdl_scope_visitor (void)
-{
-  if (this->psdl_scope_visitor_ == 0)
-    this->psdl_scope_visitor_ = new TAO_PSDL_Scope_Visitor (this);
-
-  return this->psdl_scope_visitor_;
-}
-
-TAO_PSDL_Scope *
-TAO_PSDL_Node::psdl_scope (void)
-{
-  this->psdl_scope_ = TAO_PSDL_Scope::instance ()->pop_top_scope ();
-
-  return this->psdl_scope_;
-}
-
-ACE_CString
-TAO_PSDL_Node::get_identifier_type (void)
-{
-  // We are going to save such that the first element is the type of the
-  // identifier and the second element is the actual identifier
-  return this->identifiers_[0];
-}
-
-ACE_CString
-TAO_PSDL_Node::get_identifier_value (void)
-{
-  // We are going to save such as the first element is the type of the
-  // identifier and
-  // the second element is the actual identifier
-  return this->identifiers_[1];
-}
-
-void
-TAO_PSDL_Node::set_identifier (ACE_CString identifier)
-{
-  if (this->identifiers_.size () == 0)
-    this->identifiers_.size (2);
-
-  this->identifiers_[this->count_] = identifier;
-  ++this->count_;
-}
-
-void
-TAO_PSDL_Node::set_predefined_type (void)
-{
-  this->predefined_type_ = 1;
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Specification::TAO_PSDL_Specification (TAO_PSDL_Node *definition)
-  : definition_ (definition),
-    specification_ (0)
-{
-}
-
-TAO_PSDL_Specification::TAO_PSDL_Specification (TAO_PSDL_Node *definition,
-                                                TAO_PSDL_Node *specification)
-  : definition_ (definition),
-    specification_ (specification)
-{
-}
-
-TAO_PSDL_Specification::~TAO_PSDL_Specification (void)
-{
-  delete this->definition_;
-  delete this->specification_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Specification::definition (void) const
-{
-  return this->definition_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Specification::specification (void) const
-{
-  return this->specification_;
-}
-
-int
-TAO_PSDL_Specification::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  int result = visitor->visit_specification (this);
-
-  // The control goes back to psdl_tao now. So, put in the end stuff
-  // to the header file.
-
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
-  *ps_sh << "#if defined (__ACE_INLINE__)"; ps_sh->nl ();
-  *ps_sh << "#include \""
-         << TAO_PSDL_Scope::instance ()->get_stub_prefix ()
-         << "C.i\""; ps_sh->nl ();
-  *ps_sh << "#endif /* defined INLINE */"; ps_sh->nl ();
-
-  ps_sh->nl ();
-
-  *ps_sh << "#if defined(_MSC_VER)"; ps_sh->nl ();
-  *ps_sh << "#pragma warning(pop)"; ps_sh->nl ();
-  *ps_sh << "#endif /* _MSC_VER */"; ps_sh->nl ();
-
-  ps_sh->nl ();
-
-  *ps_sh << "#endif /* ifndef */"; ps_sh->nl ();
-
-  return result;
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Definition::TAO_PSDL_Definition (TAO_PSDL_Node *definition_type)
-  : definition_type_ (definition_type)
-{
-}
-
-TAO_PSDL_Definition::~TAO_PSDL_Definition (void)
-{
-  delete this->definition_type_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Definition::definition_type (void) const
-{
-  return this->definition_type_;
-}
-
-int
-TAO_PSDL_Definition::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_definition (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Module::TAO_PSDL_Module (int type,
-                                  TAO_PSDL_Node *identifier,
-                                  TAO_PSDL_Node *specification)
-  : identifier_ (identifier),
-    specification_ (specification)
-{
-  this->type_ = type;
-}
-
-TAO_PSDL_Module::~TAO_PSDL_Module (void)
-{
-  delete this->identifier_;
-  delete this->specification_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Module::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Module::specification (void) const
-{
-  return this->specification_;
-}
-
-void
-TAO_PSDL_Module::set_identifier_name (ACE_CString identifier_name)
-{
-  this->module_name_ = identifier_name;
-}
-
-ACE_CString
-TAO_PSDL_Module::identifier_name (void) const
-{
-  return this->module_name_;
-}
-
-int
-TAO_PSDL_Module::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_module (this);
-}
-
-/// ***************************************************************
-
-TAO_PSDL_Abstract_Storagetype::TAO_PSDL_Abstract_Storagetype (TAO_PSDL_Node *storagetype_dcl)
-  : storagetype_dcl_ (storagetype_dcl)
-{
-}
-
-TAO_PSDL_Abstract_Storagetype::~TAO_PSDL_Abstract_Storagetype (void)
-{
-  delete this->storagetype_dcl_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagetype::storagetype_dcl (void) const
-{
-  return this->storagetype_dcl_;
-}
-
-int
-TAO_PSDL_Abstract_Storagetype::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagetype (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagetype_Dcl::TAO_PSDL_Abstract_Storagetype_Dcl (
-     TAO_PSDL_Node *abs_storagetype_header)
-  : abs_storagetype_header_ (abs_storagetype_header),
-    abs_storagetype_body_ (0)
-{
-}
-
-TAO_PSDL_Abstract_Storagetype_Dcl::TAO_PSDL_Abstract_Storagetype_Dcl (
-     TAO_PSDL_Node *abs_storagetype_header,
-     TAO_PSDL_Node *abs_storagetype_body)
-  : abs_storagetype_header_ (abs_storagetype_header),
-    abs_storagetype_body_ (abs_storagetype_body)
-{
-}
-
-TAO_PSDL_Abstract_Storagetype_Dcl::~TAO_PSDL_Abstract_Storagetype_Dcl (void)
-{
-  delete this->abs_storagetype_header_;
-  if (this->abs_storagetype_body_ != 0)
-    delete this->abs_storagetype_body_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagetype_Dcl::abs_storagetype_header (void) const
-{
-  return this->abs_storagetype_header_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagetype_Dcl::abs_storagetype_body (void) const
-{
-  return this->abs_storagetype_body_;
-}
-
-int
-TAO_PSDL_Abstract_Storagetype_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagetype_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagetype_Fwd_Dcl::TAO_PSDL_Abstract_Storagetype_Fwd_Dcl (
-     TAO_PSDL_Node *identifier)
-  : identifier_ (identifier)
-{
-}
-
-TAO_PSDL_Abstract_Storagetype_Fwd_Dcl::~TAO_PSDL_Abstract_Storagetype_Fwd_Dcl (void)
-{
-  delete this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagetype_Fwd_Dcl::identifier (void) const
-{
-  return this->identifier_;
-}
-
-int
-TAO_PSDL_Abstract_Storagetype_Fwd_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagetype_fwd_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagetype_Header::TAO_PSDL_Abstract_Storagetype_Header (TAO_PSDL_Node *identifier)
-  : identifier_ (identifier)
-{
-}
-
-TAO_PSDL_Abstract_Storagetype_Header::TAO_PSDL_Abstract_Storagetype_Header (
-     TAO_PSDL_Node *identifier,
-     TAO_PSDL_Node *abs_storagetype_inh_spec)
-  : identifier_ (identifier),
-    abs_storagetype_inh_spec_ (abs_storagetype_inh_spec)
-{
-}
-
-TAO_PSDL_Abstract_Storagetype_Header::~TAO_PSDL_Abstract_Storagetype_Header (void)
-{
-  delete this->identifier_;
-  delete this->abs_storagetype_inh_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagetype_Header::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagetype_Header::abs_storagetype_inh_spec (void) const
-{
-  return this->abs_storagetype_inh_spec_;
-}
-
-int
-TAO_PSDL_Abstract_Storagetype_Header::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagetype_header (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagetype_Body::TAO_PSDL_Abstract_Storagetype_Body (TAO_PSDL_Node *abs_storagetype_member)
-  : abs_storagetype_member_ (abs_storagetype_member)
-{
-}
-
-TAO_PSDL_Abstract_Storagetype_Body::TAO_PSDL_Abstract_Storagetype_Body (
-     TAO_PSDL_Node *abs_storagetype_member,
-     TAO_PSDL_Node *abs_storagetype_body)
-  : abs_storagetype_member_ (abs_storagetype_member),
-    abs_storagetype_body_ (abs_storagetype_body)
-{
-}
-
-TAO_PSDL_Abstract_Storagetype_Body::~TAO_PSDL_Abstract_Storagetype_Body (void)
-{
-  delete this->abs_storagetype_member_;
-  delete this->abs_storagetype_body_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagetype_Body::abs_storagetype_member (void) const
-{
-  return this->abs_storagetype_member_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagetype_Body::abs_storagetype_body (void) const
-{
-  return this->abs_storagetype_body_;
-}
-
-int
-TAO_PSDL_Abstract_Storagetype_Body::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagetype_body (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagetype_Member::TAO_PSDL_Abstract_Storagetype_Member (TAO_PSDL_Node *declaration)
-  : declaration_ (declaration)
-{
-}
-
-TAO_PSDL_Abstract_Storagetype_Member::~TAO_PSDL_Abstract_Storagetype_Member (void)
-{
-  delete this->declaration_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagetype_Member::declaration (void) const
-{
-  return this->declaration_;
-}
-
-int
-TAO_PSDL_Abstract_Storagetype_Member::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagetype_member (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagetype_Inh_Spec::TAO_PSDL_Abstract_Storagetype_Inh_Spec (TAO_PSDL_Node *abs_storagetype_name)
-  : abs_storagetype_name_ (abs_storagetype_name)
-{
-}
-
-TAO_PSDL_Abstract_Storagetype_Inh_Spec::~TAO_PSDL_Abstract_Storagetype_Inh_Spec (void)
-{
-  delete this->abs_storagetype_name_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagetype_Inh_Spec::abs_storagetype_name (void) const
-{
-  return this->abs_storagetype_name_;
-}
-
-int
-TAO_PSDL_Abstract_Storagetype_Inh_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagetype_inh_spec (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagetype_Name::TAO_PSDL_Abstract_Storagetype_Name (TAO_PSDL_Node *scoped_name)
-  : scoped_name_ (scoped_name),
-    abs_storagetype_name_ (0)
-{
-}
-
-TAO_PSDL_Abstract_Storagetype_Name::TAO_PSDL_Abstract_Storagetype_Name (
-     TAO_PSDL_Node *scoped_name,
-     TAO_PSDL_Node *abs_storagetype_name)
-  : scoped_name_ (scoped_name),
-    abs_storagetype_name_ (abs_storagetype_name)
-{
-}
-
-TAO_PSDL_Abstract_Storagetype_Name::~TAO_PSDL_Abstract_Storagetype_Name (void)
-{
-  delete this->scoped_name_;
-  if (this->abs_storagetype_name_ != 0)
-    delete this->abs_storagetype_name_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagetype_Name::scoped_name (void) const
-{
-  return this->scoped_name_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagetype_Name::abs_storagetype_name (void) const
-{
-  return this->abs_storagetype_name_;
-}
-
-int
-TAO_PSDL_Abstract_Storagetype_Name::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagetype_name (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Psdl_State_Dcl::TAO_PSDL_Psdl_State_Dcl (TAO_PSDL_Node *key_word,
-                                                  TAO_PSDL_Node *psdl_state_type_spec,
-                                                  TAO_PSDL_Node *simple_declarator)
-  : key_word_ (key_word),
-    psdl_state_type_spec_ (psdl_state_type_spec),
-    simple_declarator_ (simple_declarator)
-{
-}
-
-TAO_PSDL_Psdl_State_Dcl::TAO_PSDL_Psdl_State_Dcl (TAO_PSDL_Node *psdl_state_type_spec,
-                                                  TAO_PSDL_Node *simple_declarator)
-  : key_word_ (0),
-    psdl_state_type_spec_ (psdl_state_type_spec),
-    simple_declarator_ (simple_declarator)
-{
-}
-
-TAO_PSDL_Psdl_State_Dcl::~TAO_PSDL_Psdl_State_Dcl (void)
-{
-  if (this->key_word_ != 0)
-    delete this->key_word_;
-  delete this->psdl_state_type_spec_;
-  delete this->simple_declarator_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Psdl_State_Dcl::key_word (void) const
-{
-  return this->key_word_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Psdl_State_Dcl::psdl_state_type_spec (void) const
-{
-  return this->psdl_state_type_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Psdl_State_Dcl::simple_declarator (void) const
-{
-  return this->simple_declarator_;
-}
-
-int
-TAO_PSDL_Psdl_State_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_psdl_state_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Psdl_State_Type_Spec::TAO_PSDL_Psdl_State_Type_Spec (TAO_PSDL_Node *type_spec)
-  : type_spec_ (type_spec)
-{
-}
-
-TAO_PSDL_Psdl_State_Type_Spec::~TAO_PSDL_Psdl_State_Type_Spec (void)
-{
-  delete this->type_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Psdl_State_Type_Spec::type_spec (void) const
-{
-  return this->type_spec_;
-}
-
-int
-TAO_PSDL_Psdl_State_Type_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_psdl_state_type_spec (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagetype_Ref_Type::TAO_PSDL_Abstract_Storagetype_Ref_Type  (TAO_PSDL_Node *key_word,
-  TAO_PSDL_Node *abs_storagetype_name)
-  : key_word_ (key_word),
-    abs_storagetype_name_ (abs_storagetype_name)
-{
-}
-
-TAO_PSDL_Abstract_Storagetype_Ref_Type::TAO_PSDL_Abstract_Storagetype_Ref_Type (TAO_PSDL_Node *abs_storagetype_name)
-  : key_word_ (0),
-    abs_storagetype_name_ (abs_storagetype_name)
-{
-}
-
-TAO_PSDL_Abstract_Storagetype_Ref_Type::~TAO_PSDL_Abstract_Storagetype_Ref_Type (void)
-{
-  if (this->key_word_ != 0)
-    delete this->key_word_;
-  delete this->abs_storagetype_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagetype_Ref_Type::key_word (void) const
-{
-  return this->key_word_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagetype_Ref_Type::abs_storagetype_name (void) const
-{
-  return this->abs_storagetype_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Abstract_Storagetype_Ref_Type::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagetype_ref_type (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagehome::TAO_PSDL_Abstract_Storagehome (TAO_PSDL_Node *abs_storagehome_dcl)
-  : abs_storagehome_dcl_ (abs_storagehome_dcl)
-{
-}
-
-TAO_PSDL_Abstract_Storagehome::~TAO_PSDL_Abstract_Storagehome (void)
-{
-  delete this->abs_storagehome_dcl_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagehome::abs_storagehome_dcl (void) const
-{
-  return this->abs_storagehome_dcl_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Abstract_Storagehome::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagehome (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagehome_Fwd_Dcl::TAO_PSDL_Abstract_Storagehome_Fwd_Dcl (
-     TAO_PSDL_Node *identifier)
-  : identifier_ (identifier)
-{
-}
-
-TAO_PSDL_Abstract_Storagehome_Fwd_Dcl::~TAO_PSDL_Abstract_Storagehome_Fwd_Dcl (void)
-{
-  delete this->identifier_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagehome_Fwd_Dcl::identifier (void) const
-{
-  return this->identifier_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Abstract_Storagehome_Fwd_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagehome_fwd_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagehome_Dcl::TAO_PSDL_Abstract_Storagehome_Dcl (TAO_PSDL_Node *abs_storagehome_header)
-  : abs_storagehome_header_ (abs_storagehome_header),
-    abs_storagehome_body_ (0)
-{
-}
-
-TAO_PSDL_Abstract_Storagehome_Dcl::TAO_PSDL_Abstract_Storagehome_Dcl (TAO_PSDL_Node *abs_storagehome_header,
-                                   TAO_PSDL_Node *abs_storagehome_body)
-  : abs_storagehome_header_ (abs_storagehome_header),
-    abs_storagehome_body_ (abs_storagehome_body)
-{
-}
-
-TAO_PSDL_Abstract_Storagehome_Dcl::~TAO_PSDL_Abstract_Storagehome_Dcl (void)
-{
-  delete this->abs_storagehome_header_;
-  delete this->abs_storagehome_body_;
-}
-
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagehome_Dcl::abs_storagehome_header (void) const
-{
-  return this->abs_storagehome_header_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagehome_Dcl::abs_storagehome_body (void) const
-{
- return this->abs_storagehome_body_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Abstract_Storagehome_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagehome_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagehome_Header::TAO_PSDL_Abstract_Storagehome_Header (TAO_PSDL_Node *identifier,
-                                      TAO_PSDL_Node *abs_storagetype_name)
-  : identifier_ (identifier),
-    abs_storagetype_name_ (abs_storagetype_name),
-    abs_storagehome_inh_spec_ (0)
-{
-}
-
-TAO_PSDL_Abstract_Storagehome_Header::TAO_PSDL_Abstract_Storagehome_Header (TAO_PSDL_Node *identifier,
-                                      TAO_PSDL_Node *abs_storagetype_name,
-                                      TAO_PSDL_Node *abs_storagehome_inh_spec)
-  : identifier_ (identifier),
-    abs_storagetype_name_ (abs_storagetype_name),
-    abs_storagehome_inh_spec_ (abs_storagehome_inh_spec)
-{
-}
-
-TAO_PSDL_Abstract_Storagehome_Header::~TAO_PSDL_Abstract_Storagehome_Header (void)
-{
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagehome_Header::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagehome_Header::abs_storagetype_name (void) const
-{
-  return this->abs_storagetype_name_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagehome_Header::abs_storagehome_inh_spec (void) const
-{
-  return this->abs_storagehome_inh_spec_;
-}
-
-
-/// = The Node methods.
-int
-TAO_PSDL_Abstract_Storagehome_Header::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagehome_header (this);
-}
-
-/// ****************************************************************
-
-
-TAO_PSDL_Abstract_Storagehome_Body::TAO_PSDL_Abstract_Storagehome_Body ()
-{
-}
-
-TAO_PSDL_Abstract_Storagehome_Body::TAO_PSDL_Abstract_Storagehome_Body (TAO_PSDL_Node *abs_storagehome_member)
-  : abs_storagehome_member_ (abs_storagehome_member)
-{
-}
-
-TAO_PSDL_Abstract_Storagehome_Body::TAO_PSDL_Abstract_Storagehome_Body (TAO_PSDL_Node *abs_storagehome_member,
-                                    TAO_PSDL_Node *abs_storagehome_body)
-  : abs_storagehome_member_ (abs_storagehome_member),
-    abs_storagehome_body_ (abs_storagehome_body)
-{
-}
-
-TAO_PSDL_Abstract_Storagehome_Body::~TAO_PSDL_Abstract_Storagehome_Body (void)
-{
-  delete this->abs_storagehome_member_;
-
-  if (this->abs_storagehome_body_ != 0)
-    delete this->abs_storagehome_body_;
-}
-
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagehome_Body::abs_storagehome_member (void) const
-{
-  return this->abs_storagehome_member_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagehome_Body::abs_storagehome_body (void) const
-{
-  return this->abs_storagehome_body_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Abstract_Storagehome_Body::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagehome_body (this);
-}
-
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagehome_Member::TAO_PSDL_Abstract_Storagehome_Member (TAO_PSDL_Node *declaration_type)
-  : declaration_type_ (declaration_type)
-{
-}
-
-TAO_PSDL_Abstract_Storagehome_Member::~TAO_PSDL_Abstract_Storagehome_Member (void)
-{
-  delete this->declaration_type_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagehome_Member::declaration_type (void) const
-{
-  return this->declaration_type_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Abstract_Storagehome_Member::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagehome_member (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagehome_Inh_Spec::TAO_PSDL_Abstract_Storagehome_Inh_Spec (TAO_PSDL_Node *abs_storagehome_name)
-  : abs_storagehome_name_ (abs_storagehome_name)
-{
-}
-
-TAO_PSDL_Abstract_Storagehome_Inh_Spec::~TAO_PSDL_Abstract_Storagehome_Inh_Spec (void)
-{
-  delete this->abs_storagehome_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagehome_Inh_Spec::abs_storagehome_name (void) const
-{
-  return this->abs_storagehome_name_;
-}
-
-
-/// = The Node methods.
-int
-TAO_PSDL_Abstract_Storagehome_Inh_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagehome_inh_spec (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Abstract_Storagehome_Name::TAO_PSDL_Abstract_Storagehome_Name (TAO_PSDL_Node *scoped_name)
-  : scoped_name_ (scoped_name),
-    abs_storagehome_name_ (0)
-{
-}
-
-TAO_PSDL_Abstract_Storagehome_Name::TAO_PSDL_Abstract_Storagehome_Name (TAO_PSDL_Node *scoped_name,
-                                    TAO_PSDL_Node *abs_storagehome_name)
-  : scoped_name_ (scoped_name),
-    abs_storagehome_name_ (abs_storagehome_name)
-{
-}
-
-TAO_PSDL_Abstract_Storagehome_Name::~TAO_PSDL_Abstract_Storagehome_Name (void)
-{
-  delete this->scoped_name_;
-  if (this->abs_storagehome_name_ != 0)
-    delete this->abs_storagehome_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagehome_Name::scoped_name (void) const
-{
-  return this->scoped_name_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Abstract_Storagehome_Name::abs_storagehome_name (void) const
-{
-  return this->abs_storagehome_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Abstract_Storagehome_Name::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_abstract_storagehome_name (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Local_Op_Dcl::TAO_PSDL_Local_Op_Dcl (TAO_PSDL_Node *op_type_spec,
-                                              TAO_PSDL_Node *identifier,
-                                              TAO_PSDL_Node *parameter_dcls,
-                                              TAO_PSDL_Node *raises_expr)
-  : op_type_spec_ (op_type_spec),
-    identifier_ (identifier),
-    parameter_dcls_ (parameter_dcls),
-    raises_expr_ (raises_expr)
-{
-}
-
-TAO_PSDL_Local_Op_Dcl::TAO_PSDL_Local_Op_Dcl (TAO_PSDL_Node *op_type_spec,
-                                              TAO_PSDL_Node *identifier,
-                                              TAO_PSDL_Node *parameter_dcls)
-  : op_type_spec_ (op_type_spec),
-    identifier_ (identifier),
-    parameter_dcls_ (parameter_dcls),
-    raises_expr_ (0)
-{
-}
-
-TAO_PSDL_Local_Op_Dcl::~TAO_PSDL_Local_Op_Dcl (void)
-{
-  delete this->op_type_spec_;
-  delete this->identifier_;
-  delete this->parameter_dcls_;
-  if (this->raises_expr_ != 0)
-    delete this->raises_expr_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Local_Op_Dcl::op_type_spec (void) const
-{
-  return this->op_type_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Local_Op_Dcl::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Local_Op_Dcl::parameter_dcls (void) const
-{
-  return this->parameter_dcls_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Local_Op_Dcl::raises_expr (void) const
-{
-  return this->raises_expr_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Local_Op_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_local_op_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Key_Dcl::TAO_PSDL_Key_Dcl (TAO_PSDL_Node *identifier,
-                                    TAO_PSDL_Node *simple_declarator)
-  : identifier_ (identifier),
-    simple_declarator_ (simple_declarator)
-{
-}
-
-TAO_PSDL_Key_Dcl::TAO_PSDL_Key_Dcl (TAO_PSDL_Node *identifier)
-  : identifier_ (identifier),
-    simple_declarator_ (0)
-{
-}
-
-TAO_PSDL_Key_Dcl::~TAO_PSDL_Key_Dcl (void)
-{
-  delete this->identifier_;
-  if (this->simple_declarator_ != 0)
-    delete this->simple_declarator_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Key_Dcl::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Key_Dcl::simple_declarator (void) const
-{
-  return this->simple_declarator_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Key_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_key_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Catalog::TAO_PSDL_Catalog (TAO_PSDL_Node *identifier)
-  : identifier_ (identifier),
-    catalog_inh_spec_ (0),
-    catalog_body_ (0)
-{
-}
-
-TAO_PSDL_Catalog::TAO_PSDL_Catalog (TAO_PSDL_Node *identifier,
-                                    TAO_PSDL_Node *catalog_inh_spec,
-                                    TAO_PSDL_Node *catalog_body)
-  :identifier_ (identifier),
-   catalog_inh_spec_ (catalog_inh_spec),
-   catalog_body_ (catalog_body)
-{
-}
-
-TAO_PSDL_Catalog::TAO_PSDL_Catalog (TAO_PSDL_Node *identifier,
-                                    TAO_PSDL_Node *catalog_body)
-  : identifier_ (identifier),
-    catalog_inh_spec_ (0),
-    catalog_body_ (catalog_body)
-{
-}
-
-TAO_PSDL_Catalog::~TAO_PSDL_Catalog (void)
-{
-  delete this->identifier_;
-
-  if (this->catalog_inh_spec_ != 0)
-  delete this->catalog_inh_spec_;
-
-  delete this->catalog_body_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Catalog::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Catalog::catalog_inh_spec (void) const
-{
-  return this->catalog_inh_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Catalog::catalog_body (void) const
-{
-  return this->catalog_body_;
-}
-
-  /// = The Node methods.
-int
-TAO_PSDL_Catalog::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_catalog (this);
-}
-
-/// ****************************************************************
-
-
-TAO_PSDL_Catalog_Inh_Spec::TAO_PSDL_Catalog_Inh_Spec (TAO_PSDL_Node *catalog_name)
-  : catalog_name_ (catalog_name)
-{
-}
-
-TAO_PSDL_Catalog_Inh_Spec::~TAO_PSDL_Catalog_Inh_Spec (void)
-{
-  delete this->catalog_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Catalog_Inh_Spec::catalog_name (void) const
-{
-  return this->catalog_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Catalog_Inh_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_catalog_inh_spec (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Catalog_Name::TAO_PSDL_Catalog_Name (TAO_PSDL_Node *scoped_name)
-  : scoped_name_ (scoped_name),
-    catalog_name_ (0)
-{
-}
-
-TAO_PSDL_Catalog_Name::TAO_PSDL_Catalog_Name (TAO_PSDL_Node *scoped_name,
-                                              TAO_PSDL_Node *catalog_name)
-  : scoped_name_ (scoped_name),
-    catalog_name_ (catalog_name)
-{
-}
-
-TAO_PSDL_Catalog_Name::~TAO_PSDL_Catalog_Name (void)
-{
-  delete this->scoped_name_;
-  if (this->catalog_name_ != 0)
-    delete this->catalog_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Catalog_Name::scoped_name (void) const
-{
-  return this->scoped_name_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Catalog_Name::catalog_name (void) const
-{
-  return this->catalog_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Catalog_Name::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_catalog_name (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Catalog_Body::TAO_PSDL_Catalog_Body ()
-  : catalog_member_ (0),
-    catalog_body_ (0)
-{
-}
-
-TAO_PSDL_Catalog_Body::TAO_PSDL_Catalog_Body (TAO_PSDL_Node *catalog_member)
-  : catalog_member_ (catalog_member)
-{
-}
-
-TAO_PSDL_Catalog_Body::TAO_PSDL_Catalog_Body (TAO_PSDL_Node *catalog_member,
-                                              TAO_PSDL_Node *catalog_body)
-  : catalog_member_ (catalog_member),
-    catalog_body_ (catalog_body)
-{
-}
-
-TAO_PSDL_Catalog_Body::~TAO_PSDL_Catalog_Body (void)
-{
-  if (this->catalog_member_ != 0)
-    delete this->catalog_member_;
-
-  if (this->catalog_body_ != 0)
-    delete this->catalog_body_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Catalog_Body::catalog_member (void) const
-{
-  return this->catalog_member_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Catalog_Body::catalog_body (void) const
-{
-  return this->catalog_body_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Catalog_Body::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_catalog_body (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Catalog_Member::TAO_PSDL_Catalog_Member (TAO_PSDL_Node *declaration)
-  : declaration_ (declaration)
-{
-}
-
-TAO_PSDL_Catalog_Member::~TAO_PSDL_Catalog_Member (void)
-{
-  delete this->declaration_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Catalog_Member::declaration (void) const
-{
-  return this->declaration_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Catalog_Member::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_catalog_member (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Provides_Dcl::TAO_PSDL_Provides_Dcl (
-     TAO_PSDL_Node *abs_storagehome_name,
-     TAO_PSDL_Node *simple_declarator)
-  : abs_storagehome_name_ (abs_storagehome_name),
-    simple_declarator_ (simple_declarator)
-{
-}
-
-TAO_PSDL_Provides_Dcl::~TAO_PSDL_Provides_Dcl (void)
-{
-  delete this->abs_storagehome_name_;
-  delete this->simple_declarator_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Provides_Dcl::abs_storagehome_name (void) const
-{
-  return this->abs_storagehome_name_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Provides_Dcl::simple_declarator (void) const
-{
-  return this->simple_declarator_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Provides_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_provides_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Storagetype::TAO_PSDL_Storagetype (TAO_PSDL_Node *declaration)
-  : declaration_ (declaration)
-{
-}
-
-TAO_PSDL_Storagetype::~TAO_PSDL_Storagetype (void)
-{
-  delete this->declaration_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagetype::declaration (void) const
-{
-  return this->declaration_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagetype::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagetype (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Storagetype_Dcl::TAO_PSDL_Storagetype_Dcl (TAO_PSDL_Node *storagetype_header)
-  : storagetype_header_ (storagetype_header),
-    storagetype_body_ (0)
-{
-}
-
-TAO_PSDL_Storagetype_Dcl::TAO_PSDL_Storagetype_Dcl (
-     TAO_PSDL_Node *storagetype_header,
-     TAO_PSDL_Node *storagetype_body)
-  : storagetype_header_ (storagetype_header),
-    storagetype_body_ (storagetype_body)
-{
-}
-
-TAO_PSDL_Storagetype_Dcl::~TAO_PSDL_Storagetype_Dcl (void)
-{
-  delete this->storagetype_header_;
-  if (this->storagetype_body_ != 0)
-    delete this->storagetype_body_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagetype_Dcl::storagetype_header (void) const
-{
-  return this->storagetype_header_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Storagetype_Dcl::storagetype_body (void) const
-{
-  return this->storagetype_body_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagetype_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagetype_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Storagetype_Fwd_Dcl::TAO_PSDL_Storagetype_Fwd_Dcl (TAO_PSDL_Node *identifier)
-  : identifier_ (identifier)
-{
-}
-
-TAO_PSDL_Storagetype_Fwd_Dcl::~TAO_PSDL_Storagetype_Fwd_Dcl (void)
-{
-  delete this->identifier_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagetype_Fwd_Dcl::identifier (void) const
-{
-  return this->identifier_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagetype_Fwd_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagetype_fwd_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Storagetype_Header::TAO_PSDL_Storagetype_Header (
-     TAO_PSDL_Node *identifier,
-     TAO_PSDL_Node *storagetype_inh_spec,
-     TAO_PSDL_Node *storagetype_impl_spec)
-  : identifier_ (identifier),
-    storagetype_inh_spec_ (storagetype_inh_spec),
-    storagetype_impl_spec_ (storagetype_impl_spec)
-{
-}
-
-TAO_PSDL_Storagetype_Header::TAO_PSDL_Storagetype_Header (
-     TAO_PSDL_Node *identifier,
-     TAO_PSDL_Node *storagetype_inh_spec)
-  : identifier_ (identifier),
-    storagetype_inh_spec_ (storagetype_inh_spec),
-    storagetype_impl_spec_ (0)
-{
-}
-
-TAO_PSDL_Storagetype_Header::TAO_PSDL_Storagetype_Header (
-     TAO_PSDL_Node *identifier)
-  : identifier_ (identifier),
-    storagetype_inh_spec_ (0),
-    storagetype_impl_spec_ (0)
-{
-}
-
-TAO_PSDL_Storagetype_Header::~TAO_PSDL_Storagetype_Header (void)
-{
-  delete this->identifier_;
-  if (this->storagetype_inh_spec_ != 0)
-    delete this->storagetype_inh_spec_;
-
-  if (this->storagetype_impl_spec_ != 0)
-    delete this->storagetype_impl_spec_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagetype_Header::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Storagetype_Header::storagetype_inh_spec (void) const
-{
-  return this->storagetype_inh_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Storagetype_Header::storagetype_impl_spec (void) const
-{
-  return this->storagetype_impl_spec_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagetype_Header::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagetype_header (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Storagetype_Body::TAO_PSDL_Storagetype_Body ()
-  : storagetype_member_ (0),
-    storagetype_body_ (0)
-{
-}
-
-TAO_PSDL_Storagetype_Body::TAO_PSDL_Storagetype_Body (
-     TAO_PSDL_Node *storagetype_member)
-  : storagetype_member_ (storagetype_member),
-    storagetype_body_ (0)
-{
-}
-
-TAO_PSDL_Storagetype_Body::TAO_PSDL_Storagetype_Body (
-     TAO_PSDL_Node *storagetype_member,
-     TAO_PSDL_Node *storagetype_body)
-  : storagetype_member_ (storagetype_member),
-    storagetype_body_ (storagetype_body)
-{
-}
-
-TAO_PSDL_Storagetype_Body::~TAO_PSDL_Storagetype_Body (void)
-{
-  if (this->storagetype_member_ != 0)
-    delete this->storagetype_member_;
-  if (this->storagetype_body_ != 0)
-    delete this->storagetype_body_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagetype_Body::storagetype_member (void) const
-{
-  return this->storagetype_member_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Storagetype_Body::storagetype_body (void) const
-{
-  return this->storagetype_body_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagetype_Body::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagetype_body (this);
-}
-
-/// ****************************************************************
-
-
-TAO_PSDL_Storagetype_Member::TAO_PSDL_Storagetype_Member (TAO_PSDL_Node *declaration)
-  : declaration_ (declaration)
-{
-}
-
-TAO_PSDL_Storagetype_Member::~TAO_PSDL_Storagetype_Member (void)
-{
-  delete this->declaration_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagetype_Member::declaration (void) const
-{
-  return this->declaration_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagetype_Member::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagetype_member (this);
-}
-
-/// ****************************************************************
-
-
-TAO_PSDL_Storagetype_Inh_Spec::TAO_PSDL_Storagetype_Inh_Spec (TAO_PSDL_Node *storagetype_name)
-  : storagetype_name_ (storagetype_name)
-{
-}
-
-TAO_PSDL_Storagetype_Inh_Spec::~TAO_PSDL_Storagetype_Inh_Spec (void)
-{
-  delete this->storagetype_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagetype_Inh_Spec::storagetype_name (void) const
-{
-  return this->storagetype_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagetype_Inh_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagetype_inh_spec (this);
-}
-
-/// ****************************************************************
-
-
-TAO_PSDL_Storagetype_Name::TAO_PSDL_Storagetype_Name (TAO_PSDL_Node *scoped_name)
-  : scoped_name_ (scoped_name)
-{
-}
-
-TAO_PSDL_Storagetype_Name::~TAO_PSDL_Storagetype_Name (void)
-{
-  delete this->scoped_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagetype_Name::scoped_name (void) const
-{
-  return this->scoped_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagetype_Name::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagetype_name (this);
-}
-
-/// ****************************************************************
-
-
-TAO_PSDL_Storagetype_Impl_Spec::TAO_PSDL_Storagetype_Impl_Spec (TAO_PSDL_Node *abstract_storagetype_name)
-  : abstract_storagetype_name_ (abstract_storagetype_name)
-{
-}
-
-TAO_PSDL_Storagetype_Impl_Spec::~TAO_PSDL_Storagetype_Impl_Spec (void)
-{
-  delete this->abstract_storagetype_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagetype_Impl_Spec::abstract_storagetype_name (void) const
-{
-  return this->abstract_storagetype_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagetype_Impl_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagetype_impl_spec (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Storagetype_Ref_Type::TAO_PSDL_Storagetype_Ref_Type (TAO_PSDL_Node *storagetype_name)
-  : storagetype_name_ (storagetype_name)
-{
-}
-
-TAO_PSDL_Storagetype_Ref_Type::~TAO_PSDL_Storagetype_Ref_Type (void)
-{
-  delete this->storagetype_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagetype_Ref_Type::storagetype_name (void) const
-{
-  return this->storagetype_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagetype_Ref_Type::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagetype_ref_type (this);
-}
-
-/// ****************************************************************
-TAO_PSDL_Storagehome_Scope::TAO_PSDL_Storagehome_Scope (TAO_PSDL_Node *storagehome_name)
-  : storagehome_name_ (storagehome_name)
-{
-}
-
-TAO_PSDL_Storagehome_Scope::~TAO_PSDL_Storagehome_Scope (void)
-{
-  delete this->storagehome_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagehome_Scope::storagehome_name (void) const
-{
-  return this->storagehome_name_;
-}
-
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagehome_Scope::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagehome_scope (this);
-}
-
-/// ****************************************************************
-
-
-TAO_PSDL_Store_Directive::TAO_PSDL_Store_Directive (
-     TAO_PSDL_Node *simple_declarator,
-     TAO_PSDL_Node *psdl_concrete_state_type,
-     TAO_PSDL_Node *storagehome_scope)
-  : simple_declarator_ (simple_declarator),
-    psdl_concrete_state_type_ (psdl_concrete_state_type),
-    storagehome_scope_ (storagehome_scope)
-{
-}
-
-TAO_PSDL_Store_Directive::TAO_PSDL_Store_Directive (
-     TAO_PSDL_Node *simple_declarator,
-     TAO_PSDL_Node *psdl_concrete_state_type)
-  : simple_declarator_ (simple_declarator),
-    psdl_concrete_state_type_ (psdl_concrete_state_type),
-    storagehome_scope_ (0)
-{
-}
-
-TAO_PSDL_Store_Directive::~TAO_PSDL_Store_Directive (void)
-{
-  delete this->simple_declarator_;
-  delete this->psdl_concrete_state_type_;
-
-  if (this->storagehome_scope_ != 0)
-    delete this->storagehome_scope_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Store_Directive::simple_declarator (void) const
-{
-  return this->simple_declarator_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Store_Directive::psdl_concrete_state_type (void) const
-{
-  return this->psdl_concrete_state_type_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Store_Directive::storagehome_scope (void) const
-{
-  return this->storagehome_scope_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Store_Directive::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_store_directive (this);
-}
-
-/// ****************************************************************
-TAO_PSDL_Psdl_Concrete_State_Type::TAO_PSDL_Psdl_Concrete_State_Type (TAO_PSDL_Node *storagetype)
-  : storagetype_ (storagetype)
-{
-}
-
-TAO_PSDL_Psdl_Concrete_State_Type::~TAO_PSDL_Psdl_Concrete_State_Type (void)
-{
-  delete this->storagetype_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Psdl_Concrete_State_Type::storagetype (void) const
-{
-  return this->storagetype_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Psdl_Concrete_State_Type::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_psdl_concrete_state_type (this);
-}
-
-/// ****************************************************************
-TAO_PSDL_Ref_Rep_Directive::TAO_PSDL_Ref_Rep_Directive (TAO_PSDL_Node *simple_declarator)
-  : simple_declarator_ (simple_declarator)
-{
-}
-
-TAO_PSDL_Ref_Rep_Directive::~TAO_PSDL_Ref_Rep_Directive (void)
-{
-  delete this->simple_declarator_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Ref_Rep_Directive::simple_declarator (void) const
-{
-  return this->simple_declarator_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Ref_Rep_Directive::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_ref_rep_directive (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Storagehome::TAO_PSDL_Storagehome (TAO_PSDL_Node *storagehome_header)
-  : storagehome_header_ (storagehome_header),
-    storagehome_body_ (0)
-{
-}
-
-TAO_PSDL_Storagehome::TAO_PSDL_Storagehome (TAO_PSDL_Node *storagehome_header,
-                                             TAO_PSDL_Node *storagehome_body)
-  : storagehome_header_ (storagehome_header),
-    storagehome_body_ (storagehome_body)
-{
-}
-
-TAO_PSDL_Storagehome::~TAO_PSDL_Storagehome (void)
-{
-  delete this->storagehome_header_;
-  delete this->storagehome_body_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagehome::storagehome_header (void) const
-{
-  return this->storagehome_header_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Storagehome::storagehome_body (void) const
-{
-  return this->storagehome_body_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagehome::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagehome (this);
-}
-
-/// ****************************************************************
-TAO_PSDL_Storagehome_Header::TAO_PSDL_Storagehome_Header (
-      TAO_PSDL_Node *identifier,
-      TAO_PSDL_Node *storagetype_name,
-      TAO_PSDL_Node *storagehome_inh_spec,
-      TAO_PSDL_Node *storagehome_impl_spec)
-  : identifier_ (identifier),
-    storagetype_name_ (storagetype_name),
-    storagehome_inh_spec_ (storagehome_inh_spec),
-    storagehome_impl_spec_ (storagehome_impl_spec)
-{
-}
-
-TAO_PSDL_Storagehome_Header::TAO_PSDL_Storagehome_Header (
-      TAO_PSDL_Node *identifier,
-      TAO_PSDL_Node *storagetype_name,
-      TAO_PSDL_Node *storagehome_inh_spec)
-  : identifier_ (identifier),
-    storagetype_name_ (storagetype_name),
-    storagehome_inh_spec_ (storagehome_inh_spec),
-    storagehome_impl_spec_ (0)
-{
-}
-
-TAO_PSDL_Storagehome_Header::TAO_PSDL_Storagehome_Header (
-      TAO_PSDL_Node *identifier,
-      TAO_PSDL_Node *storagetype_name)
-  : identifier_ (identifier),
-    storagetype_name_ (storagetype_name),
-    storagehome_inh_spec_ (0),
-    storagehome_impl_spec_ (0)
-{
-}
-
-TAO_PSDL_Storagehome_Header::~TAO_PSDL_Storagehome_Header (void)
-{
-  delete this->identifier_;
-  delete this->storagetype_name_;
-  delete this->storagehome_inh_spec_;
-  delete this->storagehome_impl_spec_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagehome_Header::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Storagehome_Header::storagetype_name (void) const
-{
-  return this->storagetype_name_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Storagehome_Header::storagehome_inh_spec (void) const
-{
-  return this->storagehome_inh_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Storagehome_Header::storagehome_impl_spec (void) const
-{
-  return this->storagehome_impl_spec_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagehome_Header::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagehome_header (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Storagehome_Body::TAO_PSDL_Storagehome_Body ()
-  : storagehome_member_ (0),
-    storagehome_body_ (0)
-{
-}
-
-TAO_PSDL_Storagehome_Body::TAO_PSDL_Storagehome_Body (
-      TAO_PSDL_Node *storagehome_member)
-  : storagehome_member_ (storagehome_member),
-    storagehome_body_ (0)
-{
-}
-
-TAO_PSDL_Storagehome_Body::TAO_PSDL_Storagehome_Body (
-     TAO_PSDL_Node *storagehome_member,
-     TAO_PSDL_Node *storagehome_body)
-  : storagehome_member_ (storagehome_member),
-    storagehome_body_ (storagehome_body)
-{
-}
-
-TAO_PSDL_Storagehome_Body::~TAO_PSDL_Storagehome_Body (void)
-{
-  delete this->storagehome_member_;
-  delete this->storagehome_body_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagehome_Body::storagehome_member (void) const
-{
-  return this->storagehome_member_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Storagehome_Body::storagehome_body (void) const
-{
-  return this->storagehome_body_;
-}
-
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagehome_Body::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagehome_body  (this);
-}
-
-/// ****************************************************************
-
-
-TAO_PSDL_Storagehome_Member::TAO_PSDL_Storagehome_Member (
-      TAO_PSDL_Node *key_dcl)
-  : key_dcl_ (key_dcl)
-{
-}
-
-TAO_PSDL_Storagehome_Member::~TAO_PSDL_Storagehome_Member (void)
-{
-  delete this->key_dcl_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagehome_Member::key_dcl (void) const
-{
-  return this->key_dcl_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagehome_Member::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagehome_member  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Storagehome_Inh_Spec::TAO_PSDL_Storagehome_Inh_Spec (TAO_PSDL_Node *storagehome_name)
-  : storagehome_name_ (storagehome_name)
-{
-}
-
-TAO_PSDL_Storagehome_Inh_Spec::~TAO_PSDL_Storagehome_Inh_Spec (void)
-{
-  delete this->storagehome_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagehome_Inh_Spec::storagehome_name (void) const
-{
-  return this->storagehome_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagehome_Inh_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagehome_inh_spec  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Storagehome_Name::TAO_PSDL_Storagehome_Name (TAO_PSDL_Node *scoped_name)
-  : scoped_name_ (scoped_name)
-{
-}
-
-TAO_PSDL_Storagehome_Name::~TAO_PSDL_Storagehome_Name (void)
-{
-  delete this->scoped_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagehome_Name::scoped_name (void) const
-{
-  return this->scoped_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagehome_Name::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagehome_name (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Storagehome_Impl_Spec::TAO_PSDL_Storagehome_Impl_Spec (
-     TAO_PSDL_Node *abstract_storagehome_name)
-  : abstract_storagehome_name_ (abstract_storagehome_name)
-{
-}
-
-TAO_PSDL_Storagehome_Impl_Spec::~TAO_PSDL_Storagehome_Impl_Spec (void)
-{
-  delete this->abstract_storagehome_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Storagehome_Impl_Spec::abstract_storagehome_name (void) const
-{
-  return this->abstract_storagehome_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Storagehome_Impl_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_storagehome_impl_spec (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Primary_Key_Dcl::TAO_PSDL_Primary_Key_Dcl ()
-  : identifier_ (0)
-{
-}
-
-TAO_PSDL_Primary_Key_Dcl::TAO_PSDL_Primary_Key_Dcl (TAO_PSDL_Node *identifier)
-  : identifier_ (identifier)
-{
-}
-
-TAO_PSDL_Primary_Key_Dcl::~TAO_PSDL_Primary_Key_Dcl (void)
-{
-  delete this->identifier_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Primary_Key_Dcl::identifier (void) const
-{
-  return this->identifier_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Primary_Key_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_primary_key_dcl  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Identifier::TAO_PSDL_Identifier (char *value)
-  : value_ (CORBA::string_dup (value)),
-    value_type_ (0)
-{
-  TAO_PSDL_Scope::instance ()->save_identifier (value);
-}
-
-TAO_PSDL_Identifier::TAO_PSDL_Identifier (int value_type)
-  : value_type_ (value_type)
-{
-}
-
-TAO_PSDL_Identifier::~TAO_PSDL_Identifier (void)
-{
-  if (this->value_ != 0)
-    delete this->value_;
-}
-
-/// Get the value
-char *
-TAO_PSDL_Identifier::value (void) const
-{
-  return this->value_;
-}
-
-int
-TAO_PSDL_Identifier::value_type (void) const
-{
-  return this->value_type_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Identifier::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_identifier  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Type_Dcl::TAO_PSDL_Type_Dcl (TAO_PSDL_Node *type_of_type_dcl)
-  : key_word_ (0),
-    type_of_type_dcl_ (type_of_type_dcl)
-{
-}
-
-TAO_PSDL_Type_Dcl::TAO_PSDL_Type_Dcl (int key_word,
-                                      TAO_PSDL_Node *type_of_type_dcl)
-  : key_word_ (key_word),
-    type_of_type_dcl_ (type_of_type_dcl)
-{
-  this->type_ = key_word;
-
-  this->psdl_scope_visitor ()->visit_type_dcl (this);
-
-  // @@ why this if loop
-  if (ACE_OS::strcmp (this->identifiers_[0].c_str (), "") == 0)
-    {
-      this->identifiers_[0] = this->psdl_scope_visitor ()->get_scoped_type ();
-    }
-
-  if (key_word != TAO_PSDL_TYPEDEF)
-    {
-      this->psdl_scope ()->check_name_in_scope (this->identifiers_[0],
-                                                this->psdl_scope ());
-    }
-
-  this->psdl_scope ()->add_typedef (this->identifiers_[1],
-                                    this->identifiers_[0]);
-
-  // We dont these values of the identifiers anymore as they have been
-  // added to the corresponding AST. So, set count to 'zero' again.
-  this->count_ = 0;
-
-}
-
-TAO_PSDL_Type_Dcl::~TAO_PSDL_Type_Dcl (void)
-{
-  delete this->type_of_type_dcl_;
-}
-
-/// Get the value
-int
-TAO_PSDL_Type_Dcl::key_word (void) const
-{
-  return this->key_word_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Type_Dcl::type_of_type_dcl (void) const
-{
-  return this->type_of_type_dcl_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Type_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_type_dcl  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Type_Declarator::TAO_PSDL_Type_Declarator (TAO_PSDL_Node *type_spec,
-                                                     TAO_PSDL_Node *declarators)
-  : type_spec_ (type_spec),
-    declarators_ (declarators)
-{
-}
-
-TAO_PSDL_Type_Declarator::~TAO_PSDL_Type_Declarator (void)
-{
-  delete this->type_spec_;
-  delete this->declarators_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Type_Declarator::type_spec (void) const
-{
-  return this->type_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Type_Declarator::declarators (void) const
-{
-  return this->declarators_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Type_Declarator::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_type_declarator  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Type_Spec::TAO_PSDL_Type_Spec (TAO_PSDL_Node *type_of_type_spec)
-  : type_of_type_spec_ (type_of_type_spec)
-{
-}
-
-TAO_PSDL_Type_Spec::~TAO_PSDL_Type_Spec (void)
-{
-  delete this->type_of_type_spec_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Type_Spec::type_of_type_spec (void) const
-{
-  return this->type_of_type_spec_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Type_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_type_spec  (this);
-}
-
-/// ****************************************************************
-TAO_PSDL_Simple_Type_Spec::TAO_PSDL_Simple_Type_Spec (TAO_PSDL_Node *type_of_simple_type_spec)
-  : type_of_simple_type_spec_ (type_of_simple_type_spec)
-{
-}
-
-TAO_PSDL_Simple_Type_Spec::~TAO_PSDL_Simple_Type_Spec (void)
-{
-  delete this->type_of_simple_type_spec_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Simple_Type_Spec::type_of_simple_type_spec (void) const
-{
-  return this->type_of_simple_type_spec_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Simple_Type_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_simple_type_spec  (this);
-}
-
-/// ****************************************************************
-TAO_PSDL_Base_Type_Spec::TAO_PSDL_Base_Type_Spec (
-     TAO_PSDL_Node *type_of_base_type_spec)
-  : type_of_base_type_spec_ (type_of_base_type_spec)
-{
-}
-
-TAO_PSDL_Base_Type_Spec::~TAO_PSDL_Base_Type_Spec (void)
-{
-  delete this->type_of_base_type_spec_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Base_Type_Spec::type_of_base_type_spec (void) const
-{
-  return this->type_of_base_type_spec_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Base_Type_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_base_type_spec  (this);
-}
-
-/// ****************************************************************
-TAO_PSDL_Template_Type_Spec::TAO_PSDL_Template_Type_Spec (
-     TAO_PSDL_Node *type_of_template_type_spec)
-  : type_of_template_type_spec_ (type_of_template_type_spec)
-{
-}
-
-TAO_PSDL_Template_Type_Spec::~TAO_PSDL_Template_Type_Spec (void)
-{
-  delete this->type_of_template_type_spec_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Template_Type_Spec::type_of_template_type_spec (void) const
-{
-  return this->type_of_template_type_spec_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Template_Type_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_template_type_spec  (this);
-}
-
-/// ***********************************************************
-
-TAO_PSDL_Constr_Type_Spec::TAO_PSDL_Constr_Type_Spec (
-     TAO_PSDL_Node *type_of_constr_type_spec)
-  : type_of_constr_type_spec_ (type_of_constr_type_spec)
-{
-}
-
-TAO_PSDL_Constr_Type_Spec::~TAO_PSDL_Constr_Type_Spec (void)
-{
-  delete this->type_of_constr_type_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Constr_Type_Spec::type_of_constr_type_spec (void) const
-{
-  return this->type_of_constr_type_spec_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Constr_Type_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_constr_type_spec  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Declarators::TAO_PSDL_Declarators (TAO_PSDL_Node *declarator)
-  : declarator_ (declarator),
-    set_of_declarators_ (0)
-{
-}
-
-TAO_PSDL_Declarators::TAO_PSDL_Declarators (TAO_PSDL_Node *declarator,
-                                            TAO_PSDL_Node *set_of_declarators)
-  : declarator_ (declarator),
-    set_of_declarators_ (set_of_declarators)
-{
-}
-
-TAO_PSDL_Declarators::~TAO_PSDL_Declarators (void)
-{
-  delete this->declarator_;
-
-  if (this->set_of_declarators_ != 0)
-    delete this->set_of_declarators_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Declarators::declarator (void) const
-{
-  return this->declarator_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Declarators::set_of_declarators (void) const
-{
-  return this->set_of_declarators_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Declarators::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_declarators  (this);
-}
-
-/// ****************************************************************
-TAO_PSDL_Declarator::TAO_PSDL_Declarator (TAO_PSDL_Node *type_of_declarator)
-  : type_of_declarator_ (type_of_declarator)
-{
-}
-
-TAO_PSDL_Declarator::~TAO_PSDL_Declarator (void)
-{
-  delete this->type_of_declarator_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Declarator::type_of_declarator (void) const
-{
-  return this->type_of_declarator_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Declarator::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_declarator  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Simple_Declarator::TAO_PSDL_Simple_Declarator (
-     TAO_PSDL_Node *identifier)
-  : identifier_ (identifier),
-    simple_declarator_ (0)
-{
-}
-
-TAO_PSDL_Simple_Declarator::TAO_PSDL_Simple_Declarator (
-     TAO_PSDL_Node *identifier,
-     TAO_PSDL_Node *simple_declarator)
-  : identifier_ (identifier),
-    simple_declarator_ (simple_declarator)
-{
-}
-
-TAO_PSDL_Simple_Declarator::~TAO_PSDL_Simple_Declarator (void)
-{
-  delete this->identifier_;
-
-  if (this->simple_declarator_ != 0)
-    delete this->simple_declarator_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Simple_Declarator::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Simple_Declarator::simple_declarator (void) const
-{
-  return this->simple_declarator_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Simple_Declarator::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_simple_declarator  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Simple_Declarator_List::TAO_PSDL_Simple_Declarator_List (
-     TAO_PSDL_Node *simple_declarator)
-  : simple_declarator_list_ (0),
-    simple_declarator_ (simple_declarator)
-{
-}
-
-TAO_PSDL_Simple_Declarator_List::TAO_PSDL_Simple_Declarator_List (
-     TAO_PSDL_Node *simple_declarator_list,
-     TAO_PSDL_Node *simple_declarator)
-  : simple_declarator_list_ (simple_declarator_list),
-    simple_declarator_ (simple_declarator)
-{
-}
-
-TAO_PSDL_Simple_Declarator_List::~TAO_PSDL_Simple_Declarator_List (void)
-{
-  if (this->simple_declarator_list_ != 0)
-  delete this->simple_declarator_list_;
-
-  if (this->simple_declarator_ != 0)
-    delete this->simple_declarator_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Simple_Declarator_List::simple_declarator_list (void) const
-{
-  return this->simple_declarator_list_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Simple_Declarator_List::simple_declarator (void) const
-{
-  return this->simple_declarator_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Simple_Declarator_List::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_simple_declarator_list  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Complex_Declarator::TAO_PSDL_Complex_Declarator (TAO_PSDL_Node *array_declarator)
-  : array_declarator_ (array_declarator)
-{
-}
-
-TAO_PSDL_Complex_Declarator::~TAO_PSDL_Complex_Declarator (void)
-{
-  delete this->array_declarator_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Complex_Declarator::array_declarator (void) const
-{
-  return this->array_declarator_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Complex_Declarator::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_complex_declarator  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Predefined_Type::TAO_PSDL_Predefined_Type (int type_one)
-  : type_one_ (type_one),
-    type_two_ (0),
-    type_three_ (0),
-    type_of_variable_one_ (0),
-    type_of_variable_two_ (0),
-    type_of_variable_three_ (0)
-{
-}
-
-TAO_PSDL_Predefined_Type::TAO_PSDL_Predefined_Type (int type_one,
-                                                    int type_two)
-  : type_one_ (type_one),
-    type_two_ (type_two),
-    type_three_ (0),
-    type_of_variable_one_ (0),
-    type_of_variable_two_ (0),
-    type_of_variable_three_ (0)
-{
-}
-
-TAO_PSDL_Predefined_Type::TAO_PSDL_Predefined_Type (int type_one,
-                                                    int type_two,
-                                                    int type_three)
-  : type_one_ (type_one),
-    type_two_ (type_two),
-    type_three_ (type_three),
-    type_of_variable_one_ (0),
-    type_of_variable_two_ (0),
-    type_of_variable_three_ (0)
-{
-}
-
-TAO_PSDL_Predefined_Type::TAO_PSDL_Predefined_Type (int type_one,
-                                                    TAO_PSDL_Node *type_of_variable_one)
-  : type_one_ (type_one),
-    type_two_ (0),
-    type_three_ (0),
-    type_of_variable_one_ (type_of_variable_one),
-    type_of_variable_two_ (0),
-    type_of_variable_three_ (0)
-{
-}
-
-TAO_PSDL_Predefined_Type::TAO_PSDL_Predefined_Type (TAO_PSDL_Node *type_of_variable_one)
-  : type_one_ (0),
-    type_two_ (0),
-    type_three_ (0),
-    type_of_variable_one_ (type_of_variable_one),
-    type_of_variable_two_ (0),
-    type_of_variable_three_ (0)
-{
-}
-
-TAO_PSDL_Predefined_Type::TAO_PSDL_Predefined_Type (TAO_PSDL_Node *type_of_variable_one,
-                                                    TAO_PSDL_Node *type_of_variable_two)
-  : type_one_ (0),
-    type_two_ (0),
-    type_three_ (0),
-    type_of_variable_one_ (type_of_variable_one),
-    type_of_variable_two_ (type_of_variable_two),
-    type_of_variable_three_ (0)
-{
-  this->psdl_scope_visitor ()->visit_predefined_type (this);
-  /*
-  this->psdl_scope ()->add_enum_decl (this->identifier_value_,
-                                      this->identifier_type_);
-  */
-}
-
-TAO_PSDL_Predefined_Type::TAO_PSDL_Predefined_Type (int type_one,
-                                                    TAO_PSDL_Node *type_of_variable_one,
-                                                    TAO_PSDL_Node *type_of_variable_two)
-  : type_one_ (type_one),
-    type_two_ (0),
-    type_three_ (0),
-    type_of_variable_one_ (type_of_variable_one),
-    type_of_variable_two_ (type_of_variable_two),
-    type_of_variable_three_ (0)
-{
-  // @@ I am not sure if it is needed. This is nto needed in case fo
-  // structs atleast. So, I will check it that it doesnt happen in
-  // case of structs. Or rather will comment it out and will check
-  // later if need arised by.
-  // this->psdl_scope_visitor ()->visit_predefined_type (this);
-
-  /*  if (this->type_one_ == TAO_PSDL_ENUM)
-    {
-      this->psdl_scope ()->add_enum_decl (this->identifier_type_,
-                                          "enum");
-    }
-  */
-}
-
-TAO_PSDL_Predefined_Type::TAO_PSDL_Predefined_Type (
-      TAO_PSDL_Node *type_of_variable_one,
-      TAO_PSDL_Node *type_of_variable_two,
-      TAO_PSDL_Node *type_of_variable_three)
-  : type_one_ (0),
-    type_two_ (0),
-    type_three_ (0),
-    type_of_variable_one_ (type_of_variable_one),
-    type_of_variable_two_ (type_of_variable_two),
-    type_of_variable_three_ (type_of_variable_three)
-{
-}
-
-TAO_PSDL_Predefined_Type::~TAO_PSDL_Predefined_Type (void)
-{
-  if (this->type_of_variable_one_ != 0)
-    delete this->type_of_variable_one_;
-  if (this->type_of_variable_two_ != 0)
-    delete this->type_of_variable_two_;
-  if (this->type_of_variable_three_ != 0)
-    delete this->type_of_variable_three_;
-}
-
-/// Get the value
-int
-TAO_PSDL_Predefined_Type::type_one (void) const
-{
-  return this->type_one_;
-}
-
-int
-TAO_PSDL_Predefined_Type::type_two (void) const
-{
-  return this->type_two_;
-}
-
-int
-TAO_PSDL_Predefined_Type::type_three (void) const
-{
-  return this->type_three_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Predefined_Type::type_of_variable_one (void) const
-{
-  return this->type_of_variable_one_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Predefined_Type::type_of_variable_two (void) const
-{
-  return this->type_of_variable_two_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Predefined_Type::type_of_variable_three (void) const
-{
-  return this->type_of_variable_three_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Predefined_Type::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_predefined_type  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Member_List::TAO_PSDL_Member_List (TAO_PSDL_Node *member)
-  : member_ (member),
-    member_list_ (0)
-{
-}
-
-TAO_PSDL_Member_List::TAO_PSDL_Member_List (TAO_PSDL_Node *member,
-                                            TAO_PSDL_Node *member_list)
-  : member_ (member),
-    member_list_ (member_list)
-{
-}
-
-TAO_PSDL_Member_List::~TAO_PSDL_Member_List (void)
-{
-  delete this->member_;
-
-  if (this->member_list_ != 0)
-    delete this->member_list_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Member_List::member (void) const
-{
-  return this->member_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Member_List::member_list (void) const
-{
-  return this->member_list_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Member_List::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_member_list  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Member::TAO_PSDL_Member (TAO_PSDL_Node *type_spec,
-                                  TAO_PSDL_Node *declarators)
-  : type_spec_ (type_spec),
-    declarators_ (declarators)
-{
-  this->psdl_scope_visitor ()->visit_member (this);
-
-  if (this->predefined_type_)
-    {
-      // This is a predefined type. So, no need to check. But, reset the
-      // value to the default value.
-      this->predefined_type_ = 0;
-    }
-  else
-    {
-      // This is a user-defined type. So, check if it has already been
-      // defined.
-      this->psdl_scope ()->check_name_in_scope (this->identifiers_[0],
-                                                this->psdl_scope ());
-    }
-
-  this->psdl_scope ()->add_member_decl (this->identifiers_[1],
-                                        this->identifiers_[0]);
-
-  // We dont these values of the identifiers anymore as they have been
-  // added to the corresponding AST. So, set count to 'zero' again.
-  this->count_ = 0;
-}
-
-TAO_PSDL_Member::~TAO_PSDL_Member (void)
-{
-  delete this->type_spec_;
-  delete this->declarators_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Member::type_spec (void) const
-{
-  return this->type_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Member::declarators (void) const
-{
-  return this->declarators_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Member::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_member  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Union_Type::TAO_PSDL_Union_Type (TAO_PSDL_Node *identifier,
-                                          TAO_PSDL_Node *switch_type_spec,
-                                          TAO_PSDL_Node *switch_body)
-  : identifier_ (identifier),
-    switch_type_spec_ (switch_type_spec),
-    switch_body_ (switch_body)
-{
-}
-
-TAO_PSDL_Union_Type::~TAO_PSDL_Union_Type (void)
-{
-  delete this->identifier_;
-  delete this->switch_type_spec_;
-  delete this->switch_body_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Union_Type::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Union_Type::switch_type_spec (void) const
-{
-  return this->switch_type_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Union_Type::switch_body (void) const
-{
-  return this->switch_body_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Union_Type::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_union_type (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Switch_Type_Spec::TAO_PSDL_Switch_Type_Spec (TAO_PSDL_Node *type)
-  : type_ (type)
-{
-}
-
-TAO_PSDL_Switch_Type_Spec::~TAO_PSDL_Switch_Type_Spec (void)
-{
-  delete this->type_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Switch_Type_Spec::type (void) const
-{
-  return this->type_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Switch_Type_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_switch_type_spec  (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Switch_Body::TAO_PSDL_Switch_Body (TAO_PSDL_Node *switch_case)
-  : switch_case_ (switch_case),
-    switch_body_ (0)
-{
-}
-
-TAO_PSDL_Switch_Body::TAO_PSDL_Switch_Body (TAO_PSDL_Node *switch_case,
-                                            TAO_PSDL_Node *switch_body)
-  : switch_case_ (switch_case),
-    switch_body_ (switch_body)
-{
-}
-
-TAO_PSDL_Switch_Body::~TAO_PSDL_Switch_Body (void)
-{
-  delete this->switch_case_;
-  delete this->switch_body_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Switch_Body::switch_case (void) const
-{
-  return this->switch_case_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Switch_Body::switch_body (void) const
-{
-  return this->switch_body_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Switch_Body::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_switch_body (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Case::TAO_PSDL_Case (TAO_PSDL_Node *case_label,
-                              TAO_PSDL_Node *element_spec)
-  : case_label_ (case_label),
-    element_spec_ (element_spec)
-{
-}
-
-TAO_PSDL_Case::~TAO_PSDL_Case (void)
-{
-  delete this->case_label_;
-  delete this->element_spec_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Case::case_label (void) const
-{
-  return this->case_label_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Case::element_spec (void) const
-{
-  return this->element_spec_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Case::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_case_case (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Case_Label::TAO_PSDL_Case_Label (TAO_PSDL_Node * type)
-  : type_ (type),
-    const_exp_ (0),
-    case_label_ (0)
-{
-}
-
-TAO_PSDL_Case_Label::TAO_PSDL_Case_Label (TAO_PSDL_Node * type,
-                                          TAO_PSDL_Node *const_exp)
-  : type_ (type),
-    const_exp_ (const_exp),
-    case_label_ (0)
-{
-}
-
-TAO_PSDL_Case_Label::TAO_PSDL_Case_Label (TAO_PSDL_Node * type,
-                                          TAO_PSDL_Node *const_exp,
-                                          TAO_PSDL_Node *case_label)
-  : type_ (type),
-    const_exp_ (const_exp),
-    case_label_ (case_label)
-{
-}
-
-TAO_PSDL_Case_Label::~TAO_PSDL_Case_Label (void)
-{
-  if (this->const_exp_ != 0)
-    delete this->const_exp_;
-
-  if (this->case_label_ != 0)
-    delete this->case_label_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Case_Label::type (void) const
-{
-  return this->type_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Case_Label::const_exp (void) const
-{
-  return this->const_exp_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Case_Label::case_label (void) const
-{
-  return this->case_label_;
-}
-
-int
-TAO_PSDL_Case_Label::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_case_label (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Element_Spec::TAO_PSDL_Element_Spec (TAO_PSDL_Node *type_spec,
-                                              TAO_PSDL_Node *declarator)
-  : type_spec_ (type_spec),
-    declarator_ (declarator)
-{
-}
-
-TAO_PSDL_Element_Spec::~TAO_PSDL_Element_Spec (void)
-{
-  delete this->type_spec_;
-  delete this->declarator_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Element_Spec::type_spec (void) const
-{
-  return this->type_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Element_Spec::declarator (void) const
-{
-  return this->declarator_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Element_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_element_spec (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Const_Dcl::TAO_PSDL_Const_Dcl (TAO_PSDL_Node *const_type,
-                                        TAO_PSDL_Node *identifier,
-                                        TAO_PSDL_Node *const_exp)
-  : const_type_ (const_type),
-    identifier_ (identifier),
-    const_exp_ (const_exp)
-{
-  this->psdl_scope_visitor ()->visit_const_dcl (this);
-
-  this->psdl_scope ()->add_const_decl (this->identifiers_[1],
-                                       this->identifiers_[0]);
-
-  // We dont these values of the identifiers anymore as they have been
-  // added to the corresponding AST. So, set count to 'zero' again.
-  this->count_ = 0;
-
-}
-
-TAO_PSDL_Const_Dcl::~TAO_PSDL_Const_Dcl (void)
-{
-  delete this->const_type_;
-  delete this->identifier_;
-  delete this->const_exp_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Const_Dcl::const_type (void) const
-{
-  return this->const_type_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Const_Dcl::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Const_Dcl::const_exp (void) const
-{
-  return this->const_exp_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Const_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_const_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Const_Type::TAO_PSDL_Const_Type (TAO_PSDL_Node *type)
-  : type_ (type)
-{
-}
-
-TAO_PSDL_Const_Type::~TAO_PSDL_Const_Type (void)
-{
-  delete this->type_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Const_Type::type (void) const
-{
-  return this->type_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Const_Type::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_const_type (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Const_Exp::TAO_PSDL_Const_Exp (TAO_PSDL_Node *expr)
-  : expr_ (expr)
-{
-}
-
-TAO_PSDL_Const_Exp::~TAO_PSDL_Const_Exp (void)
-{
-  delete this->expr_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Const_Exp::expr (void) const
-{
-  return this->expr_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Const_Exp::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_const_exp (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Or_Expr::TAO_PSDL_Or_Expr (TAO_PSDL_Node *xor_expr)
-  : or_expr_ (0),
-    xor_expr_ (xor_expr)
-{
-}
-
-TAO_PSDL_Or_Expr::TAO_PSDL_Or_Expr (TAO_PSDL_Node *or_expr,
-                                    TAO_PSDL_Node *xor_expr)
-  : or_expr_ (or_expr),
-    xor_expr_ (xor_expr)
-{
-}
-
-TAO_PSDL_Or_Expr::~TAO_PSDL_Or_Expr (void)
-{
-  if (this->or_expr_ != 0)
-    delete this->or_expr_;
-
-  delete this->xor_expr_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Or_Expr::or_expr (void) const
-{
-  return this->or_expr_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Or_Expr::xor_expr (void) const
-{
-  return this->xor_expr_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Or_Expr::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_or_expr (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Xor_Expr::TAO_PSDL_Xor_Expr (TAO_PSDL_Node *and_expr)
-  : xor_expr_ (0),
-    and_expr_ (and_expr)
-{
-}
-
-TAO_PSDL_Xor_Expr::TAO_PSDL_Xor_Expr (TAO_PSDL_Node *xor_expr,
-                                      TAO_PSDL_Node *and_expr)
-  : xor_expr_ (xor_expr),
-    and_expr_ (and_expr)
-{
-}
-
-TAO_PSDL_Xor_Expr::~TAO_PSDL_Xor_Expr (void)
-{
-  if (this->xor_expr_ != 0)
-    delete this->xor_expr_;
-
-  delete this->and_expr_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Xor_Expr::xor_expr (void) const
-{
-  return this->xor_expr_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Xor_Expr::and_expr (void) const
-{
-  return this->and_expr_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Xor_Expr::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_xor_expr (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_And_Expr::TAO_PSDL_And_Expr (TAO_PSDL_Node *shift_expr)
-  : and_expr_ (0),
-    shift_expr_ (shift_expr)
-{
-}
-
-TAO_PSDL_And_Expr::TAO_PSDL_And_Expr (TAO_PSDL_Node *and_expr,
-                                      TAO_PSDL_Node *shift_expr)
-  : and_expr_ (and_expr),
-    shift_expr_ (shift_expr)
-{
-}
-
-TAO_PSDL_And_Expr::~TAO_PSDL_And_Expr (void)
-{
-  if (this->shift_expr_ != 0)
-    delete this->shift_expr_;
-
-  delete this->and_expr_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_And_Expr::and_expr (void) const
-{
-  return this->and_expr_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_And_Expr::shift_expr (void) const
-{
-  return this->shift_expr_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_And_Expr::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_and_expr (this);
-}
-
-/// ****************************************************************
-TAO_PSDL_Shift_Expr::TAO_PSDL_Shift_Expr (TAO_PSDL_Node *add_expr)
-  : shift_expr_ (0),
-    type_ (0),
-    add_expr_ (add_expr)
-{
-}
-
-TAO_PSDL_Shift_Expr::TAO_PSDL_Shift_Expr (TAO_PSDL_Node *shift_expr,
-                                          TAO_PSDL_Node * type,
-                                          TAO_PSDL_Node *add_expr)
-  : shift_expr_ (shift_expr),
-    type_ (type),
-    add_expr_ (add_expr)
-{
-}
-
-TAO_PSDL_Shift_Expr::~TAO_PSDL_Shift_Expr (void)
-{
-  if (this->shift_expr_ != 0)
-    delete this->shift_expr_;
-
-  delete this->add_expr_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Shift_Expr::type (void) const
-{
-  return this->type_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Shift_Expr::add_expr (void) const
-{
-  return this->add_expr_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Shift_Expr::shift_expr (void) const
-{
-  return this->shift_expr_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Shift_Expr::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_shift_expr (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Add_Expr::TAO_PSDL_Add_Expr (TAO_PSDL_Node *mult_expr)
-  : add_expr_ (0),
-    type_ (0),
-    mult_expr_ (mult_expr)
-{
-}
-
-TAO_PSDL_Add_Expr::TAO_PSDL_Add_Expr (TAO_PSDL_Node *add_expr,
-                                      TAO_PSDL_Node * type,
-                                      TAO_PSDL_Node *mult_expr)
-  : add_expr_ (add_expr),
-    type_ (type),
-    mult_expr_ (mult_expr)
-{
-}
-
-TAO_PSDL_Add_Expr::~TAO_PSDL_Add_Expr (void)
-{
-  if (this->add_expr_ != 0)
-    delete this->add_expr_;
-
-  delete this->mult_expr_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Add_Expr::type (void) const
-{
-  return this->type_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Add_Expr::add_expr (void) const
-{
-  return this->add_expr_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Add_Expr::mult_expr (void) const
-{
-  return this->mult_expr_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Add_Expr::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_add_expr (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Mult_Expr::TAO_PSDL_Mult_Expr (TAO_PSDL_Node *unary_expr)
-  : mult_expr_ (0),
-    type_ (0),
-    unary_expr_ (unary_expr)
-{
-}
-
-TAO_PSDL_Mult_Expr::TAO_PSDL_Mult_Expr (TAO_PSDL_Node *mult_expr,
-                                        TAO_PSDL_Node *unary_expr)
-  : mult_expr_ (mult_expr),
-    type_ (0),
-    unary_expr_ (unary_expr)
-{
-}
-
-TAO_PSDL_Mult_Expr::TAO_PSDL_Mult_Expr (TAO_PSDL_Node *mult_expr,
-                                        TAO_PSDL_Node * type,
-                                        TAO_PSDL_Node *unary_expr)
-  : mult_expr_ (mult_expr),
-    type_ (type),
-    unary_expr_ (unary_expr)
-{
-}
-
-TAO_PSDL_Mult_Expr::~TAO_PSDL_Mult_Expr (void)
-{
-  if (this->mult_expr_ != 0)
-    delete this->mult_expr_;
-
-  if (this->type_ != 0)
-    delete this->type_;
-
-  delete this->unary_expr_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Mult_Expr::type (void) const
-{
-  return this->type_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Mult_Expr::unary_expr (void) const
-{
-  return this->unary_expr_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Mult_Expr::mult_expr (void) const
-{
-  return this->mult_expr_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Mult_Expr::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_mult_expr (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Unary_Expr::TAO_PSDL_Unary_Expr (TAO_PSDL_Node *unary_operator,
-                                          TAO_PSDL_Node *primary_expr)
-  : unary_operator_ (unary_operator),
-    primary_expr_ (primary_expr)
-{
-}
-
-TAO_PSDL_Unary_Expr::TAO_PSDL_Unary_Expr (TAO_PSDL_Node *primary_expr)
-  : unary_operator_ (0),
-    primary_expr_ (primary_expr)
-{
-}
-
-TAO_PSDL_Unary_Expr::~TAO_PSDL_Unary_Expr (void)
-{
-  if (this->unary_operator_ != 0)
-    delete this->unary_operator_;
-
-  delete this->primary_expr_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Unary_Expr::unary_operator (void) const
-{
-  return this->unary_operator_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Unary_Expr::primary_expr (void) const
-{
-  return this->primary_expr_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Unary_Expr::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_unary_expr  (this);
-}
-
-/// ****************************************************************
-TAO_PSDL_Primary_Expr::TAO_PSDL_Primary_Expr (TAO_PSDL_Node *type_of_primary_expr)
-  : type_of_primary_expr_ (type_of_primary_expr)
-{
-}
-
-TAO_PSDL_Primary_Expr::~TAO_PSDL_Primary_Expr (void)
-{
-  delete this->type_of_primary_expr_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Primary_Expr::type_of_primary_expr (void) const
-{
-  return this->type_of_primary_expr_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Primary_Expr::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_primary_expr (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Except_Dcl::TAO_PSDL_Except_Dcl (TAO_PSDL_Node *identifier)
-  : identifier_ (identifier),
-    member_list_ (0)
-{
-}
-
-TAO_PSDL_Except_Dcl::TAO_PSDL_Except_Dcl (TAO_PSDL_Node *identifier,
-                                          TAO_PSDL_Node *member_list)
-  : identifier_ (identifier),
-    member_list_ (member_list)
-{
-}
-
-TAO_PSDL_Except_Dcl::~TAO_PSDL_Except_Dcl (void)
-{
-  delete this->identifier_;
-  if (this->member_list_ != 0)
-    delete this->member_list_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Except_Dcl::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Except_Dcl::member_list (void) const
-{
-  return this->member_list_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Except_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_except_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Op_Dcl::TAO_PSDL_Op_Dcl (TAO_PSDL_Node *op_attribute,
-                                  TAO_PSDL_Node *op_type_spec,
-                                  TAO_PSDL_Node *identifier,
-                                  TAO_PSDL_Node * parameter_dcls,
-                                  TAO_PSDL_Node * raises_expr,
-                                  TAO_PSDL_Node * context_expr)
-  : op_attribute_ (op_attribute),
-    op_type_spec_ (op_type_spec),
-    identifier_ (identifier),
-    parameter_dcls_ (parameter_dcls),
-    raises_expr_ (raises_expr),
-    context_expr_ (context_expr)
-{
-}
-
-TAO_PSDL_Op_Dcl::TAO_PSDL_Op_Dcl (TAO_PSDL_Node *op_type_spec,
-                                  TAO_PSDL_Node *identifier,
-                                  TAO_PSDL_Node * parameter_dcls,
-                                  TAO_PSDL_Node * raises_expr,
-                                  TAO_PSDL_Node * context_expr)
-  : op_attribute_ (0),
-    op_type_spec_ (op_type_spec),
-    identifier_ (identifier),
-    parameter_dcls_ (parameter_dcls),
-    raises_expr_ (raises_expr),
-    context_expr_ (context_expr)
-{
-}
-
-TAO_PSDL_Op_Dcl::TAO_PSDL_Op_Dcl (TAO_PSDL_Node *op_type_spec,
-                                  TAO_PSDL_Node *identifier,
-                                  TAO_PSDL_Node * parameter_dcls,
-                                  TAO_PSDL_Node * raises_expr)
-  : op_attribute_ (0),
-    op_type_spec_ (op_type_spec),
-    identifier_ (identifier),
-    parameter_dcls_ (parameter_dcls),
-    raises_expr_ (raises_expr),
-    context_expr_ (0)
-{
-}
-
-TAO_PSDL_Op_Dcl::TAO_PSDL_Op_Dcl (TAO_PSDL_Node *op_type_spec,
-                                   TAO_PSDL_Node *identifier,
-                                   TAO_PSDL_Node * parameter_dcls)
-  : op_attribute_ (0),
-    op_type_spec_ (op_type_spec),
-    identifier_ (identifier),
-    parameter_dcls_ (parameter_dcls),
-    raises_expr_ (0),
-    context_expr_ (0)
-{
-}
-
-TAO_PSDL_Op_Dcl::~TAO_PSDL_Op_Dcl (void)
-{
-  if (this->op_attribute_ != 0)
-    delete this->op_attribute_;
-
-  delete this->op_type_spec_;
-  delete this->identifier_;
-  delete this->parameter_dcls_;
-
-  if (this->raises_expr_ != 0)
-    delete this->raises_expr_;
-
-  if (this->context_expr_ != 0)
-    delete this->context_expr_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Op_Dcl::op_attribute (void) const
-{
-  return this->op_attribute_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Op_Dcl::op_type_spec (void) const
-{
-  return this->op_type_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Op_Dcl::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Op_Dcl::parameter_dcls (void) const
-{
-  return this->parameter_dcls_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Op_Dcl::raises_expr (void) const
-{
-  return this->raises_expr_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Op_Dcl::context_expr (void) const
-{
-  return this->context_expr_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Op_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_op_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Op_Type_Spec::TAO_PSDL_Op_Type_Spec (TAO_PSDL_Node *type_spec)
-  : type_spec_ (type_spec),
-    type_ (0)
-{
-}
-
-TAO_PSDL_Op_Type_Spec::TAO_PSDL_Op_Type_Spec (int type)
-  : type_spec_ (0),
-    type_ (type)
-{
-}
-
-TAO_PSDL_Op_Type_Spec::~TAO_PSDL_Op_Type_Spec (void)
-{
-  if (this->type_spec_ != 0)
-    delete this->type_spec_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Op_Type_Spec::type_spec (void) const
-{
-  return this->type_spec_;
-}
-
-int
-TAO_PSDL_Op_Type_Spec::type (void) const
-{
-  return this->type_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Op_Type_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_op_type_spec (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Parameter_Dcls::TAO_PSDL_Parameter_Dcls ()
-  : param_dcl_ (0)
-{
-}
-
-TAO_PSDL_Parameter_Dcls::TAO_PSDL_Parameter_Dcls (TAO_PSDL_Node *param_dcl)
-  : param_dcl_ (param_dcl)
-{
-}
-
-TAO_PSDL_Parameter_Dcls::~TAO_PSDL_Parameter_Dcls (void)
-{
-  delete this->param_dcl_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Parameter_Dcls::param_dcl (void) const
-{
-  return this->param_dcl_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Parameter_Dcls::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_parameter_dcls (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Param_Dcl::TAO_PSDL_Param_Dcl (TAO_PSDL_Node *param_attribute,
-                                        TAO_PSDL_Node *param_type_spec,
-                                        TAO_PSDL_Node *simple_declarator)
-  : param_attribute_ (param_attribute),
-    param_type_spec_ (param_type_spec),
-    simple_declarator_ (simple_declarator),
-    param_dcl_ (0)
-{
-}
-
-TAO_PSDL_Param_Dcl::TAO_PSDL_Param_Dcl (TAO_PSDL_Node *param_attribute,
-                                        TAO_PSDL_Node *param_type_spec,
-                                        TAO_PSDL_Node *simple_declarator,
-                                        TAO_PSDL_Node *param_dcl)
-  : param_attribute_ (param_attribute),
-    param_type_spec_ (param_type_spec),
-    simple_declarator_ (simple_declarator),
-    param_dcl_ (param_dcl)
-{
-}
-
-TAO_PSDL_Param_Dcl::~TAO_PSDL_Param_Dcl (void)
-{
-  delete this->param_attribute_;
-  delete this->param_type_spec_;
-  delete this->simple_declarator_;
-
-  if (this->param_dcl_ != 0)
-    delete this->param_dcl_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Param_Dcl::param_attribute (void) const
-{
-  return this->param_attribute_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Param_Dcl::param_type_spec (void) const
-{
-  return this->param_type_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Param_Dcl::simple_declarator (void) const
-{
-  return this->simple_declarator_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Param_Dcl::param_dcl (void) const
-{
-  return this->param_dcl_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Param_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_param_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Raises_Expr::TAO_PSDL_Raises_Expr (TAO_PSDL_Node *first_scoped_name)
-  : first_scoped_name_ (first_scoped_name),
-    second_scoped_name_ (0)
-{
-  this->psdl_scope_visitor ()->visit_raises_expr (this);
-
-  this->set_identifier ("raises_exception");
-}
-
-TAO_PSDL_Raises_Expr::TAO_PSDL_Raises_Expr (TAO_PSDL_Node *first_scoped_name,
-                                            TAO_PSDL_Node *second_scoped_name)
-  : first_scoped_name_ (first_scoped_name),
-    second_scoped_name_ (second_scoped_name)
-{
-  this->set_identifier ("raises_exception");
-
-  this->psdl_scope_visitor ()->visit_raises_expr (this);
-}
-
-TAO_PSDL_Raises_Expr::~TAO_PSDL_Raises_Expr (void)
-{
-  delete this->first_scoped_name_;
-
-  if (this->second_scoped_name_ != 0)
-    delete this->second_scoped_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Raises_Expr::first_scoped_name (void) const
-{
-  return this->first_scoped_name_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Raises_Expr::second_scoped_name (void) const
-{
-  return this->second_scoped_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Raises_Expr::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_raises_expr (this);
-}
-
-/// ****************************************************************
-TAO_PSDL_Context_Expr::TAO_PSDL_Context_Expr (TAO_PSDL_Node *string_literal)
-  : string_literal_ (string_literal)
-{
-}
-
-TAO_PSDL_Context_Expr::~TAO_PSDL_Context_Expr (void)
-{
-  delete this->string_literal_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Context_Expr::string_literal (void) const
-{
-  return this->string_literal_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Context_Expr::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_context_expr (this);
-}
-
-/// ****************************************************************
-TAO_PSDL_Param_Type_Spec::TAO_PSDL_Param_Type_Spec (
-     TAO_PSDL_Node *type_of_param)
-  : type_of_param_ (type_of_param)
-{
-}
-
-TAO_PSDL_Param_Type_Spec::~TAO_PSDL_Param_Type_Spec (void)
-{
-  delete this->type_of_param_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Param_Type_Spec::type_of_param (void) const
-{
-  return this->type_of_param_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Param_Type_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_param_type_spec (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Fixed_Pt_Type::TAO_PSDL_Fixed_Pt_Type (
-     TAO_PSDL_Node *positive_int_const_one,
-     TAO_PSDL_Node *positive_int_const_two)
-  : positive_int_const_one_ (positive_int_const_one),
-    positive_int_const_two_ (positive_int_const_two)
-{
-}
-
-TAO_PSDL_Fixed_Pt_Type::~TAO_PSDL_Fixed_Pt_Type (void)
-{
-  delete this->positive_int_const_one_;
-  delete this->positive_int_const_two_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Fixed_Pt_Type::positive_int_const_one (void) const
-{
-  return this->positive_int_const_one_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Fixed_Pt_Type::positive_int_const_two (void) const
-{
-  return this->positive_int_const_two_;
-}
-
-int
-TAO_PSDL_Fixed_Pt_Type::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_fixed_pt_type (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Constr_Forward_Decl::TAO_PSDL_Constr_Forward_Decl (TAO_PSDL_Node * type,
-                                                            TAO_PSDL_Node *identifier)
-  : type_ (type),
-    identifier_ (identifier)
-{
-}
-
-TAO_PSDL_Constr_Forward_Decl::~TAO_PSDL_Constr_Forward_Decl (void)
-{
-  delete this->identifier_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Constr_Forward_Decl::type (void) const
-{
-  return this->type_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Constr_Forward_Decl::identifier (void) const
-{
-  return this->identifier_;
-}
-
-int
-TAO_PSDL_Constr_Forward_Decl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_constr_forward_decl (this);
-}
-
-/// ***************************************************************
-
-TAO_PSDL_Interface::TAO_PSDL_Interface (TAO_PSDL_Node *type_of_dcl)
-  : type_of_dcl_ (type_of_dcl)
-{
-}
-
-TAO_PSDL_Interface::~TAO_PSDL_Interface (void)
-{
-  delete this->type_of_dcl_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Interface::type_of_dcl (void) const
-{
-  return this->type_of_dcl_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Interface::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_interface (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Interface_Body::TAO_PSDL_Interface_Body (TAO_PSDL_Node *export_variable)
-  : export_variable_ (export_variable),
-    interface_body_ (0)
-{
-}
-
-TAO_PSDL_Interface_Body::TAO_PSDL_Interface_Body (
-     TAO_PSDL_Node *export_variable,
-     TAO_PSDL_Node *interface_body)
-  : export_variable_ (export_variable),
-    interface_body_ (interface_body)
-{
-}
-
-TAO_PSDL_Interface_Body::~TAO_PSDL_Interface_Body (void)
-{
-  delete this->export_variable_;
-
-  if (this->interface_body_ != 0)
-    delete this->interface_body_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Interface_Body::export_variable (void) const
-{
-  return this->export_variable_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Interface_Body::interface_body (void) const
-{
-  return this->interface_body_;
-}
-
-
-/// = The Node methods.
-int
-TAO_PSDL_Interface_Body::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_interface_body (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Interface_Dcl::TAO_PSDL_Interface_Dcl (
-     TAO_PSDL_Node *interface_header)
-  : interface_header_ (interface_header),
-    interface_body_ (0)
-{
-}
-
-TAO_PSDL_Interface_Dcl::TAO_PSDL_Interface_Dcl (
-     TAO_PSDL_Node *interface_header,
-     TAO_PSDL_Node *interface_body)
-  : interface_header_ (interface_header),
-    interface_body_ (interface_body)
-{
-}
-
-
-TAO_PSDL_Interface_Dcl::~TAO_PSDL_Interface_Dcl (void)
-{
-  delete this->interface_header_;
-
-  if (this->interface_body_ != 0)
-    delete this->interface_body_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Interface_Dcl::interface_header (void) const
-{
-  return this->interface_header_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Interface_Dcl::interface_body (void) const
-{
-  return this->interface_body_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Interface_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_interface_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Forward_Dcl::TAO_PSDL_Forward_Dcl (TAO_PSDL_Node *identifier)
-  : type_ (0),
-    identifier_ (identifier)
-{
-  this->psdl_scope_visitor ()->visit_forward_dcl (this);
-
-  TAO_PSDL_Scope::instance ()->add_interface_dcl_to_scope (this->identifiers_[0],
-                         //@@ deal                         "forward_dcl",
-                                                           this->psdl_scope ());
-}
-
-TAO_PSDL_Forward_Dcl::TAO_PSDL_Forward_Dcl (int type,
-                                            TAO_PSDL_Node *identifier)
-  : type_ (type),
-    identifier_ (identifier)
-{
-  this->psdl_scope_visitor ()->visit_forward_dcl (this);
-
-  TAO_PSDL_Scope::instance ()->add_interface_dcl_to_scope (this->identifiers_[0],
-                                     //@@ deal             "forward_dcl",
-                                                           this->psdl_scope ());
-
-}
-
-TAO_PSDL_Forward_Dcl::~TAO_PSDL_Forward_Dcl (void)
-{
-  delete this->identifier_;
-}
-
-/// Get the value
-int
-TAO_PSDL_Forward_Dcl::type (void) const
-{
-  return this->type_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Forward_Dcl::identifier (void) const
-{
-  return this->identifier_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Forward_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_forward_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Interface_Header::TAO_PSDL_Interface_Header (TAO_PSDL_Node *identifier)
-  : type_ (0),
-    identifier_ (identifier),
-    interface_inheritance_spec_ (0)
-{
-}
-
-TAO_PSDL_Interface_Header::TAO_PSDL_Interface_Header (TAO_PSDL_Node *type,
-                                                      TAO_PSDL_Node *identifier)
-  : type_ (type),
-    identifier_ (identifier),
-    interface_inheritance_spec_ (0)
-{
-}
-
-TAO_PSDL_Interface_Header::TAO_PSDL_Interface_Header (TAO_PSDL_Node * type,
-                                                      TAO_PSDL_Node *identifier,
-                                                      TAO_PSDL_Node *interface_inheritance_spec)
-  : type_ (type),
-    identifier_ (identifier),
-    interface_inheritance_spec_ (interface_inheritance_spec)
-{
-}
-
-TAO_PSDL_Interface_Header::~TAO_PSDL_Interface_Header (void)
-{
-  if (this->identifier_ != 0)
-    delete this->identifier_;
-
-  if (this->interface_inheritance_spec_ != 0)
-    delete this->interface_inheritance_spec_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Interface_Header::type (void) const
-{
-  return this->type_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Interface_Header::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Interface_Header::interface_inheritance_spec (void) const
-{
-  return this->interface_inheritance_spec_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Interface_Header::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_interface_header (this);
-}
-
-
-/// ****************************************************************
-TAO_PSDL_Export_Dcl::TAO_PSDL_Export_Dcl (TAO_PSDL_Node *type_of_export_one)
-  : type_of_export_one_ (type_of_export_one),
-    type_of_export_two_ (0)
-{
-}
-
-TAO_PSDL_Export_Dcl::TAO_PSDL_Export_Dcl (TAO_PSDL_Node *type_of_export_one,
-                                          TAO_PSDL_Node *type_of_export_two)
-  : type_of_export_one_ (type_of_export_one),
-    type_of_export_two_ (type_of_export_two)
-{
-}
-
-TAO_PSDL_Export_Dcl::~TAO_PSDL_Export_Dcl (void)
-{
-  delete this->type_of_export_one_;
-
-  if (this->type_of_export_two_ != 0)
-    delete this->type_of_export_two_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Export_Dcl::type_of_export_one (void) const
-{
-  return this->type_of_export_one_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Export_Dcl::type_of_export_two (void) const
-{
-  return this->type_of_export_two_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Export_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_export_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Interface_Inheritance_Spec::TAO_PSDL_Interface_Inheritance_Spec (
-     TAO_PSDL_Node *interface_name)
-  : interface_name_ (interface_name)
-{
-}
-
-TAO_PSDL_Interface_Inheritance_Spec::~TAO_PSDL_Interface_Inheritance_Spec (void)
-{
-  if (this->interface_name_ != 0)
-    delete this->interface_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Interface_Inheritance_Spec::interface_name (void) const
-{
-  return this->interface_name_;
-}
-
-
-/// = The Node methods.
-int
-TAO_PSDL_Interface_Inheritance_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_interface_inheritance_spec (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Interface_Name::TAO_PSDL_Interface_Name (
-     TAO_PSDL_Node *scoped_name)
-  : scoped_name_ (scoped_name),
-    interface_name_ (0)
-{
-}
-
-TAO_PSDL_Interface_Name::TAO_PSDL_Interface_Name (
-     TAO_PSDL_Node *scoped_name,
-     TAO_PSDL_Node *interface_name)
-  : scoped_name_ (scoped_name),
-    interface_name_ (interface_name)
-{
-}
-
-TAO_PSDL_Interface_Name::~TAO_PSDL_Interface_Name (void)
-{
-  delete this->scoped_name_;
-
-  if (this->interface_name_ != 0)
-    delete this->interface_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Interface_Name::scoped_name (void) const
-{
-  return this->scoped_name_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Interface_Name::interface_name (void) const
-{
-  return this->interface_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Interface_Name::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_interface_name (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Scoped_Name::TAO_PSDL_Scoped_Name (
-     TAO_PSDL_Node *identifier)
-  : identifier_ (identifier),
-    scoped_name_ (0)
-{
-  this->psdl_scope_visitor ()->visit_scoped_name (this);
-}
-
-TAO_PSDL_Scoped_Name::TAO_PSDL_Scoped_Name (
-     TAO_PSDL_Node *scoped_name,
-     TAO_PSDL_Node *identifier)
-  : identifier_ (identifier),
-    scoped_name_ (scoped_name)
-{
-  this->psdl_scope_visitor ()->visit_scoped_name (this);
-}
-
-TAO_PSDL_Scoped_Name::~TAO_PSDL_Scoped_Name (void)
-{
-  delete this->identifier_;
-
-  if (this->scoped_name_ != 0)
-    delete this->scoped_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Scoped_Name::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Scoped_Name::scoped_name (void) const
-{
-  return this->scoped_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Scoped_Name::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_scoped_name (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Value::TAO_PSDL_Value (TAO_PSDL_Node *type_of_value_dcl)
-  : type_of_value_dcl_ (type_of_value_dcl)
-{
-}
-
-TAO_PSDL_Value::~TAO_PSDL_Value (void)
-{
-  delete this->type_of_value_dcl_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Value::type_of_value_dcl (void) const
-{
-  return this->type_of_value_dcl_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Value::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_value (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Value_Common_Base::TAO_PSDL_Value_Common_Base (TAO_PSDL_Node *identifier)
-  : identifier_ (identifier)
-{
-}
-
-TAO_PSDL_Value_Common_Base::~TAO_PSDL_Value_Common_Base (void)
-{
-  delete this->identifier_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Value_Common_Base::identifier (void) const
-{
-  return this->identifier_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Value_Common_Base::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_value_common_base (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Value_Forward_Dcl::TAO_PSDL_Value_Forward_Dcl (
-     TAO_PSDL_Node *value_common_base)
-  : value_common_base_ (value_common_base),
-    abstract_ (0)
-{
-}
-
-TAO_PSDL_Value_Forward_Dcl::TAO_PSDL_Value_Forward_Dcl (
-     TAO_PSDL_Node *abstract,
-     TAO_PSDL_Node *value_common_base)
-  : value_common_base_ (value_common_base),
-    abstract_ (abstract)
-{
-}
-
-TAO_PSDL_Value_Forward_Dcl::~TAO_PSDL_Value_Forward_Dcl (void)
-{
-  delete this->value_common_base_;
-
-  if (this->abstract_ != 0)
-    delete this->abstract_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Value_Forward_Dcl::value_common_base (void) const
-{
-  return this->value_common_base_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Value_Forward_Dcl::abstract (void) const
-{
-  return this->abstract_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Value_Forward_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_value_forward_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Value_Box_Dcl::TAO_PSDL_Value_Box_Dcl (
-     TAO_PSDL_Node *value_common_base,
-     TAO_PSDL_Node *type_spec)
-  : value_common_base_ (value_common_base),
-    type_spec_ (type_spec)
-{
-}
-
-TAO_PSDL_Value_Box_Dcl::~TAO_PSDL_Value_Box_Dcl (void)
-{
-  delete this->value_common_base_;
-  delete this->type_spec_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Value_Box_Dcl::value_common_base (void) const
-{
-  return this->value_common_base_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Value_Box_Dcl::type_spec (void) const
-{
-  return this->type_spec_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Value_Box_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_value_box_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Value_Abs_Dcl::TAO_PSDL_Value_Abs_Dcl (
-     TAO_PSDL_Node *value_common_base,
-     TAO_PSDL_Node *export_variable)
-  : value_common_base_ (value_common_base),
-    value_inheritance_spec_ (0),
-    export_variable_ (export_variable)
-{
-}
-
-TAO_PSDL_Value_Abs_Dcl::TAO_PSDL_Value_Abs_Dcl (
-     TAO_PSDL_Node *value_common_base,
-     TAO_PSDL_Node *value_inheritance_spec,
-     TAO_PSDL_Node *export_variable)
-  : value_common_base_ (value_common_base),
-    value_inheritance_spec_ (value_inheritance_spec),
-    export_variable_ (export_variable)
-{
-}
-
-TAO_PSDL_Value_Abs_Dcl::~TAO_PSDL_Value_Abs_Dcl (void)
-{
-  delete this->value_common_base_;
-  delete this->export_variable_;
-
-  if (this->value_inheritance_spec_ != 0)
-    delete this->value_inheritance_spec_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Value_Abs_Dcl::value_common_base (void) const
-{
-  return this->value_common_base_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Value_Abs_Dcl::export_variable (void) const
-{
-  return this->export_variable_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Value_Abs_Dcl::value_inheritance_spec (void) const
-{
-  return this->value_inheritance_spec_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Value_Abs_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_value_abs_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Value_Dcl::TAO_PSDL_Value_Dcl (
-     TAO_PSDL_Node *value_header,
-     TAO_PSDL_Node *value_element)
-  : value_header_ (value_header),
-    value_element_ (value_element)
-{
-}
-
-TAO_PSDL_Value_Dcl::~TAO_PSDL_Value_Dcl (void)
-{
-  delete this->value_header_;
-  delete this->value_element_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Value_Dcl::value_header (void) const
-{
-  return this->value_header_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Value_Dcl::value_element (void) const
-{
-  return this->value_element_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Value_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_value_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Value_Header::TAO_PSDL_Value_Header (
-     TAO_PSDL_Node *value_common_base,
-     TAO_PSDL_Node *value_inheritance_spec)
-  : custom_ (0),
-    value_common_base_ (value_common_base),
-    value_inheritance_spec_ (value_inheritance_spec)
-{
-}
-
-TAO_PSDL_Value_Header::TAO_PSDL_Value_Header (TAO_PSDL_Node *custom,
-                                              TAO_PSDL_Node *value_common_base,
-                                              TAO_PSDL_Node *value_inheritance_spec)
-  : custom_ (custom),
-    value_common_base_ (value_common_base),
-    value_inheritance_spec_ (value_inheritance_spec)
-{
-}
-
-TAO_PSDL_Value_Header::~TAO_PSDL_Value_Header (void)
-{
-  delete this->value_common_base_;
-
-  if (this->custom_ != 0)
-    delete this->custom_;
-
-  delete this->value_inheritance_spec_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Value_Header::custom (void) const
-{
-  return this->custom_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Value_Header::value_common_base (void) const
-{
-  return this->value_common_base_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Value_Header::value_inheritance_spec (void) const
-{
-  return this->value_inheritance_spec_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Value_Header::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_value_header (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Value_Inheritance_Spec::TAO_PSDL_Value_Inheritance_Spec (
-     TAO_PSDL_Node *interface_name)
-  : truncatable_ (0),
-    value_name_ (0),
-    interface_name_ (interface_name)
-{
-}
-
-TAO_PSDL_Value_Inheritance_Spec::TAO_PSDL_Value_Inheritance_Spec (
-     TAO_PSDL_Node *value_name,
-     TAO_PSDL_Node *interface_name)
-  : truncatable_ (0),
-    value_name_ (value_name),
-    interface_name_ (interface_name)
-{
-}
-
-TAO_PSDL_Value_Inheritance_Spec::TAO_PSDL_Value_Inheritance_Spec (
-     TAO_PSDL_Node *truncatable,
-     TAO_PSDL_Node *value_name,
-     TAO_PSDL_Node *interface_name)
-  : truncatable_ (truncatable),
-    value_name_ (value_name),
-    interface_name_ (interface_name)
-{
-}
-
-TAO_PSDL_Value_Inheritance_Spec::~TAO_PSDL_Value_Inheritance_Spec (void)
-{
-  if (this->truncatable_ != 0)
-    delete this->truncatable_;
-
-  delete this->interface_name_;
-
-  if (this->value_name_ != 0)
-    delete this->value_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Value_Inheritance_Spec::truncatable (void) const
-{
-  return this->truncatable_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Value_Inheritance_Spec::value_name (void) const
-{
-  return this->value_name_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Value_Inheritance_Spec::interface_name (void) const
-{
-  return this->interface_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Value_Inheritance_Spec::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_value_inheritance_spec (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Value_Name::TAO_PSDL_Value_Name (TAO_PSDL_Node *scoped_name)
-  : scoped_name_ (scoped_name),
-    value_name_ (0)
-{
-}
-
-TAO_PSDL_Value_Name::TAO_PSDL_Value_Name (TAO_PSDL_Node *scoped_name,
-                                          TAO_PSDL_Node *value_name)
-  : scoped_name_ (scoped_name),
-    value_name_ (value_name)
-{
-}
-
-TAO_PSDL_Value_Name::~TAO_PSDL_Value_Name (void)
-{
-  if (this->scoped_name_ != 0)
-    delete this->scoped_name_;
-
-  if (this->value_name_ != 0)
-    delete this->value_name_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Value_Name::scoped_name (void) const
-{
-  return this->scoped_name_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Value_Name::value_name (void) const
-{
-  return this->value_name_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Value_Name::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_value_name (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Value_Element::TAO_PSDL_Value_Element (
-     TAO_PSDL_Node *type_of_element)
-  : type_of_element_ (type_of_element)
-{
-}
-
-TAO_PSDL_Value_Element::~TAO_PSDL_Value_Element (void)
-{
-  delete this->type_of_element_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Value_Element::type_of_element (void) const
-{
-  return this->type_of_element_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Value_Element::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_value_element (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Array_Declarator::TAO_PSDL_Array_Declarator (
-     TAO_PSDL_Node *identifier,
-     TAO_PSDL_Node *fixed_array_size)
-  : identifier_ (identifier),
-    fixed_array_size_ (fixed_array_size)
-{
-}
-
-TAO_PSDL_Array_Declarator::~TAO_PSDL_Array_Declarator (void)
-{
-  delete this->identifier_;
-  delete this->fixed_array_size_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Array_Declarator::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Array_Declarator::fixed_array_size (void) const
-{
-  return this->fixed_array_size_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Array_Declarator::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_array_declarator (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Fixed_Array_Size::TAO_PSDL_Fixed_Array_Size (
-     TAO_PSDL_Node *positive_int_const)
-  : positive_int_const_ (positive_int_const)
-{
-}
-
-TAO_PSDL_Fixed_Array_Size::~TAO_PSDL_Fixed_Array_Size (void)
-{
-  delete this->positive_int_const_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Fixed_Array_Size::positive_int_const (void) const
-{
-  return this->positive_int_const_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Fixed_Array_Size::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_fixed_array_size (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Enumerator::TAO_PSDL_Enumerator (TAO_PSDL_Node *identifier)
-  : identifier_ (identifier),
-    enumerator_ (0)
-{
-}
-
-TAO_PSDL_Enumerator::TAO_PSDL_Enumerator (TAO_PSDL_Node *identifier,
-                                          TAO_PSDL_Node *enumerator)
-  : identifier_ (identifier),
-    enumerator_ (enumerator)
-{
-}
-
-TAO_PSDL_Enumerator::~TAO_PSDL_Enumerator (void)
-{
-  delete this->identifier_;
-
-  if (this->enumerator_ != 0)
-    delete this->enumerator_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Enumerator::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Enumerator::enumerator (void) const
-{
-  return this->enumerator_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Enumerator::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_enumerator (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Literal::TAO_PSDL_Literal (CORBA::Boolean boolean_value)
-  : boolean_value_ (boolean_value),
-    int_value_ (0),
-    double_value_ (0),
-    char_value_ (0)
-{
-}
-
-TAO_PSDL_Literal::TAO_PSDL_Literal (int int_value)
-  : boolean_value_ (0),
-    int_value_ (int_value),
-    double_value_ (0),
-    char_value_ (0)
-{
-}
-
-TAO_PSDL_Literal::TAO_PSDL_Literal (double double_value)
-  : boolean_value_ (0),
-    int_value_ (0),
-    double_value_ (double_value),
-    char_value_ (0)
-{
-}
-
-TAO_PSDL_Literal::TAO_PSDL_Literal (const char *char_value)
-  : boolean_value_ (0),
-    int_value_ (0),
-    double_value_ (0),
-    char_value_ (char_value)
-{
-}
-
-TAO_PSDL_Literal::~TAO_PSDL_Literal (void)
-{
-  // We cannot delete this since it is a constant
-  /*if (this->char_value_ != 0)
-    delete this->char_value_; */
-}
-
-/// Get the value
-CORBA::Boolean
-TAO_PSDL_Literal::boolean_value (void) const
-{
-  return this->boolean_value_;
-}
-
-int
-TAO_PSDL_Literal::int_value (void) const
-{
-  return this->int_value_;
-}
-
-double
-TAO_PSDL_Literal::double_value (void) const
-{
-  return this->double_value_;
-}
-
-const char *
-TAO_PSDL_Literal::char_value (void) const
-{
-  return this->char_value_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Literal::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_literal (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_State_Member::TAO_PSDL_State_Member (TAO_PSDL_Node *public_or_private,
-                                              TAO_PSDL_Node *type_spec,
-                                              TAO_PSDL_Node *declarators)
-  : public_or_private_ (public_or_private),
-    type_spec_ (type_spec),
-    declarators_ (declarators)
-{
-}
-
-TAO_PSDL_State_Member::~TAO_PSDL_State_Member (void)
-{
-  delete this->public_or_private_;
-
-  delete this->type_spec_;
-
-  delete this->declarators_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_State_Member::public_or_private (void) const
-{
-  return this->public_or_private_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_State_Member::type_spec (void) const
-{
-  return this->type_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_State_Member::declarators (void) const
-{
-  return this->declarators_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_State_Member::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_state_member (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Init_Dcl::TAO_PSDL_Init_Dcl (TAO_PSDL_Node *identifier)
-  : identifier_ (identifier),
-    init_param_decls_ (0)
-{
-}
-
-TAO_PSDL_Init_Dcl::TAO_PSDL_Init_Dcl (TAO_PSDL_Node *identifier,
-                                      TAO_PSDL_Node *init_param_decls)
-  : identifier_ (identifier),
-    init_param_decls_ (init_param_decls)
-{
-}
-
-TAO_PSDL_Init_Dcl::~TAO_PSDL_Init_Dcl (void)
-{
-  delete this->identifier_;
-
-  if (this->init_param_decls_ != 0)
-    delete this->init_param_decls_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Init_Dcl::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Init_Dcl::init_param_decls (void) const
-{
-  return this->init_param_decls_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Init_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_init_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Init_Param_Decls::TAO_PSDL_Init_Param_Decls (TAO_PSDL_Node *init_param_decl)
-  : init_param_decl_ (init_param_decl),
-    init_param_decls_ (0)
-{
-}
-
-TAO_PSDL_Init_Param_Decls::TAO_PSDL_Init_Param_Decls (TAO_PSDL_Node *init_param_decl,
-                                                      TAO_PSDL_Node *init_param_decls)
-  : init_param_decl_ (init_param_decl),
-    init_param_decls_ (init_param_decls)
-{
-}
-
-TAO_PSDL_Init_Param_Decls::~TAO_PSDL_Init_Param_Decls (void)
-{
-  delete this->init_param_decl_;
-
-  if (this->init_param_decls_ != 0)
-    delete this->init_param_decls_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Init_Param_Decls::init_param_decl (void) const
-{
-  return this->init_param_decl_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Init_Param_Decls::init_param_decls (void) const
-{
-  return this->init_param_decls_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Init_Param_Decls::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_init_param_decls (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Init_Param_Decl::TAO_PSDL_Init_Param_Decl (TAO_PSDL_Node *init_param_attribute,
-                                              TAO_PSDL_Node *param_type_spec,
-                                              TAO_PSDL_Node *simple_declarator)
-  : init_param_attribute_ (init_param_attribute),
-    param_type_spec_ (param_type_spec),
-    simple_declarator_ (simple_declarator)
-{
-}
-
-TAO_PSDL_Init_Param_Decl::~TAO_PSDL_Init_Param_Decl (void)
-{
-  delete this->init_param_attribute_;
-
-  delete this->param_type_spec_;
-
-  delete this->simple_declarator_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Init_Param_Decl::init_param_attribute (void) const
-{
-  return this->init_param_attribute_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Init_Param_Decl::param_type_spec (void) const
-{
-  return this->param_type_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Init_Param_Decl::simple_declarator (void) const
-{
-  return this->simple_declarator_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Init_Param_Decl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_init_param_decl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Factory_Parameters::TAO_PSDL_Factory_Parameters ()
-  : simple_declarator_ (0)
-{
-}
-
-TAO_PSDL_Factory_Parameters::TAO_PSDL_Factory_Parameters (TAO_PSDL_Node *simple_declarator)
-  : simple_declarator_ (simple_declarator)
-{
-}
-
-TAO_PSDL_Factory_Parameters::~TAO_PSDL_Factory_Parameters (void)
-{
-  if (this->simple_declarator_ != 0)
-    delete this->simple_declarator_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Factory_Parameters::simple_declarator (void) const
-{
-  return this->simple_declarator_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Factory_Parameters::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_factory_parameters (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Attr_Dcl::TAO_PSDL_Attr_Dcl (int readonly,
-                                      TAO_PSDL_Node *param_type_spec,
-                                      TAO_PSDL_Node *simple_declarator)
-  : readonly_ (readonly),
-    param_type_spec_ (param_type_spec),
-    simple_declarator_ (simple_declarator)
-{
-}
-
-TAO_PSDL_Attr_Dcl::TAO_PSDL_Attr_Dcl (TAO_PSDL_Node *param_type_spec,
-                                      TAO_PSDL_Node *simple_declarator)
-  : readonly_ (0),
-    param_type_spec_ (param_type_spec),
-    simple_declarator_ (simple_declarator)
-{
-}
-
-TAO_PSDL_Attr_Dcl::~TAO_PSDL_Attr_Dcl (void)
-{
-  delete this->param_type_spec_;
-
-  delete this->simple_declarator_;
-}
-
-/// Get the value
-int
-TAO_PSDL_Attr_Dcl::readonly (void) const
-{
-  return this->readonly_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Attr_Dcl::param_type_spec (void) const
-{
-  return this->param_type_spec_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Attr_Dcl::simple_declarator (void) const
-{
-  return this->simple_declarator_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Attr_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_attr_dcl (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Positive_Int_Const::TAO_PSDL_Positive_Int_Const (TAO_PSDL_Node *const_exp)
-  : const_exp_ (const_exp)
-{
-}
-
-TAO_PSDL_Positive_Int_Const::~TAO_PSDL_Positive_Int_Const (void)
-{
-  delete this->const_exp_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Positive_Int_Const::const_exp (void) const
-{
-  return this->const_exp_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Positive_Int_Const::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_positive_int_const (this);
-}
-
-/// ****************************************************************
-
-TAO_PSDL_Factory_Dcl::TAO_PSDL_Factory_Dcl (TAO_PSDL_Node *identifier,
-                                            TAO_PSDL_Node *factory_parameters)
-  : identifier_ (identifier),
-    factory_parameters_ (factory_parameters)
-{
-}
-
-TAO_PSDL_Factory_Dcl::~TAO_PSDL_Factory_Dcl (void)
-{
-  delete this->identifier_;
-
-  if (this->factory_parameters_ != 0)
-    delete this->factory_parameters_;
-}
-
-/// Get the value
-TAO_PSDL_Node *
-TAO_PSDL_Factory_Dcl::identifier (void) const
-{
-  return this->identifier_;
-}
-
-TAO_PSDL_Node *
-TAO_PSDL_Factory_Dcl::factory_parameters (void) const
-{
-  return this->factory_parameters_;
-}
-
-/// = The Node methods.
-int
-TAO_PSDL_Factory_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
-{
-  return visitor->visit_factory_dcl (this);
-}
diff --git a/orbsvcs/PSS/PSDL_Node.h b/orbsvcs/PSS/PSDL_Node.h
deleted file mode 100644
index 464bcdc53bf..00000000000
--- a/orbsvcs/PSS/PSDL_Node.h
+++ /dev/null
@@ -1,3333 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Node
-//
-// = DESCRIPTION
-//    This class is the base type for all the type of possible nodes
-//    in the parse tree.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_NODE_H
-#define TAO_PSDL_NODE_H
-
-#include "psdl_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "PSDL_Scope.h"
-
-#include "tao/corbafwd.h"
-#include "ace/SString.h"
-
-
-class TAO_PSDL_Node_Visitor;
-class TAO_PSDL_Scope_Visitor;
-
-class TAO::String_Manager;
-
-class TAO_PSDL_Export TAO_PSDL_Node
-{
-public:
-
-  // Constructor and destructor
-  TAO_PSDL_Node (void);
-
-  virtual ~TAO_PSDL_Node (void);
-
-  // This method is for applying the visitor pattern. When the control
-  // reaches a particular node, since we donot know the type of the
-  // node, we invoke the accept method. Each derived classes accept
-  // method, will invoke the corresponding visitor method which does
-  // the needful for that particular type of the node.
-  virtual int accept (TAO_PSDL_Node_Visitor *visitor) = 0;
-
-  // Needed when writing to stubs.
-  virtual int type_of_node (void) const;
-
-  // Accessors to the identifiers for use while building the ASTs
-  ACE_CString get_identifier_type (void);
-  ACE_CString get_identifier_value (void);
-  void set_identifier (ACE_CString identifier);
-
-  // Set the predefined_type_ to 1 to indicate that the type is a
-  // predefined type.
-  void set_predefined_type (void);
-
-  /// Accessor methods.
-  TAO_PSDL_Scope *psdl_scope (void);
-  TAO_PSDL_Scope_Visitor *psdl_scope_visitor (void);
-
-protected :
-
-  int type_;
-
-  // Array to carry the temporary identifier_type and identifier_value
-  // before they are added to the related scope. ie,. to the ASTs
-  ACE_Array_Base <ACE_CString> identifiers_;
-
-  // Index to keep track of the present member of the identifiers_
-  // array.
-  CORBA::ULong count_;
-
-  // Check if the type of the identifier is a predefined one.
-  // The default value is that any identifier_type is a user-defined
-  // one i.e. if the value is zero, it is a user-defined type. When
-  // the identifier_type is actually a predefined one, its value is to
-  // be changed to 1.
-  CORBA::Boolean predefined_type_;
-  /// Pointer to psdl_scope_
-  TAO_PSDL_Scope *psdl_scope_;
-
-  // Pointer to the base visitor class
-  TAO_PSDL_Scope_Visitor *psdl_scope_visitor_;
-};
-
-// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Specification : public TAO_PSDL_Node
-{
-  // This class is for psdl_specification s.
-public:
-  TAO_PSDL_Specification (TAO_PSDL_Node *definition);
-  TAO_PSDL_Specification (TAO_PSDL_Node *definition,
-                          TAO_PSDL_Node *specification);
-
-  virtual ~TAO_PSDL_Specification (void);
-
-  /// Get the values.
-  TAO_PSDL_Node *definition (void) const;
-  TAO_PSDL_Node *specification (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *definition_;
-  TAO_PSDL_Node *specification_;
-
-};
-
-// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Definition : public TAO_PSDL_Node
-{
-  // For psdl_definition
-public:
-  TAO_PSDL_Definition (TAO_PSDL_Node *definition_type);
-
-  virtual ~TAO_PSDL_Definition (void);
-
-  /// Get the value
-  TAO_PSDL_Node *definition_type (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *definition_type_;
-};
-
-// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Module : public TAO_PSDL_Node
-{
-  // for psdl_module
-public:
-  TAO_PSDL_Module (int type,
-                   TAO_PSDL_Node *identifier,
-                   TAO_PSDL_Node *specification);
-
-  virtual ~TAO_PSDL_Module (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *specification (void) const;
-
-  void set_identifier_name (ACE_CString);
-  ACE_CString identifier_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *specification_;
-  ACE_CString module_name_;
-};
-
-// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagetype : public TAO_PSDL_Node
-{
-  // For abstract_storagetype
-public:
-  TAO_PSDL_Abstract_Storagetype (TAO_PSDL_Node *storagetype_dcl);
-
-  virtual ~TAO_PSDL_Abstract_Storagetype (void);
-
-  /// Get the value
-  TAO_PSDL_Node *storagetype_dcl (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *storagetype_dcl_;
-};
-
-// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagetype_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagetype_Dcl (TAO_PSDL_Node *abs_storagetype_header);
-
-  TAO_PSDL_Abstract_Storagetype_Dcl (TAO_PSDL_Node *abs_storagetype_header,
-                                     TAO_PSDL_Node *abs_storagetype_body);
-
-  virtual ~TAO_PSDL_Abstract_Storagetype_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *abs_storagetype_header (void) const;
-  TAO_PSDL_Node *abs_storagetype_body (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *abs_storagetype_header_;
-  TAO_PSDL_Node *abs_storagetype_body_;
-
-};
-
-// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagetype_Fwd_Dcl : public TAO_PSDL_Node
-{
-public:
-  TAO_PSDL_Abstract_Storagetype_Fwd_Dcl (TAO_PSDL_Node *identifer);
-
-  virtual ~TAO_PSDL_Abstract_Storagetype_Fwd_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *identifier_;
-};
-
-// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagetype_Header : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagetype_Header (TAO_PSDL_Node *identifer);
-  TAO_PSDL_Abstract_Storagetype_Header (TAO_PSDL_Node *identifer,
-                                        TAO_PSDL_Node *abs_storagetype_inh_spec);
-
-  virtual ~TAO_PSDL_Abstract_Storagetype_Header (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *abs_storagetype_inh_spec (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *abs_storagetype_inh_spec_;
-};
-
-// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagetype_Body : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagetype_Body (TAO_PSDL_Node *abs_storagetype_member);
-  TAO_PSDL_Abstract_Storagetype_Body (TAO_PSDL_Node *abs_storagetype_member,
-                                      TAO_PSDL_Node *abs_storagetype_body);
-
-  virtual ~TAO_PSDL_Abstract_Storagetype_Body (void);
-
-  /// Get the value
-  TAO_PSDL_Node *abs_storagetype_member (void) const;
-  TAO_PSDL_Node *abs_storagetype_body (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *abs_storagetype_member_;
-  TAO_PSDL_Node *abs_storagetype_body_;
-};
-
-// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagetype_Member : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagetype_Member (TAO_PSDL_Node *declaration);
-  virtual ~TAO_PSDL_Abstract_Storagetype_Member (void);
-
-  /// Get the value
-  TAO_PSDL_Node *declaration (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *declaration_;
-};
-
-// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagetype_Inh_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagetype_Inh_Spec (TAO_PSDL_Node *abs_storagetype_name);
-  virtual ~TAO_PSDL_Abstract_Storagetype_Inh_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *abs_storagetype_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *abs_storagetype_name_;
-};
-
-// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagetype_Name : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagetype_Name (TAO_PSDL_Node *scoped_name);
-  TAO_PSDL_Abstract_Storagetype_Name (TAO_PSDL_Node *scoped_name,
-                                      TAO_PSDL_Node *abs_storagetype_name);
-  virtual ~TAO_PSDL_Abstract_Storagetype_Name (void);
-
-  /// Get the value
-  TAO_PSDL_Node *scoped_name (void) const;
-  TAO_PSDL_Node *abs_storagetype_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *scoped_name_;
-  TAO_PSDL_Node *abs_storagetype_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Psdl_State_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Psdl_State_Dcl (TAO_PSDL_Node *key_word,
-                           TAO_PSDL_Node *psdl_state_type_spec,
-                           TAO_PSDL_Node *simple_declarator);
-
-  TAO_PSDL_Psdl_State_Dcl (TAO_PSDL_Node *psdl_state_type_spec,
-                           TAO_PSDL_Node *simple_declarator);
-
-  virtual ~TAO_PSDL_Psdl_State_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *psdl_state_type_spec (void) const;
-  TAO_PSDL_Node *simple_declarator (void) const;
-  TAO_PSDL_Node *key_word (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *key_word_;
-  TAO_PSDL_Node *psdl_state_type_spec_;
-  TAO_PSDL_Node *simple_declarator_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Psdl_State_Type_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Psdl_State_Type_Spec (TAO_PSDL_Node *type_spec);
-
-  virtual ~TAO_PSDL_Psdl_State_Type_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_spec (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_spec_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagetype_Ref_Type : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagetype_Ref_Type (TAO_PSDL_Node *key_word,
-                                          TAO_PSDL_Node *abs_storagetype_name);
-
-  TAO_PSDL_Abstract_Storagetype_Ref_Type (TAO_PSDL_Node *abs_storagetype_name);
-
-  virtual ~TAO_PSDL_Abstract_Storagetype_Ref_Type (void);
-
-  /// Get the value
-  TAO_PSDL_Node *key_word (void) const;
-  TAO_PSDL_Node *abs_storagetype_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *key_word_;
-  TAO_PSDL_Node *abs_storagetype_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagehome : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagehome (TAO_PSDL_Node *abs_storagehome_dcl);
-
-  virtual ~TAO_PSDL_Abstract_Storagehome (void);
-
-  /// Get the value
-  TAO_PSDL_Node *abs_storagehome_dcl (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *abs_storagehome_dcl_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagehome_Fwd_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagehome_Fwd_Dcl (TAO_PSDL_Node *identifier);
-
-  virtual ~TAO_PSDL_Abstract_Storagehome_Fwd_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *identifier_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagehome_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagehome_Dcl (TAO_PSDL_Node *abs_storagehome_header);
-
-  TAO_PSDL_Abstract_Storagehome_Dcl (TAO_PSDL_Node *abs_storagehome_header,
-                                     TAO_PSDL_Node *abs_storagehome_body);
-
-  virtual ~TAO_PSDL_Abstract_Storagehome_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *abs_storagehome_header (void) const;
-  TAO_PSDL_Node *abs_storagehome_body (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *abs_storagehome_header_;
-  TAO_PSDL_Node *abs_storagehome_body_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagehome_Header : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagehome_Header (TAO_PSDL_Node *identifier,
-                                        TAO_PSDL_Node *abs_storagetype_name);
-
-  TAO_PSDL_Abstract_Storagehome_Header (TAO_PSDL_Node *identifier,
-                                        TAO_PSDL_Node *abs_storagetype_name,
-                                        TAO_PSDL_Node *abs_storagehome_inh_spec);
-
-  virtual ~TAO_PSDL_Abstract_Storagehome_Header (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *abs_storagetype_name (void) const;
-  TAO_PSDL_Node *abs_storagehome_inh_spec (void) const;
-
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *abs_storagetype_name_;
-  TAO_PSDL_Node *abs_storagehome_inh_spec_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagehome_Body : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagehome_Body ();
-
-  TAO_PSDL_Abstract_Storagehome_Body (TAO_PSDL_Node *abs_storagehome_member);
-
-  TAO_PSDL_Abstract_Storagehome_Body (TAO_PSDL_Node *abs_storagehome_member,
-                                      TAO_PSDL_Node *abs_storagehome_body);
-
-  virtual ~TAO_PSDL_Abstract_Storagehome_Body (void);
-
-  /// Get the value
-  TAO_PSDL_Node *abs_storagehome_member (void) const;
-  TAO_PSDL_Node *abs_storagehome_body (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *abs_storagehome_member_;
-  TAO_PSDL_Node *abs_storagehome_body_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagehome_Member : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagehome_Member (TAO_PSDL_Node *declaration_type);
-
-  virtual ~TAO_PSDL_Abstract_Storagehome_Member (void);
-
-  /// Get the value
-  TAO_PSDL_Node *declaration_type (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *declaration_type_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagehome_Inh_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagehome_Inh_Spec (TAO_PSDL_Node *abs_storagehome_name);
-
-  virtual ~TAO_PSDL_Abstract_Storagehome_Inh_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *abs_storagehome_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *abs_storagehome_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Abstract_Storagehome_Name : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Abstract_Storagehome_Name (TAO_PSDL_Node *scoped_name);
-
-  TAO_PSDL_Abstract_Storagehome_Name (TAO_PSDL_Node *scoped_name,
-                                      TAO_PSDL_Node *abs_storagehome_name);
-
-  virtual ~TAO_PSDL_Abstract_Storagehome_Name (void);
-
-  /// Get the value
-  TAO_PSDL_Node *scoped_name (void) const;
-  TAO_PSDL_Node *abs_storagehome_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *scoped_name_;
-  TAO_PSDL_Node *abs_storagehome_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Local_Op_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Local_Op_Dcl (TAO_PSDL_Node *op_type_spec,
-                         TAO_PSDL_Node *identifier,
-                         TAO_PSDL_Node *parameter_dcls,
-                         TAO_PSDL_Node *raises_expr);
-
-  TAO_PSDL_Local_Op_Dcl (TAO_PSDL_Node *op_type_spec,
-                         TAO_PSDL_Node *identifier,
-                         TAO_PSDL_Node *parameter_dcls);
-
-  virtual ~TAO_PSDL_Local_Op_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *op_type_spec (void) const;
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *parameter_dcls (void) const;
-  TAO_PSDL_Node *raises_expr (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *op_type_spec_;
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *parameter_dcls_;
-  TAO_PSDL_Node *raises_expr_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Key_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Key_Dcl (TAO_PSDL_Node *identifier,
-                    TAO_PSDL_Node *simple_declarator);
-
-  TAO_PSDL_Key_Dcl (TAO_PSDL_Node *identifier);
-
-  virtual ~TAO_PSDL_Key_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *simple_declarator (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *simple_declarator_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Catalog : public TAO_PSDL_Node
-{
-public:
-  TAO_PSDL_Catalog (TAO_PSDL_Node *identifier);
-
-  TAO_PSDL_Catalog (TAO_PSDL_Node *identifier,
-                    TAO_PSDL_Node *catalog_inh_spec,
-                    TAO_PSDL_Node *catalog_body);
-
-  TAO_PSDL_Catalog (TAO_PSDL_Node *identifier,
-                    TAO_PSDL_Node *catalog_body);
-
-  virtual ~TAO_PSDL_Catalog (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *catalog_inh_spec (void) const;
-  TAO_PSDL_Node *catalog_body (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *catalog_inh_spec_;
-  TAO_PSDL_Node *catalog_body_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Catalog_Inh_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Catalog_Inh_Spec (TAO_PSDL_Node *catalog_name);
-
-  virtual ~TAO_PSDL_Catalog_Inh_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *catalog_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *catalog_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Catalog_Name : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Catalog_Name (TAO_PSDL_Node *scoped_name);
-  TAO_PSDL_Catalog_Name (TAO_PSDL_Node *scoped_name,
-                         TAO_PSDL_Node *catalog_name);
-
-  virtual ~TAO_PSDL_Catalog_Name (void);
-
-  /// Get the value
-  TAO_PSDL_Node *scoped_name (void) const;
-  TAO_PSDL_Node *catalog_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *scoped_name_;
-  TAO_PSDL_Node *catalog_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Catalog_Body : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Catalog_Body ();
-  TAO_PSDL_Catalog_Body (TAO_PSDL_Node *catalog_member);
-  TAO_PSDL_Catalog_Body (TAO_PSDL_Node *catalog_member,
-                         TAO_PSDL_Node *catalog_body);
-
-  virtual ~TAO_PSDL_Catalog_Body (void);
-
-  /// Get the value
-  TAO_PSDL_Node *catalog_member (void) const;
-  TAO_PSDL_Node *catalog_body (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *catalog_member_;
-  TAO_PSDL_Node *catalog_body_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Catalog_Member : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Catalog_Member (TAO_PSDL_Node *declaration);
-
-  virtual ~TAO_PSDL_Catalog_Member (void);
-
-  /// Get the value
-  TAO_PSDL_Node *declaration (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *declaration_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Provides_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Provides_Dcl (TAO_PSDL_Node *abs_storagehome_name,
-                         TAO_PSDL_Node *simple_declarator);
-
-  virtual ~TAO_PSDL_Provides_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *abs_storagehome_name (void) const;
-  TAO_PSDL_Node *simple_declarator (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *abs_storagehome_name_;
-  TAO_PSDL_Node *simple_declarator_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagetype : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagetype (TAO_PSDL_Node *declaration);
-
-  virtual ~TAO_PSDL_Storagetype (void);
-
-  /// Get the value
-  TAO_PSDL_Node *declaration (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *declaration_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagetype_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagetype_Dcl (TAO_PSDL_Node *storagetype_header);
-
-  TAO_PSDL_Storagetype_Dcl (TAO_PSDL_Node *storagetype_header,
-                            TAO_PSDL_Node *storagetype_body);
-
-  virtual ~TAO_PSDL_Storagetype_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *storagetype_header (void) const;
-  TAO_PSDL_Node *storagetype_body (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *storagetype_header_;
-  TAO_PSDL_Node *storagetype_body_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagetype_Fwd_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagetype_Fwd_Dcl (TAO_PSDL_Node *identifier);
-
-  virtual ~TAO_PSDL_Storagetype_Fwd_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *identifier_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagetype_Header : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagetype_Header (TAO_PSDL_Node *identifier,
-                               TAO_PSDL_Node *storagetype_inh_spec,
-                               TAO_PSDL_Node *storagetype_impl_spec);
-
-  TAO_PSDL_Storagetype_Header (TAO_PSDL_Node *identifier,
-                               TAO_PSDL_Node *storagetype_inh_spec);
-
-  TAO_PSDL_Storagetype_Header (TAO_PSDL_Node *identifier);
-
-  virtual ~TAO_PSDL_Storagetype_Header (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *storagetype_inh_spec (void) const;
-  TAO_PSDL_Node *storagetype_impl_spec (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *storagetype_inh_spec_;
-  TAO_PSDL_Node *storagetype_impl_spec_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagetype_Body : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagetype_Body ();
-
-  TAO_PSDL_Storagetype_Body (TAO_PSDL_Node *storagetype_member);
-
-  TAO_PSDL_Storagetype_Body (TAO_PSDL_Node *storagetype_member,
-                             TAO_PSDL_Node *storagetype_body);
-
-  virtual ~TAO_PSDL_Storagetype_Body (void);
-
-  /// Get the value
-  TAO_PSDL_Node *storagetype_member (void) const;
-  TAO_PSDL_Node *storagetype_body (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *storagetype_member_;
-  TAO_PSDL_Node *storagetype_body_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagetype_Member : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagetype_Member (TAO_PSDL_Node *declaration);
-
-  virtual ~TAO_PSDL_Storagetype_Member (void);
-
-  /// Get the value
-  TAO_PSDL_Node *declaration (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *declaration_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagetype_Inh_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagetype_Inh_Spec (TAO_PSDL_Node *storagetype_name);
-
-  virtual ~TAO_PSDL_Storagetype_Inh_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *storagetype_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *storagetype_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagetype_Name : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagetype_Name (TAO_PSDL_Node *scoped_name);
-
-  virtual ~TAO_PSDL_Storagetype_Name (void);
-
-  /// Get the value
-  TAO_PSDL_Node *scoped_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *scoped_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagetype_Impl_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagetype_Impl_Spec (TAO_PSDL_Node *abstract_storagetype_name);
-
-  virtual ~TAO_PSDL_Storagetype_Impl_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *abstract_storagetype_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *abstract_storagetype_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagetype_Ref_Type : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagetype_Ref_Type (TAO_PSDL_Node *storagetype_name);
-
-  virtual ~TAO_PSDL_Storagetype_Ref_Type (void);
-
-  /// Get the value
-  TAO_PSDL_Node *storagetype_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *storagetype_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagehome_Scope : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagehome_Scope (TAO_PSDL_Node *storagehome_name);
-
-  virtual ~TAO_PSDL_Storagehome_Scope (void);
-
-  /// Get the value
-  TAO_PSDL_Node *storagehome_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *storagehome_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Store_Directive : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Store_Directive (TAO_PSDL_Node *simple_declarator,
-                            TAO_PSDL_Node *psdl_concrete_state_type,
-                            TAO_PSDL_Node *storagehome_scope);
-
-  TAO_PSDL_Store_Directive (TAO_PSDL_Node *simple_declarator,
-                            TAO_PSDL_Node *psdl_concrete_state_type);
-
-  virtual ~TAO_PSDL_Store_Directive (void);
-
-  /// Get the value
-  TAO_PSDL_Node *simple_declarator (void) const;
-  TAO_PSDL_Node *psdl_concrete_state_type (void) const;
-  TAO_PSDL_Node *storagehome_scope (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *simple_declarator_;
-  TAO_PSDL_Node *psdl_concrete_state_type_;
-  TAO_PSDL_Node *storagehome_scope_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Psdl_Concrete_State_Type : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Psdl_Concrete_State_Type (TAO_PSDL_Node *storagetype);
-
-  virtual ~TAO_PSDL_Psdl_Concrete_State_Type (void);
-
-  /// Get the value
-  TAO_PSDL_Node *storagetype (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *storagetype_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Ref_Rep_Directive : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Ref_Rep_Directive (TAO_PSDL_Node *simple_declarator);
-
-  virtual ~TAO_PSDL_Ref_Rep_Directive (void);
-
-  /// Get the value
-  TAO_PSDL_Node *simple_declarator (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *simple_declarator_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagehome : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagehome (TAO_PSDL_Node *storagehome_header);
-
-  TAO_PSDL_Storagehome (TAO_PSDL_Node *storagehome_header,
-                        TAO_PSDL_Node *storagehome_body);
-
-  virtual ~TAO_PSDL_Storagehome (void);
-
-  /// Get the value
-  TAO_PSDL_Node *storagehome_header (void) const;
-  TAO_PSDL_Node *storagehome_body (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *storagehome_header_;
-  TAO_PSDL_Node *storagehome_body_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagehome_Header : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagehome_Header (TAO_PSDL_Node *identifier,
-                               TAO_PSDL_Node *storagetype_name,
-                               TAO_PSDL_Node *storagehome_inh_spec,
-                               TAO_PSDL_Node *storagehome_impl_spec);
-
-  TAO_PSDL_Storagehome_Header (TAO_PSDL_Node *identifier,
-                               TAO_PSDL_Node *storagetype_name,
-                               TAO_PSDL_Node *storagehome_inh_spec);
-
-  TAO_PSDL_Storagehome_Header (TAO_PSDL_Node *identifier,
-                               TAO_PSDL_Node *storagetype_name);
-
-  virtual ~TAO_PSDL_Storagehome_Header (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *storagetype_name (void) const;
-  TAO_PSDL_Node *storagehome_inh_spec (void) const;
-  TAO_PSDL_Node *storagehome_impl_spec (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *storagetype_name_;
-  TAO_PSDL_Node *storagehome_inh_spec_;
-  TAO_PSDL_Node *storagehome_impl_spec_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagehome_Body : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagehome_Body ();
-
-  TAO_PSDL_Storagehome_Body (TAO_PSDL_Node *storagehome_member);
-
-  TAO_PSDL_Storagehome_Body (TAO_PSDL_Node *storagehome_member,
-                             TAO_PSDL_Node *storagehome_body);
-
-  virtual ~TAO_PSDL_Storagehome_Body (void);
-
-  /// Get the value
-  TAO_PSDL_Node *storagehome_member (void) const;
-  TAO_PSDL_Node *storagehome_body (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *storagehome_member_;
-  TAO_PSDL_Node *storagehome_body_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagehome_Member : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagehome_Member (TAO_PSDL_Node *key_dcl);
-
-  virtual ~TAO_PSDL_Storagehome_Member (void);
-
-  /// Get the value
-  TAO_PSDL_Node *key_dcl (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *key_dcl_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagehome_Inh_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagehome_Inh_Spec (TAO_PSDL_Node *storagehome_name);
-
-  virtual ~TAO_PSDL_Storagehome_Inh_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *storagehome_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *storagehome_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagehome_Name : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagehome_Name (TAO_PSDL_Node *scoped_name);
-
-  virtual ~TAO_PSDL_Storagehome_Name (void);
-
-  /// Get the value
-  TAO_PSDL_Node *scoped_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *scoped_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Storagehome_Impl_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Storagehome_Impl_Spec (TAO_PSDL_Node *abstract_storagehome_name);
-
-  virtual ~TAO_PSDL_Storagehome_Impl_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *abstract_storagehome_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *abstract_storagehome_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Primary_Key_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Primary_Key_Dcl ();
-
-  TAO_PSDL_Primary_Key_Dcl (TAO_PSDL_Node *identifier);
-
-  virtual ~TAO_PSDL_Primary_Key_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *identifier_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Identifier : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Identifier (char *value);
-
-  TAO_PSDL_Identifier (int value_type);
-
-  virtual ~TAO_PSDL_Identifier (void);
-
-  /// Get the value
-  char *value (void) const;
-
-  int value_type (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  char *value_;
-  int value_type_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Type_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Type_Dcl (TAO_PSDL_Node *type_of_type_dcl);
-
-  TAO_PSDL_Type_Dcl (int key_word,
-                     TAO_PSDL_Node *type_of_type_dcl);
-
-  virtual ~TAO_PSDL_Type_Dcl (void);
-
-  /// Get the value
-  int key_word (void) const;
-  TAO_PSDL_Node *type_of_type_dcl (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  int key_word_;
-  TAO_PSDL_Node *type_of_type_dcl_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Type_Declarator : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Type_Declarator (TAO_PSDL_Node *type_spec,
-                            TAO_PSDL_Node *declarators);
-
-  virtual ~TAO_PSDL_Type_Declarator (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_spec (void) const;
-  TAO_PSDL_Node *declarators (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_spec_;
-  TAO_PSDL_Node *declarators_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Type_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Type_Spec (TAO_PSDL_Node *type_of_type_spec);
-
-  virtual ~TAO_PSDL_Type_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_of_type_spec (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_of_type_spec_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Simple_Type_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Simple_Type_Spec (TAO_PSDL_Node *type_of_simple_type_spec);
-
-  virtual ~TAO_PSDL_Simple_Type_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_of_simple_type_spec (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_of_simple_type_spec_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Base_Type_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Base_Type_Spec (TAO_PSDL_Node *type_of_base_type_spec);
-
-  virtual ~TAO_PSDL_Base_Type_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_of_base_type_spec (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_of_base_type_spec_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Template_Type_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Template_Type_Spec (TAO_PSDL_Node *type_of_template_type_spec);
-
-  virtual ~TAO_PSDL_Template_Type_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_of_template_type_spec (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_of_template_type_spec_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Constr_Type_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Constr_Type_Spec (TAO_PSDL_Node *type_of_constr_type_spec);
-
-  virtual ~TAO_PSDL_Constr_Type_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_of_constr_type_spec (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_of_constr_type_spec_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Declarators : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Declarators (TAO_PSDL_Node *declarator);
-
-  TAO_PSDL_Declarators (TAO_PSDL_Node *declarator,
-                        TAO_PSDL_Node *set_of_declarators);
-
-  virtual ~TAO_PSDL_Declarators (void);
-
-  /// Get the value
-  TAO_PSDL_Node *declarator (void) const;
-  TAO_PSDL_Node *set_of_declarators (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *declarator_;
-  TAO_PSDL_Node *set_of_declarators_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Declarator : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Declarator (TAO_PSDL_Node *type_of_declarator);
-
-  virtual ~TAO_PSDL_Declarator (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_of_declarator (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_of_declarator_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Simple_Declarator : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Simple_Declarator (TAO_PSDL_Node *identifier);
-  TAO_PSDL_Simple_Declarator (TAO_PSDL_Node *identifier,
-                              TAO_PSDL_Node *simple_declarator);
-
-  virtual ~TAO_PSDL_Simple_Declarator (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *simple_declarator (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *simple_declarator_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Simple_Declarator_List : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Simple_Declarator_List (TAO_PSDL_Node *simple_declarator);
-
-  TAO_PSDL_Simple_Declarator_List (TAO_PSDL_Node *simple_declarator_list,
-                                   TAO_PSDL_Node *simple_declarator);
-
-  virtual ~TAO_PSDL_Simple_Declarator_List (void);
-
-  /// Get the value
-  TAO_PSDL_Node *simple_declarator_list (void) const;
-  TAO_PSDL_Node *simple_declarator (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *simple_declarator_list_;
-  TAO_PSDL_Node *simple_declarator_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Complex_Declarator : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Complex_Declarator (TAO_PSDL_Node *array_declarator);
-
-  virtual ~TAO_PSDL_Complex_Declarator (void);
-
-  /// Get the value
-  TAO_PSDL_Node *array_declarator (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *array_declarator_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Predefined_Type : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Predefined_Type (int type_one);
-
-  TAO_PSDL_Predefined_Type (int type_one,
-                            int type_two);
-
-  TAO_PSDL_Predefined_Type (int type_one,
-                            int type_two,
-                            int type_three);
-
-  TAO_PSDL_Predefined_Type (int type_one,
-                            TAO_PSDL_Node *type_of_variable_one);
-
-  TAO_PSDL_Predefined_Type (TAO_PSDL_Node *type_of_variable_one);
-
-  TAO_PSDL_Predefined_Type (int type_one,
-                            TAO_PSDL_Node *type_of_variable_one,
-                            TAO_PSDL_Node *type_of_variable_two);
-
-  TAO_PSDL_Predefined_Type (TAO_PSDL_Node *type_of_variable_one,
-                            TAO_PSDL_Node *type_of_variable_two);
-
-  TAO_PSDL_Predefined_Type (TAO_PSDL_Node *type_of_variable_one,
-                            TAO_PSDL_Node *type_of_variable_two,
-                            TAO_PSDL_Node *type_of_variable_three);
-
-  virtual ~TAO_PSDL_Predefined_Type (void);
-
-  /// Get the value
-  int type_one (void) const;
-  int type_two (void) const;
-  int type_three (void) const;
-  TAO_PSDL_Node *type_of_variable_one (void) const;
-  TAO_PSDL_Node *type_of_variable_two (void) const;
-  TAO_PSDL_Node *type_of_variable_three (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  int type_one_;
-  int type_two_;
-  int type_three_;
-
-  TAO_PSDL_Node *type_of_variable_one_;
-  TAO_PSDL_Node *type_of_variable_two_;
-  TAO_PSDL_Node *type_of_variable_three_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Member_List : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Member_List (TAO_PSDL_Node *member);
-  TAO_PSDL_Member_List (TAO_PSDL_Node *member,
-                        TAO_PSDL_Node *member_list);
-
-  virtual ~TAO_PSDL_Member_List (void);
-
-  /// Get the value
-  TAO_PSDL_Node *member (void) const;
-  TAO_PSDL_Node *member_list (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *member_;
-  TAO_PSDL_Node *member_list_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Member : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Member (TAO_PSDL_Node *type_spec,
-                   TAO_PSDL_Node *declarators);
-
-  virtual ~TAO_PSDL_Member (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_spec (void) const;
-  TAO_PSDL_Node *declarators (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_spec_;
-  TAO_PSDL_Node *declarators_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Union_Type : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Union_Type (TAO_PSDL_Node *identifier,
-                       TAO_PSDL_Node *switch_type_spec,
-                       TAO_PSDL_Node *switch_body);
-
-  virtual ~TAO_PSDL_Union_Type (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *switch_type_spec (void) const;
-  TAO_PSDL_Node *switch_body (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *switch_type_spec_;
-  TAO_PSDL_Node *switch_body_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Switch_Type_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Switch_Type_Spec (TAO_PSDL_Node *type);
-
-  virtual ~TAO_PSDL_Switch_Type_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Switch_Body : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Switch_Body (TAO_PSDL_Node *switch_case);
-
-  TAO_PSDL_Switch_Body (TAO_PSDL_Node *switch_case,
-                        TAO_PSDL_Node *switch_body);
-
-  virtual ~TAO_PSDL_Switch_Body (void);
-
-  /// Get the value
-  TAO_PSDL_Node *switch_case (void) const;
-  TAO_PSDL_Node *switch_body (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *switch_case_;
-  TAO_PSDL_Node *switch_body_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Case : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Case (TAO_PSDL_Node *case_label,
-                 TAO_PSDL_Node *element_spec);
-
-  virtual ~TAO_PSDL_Case (void);
-
-  /// Get the value
-  TAO_PSDL_Node *case_label (void) const;
-  TAO_PSDL_Node *element_spec (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *case_label_;
-  TAO_PSDL_Node *element_spec_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Case_Label : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Case_Label (TAO_PSDL_Node * type);
-
-  TAO_PSDL_Case_Label (TAO_PSDL_Node * type,
-                       TAO_PSDL_Node *const_exp);
-
-  TAO_PSDL_Case_Label (TAO_PSDL_Node * type,
-                       TAO_PSDL_Node *const_exp,
-                       TAO_PSDL_Node *case_label);
-
-  virtual ~TAO_PSDL_Case_Label (void);
-
-  /// Get the value
-  TAO_PSDL_Node * type (void) const;
-  TAO_PSDL_Node *const_exp (void) const;
-  TAO_PSDL_Node *case_label (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node * type_;
-  TAO_PSDL_Node *const_exp_;
-  TAO_PSDL_Node *case_label_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Element_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Element_Spec (TAO_PSDL_Node *type_spec,
-                         TAO_PSDL_Node *declarator);
-
-  virtual ~TAO_PSDL_Element_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_spec (void) const;
-  TAO_PSDL_Node *declarator (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_spec_;
-  TAO_PSDL_Node *declarator_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Const_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Const_Dcl (TAO_PSDL_Node *const_type,
-                      TAO_PSDL_Node *identifier,
-                      TAO_PSDL_Node *const_exp);
-
-  virtual ~TAO_PSDL_Const_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *const_type (void) const;
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *const_exp (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *const_type_;
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *const_exp_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Const_Type : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Const_Type (TAO_PSDL_Node *type);
-
-  virtual ~TAO_PSDL_Const_Type (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Const_Exp : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Const_Exp (TAO_PSDL_Node *expr);
-
-  virtual ~TAO_PSDL_Const_Exp (void);
-
-  /// Get the value
-  TAO_PSDL_Node *expr (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *expr_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Or_Expr : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Or_Expr (TAO_PSDL_Node *xor_expr);
-  TAO_PSDL_Or_Expr (TAO_PSDL_Node *or_expr,
-                   TAO_PSDL_Node *xor_expr);
-
-  virtual ~TAO_PSDL_Or_Expr (void);
-
-  /// Get the value
-  TAO_PSDL_Node *or_expr (void) const;
-  TAO_PSDL_Node *xor_expr (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *or_expr_;
-  TAO_PSDL_Node *xor_expr_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Xor_Expr : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Xor_Expr (TAO_PSDL_Node *and_expr);
-  TAO_PSDL_Xor_Expr (TAO_PSDL_Node *xor_expr,
-                   TAO_PSDL_Node *and_expr);
-
-  virtual ~TAO_PSDL_Xor_Expr (void);
-
-  /// Get the value
-  TAO_PSDL_Node *xor_expr (void) const;
-  TAO_PSDL_Node *and_expr (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *xor_expr_;
-  TAO_PSDL_Node *and_expr_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_And_Expr : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_And_Expr (TAO_PSDL_Node *shift_expr);
-  TAO_PSDL_And_Expr (TAO_PSDL_Node *and_expr,
-                     TAO_PSDL_Node *shift_expr);
-
-  virtual ~TAO_PSDL_And_Expr (void);
-
-  /// Get the value
-  TAO_PSDL_Node *and_expr (void) const;
-  TAO_PSDL_Node *shift_expr (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *and_expr_;
-  TAO_PSDL_Node *shift_expr_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Shift_Expr : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Shift_Expr (TAO_PSDL_Node *add_expr);
-
-  TAO_PSDL_Shift_Expr (TAO_PSDL_Node *shift_expr,
-                       TAO_PSDL_Node * type,
-                       TAO_PSDL_Node *add_expr);
-
-  virtual ~TAO_PSDL_Shift_Expr (void);
-
-  /// Get the value
-  TAO_PSDL_Node * type (void) const;
-  TAO_PSDL_Node *add_expr (void) const;
-  TAO_PSDL_Node *shift_expr (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *shift_expr_;
-  TAO_PSDL_Node * type_;
-  TAO_PSDL_Node *add_expr_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Add_Expr : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Add_Expr (TAO_PSDL_Node *mult_expr);
-  TAO_PSDL_Add_Expr (TAO_PSDL_Node *add_expr,
-                     TAO_PSDL_Node * type,
-                     TAO_PSDL_Node *mult_expr);
-
-  virtual ~TAO_PSDL_Add_Expr (void);
-
-  /// Get the value
-  TAO_PSDL_Node * type (void) const;
-  TAO_PSDL_Node *add_expr (void) const;
-  TAO_PSDL_Node *mult_expr (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *add_expr_;
-  TAO_PSDL_Node * type_;
-  TAO_PSDL_Node *mult_expr_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Mult_Expr : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Mult_Expr (TAO_PSDL_Node *unary_expr);
-
-  TAO_PSDL_Mult_Expr (TAO_PSDL_Node *mult_expr,
-                      TAO_PSDL_Node *unary_expr);
-
-  TAO_PSDL_Mult_Expr (TAO_PSDL_Node *mult_expr,
-                      TAO_PSDL_Node * type,
-                      TAO_PSDL_Node *unary_expr);
-
-  virtual ~TAO_PSDL_Mult_Expr (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type (void) const;
-  TAO_PSDL_Node *unary_expr (void) const;
-  TAO_PSDL_Node *mult_expr (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *mult_expr_;
-  TAO_PSDL_Node * type_;
-  TAO_PSDL_Node *unary_expr_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Unary_Expr : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Unary_Expr (TAO_PSDL_Node *unary_operator,
-                       TAO_PSDL_Node *primary_expr);
-
-  TAO_PSDL_Unary_Expr (TAO_PSDL_Node *primary_expr);
-
-  virtual ~TAO_PSDL_Unary_Expr (void);
-
-  /// Get the value
-  TAO_PSDL_Node *unary_operator (void) const;
-  TAO_PSDL_Node *primary_expr (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *unary_operator_;
-  TAO_PSDL_Node *primary_expr_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Primary_Expr : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Primary_Expr (TAO_PSDL_Node *type_of_primary_expr);
-
-  virtual ~TAO_PSDL_Primary_Expr (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_of_primary_expr (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_of_primary_expr_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Except_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Except_Dcl (TAO_PSDL_Node *identifier);
-
-  TAO_PSDL_Except_Dcl (TAO_PSDL_Node *identifier,
-                       TAO_PSDL_Node *member_list);
-
-  virtual ~TAO_PSDL_Except_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *member_list (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *member_list_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Op_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Op_Dcl (TAO_PSDL_Node *op_attribute,
-                   TAO_PSDL_Node *op_type_spec,
-                   TAO_PSDL_Node *identifier,
-                   TAO_PSDL_Node * parameter_dcls,
-                   TAO_PSDL_Node * raises_expr,
-                   TAO_PSDL_Node * context_expr);
-
-  TAO_PSDL_Op_Dcl (TAO_PSDL_Node *op_type_spec,
-                   TAO_PSDL_Node *identifier,
-                   TAO_PSDL_Node * parameter_dcls,
-                   TAO_PSDL_Node * raises_expr,
-                   TAO_PSDL_Node * context_expr);
-
-  TAO_PSDL_Op_Dcl (TAO_PSDL_Node *op_type_spec,
-                   TAO_PSDL_Node *identifier,
-                   TAO_PSDL_Node * parameter_dcls,
-                   TAO_PSDL_Node * raises_expr);
-
-  /*
-   Other kinds of similar constructors.
-
-   TAO_PSDL_Op_Dcl (TAO_PSDL_Node *op_attribute,
-                    TAO_PSDL_Node *op_type_spec,
-                    TAO_PSDL_Node *identifier,
-                    TAO_PSDL_Node * parameter_dcls,
-                    TAO_PSDL_Node * raises_expr);
-
-  TAO_PSDL_Op_Dcl (TAO_PSDL_Node *op_attribute,
-                   TAO_PSDL_Node *op_type_spec,
-                   TAO_PSDL_Node *identifier,
-                   TAO_PSDL_Node * parameter_dcls,
-                   TAO_PSDL_Node * context_expr);
-  */
-
-  TAO_PSDL_Op_Dcl (TAO_PSDL_Node *op_type_spec,
-                   TAO_PSDL_Node *identifier,
-                   TAO_PSDL_Node * parameter_dcls);
-
-  virtual ~TAO_PSDL_Op_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *op_attribute (void) const;
-  TAO_PSDL_Node *op_type_spec (void) const;
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node * parameter_dcls (void) const;
-  TAO_PSDL_Node * raises_expr (void) const;
-  TAO_PSDL_Node * context_expr (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *op_attribute_;
-  TAO_PSDL_Node *op_type_spec_;
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node * parameter_dcls_;
-  TAO_PSDL_Node * raises_expr_;
-  TAO_PSDL_Node * context_expr_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Op_Type_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Op_Type_Spec (TAO_PSDL_Node *type_spec);
-
-  TAO_PSDL_Op_Type_Spec (int type);
-
-  virtual ~TAO_PSDL_Op_Type_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_spec (void) const;
-  int type (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node * type_spec_;
-  int type_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Parameter_Dcls : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Parameter_Dcls ();
-  TAO_PSDL_Parameter_Dcls (TAO_PSDL_Node *param_dcl);
-
-  virtual ~TAO_PSDL_Parameter_Dcls (void);
-
-  /// Get the value
-  TAO_PSDL_Node *param_dcl (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *param_dcl_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Param_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Param_Dcl (TAO_PSDL_Node *param_attribute,
-                      TAO_PSDL_Node *param_type_spec,
-                      TAO_PSDL_Node *simple_declarator);
-
-  TAO_PSDL_Param_Dcl (TAO_PSDL_Node *param_attribute,
-                      TAO_PSDL_Node *param_type_spec,
-                      TAO_PSDL_Node *simple_declarator,
-                      TAO_PSDL_Node *param_dcl);
-
-  virtual ~TAO_PSDL_Param_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *param_attribute (void) const;
-  TAO_PSDL_Node *param_type_spec (void) const;
-  TAO_PSDL_Node *simple_declarator (void) const;
-  TAO_PSDL_Node *param_dcl (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *param_attribute_;
-  TAO_PSDL_Node *param_type_spec_;
-  TAO_PSDL_Node *simple_declarator_;
-  TAO_PSDL_Node *param_dcl_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Raises_Expr : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Raises_Expr (TAO_PSDL_Node *first_scoped_name);
-
-  TAO_PSDL_Raises_Expr (TAO_PSDL_Node *first_scoped_name,
-                        TAO_PSDL_Node *second_scoped_name);
-
-  virtual ~TAO_PSDL_Raises_Expr (void);
-
-  /// Get the value
-  TAO_PSDL_Node *first_scoped_name (void) const;
-  TAO_PSDL_Node *second_scoped_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *first_scoped_name_;
-  TAO_PSDL_Node *second_scoped_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Context_Expr : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Context_Expr (TAO_PSDL_Node *string_literal);
-
-  virtual ~TAO_PSDL_Context_Expr (void);
-
-  /// Get the value
-  TAO_PSDL_Node *string_literal (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *string_literal_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Param_Type_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Param_Type_Spec (TAO_PSDL_Node *type_of_param);
-
-  virtual ~TAO_PSDL_Param_Type_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_of_param (void) const;
-
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_of_param_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Fixed_Pt_Type : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Fixed_Pt_Type (TAO_PSDL_Node *positive_int_const_one,
-                          TAO_PSDL_Node *positive_int_const_two);
-
-  virtual ~TAO_PSDL_Fixed_Pt_Type (void);
-
-  /// Get the value
-  TAO_PSDL_Node *positive_int_const_one (void) const;
-  TAO_PSDL_Node *positive_int_const_two (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *positive_int_const_one_;
-  TAO_PSDL_Node *positive_int_const_two_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Constr_Forward_Decl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Constr_Forward_Decl (TAO_PSDL_Node * type,
-                                TAO_PSDL_Node *identifier);
-
-  virtual ~TAO_PSDL_Constr_Forward_Decl (void);
-
-  /// Get the value
-  TAO_PSDL_Node * type (void) const;
-  TAO_PSDL_Node *identifier (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node * type_;
-  TAO_PSDL_Node *identifier_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Interface : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Interface (TAO_PSDL_Node *type_of_dcl);
-
-  virtual ~TAO_PSDL_Interface (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_of_dcl (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *type_of_dcl_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Interface_Body : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Interface_Body (TAO_PSDL_Node *export_variable);
-
-  TAO_PSDL_Interface_Body (TAO_PSDL_Node *export_variable,
-                           TAO_PSDL_Node *interface_body);
-
-  virtual ~TAO_PSDL_Interface_Body (void);
-
-  /// Get the value
-  TAO_PSDL_Node *export_variable (void) const;
-  TAO_PSDL_Node *interface_body (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-  /// The values
-  TAO_PSDL_Node *export_variable_;
-  TAO_PSDL_Node *interface_body_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Interface_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Interface_Dcl (TAO_PSDL_Node *interface_header);
-
-  TAO_PSDL_Interface_Dcl (TAO_PSDL_Node *interface_header,
-                          TAO_PSDL_Node *interface_body);
-
-  virtual ~TAO_PSDL_Interface_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *interface_header (void) const;
-  TAO_PSDL_Node *interface_body (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *interface_header_;
-  TAO_PSDL_Node *interface_body_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Forward_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Forward_Dcl (TAO_PSDL_Node *identifier);
-
-  TAO_PSDL_Forward_Dcl (int type,
-                        TAO_PSDL_Node *identifier);
-
-  virtual ~TAO_PSDL_Forward_Dcl (void);
-
-  /// Get the value
-  int type (void) const;
-  TAO_PSDL_Node *identifier (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  int type_;
-  TAO_PSDL_Node *identifier_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Interface_Header : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Interface_Header (TAO_PSDL_Node *identifier);
-
-  TAO_PSDL_Interface_Header (TAO_PSDL_Node * type,
-                             TAO_PSDL_Node *identifier);
-
-  TAO_PSDL_Interface_Header (TAO_PSDL_Node * type,
-                             TAO_PSDL_Node *identifier,
-                             TAO_PSDL_Node *interface_inheritance_spec);
-
-  /*
-     Other Possible values.
-     TAO_PSDL_Interface_Header (TAO_PSDL_Node *identifier,
-                                TAO_PSDL_Node *interface_inheritance_spec);
-  */
-
-  virtual ~TAO_PSDL_Interface_Header (void);
-
-  /// Get the value
-  TAO_PSDL_Node * type (void) const;
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *interface_inheritance_spec (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-
-  /// the value of type can be either type_ or
-  /// interface_inheritance_spec_ if interface_inheritance_spec_ is
-  /// zero. If it is not zero, everything is straight forward.
-  TAO_PSDL_Node * type_;
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *interface_inheritance_spec_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Export_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Export_Dcl (TAO_PSDL_Node *type_of_export_one);
-
-  TAO_PSDL_Export_Dcl (TAO_PSDL_Node *type_of_export_one,
-                       TAO_PSDL_Node *type_of_export_two);
-
-  virtual ~TAO_PSDL_Export_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_of_export_one (void) const;
-  TAO_PSDL_Node *type_of_export_two (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *type_of_export_one_;
-  TAO_PSDL_Node *type_of_export_two_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Interface_Inheritance_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Interface_Inheritance_Spec (TAO_PSDL_Node *interface_name);
-
-  virtual ~TAO_PSDL_Interface_Inheritance_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *interface_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *interface_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Interface_Name : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Interface_Name (TAO_PSDL_Node *scoped_name);
-  TAO_PSDL_Interface_Name (TAO_PSDL_Node *scoped_name,
-                           TAO_PSDL_Node *interface_name);
-
-  virtual ~TAO_PSDL_Interface_Name (void);
-
-  /// Get the value
-  TAO_PSDL_Node *scoped_name (void) const;
-  TAO_PSDL_Node *interface_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *scoped_name_;
-  TAO_PSDL_Node *interface_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Scoped_Name : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Scoped_Name (TAO_PSDL_Node *identifier);
-  TAO_PSDL_Scoped_Name (TAO_PSDL_Node *scoped_name,
-                        TAO_PSDL_Node *identifier);
-
-  virtual ~TAO_PSDL_Scoped_Name (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *scoped_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *scoped_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Value : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Value (TAO_PSDL_Node *type_of_value_dcl);
-  virtual ~TAO_PSDL_Value (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_of_value_dcl (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *type_of_value_dcl_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Value_Common_Base : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Value_Common_Base (TAO_PSDL_Node *identifier);
-  virtual ~TAO_PSDL_Value_Common_Base (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *identifier_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Value_Forward_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Value_Forward_Dcl (TAO_PSDL_Node *value_common_base);
-  TAO_PSDL_Value_Forward_Dcl (TAO_PSDL_Node *abstract,
-                              TAO_PSDL_Node *value_common_base);
-  virtual ~TAO_PSDL_Value_Forward_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *abstract (void) const;
-  TAO_PSDL_Node *value_common_base (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *value_common_base_;
-  TAO_PSDL_Node *abstract_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Value_Box_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Value_Box_Dcl (TAO_PSDL_Node *value_common_base,
-                          TAO_PSDL_Node *type_spec);
-  virtual ~TAO_PSDL_Value_Box_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *value_common_base (void) const;
-  TAO_PSDL_Node *type_spec (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *value_common_base_;
-  TAO_PSDL_Node *type_spec_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Value_Abs_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Value_Abs_Dcl (TAO_PSDL_Node *value_common_base,
-                          TAO_PSDL_Node *export_variable);
-
-  TAO_PSDL_Value_Abs_Dcl (TAO_PSDL_Node *value_common_base,
-                          TAO_PSDL_Node *value_inheritance_spec,
-                          TAO_PSDL_Node *export_variable);
-
-  virtual ~TAO_PSDL_Value_Abs_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *value_common_base (void) const;
-  TAO_PSDL_Node *value_inheritance_spec (void) const;
-  TAO_PSDL_Node *export_variable (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *value_common_base_;
-  TAO_PSDL_Node *value_inheritance_spec_;
-  TAO_PSDL_Node *export_variable_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Value_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Value_Dcl (TAO_PSDL_Node *value_header,
-                      TAO_PSDL_Node *value_element);
-
-  virtual ~TAO_PSDL_Value_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *value_header (void) const;
-  TAO_PSDL_Node *value_element (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *value_header_;
-  TAO_PSDL_Node *value_element_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Value_Header : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Value_Header (TAO_PSDL_Node *value_common_base,
-                         TAO_PSDL_Node *value_inheritance_spec);
-
-  TAO_PSDL_Value_Header (TAO_PSDL_Node *custom,
-                         TAO_PSDL_Node *value_common_base,
-                         TAO_PSDL_Node *value_inheritance_spec);
-
-  virtual ~TAO_PSDL_Value_Header (void);
-
-  /// Get the value
-  TAO_PSDL_Node *custom (void) const;
-  TAO_PSDL_Node *value_common_base (void) const;
-  TAO_PSDL_Node *value_inheritance_spec (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *custom_;
-  TAO_PSDL_Node *value_common_base_;
-  TAO_PSDL_Node *value_inheritance_spec_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Value_Inheritance_Spec : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Value_Inheritance_Spec (TAO_PSDL_Node *interface_name);
-
-  /*
-    Other forms
-    TAO_PSDL_Value_Inheritance_Spec (TAO_PSDL_Node *value_name);
-  */
-
-  TAO_PSDL_Value_Inheritance_Spec (TAO_PSDL_Node *value_name,
-                                   TAO_PSDL_Node *interface_name);
-
-  /*
-   Other forms of similar constuctors
-   TAO_PSDL_Value_Inheritance_Spec (TAO_PSDL_Node *truncatable,
-                                    TAO_PSDL_Node *value_name,
-  */
-
-  TAO_PSDL_Value_Inheritance_Spec (TAO_PSDL_Node *truncatable,
-                                   TAO_PSDL_Node *value_name,
-                                   TAO_PSDL_Node *interface_name);
-
-  virtual ~TAO_PSDL_Value_Inheritance_Spec (void);
-
-  /// Get the value
-  TAO_PSDL_Node *truncatable (void) const;
-  TAO_PSDL_Node *value_name (void) const;
-  TAO_PSDL_Node *interface_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *truncatable_;
-  TAO_PSDL_Node *value_name_;
-  TAO_PSDL_Node *interface_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Value_Name : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Value_Name (TAO_PSDL_Node *scoped_name);
-
-  TAO_PSDL_Value_Name (TAO_PSDL_Node *scoped_name,
-                       TAO_PSDL_Node *value_name);
-
-  virtual ~TAO_PSDL_Value_Name (void);
-
-  /// Get the value
-  TAO_PSDL_Node *scoped_name (void) const;
-  TAO_PSDL_Node *value_name (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *scoped_name_;
-  TAO_PSDL_Node *value_name_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Value_Element : public TAO_PSDL_Node
-{
-public:
-
-  /// type_of_element can be export | state_member | init_dcl
-  TAO_PSDL_Value_Element (TAO_PSDL_Node *type_of_element);
-
-  virtual ~TAO_PSDL_Value_Element (void);
-
-  /// Get the value
-  TAO_PSDL_Node *type_of_element (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *type_of_element_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Array_Declarator : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Array_Declarator (TAO_PSDL_Node *identifier,
-                             TAO_PSDL_Node *fixed_array_size);
-
-  virtual ~TAO_PSDL_Array_Declarator (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *fixed_array_size (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *fixed_array_size_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Fixed_Array_Size : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Fixed_Array_Size (TAO_PSDL_Node *positive_int_const);
-
-  virtual ~TAO_PSDL_Fixed_Array_Size (void);
-
-  /// Get the value
-  TAO_PSDL_Node *positive_int_const (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *positive_int_const_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Attr_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Attr_Dcl (int readonly,
-                     TAO_PSDL_Node *param_type_spec,
-                     TAO_PSDL_Node *simple_declarator);
-
-  TAO_PSDL_Attr_Dcl (TAO_PSDL_Node *param_type_spec,
-                     TAO_PSDL_Node *simple_declarator);
-
-  virtual ~TAO_PSDL_Attr_Dcl (void);
-
-  /// Get the value
-  int readonly (void) const;
-  TAO_PSDL_Node *param_type_spec (void) const;
-  TAO_PSDL_Node *simple_declarator (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  int readonly_;
-  TAO_PSDL_Node *param_type_spec_;
-  TAO_PSDL_Node *simple_declarator_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Enumerator : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Enumerator (TAO_PSDL_Node *identifier);
-
-  TAO_PSDL_Enumerator (TAO_PSDL_Node *identifier,
-                       TAO_PSDL_Node *enumerator);
-
-  virtual ~TAO_PSDL_Enumerator (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *enumerator (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *enumerator_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Literal : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Literal (CORBA::Boolean boolean_value);
-
-  TAO_PSDL_Literal (int int_value);
-
-  TAO_PSDL_Literal (double double_value);
-
-  TAO_PSDL_Literal (const char *char_value);
-
-  virtual ~TAO_PSDL_Literal (void);
-
-  /// Get the value
-  CORBA::Boolean boolean_value (void) const;
-  int int_value (void) const;
-  double double_value (void) const;
-  const char *char_value (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  CORBA::Boolean boolean_value_;
-  int int_value_;
-  double double_value_;
-  const char *char_value_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_State_Member : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_State_Member (TAO_PSDL_Node *public_or_private,
-                         TAO_PSDL_Node *type_spec,
-                         TAO_PSDL_Node *declarators);
-
-  /* Other forms
-    TAO_PSDL_State_Member (TAO_PSDL_Node *public_or_private,
-                           TAO_PSDL_Node *type_spec,
-                           TAO_PSDL_Node *declarators);
-  */
-
-  virtual ~TAO_PSDL_State_Member (void);
-
-  /// Get the value
-  TAO_PSDL_Node *public_or_private (void) const;
-  TAO_PSDL_Node *type_spec (void) const;
-  TAO_PSDL_Node *declarators (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *public_or_private_;
-  TAO_PSDL_Node *type_spec_;
-  TAO_PSDL_Node *declarators_;
-
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Init_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Init_Dcl (TAO_PSDL_Node *identifier);
-
-  TAO_PSDL_Init_Dcl (TAO_PSDL_Node *identifier,
-                     TAO_PSDL_Node *init_param_decls);
-
-  virtual ~TAO_PSDL_Init_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *init_param_decls (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *init_param_decls_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Init_Param_Decls : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Init_Param_Decls (TAO_PSDL_Node *init_param_decl);
-
-  TAO_PSDL_Init_Param_Decls (TAO_PSDL_Node *init_param_decl,
-                             TAO_PSDL_Node *init_param_decls);
-
-  virtual ~TAO_PSDL_Init_Param_Decls (void);
-
-  /// Get the value
-  TAO_PSDL_Node *init_param_decl (void) const;
-  TAO_PSDL_Node *init_param_decls (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *init_param_decl_;
-  TAO_PSDL_Node *init_param_decls_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Init_Param_Decl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Init_Param_Decl (TAO_PSDL_Node *init_param_attribute,
-                            TAO_PSDL_Node *param_type_spec,
-                            TAO_PSDL_Node *simple_declarator);
-
-  virtual ~TAO_PSDL_Init_Param_Decl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *init_param_attribute (void) const;
-  TAO_PSDL_Node *param_type_spec (void) const;
-  TAO_PSDL_Node *simple_declarator (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *init_param_attribute_;
-  TAO_PSDL_Node *param_type_spec_;
-  TAO_PSDL_Node *simple_declarator_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Positive_Int_Const : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Positive_Int_Const (TAO_PSDL_Node *const_exp);
-
-  virtual ~TAO_PSDL_Positive_Int_Const (void);
-
-  /// Get the value
-  TAO_PSDL_Node *const_exp (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *const_exp_;
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Factory_Dcl : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Factory_Dcl (TAO_PSDL_Node *identifier,
-                        TAO_PSDL_Node *factory_parameters);
-
-  virtual ~TAO_PSDL_Factory_Dcl (void);
-
-  /// Get the value
-  TAO_PSDL_Node *identifier (void) const;
-  TAO_PSDL_Node *factory_parameters (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *identifier_;
-  TAO_PSDL_Node *factory_parameters_;
-
-};
-
-/// ****************************************************************
-
-class TAO_PSDL_Export TAO_PSDL_Factory_Parameters : public TAO_PSDL_Node
-{
-public:
-
-  TAO_PSDL_Factory_Parameters ();
-  TAO_PSDL_Factory_Parameters (TAO_PSDL_Node *simple_declarator);
-
-  virtual ~TAO_PSDL_Factory_Parameters (void);
-
-  /// Get the value
-  TAO_PSDL_Node *simple_declarator (void) const;
-
-  /// = The Node methods.
-  int accept (TAO_PSDL_Node_Visitor *visitor);
-
-private:
-
-  /// The values
-  TAO_PSDL_Node *simple_declarator_;
-};
-
-#endif /* TAO_PSDL_NODE_H */
diff --git a/orbsvcs/PSS/PSDL_Node_Visitor.cpp b/orbsvcs/PSS/PSDL_Node_Visitor.cpp
deleted file mode 100644
index 5bd628fd5d4..00000000000
--- a/orbsvcs/PSS/PSDL_Node_Visitor.cpp
+++ /dev/null
@@ -1,647 +0,0 @@
-// $Id$
-
-#include "PSDL_Node_Visitor.h"
-#include "PSDL_Visitor_Factory.h"
-#include "PSDL_Typecode_Defn.h"
-#include "PSDL_y.h"
-
-TAO_PSDL_Node_Visitor::TAO_PSDL_Node_Visitor ()
-  : identifiers_ (0),
-    predefined_type_ (0),
-    count_ (0),
-    node_visitor_ (0)
-{
-  ACE_NEW (this->visitor_factory_,
-           TAO_PSDL_Visitor_Factory);
-}
-
-TAO_PSDL_Node_Visitor::~TAO_PSDL_Node_Visitor ()
-{
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_specification (TAO_PSDL_Specification *specification)
-{
-  if (specification->definition ()->accept (this) == -1)
-      return -1;
-
-  if (specification->specification () != 0)
-    {
-      if (specification->specification ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_definition (TAO_PSDL_Definition *definition)
-{
-  if (definition->definition_type ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_module (TAO_PSDL_Module *module)
-{
-  this->node_visitor_ =
-    this->visitor_factory_->make_visitor (module->type_of_node ());
-
-  if (this->node_visitor_ != 0)
-    {
-      return this->node_visitor_->visit_module (module);
-    }
-  else
-    {
-      return -1;
-    }
-}
-
-int TAO_PSDL_Node_Visitor::visit_abstract_storagetype (TAO_PSDL_Abstract_Storagetype *)
-{ return 0; }
-
-int
-TAO_PSDL_Node_Visitor::visit_abstract_storagetype_dcl (TAO_PSDL_Abstract_Storagetype_Dcl *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_abstract_storagetype_fwd_dcl (TAO_PSDL_Abstract_Storagetype_Fwd_Dcl *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_abstract_storagetype_header (TAO_PSDL_Abstract_Storagetype_Header *)
-{
-  return 0;
-}
-
-int TAO_PSDL_Node_Visitor::visit_abstract_storagetype_body (TAO_PSDL_Abstract_Storagetype_Body *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_abstract_storagetype_member (TAO_PSDL_Abstract_Storagetype_Member *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_abstract_storagetype_inh_spec (TAO_PSDL_Abstract_Storagetype_Inh_Spec *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_abstract_storagetype_name (TAO_PSDL_Abstract_Storagetype_Name *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_psdl_state_dcl (TAO_PSDL_Psdl_State_Dcl *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_psdl_state_type_spec (TAO_PSDL_Psdl_State_Type_Spec *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_abstract_storagetype_ref_type (TAO_PSDL_Abstract_Storagetype_Ref_Type)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_abstract_storagehome (TAO_PSDL_Abstract_Storagehome *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_abstract_storagehome_fwd_dcl (TAO_PSDL_Abstract_Storagehome_Fwd_Dcl *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_abstract_storagehome_dcl (TAO_PSDL_Abstract_Storagehome_Dcl *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_abstract_storagehome_header (TAO_PSDL_Abstract_Storagehome_Header *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_abstract_storagehome_body (TAO_PSDL_Abstract_Storagehome_Body  *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_abstract_storagehome_member (TAO_PSDL_Abstract_Storagehome_Member *)
-{
-  return 0;
-}
-
-int TAO_PSDL_Node_Visitor::visit_abstract_storagehome_inh_spec (TAO_PSDL_Abstract_Storagehome_Inh_Spec *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_abstract_storagehome_name (TAO_PSDL_Abstract_Storagehome_Name *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_local_op_dcl (TAO_PSDL_Local_Op_Dcl *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_key_dcl (TAO_PSDL_Key_Dcl *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_catalog (TAO_PSDL_Catalog *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_catalog_inh_spec (TAO_PSDL_Catalog_Inh_Spec *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_catalog_name (TAO_PSDL_Catalog_Name *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_catalog_body (TAO_PSDL_Catalog_Body *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_catalog_member (TAO_PSDL_Catalog_Member *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagetype_member (TAO_PSDL_Storagetype_Member *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagetype_inh_spec (TAO_PSDL_Storagetype_Inh_Spec *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagetype_name (TAO_PSDL_Storagetype_Name *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagetype_impl_spec (TAO_PSDL_Storagetype_Impl_Spec *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagetype_ref_type (TAO_PSDL_Storagetype_Ref_Type *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_store_directive (TAO_PSDL_Store_Directive *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_psdl_concrete_state_type (TAO_PSDL_Psdl_Concrete_State_Type *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_ref_rep_directive (TAO_PSDL_Ref_Rep_Directive *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagehome (TAO_PSDL_Storagehome *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagehome_header (TAO_PSDL_Storagehome_Header *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagehome_body  (TAO_PSDL_Storagehome_Body *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagehome_member  (TAO_PSDL_Storagehome_Member *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagehome_inh_spec  (TAO_PSDL_Storagehome_Inh_Spec *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagehome_name  (TAO_PSDL_Storagehome_Name *)  { return 0; }
-
-int TAO_PSDL_Node_Visitor::visit_storagehome_impl_spec (TAO_PSDL_Storagehome_Impl_Spec *)  { return 0; }
-
-int
-TAO_PSDL_Node_Visitor::visit_primary_key_dcl (TAO_PSDL_Primary_Key_Dcl *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_identifier (TAO_PSDL_Identifier *identifier)
-{
-  if (this->identifiers_.size () == 0)
-    {
-      this->identifiers_.size (1);
-      this->count_ = 0;
-    }
-
-  this->identifiers_ [this->count_] = identifier->value ();
-  ++this->count_;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_type_dcl (TAO_PSDL_Type_Dcl *type_dcl)
-{
- if (type_dcl->type_of_type_dcl ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_type_declarator (TAO_PSDL_Type_Declarator *type_declarator)
-{
-  int type = TAO_PSDL_TYPEDEF;
-  this->node_visitor_ =
-    this->visitor_factory_->make_visitor (type);
-
-  // Generates code into the client header
-  if (this->node_visitor_ != 0)
-      return this->node_visitor_->visit_type_declarator (type_declarator);
-  else
-    return -1;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_type_spec (TAO_PSDL_Type_Spec *type_spec)
-{
-  if (type_spec->type_of_type_spec ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_simple_type_spec (TAO_PSDL_Simple_Type_Spec *simple_type_spec)
-{
-  if (simple_type_spec->type_of_simple_type_spec ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_base_type_spec (TAO_PSDL_Base_Type_Spec *base_type_spec)
-{
-
-
-  if (base_type_spec->type_of_base_type_spec ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_template_type_spec (TAO_PSDL_Template_Type_Spec *template_type_spec)
-{
-  if (template_type_spec->type_of_template_type_spec ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_constr_type_spec (TAO_PSDL_Constr_Type_Spec *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_declarators (TAO_PSDL_Declarators *declarators)
-{
-  if (declarators->declarator ()->accept (this) == -1)
-    return -1;
-
-  if (declarators->set_of_declarators () != 0)
-    {
-      if (declarators->set_of_declarators ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_declarator (TAO_PSDL_Declarator *declarator)
-{
-  if (declarator->type_of_declarator ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_simple_declarator (TAO_PSDL_Simple_Declarator *simple_declarator)
-{
-  if (simple_declarator->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (simple_declarator->simple_declarator () != 0)
-    {
-      if (simple_declarator->simple_declarator ()->accept (this) == -1)
-        return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_simple_declarator_list (TAO_PSDL_Simple_Declarator_List *)  { return 0; }
-
-int
-TAO_PSDL_Node_Visitor::visit_complex_declarator  (TAO_PSDL_Complex_Declarator *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_predefined_type (TAO_PSDL_Predefined_Type *predefined_type)
-{
-  if (predefined_type->type_one () != 0)
-    {
-      // @@ mainly for case 291:struct as of now.
-      this->node_visitor_ =
-        this->visitor_factory_->make_visitor (predefined_type->type_one ());
-
-      if (this->node_visitor_ != 0)
-        {
-          int result =
-            this->node_visitor_->visit_predefined_type (predefined_type);
-
-          if (result != 0)
-            return result;
-
-          this->node_visitor_->gen_code_for_si ();
-          this->node_visitor_->gen_code_for_sinline ();
-        }
-    }
-
-  if (predefined_type->type_two () != 0)
-    {}
-
-  if (predefined_type->type_three () != 0)
-    {}
-
-  // @@ Abt predefined PSDL_Nodes later.
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_member_list (TAO_PSDL_Member_List *member_list)
-{
-  if (member_list->member ()->accept (this) == -1)
-    return -1;
-
-  if (member_list->member_list () != 0)
-    {
-      if (member_list->member_list ()->accept (this) == -1)
-        return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_member (TAO_PSDL_Member *member)
-{
-  if (member->type_spec ()->accept (this) == -1)
-    return -1;
-
-  if (member->declarators ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_union_type (TAO_PSDL_Union_Type *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_switch_type_spec (TAO_PSDL_Switch_Type_Spec *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_switch_body (TAO_PSDL_Switch_Body *)
-{
-  return 0;
-}
-
-int TAO_PSDL_Node_Visitor::visit_case_case (TAO_PSDL_Case *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_case_label (TAO_PSDL_Case_Label *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_element_spec (TAO_PSDL_Element_Spec *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_const_dcl (TAO_PSDL_Const_Dcl *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_const_type (TAO_PSDL_Const_Type *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_const_exp (TAO_PSDL_Const_Exp *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_or_expr (TAO_PSDL_Or_Expr *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_xor_expr (TAO_PSDL_Xor_Expr *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_and_expr (TAO_PSDL_And_Expr *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_shift_expr (TAO_PSDL_Shift_Expr *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_add_expr (TAO_PSDL_Add_Expr *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_mult_expr (TAO_PSDL_Mult_Expr *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_unary_expr (TAO_PSDL_Unary_Expr *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_primary_expr (TAO_PSDL_Primary_Expr *)  { return 0; }
-
-int
-TAO_PSDL_Node_Visitor::visit_except_dcl (TAO_PSDL_Except_Dcl *except_dcl)
-{
-  int type = TAO_PSDL_EXCEPTION;
-  this->node_visitor_ =
-    this->visitor_factory_->make_visitor (type);
-
-  if (this->node_visitor_ != 0)
-    return this->node_visitor_->visit_except_dcl (except_dcl);
-
-  /*
-    if (except_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (except_dcl->member () != 0)
-    {
-      if (except_dcl->member ()->accept (&body_visitor) == -1)
-        return -1;
-    }
-  */
-  return -1;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_op_dcl (TAO_PSDL_Op_Dcl *)
-{
-  return 0;
-}
-
-int TAO_PSDL_Node_Visitor::visit_storagetype (TAO_PSDL_Storagetype *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagetype_dcl (TAO_PSDL_Storagetype_Dcl *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagetype_fwd_dcl (TAO_PSDL_Storagetype_Fwd_Dcl *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagetype_header (TAO_PSDL_Storagetype_Header *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagetype_body (TAO_PSDL_Storagetype_Body *)  { return 0; }
-int TAO_PSDL_Node_Visitor::visit_storagehome_scope (TAO_PSDL_Storagehome_Scope *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_provides_dcl (TAO_PSDL_Provides_Dcl *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_op_type_spec (TAO_PSDL_Op_Type_Spec *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_parameter_dcls (TAO_PSDL_Parameter_Dcls *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_param_dcl (TAO_PSDL_Param_Dcl *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_raises_expr (TAO_PSDL_Raises_Expr *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_context_expr (TAO_PSDL_Context_Expr *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_param_type_spec (TAO_PSDL_Param_Type_Spec *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_fixed_pt_type (TAO_PSDL_Fixed_Pt_Type *) { return 0; }
-
-int
-TAO_PSDL_Node_Visitor::visit_constr_forward_decl (TAO_PSDL_Constr_Forward_Decl *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_interface (TAO_PSDL_Interface *interf)
-{
-  if (interf->type_of_dcl ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_interface_body (TAO_PSDL_Interface_Body *interface_body)
-{
-  if (interface_body->export_variable ()->accept (this) == -1)
-    return -1;
-
-  if (interface_body->interface_body () != 0)
-    {
-      if (interface_body->interface_body ()->accept (this) == -1)
-        return -1;
-
-    }
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_interface_dcl (TAO_PSDL_Interface_Dcl *interface_dcl)
-{
-  int type = TAO_PSDL_INTERFACE;
-  this->node_visitor_ =
-    this->visitor_factory_->make_visitor (type);
-
-  if (this->node_visitor_ != 0)
-    {
-      this->node_visitor_->visit_interface_dcl (interface_dcl);
-      this->node_visitor_->gen_code_for_si ();
-    }
-  else
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_forward_dcl (TAO_PSDL_Forward_Dcl *forward_dcl)
-{
-  int type = TAO_PSDL_INTERFACE;
-  this->node_visitor_ =
-    this->visitor_factory_->make_visitor (type);
-
-  if (this->node_visitor_ != 0)
-    return this->node_visitor_->visit_forward_dcl (forward_dcl);
-
-  return -1;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_interface_header (TAO_PSDL_Interface_Header *interface_header)
-{
-  int type = 325;
-  this->node_visitor_ =
-    this->visitor_factory_->make_visitor (type);
-
-  if (this->node_visitor_ != 0)
-    return this->node_visitor_->visit_interface_header (interface_header);
-  else
-    return -1;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_export_dcl (TAO_PSDL_Export_Dcl *export_dcl)
-{
-  if (export_dcl->type_of_export_one ()->accept (this) == -1)
-      return -1;
-
-  if (export_dcl->type_of_export_two () != 0)
-    {
-      if (export_dcl->type_of_export_two ()->accept (this) == -1)
-        return -1;
-      }
-
-  return 0;
-}
-
-int TAO_PSDL_Node_Visitor::visit_interface_inheritance_spec (TAO_PSDL_Interface_Inheritance_Spec *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_interface_name (TAO_PSDL_Interface_Name *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_scoped_name (TAO_PSDL_Scoped_Name *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_value (TAO_PSDL_Value *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_value_common_base (TAO_PSDL_Value_Common_Base *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_value_forward_dcl (TAO_PSDL_Value_Forward_Dcl *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_value_box_dcl (TAO_PSDL_Value_Box_Dcl *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_value_abs_dcl (TAO_PSDL_Value_Abs_Dcl *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_value_dcl (TAO_PSDL_Value_Dcl *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_value_header (TAO_PSDL_Value_Header *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_value_inheritance_spec (TAO_PSDL_Value_Inheritance_Spec *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_value_name (TAO_PSDL_Value_Name *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_value_element (TAO_PSDL_Value_Element *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_array_declarator (TAO_PSDL_Array_Declarator *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_fixed_array_size (TAO_PSDL_Fixed_Array_Size *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_enumerator (TAO_PSDL_Enumerator *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_literal (TAO_PSDL_Literal *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_state_member (TAO_PSDL_State_Member *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_init_dcl (TAO_PSDL_Init_Dcl *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_init_param_decls (TAO_PSDL_Init_Param_Decls *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_init_param_decl (TAO_PSDL_Init_Param_Decl *) { return 0; }
-int TAO_PSDL_Node_Visitor::visit_factory_parameters (TAO_PSDL_Factory_Parameters *) { return 0; }
-
-int
-TAO_PSDL_Node_Visitor::visit_attr_dcl (TAO_PSDL_Attr_Dcl *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_factory_dcl (TAO_PSDL_Factory_Dcl *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::visit_positive_int_const (TAO_PSDL_Positive_Int_Const *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Node_Visitor::base_type (const ACE_CString &identifier,
-                                  ACE_CString &identifier_type)
-{
-  ACE_CString identifier_name = identifier;
-  TAO_PSDL_Scope::instance ()->to_lower_case (identifier_name);
-
-  int result =
-    TAO_PSDL_Scope::instance ()->find (identifier_name,
-                                       identifier_type);
-
-  if (result == 0)
-    {
-      // check if the base type is a predefined base type defined in
-      // PSDL.yy
-      if (ACE_OS::strcmp (identifier_type.c_str (), "enum") == 0)
-        return 0;
-
-      // The way I am deciding is trying to find the idn
-      result = TAO_PSDL_Scope::instance ()->find (identifier_type);
-
-      if (result == 0)
-        {
-          return 0;
-        }
-      else
-        {
-          return 1;
-        }
-    }
-
-  // identifier_name is a predefined type like char *.
-  identifier_type = identifier_name;
-
-  return 1;
-}
-
-ACE_CString
-TAO_PSDL_Node_Visitor::version_for_stub (ACE_CString identifier_type)
-{
-  if (ACE_OS::strcmp (identifier_type.c_str (), "char *") == 0)
-    {
-      return "CORBA::String";
-    }
-  else if (ACE_OS::strcmp (identifier_type.c_str (), "long") == 0)
-    {
-      return "CORBA::Long";
-    }
-  else
-    return identifier_type;
-}
-
-void
-TAO_PSDL_Node_Visitor::gen_code_for_si (void)
-{
-  return;
-}
-
-void
-TAO_PSDL_Node_Visitor::gen_code_for_sinline (void)
-{
-  return;
-}
diff --git a/orbsvcs/PSS/PSDL_Node_Visitor.h b/orbsvcs/PSS/PSDL_Node_Visitor.h
deleted file mode 100644
index 08f95858aa5..00000000000
--- a/orbsvcs/PSS/PSDL_Node_Visitor.h
+++ /dev/null
@@ -1,368 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs/PSS
-//
-// = FILENAME
-//    PSDL_Node_Visitor
-//
-// = DESCRIPTION
-//    This class serves as a base class for the classes that put the
-//    generated code that should go into the stubs. Derived classes
-//    override the necessary methods. Uses the Visitor Pattern.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_NODE_VISITOR_H
-#define TAO_PSDL_NODE_VISITOR_H
-
-#include "psdl_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "PSDL_Node.h"
-#include "ace/Array_Base.h"
-
-// Forward declarations.
-class TAO_PSDL_Visitor_Factory;
-
-
-class TAO_PSDL_Specification;
-class TAO_PSDL_Definition;
-class TAO_PSDL_Module;
-class TAO_PSDL_Abstract_Storagetype;
-class TAO_PSDL_Abstract_Storagetype_Dcl;
-class TAO_PSDL_Abstract_Storagetype_Fwd_Dcl;
-class TAO_PSDL_Abstract_Storagetype_Header;
-class TAO_PSDL_Abstract_Storagetype_Body;
-class TAO_PSDL_Abstract_Storagetype_Member;
-class TAO_PSDL_Abstract_Storagetype_Inh_Spec;
-class TAO_PSDL_Abstract_Storagetype_Name;
-class TAO_PSDL_Psdl_State_Dcl;
-class TAO_PSDL_Psdl_State_Type_Spec;
-class TAO_PSDL_Abstract_Storagetype_Ref_Type;
-class TAO_PSDL_Abstract_Storagehome;
-class TAO_PSDL_Abstract_Storagehome_Fwd_Dcl;
-class TAO_PSDL_Abstract_Storagehome_Dcl;
-class TAO_PSDL_Abstract_Storagehome_Header;
-class TAO_PSDL_Abstract_Storagehome_Body;
-class TAO_PSDL_Abstract_Storagehome_Member;
-class TAO_PSDL_Abstract_Storagehome_Inh_Spec;
-class TAO_PSDL_Abstract_Storagehome_Name;
-class TAO_PSDL_Local_Op_Dcl;
-class TAO_PSDL_Key_Dcl;
-class TAO_PSDL_Catalog;
-class TAO_PSDL_Catalog_Inh_Spec;
-class TAO_PSDL_Catalog_Name;
-class TAO_PSDL_Catalog_Body;
-class TAO_PSDL_Catalog_Member;
-class TAO_PSDL_Provides_Dcl;
-class TAO_PSDL_Storagetype;
-class TAO_PSDL_Storagetype_Dcl;
-class TAO_PSDL_Abstract_Storagetype_Fwd_Dcl;
-class TAO_PSDL_Abstract_Storagetype_Header;
-class TAO_PSDL_Abstract_Storagetype_Body;
-class TAO_PSDL_Abstract_Storagetype_Member;
-class TAO_PSDL_Abstract_Storagetype_Inh_Spec;
-class TAO_PSDL_Abstract_Storagetype_Name;
-class TAO_PSDL_Psdl_State_Dcl;
-class TAO_PSDL_Psdl_State_Type_Spec;
-class TAO_PSDL_Abstract_Storagetype_Ref_Type;
-class TAO_PSDL_Abstract_Storagehome;
-class TAO_PSDL_Abstract_Storagehome_Fwd_Dcl;
-class TAO_PSDL_Abstract_Storagehome_Dcl;
-class TAO_PSDL_Abstract_Storagehome_Header;
-class TAO_PSDL_Abstract_Storagehome_Body;
-class TAO_PSDL_Abstract_Storagehome_Member;
-class TAO_PSDL_Abstract_Storagehome_Inh_Spec;
-class TAO_PSDL_Abstract_Storagehome_Name;
-class TAO_PSDL_Local_Op_Dcl;
-class TAO_PSDL_Key_Dcl;
-class TAO_PSDL_Catalog;
-class TAO_PSDL_Catalog_Inh_Spec;
-class TAO_PSDL_Catalog_Name;
-class TAO_PSDL_Catalog_Body;
-class TAO_PSDL_Catalog_Member;
-class TAO_PSDL_Provides_Dcl;
-class TAO_PSDL_Storagetype;
-class TAO_PSDL_Storagetype_Dcl;
-class TAO_PSDL_Storagetype_Fwd_Dcl;
-class TAO_PSDL_Storagetype_Header;
-class TAO_PSDL_Storagetype_Body;
-class TAO_PSDL_Storagetype_Member;
-class TAO_PSDL_Storagetype_Inh_Spec;
-class TAO_PSDL_Storagetype_Name;
-class TAO_PSDL_Storagetype_Impl_Spec;
-class TAO_PSDL_Storagetype_Ref_Type;
-class TAO_PSDL_Storagehome_Scope;
-class TAO_PSDL_Store_Directive;
-class TAO_PSDL_Psdl_Concrete_State_Type;
-class TAO_PSDL_Ref_Rep_Directive;
-class TAO_PSDL_Storagehome;
-class TAO_PSDL_Storagehome_Header;
-class TAO_PSDL_Storagehome_Body;
-class TAO_PSDL_Storagehome_Member;
-class TAO_PSDL_Storagehome_Inh_Spec;
-class TAO_PSDL_Storagehome_Name;
-class TAO_PSDL_Storagehome_Impl_Spec;
-class TAO_PSDL_Primary_Key_Dcl;
-class TAO_PSDL_Identifier;
-class TAO_PSDL_Type_Dcl;
-class TAO_PSDL_Type_Declarator;
-class TAO_PSDL_Type_Spec;
-class TAO_PSDL_Simple_Type_Spec;
-class TAO_PSDL_Base_Type_Spec;
-class TAO_PSDL_Template_Type_Spec;
-class TAO_PSDL_Constr_Type_Spec;
-class TAO_PSDL_Declarators;
-class TAO_PSDL_Declarator;
-class TAO_PSDL_Simple_Declarator;
-class TAO_PSDL_Simple_Declarator_List;
-class TAO_PSDL_Complex_Declarator;
-class TAO_PSDL_Predefined_Type;
-class TAO_PSDL_Member_List;
-class TAO_PSDL_Member;
-class TAO_PSDL_Union_Type;
-class TAO_PSDL_Switch_Type_Spec;
-class TAO_PSDL_Switch_Body;
-class TAO_PSDL_Case;
-class TAO_PSDL_Case_Label;
-class TAO_PSDL_Element_Spec;
-class TAO_PSDL_Const_Dcl;
-class TAO_PSDL_Const_Type;
-class TAO_PSDL_Const_Exp;
-class TAO_PSDL_Or_Expr;
-class TAO_PSDL_Xor_Expr;
-class TAO_PSDL_And_Expr;
-class TAO_PSDL_Shift_Expr;
-class TAO_PSDL_Add_Expr;
-class TAO_PSDL_Mult_Expr;
-class TAO_PSDL_Unary_Expr;
-class TAO_PSDL_Primary_Expr;
-class TAO_PSDL_Except_Dcl;
-class TAO_PSDL_Op_Dcl;
-class TAO_PSDL_Op_Type_Spec;
-class TAO_PSDL_Parameter_Dcls;
-class TAO_PSDL_Param_Dcl;
-class TAO_PSDL_Raises_Expr;
-class TAO_PSDL_Context_Expr;
-class TAO_PSDL_Param_Type_Spec;
-class TAO_PSDL_Fixed_Pt_Type;
-class TAO_PSDL_Constr_Forward_Decl;
-class TAO_PSDL_Interface;
-class TAO_PSDL_Interface_Body;
-class TAO_PSDL_Interface_Dcl;
-class TAO_PSDL_Forward_Dcl;
-class TAO_PSDL_Interface_Header;
-class TAO_PSDL_Export_Dcl;
-class TAO_PSDL_Storagetype_Dcl;
-class TAO_PSDL_Storagetype_Fwd_Dcl;
-class TAO_PSDL_Storagetype_Header;
-class TAO_PSDL_Storagetype_Body;
-class TAO_PSDL_Interface_Inheritance_Spec;
-class TAO_PSDL_Interface_Name;
-class TAO_PSDL_Scoped_Name;
-class TAO_PSDL_Value;
-class TAO_PSDL_Value_Common_Base;
-class TAO_PSDL_Value_Forward_Dcl;
-class TAO_PSDL_Value_Box_Dcl;
-class TAO_PSDL_Value_Abs_Dcl;
-class TAO_PSDL_Value_Dcl;
-class TAO_PSDL_Value_Header;
-class TAO_PSDL_Value_Inheritance_Spec;
-class TAO_PSDL_Value_Name;
-class TAO_PSDL_Value_Element;
-class TAO_PSDL_Enumerator;
-class TAO_PSDL_Literal;
-class TAO_PSDL_Array_Declarator;
-class TAO_PSDL_Fixed_Array_Size;
-class TAO_PSDL_State_Member;
-class TAO_PSDL_Init_Dcl;
-class TAO_PSDL_Init_Param_Decls;
-class TAO_PSDL_Init_Param_Decl;
-class TAO_PSDL_Factory_Parameters;
-class TAO_PSDL_Attr_Dcl;
-class TAO_PSDL_Factory_Dcl;
-class TAO_PSDL_Positive_Int_Const;
-
-class TAO_PSDL_Export TAO_PSDL_Node_Visitor
-{
-public:
-
-  TAO_PSDL_Node_Visitor ();
-
-  // Destructor.
-  virtual ~TAO_PSDL_Node_Visitor (void);
-
-  // All the nodes in the parse tree are of base type
-  // TAO_PSDL_Node. Based on the visitor pattern, the following
-  // methods are invoked depending on the actual type of the node.
-  // The visitor pattern is being used. And, the return value is a '0'
-  // when successful and '-1' on a failure.
-  virtual int visit_specification (TAO_PSDL_Specification *);
-  virtual int visit_definition (TAO_PSDL_Definition *);
-  virtual int visit_module (TAO_PSDL_Module *);
-  virtual int visit_abstract_storagetype (TAO_PSDL_Abstract_Storagetype *);
-  virtual int visit_abstract_storagetype_dcl (TAO_PSDL_Abstract_Storagetype_Dcl *);
-  virtual int visit_abstract_storagetype_fwd_dcl (TAO_PSDL_Abstract_Storagetype_Fwd_Dcl *);
-  virtual int visit_abstract_storagetype_header (TAO_PSDL_Abstract_Storagetype_Header *);
-  virtual int visit_abstract_storagetype_body (TAO_PSDL_Abstract_Storagetype_Body *);
-  virtual int visit_abstract_storagetype_member (TAO_PSDL_Abstract_Storagetype_Member *);
-  virtual int visit_abstract_storagetype_inh_spec (TAO_PSDL_Abstract_Storagetype_Inh_Spec *);
-  virtual int visit_abstract_storagetype_name (TAO_PSDL_Abstract_Storagetype_Name *);
-  virtual int visit_psdl_state_dcl (TAO_PSDL_Psdl_State_Dcl *);
-  virtual int visit_psdl_state_type_spec (TAO_PSDL_Psdl_State_Type_Spec *);
-
-  virtual int visit_abstract_storagetype_ref_type (TAO_PSDL_Abstract_Storagetype_Ref_Type);
-
-  virtual int visit_abstract_storagehome (TAO_PSDL_Abstract_Storagehome *);
-  virtual int visit_abstract_storagehome_fwd_dcl (TAO_PSDL_Abstract_Storagehome_Fwd_Dcl *);
-  virtual int visit_abstract_storagehome_dcl (TAO_PSDL_Abstract_Storagehome_Dcl *);
-
-  virtual int visit_abstract_storagehome_header (TAO_PSDL_Abstract_Storagehome_Header *);
-  virtual int visit_abstract_storagehome_body (TAO_PSDL_Abstract_Storagehome_Body  *);
-  virtual int visit_abstract_storagehome_member (TAO_PSDL_Abstract_Storagehome_Member *);
-  virtual int visit_abstract_storagehome_inh_spec (TAO_PSDL_Abstract_Storagehome_Inh_Spec *);
-  virtual int visit_abstract_storagehome_name (TAO_PSDL_Abstract_Storagehome_Name *);
-  virtual int visit_local_op_dcl (TAO_PSDL_Local_Op_Dcl *);
-  virtual int visit_key_dcl (TAO_PSDL_Key_Dcl *);
-  virtual int visit_catalog (TAO_PSDL_Catalog *);
-  virtual int visit_catalog_inh_spec (TAO_PSDL_Catalog_Inh_Spec *);
-  virtual int visit_catalog_name (TAO_PSDL_Catalog_Name *);
-  virtual int visit_catalog_body (TAO_PSDL_Catalog_Body *);
-  virtual int visit_catalog_member (TAO_PSDL_Catalog_Member *);
-  virtual int visit_storagetype_member (TAO_PSDL_Storagetype_Member *);
-  virtual int visit_storagetype_inh_spec (TAO_PSDL_Storagetype_Inh_Spec *);
-  virtual int visit_storagetype_name (TAO_PSDL_Storagetype_Name *);
-  virtual int visit_storagetype_impl_spec (TAO_PSDL_Storagetype_Impl_Spec *);
-  virtual int visit_storagetype_ref_type (TAO_PSDL_Storagetype_Ref_Type *);
-  virtual int visit_store_directive (TAO_PSDL_Store_Directive *);
-  virtual int visit_psdl_concrete_state_type (TAO_PSDL_Psdl_Concrete_State_Type *);
-  virtual int visit_ref_rep_directive (TAO_PSDL_Ref_Rep_Directive *);
-  virtual int visit_storagehome (TAO_PSDL_Storagehome *);
-  virtual int visit_storagehome_header (TAO_PSDL_Storagehome_Header *);
-  virtual int visit_storagehome_body  (TAO_PSDL_Storagehome_Body *);
-  virtual int visit_storagehome_member  (TAO_PSDL_Storagehome_Member *);
-  virtual int visit_storagehome_inh_spec  (TAO_PSDL_Storagehome_Inh_Spec *);
-  virtual int visit_storagehome_name  (TAO_PSDL_Storagehome_Name *);
-
-  virtual int visit_storagehome_impl_spec (TAO_PSDL_Storagehome_Impl_Spec *);
-  virtual int visit_primary_key_dcl (TAO_PSDL_Primary_Key_Dcl *);
-  virtual int visit_identifier (TAO_PSDL_Identifier *);
-
-  virtual int visit_type_dcl (TAO_PSDL_Type_Dcl *);
-  virtual int visit_type_declarator (TAO_PSDL_Type_Declarator *);
-  virtual int visit_type_spec (TAO_PSDL_Type_Spec *);
-  virtual int visit_simple_type_spec  (TAO_PSDL_Simple_Type_Spec *);
-  virtual int visit_base_type_spec  (TAO_PSDL_Base_Type_Spec *);
-  virtual int visit_template_type_spec  (TAO_PSDL_Template_Type_Spec *);
-  virtual int visit_constr_type_spec  (TAO_PSDL_Constr_Type_Spec *);
-  virtual int visit_declarators  (TAO_PSDL_Declarators *);
-  virtual int visit_declarator  (TAO_PSDL_Declarator *);
-  virtual int visit_simple_declarator  (TAO_PSDL_Simple_Declarator *);
-  virtual int visit_simple_declarator_list  (TAO_PSDL_Simple_Declarator_List *);
-  virtual int visit_complex_declarator  (TAO_PSDL_Complex_Declarator *);
-  virtual int visit_predefined_type  (TAO_PSDL_Predefined_Type *);
-  virtual int visit_member_list (TAO_PSDL_Member_List *);
-  virtual int visit_member (TAO_PSDL_Member *);
-  virtual int visit_union_type (TAO_PSDL_Union_Type *);
-  virtual int visit_switch_type_spec (TAO_PSDL_Switch_Type_Spec *);
-  virtual int visit_switch_body (TAO_PSDL_Switch_Body *);
-  virtual int visit_case_case (TAO_PSDL_Case *);
-  virtual int visit_case_label (TAO_PSDL_Case_Label *);
-  virtual int visit_element_spec (TAO_PSDL_Element_Spec *);
-  virtual int visit_const_dcl (TAO_PSDL_Const_Dcl *);
-  virtual int visit_const_type (TAO_PSDL_Const_Type *);
-  virtual int visit_const_exp (TAO_PSDL_Const_Exp *);
-  virtual int visit_or_expr (TAO_PSDL_Or_Expr *);
-  virtual int visit_xor_expr (TAO_PSDL_Xor_Expr *);
-  virtual int visit_and_expr (TAO_PSDL_And_Expr *);
-  virtual int visit_shift_expr (TAO_PSDL_Shift_Expr *);
-  virtual int visit_add_expr (TAO_PSDL_Add_Expr *);
-  virtual int visit_mult_expr (TAO_PSDL_Mult_Expr *);
-  virtual int visit_unary_expr (TAO_PSDL_Unary_Expr *);
-  virtual int visit_primary_expr (TAO_PSDL_Primary_Expr *);
-  virtual int visit_except_dcl (TAO_PSDL_Except_Dcl *);
-  virtual int visit_op_dcl (TAO_PSDL_Op_Dcl *);
-  virtual int visit_storagetype (TAO_PSDL_Storagetype *);
-  virtual int visit_storagetype_dcl (TAO_PSDL_Storagetype_Dcl *);
-  virtual int visit_storagetype_fwd_dcl (TAO_PSDL_Storagetype_Fwd_Dcl *);
-  virtual int visit_storagetype_header (TAO_PSDL_Storagetype_Header *);
-  virtual int visit_storagetype_body (TAO_PSDL_Storagetype_Body *);
-  virtual int visit_storagehome_scope (TAO_PSDL_Storagehome_Scope *);
-  virtual int visit_provides_dcl (TAO_PSDL_Provides_Dcl *);
-  virtual int visit_op_type_spec (TAO_PSDL_Op_Type_Spec *);
-  virtual int visit_parameter_dcls (TAO_PSDL_Parameter_Dcls *);
-  virtual int visit_param_dcl (TAO_PSDL_Param_Dcl *);
-  virtual int visit_raises_expr (TAO_PSDL_Raises_Expr *);
-  virtual int visit_context_expr (TAO_PSDL_Context_Expr *);
-  virtual int visit_param_type_spec (TAO_PSDL_Param_Type_Spec *);
-  virtual int visit_fixed_pt_type (TAO_PSDL_Fixed_Pt_Type *);
-  virtual int visit_constr_forward_decl (TAO_PSDL_Constr_Forward_Decl *);
-  virtual int visit_interface (TAO_PSDL_Interface *);
-  virtual int visit_interface_body (TAO_PSDL_Interface_Body *);
-  virtual int visit_interface_dcl (TAO_PSDL_Interface_Dcl *);
-  virtual int visit_forward_dcl (TAO_PSDL_Forward_Dcl *);
-  virtual int visit_interface_header (TAO_PSDL_Interface_Header *);
-  virtual int visit_export_dcl (TAO_PSDL_Export_Dcl *);
-  virtual int visit_interface_inheritance_spec (TAO_PSDL_Interface_Inheritance_Spec *);
-  virtual int visit_interface_name (TAO_PSDL_Interface_Name *);
-  virtual int visit_scoped_name (TAO_PSDL_Scoped_Name *);
-  virtual int visit_value (TAO_PSDL_Value *);
-  virtual int visit_value_common_base (TAO_PSDL_Value_Common_Base *);
-  virtual int visit_value_forward_dcl (TAO_PSDL_Value_Forward_Dcl *);
-  virtual int visit_value_box_dcl (TAO_PSDL_Value_Box_Dcl *);
-  virtual int visit_value_abs_dcl (TAO_PSDL_Value_Abs_Dcl *);
-  virtual int visit_value_dcl (TAO_PSDL_Value_Dcl *);
-  virtual int visit_value_header (TAO_PSDL_Value_Header *);
-  virtual int visit_value_inheritance_spec (TAO_PSDL_Value_Inheritance_Spec *);
-  virtual int visit_value_name (TAO_PSDL_Value_Name *);
-  virtual int visit_value_element (TAO_PSDL_Value_Element *);
-  virtual int visit_array_declarator (TAO_PSDL_Array_Declarator *);
-  virtual int visit_fixed_array_size (TAO_PSDL_Fixed_Array_Size *);
-  virtual int visit_enumerator (TAO_PSDL_Enumerator *);
-  virtual int visit_literal (TAO_PSDL_Literal *);
-  virtual int visit_state_member (TAO_PSDL_State_Member *);
-  virtual int visit_init_dcl (TAO_PSDL_Init_Dcl *);
-  virtual int visit_init_param_decls (TAO_PSDL_Init_Param_Decls *);
-  virtual int visit_init_param_decl (TAO_PSDL_Init_Param_Decl *);
-  virtual int visit_factory_parameters (TAO_PSDL_Factory_Parameters *);
-  virtual int visit_attr_dcl (TAO_PSDL_Attr_Dcl *);
-  virtual int visit_factory_dcl (TAO_PSDL_Factory_Dcl *);
-  virtual int visit_positive_int_const (TAO_PSDL_Positive_Int_Const *);
-
-  /// To check if the identifier_type is a predefined type or one that
-  /// is defined in the idl in case.
-  virtual int base_type (const ACE_CString &identifier_name,
-                         ACE_CString &identifier_type);
-
-  virtual ACE_CString version_for_stub (ACE_CString identifier_type);
-
-  // Generate the code that should go into the stub implementation
-  // file for the type_declarators.
-  virtual void gen_code_for_si (void);
-
-  // Generate the code that should go into the stub inline
-  // file for the type_declarators.
-  virtual void gen_code_for_sinline (void);
-
-protected:
-
-  // identifiers_ and predefined_type_ is used to store the temporary
-  // values while building ASTs.
-  ACE_Array_Base <ACE_CString> identifiers_;
-  ACE_Array_Base <CORBA::ULong> predefined_type_;
-  CORBA::ULong count_;
-  TAO_PSDL_Node_Visitor *node_visitor_;
-  TAO_PSDL_Visitor_Factory *visitor_factory_;
-};
-
-#endif /* TAO_PSDL_NODE_VISITOR_H */
diff --git a/orbsvcs/PSS/PSDL_OctetSeq.cpp b/orbsvcs/PSS/PSDL_OctetSeq.cpp
deleted file mode 100644
index fb223b54ae9..00000000000
--- a/orbsvcs/PSS/PSDL_OctetSeq.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-// $Id$
-
-#include "PSDL_OctetSeq.h"
-
-#include "ace/Malloc_Base.h"
-
-ACE_RCSID (PSS, PSDL_OctetSeq, "$Id")
-
-// Constructor
-TAO_PSDL_OctetSeq::TAO_PSDL_OctetSeq ()
-  : allocator_ (0),
-    buffer_ (0),
-    length_ (0)
-{
-}
-
-// Constructor
-TAO_PSDL_OctetSeq::TAO_PSDL_OctetSeq (ACE_Allocator * persistent_allocator)
-  : allocator_ (persistent_allocator),
-    buffer_ (0),
-    length_ (0)
-{
-}
-
-// Destructor.
-TAO_PSDL_OctetSeq::~TAO_PSDL_OctetSeq (void)
-{
-  if (this->buffer_ != 0)
-    this->allocator_->free (this->buffer_);
-}
-
-// Copy constructor.
-TAO_PSDL_OctetSeq::TAO_PSDL_OctetSeq (const TAO_PSDL_OctetSeq & rhs)
-{
-  *this = rhs;
-}
-
-// Assignment operator.
-void
-TAO_PSDL_OctetSeq::operator= (const TAO_PSDL_OctetSeq & rhs)
-{
-  if (this == &rhs)  // Prevent self assignment
-    return;
-
-  // Free the existing buffer before assigning a new
-  // allocator and buffer.
-  if (this->buffer_ != 0)
-    this->allocator_->free (this->buffer_);
-
-  this->allocator_ = rhs.allocator_;
-  void * buf = this->allocator_->malloc (rhs.length_);
-  this->buffer_ = static_cast<CORBA::Octet *> (buf);
-  if (this->buffer_)
-    {
-      // Deep copy the buffer.
-      ACE_OS::memcpy (this->buffer_, rhs.buffer_, rhs.length_);
-
-      this->length_ = rhs.length_;
-    }
-  else
-    this->length_ = 0;
-}
-
-void
-TAO_PSDL_OctetSeq::operator= (const CORBA::OctetSeq & rhs)
-{
-  // Free the existing buffer before assigning octet
-  // sequence.
-  if (this->buffer_ != 0)
-    this->allocator_->free (this->buffer_);
-
-  const CORBA::ULong len = rhs.length ();
-
-  void * buf = this->allocator_->malloc (len);
-  this->buffer_ = static_cast<CORBA::Octet *> (buf);
-  if (this->buffer_)
-    {
-      CORBA::Octet * dest = this->buffer_;
-      const CORBA::Octet * src = rhs.get_buffer ();
-
-      // Deep copy the buffer.
-      ACE_OS::memcpy (dest, src, len);
-
-      this->length_ = len;
-    }
-  else
-    this->length_ = 0;
-}
-
-// Conversion operators (cast)
-// (caller owns storage of return values)
-TAO_PSDL_OctetSeq::operator CORBA::OctetSeq *() const
-{
-  CORBA::OctetSeq * tmp;
-  ACE_NEW_RETURN (tmp,
-                  CORBA::OctetSeq (this->length_),
-                  0);
-  CORBA::OctetSeq_var seq = tmp;
-
-  seq->length (this->length_);
-
-  CORBA::Octet * dest = seq->get_buffer ();
-  const CORBA::Octet * src = this->buffer_;
-  ACE_OS::memcpy (dest, src, this->length_);
-
-  return seq._retn ();
-}
-
-TAO_PSDL_OctetSeq::operator CORBA::OctetSeq *()
-{
-  CORBA::OctetSeq * tmp;
-  ACE_NEW_RETURN (tmp,
-                  CORBA::OctetSeq (this->length_),
-                  0);
-  CORBA::OctetSeq_var seq = tmp;
-
-  seq->length (this->length_);
-
-  CORBA::Octet * dest = seq->get_buffer ();
-  const CORBA::Octet * src = this->buffer_;
-  ACE_OS::memcpy (dest, src, this->length_);
-
-  return seq._retn ();
-}
diff --git a/orbsvcs/PSS/PSDL_OctetSeq.h b/orbsvcs/PSS/PSDL_OctetSeq.h
deleted file mode 100644
index 723afb12916..00000000000
--- a/orbsvcs/PSS/PSDL_OctetSeq.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    PSDL_OctetSeq.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@uci.edu>
- *  @author Priyanka Gontla <gontla_p@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_PSDL_OCTETSEQ_H
-#define TAO_PSDL_OCTETSEQ_H
-#include /**/ "ace/pre.h"
-
-#include "psdl_export.h"
-#include "tao/OctetSeqC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "PSDL_Datastore.h"
-
-/**
- * @class TAO_PSDL_OctetSeq
- *
- * @brief This class facilitates implementation of Persistent
- * Service. Helps perform the bind and find to the hash_map and to
- * make the data persistent.
- **/
-
-class ACE_Allocator;
-
-class TAO_PSDL_Export TAO_PSDL_OctetSeq
-{
-public:
-
-  /// Constructor.
-  TAO_PSDL_OctetSeq (void);
-
-  /// Constructor.
-  TAO_PSDL_OctetSeq (ACE_Allocator *persistent_allocator);
-
-  /// Copy constructor.
-  TAO_PSDL_OctetSeq (const TAO_PSDL_OctetSeq & rhs);
-
-  /// Destructor.
-  ~TAO_PSDL_OctetSeq (void);
-
-  /// Assignment operator.
-  void operator= (const TAO_PSDL_OctetSeq & rhs);
-
-  // Conversion operator (assignment)
-  void operator= (const CORBA::OctetSeq & rhs);
-
-  // Conversion operators (cast)
-  // (caller owns storage of return values)
-  operator CORBA::OctetSeq *() const;
-
-  operator CORBA::OctetSeq *();
-
-  // Persistent allocator.
-  ACE_Allocator * allocator_;
-
-  // Persistent buffer.
-  CORBA::Octet * buffer_;
-
-  // Length of the persistent buffer.
-  CORBA::ULong length_;
-};
-
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PSDL_OCTETSEQ_H */
diff --git a/orbsvcs/PSS/PSDL_Op_Dcl_Scope.cpp b/orbsvcs/PSS/PSDL_Op_Dcl_Scope.cpp
deleted file mode 100644
index 279d0a6c0d9..00000000000
--- a/orbsvcs/PSS/PSDL_Op_Dcl_Scope.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Module_Scope.h"
-#include "PSDL_Op_Dcl_Scope.h"
-
-ACE_RCSID (PSS, PSDL_Op_Dcl_Scope, "$Id$")
-
-TAO_PSDL_Op_Dcl_Scope::TAO_PSDL_Op_Dcl_Scope (TAO_PSDL_Scope *parent_scope)
-  : scope_map_ (),
-    parent_scope_ (parent_scope)
-{
-}
-
-int
-TAO_PSDL_Op_Dcl_Scope::add_const_decl (ACE_CString identifier,
-                                       ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_const_decl_to_scope (identifier,
-                                                               identifier_type,
-                                                               this);
-}
-
-int
-TAO_PSDL_Op_Dcl_Scope::add_member_decl (ACE_CString identifier,
-                                        ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_member_decl_to_scope (identifier,
-                                                                identifier_type,
-                                                                this);
-}
-
-void
-TAO_PSDL_Op_Dcl_Scope::dump (CORBA::ULong depth)
-{
-  depth = depth + 5;
-
-  for (Scope_Map_Iterator i = this->scope_map_.begin ();
-       i != this->scope_map_.end ();
-       ++i)
-    {
-      this->print_depth (depth);
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s (%s)\n",
-                  (*i).ext_id_.c_str (), (*i).int_id_));
-    }
-}
-
-TAO_PSDL_Scope *
-TAO_PSDL_Op_Dcl_Scope::parent_scope (void)
-{
-  return this->parent_scope_;
-}
-
-Scope_Map *
-TAO_PSDL_Op_Dcl_Scope::scope_map (void)
-{
-  return &this->scope_map_;
-}
diff --git a/orbsvcs/PSS/PSDL_Op_Dcl_Scope.h b/orbsvcs/PSS/PSDL_Op_Dcl_Scope.h
deleted file mode 100644
index 6df594b464c..00000000000
--- a/orbsvcs/PSS/PSDL_Op_Dcl_Scope.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Op_Dcl_Scope
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_OP_DCL_SCOPE_H
-#define TAO_PSDL_OP_DCL_SCOPE_H
-
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Scope.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PSDL_Export TAO_PSDL_Op_Dcl_Scope : public TAO_PSDL_Scope
-{
- public:
-
-  TAO_PSDL_Op_Dcl_Scope (TAO_PSDL_Scope *parent_scope);
-
-  int add_const_decl (ACE_CString identifier,
-                      ACE_CString identifier_type);
-
-  int add_member_decl (ACE_CString identifier,
-                       ACE_CString identifier_type);
-
-  void dump (CORBA::ULong depth);
-
-  TAO_PSDL_Scope *parent_scope (void);
-
-  Scope_Map *scope_map (void);
-
-protected:
-
-  Scope_Map scope_map_;
-  TAO_PSDL_Scope *parent_scope_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_OP_DCL_SCOPE_H */
diff --git a/orbsvcs/PSS/PSDL_Root_Scope.cpp b/orbsvcs/PSS/PSDL_Root_Scope.cpp
deleted file mode 100644
index 32c1b429572..00000000000
--- a/orbsvcs/PSS/PSDL_Root_Scope.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Root_Scope.h"
-#include "PSDL_Interface_Scope.h"
-
-ACE_RCSID (PSS, PSDL_Root_Scope, "$Id$")
-
-TAO_PSDL_Root_Scope::TAO_PSDL_Root_Scope ()
-  : root_scope_map_ ()
-{
-}
-
-TAO_PSDL_Root_Scope::~TAO_PSDL_Root_Scope ()
-{
-}
-
-int
-TAO_PSDL_Root_Scope::add_module (ACE_CString identifier)
-{
-  return TAO_PSDL_Scope::instance ()->add_module_to_scope (identifier,
-                                                           this);
-}
-
-int
-TAO_PSDL_Root_Scope::add_interface (ACE_CString interface_name)
-{
-  // Add the actual interface.
-  return TAO_PSDL_Scope::instance ()->add_interface_to_scope (interface_name,
-                                                              this);
-}
-
-int
-TAO_PSDL_Root_Scope::add_struct (ACE_CString struct_name)
-{
-  return TAO_PSDL_Scope::instance ()->add_struct_to_scope (struct_name,
-                                                           this);
-}
-
-int
-TAO_PSDL_Root_Scope::add_typedef (ACE_CString identifier,
-                                  ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_typedef_to_scope (identifier,
-                                                            identifier_type,
-                                                            this);
-}
-
-int
-TAO_PSDL_Root_Scope::add_const_decl (ACE_CString identifier,
-                                     ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_const_decl_to_scope (identifier,
-                                                               identifier_type,
-                                                               this);
-}
-
-int
-TAO_PSDL_Root_Scope::add_except_decl (ACE_CString identifier,
-                                      ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_except_decl_to_scope (identifier,
-                                                                identifier_type,
-                                                                this);
-}
-
-int
-TAO_PSDL_Root_Scope::add_op_dcl (ACE_CString identifier)
-{
-  return TAO_PSDL_Scope::instance ()->add_op_dcl_to_scope (identifier,
-                                                           this);
-}
-
-void
-TAO_PSDL_Root_Scope::dump (CORBA::ULong depth)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "ROOT_SCOPE"));
-
-  depth = depth + 5;
-  for (Scope_Map_Iterator i = this->root_scope_map_.begin ();
-       i != this->root_scope_map_.end ();
-       ++i)
-    {
-      TAO_PSDL_Scope::instance ()->print_depth (depth);
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s (module)\n",
-                  (*i).ext_id_.c_str ()));
-      (*i).int_id_->dump (depth);
-    }
-
-}
-
-int
-TAO_PSDL_Root_Scope::find (const ACE_CString &identifier_name,
-                           ACE_CString &identifier_type)
-{
-  for (Scope_Map_Iterator i = this->root_scope_map_.begin ();
-       i != this->root_scope_map_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          identifier_type = (*i).int_id_->identifier_type ();
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->find (identifier_name,
-                                  identifier_type) == 0)
-            {
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-int
-TAO_PSDL_Root_Scope::find (const ACE_CString &identifier_name)
-{
-  for (Scope_Map_Iterator i = this->root_scope_map_.begin ();
-       i != this->root_scope_map_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->find (identifier_name) == 0)
-            {
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-int
-TAO_PSDL_Root_Scope::get_module_name (const ACE_CString &identifier_name,
-                                      ACE_CString &module_name)
-{
-  for (Scope_Map_Iterator i = this->root_scope_map_.begin ();
-       i != this->root_scope_map_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          module_name = (*i).int_id_->module_name ();
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->get_module_name (identifier_name,
-                                             module_name) == 0)
-            {
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-int
-TAO_PSDL_Root_Scope::get_interface_name (const ACE_CString &identifier_name,
-                                         ACE_CString &interface_name)
-{
-  for (Scope_Map_Iterator i = this->root_scope_map_.begin ();
-       i != this->root_scope_map_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          interface_name = (*i).int_id_->interface_name ();
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->get_interface_name (identifier_name,
-                                                interface_name) == 0)
-            {
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-TAO_PSDL_Scope *
-TAO_PSDL_Root_Scope::parent_scope (void)
-{
-  return 0;
-}
-
-Scope_Map *
-TAO_PSDL_Root_Scope::scope_map (void)
-{
-  return &this->root_scope_map_;
-}
diff --git a/orbsvcs/PSS/PSDL_Root_Scope.h b/orbsvcs/PSS/PSDL_Root_Scope.h
deleted file mode 100644
index df0856c8880..00000000000
--- a/orbsvcs/PSS/PSDL_Root_Scope.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Root_Scope
-//
-// = DESCRIPTION
-//    Derived class from PSDL_Scope. This is for the Root Scope.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_ROOT_SCOPE_H
-#define TAO_PSDL_ROOT_SCOPE_H
-
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Scope.h"
-#include "PSDL_Module_Scope.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PSDL_Export TAO_PSDL_Root_Scope : public TAO_PSDL_Scope
-{
-public:
-
-  TAO_PSDL_Root_Scope (void);
-
-  ~TAO_PSDL_Root_Scope (void);
-
-  /// Methods to be able to add the respective types to the Root
-  /// Scope.
-  int add_module (ACE_CString identifier);
-
-  int add_interface (ACE_CString identifier);
-
-  int add_struct (ACE_CString identifier);
-
-  int add_typedef (ACE_CString identifier,
-                   ACE_CString identifier_type);
-
-  int add_const_decl (ACE_CString identifier,
-                      ACE_CString identifier_type);
-
-  int add_except_decl (ACE_CString identifier,
-                       ACE_CString identifier_type);
-
-  int add_op_dcl (ACE_CString identifier);
-
-  void dump (CORBA::ULong depth);
-
-  int find (const ACE_CString &identifier_name,
-            ACE_CString &identifier_type);
-
-  int find (const ACE_CString &identifier_name);
-
-  int get_module_name (const ACE_CString &identifier_name,
-                       ACE_CString &module_name);
-  
-  int get_interface_name (const ACE_CString &identifier_name,
-                          ACE_CString &interface_name);
-  
-  /// Public methods to return the scopes needed.
-  TAO_PSDL_Scope *parent_scope (void);
-
-  Scope_Map *scope_map (void);
-
-protected:
-
-  Scope_Map root_scope_map_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_ROOT_SCOPE_H */
diff --git a/orbsvcs/PSS/PSDL_Scope.cpp b/orbsvcs/PSS/PSDL_Scope.cpp
deleted file mode 100644
index 0e64ffca560..00000000000
--- a/orbsvcs/PSS/PSDL_Scope.cpp
+++ /dev/null
@@ -1,914 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Scope.h"
-#include "PSDL_Root_Scope.h"
-#include "PSDL_Simple_Scope.h"
-#include "PSDL_Module_Scope.h"
-#include "PSDL_Interface_Scope.h"
-#include "PSDL_Struct_Scope.h"
-#include "PSDL_Exception_Scope.h"
-#include "PSDL_Op_Dcl_Scope.h"
-#include "PSDL_Stream.h"
-#include "ace/OS_NS_ctype.h"
-
-ACE_RCSID (PSS, PSDL_Scope, "$Id$")
-
-#undef INCREMENT
-#define INCREMENT 40
-
-TAO_PSDL_Scope::TAO_PSDL_Scope (void)
-  : psdl_scope_ (new TAO_PSDL_Scope *[INCREMENT]),
-    ast_scope_ (0),
-    module_names_ (0),
-    interface_names_ (0),
-    psdl_scope_top_ (0),
-    root_scope_ (0),
-    identifier_ (),
-    name_space_ (),
-    interface_name_ (),
-    ps_sh_ (0),
-    ps_si_ (0),
-    ps_sin_ (0)
-{
-}
-
-TAO_PSDL_Scope::~TAO_PSDL_Scope (void)
-{
-}
-
-void
-TAO_PSDL_Scope::to_lower_case (ACE_CString &identifier)
-{
-  size_t len = identifier.length ();
-  for (size_t i = 0; i <= len; ++i)
-    {
-      identifier[i] = ACE_OS::ace_tolower (identifier[i]);
-    }
-}
-
-int
-TAO_PSDL_Scope::check_identifier (ACE_CString identifier,
-                                  TAO_PSDL_Scope *scope)
-{
-  int result = 0;
-
-  this->to_lower_case (identifier);
-
-  // Check in the ROOT_SCOPE
-  if (scope->scope_map () != 0)
-    result = scope->scope_map ()->find (identifier);
-
-  if (result != 0)
-    {
-      // Didnt find in this scope. Check in the parents scope
-      // since that also counts.
-      if (scope->parent_scope () != 0)
-        {
-          result =
-            this->check_identifier (identifier,
-                                    scope->parent_scope ());
-        }
-    }
-
-  return result;
-}
-
-void
-TAO_PSDL_Scope::check_name_in_scope (ACE_CString identifier,
-                                     TAO_PSDL_Scope *scope)
-{
-  // This method is to be used in the cases when the identifier should
-  // have been declared before: for example, forward declarations.
-
-  // Check if it is a user-defined type defined in this scope.
-  int check_result = this->check_identifier (identifier,
-                                             scope);
-
-  if (check_result == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Identifier %s not defined before in the scope..aborting..\n",
-                  identifier.c_str ()));
-
-      ACE_OS::exit (1);
-    }
-}
-
-int
-TAO_PSDL_Scope::add_module (ACE_CString)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_module_to_scope (ACE_CString identifier,
-                                     TAO_PSDL_Scope *scope)
-{
-  ACE_CString lower_identifier = identifier;
-  this->to_lower_case (lower_identifier);
-
-  if (this->check_identifier (lower_identifier, scope) == -1)
-    {
-      TAO_PSDL_Module_Scope *psdl_module =
-        new TAO_PSDL_Module_Scope (scope);
-
-      scope->scope_map ()->bind (lower_identifier,
-                                 psdl_module);
-
-      size_t cur_size = this->module_names_.size ();
-
-      /// @@ Rather than here .. you must have actually save the
-      /// identifier name in the instance of the module itself .. or
-      /// may be I should rather figure out a
-      this->module_names_.size (cur_size + 1);
-      this->module_names_[cur_size] = identifier;
-
-      TAO_PSDL_Scope::instance ()->push_scope (psdl_module);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Error: module name re-defined: ABORTING\n"));
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_interface_dcl_to_scope (ACE_CString identifier,
-                                            TAO_PSDL_Scope *scope)
-{
-  this->to_lower_case (identifier);
-
-  if (this->check_identifier (identifier, scope) == -1)
-    {
-      TAO_PSDL_Simple_Scope *psdl_simple =
-        new TAO_PSDL_Simple_Scope (scope,
-                                   "forward_dcl");
-
-      scope->scope_map ()->bind (identifier,
-                                 psdl_simple);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Error: interface_name %s re-defined\n",
-                  identifier.c_str ()));
-
-      ACE_OS::exit (1);
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_interface (ACE_CString)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_interface_to_scope (ACE_CString identifier,
-                                        TAO_PSDL_Scope *scope)
-{
-  this->to_lower_case (identifier);
-
-  if (this->check_identifier (identifier, scope) == -1)
-    {
-      TAO_PSDL_Interface_Scope *psdl_interface =
-        new TAO_PSDL_Interface_Scope (scope);
-
-      scope->scope_map ()->bind (identifier,
-                                  psdl_interface);
-
-      TAO_PSDL_Scope::instance ()->push_scope (psdl_interface);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Error: interface_name %s re-defined\n",
-                  identifier.c_str ()));
-
-      ACE_OS::exit (1);
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_struct (ACE_CString)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_struct_to_scope (ACE_CString struct_name,
-                                     TAO_PSDL_Scope *scope)
-{
-  this->to_lower_case (struct_name);
-
-  if (this->check_identifier (struct_name, scope) == -1)
-    {
-      TAO_PSDL_Struct_Scope *psdl_struct =
-        new TAO_PSDL_Struct_Scope (scope);
-
-      scope->scope_map ()->bind (struct_name,
-                                 psdl_struct);
-
-      TAO_PSDL_Scope::instance ()->push_scope (psdl_struct);
-
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Error: identifier re-defined: ABORTING\n"));
-
-      ACE_OS::exit (1);
-
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_typedef (ACE_CString,
-                             ACE_CString)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_typedef_to_scope (ACE_CString identifier,
-                                      ACE_CString identifier_type,
-                                      TAO_PSDL_Scope *scope)
-{
-  this->to_lower_case (identifier);
-  this->to_lower_case (identifier_type);
-
-  if (this->check_identifier (identifier, scope) == -1)
-    {
-      TAO_PSDL_Simple_Scope *psdl_simple =
-        new TAO_PSDL_Simple_Scope (scope,
-                                   identifier_type);
-
-      scope->scope_map ()->bind (identifier,
-                                 psdl_simple);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_ERROR,
-                  "Error: trying to redefine typedef %s\n",
-                  identifier.c_str ()));
-
-      ACE_OS::exit (1);
-
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_const_decl (ACE_CString,
-                                ACE_CString)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_const_decl_to_scope (ACE_CString identifier,
-                                         ACE_CString identifier_type,
-                                         TAO_PSDL_Scope *scope)
-{
-  this->to_lower_case (identifier);
-  this->to_lower_case (identifier_type);
-
-  // First check if the identifier_type is either a predefined type
-  // or if it is defined before. If it is defined before, we will
-  // proceed.
-  this->check_name_in_scope (identifier_type, scope);
-
-  if (this->check_identifier (identifier, scope) == -1)
-    {
-      TAO_PSDL_Simple_Scope *psdl_simple =
-            new TAO_PSDL_Simple_Scope (scope,
-                                       identifier_type);
-
-      scope->scope_map ()->bind (identifier,
-                                 psdl_simple);
-
-    }
-  else
-    {
-      ACE_DEBUG ((LM_ERROR,
-                  "Error: const_decl re-defined %s\n",
-                  identifier.c_str ()));
-
-      ACE_OS::exit (1);
-
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_except_decl (ACE_CString,
-                                ACE_CString)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_except_decl_to_scope (ACE_CString identifier,
-                                          ACE_CString identifier_type,
-                                          TAO_PSDL_Scope *scope)
-{
-  this->to_lower_case (identifier);
-  this->to_lower_case (identifier_type);
-
-  if (this->check_identifier (identifier, scope) == -1)
-    {
-      TAO_PSDL_Simple_Scope *psdl_simple =
-        new TAO_PSDL_Simple_Scope (scope,
-                                   identifier_type);
-
-      scope->scope_map ()->bind (identifier,
-                                 psdl_simple);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Error: exception_name %s re-defined\n",
-                  identifier.c_str ()));
-
-      ACE_OS::exit (1);
-
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_op_dcl (ACE_CString)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_op_dcl_to_scope (ACE_CString op_name,
-                                     TAO_PSDL_Scope *scope)
-{
-  this->to_lower_case (op_name);
-
-  if (this->check_identifier (op_name, scope) == -1)
-    {
-      TAO_PSDL_Op_Dcl_Scope *psdl_op_dcl =
-        new TAO_PSDL_Op_Dcl_Scope (scope);
-
-      scope->scope_map ()->bind (op_name,
-                                  psdl_op_dcl);
-
-      TAO_PSDL_Scope::instance ()->push_scope (psdl_op_dcl);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Error: op_name %s re-defined\n",
-                  op_name.c_str ()));
-
-      ACE_OS::exit (1);
-
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_member_decl (ACE_CString,
-                                 ACE_CString)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_member_decl_to_scope (ACE_CString identifier,
-                                          ACE_CString identifier_type,
-                                          TAO_PSDL_Scope *scope)
-{
-  this->to_lower_case (identifier);
-  this->to_lower_case (identifier_type);
-
-  if (this->check_identifier (identifier, scope) == -1)
-    {
-      TAO_PSDL_Simple_Scope *psdl_simple =
-        new TAO_PSDL_Simple_Scope (scope,
-                                   identifier_type);
-
-      scope->scope_map ()->bind (identifier,
-                                 psdl_simple);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Error: member_decl %s re-defined\n",
-                  identifier.c_str ()));
-
-      ACE_OS::exit (1);
-
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_exception (ACE_CString)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_exception_to_scope (ACE_CString identifier,
-                                        TAO_PSDL_Scope *scope)
-{
-  this->to_lower_case (identifier);
-
-  if (this->check_identifier (identifier, scope) == -1)
-    {
-      TAO_PSDL_Exception_Scope *psdl_exception =
-        new TAO_PSDL_Exception_Scope (scope);
-
-      scope->scope_map ()->bind (identifier,
-                                  psdl_exception);
-
-      TAO_PSDL_Scope::instance ()->push_scope (psdl_exception);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Error: exception %s re-defined: aborting\n",
-                  identifier.c_str ()));
-
-      ACE_OS::exit (1);
-
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_scoped_decl_to_scope (ACE_CString identifier,
-                                          ACE_CString identifier_type,
-                                          TAO_PSDL_Scope *scope)
-{
-  this->to_lower_case (identifier);
-  this->to_lower_case (identifier_type);
-
-  TAO_PSDL_Simple_Scope *psdl_simple =
-    new TAO_PSDL_Simple_Scope (scope,
-                               identifier_type);
-
-  scope->scope_map ()->bind (identifier,
-                             psdl_simple);
-  return 0;
-}
-
-int
-TAO_PSDL_Scope::add_enum_decl_to_scope (ACE_CString identifier,
-                                        ACE_CString identifier_type,
-                                        TAO_PSDL_Scope *scope)
-{
-  this->to_lower_case (identifier);
-  this->to_lower_case (identifier_type);
-
-  TAO_PSDL_Simple_Scope *psdl_simple =
-    new TAO_PSDL_Simple_Scope (scope,
-                               identifier_type);
-
-  scope->scope_map ()->bind (identifier,
-                             psdl_simple);
-  return 0;
-}
-
-void
-TAO_PSDL_Scope::set_root_scope ()
-{
-  // This method is called to push the root_scope the first time.
-  if (this->root_scope_ == 0)
-    {
-      this->root_scope_ = new TAO_PSDL_Root_Scope ();
-      TAO_PSDL_Scope::instance ()->push_scope (this->root_scope_);
-    }
-}
-
-void
-TAO_PSDL_Scope::set_stub_prefix (const char *filename)
-{
-  this->stub_prefix_ = filename;
-}
-
-const ACE_CString &
-TAO_PSDL_Scope::get_stub_prefix (void)
-{
-  return this->stub_prefix_;
-}
-
-TAO_PSDL_Stream *
-TAO_PSDL_Scope::get_sh (void)
-{
-  if (this->ps_sh_ == 0)
-    {
-      ACE_NEW_RETURN (this->ps_sh_,
-                      TAO_PSDL_Stream,
-                      0);
-
-      ACE_CString file_name =
-        TAO_PSDL_Scope::instance ()->get_stub_prefix () + "C.h";
-
-      this->ps_sh_->open (file_name.c_str ());
-
-      this->header_initialization (this->ps_sh_);
-    }
-
-  return this->ps_sh_;
-}
-
-TAO_PSDL_Stream *
-TAO_PSDL_Scope::get_si (void)
-{
-  if (this->ps_si_ == 0)
-    {
-      ACE_NEW_RETURN (this->ps_si_,
-                      TAO_PSDL_Stream,
-                      0);
-
-      ACE_CString file_name =
-        TAO_PSDL_Scope::instance ()->get_stub_prefix () + "C.cpp";
-
-      this->ps_si_->open (file_name.c_str ());
-
-      this->stub_initialization (this->ps_si_);
-    }
-
-  return this->ps_si_;
-}
-
-TAO_PSDL_Stream *
-TAO_PSDL_Scope::get_sinline (void)
-{
-  if (this->ps_sin_ == 0)
-    {
-      ACE_NEW_RETURN (this->ps_sin_,
-                      TAO_PSDL_Stream,
-                      0);
-
-      ACE_CString file_name =
-        TAO_PSDL_Scope::instance ()->get_stub_prefix () + "C.i";
-
-      this->ps_sin_->open (file_name.c_str ());
-    }
-
-  return this->ps_sin_;
-}
-
-void
-TAO_PSDL_Scope::header_initialization (TAO_PSDL_Stream *ps_sh)
-{
-  ps_sh->reset ();
-
-  *ps_sh << "#ifndef _TAO_PSDL_" << this->get_stub_prefix () << "C_H_";
-  ps_sh->nl ();
-
-  *ps_sh << "#define _TAO_PSDL_" << this->get_stub_prefix () << "C_H_";
-  ps_sh->nl ();
-
-  *ps_sh << "#include \"tao/corba.h\"";
-  ps_sh->nl ();
-
-  *ps_sh << "#if !defined (ACE_LACKS_PRAGMA_ONCE)";
-  ps_sh->nl ();
-  *ps_sh << "# pragma once";
-  ps_sh->nl ();
-  *ps_sh << "#endif /* ACE_LACKS_PRAGMA_ONCE */";
-  ps_sh->nl ();
-
-  ps_sh->nl ();
-
-  *ps_sh << "#if defined (TAO_EXPORT_MACRO)";
-  ps_sh->nl ();
-  *ps_sh << "#undef TAO_EXPORT_MACRO";
-  ps_sh->nl ();
-  *ps_sh << "#endif";
-  ps_sh->nl ();
-  *ps_sh << "#define TAO_EXPORT_MACRO";
-  ps_sh->nl ();
-
-  ps_sh->nl ();
-
-  *ps_sh << "#if defined (TAO_EXPORT_NESTED_CLASSES)";
-  ps_sh->nl ();
-  *ps_sh << "#  if defined (TAO_EXPORT_NESTED_MACRO)";
-  ps_sh->nl ();
-  *ps_sh << "#    undef TAO_EXPORT_NESTED_MACRO";
-  ps_sh->nl ();
-  *ps_sh << "#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */";
-  ps_sh->nl ();
-  *ps_sh << "#  define TAO_EXPORT_NESTED_MACRO";
-  ps_sh->nl ();
-  *ps_sh << "#endif /* TAO_EXPORT_NESTED_CLASSES */";
-  ps_sh->nl ();
-
-  ps_sh->nl ();
-
-  *ps_sh << "#if defined(_MSC_VER)";
-  ps_sh->nl ();
-  *ps_sh << "#pragma warning(push)";
-  ps_sh->nl ();
-  *ps_sh << "#pragma warning(disable:4250)";
-  ps_sh->nl ();
-  *ps_sh << "#endif /* _MSC_VER */";
-  ps_sh->nl ();
-
-  ps_sh->nl ();
-
-  ps_sh->nl ();
-
-}
-
-void
-TAO_PSDL_Scope::stub_initialization (TAO_PSDL_Stream *ps_si)
-{
-
-  ps_si->reset ();
-
-  *ps_si << "#include \"" << this->get_stub_prefix () << "C.h\"";
-  ps_si->nl ();
-  *ps_si << "#include \"tao/Stub.h\"";
-  ps_si->nl ();
-  *ps_si << "#include \"tao/PortableInterceptor.h\"";
-  ps_si->nl ();
-
-  ps_si->nl ();
-
-  *ps_si << "#if TAO_HAS_INTERCEPTORS == 1";
-  ps_si->nl ();
-  *ps_si << "#include \"tao/RequestInfo_Util.h\"";
-  ps_si->nl ();
-  *ps_si << "#include \"tao/ClientRequestInfo_i.h\"";
-  ps_si->nl ();
-  *ps_si << "#endif  /* TAO_HAS_INTERCEPTORS == 1 */";
-  ps_si->nl ();
-
-  ps_si->nl ();
-
-  ps_si->nl ();
-
-  *ps_si << "#if !defined (__ACE_INLINE__)";
-  ps_si->nl ();
-  *ps_si << "#include \"" << this->get_stub_prefix () << "C.i\"";
-  ps_si->nl ();
-  *ps_si << "#endif /* !defined INLINE */";
-  ps_si->nl ();
-  ps_si->nl ();
-
-}
-
-TAO_PSDL_Scope *
-TAO_PSDL_Scope::pop_top_scope ()
-{
-  // Return the top Scope
-  if (this->psdl_scope_top_ <= 0)
-    return 0;
-
-  return this->psdl_scope_ [this->psdl_scope_top_ - 1];
-}
-
-void
-TAO_PSDL_Scope::set_module_scope (void)
-{
-  size_t cur_size = this->module_names_.size ();
-
-  // Resetting the module_names_
-  this->module_names_.size (cur_size -1);
-  this->set_scope ();
-}
-
-void
-TAO_PSDL_Scope::set_interface_scope (void)
-{
-  size_t cur_size = this->interface_names_.size ();
-
-  // Resetting the module_names_
-  this->interface_names_.size (cur_size -1);
-  this->set_scope ();
-}
-
-void
-TAO_PSDL_Scope::set_scope (void)
-{
-  // Remove the top scope. Its no longer needed.
-  if (this->psdl_scope_top_ <= 0)
-    {
-      return;
-    }
-
-  --this->psdl_scope_top_;
-}
-
-void
-TAO_PSDL_Scope::push_scope (TAO_PSDL_Scope *scope)
-{
-  // Push a new scope.
-  ++this->psdl_scope_top_;
-  this->psdl_scope_ [this->psdl_scope_top_ - 1] = scope;
-
-  // save for later.
-  size_t cur_size = this->ast_scope_.size ();
-  this->ast_scope_.size (cur_size + 1);
-  this->ast_scope_[cur_size] = scope;
-}
-
-void
-TAO_PSDL_Scope::save_identifier (ACE_CString identifier)
-{
-  this->identifier_ = identifier;
-}
-
-ACE_CString
-TAO_PSDL_Scope::get_identifier (void)
-{
-  return this->identifier_;
-}
-
-void
-TAO_PSDL_Scope::dump (CORBA::ULong depth)
-{
-  this->psdl_scope_[0]->dump (depth);
-}
-
-int
-TAO_PSDL_Scope::find (const ACE_CString &identifier_name,
-                      ACE_CString &identifier_type)
-{
-  int result = this->root_scope_->find (identifier_name,
-                                        identifier_type);
-
-  return result;
-}
-
-int
-TAO_PSDL_Scope::find (const ACE_CString &identifier_name)
-{
-  int result = this->root_scope_->find (identifier_name);
-
-  return result;
-}
-
-int
-TAO_PSDL_Scope::get_module_name (const ACE_CString &identifier_name,
-                                 ACE_CString &module_name)
-{
-  return this->root_scope_->get_module_name (identifier_name,
-                                             module_name);
-}
-
-int
-TAO_PSDL_Scope::get_interface_name (const ACE_CString &identifier_name,
-                                    ACE_CString &interface_name)
-{
-  return this->root_scope_->get_interface_name (identifier_name,
-                                                interface_name);
-}
-
-ACE_CString
-TAO_PSDL_Scope::identifier_type (void)
-{
-  return "null";
-}
-
-ACE_CString
-TAO_PSDL_Scope::module_name (void)
-{
-  return "null";
-}
-
-ACE_CString
-TAO_PSDL_Scope::interface_name (void)
-{
-  return "null";
-}
-
-ACE_CString
-TAO_PSDL_Scope::convert_str (int identifier_type)
-{
-  switch (identifier_type)
-    {
-    case 258:
-      return "module";
-    case 264:
-      return "abstract";
-    case 288:
-      return "octet";
-    case 290:
-      return "object";
-    case 291:
-      return "struct";
-    case 295:
-      return "long";
-    case 296:
-      return "short";
-    case 298:
-      return "char";
-    case 300:
-      return "typedef";
-    case 301:
-      return "native";
-    case 316:
-      return "void";
-    case 317:
-      return "in";
-    case 324:
-      return "exception";
-    case 325:
-      return "interface";
-    case 326:
-      return "local";
-    case 332:
-      return "char *";
-    case 337:
-      return "enum";
-    case 338:
-      return "sequence";
-    default:
-      return "unknown";
-    };
-}
-
-
-void
-TAO_PSDL_Scope::print_depth (CORBA::ULong depth)
-{
-  for (CORBA::ULong i=0; i != depth; ++i)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "-"));
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              ">"));
-}
-
-TAO_PSDL_Scope *
-TAO_PSDL_Scope::instance (void)
-{
-  return TAO_Singleton<TAO_PSDL_Scope, TAO_SYNCH_MUTEX>::instance ();
-}
-
-void
-TAO_PSDL_Scope::set_name_space (ACE_CString name_space)
-{
-  this->name_space_ = name_space;
-}
-
-ACE_CString
-TAO_PSDL_Scope::get_name_space (void)
-{
-  return this->name_space_;
-}
-
-void
-TAO_PSDL_Scope::set_interface_name (ACE_CString interface_name)
-{
-  this->interface_name_ = interface_name;
-}
-
-ACE_CString
-TAO_PSDL_Scope::get_interface_name (void)
-{
-  return this->interface_name_;
-}
-
-TAO_PSDL_Scope *
-TAO_PSDL_Scope::parent_scope (void)
-{
-  return 0;
-}
-
-Scope_Map *
-TAO_PSDL_Scope::scope_map (void)
-{
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-template TAO_Singleton<TAO_PSDL_Scope, TAO_SYNCH_MUTEX> *TAO_Singleton<TAO_PSDL_Scope, TAO_SYNCH_MUTEX>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/orbsvcs/PSS/PSDL_Scope.h b/orbsvcs/PSS/PSDL_Scope.h
deleted file mode 100644
index 0e7ad9d0862..00000000000
--- a/orbsvcs/PSS/PSDL_Scope.h
+++ /dev/null
@@ -1,294 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ==================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Scope
-//
-// = DESCRIPTION
-//    This Class is a base class for building the ASTs. The derived
-//    classes override the virtual methods that they need. The class
-//    also contains the methods which are common to all the derived
-//    classes.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ==================================================================
-
-#ifndef TAO_PSDL_SCOPE_H
-#define TAO_PSDL_SCOPE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "psdl_export.h"
-
-#include "tao/TAO_Singleton.h"
-
-#include "ace/Hash_Map_Manager_T.h"
-#include "ace/Array_Base.h"
-#include "ace/SString.h"
-
-
-// Fwd Declarations.
-class TAO_PSDL_Node;
-class TAO_PSDL_Scope;
-class TAO_PSDL_Root_Scope;
-class TAO_PSDL_Stream;
-
-typedef ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_PSDL_Scope *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX> Scope_Map;
-
-typedef Scope_Map::iterator Scope_Map_Iterator;
-
-class TAO_PSDL_Export TAO_PSDL_Scope
-{
-  // The TAO_PSDL_Scope class serves two purposes. One it acts as the
-  // base class from which the child classes derive to be able to add
-  // the members in their scopes. TAO_PSDL_Root_Scope is the root
-  // scope where any thing goes into. If there is a module in the idl
-  // file, all the members in the module are to be added to an
-  // instance of TAO_PSDL_Module_Scope. And, it also acts as a class
-  // that has the common members to be accessed by all the derived
-  // classes. For example, add_module_to_scope is the common method
-  // for all the sub-classes to invoke from the add_module method.
-  friend class TAO_Singleton<TAO_PSDL_Scope, TAO_SYNCH_MUTEX>;
-
-public:
-
-  TAO_PSDL_Scope (void);
-
-  virtual ~TAO_PSDL_Scope (void);
-
-  /// The add functions are overridden by the derived classes to add
-  /// the respective types in their scopes. The return value is a '0'
-  /// if successful and '-1' if it ends up as a failure.
-  virtual int add_module (ACE_CString identifier);
-
-  virtual int add_interface (ACE_CString identifier);
-
-  virtual int add_struct (ACE_CString identifier);
-
-  virtual int add_typedef (ACE_CString identifier,
-                           ACE_CString identifier_type);
-
-  virtual int add_const_decl (ACE_CString identifier,
-                              ACE_CString identifier_type);
-
-  virtual int add_except_decl (ACE_CString identifier,
-                               ACE_CString identifier_type);
-
-  virtual int add_exception (ACE_CString identifier);
-
-  virtual int add_op_dcl (ACE_CString identifier);
-
-  virtual int add_member_decl (ACE_CString identifier,
-                               ACE_CString identifier_type);
-
-  /// Return the top scope.
-  virtual TAO_PSDL_Scope *pop_top_scope (void);
-
-  /// Push the scope that is passed into the stack of scopes.
-  virtual void push_scope (TAO_PSDL_Scope *scope);
-
-  /// Return the pointer to the parent scope.
-  virtual TAO_PSDL_Scope *parent_scope (void);
-
-  /// Return the pointer to Scope_Map of the instance.
-  virtual Scope_Map *scope_map (void);
-
-  /// Function to help indent the output of the parse tree.
-  virtual void dump (CORBA::ULong depth);
-
-  /// Function to find the TAO_PSDL_Scope for the given identifier_name
-  virtual int find (const ACE_CString &identifier_name,
-                    ACE_CString &identifier_type);
-
-  /// Function to check if a particular identifier_name exists in the
-  /// scope.
-  virtual int find (const ACE_CString &identifier_name);
-
-  /// To get the name of the module to which an identifier_name
-  /// belongs. returns '0' on succes and '-1' on failure.
-  virtual int get_module_name (const ACE_CString &identifier_name,
-                               ACE_CString &module_name);
-
-  /// To get the name of the interface to which an identifier_name
-  /// belongs. returns '0' on succes and '-1' on failure.
-  virtual int get_interface_name (const ACE_CString &identifier_name,
-                                  ACE_CString &interface_name);
-
-  /// Each identifier will have an instance of a derived type of
-  /// TAO_PSDL_Scope *.. the following method is an accessor to the
-  /// type of the identifier name
-  virtual ACE_CString identifier_type (void);
-  virtual ACE_CString module_name (void);
-  virtual ACE_CString interface_name (void);
-
-  /// As the function name implies, the following methods help add the
-  /// respective types to the scope passed in. The return value is a
-  /// '0' on success and '-1' on a failure.
-  int add_module_to_scope (ACE_CString identifier,
-                           TAO_PSDL_Scope *scope);
-
-  int add_interface_to_scope (ACE_CString identifier,
-                              TAO_PSDL_Scope *scope);
-
-  int add_interface_dcl_to_scope (ACE_CString identifier,
-                                  TAO_PSDL_Scope *scope);
-
-  int add_struct_to_scope (ACE_CString identifier,
-                           TAO_PSDL_Scope *scope);
-
-  int add_typedef_to_scope (ACE_CString identifier,
-                            ACE_CString identifier_type,
-                            TAO_PSDL_Scope *scope);
-
-  int add_const_decl_to_scope (ACE_CString identifier,
-                               ACE_CString identifier_type,
-                               TAO_PSDL_Scope *scope);
-
-  int add_except_decl_to_scope (ACE_CString identifier,
-                                ACE_CString identifier_type,
-                                TAO_PSDL_Scope *scope);
-
-  int add_exception_to_scope (ACE_CString identifier,
-                              TAO_PSDL_Scope *scope);
-
-  int add_scoped_decl_to_scope (ACE_CString identifier,
-                                ACE_CString identifier_type,
-                                TAO_PSDL_Scope *scope);
-
-  int add_enum_decl_to_scope (ACE_CString identifier,
-                              ACE_CString identifier_type,
-                              TAO_PSDL_Scope *scope);
-
-  int add_op_dcl_to_scope (ACE_CString identifier,
-                           TAO_PSDL_Scope *scope);
-
-  int add_member_decl_to_scope (ACE_CString identifier,
-                                ACE_CString identifier_type,
-                                TAO_PSDL_Scope *scope);
-
-  /// Set the root scope the very first time.
-  void set_root_scope (void);
-
-  /// Set and get the name of the stub that has to be generated. The name
-  /// is based on the input file that is passed to the compiler.
-  void set_stub_prefix (const char *filename);
-  const ACE_CString &get_stub_prefix (void);
-
-  /// These methods help write the header files that needs to be
-  /// included and other initialization part to the stubs.
-  void header_initialization (TAO_PSDL_Stream *ps_sh);
-  void stub_initialization (TAO_PSDL_Stream *ps_si);
-
-  /// Get the pointer to the TAO_PSDL_Stream for the stub header.
-  TAO_PSDL_Stream *get_sh (void);
-
-  /// Get the pointer to the TAO_PSDL_Stream for the stub
-  /// implementation file.
-  TAO_PSDL_Stream *get_si (void);
-
-  /// Get the pointer to the TAO_PSDL_Stream for the stub
-  /// inline file.
-  TAO_PSDL_Stream *get_sinline (void);
-
-  /// As the name suggests, check if the identifier name is already
-  /// used for something else in the sc
-  int check_identifier (ACE_CString identifier,
-                        TAO_PSDL_Scope *scope);
-
-  /// This is to check if a forward declaration has been done
-  /// already.
-  void check_name_in_scope (ACE_CString identifier,
-                            TAO_PSDL_Scope *scope);
-
-  /// Return a unique instance
-  static TAO_PSDL_Scope *instance (void);
-
-  /// This wont be necessary in the final version .. its helpful to
-  /// print the symbol table to the std output for now.
-  void print_depth (CORBA::ULong depth);
-
-  /// Method used to set the scope back to the previous one.
-  void set_scope (void);
-
-  /// Set interface scope to the previous one.
-  void set_interface_scope (void);
-
-  /// Set module scope to the previous one.
-  void set_module_scope (void);
-
-  /// Methods to save and retrieve the identifier values.
-  void save_identifier (ACE_CString identifier);
-  ACE_CString get_identifier (void);
-
-  /// Accessor methods to the name of the name_space: Module name
-  void set_name_space (ACE_CString name_space);
-  ACE_CString get_name_space (void);
-
-  /// Accessor methods to the name of the current interface.
-  void set_interface_name (ACE_CString interface_name);
-  ACE_CString get_interface_name (void);
-
-  // Helper method for the semantic checking. By converting all the
-  // identifiers to lower case before adding to the scope.
-  void to_lower_case (ACE_CString &identifier);
-
-  /// Helper method to convert the int value of the identifier type to
-  /// its string equivalent based on the conversion values generated
-  /// by the Yacc Parser (please see PSDL_y.h for the conversion values).
-  ACE_CString convert_str (int identifier_type);
-
-private:
-
-  /// Array of TAO_PSDL_Scope pointers to be used with the singleton
-  /// instance.
-  TAO_PSDL_Scope **psdl_scope_;
-
-  /// Save the psdl_scopes for use while writing
-  /// to stubs.
-  ACE_Array_Base <TAO_PSDL_Scope *> ast_scope_;
-
-  /// Arrays to save the module and interface names
-  ACE_Array_Base <ACE_CString> module_names_;
-  ACE_Array_Base <ACE_CString> interface_names_;
-
-  /// Count of the members in the psdl_scope_
-  unsigned long psdl_scope_top_;
-
-  /// Pointer to the instance of the TAO_PSDL_Root_Scope.
-  TAO_PSDL_Root_Scope *root_scope_;
-
-  /// Identifier used for the save_identifier and get_identifier
-  /// methods.
-  ACE_CString identifier_;
-
-  /// Save for use while writing to stubs.
-  ACE_CString name_space_;
-  ACE_CString interface_name_;
-
-  /// Name of the filename that is passed to the compiler psdl_tao.
-  ACE_CString stub_prefix_;
-
-  /// Pointers to the TAO_PSDL_Streams for the stub header,
-  /// implementation and inline files.
-  TAO_PSDL_Stream *ps_sh_;
-  TAO_PSDL_Stream *ps_si_;
-  TAO_PSDL_Stream *ps_sin_;
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_SCOPE_H */
diff --git a/orbsvcs/PSS/PSDL_Scope_Visitor.cpp b/orbsvcs/PSS/PSDL_Scope_Visitor.cpp
deleted file mode 100644
index 700b70dd62e..00000000000
--- a/orbsvcs/PSS/PSDL_Scope_Visitor.cpp
+++ /dev/null
@@ -1,1150 +0,0 @@
-// $Id$
-
-#include "PSDL_Scope_Visitor.h"
-#include "PSDL_y.h"
-
-TAO_PSDL_Scope_Visitor::TAO_PSDL_Scope_Visitor (TAO_PSDL_Node *psdl_node)
-  : psdl_node_ (psdl_node)
-{
-}
-
-TAO_PSDL_Scope_Visitor::~TAO_PSDL_Scope_Visitor ()
-{
-}
-
-ACE_CString
-TAO_PSDL_Scope_Visitor::get_scoped_type (void)
-{
-  return this->scoped_type_;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_module (TAO_PSDL_Module *module)
-{
-  //  this->psdl_node_->set_identifier ("module");
-
-  if (module->specification ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_identifier (TAO_PSDL_Identifier *identifier)
-{
-  this->psdl_node_->set_identifier (identifier->value ());
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_specification (TAO_PSDL_Specification *specification)
-{
-  if (specification->definition ()->accept (this) == -1)
-    return -1;
-
-  if (specification->specification () != 0)
-    {
-      if (specification->specification ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_definition (TAO_PSDL_Definition *definition)
-{
-  if (definition->definition_type ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_abstract_storagetype (TAO_PSDL_Abstract_Storagetype *)
-{
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_abstract_storagetype_dcl (TAO_PSDL_Abstract_Storagetype_Dcl *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_abstract_storagetype_fwd_dcl (TAO_PSDL_Abstract_Storagetype_Fwd_Dcl *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_abstract_storagetype_header (TAO_PSDL_Abstract_Storagetype_Header *)
-{
- //  NOT YET SUPPORTED
- return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_abstract_storagetype_body (TAO_PSDL_Abstract_Storagetype_Body *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_abstract_storagetype_member (TAO_PSDL_Abstract_Storagetype_Member *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_abstract_storagetype_inh_spec (TAO_PSDL_Abstract_Storagetype_Inh_Spec *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_abstract_storagetype_name (TAO_PSDL_Abstract_Storagetype_Name *)
-{
-  //  NOT YET SUPPORTED
-  return 0; }
-
-int TAO_PSDL_Scope_Visitor::visit_psdl_state_dcl (TAO_PSDL_Psdl_State_Dcl *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_psdl_state_type_spec (TAO_PSDL_Psdl_State_Type_Spec *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_abstract_storagetype_ref_type (TAO_PSDL_Abstract_Storagetype_Ref_Type)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_abstract_storagehome (TAO_PSDL_Abstract_Storagehome *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_abstract_storagehome_fwd_dcl (TAO_PSDL_Abstract_Storagehome_Fwd_Dcl *)
-{ //  NOT YET SUPPORTED
-
-
- return 0; }
-
-int TAO_PSDL_Scope_Visitor::visit_abstract_storagehome_dcl (TAO_PSDL_Abstract_Storagehome_Dcl *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_abstract_storagehome_header (TAO_PSDL_Abstract_Storagehome_Header *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_abstract_storagehome_body (TAO_PSDL_Abstract_Storagehome_Body  *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_abstract_storagehome_member (TAO_PSDL_Abstract_Storagehome_Member *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_abstract_storagehome_inh_spec (TAO_PSDL_Abstract_Storagehome_Inh_Spec *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_abstract_storagehome_name (TAO_PSDL_Abstract_Storagehome_Name *)
-{ //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_local_op_dcl (TAO_PSDL_Local_Op_Dcl *local_op_dcl)
-{
-  if (local_op_dcl->op_type_spec ()->accept (this) == -1)
-    return -1;
-
-  if (local_op_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (local_op_dcl->parameter_dcls ()->accept (this) == -1)
-    return -1;
-
-  if (local_op_dcl->raises_expr () != 0)
-    {
-      if (local_op_dcl->raises_expr ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_key_dcl (TAO_PSDL_Key_Dcl *key_dcl)
-{
-  if (key_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (key_dcl->simple_declarator () != 0)
-    if (key_dcl->simple_declarator ()->accept (this) == -1)
-      return -1;
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_catalog (TAO_PSDL_Catalog *)
-{
-  //  NOT YET SUPPORTED
-  return 0; }
-
-int TAO_PSDL_Scope_Visitor::visit_catalog_inh_spec (TAO_PSDL_Catalog_Inh_Spec *)
-{
-  //  NOT YET SUPPORTED
-  return 0; }
-
-int TAO_PSDL_Scope_Visitor::visit_catalog_name (TAO_PSDL_Catalog_Name *)
-{ //  NOT YET SUPPORTED
-  return 0; }
-
-int TAO_PSDL_Scope_Visitor::visit_catalog_body (TAO_PSDL_Catalog_Body *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_catalog_member (TAO_PSDL_Catalog_Member *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_storagetype_member (TAO_PSDL_Storagetype_Member *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_storagetype_inh_spec (TAO_PSDL_Storagetype_Inh_Spec *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_storagetype_name (TAO_PSDL_Storagetype_Name *storagetype_name)
-{
-  if (storagetype_name->scoped_name ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_storagetype_impl_spec (TAO_PSDL_Storagetype_Impl_Spec *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_storagetype_ref_type (TAO_PSDL_Storagetype_Ref_Type *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_store_directive (TAO_PSDL_Store_Directive *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_psdl_concrete_state_type (TAO_PSDL_Psdl_Concrete_State_Type *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_ref_rep_directive (TAO_PSDL_Ref_Rep_Directive *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_storagehome (TAO_PSDL_Storagehome *storagehome)
-{
-  if (storagehome->storagehome_header ()->accept (this) == -1)
-    return -1;
-
-  if (storagehome->storagehome_body () != 0)
-    if (storagehome->storagehome_body ()->accept (this) == -1)
-      return -1;
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_storagehome_header (TAO_PSDL_Storagehome_Header *sh_header)
-{
-  if (sh_header->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (sh_header->storagetype_name ()->accept (this) == -1)
-    return -1;
-
-
-  if (sh_header->storagehome_inh_spec () != 0)
-    if (sh_header->storagehome_inh_spec ()->accept (this) == -1)
-      return -1;
-
-  if (sh_header->storagehome_impl_spec () != 0)
-    if (sh_header->storagehome_impl_spec ()->accept (this) == -1)
-      return -1;
-
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_storagehome_body  (TAO_PSDL_Storagehome_Body *sh_body)
-{
-  if (sh_body->storagehome_member ()->accept (this) == -1)
-    return -1;
-
-  if (sh_body->storagehome_body () != 0)
-    if (sh_body->storagehome_body ()->accept (this) == -1)
-      return -1;
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_storagehome_member  (TAO_PSDL_Storagehome_Member *sh_member)
-{
-  if (sh_member->key_dcl ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_storagehome_inh_spec  (TAO_PSDL_Storagehome_Inh_Spec *sh_inh_spec)
-{
-  if (sh_inh_spec->storagehome_name ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_storagehome_name  (TAO_PSDL_Storagehome_Name *sh_name)
-{
-  if (sh_name->scoped_name ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_storagehome_impl_spec (TAO_PSDL_Storagehome_Impl_Spec *sh_impl_spec)
-{
-  if (sh_impl_spec->abstract_storagehome_name ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_primary_key_dcl (TAO_PSDL_Primary_Key_Dcl *primary_key_dcl)
-{
-  if (primary_key_dcl->identifier ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_type_dcl (TAO_PSDL_Type_Dcl *type_dcl)
-{
-  if (type_dcl->key_word () == TAO_PSDL_NATIVE)
-    {
-      this->psdl_node_->set_identifier (TAO_PSDL_Scope::instance ()->convert_str (type_dcl->key_word ()));
-
-      this->psdl_node_->set_predefined_type ();
-    }
-
-  if (type_dcl->type_of_type_dcl ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_type_declarator (TAO_PSDL_Type_Declarator *type_declarator)
-{
-  if (type_declarator->type_spec ()->accept (this) == -1)
-    return -1;
-
-  if (type_declarator->declarators ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_type_spec (TAO_PSDL_Type_Spec *type_spec)
-{
-  if (type_spec->type_of_type_spec ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_simple_type_spec  (TAO_PSDL_Simple_Type_Spec *simple_type_spec)
-{
-  if (simple_type_spec->type_of_simple_type_spec ()->accept (this) == -1)
-    return -1;
-
-  // @@ why this
-  this->scoped_type_ = TAO_PSDL_Scope::instance ()->get_identifier ();
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_base_type_spec  (TAO_PSDL_Base_Type_Spec *base_type_spec)
-{
-  if (base_type_spec->type_of_base_type_spec ()->accept (this) == -1)
-    return -1;
-  return 0; }
-
-int TAO_PSDL_Scope_Visitor::visit_template_type_spec  (TAO_PSDL_Template_Type_Spec *template_type_spec)
-{
-  if (template_type_spec->type_of_template_type_spec ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_constr_type_spec  (TAO_PSDL_Constr_Type_Spec *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_declarators  (TAO_PSDL_Declarators *declarators)
-{
-
-  if (declarators->declarator ()->accept (this) == -1)
-    return -1;
-
-  if (declarators->set_of_declarators () != 0)
-    {
-      if (declarators->set_of_declarators ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_declarator  (TAO_PSDL_Declarator *declarator)
-{
-  if (declarator->type_of_declarator ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_simple_declarator  (TAO_PSDL_Simple_Declarator *simple_declarator)
-{
-
-  if (simple_declarator->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (simple_declarator->simple_declarator () != 0)
-    {
-
-      if (simple_declarator->simple_declarator ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_simple_declarator_list  (TAO_PSDL_Simple_Declarator_List *simple_decl_list)
-{
-
-  if (simple_decl_list-> simple_declarator ()->accept (this) == -1)
-    return -1;
-
-  if (simple_decl_list->simple_declarator_list () != 0)
-    {
-
-      if (simple_decl_list->simple_declarator_list ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_complex_declarator  (TAO_PSDL_Complex_Declarator *complex_declarator)
-{
-  if (complex_declarator->array_declarator ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_predefined_type (TAO_PSDL_Predefined_Type *predefined_type)
-{
-  if ((predefined_type->type_one () != 0) && (predefined_type->type_one () != TAO_PSDL_SEQUENCE))
-    {
-      // This will happen in the case of typedefs like
-      // typedef sequence<Istring> Name. We neednot save the sequence
-      // @@ May be this is a wrong solution ... but atleast a
-      // temporary one :)
-      this->psdl_node_->set_identifier (TAO_PSDL_Scope::instance ()->convert_str (predefined_type->type_one ()));
-
-      this->psdl_node_->set_predefined_type ();
-    }
-  if (predefined_type->type_two () != 0) {}
-
-  if (predefined_type->type_three () != 0)
-    {}
-
-  if (predefined_type->type_of_variable_one () != 0)
-    {
-      if (predefined_type->type_of_variable_one ()->accept (this) == -1)
-        return -1;
-    }
-
-  if (predefined_type->type_of_variable_two () != 0)
-    {
-      if (predefined_type->type_of_variable_two ()->accept (this) == -1)
-        return -1;
-
-      // @@ I am not sure now if I need this here. So, commenting it
-      // out nad will get it back if need arises in future.
-      // this->psdl_node_->set_identifier (TAO_PSDL_Scope::instance ()->get_identifier ());
-    }
-
-  if (predefined_type->type_of_variable_three () != 0)
-    {
-      if (predefined_type->type_of_variable_three ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_member_list (TAO_PSDL_Member_List *member_list)
-{
-  if (member_list->member ()->accept (this) == -1)
-    return -1;
-
-  if (member_list->member_list () != 0)
-    {
-      if (member_list->member_list ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_member (TAO_PSDL_Member *member)
-{
-  if (member->type_spec ()->accept (this) == -1)
-    return -1;
-
-  if (member->declarators ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_union_type (TAO_PSDL_Union_Type *)
-{ //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_switch_type_spec (TAO_PSDL_Switch_Type_Spec *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_switch_body (TAO_PSDL_Switch_Body *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_case_case (TAO_PSDL_Case *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_case_label (TAO_PSDL_Case_Label *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_element_spec (TAO_PSDL_Element_Spec *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_const_dcl (TAO_PSDL_Const_Dcl *const_dcl)
-{
-  if (const_dcl->const_type () != 0)
-    {
-      if (const_dcl->const_type ()->accept (this) == -1)
-        return -1;
-    }
-
-  if (const_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (const_dcl->const_exp ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_const_type (TAO_PSDL_Const_Type *const_type)
-{
-  if (const_type->type ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_const_exp (TAO_PSDL_Const_Exp *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_or_expr (TAO_PSDL_Or_Expr *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_xor_expr (TAO_PSDL_Xor_Expr *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_and_expr (TAO_PSDL_And_Expr *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_shift_expr (TAO_PSDL_Shift_Expr *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_add_expr (TAO_PSDL_Add_Expr *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_mult_expr (TAO_PSDL_Mult_Expr *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_unary_expr (TAO_PSDL_Unary_Expr *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_primary_expr (TAO_PSDL_Primary_Expr *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
- }
-
-int TAO_PSDL_Scope_Visitor::visit_except_dcl (TAO_PSDL_Except_Dcl *except_dcl)
-{
-  // @@ Do I really need this. Lets comment it for now and if it is
-  // really needed will uncomment it later,
-  /*
-  if (except_dcl->identifier ()->accept (this) == -1)
-    return -1;
-  */
-
-  if (except_dcl->member_list () != 0)
-    {
-      if (except_dcl->member_list ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_op_dcl (TAO_PSDL_Op_Dcl *op_dcl)
-{
-  if (op_dcl->op_attribute () != 0)
-    if (op_dcl->op_attribute ()->accept (this) == -1)
-      return -1;
-
-  if (op_dcl->op_type_spec ()->accept (this) == -1)
-    return -1;
-
-  if (op_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (op_dcl->parameter_dcls ()->accept (this) == -1)
-    return -1;
-
-  if (op_dcl->raises_expr () != 0)
-    if (op_dcl->raises_expr ()->accept (this) == -1)
-      return -1;
-
-  if (op_dcl->context_expr () != 0)
-    if (op_dcl->context_expr ()->accept (this) == -1)
-      return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_storagetype (TAO_PSDL_Storagetype *storagetype)
-{
-  if (storagetype->declaration () != 0)
-    if (storagetype->declaration ()->accept (this) == -1)
-      return -1;
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_storagetype_dcl (TAO_PSDL_Storagetype_Dcl *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_storagetype_fwd_dcl (TAO_PSDL_Storagetype_Fwd_Dcl *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_storagetype_header (TAO_PSDL_Storagetype_Header *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_storagetype_body (TAO_PSDL_Storagetype_Body *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_storagehome_scope (TAO_PSDL_Storagehome_Scope *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_provides_dcl (TAO_PSDL_Provides_Dcl *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_op_type_spec (TAO_PSDL_Op_Type_Spec *op_type_spec)
-{
-  if (op_type_spec->type () != 0)
-    {
-      this->psdl_node_->set_identifier (TAO_PSDL_Scope::instance ()->convert_str (op_type_spec->type ()));
-
-      this->psdl_node_->set_predefined_type ();
-    }
-
-  if (op_type_spec->type_spec () != 0)
-    if (op_type_spec->type_spec ()->accept (this) == -1)
-      return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_parameter_dcls (TAO_PSDL_Parameter_Dcls *parameter_dcls)
-{
-  if (parameter_dcls->param_dcl () != 0)
-    if (parameter_dcls->param_dcl ()->accept (this) == -1)
-      return -1;
-
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_param_dcl (TAO_PSDL_Param_Dcl *param_dcl)
-{
-  if (param_dcl->param_attribute ()->accept (this) == -1)
-    return -1;
-
-  if (param_dcl->param_type_spec ()->accept (this) == -1)
-    return -1;
-
-  if (param_dcl->simple_declarator ()->accept (this) == -1)
-    return -1;
-
-  if (param_dcl->param_dcl () != 0)
-    if (param_dcl->param_dcl ()->accept (this) == -1)
-      return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_raises_expr (TAO_PSDL_Raises_Expr *raises_expr)
-{
-  this->psdl_node_->set_identifier ("raises_exception");
-
-  if (raises_expr->first_scoped_name ()->accept (this) == -1)
-    return -1;
-
-  if (raises_expr->second_scoped_name () != 0)
-    {
-      if (raises_expr->second_scoped_name ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_context_expr (TAO_PSDL_Context_Expr *context_expr)
-{
-  if (context_expr->string_literal ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_param_type_spec (TAO_PSDL_Param_Type_Spec *param_type_spec)
-{
-  if (param_type_spec->type_of_param ()->accept (this) == -1)
-    return -1;
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_fixed_pt_type (TAO_PSDL_Fixed_Pt_Type *fixed_pt_type)
-{
-  if (fixed_pt_type->positive_int_const_one ()->accept (this) == -1)
-    return -1;
-
-  if (fixed_pt_type->positive_int_const_two ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_constr_forward_decl (TAO_PSDL_Constr_Forward_Decl *constr_fwd_dcl)
-{
-  if (constr_fwd_dcl->type ()->accept (this) == -1)
-    return -1;
-
-  if (constr_fwd_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_interface (TAO_PSDL_Interface *interf)
-{
-  if (interf->type_of_dcl ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_interface_body (TAO_PSDL_Interface_Body *interface_body)
-{
-  if (interface_body->export_variable ()->accept (this) == -1)
-    return -1;
-
-  if (interface_body->interface_body () != 0)
-    {
-      if (interface_body->interface_body ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_interface_dcl (TAO_PSDL_Interface_Dcl *interface_dcl)
-{
-  if (interface_dcl->interface_header ()->accept (this) == -1)
-    return -1;
-
-  if (interface_dcl->interface_body () != 0)
-    {
-      if (interface_dcl->interface_body ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_forward_dcl (TAO_PSDL_Forward_Dcl *forward_dcl)
-{
-  if (forward_dcl->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (forward_dcl->type () != 0)
-    {
-      this->psdl_node_->set_identifier (TAO_PSDL_Scope::instance ()->convert_str (forward_dcl->type ()));
-      this->psdl_node_->set_predefined_type ();
-    }
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_interface_header (TAO_PSDL_Interface_Header *interface_header)
-{
-  // @@ Do I really need this. Lets comment it for now and if it is
-  // really needed will uncomment it later,
-
-  /*
-    if (interface_header->identifier ()->accept (this) == -1)
-    return -1;
-  */
-
-  if (interface_header->type () != 0)
-    {
-      if (interface_header->type ()->accept (this) == -1)
-        return -1;
-    }
-
-  if (interface_header->interface_inheritance_spec () != 0)
-    {
-      if (interface_header->interface_inheritance_spec ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_export_dcl (TAO_PSDL_Export_Dcl *export_dcl)
-{
-  if (export_dcl->type_of_export_one ()->accept (this) == -1)
-    return -1;
-
-  if (export_dcl->type_of_export_two () != 0)
-    {
-
-      if (export_dcl->type_of_export_two ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_interface_inheritance_spec (TAO_PSDL_Interface_Inheritance_Spec *interface_inh_spec)
-{
-  if (interface_inh_spec->interface_name ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_interface_name (TAO_PSDL_Interface_Name *interface_name)
-{
-  if (interface_name->scoped_name ()->accept (this) == -1)
-    return -1;
-
-  if (interface_name->interface_name () != 0)
-    {
-      if (interface_name->interface_name ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_scoped_name (TAO_PSDL_Scoped_Name *scoped_name)
-{
-  if (scoped_name->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (scoped_name->scoped_name () != 0)
-    {
-      if (scoped_name->scoped_name ()->accept (this) == -1)
-        return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_value (TAO_PSDL_Value *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_value_common_base (TAO_PSDL_Value_Common_Base *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_value_forward_dcl (TAO_PSDL_Value_Forward_Dcl *)
-{
-  //  NOT YET SUPPORTED
- return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_value_box_dcl (TAO_PSDL_Value_Box_Dcl *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_value_abs_dcl (TAO_PSDL_Value_Abs_Dcl *)
-{
-  //  NOT YET SUPPORTED
-  return 0; }
-
-int
-TAO_PSDL_Scope_Visitor::visit_value_dcl (TAO_PSDL_Value_Dcl *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_value_header (TAO_PSDL_Value_Header *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_value_inheritance_spec (TAO_PSDL_Value_Inheritance_Spec *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_value_name (TAO_PSDL_Value_Name *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_value_element (TAO_PSDL_Value_Element *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_array_declarator (TAO_PSDL_Array_Declarator *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_fixed_array_size (TAO_PSDL_Fixed_Array_Size *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_enumerator (TAO_PSDL_Enumerator *enumerator)
-{
-  if (enumerator->identifier ()->accept (this) == -1)
-    return -1;
-
-  if (enumerator->enumerator () != 0)
-    {
-      if (enumerator->enumerator ()->accept (this) == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_literal (TAO_PSDL_Literal *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_state_member (TAO_PSDL_State_Member *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_init_dcl (TAO_PSDL_Init_Dcl *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int
-TAO_PSDL_Scope_Visitor::visit_init_param_decls (TAO_PSDL_Init_Param_Decls *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_init_param_decl (TAO_PSDL_Init_Param_Decl *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_factory_parameters (TAO_PSDL_Factory_Parameters *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_attr_dcl (TAO_PSDL_Attr_Dcl *attr_dcl)
-{
-  if (attr_dcl->readonly () != 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "{ %s }\n",
-                  attr_dcl->readonly ()));
-    }
-
-  if (attr_dcl->param_type_spec ()->accept (this) == -1)
-    return -1;
-
-  if (attr_dcl->simple_declarator ()->accept (this) == -1)
-    return -1;
-
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_factory_dcl (TAO_PSDL_Factory_Dcl *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
-
-int TAO_PSDL_Scope_Visitor::visit_positive_int_const (TAO_PSDL_Positive_Int_Const *)
-{
-  //  NOT YET SUPPORTED
-  return 0;
-}
diff --git a/orbsvcs/PSS/PSDL_Scope_Visitor.h b/orbsvcs/PSS/PSDL_Scope_Visitor.h
deleted file mode 100644
index fb9106b50ce..00000000000
--- a/orbsvcs/PSS/PSDL_Scope_Visitor.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Scope_Visitor
-//
-// = DESCRIPTION
-//    This class serves dual purposes: for generating a parse tree and for
-//    being a base class for the classes that put the generated code
-//    that should go into the stubs. Derived classes override the
-//    necessary methods. Uses the Visitor Pattern.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_SCOPE_VISITOR_H
-#define TAO_PSDL_SCOPE_VISITOR_H
-
-#include "PSDL_Node_Visitor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "PSDL_Node.h"
-
-class TAO_PSDL_Export TAO_PSDL_Scope_Visitor : public TAO_PSDL_Node_Visitor
-{
- public:
-
-  TAO_PSDL_Scope_Visitor (TAO_PSDL_Node *psdl_node);
-
-  ~TAO_PSDL_Scope_Visitor ();
-
-  // The following methods will contain code that should be executed
-  // for each particular type of a node. The derived classes override
-  // only the necessary methods. And, hence, the methods are not made
-  // pure virtual. asdkl
-  int visit_specification (TAO_PSDL_Specification *);
-  int visit_definition (TAO_PSDL_Definition *);
-  int visit_module (TAO_PSDL_Module *);
-  int visit_abstract_storagetype (TAO_PSDL_Abstract_Storagetype *);
-  int visit_abstract_storagetype_dcl (TAO_PSDL_Abstract_Storagetype_Dcl *);
-  int visit_abstract_storagetype_fwd_dcl (TAO_PSDL_Abstract_Storagetype_Fwd_Dcl *);
-  int visit_abstract_storagetype_header (TAO_PSDL_Abstract_Storagetype_Header *);
-  int visit_abstract_storagetype_body (TAO_PSDL_Abstract_Storagetype_Body *);
-  int visit_abstract_storagetype_member (TAO_PSDL_Abstract_Storagetype_Member *);
-  int visit_abstract_storagetype_inh_spec (TAO_PSDL_Abstract_Storagetype_Inh_Spec *);
-  int visit_abstract_storagetype_name (TAO_PSDL_Abstract_Storagetype_Name *);
-  int visit_psdl_state_dcl (TAO_PSDL_Psdl_State_Dcl *);
-  int visit_psdl_state_type_spec (TAO_PSDL_Psdl_State_Type_Spec *);
-
-  int visit_abstract_storagetype_ref_type (TAO_PSDL_Abstract_Storagetype_Ref_Type);
-
-  int visit_abstract_storagehome (TAO_PSDL_Abstract_Storagehome *);
-  int visit_abstract_storagehome_fwd_dcl (TAO_PSDL_Abstract_Storagehome_Fwd_Dcl *);
-  int visit_abstract_storagehome_dcl (TAO_PSDL_Abstract_Storagehome_Dcl *);
-
-  int visit_abstract_storagehome_header (TAO_PSDL_Abstract_Storagehome_Header *);
-  int visit_abstract_storagehome_body (TAO_PSDL_Abstract_Storagehome_Body  *);
-  int visit_abstract_storagehome_member (TAO_PSDL_Abstract_Storagehome_Member *);
-  int visit_abstract_storagehome_inh_spec (TAO_PSDL_Abstract_Storagehome_Inh_Spec *);
-  int visit_abstract_storagehome_name (TAO_PSDL_Abstract_Storagehome_Name *);
-  int visit_local_op_dcl (TAO_PSDL_Local_Op_Dcl *);
-  int visit_key_dcl (TAO_PSDL_Key_Dcl *);
-  int visit_catalog (TAO_PSDL_Catalog *);
-  int visit_catalog_inh_spec (TAO_PSDL_Catalog_Inh_Spec *);
-  int visit_catalog_name (TAO_PSDL_Catalog_Name *);
-  int visit_catalog_body (TAO_PSDL_Catalog_Body *);
-  int visit_catalog_member (TAO_PSDL_Catalog_Member *);
-  int visit_storagetype_member (TAO_PSDL_Storagetype_Member *);
-  int visit_storagetype_inh_spec (TAO_PSDL_Storagetype_Inh_Spec *);
-  int visit_storagetype_name (TAO_PSDL_Storagetype_Name *);
-  int visit_storagetype_impl_spec (TAO_PSDL_Storagetype_Impl_Spec *);
-  int visit_storagetype_ref_type (TAO_PSDL_Storagetype_Ref_Type *);
-  int visit_store_directive (TAO_PSDL_Store_Directive *);
-  int visit_psdl_concrete_state_type (TAO_PSDL_Psdl_Concrete_State_Type *) ;
-  int visit_ref_rep_directive (TAO_PSDL_Ref_Rep_Directive *) ;
-  int visit_storagehome (TAO_PSDL_Storagehome *) ;
-  int visit_storagehome_header (TAO_PSDL_Storagehome_Header *) ;
-  int visit_storagehome_body  (TAO_PSDL_Storagehome_Body *) ;
-  int visit_storagehome_member  (TAO_PSDL_Storagehome_Member *) ;
-  int visit_storagehome_inh_spec  (TAO_PSDL_Storagehome_Inh_Spec *) ;
-  int visit_storagehome_name  (TAO_PSDL_Storagehome_Name *) ;
-
-  int visit_storagehome_impl_spec (TAO_PSDL_Storagehome_Impl_Spec *) ;
-  int visit_primary_key_dcl (TAO_PSDL_Primary_Key_Dcl *);
-  int visit_identifier (TAO_PSDL_Identifier *);
-
-  int visit_type_dcl (TAO_PSDL_Type_Dcl *) ;
-  int visit_type_declarator (TAO_PSDL_Type_Declarator *) ;
-  int visit_type_spec (TAO_PSDL_Type_Spec *) ;
-  int visit_simple_type_spec  (TAO_PSDL_Simple_Type_Spec *) ;
-  int visit_base_type_spec  (TAO_PSDL_Base_Type_Spec *) ;
-  int visit_template_type_spec  (TAO_PSDL_Template_Type_Spec *) ;
-  int visit_constr_type_spec  (TAO_PSDL_Constr_Type_Spec *) ;
-  int visit_declarators  (TAO_PSDL_Declarators *) ;
-  int visit_declarator  (TAO_PSDL_Declarator *) ;
-  int visit_simple_declarator  (TAO_PSDL_Simple_Declarator *) ;
-  int visit_simple_declarator_list  (TAO_PSDL_Simple_Declarator_List *) ;
-  int visit_complex_declarator  (TAO_PSDL_Complex_Declarator *) ;
-  int visit_predefined_type  (TAO_PSDL_Predefined_Type *) ;
-  int visit_member_list (TAO_PSDL_Member_List *) ;
-  int visit_member (TAO_PSDL_Member *) ;
-  int visit_union_type (TAO_PSDL_Union_Type *) ;
-  int visit_switch_type_spec (TAO_PSDL_Switch_Type_Spec *) ;
-  int visit_switch_body (TAO_PSDL_Switch_Body *) ;
-  int visit_case_case (TAO_PSDL_Case *) ;
-  int visit_case_label (TAO_PSDL_Case_Label *) ;
-  int visit_element_spec (TAO_PSDL_Element_Spec *) ;
-  int visit_const_dcl (TAO_PSDL_Const_Dcl *) ;
-  int visit_const_type (TAO_PSDL_Const_Type *) ;
-  int visit_const_exp (TAO_PSDL_Const_Exp *) ;
-  int visit_or_expr (TAO_PSDL_Or_Expr *) ;
-  int visit_xor_expr (TAO_PSDL_Xor_Expr *) ;
-  int visit_and_expr (TAO_PSDL_And_Expr *) ;
-  int visit_shift_expr (TAO_PSDL_Shift_Expr *) ;
-  int visit_add_expr (TAO_PSDL_Add_Expr *) ;
-  int visit_mult_expr (TAO_PSDL_Mult_Expr *) ;
-  int visit_unary_expr (TAO_PSDL_Unary_Expr *) ;
-  int visit_primary_expr (TAO_PSDL_Primary_Expr *) ;
-  int visit_except_dcl (TAO_PSDL_Except_Dcl *) ;
-  int visit_op_dcl (TAO_PSDL_Op_Dcl *) ;
-  int visit_storagetype (TAO_PSDL_Storagetype *) ;
-  int visit_storagetype_dcl (TAO_PSDL_Storagetype_Dcl *) ;
-  int visit_storagetype_fwd_dcl (TAO_PSDL_Storagetype_Fwd_Dcl *);
-  int visit_storagetype_header (TAO_PSDL_Storagetype_Header *);
-  int visit_storagetype_body (TAO_PSDL_Storagetype_Body *);
-  int visit_storagehome_scope (TAO_PSDL_Storagehome_Scope *);
-  int visit_provides_dcl (TAO_PSDL_Provides_Dcl *);
-  int visit_op_type_spec (TAO_PSDL_Op_Type_Spec *);
-  int visit_parameter_dcls (TAO_PSDL_Parameter_Dcls *);
-  int visit_param_dcl (TAO_PSDL_Param_Dcl *);
-  int visit_raises_expr (TAO_PSDL_Raises_Expr *);
-  int visit_context_expr (TAO_PSDL_Context_Expr *);
-  int visit_param_type_spec (TAO_PSDL_Param_Type_Spec *);
-  int visit_fixed_pt_type (TAO_PSDL_Fixed_Pt_Type *);
-  int visit_constr_forward_decl (TAO_PSDL_Constr_Forward_Decl *);
-  int visit_interface (TAO_PSDL_Interface *);
-  int visit_interface_body (TAO_PSDL_Interface_Body *);
-  int visit_interface_dcl (TAO_PSDL_Interface_Dcl *);
-  int visit_forward_dcl (TAO_PSDL_Forward_Dcl *);
-  int visit_interface_header (TAO_PSDL_Interface_Header *);
-  int visit_export_dcl (TAO_PSDL_Export_Dcl *);
-  int visit_interface_inheritance_spec (TAO_PSDL_Interface_Inheritance_Spec *);
-  int visit_interface_name (TAO_PSDL_Interface_Name *);
-  int visit_scoped_name (TAO_PSDL_Scoped_Name *);
-  int visit_value (TAO_PSDL_Value *);
-  int visit_value_common_base (TAO_PSDL_Value_Common_Base *);
-  int visit_value_forward_dcl (TAO_PSDL_Value_Forward_Dcl *);
-  int visit_value_box_dcl (TAO_PSDL_Value_Box_Dcl *);
-  int visit_value_abs_dcl (TAO_PSDL_Value_Abs_Dcl *);
-  int visit_value_dcl (TAO_PSDL_Value_Dcl *);
-  int visit_value_header (TAO_PSDL_Value_Header *);
-  int visit_value_inheritance_spec (TAO_PSDL_Value_Inheritance_Spec *);
-  int visit_value_name (TAO_PSDL_Value_Name *);
-  int visit_value_element (TAO_PSDL_Value_Element *);
-  int visit_array_declarator (TAO_PSDL_Array_Declarator *);
-  int visit_fixed_array_size (TAO_PSDL_Fixed_Array_Size *);
-  int visit_enumerator (TAO_PSDL_Enumerator *);
-  int visit_literal (TAO_PSDL_Literal *);
-  int visit_state_member (TAO_PSDL_State_Member *);
-  int visit_init_dcl (TAO_PSDL_Init_Dcl *);
-  int visit_init_param_decls (TAO_PSDL_Init_Param_Decls *);
-  int visit_init_param_decl (TAO_PSDL_Init_Param_Decl *);
-  int visit_factory_parameters (TAO_PSDL_Factory_Parameters *);
-  int visit_attr_dcl (TAO_PSDL_Attr_Dcl *);
-  int visit_factory_dcl (TAO_PSDL_Factory_Dcl *);
-  int visit_positive_int_const (TAO_PSDL_Positive_Int_Const *);
-
-  ACE_CString get_scoped_type (void);
-
-private:
-
-  TAO_PSDL_Node *psdl_node_;
-  ACE_CString scoped_type_;
-};
-
-#endif /* TAO_PSDL_SCOPE_VISITOR_H */
diff --git a/orbsvcs/PSS/PSDL_Simple_Scope.cpp b/orbsvcs/PSS/PSDL_Simple_Scope.cpp
deleted file mode 100644
index 40f5bbfd332..00000000000
--- a/orbsvcs/PSS/PSDL_Simple_Scope.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Simple_Scope.h"
-#include "PSDL_Interface_Scope.h"
-
-ACE_RCSID (PSS, PSDL_Simple_Scope, "$Id$")
-
-TAO_PSDL_Simple_Scope::TAO_PSDL_Simple_Scope (TAO_PSDL_Scope *parent_scope,
-                                              ACE_CString identifier_type)
-  : scope_map_ (),
-    parent_scope_ (parent_scope),
-    identifier_type_ (identifier_type)
-{
-}
-
-TAO_PSDL_Simple_Scope::~TAO_PSDL_Simple_Scope (void)
-{
-}
-
-int
-TAO_PSDL_Simple_Scope::add_typedef (ACE_CString identifier,
-                                    ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_typedef_to_scope (identifier,
-                                                            identifier_type,
-                                                            this);
-}
-
-int
-TAO_PSDL_Simple_Scope::add_const_decl (ACE_CString identifier,
-                                       ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_const_decl_to_scope (identifier,
-                                                               identifier_type,
-                                                               this);
-}
-
-int
-TAO_PSDL_Simple_Scope::add_except_decl (ACE_CString identifier,
-                                        ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_except_decl_to_scope (identifier,
-                                                                identifier_type,
-                                                                this);
-}
-
-int
-TAO_PSDL_Simple_Scope::add_enum_decl (ACE_CString identifier,
-                                      ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_enum_decl_to_scope (identifier,
-                                                              identifier_type,
-                                                              this);
-}
-
-int
-TAO_PSDL_Simple_Scope::add_op_dcl (ACE_CString identifier)
-{
-  return TAO_PSDL_Scope::instance ()->add_op_dcl_to_scope (identifier,
-                                                           this);
-}
-
-void
-TAO_PSDL_Simple_Scope::dump (CORBA::ULong depth)
-{
-  depth = depth + 5;
-
-  for (Scope_Map_Iterator i = this->scope_map_.begin ();
-       i != this->scope_map_.end ();
-       ++i)
-    {
-      this->print_depth (depth);
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s (simple types)",
-                  (*i).ext_id_.c_str ()));
-      (*i).int_id_->dump (depth);
-    }
-}
-
-int
-TAO_PSDL_Simple_Scope::find (const ACE_CString &identifier_name,
-                             ACE_CString &identifier_type)
-{
-  for (Scope_Map_Iterator i = this->scope_map_.begin ();
-       i != this->scope_map_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          identifier_type = (*i).int_id_->identifier_type ();
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->find (identifier_name,
-                                  identifier_type) == 0)
-            {
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-int
-TAO_PSDL_Simple_Scope::find (const ACE_CString &identifier_name)
-{
-  for (Scope_Map_Iterator i = this->scope_map_.begin ();
-       i != this->scope_map_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->find (identifier_name) == 0)
-            {
-              // #@@@@ deal
-              //      identifier_type = identifier_info->type;
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-ACE_CString
-TAO_PSDL_Simple_Scope::identifier_type (void)
-{
-  return this->identifier_type_;
-}
-
-ACE_CString
-TAO_PSDL_Simple_Scope::module_name (void)
-{
-  return this->module_name_;
-}
-
-ACE_CString
-TAO_PSDL_Simple_Scope::interface_name (void)
-{
-  return this->interface_name_;
-}
-
-TAO_PSDL_Scope *
-TAO_PSDL_Simple_Scope::parent_scope (void)
-{
-  return this->parent_scope_;
-}
-
-Scope_Map *
-TAO_PSDL_Simple_Scope::scope_map (void)
-{
-  return &this->scope_map_;
-}
diff --git a/orbsvcs/PSS/PSDL_Simple_Scope.h b/orbsvcs/PSS/PSDL_Simple_Scope.h
deleted file mode 100644
index ef8e1d4ec69..00000000000
--- a/orbsvcs/PSS/PSDL_Simple_Scope.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Simple_Scope
-//
-// = DESCRIPTION
-//    Scope class for the Exception type helpful for building the AST.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_SIMPLE_SCOPE_H
-#define TAO_PSDL_SIMPLE_SCOPE_H
-
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Scope.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PSDL_Export TAO_PSDL_Simple_Scope : public TAO_PSDL_Scope
-{
- public:
-
-  TAO_PSDL_Simple_Scope (TAO_PSDL_Scope *parent_scope,
-                         ACE_CString identifier_type);
-
-  ~TAO_PSDL_Simple_Scope (void);
-
-  // Override the necessary methods for the simples.
-  int add_typedef (ACE_CString identifier,
-                   ACE_CString identifier_type);
-
-  int add_const_decl (ACE_CString identifier,
-                      ACE_CString identifier_type);
-
-  int add_except_decl (ACE_CString identifier,
-                       ACE_CString identifier_type);
-
-  int add_enum_decl (ACE_CString identifier,
-                     ACE_CString identifier_type);
-
-  int add_op_dcl (ACE_CString identifier);
-
-  void dump (CORBA::ULong depth);
-
-  int find (const ACE_CString &identifier_name,
-            ACE_CString &identifier_type);
-
-  int find (const ACE_CString &identifier_name);
-
-  TAO_PSDL_Scope *parent_scope (void);
-
-  Scope_Map *scope_map (void);
-
-  ACE_CString identifier_type (void);
-  ACE_CString module_name (void);
-  ACE_CString interface_name (void);
-
-protected:
-
-  Scope_Map scope_map_;
-  TAO_PSDL_Scope *parent_scope_;
-  ACE_CString identifier_type_;
-  ACE_CString module_name_;
-  ACE_CString interface_name_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_SIMPLE_SCOPE_H */
diff --git a/orbsvcs/PSS/PSDL_Stream.cpp b/orbsvcs/PSS/PSDL_Stream.cpp
deleted file mode 100644
index eb5a8522c91..00000000000
--- a/orbsvcs/PSS/PSDL_Stream.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Stream.h"
-
-ACE_RCSID (PSS, PSDL_Scope, "$Id$")
-
-TAO_PSDL_Stream::TAO_PSDL_Stream (void)
-{
-}
-
-TAO_PSDL_Stream::~TAO_PSDL_Stream (void)
-{
-}
-
-int
-TAO_PSDL_Stream::open (const char *fname)
-{
-  if (fname != 0)
-    {
-      // File name exists, open an I/O file handle.
-      this->fp_ = ACE_OS::fopen (fname, "w");
-
-      if (this->fp_ != 0)
-        {
-          return 0;
-        }
-      else
-        {
-          return -1;
-        }
-    }
-  else
-    {
-      return -1;
-    }
-}
-
-// Return the underlying lowlevel file pointer.
-// indentation.
-FILE *
-TAO_PSDL_Stream::file (void)
-{
-  return this->fp_;
-}
-
-int
-TAO_PSDL_Stream::incr_indent (unsigned short flag)
-{
-  indent_level_++;
-
-  if (flag != 0)
-    {
-      return this->indent ();
-    }
-  else
-    {
-      // Do not indent output.
-      return 0;
-    }
-}
-
-// Indentation
-int
-TAO_PSDL_Stream::decr_indent (unsigned short flag)
-{
-  this->indent_level_--;
-  // Just in case somebody gets "unindent happy".
-  if (this->indent_level_ < 0)
-    {
-      // ACE_DEBUG ((LM_DEBUG, "negative indentation?\n"));
-      this->indent_level_ = 0;
-    }
-
-  if (flag != 0)
-    {
-      return this->indent ();
-    }
-  else
-    {
-      // Do not indent output.
-      return 0;
-    }
-}
-
-int
-TAO_PSDL_Stream::reset (void)
-{
-  this->indent_level_ = 0;
-  return 0;
-}
-
-// Indented print.
-int
-TAO_PSDL_Stream::indent (void)
-{
-  // Based on the current indentation level, leave appropriate number of blank
-  // spaces in the output.
-  if (this->indent_level_ > 0)
-    {
-      for (int i = 0; i < this->indent_level_; i++)
-        {
-          ACE_OS::fprintf (this->fp_, "  ");
-          ACE_OS::fflush (this->fp_);
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_PSDL_Stream::nl (void)
-{
-  ACE_OS::fprintf (this->fp_, "\n");
-  this->indent ();
-  return 0;
-}
-
-TAO_PSDL_Stream &
-TAO_PSDL_Stream::operator<< (const char *str)
-{
-  ACE_OS::fprintf (this->fp_, "%s", str);
-  ACE_OS::fflush (this->fp_);
-  
-  return *this;
-}
-
-TAO_PSDL_Stream &
-TAO_PSDL_Stream::operator<< (ACE_CString str)
-{
-  ACE_OS::fprintf (this->fp_, "%s", str.c_str ());
-  ACE_OS::fflush (this->fp_);
-  
-  return *this;
-}
-
-TAO_PSDL_Stream &
-TAO_PSDL_Stream::operator<< (const unsigned long num)
-{
-  ACE_OS::fprintf (this->fp_,
-                   "%lu",
-                   num);
-
-  ACE_OS::fflush (this->fp_);
-  
-  return *this;
-}
-
-TAO_PSDL_Stream &
-TAO_PSDL_Stream::operator<< (const long num)
-{
-  ACE_OS::fprintf (this->fp_,
-                   "%ld",
-                   num);
-
-  ACE_OS::fflush (this->fp_);
-  return *this;
-}
diff --git a/orbsvcs/PSS/PSDL_Stream.h b/orbsvcs/PSS/PSDL_Stream.h
deleted file mode 100644
index 43e79f5b342..00000000000
--- a/orbsvcs/PSS/PSDL_Stream.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ==================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Stream
-//
-// = DESCRIPTION
-//    This class is to help write the generated code to files.
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ==================================================================
-
-#ifndef TAO_PSDL_STREAM_H
-#define TAO_PSDL_STREAM_H
-
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Scope.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PSDL_Stream
-{
- public:
-
-  TAO_PSDL_Stream (void);
-
-  ~TAO_PSDL_Stream (void);
-
-  /// Open the file name to be able to write to it.
-  int open (const char *fname);
-
-  /// Return the underlying lowlevel file pointer.
-  FILE *file (void);
-
-  /// increment the indentation level and by default actually indent the output
-  /// accordingly
-  int incr_indent (unsigned short flag=1);
-
-  /// decrease the indentation level and by default actually indent the output
-  /// accordingly
-  int decr_indent (unsigned short flag=1);
-
-  /// reset indentation level to 0
-  int reset (void);
-
-  /// indent starting next line
-  int indent (void);
-
-  /// put a newline and indent on the next line
-  int nl (void);
-
-  /// "printf" style variable argument print
-  int print (const char *format, ...);
-
-  // =overloaded operators
-
-  // output the char string and return a reference to ourselves
-  TAO_PSDL_Stream &operator<< (const char *str);
-
-  TAO_PSDL_Stream &operator<< (ACE_CString str);
-
-  TAO_PSDL_Stream &operator<< (const unsigned long num);
-  // output the integer and return a reference to ourselves
-
-  TAO_PSDL_Stream &operator<< (const long num);
-  // output the integer and return a reference to ourselves
-
-private:
-
-  // the underlying low-level I/O handle
-  FILE *fp_;
-
-  // indnetation level
-  int indent_level_;
-};
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_STREAM_H */
diff --git a/orbsvcs/PSS/PSDL_String.cpp b/orbsvcs/PSS/PSDL_String.cpp
deleted file mode 100644
index 56eb91f7886..00000000000
--- a/orbsvcs/PSS/PSDL_String.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-// $Id$
-
-#include "PSDL_String.h"
-
-#include "ace/Malloc_Base.h"
-#include "ace/SString.h"
-
-ACE_RCSID (PSS, PSDL_String, "$Id")
-
-// Constructor
-TAO_PSDL_String::TAO_PSDL_String ()
-  : allocator_ (0),
-    buffer_ (0),
-    length_ (0)
-{
-}
-
-// Constructor
-TAO_PSDL_String::TAO_PSDL_String (ACE_Allocator * persistent_allocator)
-  : allocator_ (persistent_allocator),
-    buffer_ (0),
-    length_ (0)
-{
-}
-
-// Destructor.
-TAO_PSDL_String::~TAO_PSDL_String (void)
-{
-  if (this->buffer_ != 0)
-    this->allocator_->free ((void *) this->buffer_);
-}
-
-// Copy constructor.
-TAO_PSDL_String::TAO_PSDL_String (const TAO_PSDL_String & rhs)
-{
-  *this = rhs;
-}
-
-// Assignment operator.
-void
-TAO_PSDL_String::operator= (const TAO_PSDL_String & rhs)
-{
-  if (this == &rhs)  // Prevent self assignment
-    return;
-
-  // Free the existing buffer before assigning a new
-  // allocator and buffer.
-  if (this->buffer_ != 0)
-    this->allocator_->free ((void *) this->buffer_);
-
-  this->allocator_ = rhs.allocator_;
-  void * buf = this->allocator_->malloc (rhs.length_);
-  this->buffer_ = (const char *) buf;
-  if (this->buffer_)
-    {
-      // Deep copy the buffer.
-      ACE_OS::memcpy ( (void *) this->buffer_,
-                       rhs.buffer_,
-                       rhs.length_);
-
-      this->length_ = rhs.length_;
-    }
-  else
-    this->length_ = 0;
-}
-
-void
-TAO_PSDL_String::operator= (const ACE_CString & rhs)
-{
-  // Free the existing buffer before assigning octet
-  // sequence.
-  if (this->buffer_ != 0)
-    this->allocator_->free ((void *) this->buffer_);
-
-  const CORBA::ULong len = rhs.length ();
-
-  void * buf = this->allocator_->malloc (len);
-
-  this->buffer_ = (const char *) buf;
-
-  if (this->buffer_)
-    {
-      const char * dest = this->buffer_;
-      const char * src = rhs.rep ();
-
-      // Deep copy the buffer.
-      ACE_OS::memcpy ((void *)dest,
-                      src,
-                      len);
-
-      this->length_ = len;
-    }
-  else
-    this->length_ = 0;
-}
-
-bool
-TAO_PSDL_String::operator== (const TAO_PSDL_String &rhs) const
-{
-  return (ACE_OS::strcmp (buffer_, rhs.buffer_) == 0);
-}
-
-bool
-TAO_PSDL_String::operator!= (const TAO_PSDL_String &rhs) const
-{
-  return (ACE_OS::strcmp (buffer_, rhs.buffer_) != 0);
-}
-
-u_long
-TAO_PSDL_String::hash (void) const
-{
-  return ACE::hash_pjw (this->buffer_);
-}
-
-// Conversion operators (cast)
-// (caller owns storage of return values)
-TAO_PSDL_String::operator ACE_CString *() const
-{
-  ACE_CString *str = 0;
-
-  char * dest = str->rep ();
-  const char * src = this->buffer_;
-
-  ACE_OS::memcpy (dest, src, this->length_);
-
-  return str;
-}
-
-TAO_PSDL_String::operator ACE_CString *()
-{
-  ACE_CString *str = 0;
-
-  char * dest = str->rep ();
-  const char * src = this->buffer_;
-  ACE_OS::memcpy (dest, src, this->length_);
-
-  return str;
-}
diff --git a/orbsvcs/PSS/PSDL_String.h b/orbsvcs/PSS/PSDL_String.h
deleted file mode 100644
index a84e312677e..00000000000
--- a/orbsvcs/PSS/PSDL_String.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    PSDL_String.h
- *
- *  $Id$
- *
- *  @author Priyanka Gontla <gontla_p@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_PSDL_STRING_H
-#define TAO_PSDL_STRING_H
-#include /**/ "ace/pre.h"
-
-#include "psdl_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "PSDL_Datastore.h"
-
-/**
- * @class TAO_PSDL_String
- *
- * @brief Wrapper for the ACE_CString to facilitate saving the string
- * persistently.
- *
- *
- **/
-
-class ACE_Allocator;
-
-class TAO_PSDL_Export TAO_PSDL_String
-{
-public:
-
-  /// Constructor.
-  TAO_PSDL_String (void);
-
-  /// Constructor.
-  TAO_PSDL_String (ACE_Allocator *persistent_allocator);
-
-  /// Copy constructor.
-  TAO_PSDL_String (const TAO_PSDL_String & rhs);
-
-  /// Destructor.
-  ~TAO_PSDL_String (void);
-
-  /// Assignment operator.
-  void operator= (const TAO_PSDL_String & rhs);
-
-  // Conversion operator (assignment)
-  void operator= (const ACE_CString & rhs);
-
-  /// Equality comparison operator.
-  bool operator== (const TAO_PSDL_String &rhs) const;
-
-  /// Inequality comparison operator.
-  bool operator!= (const TAO_PSDL_String &rhs) const;
-
-  /// Returns a hash value for this string.
-  u_long hash (void) const;
-
-  // Conversion operators (cast)
-  // (caller owns storage of return values)
-  operator ACE_CString *() const;
-
-  operator ACE_CString *();
-
-  // Persistent allocator.
-  ACE_Allocator * allocator_;
-
-  // Persistent buffer.
-  const char * buffer_;
-
-  // Length of the persistent buffer.
-  CORBA::ULong length_;
-};
-
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PSDL_STRING_H */
diff --git a/orbsvcs/PSS/PSDL_Struct_Scope.cpp b/orbsvcs/PSS/PSDL_Struct_Scope.cpp
deleted file mode 100644
index cbbce2777cd..00000000000
--- a/orbsvcs/PSS/PSDL_Struct_Scope.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Struct_Scope.h"
-
-ACE_RCSID (PSS, PSDL_Struct_Scope, "$Id$")
-
-TAO_PSDL_Struct_Scope::TAO_PSDL_Struct_Scope (TAO_PSDL_Scope *parent_scope)
-  : struct_scope_ (),
-    parent_scope_ (parent_scope),
-    identifier_type_ ("struct")
-{
-}
-
-int
-TAO_PSDL_Struct_Scope::add_module (ACE_CString identifier)
-{
-  return TAO_PSDL_Scope::instance ()->add_module_to_scope (identifier,
-                                                           this);
-}
-
-int
-TAO_PSDL_Struct_Scope::add_struct (ACE_CString struct_name)
-{
-  return TAO_PSDL_Scope::instance ()->add_struct_to_scope (struct_name,
-                                                           this);
-}
-
-int
-TAO_PSDL_Struct_Scope::add_typedef (ACE_CString identifier,
-                                    ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_typedef_to_scope (identifier,
-                                                            identifier_type,
-                                                            this);
-}
-
-int
-TAO_PSDL_Struct_Scope::add_const_decl (ACE_CString identifier,
-                                       ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_const_decl_to_scope (identifier,
-                                                               identifier_type,
-                                                               this);
-}
-
-int
-TAO_PSDL_Struct_Scope::add_except_decl (ACE_CString identifier,
-                                        ACE_CString identifier_type)
-{
-  return TAO_PSDL_Scope::instance ()->add_except_decl_to_scope (identifier,
-                                                                identifier_type,
-                                                                this);
-}
-
-void
-TAO_PSDL_Struct_Scope::dump (CORBA::ULong depth)
-{
-  depth = depth + 5;
-
-  for (Scope_Map_Iterator i = this->struct_scope_.begin ();
-       i != this->struct_scope_.end ();
-       ++i)
-    {
-      this->print_depth (depth);
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s (struct)\n",
-                  (*i).ext_id_.c_str ()));
-      (*i).int_id_->dump (depth);
-    }
-}
-
-int
-TAO_PSDL_Struct_Scope::find (const ACE_CString &identifier_name,
-                             ACE_CString &identifier_type)
-{
-  for (Scope_Map_Iterator i = this->struct_scope_.begin ();
-       i != this->struct_scope_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          identifier_type = (*i).int_id_->identifier_type ();
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->find (identifier_name,
-                                  identifier_type) == 0)
-            {
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-int
-TAO_PSDL_Struct_Scope::find (const ACE_CString &identifier_name)
-{
-  for (Scope_Map_Iterator i = this->struct_scope_.begin ();
-       i != this->struct_scope_.end ();
-       ++i)
-    {
-      if (ACE_OS::strcmp (identifier_name.c_str (), (*i).ext_id_.c_str ()) == 0)
-        {
-          return 0;
-        }
-      else
-        {
-          if ((*i).int_id_->find (identifier_name) == 0)
-            {
-              // #@@@@ deal
-              //      identifier_type = identifier_info->type;
-              return 0;
-            }
-        }
-    }
-
-  return -1;
-}
-
-TAO_PSDL_Scope *
-TAO_PSDL_Struct_Scope::parent_scope (void)
-{
-  return this->parent_scope_;
-}
-
-Scope_Map *
-TAO_PSDL_Struct_Scope::scope_map (void)
-{
-  return &this->struct_scope_;
-}
-
-ACE_CString
-TAO_PSDL_Struct_Scope::identifier_type (void)
-{
-  return this->identifier_type_;
-}
-
-ACE_CString
-TAO_PSDL_Struct_Scope::module_name (void)
-{
-  return this->module_name_;
-}
-
-ACE_CString
-TAO_PSDL_Struct_Scope::interface_name (void)
-{
-  return this->interface_name_;
-}
diff --git a/orbsvcs/PSS/PSDL_Struct_Scope.h b/orbsvcs/PSS/PSDL_Struct_Scope.h
deleted file mode 100644
index a1655c8868a..00000000000
--- a/orbsvcs/PSS/PSDL_Struct_Scope.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Struct_Scope
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_STRUCT_SCOPE_H
-#define TAO_PSDL_STRUCT_SCOPE_H
-
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Scope.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PSDL_Export TAO_PSDL_Struct_Scope : public TAO_PSDL_Scope
-{
- public:
-
-  TAO_PSDL_Struct_Scope (TAO_PSDL_Scope *parent_scope);
-
-  int add_module (ACE_CString identifier);
-
-  int add_struct (ACE_CString identifier);
-
-  int add_typedef (ACE_CString identifier,
-                   ACE_CString identifier_type);
-
-  int add_const_decl (ACE_CString identifier,
-                      ACE_CString identifier_type);
-
-  int add_except_decl (ACE_CString identifier,
-                       ACE_CString identifier_type);
-
-  void dump (CORBA::ULong depth);
-
-  int find (const ACE_CString &identifier_name,
-            ACE_CString &identifier_type);
-
-  int find (const ACE_CString &identifier_name);
-
-  TAO_PSDL_Scope *parent_scope (void);
-
-  Scope_Map *scope_map (void);
-
-  ACE_CString identifier_type (void);
-  ACE_CString module_name (void);
-  ACE_CString interface_name (void);
-
-private:
-
-  Scope_Map struct_scope_;
-  TAO_PSDL_Scope *parent_scope_;
-  ACE_CString identifier_type_;
-  ACE_CString module_name_;
-  ACE_CString interface_name_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_STRUCT_SCOPE_H */
diff --git a/orbsvcs/PSS/PSDL_Struct_Visitor.cpp b/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
deleted file mode 100644
index 878f19db993..00000000000
--- a/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
+++ /dev/null
@@ -1,1160 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Struct_Visitor.h"
-#include "PSDL_Stream.h"
-#include "PSDL_y.h"
-#include "tao/CORBA_String.h"
-
-ACE_RCSID (PSS, PSDL_Struct_Visitor, "$Id$")
-
-TAO_PSDL_Struct_Visitor::TAO_PSDL_Struct_Visitor (void)
-  : identifiers_count_ (0),
-    struct_name_ ()
-{
-}
-
-TAO_PSDL_Struct_Visitor::~TAO_PSDL_Struct_Visitor (void)
-{
-}
-
-int
-TAO_PSDL_Struct_Visitor::visit_identifier (TAO_PSDL_Identifier *identifier)
-{
-  // The first time it will enter this function is to get the name of
-  // the struct. And, then on, for the members in the structure.
-  // so this->identifiers_[0] will be the name of the struct.
-  if (this->identifiers_.size () == 0)
-    {
-      this->identifiers_.size (1);
-      this->count_ = 0;
-    }
-
-  if (this->identifiers_.size () < this->count_ + 1)
-    this->identifiers_.size (this->count_ + 1);
-
-  this->identifiers_ [this->count_] = identifier->value ();
-  ++this->count_;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Struct_Visitor::visit_type_spec (TAO_PSDL_Type_Spec *type_spec)
-{
-  if (type_spec->type_of_type_spec ()->accept (this) == -1)
-    return -1;
-
-  ACE_CString type;
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
-  if (this->base_type (this->identifiers_[this->identifiers_count_], type))
-    {
-      // If this is a predefined type like long or char *
-      if (ACE_OS::strcmp (type.c_str (), "char *") == 0)
-        {
-          ps_sh->indent ();
-          *ps_sh << " TAO::String_Manager ";
-        }
-      else
-        {
-          *ps_sh << " "
-                 << this->version_for_stub (type) << " ";
-        }
-    }
-  else
-    {
-      *ps_sh << "ACE_NESTED_CLASS ("
-           << TAO_PSDL_Scope::instance ()->get_name_space ()
-           << ", " << this->identifiers_ [this->identifiers_count_] << ") ";
-    }
-
-  ++this->identifiers_count_;
-  return 0;
-}
-
-int
-TAO_PSDL_Struct_Visitor::visit_declarator (TAO_PSDL_Declarator *declarator)
-{
-  if (declarator->type_of_declarator ()->accept (this) == -1)
-    return -1;
-
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
-  *ps_sh << this->identifiers_ [this->identifiers_count_].c_str ()
-       << ";\n";
-
-  ++this->identifiers_count_;
-  return 0;
-}
-
-int
-TAO_PSDL_Struct_Visitor::visit_predefined_type (TAO_PSDL_Predefined_Type *predefined_type)
-{
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
-  // Reset the indentation.
-  ps_sh->reset ();
-
-  if (predefined_type->type_of_variable_one () != 0)
-    {
-      if (predefined_type->type_of_variable_one ()->accept (this) == -1)
-        return -1;
-
-      this->struct_name_ = CORBA::string_dup (this->identifiers_ [0].c_str ());
-
-      *ps_sh << "struct " << this->struct_name_
-           << ";\n";
-
-      *ps_sh << "class " << this->struct_name_
-           << "_var;";
-
-      ps_sh->nl ();
-      ps_sh->nl ();
-
-      *ps_sh << "struct " << this->struct_name_;
-      ps_sh->nl ();
-
-      *ps_sh << "{";
-      ps_sh->nl ();
-
-      ps_sh->nl ();
-
-      *ps_sh << "typedef " << this->struct_name_ << "_var _var_type;\n";
-
-      ps_sh->nl ();
-
-      ps_sh->nl ();
-
-      *ps_sh << "static void _tao_any_destructor (void*);";
-
-      ps_sh->nl ();
-      ps_sh->nl ();
-    }
-
-  if (predefined_type->type_of_variable_two () != 0)
-    {
-      // Resetting the counter to be used while printing out the
-      // type_spec and declarator informations. See the corresponding
-      // visit_* methods.
-
-      if (this->count_ > 0)
-        this->identifiers_count_ = 1;
-
-      if (predefined_type->type_of_variable_two ()->accept (this) == -1)
-        return -1;
-
-      *ps_sh << "\n};\n\n";
-
-      this->print_class_for_structure (this->struct_name_);
-    }
-
-  if (predefined_type->type_one () != 0)
-    {
-      // If the member declarations in the structure include any
-      // predefined types like long, save them and increment the counter.
-      if (this->identifiers_.size () < this->count_ + 1)
-        this->identifiers_.size (this->count_ + 1);
-
-      this->identifiers_ [this->count_] =
-        TAO_PSDL_Scope::instance ()->convert_str (predefined_type->type_one ());
-
-      ++this->count_;
-    }
-
-  return 0;
-}
-
-void
-TAO_PSDL_Struct_Visitor::gen_code_for_si (void)
-{
-  TAO_PSDL_Stream *ps_si = TAO_PSDL_Scope::instance ()->get_si ();
-
-  ps_si->reset ();
-  ps_si->indent (); // start from current indentation level
-
-  // Generate the typecode information here
-  *ps_si << "static const CORBA::Long _oc_";
-
-  // Flat name generation.
-  *ps_si << this->struct_name_;
-  *ps_si << "[] =";
-  ps_si->nl ();
-  *ps_si << "{";
-  ps_si->nl ();
-
-  // Some invocation call to put in the stuff that goes between
-  // braces.
-  *ps_si << "TAO_ENCAP_BYTE_ORDER";
-  ps_si->nl ();
-  *ps_si << "// Typecode related information should go in here";
-  ps_si->nl ();
-
-  *ps_si << "};";
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "static CORBA::TypeCode _tc_TAO_tc_";
-  *ps_si << this->struct_name_;
-  *ps_si << " (";
-  ps_si->nl ();
-  ps_si->incr_indent (0);
-  *ps_si << "CORBA::tk_struct,";
-  ps_si->nl ();
-  *ps_si << "sizeof (_oc_" << this->struct_name_ << "),";
-  ps_si->nl ();
-  *ps_si << "(char *) &_oc_";
-  *ps_si << this->struct_name_ << ",";
-  ps_si->nl ();
-  *ps_si << "0,";
-  ps_si->nl ();
-  *ps_si << "sizeof (" << this->struct_name_ << ")";
-  ps_si->nl ();
-  *ps_si << ");";
-  ps_si->decr_indent ();
-
-  ps_si->nl ();
-  ps_si->nl ();
-  *ps_si << "::CORBA::TypeCode_ptr _tc_" << this->struct_name_ << " =";
-  ps_si->nl ();
-  ps_si->incr_indent (0);
-
-  *ps_si << "&_tc_TAO_tc_" << this->struct_name_ << ";";
-  ps_si->decr_indent ();
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "void ";
-  *ps_si << this->struct_name_
-         << "::_tao_any_destructor (void *_tao_void_pointer)";
-  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->nl ();
-  ps_si->incr_indent (0);
-
-  *ps_si << this->struct_name_ << " *tmp = "
-         << "ACE_static_cast ("
-         << this->struct_name_
-         << "*, _tao_void_pointer);";
-
-  ps_si->nl ();
-  *ps_si << "delete tmp;";
-  ps_si->decr_indent ();
-  ps_si->nl ();
-  ps_si->decr_indent ();
-  *ps_si <<"}";
-  ps_si->nl ();
-  ps_si->nl ();
-
-  // Copying Insertion
-
-  *ps_si << "// Copying insertion.";
-  ps_si->nl ();
-
-  *ps_si << "void operator<<= (";
-
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "CORBA::Any &_tao_any,"; ps_si->nl ();
-  *ps_si << "const " << this->struct_name_ << " &_tao_elem"; ps_si->nl ();
-
-  ps_si->decr_indent ();
-
-  *ps_si << ")"; ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0); ps_si->nl ();
-  *ps_si << "TAO_OutputCDR stream;"; ps_si->nl ();
-
-  *ps_si << "if (stream << _tao_elem)"; ps_si->nl ();
-  *ps_si << "{";
-
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "_tao_any._tao_replace (";
-
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "_tc_" << this->struct_name_ << ","; ps_si->nl ();
-  *ps_si << "TAO_ENCAP_BYTE_ORDER,"; ps_si->nl ();
-  *ps_si << "stream.begin ()";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << ");";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->nl ();
-
-  ps_si->reset ();
-  ps_si->nl ();
-
-  *ps_si << "// Non-copying insertion."; ps_si->nl ();
-  *ps_si << "void operator<<= (";
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "CORBA::Any &_tao_any,"; ps_si->nl ();
-  *ps_si << this->struct_name_ << " *_tao_elem";
-
-  ps_si->nl ();
-  *ps_si << ")";
-
-  ps_si->decr_indent (0);  ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "TAO_OutputCDR stream;"; ps_si->nl ();
-
-  *ps_si << "if (stream << *_tao_elem)"; ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "_tao_any._tao_replace (";
-  ps_si->incr_indent (0);ps_si->nl ();
-
-  *ps_si << "_tc_" << this->struct_name_ << ","; ps_si->nl ();
-  *ps_si << "TAO_ENCAP_BYTE_ORDER,"; ps_si->nl ();
-  *ps_si << "stream.begin (),"; ps_si->nl ();
-  *ps_si << "1,"; ps_si->nl ();
-  *ps_si << "_tao_elem,"; ps_si->nl ();
-  *ps_si << this->struct_name_ << "::_tao_any_destructor";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << ");";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << "}"; ps_si->nl ();
-
-  ps_si->reset ();
-  ps_si->nl ();
-
-  *ps_si << "// Extraction to const pointer."; ps_si->nl ();
-
-  *ps_si << "CORBA::Boolean operator>>= (";
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "const CORBA::Any &_tao_any,"; ps_si->nl ();
-  *ps_si << "const " << this->struct_name_ << " *&_tao_elem"; ps_si->nl ();
-
-  *ps_si << ")";
-  ps_si->decr_indent (0); ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0);  ps_si->nl ();
-
-  *ps_si << "_tao_elem = 0;"; ps_si->nl ();
-
-  *ps_si << "ACE_TRY_NEW_ENV"; ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "CORBA::TypeCode_var type = _tao_any.type ();"; ps_si->nl ();
-  *ps_si << "CORBA::Boolean result ="; ps_si->nl ();
-
-  *ps_si << "type->equivalent (";
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "_tc_" << this->struct_name_ << ""; ps_si->nl ();
-  *ps_si << "";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-
-  *ps_si << ");"; ps_si->nl ();
-; ps_si->nl ();
-
-  *ps_si << "if (result == 0)"; ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "return 0; // not equivalent";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << "}"; ps_si->nl ();
-
-  *ps_si << "if (_tao_any.any_owns_data ())"; ps_si->nl ();
-  *ps_si << "{";
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "_tao_elem = ACE_static_cast (";
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "const " << this->struct_name_ << "*,"; ps_si->nl ();
-  *ps_si << "_tao_any.value ()";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << ");"; ps_si->nl ();
-
-  *ps_si << "return 1;"; ps_si->nl ();
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << "}"; ps_si->nl ();
-
-  *ps_si << "else"; ps_si->nl ();
-  *ps_si << "{";
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << this->struct_name_ << " *tmp;"; ps_si->nl ();
-
-  *ps_si << "ACE_NEW_RETURN (";
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "tmp,"; ps_si->nl ();
-  *ps_si << this->struct_name_ << ","; ps_si->nl ();
-  *ps_si << "0"; ps_si->nl ();
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << ");"; ps_si->nl ();
-  *ps_si << ""; ps_si->nl ();
-
-  *ps_si << "TAO_InputCDR stream (";
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "_tao_any._tao_get_cdr (),"; ps_si->nl ();
-  *ps_si << "_tao_any._tao_byte_order ()";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << ");"; ps_si->nl ();
-
-  *ps_si << "if (stream >> *tmp)"; ps_si->nl ();
-  *ps_si << "{";
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "((CORBA::Any *)&_tao_any)->_tao_replace (";
-  ps_si->incr_indent (0); ps_si->nl ();
-  *ps_si << "_tc_" << this->struct_name_ << ","; ps_si->nl ();
-  *ps_si << "1,"; ps_si->nl ();
-  *ps_si << "static_cast<void *> (tmp),"; ps_si->nl ();
-  *ps_si << this->struct_name_ << "::_tao_any_destructor";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << ");"; ps_si->nl ();
-
-  *ps_si << "_tao_elem = tmp;"; ps_si->nl ();
-  *ps_si << "return 1;";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << "}"; ps_si->nl ();
-
-  *ps_si << "else"; ps_si->nl ();
-
-  *ps_si << "{";
-  ps_si->incr_indent (0); ps_si->nl ();
-
-  *ps_si << "delete tmp;";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << "}"; ps_si->nl ();
-
-  *ps_si << "ACE_CATCHANY"; ps_si->nl ();
-  *ps_si << "{";
-  ps_si->nl ();
-  *ps_si << "}"; ps_si->nl ();
-
-  *ps_si << "ACE_ENDTRY;"; ps_si->nl ();
-  *ps_si << "return 0;"; ps_si->nl ();
-  ps_si->decr_indent (0); ps_si->nl ();
-  *ps_si << "}";
-
-  ps_si->reset ();
-  ps_si->nl (); ps_si->nl ();
-
-  return;
-}
-
-void
-TAO_PSDL_Struct_Visitor::print_class_for_structure (ACE_CString struct_name)
-{
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
-  *ps_sh << "class " << struct_name.c_str () << "_var\n";
-  *ps_sh << "{\n";
-
-  *ps_sh << "public:\n";
-  *ps_sh << "   " << struct_name << "_var (void);\n";
-  *ps_sh << "   " << struct_name << "_var (" << struct_name
-         << " *);\n";
-  *ps_sh << "   " << struct_name << "_var (const " << struct_name
-       << "_var &);\n";
-  *ps_sh << "   ~" << struct_name << "_var (void"
-       << ");\n";
-
-    ps_sh->nl ();
-
-
-  *ps_sh << "   " << struct_name << "_var"
-       << " &operator= (" << struct_name
-       << " *);\n";
-
-  *ps_sh << "   " << struct_name << "_var"
-       << " &operator= (const " << struct_name
-       << "_var &);\n";
-
-  *ps_sh << "   " << struct_name
-       << " *operator-> (void);\n";
-
-  *ps_sh << "   const " << struct_name
-       << " *operator-> (void) const;\n";
-
-    ps_sh->nl ();
-
-
-  *ps_sh << "   operator const "
-       << struct_name << "&() const;\n";
-
-  *ps_sh << "   operator "
-       << struct_name << "&();\n";
-
-  *ps_sh << "   operator "
-       << struct_name << "&() const;\n";
-
-  *ps_sh << "   // Variable-size types only.\n";
-
-  *ps_sh << "   operator "
-       << struct_name << "*&();\n";
-
-  *ps_sh << "  // in inout, out, _retn\n";
-  *ps_sh << "  const " << struct_name << "&in (void) const;\n";
-  *ps_sh << "  " << struct_name << " &inout (void);\n";
-  *ps_sh << "  " << struct_name << " *&out (void);\n";
-  *ps_sh << "  " << struct_name << " *_retn (void);\n";
-  *ps_sh << "  " << struct_name << " *ptr (void) const;\n";
-
-  *ps_sh << "private:\n";
-  *ps_sh << "  " << struct_name << " *ptr_;\n";
-
-  *ps_sh << "};\n";
-
-  *ps_sh << "class  " << struct_name << "_out\n";
-  *ps_sh << "{\n";
-  *ps_sh << "  public:\n";
-  *ps_sh << "    " << struct_name << "_out ("
-         << struct_name << " *&);\n";
-  *ps_sh << "    " << struct_name << "_out ("
-         << struct_name << "_var &);\n";
-  *ps_sh << "    " << struct_name << "_out (const "
-         << struct_name << "_out &);\n";
-  *ps_sh << "    " << struct_name << "_out &operator= (const "
-         << struct_name << "_out &);\n";
-  *ps_sh << "    " << struct_name << "_out &operator= ("
-         << struct_name << " *);\n";
-  *ps_sh << "    operator " << struct_name << " *&();\n";
-  *ps_sh << "    " << struct_name << " *&ptr (void);\n";
-  *ps_sh << "    " << struct_name << " *operator-> (void);\n";
-  ps_sh->nl ();
-
-  *ps_sh << "  private:\n";
-  *ps_sh << "    " << struct_name << " *&ptr_;\n";
-  *ps_sh << "    // Assignment from T_var not allowed.\n";
-  *ps_sh << "    void operator= (const " << struct_name << "_var &);\n";
-  *ps_sh << "  };\n";
-
-  *ps_sh << "TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr"
-         << " _tc_" << struct_name << ";";
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << " void operator<<= (CORBA::Any &, const " << struct_name << " &);"
-         << "// copying version";
-  ps_sh->nl ();
-
-  *ps_sh << " void operator<<= (CORBA::Any &, " << struct_name << "*);"
-         << "// noncopying version";
-  ps_sh->nl ();
-
-  *ps_sh << " CORBA::Boolean operator>>= "
-         << "(const CORBA::Any &, " << struct_name << " *&);"
-         << "// deprecated";
-  ps_sh->nl ();
-
-  *ps_sh << " CORBA::Boolean operator>>= "
-         << "(const CORBA::Any &, const " << struct_name << " *&);";
-  ps_sh->nl ();
-
-  ps_sh->nl ();
-
-  *ps_sh << "#ifndef __ACE_INLINE__";
-  ps_sh->incr_indent (0);
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << " CORBA::Boolean operator<< "
-         << "(TAO_OutputCDR &, const " << struct_name << " &);";
-  ps_sh->nl ();
-
-  *ps_sh << " CORBA::Boolean operator>> (TAO_InputCDR &, " << struct_name << " &);";
-
-  ps_sh->decr_indent (0);
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "#endif /* __ACE_INLINE__ */";
-
-  ps_sh->nl ();
-  ps_sh->nl ();
-}
-
-void
-TAO_PSDL_Struct_Visitor::gen_code_for_sinline (void)
-{
-  TAO_PSDL_Stream *ps_sin = TAO_PSDL_Scope::instance ()->get_sinline ();
-
-  if (ps_sin == 0)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "Null pointer to the psdl inline file\n"));
-  }
-  ps_sin->reset ();
-
-  *ps_sin << "// ********************************************************";
-  ps_sin->nl ();
-  *ps_sin << "// Inline operations for class " << this->struct_name_ << "_var"; ps_sin->nl ();
-  *ps_sin << "// ********************************************************";
-  ps_sin->nl ();
-
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::" << this->struct_name_ << "_var (void) // default constructor";
-
-  ps_sin->incr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << ": ptr_ (0)";
-
-  ps_sin->decr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "{}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::" << this->struct_name_ << "_var (" << this->struct_name_ << " *p)";
-
-  ps_sin->incr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << ": ptr_ (p)";
-
-  ps_sin->decr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "{}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::" << this->struct_name_ << "_var (const ::" << this->struct_name_ << "_var &p) // copy constructor"; ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "if (p.ptr_)";
-
-  ps_sin->incr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_NEW (this->ptr_, ::" << this->struct_name_ << " (*p.ptr_));";
-
-  ps_sin->decr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "else";
-
-  ps_sin->incr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "this->ptr_ = 0;";
-
-  ps_sin->decr_indent (0);
-  ps_sin->decr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::~" << this->struct_name_ << "_var (void) // destructor"; ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "delete this->ptr_;";
-
-  ps_sin->decr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE " << this->struct_name_ << "_var &"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::operator= (" << this->struct_name_ << " *p)"; ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "delete this->ptr_;"; ps_sin->nl ();
-  *ps_sin << "this->ptr_ = p;"; ps_sin->nl ();
-  *ps_sin << "return *this;";
-
-  ps_sin->decr_indent (0);
-  ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE ::" << this->struct_name_ << "_var &"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::operator= (const ::" << this->struct_name_ << "_var &p)"; ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "if (this != &p)";
-
-  ps_sin->incr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "if (p.ptr_ == 0)";
-
-  ps_sin->incr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "delete this->ptr_;"; ps_sin->nl ();
-  *ps_sin << "this->ptr_ = 0;";
-
-  ps_sin->decr_indent (0);
-  ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-
-  *ps_sin << "else";
-
-  ps_sin->incr_indent (0);
-  ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << this->struct_name_ << " *deep_copy =";
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "new " << this->struct_name_ << " (*p.ptr_);";
-
-  ps_sin->decr_indent (0);ps_sin->nl ();
-
-  ps_sin->nl ();
-
-  *ps_sin << "if (deep_copy != 0)";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << this->struct_name_ << " *tmp = deep_copy;"; ps_sin->nl ();
-  *ps_sin << "deep_copy = this->ptr_;"; ps_sin->nl ();
-  *ps_sin << "this->ptr_ = tmp;"; ps_sin->nl ();
-  *ps_sin << "delete deep_copy;";
-
-  ps_sin->decr_indent (0);ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->decr_indent (0);
-  ps_sin->decr_indent (0);ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->decr_indent (0);
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "return *this;";
-
-  ps_sin->decr_indent (0);
-  ps_sin->decr_indent (0);
-  ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE const ::" << this->struct_name_ << " *"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::operator-> (void) const"; ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "return this->ptr_;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE ::" << this->struct_name_ << " *"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::operator-> (void)"; ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "return this->ptr_;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::operator const ::" << this->struct_name_ << " &() const // cast"; ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "return *this->ptr_;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::operator ::" << this->struct_name_ << " &() // cast "; ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "return *this->ptr_;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::operator ::" << this->struct_name_ << " &() const // cast "; ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "return *this->ptr_;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "// variable-size types only"; ps_sin->nl ();
-  *ps_sin << "ACE_INLINE"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::operator ::" << this->struct_name_ << " *&() // cast "; ps_sin->nl ();
-  *ps_sin << "{";
-  ps_sin->incr_indent (0); ps_sin->nl ();
-
-  *ps_sin << "return this->ptr_;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE const ::" << this->struct_name_ << " &"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::in (void) const"; ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "return *this->ptr_;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE ::" << this->struct_name_ << " &"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::inout (void)"; ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "return *this->ptr_;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "// mapping for variable size "; ps_sin->nl ();
-  *ps_sin << "ACE_INLINE ::" << this->struct_name_ << " *&"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::out (void)"; ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "delete this->ptr_;"; ps_sin->nl ();
-  *ps_sin << "this->ptr_ = 0;"; ps_sin->nl ();
-  *ps_sin << "return this->ptr_;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE ::" << this->struct_name_ << " *"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::_retn (void)"; ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-
-  *ps_sin << "::" << this->struct_name_ << " *tmp = this->ptr_;"; ps_sin->nl ();
-  *ps_sin << "this->ptr_ = 0;"; ps_sin->nl ();
-  *ps_sin << "return tmp;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE ::" << this->struct_name_ << " *"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_var::ptr (void) const"; ps_sin->nl ();
-
-  *ps_sin << "{";
-  ps_sin->incr_indent (0); ps_sin->nl ();
-
-  *ps_sin << "return this->ptr_;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "// ************************************************************";
-  ps_sin->nl ();
-  *ps_sin << "// Inline operations for class " << this->struct_name_ << "_out";
-  ps_sin->nl ();
-  *ps_sin << "// ************************************************************"; ps_sin->nl ();
-
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_out::" << this->struct_name_ << "_out (::" << this->struct_name_ << " *&p)";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << ": ptr_ (p)";
-  ps_sin->decr_indent (0); ps_sin->nl ();
-
-  *ps_sin << "{";
-  ps_sin->incr_indent (0); ps_sin->nl ();
-
-  *ps_sin << "this->ptr_ = 0;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_out::" << this->struct_name_ << "_out (" << this->struct_name_ << "_var &p) // constructor from _var";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << ": ptr_ (p.out ())";
-  ps_sin->decr_indent (0); ps_sin->nl ();
-
-  *ps_sin << "{";
-  ps_sin->incr_indent (0);ps_sin->nl ();
-
-  *ps_sin << "delete this->ptr_;"; ps_sin->nl ();
-  *ps_sin << "this->ptr_ = 0;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_out::" << this->struct_name_ << "_out (const ::" << this->struct_name_ << "_out &p) // copy constructor";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << ": ptr_ (ACE_const_cast (" << this->struct_name_ << "_out&, p).ptr_)";
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "{}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE " << this->struct_name_ << "_out &"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_out::operator= (const ::" << this->struct_name_ << "_out &p)"; ps_sin->nl ();
-
-  *ps_sin << "{";
-  ps_sin->incr_indent (0);ps_sin->nl ();
-
-  *ps_sin << "this->ptr_ = ACE_const_cast (" << this->struct_name_ << "_out&, p).ptr_;"; ps_sin->nl ();
-  *ps_sin << "return *this;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE " << this->struct_name_ << "_out &"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_out::operator= (" << this->struct_name_ << " *p)"; ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "this->ptr_ = p;"; ps_sin->nl ();
-  *ps_sin << "return *this;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_out::operator ::" << this->struct_name_ << " *&() // cast"; ps_sin->nl ();
-  *ps_sin << "{";
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "return this->ptr_;";
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE ::" << this->struct_name_ << " *&"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_out::ptr (void) // ptr"; ps_sin->nl ();
-  *ps_sin << "{";
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "return this->ptr_;";
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE ::" << this->struct_name_ << " *"; ps_sin->nl ();
-  *ps_sin << this->struct_name_ << "_out::operator-> (void)"; ps_sin->nl ();
-  *ps_sin << "{";
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "return this->ptr_;";
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE CORBA::Boolean operator<< "
-          << "(TAO_OutputCDR &strm, const " << this->struct_name_ << " &_tao_aggregate)";
-  ps_sin->nl ();
-  *ps_sin << "{";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-
-  *ps_sin << "if (";
-  ps_sin->incr_indent (0); ps_sin->nl ();
-
-  *ps_sin << "(strm << _tao_aggregate.name.in ()) &&"; ps_sin->nl ();
-  *ps_sin << "(strm << _tao_aggregate.obj_ref.in ())";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << ")";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "return 1;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "else";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "return 0;";
-
-
-  ps_sin->decr_indent (0);
-  ps_sin->decr_indent (0);ps_sin->nl ();
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-  ps_sin->nl ();
-
-  *ps_sin << "ACE_INLINE CORBA::Boolean operator>> "
-          << "(TAO_InputCDR &strm, " << this->struct_name_ << " &_tao_aggregate)";
-  ps_sin->nl ();
-
-  *ps_sin << "{";
-  ps_sin->incr_indent (0); ps_sin->nl ();
-
-  *ps_sin << "if (";
-  ps_sin->incr_indent (0);ps_sin->nl ();
-
-  *ps_sin << "(strm >> _tao_aggregate.name.out ()) &&"; ps_sin->nl ();
-  *ps_sin << "(strm >> _tao_aggregate.obj_ref.out ())";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << ")";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "return 1;";
-
-  ps_sin->decr_indent (0); ps_sin->nl ();
-  *ps_sin << "else";
-
-  ps_sin->incr_indent (0); ps_sin->nl ();
-  *ps_sin << "return 0;";
-
-  ps_sin->decr_indent (0);
-  ps_sin->decr_indent (0);
-  ps_sin->nl ();
-
-  *ps_sin << "}";
-
-  ps_sin->nl ();
-
-}
diff --git a/orbsvcs/PSS/PSDL_Struct_Visitor.h b/orbsvcs/PSS/PSDL_Struct_Visitor.h
deleted file mode 100644
index 7910bb72c38..00000000000
--- a/orbsvcs/PSS/PSDL_Struct_Visitor.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Struct_Visitor.h
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_STRUCT_VISITOR_H
-#define TAO_PSDL_STRUCT_VISITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Node_Visitor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PSDL_Struct_Visitor : public TAO_PSDL_Node_Visitor
-{
- public:
-
-  TAO_PSDL_Struct_Visitor ();
-
-  ~TAO_PSDL_Struct_Visitor ();
-
-  int visit_identifier (TAO_PSDL_Identifier *identifier);
-
-  int visit_type_spec (TAO_PSDL_Type_Spec *type_spec);
-
-  int visit_declarator (TAO_PSDL_Declarator *declarator);
-
-  // For structs
-  int visit_predefined_type (TAO_PSDL_Predefined_Type *predefined_type);
-
-  // Generate the code that should go into the stub implementation
-  // file for the type_declarators.
-  void gen_code_for_si (void);
-
-  // Generate the code that should go into the stub inline
-  // file for the type_declarators.
-  void gen_code_for_sinline (void);
-
- private:
-  void print_class_for_structure (ACE_CString struct_name);
-
-  // Counter to help print the type_specs and declarators of a
-  // structure.
-  int identifiers_count_;
-
-  // structure_name
-  const char *struct_name_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_STRUCT_VISITOR_H */
diff --git a/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.cpp b/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.cpp
deleted file mode 100644
index 0bde2955e69..00000000000
--- a/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.cpp
+++ /dev/null
@@ -1,445 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Type_Dcl_Visitor.h"
-#include "PSDL_Stream.h"
-
-ACE_RCSID (PSS, PSDL_Type_Dcl_Visitor, "$Id$")
-
-TAO_PSDL_Type_Dcl_Visitor::TAO_PSDL_Type_Dcl_Visitor (void)
-{
-}
-
-TAO_PSDL_Type_Dcl_Visitor::~TAO_PSDL_Type_Dcl_Visitor (void)
-{
-}
-
-int
-TAO_PSDL_Type_Dcl_Visitor::visit_identifier (TAO_PSDL_Identifier *identifier)
-{
-  if (this->identifiers_.size () == 0)
-    {
-      this->identifiers_.size (1);
-      this->count_ = 0;
-    }
-
-  if (this->identifiers_.size () < this->count_ + 1)
-    this->identifiers_.size (this->count_ + 1);
-
-  this->identifiers_ [this->count_] = identifier->value ();
-  ++this->count_;
-
-  return 0;
-}
-
-int
-TAO_PSDL_Type_Dcl_Visitor::visit_type_declarator (TAO_PSDL_Type_Declarator *type_declarator)
-{
-  // Typedefs.
-  this->count_ = 0;
-  this->identifiers_.size (2);
-  this->predefined_type_.size (2);
-
-  this->predefined_type_[this->count_] = 0;
-
-  if (type_declarator->type_spec ()->accept (this) == -1)
-    return -1;
-
-  if (type_declarator->declarators ()->accept (this) == -1)
-    return -1;
-
-  ACE_CString type;
-
-  // This flag is used to distinguish between the predefined types and
-  // types that are typedef'ed before.
-  if (this->predefined_type_ [0] == 0)
-    {
-      if (this->base_type (this->identifiers_[this->count_ -1], type))
-        {
-          if (ACE_OS::strcmp (type.c_str (), "struct") != 0)
-            this->identifiers_[0] = type;
-        }
-    }
-
-  // If the typedef is for a sequence of something, the very first
-  // element is going to be 'sequence' (check visit_predefined_type
-  // method in this class). We are basing our selection
-  // based on that.
-  if (ACE_OS::strcmp (this->identifiers_[0].c_str (), "sequence") != 0)
-    {
-      this->print_for_simple_typedefs ();
-    }
-  else
-    this->print_for_sequence_typedefs (this->identifiers_[1],
-                                       this->identifiers_[2]);
-
-  return 0;
-}
-
-/*
-  There seems to be a difference with what shoudl be printed adn what
-  is printed out as per the method. So commenting it for now. Will keep
-  it around for some time nad remove when I am sure its is totally wrong
-*/
-
-void
-TAO_PSDL_Type_Dcl_Visitor::print_for_sequence_typedefs (ACE_CString identifier_type,
-                                                        ACE_CString identifier)
-{
-  ACE_CString name_space = TAO_PSDL_Scope::instance ()->get_name_space ();
-
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
-  ps_sh->nl ();
-  *ps_sh << "#if !defined (TAO_USE_SEQUENCE_TEMPLATES)";
-  ps_sh->nl ();
-  *ps_sh << "#if !defined (__TAO_UNBOUNDED_SEQUENCE_" << name_space.c_str ()
-         << "_" << identifier.c_str () << "_CH_)";
-  ps_sh->nl ();
-  *ps_sh << "#define __TAO_UNBOUNDED_SEQUENCE_" << name_space.c_str ()
-         << "_" << identifier.c_str () << "_CH_";
-  ps_sh->nl ();
-  *ps_sh << "class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_CosNaming_"
-         << identifier.c_str ();
-  ps_sh->nl ();
-  *ps_sh << ": public TAO_Unbounded_Base_Sequence";
-  ps_sh->nl ();
-  *ps_sh << "{";
-  ps_sh->incr_indent ();
-  ps_sh->nl ();
-  *ps_sh << "public:";
-  ps_sh->nl ();
-  *ps_sh << "// = Initialization and termination methods.";
-  ps_sh->nl ();
-  *ps_sh << "_TAO_Unbounded_Sequence_" << name_space.c_str ()
-         << "_" << identifier.c_str () << " (void);";
-  ps_sh->nl ();
-  *ps_sh << "_TAO_Unbounded_Sequence_" << name_space.c_str ()
-         << "_" << identifier.c_str () << " (CORBA::ULong maximum);";
-  ps_sh->nl ();
-  *ps_sh << "_TAO_Unbounded_Sequence_" << name_space.c_str () << "_"
-         << identifier.c_str () << " (";
-  ps_sh->nl ();
-  *ps_sh << "CORBA::ULong maximum,";
-  ps_sh->nl ();
-  *ps_sh << "CORBA::ULong length,";
-  ps_sh->nl ();
-  *ps_sh << identifier_type << " *data,";
-  ps_sh->nl ();
-  *ps_sh << "CORBA::Boolean release = 0";
-  ps_sh->nl ();
-  *ps_sh << ");";
-  ps_sh->nl ();
-  *ps_sh << "_TAO_Unbounded_Sequence_" << name_space.c_str () << "_" << identifier.c_str () << " (";
-  ps_sh->nl ();
-  *ps_sh << "const _TAO_Unbounded_Sequence_" << name_space.c_str () << "_" << identifier.c_str () << " &rhs\n";
-  *ps_sh << ");\n";
-  *ps_sh << "_TAO_Unbounded_Sequence_" << name_space.c_str () << "_" << identifier.c_str () << " &operator= (\n";
-  *ps_sh << "const _TAO_Unbounded_Sequence_" << name_space.c_str () << "_" << identifier.c_str () << " &rhs\n";
-  *ps_sh << ");\n";
-  *ps_sh << "virtual ~_TAO_Unbounded_Sequence_" << name_space << "_" << identifier << " (void);";
-  ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << "// = Accessors.\n";
-  *ps_sh << identifier_type << " &operator[] (CORBA::ULong i);\n";
-  *ps_sh << "const " << identifier_type << " &operator[] (CORBA::ULong i) const;\n";
-  ps_sh->nl ();
-  *ps_sh << "// = Static operations.\n";
-  *ps_sh << "static " << identifier_type << " *allocbuf (CORBA::ULong size);\n";
-  *ps_sh << "static void freebuf (" << identifier_type << " *buffer);\n";
-  ps_sh->nl ();
-  *ps_sh << "// Implement the TAO_Base_Sequence methods (see Sequence.h)";   ps_sh->nl ();
-  *ps_sh << "virtual void _allocate_buffer (CORBA::ULong length);";   ps_sh->nl ();
-  *ps_sh << "virtual void _deallocate_buffer (void);";   ps_sh->nl ();
-  *ps_sh << identifier_type << " *get_buffer (CORBA::Boolean orphan = 0);";   ps_sh->nl ();
-  *ps_sh << "const " << identifier_type << " *get_buffer (void) const;";   ps_sh->nl ();
-  *ps_sh << "void replace (";   ps_sh->nl ();
-  *ps_sh << "  CORBA::ULong max,";   ps_sh->nl ();
-  *ps_sh << "  CORBA::ULong length,";   ps_sh->nl ();
-  *ps_sh << identifier_type << " *data,";   ps_sh->nl ();
-  *ps_sh << "CORBA::Boolean release";   ps_sh->nl ();
-  *ps_sh << ");";   ps_sh->nl ();
-  ps_sh->decr_indent ();
-  *ps_sh << "};";   ps_sh->nl ();
-  ps_sh->decr_indent ();
-  ps_sh->nl ();
-  *ps_sh << "#endif /* end #if !defined */";   ps_sh->nl ();
-  ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << "#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ";   ps_sh->nl ();
-
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "#if !defined (_" << name_space.c_str () << "_" << identifier.c_str () << "_CH_)";   ps_sh->nl ();
-  *ps_sh << "#define _" << name_space.c_str () << "_" << identifier.c_str () << "_CH_";   ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "class " << identifier.c_str () << ";";   ps_sh->nl ();
-  *ps_sh << "class " << identifier.c_str () << "_var;";   ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "// *************************************************************";   ps_sh->nl ();
-  *ps_sh << "// " << identifier.c_str () ;   ps_sh->nl ();
-  *ps_sh << "// *************************************************************";   ps_sh->nl ();
-
-  ps_sh->nl ();
-
-  *ps_sh << "class  " << identifier.c_str () << " : public";   ps_sh->nl ();
-
-  ps_sh->nl ();
-
-  *ps_sh << "#if !defined (TAO_USE_SEQUENCE_TEMPLATES)";   ps_sh->nl ();
-  *ps_sh << "_TAO_Unbounded_Sequence_" << name_space.c_str () << "_" << identifier.c_str () ;   ps_sh->nl ();
-  *ps_sh << "#else /* TAO_USE_SEQUENCE_TEMPLATES */";   ps_sh->nl ();
-  *ps_sh << "TAO_Unbounded_Sequence<" << identifier.c_str () << "Component>";   ps_sh->nl ();
-  *ps_sh << "#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ";   ps_sh->nl ();
-  *ps_sh << "{";   ps_sh->nl ();
-  ps_sh->incr_indent ();
-  *ps_sh << "public:";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << " (void); // default ctor";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << " (CORBA::ULong max); // uses max size";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << " (";   ps_sh->nl ();
-  *ps_sh << "CORBA::ULong max, ";   ps_sh->nl ();
-  *ps_sh << "CORBA::ULong length, ";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << "Component *buffer, ";   ps_sh->nl ();
-  *ps_sh << "CORBA::Boolean release = 0";   ps_sh->nl ();
-  *ps_sh << ");";   ps_sh->nl ();
-
-  *ps_sh  << identifier.c_str () << " (const " << identifier.c_str () << " &); // copy ctor";   ps_sh->nl ();
-  *ps_sh << "~" << identifier.c_str () << " (void);";   ps_sh->nl ();
-  *ps_sh << "static void _tao_any_destructor (void*);";   ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << "typedef " << identifier.c_str () << "_var _var_type;";   ps_sh->nl ();
-  ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << "};";   ps_sh->nl ();
-  ps_sh->decr_indent ();
-  ps_sh->nl ();
-  *ps_sh << "#endif /* end #if !defined */";   ps_sh->nl ();
-  ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << "#if !defined (_" << name_space.c_str () << "_" << identifier.c_str () << "___VAR_CH_)";   ps_sh->nl ();
-  *ps_sh << "#define _" << name_space.c_str () << "_" << identifier.c_str () << "___VAR_CH_";   ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << "// *************************************************************";   ps_sh->nl ();
-  *ps_sh << "// class " << name_space.c_str () << "::" << identifier.c_str () << "_var";   ps_sh->nl ();
-  *ps_sh << "// *************************************************************";   ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << "class  " << identifier.c_str () << "_var";   ps_sh->nl ();
-  *ps_sh << "{";   ps_sh->nl ();
-  ps_sh->incr_indent ();
-  *ps_sh << "public:";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << "_var (void);";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << "_var (" << identifier.c_str () << " *);";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << "_var (const " << identifier.c_str () << "_var &);";   ps_sh->nl ();
-  *ps_sh << "~" << identifier.c_str () << "_var (void);";   ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << identifier.c_str () << "_var &operator= (" << identifier.c_str () << " *);";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << "_var &operator= (const " << identifier.c_str () << "_var &);";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << " *operator-> (void);";   ps_sh->nl ();
-  *ps_sh << "const " << identifier.c_str () << " *operator-> (void) const;";   ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << "operator const " << identifier.c_str () << " &() const;";   ps_sh->nl ();
-  *ps_sh << "operator " << identifier.c_str () << " &();";   ps_sh->nl ();
-  *ps_sh << "operator " << identifier.c_str () << " &() const;";   ps_sh->nl ();
-  *ps_sh << "operator " << identifier.c_str () << " *&(); // variable-size base types only";   ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << identifier.c_str () << "Component & operator[] (CORBA::ULong index);";   ps_sh->nl ();
-  *ps_sh << "const " << identifier.c_str () << "Component & operator[] (CORBA::ULong index) const;";
-
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "// in, inout, out, _retn ";   ps_sh->nl ();
-  *ps_sh << "const " << identifier.c_str () << " &in (void) const;";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << " &inout (void);";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << " *&out (void);";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << " *_retn (void);";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << " *ptr (void) const;";
-
-  ps_sh->decr_indent (0);
-
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "private:";
-
-  ps_sh->incr_indent (0);
-  ps_sh->nl ();
-
-  *ps_sh << identifier.c_str () << " *ptr_;";   ps_sh->nl ();
-  *ps_sh << "};";
-
-  ps_sh->nl ();
-  ps_sh->nl ();
-  ps_sh->nl ();
-
-  *ps_sh << "#endif /* end #if !defined */";   ps_sh->nl ();
-  ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << "#if !defined (_" << name_space.c_str () << "_" << identifier.c_str () << "___OUT_CH_)";   ps_sh->nl ();
-  *ps_sh << "#define _" << name_space.c_str () << "_" << identifier.c_str () << "___OUT_CH_";   ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << "class  " << identifier.c_str () << "_out";   ps_sh->nl ();
-  *ps_sh << "{";   ps_sh->nl ();
-  ps_sh->incr_indent ();
-  *ps_sh << "public:";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << "_out (" << identifier.c_str () << " *&);";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << "_out (" << identifier.c_str () << "_var &);";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << "_out (const " << identifier.c_str () << "_out &);";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << "_out &operator= (const " << identifier.c_str () << "_out &);";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << "_out &operator= (" << identifier.c_str () << " *);";   ps_sh->nl ();
-  *ps_sh << "operator " << identifier.c_str () << " *&();";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << " *&ptr (void);";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << " *operator-> (void);";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << "Component & operator[] (CORBA::ULong index);";   ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << "private:";   ps_sh->nl ();
-  *ps_sh << identifier.c_str () << " *&ptr_;";   ps_sh->nl ();
-  *ps_sh << "// Assignment from T_var not allowed.";   ps_sh->nl ();
-  *ps_sh << "void operator= (const " << identifier.c_str () << "_var &);";   ps_sh->nl ();
-  *ps_sh << "};";   ps_sh->nl ();
-  ps_sh->decr_indent ();
-  ps_sh->nl ();
-  ps_sh->nl ();
-  *ps_sh << "#endif /* end #if !defined */";   ps_sh->nl ();
-
-  *ps_sh << "TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr "
-         << "_tc_" << identifier.c_str () << ";";   ps_sh->nl ();
-}
-
-void
-TAO_PSDL_Type_Dcl_Visitor::print_for_simple_typedefs (void)
-{
-  ACE_CString type;
-
-  // Get the base type of the identifier name
-  this->base_type (this->identifiers_ [0], type);
-
-  // Get a pointer to PSDL_Stream of the stub header.
-  TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-
-  if (ACE_OS::strcmp (type.c_str (), "char *") == 0)
-    {
-      ps_sh->reset ();
-      ps_sh->nl ();
-
-      *ps_sh << "typedef " << type.c_str () << " "
-             << this->identifiers_ [1].c_str () << ";";
-      }
-
-  ps_sh->nl ();
-  *ps_sh << "typedef " << this->version_for_stub (type).c_str () << " "
-         << this->identifiers_[1].c_str ();
-
-  if (ACE_OS::strcmp (type.c_str (), "char *") == 0)
-    *ps_sh << "_var;";
-  else
-    *ps_sh << ";";
-
-  ps_sh->nl ();
-  *ps_sh << "typedef " << this->version_for_stub (type).c_str () << "_out"
-         << " " << this->identifiers_[1].c_str () << "_out;";   ps_sh->nl ();
-  *ps_sh << "TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr"
-         << " _tc_" << this->identifiers_[1].c_str () << ";";   ps_sh->nl ();
-  ps_sh->nl ();
-
-  // Generates code for the stub implementation files.
-  this->gen_code_for_si ();
-}
-
-void
-TAO_PSDL_Type_Dcl_Visitor::gen_code_for_si (void)
-{
-  TAO_PSDL_Stream *ps_si = TAO_PSDL_Scope::instance ()->get_si ();
-
-  ps_si->reset ();
-  ps_si->indent (); // start from current indentation level
-
-  // Generate the typecode information here
-  *ps_si << "static const CORBA::Long _oc_";
-
-  // Flat name generation.
-  *ps_si << this->identifiers_[1];
-  *ps_si << "[] =";
-  ps_si->nl ();
-  *ps_si << "{";
-  ps_si->nl ();
-
-  // Some invocation call to put in the stuff that goes between
-  // braces.
-  *ps_si << "// Typecode related information should go in here";
-  ps_si->nl ();
-
-  *ps_si << "};";
-  ps_si->nl ();
-  ps_si->nl ();
-
-  *ps_si << "static CORBA::TypeCode _tc_TAO_tc_";
-  *ps_si << this->identifiers_[1];
-  *ps_si << " (";
-  ps_si->nl ();
-  ps_si->incr_indent ();
-  *ps_si << "CORBA::tk_alias,";
-  ps_si->nl ();
-  *ps_si << "sizeof (_oc_" << this->identifiers_[1] << "),";
-  ps_si->nl ();
-  *ps_si << "(char *) &_oc_";
-  *ps_si << this->identifiers_[1] << ",";
-  ps_si->nl ();
-  *ps_si << "0,";
-  ps_si->nl ();
-  *ps_si << "sizeof (" << this->identifiers_[1] << ")";
-  ps_si->nl ();
-  *ps_si << ");";
-  ps_si->decr_indent ();
-
-  ps_si->nl ();
-  ps_si->nl ();
-  *ps_si << "::CORBA::TypeCode_ptr _tc_" << this->identifiers_[1] << " =";
-  ps_si->nl ();
-  ps_si->incr_indent ();
-
-  *ps_si << "&_tc_TAO_tc_" << this->identifiers_[1] << ";";
-  ps_si->decr_indent ();
-  ps_si->nl ();
-  ps_si->nl ();
-
-
-  return;
-}
-
-int
-TAO_PSDL_Type_Dcl_Visitor::visit_predefined_type (TAO_PSDL_Predefined_Type *predefined_type)
-{
-  if (predefined_type->type_one () != 0)
-    {
-      this->identifiers_ [this->count_] =
-        TAO_PSDL_Scope::instance ()->convert_str (predefined_type->type_one ());
-      if (this->count_ == 0)
-        {
-          // @@ implies this is the type.
-          this->predefined_type_ [this->count_] = 1;
-        }
-      ++this->count_;
-    }
-
-  if (predefined_type->type_two () != 0)
-    {}
-
-  if (predefined_type->type_three () != 0)
-    {}
-
-  if (predefined_type->type_of_variable_one () != 0)
-    {
-      if (predefined_type->type_of_variable_one ()->accept (this) == -1)
-        return -1;
-    }
-  if (predefined_type->type_of_variable_two () != 0)
-    {}
-  if (predefined_type->type_of_variable_three () != 0)
-    {}
-  return 0;
-}
diff --git a/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.h b/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.h
deleted file mode 100644
index cd8d558a4a2..00000000000
--- a/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Type_Dcl_Visitor.h
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_TYPE_DCL_VISITOR_H
-#define TAO_PSDL_TYPE_DCL_VISITOR_H
-
-#include /**/ "ace/pre.h"
-#include "PSDL_Node_Visitor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-class TAO_PSDL_Type_Dcl_Visitor : public TAO_PSDL_Node_Visitor
-{
- public:
-
-  TAO_PSDL_Type_Dcl_Visitor ();
-
-  ~TAO_PSDL_Type_Dcl_Visitor ();
-
-  // All type_dcl's except typedef (Refer to PSDL.yy for type_dcl's
-  int visit_identifier (TAO_PSDL_Identifier *identifier);
-
-  // For typedef s
-  int visit_type_declarator (TAO_PSDL_Type_Declarator *node);
-
-  int visit_predefined_type (TAO_PSDL_Predefined_Type *predefined_type);
-
-private:
-
-  void print_for_simple_typedefs (void);
-
-  void print_for_sequence_typedefs (ACE_CString identifier_type,
-                                    ACE_CString identifier);
-  
-  // Generate the code that should go into the stub implementation
-  // file for the type_declarators.
-  void gen_code_for_si (void);
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_TYPE_DCL_VISITOR_H */
diff --git a/orbsvcs/PSS/PSDL_Typecode_Defn.cpp b/orbsvcs/PSS/PSDL_Typecode_Defn.cpp
deleted file mode 100644
index cb458ae9528..00000000000
--- a/orbsvcs/PSS/PSDL_Typecode_Defn.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-
-#include "PSDL_Typecode_Defn.h"
-#include "PSDL_Stream.h"
-
-ACE_RCSID(be_visitor_typecode, typecode_defn, "$Id$")
-
-
-TAO_PSDL_Typecode_Defn::TAO_PSDL_Typecode_Defn ()
-{
-  // Constructor
-}
-
-TAO_PSDL_Typecode_Defn::~TAO_PSDL_Typecode_Defn ()
-{
-  // Destructor
-}
-
-int
-TAO_PSDL_Typecode_Defn::visit_type_declarator (TAO_PSDL_Type_Declarator *type_declarator)
-{
-  ACE_UNUSED_ARG (type_declarator);
-  // Get a pointer to PSDL_Stream of the stub implementation file
-  TAO_PSDL_Stream *ps_si = TAO_PSDL_Scope::instance ()->get_si ();
-
-  ps_si->indent (); // start from current indentation level
-
-  // Generate the typecode information here
-  *ps_si << "static const CORBA::Long _oc_";
-
-  // Flat name generation.
-  return 0;
-}
diff --git a/orbsvcs/PSS/PSDL_Typecode_Defn.h b/orbsvcs/PSS/PSDL_Typecode_Defn.h
deleted file mode 100644
index 1a37d86f38f..00000000000
--- a/orbsvcs/PSS/PSDL_Typecode_Defn.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs/PSS
-//
-// = FILENAME
-//    PSDL_Typecode_Defn.h
-//
-// = DESCRIPTION
-//    Helper for the generation of the typecodes.
-//    This one generates the definitions.
-//
-// = AUTHOR
-//    Priyanka Gontla <pgontla@doc.ece.uci.edu>
-//
-// ============================================================================
-
-#ifndef PSDL_TYPECODE_DEFN_H
-#define PSDL_TYPECODE_DEFN_H
-
-#include /**/ "ace/pre.h"
-#include "PSDL_Node_Visitor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-class TAO_PSDL_Typecode_Defn : public TAO_PSDL_Node_Visitor
-{
- public:
-
-  TAO_PSDL_Typecode_Defn ();
-
-  ~TAO_PSDL_Typecode_Defn ();
-
-  int visit_type_declarator (TAO_PSDL_Type_Declarator *);
-};
-
-#include /**/ "ace/post.h"
-#endif /* PSDL_TYPECODE_DEFN_H */
diff --git a/orbsvcs/PSS/PSDL_Visitor_Factory.cpp b/orbsvcs/PSS/PSDL_Visitor_Factory.cpp
deleted file mode 100644
index d33e61862db..00000000000
--- a/orbsvcs/PSS/PSDL_Visitor_Factory.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "PSDL_Visitor_Factory.h"
-#include "PSDL_Module_Visitor.h"
-#include "PSDL_Type_Dcl_Visitor.h"
-#include "PSDL_Interface_Visitor.h"
-#include "PSDL_Struct_Visitor.h"
-#include "PSDL_Enum_Type_Visitor.h"
-#include "PSDL_Exception_Visitor.h"
-
-ACE_RCSID (PSS, PSDL_Visitor_Factory, "$Id$")
-
-TAO_PSDL_Visitor_Factory::TAO_PSDL_Visitor_Factory (void)
-{
-}
-
-TAO_PSDL_Visitor_Factory::~TAO_PSDL_Visitor_Factory (void)
-{
-}
-
-TAO_PSDL_Node_Visitor *
-TAO_PSDL_Visitor_Factory::make_visitor (int type)
-{
-  switch (type)
-    {
-    case 258:
-      {
-        TAO_PSDL_Module_Visitor *module_visitor = 0;
-        ACE_NEW_RETURN (module_visitor,
-                        TAO_PSDL_Module_Visitor,
-                        0);
-        return module_visitor;
-      }
-    case 291:
-      {
-        TAO_PSDL_Struct_Visitor *struct_visitor = 0;
-        ACE_NEW_RETURN (struct_visitor,
-                        TAO_PSDL_Struct_Visitor,
-                        0);
-        return struct_visitor;
-      }
-    case 300:
-      {
-       TAO_PSDL_Type_Dcl_Visitor *type_dcl_visitor = 0;
-       ACE_NEW_RETURN (type_dcl_visitor,
-                       TAO_PSDL_Type_Dcl_Visitor,
-                       0);
-       return type_dcl_visitor;
-      }
-    case 324:
-      {
-        TAO_PSDL_Exception_Visitor *exception_visitor = 0;
-        ACE_NEW_RETURN (exception_visitor,
-                        TAO_PSDL_Exception_Visitor,
-                        0);
-        return exception_visitor;
-      }
-    case 325:
-      {
-       TAO_PSDL_Interface_Visitor *interface_visitor = 0;
-       ACE_NEW_RETURN (interface_visitor,
-                       TAO_PSDL_Interface_Visitor,
-                       0);
-       return interface_visitor;
-      }
-    case 337:
-      {
-        TAO_PSDL_Enum_Type_Visitor *enum_type_visitor = 0;
-        ACE_NEW_RETURN (enum_type_visitor,
-                        TAO_PSDL_Enum_Type_Visitor,
-                        0);
-        return enum_type_visitor;
-      }
-    default:
-      return 0;
-    }
-}
diff --git a/orbsvcs/PSS/PSDL_Visitor_Factory.h b/orbsvcs/PSS/PSDL_Visitor_Factory.h
deleted file mode 100644
index 0a9db809003..00000000000
--- a/orbsvcs/PSS/PSDL_Visitor_Factory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    PSS
-//
-// = FILENAME
-//    PSDL_Visitor_Factory.h
-//
-// = AUTHOR
-//    Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_PSDL_VISITOR_FACTORY_H
-#define TAO_PSDL_VISITOR_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "PSDL_Node_Visitor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PSDL_Export TAO_PSDL_Visitor_Factory
-{
- public:
-
-  TAO_PSDL_Visitor_Factory ();
-
-  ~TAO_PSDL_Visitor_Factory ();
-
-  TAO_PSDL_Node_Visitor *make_visitor (int type);
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSDL_VISITOR_FACTORY_H */
diff --git a/orbsvcs/PSS/PSDL_l.cpp b/orbsvcs/PSS/PSDL_l.cpp
deleted file mode 100644
index b72c0951eb6..00000000000
--- a/orbsvcs/PSS/PSDL_l.cpp
+++ /dev/null
@@ -1,2319 +0,0 @@
-/* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- * $Id$
- */
-
-#define yy_create_buffer TAO_PSDL_yy_create_buffer
-#define yy_delete_buffer TAO_PSDL_yy_delete_buffer
-#define yy_scan_buffer TAO_PSDL_yy_scan_buffer
-#define yy_scan_string TAO_PSDL_yy_scan_string
-#define yy_scan_bytes TAO_PSDL_yy_scan_bytes
-#define yy_flex_debug TAO_PSDL_yy_flex_debug
-#define yy_init_buffer TAO_PSDL_yy_init_buffer
-#define yy_flush_buffer TAO_PSDL_yy_flush_buffer
-#define yy_load_buffer_state TAO_PSDL_yy_load_buffer_state
-#define yy_switch_to_buffer TAO_PSDL_yy_switch_to_buffer
-#define yyin TAO_PSDL_yyin
-#define yyleng TAO_PSDL_yyleng
-#define yylex TAO_PSDL_yylex
-#define yyout TAO_PSDL_yyout
-#define yyrestart TAO_PSDL_yyrestart
-#define yytext TAO_PSDL_yytext
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-
-#include "ace/OS.h"
-
-#include <stdio.h>
-#include <errno.h>
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-#include <stdlib.h>
-#ifndef _Win32
-#include "ace/Synch.h"
-#else
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
-#endif
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else /* ! __cplusplus */
-
-#if __STDC__
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif  /* __STDC__ */
-#endif  /* ! __cplusplus */
-
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((yy_start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define YY_BUF_SIZE 16384
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-extern int yyleng;
-extern FILE *yyin, *yyout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- *  if ( condition_holds )
- *    yyless( 5 );
- *  else
- *    do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define yyless(n) \
-  do \
-    { \
-    /* Undo effects of setting up yytext. */ \
-    *yy_cp = yy_hold_char; \
-    YY_RESTORE_YY_MORE_OFFSET \
-    yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-    YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-    } \
-  while ( 0 )
-
-#define unput(c) yyunput( c, yytext_ptr )
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-typedef unsigned int yy_size_t;
-
-
-struct yy_buffer_state
-{
-  FILE *yy_input_file;
-
-  char *yy_ch_buf;    /* input buffer */
-  char *yy_buf_pos;   /* current position in input buffer */
-
-  /* Size of input buffer in bytes, not including room for EOB
-   * characters.
-   */
-  yy_size_t yy_buf_size;
-
-  /* Number of characters read into yy_ch_buf, not including EOB
-   * characters.
-   */
-  int yy_n_chars;
-
-  /* Whether we "own" the buffer - i.e., we know we created it,
-   * and can realloc() it to grow it, and should free() it to
-   * delete it.
-   */
-  int yy_is_our_buffer;
-
-  /* Whether this is an "interactive" input source; if so, and
-   * if we're using stdio for input, then we want to use getc()
-   * instead of fread(), to make sure we stop fetching input after
-   * each newline.
-   */
-  int yy_is_interactive;
-
-  /* Whether we're considered to be at the beginning of a line.
-   * If so, '^' rules will be active on the next match, otherwise
-   * not.
-   */
-  int yy_at_bol;
-
-  /* Whether to try to fill the input buffer when we reach the
-   * end of it.
-   */
-  int yy_fill_buffer;
-
-  int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-  /* When an EOF's been seen but there's still some text to process
-   * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-   * shouldn't try reading from the input source any more.  We might
-   * still have a bunch of tokens to match, though, because of
-   * possible backing-up.
-   *
-   * When we actually see the EOF, we change the status to "new"
-   * (via yyrestart()), so that the user can continue scanning by
-   * just pointing yyin at a new input file.
-   */
-#define YY_BUFFER_EOF_PENDING 2
-};
-
-static YY_BUFFER_STATE yy_current_buffer = 0;
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-
-static int yy_n_chars;    /* number of characters read into yy_ch_buf */
-
-
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;   /* whether we need to initialize */
-static int yy_start = 0;  /* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void yyrestart YY_PROTO(( FILE *input_file ));
-
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
-
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
-
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-  { \
-  if ( ! yy_current_buffer ) \
-    yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-  yy_current_buffer->yy_is_interactive = is_interactive; \
-  }
-
-#define yy_set_bol(at_bol) \
-  { \
-  if ( ! yy_current_buffer ) \
-    yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-  yy_current_buffer->yy_at_bol = at_bol; \
-  }
-
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
-
-// #define yywrap() 1
-// #define YY_SKIP_YYWRAP
-typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-typedef int yy_state_type;
-extern char *yytext;
-#define yytext_ptr yytext
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-  yytext_ptr = yy_bp; \
-  yyleng = (int) (yy_cp - yy_bp); \
-  yy_hold_char = *yy_cp; \
-  *yy_cp = '\0'; \
-  yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 94
-#define YY_END_OF_BUFFER 95
-static yyconst short int yy_accept[364] =
-    {   0,
-        0,    0,   95,   93,   91,   92,   18,   13,   93,    5,
-        6,   14,   10,    9,   11,   93,   17,   87,    2,    1,
-        7,   20,    8,   89,   89,   89,   89,   89,   23,   93,
-       24,   12,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,    3,   21,    4,   19,    0,   90,    0,   88,    0,
-       87,   22,   16,   15,   89,   89,   89,   89,   89,   89,
-       89,   89,   26,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   25,   89,   89,
-       89,   89,   89,   27,   89,   89,   89,   89,   89,   89,
-
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,    0,    0,   89,   89,   89,   89,   89,
-       89,   30,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   28,
-       89,   89,   89,   89,   89,   89,   31,   89,   89,   89,
-       89,   89,   29,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   89,   89,    0,
-       88,   89,   89,   85,   89,   89,   89,   89,   32,   89,
-       36,   89,   89,   89,   89,   89,   80,   89,   89,   89,
-       89,   89,   89,   89,   89,   57,   89,   89,   89,   89,
-
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   65,   89,   89,   86,   89,   89,   89,   89,   89,
-       89,   64,   89,   89,   89,   89,   89,   89,   68,   55,
-       89,   33,   89,   72,   89,   89,   51,   89,   89,   89,
-       89,   89,   89,   89,   38,   89,   58,   40,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   47,   89,   89,
-       49,   89,   52,   89,   89,   89,   89,   89,   89,   74,
-       89,   56,   89,   89,   89,   89,   62,   61,   63,   89,
-       89,   89,   83,   66,   89,   89,   89,   39,   77,   44,
-
-       53,   89,   48,   89,   89,   89,   89,   89,   89,   89,
-       89,   50,   34,   67,   54,   89,   84,   89,   89,   45,
-       82,   89,   89,   89,   89,   89,   89,   60,   89,   89,
-       78,   89,   41,   89,   89,   89,   89,   35,   46,   81,
-       89,   89,   76,   89,   59,   89,   69,   79,   70,   89,
-       71,   89,   89,   89,   73,   37,   89,   89,   89,   43,
-       42,   75,    0
-    } ;
-
-static yyconst int yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    4,    5,    6,    7,
-        8,    9,   10,   11,   12,   13,   14,   15,   15,   15,
-       15,   15,   15,   15,   15,   15,   15,   16,   17,   18,
-       19,   20,    1,    1,   21,   22,   23,   23,   24,   25,
-       23,   23,   23,   23,   23,   26,   23,   23,   27,   23,
-       23,   28,   29,   30,   31,   32,   23,   23,   23,   23,
-       33,   34,   35,   36,   37,    1,   38,   39,   40,   41,
-
-       42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
-       52,   53,   54,   55,   56,   57,   58,   59,   60,   61,
-       62,   23,   63,   64,   65,   66,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst int yy_meta[67] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    2,    1,    1,    1,    1,    1,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    1,    1,    1,    1,    2,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    1,    1,    1,    1
-    } ;
-
-static yyconst short int yy_base[368] =
-    {   0,
-        0,    0,  391,  392,  392,  392,  392,  392,   61,  392,
-      392,  392,  392,  392,  392,  375,  392,   55,  373,  392,
-      370,  392,  367,    0,  365,  346,  356,  345,  392,    0,
-      392,  392,   30,  330,   33,   30,   22,   50,   24,  339,
-      328,  327,  340,   49,   21,   42,   61,   35,  326,   56,
-       37,  392,  392,  392,  392,   92,  392,   96,   89,  361,
-       96,  392,  392,  392,    0,  349,  327,  342,  323,    0,
-      315,  308,    0,  312,  316,   58,  329,  315,  309,  321,
-      305,  304,  321,  320,  298,  306,  304,   53,  294,   72,
-      314,  297,  296,    0,  310,  294,   70,  311,  303,   82,
-
-      296,  293,  294,   86,  292,  298,  285,  289,   71,  292,
-      294,  294,  281,  122,  122,  308,  294,  311,  276,    0,
-      276,    0,  277,  282,  288,  291,  273,   79,  270,  288,
-      286,  274,  281,  265,  279,  282,  270,  260,  275,    0,
-      278,  271,  256,  267,  270,  251,    0,   83,  251,  260,
-      252,  266,    0,  253,  247,  249,  246,  247,   93,  248,
-      243,  248,  256,  245,  250,  237,  253,  255,  237,  276,
-      275,  265,  248,    0,  245,  231,  239,  242,    0,  234,
-        0,  225,  239,  228,  221,  229,    0,  224,  224,  234,
-      217,  231,  215,  216,  221,    0,  220,  209,  210,  228,
-
-      227,  226,  217,  216,  219,  208,  217,  216,  200,  214,
-      102,  204,  203,  213,  200,  211,  210,  208,  197,  203,
-      204,    0,  190,  198,    0,  186,  220,  203,  201,  201,
-      186,    0,  176,  186,  186,  192,  176,  177,    0,    0,
-      181,    0,  187,    0,  187,  186,    0,  165,  171,  168,
-      183,  183,  166,  170,    0,  169,    0,    0,  175,  162,
-      173,  172,  158,  159,  168,  174,  169,    0,  159,  152,
-        0,  157,    0,  169,  166,  147,  153,  159,  145,    0,
-      144,    0,  154,  137,  156,  159,    0,    0,    0,  134,
-      153,  152,    0,    0,  144,  152,  149,    0,    0,    0,
-
-        0,  133,    0,  132,  145,  145,  124,  141,  128,  126,
-      125,    0,    0,    0,    0,  129,    0,  129,  139,    0,
-        0,  122,  115,  134,   98,  119,  136,    0,  132,  119,
-        0,  129,    0,  128,  118,  111,  125,    0,    0,    0,
-      114,  103,    0,  125,    0,  112,    0,    0,    0,   97,
-        0,  102,   97,  100,    0,    0,  106,  105,  104,    0,
-        0,    0,  392,  156,  158,  126,  160
-    } ;
-
-static yyconst short int yy_def[368] =
-    {   0,
-      363,    1,  363,  363,  363,  363,  363,  363,  364,  363,
-      363,  363,  363,  363,  363,  363,  363,  363,  363,  363,
-      363,  363,  363,  365,  365,  365,  365,  365,  363,  366,
-      363,  363,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  363,  363,  363,  363,  364,  363,  363,  363,  363,
-      363,  363,  363,  363,  365,  365,  365,  365,  365,  367,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  364,  363,  365,  365,  365,  365,  367,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  363,
-      363,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,    0,  363,  363,  363,  363
-    } ;
-
-static yyconst short int yy_nxt[459] =
-    {   0,
-        4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-       14,   15,   16,   17,   18,   19,   20,   21,   22,   23,
-       24,   24,   24,   24,   25,   24,   26,   24,   24,   27,
-       24,   28,   29,   30,   31,   32,    4,   33,   34,   35,
-       36,   37,   38,   24,   24,   39,   24,   40,   41,   42,
-       43,   44,   45,   24,   46,   47,   48,   49,   50,   51,
-       24,   24,   52,   53,   54,   55,   57,   60,   71,   61,
-       76,   80,   82,   87,   88,   97,  112,   77,   98,   99,
-       72,   81,   83,  100,   78,   73,   74,   84,   93,  107,
-       79,   94,  113,  110,   58,   85,  108,   57,   86,   95,
-
-      101,  114,  102,   59,  138,  103,   96,  111,   60,  139,
-       61,  141,  115,  125,  126,  148,  164,  104,  105,  152,
-      106,  149,  142,  157,  153,   58,  165,   57,   70,  114,
-      115,  170,  201,  170,  182,  183,  171,  158,  212,  259,
-      159,  202,  341,  260,  213,  362,  361,  360,  359,  358,
-      214,  357,  356,  355,  342,   58,   56,   56,   56,   65,
-       65,  120,  120,  354,  353,  352,  351,  350,  349,  348,
-      347,  346,  345,  344,  343,  340,  339,  338,  337,  336,
-      335,  334,  333,  332,  331,  330,  329,  328,  327,  326,
-      325,  324,  323,  322,  321,  320,  319,  318,  317,  316,
-
-      315,  314,  313,  312,  311,  310,  309,  308,  307,  306,
-      305,  304,  303,  302,  301,  300,  299,  298,  297,  296,
-      295,  294,  293,  292,  291,  290,  289,  288,  287,  286,
-      285,  284,  283,  282,  281,  280,  279,  278,  277,  276,
-      275,  274,  273,  272,  271,  270,  269,  268,  267,  266,
-      265,  264,  263,  262,  261,  258,  257,  256,  255,  254,
-      253,  252,  251,  250,  249,  248,  247,  246,  245,  244,
-      243,  242,  241,  240,  239,  238,  237,  236,  235,  234,
-      233,  232,  231,  230,  229,  228,  227,  226,  225,  171,
-      171,  224,  223,  222,  221,  220,  219,  218,  217,  216,
-
-      215,  211,  210,  209,  208,  207,  206,  205,  204,  203,
-      200,  199,  198,  197,  196,  195,  194,  193,  192,  191,
-      190,  189,  188,  187,  186,  185,  184,  181,  180,  179,
-      178,  177,  176,  175,  174,  173,  172,  169,  168,  167,
-      166,  163,  162,  161,  160,  156,  155,  154,  151,  150,
-      147,  146,  145,  144,  143,  140,  137,  136,  135,  134,
-      133,  132,  131,  130,  129,  128,  127,  124,  123,  122,
-      121,  119,  118,  117,  116,   59,  109,   92,   91,   90,
-       89,   75,   69,   68,   67,   66,   64,   63,   62,   59,
-      363,    3,  363,  363,  363,  363,  363,  363,  363,  363,
-
-      363,  363,  363,  363,  363,  363,  363,  363,  363,  363,
-      363,  363,  363,  363,  363,  363,  363,  363,  363,  363,
-      363,  363,  363,  363,  363,  363,  363,  363,  363,  363,
-      363,  363,  363,  363,  363,  363,  363,  363,  363,  363,
-      363,  363,  363,  363,  363,  363,  363,  363,  363,  363,
-      363,  363,  363,  363,  363,  363,  363,  363
-    } ;
-
-static yyconst short int yy_chk[459] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    9,   18,   33,   18,
-       35,   36,   37,   39,   39,   45,   51,   35,   45,   46,
-       33,   36,   37,   46,   35,   33,   33,   38,   44,   48,
-       35,   44,   51,   50,    9,   38,   48,   56,   38,   44,
-
-       47,   58,   47,   59,   88,   47,   44,   50,   61,   88,
-       61,   90,   59,   76,   76,   97,  109,   47,   47,  100,
-       47,   97,   90,  104,  100,   56,  109,  114,  366,   58,
-       59,  115,  148,  115,  128,  128,  115,  104,  159,  211,
-      104,  148,  325,  211,  159,  359,  358,  357,  354,  353,
-      159,  352,  350,  346,  325,  114,  364,  364,  364,  365,
-      365,  367,  367,  344,  342,  341,  337,  336,  335,  334,
-      332,  330,  329,  327,  326,  324,  323,  322,  319,  318,
-      316,  311,  310,  309,  308,  307,  306,  305,  304,  302,
-      297,  296,  295,  292,  291,  290,  286,  285,  284,  283,
-
-      281,  279,  278,  277,  276,  275,  274,  272,  270,  269,
-      267,  266,  265,  264,  263,  262,  261,  260,  259,  256,
-      254,  253,  252,  251,  250,  249,  248,  246,  245,  243,
-      241,  238,  237,  236,  235,  234,  233,  231,  230,  229,
-      228,  227,  226,  224,  223,  221,  220,  219,  218,  217,
-      216,  215,  214,  213,  212,  210,  209,  208,  207,  206,
-      205,  204,  203,  202,  201,  200,  199,  198,  197,  195,
-      194,  193,  192,  191,  190,  189,  188,  186,  185,  184,
-      183,  182,  180,  178,  177,  176,  175,  173,  172,  171,
-      170,  169,  168,  167,  166,  165,  164,  163,  162,  161,
-
-      160,  158,  157,  156,  155,  154,  152,  151,  150,  149,
-      146,  145,  144,  143,  142,  141,  139,  138,  137,  136,
-      135,  134,  133,  132,  131,  130,  129,  127,  126,  125,
-      124,  123,  121,  119,  118,  117,  116,  113,  112,  111,
-      110,  108,  107,  106,  105,  103,  102,  101,   99,   98,
-       96,   95,   93,   92,   91,   89,   87,   86,   85,   84,
-       83,   82,   81,   80,   79,   78,   77,   75,   74,   72,
-       71,   69,   68,   67,   66,   60,   49,   43,   42,   41,
-       40,   34,   28,   27,   26,   25,   23,   21,   19,   16,
-        3,  363,  363,  363,  363,  363,  363,  363,  363,  363,
-
-      363,  363,  363,  363,  363,  363,  363,  363,  363,  363,
-      363,  363,  363,  363,  363,  363,  363,  363,  363,  363,
-      363,  363,  363,  363,  363,  363,  363,  363,  363,  363,
-      363,  363,  363,  363,  363,  363,  363,  363,  363,  363,
-      363,  363,  363,  363,  363,  363,  363,  363,  363,  363,
-      363,  363,  363,  363,  363,  363,  363,  363
-    } ;
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-#line 1 "PSDL.ll"
-#define INITIAL 0
-#line 4 "PSDL.ll"
-// $Id$
-// ========================================================================
-//
-// = LIBRARY
-//   orbsvcs/PSS
-//
-// = FILENAME
-//   PSDL.ll
-//
-// = AUTHOR
-//   Priyanka Gontla <gontla_p@ociweb.com>
-// ========================================================================
-
-#include "ace/OS.h"
-
-#include "PSDL_Interpreter.h"
-#include "PSDL_Node.h"
-#include "PSDL_y.h"
-
-static const char * extract_string(char*);
-
-#define TAO_YY_LEX_DEBUG
-
-//#define TAO_YY_LEX_DEBUG ACE_OS::fprintf(stderr, "%s\n", yytext)
-
-#define YY_DECL int TAO_PSDL_yylex (TAO_PSDL_Node **lvalp, void* )
-
-#define YY_BREAK
-#define YY_NO_UNPUT
-
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
-#else
-extern int yywrap YY_PROTO(( void ));
-#endif
-#endif
-
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
-#endif
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
-
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-//FUZZ: disable check_for_lack_ACE_OS
-#ifndef TAO_PSDL_ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define TAO_PSDL_ECHO (void) fwrite( yytext, yyleng, 1, yyout )
-#endif
-//FUZZ: enable check_for_lack_ACE_OS
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-  if ( yy_current_buffer->yy_is_interactive ) \
-    { \
-    int c = '*', n; \
-    for ( n = 0; n < max_size && \
-         (c = ACE_OS:getc( yyin )) != EOF && c != '\n'; ++n ) \
-      buf[n] = (char) c; \
-    if ( c == '\n' ) \
-      buf[n++] = (char) c; \
-    if ( c == EOF && ferror( yyin ) ) \
-      YY_FATAL_ERROR( "input in flex scanner failed" ); \
-    result = n; \
-    } \
-  else \
-    { \
-    errno=0; \
-    while ( (result = ACE_OS::fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-      { \
-      if( errno != EINTR) \
-        { \
-        YY_FATAL_ERROR( "input in flex scanner failed" ); \
-        break; \
-        } \
-      errno=0; \
-      ACE_OS::clearerr(yyin); \
-      } \
-    }
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-  YY_USER_ACTION
-
-YY_DECL
-  {
-  register yy_state_type yy_current_state;
-  register char *yy_cp, *yy_bp;
-  register int yy_act;
-
-#line 47 "PSDL.ll"
-
-
-
-  if ( yy_init )
-    {
-    yy_init = 0;
-
-#ifdef YY_USER_INIT
-    YY_USER_INIT;
-#endif
-
-    if ( ! yy_start )
-      yy_start = 1; /* first start state */
-
-    if ( ! yyin )
-      yyin = stdin;
-
-    if ( ! yyout )
-      yyout = stdout;
-
-    if ( ! yy_current_buffer )
-      yy_current_buffer =
-        yy_create_buffer( yyin, YY_BUF_SIZE );
-
-    yy_load_buffer_state();
-    }
-
-  while ( 1 )   /* loops until end-of-file is reached */
-    {
-    yy_cp = yy_c_buf_p;
-
-    /* Support of yytext. */
-    *yy_cp = yy_hold_char;
-
-    /* yy_bp points to the position in yy_ch_buf of the start of
-     * the current run.
-     */
-    yy_bp = yy_cp;
-
-    yy_current_state = yy_start;
-yy_match:
-    do
-      {
-      register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-      if ( yy_accept[yy_current_state] )
-        {
-        yy_last_accepting_state = yy_current_state;
-        yy_last_accepting_cpos = yy_cp;
-        }
-      while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-        {
-        yy_current_state = (int) yy_def[yy_current_state];
-        if ( yy_current_state >= 364 )
-          yy_c = yy_meta[(unsigned int) yy_c];
-        }
-      yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-      ++yy_cp;
-      }
-    while ( yy_base[yy_current_state] != 392 );
-
-yy_find_action:
-    yy_act = yy_accept[yy_current_state];
-    if ( yy_act == 0 )
-      { /* have to back up */
-      yy_cp = yy_last_accepting_cpos;
-      yy_current_state = yy_last_accepting_state;
-      yy_act = yy_accept[yy_current_state];
-      }
-
-    YY_DO_BEFORE_ACTION;
-
-
-do_action:  /* This label is used only to access EOF actions. */
-
-
-    switch ( yy_act )
-  { /* beginning of action switch */
-      case 0: /* must back up */
-      /* undo the effects of YY_DO_BEFORE_ACTION */
-      *yy_cp = yy_hold_char;
-      yy_cp = yy_last_accepting_cpos;
-      yy_current_state = yy_last_accepting_state;
-      goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 49 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_SEMI; }
-  YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 50 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_COLON; }
-  YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 51 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OPEN_CURLY_BRACE; }
-  YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 52 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CLOSE_CURLY_BRACE; }
-  YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 53 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OPEN_BRACE; }
-  YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 54 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CLOSE_BRACE; }
-  YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 55 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OPEN_ANGULAR_BRACE; }
-  YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 56 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CLOSE_ANGULAR_BRACE; }
-  YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 57 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_COMMA; }
-  YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 58 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_PLUS; }
-  YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 59 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_MINUS; }
-  YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 60 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_XOR; }
-  YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 61 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_AND; }
-  YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 62 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_MULT; }
-  YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 63 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_RIGHT_SHIFT; }
-  YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 64 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_LEFT_SHIFT; }
-  YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 65 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_DIV; }
-  YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 66 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_PERCENT; }
-  YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 67 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_TILDA; }
-  YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 68 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_EQUAL; }
-  YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 69 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OR; }
-  YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 70 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_DOUBLE_COLON; }
-  YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 71 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OPEN_SQUARE_BRACE; }
-  YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 72 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CLOSE_SQUARE_BRACE; }
-  YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 73 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_IN; }
-  YY_BREAK
-case 26:
-YY_RULE_SETUP
-#line 74 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_AS; }
-  YY_BREAK
-case 27:
-YY_RULE_SETUP
-#line 75 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OF; }
-  YY_BREAK
-case 28:
-YY_RULE_SETUP
-#line 76 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_KEY; }
-  YY_BREAK
-case 29:
-YY_RULE_SETUP
-#line 77 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_REF; }
-  YY_BREAK
-case 30:
-YY_RULE_SETUP
-#line 78 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_ANY; }
-  YY_BREAK
-case 31:
-YY_RULE_SETUP
-#line 79 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OUT; }
-  YY_BREAK
-case 32:
-YY_RULE_SETUP
-#line 80 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CASE; }
-  YY_BREAK
-case 33:
-YY_RULE_SETUP
-#line 81 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_INOUT; }
-  YY_BREAK
-case 34:
-YY_RULE_SETUP
-#line 82 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CATALOG; }
-  YY_BREAK
-case 35:
-YY_RULE_SETUP
-#line 83 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_PROVIDES; }
-  YY_BREAK
-case 36:
-YY_RULE_SETUP
-#line 84 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CHAR; }
-  YY_BREAK
-case 37:
-YY_RULE_SETUP
-#line 85 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_IMPLEMENTS; }
-  YY_BREAK
-case 38:
-YY_RULE_SETUP
-#line 86 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_SCOPE; }
-  YY_BREAK
-case 39:
-YY_RULE_SETUP
-#line 87 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_STORES; }
-  YY_BREAK
-case 40:
-YY_RULE_SETUP
-#line 88 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_STATE; }
-  YY_BREAK
-case 41:
-YY_RULE_SETUP
-#line 89 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_ABSTRACT; }
-  YY_BREAK
-case 42:
-YY_RULE_SETUP
-#line 90 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_STORAGETYPE; }
-  YY_BREAK
-case 43:
-YY_RULE_SETUP
-#line 91 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_STORAGEHOME; }
-  YY_BREAK
-case 44:
-YY_RULE_SETUP
-#line 92 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_STRONG; }
-  YY_BREAK
-case 45:
-YY_RULE_SETUP
-#line 93 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_PRIMARY; }
-  YY_BREAK
-case 46:
-YY_RULE_SETUP
-#line 94 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_READONLY; }
-  YY_BREAK
-case 47:
-YY_RULE_SETUP
-#line 95 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_UNION; }
-  YY_BREAK
-case 48:
-YY_RULE_SETUP
-#line 96 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_SWITCH; }
-  YY_BREAK
-case 49:
-YY_RULE_SETUP
-#line 97 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_WCHAR; }
-  YY_BREAK
-case 50:
-YY_RULE_SETUP
-#line 98 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_BOOLEAN; }
-  YY_BREAK
-case 51:
-YY_RULE_SETUP
-#line 99 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OCTET; }
-  YY_BREAK
-case 52:
-YY_RULE_SETUP
-#line 100 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_OBJECT; }
-  YY_BREAK
-case 53:
-YY_RULE_SETUP
-#line 101 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_STRUCT; }
-  YY_BREAK
-case 54:
-YY_RULE_SETUP
-#line 102 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_DEFAULT; }
-  YY_BREAK
-case 55:
-YY_RULE_SETUP
-#line 103 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_FLOAT; }
-  YY_BREAK
-case 56:
-YY_RULE_SETUP
-#line 104 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_DOUBLE; }
-  YY_BREAK
-case 57:
-YY_RULE_SETUP
-#line 105 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_LONG; }
-  YY_BREAK
-case 58:
-YY_RULE_SETUP
-#line 106 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_SHORT; }
-  YY_BREAK
-case 59:
-YY_RULE_SETUP
-#line 107 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_UNSIGNED; }
-  YY_BREAK
-case 60:
-YY_RULE_SETUP
-#line 108 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_TYPEDEF; }
-  YY_BREAK
-case 61:
-YY_RULE_SETUP
-#line 109 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_NATIVE; }
-  YY_BREAK
-case 62:
-YY_RULE_SETUP
-#line 110 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_MODULE; }
-  YY_BREAK
-case 63:
-YY_RULE_SETUP
-#line 111 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_ONEWAY; }
-  YY_BREAK
-case 64:
-YY_RULE_SETUP
-#line 112 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CONST; }
-  YY_BREAK
-case 65:
-YY_RULE_SETUP
-#line 113 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_VOID; }
-  YY_BREAK
-case 66:
-YY_RULE_SETUP
-#line 114 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_RAISES; }
-  YY_BREAK
-case 67:
-YY_RULE_SETUP
-#line 115 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CONTEXT; }
-  YY_BREAK
-case 68:
-YY_RULE_SETUP
-#line 116 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_FIXED; }
-  YY_BREAK
-case 69:
-YY_RULE_SETUP
-#line 117 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_VALUEBASE; }
-  YY_BREAK
-case 70:
-YY_RULE_SETUP
-#line 118 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_EXCEPTION; }
-  YY_BREAK
-case 71:
-YY_RULE_SETUP
-#line 119 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_INTERFACE; }
-  YY_BREAK
-case 72:
-YY_RULE_SETUP
-#line 120 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_LOCAL; }
-  YY_BREAK
-case 73:
-YY_RULE_SETUP
-#line 121 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_VALUETYPE; }
-  YY_BREAK
-case 74:
-YY_RULE_SETUP
-#line 122 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_CUSTOM; }
-  YY_BREAK
-case 75:
-YY_RULE_SETUP
-#line 123 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_TRUNCATABLE; }
-  YY_BREAK
-case 76:
-YY_RULE_SETUP
-#line 124 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_SUPPORTS; }
-  YY_BREAK
-case 77:
-YY_RULE_SETUP
-#line 125 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_STRING; }
-  YY_BREAK
-case 78:
-YY_RULE_SETUP
-#line 126 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_WSTRING; }
-  YY_BREAK
-case 79:
-YY_RULE_SETUP
-#line 127 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_ATTRIBUTE; }
-  YY_BREAK
-case 80:
-YY_RULE_SETUP
-#line 128 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_ENUM; }
-  YY_BREAK
-case 81:
-YY_RULE_SETUP
-#line 129 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_SEQUENCE; }
-  YY_BREAK
-case 82:
-YY_RULE_SETUP
-#line 130 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_PRIVATE; }
-  YY_BREAK
-case 83:
-YY_RULE_SETUP
-#line 131 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_PUBLIC; }
-  YY_BREAK
-case 84:
-YY_RULE_SETUP
-#line 132 "PSDL.ll"
-{ TAO_YY_LEX_DEBUG; return TAO_PSDL_FACTORY; }
-  YY_BREAK
-case 85:
-YY_RULE_SETUP
-#line 133 "PSDL.ll"
-{
-      *lvalp =
-        new TAO_PSDL_Literal ((CORBA::Boolean) 1);
-      TAO_YY_LEX_DEBUG; return TAO_PSDL_TRUE;
-    }
-  YY_BREAK
-case 86:
-YY_RULE_SETUP
-#line 138 "PSDL.ll"
-{
-      *lvalp =
-        new TAO_PSDL_Literal ((CORBA::Boolean) 0);
-      TAO_YY_LEX_DEBUG; return TAO_PSDL_FALSE;
-    }
-  YY_BREAK
-case 87:
-YY_RULE_SETUP
-#line 143 "PSDL.ll"
-{
-      *lvalp =
-      new TAO_PSDL_Literal (ACE_OS::atoi (yytext));
-      TAO_YY_LEX_DEBUG; return TAO_PSDL_INTEGER;
-    }
-  YY_BREAK
-case 88:
-YY_RULE_SETUP
-#line 148 "PSDL.ll"
-{
-        double v;
-      sscanf (yytext, "%lf", &v);
-      *lvalp =
-        new TAO_PSDL_Literal (v);
-      TAO_YY_LEX_DEBUG; return TAO_PSDL_FLOATING_PT;
-    }
-  YY_BREAK
-case 89:
-YY_RULE_SETUP
-#line 155 "PSDL.ll"
-{
-      *lvalp =
-        new TAO_PSDL_Identifier (yytext);
-      TAO_YY_LEX_DEBUG; return TAO_PSDL_IDENT;
-    }
-  YY_BREAK
-case 90:
-YY_RULE_SETUP
-#line 160 "PSDL.ll"
-{
-      *lvalp =
-        new TAO_PSDL_Literal (extract_string (yytext));
-      TAO_YY_LEX_DEBUG; return TAO_PSDL_STRING;
-    }
-  YY_BREAK
-case 91:
-YY_RULE_SETUP
-#line 165 "PSDL.ll"
-{
-                  TAO_YY_LEX_DEBUG; break; // Ignore
-                }
-  YY_BREAK
-case 92:
-YY_RULE_SETUP
-#line 168 "PSDL.ll"
-{
-      TAO_YY_LEX_DEBUG; break; // Ignore
-    }
-  YY_BREAK
-case 93:
-YY_RULE_SETUP
-#line 171 "PSDL.ll"
-{
-                  TAO_YY_LEX_DEBUG; break; // @@ TODO
-                }
-  YY_BREAK
-case 94:
-YY_RULE_SETUP
-#line 174 "PSDL.ll"
-TAO_PSDL_ECHO;
-  YY_BREAK
-case YY_STATE_EOF(INITIAL):
-  yyterminate();
-
-  case YY_END_OF_BUFFER:
-    {
-    /* Amount of text matched not including the EOB char. */
-    int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
-
-    /* Undo the effects of YY_DO_BEFORE_ACTION. */
-    *yy_cp = yy_hold_char;
-    YY_RESTORE_YY_MORE_OFFSET
-
-    if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
-      {
-      /* We're scanning a new file or input source.  It's
-       * possible that this happened because the user
-       * just pointed yyin at a new source and called
-       * yylex().  If so, then we have to assure
-       * consistency between yy_current_buffer and our
-       * globals.  Here is the right place to do so, because
-       * this is the first action (other than possibly a
-       * back-up) that will match for the new input source.
-       */
-      yy_n_chars = yy_current_buffer->yy_n_chars;
-      yy_current_buffer->yy_input_file = yyin;
-      yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
-      }
-
-    /* Note that here we test for yy_c_buf_p "<=" to the position
-     * of the first EOB in the buffer, since yy_c_buf_p will
-     * already have been incremented past the NUL character
-     * (since all states make transitions on EOB to the
-     * end-of-buffer state).  Contrast this with the test
-     * in input().
-     */
-    if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-      { /* This was really a NUL. */
-      yy_state_type yy_next_state;
-
-      yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
-
-      yy_current_state = yy_get_previous_state();
-
-      /* Okay, we're now positioned to make the NUL
-       * transition.  We couldn't have
-       * yy_get_previous_state() go ahead and do it
-       * for us because it doesn't know how to deal
-       * with the possibility of jamming (and we don't
-       * want to build jamming into it because then it
-       * will run more slowly).
-       */
-
-      yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-      yy_bp = yytext_ptr + YY_MORE_ADJ;
-
-      if ( yy_next_state )
-        {
-        /* Consume the NUL. */
-        yy_cp = ++yy_c_buf_p;
-        yy_current_state = yy_next_state;
-        goto yy_match;
-        }
-
-      else
-        {
-        yy_cp = yy_c_buf_p;
-        goto yy_find_action;
-        }
-      }
-
-    else switch ( yy_get_next_buffer() )
-      {
-      case EOB_ACT_END_OF_FILE:
-        {
-        yy_did_buffer_switch_on_eof = 0;
-
-        if ( yywrap() )
-          {
-          /* Note: because we've taken care in
-           * yy_get_next_buffer() to have set up
-           * yytext, we can now set up
-           * yy_c_buf_p so that if some total
-           * hoser (like flex itself) wants to
-           * call the scanner after we return the
-           * YY_NULL, it'll still work - another
-           * YY_NULL will get returned.
-           */
-          yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-
-          yy_act = YY_STATE_EOF(YY_START);
-          goto do_action;
-          }
-
-        else
-          {
-          if ( ! yy_did_buffer_switch_on_eof )
-            YY_NEW_FILE;
-          }
-        break;
-        }
-
-      case EOB_ACT_CONTINUE_SCAN:
-        yy_c_buf_p =
-          yytext_ptr + yy_amount_of_matched_text;
-
-        yy_current_state = yy_get_previous_state();
-
-        yy_cp = yy_c_buf_p;
-        yy_bp = yytext_ptr + YY_MORE_ADJ;
-        goto yy_match;
-
-      case EOB_ACT_LAST_MATCH:
-        yy_c_buf_p =
-        &yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-        yy_current_state = yy_get_previous_state();
-
-        yy_cp = yy_c_buf_p;
-        yy_bp = yytext_ptr + YY_MORE_ADJ;
-        goto yy_find_action;
-      }
-    break;
-    }
-
-  default:
-    YY_FATAL_ERROR(
-      "fatal flex scanner internal error--no action found" );
-  } /* end of action switch */
-    } /* end of scanning one token */
-  } /* end of yylex */
-
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *  EOB_ACT_LAST_MATCH -
- *  EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *  EOB_ACT_END_OF_FILE - end of file
- */
-
-static int yy_get_next_buffer()
-  {
-  register char *dest = yy_current_buffer->yy_ch_buf;
-  register char *source = yytext_ptr;
-  register int number_to_move, i;
-  int ret_val;
-
-  if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
-    YY_FATAL_ERROR(
-    "fatal flex scanner internal error--end of buffer missed" );
-
-  if ( yy_current_buffer->yy_fill_buffer == 0 )
-    { /* Don't try to fill the buffer, so this is an EOF. */
-    if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
-      {
-      /* We matched a single character, the EOB, so
-       * treat this as a final EOF.
-       */
-      return EOB_ACT_END_OF_FILE;
-      }
-
-    else
-      {
-      /* We matched some text prior to the EOB, first
-       * process it.
-       */
-      return EOB_ACT_LAST_MATCH;
-      }
-    }
-
-  /* Try to read more data. */
-
-  /* First move last chars to start of buffer. */
-  number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
-
-  for ( i = 0; i < number_to_move; ++i )
-    *(dest++) = *(source++);
-
-  if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-    /* don't do the read, it's not guaranteed to return an EOF,
-     * just force an EOF
-     */
-    yy_current_buffer->yy_n_chars = yy_n_chars = 0;
-
-  else
-    {
-    int num_to_read =
-      yy_current_buffer->yy_buf_size - number_to_move - 1;
-
-    while ( num_to_read <= 0 )
-      { /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-      YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-      /* just a shorter name for the current buffer */
-      YY_BUFFER_STATE b = yy_current_buffer;
-
-      int yy_c_buf_p_offset =
-        (int) (yy_c_buf_p - b->yy_ch_buf);
-
-      if ( b->yy_is_our_buffer )
-        {
-        int new_size = b->yy_buf_size * 2;
-
-        if ( new_size <= 0 )
-          b->yy_buf_size += b->yy_buf_size / 8;
-        else
-          b->yy_buf_size *= 2;
-
-        b->yy_ch_buf = (char *)
-          /* Include room in for 2 EOB chars. */
-          yy_flex_realloc( (void *) b->yy_ch_buf,
-               b->yy_buf_size + 2 );
-        }
-      else
-        /* Can't grow it, we don't own it. */
-        b->yy_ch_buf = 0;
-
-      if ( ! b->yy_ch_buf )
-        YY_FATAL_ERROR(
-        "fatal error - scanner input buffer overflow" );
-
-      yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-      num_to_read = yy_current_buffer->yy_buf_size -
-            number_to_move - 1;
-#endif
-      }
-
-    if ( num_to_read > YY_READ_BUF_SIZE )
-      num_to_read = YY_READ_BUF_SIZE;
-
-    /* Read in more data. */
-    YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-      yy_n_chars, num_to_read );
-
-    yy_current_buffer->yy_n_chars = yy_n_chars;
-    }
-
-  if ( yy_n_chars == 0 )
-    {
-    if ( number_to_move == YY_MORE_ADJ )
-      {
-      ret_val = EOB_ACT_END_OF_FILE;
-      yyrestart( yyin );
-      }
-
-    else
-      {
-      ret_val = EOB_ACT_LAST_MATCH;
-      yy_current_buffer->yy_buffer_status =
-        YY_BUFFER_EOF_PENDING;
-      }
-    }
-
-  else
-    ret_val = EOB_ACT_CONTINUE_SCAN;
-
-  yy_n_chars += number_to_move;
-  yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-  yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-  yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
-
-  return ret_val;
-  }
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-static yy_state_type yy_get_previous_state()
-  {
-  register yy_state_type yy_current_state;
-  register char *yy_cp;
-
-  yy_current_state = yy_start;
-
-  for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
-    {
-    register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-    if ( yy_accept[yy_current_state] )
-      {
-      yy_last_accepting_state = yy_current_state;
-      yy_last_accepting_cpos = yy_cp;
-      }
-    while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-      {
-      yy_current_state = (int) yy_def[yy_current_state];
-      if ( yy_current_state >= 364 )
-        yy_c = yy_meta[(unsigned int) yy_c];
-      }
-    yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-    }
-
-  return yy_current_state;
-  }
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *  next_state = yy_try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-  {
-  register int yy_is_jam;
-  register char *yy_cp = yy_c_buf_p;
-
-  register YY_CHAR yy_c = 1;
-  if ( yy_accept[yy_current_state] )
-    {
-    yy_last_accepting_state = yy_current_state;
-    yy_last_accepting_cpos = yy_cp;
-    }
-  while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-    {
-    yy_current_state = (int) yy_def[yy_current_state];
-    if ( yy_current_state >= 364 )
-      yy_c = yy_meta[(unsigned int) yy_c];
-    }
-  yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-  yy_is_jam = (yy_current_state == 363);
-
-  return yy_is_jam ? 0 : yy_current_state;
-  }
-
-
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-  {
-  register char *yy_cp = yy_c_buf_p;
-
-  /* undo effects of setting up yytext */
-  *yy_cp = yy_hold_char;
-
-  if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-    { /* need to shift things up to make room */
-    /* +2 for EOB chars. */
-    register int number_to_move = yy_n_chars + 2;
-    register char *dest = &yy_current_buffer->yy_ch_buf[
-          yy_current_buffer->yy_buf_size + 2];
-    register char *source =
-        &yy_current_buffer->yy_ch_buf[number_to_move];
-
-    while ( source > yy_current_buffer->yy_ch_buf )
-      *--dest = *--source;
-
-    yy_cp += (int) (dest - source);
-    yy_bp += (int) (dest - source);
-    yy_current_buffer->yy_n_chars =
-      yy_n_chars = yy_current_buffer->yy_buf_size;
-
-    if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-      YY_FATAL_ERROR( "flex scanner push-back overflow" );
-    }
-
-  *--yy_cp = (char) c;
-
-
-  yytext_ptr = yy_bp;
-  yy_hold_char = *yy_cp;
-  yy_c_buf_p = yy_cp;
-  }
-#endif  /* ifndef YY_NO_UNPUT */
-
-
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
-  {
-  int c;
-
-  *yy_c_buf_p = yy_hold_char;
-
-  if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-    {
-    /* yy_c_buf_p now points to the character we want to return.
-     * If this occurs *before* the EOB characters, then it's a
-     * valid NUL; if not, then we've hit the end of the buffer.
-     */
-    if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-      /* This was really a NUL. */
-      *yy_c_buf_p = '\0';
-
-    else
-      { /* need more input */
-      int offset = yy_c_buf_p - yytext_ptr;
-      ++yy_c_buf_p;
-
-      switch ( yy_get_next_buffer() )
-        {
-        case EOB_ACT_LAST_MATCH:
-          /* This happens because yy_g_n_b()
-           * sees that we've accumulated a
-           * token and flags that we need to
-           * try matching the token before
-           * proceeding.  But for input(),
-           * there's no matching to consider.
-           * So convert the EOB_ACT_LAST_MATCH
-           * to EOB_ACT_END_OF_FILE.
-           */
-
-          /* Reset buffer status. */
-          yyrestart( yyin );
-
-          /* fall through */
-
-        case EOB_ACT_END_OF_FILE:
-          {
-          if ( yywrap() )
-            return EOF;
-
-          if ( ! yy_did_buffer_switch_on_eof )
-            YY_NEW_FILE;
-#ifdef __cplusplus
-          return yyinput();
-#else
-          return input();
-#endif
-          }
-
-        case EOB_ACT_CONTINUE_SCAN:
-          yy_c_buf_p = yytext_ptr + offset;
-          break;
-        }
-      }
-    }
-
-  c = *(unsigned char *) yy_c_buf_p;  /* cast for 8-bit char's */
-  *yy_c_buf_p = '\0'; /* preserve yytext */
-  yy_hold_char = *++yy_c_buf_p;
-
-
-  return c;
-  }
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-  {
-  if ( ! yy_current_buffer )
-    yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-  yy_init_buffer( yy_current_buffer, input_file );
-  yy_load_buffer_state();
-  }
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-  {
-  if ( yy_current_buffer == new_buffer )
-    return;
-
-  if ( yy_current_buffer )
-    {
-    /* Flush out information for old buffer. */
-    *yy_c_buf_p = yy_hold_char;
-    yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-    yy_current_buffer->yy_n_chars = yy_n_chars;
-    }
-
-  yy_current_buffer = new_buffer;
-  yy_load_buffer_state();
-
-  /* We don't actually know whether we did this switch during
-   * EOF (yywrap()) processing, but the only time this flag
-   * is looked at is after yywrap() is called, so it's safe
-   * to go ahead and always set it.
-   */
-  yy_did_buffer_switch_on_eof = 1;
-  }
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-  {
-  yy_n_chars = yy_current_buffer->yy_n_chars;
-  yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-  yyin = yy_current_buffer->yy_input_file;
-  yy_hold_char = *yy_c_buf_p;
-  }
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-  {
-  YY_BUFFER_STATE b;
-
-  b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-  if ( ! b )
-    YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-  b->yy_buf_size = size;
-
-  /* yy_ch_buf has to be 2 characters longer than the size given because
-   * we need to put in 2 end-of-buffer characters.
-   */
-  b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
-  if ( ! b->yy_ch_buf )
-    YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-  b->yy_is_our_buffer = 1;
-
-  yy_init_buffer( b, file );
-
-  return b;
-  }
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-  {
-  if ( ! b )
-    return;
-
-  if ( b == yy_current_buffer )
-    yy_current_buffer = (YY_BUFFER_STATE) 0;
-
-  if ( b->yy_is_our_buffer )
-    yy_flex_free( (void *) b->yy_ch_buf );
-
-  yy_flex_free( (void *) b );
-  }
-
-
-#ifndef _Win32
-#include "ace/Synch.h"
-#else
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
-#endif
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-
-  {
-  yy_flush_buffer( b );
-
-  b->yy_input_file = file;
-  b->yy_fill_buffer = 1;
-
-#if YY_ALWAYS_INTERACTIVE
-  b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-  b->yy_is_interactive = 0;
-#else
-  b->yy_is_interactive = file ? (ACE_OS::ace_isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-  }
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-
-  {
-  if ( ! b )
-    return;
-
-  b->yy_n_chars = 0;
-
-  /* We always need two end-of-buffer characters.  The first causes
-   * a transition to the end-of-buffer state.  The second causes
-   * a jam in that state.
-   */
-  b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-  b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-  b->yy_buf_pos = &b->yy_ch_buf[0];
-
-  b->yy_at_bol = 1;
-  b->yy_buffer_status = YY_BUFFER_NEW;
-
-  if ( b == yy_current_buffer )
-    yy_load_buffer_state();
-  }
-
-
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-  {
-  YY_BUFFER_STATE b;
-
-  if ( size < 2 ||
-       base[size-2] != YY_END_OF_BUFFER_CHAR ||
-       base[size-1] != YY_END_OF_BUFFER_CHAR )
-    /* They forgot to leave room for the EOB's. */
-    return 0;
-
-  b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-  if ( ! b )
-    YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-  b->yy_buf_size = size - 2;  /* "- 2" to take care of EOB's */
-  b->yy_buf_pos = b->yy_ch_buf = base;
-  b->yy_is_our_buffer = 0;
-  b->yy_input_file = 0;
-  b->yy_n_chars = b->yy_buf_size;
-  b->yy_is_interactive = 0;
-  b->yy_at_bol = 1;
-  b->yy_fill_buffer = 0;
-  b->yy_buffer_status = YY_BUFFER_NEW;
-
-  yy_switch_to_buffer( b );
-
-  return b;
-  }
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-  {
-  int len;
-  for ( len = 0; yy_str[len]; ++len )
-    ;
-
-  return yy_scan_bytes( yy_str, len );
-  }
-#endif
-
-
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-  {
-  YY_BUFFER_STATE b;
-  char *buf;
-  yy_size_t n;
-  int i;
-
-  /* Get memory for full buffer, including space for trailing EOB's. */
-  n = len + 2;
-  buf = (char *) yy_flex_alloc( n );
-  if ( ! buf )
-    YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-  for ( i = 0; i < len; ++i )
-    buf[i] = bytes[i];
-
-  buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
-
-  b = yy_scan_buffer( buf, n );
-  if ( ! b )
-    YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-  /* It's okay to grow etc. this buffer, and we should throw it
-   * away when we're done.
-   */
-  b->yy_is_our_buffer = 1;
-
-  return b;
-  }
-#endif
-
-
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-  {
-  if ( yy_start_stack_ptr >= yy_start_stack_depth )
-    {
-    yy_size_t new_size;
-
-    yy_start_stack_depth += YY_START_STACK_INCR;
-    new_size = yy_start_stack_depth * sizeof( int );
-
-    if ( ! yy_start_stack )
-      yy_start_stack = (int *) yy_flex_alloc( new_size );
-
-    else
-      yy_start_stack = (int *) yy_flex_realloc(
-          (void *) yy_start_stack, new_size );
-
-    if ( ! yy_start_stack )
-      YY_FATAL_ERROR(
-      "out of memory expanding start-condition stack" );
-    }
-
-  yy_start_stack[yy_start_stack_ptr++] = YY_START;
-
-  BEGIN(new_state);
-  }
-#endif
-
-
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-  {
-  if ( --yy_start_stack_ptr < 0 )
-    YY_FATAL_ERROR( "start-condition stack underflow" );
-
-  BEGIN(yy_start_stack[yy_start_stack_ptr]);
-  }
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-  {
-  return yy_start_stack[yy_start_stack_ptr - 1];
-  }
-#endif
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-  {
-  (void) ACE_OS::fprintf( stderr, "%s\n", msg );
-  ACE_OS::exit( YY_EXIT_FAILURE );
-  }
-
-
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-  do \
-    { \
-    /* Undo effects of setting up yytext. */ \
-    yytext[yyleng] = yy_hold_char; \
-    yy_c_buf_p = yytext + n; \
-    yy_hold_char = *yy_c_buf_p; \
-    *yy_c_buf_p = '\0'; \
-    yyleng = n; \
-    } \
-  while ( 0 )
-
-
-/* Internal utility routines. */
-
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-  {
-  register int i;
-  for ( i = 0; i < n; ++i )
-    s1[i] = s2[i];
-  }
-#endif
-
-#ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-  {
-  register int n;
-  for ( n = 0; s[n]; ++n )
-    ;
-
-  return n;
-  }
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-  {
-  return (void *) ACE_OS::malloc( size );
-  }
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-  {
-  /* The cast to (char *) in the following accommodates both
-   * implementations that use char* generic pointers, and those
-   * that use void* generic pointers.  It works with the latter
-   * because both ANSI C and C++ allow castless assignment from
-   * any pointer type to void*, and deal with argument conversions
-   * as though doing an assignment.
-   */
-   return (void *) ACE_OS::realloc( (char *) ptr, size );
-  }
-
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-  {
-  ACE_OS::free( ptr );
-  }
-
-#if YY_MAIN
-int main()
-  {
-  yylex();
-  return 0;
-  }
-#endif
-#line 174 "PSDL.ll"
-
-
-const char*
-extract_string(char* str)
-{
-  char *t = str;
-  for (char * i = str + 1; *i != '\''; ++i, ++t)
-    {
-      if (*i == '\\')
-        {
-          ++i;
-          if (*i == 0)
-            return 0;
-          else if (*i == 't')
-            *t = '\t';
-          else if (*i == 'n')
-            *t = '\n';
-          else if (*i == '\\')
-            *t = '\\';
-          else
-            *t = *i;
-          continue;
-        }
-
-      *t = *i;
-    }
-
-  *t = '\0';
-  return str;
-}
-
-int
-yywrap ()
-{
-  return 1;
-}
diff --git a/orbsvcs/PSS/PSDL_y.cpp b/orbsvcs/PSS/PSDL_y.cpp
deleted file mode 100644
index 984e36fd977..00000000000
--- a/orbsvcs/PSS/PSDL_y.cpp
+++ /dev/null
@@ -1,3410 +0,0 @@
-// $Id$
-/* A Bison parser, made from PSDL.yy
-   by GNU bison 1.35.  */
-
-#define YYBISON 1  /* Identify Bison output.  */
-
-#define yyparse TAO_PSDL_yyparse
-#define yylex TAO_PSDL_yylex
-#define yyerror TAO_PSDL_yyerror
-#define yylval TAO_PSDL_yylval
-#define yychar TAO_PSDL_yychar
-#define yydebug TAO_PSDL_yydebug
-#define yynerrs TAO_PSDL_yynerrs
-# define  TAO_PSDL_SEMI 257
-# define  TAO_PSDL_MODULE 258
-# define  TAO_PSDL_COLON  259
-# define  TAO_PSDL_OPEN_CURLY_BRACE 260
-# define  TAO_PSDL_CLOSE_CURLY_BRACE  261
-# define  TAO_PSDL_OPEN_BRACE 262
-# define  TAO_PSDL_CLOSE_BRACE  263
-# define  TAO_PSDL_ABSTRACT 264
-# define  TAO_PSDL_STORAGETYPE  265
-# define  TAO_PSDL_STORAGEHOME  266
-# define  TAO_PSDL_CATALOG  267
-# define  TAO_PSDL_PROVIDES 268
-# define  TAO_PSDL_IMPLEMENTS 269
-# define  TAO_PSDL_SCOPE  270
-# define  TAO_PSDL_STORES 271
-# define  TAO_PSDL_STATE  272
-# define  TAO_PSDL_AS 273
-# define  TAO_PSDL_PRIMARY  274
-# define  TAO_PSDL_STRONG 275
-# define  TAO_PSDL_REF  276
-# define  TAO_PSDL_OF 277
-# define  TAO_PSDL_OPEN_ANGULAR_BRACE 278
-# define  TAO_PSDL_CLOSE_ANGULAR_BRACE  279
-# define  TAO_PSDL_COMMA  280
-# define  TAO_PSDL_KEY  281
-# define  TAO_PSDL_READONLY 282
-# define  TAO_PSDL_UNION  283
-# define  TAO_PSDL_SWITCH 284
-# define  TAO_PSDL_CASE 285
-# define  TAO_PSDL_WCHAR  286
-# define  TAO_PSDL_BOOLEAN  287
-# define  TAO_PSDL_OCTET  288
-# define  TAO_PSDL_ANY  289
-# define  TAO_PSDL_OBJECT 290
-# define  TAO_PSDL_STRUCT 291
-# define  TAO_PSDL_DEFAULT  292
-# define  TAO_PSDL_FLOAT  293
-# define  TAO_PSDL_DOUBLE 294
-# define  TAO_PSDL_LONG 295
-# define  TAO_PSDL_SHORT  296
-# define  TAO_PSDL_UNSIGNED 297
-# define  TAO_PSDL_CHAR 298
-# define  TAO_PSDL_IDENT  299
-# define  TAO_PSDL_TYPEDEF  300
-# define  TAO_PSDL_NATIVE 301
-# define  TAO_PSDL_PLUS 302
-# define  TAO_PSDL_MINUS  303
-# define  TAO_PSDL_XOR  304
-# define  TAO_PSDL_AND  305
-# define  TAO_PSDL_MULT 306
-# define  TAO_PSDL_RIGHT_SHIFT  307
-# define  TAO_PSDL_LEFT_SHIFT 308
-# define  TAO_PSDL_DIV  309
-# define  TAO_PSDL_PERCENT  310
-# define  TAO_PSDL_TILDA  311
-# define  TAO_PSDL_ONEWAY 312
-# define  TAO_PSDL_CONST  313
-# define  TAO_PSDL_EQUAL  314
-# define  TAO_PSDL_OR 315
-# define  TAO_PSDL_VOID 316
-# define  TAO_PSDL_IN 317
-# define  TAO_PSDL_OUT  318
-# define  TAO_PSDL_INOUT  319
-# define  TAO_PSDL_RAISES 320
-# define  TAO_PSDL_CONTEXT  321
-# define  TAO_PSDL_FIXED  322
-# define  TAO_PSDL_VALUEBASE  323
-# define  TAO_PSDL_EXCEPTION  324
-# define  TAO_PSDL_INTERFACE  325
-# define  TAO_PSDL_LOCAL  326
-# define  TAO_PSDL_DOUBLE_COLON 327
-# define  TAO_PSDL_VALUETYPE  328
-# define  TAO_PSDL_CUSTOM 329
-# define  TAO_PSDL_TRUNCATABLE  330
-# define  TAO_PSDL_SUPPORTS 331
-# define  TAO_PSDL_STRING 332
-# define  TAO_PSDL_WSTRING  333
-# define  TAO_PSDL_ATTRIBUTE  334
-# define  TAO_PSDL_OPEN_SQUARE_BRACE  335
-# define  TAO_PSDL_CLOSE_SQUARE_BRACE 336
-# define  TAO_PSDL_ENUM 337
-# define  TAO_PSDL_SEQUENCE 338
-# define  TAO_PSDL_TRUE 339
-# define  TAO_PSDL_FALSE  340
-# define  TAO_PSDL_INTEGER  341
-# define  TAO_PSDL_FLOATING 342
-# define  TAO_PSDL_PRIVATE  343
-# define  TAO_PSDL_PUBLIC 344
-# define  TAO_PSDL_FACTORY  345
-# define  TAO_PSDL_FLOATING_PT  346
-# define  TAO_PSDL_CHAR_LITERAL 347
-# define  TAO_PSDL_FIXED_PT 348
-
-#line 1 "PSDL.yy"
-
-// $Id$
-// ========================================================================
-//
-// = LIBRARY
-//   orbsvcs / Persistent State Definition Language parser.
-//
-// = FILENAME
-//   PSDL.yy
-//
-// = AUTHOR
-//   Priyanka Gontla <pgontla@doc.ece.uci.edu>
-//
-// ========================================================================
-
-#include "PSDL_y.h"
-#include "PSDL_Node.h"
-#include "PSDL_Interpreter.h"
-#include "PSDL_Scope.h"
-#include "PSDL_Module_Scope.h"
-
-#define YYPARSE_PARAM lex_state
-#define YYLEX_PARAM lex_state
-
-//extern int yylex (TAO_PSDL_Node **, void *);
-extern int yylex (void);
-
-static void yyerror (const char *error)
-{
-  ACE_OS::printf ("Error %s\n", error);
-}
-
-#ifndef YYSTYPE
-# define YYSTYPE int
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-
-
-#define YYFINAL   593
-#define YYFLAG    -32768
-#define YYNTBASE  95
-
-/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
-#define YYTRANSLATE(x) ((unsigned)(x) <= 348 ? yytranslate[x] : 262)
-
-/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
-static const char yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94
-};
-
-#if YYDEBUG
-static const short yyprhs[] =
-{
-       0,     0,     2,     5,     8,    11,    14,    17,    20,    23,
-      26,    29,    32,    35,    38,    39,    46,    48,    50,    55,
-      59,    63,    66,    70,    73,    75,    78,    81,    84,    87,
-      89,    93,    98,   102,   104,   106,   108,   110,   112,   118,
-     123,   125,   127,   131,   136,   140,   147,   153,   155,   158,
-     161,   164,   167,   170,   172,   176,   181,   185,   191,   194,
-     201,   207,   212,   218,   221,   223,   227,   229,   232,   235,
-     238,   242,   244,   246,   251,   255,   258,   263,   267,   271,
-     273,   276,   279,   282,   285,   288,   290,   293,   298,   301,
-     307,   312,   314,   316,   321,   326,   330,   337,   343,   349,
-     354,   356,   359,   362,   365,   368,   370,   373,   377,   381,
-     383,   386,   388,   390,   392,   395,   397,   400,   402,   404,
-     406,   408,   410,   412,   414,   416,   418,   420,   422,   424,
-     426,   428,   430,   432,   434,   436,   438,   440,   442,   444,
-     448,   450,   452,   454,   456,   460,   462,   464,   466,   469,
-     471,   473,   475,   477,   479,   481,   483,   486,   488,   490,
-     492,   495,   498,   502,   504,   506,   508,   510,   512,   514,
-     515,   522,   524,   527,   531,   541,   543,   545,   547,   549,
-     551,   553,   556,   560,   564,   567,   572,   576,   579,   585,
-     587,   589,   591,   593,   595,   597,   599,   601,   603,   605,
-     607,   609,   613,   615,   619,   621,   625,   627,   631,   635,
-     637,   641,   645,   647,   651,   655,   659,   662,   664,   666,
-     668,   670,   672,   674,   678,   681,   686,   690,   692,   699,
-     705,   711,   717,   722,   727,   731,   733,   735,   737,   741,
-     744,   748,   754,   756,   758,   760,   765,   772,   777,   779,
-     781,   783,   785,   792,   794,   796,   799,   802,   804,   806,
-     811,   815,   819,   823,   826,   829,   832,   835,   837,   841,
-     845,   848,   850,   853,   856,   859,   862,   865,   868,   871,
-     873,   877,   881,   883,   887,   889,   891,   893,   895,   897,
-     900,   903,   905,   908,   915,   921,   926,   930,   933,   936,
-     942,   947,   950,   954,   957,   962,   964,   969,   971,   974,
-     978,   983,   987,   993,   995,   999,  1006,  1011,  1013,  1015,
-    1017,  1019,  1021,  1023,  1025,  1027,  1029,  1031,  1033,  1035,
-    1037,  1039,  1041,  1043,  1045,  1047,  1051,  1053,  1055,  1057,
-    1062,  1067,  1074,  1080,  1082,  1086,  1090,  1092,  1094,  1098,
-    1102
-};
-static const short yyrhs[] =
-{
-      96,     0,    95,    96,     0,   150,     3,     0,   188,     3,
-       0,   201,     3,     0,   216,     3,     0,    97,     3,     0,
-     121,     3,     0,   141,     3,     0,   111,     3,     0,   127,
-       3,     0,    99,     3,     0,   227,     3,     0,     0,     4,
-     149,    98,     6,    95,     7,     0,   100,     0,   101,     0,
-     103,     6,   104,     7,     0,   103,     6,     7,     0,    10,
-      11,   149,     0,    11,   149,     0,    10,   102,   106,     0,
-      10,   102,     0,   105,     0,   105,   104,     0,   108,     3,
-       0,   119,     3,     0,     5,   107,     0,   225,     0,   225,
-      26,   107,     0,    28,    18,   109,   159,     0,    18,   109,
-     159,     0,   154,     0,   235,     0,   236,     0,   110,     0,
-     225,     0,    21,    22,    24,   107,    25,     0,    22,    24,
-     107,    25,     0,   113,     0,   112,     0,    10,    12,   149,
-       0,   114,     6,   115,     7,     0,   114,     6,     7,     0,
-      10,    12,   149,    23,   107,   117,     0,    10,    12,   149,
-      23,   107,     0,   116,     0,   116,   115,     0,   119,     3,
-       0,   120,     3,     0,   260,     3,     0,     5,   118,     0,
-     225,     0,   225,    26,   118,     0,   205,   202,   206,   209,
-       0,   205,   202,   206,     0,    27,   149,     8,   160,     9,
-       0,    27,   149,     0,    13,   149,   122,     6,   124,     7,
-       0,    13,   149,     6,   124,     7,     0,    13,   149,     6,
-       7,     0,    13,   149,   122,     6,     7,     0,     5,   123,
-       0,   225,     0,   225,    26,   123,     0,   125,     0,   125,
-     124,     0,   126,     3,     0,   119,     3,     0,    14,   118,
-     159,     0,   128,     0,   129,     0,   130,     6,   131,     7,
-       0,   130,     6,     7,     0,    11,   149,     0,    11,   149,
-     133,   135,     0,    11,   149,   133,     0,    11,   149,   135,
-       0,   132,     0,   132,   131,     0,   108,     3,     0,   138,
-       3,     0,   140,     3,     0,     5,   134,     0,   225,     0,
-      15,   107,     0,    22,    24,   134,    25,     0,    16,   146,
-       0,    17,   159,    19,   139,   137,     0,    17,   159,    19,
-     139,     0,   134,     0,   136,     0,    22,     8,   159,     9,
-       0,   142,     6,   143,     7,     0,   142,     6,     7,     0,
-      12,   149,    23,   134,   145,   147,     0,    12,   149,    23,
-     134,   145,     0,    12,   149,    23,   134,   147,     0,    12,
-     149,    23,   134,     0,   144,     0,   144,   143,     0,   120,
-       3,     0,   148,     3,     0,     5,   146,     0,   225,     0,
-      15,   118,     0,    20,    27,   149,     0,    20,    27,    22,
-       0,    45,     0,    46,   151,     0,   178,     0,   182,     0,
-     240,     0,    47,   159,     0,   215,     0,   152,   157,     0,
-     153,     0,   156,     0,   154,     0,   155,     0,   225,     0,
-     162,     0,   163,     0,   172,     0,   173,     0,   174,     0,
-     175,     0,   176,     0,   177,     0,   214,     0,   242,     0,
-     235,     0,   236,     0,   212,     0,   178,     0,   182,     0,
-     240,     0,   158,     0,   158,    26,   157,     0,   159,     0,
-     161,     0,   149,     0,   159,     0,   160,    26,   159,     0,
-     237,     0,    39,     0,    40,     0,    41,    40,     0,   164,
-       0,   168,     0,   165,     0,   166,     0,   167,     0,    42,
-       0,    41,     0,    41,    41,     0,   169,     0,   170,     0,
-     171,     0,    43,    42,     0,    43,    41,     0,    43,    41,
-      41,     0,    44,     0,    32,     0,    33,     0,    34,     0,
-      35,     0,    36,     0,     0,    37,   149,   179,     6,   180,
-       7,     0,   181,     0,   181,   180,     0,   152,   157,     3,
-       0,    29,   149,    30,     8,   183,     9,     6,   184,     7,
-       0,   163,     0,   172,     0,   174,     0,   240,     0,   225,
-       0,   185,     0,   185,   184,     0,   186,   187,     3,     0,
-      31,   190,     5,     0,    38,     5,     0,    31,   190,     5,
-     186,     0,    38,     5,   186,     0,   152,   158,     0,    59,
-     189,   149,    60,   190,     0,   163,     0,   172,     0,   173,
-       0,   174,     0,   162,     0,   235,     0,   236,     0,   213,
-       0,   225,     0,   175,     0,   191,     0,   192,     0,   191,
-      61,   192,     0,   193,     0,   192,    50,   193,     0,   194,
-       0,   193,    51,   194,     0,   195,     0,   194,    53,   195,
-       0,   194,    54,   195,     0,   196,     0,   195,    48,   196,
-       0,   195,    49,   196,     0,   197,     0,   196,    52,   197,
-       0,   196,    55,   197,     0,   196,    56,   197,     0,   198,
-     199,     0,   199,     0,    49,     0,    48,     0,    57,     0,
-     225,     0,   243,     0,     8,   190,     9,     0,    70,   149,
-       0,   200,     6,   180,     7,     0,   200,     6,     7,     0,
-     149,     0,   204,   205,   202,   206,   209,   210,     0,   205,
-     202,   206,   209,   210,     0,   204,   205,   202,   206,   209,
-       0,   204,   205,   202,   206,   210,     0,   205,   202,   206,
-     209,     0,   205,   202,   206,   210,     0,   205,   202,   206,
-       0,    58,     0,   211,     0,    62,     0,     8,   207,     9,
-       0,     8,     9,     0,   208,   211,   159,     0,   208,   211,
-     159,    26,   207,     0,    63,     0,    64,     0,    65,     0,
-      66,     8,   225,     9,     0,    66,     8,   225,    26,   226,
-       9,     0,    67,     8,   249,     9,     0,   154,     0,   235,
-       0,   236,     0,   225,     0,    68,    24,   259,    26,   259,
-      25,     0,    68,     0,    69,     0,    37,   149,     0,    29,
-     149,     0,   217,     0,   218,     0,   220,     6,   221,     7,
-       0,   220,     6,     7,     0,    10,    71,   149,     0,    72,
-      71,   149,     0,    71,   149,     0,    71,   149,     0,    10,
-     219,     0,    72,   219,     0,   219,     0,    10,   219,   223,
-       0,    72,   219,   223,     0,   219,   223,     0,   222,     0,
-     222,   221,     0,   150,     3,     0,   188,     3,     0,   201,
-       3,     0,   239,     3,     0,   203,     3,     0,     5,   224,
-       0,   225,     0,   225,    26,   224,     0,   149,    73,   225,
-       0,   149,     0,   149,    26,   226,     0,   149,     0,   232,
-       0,   231,     0,   230,     0,   229,     0,    74,   149,     0,
-      10,   228,     0,   228,     0,   228,   152,     0,    10,   228,
-     234,     6,   222,     7,     0,    10,   228,     6,   222,     7,
-       0,   233,     6,   253,     7,     0,    75,   228,   234,     0,
-     228,   234,     0,    75,   228,     0,     5,    76,   252,    77,
-     224,     0,     5,   252,    77,   224,     0,    77,   224,     0,
-       5,    76,   252,     0,     5,   252,     0,    78,    24,   259,
-      25,     0,    78,     0,    79,    24,   259,    25,     0,    79,
-       0,   149,   238,     0,    81,   259,    82,     0,    28,    80,
-     211,   159,     0,    80,   211,   159,     0,    83,   149,     6,
-     241,     7,     0,   149,     0,   149,    26,   241,     0,    84,
-      24,   153,    26,   259,    25,     0,    84,    24,   153,    25,
-       0,   245,     0,   249,     0,   250,     0,   247,     0,   248,
-       0,   251,     0,   246,     0,   244,     0,    85,     0,    86,
-       0,    87,     0,    92,     0,    93,     0,    32,     0,    78,
-       0,    79,     0,    94,     0,   225,     0,   225,    26,   252,
-       0,   222,     0,   254,     0,   255,     0,    90,   152,   157,
-       3,     0,    89,   152,   157,     3,     0,    91,   149,     8,
-     256,     9,     3,     0,    91,   149,     8,     9,     3,     0,
-     257,     0,   257,    26,   256,     0,   258,   211,   159,     0,
-      63,     0,   190,     0,    91,   149,   261,     0,     8,   159,
-       9,     0,     8,     9,     0
-};
-
-#endif
-
-#if YYDEBUG
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const short yyrline[] =
-{
-       0,    78,    80,    85,    87,    90,    93,    96,    99,   102,
-     105,   108,   111,   114,   119,   119,   131,   134,   139,   141,
-     146,   150,   160,   163,   168,   171,   176,   179,   184,   189,
-     192,   197,   199,   204,   206,   209,   212,   215,   220,   223,
-     228,   230,   235,   240,   243,   248,   251,   256,   259,   264,
-     267,   270,   275,   280,   283,   288,   291,   297,   299,   304,
-     306,   309,   312,   317,   321,   323,   328,   330,   335,   337,
-     342,   346,   348,   353,   355,   360,   364,   366,   369,   374,
-     376,   381,   383,   386,   391,   395,   399,   403,   407,   411,
-     413,   418,   421,   426,   430,   432,   437,   439,   442,   445,
-     450,   452,   457,   459,   464,   468,   472,   476,   478,   483,
-     487,   489,   492,   495,   498,   501,   506,   510,   512,   517,
-     519,   522,   527,   529,   532,   535,   538,   541,   544,   547,
-     550,   555,   557,   560,   563,   568,   570,   573,   578,   580,
-     585,   587,   592,   596,   598,   603,   607,   609,   612,   617,
-     619,   624,   626,   629,   634,   638,   642,   646,   648,   651,
-     656,   660,   664,   668,   672,   676,   680,   684,   688,   692,
-     692,   705,   707,   712,   716,   720,   722,   725,   728,   731,
-     736,   738,   743,   747,   749,   752,   755,   760,   764,   768,
-     770,   773,   776,   779,   782,   785,   788,   791,   794,   799,
-     803,   805,   810,   812,   817,   819,   824,   826,   829,   834,
-     836,   839,   844,   846,   849,   852,   857,   859,   864,   866,
-     869,   874,   876,   879,   884,   893,   898,   906,   917,   920,
-     924,   928,   932,   936,   940,   946,   950,   952,   957,   959,
-     964,   966,   971,   973,   976,   981,   983,   988,   992,   994,
-     997,  1000,  1005,  1009,  1013,  1017,  1019,  1024,  1026,  1031,
-    1036,  1044,  1046,  1049,  1054,  1064,  1066,  1069,  1072,  1075,
-    1078,  1083,  1085,  1090,  1092,  1095,  1098,  1101,  1106,  1111,
-    1113,  1118,  1120,  1125,  1127,  1132,  1134,  1137,  1140,  1145,
-    1149,  1151,  1156,  1160,  1162,  1167,  1171,  1173,  1176,  1181,
-    1183,  1186,  1189,  1192,  1198,  1200,  1205,  1207,  1212,  1216,
-    1220,  1222,  1227,  1231,  1233,  1238,  1240,  1245,  1247,  1250,
-    1253,  1256,  1259,  1262,  1265,  1270,  1272,  1277,  1281,  1285,
-    1289,  1293,  1297,  1301,  1305,  1307,  1312,  1314,  1317,  1322,
-    1324,  1329,  1331,  1336,  1338,  1343,  1347,  1351,  1355,  1359,
-    1361
-};
-#endif
-
-
-#if (YYDEBUG) || defined YYERROR_VERBOSE
-
-/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
-static const char *const yytname[] =
-{
-  "$", "error", "$undefined.", "TAO_PSDL_SEMI", "TAO_PSDL_MODULE",
-  "TAO_PSDL_COLON", "TAO_PSDL_OPEN_CURLY_BRACE",
-  "TAO_PSDL_CLOSE_CURLY_BRACE", "TAO_PSDL_OPEN_BRACE",
-  "TAO_PSDL_CLOSE_BRACE", "TAO_PSDL_ABSTRACT", "TAO_PSDL_STORAGETYPE",
-  "TAO_PSDL_STORAGEHOME", "TAO_PSDL_CATALOG", "TAO_PSDL_PROVIDES",
-  "TAO_PSDL_IMPLEMENTS", "TAO_PSDL_SCOPE", "TAO_PSDL_STORES",
-  "TAO_PSDL_STATE", "TAO_PSDL_AS", "TAO_PSDL_PRIMARY", "TAO_PSDL_STRONG",
-  "TAO_PSDL_REF", "TAO_PSDL_OF", "TAO_PSDL_OPEN_ANGULAR_BRACE",
-  "TAO_PSDL_CLOSE_ANGULAR_BRACE", "TAO_PSDL_COMMA", "TAO_PSDL_KEY",
-  "TAO_PSDL_READONLY", "TAO_PSDL_UNION", "TAO_PSDL_SWITCH",
-  "TAO_PSDL_CASE", "TAO_PSDL_WCHAR", "TAO_PSDL_BOOLEAN", "TAO_PSDL_OCTET",
-  "TAO_PSDL_ANY", "TAO_PSDL_OBJECT", "TAO_PSDL_STRUCT",
-  "TAO_PSDL_DEFAULT", "TAO_PSDL_FLOAT", "TAO_PSDL_DOUBLE",
-  "TAO_PSDL_LONG", "TAO_PSDL_SHORT", "TAO_PSDL_UNSIGNED", "TAO_PSDL_CHAR",
-  "TAO_PSDL_IDENT", "TAO_PSDL_TYPEDEF", "TAO_PSDL_NATIVE",
-  "TAO_PSDL_PLUS", "TAO_PSDL_MINUS", "TAO_PSDL_XOR", "TAO_PSDL_AND",
-  "TAO_PSDL_MULT", "TAO_PSDL_RIGHT_SHIFT", "TAO_PSDL_LEFT_SHIFT",
-  "TAO_PSDL_DIV", "TAO_PSDL_PERCENT", "TAO_PSDL_TILDA", "TAO_PSDL_ONEWAY",
-  "TAO_PSDL_CONST", "TAO_PSDL_EQUAL", "TAO_PSDL_OR", "TAO_PSDL_VOID",
-  "TAO_PSDL_IN", "TAO_PSDL_OUT", "TAO_PSDL_INOUT", "TAO_PSDL_RAISES",
-  "TAO_PSDL_CONTEXT", "TAO_PSDL_FIXED", "TAO_PSDL_VALUEBASE",
-  "TAO_PSDL_EXCEPTION", "TAO_PSDL_INTERFACE", "TAO_PSDL_LOCAL",
-  "TAO_PSDL_DOUBLE_COLON", "TAO_PSDL_VALUETYPE", "TAO_PSDL_CUSTOM",
-  "TAO_PSDL_TRUNCATABLE", "TAO_PSDL_SUPPORTS", "TAO_PSDL_STRING",
-  "TAO_PSDL_WSTRING", "TAO_PSDL_ATTRIBUTE", "TAO_PSDL_OPEN_SQUARE_BRACE",
-  "TAO_PSDL_CLOSE_SQUARE_BRACE", "TAO_PSDL_ENUM", "TAO_PSDL_SEQUENCE",
-  "TAO_PSDL_TRUE", "TAO_PSDL_FALSE", "TAO_PSDL_INTEGER",
-  "TAO_PSDL_FLOATING", "TAO_PSDL_PRIVATE", "TAO_PSDL_PUBLIC",
-  "TAO_PSDL_FACTORY", "TAO_PSDL_FLOATING_PT", "TAO_PSDL_CHAR_LITERAL",
-  "TAO_PSDL_FIXED_PT", "psdl_specification", "psdl_definition",
-  "psdl_module", "@1", "abstract_storagetype", "abstract_storagetype_dcl",
-  "abstract_storagetype_fwd_dcl", "storagetype_identifier",
-  "abstract_storagetype_header", "abstract_storagetype_body",
-  "abstract_storagetype_member", "abstract_storagetype_inh_spec",
-  "abstract_storagetype_name", "psdl_state_dcl", "psdl_state_type_spec",
-  "abstract_storagetype_ref_type", "abstract_storagehome",
-  "abstract_storagehome_fwd_dcl", "abstract_storagehome_dcl",
-  "abstract_storagehome_header", "abstract_storagehome_body",
-  "abstract_storagehome_member", "abstract_storagehome_inh_spec",
-  "abstract_storagehome_name", "local_op_dcl", "key_dcl", "catalog",
-  "catalog_inh_spec", "catalog_name", "catalog_body", "catalog_member",
-  "provides_dcl", "storagetype", "storagetype_dcl", "storagetype_fwd_dcl",
-  "storagetype_header", "storagetype_body", "storagetype_member",
-  "storagetype_inh_spec", "storagetype_name", "storagetype_impl_spec",
-  "storagetype_ref_type", "storagehome_scope", "store_directive",
-  "psdl_concrete_state_type", "ref_rep_directive", "storagehome",
-  "storagehome_header", "storagehome_body", "storagehome_member",
-  "storagehome_inh_spec", "storagehome_name", "storagehome_impl_spec",
-  "primary_key_dcl", "identifier", "type_dcl", "type_declarator",
-  "type_spec", "simple_type_spec", "base_type_spec", "template_type_spec",
-  "constr_type_spec", "declarators", "declarator", "simple_declarator",
-  "simple_declarator_list", "complex_declarator", "floating_pt_type",
-  "integer_type", "signed_int", "signed_short_int", "signed_long_int",
-  "signed_longlong_int", "unsigned_int", "unsigned_short_int",
-  "unsigned_long_int", "unsigned_longlong_int", "char_type",
-  "wide_char_type", "boolean_type", "octet_type", "any_type",
-  "object_type", "struct_type", "@2", "member_list", "member",
-  "union_type", "switch_type_spec", "switch_body", "case", "case_label",
-  "element_spec", "const_dcl", "const_type", "const_exp", "or_expr",
-  "xor_expr", "and_expr", "shift_expr", "add_expr", "mult_expr",
-  "unary_expr", "unary_operator", "primary_expr", "except_header",
-  "except_dcl", "op_name", "op_dcl", "op_attribute", "op_type_spec",
-  "parameter_dcls", "param_dcl", "param_attribute", "raises_expr",
-  "context_expr", "param_type_spec", "fixed_pt_type",
-  "fixed_pt_const_type", "value_base_type", "constr_forward_decl",
-  "interface", "interface_dcl", "forward_dcl", "interface_identifier",
-  "interface_header", "interface_body", "export",
-  "interface_inheritance_spec", "interface_name", "scoped_name",
-  "comma_scoped_name", "value", "value_common_base", "value_forward_dcl",
-  "value_box_dcl", "value_abs_dcl", "value_dcl", "value_header",
-  "value_inheritance_spec", "string_type", "wide_string_type",
-  "array_declarator", "fixed_array_size", "attr_dcl", "enum_type",
-  "enumerator", "sequence_type", "literal", "boolean_literal",
-  "integer_literal", "floating_pt_literal", "character_literal",
-  "wide_character_literal", "string_literal", "wide_string_literal",
-  "fixed_pt_literal", "value_name", "value_element", "state_member",
-  "init_dcl", "init_param_decls", "init_param_decl",
-  "init_param_attribute", "positive_int_const", "factory_dcl",
-  "factory_parameters", 0
-};
-#endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const short yyr1[] =
-{
-       0,    95,    95,    96,    96,    96,    96,    96,    96,    96,
-      96,    96,    96,    96,    98,    97,    99,    99,   100,   100,
-     101,   102,   103,   103,   104,   104,   105,   105,   106,   107,
-     107,   108,   108,   109,   109,   109,   109,   109,   110,   110,
-     111,   111,   112,   113,   113,   114,   114,   115,   115,   116,
-     116,   116,   117,   118,   118,   119,   119,   120,   120,   121,
-     121,   121,   121,   122,   123,   123,   124,   124,   125,   125,
-     126,   127,   127,   128,   128,   129,   130,   130,   130,   131,
-     131,   132,   132,   132,   133,   134,   135,   136,   137,   138,
-     138,   139,   139,   140,   141,   141,   142,   142,   142,   142,
-     143,   143,   144,   144,   145,   146,   147,   148,   148,   149,
-     150,   150,   150,   150,   150,   150,   151,   152,   152,   153,
-     153,   153,   154,   154,   154,   154,   154,   154,   154,   154,
-     154,   155,   155,   155,   155,   156,   156,   156,   157,   157,
-     158,   158,   159,   160,   160,   161,   162,   162,   162,   163,
-     163,   164,   164,   164,   165,   166,   167,   168,   168,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   179,
-     178,   180,   180,   181,   182,   183,   183,   183,   183,   183,
-     184,   184,   185,   186,   186,   186,   186,   187,   188,   189,
-     189,   189,   189,   189,   189,   189,   189,   189,   189,   190,
-     191,   191,   192,   192,   193,   193,   194,   194,   194,   195,
-     195,   195,   196,   196,   196,   196,   197,   197,   198,   198,
-     198,   199,   199,   199,   200,   201,   201,   202,   203,   203,
-     203,   203,   203,   203,   203,   204,   205,   205,   206,   206,
-     207,   207,   208,   208,   208,   209,   209,   210,   211,   211,
-     211,   211,   212,   213,   214,   215,   215,   216,   216,   217,
-     217,   218,   218,   218,   219,   220,   220,   220,   220,   220,
-     220,   221,   221,   222,   222,   222,   222,   222,   223,   224,
-     224,   225,   225,   226,   226,   227,   227,   227,   227,   228,
-     229,   229,   230,   231,   231,   232,   233,   233,   233,   234,
-     234,   234,   234,   234,   235,   235,   236,   236,   237,   238,
-     239,   239,   240,   241,   241,   242,   242,   243,   243,   243,
-     243,   243,   243,   243,   243,   244,   244,   245,   246,   247,
-     248,   249,   250,   251,   252,   252,   253,   253,   253,   254,
-     254,   255,   255,   256,   256,   257,   258,   259,   260,   261,
-     261
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const short yyr2[] =
-{
-       0,     1,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     0,     6,     1,     1,     4,     3,
-       3,     2,     3,     2,     1,     2,     2,     2,     2,     1,
-       3,     4,     3,     1,     1,     1,     1,     1,     5,     4,
-       1,     1,     3,     4,     3,     6,     5,     1,     2,     2,
-       2,     2,     2,     1,     3,     4,     3,     5,     2,     6,
-       5,     4,     5,     2,     1,     3,     1,     2,     2,     2,
-       3,     1,     1,     4,     3,     2,     4,     3,     3,     1,
-       2,     2,     2,     2,     2,     1,     2,     4,     2,     5,
-       4,     1,     1,     4,     4,     3,     6,     5,     5,     4,
-       1,     2,     2,     2,     2,     1,     2,     3,     3,     1,
-       2,     1,     1,     1,     2,     1,     2,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
-       1,     1,     1,     1,     3,     1,     1,     1,     2,     1,
-       1,     1,     1,     1,     1,     1,     2,     1,     1,     1,
-       2,     2,     3,     1,     1,     1,     1,     1,     1,     0,
-       6,     1,     2,     3,     9,     1,     1,     1,     1,     1,
-       1,     2,     3,     3,     2,     4,     3,     2,     5,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     3,     1,     3,     1,     3,     1,     3,     3,     1,
-       3,     3,     1,     3,     3,     3,     2,     1,     1,     1,
-       1,     1,     1,     3,     2,     4,     3,     1,     6,     5,
-       5,     5,     4,     4,     3,     1,     1,     1,     3,     2,
-       3,     5,     1,     1,     1,     4,     6,     4,     1,     1,
-       1,     1,     6,     1,     1,     2,     2,     1,     1,     4,
-       3,     3,     3,     2,     2,     2,     2,     1,     3,     3,
-       2,     1,     2,     2,     2,     2,     2,     2,     2,     1,
-       3,     3,     1,     3,     1,     1,     1,     1,     1,     2,
-       2,     1,     2,     6,     5,     4,     3,     2,     2,     5,
-       4,     2,     3,     2,     4,     1,     4,     1,     2,     3,
-       4,     3,     5,     1,     3,     6,     4,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     3,     1,     1,     1,     4,
-       4,     6,     5,     1,     3,     3,     1,     1,     3,     3,
-       2
-};
-
-/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
-   doesn't specify something else to do.  Zero means the default is an
-   error. */
-static const short yydefact[] =
-{
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     1,     0,
-       0,    16,    17,     0,     0,    41,    40,     0,     0,     0,
-      71,    72,     0,     0,     0,     0,   111,   112,     0,     0,
-       0,   115,     0,   257,   258,   267,     0,     0,   291,   288,
-     287,   286,   285,     0,   113,   109,    14,     0,     0,     0,
-      23,   265,   290,    75,     0,     0,   256,   169,     0,   164,
-     165,   166,   167,   168,     0,   146,   147,   155,   154,     0,
-     163,     0,   254,   305,   307,     0,   282,   110,     0,   117,
-     119,   120,   118,   122,   123,   149,   151,   152,   153,   150,
-     157,   158,   159,   124,   125,   126,   127,   128,   129,   135,
-     136,   134,   130,   121,   132,   133,   137,   131,   142,   114,
-     253,   193,   189,   190,   191,   192,   198,     0,   196,   197,
-     194,   195,   224,   264,     0,   266,   289,   298,     0,     2,
-       7,    12,     0,    10,     0,     8,    11,     0,     9,     0,
-       3,     4,     0,     5,     6,     0,   270,     0,    13,     0,
-       0,   292,   297,     0,     0,    21,    42,   264,     0,    22,
-     268,     0,     0,     0,     0,    77,    78,     0,     0,     0,
-       0,     0,     0,     0,   169,   148,   156,   161,   160,     0,
-       0,     0,     0,     0,   142,   116,   138,   140,   141,   145,
-       0,   264,   269,   296,     0,    19,     0,     0,   237,     0,
-      24,     0,     0,   248,     0,   236,   251,   249,   250,    44,
-       0,     0,     0,    47,     0,     0,     0,    74,     0,     0,
-       0,     0,    79,     0,     0,    95,     0,     0,     0,   100,
-       0,   226,     0,     0,   171,   278,   279,   260,     0,   235,
-       0,     0,     0,     0,     0,     0,     0,     0,   271,     0,
-       0,   334,   303,   301,     0,     0,     0,   336,     0,   337,
-     338,     0,     0,    28,    29,     0,     0,    84,    85,    86,
-      76,    99,    63,    64,    61,     0,     0,     0,    66,     0,
-       0,     0,     0,   162,     0,   330,   219,   218,   220,   331,
-     332,   325,   326,   327,   328,   329,   333,   347,   199,   200,
-     202,   204,   206,   209,   212,     0,   217,   221,   222,   324,
-     317,   323,   320,   321,   318,   319,   322,     0,     0,     0,
-       0,   281,     0,   308,     0,     0,   313,     0,     0,     0,
-       0,    36,    33,    37,    34,    35,     0,    18,    25,    26,
-      27,   227,     0,    58,     0,    43,    48,    49,    50,    51,
-       0,     0,    81,    73,    80,    82,    83,     0,   102,    94,
-     101,   103,     0,   225,   172,     0,     0,     0,   273,   274,
-     275,   277,     0,     0,   259,   272,   276,   302,     0,     0,
-       0,     0,     0,   295,     0,    46,     0,   294,     0,     0,
-       0,    97,    98,     0,     0,    53,    69,    60,    67,    68,
-      62,     0,   155,   175,   176,   177,     0,   179,   178,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   216,     0,   304,   306,   316,     0,     0,   139,   188,
-       0,   312,     0,     0,    32,     0,     0,    56,     0,     0,
-     348,     0,     0,   108,   107,   173,   280,     0,   311,     0,
-     234,     0,   335,   300,     0,     0,     0,    15,     0,    45,
-      30,   293,   104,   105,   106,    96,    65,    70,     0,    59,
-       0,   170,   223,   201,   203,   205,   207,   208,   210,   211,
-     213,   214,   215,     0,     0,   309,   314,     0,     0,    31,
-     239,   242,   243,   244,     0,     0,     0,    55,   143,     0,
-     350,     0,     0,    91,    92,    90,    93,   310,     0,     0,
-     232,   233,   299,   340,   339,     0,   346,     0,   343,     0,
-      52,    54,     0,   252,   315,     0,    39,   238,     0,     0,
-      57,     0,   349,     0,     0,    89,   230,   231,     0,   229,
-     342,     0,     0,     0,     0,     0,     0,   180,     0,    38,
-     240,     0,   144,     0,    88,   228,     0,   341,   344,   345,
-       0,   184,   174,   181,     0,     0,     0,   245,     0,    87,
-     247,   183,   186,   187,   182,   241,   284,     0,   185,     0,
-     246,   283,     0,     0
-};
-
-static const short yydefgoto[] =
-{
-      17,    18,    19,   164,    20,    21,    22,    60,    23,   209,
-     210,   169,   273,   211,   340,   341,    24,    25,    26,    27,
-     222,   223,   469,   404,   286,   225,    28,   180,   282,   287,
-     288,   289,    29,    30,    31,    32,   231,   232,   175,   277,
-     176,   514,   545,   233,   515,   234,    33,    34,   238,   239,
-     401,   472,   402,   240,    86,   251,    87,   242,    89,   213,
-      91,    92,   195,   196,   197,   509,   198,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,    36,   182,   243,   244,    37,   416,   556,
-     557,   558,   575,   252,   127,   307,   308,   309,   310,   311,
-     312,   313,   314,   315,   316,    39,   253,   352,   254,   255,
-     214,   447,   504,   505,   507,   521,   215,   111,   128,   112,
-      41,    42,    43,    44,    45,    46,   257,   258,   156,   245,
-     317,   587,    47,    48,    49,    50,    51,    52,    53,   162,
-     217,   218,   199,   333,   259,    54,   337,   117,   318,   319,
-     320,   321,   322,   323,   324,   325,   326,   262,   268,   269,
-     270,   527,   528,   529,   327,   226,   450
-};
-
-static const short yypact[] =
-{
-     671,    66,    84,    66,    66,    66,    66,    66,  1142,    66,
-    1060,    66,    66,     1,    66,    44,    66,   553,-32768,    87,
-     129,-32768,-32768,   151,   175,-32768,-32768,   153,   209,   218,
-  -32768,-32768,   234,   246,   244,   251,-32768,-32768,   254,   252,
-     256,-32768,   258,-32768,-32768,   176,   257,   261,   608,-32768,
-  -32768,-32768,-32768,   262,-32768,-32768,-32768,    66,    66,    66,
-     268,   176,    43,    69,   259,   131,   245,   271,    66,-32768,
-  -32768,-32768,-32768,-32768,    66,-32768,-32768,   152,-32768,   174,
-  -32768,   255,-32768,   274,   282,   289,   243,-32768,    66,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,    66,-32768,-32768,
-  -32768,-32768,-32768,   314,    66,   176,-32768,    35,   317,-32768,
-  -32768,-32768,   798,-32768,   442,-32768,-32768,   189,-32768,   146,
-  -32768,-32768,   724,-32768,-32768,    66,-32768,   742,-32768,    18,
-      66,-32768,-32768,   979,   319,   323,   297,   324,    66,-32768,
-  -32768,  1090,   325,    66,    66,   315,-32768,    66,    66,   839,
-     328,   330,   334,   245,-32768,-32768,-32768,   302,-32768,   372,
-     372,   372,  1122,    66,   263,-32768,   320,-32768,-32768,-32768,
-     285,   344,-32768,-32768,    66,-32768,  1042,   331,-32768,   341,
-    1011,   347,   348,-32768,    66,-32768,-32768,-32768,-32768,-32768,
-      66,    66,   345,   926,   350,   351,   352,-32768,    66,   349,
-     353,   354,   208,   356,   359,-32768,   337,   362,   360,    89,
-     367,-32768,    66,   364,  1142,-32768,   346,-32768,   293,-32768,
-    1209,   371,   374,   376,   379,  1195,    66,   368,  1090,   380,
-      66,   358,   308,-32768,  1142,  1142,    66,-32768,   385,-32768,
-  -32768,   671,    66,-32768,   369,   387,  1090,-32768,-32768,-32768,
-  -32768,   172,-32768,   370,-32768,    66,   383,   391,   895,   396,
-     854,   105,  1142,-32768,   372,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   355,   357,
-     363,   180,   190,   143,-32768,    36,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,   384,   377,   381,
-     217,-32768,   372,-32768,    66,   372,   398,   402,   403,   404,
-      66,-32768,-32768,-32768,-32768,-32768,  1042,-32768,-32768,-32768,
-  -32768,-32768,   397,   418,   419,-32768,-32768,-32768,-32768,-32768,
-     411,    66,-32768,-32768,-32768,-32768,-32768,    54,-32768,-32768,
-  -32768,-32768,   428,-32768,-32768,    66,  1209,    66,-32768,-32768,
-  -32768,-32768,    66,   397,-32768,-32768,-32768,   361,    66,    66,
-      66,    66,   424,-32768,   651,   430,    66,-32768,   426,    66,
-      66,   421,-32768,    66,    66,   414,-32768,-32768,-32768,-32768,
-  -32768,   434,   401,-32768,-32768,-32768,   436,-32768,-32768,   439,
-     443,   372,   372,   372,   372,   372,   372,   372,   372,   372,
-     372,-32768,   372,-32768,-32768,-32768,   372,   378,-32768,-32768,
-      66,-32768,   413,    66,-32768,    66,    80,   388,    66,    53,
-  -32768,    58,   444,-32768,-32768,-32768,-32768,    66,-32768,   397,
-     178,    66,-32768,-32768,   440,   459,    37,-32768,    66,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    66,-32768,
-     461,-32768,-32768,   357,   363,   180,   190,   190,   143,   143,
-  -32768,-32768,-32768,   445,   446,-32768,-32768,    66,   447,-32768,
-  -32768,-32768,-32768,-32768,   470,  1209,   460,-32768,-32768,   115,
-  -32768,   479,   465,-32768,-32768,   475,-32768,-32768,   178,   484,
-     427,-32768,-32768,-32768,-32768,   490,-32768,   486,   471,  1209,
-  -32768,-32768,   132,-32768,-32768,   473,-32768,-32768,    66,    66,
-  -32768,    66,-32768,    66,    66,-32768,   427,-32768,   422,-32768,
-  -32768,   493,   438,    66,   372,   494,   496,   132,  1142,-32768,
-     481,   156,-32768,   483,-32768,-32768,   501,-32768,-32768,-32768,
-     507,   132,-32768,-32768,    66,   510,   137,-32768,    66,-32768,
-  -32768,   132,-32768,-32768,-32768,-32768,   489,   509,-32768,    66,
-  -32768,-32768,   516,-32768
-};
-
-static const short yypgoto[] =
-{
-     248,   -16,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   312,
-  -32768,-32768,  -165,  -126,   177,-32768,-32768,-32768,-32768,-32768,
-     301,-32768,-32768,  -377,   -83,  -131,-32768,-32768,   122,  -202,
-  -32768,-32768,-32768,-32768,-32768,-32768,   294,-32768,-32768,  -150,
-     373,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   288,-32768,
-  -32768,   -15,   127,-32768,    -1,    19,-32768,    29,   338,    77,
-  -32768,-32768,  -230,   -43,    57,-32768,-32768,   522,     4,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,    21,   524,    31,
-     525,-32768,-32768,    27,-32768,  -190,-32768,    71,-32768,   -21,
-  -32768,  -387,-32768,    25,-32768,  -243,-32768,   117,   120,   116,
-    -177,  -174,  -220,-32768,   228,-32768,    28,  -240,-32768,-32768,
-    -124,  -354,   -32,-32768,  -408,  -449,  -200,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,   149,-32768,   287,  -137,   -18,  -143,
-      12,   -42,-32768,    63,-32768,-32768,-32768,-32768,-32768,   -24,
-      22,    45,-32768,-32768,-32768,    16,   106,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,     2,-32768,-32768,  -253,-32768,-32768,
-  -32768,    -3,-32768,-32768,  -108,-32768,-32768
-};
-
-
-#define YYLAST    1288
-
-
-static const short yytable[] =
-{
-      56,   139,    63,    64,    65,    66,    67,   387,   118,   279,
-     132,   133,   372,   136,   122,   138,   383,   263,   237,    35,
-     113,   230,   129,   474,   116,    38,   267,   281,    40,   460,
-     114,   123,   130,   256,   275,   109,    35,    88,   172,   256,
-     159,   125,    38,   170,   294,    40,   525,   256,   159,   171,
-     377,   420,   520,   115,   374,   131,   165,   166,   167,   212,
-     113,   224,   510,    55,   116,    62,   119,   183,   295,   547,
-     114,   549,   134,   184,   173,   109,   453,   161,   137,   110,
-     512,    55,   328,   329,   174,    90,   408,   194,   411,   500,
-     140,   530,   439,   115,   260,    57,    58,   565,    55,    55,
-     526,   531,   419,    55,   438,   518,   230,   395,   237,   236,
-     546,    55,   160,   203,   299,   300,   220,   202,    14,   110,
-     160,   301,   302,   303,   540,    90,   200,   212,   304,   305,
-     306,   382,   141,   201,   256,   462,   178,   179,    70,   398,
-     224,   541,   459,   501,   502,   503,   412,    78,    79,    80,
-      55,    61,   256,   235,   216,    59,   216,   142,    14,   144,
-     464,   465,   135,   554,   113,   577,   236,   246,   116,   216,
-     555,   261,   246,   220,   114,   216,   457,   399,   143,   109,
-     274,   155,   578,   216,   582,   278,   274,   400,    16,   278,
-     283,   216,   185,   186,   588,   428,   227,   115,   429,   430,
-     501,   502,   503,   336,   113,   331,   228,   206,   490,   491,
-     492,   229,   145,   351,   114,   187,   188,   207,   343,   353,
-     354,   146,   216,   110,   437,   228,   206,   118,   344,    90,
-     229,   470,   456,   424,   425,   216,   207,   115,   426,   427,
-     147,   194,   435,   436,   506,   519,   463,   486,   487,   148,
-     149,   345,   488,   489,   150,   351,   113,   151,   152,   153,
-     116,   154,   216,   157,   158,   392,   114,   216,   163,    90,
-     216,   109,   261,   168,  -255,   181,   113,   113,   498,   189,
-     116,   116,   177,   342,   274,   360,   114,   114,   216,   115,
-      35,   109,   109,   390,   391,   413,    38,   405,   190,    40,
-     216,   513,   216,   417,   113,   538,   191,   418,   116,   115,
-     115,   570,   414,   192,   114,   110,   193,  -263,   522,   109,
-     272,    90,   415,   204,   493,   271,   -20,  -261,   494,   553,
-     174,   276,   535,   194,   290,   110,   110,   115,   291,   118,
-     292,    90,    90,   293,   332,   335,   334,  -262,   347,   346,
-     349,   350,   355,   357,   358,   359,   362,   361,   343,   365,
-     118,   363,   366,   110,   367,   368,   454,   369,   344,    90,
-     371,   373,   375,   376,   378,   384,   118,   379,   139,   380,
-     294,   351,   381,   386,   388,   389,   406,   246,   216,   194,
-     194,   345,   393,   563,   397,   396,   403,   444,   407,   409,
-     261,   246,   433,   118,   295,   446,   434,   422,   274,   441,
-     432,   473,   405,    35,   423,   283,   421,    55,   452,    38,
-     296,   297,    40,   342,   440,   442,   448,   449,   443,   298,
-     451,   455,   466,   471,   458,   468,   400,   497,   461,   336,
-     478,   479,   186,   523,   118,   480,   481,   118,   118,   219,
-     299,   300,   482,   516,   506,   274,   118,   301,   302,   303,
-     495,   477,   524,   278,   304,   305,   306,   532,   539,   220,
-     533,   534,   536,   246,    69,    70,    71,    72,    73,   537,
-     405,    75,    76,    77,    78,    79,    80,    55,   542,   543,
-     405,   544,   548,   550,   519,   551,   567,   552,   559,   571,
-     299,   526,   499,   572,   208,   508,   511,   576,   579,   274,
-     580,    82,   581,   584,   517,   589,   593,   216,   590,   394,
-      83,    84,   348,   445,   356,   476,   364,   370,   475,   564,
-     330,   583,   121,   221,   124,   126,   573,   118,   483,   485,
-     118,   216,   484,   431,   585,   385,   496,   591,   280,   568,
-     566,   561,   118,   592,     0,   278,   473,     1,     0,     0,
-       0,     0,     0,     2,     3,     4,     5,     0,     0,     0,
-     113,     0,     0,   194,   116,     0,     0,   586,     0,     0,
-     114,     0,     6,     0,     0,   109,     0,   574,   586,     0,
-       7,     0,     0,     0,     0,   560,     0,     0,   562,     8,
-       9,     0,     0,   115,     0,     0,     0,     0,     0,     0,
-     569,     0,    10,   159,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    11,    12,    13,     0,    14,    15,   110,
-       0,     0,     0,     0,     0,    90,    16,    68,     0,     0,
-      69,    70,    71,    72,    73,    74,     0,    75,    76,    77,
-      78,    79,    80,    55,     0,     1,     0,     0,   467,     0,
-       0,     2,     3,     4,     5,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     1,    81,    82,     0,     0,
-       6,     2,     3,     4,     5,   160,    83,    84,     7,     0,
-       0,    16,    85,     0,     0,     0,     0,     8,     9,     0,
-       6,     0,     0,     0,     0,     0,     0,     0,     7,     0,
-      10,     0,     0,     0,     0,     0,     0,     8,     9,     0,
-       0,    11,    12,    13,     0,    14,    15,     0,     0,     0,
-      10,   241,     0,     0,    16,     0,     0,     0,     0,     0,
-       0,    11,    12,    13,     0,    14,    15,     0,     0,   247,
-       0,     0,     0,    68,    16,     0,    69,    70,    71,    72,
-      73,    74,     0,    75,    76,    77,    78,    79,    80,    55,
-     248,     6,     0,     0,    69,    70,    71,    72,    73,     7,
-       0,    75,    76,    77,    78,    79,    80,    55,     8,     9,
-       0,     0,    81,    82,     0,     0,     0,     0,     0,     0,
-     249,    10,    83,    84,   208,   205,     0,    16,    85,     0,
-       0,    82,    11,     0,     0,     0,   206,     0,     0,     0,
-      83,    84,   250,     0,     0,    16,   207,     0,     0,     0,
-      69,    70,    71,    72,    73,     0,     0,    75,    76,    77,
-      78,    79,    80,    55,     0,     0,   284,     0,     0,     0,
-       0,     0,     0,   285,     0,     0,     0,     0,     0,     0,
-     208,   410,     0,     0,     0,     0,     0,    82,   285,     0,
-       0,    69,    70,    71,    72,    73,    83,    84,    75,    76,
-      77,    78,    79,    80,    55,     0,    69,    70,    71,    72,
-      73,     0,     0,    75,    76,    77,    78,    79,    80,    55,
-       0,   208,     0,     0,     0,     0,     0,     0,    82,   285,
-       0,     0,     0,     0,     0,     0,   208,    83,    84,     0,
-       0,     0,     0,    82,     0,     0,     0,    69,    70,    71,
-      72,    73,    83,    84,    75,    76,    77,    78,    79,    80,
-      55,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   220,     0,     0,     0,   208,    69,    70,
-      71,    72,    73,     0,    82,    75,    76,    77,    78,    79,
-      80,    55,     0,    83,    84,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   208,     0,
-       0,     0,     0,     0,     0,    82,     0,     0,     0,     0,
-       0,     0,     0,     0,    83,    84,     0,   248,     6,     0,
-       0,    69,    70,    71,    72,    73,     7,   221,    75,    76,
-      77,    78,    79,    80,    55,     8,     9,     0,     0,   206,
-       0,     0,     0,     0,     0,     0,     0,   249,    10,   207,
-       0,   208,     0,    69,    70,    71,    72,    73,    82,    11,
-      75,    76,    77,    78,    79,    80,    55,    83,    84,   250,
-       0,     0,    16,   338,   339,     0,     0,     0,   264,   265,
-     266,     0,     0,   208,    69,    70,    71,    72,    73,     0,
-      82,    75,    76,    77,    78,    79,    80,    55,     0,    83,
-      84,     0,    69,    70,    71,     0,     0,     0,     0,    75,
-      76,    77,    78,    79,    80,    55,     0,     0,     0,     0,
-       0,    82,     0,     0,     0,     0,     0,     0,   248,     6,
-      83,    84,    69,    70,    71,    72,    73,     7,   120,    75,
-      76,    77,    78,    79,    80,    55,     8,     9,    83,    84,
-       0,     0,     0,     0,     0,     0,     0,     0,   249,    10,
-       0,     0,   208,     0,    69,    70,    71,    72,    73,    82,
-      11,    75,    76,    77,    78,    79,    80,    55,    83,    84,
-     250,    68,     0,    16,    69,    70,    71,    72,    73,    74,
-       0,    75,    76,    77,    78,    79,    80,    55,     0,     0,
-      81,    82,     0,     0,     0,     0,     0,     0,     0,     0,
-      83,    84,     0,     0,     0,     0,    85,     0,     0,     0,
-      81,    82,     0,     0,     0,     0,     0,     0,     0,     0,
-      83,    84,     0,     0,     0,    16,    85,    69,    70,    71,
-      72,    73,     0,     0,    75,    76,    77,    78,    79,    80,
-      55,    69,    70,    71,    72,    73,     0,     0,    75,    76,
-      77,    78,    79,    80,    55,     0,     0,   208,     0,     0,
-       0,     0,     0,     0,    82,     0,     0,     0,     0,     0,
-       0,     0,     0,    83,    84,     0,     0,     0,    82,     0,
-       0,     0,     0,     0,     0,     0,     0,    83,    84
-};
-
-static const short yycheck[] =
-{
-       1,    17,     3,     4,     5,     6,     7,   260,     9,   174,
-      11,    12,   242,    14,    10,    16,   256,   160,   149,     0,
-       8,   147,    10,   400,     8,     0,   163,   177,     0,   383,
-       8,    10,    10,   157,   171,     8,    17,     8,    62,   163,
-       5,    10,    17,    61,     8,    17,     9,   171,     5,     6,
-     250,   294,   460,     8,   244,    10,    57,    58,    59,   142,
-      48,   144,     9,    45,    48,     2,     9,    68,    32,   518,
-      48,   520,    71,    74,     5,    48,    22,    48,    15,     8,
-      22,    45,   190,   191,    15,     8,   288,    88,   290,     9,
-       3,   468,   335,    48,    76,    11,    12,   546,    45,    45,
-      63,   478,   292,    45,   334,   459,   232,   272,   239,    20,
-     518,    45,    77,   137,    78,    79,    27,   135,    74,    48,
-      77,    85,    86,    87,     9,    48,   127,   210,    92,    93,
-      94,   255,     3,   134,   258,   388,     5,     6,    33,   276,
-     223,    26,   382,    63,    64,    65,    41,    42,    43,    44,
-      45,     2,   276,     7,   142,    71,   144,     6,    74,     6,
-     390,   391,    13,    31,   152,     9,    20,   155,   152,   157,
-      38,   159,   160,    27,   152,   163,   376,     5,     3,   152,
-     168,     5,    26,   171,   571,   173,   174,    15,    83,   177,
-     178,   179,    40,    41,   581,    52,     7,   152,    55,    56,
-      63,    64,    65,   204,   192,   193,    17,    18,   428,   429,
-     430,    22,     3,   214,   192,    41,    42,    28,   206,   220,
-     221,     3,   210,   152,   332,    17,    18,   228,   206,   152,
-      22,   396,   375,    53,    54,   223,    28,   192,    48,    49,
-       6,   242,    25,    26,    66,    67,   389,   424,   425,     3,
-       6,   206,   426,   427,     3,   256,   244,     3,     6,     3,
-     244,     3,   250,     6,     3,   266,   244,   255,     6,   192,
-     258,   244,   260,     5,     3,    30,   264,   265,   443,    24,
-     264,   265,    23,   206,   272,   228,   264,   265,   276,   244,
-     271,   264,   265,   264,   265,   291,   271,   285,    24,   271,
-     288,   451,   290,   291,   292,   505,    24,   291,   292,   264,
-     265,   554,   291,    24,   292,   244,    73,     3,   461,   292,
-      23,   244,   291,     6,   432,     6,     3,     3,   436,   529,
-      15,     6,   497,   334,     6,   264,   265,   292,     8,   340,
-       6,   264,   265,    41,    81,    60,    26,     3,     7,    18,
-       3,     3,     7,     3,     3,     3,     3,     8,   346,     3,
-     361,     7,     3,   292,    27,     3,   367,     7,   346,   292,
-       3,     7,    26,    80,     3,     7,   377,     3,   394,     3,
-       8,   382,     3,     3,    26,    77,     3,   375,   376,   390,
-     391,   346,     7,   543,     7,    26,    26,   340,     7,     3,
-     388,   389,    25,   404,    32,     8,    25,    50,   396,     7,
-      26,   399,   400,   394,    51,   403,    61,    45,   361,   394,
-      48,    49,   394,   346,    26,    22,     8,     8,    24,    57,
-      19,     3,     8,     7,   377,     5,    15,    24,    77,   440,
-      26,     7,    41,     3,   445,     9,     7,   448,   449,     7,
-      78,    79,     9,     9,    66,   443,   457,    85,    86,    87,
-      82,   404,     3,   451,    92,    93,    94,     6,     8,    27,
-      25,    25,    25,   461,    32,    33,    34,    35,    36,     9,
-     468,    39,    40,    41,    42,    43,    44,    45,     9,    24,
-     478,    16,     8,     3,    67,     9,     3,    26,    25,     5,
-      78,    63,   445,     7,    62,   448,   449,    26,    25,   497,
-       9,    69,     5,     3,   457,    26,     0,   505,     9,   271,
-      78,    79,   210,   346,   223,   403,   232,   239,   401,   544,
-     192,   574,    10,    91,    10,    10,   557,   538,   421,   423,
-     541,   529,   422,   315,   576,   258,   440,   589,   175,   552,
-     548,   539,   553,     0,    -1,   543,   544,     4,    -1,    -1,
-      -1,    -1,    -1,    10,    11,    12,    13,    -1,    -1,    -1,
-     558,    -1,    -1,   574,   558,    -1,    -1,   578,    -1,    -1,
-     558,    -1,    29,    -1,    -1,   558,    -1,   558,   589,    -1,
-      37,    -1,    -1,    -1,    -1,   538,    -1,    -1,   541,    46,
-      47,    -1,    -1,   558,    -1,    -1,    -1,    -1,    -1,    -1,
-     553,    -1,    59,     5,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    70,    71,    72,    -1,    74,    75,   558,
-      -1,    -1,    -1,    -1,    -1,   558,    83,    29,    -1,    -1,
-      32,    33,    34,    35,    36,    37,    -1,    39,    40,    41,
-      42,    43,    44,    45,    -1,     4,    -1,    -1,     7,    -1,
-      -1,    10,    11,    12,    13,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     4,    68,    69,    -1,    -1,
-      29,    10,    11,    12,    13,    77,    78,    79,    37,    -1,
-      -1,    83,    84,    -1,    -1,    -1,    -1,    46,    47,    -1,
-      29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,
-      59,    -1,    -1,    -1,    -1,    -1,    -1,    46,    47,    -1,
-      -1,    70,    71,    72,    -1,    74,    75,    -1,    -1,    -1,
-      59,     7,    -1,    -1,    83,    -1,    -1,    -1,    -1,    -1,
-      -1,    70,    71,    72,    -1,    74,    75,    -1,    -1,     7,
-      -1,    -1,    -1,    29,    83,    -1,    32,    33,    34,    35,
-      36,    37,    -1,    39,    40,    41,    42,    43,    44,    45,
-      28,    29,    -1,    -1,    32,    33,    34,    35,    36,    37,
-      -1,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      -1,    -1,    68,    69,    -1,    -1,    -1,    -1,    -1,    -1,
-      58,    59,    78,    79,    62,     7,    -1,    83,    84,    -1,
-      -1,    69,    70,    -1,    -1,    -1,    18,    -1,    -1,    -1,
-      78,    79,    80,    -1,    -1,    83,    28,    -1,    -1,    -1,
-      32,    33,    34,    35,    36,    -1,    -1,    39,    40,    41,
-      42,    43,    44,    45,    -1,    -1,     7,    -1,    -1,    -1,
-      -1,    -1,    -1,    14,    -1,    -1,    -1,    -1,    -1,    -1,
-      62,     7,    -1,    -1,    -1,    -1,    -1,    69,    14,    -1,
-      -1,    32,    33,    34,    35,    36,    78,    79,    39,    40,
-      41,    42,    43,    44,    45,    -1,    32,    33,    34,    35,
-      36,    -1,    -1,    39,    40,    41,    42,    43,    44,    45,
-      -1,    62,    -1,    -1,    -1,    -1,    -1,    -1,    69,    14,
-      -1,    -1,    -1,    -1,    -1,    -1,    62,    78,    79,    -1,
-      -1,    -1,    -1,    69,    -1,    -1,    -1,    32,    33,    34,
-      35,    36,    78,    79,    39,    40,    41,    42,    43,    44,
-      45,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    27,    -1,    -1,    -1,    62,    32,    33,
-      34,    35,    36,    -1,    69,    39,    40,    41,    42,    43,
-      44,    45,    -1,    78,    79,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    62,    -1,
-      -1,    -1,    -1,    -1,    -1,    69,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    78,    79,    -1,    28,    29,    -1,
-      -1,    32,    33,    34,    35,    36,    37,    91,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    -1,    -1,    18,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    58,    59,    28,
-      -1,    62,    -1,    32,    33,    34,    35,    36,    69,    70,
-      39,    40,    41,    42,    43,    44,    45,    78,    79,    80,
-      -1,    -1,    83,    21,    22,    -1,    -1,    -1,    89,    90,
-      91,    -1,    -1,    62,    32,    33,    34,    35,    36,    -1,
-      69,    39,    40,    41,    42,    43,    44,    45,    -1,    78,
-      79,    -1,    32,    33,    34,    -1,    -1,    -1,    -1,    39,
-      40,    41,    42,    43,    44,    45,    -1,    -1,    -1,    -1,
-      -1,    69,    -1,    -1,    -1,    -1,    -1,    -1,    28,    29,
-      78,    79,    32,    33,    34,    35,    36,    37,    68,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    78,    79,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    58,    59,
-      -1,    -1,    62,    -1,    32,    33,    34,    35,    36,    69,
-      70,    39,    40,    41,    42,    43,    44,    45,    78,    79,
-      80,    29,    -1,    83,    32,    33,    34,    35,    36,    37,
-      -1,    39,    40,    41,    42,    43,    44,    45,    -1,    -1,
-      68,    69,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      78,    79,    -1,    -1,    -1,    -1,    84,    -1,    -1,    -1,
-      68,    69,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      78,    79,    -1,    -1,    -1,    83,    84,    32,    33,    34,
-      35,    36,    -1,    -1,    39,    40,    41,    42,    43,    44,
-      45,    32,    33,    34,    35,    36,    -1,    -1,    39,    40,
-      41,    42,    43,    44,    45,    -1,    -1,    62,    -1,    -1,
-      -1,    -1,    -1,    -1,    69,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    -1,    -1,    -1,    69,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79
-};
-#define YYPURE 1
-
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/bison/bison.simple"
-
-/* Skeleton output parser for bison,
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser when
-   the %semantic_parser declaration is not specified in the grammar.
-   It was written by Richard Stallman by simplifying the hairy parser
-   used when %semantic_parser is specified.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
-# else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
-#   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-# else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
-#  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
-# endif
-#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
-
-
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-   || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  short yyss;
-  YYSTYPE yyvs;
-# if YYLSP_NEEDED
-  YYLTYPE yyls;
-# endif
-};
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# if YYLSP_NEEDED
-#  define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))  \
-      + 2 * YYSTACK_GAP_MAX)
-# else
-#  define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))       \
-      + YYSTACK_GAP_MAX)
-# endif
-
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)    \
-      do          \
-  {         \
-    register YYSIZE_T yyi;    \
-    for (yyi = 0; yyi < (Count); yyi++) \
-      (To)[yyi] = (From)[yyi];    \
-  }         \
-      while (0)
-#  endif
-# endif
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack)          \
-    do                  \
-      {                 \
-  YYSIZE_T yynewbytes;            \
-  YYCOPY (&yyptr->Stack, Stack, yysize);        \
-  Stack = &yyptr->Stack;            \
-  yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \
-  yyptr += yynewbytes / sizeof (*yyptr);        \
-      }                 \
-    while (0)
-
-#endif
-
-
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
-#define yyerrok   (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY   -2
-#define YYEOF   0
-#define YYACCEPT  goto yyacceptlab
-#define YYABORT   goto yyabortlab
-#define YYERROR   goto yyerrlab1
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-#define YYFAIL    goto yyerrlab
-#define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(Token, Value)          \
-do                \
-  if (yychar == YYEMPTY && yylen == 1)        \
-    {               \
-      yychar = (Token);           \
-      yylval = (Value);           \
-      yychar1 = YYTRANSLATE (yychar);       \
-      YYPOPSTACK;           \
-      goto yybackup;            \
-    }               \
-  else                \
-    {                 \
-      yyerror ("syntax error: cannot back up");     \
-      YYERROR;              \
-    }               \
-while (0)
-
-#define YYTERROR  1
-#define YYERRCODE 256
-
-
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).
-
-   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
-   first token.  By default, to implement support for ranges, extend
-   its range to the last symbol.  */
-
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)        \
-   Current.last_line   = Rhs[N].last_line;  \
-   Current.last_column = Rhs[N].last_column;
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#if YYPURE
-# if YYLSP_NEEDED
-#  ifdef YYLEX_PARAM
-#   define YYLEX    yylex (&yylval, &yylloc, YYLEX_PARAM)
-#  else
-#   define YYLEX    yylex (&yylval, &yylloc)
-#  endif
-# else /* !YYLSP_NEEDED */
-#  ifdef YYLEX_PARAM
-#   define YYLEX    yylex (&yylval, YYLEX_PARAM)
-#  else
-#   define YYLEX    yylex (&yylval)
-#  endif
-# endif /* !YYLSP_NEEDED */
-#else /* !YYPURE */
-# define YYLEX      yylex ()
-#endif /* !YYPURE */
-
-
-/* Enable debugging if requested.  */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)      \
-do {            \
-  if (yydebug)          \
-    YYFPRINTF Args;       \
-} while (0)
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-#endif /* !YYDEBUG */
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-#ifdef YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
-yystrlen (const char *yystr)
-#   else
-yystrlen (yystr)
-     const char *yystr;
-#   endif
-{
-  register const char *yys = yystr;
-
-  while (*yys++ != '\0')
-    continue;
-
-  return yys - yystr - 1;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-#   if defined (__STDC__) || defined (__cplusplus)
-yystpcpy (char *yydest, const char *yysrc)
-#   else
-yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
-{
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-#endif
-
-#line 315 "/usr/share/bison/bison.simple"
-
-
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
-
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL
-# else
-#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-# endif
-#else /* !YYPARSE_PARAM */
-# define YYPARSE_PARAM_ARG
-# define YYPARSE_PARAM_DECL
-#endif /* !YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-# ifdef YYPARSE_PARAM
-int yyparse (void *);
-# else
-int yyparse (void);
-# endif
-#endif
-
-/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
-   variables are global, or local to YYPARSE.  */
-
-#define YY_DECL_NON_LSP_VARIABLES     \
-/* The lookahead symbol.  */        \
-int yychar;           \
-              \
-/* The semantic value of the lookahead symbol. */ \
-YYSTYPE yylval;           \
-
-/* The variables used to return semantic value and location from the
-   action routines.  */
-  YYSTYPE yyval;
-#if YYLSP_NEEDED
-  YYLTYPE yyloc;
-#endif
-            \
-/* Number of parse errors so far.  */     \
-int yynerrs;
-
-#if YYLSP_NEEDED
-# define YY_DECL_VARIABLES      \
-YY_DECL_NON_LSP_VARIABLES     \
-            \
-/* Location data for the lookahead symbol.  */  \
-YYLTYPE yylloc;
-#else
-# define YY_DECL_VARIABLES      \
-YY_DECL_NON_LSP_VARIABLES
-#endif
-
-
-/* If nonreentrant, generate the variables here. */
-
-#if !YYPURE
-YY_DECL_VARIABLES
-#endif  /* !YYPURE */
-
-int
-yyparse (YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  /* If reentrant, generate the variables here. */
-#if YYPURE
-  YY_DECL_VARIABLES
-#endif  /* !YYPURE */
-
-  register int yystate;
-  register int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yychar1 = 0;
-
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack. */
-  short yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
-
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
-
-#if YYLSP_NEEDED
-  /* The location stack.  */
-  YYLTYPE yylsa[YYINITDEPTH];
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-#endif
-
-#if YYLSP_NEEDED
-# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-# define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
-
-  YYSIZE_T yystacksize = YYINITDEPTH;
-
-
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule. */
-  int yylen;
-
-  YYDPRINTF ((stderr, "Starting parse\n"));
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;   /* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss;
-  yyvsp = yyvs;
-#if YYLSP_NEEDED
-  yylsp = yyls;
-#endif
-  goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
-  yyssp++;
-
- yysetstate:
-  *yyssp = yystate;
-
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      {
-  /* Give user a chance to reallocate the stack. Use copies of
-     these so that the &'s don't force the real ones into
-     memory.  */
-  YYSTYPE *yyvs1 = yyvs;
-  short *yyss1 = yyss;
-
-  /* Each stack pointer address is followed by the size of the
-     data in use in that stack, in bytes.  */
-# if YYLSP_NEEDED
-  YYLTYPE *yyls1 = yyls;
-  /* This used to be a conditional around just the two extra args,
-     but that might be undefined if yyoverflow is a macro.  */
-  yyoverflow ("parser stack overflow",
-        &yyss1, yysize * sizeof (*yyssp),
-        &yyvs1, yysize * sizeof (*yyvsp),
-        &yyls1, yysize * sizeof (*yylsp),
-        &yystacksize);
-  yyls = yyls1;
-# else
-  yyoverflow ("parser stack overflow",
-        &yyss1, yysize * sizeof (*yyssp),
-        &yyvs1, yysize * sizeof (*yyvsp),
-        &yystacksize);
-# endif
-  yyss = yyss1;
-  yyvs = yyvs1;
-      }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
-# else
-      /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-  goto yyoverflowlab;
-      yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
-  yystacksize = YYMAXDEPTH;
-
-      {
-  short *yyss1 = yyss;
-  union yyalloc *yyptr =
-    (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-  if (! yyptr)
-    goto yyoverflowlab;
-  YYSTACK_RELOCATE (yyss);
-  YYSTACK_RELOCATE (yyvs);
-# if YYLSP_NEEDED
-  YYSTACK_RELOCATE (yyls);
-# endif
-# undef YYSTACK_RELOCATE
-  if (yyss1 != yyssa)
-    YYSTACK_FREE (yyss1);
-      }
-# endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-#if YYLSP_NEEDED
-      yylsp = yyls + yysize - 1;
-#endif
-
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-      (unsigned long int) yystacksize));
-
-      if (yyssp >= yyss + yystacksize - 1)
-  YYABORT;
-    }
-
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
-  goto yybackup;
-
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
-    }
-
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)    /* This means end of input. */
-    {
-      yychar1 = 0;
-      yychar = YYEOF;   /* Don't call YYLEX any more */
-
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yychar1 = YYTRANSLATE (yychar);
-
-#if YYDEBUG
-     /* We have to keep this `#if YYDEBUG', since we use variables
-  which are defined only if `YYDEBUG' is set.  */
-      if (yydebug)
-  {
-    YYFPRINTF (stderr, "Next token is %d (%s",
-         yychar, yytname[yychar1]);
-    /* Give the individual parser a way to print the precise
-       meaning of a token, for further debugging info.  */
-# ifdef YYPRINT
-    YYPRINT (stderr, yychar, yylval);
-# endif
-    YYFPRINTF (stderr, ")\n");
-  }
-#endif
-    }
-
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
-    goto yydefault;
-
-  yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-  goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrlab;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
-        yychar, yytname[yychar1]));
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
-
-  /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to the semantic value of
-     the lookahead token.  This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-
-#if YYLSP_NEEDED
-  /* Similarly for the default location.  Let the user run additional
-     commands if for instance locations are ranges.  */
-  yyloc = yylsp[1-yylen];
-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
-#endif
-
-#if YYDEBUG
-  /* We have to keep this `#if YYDEBUG', since we use variables which
-     are defined only if `YYDEBUG' is set.  */
-  if (yydebug)
-    {
-      int yyi;
-
-      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
-     yyn, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
-  YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
-      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-
-  switch (yyn) {
-
-case 1:
-#line 79 "PSDL.yy"
-{ yyval = new TAO_PSDL_Specification (yyvsp[0]); ;
-    break;}
-case 2:
-#line 82 "PSDL.yy"
-{ yyval = new TAO_PSDL_Specification (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 3:
-#line 86 "PSDL.yy"
-{ yyval = new TAO_PSDL_Definition (yyvsp[-1]); ;
-    break;}
-case 4:
-#line 89 "PSDL.yy"
-{ yyval = new TAO_PSDL_Definition (yyvsp[-1]); ;
-    break;}
-case 5:
-#line 92 "PSDL.yy"
-{ yyval = new TAO_PSDL_Definition (yyvsp[-1]); ;
-    break;}
-case 6:
-#line 95 "PSDL.yy"
-{ yyval = new TAO_PSDL_Definition (yyvsp[-1]); ;
-    break;}
-case 7:
-#line 98 "PSDL.yy"
-{ yyval = new TAO_PSDL_Definition (yyvsp[-1]); ;
-    break;}
-case 8:
-#line 101 "PSDL.yy"
-{ yyval = new TAO_PSDL_Definition (yyvsp[-1]); ;
-    break;}
-case 9:
-#line 104 "PSDL.yy"
-{ yyval = new TAO_PSDL_Definition (yyvsp[-1]); ;
-    break;}
-case 10:
-#line 107 "PSDL.yy"
-{ yyval = new TAO_PSDL_Definition (yyvsp[-1]); ;
-    break;}
-case 11:
-#line 110 "PSDL.yy"
-{ yyval = new TAO_PSDL_Definition (yyvsp[-1]); ;
-    break;}
-case 12:
-#line 113 "PSDL.yy"
-{ yyval = new TAO_PSDL_Definition (yyvsp[-1]); ;
-    break;}
-case 13:
-#line 116 "PSDL.yy"
-{ yyval = new TAO_PSDL_Definition (yyvsp[-1]); ;
-    break;}
-case 14:
-#line 120 "PSDL.yy"
-{
-  int good_module_name = TAO_PSDL_Scope::instance ()->pop_top_scope ()->add_module (TAO_PSDL_Scope::instance ()->get_identifier ());
-  if (good_module_name == -1)
-    YYABORT;
-  ;
-    break;}
-case 15:
-#line 126 "PSDL.yy"
-{
-      TAO_PSDL_Scope::instance ()->set_module_scope ();
-      yyval = new TAO_PSDL_Module (TAO_PSDL_MODULE, yyvsp[-4], yyvsp[-1]); ;
-    break;}
-case 16:
-#line 132 "PSDL.yy"
-{ TAO_PSDL_Scope::instance ()->set_scope ();
-      yyval = new TAO_PSDL_Abstract_Storagetype (yyvsp[0]); ;
-    break;}
-case 17:
-#line 136 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype (yyvsp[0]); ;
-    break;}
-case 18:
-#line 140 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype_Dcl (yyvsp[-3], yyvsp[-1]); ;
-    break;}
-case 19:
-#line 143 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype_Dcl (yyvsp[-2]); ;
-    break;}
-case 20:
-#line 147 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype_Fwd_Dcl (yyvsp[0]); ;
-    break;}
-case 21:
-#line 151 "PSDL.yy"
-{
-      int good_storagetype_name = TAO_PSDL_Scope::instance ()->pop_top_scope ()->add_interface (TAO_PSDL_Scope::instance ()->get_identifier ());
-      if (good_storagetype_name == -1)
-          YYABORT;
-
-      yyval = yyvsp[0];
-    ;
-    break;}
-case 22:
-#line 162 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype_Header (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 23:
-#line 165 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype_Header (yyvsp[0]); ;
-    break;}
-case 24:
-#line 170 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype_Body (yyvsp[0]); ;
-    break;}
-case 25:
-#line 173 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype_Body (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 26:
-#line 178 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype_Member (yyvsp[-1]); ;
-    break;}
-case 27:
-#line 181 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype_Member (yyvsp[-1]); ;
-    break;}
-case 28:
-#line 186 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype_Inh_Spec (yyvsp[0]); ;
-    break;}
-case 29:
-#line 191 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype_Name (yyvsp[0]); ;
-    break;}
-case 30:
-#line 194 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype_Name (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 31:
-#line 198 "PSDL.yy"
-{ yyval = new TAO_PSDL_Psdl_State_Dcl (yyvsp[-3], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 32:
-#line 201 "PSDL.yy"
-{ yyval = new TAO_PSDL_Psdl_State_Dcl (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 33:
-#line 205 "PSDL.yy"
-{ yyval = new TAO_PSDL_Psdl_State_Type_Spec (yyvsp[0]); ;
-    break;}
-case 34:
-#line 208 "PSDL.yy"
-{ yyval = new TAO_PSDL_Psdl_State_Type_Spec (yyvsp[0]); ;
-    break;}
-case 35:
-#line 211 "PSDL.yy"
-{ yyval = new TAO_PSDL_Psdl_State_Type_Spec (yyvsp[0]); ;
-    break;}
-case 36:
-#line 214 "PSDL.yy"
-{ yyval = new TAO_PSDL_Psdl_State_Type_Spec (yyvsp[0]); ;
-    break;}
-case 37:
-#line 217 "PSDL.yy"
-{ yyval = new TAO_PSDL_Psdl_State_Type_Spec (yyvsp[0]); ;
-    break;}
-case 38:
-#line 222 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype_Ref_Type (yyvsp[-4], yyvsp[-1]); ;
-    break;}
-case 39:
-#line 225 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagetype_Ref_Type (yyvsp[-1]); ;
-    break;}
-case 40:
-#line 229 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome (yyvsp[0]); ;
-    break;}
-case 41:
-#line 232 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome (yyvsp[0]); ;
-    break;}
-case 42:
-#line 237 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome_Fwd_Dcl (yyvsp[0]); ;
-    break;}
-case 43:
-#line 242 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome_Dcl (yyvsp[-3], yyvsp[-1]); ;
-    break;}
-case 44:
-#line 245 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome_Dcl (yyvsp[-2]); ;
-    break;}
-case 45:
-#line 250 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome_Header (yyvsp[-3], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 46:
-#line 253 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome_Header (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 47:
-#line 258 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome_Body (yyvsp[0]); ;
-    break;}
-case 48:
-#line 261 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome_Body (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 49:
-#line 266 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome_Member (yyvsp[-1]); ;
-    break;}
-case 50:
-#line 269 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome_Member (yyvsp[-1]); ;
-    break;}
-case 51:
-#line 272 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome_Member (yyvsp[-1]); ;
-    break;}
-case 52:
-#line 277 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome_Inh_Spec (yyvsp[0]); ;
-    break;}
-case 53:
-#line 282 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome_Name (yyvsp[0]); ;
-    break;}
-case 54:
-#line 285 "PSDL.yy"
-{ yyval = new TAO_PSDL_Abstract_Storagehome_Name (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 55:
-#line 289 "PSDL.yy"
-{ TAO_PSDL_Scope::instance ()->set_scope ();
-      yyval = new TAO_PSDL_Op_Dcl (yyvsp[-3], yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 56:
-#line 293 "PSDL.yy"
-{ TAO_PSDL_Scope::instance ()->set_scope ();
-      yyval = new TAO_PSDL_Op_Dcl (yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 57:
-#line 298 "PSDL.yy"
-{ yyval = new TAO_PSDL_Key_Dcl (yyvsp[-3], yyvsp[-1]); ;
-    break;}
-case 58:
-#line 301 "PSDL.yy"
-{ yyval = new TAO_PSDL_Key_Dcl (yyvsp[0]); ;
-    break;}
-case 59:
-#line 305 "PSDL.yy"
-{ yyval = new TAO_PSDL_Catalog (yyvsp[-4], yyvsp[-3], yyvsp[-1]); ;
-    break;}
-case 60:
-#line 308 "PSDL.yy"
-{ yyval = new TAO_PSDL_Catalog (yyvsp[-3], yyvsp[-1]); ;
-    break;}
-case 61:
-#line 311 "PSDL.yy"
-{ yyval = new TAO_PSDL_Catalog (yyvsp[-2]); ;
-    break;}
-case 62:
-#line 314 "PSDL.yy"
-{ yyval = new TAO_PSDL_Catalog (yyvsp[-3], yyvsp[-2]); ;
-    break;}
-case 63:
-#line 318 "PSDL.yy"
-{ yyval = new TAO_PSDL_Catalog_Inh_Spec (yyvsp[0]); ;
-    break;}
-case 64:
-#line 322 "PSDL.yy"
-{ yyval = new TAO_PSDL_Catalog_Name (yyvsp[0]); ;
-    break;}
-case 65:
-#line 325 "PSDL.yy"
-{ yyval = new TAO_PSDL_Catalog_Name (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 66:
-#line 329 "PSDL.yy"
-{ yyval = new TAO_PSDL_Catalog_Body (yyvsp[0]); ;
-    break;}
-case 67:
-#line 332 "PSDL.yy"
-{ yyval = new TAO_PSDL_Catalog_Body (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 68:
-#line 336 "PSDL.yy"
-{ yyval = new TAO_PSDL_Catalog_Member (yyvsp[-1]); ;
-    break;}
-case 69:
-#line 339 "PSDL.yy"
-{ yyval = new TAO_PSDL_Catalog_Member (yyvsp[-1]); ;
-    break;}
-case 70:
-#line 343 "PSDL.yy"
-{ yyval = new TAO_PSDL_Provides_Dcl (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 71:
-#line 347 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype (yyvsp[0]); ;
-    break;}
-case 72:
-#line 350 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype (yyvsp[0]); ;
-    break;}
-case 73:
-#line 354 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Dcl (yyvsp[-3], yyvsp[-1]); ;
-    break;}
-case 74:
-#line 357 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Dcl (yyvsp[-2]); ;
-    break;}
-case 75:
-#line 361 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Fwd_Dcl (yyvsp[0]); ;
-    break;}
-case 76:
-#line 365 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Header (yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 77:
-#line 368 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Header (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 78:
-#line 371 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Header (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 79:
-#line 375 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Body (yyvsp[0]); ;
-    break;}
-case 80:
-#line 378 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Body (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 81:
-#line 382 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Member (yyvsp[-1]); ;
-    break;}
-case 82:
-#line 385 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Member (yyvsp[-1]); ;
-    break;}
-case 83:
-#line 388 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Member (yyvsp[-1]); ;
-    break;}
-case 84:
-#line 392 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Inh_Spec (yyvsp[0]); ;
-    break;}
-case 85:
-#line 396 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Name (yyvsp[0]); ;
-    break;}
-case 86:
-#line 400 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Impl_Spec (yyvsp[0]); ;
-    break;}
-case 87:
-#line 404 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagetype_Ref_Type (yyvsp[-1]); ;
-    break;}
-case 88:
-#line 408 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagehome_Scope (yyvsp[0]); ;
-    break;}
-case 89:
-#line 412 "PSDL.yy"
-{ yyval = new TAO_PSDL_Store_Directive (yyvsp[-3], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 90:
-#line 415 "PSDL.yy"
-{ yyval = new TAO_PSDL_Store_Directive (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 91:
-#line 420 "PSDL.yy"
-{ yyval = new TAO_PSDL_Psdl_Concrete_State_Type (yyvsp[0]); ;
-    break;}
-case 92:
-#line 423 "PSDL.yy"
-{ yyval = new TAO_PSDL_Psdl_Concrete_State_Type (yyvsp[0]); ;
-    break;}
-case 93:
-#line 427 "PSDL.yy"
-{ yyval = new TAO_PSDL_Ref_Rep_Directive (yyvsp[-1]); ;
-    break;}
-case 94:
-#line 431 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagehome (yyvsp[-3], yyvsp[-1]); ;
-    break;}
-case 95:
-#line 434 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagehome (yyvsp[-2]); ;
-    break;}
-case 96:
-#line 438 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagehome_Header (yyvsp[-4], yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 97:
-#line 441 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagehome_Header (yyvsp[-3], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 98:
-#line 444 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagehome_Header (yyvsp[-3], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 99:
-#line 447 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagehome_Header (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 100:
-#line 451 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagehome_Body (yyvsp[0]); ;
-    break;}
-case 101:
-#line 454 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagehome_Body (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 102:
-#line 458 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagehome_Member (yyvsp[-1]); ;
-    break;}
-case 103:
-#line 461 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagehome_Member (yyvsp[-1]); ;
-    break;}
-case 104:
-#line 465 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagehome_Inh_Spec (yyvsp[0]); ;
-    break;}
-case 105:
-#line 469 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagehome_Name (yyvsp[0]); ;
-    break;}
-case 106:
-#line 473 "PSDL.yy"
-{ yyval = new TAO_PSDL_Storagehome_Impl_Spec (yyvsp[0]); ;
-    break;}
-case 107:
-#line 477 "PSDL.yy"
-{ yyval = new TAO_PSDL_Primary_Key_Dcl (yyvsp[0]); ;
-    break;}
-case 108:
-#line 480 "PSDL.yy"
-{ yyval = new TAO_PSDL_Primary_Key_Dcl (); ;
-    break;}
-case 109:
-#line 484 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 110:
-#line 488 "PSDL.yy"
-{ yyval = new TAO_PSDL_Type_Dcl (TAO_PSDL_TYPEDEF, yyvsp[0]); ;
-    break;}
-case 111:
-#line 491 "PSDL.yy"
-{ yyval = new TAO_PSDL_Type_Dcl (yyvsp[0]); ;
-    break;}
-case 112:
-#line 494 "PSDL.yy"
-{ yyval = new TAO_PSDL_Type_Dcl (yyvsp[0]); ;
-    break;}
-case 113:
-#line 497 "PSDL.yy"
-{ yyval = new TAO_PSDL_Type_Dcl (yyvsp[0]); ;
-    break;}
-case 114:
-#line 500 "PSDL.yy"
-{ yyval = new TAO_PSDL_Type_Dcl (TAO_PSDL_NATIVE, yyvsp[0]); ;
-    break;}
-case 115:
-#line 503 "PSDL.yy"
-{ yyval = new TAO_PSDL_Type_Dcl (yyvsp[0]); ;
-    break;}
-case 116:
-#line 507 "PSDL.yy"
-{ yyval = new TAO_PSDL_Type_Declarator (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 117:
-#line 511 "PSDL.yy"
-{ yyval = new TAO_PSDL_Type_Spec (yyvsp[0]); ;
-    break;}
-case 118:
-#line 514 "PSDL.yy"
-{ yyval = new TAO_PSDL_Type_Spec (yyvsp[0]); ;
-    break;}
-case 119:
-#line 518 "PSDL.yy"
-{ yyval = new TAO_PSDL_Simple_Type_Spec (yyvsp[0]); ;
-    break;}
-case 120:
-#line 521 "PSDL.yy"
-{ yyval = new TAO_PSDL_Simple_Type_Spec (yyvsp[0]); ;
-    break;}
-case 121:
-#line 524 "PSDL.yy"
-{ yyval = new TAO_PSDL_Simple_Type_Spec (yyvsp[0]); ;
-    break;}
-case 122:
-#line 528 "PSDL.yy"
-{ yyval = new TAO_PSDL_Base_Type_Spec (yyvsp[0]); ;
-    break;}
-case 123:
-#line 531 "PSDL.yy"
-{ yyval = new TAO_PSDL_Base_Type_Spec (yyvsp[0]); ;
-    break;}
-case 124:
-#line 534 "PSDL.yy"
-{ yyval = new TAO_PSDL_Base_Type_Spec (yyvsp[0]); ;
-    break;}
-case 125:
-#line 537 "PSDL.yy"
-{ yyval = new TAO_PSDL_Base_Type_Spec (yyvsp[0]); ;
-    break;}
-case 126:
-#line 540 "PSDL.yy"
-{ yyval = new TAO_PSDL_Base_Type_Spec (yyvsp[0]); ;
-    break;}
-case 127:
-#line 543 "PSDL.yy"
-{ yyval = new TAO_PSDL_Base_Type_Spec (yyvsp[0]); ;
-    break;}
-case 128:
-#line 546 "PSDL.yy"
-{ yyval = new TAO_PSDL_Base_Type_Spec (yyvsp[0]); ;
-    break;}
-case 129:
-#line 549 "PSDL.yy"
-{ yyval = new TAO_PSDL_Base_Type_Spec (yyvsp[0]); ;
-    break;}
-case 130:
-#line 552 "PSDL.yy"
-{ yyval = new TAO_PSDL_Base_Type_Spec (yyvsp[0]); ;
-    break;}
-case 131:
-#line 556 "PSDL.yy"
-{ yyval = new TAO_PSDL_Template_Type_Spec (yyvsp[0]); ;
-    break;}
-case 132:
-#line 559 "PSDL.yy"
-{ yyval = new TAO_PSDL_Template_Type_Spec (yyvsp[0]); ;
-    break;}
-case 133:
-#line 562 "PSDL.yy"
-{ yyval = new TAO_PSDL_Template_Type_Spec (yyvsp[0]); ;
-    break;}
-case 134:
-#line 565 "PSDL.yy"
-{ yyval = new TAO_PSDL_Template_Type_Spec (yyvsp[0]); ;
-    break;}
-case 135:
-#line 569 "PSDL.yy"
-{ yyval = new TAO_PSDL_Constr_Type_Spec (yyvsp[0]); ;
-    break;}
-case 136:
-#line 572 "PSDL.yy"
-{ yyval = new TAO_PSDL_Constr_Type_Spec (yyvsp[0]); ;
-    break;}
-case 137:
-#line 575 "PSDL.yy"
-{ yyval = new TAO_PSDL_Constr_Type_Spec (yyvsp[0]); ;
-    break;}
-case 138:
-#line 579 "PSDL.yy"
-{ yyval = new TAO_PSDL_Declarators (yyvsp[0]); ;
-    break;}
-case 139:
-#line 582 "PSDL.yy"
-{ yyval = new TAO_PSDL_Declarators (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 140:
-#line 586 "PSDL.yy"
-{ yyval = new TAO_PSDL_Declarator (yyvsp[0]); ;
-    break;}
-case 141:
-#line 589 "PSDL.yy"
-{ yyval = new TAO_PSDL_Declarator (yyvsp[0]); ;
-    break;}
-case 142:
-#line 593 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 143:
-#line 597 "PSDL.yy"
-{ yyval = new TAO_PSDL_Simple_Declarator_List (yyvsp[0]); ;
-    break;}
-case 144:
-#line 600 "PSDL.yy"
-{ yyval = new TAO_PSDL_Simple_Declarator_List (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 145:
-#line 604 "PSDL.yy"
-{ yyval = new TAO_PSDL_Complex_Declarator (yyvsp[0]); ;
-    break;}
-case 146:
-#line 608 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_FLOAT); ;
-    break;}
-case 147:
-#line 611 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_DOUBLE); ;
-    break;}
-case 148:
-#line 614 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_LONG, TAO_PSDL_DOUBLE); ;
-    break;}
-case 149:
-#line 618 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 150:
-#line 621 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 151:
-#line 625 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 152:
-#line 628 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 153:
-#line 631 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 154:
-#line 635 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_SHORT); ;
-    break;}
-case 155:
-#line 639 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_LONG); ;
-    break;}
-case 156:
-#line 643 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_LONG, TAO_PSDL_LONG); ;
-    break;}
-case 157:
-#line 647 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (yyvsp[0]); ;
-    break;}
-case 158:
-#line 650 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (yyvsp[0]); ;
-    break;}
-case 159:
-#line 653 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (yyvsp[0]); ;
-    break;}
-case 160:
-#line 657 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_UNSIGNED, TAO_PSDL_SHORT); ;
-    break;}
-case 161:
-#line 661 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_UNSIGNED, TAO_PSDL_LONG); ;
-    break;}
-case 162:
-#line 665 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_UNSIGNED, TAO_PSDL_LONG, TAO_PSDL_LONG); ;
-    break;}
-case 163:
-#line 669 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_CHAR); ;
-    break;}
-case 164:
-#line 673 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_WCHAR); ;
-    break;}
-case 165:
-#line 677 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_BOOLEAN); ;
-    break;}
-case 166:
-#line 681 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_OCTET); ;
-    break;}
-case 167:
-#line 685 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_ANY); ;
-    break;}
-case 168:
-#line 689 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_OBJECT); ;
-    break;}
-case 169:
-#line 693 "PSDL.yy"
-{
-      int good_struct_name = TAO_PSDL_Scope::instance ()->pop_top_scope ()->add_struct (TAO_PSDL_Scope::instance ()->get_identifier ());
-
-      if (good_struct_name == -1)
-      YYABORT;
-    ;
-    break;}
-case 170:
-#line 700 "PSDL.yy"
-{
-        TAO_PSDL_Scope::instance ()->set_scope ();
-      yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_STRUCT, yyvsp[-4], yyvsp[-1]); ;
-    break;}
-case 171:
-#line 706 "PSDL.yy"
-{ yyval = new TAO_PSDL_Member_List (yyvsp[0]); ;
-    break;}
-case 172:
-#line 709 "PSDL.yy"
-{ yyval = new TAO_PSDL_Member_List (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 173:
-#line 713 "PSDL.yy"
-{ yyval = new TAO_PSDL_Member (yyvsp[-2], yyvsp[-1]); ;
-    break;}
-case 174:
-#line 717 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (yyvsp[-7], yyvsp[-4], yyvsp[-1]); ;
-    break;}
-case 175:
-#line 721 "PSDL.yy"
-{ yyval = new TAO_PSDL_Switch_Type_Spec (yyvsp[0]); ;
-    break;}
-case 176:
-#line 724 "PSDL.yy"
-{ yyval = new TAO_PSDL_Switch_Type_Spec (yyvsp[0]); ;
-    break;}
-case 177:
-#line 727 "PSDL.yy"
-{ yyval = new TAO_PSDL_Switch_Type_Spec (yyvsp[0]); ;
-    break;}
-case 178:
-#line 730 "PSDL.yy"
-{ yyval = new TAO_PSDL_Switch_Type_Spec (yyvsp[0]); ;
-    break;}
-case 179:
-#line 733 "PSDL.yy"
-{ yyval = new TAO_PSDL_Switch_Type_Spec (yyvsp[0]); ;
-    break;}
-case 180:
-#line 737 "PSDL.yy"
-{ yyval = new TAO_PSDL_Switch_Body (yyvsp[0]); ;
-    break;}
-case 181:
-#line 740 "PSDL.yy"
-{ yyval = new TAO_PSDL_Switch_Body (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 182:
-#line 744 "PSDL.yy"
-{ yyval = new TAO_PSDL_Case (yyvsp[-2], yyvsp[-1]); ;
-    break;}
-case 183:
-#line 748 "PSDL.yy"
-{ yyval = new TAO_PSDL_Case_Label (yyvsp[-2], yyvsp[-1]); ;
-    break;}
-case 184:
-#line 751 "PSDL.yy"
-{ yyval = new TAO_PSDL_Case_Label (yyvsp[-1]); ;
-    break;}
-case 185:
-#line 754 "PSDL.yy"
-{ yyval = new TAO_PSDL_Case_Label (yyvsp[-3], yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 186:
-#line 757 "PSDL.yy"
-{ yyval = new TAO_PSDL_Case_Label (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 187:
-#line 761 "PSDL.yy"
-{ yyval = new TAO_PSDL_Element_Spec (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 188:
-#line 765 "PSDL.yy"
-{ yyval = new TAO_PSDL_Const_Dcl (yyvsp[-3], yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 189:
-#line 769 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type(yyvsp[0]); ;
-    break;}
-case 190:
-#line 772 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type(yyvsp[0]); ;
-    break;}
-case 191:
-#line 775 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type(yyvsp[0]); ;
-    break;}
-case 192:
-#line 778 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type(yyvsp[0]); ;
-    break;}
-case 193:
-#line 781 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type(yyvsp[0]); ;
-    break;}
-case 194:
-#line 784 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type(yyvsp[0]); ;
-    break;}
-case 195:
-#line 787 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type(yyvsp[0]); ;
-    break;}
-case 196:
-#line 790 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type(yyvsp[0]); ;
-    break;}
-case 197:
-#line 793 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type(yyvsp[0]); ;
-    break;}
-case 198:
-#line 796 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type(yyvsp[0]); ;
-    break;}
-case 199:
-#line 800 "PSDL.yy"
-{ yyval = new TAO_PSDL_Const_Exp (yyvsp[0]); ;
-    break;}
-case 200:
-#line 804 "PSDL.yy"
-{ yyval = new TAO_PSDL_Or_Expr (yyvsp[0]); ;
-    break;}
-case 201:
-#line 807 "PSDL.yy"
-{ yyval = new TAO_PSDL_Or_Expr (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 202:
-#line 811 "PSDL.yy"
-{ yyval = new TAO_PSDL_Xor_Expr (yyvsp[0]); ;
-    break;}
-case 203:
-#line 814 "PSDL.yy"
-{ yyval = new TAO_PSDL_Xor_Expr (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 204:
-#line 818 "PSDL.yy"
-{ yyval = new TAO_PSDL_And_Expr (yyvsp[0]); ;
-    break;}
-case 205:
-#line 821 "PSDL.yy"
-{ yyval = new TAO_PSDL_And_Expr (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 206:
-#line 825 "PSDL.yy"
-{ yyval = new TAO_PSDL_Shift_Expr (yyvsp[0]); ;
-    break;}
-case 207:
-#line 828 "PSDL.yy"
-{ yyval = new TAO_PSDL_Shift_Expr (yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 208:
-#line 831 "PSDL.yy"
-{ yyval = new TAO_PSDL_Shift_Expr (yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 209:
-#line 835 "PSDL.yy"
-{ yyval = new TAO_PSDL_Add_Expr (yyvsp[0]); ;
-    break;}
-case 210:
-#line 838 "PSDL.yy"
-{ yyval = new TAO_PSDL_Add_Expr (yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 211:
-#line 841 "PSDL.yy"
-{ yyval = new TAO_PSDL_Add_Expr (yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 212:
-#line 845 "PSDL.yy"
-{ yyval = new TAO_PSDL_Mult_Expr (yyvsp[0]); ;
-    break;}
-case 213:
-#line 848 "PSDL.yy"
-{ yyval = new TAO_PSDL_Mult_Expr (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 214:
-#line 851 "PSDL.yy"
-{ yyval = new TAO_PSDL_Mult_Expr (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 215:
-#line 854 "PSDL.yy"
-{ yyval = new TAO_PSDL_Mult_Expr (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 216:
-#line 858 "PSDL.yy"
-{ yyval = new TAO_PSDL_Unary_Expr (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 217:
-#line 861 "PSDL.yy"
-{ yyval = new TAO_PSDL_Unary_Expr (yyvsp[0]); ;
-    break;}
-case 218:
-#line 865 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 219:
-#line 868 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 220:
-#line 871 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 221:
-#line 875 "PSDL.yy"
-{ yyval = new TAO_PSDL_Primary_Expr (yyvsp[0]); ;
-    break;}
-case 222:
-#line 878 "PSDL.yy"
-{ yyval = new TAO_PSDL_Primary_Expr (yyvsp[0]); ;
-    break;}
-case 223:
-#line 881 "PSDL.yy"
-{ yyval = new TAO_PSDL_Primary_Expr (yyvsp[-1]); ;
-    break;}
-case 224:
-#line 885 "PSDL.yy"
-{
-      int good_except_name = TAO_PSDL_Scope::instance ()->pop_top_scope ()->add_exception (TAO_PSDL_Scope::instance ()->get_identifier ());
-            if (good_except_name == -1)
-        YYABORT;
-          yyval = yyvsp[0];
-    ;
-    break;}
-case 225:
-#line 894 "PSDL.yy"
-{
-      TAO_PSDL_Scope::instance ()->set_scope ();
-      yyval = new TAO_PSDL_Except_Dcl (yyvsp[-3], yyvsp[-1]);
-    ;
-    break;}
-case 226:
-#line 900 "PSDL.yy"
-{
-      TAO_PSDL_Scope::instance ()->set_scope ();
-      yyval = new TAO_PSDL_Except_Dcl (yyvsp[-2]);
-    ;
-    break;}
-case 227:
-#line 907 "PSDL.yy"
-{
-      int good_op_dcl_name = TAO_PSDL_Scope::instance ()->pop_top_scope ()->add_op_dcl (TAO_PSDL_Scope::instance ()->get_identifier ());
-
-            if (good_op_dcl_name == -1)
-        YYABORT;
-
-      yyval = yyvsp[0];
-    ;
-    break;}
-case 228:
-#line 918 "PSDL.yy"
-{ TAO_PSDL_Scope::instance ()->set_scope ();
-      yyval = new TAO_PSDL_Op_Dcl (yyvsp[-5], yyvsp[-4], yyvsp[-3], yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 229:
-#line 922 "PSDL.yy"
-{ TAO_PSDL_Scope::instance ()->set_scope ();
-      yyval = new TAO_PSDL_Op_Dcl (yyvsp[-4], yyvsp[-3], yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 230:
-#line 926 "PSDL.yy"
-{ TAO_PSDL_Scope::instance ()->set_scope ();
-      yyval = new TAO_PSDL_Op_Dcl (yyvsp[-4], yyvsp[-3], yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 231:
-#line 930 "PSDL.yy"
-{ TAO_PSDL_Scope::instance ()->set_scope ();
-      yyval = new TAO_PSDL_Op_Dcl (yyvsp[-4], yyvsp[-3], yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 232:
-#line 934 "PSDL.yy"
-{ TAO_PSDL_Scope::instance ()->set_scope ();
-                  yyval = new TAO_PSDL_Op_Dcl (yyvsp[-3], yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 233:
-#line 938 "PSDL.yy"
-{ TAO_PSDL_Scope::instance ()->set_scope ();
-      yyval = new TAO_PSDL_Op_Dcl (yyvsp[-3], yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 234:
-#line 942 "PSDL.yy"
-{ TAO_PSDL_Scope::instance ()->set_scope ();
-                  yyval = new TAO_PSDL_Op_Dcl (yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 235:
-#line 947 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_ONEWAY); ;
-    break;}
-case 236:
-#line 951 "PSDL.yy"
-{ yyval = new TAO_PSDL_Op_Type_Spec (yyvsp[0]); ;
-    break;}
-case 237:
-#line 954 "PSDL.yy"
-{ yyval = new TAO_PSDL_Op_Type_Spec (TAO_PSDL_VOID); ;
-    break;}
-case 238:
-#line 958 "PSDL.yy"
-{ yyval = new TAO_PSDL_Parameter_Dcls (yyvsp[-1]); ;
-    break;}
-case 239:
-#line 961 "PSDL.yy"
-{ yyval = new TAO_PSDL_Parameter_Dcls (); ;
-    break;}
-case 240:
-#line 965 "PSDL.yy"
-{ yyval = new TAO_PSDL_Param_Dcl (yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 241:
-#line 968 "PSDL.yy"
-{ yyval = new TAO_PSDL_Param_Dcl (yyvsp[-4], yyvsp[-3], yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 242:
-#line 972 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_IN); ;
-    break;}
-case 243:
-#line 975 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_OUT); ;
-    break;}
-case 244:
-#line 978 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_INOUT); ;
-    break;}
-case 245:
-#line 982 "PSDL.yy"
-{ yyval = new TAO_PSDL_Raises_Expr (yyvsp[-1]); ;
-    break;}
-case 246:
-#line 985 "PSDL.yy"
-{ yyval = new TAO_PSDL_Raises_Expr (yyvsp[-3], yyvsp[-2]); ;
-    break;}
-case 247:
-#line 989 "PSDL.yy"
-{ yyval = new TAO_PSDL_Context_Expr (yyvsp[-1]); ;
-    break;}
-case 248:
-#line 993 "PSDL.yy"
-{ yyval = new TAO_PSDL_Param_Type_Spec (yyvsp[0]); ;
-    break;}
-case 249:
-#line 996 "PSDL.yy"
-{ yyval = new TAO_PSDL_Param_Type_Spec (yyvsp[0]); ;
-    break;}
-case 250:
-#line 999 "PSDL.yy"
-{ yyval = new TAO_PSDL_Param_Type_Spec (yyvsp[0]); ;
-    break;}
-case 251:
-#line 1002 "PSDL.yy"
-{ yyval = new TAO_PSDL_Param_Type_Spec (yyvsp[0]); ;
-    break;}
-case 252:
-#line 1006 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (yyvsp[-3], yyvsp[-1]); ;
-    break;}
-case 253:
-#line 1010 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 254:
-#line 1014 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 255:
-#line 1018 "PSDL.yy"
-{ yyval = new TAO_PSDL_Constr_Forward_Decl (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 256:
-#line 1021 "PSDL.yy"
-{ yyval = new TAO_PSDL_Constr_Forward_Decl (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 257:
-#line 1025 "PSDL.yy"
-{ yyval = new TAO_PSDL_Interface (yyvsp[0]); ;
-    break;}
-case 258:
-#line 1028 "PSDL.yy"
-{ yyval = new TAO_PSDL_Interface (yyvsp[0]); ;
-    break;}
-case 259:
-#line 1032 "PSDL.yy"
-{
-      TAO_PSDL_Scope::instance ()->set_interface_scope ();
-      yyval = new TAO_PSDL_Interface_Dcl (yyvsp[-3], yyvsp[-1]);
-    ;
-    break;}
-case 260:
-#line 1038 "PSDL.yy"
-{
-      TAO_PSDL_Scope::instance ()->set_interface_scope ();
-      yyval = new TAO_PSDL_Interface_Dcl (yyvsp[-2]);
-    ;
-    break;}
-case 261:
-#line 1045 "PSDL.yy"
-{ yyval = new TAO_PSDL_Forward_Dcl (TAO_PSDL_ABSTRACT, yyvsp[0]); ;
-    break;}
-case 262:
-#line 1048 "PSDL.yy"
-{ yyval = new TAO_PSDL_Forward_Dcl (TAO_PSDL_LOCAL, yyvsp[0]); ;
-    break;}
-case 263:
-#line 1051 "PSDL.yy"
-{ yyval = new TAO_PSDL_Forward_Dcl (yyvsp[0]); ;
-    break;}
-case 264:
-#line 1055 "PSDL.yy"
-{
-      int good_interface_name = TAO_PSDL_Scope::instance ()->pop_top_scope ()->add_interface (TAO_PSDL_Scope::instance ()->get_identifier ());
-      if (good_interface_name == -1)
-          YYABORT;
-
-      yyval = yyvsp[0];
-    ;
-    break;}
-case 265:
-#line 1065 "PSDL.yy"
-{ yyval = new TAO_PSDL_Interface_Header (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 266:
-#line 1068 "PSDL.yy"
-{ yyval = new TAO_PSDL_Interface_Header (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 267:
-#line 1071 "PSDL.yy"
-{ yyval = new TAO_PSDL_Interface_Header (yyvsp[0]); ;
-    break;}
-case 268:
-#line 1074 "PSDL.yy"
-{ yyval = new TAO_PSDL_Interface_Header (yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 269:
-#line 1077 "PSDL.yy"
-{ yyval = new TAO_PSDL_Interface_Header (yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 270:
-#line 1080 "PSDL.yy"
-{ yyval = new TAO_PSDL_Interface_Header (yyvsp[0], yyvsp[-1]); ;
-    break;}
-case 271:
-#line 1084 "PSDL.yy"
-{ yyval = new TAO_PSDL_Interface_Body (yyvsp[0]); ;
-    break;}
-case 272:
-#line 1087 "PSDL.yy"
-{ yyval = new TAO_PSDL_Interface_Body (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 273:
-#line 1091 "PSDL.yy"
-{ yyval = new TAO_PSDL_Export_Dcl (yyvsp[-1]); ;
-    break;}
-case 274:
-#line 1094 "PSDL.yy"
-{ yyval = new TAO_PSDL_Export_Dcl (yyvsp[-1]); ;
-    break;}
-case 275:
-#line 1097 "PSDL.yy"
-{ yyval = new TAO_PSDL_Export_Dcl (yyvsp[-1]); ;
-    break;}
-case 276:
-#line 1100 "PSDL.yy"
-{ yyval = new TAO_PSDL_Export_Dcl (yyvsp[-1]); ;
-    break;}
-case 277:
-#line 1103 "PSDL.yy"
-{ yyval = new TAO_PSDL_Export_Dcl (yyvsp[-1]); ;
-    break;}
-case 278:
-#line 1108 "PSDL.yy"
-{ yyval = new TAO_PSDL_Interface_Inheritance_Spec (yyvsp[0]); ;
-    break;}
-case 279:
-#line 1112 "PSDL.yy"
-{ yyval = new TAO_PSDL_Interface_Name (yyvsp[0]); ;
-    break;}
-case 280:
-#line 1115 "PSDL.yy"
-{ yyval = new TAO_PSDL_Interface_Name (yyvsp[-2], yyvsp[-1]); ;
-    break;}
-case 281:
-#line 1119 "PSDL.yy"
-{ yyval = new TAO_PSDL_Scoped_Name (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 282:
-#line 1122 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 283:
-#line 1126 "PSDL.yy"
-{ yyval = new TAO_PSDL_Scoped_Name (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 284:
-#line 1129 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 285:
-#line 1133 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value (yyvsp[0]); ;
-    break;}
-case 286:
-#line 1136 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value (yyvsp[0]); ;
-    break;}
-case 287:
-#line 1139 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value (yyvsp[0]); ;
-    break;}
-case 288:
-#line 1142 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value (yyvsp[0]); ;
-    break;}
-case 289:
-#line 1146 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Common_Base (yyvsp[0]); ;
-    break;}
-case 290:
-#line 1150 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Forward_Dcl (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 291:
-#line 1153 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Forward_Dcl (yyvsp[0]); ;
-    break;}
-case 292:
-#line 1157 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Box_Dcl (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 293:
-#line 1161 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Abs_Dcl (yyvsp[-4], yyvsp[-3], yyvsp[-1]); ;
-    break;}
-case 294:
-#line 1164 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Abs_Dcl (yyvsp[-3], yyvsp[-1]); ;
-    break;}
-case 295:
-#line 1168 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Dcl (yyvsp[-3], yyvsp[-1]); ;
-    break;}
-case 296:
-#line 1172 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Header (yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 297:
-#line 1175 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Header (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 298:
-#line 1178 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Header (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 299:
-#line 1182 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Inheritance_Spec (yyvsp[-3], yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 300:
-#line 1185 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Inheritance_Spec (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 301:
-#line 1188 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Inheritance_Spec (yyvsp[0]); ;
-    break;}
-case 302:
-#line 1191 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Inheritance_Spec (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 303:
-#line 1194 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Inheritance_Spec (yyvsp[0]); ;
-    break;}
-case 304:
-#line 1199 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_STRING, yyvsp[-1]); ;
-    break;}
-case 305:
-#line 1202 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_STRING); ;
-    break;}
-case 306:
-#line 1206 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (yyvsp[-1]); ;
-    break;}
-case 307:
-#line 1209 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 308:
-#line 1213 "PSDL.yy"
-{ yyval = new TAO_PSDL_Array_Declarator (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 309:
-#line 1217 "PSDL.yy"
-{ yyval = new TAO_PSDL_Fixed_Array_Size (yyvsp[-1]); ;
-    break;}
-case 310:
-#line 1221 "PSDL.yy"
-{ yyval = new TAO_PSDL_Attr_Dcl (TAO_PSDL_READONLY, yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 311:
-#line 1224 "PSDL.yy"
-{ yyval = new TAO_PSDL_Attr_Dcl (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 312:
-#line 1228 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_ENUM, yyvsp[-3], yyvsp[-1]); ;
-    break;}
-case 313:
-#line 1232 "PSDL.yy"
-{ yyval = new TAO_PSDL_Enumerator (yyvsp[0]); ;
-    break;}
-case 314:
-#line 1235 "PSDL.yy"
-{ yyval = new TAO_PSDL_Enumerator (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 315:
-#line 1239 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_SEQUENCE, yyvsp[-3], yyvsp[-1]); ;
-    break;}
-case 316:
-#line 1242 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_SEQUENCE, yyvsp[-1]); ;
-    break;}
-case 317:
-#line 1246 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 318:
-#line 1249 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 319:
-#line 1252 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 320:
-#line 1255 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 321:
-#line 1258 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 322:
-#line 1261 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 323:
-#line 1264 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 324:
-#line 1267 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 325:
-#line 1271 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 326:
-#line 1274 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 327:
-#line 1278 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 328:
-#line 1282 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 329:
-#line 1286 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 330:
-#line 1290 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 331:
-#line 1294 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 332:
-#line 1298 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 333:
-#line 1302 "PSDL.yy"
-{ yyval = yyvsp[0]; ;
-    break;}
-case 334:
-#line 1306 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Name (yyvsp[0]); ;
-    break;}
-case 335:
-#line 1309 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Name (yyvsp[-2], yyvsp[0]); ;
-    break;}
-case 336:
-#line 1313 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Element (yyvsp[0]); ;
-    break;}
-case 337:
-#line 1316 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Element (yyvsp[0]); ;
-    break;}
-case 338:
-#line 1319 "PSDL.yy"
-{ yyval = new TAO_PSDL_Value_Element (yyvsp[0]); ;
-    break;}
-case 339:
-#line 1323 "PSDL.yy"
-{ yyval = new TAO_PSDL_State_Member (yyvsp[-3], yyvsp[-2], yyvsp[-1]); ;
-    break;}
-case 340:
-#line 1326 "PSDL.yy"
-{ yyval = new TAO_PSDL_State_Member (yyvsp[-3], yyvsp[-2], yyvsp[-1]); ;
-    break;}
-case 341:
-#line 1330 "PSDL.yy"
-{ yyval = new TAO_PSDL_Init_Dcl (yyvsp[-4], yyvsp[-2]); ;
-    break;}
-case 342:
-#line 1333 "PSDL.yy"
-{ yyval = new TAO_PSDL_Init_Dcl (yyvsp[-3]); ;
-    break;}
-case 343:
-#line 1337 "PSDL.yy"
-{ yyval = new TAO_PSDL_Init_Param_Decls (yyvsp[0]); ;
-    break;}
-case 344:
-#line 1340 "PSDL.yy"
-{ yyval = new TAO_PSDL_Init_Param_Decls (yyvsp[-2], yyvsp[-1]); ;
-    break;}
-case 345:
-#line 1344 "PSDL.yy"
-{ yyval = new TAO_PSDL_Init_Param_Decl (yyvsp[-2], yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 346:
-#line 1348 "PSDL.yy"
-{ yyval = new TAO_PSDL_Predefined_Type (TAO_PSDL_IN); ;
-    break;}
-case 347:
-#line 1352 "PSDL.yy"
-{ yyval = new TAO_PSDL_Positive_Int_Const (yyvsp[0]); ;
-    break;}
-case 348:
-#line 1356 "PSDL.yy"
-{ yyval = new TAO_PSDL_Factory_Dcl (yyvsp[-1], yyvsp[0]); ;
-    break;}
-case 349:
-#line 1360 "PSDL.yy"
-{ yyval = new TAO_PSDL_Factory_Parameters (yyvsp[-1]); ;
-    break;}
-case 350:
-#line 1363 "PSDL.yy"
-{ yyval = new TAO_PSDL_Factory_Parameters (); ;
-    break;}
-}
-
-#line 705 "/usr/share/bison/bison.simple"
-
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#if YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
-
-#if YYDEBUG
-  if (yydebug)
-    {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "state stack now");
-      while (yyssp1 != yyssp)
-  YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
-    }
-#endif
-
-  *++yyvsp = yyval;
-#if YYLSP_NEEDED
-  *++yylsp = yyloc;
-#endif
-
-  /* Now `shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTBASE];
-
-  goto yynewstate;
-
-
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && yyn < YYLAST)
-  {
-    YYSIZE_T yysize = 0;
-    char *yymsg;
-    int yyx, yycount;
-
-    yycount = 0;
-    /* Start YYX at -YYN if negative to avoid negative indexes in
-       YYCHECK.  */
-    for (yyx = yyn < 0 ? -yyn : 0;
-         yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-      if (yycheck[yyx + yyn] == yyx)
-        yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-    yysize += yystrlen ("parse error, unexpected ") + 1;
-    yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
-    yymsg = (char *) YYSTACK_ALLOC (yysize);
-    if (yymsg != 0)
-      {
-        char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
-        yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
-
-        if (yycount < 5)
-    {
-      yycount = 0;
-      for (yyx = yyn < 0 ? -yyn : 0;
-           yyx < (int) (sizeof (yytname) / sizeof (char *));
-           yyx++)
-        if (yycheck[yyx + yyn] == yyx)
-          {
-      const char *yyq = ! yycount ? ", expecting " : " or ";
-      yyp = yystpcpy (yyp, yyq);
-      yyp = yystpcpy (yyp, yytname[yyx]);
-      yycount++;
-          }
-    }
-        yyerror (yymsg);
-        YYSTACK_FREE (yymsg);
-      }
-    else
-      yyerror ("parse error; also virtual memory exhausted");
-  }
-      else
-#endif /* defined (YYERROR_VERBOSE) */
-  yyerror ("parse error");
-    }
-  goto yyerrlab1;
-
-
-/*--------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action |
-`--------------------------------------------------*/
-yyerrlab1:
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-   error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-  YYABORT;
-      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
-      yychar, yytname[yychar1]));
-      yychar = YYEMPTY;
-    }
-
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-
-  yyerrstatus = 3;    /* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
-
-/*-------------------------------------------------------------------.
-| yyerrdefault -- current state does not do anything special for the |
-| error token.                                                       |
-`-------------------------------------------------------------------*/
-yyerrdefault:
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-
-  /* If its default is to accept any token, ok.  Otherwise pop it.  */
-  yyn = yydefact[yystate];
-  if (yyn)
-    goto yydefault;
-#endif
-
-
-/*---------------------------------------------------------------.
-| yyerrpop -- pop the current state because it cannot handle the |
-| error token                                                    |
-`---------------------------------------------------------------*/
-yyerrpop:
-  if (yyssp == yyss)
-    YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#if YYLSP_NEEDED
-  yylsp--;
-#endif
-
-#if YYDEBUG
-  if (yydebug)
-    {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "Error: state stack now");
-      while (yyssp1 != yyssp)
-  YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
-    }
-#endif
-
-/*--------------.
-| yyerrhandle.  |
-`--------------*/
-yyerrhandle:
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
-
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-  goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrpop;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
-  *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-/*---------------------------------------------.
-| yyoverflowab -- parser overflow comes here.  |
-`---------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
-  yyresult = 2;
-  /* Fall through.  */
-
-yyreturn:
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-  return yyresult;
-}
-#line 1365 "PSDL.yy"
diff --git a/orbsvcs/PSS/PSDL_y.h b/orbsvcs/PSS/PSDL_y.h
deleted file mode 100644
index 3df528749ef..00000000000
--- a/orbsvcs/PSS/PSDL_y.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// $Id$
-
-# define  TAO_PSDL_SEMI 257
-# define  TAO_PSDL_MODULE 258
-# define  TAO_PSDL_COLON  259
-# define  TAO_PSDL_OPEN_CURLY_BRACE 260
-# define  TAO_PSDL_CLOSE_CURLY_BRACE  261
-# define  TAO_PSDL_OPEN_BRACE 262
-# define  TAO_PSDL_CLOSE_BRACE  263
-# define  TAO_PSDL_ABSTRACT 264
-# define  TAO_PSDL_STORAGETYPE  265
-# define  TAO_PSDL_STORAGEHOME  266
-# define  TAO_PSDL_CATALOG  267
-# define  TAO_PSDL_PROVIDES 268
-# define  TAO_PSDL_IMPLEMENTS 269
-# define  TAO_PSDL_SCOPE  270
-# define  TAO_PSDL_STORES 271
-# define  TAO_PSDL_STATE  272
-# define  TAO_PSDL_AS 273
-# define  TAO_PSDL_PRIMARY  274
-# define  TAO_PSDL_STRONG 275
-# define  TAO_PSDL_REF  276
-# define  TAO_PSDL_OF 277
-# define  TAO_PSDL_OPEN_ANGULAR_BRACE 278
-# define  TAO_PSDL_CLOSE_ANGULAR_BRACE  279
-# define  TAO_PSDL_COMMA  280
-# define  TAO_PSDL_KEY  281
-# define  TAO_PSDL_READONLY 282
-# define  TAO_PSDL_UNION  283
-# define  TAO_PSDL_SWITCH 284
-# define  TAO_PSDL_CASE 285
-# define  TAO_PSDL_WCHAR  286
-# define  TAO_PSDL_BOOLEAN  287
-# define  TAO_PSDL_OCTET  288
-# define  TAO_PSDL_ANY  289
-# define  TAO_PSDL_OBJECT 290
-# define  TAO_PSDL_STRUCT 291
-# define  TAO_PSDL_DEFAULT  292
-# define  TAO_PSDL_FLOAT  293
-# define  TAO_PSDL_DOUBLE 294
-# define  TAO_PSDL_LONG 295
-# define  TAO_PSDL_SHORT  296
-# define  TAO_PSDL_UNSIGNED 297
-# define  TAO_PSDL_CHAR 298
-# define  TAO_PSDL_IDENT  299
-# define  TAO_PSDL_TYPEDEF  300
-# define  TAO_PSDL_NATIVE 301
-# define  TAO_PSDL_PLUS 302
-# define  TAO_PSDL_MINUS  303
-# define  TAO_PSDL_XOR  304
-# define  TAO_PSDL_AND  305
-# define  TAO_PSDL_MULT 306
-# define  TAO_PSDL_RIGHT_SHIFT  307
-# define  TAO_PSDL_LEFT_SHIFT 308
-# define  TAO_PSDL_DIV  309
-# define  TAO_PSDL_PERCENT  310
-# define  TAO_PSDL_TILDA  311
-# define  TAO_PSDL_ONEWAY 312
-# define  TAO_PSDL_CONST  313
-# define  TAO_PSDL_EQUAL  314
-# define  TAO_PSDL_OR 315
-# define  TAO_PSDL_VOID 316
-# define  TAO_PSDL_IN 317
-# define  TAO_PSDL_OUT  318
-# define  TAO_PSDL_INOUT  319
-# define  TAO_PSDL_RAISES 320
-# define  TAO_PSDL_CONTEXT  321
-# define  TAO_PSDL_FIXED  322
-# define  TAO_PSDL_VALUEBASE  323
-# define  TAO_PSDL_EXCEPTION  324
-# define  TAO_PSDL_INTERFACE  325
-# define  TAO_PSDL_LOCAL  326
-# define  TAO_PSDL_DOUBLE_COLON 327
-# define  TAO_PSDL_VALUETYPE  328
-# define  TAO_PSDL_CUSTOM 329
-# define  TAO_PSDL_TRUNCATABLE  330
-# define  TAO_PSDL_SUPPORTS 331
-# define  TAO_PSDL_STRING 332
-# define  TAO_PSDL_WSTRING  333
-# define  TAO_PSDL_ATTRIBUTE  334
-# define  TAO_PSDL_OPEN_SQUARE_BRACE  335
-# define  TAO_PSDL_CLOSE_SQUARE_BRACE 336
-# define  TAO_PSDL_ENUM 337
-# define  TAO_PSDL_SEQUENCE 338
-# define  TAO_PSDL_TRUE 339
-# define  TAO_PSDL_FALSE  340
-# define  TAO_PSDL_INTEGER  341
-# define  TAO_PSDL_FLOATING 342
-# define  TAO_PSDL_PRIVATE  343
-# define  TAO_PSDL_PUBLIC 344
-# define  TAO_PSDL_FACTORY  345
-# define  TAO_PSDL_FLOATING_PT  346
-# define  TAO_PSDL_CHAR_LITERAL 347
-# define  TAO_PSDL_FIXED_PT 348
diff --git a/orbsvcs/PSS/README b/orbsvcs/PSS/README
deleted file mode 100644
index 106a07c5dd5..00000000000
--- a/orbsvcs/PSS/README
+++ /dev/null
@@ -1,261 +0,0 @@
-
-			Persistence State Service
-			-------------------------
-
-	The Persistent State Service (PSS) provides a standard way to
-persistently save the state of objects in a datastore. A datastore is
-an entity that manages data like a database or a set of files. For
-TAO's implementation of PSS, the datastore is a normal file, for now.
-
-	The PSS defines two ways to define the datastore schema and
-the interfaces to the storage object instances in the datastore. One
-way is to use the Persistent State Definition Language (PSDL). PSDL
-language is a superset to the IDL language and introduces four new
-constructs: storagehome, storagetype, abstract storagehome and
-abstract storagetype. A PSDL file (which is similar to an IDL file)
-contain the definitions which describe the interface to the
-datastore. This psdl interface and the datastore is visible only to
-the server which saves the state of objects. The clients to this
-server do not idea about how the server saves the state of the
-objects and hence have no idea about the psdl interface or the
-datastore.
-
-	 The PSS implementation provides a compiler tool to process
-the psdl file and generates stubs (I will use the name 'stub' just for
-the lack of any other name.. though this stub is not the same as the
-normal stub that is generated by the IDL compiler).
-
-			PSDL Compiler
-			=============
-
-	TAO's implementation of the PSS provides psdl_tao as the
-compiler to 
-
-Design
-======
-
-	The Input file (of format pidl) is first parsed with the
-yacc-lex parser. The TAO_PSDL_Interpreter has a method (build_tree)
-which helps construct an expression tree representing nodes from the
-tokens returned by the Yacc generated parser. In addition, based on
-the grammar set in PSDL.yy, any syntax errors are checked by the yacc
-parser. Using the '-b' (build-tree) option, you can print out the
-generated parse-tree for debugging purposes. All the classes in
-PSDL_Node help build the parse tree.
-(@@ To-do: I should be adding an option to the executable so that the
-parse tree can be printed out when the option is set.)
-
-	Along with the basic parsing, we build the symbol
-table. The TAO_PSDL_Scope class is the base class which helps add each
-type (like interface, exceptions etc) to the symbol table.
-
-	The symbol table is constructed using the ACE hash maps.
-We use two kinds of hash-maps...one maps the identifier to a
-structure (Node_Info) which has information about the identifier
-(identifier_type, module_name & interface_name (module and interfaces
-to which this identifier belongs).  This is used in cases where in the
-identifier doesnt have some members in itself.. constant declarations,
-typedefs, exceptions with no members etc.
-
-	Unlike a simple declaration or a typedef, types like
-interfaces have member declarations which come with their scope. For
-example, an interface has its own set of declarations, methods,
-interfaces etc. For such types, we will have a class derived from
-base TAO_PDSL_Scope. [In the case of interfaces, it is
-TAO_PSDL_Interface_Scope.] The second hash map is to
-map the identifier and the instance of the identifier's
-type... i.e. say the identifier is of type interface, this hash-map
-has a mapping between the identifier and the pointer to the instance
-of TAO_PSDL_Interface_Scope. [All the TAO_PSDL_*_Scope classes fall in
-this category.]
-
-	In this phase, along with building the symbol table, we also
-do the semantic checking. Semantic checking includes checking if an
-identifier that is declared before is now being redeclared.
-Identifiers are case-sensitive and case-insensitive too...
-ie. for ex: You cannot have CosNaming and cosnaming.
-
-	After the symbol tables are built, the next step is to
-generate code in to the stubs. The classes TAO_PSDL_*_Visitor generates
-this code. TAO_PSDL_Node_Visitor is the base class and the derived
-classes override the necessary methods. So, if you want to generate
-for some other type in future, we need to have another of
-TAO_PSDL_*_Visitor class and override the necessary virtual method.
-
-
-Implementation files of the stubs (idlC.cpp)
-=================================
-
-	The generation of the header and implementation files 
-for the stubs can be done in a single pass. The implementation files
-mainly involves the '<<' and '>>' operator support. These operators
-support will be mainly useful while marshalling and demarshalling the
-data types.
-
-
-
-
-Status in a summary.
-=======
-
-1. Can parse any psdl file.
-2. Does syntax checking.
-3. Can build parse tree for most but not all of the types.
-4. Builds ASTs for the basic types which includes typedefs,
-   interfaces, structs, modules, exceptions, constant declarations.
-5. Generate the code that goes into the header file for the same types
-   listed above.
-
-
-Files and Description
-=====================
-
-PSDL.yy			Yacc file which has the PSDL grammar.
-
-PSDL_y.cpp
-PSDL_y.h		Yacc generated files.
-
-PSDL_l.cpp		Lex generated file.
-
-PSDL_Node.h
-PSDL_Node.cpp		Each node in the parse tree is derived from
-			the base type TAO_PSDL_Node. The classes in
-			this file provide the interface for the
-			different types. Each class will have accessor
-			methods to access the private members and an
-			accept method to invoke the corresponding
-			visitor method. (We are applying the visitor
-			pattern here.)
-
-
-PSDL_Scope.h
-PSDL_Scope.cpp
-PSDL_*_Scope.*		The classes in these files are useful for
-			building the AST. TAO_PSDL_Scope is the base
-			class and there are classes for each type
-			(which has members in it, ex: interface)
-			which needs to be added to the AST which
-			derive from TAO_PSDL_Scope.
-
-PSDL_Node_Visitor.h
-PSDL_Node_Visitor.cpp
-PSDL_*_Visitor.*	TAO_PSDL_Node_Visitor acts as a base class
-			useful for generating code into
-			stubs. TAO_PDSL_Node_Visitor derives from
-			TAO_PSDL_Scope_Visitor. The sub-classes (for
-			the different types) which
-			need to override the basic functionality of
-			the visitor methods in TAO_PSDL_Node_Visitor
-			derive from it and override accordingly. The
-derived classes methods are invoked from the base class as needed
-making use of the factory pattern (TAO_PSDL_Visitor_Factory).
-
-
-To-Do
-====
-
-1. The visitor classes should generate the code into a file and not to
-   stdout as I am doing now.
-
-2. Support for comments , pragmas etc. Right now, if you have
-   comments or pragmas, its going to fail.
-
-Test
-====
-
-% ./psdl_tao < trial_idl.idl
-
-
-Things to do
-============
-
-
-1. Have a test to include all the existing types. Should check the
-   generated code and check if it is the right thing. - 2 days
-
-2. Work on the stubs.
-    . Redirect the output to a file rather than to stdout.
-    . Work on the implementation files (*C.cpp). This will be based on
-      ACE Reliable Multicast framework. 
-      ps: Bala told last friday that ACE Reliable Multicast Framework
-	  has several bugs. So, this might end up taking longer. FYI,
-
-			- 2 weeks. 
-
-3. Have a test/example for the total framework. 1 week- 10 days
-
-	- Have an application which is going to use the PSS framework.. have a server etc.
-
-4. Additional Documentation as needed including
-   . Steps for modifying the existing services to use PSS. 1 week.
-
-	
-5. Include support for all the types in PSDL language in all the
-   stages which includes mainly
-    . Building the parse tree
-    . While building ASTs
-    . Generating the stubs.
-
-6. Extend the tests to include all the new types.
-
-
-
-IMR
-===
-
-1. Test
-
-2. Documentation abt the differences between old and new IMR.
-3. How to update/migrate to the new IMR.
-
-4. Code review.  2 days
-5. modift  2 days.
-
-
-MInor things
-============
-
-1. Print out the Caps of the names 
-
-#if !defined (_TRIAL_INTERFACE___PTR_CH_)
-
-instead of
-
-#if !defined (__trial_interface___PTR_CH_)
-
-
-2. Check out TAO_NAMESPACE_STORAGE_CLASS and static nad extern storage classes before _tc_*
-
-
-Notes on how to proceed
-=======================
-
-1. Serialize the data using TAO_OutputCDR.
-
-The implementation files should have the '<<' and '>>' methods.
-
-2. There needs to be another executable or library which would be
-actually saving the state of objects to the database. Since RMCast is
-not working right now, we can save the data to a file and retrieve
-from it. 
-
-
-Example
-=======
-
-1. Have a mini naming idl which just has the bind and find functions
-   support. 
-
-	There can be just a server.cpp which will bind information.
-
-2. Have a psdl interface which has a 
-
-	sequence of struct (name,
-			    stringified_ior). 
-
-	When a bind is done, it has to be going through the helper
-classes and inserted into a hash_map and saved to the file. And when
-find is invoked, it has to be read from the file and demarshalled.
-
-
-
diff --git a/orbsvcs/PSS/psdl_export.h b/orbsvcs/PSS/psdl_export.h
deleted file mode 100644
index 19409b8a680..00000000000
--- a/orbsvcs/PSS/psdl_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_PSDL_EXPORT_H
-#define TAO_PSDL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_PSDL_HAS_DLL)
-#    define TAO_PSDL_HAS_DLL 0
-#  endif /* ! TAO_PSDL_HAS_DLL */
-#else
-#if !defined (TAO_PSDL_HAS_DLL)
-#  define TAO_PSDL_HAS_DLL 1
-#endif /* ! TAO_PSDL_HAS_DLL */
-#endif /* TAO_AS_STATIC_LIBS */
-
-#if defined (TAO_PSDL_HAS_DLL) && (TAO_PSDL_HAS_DLL == 1)
-#  if defined (TAO_PSDL_BUILD_DLL)
-#    define TAO_PSDL_Export ACE_Proper_Export_Flag
-#    define TAO_PSDL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_PSDL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_PSDL_BUILD_DLL */
-#    define TAO_PSDL_Export ACE_Proper_Import_Flag
-#    define TAO_PSDL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_PSDL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_PSDL_BUILD_DLL */
-#else /* TAO_PSDL_HAS_DLL == 1 */
-#  define TAO_PSDL_Export
-#  define TAO_PSDL_SINGLETON_DECLARATION(T)
-#  define TAO_PSDL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_PSDL_HAS_DLL == 1 */
-
-#endif /* TAO_PSDL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/orbsvcs/PSS/psdl_tao.cpp b/orbsvcs/PSS/psdl_tao.cpp
deleted file mode 100644
index 82d765ca145..00000000000
--- a/orbsvcs/PSS/psdl_tao.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-// $Id$
-
-#include "PSDL_Scope.h"
-#include "PSDL_Extern.h"
-#include "Dump_Visitor.h"
-
-int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  void *result_ptr = 0;
-
-  TAO_PSDL_Extern psdl_extern;
-
-  if (argc < 2)
-    psdl_extern.TAO_PSDL_Extern_yyin (stdin);
-  else
-    psdl_extern.TAO_PSDL_Extern_yyin (ACE_OS::fopen (argv[1], "r"));
-
-  ACE_OS::strtok (argv[1], ACE_TEXT ("."));
-
-  TAO_PSDL_Scope::instance ()->set_stub_prefix (ACE_TEXT_ALWAYS_CHAR (argv[1]));
-  TAO_PSDL_Scope::instance ()->set_root_scope ();
-
-  // The syntax is checked and ASTs are build.
-  int result = psdl_extern.TAO_PSDL_Extern_yyparse (result_ptr);
-
-  if (result != 0)
-  {
-    ACE_DEBUG ((LM_ERROR,
-                "Error in yyparse\n"));
-    return -1;
-  }
-
-  TAO_PSDL_Node *tree_node = psdl_extern.TAO_PSDL_Extern_yyval ();
-
-  // The following segment of the code is for printing out a parse
-  // tree. To-Do: have a parse option so that
-  // the parse tree will be printed out when that option is used.
-  // {@@
-  /*Dump_Visitor visitor (0);
-
-  int result_visitor = tree_node->accept (&visitor);
-
-  if (result_visitor != 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Error in creating the parse tree\n"));
-  // @@}
-  */
-
-  // This segment is responsible for generating code
-  // for the stubs.
-  // {@@
-  TAO_PSDL_Node_Visitor node_visitor;
-
-  result = tree_node->accept (&node_visitor);
-
-  if (result != 0)
-    {
-      ACE_DEBUG ((LM_ERROR,
-                  "Error in writing the stubs\n"));
-      return -1;
-    }
-  // @@}
-
-  return 0;
-}
diff --git a/orbsvcs/Scheduling_Service/Makefile.am b/orbsvcs/Scheduling_Service/Makefile.am
deleted file mode 100644
index 45042fd7326..00000000000
--- a/orbsvcs/Scheduling_Service/Makefile.am
+++ /dev/null
@@ -1,56 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Scheduling_Service.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS = Scheduling_Service
-
-Scheduling_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Scheduling_Service_SOURCES = \
-  Scheduling_Service.cpp \
-  Scheduling_Service.h
-
-Scheduling_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 84294849ce7..678584016bf 100644
--- a/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -9,12 +9,7 @@
 #include "ace/OS_main.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_strings.h"
-
-ACE_RCSID (Scheduling_Service,
-           Scheduling_Service,
-           "$Id$")
-
-// Default Constructor.
+#include "ace/OS_NS_unistd.h"
 
 TAO_Scheduling_Service::TAO_Scheduling_Service (void)
   : scheduler_impl_ (0),
@@ -23,9 +18,7 @@ TAO_Scheduling_Service::TAO_Scheduling_Service (void)
 {
 }
 
-
 // Constructor taking the command-line arguments.
-
 TAO_Scheduling_Service::TAO_Scheduling_Service (int argc, ACE_TCHAR* argv[])
   : scheduler_impl_ (0),
     service_name_ ("ScheduleService"),
@@ -34,15 +27,11 @@ TAO_Scheduling_Service::TAO_Scheduling_Service (int argc, ACE_TCHAR* argv[])
   this->init (argc, argv);
 }
 
-// Destructor.
-
 TAO_Scheduling_Service::~TAO_Scheduling_Service (void)
 {
 }
 
-
 // Initialize the Scheduling Service with the arguments.
-
 int
 TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
 {
diff --git a/orbsvcs/Scheduling_Service/Scheduling_Service.mpc b/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
index a6fd23697f3..9d3a4a959c1 100644
--- a/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
+++ b/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
@@ -2,5 +2,5 @@
 // $Id$
 
 project : orbsvcsexe, install, rtsched, naming, svc_utils, iortable, portableserver, utils {
-  exename  = Scheduling_Service
+  exename  = tao_cosscheduling
 }
diff --git a/orbsvcs/TAO_Service/Makefile.am b/orbsvcs/TAO_Service/Makefile.am
deleted file mode 100644
index 2542a4b66ca..00000000000
--- a/orbsvcs/TAO_Service/Makefile.am
+++ /dev/null
@@ -1,44 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.TAO_Service.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS = TAO_Service
-
-TAO_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-TAO_Service_SOURCES = \
-  TAO_Service.cpp
-
-TAO_Service_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/orbsvcs/TAO_Service/TAO_Service.cpp b/orbsvcs/TAO_Service/TAO_Service.cpp
index 07951b17a0e..a5b9df174b5 100644
--- a/orbsvcs/TAO_Service/TAO_Service.cpp
+++ b/orbsvcs/TAO_Service/TAO_Service.cpp
@@ -1,22 +1,19 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs/TAO_Service/
-//
-// = FILENAME
-//   TAO_Service.cpp
-//
-// = DESCRIPTION
-//   This directory contains an example that illustrates how the ACE
-//   Service Configurator can dynamically configure an ORB and its
-//   servants from a svc.conf file.
-//
-// = AUTHOR
-//     Priyanka Gontla <pgontla@ece.uci.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   TAO_Service.cpp
+ *
+ *  $Id$
+ *
+ * This directory contains an example that illustrates how the ACE
+ * Service Configurator can dynamically configure an ORB and its
+ * servants from a svc.conf file.
+ *
+ *
+ *  @author  Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #include "tao/ORB_Constants.h"
 #include "tao/ORB.h"
@@ -26,11 +23,6 @@
 #include "ace/Time_Value.h"
 #include "ace/Argv_Type_Converter.h"
 
-ACE_RCSID (TAO_Service,
-           TAO_Service,
-           "$Id$")
-
-
 extern "C" void handler (int)
 {
   ACE_Service_Config::reconfig_occurred (1);
diff --git a/orbsvcs/TAO_Service/TAO_Service.mpc b/orbsvcs/TAO_Service/TAO_Service.mpc
index cec3858e522..f7a27d58b55 100644
--- a/orbsvcs/TAO_Service/TAO_Service.mpc
+++ b/orbsvcs/TAO_Service/TAO_Service.mpc
@@ -2,5 +2,5 @@
 // $Id$
 
 project : taoexe, install {
-  exename = TAO_Service
+  exename = tao_service
 }
diff --git a/orbsvcs/TAO_Service/svc.conf b/orbsvcs/TAO_Service/svc.conf
index 6168a3a624d..1c34a6ada24 100644
--- a/orbsvcs/TAO_Service/svc.conf
+++ b/orbsvcs/TAO_Service/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # Dynamically configure the naming service into the application process.
 #dynamic TAO_Naming_Loader Service_Object * TAO_CosNaming_Serv:_make_TAO_Naming_Loader () "dummy -o ns.ior"
 
@@ -12,7 +14,7 @@
 
 #Dynamically remove the trading service from the application process
 #remove TAO_Trading_Loader
-	
+
 #Dynamically remove the event service from the application process
 #remove TAO_Event_Loader
 
diff --git a/orbsvcs/Time_Service/Clerk_i.cpp b/orbsvcs/Time_Service/Clerk_i.cpp
index abde51def24..189991f6f26 100644
--- a/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/orbsvcs/Time_Service/Clerk_i.cpp
@@ -11,7 +11,7 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID(Time_Service, Clerk_i, "$Id$")
+
 
 // Constructor.
 
diff --git a/orbsvcs/Time_Service/Clerk_i.h b/orbsvcs/Time_Service/Clerk_i.h
index bd9ce302f01..0b4f8c700da 100644
--- a/orbsvcs/Time_Service/Clerk_i.h
+++ b/orbsvcs/Time_Service/Clerk_i.h
@@ -1,18 +1,15 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Time_Service
-//
-// = FILENAME
-//    Clerk_i.h
-//
-// = AUTHOR
-//    Vishal Kachroo <vishal@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Clerk_i.h
+ *
+ *  $Id$
+ *
+ *  @author Vishal Kachroo <vishal@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef CLERK_I_H
 #define CLERK_I_H
@@ -24,14 +21,16 @@
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/Time/TAO_Time_Service_Clerk.h"
 
+/**
+ * @class Clerk_i
+ *
+ * @brief CORBA Time Clerk implementation.
+ *
+ * A CORBA server that initializes the TimeService clerk
+ * implementation and the ORB.
+ */
 class Clerk_i
 {
-  // = TITLE
-  //   CORBA Time Clerk implementation.
-  //
-  // = DESCRIPTION
-  //   A CORBA server that initializes the TimeService clerk
-  //   implementation and the ORB.
 public:
 
   enum {
@@ -41,98 +40,100 @@ public:
   };
 
   // = Initialization and termination methods.
+  /// Constructor.
   Clerk_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~Clerk_i (void);
-  // Destructor.
 
+  /// Set of available Time servers.
   typedef ACE_Array_Base<CosTime::TimeService_var> IORS;
-  // Set of available Time servers.
 
+  /// Initialize the Clerk state - parsing arguments and waiting.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the Clerk state - parsing arguments and waiting.
 
+  /// Run the orb.
   int run (void);
-  // Run the orb.
 
 private:
+  /// Insert a server in the internal data structure (servers_).
   void insert_server (CosTime::TimeService_ptr server);
-  // Insert a server in the internal data structure (servers_).
 
 private:
 
+  /// Read the server IORs from a file instead of using a naming
+  /// service.
   int read_ior (const ACE_TCHAR* filename);
-  // Read the server IORs from a file instead of using a naming
-  // service.
 
+  /// Parses the commandline arguments.
   int parse_args (int argc,
                   ACE_TCHAR* argv[]);
-  // Parses the commandline arguments.
 
+  /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
 
+  /// File where the IOR of the Clerk object is stored.
   FILE *ior_output_file_;
-  // File where the IOR of the Clerk object is stored.
 
+  /// Initialises the name client and registers the <TimeService> Clerk
+  /// object with it.
   int init_naming_service ();
-  // Initialises the name client and registers the <TimeService> Clerk
-  // object with it.
 
+  /// Create an instance of the clerk to use.
   int create_clerk (void);
-  // Create an instance of the clerk to use.
 
+  /// Bind the clerk in the appropriate context in the Naming Service.
   int register_clerk (void);
-  // Bind the clerk in the appropriate context in the Naming Service.
 
+  /// Initialise the Interface Repository and register the clerk
+  /// implementation with it.
   int init_IR (void);
-  // Initialise the Interface Repository and register the clerk
-  // implementation with it.
 
+  /// Get the reference to the server naming context and the first
+  /// server IOR.
   int get_first_IOR (void);
-  // Get the reference to the server naming context and the first
-  // server IOR.
 
+  /// Iterate over the given server context to get the rest of the
+  /// server IORs.
   int next_n_IORs (CosNaming::BindingIterator_var iter,
                    CosNaming::NamingContext_var server_context);
-  // Iterate over the given server context to get the rest of the
-  // server IORs.
 
+  /**
+   * An instance of the name server used for registering the
+   * <TimeService Clerk> object. The same instance is used by the
+   * Clerk to periodically iterate through the Server Naming Context
+   * and get IORs of the available servers.
+   */
   TAO_Naming_Client naming_client_;
-  // An instance of the name server used for registering the
-  // <TimeService Clerk> object. The same instance is used by the
-  // Clerk to periodically iterate through the Server Naming Context
-  // and get IORs of the available servers.
 
+  /// Implementation of the <TimeService> Clerk object.
   TAO_Time_Service_Clerk *time_service_clerk_impl_;
-  // Implementation of the <TimeService> Clerk object.
 
+  /// Reference of the time service clerk.
   CosTime::TimeService_var time_service_clerk_;
-  // Reference of the time service clerk.
 
+  /// Naming context for the Naming Service.
   CosNaming::NamingContext_var time_service_clerk_context_;
-  // Naming context for the Naming Service.
 
+  /// My orb.
   CORBA::ORB_var orb_;
-  // My orb.
 
+  /// Clerk seeks time periodically after this interval in secs. from the
+  /// servers in the network.
   int timer_value_ ;
-  // Clerk seeks time periodically after this interval in secs. from the
-  // servers in the network.
 
+  /// Continues the precision of timer_value_ in microseconds.
   int timer_value_usecs_;
-  // Continues the precision of timer_value_ in microseconds.
 
   //  IR_Helper *ir_helper_;
   // Helper class for using the IR.
 
+  /// The unbounded set of server IORS.
   IORS server_;
-  // The unbounded set of server IORS.
 
+  /// Read IORs from a file.
   int ior_fp_;
-  // Read IORs from a file.
 };
 
 #endif /* CLERK_I_H */
diff --git a/orbsvcs/Time_Service/Makefile.am b/orbsvcs/Time_Service/Makefile.am
deleted file mode 100644
index e02048202f8..00000000000
--- a/orbsvcs/Time_Service/Makefile.am
+++ /dev/null
@@ -1,90 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-bin_PROGRAMS =
-
-## Makefile.Time_Service_Clerk.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS += Time_Service_Clerk
-
-Time_Service_Clerk_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Time_Service_Clerk_SOURCES = \
-  Clerk_i.cpp \
-  Time_Service_Clerk.cpp \
-  Clerk_i.h
-
-Time_Service_Clerk_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Time_Service_Server.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS += Time_Service_Server
-
-Time_Service_Server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Time_Service_Server_SOURCES = \
-  Server_i.cpp \
-  Time_Service_Server.cpp \
-  Server_i.h
-
-Time_Service_Server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/Time_Service/Server_i.cpp b/orbsvcs/Time_Service/Server_i.cpp
index 60421473742..c90b4e3999e 100644
--- a/orbsvcs/Time_Service/Server_i.cpp
+++ b/orbsvcs/Time_Service/Server_i.cpp
@@ -9,7 +9,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID(Time_Service, Server_i, "$Id$")
+
 
 // Constructor.
 Server_i::Server_i (void)
diff --git a/orbsvcs/Time_Service/Server_i.h b/orbsvcs/Time_Service/Server_i.h
index 2727cc51ec8..c7c62376c74 100644
--- a/orbsvcs/Time_Service/Server_i.h
+++ b/orbsvcs/Time_Service/Server_i.h
@@ -1,18 +1,15 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Time_Service
-//
-// = FILENAME
-//    Server_i.h
-//
-// = AUTHOR
-//    Vishal Kachroo <vishal@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Server_i.h
+ *
+ *  $Id$
+ *
+ *  @author Vishal Kachroo <vishal@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef SERVER_I_H
 #define SERVER_I_H
@@ -24,65 +21,67 @@
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/Time/TAO_Time_Service_Server.h"
 
+/**
+ * @class Server_i
+ *
+ * @brief CORBA Server implementation.
+ *
+ * A CORBA server that initializes the <TimeService Server>
+ * servant implementation and the ORB.
+ */
 class Server_i
 {
-  // = TITLE
-  //   CORBA Server implementation.
-  //
-  // = DESCRIPTION
-  //    A CORBA server that initializes the <TimeService Server>
-  //    servant implementation and the ORB.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Server_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~Server_i (void);
-  // Destructor.
 
+  /// Initialize the Server state.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the Server state.
 
+  /// Run the orb.
   int run (void);
-  // Run the orb.
 
+  /// Initialises the name client.
   int init_naming_service ();
-  // Initialises the name client.
 
+  /// Create the time server object.
   int create_server (void);
-  // Create the time server object.
 
+  /// Register the time server object with the Naming Service.
   int register_server (void);
-  // Register the time server object with the Naming Service.
 
+  /// Parse the commandline arguments.
   int parse_args (int argc,
                   ACE_TCHAR* argv[]);
-  // Parse the commandline arguments.
 
 private:
 
+  /// My orb.
   CORBA::ORB_var orb_;
-  // My orb.
 
+  /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
 
+  /// File where the IOR of the Clerk object is stored.
   FILE *ior_output_file_;
-  // File where the IOR of the Clerk object is stored.
 
+  /// An instance of the name server used for registering the
+  /// <TimeService Server> object.
   TAO_Naming_Client naming_client_;
-  // An instance of the name server used for registering the
-  // <TimeService Server> object.
 
+  /// Implementation of the <TimeService> Server object.
   TAO_Time_Service_Server *time_service_server_impl_;
-  // Implementation of the <TimeService> Server object.
 
+  /// Reference of the time server.
   CosTime::TimeService_var time_service_server_;
-  // Reference of the time server.
 
+  /// Naming context for the Naming Service.
   CosNaming::NamingContext_var time_service_server_context_;
-  // Naming context for the Naming Service.
 };
 
 #endif /* SERVER_I_H */
diff --git a/orbsvcs/Time_Service/Time_Service.mpc b/orbsvcs/Time_Service/Time_Service.mpc
index af33776a411..ec6d2297206 100644
--- a/orbsvcs/Time_Service/Time_Service.mpc
+++ b/orbsvcs/Time_Service/Time_Service.mpc
@@ -2,7 +2,7 @@
 // $Id$
 
 project(Time_Service_Server) : orbsvcsexe, install, time_serv, naming, utils, avoids_corba_e_micro {
-  exename  = Time_Service_Server
+  exename  = tao_costime_server
   Source_Files {
     Server_i.cpp
     Time_Service_Server.cpp
@@ -10,7 +10,7 @@ project(Time_Service_Server) : orbsvcsexe, install, time_serv, naming, utils, av
 }
 
 project(Time_Service_Clerk) : orbsvcsexe, install, time_serv, naming, utils, avoids_corba_e_micro {
-  exename  = Time_Service_Clerk
+  exename  = tao_costime_clerk
   Source_Files {
     Clerk_i.cpp
     Time_Service_Clerk.cpp
diff --git a/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/orbsvcs/Time_Service/Time_Service_Clerk.cpp
index 8a0347b8c09..79649db92a1 100644
--- a/orbsvcs/Time_Service/Time_Service_Clerk.cpp
+++ b/orbsvcs/Time_Service/Time_Service_Clerk.cpp
@@ -3,7 +3,7 @@
 #include "Clerk_i.h"
 #include "ace/OS_main.h"
 
-ACE_RCSID(TimeService, Time_Service_Clerk, "$Id$")
+
 
 // This is the main driver program for the Time Service clerk.
 
diff --git a/orbsvcs/Time_Service/Time_Service_Server.cpp b/orbsvcs/Time_Service/Time_Service_Server.cpp
index 4b2714a3c24..fe0c8e9c885 100644
--- a/orbsvcs/Time_Service/Time_Service_Server.cpp
+++ b/orbsvcs/Time_Service/Time_Service_Server.cpp
@@ -3,7 +3,7 @@
 #include "Server_i.h"
 #include "ace/OS_main.h"
 
-ACE_RCSID(TimeService, Time_Service_Server, "$Id$")
+
 
 // This is the main driver program for the Time Service server.
 
diff --git a/orbsvcs/Trading_Service/Makefile.am b/orbsvcs/Trading_Service/Makefile.am
deleted file mode 100644
index 9ee7edd0fd5..00000000000
--- a/orbsvcs/Trading_Service/Makefile.am
+++ /dev/null
@@ -1,61 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Trading_Service.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS = Trading_Service
-
-Trading_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Trading_Service_SOURCES = \
-  Trading_Server.cpp \
-  Trading_Service.cpp \
-  Trading_Service.h
-
-Trading_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/Trading_Service/Trading_Service.cpp b/orbsvcs/Trading_Service/Trading_Service.cpp
index f1d46210ff3..95566172a03 100644
--- a/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -1,11 +1,8 @@
 // $Id$
 
-#include "ace/OS.h"
 #include "ace/Arg_Shifter.h"
 #include "Trading_Service.h"
 
-ACE_RCSID(Trading_Service, Trading_Service, "$Id$")
-
 Trading_Shutdown::Trading_Shutdown (Trading_Service& trader)
   : trader_ (trader)
 {
diff --git a/orbsvcs/Trading_Service/Trading_Service.h b/orbsvcs/Trading_Service/Trading_Service.h
index b33337661f7..bcd169bc287 100644
--- a/orbsvcs/Trading_Service/Trading_Service.h
+++ b/orbsvcs/Trading_Service/Trading_Service.h
@@ -1,19 +1,15 @@
 // -*- C++ -*-
-//
-// $Id$
-
-// ========================================================================
-//
-// = BINARY
-//    trader
-//
-// = FILENAME
-//    Trading_Service.h
-//
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//
-// =======================================================================
+
+//=============================================================================
+/**
+ *  @file    Trading_Service.h
+ *
+ *  $Id$
+ *
+ *  @author Seth Widoff <sbw1@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _TRADING_SERVICE_H
 #define _TRADING_SERVICE_H
@@ -32,52 +28,58 @@
 
 class Trading_Service;
 
+/**
+ * @class Trading_Shutdown
+ *
+ * @brief A class that shutsdown a Trading Service instance.
+ */
 class Trading_Shutdown : public ACE_Event_Handler
 {
-  // = TITLE
-  //   A class that shutsdown a Trading Service instance.
 public:
+  /// Constructor.
   Trading_Shutdown (Trading_Service& trader);
-  // Constructor.
 
+  /// Signal handler.
   virtual int handle_signal (int,
                              siginfo_t *,
                              ucontext_t *);
-  // Signal handler.
 
 protected:
   Trading_Service &trader_;
   ACE_Sig_Handler shutdown_;
 };
 
+/**
+ * @class Trading_Service
+ *
+ * @brief A class that initializes a Trading Service instance.
+ */
 class Trading_Service
 {
-  // = TITLE
-  //   A class that initializes a Trading Service instance.
 public:
 
+  /// Default constructor.
   Trading_Service (void);
-  // Default constructor.
 
+  /// Destructor
   ~Trading_Service (void);
-  // Destructor
 
+  /// Initialize the Trading Service with arguments.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the Trading Service with arguments.
 
+  /// Run the Trading Service.
   int run (void);
-  // Run the Trading Service.
 
   int shutdown (void);
 
 protected:
 
+  /// Pointer to the linked trader.
   auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader_;
-  // Pointer to the linked trader.
 
+  /// Instance of TAO_Trading_Laoder
   TAO_Trading_Loader trading_loader_;
-  // Instance of TAO_Trading_Laoder
 };
 
 #endif /* _TRADING_SERVICE_H */
diff --git a/orbsvcs/Trading_Service/Trading_Service.mpc b/orbsvcs/Trading_Service/Trading_Service.mpc
index 2cc06e3d3df..67ddcf202e2 100644
--- a/orbsvcs/Trading_Service/Trading_Service.mpc
+++ b/orbsvcs/Trading_Service/Trading_Service.mpc
@@ -2,6 +2,6 @@
 // $Id$
 
 project : orbsvcsexe, utils, install, naming, trading_serv {
-  exename  = Trading_Service
+  exename  = tao_costrading
 }
 
diff --git a/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl b/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl
index 9e68302b882..63ddf14c056 100644
--- a/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl
+++ b/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl
@@ -1,14 +1,14 @@
-// $Id$
 
-// ============================================================================
-//
-// = FILENAME
-//    CosEventChannelFactory.idl
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    CosEventChannelFactory.idl
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_COSEVENTCHANNELFACTORY_IDL
 #define TAO_COSEVENTCHANNELFACTORY_IDL
diff --git a/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
index 13ebcb5b406..df950da6a24 100644
--- a/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
+++ b/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/examples/CosEC/Factory
-//
-// = FILENAME
-//    CosEventChannelFactory_i.h
-//
-// = DESCRIPTION
-//    This class implements the CosEventChannelFactory
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CosEventChannelFactory_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the CosEventChannelFactory
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_COSEVENTCHANNELFACTORY_I_H
 #define TAO_COSEVENTCHANNELFACTORY_I_H
@@ -34,32 +31,34 @@ class TAO_CosEventChannelFactory_i :
 {
  public:
   // = Initialization and termination code.
+  /// Constructor.
   TAO_CosEventChannelFactory_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~TAO_CosEventChannelFactory_i (void);
-  // Destructor.
 
+  /**
+   * This method creates a child poa with <poa> as the
+   * parent. It also accepts a Naming_Context which is used to register
+   * the event channels if specified.
+   * Returns -1 on error, 0 on success.
+   * @@ Pradeep: this looks OK. I wonder if it would be a good idea to
+   *    raise exceptions, but I'm undecided.
+   * @@ Pradeep: when is the child poa destroyed? Maybe we should add
+   *    a destroy() method to the factory interface (in IDL).
+   * @@ Carlos: if we add a <destroy> to the factory, any client will be
+   * able to destroy the factory!
+   * @@ Pradeep: it could be a method of the Factory_i class, it
+   *    doesn't have to be exposed through the IDL interface. Anyway,
+   *    there must be a way to cleanup any resources created by the
+   *    factory, and you must avoid CORBA calls in the destructor,
+   *    first because you won't have an and second because
+   *    exceptions in destructors are evil.
+   * @@ Pradeep: anyway you can just use exceptions and not return -1?
+   */
   int init (PortableServer::POA_ptr poa,
             const char* child_poa_name,
             CosNaming::NamingContext_ptr naming = CosNaming::NamingContext::_nil ());
-  // This method creates a child poa with <poa> as the
-  // parent. It also accepts a Naming_Context which is used to register
-  // the event channels if specified.
-  // Returns -1 on error, 0 on success.
-  // @@ Pradeep: this looks OK. I wonder if it would be a good idea to
-  //    raise exceptions, but I'm undecided.
-  // @@ Pradeep: when is the child poa destroyed? Maybe we should add
-  //    a destroy() method to the factory interface (in IDL).
-  // @@ Carlos: if we add a <destroy> to the factory, any client will be
-  // able to destroy the factory!
-  // @@ Pradeep: it could be a method of the Factory_i class, it
-  //    doesn't have to be exposed through the IDL interface. Anyway,
-  //    there must be a way to cleanup any resources created by the
-  //    factory, and you must avoid CORBA calls in the destructor,
-  //    first because you won't have an and second because
-  //    exceptions in destructors are evil.
-  // @@ Pradeep: anyway you can just use exceptions and not return -1?
 
   // = CosEventChannelFactory::ChannelFactory methods.
   virtual CosEventChannelAdmin::EventChannel_ptr create
@@ -85,11 +84,11 @@ class TAO_CosEventChannelFactory_i :
      );
  protected:
 
+  /// The Poa with which we activate all the Event Channels.
   PortableServer::POA_var poa_;
-  // The Poa with which we activate all the Event Channels.
 
+  /// The naming context to use.
   CosNaming::NamingContext_var naming_;
-  // The naming context to use.
 };
 
 #include /**/ "ace/post.h"
diff --git a/orbsvcs/examples/CosEC/Factory/FactoryDriver.h b/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
index 866c7c840e8..40c1af54d1f 100644
--- a/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
+++ b/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
@@ -1,22 +1,19 @@
 
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/examples/CosEC/Factory
-//
-// = FILENAME
-//    FactoryDriver.h
-//
-// = DESCRIPTION
-//    This class implements the Factory driver.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    FactoryDriver.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Factory driver.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_FACTORYDRIVER_H
 #define TAO_FACTORYDRIVER_H
@@ -29,52 +26,54 @@
 //    using the -ORBInitRef mechanisms?  That way we can run this
 //    stuff without the naming service running.
 
+ /**
+  * @class FactoryDriver
+  *
+  * @brief Driver class for the CosEventChannel Factory.
+  *
+  * creates a CosEventChannel Factory and registers it with the
+  * naming service.
+  */
 class FactoryDriver
 {
-  // = TITLE
-  //   Driver class for the CosEventChannel Factory.
-  // = DESCRIPTION
-  //   creates a CosEventChannel Factory and registers it with the
-  //   naming service.
-  //
  public:
   // = Initialization and termination code.
+  /// Constructor.
   FactoryDriver (const ACE_TCHAR* factory = ACE_TEXT("CosEC_Factory"));
-  // Constructor.
 
+  /// Destructor.
   ~FactoryDriver (void);
-  // Destructor.
 
+  /// Start the driver.
   int start (int argc, ACE_TCHAR *argv []);
-  // Start the driver.
 
+  ///Stop the driver.
   int stop (void);
-  //Stop the driver.
 
  protected:
+  /// Parse the command-line arguments and set options.
   int parse_args (int argc, ACE_TCHAR *argv []);
-  // Parse the command-line arguments and set options.
 
+  /// The name of the factory registered with the naming service.
   const ACE_TCHAR *factoryName_;
-  // The name of the factory registered with the naming service.
 
+  /// The name of the Child POA.
   const char* child_poa_name_;
-  // The name of the Child POA.
 
+  /// The ORB that we use.
   CORBA::ORB_var orb_;
-  // The ORB that we use.
 
+  /// The factory servant.
   TAO_CosEventChannelFactory_i *factory_servant_;
-  // The factory servant.
 
+  /// Reference to the root poa.
   PortableServer::POA_var root_poa_;
-  // Reference to the root poa.
 
+  /// The corba object after activation.
   CosEventChannelFactory::ChannelFactory_var factory_;
-  // The corba object after activation.
 
+  /// Use a naming client.
   TAO_Naming_Client naming_client_;
-  // Use a naming client.
 
 };
 #endif /*  TAO_FACTORYDRIVER_H */
diff --git a/orbsvcs/examples/CosEC/Factory/Makefile.am b/orbsvcs/examples/CosEC/Factory/Makefile.am
deleted file mode 100644
index c49590b624c..00000000000
--- a/orbsvcs/examples/CosEC/Factory/Makefile.am
+++ /dev/null
@@ -1,136 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CosEC_Factory_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  CosEventChannelFactoryC.cpp \
-  CosEventChannelFactoryC.h \
-  CosEventChannelFactoryC.inl \
-  CosEventChannelFactoryS.cpp \
-  CosEventChannelFactoryS.h \
-  CosEventChannelFactoryS.inl
-
-CLEANFILES = \
-  CosEventChannelFactory-stamp \
-  CosEventChannelFactoryC.cpp \
-  CosEventChannelFactoryC.h \
-  CosEventChannelFactoryC.inl \
-  CosEventChannelFactoryS.cpp \
-  CosEventChannelFactoryS.h \
-  CosEventChannelFactoryS.inl
-
-CosEventChannelFactoryC.cpp CosEventChannelFactoryC.h CosEventChannelFactoryC.inl CosEventChannelFactoryS.cpp CosEventChannelFactoryS.h CosEventChannelFactoryS.inl: CosEventChannelFactory-stamp
-
-CosEventChannelFactory-stamp: $(srcdir)/CosEventChannelFactory.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/CosEventChannelFactory.idl
-	@touch $@
-
-noinst_HEADERS = \
-  CosEventChannelFactory.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CosEC_Factory_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += FactoryClient
-
-FactoryClient_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-FactoryClient_SOURCES = \
-  CosEventChannelFactoryC.cpp \
-  FactoryClient.cpp \
-  CosEventChannelFactory_i.h \
-  FactoryDriver.h
-
-FactoryClient_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CosEC_Factory_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += FactoryServer
-
-FactoryServer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-FactoryServer_SOURCES = \
-  CosEventChannelFactoryC.cpp \
-  CosEventChannelFactoryS.cpp \
-  CosEventChannelFactory_i.cpp \
-  FactoryDriver.cpp \
-  main.cpp \
-  CosEventChannelFactory_i.h \
-  FactoryDriver.h
-
-FactoryServer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/CosEC/Makefile.am b/orbsvcs/examples/CosEC/Makefile.am
deleted file mode 100644
index fc83f662130..00000000000
--- a/orbsvcs/examples/CosEC/Makefile.am
+++ /dev/null
@@ -1,16 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Factory \
-        RtEC_Based \
-        Simple \
-        TypedSimple
-
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am b/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am
deleted file mode 100644
index ddfbbbdf826..00000000000
--- a/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am
+++ /dev/null
@@ -1,17 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        lib \
-        bin
-
-if BUILD_TESTS
-SUBDIRS += tests
-endif
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am b/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
deleted file mode 100644
index 5a2ed914e7b..00000000000
--- a/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
+++ /dev/null
@@ -1,70 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CosEC_RtEC_Based_bin.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = RtEC_Based_CosEC
-
-RtEC_Based_CosEC_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-RtEC_Based_CosEC_SOURCES = \
-  RtEC_Based_CosEC.cpp \
-  RtEC_Based_CosEC.h
-
-RtEC_Based_CosEC_LDFLAGS = \
-  -L../lib
-
-RtEC_Based_CosEC_LDADD = \
-  $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
index 5b9a122d54e..bc061941e68 100644
--- a/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
+++ b/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
@@ -1,17 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//   RtEC_Based_CosEC.h
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-//   The COS Event Channel service.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   RtEC_Based_CosEC.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *
+ * The COS Event Channel service.
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef RTEC_BASED_COSEC_H
 #define RTEC_BASED_COSEC_H
@@ -24,77 +25,79 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+/**
+ * @class RtEC_Based_CosEC
+ *
+ * @brief RtEC_Based_CosEC
+ *
+ * Implementation of the COS Event Service.
+ */
 class RtEC_Based_CosEC : public CosEC_ServantBase
 {
-  // = TITLE
-  //   RtEC_Based_CosEC
-  //
-  // = DESCRIPTION
-  //   Implementation of the COS Event Service.
 
  public:
   // = Initialization and termination methods.
+  /// Constructor.
   RtEC_Based_CosEC (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~RtEC_Based_CosEC (void);
-  // Destructor.
 
+  /// Parses the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv []);
-  // Parses the command line arguments.
 
+  /// Initializes the COS Event Service.
+  /// Returns 0 on success, -1 on error.
   void startup (int argc, ACE_TCHAR *argv[]);
-  // Initializes the COS Event Service.
-  // Returns 0 on success, -1 on error.
 
+  /// run the COS Event Service.
+  /// Returns 0 on success, -1 on error.
   int run (void);
-  // run the COS Event Service.
-  // Returns 0 on success, -1 on error.
 
+  /// Shutdown the COS Event Service.
+  /// Returns 0 on success, -1 on error.
   void shutdown (void);
-  // Shutdown the COS Event Service.
-  // Returns 0 on success, -1 on error.
 
 protected:
   // = Methods from CosEC_ServantBase
+  /// Create a local rtec.
   virtual POA_RtecEventChannelAdmin::EventChannel_ptr
   create_rtec (void);
-  // Create a local rtec.
 
+  /// Activates the rtec.
   virtual void activate_rtec (void);
-  // Activates the rtec.
 
+  /// Deactivates the rtec.
   virtual void deactivate_rtec (void);
-  // Deactivates the rtec.
 
+  /// initialize the ORB.
   void init_ORB (int& argc, ACE_TCHAR *argv []);
-  // initialize the ORB.
 
+  /// Resolve the naming service.
   void resolve_naming_service (void);
-  // Resolve the naming service.
 
+  /// Locate a rtec.
   void locate_rtec (void);
-  // Locate a rtec.
 
   // = Data members
+  /// The name we use to register with the Naming Service.
   const ACE_TCHAR *service_name;
-  // The name we use to register with the Naming Service.
 
+  /// The name of the Real Time Event Service.
   const ACE_TCHAR *rt_service_name;
-  // The name of the Real Time Event Service.
 
+  /// The ORB that we use.
   CORBA::ORB_var orb_;
-  // The ORB that we use.
 
+  /// Reference to the root poa.
   PortableServer::POA_var poa_;
-  // Reference to the root poa.
 
+  /// A naming context.
   CosNaming::NamingContext_var naming_;
-  // A naming context.
 
+  /// Flag to indicate if the RtEC is local/remote,
+  /// 0 => local, 1 => remote, default is local.
   CORBA::Boolean remote_rtec_;
-  // Flag to indicate if the RtEC is local/remote,
-  // 0 => local, 1 => remote, default is local.
 };
 
 #if defined (_MSC_VER)
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
index 83689e0dbb0..f2e60fdd1c7 100644
--- a/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
+++ b/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
@@ -1,22 +1,20 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//   TAO services
-//
-// = FILENAME
-//   ConsumerAdmin_i
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-//   This has the implementation of the
-//   CosEventChannelAdmin::ConsumerAdmin interface.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   ConsumerAdmin_i.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *
+ * This has the implementation of the
+ * CosEventChannelAdmin::ConsumerAdmin interface.
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef CONSUMERADMIN_I_H
 #define CONSUMERADMIN_I_H
@@ -37,30 +35,30 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_ConsumerAdmin_i :
   //   RtecEventChannelAdmin::ConsumerAdmin.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   TAO_CosEC_ConsumerAdmin_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~TAO_CosEC_ConsumerAdmin_i (void);
-  // Destructor.
 
   int init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
             RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin);
 
+  /// Returns a new ProxyPushSupplier_ptr.
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
     obtain_push_supplier(void);
-  // Returns a new ProxyPushSupplier_ptr.
 
+  /// Returns a new ProxyPullSupplier_ptr.
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
     obtain_pull_supplier(void);
-  // Returns a new ProxyPullSupplier_ptr.
 
 private:
+  /// The ConsumerQOS specified by the user of this class.
   RtecEventChannelAdmin::ConsumerQOS qos_;
-  // The ConsumerQOS specified by the user of this class.
 
+  /// The RtecEventChannelAdmin::ConsumerAdmin specified by the user of
+  /// this class.
   RtecEventChannelAdmin::ConsumerAdmin_var rtec_consumeradmin_;
-  // The RtecEventChannelAdmin::ConsumerAdmin specified by the user of
-  // this class.
 };
 
 #include /**/ "ace/post.h"
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
index b9dbf4271ea..7fb9cc1d7ce 100644
--- a/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
+++ b/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs
-//
-// = FILENAME
-//     CosEvent_Utilities.h
-//
-// = DESCRIPTION
-//    A few utility classes to make it easier to write EC applications.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file     CosEvent_Utilities.h
+ *
+ *  $Id$
+ *
+ *  A few utility classes to make it easier to write EC applications.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_COSEVENT_UTILITIES_H
 #define TAO_COSEVENT_UTILITIES_H
@@ -40,113 +37,117 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase :
   //   Clients can derive from this class and create servants.
  public:
   // = Initialization method.
+  /// Constructor.
   CosEC_ServantBase (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~CosEC_ServantBase (void);
-  // Destructor.
 
+  /**
+   * This method creates a local scheduler, rtec and cosec.
+   * The POA <poa> specified here is used when <activate> is called to
+   * activate the contained servants.
+   * The POA <thispoa> is used to activate this.
+   */
   virtual void init (PortableServer::POA_ptr thispoa,
                      PortableServer::POA_ptr poa,
                      ACE_TCHAR *eventTypeIds,
                      ACE_TCHAR *eventSourceIds,
                      ACE_TCHAR *source_type_pairs);
-  // This method creates a local scheduler, rtec and cosec.
-  // The POA <poa> specified here is used when <activate> is called to
-  // activate the contained servants.
-  // The POA <thispoa> is used to activate this.
 
+  /// Activates the CosEC with <thispoa_> and friends with the <poa_>
   int activate (void);
-  // Activates the CosEC with <thispoa_> and friends with the <poa_>
 
+  /// If the servant_id is not nil then it is used to supply the object id
+  /// for <this> servant.
   int activate (const char* servant_id);
-  // If the servant_id is not nil then it is used to supply the object id
-  // for <this> servant.
 
+  /// Deactivates the CosEC and friends with the POA.
   void deactivate (void);
-  // Deactivates the CosEC and friends with the POA.
 
   // =  POA_CosEventChannelAdmin::EventChannel methods.
   virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void);
 
   virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void);
 
+  /// Destroys this Event Channel object.
   virtual void destroy (void);
-  // Destroys this Event Channel object.
 
  protected:
   // = RtEC creation, activation and deactivation methods.
+  /// Create a local rtec.
   virtual POA_RtecEventChannelAdmin::EventChannel_ptr
   create_rtec (void);
-  // Create a local rtec.
 
+  /// Activates the rtec.
   virtual void activate_rtec (void);
-  // Activates the rtec.
 
+  /// Deactivates the rtec.
   virtual void deactivate_rtec (void);
-  // Deactivates the rtec.
 
   // = CosEC creation, activation and deactivation methods.
+  /// Create a local cosec.
   TAO_CosEC_EventChannel_i*
   create_cosec (void);
-  // Create a local cosec.
 
+  /// Activates the cosec.
   int activate_cosec (void);
-  // Activates the cosec.
 
+  /// Deactivates the cosec.
   void deactivate_cosec (void);
-  // Deactivates the cosec.
 
+  /// Initialize the SupplierQOS Factory.
   void init_SupplierQOS (RtecBase::handle_t supp_handle,
                          ACE_SupplierQOS_Factory &supplier_qos,
                          ACE_TCHAR *source_type_pairs);
-  // Initialize the SupplierQOS Factory.
 
 
+  /// Initialize the ConsumerQOS Factory.
   void init_ConsumerQOS (RtecBase::handle_t cons_handle,
                          ACE_ConsumerQOS_Factory &consumer_qos,
                          ACE_TCHAR *eventTypeIds,
                          ACE_TCHAR *eventSourceIds);
-  // Initialize the ConsumerQOS Factory.
 
   // = Protected Data members.
 
+  /// The poa that we use to activate ourselves.
   PortableServer::POA_var thispoa_;
-  // The poa that we use to activate ourselves.
 
+  /// The poa that we use to activate others
   PortableServer::POA_var poa_;
-  // The poa that we use to activate others
 
+  /// The Event Channel servant.
   POA_RtecEventChannelAdmin::EventChannel_ptr rtec_servant_;
-  // The Event Channel servant.
 
+  /// The servant object of the COS Event Channel.
   TAO_CosEC_EventChannel_i *cosec_servant_;
-  // The servant object of the COS Event Channel.
 
+  /// Ref to the Rtec.
   RtecEventChannelAdmin::EventChannel_var rtec_;
-  // Ref to the Rtec.
 
+  /// Ref to the cosec.
   CosEventChannelAdmin::EventChannel_var cosec_;
-  // Ref to the cosec.
 
+  /// The Consumer QOS.
   ACE_ConsumerQOS_Factory consumer_qos_;
-  // The Consumer QOS.
 
+  /// The Supplier QOS.
   ACE_SupplierQOS_Factory supplier_qos_;
-  // The Supplier QOS.
 
+  /// The list of EventTypeIDs (for ConsumerQOS) seperated by spaces.
+  /// e.g. "1 2 3 4"
   ACE_TCHAR *eventTypeIds_;
-  // The list of EventTypeIDs (for ConsumerQOS) seperated by spaces.
-  // e.g. "1 2 3 4"
 
+  /// The list of EventSourceIDs (for ConsumerQOS) seperated by spaces.
+  /// e.g. "1 2 3 4"
   ACE_TCHAR *eventSourceIds_;
-  // The list of EventSourceIDs (for ConsumerQOS) seperated by spaces.
-  // e.g. "1 2 3 4"
 
+  /**
+   * The pairs of Source and EventType Ids (for the SupplierQOS).
+   * e.g "1 4 2 5 3 6" where (1,4) (2,5) and (3,6) from source id,
+   * event id pairs.
+   */
   ACE_TCHAR *source_type_pairs_;
-  // The pairs of Source and EventType Ids (for the SupplierQOS).
-  // e.g "1 4 2 5 3 6" where (1,4) (2,5) and (3,6) from source id,
-  // event id pairs.
 };
 
 #include /**/ "ace/post.h"
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
index cc30861b4f8..3817a8153fb 100644
--- a/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
+++ b/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
@@ -1,22 +1,20 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO services
-//
-// = FILENAME
-//   EventChannel_i
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-//   This has the implementation of the
-//   CosEventChannelAdmin::EventChannel interface.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   EventChannel_i.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *
+ * This has the implementation of the
+ * CosEventChannelAdmin::EventChannel interface.
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef EVENTCHANNEL_I_H
 #define EVENTCHANNEL_I_H
@@ -42,46 +40,46 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_EventChannel_i :
   //
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   TAO_CosEC_EventChannel_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~TAO_CosEC_EventChannel_i (void);
-  // Destructor.
 
+  /// Activates the ConsumerAdmin and SupplierAdmin servants.  Returns
+  /// -1 on error, 0 on success.
   int init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
             const RtecEventChannelAdmin::SupplierQOS &supplierqos,
             RtecEventChannelAdmin::EventChannel_ptr rtec);
-  // Activates the ConsumerAdmin and SupplierAdmin servants.  Returns
-  // -1 on error, 0 on success.
 
+  /// The for_consumers method will return the same ConsumerAdmin_ptr
+  /// everytime its called.
   virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void);
-  // The for_consumers method will return the same ConsumerAdmin_ptr
-  // everytime its called.
 
+  /// The for_suppliers method will return the same SupplierAdmin_ptr
+  /// everytime its called.
   virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void);
-  // The for_suppliers method will return the same SupplierAdmin_ptr
-  // everytime its called.
 
+  /// Destroys this Event Channel object.
   virtual void destroy (void);
-  // Destroys this Event Channel object.
 
+  /// destroys this Event Channel object and <delete>s this object.
   void shutdown (void);
-  // destroys this Event Channel object and <delete>s this object.
 
 private:
+  /// ConsumerAdmin servant object.
   TAO_CosEC_ConsumerAdmin_i* consumer_admin_;
-  // ConsumerAdmin servant object.
 
+  /// SupplierAdmin servant object.
   TAO_CosEC_SupplierAdmin_i* supplier_admin_;
-  // SupplierAdmin servant object.
 
+  /// The reference to the ConsumerAdmin interface returned after
+  /// activating the servant in the ORB.
   CosEventChannelAdmin::ConsumerAdmin_var consumeradmin_;
-  // The reference to the ConsumerAdmin interface returned after
-  // activating the servant in the ORB.
 
+  /// The reference to the SupplierAdmin interface returned after
+  /// activating the servant in the ORB.
   CosEventChannelAdmin::SupplierAdmin_var supplieradmin_;
-  // The reference to the SupplierAdmin interface returned after
-  // activating the servant in the ORB.
 };
 
 #include /**/ "ace/post.h"
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am b/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
deleted file mode 100644
index 935d64c4837..00000000000
--- a/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
+++ /dev/null
@@ -1,62 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CosEC_RtEC_Based_lib.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_LTLIBRARIES = libCosEC_RtEC_Based.la
-
-libCosEC_RtEC_Based_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_RTEC_COSEC_BUILD_DLL
-
-libCosEC_RtEC_Based_la_SOURCES = \
-  ConsumerAdmin_i.cpp \
-  CosEvent_Utilities.cpp \
-  EventChannel_i.cpp \
-  ProxyPushConsumer_i.cpp \
-  ProxyPushSupplier_i.cpp \
-  SupplierAdmin_i.cpp
-
-noinst_HEADERS = \
-  ConsumerAdmin_i.h \
-  CosEvent_Utilities.h \
-  EventChannel_i.h \
-  ProxyPushConsumer_i.h \
-  ProxyPushSupplier_i.h \
-  SupplierAdmin_i.h \
-  rtec_cosec_export.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
index b4c6bf6bc59..bfbdb60306f 100644
--- a/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
+++ b/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
@@ -1,22 +1,20 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ================================================================
-//
-// = LIBRARY
-//   TAO services
-//
-// = FILENAME
-//   ProxyPushConsumer_i
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-//   This has the implementation of the
-//   CosEventChannelAdmin::ProxyPushConsumer interface.
-//
-// ================================================================
+//=============================================================================
+/**
+ *  @file   ProxyPushConsumer_i.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *
+ * This has the implementation of the
+ * CosEventChannelAdmin::ProxyPushConsumer interface.
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef _PROXYPUSHCONSUMER_I_H
 #define _PROXYPUSHCONSUMER_I_H
@@ -46,35 +44,35 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_ProxyPushConsumer_i :
   //
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   TAO_CosEC_ProxyPushConsumer_i (const RtecEventChannelAdmin::SupplierQOS &qos,
                                  RtecEventChannelAdmin::ProxyPushConsumer_ptr proxypushconsumer);
-  // Constructor.
 
+  /// Destructor.
   ~TAO_CosEC_ProxyPushConsumer_i (void);
-  // Destructor.
 
+  /// Suppliers call this method to pass data to connected consumers.
   virtual void push (const CORBA::Any &data);
-  // Suppliers call this method to pass data to connected consumers.
 
+  /// Disconnects the supplier from the event communication.
   virtual void disconnect_push_consumer (void);
-  // Disconnects the supplier from the event communication.
 
+  /// Connects a push supplier.
   virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier);
-  // Connects a push supplier.
 
 private:
+  /// Returns 0 if a push_supplier is already connected to this
+  /// ProxyPushConsumer, otherwise it returns a 1.
   int connected (void);
-  // Returns 0 if a push_supplier is already connected to this
-  // ProxyPushConsumer, otherwise it returns a 1.
 
+  /// The SupplierQOS specified by the user of this class.
   const RtecEventChannelAdmin::SupplierQOS &qos_;
-  // The SupplierQOS specified by the user of this class.
 
+  /// The Rtec ProxyPushConsumer specified by the user of this class.
   RtecEventChannelAdmin::ProxyPushConsumer_var proxypushconsumer_;
-  // The Rtec ProxyPushConsumer specified by the user of this class.
 
+  /// The Rtec PushSupplier wrapper used by the Rtec ProxyPushConsumer.
   TAO_CosEC_PushSupplierWrapper *wrapper_;
-  // The Rtec PushSupplier wrapper used by the Rtec ProxyPushConsumer.
 };
 
 #include /**/ "ace/post.h"
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
index 875feca65d5..8512710a4cb 100644
--- a/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
+++ b/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
@@ -1,22 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ================================================================
-//
-// = LIBRARY
-//   TAO services
-//
-// = FILENAME
-//   ProxyPushSupplier_i
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-//   This has the implementation of the
-//   CosEventChannelAdmin::ProxyPushSupplier interface.
-//
-// ================================================================
+//=============================================================================
+/**
+ *  @file   ProxyPushSupplier_i.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *
+ * This has the implementation of the
+ * CosEventChannelAdmin::ProxyPushSupplier interface.
+ */
+//=============================================================================
+
 
 #ifndef _PROXYPUSHSUPPLIER_H
 #define _PROXYPUSHSUPPLIER_H
@@ -39,32 +35,32 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_ProxyPushSupplier_i :
   //   RtecEventChannelAdmin::ProxyPushSupplier.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   TAO_CosEC_ProxyPushSupplier_i (const RtecEventChannelAdmin::ConsumerQOS &qos,
                                  RtecEventChannelAdmin::ProxyPushSupplier_ptr pps);
-  // Constructor.
 
+  /// Destructor.
   ~TAO_CosEC_ProxyPushSupplier_i (void);
-  // Destructor.
 
+  /// Ends the event communication and disposes this object.
   virtual void disconnect_push_supplier (void);
-  // Ends the event communication and disposes this object.
 
+  /// Connects the <push_consumer> to the Event Channel.
   virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer);
-  // Connects the <push_consumer> to the Event Channel.
 
 private:
+  /// Returns 0 if a push_consumer is already connected to this
+  /// ProxyPushSupplier, otherwise it returns a 1.
   int connected (void);
-  // Returns 0 if a push_consumer is already connected to this
-  // ProxyPushSupplier, otherwise it returns a 1.
 
+  /// The ConsumerQOS specified by the user of this class.
   const RtecEventChannelAdmin::ConsumerQOS &qos_;
-  // The ConsumerQOS specified by the user of this class.
 
+  /// The Rtec ProxyPushSupplier specified by the user of this class.
   RtecEventChannelAdmin::ProxyPushSupplier_var pps_;
-  // The Rtec ProxyPushSupplier specified by the user of this class.
 
+  /// The Rtec PushConsumer wrapper used by the Rtec ProxyPushSupplier.
   TAO_CosEC_PushConsumerWrapper *wrapper_;
-  // The Rtec PushConsumer wrapper used by the Rtec ProxyPushSupplier.
 };
 
 #include /**/ "ace/post.h"
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
index bab4970dbbc..405fe45bed4 100644
--- a/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
+++ b/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
@@ -1,22 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//   TAO services
-//
-// = FILENAME
-//   SupplierAdmin_i.h
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-//   This has the implementation of the
-//   CosEventChannelAdmin::SupplierAdmin interface.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   SupplierAdmin_i.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *
+ * This has the implementation of the
+ * CosEventChannelAdmin::SupplierAdmin interface.
+ *
+ *
+ */
+//=============================================================================
 
 #ifndef SUPPLIER_ADMIN_I_H
 #define SUPPLIER_ADMIN_I_H
@@ -37,32 +34,32 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_SupplierAdmin_i :
   //   TAO's RtecEventChannelAdmin::SupplierAdmin.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   TAO_CosEC_SupplierAdmin_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~TAO_CosEC_SupplierAdmin_i (void);
-  // Destructor.
 
+  /// Initializes the SupplierAdmin.  Returns 0 on success, -1 on
+  /// error.
   int init (const RtecEventChannelAdmin::SupplierQOS &supplierqos,
             RtecEventChannelAdmin::SupplierAdmin_ptr rtec_supplieradmin);
-  // Initializes the SupplierAdmin.  Returns 0 on success, -1 on
-  // error.
 
+  /// Returns a new ProxyPushConsumer_ptr.
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
     obtain_push_consumer (void);
-  // Returns a new ProxyPushConsumer_ptr.
 
+  /// Returns a new ProxyPullConsumer_ptr.
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
     obtain_pull_consumer(void);
-  // Returns a new ProxyPullConsumer_ptr.
 
 private:
+  /// The SupplierQOS specified by the user of this class.
   RtecEventChannelAdmin::SupplierQOS qos_;
-  // The SupplierQOS specified by the user of this class.
 
+  /// The RtecEventChannelAdmin::SupplierAdmin specified by the user of
+  /// this class.
   RtecEventChannelAdmin::SupplierAdmin_var rtec_supplieradmin_;
-  // The RtecEventChannelAdmin::SupplierAdmin specified by the user of
-  // this class.
 };
 
 #include /**/ "ace/post.h"
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h b/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
index 37f7657a5ac..15ca31490ab 100644
--- a/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
+++ b/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
@@ -1,18 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//   Basic.h
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-//   This is a simple test class for the standard Cos Event Channel.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Basic.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *
+ * This is a simple test class for the standard Cos Event Channel.
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef COSECBASIC_H
 #define COSECBASIC_H
@@ -20,56 +21,58 @@
 #include "Consumer.h"
 #include "Supplier.h"
 
+/**
+ * @class Basic
+ *
+ * @brief class Basic
+ *
+ * Creates a CORBA Standard Event Channel (COSEC) implemented with
+ * TAO's Real-time Event Channel (RtEC) and sends an event across.
+ */
 class Basic
 {
-  // = TITLE
-  //   class Basic
-  //
-  // = DESCRIPTION
-  //   Creates a CORBA Standard Event Channel (COSEC) implemented with
-  //   TAO's Real-time Event Channel (RtEC) and sends an event across.
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Basic (void);
-  // Constructor.
 
+  /// Destructor.
   ~Basic (void);
-  // Destructor.
 
+  /// Starts up an ORB and the CosEC.
+  /// Returns 0 on success, -1 on error.
   void init (int argc, ACE_TCHAR *argv[]);
-  // Starts up an ORB and the CosEC.
-  // Returns 0 on success, -1 on error.
 
+  /// Connects a consumer and a supplier to the CosEC and sends 1 event
+  /// across.
   void run (void);
-  // Connects a consumer and a supplier to the CosEC and sends 1 event
-  // across.
 
+  /// Closes down the CosEC.
   void shutdown (void);
-  // Closes down the CosEC.
 
 private:
+  /// initializes the ORB.
+  /// Returns 0 on success, -1 on error.
   void init_ORB (int argc, ACE_TCHAR *argv[]);
-  // initializes the ORB.
-  // Returns 0 on success, -1 on error.
 
+  /// initializes the COS EC.
+  /// Returns 0 on success, -1 on error.
   void init_CosEC (void);
-  // initializes the COS EC.
-  // Returns 0 on success, -1 on error.
 
+  /// The ORB that we use.
   CORBA::ORB_var orb_;
-  // The ORB that we use.
 
+  /// The root poa.
   PortableServer::POA_var root_poa_;
-  // The root poa.
 
+  /// Reference to the CosEC returned after activating it in the ORB.
   CosEventChannelAdmin::EventChannel_var cos_ec_;
-  // Reference to the CosEC returned after activating it in the ORB.
 
+  /// The Cos Consumer that will receive the event.
   Consumer consumer_;
-  // The Cos Consumer that will receive the event.
 
+  /// The Cos Supplier that will supply the event.
   Supplier supplier_;
-  // The Cos Supplier that will supply the event.
 };
 
 #endif /* COSECBASIC_H */
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
index 7466073ed0f..4343aaef780 100644
--- a/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
+++ b/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
@@ -1,18 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ============================================================================
-//
-// = FILENAME
-//   Consumer.h
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-//   Defines a simple Push Consumer.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Consumer.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *
+ * Defines a simple Push Consumer.
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef COSECCONSUMER_H_
 #define COSECCONSUMER_H_
@@ -22,45 +23,47 @@
 #include "orbsvcs/CosEventCommS.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 
+/**
+ * @class Consumer
+ *
+ * @brief Consumer
+ *
+ * The Consumer is a simple PushConsumer that connects to the
+ * CosEC and receives events from it.
+ */
 class Consumer : public POA_CosEventComm::PushConsumer
 {
-  // = TITLE
-  //   Consumer
-  //
-  // = DESCRIPTION
-  //   The Consumer is a simple PushConsumer that connects to the
-  //   CosEC and receives events from it.
 
 public:
+  /// This method connects the consumer to the EC.
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel,
              CORBA::ORB_ptr orb);
-  // This method connects the consumer to the EC.
 
+  /// Disconnect from the EC.
   void close (void);
-  // Disconnect from the EC.
 
+  /// Connect the Consumer to the EventChannel.
   void connect (void);
-  // Connect the Consumer to the EventChannel.
 
+  /// Disconnect from the supplier, but do not forget about it or close
+  /// it.
   void disconnect (void);
-  // Disconnect from the supplier, but do not forget about it or close
-  // it.
 
+  /// push the event to the consumer.
   virtual void push (const CORBA::Any &data);
-  // push the event to the consumer.
 
+  /// disconnect the consumer from the EC.
   virtual void disconnect_push_consumer (void);
-  // disconnect the consumer from the EC.
 
 private:
+  /// The orb that we as using.
   CORBA::ORB_var orb_;
-  // The orb that we as using.
 
+  /// We talk to the EC using this proxy.
   CosEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
-  // We talk to the EC using this proxy.
 
+  /// We talk to the EC using this proxy.
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // We talk to the EC using this proxy.
 };
 
 #endif /* COSECCONSUMER_H_ */
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am b/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
deleted file mode 100644
index a05b7adbd32..00000000000
--- a/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
+++ /dev/null
@@ -1,75 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CosEC_RtEC_Based_Tests_Basic_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = Basic
-
-Basic_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Basic_SOURCES = \
-  Basic.cpp \
-  Consumer.cpp \
-  Supplier.cpp \
-  Basic.h \
-  Consumer.h \
-  Supplier.h
-
-Basic_LDFLAGS = \
-  -L../../lib
-
-Basic_LDADD = \
-  $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
index ac7f7e77f35..c315ed7f1a0 100644
--- a/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
+++ b/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
@@ -1,18 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//   Supplier.h
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-//   Defines a simple Push Supplier.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Supplier.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *
+ * Defines a simple Push Supplier.
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef COSECSUPPLIER_H_
 #define COSECSUPPLIER_H_
@@ -22,38 +23,40 @@
 #include "orbsvcs/CosEventCommS.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 
+/**
+ * @class Supplier
+ *
+ * @brief Supplier
+ *
+ * The Supplier is a simple Push Supplier that connects to
+ * the CosEC and sends events to it.
+ */
 class Supplier : public POA_CosEventComm::PushSupplier
 {
-  // = TITLE
-  //   Supplier
-  //
-  // = DESCRIPTION
-  //   The Supplier is a simple Push Supplier that connects to
-  //   the CosEC and sends events to it.
 public:
+  /// This method connects the supplier to the EC.
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
-  // This method connects the supplier to the EC.
 
+  /// Disconnect from the EC.
   void close (void);
-  // Disconnect from the EC.
 
   void connect (void);
 
+  /// Disconnect from the EC, but do not forget about it or close it.
   void disconnect (void);
-  // Disconnect from the EC, but do not forget about it or close it.
 
+  /// Send one event.
   void send_event (const CORBA::Any &data);
-  // Send one event.
 
+  /// The POA_CosEventComm::PushSupplier method.
   virtual void disconnect_push_supplier (void);
-  // The POA_CosEventComm::PushSupplier method.
 
 private:
+  /// We talk to the EC using this proxy.
   CosEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
-  // We talk to the EC using this proxy.
 
+  /// We talk to the EC using this proxy.
   CosEventChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // We talk to the EC using this proxy.
 };
 
 #endif /* COSECSUPPLIER_H_ */
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am b/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am
deleted file mode 100644
index 6e509ce0f24..00000000000
--- a/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am
+++ /dev/null
@@ -1,14 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Basic \
-        Multiple
-
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
index 2f70d238fb2..741df7d2ea5 100644
--- a/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
+++ b/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
@@ -1,18 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//   Consumer.h
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-//   Defines a simple Push Consumer.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Consumer.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *
+ * Defines a simple Push Consumer.
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef COSECCONSUMER_H_
 #define COSECCONSUMER_H_
@@ -23,55 +24,57 @@
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "Multiple.h"
 
+/**
+ * @class Consumer
+ *
+ * @brief Consumer
+ *
+ * The Consumer is a simple PushConsumer that connects to the
+ * CosEC and receives events from it.
+ */
 class Consumer : public POA_CosEventComm::PushConsumer, public Multiple
 {
-  // = TITLE
-  //   Consumer
-  //
-  // = DESCRIPTION
-  //   The Consumer is a simple PushConsumer that connects to the
-  //   CosEC and receives events from it.
 
 public:
   // = Initializatiopn and termination methods.
+  /// Constructor.
   Consumer ();
-  // Constructor.
 
+  /// Initialize the Consumer.
   int init_Consumer (void);
-  // Initialize the Consumer.
 
+  /// This method connects the consumer to the EC.
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
-  // This method connects the consumer to the EC.
 
+  /// Disconnect from the EC.
   void close (void);
-  // Disconnect from the EC.
 
+  /// Connect the Consumer to the EventChannel.
   void connect (void);
-  // Connect the Consumer to the EventChannel.
 
+  /// Disconnect from the supplier, but do not forget about it or close
+  /// it.
   void disconnect (void);
-  // Disconnect from the supplier, but do not forget about it or close
-  // it.
 
+  /// push the event to the consumer.
   virtual void push (const CORBA::Any &data);
-  // push the event to the consumer.
 
+  /// disconnect the consumer from the EC.
   virtual void disconnect_push_consumer (void);
-  // disconnect the consumer from the EC.
 
   // = CosEC_Multiple methods.
+  /// Parse the command line options.
   virtual int parse_args (int argc, ACE_TCHAR *argv []);
-  // Parse the command line options.
 
 private:
+  /// We talk to the EC using this proxy.
   CosEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
-  // We talk to the EC using this proxy.
 
+  /// We talk to the EC using this proxy.
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // We talk to the EC using this proxy.
 
+  /// The number of Events to receive before switching off.
   int event_count_;
-  // The number of Events to receive before switching off.
 };
 
 #endif /* COSECCONSUMER_H_ */
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am b/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
deleted file mode 100644
index 980d5152019..00000000000
--- a/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
+++ /dev/null
@@ -1,123 +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:
-## ../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.CosEC_RtEC_Based_Mult_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Consumer
-
-Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Consumer_SOURCES = \
-  Consumer.cpp \
-  Multiple.cpp \
-  Consumer.h \
-  Multiple.h
-
-Consumer_LDFLAGS = \
-  -L../../lib
-
-Consumer_LDADD = \
-  $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.CosEC_RtEC_Based_Mult_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Supplier
-
-Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Supplier_SOURCES = \
-  Multiple.cpp \
-  Supplier.cpp \
-  Multiple.h \
-  Supplier.h
-
-Supplier_LDFLAGS = \
-  -L../../lib
-
-Supplier_LDADD = \
-  $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h b/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
index e56bb936ea6..8fa0526f545 100644
--- a/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
+++ b/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
@@ -1,18 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//   Multiple.h
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-//   This is a test class for the Cos Event Service.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Multiple.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *
+ * This is a test class for the Cos Event Service.
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef COSECMULTIPLE_H
 #define COSECMULTIPLE_H
@@ -33,47 +34,47 @@ class Multiple
   //   via the Cos Event Service.
  public:
   // = Initialization and termination methods.
+  /// Constructor.
   Multiple (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Multiple (void);
-  // Destructor.
 
+  /// Calls parse_args, Starts up an ORB, gets hold of the Event Service.
+  /// Returns 0 on success, -1 on error.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Calls parse_args, Starts up an ORB, gets hold of the Event Service.
-  // Returns 0 on success, -1 on error.
 
+  /// Calls the ORB's <run> method.
   int runORB (void);
-  // Calls the ORB's <run> method.
 
+  /// Closes down the ORB and exits.
   void shutdown (void);
-  // Closes down the ORB and exits.
 
  protected:
+  /// Parse the command line arguments.
   virtual int parse_args (int argc, ACE_TCHAR *argv []) = 0;
-  // Parse the command line arguments.
 
+  /// Reference to a running Event Service.
   CosEventChannelAdmin::EventChannel_ptr cos_ec_;
-  // Reference to a running Event Service.
 
+  /// The name with which to locate the Event Service.
   const ACE_TCHAR *service_name_;
-  // The name with which to locate the Event Service.
 
  private:
+  /// initializes the ORB.
+  /// Returns 0 on success, -1 on error.
   int init_ORB (int argc, ACE_TCHAR *argv[]);
-  // initializes the ORB.
-  // Returns 0 on success, -1 on error.
 
+  /// initializes the COS EC.
+  /// Returns 0 on success, -1 on error.
   int init_CosEC (void);
-  // initializes the COS EC.
-  // Returns 0 on success, -1 on error.
 
+  /// The ORB that we use.
   CORBA::ORB_var orb_;
-  // The ORB that we use.
 
+  /// An instance of the name client used for resolving the factory
+  /// objects.
   TAO_Naming_Client naming_client_;
-  // An instance of the name client used for resolving the factory
-  // objects.
 };
 
 #endif /* COSECMULTIPLE_H */
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
index e5daf50692e..b5c5a4dc199 100644
--- a/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
+++ b/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
@@ -1,18 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//   Supplier.h
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-//   Defines a simple Push Supplier.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Supplier.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *
+ * Defines a simple Push Supplier.
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef COSECSUPPLIER_H_
 #define COSECSUPPLIER_H_
@@ -34,41 +35,41 @@ class Supplier : public POA_CosEventComm::PushSupplier,
   //   the CosEC and sends events to it.
 public:
   // = Initializatiopn and termination methods.
+  /// Constructor.
   Supplier ();
-  // Constructor.
 
+  /// This method connects the supplier to the EC.
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
-  // This method connects the supplier to the EC.
 
+  /// Disconnect from the EC.
   void close (void);
-  // Disconnect from the EC.
 
   void connect (void);
 
+  /// Disconnect from the EC, but do not forget about it or close it.
   void disconnect (void);
-  // Disconnect from the EC, but do not forget about it or close it.
 
+  /// Send one event.
   void send_event (const CORBA::Any &data);
-  // Send one event.
 
+  /// The POA_CosEventComm::PushSupplier method.
   virtual void disconnect_push_supplier (void);
-  // The POA_CosEventComm::PushSupplier method.
 
+  /// Sends the events to the EC.
   void run (void);
-  // Sends the events to the EC.
 
   // = Multiple methods.
+  /// Parses the command line arguments.
   virtual int parse_args (int argc, ACE_TCHAR *argv []);
-  // Parses the command line arguments.
 private:
+  /// We talk to the EC using this proxy.
   CosEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
-  // We talk to the EC using this proxy.
 
+  /// We talk to the EC using this proxy.
   CosEventChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // We talk to the EC using this proxy.
 
+  /// The number of Events to send to the EC.
   int event_count_;
-  // The number of Events to send to the EC.
 };
 
 #endif /* COSECSUPPLIER_H_ */
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl b/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl
index 05096ee23c4..07e70c584bb 100755
--- a/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl
+++ b/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl
@@ -75,10 +75,10 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
 
-$ES = $es->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Event_Service/Event_Service",
+$ES = $es->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Event_Service/tao_rtevent",
                           "-t new -ORBInitRef NameService=file://$es_nsiorfile");
 
 $CE1 = $ce1->CreateProcess ("../../bin/RtEC_Based_CosEC",
diff --git a/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl b/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl
index 2a49b37fb6b..fe697b1fe92 100755
--- a/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl
+++ b/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl
@@ -62,10 +62,10 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
 
-$ES = $es->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Event_Service/Event_Service",
+$ES = $es->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Event_Service/tao_rtevent",
                           "-t new -ORBInitRef NameService=file://$es_nsiorfile");
 
 $CE = $ce->CreateProcess ("../../bin/RtEC_Based_CosEC",
diff --git a/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/orbsvcs/examples/CosEC/Simple/Consumer.cpp
index 215f8f99441..a622faa18d7 100644
--- a/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -4,10 +4,6 @@
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (CosEC_Examples,
-           Consumer,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://ec.ior");
 
 int
diff --git a/orbsvcs/examples/CosEC/Simple/Consumer.h b/orbsvcs/examples/CosEC/Simple/Consumer.h
index cd03b0c7b32..a47ee71a6eb 100644
--- a/orbsvcs/examples/CosEC/Simple/Consumer.h
+++ b/orbsvcs/examples/CosEC/Simple/Consumer.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS COS Event Channel examples
-//
-// = FILENAME
-//   Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Consumer.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef CONSUMER_H
 #define CONSUMER_H
@@ -23,34 +19,35 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Consumer
+ *
+ * @brief Simple consumer object
+ *
+ * This class is a consumer of events.
+ */
 class Consumer : public POA_CosEventComm::PushConsumer
 {
-  // = TITLE
-  //   Simple consumer object
-  //
-  // = DESCRIPTION
-  //   This class is a consumer of events.
-  //
 public:
+  /// Constructor
   Consumer (void);
-  // Constructor
 
+  /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
-  // Run the test
 
   // = The CosEventComm::PushConsumer methods
 
+  /// The skeleton methods.
   virtual void push (const CORBA::Any &event);
   virtual void disconnect_push_consumer (void);
-  // The skeleton methods.
 
 private:
+  /// Keep track of the number of events received.
   CORBA::ULong event_count_;
-  // Keep track of the number of events received.
 
+  /// The orb, just a pointer because the ORB does not outlive the
+  /// run() method...
   CORBA::ORB_ptr orb_;
-  // The orb, just a pointer because the ORB does not outlive the
-  // run() method...
 };
 
 #endif /* CONSUMER_H */
diff --git a/orbsvcs/examples/CosEC/Simple/Makefile.am b/orbsvcs/examples/CosEC/Simple/Makefile.am
deleted file mode 100644
index 56b28bf2e51..00000000000
--- a/orbsvcs/examples/CosEC/Simple/Makefile.am
+++ /dev/null
@@ -1,123 +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:
-## ../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.CosEC_Simple_Consumer.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Consumer
-
-Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Consumer_SOURCES = \
-  Consumer.cpp \
-  Consumer.h
-
-Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CosEC_Simple_Service.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Service
-
-Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Service_SOURCES = \
-  Service.cpp \
-  Consumer.h \
-  Supplier.h
-
-Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.CosEC_Simple_Supplier.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Supplier
-
-Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Supplier_SOURCES = \
-  Supplier.cpp \
-  Supplier.h
-
-Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/examples/CosEC/Simple/Service.cpp b/orbsvcs/examples/CosEC/Simple/Service.cpp
index 1c3682594ec..324f5729357 100644
--- a/orbsvcs/examples/CosEC/Simple/Service.cpp
+++ b/orbsvcs/examples/CosEC/Simple/Service.cpp
@@ -5,10 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (CosEC_Simple,
-           Service,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ec.ior");
 
 int
@@ -33,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/orbsvcs/examples/CosEC/Simple/Supplier.cpp
index f3251b8e281..49d8c91f572 100644
--- a/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -5,10 +5,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (CosEC_Examples,
-           Supplier,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://ec.ior");
 
 int
diff --git a/orbsvcs/examples/CosEC/Simple/Supplier.h b/orbsvcs/examples/CosEC/Simple/Supplier.h
index 9f26df820ed..bf7e58e46d4 100644
--- a/orbsvcs/examples/CosEC/Simple/Supplier.h
+++ b/orbsvcs/examples/CosEC/Simple/Supplier.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS COS Event Channel examples
-//
-// = FILENAME
-//   Supplier
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Supplier.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef SUPPLIER_H
 #define SUPPLIER_H
@@ -23,25 +19,26 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Supplier
+ *
+ * @brief Simple supplier object
+ *
+ * This class is a supplier of events.
+ */
 class Supplier : public POA_CosEventComm::PushSupplier
 {
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //   This class is a supplier of events.
-  //
 public:
+  /// Constructor
   Supplier (void);
-  // Constructor
 
+  /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
-  // Run the test
 
   // = The CosEventComm::PushSupplier methods
 
+  /// The skeleton methods.
   virtual void disconnect_push_supplier (void);
-  // The skeleton methods.
 
 private:
 };
diff --git a/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
index 6477e58705e..e1817ebd6e2 100644
--- a/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
+++ b/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
@@ -34,10 +34,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-ACE_RCSID (CosEC_Examples,
-           Consumer,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/examples/CosEC/TypedSimple/Country.idl b/orbsvcs/examples/CosEC/TypedSimple/Country.idl
index 00424bfa608..e4895d84c90 100644
--- a/orbsvcs/examples/CosEC/TypedSimple/Country.idl
+++ b/orbsvcs/examples/CosEC/TypedSimple/Country.idl
@@ -7,7 +7,7 @@
 
 #include "orbsvcs/CosTypedEventComm.idl"
 
-interface Country : ::CosTypedEventComm::TypedPushConsumer 
+interface Country : ::CosTypedEventComm::TypedPushConsumer
 {
   void update_population (in string country,
                           in long population);
diff --git a/orbsvcs/examples/CosEC/TypedSimple/Makefile.am b/orbsvcs/examples/CosEC/TypedSimple/Makefile.am
deleted file mode 100644
index 72eb3b29df0..00000000000
--- a/orbsvcs/examples/CosEC/TypedSimple/Makefile.am
+++ /dev/null
@@ -1,122 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CosEC_TypedSimple_Consumer.am
-
-if BUILD_EC_TYPED_EVENTS
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  CountryC.cpp \
-  CountryC.h \
-  CountryC.inl \
-  CountryS.cpp \
-  CountryS.h \
-  CountryS.inl
-
-CLEANFILES = \
-  Country-stamp \
-  CountryC.cpp \
-  CountryC.h \
-  CountryC.inl \
-  CountryS.cpp \
-  CountryS.h \
-  CountryS.inl
-
-CountryC.cpp CountryC.h CountryC.inl CountryS.cpp CountryS.h CountryS.inl: Country-stamp
-
-Country-stamp: $(srcdir)/Country.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Country.idl
-	@touch $@
-
-noinst_PROGRAMS += Consumer
-
-Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Consumer_SOURCES = \
-  Consumer.cpp \
-  CountryC.cpp \
-  CountryS.cpp \
-  Country_i.cpp \
-  CountryC.h \
-  CountryC.inl \
-  CountryS.h \
-  CountryS.inl \
-  Country_i.h
-
-Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_EC_TYPED_EVENTS
-
-## Makefile.CosEC_TypedSimple_Supplier.am
-
-if BUILD_EC_TYPED_EVENTS
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Supplier
-
-Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Supplier_SOURCES = \
-  CountryC.cpp \
-  Supplier.cpp \
-  Country_i.h
-
-Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_EC_TYPED_EVENTS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
index 98f7088d0cc..aea93327e95 100644
--- a/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
+++ b/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
@@ -4,7 +4,7 @@
 #include "orbsvcs/CosTypedEventChannelAdminC.h"
 #include "CountryC.h"
 
-ACE_RCSID(CosEC_Examples, Supplier, "$Id:")
+
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/orbsvcs/examples/CosEC/TypedSimple/run_test.pl b/orbsvcs/examples/CosEC/TypedSimple/run_test.pl
index 3fe92494b75..b7af0ea4a41 100755
--- a/orbsvcs/examples/CosEC/TypedSimple/run_test.pl
+++ b/orbsvcs/examples/CosEC/TypedSimple/run_test.pl
@@ -52,19 +52,19 @@ $ces->DeleteFile ($cesiorfile);
 $con->DeleteFile ($coniorfile);
 
 
-$IFR = $ifr->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/IFR_Service/IFR_Service", 
+$IFR = $ifr->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/IFR_Service/tao_ifr_service",
                             " -o $ifr_ifriorfile");
-$TI = $ti->CreateProcess ($ENV{"ACE_ROOT"}."/bin/tao_ifr", 
+$TI = $ti->CreateProcess ($ENV{"ACE_ROOT"}."/bin/tao_ifr",
                           " -ORBInitRef InterfaceRepository=file://$ti_ifriorfile ".
                           "-I".$ENV{"TAO_ROOT"}."/orbsvcs $ti_idl");
-$NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
-$CES = $ces->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/CosEvent_Service/CosEvent_Service",
+$CES = $ces->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/CosEvent_Service/tao_cosevent",
                           "-n CountryEventChannel -r -t -d -o $ces_cesiorfile ".
                           "-ORBInitRef InterfaceRepository=file://$ces_ifriorfile ".
                           "-ORBInitRef NameService=file://$ces_nsiorfile ");
 $CON = $con->CreateProcess ("Consumer",
-                          "-o $con_coniorfile ".    
+                          "-o $con_coniorfile ".
                           "-ORBInitRef NameService=file://$con_nsiorfile ");
 $SUP = $sup->CreateProcess ("Supplier",
                           "-ORBInitRef NameService=file://$sup_nsiorfile ");
diff --git a/orbsvcs/examples/FaultTolerance/Makefile.am b/orbsvcs/examples/FaultTolerance/Makefile.am
deleted file mode 100644
index 8dd0d109288..00000000000
--- a/orbsvcs/examples/FaultTolerance/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        RolyPoly
-
diff --git a/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am b/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
deleted file mode 100644
index 22e0a7556a4..00000000000
--- a/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
+++ /dev/null
@@ -1,174 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RolyPoly_Idl.am
-
-BUILT_SOURCES = \
-  RolyPolyC.cpp \
-  RolyPolyC.h \
-  RolyPolyC.inl \
-  RolyPolyS.cpp \
-  RolyPolyS.h \
-  RolyPolyS.inl
-
-CLEANFILES = \
-  RolyPoly-stamp \
-  RolyPolyC.cpp \
-  RolyPolyC.h \
-  RolyPolyC.inl \
-  RolyPolyS.cpp \
-  RolyPolyS.h \
-  RolyPolyS.inl
-
-RolyPolyC.cpp RolyPolyC.h RolyPolyC.inl RolyPolyS.cpp RolyPolyS.h RolyPolyS.inl: RolyPoly-stamp
-
-RolyPoly-stamp: $(srcdir)/RolyPoly.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/RolyPoly.idl
-	@touch $@
-
-noinst_HEADERS = \
-  RolyPoly.idl
-
-## Makefile.RolyPoly_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-client_SOURCES = \
-  RolyPolyC.cpp \
-  client.cpp \
-  CrashPoint.h \
-  Log.h \
-  LogACE_RB_Tree.h \
-  LogStdMap.h \
-  ORB_Initializer.h \
-  ReplicaController.h \
-  RolyPoly_i.h \
-  StateUpdate.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.RolyPoly_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_THREADS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(ACE_ROOT)/protocols \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-server_SOURCES = \
-  CrashPoint.cpp \
-  ORB_Initializer.cpp \
-  ReplicaController.cpp \
-  RolyPolyC.cpp \
-  RolyPolyS.cpp \
-  RolyPoly_i.cpp \
-  server.cpp \
-  CrashPoint.h \
-  ORB_Initializer.h \
-  ReplicaController.h \
-  RolyPoly_i.h
-
-server_LDADD = \
-  $(ACE_BUILDDIR)/protocols/ace/TMCast/libACE_TMCast.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_THREADS
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
index 7193caa6fbf..21238195d2c 100644
--- a/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+++ b/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
@@ -111,7 +111,7 @@ ReplicaController (CORBA::ORB_ptr orb)
   ACE_DEBUG ((LM_DEBUG, "Becoming a member with id %s\n",
               uuid.to_string ()->c_str ()));
 
-  ACE_AUTO_PTR_RESET (group_, new ACE_TMCast::Group (address, uuid.to_string ()->c_str ()), ACE_TMCast::Group);
+  ACE_auto_ptr_reset (group_, new ACE_TMCast::Group (address, uuid.to_string ()->c_str ()));
 
   int r = ACE_Thread_Manager::instance ()->spawn (
     &ReplicaController::listener_thunk, this);
diff --git a/orbsvcs/examples/ImR/Advanced/Makefile.am b/orbsvcs/examples/ImR/Advanced/Makefile.am
deleted file mode 100644
index ad2a2b8837c..00000000000
--- a/orbsvcs/examples/ImR/Advanced/Makefile.am
+++ /dev/null
@@ -1,162 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Advanced_IDL.am
-
-BUILT_SOURCES = \
-  ManagerC.cpp \
-  ManagerC.h \
-  ManagerC.inl \
-  ManagerS.cpp \
-  ManagerS.h \
-  ManagerS.inl
-
-CLEANFILES = \
-  Manager-stamp \
-  ManagerC.cpp \
-  ManagerC.h \
-  ManagerC.inl \
-  ManagerS.cpp \
-  ManagerS.h \
-  ManagerS.inl
-
-ManagerC.cpp ManagerC.h ManagerC.inl ManagerS.cpp ManagerS.h ManagerS.inl: Manager-stamp
-
-Manager-stamp: $(srcdir)/Manager.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Manager.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-CLEANFILES += \
-  Messenger-stamp \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl: Messenger-stamp
-
-Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Messenger.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Manager.idl \
-  Messenger.idl
-
-## Makefile.Advanced_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  MessengerC.cpp \
-  TestClient.cpp \
-  client_main.cpp \
-  TestClient.h
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Advanced_Manager.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += manager_main
-
-manager_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-manager_main_SOURCES = \
-  ManagerC.cpp \
-  ManagerS.cpp \
-  Manager_i.cpp \
-  manager_main.cpp \
-  Manager_i.h
-
-manager_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Advanced_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_main_SOURCES = \
-  ManagerC.cpp \
-  MessengerC.cpp \
-  MessengerS.cpp \
-  Messenger_i.cpp \
-  TestServer.cpp \
-  server_main.cpp \
-  Messenger_i.h \
-  TestServer.h
-
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/orbsvcs/examples/ImR/Advanced/TestClient.cpp
index 1cd50f5b18f..58a8edd9279 100644
--- a/orbsvcs/examples/ImR/Advanced/TestClient.cpp
+++ b/orbsvcs/examples/ImR/Advanced/TestClient.cpp
@@ -199,13 +199,13 @@ int TestClient::svc()
             // Calculate the number of requests
             int newReqCount (randomRequests_ == false ? requestCount_ :
             (int)((((double)ACE_OS::rand() / (double)RAND_MAX) * (double)(requestCount_ - 1)) + .5) + 1);
-            int serverInstance = 0;
             // For each request
             for (requestIter = 1; requestIter <= newReqCount;  requestIter++)
             {
               try
               {
-                serverInstance = test->send_message(threadNum, i, objIter, requestIter);
+                ::CORBA::Long instance = test->send_message(threadNum, i, objIter, requestIter);
+                ACE_UNUSED_ARG (instance);
               }
               catch (CORBA::SystemException& ex)
               {
diff --git a/orbsvcs/examples/ImR/Advanced/TestServer.h b/orbsvcs/examples/ImR/Advanced/TestServer.h
index 6a2bfba43b1..666f526a014 100644
--- a/orbsvcs/examples/ImR/Advanced/TestServer.h
+++ b/orbsvcs/examples/ImR/Advanced/TestServer.h
@@ -4,7 +4,6 @@
 #include "ace/Auto_Ptr.h"
 
 #include "tao/IORTable/IORTable.h"
-#include "tao/Utils/Servant_Var.h"
 
 #include <string>
 #include <vector>
@@ -44,7 +43,7 @@ private:
   std::string baseDir_;
   std::string expectedDir_;
   std::vector<std::pair<std::string, std::string> > expectedEnv_;
-  TAO::Utils::Servant_Var<Messenger_i> servant_;
+  PortableServer::Servant_var<Messenger_i> servant_;
 
   CORBA::ORB_var                  orb_;
   IORTable::Table_var             iorTable_;
diff --git a/orbsvcs/examples/ImR/Advanced/run_test.pl b/orbsvcs/examples/ImR/Advanced/run_test.pl
index 75525684c07..51b5bc40bfa 100755
--- a/orbsvcs/examples/ImR/Advanced/run_test.pl
+++ b/orbsvcs/examples/ImR/Advanced/run_test.pl
@@ -60,9 +60,9 @@ my $CLIENT_CMD;
 
 my $MGR = $manager->CreateProcess ("manager_main");
 my $IMPL = $imrtarget->CreateProcess (
-    "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImplRepo_Service");
+    "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator");
 my $ACT = $acttarget->CreateProcess (
-    "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImR_Activator");
+    "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator");
 my $SV = $server->CreateProcess ("server_main");
 my $TI = $titarget->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr");
 $TI->IgnoreExeSubDir (1);
diff --git a/orbsvcs/examples/ImR/Combined_Service/Makefile.am b/orbsvcs/examples/ImR/Combined_Service/Makefile.am
deleted file mode 100644
index c0ae02ce3a6..00000000000
--- a/orbsvcs/examples/ImR/Combined_Service/Makefile.am
+++ /dev/null
@@ -1,208 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.ImR_Combined_Service_IDL.am
-
-BUILT_SOURCES = \
-  service_configC.cpp \
-  service_configC.h \
-  service_configC.inl \
-  service_configS.cpp \
-  service_configS.h \
-  service_configS.inl
-
-CLEANFILES = \
-  service_config-stamp \
-  service_configC.cpp \
-  service_configC.h \
-  service_configC.inl \
-  service_configS.cpp \
-  service_configS.h \
-  service_configS.inl
-
-service_configC.cpp service_configC.h service_configC.inl service_configS.cpp service_configS.h service_configS.inl: service_config-stamp
-
-service_config-stamp: $(srcdir)/service_config.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/service_config.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  service_config.idl \
-  test.idl
-
-## Makefile.ImR_Combined_Service.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += combined_service
-
-combined_service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-combined_service_SOURCES = \
-  combined.cpp \
-  service_configC.cpp \
-  service_configS.cpp \
-  dynserver.h \
-  dynserver_export.h
-
-combined_service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.ImR_Combined_Service_Controller.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += controller
-
-controller_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-controller_SOURCES = \
-  controller.cpp \
-  service_configC.cpp \
-  dynserver.h \
-  dynserver_export.h
-
-controller_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.ImR_Combined_Service_DynamicServer.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libDynServer.la
-
-libDynServer_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DDYNSERVER_BUILD_DLL
-
-libDynServer_la_SOURCES = \
-  dynserver.cpp \
-  testC.cpp \
-  testS.cpp
-
-noinst_HEADERS += \
-  dynserver.h \
-  dynserver_export.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.ImR_Combined_Service_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  test.cpp \
-  testC.cpp \
-  dynserver.h \
-  dynserver_export.h
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.ImR_Combined_Service_TestServer.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += test_server
-
-test_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_server_SOURCES = \
-  testC.cpp \
-  testS.cpp \
-  test_server.cpp \
-  dynserver.h \
-  dynserver_export.h
-
-test_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/ImR/Combined_Service/dynserver.conf b/orbsvcs/examples/ImR/Combined_Service/dynserver.conf
index 4d63029f52e..fe4b2e6d3eb 100644
--- a/orbsvcs/examples/ImR/Combined_Service/dynserver.conf
+++ b/orbsvcs/examples/ImR/Combined_Service/dynserver.conf
@@ -1 +1,3 @@
+# $Id$
+
 dynamic DynServer_Loader Service_Object * DynServer:_make_DynServer_Loader() '-orbcollocation per-orb -orbuseimr 1 -orbinitref ImplRepoService=corbaloc::localhost:9999/ImplRepoService'
diff --git a/orbsvcs/examples/ImR/Combined_Service/run_test.pl b/orbsvcs/examples/ImR/Combined_Service/run_test.pl
index a9285c15e19..c6d66ff9da2 100755
--- a/orbsvcs/examples/ImR/Combined_Service/run_test.pl
+++ b/orbsvcs/examples/ImR/Combined_Service/run_test.pl
@@ -69,8 +69,8 @@ my $status = 0;
 sub print_output
 {
     my $output_file = $_[0];
-    open( TEST_OUTPUT, "< $output_file" ) or return -1;
-    while( <TEST_OUTPUT> ) {
+    open (TEST_OUTPUT, "< $output_file" ) or return -1;
+    while (<TEST_OUTPUT>) {
         print;
     }
     close (TEST_OUTPUT);
@@ -92,8 +92,8 @@ sub cleanup
         if (m/ImR Activator: Successfully started/) {
             chomp $_;
             my @words = split (/=/, $_);
-            push(@pids, $words[1]); 
-            ++ $i;         
+            push(@pids, $words[1]);
+            ++ $i;
         }
     }
     close (TEST_OUTPUT);
@@ -125,7 +125,7 @@ sub do_test
     }
 
     ## Wait a little bit for everything to get started
-    sleep(2);
+    sleep(10);
     print STDERR "Starting test_server -orbuseimr 1 $imr_initref\n";
 
     $SERV->Arguments ("-ORBLogFile $output_files[$id_serv_log] -orbuseimr 1 $imr_initref");
@@ -136,7 +136,7 @@ sub do_test
     }
 
     ## Wait a little bit for everything to get started
-    sleep(2);
+    sleep(10);
     print STDERR "Starting client\n";
 
     # The client should pass the simple test
@@ -183,7 +183,7 @@ sub do_test
         print "ERROR : Shutting down test server.\n";
         return $ret;
     }
-       
+
     # Both TestObject1 and TestObject2 should now show up as "not running"
     $IMRUTIL->Arguments ("-ORBLogFile $output_files[$id_imru_log] $imr_initref list -v");
     $ret = $IMRUTIL->SpawnWaitKill ($test->ProcessStartWaitInterval());
diff --git a/orbsvcs/examples/ImR/Combined_Service/start_all.conf b/orbsvcs/examples/ImR/Combined_Service/start_all.conf
index 23e3db5379c..b8329d03a6c 100644
--- a/orbsvcs/examples/ImR/Combined_Service/start_all.conf
+++ b/orbsvcs/examples/ImR/Combined_Service/start_all.conf
@@ -1,2 +1,4 @@
-dynamic ImR_Locator_Loader Service_Object * TAO_ImR_Locator:_make_ImR_Locator_Loader() '-orbcollocation no -orbobjrefstyle url -t 5 -d 2 -orbendpoint iiop://:9999'
+# $Id$
+
+dynamic ImR_Locator_Loader Service_Object * TAO_ImR_Locator:_make_ImR_Locator_Loader() '-orbcollocation no -orbobjrefstyle url -t 10 -d 2 -orbendpoint iiop://:9999'
 dynamic ImR_Activator_Loader Service_Object * TAO_ImR_Activator:_make_ImR_Activator_Loader() '-orbcollocation per-orb -d 2 -orbinitref ImplRepoService=corbaloc::localhost:9999/ImplRepoService'
diff --git a/orbsvcs/examples/ImR/Makefile.am b/orbsvcs/examples/ImR/Makefile.am
deleted file mode 100644
index 0b48755fb65..00000000000
--- a/orbsvcs/examples/ImR/Makefile.am
+++ /dev/null
@@ -1,14 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Advanced \
-        Combined_Service
-
diff --git a/orbsvcs/examples/LoadBalancing/Makefile.am b/orbsvcs/examples/LoadBalancing/Makefile.am
deleted file mode 100644
index f89ea1f3843..00000000000
--- a/orbsvcs/examples/LoadBalancing/Makefile.am
+++ /dev/null
@@ -1,144 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.LoadBalancing_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.LoadBalancing_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  ORBInitializer.h \
-  RPS_Monitor.h \
-  ServerRequestInterceptor.h \
-  Stock.h \
-  StockFactory.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.LoadBalancing_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  ORBInitializer.cpp \
-  RPS_Monitor.cpp \
-  ServerRequestInterceptor.cpp \
-  Stock.cpp \
-  StockFactory.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  ORBInitializer.h \
-  RPS_Monitor.h \
-  ServerRequestInterceptor.h \
-  Stock.h \
-  StockFactory.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
index 1641db55b1e..ce75f2fc99d 100644
--- a/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
+++ b/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "ORBInitializer.h"
 #include "ServerRequestInterceptor.h"
 
@@ -6,12 +8,6 @@
 #include "orbsvcs/CosLoadBalancingC.h"
 #include "tao/ORB_Constants.h"
 
-
-ACE_RCSID (LoadBalancing,
-           ORBInitializer,
-           "$Id$")
-
-
 ORBInitializer::ORBInitializer (void)
   : load_alert_ (),
     interceptor_ (0)
diff --git a/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
index fef78a9b20a..546ec30fd68 100644
--- a/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
+++ b/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
@@ -1,14 +1,11 @@
+// $Id$
+
 #include "RPS_Monitor.h"
 #include "ServerRequestInterceptor.h"
 #include "ace/UUID.h"
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID (LoadBalancing,
-           RPS_Monitor,
-           "$Id$")
-
-
 RPS_Monitor::RPS_Monitor (ServerRequestInterceptor * interceptor)
   : location_ (1),
     interceptor_ (interceptor),
diff --git a/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp b/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
index 5e200084da9..9acee119ccd 100644
--- a/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
+++ b/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
@@ -1,9 +1,6 @@
-#include "ServerRequestInterceptor.h"
-
-ACE_RCSID (LoadBalancing,
-           ServerRequestInterceptor,
-           "$Id$")
+// $Id$
 
+#include "ServerRequestInterceptor.h"
 
 ServerRequestInterceptor::ServerRequestInterceptor (void)
   : request_count_ (0)
diff --git a/orbsvcs/examples/LoadBalancing/Test.idl b/orbsvcs/examples/LoadBalancing/Test.idl
index c9f270a36a3..ea0cb943d44 100644
--- a/orbsvcs/examples/LoadBalancing/Test.idl
+++ b/orbsvcs/examples/LoadBalancing/Test.idl
@@ -22,7 +22,7 @@ module Test
       raises (Invalid_Stock_Symbol);
 
     oneway void shutdown ();
-    
+
   };
 
   interface Stock
diff --git a/orbsvcs/examples/LoadBalancing/client.cpp b/orbsvcs/examples/LoadBalancing/client.cpp
index d3c1dc441a7..3e8714ab864 100644
--- a/orbsvcs/examples/LoadBalancing/client.cpp
+++ b/orbsvcs/examples/LoadBalancing/client.cpp
@@ -1,13 +1,9 @@
+// $Id$
+
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 #include "ace/streams.h"
 
-
-ACE_RCSID (LoadBalancing,
-           client,
-           "$Id$")
-
-
 const ACE_TCHAR *ior = ACE_TEXT("file://obj.ior");
 
 int niterations = 100;
@@ -44,7 +40,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/LoadBalancing/run_test.pl b/orbsvcs/examples/LoadBalancing/run_test.pl
index ae728b8f090..85cfbfff02f 100755
--- a/orbsvcs/examples/LoadBalancing/run_test.pl
+++ b/orbsvcs/examples/LoadBalancing/run_test.pl
@@ -53,29 +53,29 @@ $cl->DeleteFile ($srviorfile);
 $sr->DeleteFile ($srviorfile);
 $cr->DeleteFile ($srviorfile);
 
-$LM = $lm->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/LoadManager", 
+$LM = $lm->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmanager",
                           " -o $lm_lmiorfile");
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV = $sv->CreateProcess ("server", 
+$SV = $sv->CreateProcess ("server",
                           "-o $sv_srviorfile ".
                           " -ORBInitRef LoadManager=file://$sv_lmiorfile ".
                           " -n 1 ".
                           "-ORBInitRef NameService=file://$sv_nsiorfile ".
                           " -s LeastLoaded ".
                           " -r 9000 -c 10300 -d 0.1 ");
-$SR = $sr->CreateProcess ("server", 
+$SR = $sr->CreateProcess ("server",
                           "-o $sr_srviorfile ".
                           "-ORBInitRef LoadManager=file://$sr_lmiorfile ".
                           " -n 2 ".
                           "-ORBInitRef NameService=file://sr_nsiorfile ".
                           " -s LeastLoaded ".
                           "-r 9000 -c 10300 -d 0.1 ");
-$CL = $cl->CreateProcess ("client", 
+$CL = $cl->CreateProcess ("client",
                           "-k file://$cl_srviorfile ".
                           " -i 5 -n 1 ".
                           "-ORBInitRef NameService=file://cl_nsiorfile ");
-$CR = $cr->CreateProcess ("client", 
+$CR = $cr->CreateProcess ("client",
                           "-k file://$cr_srviorfile ".
                           "-i 5 -n 2 ".
                           "-ORBInitRef NameService=file://cr_nsiorfile ");
diff --git a/orbsvcs/examples/LoadBalancing/server.cpp b/orbsvcs/examples/LoadBalancing/server.cpp
index 877811db90e..1ba89fe6b44 100644
--- a/orbsvcs/examples/LoadBalancing/server.cpp
+++ b/orbsvcs/examples/LoadBalancing/server.cpp
@@ -1,16 +1,14 @@
+// $Id$
+
 #include "tao/ORBInitializer_Registry.h"
 #include "StockFactory.h"
 #include "ORBInitializer.h"
 #include "RPS_Monitor.h"
-#include "ace/OS.h"
 #include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_strings.h"
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (LoadBalancing,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("obj.ior");
 
 CORBA::Float reject_threshold = 0;
@@ -68,7 +66,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -135,16 +133,16 @@ join_object_group (CORBA::ORB_ptr orb,
           strategy_info.name = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(strategy));
 
           if (ACE_OS::strcasecmp (strategy, ACE_TEXT("LeastLoaded")) == 0
-              && (reject_threshold != 0
-                  || critical_threshold != 0
-                  || dampening != 0))
+              && (!ACE::is_equal (reject_threshold, 0.0f)
+                  || !ACE::is_equal (critical_threshold, 0.0f)
+                  || !ACE::is_equal (dampening, 0.0f)))
             {
               CORBA::ULong len = 1;
 
               PortableGroup::Properties & props =
                 strategy_info.props;
 
-              if (reject_threshold != 0)
+              if (!ACE::is_equal (reject_threshold, 0.0f))
                 {
                   const CORBA::ULong i = len - 1;
 
@@ -156,7 +154,7 @@ join_object_group (CORBA::ORB_ptr orb,
                   props[i].val <<= reject_threshold;
                 }
 
-              if (critical_threshold != 0)
+              if (!ACE::is_equal (critical_threshold, 0.0f))
                 {
                   const CORBA::ULong i = len - 1;
 
@@ -168,7 +166,7 @@ join_object_group (CORBA::ORB_ptr orb,
                   props[i].val <<= critical_threshold;
                 }
 
-              if (dampening != 0)
+              if (!ACE::is_equal (dampening, 0.0f))
                 {
                   const CORBA::ULong i = len - 1;
 
diff --git a/orbsvcs/examples/Log/Basic/Makefile.am b/orbsvcs/examples/Log/Basic/Makefile.am
deleted file mode 100644
index 92993ed47be..00000000000
--- a/orbsvcs/examples/Log/Basic/Makefile.am
+++ /dev/null
@@ -1,51 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Log_Basic_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TLS_Client.cpp \
-  main.cpp \
-  TLS_Client.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-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/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/orbsvcs/examples/Log/Basic/TLS_Client.cpp
index c2c926fc03a..b5fac6be20a 100644
--- a/orbsvcs/examples/Log/Basic/TLS_Client.cpp
+++ b/orbsvcs/examples/Log/Basic/TLS_Client.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "TLS_Client.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Basic,
-           TLS_Client,
-           "$Id$")
-
 #define NAMING_SERVICE_NAME "NameService"
 #define BASIC_TLS_LOG_FACTORY_NAME "BasicLogFactory"
 #define LOG_EVENT_COUNT 9
diff --git a/orbsvcs/examples/Log/Basic/main.cpp b/orbsvcs/examples/Log/Basic/main.cpp
index e3fb93ff58c..fa9b4071031 100644
--- a/orbsvcs/examples/Log/Basic/main.cpp
+++ b/orbsvcs/examples/Log/Basic/main.cpp
@@ -1,11 +1,8 @@
+// $Id$
+
 #include "TLS_Client.h"
 #include "ace/OS_main.h"
 
-ACE_RCSID (Basic,
-           main,
-           "$Id$")
-
-
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/examples/Log/Basic/run_test.pl b/orbsvcs/examples/Log/Basic/run_test.pl
index 7b49ee1b3d6..5378a79e349 100755
--- a/orbsvcs/examples/Log/Basic/run_test.pl
+++ b/orbsvcs/examples/Log/Basic/run_test.pl
@@ -1,7 +1,7 @@
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
-    if 0;  
- 
+    if 0;
+
 # $Id$
 # -*- perl -*-
 
@@ -31,11 +31,11 @@ $ls->DeleteFile ($nsiorfile);
 $cli->DeleteFile ($nsiorfile);
 
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service", 
+$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Basic_Logging_Service/tao_tls_basic",
                           " -ORBInitRef NameService=file://$ls_nsiorfile");
-$CLI = $cli->CreateProcess ("client", 
+$CLI = $cli->CreateProcess ("client",
                             "-ORBInitRef NameService=file://$cli_nsiorfile");
 
 print STDERR "Starting Naming Service\n";
@@ -80,7 +80,7 @@ if ($LS_status != 0) {
     exit 1;
 }
 
-# Give time for logging service to initialize and install its object 
+# Give time for logging service to initialize and install its object
 # reference in the nameing service.
 sleep (5);
 
diff --git a/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/orbsvcs/examples/Log/Event/Event_Consumer.cpp
index 336f21db41b..ce79fea9762 100644
--- a/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "Event_Consumer.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "ace/OS_main.h"
 
-ACE_RCSID (Event,
-           Event_Consumer,
-           "$Id$")
-
 #define NAMING_SERVICE_NAME "NameService"
 #define EVENT_TLS_LOG_FACTORY_NAME "EventLogFactory"
 
diff --git a/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index 32dcb270078..c6663a74cb2 100644
--- a/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "Event_Supplier.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "ace/OS_main.h"
 
-ACE_RCSID (Event,
-           Event_Supplier,
-           "$Id$")
-
 #define NAMING_SERVICE_NAME "NameService"
 #define EVENT_TLS_LOG_FACTORY_NAME "EventLogFactory"
 #define LOG_EVENT_COUNT 9
diff --git a/orbsvcs/examples/Log/Event/Makefile.am b/orbsvcs/examples/Log/Event/Makefile.am
deleted file mode 100644
index 6831d46ad68..00000000000
--- a/orbsvcs/examples/Log/Event/Makefile.am
+++ /dev/null
@@ -1,88 +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:
-## ../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.Log_Event_Consumer.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Event_Consumer
-
-Event_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Event_Consumer_SOURCES = \
-  Event_Consumer.cpp \
-  Event_Consumer.h
-
-Event_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Log_Event_Supplier.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Event_Supplier
-
-Event_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Event_Supplier_SOURCES = \
-  Event_Supplier.cpp \
-  Event_Supplier.h
-
-Event_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/examples/Log/Event/run_test.pl b/orbsvcs/examples/Log/Event/run_test.pl
index ccc55677401..5ea2ddef0c3 100755
--- a/orbsvcs/examples/Log/Event/run_test.pl
+++ b/orbsvcs/examples/Log/Event/run_test.pl
@@ -1,7 +1,7 @@
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
-    if 0;  
- 
+    if 0;
+
 # $Id$
 # -*- perl -*-
 
@@ -33,13 +33,13 @@ $ls->DeleteFile ($nsiorfile);
 $con->DeleteFile ($nsiorfile);
 $sup->DeleteFile ($nsiorfile);
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service", 
+$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Event_Logging_Service/tao_tls_event",
                           " -ORBInitRef NameService=file://$ls_nsiorfile");
-$CON = $con->CreateProcess ("Event_Consumer", 
+$CON = $con->CreateProcess ("Event_Consumer",
                             "-ORBInitRef NameService=file://$con_nsiorfile");
-$SUP = $sup->CreateProcess ("Event_Supplier", 
+$SUP = $sup->CreateProcess ("Event_Supplier",
                             "-ORBInitRef NameService=file://$sup_nsiorfile");
 
 print STDERR "Starting Naming Service\n";
@@ -88,7 +88,7 @@ if ($LS_status != 0) {
     exit 1;
 }
 
-# Give time for logging service to initialize and install its object 
+# Give time for logging service to initialize and install its object
 # reference in the naming service.
 sleep (5);
 
diff --git a/orbsvcs/examples/Log/Makefile.am b/orbsvcs/examples/Log/Makefile.am
deleted file mode 100644
index 2ce0dbc980d..00000000000
--- a/orbsvcs/examples/Log/Makefile.am
+++ /dev/null
@@ -1,16 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Basic \
-        Event \
-        Notify \
-        RTEvent
-
diff --git a/orbsvcs/examples/Log/Notify/Makefile.am b/orbsvcs/examples/Log/Notify/Makefile.am
deleted file mode 100644
index 8b017bd306b..00000000000
--- a/orbsvcs/examples/Log/Notify/Makefile.am
+++ /dev/null
@@ -1,94 +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:
-## ../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.Log_Notify_Consumer.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Notify_Consumer
-
-Notify_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Notify_Consumer_SOURCES = \
-  Notify_Consumer.cpp \
-  Notify_Consumer.h
-
-Notify_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Log_Notify_Supplier.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Notify_Supplier
-
-Notify_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Notify_Supplier_SOURCES = \
-  Notify_Supplier.cpp \
-  Notify_Supplier.h
-
-Notify_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
index 16872092e01..7eb34e19523 100644
--- a/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -1,12 +1,10 @@
+// $Id$
+
 #include "Notify_Consumer.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "ace/OS_main.h"
 
-ACE_RCSID (Notify,
-           Notify_Consumer,
-           "$Id$")
-
 #define NAMING_SERVICE_NAME "NameService"
 #define NOTIFY_TLS_LOG_FACTORY_NAME "NotifyLogFactory"
 #define LOG_EVENT_COUNT 29
diff --git a/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index 28061b61d0b..60f2323abe7 100644
--- a/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -1,12 +1,9 @@
+// $Id$
+
 #include "Notify_Supplier.h"
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "ace/OS_main.h"
 
-ACE_RCSID (Notify,
-           Notify_Supplier,
-           "$Id$")
-
-
 #define NAMING_SERVICE_NAME "NameService"
 #define NOTIFY_TLS_LOG_FACTORY_NAME "NotifyLogFactory"
 #define LOG_EVENT_COUNT 10
diff --git a/orbsvcs/examples/Log/Notify/run_test.pl b/orbsvcs/examples/Log/Notify/run_test.pl
index 693467fbb40..9853f6f3f2c 100755
--- a/orbsvcs/examples/Log/Notify/run_test.pl
+++ b/orbsvcs/examples/Log/Notify/run_test.pl
@@ -1,7 +1,7 @@
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
-    if 0;  
- 
+    if 0;
+
 # $Id$
 # -*- perl -*-
 
@@ -33,13 +33,13 @@ $ls->DeleteFile ($nsiorfile);
 $con->DeleteFile ($nsiorfile);
 $sup->DeleteFile ($nsiorfile);
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service", 
+$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Notify_Logging_Service/tao_tls_notify",
                           " -ORBInitRef NameService=file://$ls_nsiorfile");
-$CON = $con->CreateProcess ("Notify_Consumer", 
+$CON = $con->CreateProcess ("Notify_Consumer",
                             "-ORBInitRef NameService=file://$con_nsiorfile");
-$SUP = $sup->CreateProcess ("Notify_Supplier", 
+$SUP = $sup->CreateProcess ("Notify_Supplier",
                             "-ORBInitRef NameService=file://$sup_nsiorfile");
 
 print STDERR "Starting Naming Service\n";
@@ -88,7 +88,7 @@ if ($LS_status != 0) {
     exit 1;
 }
 
-# Give time for logging service to initialize and install its object 
+# Give time for logging service to initialize and install its object
 # reference in the naming service.
 sleep (5);
 
diff --git a/orbsvcs/examples/Log/RTEvent/Makefile.am b/orbsvcs/examples/Log/RTEvent/Makefile.am
deleted file mode 100644
index 1ce694a3599..00000000000
--- a/orbsvcs/examples/Log/RTEvent/Makefile.am
+++ /dev/null
@@ -1,100 +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:
-## ../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.Log_RTEvent_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += RTEvent_Consumer
-
-RTEvent_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-RTEvent_Consumer_SOURCES = \
-  RTEvent_Consumer.cpp \
-  RTEvent_Consumer.h
-
-RTEvent_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Log_RTEvent_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += RTEvent_Supplier
-
-RTEvent_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-RTEvent_Supplier_SOURCES = \
-  RTEvent_Supplier.cpp \
-  RTEvent_Supplier.h
-
-RTEvent_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index b17859f534c..dbb42d94488 100644
--- a/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -1,12 +1,10 @@
+// $Id$
+
 #include "RTEvent_Consumer.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "ace/OS_main.h"
 
-ACE_RCSID (RTEvent,
-           RTEvent_Consumer,
-           "$Id$")
-
 #define NAMING_SERVICE_NAME "NameService"
 #define EVENT_TLS_LOG_FACTORY_NAME "RTEventLogFactory"
 
diff --git a/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index f15eb352a41..191092bb109 100644
--- a/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "RTEvent_Supplier.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "ace/OS_main.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (RTEvent,
-           RTEvent_Supplier,
-           "$Id$")
-
 #define NAMING_SERVICE_NAME "NameService"
 #define EVENT_TLS_LOG_FACTORY_NAME "RTEventLogFactory"
 #define LOG_EVENT_COUNT 29
diff --git a/orbsvcs/examples/Log/RTEvent/run_test.pl b/orbsvcs/examples/Log/RTEvent/run_test.pl
index 10e1252164c..bf65c2e9e50 100755
--- a/orbsvcs/examples/Log/RTEvent/run_test.pl
+++ b/orbsvcs/examples/Log/RTEvent/run_test.pl
@@ -1,7 +1,7 @@
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
-    if 0;  
- 
+    if 0;
+
 # $Id$
 # -*- perl -*-
 
@@ -33,13 +33,13 @@ $ls->DeleteFile ($nsiorfile);
 $con->DeleteFile ($nsiorfile);
 $sup->DeleteFile ($nsiorfile);
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service", 
+$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/RTEvent_Logging_Service/tao_tls_rtevent",
                           " -ORBInitRef NameService=file://$ls_nsiorfile");
-$CON = $con->CreateProcess ("RTEvent_Consumer", 
+$CON = $con->CreateProcess ("RTEvent_Consumer",
                             "-ORBInitRef NameService=file://$con_nsiorfile");
-$SUP = $sup->CreateProcess ("RTEvent_Supplier", 
+$SUP = $sup->CreateProcess ("RTEvent_Supplier",
                             "-ORBInitRef NameService=file://$sup_nsiorfile");
 
 print STDERR "Starting Naming Service\n";
@@ -88,7 +88,7 @@ if ($LS_status != 0) {
     exit 1;
 }
 
-# Give time for logging service to initialize and install its object 
+# Give time for logging service to initialize and install its object
 # reference in the naming service.
 sleep (5);
 
diff --git a/orbsvcs/examples/Makefile.am b/orbsvcs/examples/Makefile.am
deleted file mode 100644
index b93a6688dc9..00000000000
--- a/orbsvcs/examples/Makefile.am
+++ /dev/null
@@ -1,21 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        CosEC \
-        FaultTolerance \
-        ImR \
-        LoadBalancing \
-        Log \
-        Notify \
-        ORT \
-        RtEC \
-        Security
-
diff --git a/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
index d126b46b3e5..b6805dd64d5 100644
--- a/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
+++ b/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
@@ -13,9 +13,8 @@
 # include <sstream>
 #endif
 
-#include "ace/OS.h"
-
 #include "tao/corba.h"
+#include "ace/OS_NS_unistd.h"
 
 #include "orbsvcs/CosNotificationC.h"
 #include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/orbsvcs/examples/Notify/Federation/Agent/Makefile.am b/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
deleted file mode 100644
index 69fedf1bf52..00000000000
--- a/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
+++ /dev/null
@@ -1,73 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Agent.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = agent
-
-agent_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(ACE_ROOT)/protocols \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/.. \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-agent_SOURCES = \
-  Agent.cpp
-
-agent_LDFLAGS = \
-  -L../Gate/.
-
-agent_LDADD = \
-  $(top_builddir)/orbsvcs/examples/Notify/Federation/Gate/libGate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_THREADS
-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/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp b/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
index 26fda764b86..0d4cef2fab4 100644
--- a/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
+++ b/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
@@ -1,29 +1,19 @@
-// file      : Gate.cpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
+// $Id$
 
 #include "Gate.h"
 #include "ace/Truncate.h"
 
-/*
-#include <iostream>
-
-using std::cerr;
-using std::endl;
-*/
-
 using namespace CORBA;
 using namespace CosNotifyComm;
 using namespace CosNotification;
 using namespace CosNotifyChannelAdmin;
 
-Gate::
-~Gate ()
+Gate::~Gate ()
 {
   // Stop tracker thread.
-  //
   {
-    Lock l (mutex_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
     stop_ = true;
   }
 
@@ -125,7 +115,7 @@ tracker ()
       // Check for cancellation request.
       //
       {
-        Lock l (mutex_);
+        ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
 
         if (stop_)
           return;
@@ -249,15 +239,14 @@ push_structured_event (StructuredEvent const& e)
 }
 
 
-void Gate::
-disconnect_structured_push_consumer (void)
+void
+Gate::disconnect_structured_push_consumer (void)
 {
   // We don't care.
 }
 
-void Gate::
-offer_change (EventTypeSeq const&,
-              EventTypeSeq const&)
+void
+Gate::offer_change (EventTypeSeq const&, EventTypeSeq const&)
 {
   // We don't care.
 }
diff --git a/orbsvcs/examples/Notify/Federation/Gate/Gate.h b/orbsvcs/examples/Notify/Federation/Gate/Gate.h
index 891bb16d0f9..01b69e9b5c8 100644
--- a/orbsvcs/examples/Notify/Federation/Gate/Gate.h
+++ b/orbsvcs/examples/Notify/Federation/Gate/Gate.h
@@ -5,7 +5,6 @@
 #ifndef GATE_H
 #define GATE_H
 
-#include "ace/OS.h"
 #include "ace/INET_Addr.h"
 #include "ace/UUID.h"
 
@@ -75,11 +74,8 @@ private:
   ACE_RMCast::Socket socket_;
   CORBA::String_var id_;
 
-  typedef TAO_SYNCH_MUTEX Mutex;
-  typedef ACE_Guard<Mutex> Lock;
-
   bool stop_;
-  Mutex mutex_;
+  TAO_SYNCH_MUTEX mutex_;
   ACE_Thread_Manager thread_mgr_;
 };
 
diff --git a/orbsvcs/examples/Notify/Federation/Gate/Makefile.am b/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
deleted file mode 100644
index c9e9ededc1a..00000000000
--- a/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
+++ /dev/null
@@ -1,53 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Gate.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-if !BUILD_ACE_FOR_TAO
-
-noinst_LTLIBRARIES = libGate.la
-
-libGate_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(ACE_ROOT)/protocols \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DGATE_BUILD_DLL
-
-libGate_la_SOURCES = \
-  Gate.cpp
-
-noinst_HEADERS = \
-  Export.h \
-  Gate.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_THREADS
-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/orbsvcs/examples/Notify/Federation/Makefile.am b/orbsvcs/examples/Notify/Federation/Makefile.am
deleted file mode 100644
index 3e06864939a..00000000000
--- a/orbsvcs/examples/Notify/Federation/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Gate \
-        Agent \
-        SpaceCraft
-
diff --git a/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am b/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
deleted file mode 100644
index fe50bea6e61..00000000000
--- a/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
+++ /dev/null
@@ -1,73 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.SpaceCraft.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = craft
-
-craft_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(ACE_ROOT)/protocols \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/.. \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-craft_SOURCES = \
-  SpaceCraft.cpp
-
-craft_LDFLAGS = \
-  -L../Gate/.
-
-craft_LDADD = \
-  $(top_builddir)/orbsvcs/examples/Notify/Federation/Gate/libGate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_THREADS
-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/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
index a09cdc3bc50..df68aecdf2d 100644
--- a/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
+++ b/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
@@ -2,9 +2,6 @@
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
-
-#include "ace/OS.h"
-
 #include "tao/corba.h"
 
 #include "orbsvcs/CosNotificationC.h"
diff --git a/orbsvcs/examples/Notify/Filter/Filter.cpp b/orbsvcs/examples/Notify/Filter/Filter.cpp
index 04a7df4e395..db8e31cc3ea 100644
--- a/orbsvcs/examples/Notify/Filter/Filter.cpp
+++ b/orbsvcs/examples/Notify/Filter/Filter.cpp
@@ -2,7 +2,7 @@
 
 #include "Filter.h"
 
-ACE_RCSID(Filter, Filter, "$Id$")
+
 
 #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
 #define NAMING_SERVICE_NAME "NameService"
diff --git a/orbsvcs/examples/Notify/Filter/Filter.h b/orbsvcs/examples/Notify/Filter/Filter.h
index 8de305adf58..927827fc028 100644
--- a/orbsvcs/examples/Notify/Filter/Filter.h
+++ b/orbsvcs/examples/Notify/Filter/Filter.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Filter.h
-//
-// = DESCRIPTION
-//   Class to demo structured event filtering.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Filter.h
+ *
+ *  $Id$
+ *
+ * Class to demo structured event filtering.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_FILTER_CLIENT_H
 #define NOTIFY_FILTER_CLIENT_H
@@ -24,104 +24,107 @@
 class Filter_StructuredPushConsumer;
 class Filter_StructuredPushSupplier;
 
+/**
+ * @class FilterClient
+ *
+ * @brief Filter Client
+ *
+ * Client example that shows how to do Structured Event filtering
+ * in the Notification Service.
+ */
 class FilterClient
 {
-  // = TITLE
-  //   Filter Client
-  // = DESCRIPTION
-  //   Client example that shows how to do Structured Event filtering
-  //   in the Notification Service.
 
  public:
   // = Initialization and Termination
+  /// Constructor
   FilterClient (void);
-  // Constructor
 
+  /// Destructor
   ~FilterClient ();
-  // Destructor
 
+  /// Init the Client.
   void init (int argc, ACE_TCHAR *argv []);
-  // Init the Client.
 
+  /// Run the demo.
   void run (void);
-  // Run the demo.
 
+  /// Consumer calls done, We're done.
   void done (void);
-  // Consumer calls done, We're done.
 
  protected:
+  /// Initializes the ORB.
   void init_ORB (int argc, ACE_TCHAR *argv []);
-  // Initializes the ORB.
 
+  /// Try to get hold of a running naming service.
   void resolve_naming_service (void);
-  // Try to get hold of a running naming service.
 
+  /// Try to resolve the Notify factory from the Naming service.
   void resolve_Notify_factory (void);
-  // Try to resolve the Notify factory from the Naming service.
 
+  /// Create an EC.
   void create_EC (void);
-  // Create an EC.
 
+  /// Create the Supplier Admin.
   void create_supplieradmin(void);
-  // Create the Supplier Admin.
 
+  /// Create the Consumer Admin.
   void create_consumeradmin (void);
-  // Create the Consumer Admin.
 
+  /// Create and initialize the consumers.
   void create_consumers (void);
-  // Create and initialize the consumers.
 
+  /// create and initialize the suppliers.
   void create_suppliers (void);
-  // create and initialize the suppliers.
 
+  /// send the events.
   void send_events (void);
-  // send the events.
 
   // = Data Members
+  /// Reference to the root poa.
   PortableServer::POA_var root_poa_;
-  // Reference to the root poa.
 
+  /// The ORB that we use.
   CORBA::ORB_var orb_;
-  // The ORB that we use.
 
+  /// Handle to the name service.
   CosNaming::NamingContext_var naming_context_;
-  // Handle to the name service.
 
+  /// Channel factory.
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
-  // Channel factory.
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The group operator between admin-proxy's.
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_;
-  // The group operator between admin-proxy's.
 
+  /// Initial qos specified to the factory when creating the EC.
   CosNotification::QoSProperties initial_qos_;
-  // Initial qos specified to the factory when creating the EC.
 
+  /// Initial admin props specified to the factory when creating the EC.
   CosNotification::AdminProperties initial_admin_;
-  // Initial admin props specified to the factory when creating the EC.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumer #1
   Filter_StructuredPushConsumer* consumer_1;
-  // Consumer #1
 
+  /// Consumer #2
   Filter_StructuredPushConsumer* consumer_2;
-  // Consumer #2
 
+  /// Supplier #1
   Filter_StructuredPushSupplier* supplier_1;
-  // Supplier #1
 
+  /// Supplier #2
   Filter_StructuredPushSupplier* supplier_2;
-  // Supplier #2
 
+  /// Set this flag to exit the run loop.
   CORBA::Boolean done_;
-  // Set this flag to exit the run loop.
 };
 
 /*****************************************************************/
@@ -137,34 +140,34 @@ class Filter_StructuredPushConsumer
 
  public:
   // = Initialization and Termination code
+  /// Constructor.
   Filter_StructuredPushConsumer (FilterClient* filter, const char *my_name);
-  // Constructor.
 
+  /// Connect the Consumer to the EventChannel.
+  /// Creates a new proxy supplier and connects to it.
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  // Connect the Consumer to the EventChannel.
-  // Creates a new proxy supplier and connects to it.
 
+  /// Disconnect from the supplier.
   virtual void disconnect (void);
-  // Disconnect from the supplier.
 
 protected:
   // = Data members
 
+  /// The callback for <done>
   FilterClient* filter_;
-  // The callback for <done>
 
+  /// The name of this consumer.
   ACE_CString my_name_;
-  // The name of this consumer.
 
+  /// The proxy that we are connected to.
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_;
-  // The proxy that we are connected to.
 
+  /// The proxy_supplier id.
   CosNotifyChannelAdmin::ProxyID proxy_supplier_id_;
-  // The proxy_supplier id.
 
   // = Methods
+  /// Destructor
   virtual ~Filter_StructuredPushConsumer (void);
-  // Destructor
 
   // = NotifyPublish method
     virtual void offer_change (
@@ -194,33 +197,33 @@ class Filter_StructuredPushSupplier
   //
  public:
   // = Initialization and Termination code
+  /// Constructor.
   Filter_StructuredPushSupplier (const char* my_name);
-  // Constructor.
 
+  /// Connect the Supplier to the EventChannel.
+  /// Creates a new proxy supplier and connects to it.
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  // Connect the Supplier to the EventChannel.
-  // Creates a new proxy supplier and connects to it.
 
+  /// Disconnect from the supplier.
   void disconnect (void);
-  // Disconnect from the supplier.
 
+  /// Send one event.
   virtual void send_event (const CosNotification::StructuredEvent& event);
-  // Send one event.
 
 protected:
   // = Data members
+  /// The name of this consumer.
   ACE_CString my_name_;
-  // The name of this consumer.
 
+  /// The proxy that we are connected to.
   CosNotifyChannelAdmin::StructuredProxyPushConsumer_var proxy_consumer_;
-  // The proxy that we are connected to.
 
+  /// This supplier's id.
   CosNotifyChannelAdmin::ProxyID proxy_consumer_id_;
-  // This supplier's id.
 
   // = Protected Methods
+  /// Destructor
   virtual ~Filter_StructuredPushSupplier ();
-  // Destructor
 
   // = NotifySubscribe
   virtual void subscription_change (
diff --git a/orbsvcs/examples/Notify/Filter/Makefile.am b/orbsvcs/examples/Notify/Filter/Makefile.am
deleted file mode 100644
index 4c43de60f24..00000000000
--- a/orbsvcs/examples/Notify/Filter/Makefile.am
+++ /dev/null
@@ -1,56 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Notify_Filter.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Filter
-
-Filter_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Filter_SOURCES = \
-  Filter.cpp \
-  main.cpp \
-  Filter.h
-
-Filter_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/examples/Notify/Filter/run_test.pl b/orbsvcs/examples/Notify/Filter/run_test.pl
index 36f7c0ae45d..e5e8bbe4240 100755
--- a/orbsvcs/examples/Notify/Filter/run_test.pl
+++ b/orbsvcs/examples/Notify/Filter/run_test.pl
@@ -35,14 +35,14 @@ $nfs->DeleteFile ($nsiorfile);
 $flt->DeleteFile ($nsiorfile);
 $nfs->DeleteFile ($nfsiorfile);
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
-$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service", 
+$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification",
                           " -o $ns_nsiorfile");
 $Notify_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile ";
 
-$FLT = $flt->CreateProcess ("Filter", 
+$FLT = $flt->CreateProcess ("Filter",
                           " -o $ns_nsiorfile");
 $Filter_Args = "-ORBInitRef NameService=file://$flt_nsiorfile -ORBDebugLevel $debug_level";
 
diff --git a/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/orbsvcs/examples/Notify/Lanes/Consumer.cpp
index 02e5c007748..37aea1702ba 100644
--- a/orbsvcs/examples/Notify/Lanes/Consumer.cpp
+++ b/orbsvcs/examples/Notify/Lanes/Consumer.cpp
@@ -2,11 +2,6 @@
 
 #include "Consumer.h"
 
-ACE_RCSID (Notify,
-           TAO_Notify_Lanes_Consumer,
-           "$Id$")
-
-
 TAO_Notify_Lanes_Consumer::TAO_Notify_Lanes_Consumer (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
 {
diff --git a/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index e66ba23fa80..8697daeebd0 100644
--- a/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -10,7 +10,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (Notify, TAO_Notify_Lanes_Consumer_Client, "$Id$")
+
 
 TAO_Notify_Lanes_Consumer_Client::TAO_Notify_Lanes_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
diff --git a/orbsvcs/examples/Notify/Lanes/Makefile.am b/orbsvcs/examples/Notify/Lanes/Makefile.am
deleted file mode 100644
index 881d31d0ce2..00000000000
--- a/orbsvcs/examples/Notify/Lanes/Makefile.am
+++ /dev/null
@@ -1,138 +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:
-## ../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.Notify_Lanes_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += Consumer
-
-Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Consumer_SOURCES = \
-  Consumer.cpp \
-  Consumer_Client.cpp \
-  ORB_Objects.cpp \
-  ORB_Run_Task.cpp \
-  Consumer.h \
-  Consumer_Client.h \
-  ORB_Objects.h \
-  ORB_Run_Task.h
-
-Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Notify_Lanes_Supplier.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += Supplier
-
-Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Supplier_SOURCES = \
-  ORB_Objects.cpp \
-  ORB_Run_Task.cpp \
-  Supplier.cpp \
-  Supplier_Client.cpp \
-  ORB_Objects.h \
-  ORB_Run_Task.h \
-  Supplier.h \
-  Supplier_Client.h
-
-Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
index 420ece6b765..43f68e43eaa 100644
--- a/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
+++ b/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
@@ -2,7 +2,7 @@
 
 #include "ORB_Objects.h"
 
-ACE_RCSID (Notify, TAO_Notify_ORB_Objects, "$Id$")
+
 
 TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void)
 {
diff --git a/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
index 0b181bdf553..f2344182273 100644
--- a/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
+++ b/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
@@ -2,7 +2,7 @@
 
 #include "ORB_Run_Task.h"
 
-ACE_RCSID (Notify, TAO_Notify_ORB_Run_Task, "$Id$")
+
 
 TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
diff --git a/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/orbsvcs/examples/Notify/Lanes/Supplier.cpp
index 5210b534d17..f453c3944e2 100644
--- a/orbsvcs/examples/Notify/Lanes/Supplier.cpp
+++ b/orbsvcs/examples/Notify/Lanes/Supplier.cpp
@@ -2,7 +2,7 @@
 
 #include "Supplier.h"
 
-ACE_RCSID (Notify, TAO_Notify_Lanes_Supplier, "$Id$")
+
 
 #include "tao/ORB_Core.h"
 
diff --git a/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index 9c2e44e458d..85245d221e3 100644
--- a/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -11,7 +11,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (Notify, TAO_Notify_Lanes_Supplier_Client, "$Id$")
+
 
 TAO_Notify_Lanes_Supplier_Client::TAO_Notify_Lanes_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
diff --git a/orbsvcs/examples/Notify/Lanes/client.conf b/orbsvcs/examples/Notify/Lanes/client.conf
index 52878238bc7..99af790bcbc 100644
--- a/orbsvcs/examples/Notify/Lanes/client.conf
+++ b/orbsvcs/examples/Notify/Lanes/client.conf
@@ -1 +1,3 @@
+# $Id$
+
 static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous"
\ No newline at end of file
diff --git a/orbsvcs/examples/Notify/Lanes/notify.conf b/orbsvcs/examples/Notify/Lanes/notify.conf
index 9aa94294430..a9deadec1b1 100644
--- a/orbsvcs/examples/Notify/Lanes/notify.conf
+++ b/orbsvcs/examples/Notify/Lanes/notify.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/examples/Notify/Lanes/run_test.pl b/orbsvcs/examples/Notify/Lanes/run_test.pl
index e87cc47f979..0a3dd08dc4a 100755
--- a/orbsvcs/examples/Notify/Lanes/run_test.pl
+++ b/orbsvcs/examples/Notify/Lanes/run_test.pl
@@ -57,10 +57,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
-$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification");
 $Notify_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconf ";
 
 $SUP = $sup->CreateProcess ("Supplier");
diff --git a/orbsvcs/examples/Notify/MC/Makefile.am b/orbsvcs/examples/Notify/MC/Makefile.am
deleted file mode 100644
index c470e23b51f..00000000000
--- a/orbsvcs/examples/Notify/MC/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        monitor
-
diff --git a/orbsvcs/examples/Notify/MC/monitor/Makefile.am b/orbsvcs/examples/Notify/MC/monitor/Makefile.am
deleted file mode 100644
index 901ccf95216..00000000000
--- a/orbsvcs/examples/Notify/MC/monitor/Makefile.am
+++ /dev/null
@@ -1,58 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.mc_monitor_example.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS = monitor
-
-monitor_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-monitor_SOURCES = \
-  monitor.cpp
-
-monitor_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-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/orbsvcs/examples/Notify/Makefile.am b/orbsvcs/examples/Notify/Makefile.am
deleted file mode 100644
index 08daacd1689..00000000000
--- a/orbsvcs/examples/Notify/Makefile.am
+++ /dev/null
@@ -1,18 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Federation \
-        Filter \
-        Lanes \
-        MC \
-        Subscribe \
-        ThreadPool
-
diff --git a/orbsvcs/examples/Notify/Subscribe/Makefile.am b/orbsvcs/examples/Notify/Subscribe/Makefile.am
deleted file mode 100644
index 835ab5316c6..00000000000
--- a/orbsvcs/examples/Notify/Subscribe/Makefile.am
+++ /dev/null
@@ -1,56 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Notify_Subscribe.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Subscribe
-
-Subscribe_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Subscribe_SOURCES = \
-  Subscribe.cpp \
-  main.cpp \
-  Subscribe.h
-
-Subscribe_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index 8fc4757099a..527c1eb5c0d 100644
--- a/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -1,7 +1,7 @@
 /* -*- C++ -*- $Id$ */
 #include "Subscribe.h"
 
-ACE_RCSID(Notify, Subscribe, "$Id$")
+
 
 #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
 #define NAMING_SERVICE_NAME "NameService"
diff --git a/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index 2b07367a90e..d7d53791135 100644
--- a/orbsvcs/examples/Notify/Subscribe/Subscribe.h
+++ b/orbsvcs/examples/Notify/Subscribe/Subscribe.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Subscribe.h
-//
-// = DESCRIPTION
-//   Class to demo structured event subscription.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Subscribe.h
+ *
+ *  $Id$
+ *
+ * Class to demo structured event subscription.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_SUBSCRIBE_CLIENT_H
 #define NOTIFY_SUBSCRIBE_CLIENT_H
@@ -23,85 +23,88 @@
 class Subscribe_StructuredPushConsumer;
 class Subscribe_StructuredPushSupplier;
 
+/**
+ * @class Subscribe
+ *
+ * @brief Subscribe
+ *
+ * Shows how consumers subscribe for events.
+ */
 class Subscribe
 {
-  // = TITLE
-  //   Subscribe
-  // = DESCRIPTION
-  //   Shows how consumers subscribe for events.
 
  public:
   // = Initialization and Termination
   Subscribe (void);
   ~Subscribe ();
 
+  /// Init the Client.
   void init (int argc, ACE_TCHAR *argv []);
-  // Init the Client.
 
+  /// Run the demo.
   void run (void);
-  // Run the demo.
 
+  /// Called when all events we are waiting for have occured.
   void done (void);
-  // Called when all events we are waiting for have occured.
 
  protected:
+  /// Initializes the ORB.
   void init_ORB (int argc, ACE_TCHAR *argv []);
-  // Initializes the ORB.
 
+  /// Try to get hold of a running naming service.
   void resolve_naming_service (void);
-  // Try to get hold of a running naming service.
 
+  /// Try to resolve the Notify factory from the Naming service.
   void resolve_Notify_factory (void);
-  // Try to resolve the Notify factory from the Naming service.
 
+  /// Create an EC.
   void create_EC (void);
-  // Create an EC.
 
+  /// Create the Supplier Admin.
   void create_supplieradmin(void);
-  // Create the Supplier Admin.
 
+  /// Create the Consumer Admin.
   void create_consumeradmin (void);
-  // Create the Consumer Admin.
 
+  /// Create and initialize the consumers.
   void create_consumers (void);
-  // Create and initialize the consumers.
 
+  /// create and initialize the suppliers.
   void create_suppliers (void);
-  // create and initialize the suppliers.
 
+  /// send the events.
   void send_events (void);
-  // send the events.
 
   // = Data Members
+  /// Reference to the root poa.
   PortableServer::POA_var root_poa_;
-  // Reference to the root poa.
 
+  /// The ORB that we use.
   CORBA::ORB_var orb_;
-  // The ORB that we use.
 
+  /// Handle to the name service.
   CosNaming::NamingContext_var naming_context_;
-  // Handle to the name service.
 
+  /// Channel factory.
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
-  // Channel factory.
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The group operator between admin-proxy's.
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_;
-  // The group operator between admin-proxy's.
 
+  /// Initial qos specified to the factory when creating the EC.
   CosNotification::QoSProperties initial_qos_;
-  // Initial qos specified to the factory when creating the EC.
 
+  /// Initial admin props specified to the factory when creating the EC.
   CosNotification::AdminProperties initial_admin_;
-  // Initial admin props specified to the factory when creating the EC.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
   Subscribe_StructuredPushConsumer* consumer_1_;
   Subscribe_StructuredPushConsumer* consumer_2_;
@@ -109,8 +112,8 @@ class Subscribe
   Subscribe_StructuredPushSupplier* supplier_1_;
   Subscribe_StructuredPushSupplier* supplier_2_;
 
+  /// Set this flag to exit the run loop.
   CORBA::Boolean done_;
-  // Set this flag to exit the run loop.
 };
 
 /*****************************************************************/
@@ -126,35 +129,35 @@ class Subscribe_StructuredPushConsumer
 
  public:
   // = Initialization and Termination code
+  /// Constructor.
   Subscribe_StructuredPushConsumer (Subscribe* subscribe);
-  // Constructor.
 
+  /// Connect the Consumer to the EventChannel.
+  /// Creates a new proxy supplier and connects to it.
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  // Connect the Consumer to the EventChannel.
-  // Creates a new proxy supplier and connects to it.
 
+  /// Disconnect from the supplier.
   virtual void disconnect (void);
-  // Disconnect from the supplier.
 
+  /// Accessor for the Proxy that we're connected to.
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void);
-  // Accessor for the Proxy that we're connected to.
 
   // public data member for evaluating the results of subscription.
   CosNotification::EventTypeSeq expected_subscription_;
 protected:
   // = Data members
+  /// The proxy that we are connected to.
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_;
-  // The proxy that we are connected to.
 
+  /// The proxy_supplier id.
   CosNotifyChannelAdmin::ProxyID proxy_supplier_id_;
-  // The proxy_supplier id.
 
+  /// callback <done>
   Subscribe* subscribe_;
-  // callback <done>
 
   // = Methods
+  /// Destructor
   virtual ~Subscribe_StructuredPushConsumer (void);
-  // Destructor
 
   // = NotifyPublish method
     virtual void offer_change (
@@ -184,30 +187,30 @@ class Subscribe_StructuredPushSupplier
   //
  public:
   // = Initialization and Termination code
+  /// Constructor.
   Subscribe_StructuredPushSupplier (void);
-  // Constructor.
 
+  /// Connect the Supplier to the EventChannel.
+  /// Creates a new proxy consumer and connects to it.
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  // Connect the Supplier to the EventChannel.
-  // Creates a new proxy consumer and connects to it.
 
+  /// Disconnect from the supplier.
   void disconnect (void);
-  // Disconnect from the supplier.
 
+  /// Send one event.
   virtual void send_event (const CosNotification::StructuredEvent& event);
-  // Send one event.
 
 protected:
   // = Data members
+  /// The proxy that we are connected to.
   CosNotifyChannelAdmin::StructuredProxyPushConsumer_var proxy_consumer_;
-  // The proxy that we are connected to.
 
+  /// This supplier's id.
   CosNotifyChannelAdmin::ProxyID proxy_consumer_id_;
-  // This supplier's id.
 
   // = Protected Methods
+  /// Destructor
   virtual ~Subscribe_StructuredPushSupplier ();
-  // Destructor
 
   // = NotifySubscribe
   virtual void subscription_change (
diff --git a/orbsvcs/examples/Notify/Subscribe/run_test.pl b/orbsvcs/examples/Notify/Subscribe/run_test.pl
index 28f694b5206..121fd68fd9f 100755
--- a/orbsvcs/examples/Notify/Subscribe/run_test.pl
+++ b/orbsvcs/examples/Notify/Subscribe/run_test.pl
@@ -38,13 +38,13 @@ $nfs->DeleteFile ($nsiorfile);
 $sub->DeleteFile ($nsiorfile);
 $nfs->DeleteFile ($nfsiorfile);
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
-$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification");
 $Notify_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile ";
 
-$SUB = $sub->CreateProcess ("Subscribe"); 
+$SUB = $sub->CreateProcess ("Subscribe");
 $Subscribe_Args = "-ORBInitRef NameService=file://$sub_nsiorfile -ORBDebugLevel $debug_level";
 
 $NS_status = $NS->Spawn ();
diff --git a/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
index 9e06af2c97a..767c4c94bb9 100644
--- a/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
+++ b/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
@@ -2,10 +2,6 @@
 
 #include "Consumer.h"
 
-ACE_RCSID (Notify,
-           TAO_Notify_ThreadPool_Consumer,
-           "$Id$")
-
 #include "tao/debug.h"
 
 #include "ace/High_Res_Timer.h"
diff --git a/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
index 26a3a3779cb..0a72f5c06fe 100644
--- a/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+++ b/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
@@ -10,7 +10,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (Notify, TAO_Notify_ThreadPool_Consumer_Client, "$Id$")
+
 
 TAO_Notify_ThreadPool_Consumer_Client::TAO_Notify_ThreadPool_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
diff --git a/orbsvcs/examples/Notify/ThreadPool/Makefile.am b/orbsvcs/examples/Notify/ThreadPool/Makefile.am
deleted file mode 100644
index a88aa5f43aa..00000000000
--- a/orbsvcs/examples/Notify/ThreadPool/Makefile.am
+++ /dev/null
@@ -1,152 +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:
-## ../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.Notify_ThreadPool_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += Consumer
-
-Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Consumer_SOURCES = \
-  Consumer.cpp \
-  Consumer_Client.cpp \
-  ORB_Objects.cpp \
-  ORB_Run_Task.cpp \
-  Consumer.h \
-  Consumer_Client.h \
-  ORB_Objects.h \
-  ORB_Run_Task.h
-
-Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Consumer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Notify_ThreadPool_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += Supplier
-
-Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Supplier_SOURCES = \
-  ORB_Objects.cpp \
-  ORB_Run_Task.cpp \
-  Supplier.cpp \
-  Supplier_Client.cpp \
-  ORB_Objects.h \
-  ORB_Run_Task.h \
-  Supplier.h \
-  Supplier_Client.h
-
-Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Supplier_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
index 420ece6b765..43f68e43eaa 100644
--- a/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
+++ b/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
@@ -2,7 +2,7 @@
 
 #include "ORB_Objects.h"
 
-ACE_RCSID (Notify, TAO_Notify_ORB_Objects, "$Id$")
+
 
 TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void)
 {
diff --git a/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
index 0b181bdf553..f2344182273 100644
--- a/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
+++ b/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
@@ -2,7 +2,7 @@
 
 #include "ORB_Run_Task.h"
 
-ACE_RCSID (Notify, TAO_Notify_ORB_Run_Task, "$Id$")
+
 
 TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
diff --git a/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
index 44fa82370f5..e24c683536f 100644
--- a/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
+++ b/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
@@ -2,7 +2,7 @@
 
 #include "Supplier.h"
 
-ACE_RCSID (Notify, TAO_Notify_ThreadPool_Supplier, "$Id$")
+
 
 #include "tao/ORB_Core.h"
 
diff --git a/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index 83bc0304d81..9720725fb57 100644
--- a/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -11,7 +11,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (Notify, TAO_Notify_ThreadPool_Supplier_Client, "$Id$")
+
 
 TAO_Notify_ThreadPool_Supplier_Client::TAO_Notify_ThreadPool_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
diff --git a/orbsvcs/examples/Notify/ThreadPool/client.conf b/orbsvcs/examples/Notify/ThreadPool/client.conf
index 52878238bc7..99af790bcbc 100644
--- a/orbsvcs/examples/Notify/ThreadPool/client.conf
+++ b/orbsvcs/examples/Notify/ThreadPool/client.conf
@@ -1 +1,3 @@
+# $Id$
+
 static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous"
\ No newline at end of file
diff --git a/orbsvcs/examples/Notify/ThreadPool/notify.conf b/orbsvcs/examples/Notify/ThreadPool/notify.conf
index 80a46e01105..2478d4dde00 100644
--- a/orbsvcs/examples/Notify/ThreadPool/notify.conf
+++ b/orbsvcs/examples/Notify/ThreadPool/notify.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous"
 ##dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/examples/Notify/ThreadPool/run_test.pl b/orbsvcs/examples/Notify/ThreadPool/run_test.pl
index 61f862dab37..ae2714106e6 100755
--- a/orbsvcs/examples/Notify/ThreadPool/run_test.pl
+++ b/orbsvcs/examples/Notify/ThreadPool/run_test.pl
@@ -63,10 +63,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
-$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification");
 $Notify_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconf -ORBDebugLevel $debug";
 
 $SUP = $sup->CreateProcess ("Supplier");
diff --git a/orbsvcs/examples/ORT/Gateway_i.cpp b/orbsvcs/examples/ORT/Gateway_i.cpp
index 1b2b044effd..2f1c2b82780 100644
--- a/orbsvcs/examples/ORT/Gateway_i.cpp
+++ b/orbsvcs/examples/ORT/Gateway_i.cpp
@@ -15,10 +15,6 @@
 #include "tao/ORB.h"
 #include "tao/LocalObject.h"
 
-ACE_RCSID (ORT,
-           Gateway_i,
-           "$Id$")
-
 Gateway_i::
 Gateway_i (CORBA::ORB_ptr orb,
            PortableServer::Current_ptr poa_current)
diff --git a/orbsvcs/examples/ORT/Makefile.am b/orbsvcs/examples/ORT/Makefile.am
deleted file mode 100644
index 648c58beb42..00000000000
--- a/orbsvcs/examples/ORT/Makefile.am
+++ /dev/null
@@ -1,218 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.ORT_Idl.am
-
-BUILT_SOURCES = \
-  GatewayC.cpp \
-  GatewayC.h \
-  GatewayC.inl \
-  GatewayS.cpp \
-  GatewayS.h \
-  GatewayS.inl
-
-CLEANFILES = \
-  Gateway-stamp \
-  GatewayC.cpp \
-  GatewayC.h \
-  GatewayC.inl \
-  GatewayS.cpp \
-  GatewayS.h \
-  GatewayS.inl
-
-GatewayC.cpp GatewayC.h GatewayC.inl GatewayS.cpp GatewayS.h GatewayS.inl: Gateway-stamp
-
-Gateway-stamp: $(srcdir)/Gateway.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Gateway.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  ObjectReferenceFactoryC.cpp \
-  ObjectReferenceFactoryC.h \
-  ObjectReferenceFactoryC.inl \
-  ObjectReferenceFactoryS.cpp \
-  ObjectReferenceFactoryS.h \
-  ObjectReferenceFactoryS.inl
-
-CLEANFILES += \
-  ObjectReferenceFactory-stamp \
-  ObjectReferenceFactoryC.cpp \
-  ObjectReferenceFactoryC.h \
-  ObjectReferenceFactoryC.inl \
-  ObjectReferenceFactoryS.cpp \
-  ObjectReferenceFactoryS.h \
-  ObjectReferenceFactoryS.inl
-
-ObjectReferenceFactoryC.cpp ObjectReferenceFactoryC.h ObjectReferenceFactoryC.inl ObjectReferenceFactoryS.cpp ObjectReferenceFactoryS.h ObjectReferenceFactoryS.inl: ObjectReferenceFactory-stamp
-
-ObjectReferenceFactory-stamp: $(srcdir)/ObjectReferenceFactory.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ObjectReferenceFactory.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  sum_serverC.cpp \
-  sum_serverC.h \
-  sum_serverC.inl \
-  sum_serverS.cpp \
-  sum_serverS.h \
-  sum_serverS.inl
-
-CLEANFILES += \
-  sum_server-stamp \
-  sum_serverC.cpp \
-  sum_serverC.h \
-  sum_serverC.inl \
-  sum_serverS.cpp \
-  sum_serverS.h \
-  sum_serverS.inl
-
-sum_serverC.cpp sum_serverC.h sum_serverC.inl sum_serverS.cpp sum_serverS.h sum_serverS.inl: sum_server-stamp
-
-sum_server-stamp: $(srcdir)/sum_server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/sum_server.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Gateway.idl \
-  ObjectReferenceFactory.idl \
-  sum_server.idl
-
-## Makefile.ORT_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-client_SOURCES = \
-  client.cpp \
-  sum_serverC.cpp \
-  Gateway_ObjRef_Factory.h \
-  Gateway_i.h \
-  Object_Factory_i.h \
-  Server_IORInterceptor.h \
-  Server_IORInterceptor_ORBInitializer.h \
-  sum_server_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.ORT_Gateway.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += gateway_server
-
-gateway_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-gateway_server_SOURCES = \
-  GatewayC.cpp \
-  GatewayS.cpp \
-  Gateway_i.cpp \
-  Object_Factory_i.cpp \
-  gateway_server.cpp \
-  Gateway_i.h \
-  Object_Factory_i.h
-
-gateway_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.ORT_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  GatewayC.cpp \
-  Gateway_ObjRef_Factory.cpp \
-  ObjectReferenceFactoryC.cpp \
-  Server_IORInterceptor.cpp \
-  Server_IORInterceptor_ORBInitializer.cpp \
-  server.cpp \
-  sum_serverC.cpp \
-  sum_serverS.cpp \
-  sum_server_i.cpp \
-  Gateway_ObjRef_Factory.h \
-  Server_IORInterceptor.h \
-  Server_IORInterceptor_ORBInitializer.h \
-  sum_server_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
index 5809da7409e..e3fd27b471c 100644
--- a/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
+++ b/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
@@ -3,11 +3,6 @@
 #include "Server_IORInterceptor.h"
 #include "Gateway_ObjRef_Factory.h"
 
-ACE_RCSID (ORT,
-           Server_IORInterceptor,
-           "$Id$")
-
-
 Server_IORInterceptor::
 Server_IORInterceptor (Gateway::Object_Factory_ptr factory)
   : gateway_object_factory_ (Gateway::Object_Factory::_duplicate (factory))
diff --git a/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp b/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
index 42306c63e67..005396f8a49 100644
--- a/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
+++ b/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
@@ -6,10 +6,6 @@
 
 #include "GatewayC.h"
 
-ACE_RCSID (ORT,
-           Server_IORInterceptor_ORBInitializer,
-           "$Id: ")
-
 void
 Server_IORInterceptor_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
diff --git a/orbsvcs/examples/ORT/client.cpp b/orbsvcs/examples/ORT/client.cpp
index 7966bac268b..679a8918339 100644
--- a/orbsvcs/examples/ORT/client.cpp
+++ b/orbsvcs/examples/ORT/client.cpp
@@ -1,12 +1,9 @@
 // -*- C++ -*-
+// $Id$
 
 #include "sum_serverC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (ORT,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/orbsvcs/examples/ORT/gateway_server.cpp b/orbsvcs/examples/ORT/gateway_server.cpp
index 218aec47c8b..66d9125c040 100644
--- a/orbsvcs/examples/ORT/gateway_server.cpp
+++ b/orbsvcs/examples/ORT/gateway_server.cpp
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/ORT/run_test.pl b/orbsvcs/examples/ORT/run_test.pl
index 4c0f0915969..0b73fe8acef 100755
--- a/orbsvcs/examples/ORT/run_test.pl
+++ b/orbsvcs/examples/ORT/run_test.pl
@@ -73,7 +73,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
 }
 
 $TI = $ti->CreateProcess ($tao_ifr);
-$IFR = $ifr->CreateProcess ("../../IFR_Service/IFR_Service",
+$IFR = $ifr->CreateProcess ("../../IFR_Service/tao_ifr_service",
                             "-o $ifr_ifriorfile");
 $GWS = $gws->CreateProcess ("gateway_server",
                             "-o $gws_gwsiorfile ".
diff --git a/orbsvcs/examples/ORT/server.cpp b/orbsvcs/examples/ORT/server.cpp
index 87d8e646fc3..743c38fc37a 100644
--- a/orbsvcs/examples/ORT/server.cpp
+++ b/orbsvcs/examples/ORT/server.cpp
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/ORT/sum_server_i.cpp b/orbsvcs/examples/ORT/sum_server_i.cpp
index fe8a7a38833..25d3ee8dfd1 100644
--- a/orbsvcs/examples/ORT/sum_server_i.cpp
+++ b/orbsvcs/examples/ORT/sum_server_i.cpp
@@ -2,10 +2,6 @@
 
 #include "sum_server_i.h"
 
-ACE_RCSID (ORT,
-           sum_server_i,
-           "$Id$")
-
 sum_server_i::sum_server_i ()
 {
 }
diff --git a/orbsvcs/examples/PSS/README b/orbsvcs/examples/PSS/README
deleted file mode 100644
index bd87fa9ac2c..00000000000
--- a/orbsvcs/examples/PSS/README
+++ /dev/null
@@ -1,58 +0,0 @@
-
-This example show the usage of PSS for persistently saving data. 
-
-
-For this example, we will have a simple_naming.idl which will have just
-two methods: bind and find. As you can guess, the bind function is to
-be used for binding the name of an object with its object
-reference. And, the find function helps find the object reference
-related to the 'name'. To make it simple, we will just bind the
-stringified form of a name to the stringified form of the object reference.
-
-How to Run
-----------
-
-As with the naming_service, we will first run the Simple_Naming
-
-% ./Simple_Naming -o simple_naming.ior
-
-
-Next Run the server giving it the reference to Simple_Naming. As this
-is an example, didnt bother about making the Simple_Naming multicast
-enabled... kept it simple.
-
-
-% ./server -ORBInitRef Simple_Naming=file://simple_naming.ior
-
-The Simple_Naming writes down the server -> IOR mapping to a file
-(Data_Store) .. this serves as the database used to help make the PSS
-persistent.
-
-
-Then Run the Client
-
-% ./client -ORBInitRef Simple_Naming=file://simple_naming.ior
-
-
-On Success, you will not get debug statements. 
-
-
-To test the persistency offered by the Persistent State Service, lets
-keep the server running .. but kill the Simple_Naming.
-
-% kill -9 pid_of_simple_naming
-
-Now, restart the Simple_Naming as before
-
-% ./Simple_Naming
-
-And, run the client to see if the Simple_Naming can help get the
-request sent to the correct server.
-
-
-% ./client -ORBInitRef Simple_Naming=file://simple_naming.ior
-
-
-
-Note: If running the example fresh, make sure you remove the
-previously generated 'Data_Store'.
diff --git a/orbsvcs/examples/PSS/Server.idl b/orbsvcs/examples/PSS/Server.idl
deleted file mode 100644
index b9edd30e302..00000000000
--- a/orbsvcs/examples/PSS/Server.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/examples/PSS
-//
-// = FILENAME
-//    Server.idl
-//
-// = AUTHOR
-//     Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_SERVER_IDL
-#define TAO_SERVER_IDL
-
-#pragma prefix "omg.org"
-
-module Simple_Server
-{
-  interface Server
-  {
-    string get_status ();
-  };
-
-};
-
-#endif /* TAO_SERVER_IDL */
diff --git a/orbsvcs/examples/PSS/Server_i.cpp b/orbsvcs/examples/PSS/Server_i.cpp
deleted file mode 100644
index 63193c391bc..00000000000
--- a/orbsvcs/examples/PSS/Server_i.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#include "Server_i.h"
-
-ACE_RCSID (PSS, Server_i, "$Id$")
-
-Server_i::Server_i (void)
-{
-}
-
-Server_i::~Server_i (void)
-{
-}
-
-char *
-Server_i::get_status (void)
-{
-  return CORBA::string_dup ("active");
-}
diff --git a/orbsvcs/examples/PSS/Server_i.h b/orbsvcs/examples/PSS/Server_i.h
deleted file mode 100644
index 768e94d9a42..00000000000
--- a/orbsvcs/examples/PSS/Server_i.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/examples/PSS
-//
-// = FILENAME
-//    Server_i.h
-//
-// = DESCRIPTION
-//      This class implements the get_status method in server.idl
-//
-// = AUTHORS
-//     Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef SERVER_I_H
-#define SERVER_I_H
-#include /**/ "ace/pre.h"
-
-#include "ServerS.h"
-
-class Server_i : public virtual POA_Simple_Server::Server
-{
- public:
-
-  Server_i ();
-
-  ~Server_i ();
-
-  virtual char *get_status (void);
-};
-
-#include /**/ "ace/post.h"
-#endif /* SERVER_I_H */
-
diff --git a/orbsvcs/examples/PSS/Simple_Naming.cpp b/orbsvcs/examples/PSS/Simple_Naming.cpp
deleted file mode 100644
index ff1d748de20..00000000000
--- a/orbsvcs/examples/PSS/Simple_Naming.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/examples/PSS
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple CORBA server which uses the
-//      simple_naming.idl to bind and find a object reference and uses
-//      Persistent State Service to save the information persistently.
-//      Serves like a Simple naming service.
-//
-// = AUTHOR
-//     Priyanka Gontla <gontla_p@ociweb.com>
-// ============================================================================
-
-#include "Simple_Naming_i.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID (PSS, client, "$Id$")
-
-const ACE_TCHAR *ior_output_file = ACE_TEXT("simple_naming.ior");
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
-{
-  try
-    {
-      // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      if (parse_args (argc, argv) == -1)
-        return -1;
-
-      // Get a reference to the RootPOA
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA");
-
-      // Narrow down to the correct reference
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ());
-
-      // Set a POA Manager
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager ();
-
-      // Activate the POA Manager
-      poa_manager->activate ();
-
-      CORBA::PolicyList policies (2);
-      policies.length (2);
-
-      // Id Assignment policy
-      policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
-
-      // Lifespan policy
-      policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
-
-      // We use a different POA, otherwise the user would have to change
-      // the object key each time it invokes the server.
-      PortableServer::POA_var poa =
-        root_poa->create_POA ("Simple_Naming",
-                              poa_manager.in (),
-                              policies);
-
-      // Creation of the new POAs over, so destroy the Policy_ptr's.
-      for (CORBA::ULong i = 0;
-           i < policies.length ();
-           ++i)
-        {
-          CORBA::Policy_ptr policy = policies[i];
-          policy->destroy ();
-        }
-
-      Naming_Context_i simple_naming_i (orb.in ());
-
-      // Activate it to obtain the reference
-      Simple_Naming::Naming_Context_var simple_naming =
-        simple_naming_i._this ();
-
-      CORBA::String_var string_obj_ref =
-        orb->object_to_string (simple_naming.in ());
-
-      // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", string_obj_ref.in ());
-      ACE_OS::fclose (output_file);
-
-      orb->run ();
-
-      poa->destroy (1, 1);
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Unexpected excpeption in PSS Test");
-      return -1;
-    }
-
-  return 0;
-}
diff --git a/orbsvcs/examples/PSS/Simple_Naming.idl b/orbsvcs/examples/PSS/Simple_Naming.idl
deleted file mode 100644
index e7728b70306..00000000000
--- a/orbsvcs/examples/PSS/Simple_Naming.idl
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/examples/PSS
-//
-// = FILENAME
-//    Simple_Naming.idl
-//
-// = AUTHOR
-//     Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef TAO_SIMPLE_NAMING_IDL
-#define TAO_SIMPLE_NAMING_IDL
-
-#pragma prefix "omg.org"
-
-module Simple_Naming
-{
-  typedef string Name;
-  typedef string Str_Obj;
-
-  interface Naming_Context
-  {
-    long bind (in Name n, in Str_Obj obj);
-
-    Str_Obj find (in Name n);
-  };
-
-};
-
-#endif /* TAO_SIMPLE_NAMING_IDL */
diff --git a/orbsvcs/examples/PSS/Simple_Naming_i.cpp b/orbsvcs/examples/PSS/Simple_Naming_i.cpp
deleted file mode 100644
index 3bc1093f353..00000000000
--- a/orbsvcs/examples/PSS/Simple_Naming_i.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// $Id$
-
-#include "Simple_Naming_i.h"
-#include "orbsvcs/PSS/PSDL_Code_Gen.h"
-
-Naming_Context_i::Naming_Context_i (CORBA::ORB_ptr orb)
-  : code_gen_ (0),
-    orb_ (orb)
-{
-  // constructor
-  // An instance of TAO_PSDL_Code_Gen
-  ACE_NEW (this->code_gen_,
-           TAO_PSDL_Code_Gen (this->orb_.in ()));
-}
-
-Naming_Context_i::~Naming_Context_i ()
-{
-  delete this->code_gen_;
-}
-
-int
-Naming_Context_i::bind (const char *n,
-                        const char *obj)
-{
-  // Save the binding to database.
-  int result =
-    this->code_gen_->set_name_obj_ref (n, obj);
-
-  return result;
-}
-
-char *
-Naming_Context_i::find (const char *n)
-{
-  // Get the Stringified object reference corresponding to
-  // 'n'
-  CORBA::String_var obj_ref =
-    this->code_gen_->get_obj_ref (n);
-
-  return CORBA::string_dup (obj_ref.in ());
-}
diff --git a/orbsvcs/examples/PSS/Simple_Naming_i.h b/orbsvcs/examples/PSS/Simple_Naming_i.h
deleted file mode 100644
index 41174e02c73..00000000000
--- a/orbsvcs/examples/PSS/Simple_Naming_i.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/examples/PSS
-//
-// = FILENAME
-//    simple_naming_i.h
-//
-// = DESCRIPTION
-//      This class implements the bind and find methods in
-//      simple_naming.idl which in turn use the PSDL implementation.
-//
-// = AUTHORS
-//     Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef SIMPLE_NAMING_I_H
-#define SIMPLE_NAMING_I_H
-#include /**/ "ace/pre.h"
-
-#include "Simple_NamingS.h"
-#include "Simple_NamingC.h"
-
-class TAO_PSDL_Code_Gen;
-
-class Naming_Context_i : public virtual POA_Simple_Naming::Naming_Context
-{
- public:
-
-  Naming_Context_i (CORBA::ORB_ptr orb);
-
-  ~Naming_Context_i (void);
-
-  virtual int bind (const char *n,
-                    const char *obj);
-
-  virtual char *find (const char *n);
-
-private:
-
-  TAO_PSDL_Code_Gen *code_gen_;
-
-  CORBA::ORB_var orb_;
-};
-
-
-#include /**/ "ace/post.h"
-#endif /* SIMPLE_NAMING_I_H */
diff --git a/orbsvcs/examples/PSS/client.cpp b/orbsvcs/examples/PSS/client.cpp
deleted file mode 100644
index b033db76d82..00000000000
--- a/orbsvcs/examples/PSS/client.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// $Id$
-
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs/examples/PSS
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//     This implements a simple CORBA client for the
-//     Server.idl
-//
-// = AUTHOR
-//     Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//
-// ============================================================================
-
-#include "ServerC.h"
-#include "Simple_Naming_i.h"
-
-int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-
-  try
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-
-      // Get a reference to the RootPOA
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA");
-
-      // Narrow down to the correct reference
-      PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in ());
-
-      // Set a POA Manager
-      PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager ();
-
-      // Activate the POA Manager
-      poa_manager->activate ();
-
-      // Get a reference to Simple_Naming
-      CORBA::Object_var simple_naming_object =
-        orb->resolve_initial_references ("Simple_Naming");
-
-      // Narrow down the reference
-      Simple_Naming::Naming_Context_var simple_naming =
-        Simple_Naming::Naming_Context::_narrow (simple_naming_object.in());
-
-      Simple_Naming::Name name = CORBA::string_dup ("Server");
-
-      CORBA::String_var ior_string =
-        simple_naming->find (name);
-
-      // Connect to the server
-      CORBA::Object_var tmp =
-        orb->string_to_object(ior_string.in ());
-
-      Simple_Server::Server_var server =
-        Simple_Server::Server::_narrow (tmp.in ());
-
-      CORBA::String_var status =
-        server->get_status ();
-
-      if (ACE_OS::strcmp (status.in (), "active") != 0)
-        {
-          ACE_DEBUG ((LM_ERROR,
-                      "ERROR: The server didnt return the active status\n"));
-          return -1;
-        }
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Client raised an exception:\n");
-    }
-
-  return 0;
-}
diff --git a/orbsvcs/examples/PSS/naming_data.psdl b/orbsvcs/examples/PSS/naming_data.psdl
deleted file mode 100644
index 65afe097ab5..00000000000
--- a/orbsvcs/examples/PSS/naming_data.psdl
+++ /dev/null
@@ -1,5 +0,0 @@
-struct Data
- {		
-   string name;
-   string obj_ref;
- };
diff --git a/orbsvcs/examples/PSS/oldmpc_pss b/orbsvcs/examples/PSS/oldmpc_pss
deleted file mode 100644
index c47c4b1992d..00000000000
--- a/orbsvcs/examples/PSS/oldmpc_pss
+++ /dev/null
@@ -1,44 +0,0 @@
-project(*Simple_Naming) : orbsvcslib, portableserver, psdl {
-  source_files {
-    Simple_NamingC.cpp
-    Simple_NamingS.cpp
-    Simple_Naming_i.cpp
-    Simple_Naming.cpp
-  }
-  idl_files {
-    Simple_Naming.idl
-  }
-}
-
-project(*Server) : orbsvcsexe, portableserver, psdl {
-  after += *Simple_Naming
-  source_files {
-    ServerC.cpp
-    ServerS.cpp
-    Server_i.cpp
-    Simple_NamingS.cpp
-    Simple_NamingC.cpp
-    Simple_Naming_i.cpp
-    server.cpp
-  }
-  idl_files {
-    Server.idl
-    Simple_Naming.idl
-  }
-}
-
-project(*Client) : orbsvcsexe, psdl, portableserver {
-  after += *Server
-  source_files {
-    Simple_NamingS.cpp
-    Simple_NamingC.cpp
-    Simple_Naming_i.cpp
-    ServerC.cpp
-    client.cpp
-  }
-  idl_files {
-    Server.idl
-    Simple_Naming.idl
-  }
-}
-
diff --git a/orbsvcs/examples/PSS/server.cpp b/orbsvcs/examples/PSS/server.cpp
deleted file mode 100644
index 696b5faa71e..00000000000
--- a/orbsvcs/examples/PSS/server.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/examples/PSS
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple CORBA server which uses the
-//      simple_naming.idl to bind and find a object reference and uses
-//      Persistent State Service to save the information persistently.
-//      Serves like a mini naming service.
-//
-// = AUTHOR
-//     Priyanka Gontla <gontla_p@ociweb.com>
-// ============================================================================
-
-#include "Simple_Naming_i.h"
-#include "Server_i.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID (PSS, client, "$Id$")
-
-int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
-{
-  try
-    {
-      // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      // Get a reference to the RootPOA
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA");
-
-      // Narrow down to the correct reference
-      PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in ());
-
-      // Set a POA Manager
-      PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager ();
-
-      // Activate the POA Manager
-      poa_manager->activate ();
-
-      Server_i server_i;
-
-      Simple_Server::Server_var server = server_i._this ();
-
-      CORBA::String_var string_obj_ref =
-        orb->object_to_string (server.in ());
-
-      // Get a reference to Simple_Naming
-      CORBA::Object_var simple_naming_object =
-        orb->resolve_initial_references ("Simple_Naming");
-
-      // Narrow down the reference
-      Simple_Naming::Naming_Context_var simple_naming =
-        Simple_Naming::Naming_Context::_narrow (simple_naming_object.in());
-
-      Simple_Naming::Name name = CORBA::string_dup ("Server");
-
-      // Bind the name to stringified objecte refernce
-      simple_naming->bind (CORBA::string_dup (name),
-                           string_obj_ref.in ());
-
-      orb->run ();
-
-      poa->destroy (1, 1);
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Unexpected excpeption in PSS Test");
-      return -1;
-    }
-
-  return 0;
-}
diff --git a/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
index 280290a51db..d0994c95d3d 100644
--- a/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+++ b/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
@@ -8,10 +8,6 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (EC_Examples,
-           Consumer,
-           "$Id$")
-
 const RtecEventComm::EventSourceID MY_SOURCE_ID  = ACE_ES_EVENT_SOURCE_ANY + 1;
 const RtecEventComm::EventType     MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1;
 
@@ -174,7 +170,7 @@ Consumer::parse_args (int argc, ACE_TCHAR *argv[])
       arg_shifter.ignore_arg ();
     }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
index cd9a0a226ef..686b1110fa3 100644
--- a/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
+++ b/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
@@ -9,10 +9,6 @@
 #include "orbsvcs/Event/EC_Gateway.h"
 #include "ace/Arg_Shifter.h"
 
-ACE_RCSID (EC_Examples,
-           Supplier,
-           "$Id$")
-
 static const ACE_TCHAR *ecname = 0;
 
 int
@@ -136,7 +132,7 @@ EC::parse_args (int argc, ACE_TCHAR *argv[])
       arg_shifter.ignore_arg ();
     }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
index 960c99a112c..39bda637a4c 100644
--- a/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
+++ b/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
@@ -9,10 +9,6 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (EC_Examples,
-           Supplier,
-           "$Id$")
-
 static const ACE_TCHAR *supplierec = 0;
 static const ACE_TCHAR *consumerec = 0;
 
@@ -155,7 +151,7 @@ Gateway::parse_args (int argc, ACE_TCHAR *argv[])
 
       arg_shifter.ignore_arg ();
     }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am b/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
deleted file mode 100644
index d8d324ba722..00000000000
--- a/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
+++ /dev/null
@@ -1,174 +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:
-## ../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.RtEC_IIOPGateway.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Gateway
-
-Gateway_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Gateway_SOURCES = \
-  Gateway.cpp \
-  Gateway.h
-
-Gateway_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RtEC_IIOPGateway_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Consumer
-
-Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Consumer_SOURCES = \
-  Consumer.cpp \
-  Consumer.h
-
-Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RtEC_IIOPGateway_EC.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += EC
-
-EC_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-EC_SOURCES = \
-  EC.cpp \
-  EC.h
-
-EC_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RtEC_IIOPGateway_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Supplier
-
-Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Supplier_SOURCES = \
-  Supplier.cpp \
-  Supplier.h
-
-Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
index 3954787c61a..b5fa6558f6a 100644
--- a/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+++ b/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
@@ -9,10 +9,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Examples,
-           Supplier,
-           "$Id$")
-
 const RtecEventComm::EventSourceID MY_SOURCE_ID  = ACE_ES_EVENT_SOURCE_ANY + 1;
 const RtecEventComm::EventType     MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1;
 
@@ -165,7 +161,7 @@ Supplier::parse_args (int argc, ACE_TCHAR *argv[])
       arg_shifter.ignore_arg ();
     }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl b/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl
index a34cba2cb9e..a5a732212aa 100755
--- a/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl
+++ b/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl
@@ -44,31 +44,31 @@ $g->DeleteFile ($nsiorfile);
 $c->DeleteFile ($nsiorfile);
 $s->DeleteFile ($nsiorfile);
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
-$T1 = $t1->CreateProcess ("EC", 
+$T1 = $t1->CreateProcess ("EC",
                           " -ORBInitRef NameService=file://$t1_nsiorfile ".
                           "-ORBsvcconf $t1_conffile ".
                           "-e channel1");
 
-$T2 = $t2->CreateProcess ("EC", 
+$T2 = $t2->CreateProcess ("EC",
                           " -ORBInitRef NameService=file://$t2_nsiorfile ".
                           "-ORBsvcconf $t2_conffile ".
                           "-e channel2");
 
-$G = $g->CreateProcess ("Gateway", 
+$G = $g->CreateProcess ("Gateway",
                         " -ORBInitRef NameService=file://$g_nsiorfile ".
                         "-ORBSvcconf $g_gconffile ".
                         "-c channel2 ".
                         "-s channel1");
 
-$C = $c->CreateProcess ("Consumer", 
+$C = $c->CreateProcess ("Consumer",
                         " -ORBInitRef NameService=file://$c_nsiorfile ".
                         "-ORBDebugLevel $debug_level ".
                         "-e channel2");
 
-$S = $s->CreateProcess ("Supplier", 
+$S = $s->CreateProcess ("Supplier",
                         " -ORBInitRef NameService=file://$s_nsiorfile ".
                         "-e channel1");
 
diff --git a/orbsvcs/examples/RtEC/IIOPGateway/ec.conf b/orbsvcs/examples/RtEC/IIOPGateway/ec.conf
index 73633a3f946..912531e5bf7 100644
--- a/orbsvcs/examples/RtEC/IIOPGateway/ec.conf
+++ b/orbsvcs/examples/RtEC/IIOPGateway/ec.conf
@@ -1,4 +1,5 @@
 # $Id$
+
 #static EC_Factory "-ECobserver basic -ECDispatching reactive -ECFiltering basic -ECSupplierFiltering per-supplier -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECConsumerControl reactive -ECSupplierControl reactive -ECConsumerControlPeriod 50000 -ECSupplierControlPeriod 50000"
 static EC_Factory "-ECobserver basic "
 #static EC_Gateway_IIOP "-ECGIIOPConsumerECControl reactive"
diff --git a/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf b/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf
index 8319c781e4e..4095ec8acef 100644
--- a/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf
+++ b/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf
@@ -1,4 +1,5 @@
 # $Id$
+
 #static EC_Factory "-ECobserver basic -ECDispatching reactive -ECFiltering basic -ECSupplierFiltering per-supplier -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECConsumerControl reactive -ECSupplierControl reactive -ECConsumerControlPeriod 50000 -ECSupplierControlPeriod 50000"
 #static EC_Factory "-ECobserver basic "
 #dynamic Logger Service_Object * ACE:_make_ACE_Logging_Strategy() "-f STDERR|VERBOSE_LITE"
diff --git a/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl b/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl
index 4a6868692c2..7caef1cc8df 100755
--- a/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl
+++ b/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl
@@ -44,31 +44,31 @@ $g->DeleteFile ($nsiorfile);
 $c->DeleteFile ($nsiorfile);
 $s->DeleteFile ($nsiorfile);
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
-$T1 = $t1->CreateProcess ("EC", 
+$T1 = $t1->CreateProcess ("EC",
                           " -ORBInitRef NameService=file://$t1_nsiorfile ".
                           "-ORBsvcconf $t1_conffile ".
                           "-e channel1");
 
-$T2 = $t2->CreateProcess ("EC", 
+$T2 = $t2->CreateProcess ("EC",
                           " -ORBInitRef NameService=file://$t2_nsiorfile ".
                           "-ORBsvcconf $t2_conffile ".
                           "-e channel2");
 
-$G = $g->CreateProcess ("Gateway", 
+$G = $g->CreateProcess ("Gateway",
                         " -ORBInitRef NameService=file://$g_nsiorfile ".
                         "-ORBSvcconf $g_gconffile ".
                         "-c channel2 ".
                         "-s channel1");
 
-$C = $c->CreateProcess ("Consumer", 
+$C = $c->CreateProcess ("Consumer",
                         " -ORBInitRef NameService=file://$c_nsiorfile ".
                         "-ORBDebugLevel $debug_level ".
                         "-e channel2");
 
-$S = $s->CreateProcess ("Supplier", 
+$S = $s->CreateProcess ("Supplier",
                         " -ORBInitRef NameService=file://$s_nsiorfile ".
                         "-e channel1");
 
diff --git a/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
index 3c88f73b002..72ddfc327d6 100644
--- a/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
+++ b/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "Consumer.h"
 
-ACE_RCSID(EC_Examples, Consumer, "$Id$")
+
 
 Consumer::Consumer (void)
 {
diff --git a/orbsvcs/examples/RtEC/Kokyu/Consumer.h b/orbsvcs/examples/RtEC/Kokyu/Consumer.h
index 36c247802f6..db4593f5d97 100644
--- a/orbsvcs/examples/RtEC/Kokyu/Consumer.h
+++ b/orbsvcs/examples/RtEC/Kokyu/Consumer.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Consumer.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef CONSUMER_H
 #define CONSUMER_H
@@ -23,30 +19,30 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Consumer
+ *
+ * @brief Simple consumer object
+ *
+ * This class is a consumer of events.
+ * It simply register for two event typesone event type
+ * The class is just a helper to simplify common tasks in EC
+ * tests, such as subscribing for a range of events, disconnecting
+ * from the EC, informing the driver of shutdown messages, etc.
+ * There are several ways to connect and disconnect this class,
+ * and it is up to the driver program to use the right one.
+ */
 class Consumer : public POA_RtecEventComm::PushConsumer
 {
-  // = TITLE
-  //   Simple consumer object
-  //
-  // = DESCRIPTION
-  //   This class is a consumer of events.
-  //   It simply register for two event typesone event type
-  //   The class is just a helper to simplify common tasks in EC
-  //   tests, such as subscribing for a range of events, disconnecting
-  //   from the EC, informing the driver of shutdown messages, etc.
-  //
-  //   There are several ways to connect and disconnect this class,
-  //   and it is up to the driver program to use the right one.
-  //
 public:
+  /// Constructor
   Consumer (void);
-  // Constructor
 
   // = The RtecEventComm::PushConsumer methods
 
+  /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
   virtual void disconnect_push_consumer (void);
-  // The skeleton methods.
 };
 
 #endif /* CONSUMER_H */
diff --git a/orbsvcs/examples/RtEC/Kokyu/Makefile.am b/orbsvcs/examples/RtEC/Kokyu/Makefile.am
deleted file mode 100644
index 195a3b0239a..00000000000
--- a/orbsvcs/examples/RtEC/Kokyu/Makefile.am
+++ /dev/null
@@ -1,69 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RtECKokyu.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = Service
-
-Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(ACE_ROOT)/Kokyu
-
-Service_SOURCES = \
-  Consumer.cpp \
-  Service.cpp \
-  Supplier.cpp \
-  Consumer.h \
-  Supplier.h
-
-Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTKokyuEvent.la \
-  $(ACE_BUILDDIR)/Kokyu/libKokyu.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/orbsvcs/examples/RtEC/Kokyu/Service.cpp
index 6ad6b434cb3..9faab51f969 100644
--- a/orbsvcs/examples/RtEC/Kokyu/Service.cpp
+++ b/orbsvcs/examples/RtEC/Kokyu/Service.cpp
@@ -21,7 +21,7 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/Thread.h"
 
-ACE_RCSID(EC_Examples, Service, "$Id$")
+
 
 namespace
 {
@@ -460,7 +460,7 @@ int parse_args (int argc, ACE_TCHAR *argv[])
                            "-s <rms|muf>"),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
index 9dd7b492b1a..69cadbb56ce 100644
--- a/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
+++ b/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
@@ -5,7 +5,7 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/RtecEventCommC.h"
 
-ACE_RCSID(EC_Examples, Supplier, "$Id$")
+
 
 Supplier::Supplier (RtecEventComm::EventSourceID id,
                     const RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy)
diff --git a/orbsvcs/examples/RtEC/Kokyu/Supplier.h b/orbsvcs/examples/RtEC/Kokyu/Supplier.h
index 8222337af57..9fc7e76cd41 100644
--- a/orbsvcs/examples/RtEC/Kokyu/Supplier.h
+++ b/orbsvcs/examples/RtEC/Kokyu/Supplier.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Supplier
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Supplier.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef SUPPLIER_H
 #define SUPPLIER_H
@@ -24,30 +20,30 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Supplier
+ *
+ * @brief Simple supplier object
+ *
+ * This class is a supplier of events.
+ * It simply register for two event typesone event type
+ * The class is just a helper to simplify common tasks in EC
+ * tests, such as subscribing for a range of events, disconnecting
+ * from the EC, informing the driver of shutdown messages, etc.
+ * There are several ways to connect and disconnect this class,
+ * and it is up to the driver program to use the right one.
+ */
 class Supplier : public POA_RtecEventComm::PushSupplier
 {
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //   This class is a supplier of events.
-  //   It simply register for two event typesone event type
-  //   The class is just a helper to simplify common tasks in EC
-  //   tests, such as subscribing for a range of events, disconnecting
-  //   from the EC, informing the driver of shutdown messages, etc.
-  //
-  //   There are several ways to connect and disconnect this class,
-  //   and it is up to the driver program to use the right one.
-  //
 public:
+  /// Constructor
   Supplier (RtecEventComm::EventSourceID id,
             const RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy);
-  // Constructor
 
   // = The RtecEventComm::PushSupplier methods
 
+  /// The skeleton methods.
   virtual void disconnect_push_supplier (void);
-  // The skeleton methods.
 
   void timeout_occured (void);
 
@@ -56,25 +52,26 @@ private:
   const RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy_;
 };
 
+/**
+ * @class Timeout_Consumer
+ *
+ * @brief Timer consumer object
+ *
+ * This class is a consumer of timeout events from EC.
+ * It registers for timeout event with EC and calls
+ * the
+ */
 class Timeout_Consumer : public POA_RtecEventComm::PushConsumer
 {
-  // = TITLE
-  //   Timer consumer object
-  //
-  // = DESCRIPTION
-  //   This class is a consumer of timeout events from EC.
-  //   It registers for timeout event with EC and calls
-  //   the
-  //
 public:
+  /// Constructor
   Timeout_Consumer (Supplier * supplier_impl);
-  // Constructor
 
   // = The RtecEventComm::PushConsumer methods
 
+  /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
   virtual void disconnect_push_consumer (void);
-  // The skeleton methods.
 
 private:
   Supplier *supplier_impl_;
diff --git a/orbsvcs/examples/RtEC/Kokyu/svc.conf b/orbsvcs/examples/RtEC/Kokyu/svc.conf
index 60b006dd1ef..f7f7f34881a 100644
--- a/orbsvcs/examples/RtEC/Kokyu/svc.conf
+++ b/orbsvcs/examples/RtEC/Kokyu/svc.conf
@@ -1,3 +1,4 @@
 # $Id$
+
 #change SCHED_OTHER to SCHED_FIFO or SCHED_RR to run in Real time class
 static EC_Factory "-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECdispatching kokyu SCHED_OTHER -ECscheduling kokyu -ECfiltering kokyu -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/orbsvcs/examples/RtEC/MCast/AddrServer.cpp b/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
index 66e1c5117bc..4c2f53f1b4f 100644
--- a/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
+++ b/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
@@ -2,8 +2,6 @@
 
 #include "AddrServer.h"
 
-ACE_RCSID(EC_Examples, AddrServer, "$Id$")
-
 AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
   : addr_ (addr)
 {
diff --git a/orbsvcs/examples/RtEC/MCast/AddrServer.h b/orbsvcs/examples/RtEC/MCast/AddrServer.h
index ce633025591..16b71eac253 100644
--- a/orbsvcs/examples/RtEC/MCast/AddrServer.h
+++ b/orbsvcs/examples/RtEC/MCast/AddrServer.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   AddrServer.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef ADDRSERVER_H
 #define ADDRSERVER_H
@@ -20,23 +16,24 @@
 
 #include "orbsvcs/RtecUDPAdminS.h"
 
+/**
+ * @class AddrServer
+ *
+ * @brief A simple AddrServer
+ *
+ * The EC is able to use multiple multicast groups to transmit its
+ * data, the is given control over the mapping between the Event
+ * (type,source) pair and the (ipaddr,port) pair using a
+ * AddrServer.
+ * This class implements a very simple server that simply maps the
+ * <type> component to the <ipaddr> and uses a fixed <port>,
+ * provided at initialization time.
+ */
 class AddrServer : public POA_RtecUDPAdmin::AddrServer
 {
-  // = TITLE
-  //   A simple AddrServer
-  //
-  // = DESCRIPTION
-  //   The EC is able to use multiple multicast groups to transmit its
-  //   data, the is given control over the mapping between the Event
-  //   (type,source) pair and the (ipaddr,port) pair using a
-  //   AddrServer.
-  //   This class implements a very simple server that simply maps the
-  //   <type> component to the <ipaddr> and uses a fixed <port>,
-  //   provided at initialization time.
-  //
 public:
+  /// Constructor
   AddrServer (const RtecUDPAdmin::UDP_Addr& addr);
-  // Constructor
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
@@ -46,8 +43,8 @@ public:
                             RtecUDPAdmin::UDP_Address_out addr);
 
 private:
+  /// The address
   RtecUDPAdmin::UDP_Addr addr_;
-  // The address
 };
 
 #include /**/ "ace/post.h"
diff --git a/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/orbsvcs/examples/RtEC/MCast/Consumer.cpp
index 125c8b7775d..69b98c3b552 100644
--- a/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -4,10 +4,6 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-ACE_RCSID (EC_Examples,
-           Consumer,
-           "$Id$")
-
 Consumer::Consumer (void)
   : event_count_ (0)
 {
diff --git a/orbsvcs/examples/RtEC/MCast/Consumer.h b/orbsvcs/examples/RtEC/MCast/Consumer.h
index 5c4f141719d..9da44e65b2f 100644
--- a/orbsvcs/examples/RtEC/MCast/Consumer.h
+++ b/orbsvcs/examples/RtEC/MCast/Consumer.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Consumer.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef CONSUMER_H
 #define CONSUMER_H
@@ -24,37 +20,38 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Consumer
+ *
+ * @brief Simple consumer object
+ *
+ * This class is a consumer of events.
+ * It simply subscribes to one event type.
+ */
 class Consumer : public POA_RtecEventComm::PushConsumer
 {
-  // = TITLE
-  //   Simple consumer object
-  //
-  // = DESCRIPTION
-  //   This class is a consumer of events.
-  //   It simply subscribes to one event type.
-  //
 public:
+  /// Constructor
   Consumer (void);
-  // Constructor
 
+  /// Connect to the Event Channel
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  // Connect to the Event Channel
 
+  /// Disconnect from the event channel
   void disconnect (void);
-  // Disconnect from the event channel
 
   // = The RtecEventComm::PushConsumer methods
 
+  /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
   virtual void disconnect_push_consumer (void);
-  // The skeleton methods.
 
 private:
+  /// Keep track of the number of events received.
   CORBA::ULong event_count_;
-  // Keep track of the number of events received.
 
+  /// The proxy
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy_;
-  // The proxy
 };
 
 #endif /* CONSUMER_H */
diff --git a/orbsvcs/examples/RtEC/MCast/MCast.cpp b/orbsvcs/examples/RtEC/MCast/MCast.cpp
index 9589df228da..90e95851b3e 100644
--- a/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "Consumer.h"
 #include "Supplier.h"
 #include "AddrServer.h"
@@ -15,10 +14,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Examples,
-           MCast,
-           "$Id$")
-
 const ACE_TCHAR *udp_mcast_address =
     ACE_TEXT (ACE_DEFAULT_MULTICAST_ADDR) ACE_TEXT(":10001");
 
@@ -146,7 +141,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       // Now we setup the sender:
-      TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender = TAO_ECG_UDP_Sender::create();
+      PortableServer::Servant_var<TAO_ECG_UDP_Sender> sender =
+        TAO_ECG_UDP_Sender::create();
       sender->init (event_channel.in (),
                     address_server.in (),
                     endpoint);
@@ -166,7 +162,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       sender->connect (sub);
 
       // To receive events we need to setup an event handler:
-      TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver = TAO_ECG_UDP_Receiver::create();
+      PortableServer::Servant_var<TAO_ECG_UDP_Receiver> receiver =
+        TAO_ECG_UDP_Receiver::create();
       TAO_ECG_Mcast_EH mcast_eh (&(*receiver));
 
       // The event handler uses the ORB reactor to wait for multicast
@@ -336,7 +333,7 @@ int parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/RtEC/MCast/Makefile.am b/orbsvcs/examples/RtEC/MCast/Makefile.am
deleted file mode 100644
index e13f9e380cc..00000000000
--- a/orbsvcs/examples/RtEC/MCast/Makefile.am
+++ /dev/null
@@ -1,68 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RtEC_MCast.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = MCast
-
-MCast_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-MCast_SOURCES = \
-  AddrServer.cpp \
-  Consumer.cpp \
-  MCast.cpp \
-  Supplier.cpp \
-  AddrServer.h \
-  Consumer.h \
-  Supplier.h
-
-MCast_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index 5ad924f7209..5ec77c0b47f 100644
--- a/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -4,10 +4,6 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-ACE_RCSID (EC_Examples,
-           Supplier,
-           "$Id$")
-
 Supplier::Supplier (void)
 {
 }
diff --git a/orbsvcs/examples/RtEC/MCast/Supplier.h b/orbsvcs/examples/RtEC/MCast/Supplier.h
index 6ee7f3251cd..b00d40fb141 100644
--- a/orbsvcs/examples/RtEC/MCast/Supplier.h
+++ b/orbsvcs/examples/RtEC/MCast/Supplier.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Supplier
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Supplier.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef SUPPLIER_H
 #define SUPPLIER_H
@@ -24,37 +20,38 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Supplier
+ *
+ * @brief Simple supplier object
+ *
+ * This class is a supplier of events.
+ * It simply publishes one event type, when the perform_push()
+ * method is invoked it pushes the event through the event service
+ */
 class Supplier : public POA_RtecEventComm::PushSupplier
 {
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //   This class is a supplier of events.
-  //   It simply publishes one event type, when the perform_push()
-  //   method is invoked it pushes the event through the event service
-  //
 public:
+  /// Constructor
   Supplier (void);
-  // Constructor
 
+  /// Connect to the event channel
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  // Connect to the event channel
 
+  /// Disconnect from the event channel
   void disconnect (void);
-  // Disconnect from the event channel
 
+  /// Push a single event
   void perform_push (void);
-  // Push a single event
 
   // = The RtecEventComm::PushSupplier methods
 
+  /// The skeleton methods.
   virtual void disconnect_push_supplier (void);
-  // The skeleton methods.
 
 private:
+  /// The proxy
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy_;
-  // The proxy
 };
 
 #endif /* SUPPLIER_H */
diff --git a/orbsvcs/examples/RtEC/MCast/svc.conf b/orbsvcs/examples/RtEC/MCast/svc.conf
index d0297d4649e..9b72e028412 100644
--- a/orbsvcs/examples/RtEC/MCast/svc.conf
+++ b/orbsvcs/examples/RtEC/MCast/svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECObserver basic -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECDispatching reactive -ECScheduling null -ECFiltering prefix -ECSupplierFilter per-supplier"
diff --git a/orbsvcs/examples/RtEC/Makefile.am b/orbsvcs/examples/RtEC/Makefile.am
deleted file mode 100644
index 7fc730d6850..00000000000
--- a/orbsvcs/examples/RtEC/Makefile.am
+++ /dev/null
@@ -1,17 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        IIOPGateway \
-        Kokyu \
-        MCast \
-        Schedule \
-        Simple
-
diff --git a/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
index 3c88f73b002..4588a48aef8 100644
--- a/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
+++ b/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
@@ -2,8 +2,6 @@
 
 #include "Consumer.h"
 
-ACE_RCSID(EC_Examples, Consumer, "$Id$")
-
 Consumer::Consumer (void)
 {
 }
diff --git a/orbsvcs/examples/RtEC/Schedule/Consumer.h b/orbsvcs/examples/RtEC/Schedule/Consumer.h
index 36c247802f6..db4593f5d97 100644
--- a/orbsvcs/examples/RtEC/Schedule/Consumer.h
+++ b/orbsvcs/examples/RtEC/Schedule/Consumer.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Consumer.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef CONSUMER_H
 #define CONSUMER_H
@@ -23,30 +19,30 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Consumer
+ *
+ * @brief Simple consumer object
+ *
+ * This class is a consumer of events.
+ * It simply register for two event typesone event type
+ * The class is just a helper to simplify common tasks in EC
+ * tests, such as subscribing for a range of events, disconnecting
+ * from the EC, informing the driver of shutdown messages, etc.
+ * There are several ways to connect and disconnect this class,
+ * and it is up to the driver program to use the right one.
+ */
 class Consumer : public POA_RtecEventComm::PushConsumer
 {
-  // = TITLE
-  //   Simple consumer object
-  //
-  // = DESCRIPTION
-  //   This class is a consumer of events.
-  //   It simply register for two event typesone event type
-  //   The class is just a helper to simplify common tasks in EC
-  //   tests, such as subscribing for a range of events, disconnecting
-  //   from the EC, informing the driver of shutdown messages, etc.
-  //
-  //   There are several ways to connect and disconnect this class,
-  //   and it is up to the driver program to use the right one.
-  //
 public:
+  /// Constructor
   Consumer (void);
-  // Constructor
 
   // = The RtecEventComm::PushConsumer methods
 
+  /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
   virtual void disconnect_push_consumer (void);
-  // The skeleton methods.
 };
 
 #endif /* CONSUMER_H */
diff --git a/orbsvcs/examples/RtEC/Schedule/Makefile.am b/orbsvcs/examples/RtEC/Schedule/Makefile.am
deleted file mode 100644
index 7c89f896172..00000000000
--- a/orbsvcs/examples/RtEC/Schedule/Makefile.am
+++ /dev/null
@@ -1,67 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RtEC_Schedule.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = Service
-
-Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Service_SOURCES = \
-  Consumer.cpp \
-  Service.cpp \
-  Supplier.cpp \
-  Consumer.h \
-  Schedule.h \
-  Supplier.h
-
-Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/RtEC/Schedule/Schedule.h b/orbsvcs/examples/RtEC/Schedule/Schedule.h
index 3a6d4463fa3..5f4119984e8 100644
--- a/orbsvcs/examples/RtEC/Schedule/Schedule.h
+++ b/orbsvcs/examples/RtEC/Schedule/Schedule.h
@@ -36,7 +36,7 @@ static int configs_size = sizeof(configs)/sizeof(configs[0]);
 
 
 // This sets up Scheduler_Factory to use the runtime version.
-int scheduler_factory_setup = 
+int scheduler_factory_setup =
   ACE_Scheduler_Factory::use_runtime (configs_size, configs, infos_size, infos);
 
 // EOF
diff --git a/orbsvcs/examples/RtEC/Schedule/Service.cpp b/orbsvcs/examples/RtEC/Schedule/Service.cpp
index a9355f78bda..6f06d98c581 100644
--- a/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -16,7 +16,7 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(EC_Examples, Service, "$Id$")
+
 
 int config_run = 0;
 
@@ -362,7 +362,7 @@ int parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
index f1714bf8773..ae4549a37b8 100644
--- a/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
+++ b/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
@@ -2,10 +2,6 @@
 
 #include "Supplier.h"
 
-ACE_RCSID (EC_Examples,
-           Supplier,
-           "$Id$")
-
 Supplier::Supplier (void)
 {
 }
diff --git a/orbsvcs/examples/RtEC/Schedule/Supplier.h b/orbsvcs/examples/RtEC/Schedule/Supplier.h
index 8824c4b9f86..3aa3a839087 100644
--- a/orbsvcs/examples/RtEC/Schedule/Supplier.h
+++ b/orbsvcs/examples/RtEC/Schedule/Supplier.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Supplier
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Supplier.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef SUPPLIER_H
 #define SUPPLIER_H
@@ -23,29 +19,29 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Supplier
+ *
+ * @brief Simple supplier object
+ *
+ * This class is a supplier of events.
+ * It simply register for two event typesone event type
+ * The class is just a helper to simplify common tasks in EC
+ * tests, such as subscribing for a range of events, disconnecting
+ * from the EC, informing the driver of shutdown messages, etc.
+ * There are several ways to connect and disconnect this class,
+ * and it is up to the driver program to use the right one.
+ */
 class Supplier : public POA_RtecEventComm::PushSupplier
 {
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //   This class is a supplier of events.
-  //   It simply register for two event typesone event type
-  //   The class is just a helper to simplify common tasks in EC
-  //   tests, such as subscribing for a range of events, disconnecting
-  //   from the EC, informing the driver of shutdown messages, etc.
-  //
-  //   There are several ways to connect and disconnect this class,
-  //   and it is up to the driver program to use the right one.
-  //
 public:
+  /// Constructor
   Supplier (void);
-  // Constructor
 
   // = The RtecEventComm::PushSupplier methods
 
+  /// The skeleton methods.
   virtual void disconnect_push_supplier (void);
-  // The skeleton methods.
 
 private:
 };
diff --git a/orbsvcs/examples/RtEC/Schedule/svc.conf b/orbsvcs/examples/RtEC/Schedule/svc.conf
index c0bbc7fc673..3bbb090cef1 100644
--- a/orbsvcs/examples/RtEC/Schedule/svc.conf
+++ b/orbsvcs/examples/RtEC/Schedule/svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECdispatching priority -ECscheduling priority -ECfiltering priority -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index c38b2f7a2bf..1edc1f633e3 100644
--- a/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/CosNamingC.h"
 
-ACE_RCSID (EC_Examples,
-           Consumer,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/examples/RtEC/Simple/Consumer.h b/orbsvcs/examples/RtEC/Simple/Consumer.h
index 3bff4a75d1d..988f9261349 100644
--- a/orbsvcs/examples/RtEC/Simple/Consumer.h
+++ b/orbsvcs/examples/RtEC/Simple/Consumer.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Consumer.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef CONSUMER_H
 #define CONSUMER_H
@@ -23,35 +19,36 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Consumer
+ *
+ * @brief Simple consumer object
+ *
+ * This class is a consumer of events.
+ * It simply registers for one event type.
+ */
 class Consumer : public POA_RtecEventComm::PushConsumer
 {
-  // = TITLE
-  //   Simple consumer object
-  //
-  // = DESCRIPTION
-  //   This class is a consumer of events.
-  //   It simply registers for one event type.
-  //
 public:
+  /// Constructor
   Consumer (void);
-  // Constructor
 
+  /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
-  // Run the test
 
   // = The RtecEventComm::PushConsumer methods
 
+  /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
   virtual void disconnect_push_consumer (void);
-  // The skeleton methods.
 
 private:
+  /// Keep track of the number of events received.
   CORBA::ULong event_count_;
-  // Keep track of the number of events received.
 
+  /// The orb, just a pointer because the ORB does not outlive the
+  /// run() method...
   CORBA::ORB_ptr orb_;
-  // The orb, just a pointer because the ORB does not outlive the
-  // run() method...
 };
 
 #endif /* CONSUMER_H */
diff --git a/orbsvcs/examples/RtEC/Simple/Makefile.am b/orbsvcs/examples/RtEC/Simple/Makefile.am
deleted file mode 100644
index 72a249d8995..00000000000
--- a/orbsvcs/examples/RtEC/Simple/Makefile.am
+++ /dev/null
@@ -1,136 +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:
-## ../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.RtEC_Simple_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Consumer
-
-Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Consumer_SOURCES = \
-  Consumer.cpp \
-  Consumer.h
-
-Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RtEC_Simple_Service.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Service
-
-Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Service_SOURCES = \
-  Service.cpp \
-  Consumer.h \
-  Supplier.h
-
-Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RtEC_Simple_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Supplier
-
-Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Supplier_SOURCES = \
-  Supplier.cpp \
-  Supplier.h
-
-Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/examples/RtEC/Simple/Service.cpp b/orbsvcs/examples/RtEC/Simple/Service.cpp
index 3d40a284ca5..d941b8eb05f 100644
--- a/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ b/orbsvcs/examples/RtEC/Simple/Service.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (EC_Examples,
-           Service,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ec.ior");
 
 int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -122,7 +118,7 @@ int parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index a15f5690fe3..589dfbbcd90 100644
--- a/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Examples,
-           Supplier,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/examples/RtEC/Simple/Supplier.h b/orbsvcs/examples/RtEC/Simple/Supplier.h
index f66ac71fc29..3a8aba409d4 100644
--- a/orbsvcs/examples/RtEC/Simple/Supplier.h
+++ b/orbsvcs/examples/RtEC/Simple/Supplier.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Supplier
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Supplier.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef SUPPLIER_H
 #define SUPPLIER_H
@@ -23,26 +19,27 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Supplier
+ *
+ * @brief Simple supplier object
+ *
+ * This class is a supplier of events.
+ * It simply publishes one event type.
+ */
 class Supplier : public POA_RtecEventComm::PushSupplier
 {
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //   This class is a supplier of events.
-  //   It simply publishes one event type.
-  //
 public:
+  /// Constructor
   Supplier (void);
-  // Constructor
 
+  /// Run the test
   int run (int argc, ACE_TCHAR* argv[]);
-  // Run the test
 
   // = The RtecEventComm::PushSupplier methods
 
+  /// The skeleton methods.
   virtual void disconnect_push_supplier (void);
-  // The skeleton methods.
 
 private:
 };
diff --git a/orbsvcs/examples/RtEC/Simple/ec.conf b/orbsvcs/examples/RtEC/Simple/ec.conf
index d3d61260f68..cb16e5dda92 100644
--- a/orbsvcs/examples/RtEC/Simple/ec.conf
+++ b/orbsvcs/examples/RtEC/Simple/ec.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECDispatching reactive -ECFiltering basic -ECSupplierFiltering per-supplier -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECConsumerControl reactive -ECSupplierControl reactive -ECConsumerControlPeriod 50000 -ECSupplierControlPeriod 50000"
diff --git a/orbsvcs/examples/RtEC/Simple/run_test.pl b/orbsvcs/examples/RtEC/Simple/run_test.pl
index d8c6fb7e377..12eec8a6b82 100755
--- a/orbsvcs/examples/RtEC/Simple/run_test.pl
+++ b/orbsvcs/examples/RtEC/Simple/run_test.pl
@@ -35,7 +35,7 @@ $t->DeleteFile ($nsiorfile);
 $c->DeleteFile ($nsiorfile);
 $s->DeleteFile ($nsiorfile);
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
 $T = $t->CreateProcess ("Service",
diff --git a/orbsvcs/examples/Security/Makefile.am b/orbsvcs/examples/Security/Makefile.am
deleted file mode 100644
index 9772a9daeed..00000000000
--- a/orbsvcs/examples/Security/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Send_File
-
diff --git a/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
index 6a3e81510bb..759335e549f 100644
--- a/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
+++ b/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
@@ -6,10 +6,6 @@
 #include "test_i.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (SecurityLevel1,
-           SLevel1_Test_i,
-           "$Id$")
-
 static int authorize_1 = 1;
 static int authorize_2 = 1;
 
diff --git a/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h b/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
index 94a2151481d..0786ab56120 100644
--- a/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
+++ b/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   orbsvcs/examples/Security/SecurityLevel1
-//
-// = FILENAME
-//   SLevel1_Test_i.h
-//
-// = AUTHOR
-//   Priyanka Gontla <gontla_p@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   SLevel1_Test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Priyanka Gontla <gontla_p@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef TAO_SLEVEL1_TEST_I_H
 #define TAO_SLEVEL1_TEST_I_H
diff --git a/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/orbsvcs/examples/Security/SecurityLevel1/client.cpp
index a1321f64e45..47d992673fc 100644
--- a/orbsvcs/examples/Security/SecurityLevel1/client.cpp
+++ b/orbsvcs/examples/Security/SecurityLevel1/client.cpp
@@ -2,7 +2,7 @@
 
 #include "SLevel1_TestC.h"
 
-ACE_RCSID (SecurityLevel1, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -27,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/orbsvcs/examples/Security/SecurityLevel1/server.cpp
index 5a0225c4cd7..d40c741f314 100644
--- a/orbsvcs/examples/Security/SecurityLevel1/server.cpp
+++ b/orbsvcs/examples/Security/SecurityLevel1/server.cpp
@@ -2,10 +2,6 @@
 
 #include "SLevel1_Test_i.h"
 
-ACE_RCSID (SecurityLevel1,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
diff --git a/orbsvcs/examples/Security/Send_File/Makefile.am b/orbsvcs/examples/Security/Send_File/Makefile.am
deleted file mode 100644
index b2ccbcf5952..00000000000
--- a/orbsvcs/examples/Security/Send_File/Makefile.am
+++ /dev/null
@@ -1,109 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Security_Send_File_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Security_Send_File_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Security_Send_File_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/orbsvcs/examples/Security/Send_File/client.cpp b/orbsvcs/examples/Security/Send_File/client.cpp
index ea058de54e7..43137bf8ab8 100644
--- a/orbsvcs/examples/Security/Send_File/client.cpp
+++ b/orbsvcs/examples/Security/Send_File/client.cpp
@@ -4,7 +4,7 @@
 #include "ace/Read_Buffer.h"
 #include "testC.h"
 
-ACE_RCSID(Send_File, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/Security/Send_File/server.cpp b/orbsvcs/examples/Security/Send_File/server.cpp
index 1444eacfc3f..48da3015992 100644
--- a/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/orbsvcs/examples/Security/Send_File/server.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Send_File, server, "$Id$")
+
 
 const ACE_TCHAR *ior_output_file = 0;
 
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/examples/Security/Send_File/test_i.cpp b/orbsvcs/examples/Security/Send_File/test_i.cpp
index 0b8df081939..5137d42bc91 100644
--- a/orbsvcs/examples/Security/Send_File/test_i.cpp
+++ b/orbsvcs/examples/Security/Send_File/test_i.cpp
@@ -6,7 +6,7 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Send_File, test_i, "$Id$")
+
 
 void
 Simple_Server_i::send_line (const char *line)
diff --git a/orbsvcs/examples/Security/Send_File/test_i.h b/orbsvcs/examples/Security/Send_File/test_i.h
index 729b1d933f8..c9ff4b29ab3 100644
--- a/orbsvcs/examples/Security/Send_File/test_i.h
+++ b/orbsvcs/examples/Security/Send_File/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Send_File
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_SEND_FILE_TEST_I_H
 #define TAO_SEND_FILE_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   void send_line (const char *line);
diff --git a/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 96e58b00d61..22198e3a91d 100644
--- a/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file   AVStreams_i.cpp
@@ -24,10 +23,6 @@
 #include "orbsvcs/AV/AVStreams_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (AV,
-           AVStreams_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //------------------------------------------------------------
@@ -161,12 +156,12 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec)
     }
   catch (const AVStreams::noSuchFlow&)
     {
-      throw; 
+      throw;
     }
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("TAO_Basic_StreamCtrl::start");
-      throw;  
+      throw;
     }
   catch(...)
     {
@@ -453,12 +448,12 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec)
     }
   catch (const AVStreams::noSuchFlow&)
     {
-      throw; 
+      throw;
     }
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("TAO_StreamCtrl::stop");
-      throw; 
+      throw;
     }
   catch(...)
     {
@@ -491,12 +486,12 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec)
     }
   catch (const AVStreams::noSuchFlow&)
     {
-      throw; 
+      throw;
     }
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("TAO_StreamCtrl::start");
-      throw; 
+      throw;
     }
   catch(...)
     {
@@ -2114,7 +2109,7 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
       TAO_Forward_FlowSpec_Entry entry;
       entry.parse (the_flows [i]);
       ACE_CString flow_name_key (entry.flowname ());
-      Flow_Handler_Map_Entry *handler_entry;
+      Flow_Handler_Map_Entry *handler_entry = 0;
       if (this->flow_handler_map_.find (flow_name_key,
                                         handler_entry) == 0)
         {
@@ -3407,7 +3402,7 @@ TAO_FlowConnection::stop (void)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("TAO_FlowConnection::stop");
-      throw;  
+      throw;
     }
   catch(...)
     {
@@ -3440,12 +3435,12 @@ TAO_FlowConnection::start (void)
     }
   catch (const AVStreams::noSuchFlow&)
     {
-      throw; 
+      throw;
     }
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("TAO_FlowConnection::start");
-      throw; 
+      throw;
     }
   catch(...)
     {
@@ -3672,7 +3667,8 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
 
               ACE_TCHAR buf [BUFSIZ];
               mcast_addr.addr_to_string (buf, BUFSIZ);
-              ACE_OS::sprintf (mcast_address, "%s=%s", this->protocol_.in (), buf);
+              ACE_OS::sprintf (mcast_address, "%s=%s", this->protocol_.in (),
+                               ACE_TEXT_ALWAYS_CHAR (buf));
             }
           else
             {
diff --git a/orbsvcs/orbsvcs/AV/AVStreams_i.h b/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 9bc0ba9c98b..35d77b38b22 100644
--- a/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -27,7 +27,6 @@
 #include "orbsvcs/Null_MediaCtrlS.h"
 #include "orbsvcs/AV/FlowSpec_Entry.h"
 
-#include "ace/OS.h"
 #include "ace/SOCK_Dgram_Mcast.h"
 #include "ace/ATM_Addr.h"
 #include "ace/Containers_T.h"
diff --git a/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index cada96abdc1..8793ff67520 100644
--- a/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -17,7 +17,7 @@
 
 #include "ace/Process_Semaphore.h"
 
-ACE_RCSID(AV, Endpoint_Strategy, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
index e7cca074af3..26da6188ebb 100644
--- a/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
+++ b/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
@@ -4,7 +4,7 @@
 
 #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
 
-ACE_RCSID(QOS, Fill_ACE_QoS,"$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h b/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
index ede10e0e1ec..a476858c61c 100644
--- a/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
+++ b/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
@@ -30,7 +30,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class Fill_ACE_QoS
- * 
+ *
  * This class helps users to add new flow specs and provides
  * utility functions for filling up the flow specs for simplex/duplex
  * sessions.
diff --git a/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index 873ff23c099..ef1f942c8fa 100644
--- a/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -10,6 +10,8 @@
 #include "orbsvcs/AV/MCast.h"
 #include "orbsvcs/AV/Fill_ACE_QoS.h"
 
+#include "ace/OS_NS_strings.h"
+
 #if !defined (__ACE_INLINE__)
 #include "orbsvcs/AV/QoS_UDP.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/orbsvcs/orbsvcs/AV/QoS_UDP.h b/orbsvcs/orbsvcs/AV/QoS_UDP.h
index fb5b38ebb37..3f4e6b99a80 100644
--- a/orbsvcs/orbsvcs/AV/QoS_UDP.h
+++ b/orbsvcs/orbsvcs/AV/QoS_UDP.h
@@ -22,7 +22,6 @@
 
 #include "orbsvcs/AV/Protocol_Factory.h"
 
-#include "ace/OS.h"
 #include "ace/Service_Config.h"
 #include "ace/QoS/QoS_Session_Factory.h"
 #include "ace/QoS/QoS_Decorator.h"
diff --git a/orbsvcs/orbsvcs/AV/QoS_UDP.inl b/orbsvcs/orbsvcs/AV/QoS_UDP.inl
index 9ae1b828b0f..1d3d82363c8 100644
--- a/orbsvcs/orbsvcs/AV/QoS_UDP.inl
+++ b/orbsvcs/orbsvcs/AV/QoS_UDP.inl
@@ -26,7 +26,7 @@ TAO_AV_UDP_QoS_Flow_Handler::open (ACE_Addr &address)
 
 ACE_INLINE ACE_QoS_Session*
 TAO_AV_UDP_QoS_Flow_Handler::qos_session (void)
-{       
+{
   return this->qos_session_;
 }
 
diff --git a/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
index 2bd859ea78f..df916055a26 100644
--- a/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
+++ b/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
@@ -10,10 +10,6 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (AV,
-           SCTP_SEQ,
-           "SCTP_SEQ.cpp,v 1.3 2003/11/05 21:06:53 yamuna Exp")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //------------------------------------------------------------
diff --git a/orbsvcs/orbsvcs/AV/TCP.cpp b/orbsvcs/orbsvcs/AV/TCP.cpp
index cab1194fd19..240f08690ad 100644
--- a/orbsvcs/orbsvcs/AV/TCP.cpp
+++ b/orbsvcs/orbsvcs/AV/TCP.cpp
@@ -662,7 +662,7 @@ TAO_AV_TCP_Flow_Handler::open (void * /*arg*/)
                                 SO_RCVBUF,
                                 (void *) &buf_size, &s) == -1)
        buf_size = BUFSIZ;
-    
+
     ((TAO_AV_TCP_Object*)(this->protocol_object_))->frame_.size (buf_size);
 
   // Called by the <Strategy_Acceptor> when the handler is completely
diff --git a/orbsvcs/orbsvcs/AV/UDP.cpp b/orbsvcs/orbsvcs/AV/UDP.cpp
index 712232f0556..4950e268695 100644
--- a/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -11,10 +11,6 @@
 #include "orbsvcs/AV/UDP.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (AV,
-           UDP,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //------------------------------------------------------------
diff --git a/orbsvcs/orbsvcs/AV/ntp-time.h b/orbsvcs/orbsvcs/AV/ntp-time.h
index 11dcd720911..6df31d6cf67 100644
--- a/orbsvcs/orbsvcs/AV/ntp-time.h
+++ b/orbsvcs/orbsvcs/AV/ntp-time.h
@@ -79,7 +79,7 @@ ntptime (timeval t)
         return (s << 16 | usec2ntp((u_int)t.tv_usec) >> 16);
 }
 
-ACE_INLINE ACE_UINT32 
+ACE_INLINE ACE_UINT32
 ntptime()
 {
   //
diff --git a/orbsvcs/orbsvcs/AVStreams.idl b/orbsvcs/orbsvcs/AVStreams.idl
index 1e40c191651..238ded3e076 100644
--- a/orbsvcs/orbsvcs/AVStreams.idl
+++ b/orbsvcs/orbsvcs/AVStreams.idl
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  @author Sumedh Mungee <sumedh@cs.wustl.edu> 
+ *  @author Sumedh Mungee <sumedh@cs.wustl.edu>
  *  @author Nagarajan Surendran <naga@cs.wustl.edu>
  */
 //=============================================================================
@@ -18,14 +18,14 @@
 
 #pragma prefix "omg.org"
 
-/** 
+/**
   * @brief  IDL for Control and Management of Audio/Video Streams
   *         Revised Submission.
-  */ 
+  */
 module AVStreams
 {
 
-  /** 
+  /**
    *  @struct QoS
    *  @brief  This structure represents QoS for a given type.
    *           E.g. {"video_qos", <"video_framerate", 26>,
@@ -40,7 +40,7 @@ module AVStreams
     /// Sequence of name value pairs, see e.g. above.
   };
 
-  /// The QoS of a stream is a sequence of QoS structs (defined above)  
+  /// The QoS of a stream is a sequence of QoS structs (defined above)
   typedef sequence<QoS> streamQoS;
 
   /// flowSpec is used to keep transport protocol information Each
@@ -72,7 +72,7 @@ module AVStreams
    *  @enum flowState
    *  @brief Represents the state of a flow
    */
-  enum flowState 
+  enum flowState
   {
     stopped,
     started,
@@ -83,13 +83,13 @@ module AVStreams
    *  @enum dirType
    *  @brief The direction of a flow.
    */
-  enum dirType 
+  enum dirType
   {
     dir_in,
     dir_out
   };
 
-  /** 
+  /**
    *  @struct flowStatus
    *  @brief Used to store the status of a flow.
    */
@@ -106,24 +106,24 @@ module AVStreams
   /// Used to convey events, in Basic_StreamCtrl::push_event.
   typedef CosPropertyService::Property streamEvent;
 
-  
-  exception notSupported 
+
+  exception notSupported
     {
       /// Used to indicate that an operation is not supported.
     };
 
-  exception PropertyException 
+  exception PropertyException
     {
       /// Property exception: raised by VDev::configure ().
     };
 
-  exception FPError 
-    { 
+  exception FPError
+    {
       /// An flow protocol related error.
-      string flow_name; 
+      string flow_name;
     };
 
-  
+
   exception streamOpFailed
     {
       /// Raised by operations on streams.
@@ -136,7 +136,7 @@ module AVStreams
       string reason;
     };
 
-  exception noSuchFlow 
+  exception noSuchFlow
     {
       /// Used to indicate that an invalid flow name was used for the
       /// operation.
@@ -163,41 +163,41 @@ module AVStreams
       /// Start the transfer of data in the stream. Empty the_spec
       /// means apply operation to all flows.
       void start (in flowSpec the_spec) raises (noSuchFlow);
-      
+
       /// Tears down the stream. This will close the connection, and
       /// delete the streamendpoint and vdev associated with this
       /// stream Empty the_spec means apply operation to all flows.
       void destroy (in flowSpec the_spec) raises (noSuchFlow);
-      
+
       /// Changes the QoS associated with the stream Empty the_spec
       /// means apply operation to all flows.
       boolean modify_QoS (inout streamQoS new_qos,
                           in flowSpec the_spec)
-        raises (noSuchFlow, 
+        raises (noSuchFlow,
                 QoSRequestFailed);
 
       /// Called by StreamEndPoint when something goes wrong with a
       /// flow.
       oneway void push_event (in streamEvent the_event);
-      
+
       /// Used to control the flow protocol parameters.
       void set_FPStatus (in flowSpec the_spec,
-                         in string fp_name,             
-                         in any fp_settings)            
-        raises (noSuchFlow, 
+                         in string fp_name,
+                         in any fp_settings)
+        raises (noSuchFlow,
                 FPError);
-      
+
       /// Not implemented in the light profile, will raise the
       /// notsupported exception.
-      Object get_flow_connection (in string flow_name) 
-        raises (noSuchFlow, 
+      Object get_flow_connection (in string flow_name)
+        raises (noSuchFlow,
                 notSupported);
-      
+
       /// Not implemented in the light profile, will raise the
       /// notsupported exception.
       void set_flow_connection (in string flow_name,
                                 in Object flow_connection)
-        raises (noSuchFlow, 
+        raises (noSuchFlow,
                 notSupported);
     };
 
@@ -226,33 +226,33 @@ module AVStreams
    *          is used to control the stream. It should be subclassed
    *          by applications that want to provide more control features.
    */
-  interface StreamCtrl : Basic_StreamCtrl 
+  interface StreamCtrl : Basic_StreamCtrl
     {
-      
+
       boolean bind_devs (in MMDevice a_party, in MMDevice b_party,
                          inout streamQoS the_qos,
                          in flowSpec the_flows)
-        raises (streamOpFailed, 
-                noSuchFlow, 
+        raises (streamOpFailed,
+                noSuchFlow,
                 QoSRequestFailed);
       /// Establish a stream between a_party and b_party, with qos
       /// the_qos, and for the flows in the_flows if the_flows is
       /// empty, bind all the flows Causes a connection to be
       /// established between the StreamEndpoints.  Returns
       /// success/failure
-      
+
       boolean bind (in StreamEndPoint_A a_party,
                     in StreamEndPoint_B b_party,
                     inout streamQoS the_qos,
                     in flowSpec the_flows)
-        raises (streamOpFailed, 
-                noSuchFlow, 
+        raises (streamOpFailed,
+                noSuchFlow,
                 QoSRequestFailed);
       /// Establish a connection between two streamendpoints. This can
       /// be used if the streamendpoints have been created independent
       /// of a MMDevice
-      
-      void unbind_dev(in MMDevice dev, in flowSpec the_spec) 
+
+      void unbind_dev(in MMDevice dev, in flowSpec the_spec)
         raises (streamOpFailed, noSuchFlow);
 
       /// Unbind the_ep from the stream. Empty the_spec means apply to
@@ -265,8 +265,8 @@ module AVStreams
       void unbind ()
         raises (streamOpFailed);
 
-      VDev get_related_vdev(in MMDevice adev, 
-                            out StreamEndPoint sep) 
+      VDev get_related_vdev(in MMDevice adev,
+                            out StreamEndPoint sep)
         raises (streamOpFailed);
 
     };
@@ -276,27 +276,27 @@ module AVStreams
    *  @brief Interface for multicasting operations.
    */
   interface MCastConfigIf : CosPropertyService::PropertySet{
-      /// Set a peer in the multicast tree.     
+      /// Set a peer in the multicast tree.
       boolean set_peer (in Object peer,
                         inout streamQoS the_qos,
                         in flowSpec the_spec)
-        raises (QoSRequestFailed, 
+        raises (QoSRequestFailed,
                 streamOpFailed);
 
-      /// Configure the multicast stream.      
+      /// Configure the multicast stream.
       void configure (in CosPropertyService::Property a_configuration);
 
-      /// Sets the initial configuration to be used for all added peers.     
+      /// Sets the initial configuration to be used for all added peers.
       void set_initial_configuration (in CosPropertyService::Properties initial);
 
-      
+
       /// Uses <format_name> standardised by OMG and IETF
       /// Multicasting operations are not supported yet.
-      void set_format (in string flowName, 
+      void set_format (in string flowName,
                        in string format_name)
         raises (notSupported);
 
-      
+
       /// Note, some of these device params are standardised by OMG
       /// Multicasting operations are not supported yet.
       void set_dev_params (in string flowName,
@@ -316,25 +316,25 @@ module AVStreams
   interface StreamEndPoint : CosPropertyService::PropertySet{
 
       /// Stop the stream. Empty the_spec means, for all the flows.
-      void stop (in flowSpec the_spec) 
+      void stop (in flowSpec the_spec)
         raises (noSuchFlow);
 
-      /// Start the stream, Empty the_spec means, for all the flows.      
-      void start (in flowSpec the_spec) 
+      /// Start the stream, Empty the_spec means, for all the flows.
+      void start (in flowSpec the_spec)
         raises (noSuchFlow);
 
-      /// Destroy the stream, Empty the_spec means, for all the flows.      
-      void destroy (in flowSpec the_spec) 
+      /// Destroy the stream, Empty the_spec means, for all the flows.
+      void destroy (in flowSpec the_spec)
         raises (noSuchFlow);
-      
+
       /// Called by StreamCtrl. responder is the peer to connect with.
       boolean connect (in StreamEndPoint responder,
                        inout streamQoS qos_spec,
                        in flowSpec the_spec)
-        raises (noSuchFlow, 
-                QoSRequestFailed, 
+        raises (noSuchFlow,
+                QoSRequestFailed,
                 streamOpFailed);
-      
+
       /// Called by the peer StreamEndPoint. The flow_spec indicates
       /// the flows (which contain transport addresses etc.).
       boolean request_connection (in StreamEndPoint initiator,
@@ -343,51 +343,51 @@ module AVStreams
                                   inout flowSpec the_spec)
         raises (streamOpDenied, noSuchFlow,
                 QoSRequestFailed, FPError);
-      
+
       /// Change the transport qos on a stream.
       boolean modify_QoS (inout streamQoS new_qos,
                           in flowSpec the_flows)
-        raises (noSuchFlow, 
+        raises (noSuchFlow,
                 QoSRequestFailed);
-      
+
       /// Used to restrict the set of protocols.
       boolean set_protocol_restriction (in protocolSpec the_pspec);
-      
+
       /// Disconnect the flows.
       void disconnect(in flowSpec the_spec)
-        raises (noSuchFlow, 
+        raises (noSuchFlow,
                 streamOpFailed);
-      
+
       /// Used to control the SFP parameters.
       void set_FPStatus (in flowSpec the_spec,
                          in string fp_name,
                          in any fp_settings)
-        raises (noSuchFlow, 
+        raises (noSuchFlow,
                 FPError);
 
       /// Not implemented in the light profile, throws notsupported.
       Object get_fep (in string flow_name)
-        raises (notSupported, 
+        raises (notSupported,
                 noSuchFlow);
-      
+
       /// Not implemented in the light profile, throws notsupported.
       string add_fep (in Object the_fep)
         /// Can fail for reasons {duplicateFepName, duplicateRef}
-        raises (notSupported, 
+        raises (notSupported,
                 streamOpFailed);
-      
+
       /// Not implemented in the light profile, throws notsupported.
       void remove_fep (in string fep_name)
-        raises (notSupported, 
+        raises (notSupported,
                 streamOpFailed);
-      
+
       /// Used to "attach" a negotiator to the endpoint.
       void set_negotiator (in Negotiator new_negotiator);
 
       /// Used for public key encryption.
-      void set_key (in string flow_name, 
+      void set_key (in string flow_name,
                     in key the_key);
-    
+
       /// Used to set a unique id for packets sent by this
       /// streamendpoint.
       void set_source_id (in long source_id);
@@ -421,7 +421,7 @@ module AVStreams
    *  @interface StreamEndPoint_B
    *  @brief The "B" side of a streamendpoint.
    */
-  interface StreamEndPoint_B : StreamEndPoint 
+  interface StreamEndPoint_B : StreamEndPoint
     {
       /// Used for ATM-style multicast.
       boolean multiconnect (inout streamQoS the_qos,
@@ -443,8 +443,8 @@ module AVStreams
                         in VDev the_peer_dev,
                         inout streamQoS the_qos,
                         in flowSpec the_spec)
-        raises (noSuchFlow, 
-                QoSRequestFailed, 
+        raises (noSuchFlow,
+                QoSRequestFailed,
                 streamOpFailed);
 
       /// Used to set the streamctrl and multicast device.
@@ -452,18 +452,18 @@ module AVStreams
                               in MCastConfigIf a_mcastconfigif,
                               inout streamQoS the_qos,
                               in flowSpec the_spec)
-        raises (noSuchFlow, 
-                QoSRequestFailed, 
+        raises (noSuchFlow,
+                QoSRequestFailed,
                 streamOpFailed);
 
       /// Called by the peer VDev to configure the device (catch all).
       void configure (in CosPropertyService::Property the_config_mesg)
-        raises (PropertyException, 
+        raises (PropertyException,
                 streamOpFailed);
 
       /// Uses <formatName> standardised by OMG and IETF
       /// Used to set a format on a flowname.
-      void set_format (in string flowName, 
+      void set_format (in string flowName,
                        in string format_name)
         raises (notSupported);
 
@@ -471,23 +471,23 @@ module AVStreams
       /// Used to set device parameters.
       void set_dev_params (in string flowName,
                            in CosPropertyService::Properties new_params)
-        raises (PropertyException, 
+        raises (PropertyException,
                 streamOpFailed);
 
       /// Called to change QoS of the device.
       boolean modify_QoS (inout streamQoS the_qos,
                           in flowSpec the_spec)
-        raises (noSuchFlow, 
+        raises (noSuchFlow,
                 QoSRequestFailed);
 
 
     };
 
-  /** 
+  /**
    *  @interface MMDevice
    *  @brief Implements a factory to create Endpoints and VDevs.
    */
-  interface MMDevice : CosPropertyService::PropertySet 
+  interface MMDevice : CosPropertyService::PropertySet
     {
       /// Called by StreamCtrl to create a "A" type streamendpoint and
       /// vdev.
@@ -497,10 +497,10 @@ module AVStreams
                                  out boolean met_qos,
                                  inout string named_vdev,
                                  in flowSpec the_spec)
-        raises (streamOpFailed, 
-                streamOpDenied, 
+        raises (streamOpFailed,
+                streamOpDenied,
                 notSupported,
-                QoSRequestFailed, 
+                QoSRequestFailed,
                 noSuchFlow);
 
       /// Called by StreamCtrl to create a "B" type streamendpoint and
@@ -511,50 +511,50 @@ module AVStreams
                                 out boolean met_qos,
                                 inout string named_vdev,
                                 in flowSpec the_spec)
-        raises (streamOpFailed, 
-                streamOpDenied, 
+        raises (streamOpFailed,
+                streamOpDenied,
                 notSupported,
-                QoSRequestFailed, 
+                QoSRequestFailed,
                 noSuchFlow);
-    
+
       /// Can be used to request the MMDevice to create a new
       /// StreamCtrl, and call bind_devs on it.
       StreamCtrl bind (in MMDevice peer_device,
                        inout streamQoS the_qos,
                        out boolean is_met,
                        in flowSpec the_spec)
-        raises (streamOpFailed, 
-                noSuchFlow, 
+        raises (streamOpFailed,
+                noSuchFlow,
                 QoSRequestFailed);
-    
+
       /// Multicast bind.
       StreamCtrl bind_mcast (in MMDevice first_peer,
                              inout streamQoS the_qos,
                              out boolean is_met,
                              in flowSpec the_spec)
-        raises (streamOpFailed, 
-                noSuchFlow, 
+        raises (streamOpFailed,
+                noSuchFlow,
                 QoSRequestFailed);
 
       /// Remove the StreamEndPoint and the related vdev.
-      void destroy (in StreamEndPoint the_ep, 
+      void destroy (in StreamEndPoint the_ep,
                     in string vdev_name)
         // ie VDev not found
         raises (notSupported);
-     
+
       /// Not supported in the light profile, raises notsupported.
       string add_fdev (in Object the_fdev)
-        raises (notSupported, 
+        raises (notSupported,
                 streamOpFailed);
 
       /// Not supported in the light profile, raises notsupported.
       Object get_fdev (in string flow_name)
-        raises (notSupported, 
+        raises (notSupported,
                 noSuchFlow);
 
       /// Not supported in the light profile, raises notsupported.
       void remove_fdev (in string flow_name)
-        raises (notSupported, 
+        raises (notSupported,
                 noSuchFlow,
                 streamOpFailed);
     };
@@ -593,8 +593,8 @@ module AVStreams
 
     boolean connect_devs(in FDev a_party, in FDev b_party,
                          inout AVStreams::QoS the_qos)
-      raises (AVStreams::streamOpFailed, 
-              AVStreams::streamOpDenied, 
+      raises (AVStreams::streamOpFailed,
+              AVStreams::streamOpDenied,
               AVStreams::QoSRequestFailed);
 
     boolean connect(in FlowProducer flow_producer,
@@ -639,7 +639,7 @@ module AVStreams
                                 in any fp_settings)
         raises (AVStreams::FPError, AVStreams::notSupported);
 
-      /// set_format() initializes �ëformat�í 
+      /// set_format() initializes �ëformat�í
       /// as current media format e.g. MPEG.
       void set_format(in string format)
         raises (AVStreams::notSupported);
@@ -647,11 +647,11 @@ module AVStreams
       void set_dev_params(in CosPropertyService::Properties new_settings)
         //      raises (CosPropertyService::PropertyException, AVStreams::streamOpFailed);
         raises (PropertyException, AVStreams::streamOpFailed);
-      
+
       void set_protocol_restriction(in AVStreams::protocolSpec the_spec)
         raises (AVStreams::notSupported);
 
-      boolean is_fep_compatible(in FlowEndPoint fep) 
+      boolean is_fep_compatible(in FlowEndPoint fep)
         raises (formatMismatch, deviceQosMismatch);
 
       boolean set_peer(in FlowConnection the_fc,
@@ -679,7 +679,7 @@ module AVStreams
                           inout string flowProtocol)// syntax <flowProtocol>
         // The out value of flowProtocol contains SFP version
         // supported and all options including "Credit".
-        raises(failedToListen, AVStreams::FPError, 
+        raises(failedToListen, AVStreams::FPError,
                AVStreams::QoSRequestFailed);
     };
 
@@ -758,7 +758,7 @@ module AVStreams
 
   /**
    *  @interface MediaControl
-   *  @brief MediaControl interface is similar to ControlledStream 
+   *  @brief MediaControl interface is similar to ControlledStream
    *         interface in MSS.  It can be inherited by flow endpoints or
    *         FlowConnection interfaces.
    */
diff --git a/orbsvcs/orbsvcs/Channel_Clients_T.h b/orbsvcs/orbsvcs/Channel_Clients_T.h
index 8c964a92548..dcc1364e8e2 100644
--- a/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -12,7 +12,7 @@
  *  These classes allow applications to be consumer, suppliers, and
  *  consumer suppliers, as well as being active objects.  This is
  *  accomplished with adapters to prevent the use of multiple
- *  inheritence (which is this root of all evil.)
+ *  inheritance (which is this root of all evil.)
  *
  *
  */
diff --git a/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index c826c2bbebe..3d34f1fd4fb 100644
--- a/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -20,10 +20,6 @@
 #include "orbsvcs/Concurrency/CC_Lock.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Concurrency,
-           CC_Lock,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CC_Lock::CC_Lock (void)
diff --git a/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index b49c3bf386e..b04be1282ca 100644
--- a/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -12,11 +12,6 @@
 
 #include "orbsvcs/Concurrency/CC_LockSet.h"
 
-ACE_RCSID (Concurrency,
-           CC_LockSet,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Default constructor.
diff --git a/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index 9b7f29ca0e6..597e9c0f3df 100644
--- a/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -12,7 +12,7 @@
 #include "orbsvcs/Concurrency/CC_LockSetFactory.h"
 #include "orbsvcs/Concurrency/CC_LockSet.h"
 
-ACE_RCSID(Concurrency, CC_LockSetFactory, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
index 88c8f20cd5d..64b0c672e3a 100644
--- a/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+++ b/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
@@ -16,7 +16,7 @@
 #include "orbsvcs/Concurrency/Concurrency_Loader.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (Concurrency, Concurrency_Loader, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
index df98c3160d2..94fc4610043 100644
--- a/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
+++ b/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
@@ -14,10 +14,6 @@
 #include "tao/debug.h"
 #include "orbsvcs/Concurrency/Concurrency_Utils.h"
 
-ACE_RCSID (Concurrency,
-           Concurrency_Utils,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Default constructor
diff --git a/orbsvcs/orbsvcs/CosConcurrencyControl.idl b/orbsvcs/orbsvcs/CosConcurrencyControl.idl
index ba8d4cd9c64..dba3d60a16e 100644
--- a/orbsvcs/orbsvcs/CosConcurrencyControl.idl
+++ b/orbsvcs/orbsvcs/CosConcurrencyControl.idl
@@ -1,24 +1,21 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//    CosTransaction.idl
-//
-// = DESCRIPTION
-//    Described in CORBAservices: Common Object Services
-//    Specification, chapter 7 The concurrency service description can
-//    be downloaded from
-//    ftp://www.omg.org/pub/docs/formal/97-11-02.idl
-//
-// = AUTHOR
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CosConcurrencyControl.idl
+ *
+ *  $Id$
+ *
+ *  Described in CORBAservices: Common Object Services
+ *  Specification, chapter 7 The concurrency service description can
+ *  be downloaded from
+ *  ftp://www.omg.org/pub/docs/formal/97-11-02.idl
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_CONCURRENCY_IDL
 #define TAO_CONCURRENCY_IDL
@@ -44,13 +41,13 @@ module CosConcurrencyControl
   // = DESCRIPTION
   //     This idl file describes the concurrency control service.  The
   //     purpose of the concurrency control service is to mediate
-  //     concurrent access to an pbject such that the consistency of
+  //     concurrent access to an object such that the consistency of
   //     the object is not compromised when accessed by concurrently
   //     executing computations.
 
   // = These are the different lock types supported by this module.
 
-  // For a description of the compatability between the different lock
+  // For a description of the compatibility between the different lock
   // types please consult the service description (OMG).
   enum lock_mode
   {
@@ -77,7 +74,7 @@ module CosConcurrencyControl
       //     The LockCoordinator interface enables a transaction service to
       //     drop all locks held by a transaction.
 
-      // Releases all the locks held by the transaction. Designet to be
+      // Releases all the locks held by the transaction. Designed to be
       // used by transaction service when a transaction commits or aborts.
       void drop_locks ();
     };
@@ -92,7 +89,7 @@ module CosConcurrencyControl
       // = DESCRIPTION
       //     Clients operating in the implicit mode
       //     (i.e. non-transactional mode) acquire and release locks
-      //     in lock sets throug this interface. The interface only
+      //     in lock sets through this interface. The interface only
       //     provides operations to acquire and release locks on
       //     behalf of the calling thread or transaction.
 
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index 887b373af45..0ad34e15760 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -12,10 +12,6 @@
 #include "orbsvcs/CosEvent/CEC_ConsumerAdmin.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (CosEvent,
-           CEC_ConsumerAdmin,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec)
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
index 570fe05a684..6740acf67da 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
@@ -2,11 +2,6 @@
 
 #include "orbsvcs/CosEvent/CEC_ConsumerControl.h"
 
-ACE_RCSID (CosEvent,
-           CEC_ConsumerControl,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl (void)
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
index b6666ea3207..f4bd0609486 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
@@ -40,11 +40,6 @@
 #include "orbsvcs/CosEvent/CEC_Default_Factory.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (CosEvent,
-           CEC_Default_Factory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory (void)
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
index 9b671f519f2..ac830526779 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
@@ -3,7 +3,7 @@
 #include "orbsvcs/CosEvent/CEC_Dispatching.h"
 #include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
 
-ACE_RCSID(CosEvent, CEC_Dispatching, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
index 7bf3b4547e4..819d431dd1b 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
@@ -12,23 +12,19 @@
 
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (CosEvent,
-           CEC_Dispatching,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
 TAO_CEC_Dispatching_Task::svc (void)
 {
   bool done = false;
-  
+
   while (!done)
     {
       try
         {
           ACE_Message_Block *mb = 0;
-          
+
           if (this->getq (mb) == -1)
             {
               if (ACE_OS::last_error () == ESHUTDOWN)
@@ -65,7 +61,7 @@ TAO_CEC_Dispatching_Task::svc (void)
           ex._tao_print_exception ("EC (%P|%t) exception in dispatching queue");
         }
     }
-    
+
   return 0;
 }
 
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index dfdf410281a..9dc4b6b2f19 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -13,7 +13,7 @@
 #include "orbsvcs/CosEvent/CEC_EventChannel.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(CosEvent, CEC_EventChannel, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index 42a2f6a53f1..f53f3cea315 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -28,10 +28,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/debug.h"
 
-ACE_RCSID (CosEvent,
-           CEC_Event_Loader,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) :
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
index e2ffe759211..eeb89d93f1b 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
@@ -3,7 +3,7 @@
 #include "orbsvcs/CosEvent/CEC_Factory.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID(CosEvent, CEC_Factory, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
index 487c4079285..ba31df77c25 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
@@ -2,7 +2,7 @@
 
 #include "orbsvcs/CosEvent/CEC_MT_Dispatching.h"
 
-ACE_RCSID(CosEvent, CEC_MT_Dispatching, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index c8400b43e42..3c26d56fa2e 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -12,10 +12,6 @@
 #include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (CosEvent,
-           CEC_ProxyPullConsumer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock;
@@ -72,7 +68,7 @@ TAO_CEC_ProxyPullConsumer::deactivate (void)
   catch (const CORBA::Exception&)
     {
       // Exceptions here should not be propagated.  They usually
-      // indicate that an object is beign disconnected twice, or some
+      // indicate that an object is being disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index 5863632eeab..fadaf6c2bea 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -10,10 +10,6 @@
 #include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (CosEvent,
-           CEC_ProxyPullSupplier,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock;
@@ -71,7 +67,7 @@ TAO_CEC_ProxyPullSupplier::deactivate (void)
   catch (const CORBA::Exception&)
     {
       // Exceptions here should not be propagated.  They usually
-      // indicate that an object is beign disconnected twice, or some
+      // indicate that an object is being disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index 57d981a8c27..c1342545f4c 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -11,10 +11,6 @@
 #include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (CosEvent,
-           CEC_ProxyPushConsumer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock;
@@ -72,7 +68,7 @@ TAO_CEC_ProxyPushConsumer::deactivate (void)
   catch (const CORBA::Exception&)
     {
       // Exceptions here should not be propagated.  They usually
-      // indicate that an object is beign disconnected twice, or some
+      // indicate that an object is being disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
@@ -324,7 +320,7 @@ TAO_CEC_ProxyPushConsumer_Guard::
      proxy_ (proxy),
      locked_ (false)
 {
-  ACE_Guard<ACE_Lock> ace_mon (*this->lock_);
+  ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
   // If the guard fails there is not much we can do, raising an
   // exception is wrong, the client has *no* way to handle that kind
   // of error.  Even worse, there is no exception to raise in that
@@ -348,7 +344,7 @@ TAO_CEC_ProxyPushConsumer_Guard::
     return;
 
   {
-    ACE_Guard<ACE_Lock> ace_mon (*this->lock_);
+    ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
     // If the guard fails there is not much we can do, raising an
     // exception is wrong, the client has *no* way to handle that kind
     // of error.  Even worse, there is no exception to raise in that
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index 4e964d3c8e7..d73a8acf0f1 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -26,10 +26,6 @@
 #include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (CosEvent,
-           CEC_ProxyPushSupplier,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock;
@@ -125,7 +121,7 @@ TAO_CEC_ProxyPushSupplier::deactivate (void)
   catch (const CORBA::Exception&)
     {
       // Exceptions here should not be propagated.  They usually
-      // indicate that an object is beign disconnected twice, or some
+      // indicate that an object is being disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
index eeb8c998046..84f62c99fbf 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
@@ -2,7 +2,7 @@
 
 #include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h"
 
-ACE_RCSID(CosEvent, CEC_Pulling_Strategy, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index edefe1fccab..e8be4970426 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -30,10 +30,6 @@
 #include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (CosEvent,
-           CEC_Reactive_ConsumerControl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_CEC_Reactive_ConsumerControl constructor for the Un-typed EC
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index 4c695f29823..4389bfb2314 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -20,7 +20,7 @@
 #include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(CosEvent, CEC_Reactive_Pulling_Strategy, "$Id$")
+
 
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index e819882e7ce..6d02ae32db2 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -31,10 +31,6 @@
 #include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (CosEvent,
-           CEC_Reactive_SupplierControl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_CEC_Reactive_SupplierControl constructor for the Un-typed EC
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index 1f77e5ecdba..6a5bba0262c 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -10,11 +10,6 @@
 #include "orbsvcs/CosEvent/CEC_SupplierAdmin.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (CosEvent,
-           CEC_SupplierAdmin,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec)
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
index 114603f9913..2ad307d240b 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
@@ -2,7 +2,7 @@
 
 #include "orbsvcs/CosEvent/CEC_SupplierControl.h"
 
-ACE_RCSID(CosEvent, CEC_SupplierControl, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
index 97110286488..95841b71732 100644
--- a/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+++ b/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
@@ -101,7 +101,7 @@ TAO_CEC_TypedProxyPushConsumer::deactivate (void)
   catch (const CORBA::Exception&)
     {
       // Exceptions here should not be propagated.  They usually
-      // indicate that an object is beign disconnected twice, or some
+      // indicate that an object is being disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
@@ -368,7 +368,7 @@ TAO_CEC_TypedProxyPushConsumer_Guard::
      proxy_ (proxy),
      locked_ (0)
 {
-  ACE_Guard<ACE_Lock> ace_mon (*this->lock_);
+  ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
   // If the guard fails there is not much we can do, raising an
   // exception is wrong, the client has *no* way to handle that kind
   // of error.  Even worse, there is no exception to raise in that
@@ -392,7 +392,7 @@ TAO_CEC_TypedProxyPushConsumer_Guard::
     return;
 
   {
-    ACE_Guard<ACE_Lock> ace_mon (*this->lock_);
+    ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
     // If the guard fails there is not much we can do, raising an
     // exception is wrong, the client has *no* way to handle that kind
     // of error.  Even worse, there is no exception to raise in that
@@ -400,7 +400,7 @@ TAO_CEC_TypedProxyPushConsumer_Guard::
     // @@ Returning something won't work either, the error should be
     // logged though!
 
-    this->refcount_--;
+    --this->refcount_;
     if (this->refcount_ != 0)
       return;
   }
diff --git a/orbsvcs/orbsvcs/CosLifeCycle.idl b/orbsvcs/orbsvcs/CosLifeCycle.idl
index ea2acff3844..f6cf190313d 100644
--- a/orbsvcs/orbsvcs/CosLifeCycle.idl
+++ b/orbsvcs/orbsvcs/CosLifeCycle.idl
@@ -1,31 +1,30 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//    CosLifeCycle.idl
-//
-// = DESCRIPTION
-//    Described in CORBAservices: Common Object Services Specification,
-//    chapter 6.
-//    The life cycle service description can be downloaded from:
-//      ftp://www.omg.org/pub/docs/formal/97-12-13.pdf
-//    The original IDL file can be downloaded from:
-//      ftp://www.omg.org/pub/docs/formal/97-11-02.idl
-//
-// = AUTHOR
-//    OMG, Torben Worm <tworm@cs.wustl.edu>, and Michael Kircher <mk1@cec.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CosLifeCycle.idl
+ *
+ *  $Id$
+ *
+ *  Described in CORBAservices: Common Object Services Specification,
+ *  chapter 6.
+ *  The life cycle service description can be downloaded from:
+ *    ftp://www.omg.org/pub/docs/formal/97-12-13.pdf
+ *  The original IDL file can be downloaded from:
+ *    ftp://www.omg.org/pub/docs/formal/97-11-02.idl
+ *
+ *
+ *  @author OMG
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ *  @author and Michael Kircher <mk1@cec.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_LIFECYCLE_IDL
 #define TAO_LIFECYCLE_IDL
 
-// OMG IDL for CosLifeCycle Module, page 6-10 in 
+// OMG IDL for CosLifeCycle Module, page 6-10 in
 // Includes the following interfaces:
 //   FactoryFinder, LifeCycleObject, GenericFactory
 
@@ -40,21 +39,21 @@ module CosLifeCycle
   //
   // = DESCRIPTION
   //     This idl file describes the life cycle service.
-  //     The purpose of the life cycle service is to 
-  
-  typedef CosNaming::Name Key; 
+  //     The purpose of the life cycle service is to
+
+  typedef CosNaming::Name Key;
   typedef Object _Factory;
   typedef sequence <_Factory> Factories;
 
   struct NameValuePair
   {
-    CosNaming::Istring name; 
-    any value; 
+    CosNaming::Istring name;
+    any value;
   };
 
   typedef sequence <NameValuePair> Criteria;
-  
-  exception NoFactory 
+
+  exception NoFactory
   {
     Key search_key;
   };
@@ -65,12 +64,12 @@ module CosLifeCycle
   {
     Criteria invalid_criteria;
   };
-  exception CannotMeetCriteria 
+  exception CannotMeetCriteria
   {
     Criteria unmet_criteria;
   };
-  
-  interface FactoryFinder 
+
+  interface FactoryFinder
     {
       // = TITLE
       //   @@ Please fill in.
@@ -80,25 +79,25 @@ module CosLifeCycle
       Factories find_factories (in Key factory_key)
         raises (NoFactory);
     };
-  
-  interface LifeCycleObject 
+
+  interface LifeCycleObject
     {
       // = TITLE
       //   @@ Please fill in.
       // = DESCRIPTION
       //   @@ Please fill in.
 
-      LifeCycleObject copy (in FactoryFinder there, 
+      LifeCycleObject copy (in FactoryFinder there,
                             in Criteria the_criteria)
         raises (NoFactory, NotCopyable, InvalidCriteria, CannotMeetCriteria);
-      void move (in FactoryFinder there, 
+      void move (in FactoryFinder there,
                  in Criteria the_criteria)
         raises (NoFactory, NotMovable, InvalidCriteria,  CannotMeetCriteria);
       void remove ()
         raises (NotRemovable);
     };
-  
-  interface GenericFactory 
+
+  interface GenericFactory
     {
       // = TITLE
       //   @@ Please fill in.
@@ -106,7 +105,7 @@ module CosLifeCycle
       //   @@ Please fill in.
 
       boolean _supports (in Key k);
-      Object create_object (in Key k, 
+      Object create_object (in Key k,
                             in Criteria the_criteria)
         raises (NoFactory, InvalidCriteria, CannotMeetCriteria);
     };
@@ -114,9 +113,9 @@ module CosLifeCycle
 
 // Criteria, page 6-17:
 /*
-typedef struct NVP 
+typedef struct NVP
 {
-  CosNaming::Istring name;  
+  CosNaming::Istring name;
   any value;
 } NameValuePair;
 
diff --git a/orbsvcs/orbsvcs/CosNaming.idl b/orbsvcs/orbsvcs/CosNaming.idl
index b432ace0811..593762c22bf 100644
--- a/orbsvcs/orbsvcs/CosNaming.idl
+++ b/orbsvcs/orbsvcs/CosNaming.idl
@@ -1,18 +1,15 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//    CosNaming.idl
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CosNaming.idl
+ *
+ *  $Id$
+ *
+ *  @author Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_NAMING_IDL
 #define TAO_NAMING_IDL
@@ -187,7 +184,7 @@ module CosNaming
 
       // = Deleting contexts.
 
-      /// Delete the naming context.  NOTE: the user should <unbind>
+      /// Delete the naming context.  @note the user should <unbind>
       /// any bindings in which the given context is bound to some
       /// names before invoking <destroy> operation on it.
       void destroy ()
diff --git a/orbsvcs/orbsvcs/CosTrading.idl b/orbsvcs/orbsvcs/CosTrading.idl
index f204eb5bddd..c94b745db86 100644
--- a/orbsvcs/orbsvcs/CosTrading.idl
+++ b/orbsvcs/orbsvcs/CosTrading.idl
@@ -1,17 +1,19 @@
 /* -*- C++ -*- */
 
-// ========================================================================
-// $Id$
-//
-// = FILENAME
-//   CosTrading.idl
-//
-// = DESCRIPTION
-//   Trader  Service v1.0 described in CORBAservices: Common Object
-//   Services Specification, chapter 16 OMG IDL for Trading Function
-//   Module, p 16-74
-//
-// ========================================================================
+//=============================================================================
+/**
+ *  @file   CosTrading.idl
+ *
+ *  $Id$
+ *
+ * Trader  Service v1.0 described in CORBAservices: Common Object
+ * Services Specification, chapter 16 OMG IDL for Trading Function
+ * Module, p 16-74
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef TAO_TRADING_IDL
 #define TAO_TRADING_IDL
@@ -201,23 +203,23 @@ module CosTrading
          {
          case some: PropertyNameSeq prop_names;
          };
-       
+
        exception IllegalPreference {
          Preference pref;
        };
-       
+
        exception IllegalPolicyName {
          PolicyName name;
        };
-       
+
        exception PolicyTypeMismatch {
          Policy the_policy;
        };
-       
+
        exception InvalidPolicyValue {
          Policy the_policy;
        };
-       
+
        void query (in ServiceTypeName type,
                    in Constraint constr,
                    in Preference pref,
@@ -238,9 +240,9 @@ module CosTrading
                  DuplicatePropertyName,
                  DuplicatePolicyName);
      };
-     
+
      interface Register : TraderComponents, SupportAttributes
-       {                
+       {
          struct OfferInfo
          {
            Object reference;
@@ -251,42 +253,42 @@ module CosTrading
          exception InvalidObjectRef {
            Object ref;
          };
-         
+
          exception UnknownPropertyName {
            PropertyName name;
          };
-         
+
          exception InterfaceTypeMismatch {
            ServiceTypeName type;
            Object reference;
          };
-         
+
          exception ProxyOfferId {
            OfferId id;
          };
-         
+
          exception MandatoryProperty {
            ServiceTypeName type;
            PropertyName name;
          };
-         
+
          exception ReadonlyProperty {
            ServiceTypeName type;
            PropertyName name;
          };
-         
+
          exception NoMatchingOffers {
            Constraint constr;
          };
-         
+
          exception IllegalTraderName {
            TraderName name;
          };
-         
+
          exception UnknownTraderName {
            TraderName name;
          };
-         
+
          exception RegisterNotSupported {
            TraderName name;
          };
@@ -308,7 +310,7 @@ module CosTrading
            raises (IllegalOfferId,
                    UnknownOfferId,
                    ProxyOfferId);
-         
+
          OfferInfo describe (in OfferId id)
            raises (IllegalOfferId,
                    UnknownOfferId,
@@ -355,25 +357,25 @@ module CosTrading
     exception IllegalLinkName {
                   LinkName name;
     };
-                
+
     exception UnknownLinkName {
                   LinkName name;
     };
-                
+
     exception DuplicateLinkName {
                   LinkName name;
     };
-                
+
     exception DefaultFollowTooPermissive {
                   FollowOption def_pass_on_follow_rule;
                   FollowOption limiting_follow_rule;
     };
-                
+
     exception LimitingFollowTooPermissive {
                   FollowOption limiting_follow_rule;
                   FollowOption max_link_follow_policy;
     };
-                
+
     void add_link (in LinkName name,
                                in Lookup target,
                                in FollowOption def_pass_on_follow_rule,
@@ -406,7 +408,7 @@ module CosTrading
   interface Proxy : TraderComponents, SupportAttributes
           {
             typedef Istring ConstraintRecipe;
-            
+
             struct ProxyInfo
             {
               ServiceTypeName type;
@@ -420,11 +422,11 @@ module CosTrading
             exception IllegalRecipe {
               ConstraintRecipe recipe;
             };
-            
+
             exception NotProxyOfferId {
               OfferId id;
             };
-            
+
             OfferId export_proxy (in Lookup target,
                                   in ServiceTypeName type,
                                   in PropertySeq properties,
@@ -446,46 +448,46 @@ module CosTrading
               raises (IllegalOfferId,
                       UnknownOfferId,
                       NotProxyOfferId);
-            
+
             ProxyInfo describe_proxy (in OfferId id)
               raises (IllegalOfferId,
                       UnknownOfferId,
                       NotProxyOfferId);
           };
-          
+
           interface Admin : TraderComponents, SupportAttributes, ImportAttributes, LinkAttributes
-            {              
+            {
               typedef sequence<octet> OctetSeq;
-              
+
               readonly attribute OctetSeq request_id_stem;
-              
+
               unsigned long set_def_search_card (in unsigned long value);
               unsigned long set_max_search_card (in unsigned long value);
-              
+
               unsigned long set_def_match_card (in unsigned long value);
               unsigned long set_max_match_card (in unsigned long value);
-              
+
               unsigned long set_def_return_card (in unsigned long value);
               unsigned long set_max_return_card (in unsigned long value);
-              
+
               unsigned long set_max_list (in unsigned long value);
-              
+
               boolean set_supports_modifiable_properties (in boolean value);
               boolean set_supports_dynamic_properties (in boolean value);
               boolean set_supports_proxy_offers (in boolean value);
-              
+
               unsigned long set_def_hop_count (in unsigned long value);
               unsigned long set_max_hop_count (in unsigned long value);
-              
+
               FollowOption set_def_follow_policy (in FollowOption policy);
               FollowOption set_max_follow_policy (in FollowOption policy);
-              
+
               FollowOption set_max_link_follow_policy (in FollowOption policy);
-              
+
               TypeRepository set_type_repos (in TypeRepository repository);
-              
+
               OctetSeq set_request_id_stem (in OctetSeq stem);
-              
+
               void list_offers (in unsigned long how_many,
                                 out OfferIdSeq ids,
                                 out OfferIdIterator id_itr)
@@ -512,13 +514,13 @@ module CosTrading
           {
             unsigned long max_left ()
               raises (UnknownMaxLeft);
-            
+
             boolean next_n (in unsigned long n,
                             out OfferIdSeq ids);
 
             void destroy ();
           };
-          
+
 }; /* end module CosTrading */
 
 #endif /* TAO_TRADING_IDL */
diff --git a/orbsvcs/orbsvcs/CosTradingDynamic.idl b/orbsvcs/orbsvcs/CosTradingDynamic.idl
index 27ffedbbf35..8db8df9343e 100644
--- a/orbsvcs/orbsvcs/CosTradingDynamic.idl
+++ b/orbsvcs/orbsvcs/CosTradingDynamic.idl
@@ -1,17 +1,19 @@
 /* -*- C++ -*- */
 
-// ========================================================================
-// $Id$
-//
-// = FILENAME
-//   CosTradingDynamic.idl
-//
-// = DESCRIPTION
-//   Trader  Service v1.0 described in CORBAservices: Common Object
-//   Services Specification, chapter 16 OMG IDL for Trading Function
-//   Module, p 16-74
-//
-// ========================================================================
+//=============================================================================
+/**
+ *  @file   CosTradingDynamic.idl
+ *
+ *  $Id$
+ *
+ * Trader  Service v1.0 described in CORBAservices: Common Object
+ * Services Specification, chapter 16 OMG IDL for Trading Function
+ * Module, p 16-74
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef TAO_TRADING_DYNAMIC_IDL
 #define TAO_TRADING_DYNAMIC_IDL
@@ -25,15 +27,15 @@
 
 module CosTradingDynamic
 {
-  
+
   exception DPEvalFailure {
     CosTrading::PropertyName name;
     CORBA::TypeCode returned_type;
     any extra_info;
   };
-  
+
   interface DynamicPropEval
-    {      
+    {
       any evalDP (in CosTrading::PropertyName name,
                   in CORBA::TypeCode returned_type,
                   in any extra_info)
diff --git a/orbsvcs/orbsvcs/CosTradingRepos.idl b/orbsvcs/orbsvcs/CosTradingRepos.idl
index 0462030155e..9bc311d3754 100644
--- a/orbsvcs/orbsvcs/CosTradingRepos.idl
+++ b/orbsvcs/orbsvcs/CosTradingRepos.idl
@@ -1,17 +1,19 @@
 /* -*- C++ -*- */
 
-// ========================================================================
-// $Id$
-//
-// = FILENAME
-//   CosTradingRepos.idl
-//
-// = DESCRIPTION
-//   Trader  Service v1.0 described in CORBAservices: Common Object
-//   Services Specification, chapter 16 OMG IDL for Trading Function
-//   Module, p 16-74
-//
-// ========================================================================
+//=============================================================================
+/**
+ *  @file   CosTradingRepos.idl
+ *
+ *  $Id$
+ *
+ * Trader  Service v1.0 described in CORBAservices: Common Object
+ * Services Specification, chapter 16 OMG IDL for Trading Function
+ * Module, p 16-74
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef TAO_TRADING_REPOS_IDL
 #define TAO_TRADING_REPOS_IDL
@@ -26,7 +28,7 @@
 module CosTradingRepos
 {
   interface ServiceTypeRepository
-    {     
+    {
       // local types
       typedef sequence<CosTrading::ServiceTypeName> ServiceTypeNameSeq;
       enum PropertyMode {
@@ -40,7 +42,7 @@ module CosTradingRepos
         PropertyMode mode;
       };
       typedef sequence<PropStruct> PropStructSeq;
-      
+
       typedef CosTrading::Istring Identifier;  // IR::Identifier
 
       struct IncarnationNumber
@@ -99,10 +101,10 @@ module CosTradingRepos
       exception DuplicateServiceTypeName {
         CosTrading::ServiceTypeName name;
       };
-      
+
       // attributes
       readonly attribute IncarnationNumber incarnation;
-      
+
       // operation signatures
       IncarnationNumber add_type (in CosTrading::ServiceTypeName name,
                                   in Identifier if_name,
@@ -121,7 +123,7 @@ module CosTradingRepos
         raises (CosTrading::IllegalServiceType,
                 CosTrading::UnknownServiceType,
                 HasSubTypes);
-      
+
       ServiceTypeNameSeq list_types (in SpecifiedServiceTypes which_types);
 
       TypeStruct describe_type (in CosTrading::ServiceTypeName name)
@@ -140,7 +142,7 @@ module CosTradingRepos
       void unmask_type (in CosTrading::ServiceTypeName name)
         raises (CosTrading::IllegalServiceType,
                 CosTrading::UnknownServiceType,
-                NotMasked);      
+                NotMasked);
     };
 }; /* end module CosTradingRepos */
 
diff --git a/orbsvcs/orbsvcs/DsEventLogAdmin.idl b/orbsvcs/orbsvcs/DsEventLogAdmin.idl
index a4f32040b3f..a43202eb871 100644
--- a/orbsvcs/orbsvcs/DsEventLogAdmin.idl
+++ b/orbsvcs/orbsvcs/DsEventLogAdmin.idl
@@ -1,18 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    DsEventLogAdmin.idl
-//
-// = DESCRIPTION
-//    This module defines the EventLog and
-//    EventLogFactory interfaces.
-//
-// = AUTHOR
-//    D A Hanvey (d.hanvey@qub.ac.uk)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    DsEventLogAdmin.idl
+ *
+ *  $Id$
+ *
+ *  This module defines the EventLog and
+ *  EventLogFactory interfaces.
+ *
+ *
+ *  @author D A Hanvey (d.hanvey@qub.ac.uk)
+ */
+//=============================================================================
+
 
 #ifndef DS_EVENT_LOG_ADMIN_IDL
 #define DS_EVENT_LOG_ADMIN_IDL
@@ -50,7 +50,7 @@ module DsEventLogAdmin
         DsLogAdmin::InvalidThreshold);
 
   };
-  
+
 };
 
 #endif /* DS_EVENT_LOG_ADMIN_IDL */
diff --git a/orbsvcs/orbsvcs/DsLogAdmin.idl b/orbsvcs/orbsvcs/DsLogAdmin.idl
index b127f0cb222..abcb86a0475 100644
--- a/orbsvcs/orbsvcs/DsLogAdmin.idl
+++ b/orbsvcs/orbsvcs/DsLogAdmin.idl
@@ -1,15 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    DsLogAdmin.idl
-//
-// = DESCRIPTION
-//    This module defines the Log, Iterator, LogMgr and LogFactory
-//    interfaces for the OMG's Telecom Event Log Service
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    DsLogAdmin.idl
+ *
+ *  $Id$
+ *
+ *  This module defines the Log, Iterator, LogMgr and LogFactory
+ *  interfaces for the OMG's Telecom Event Log Service
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef DS_LOG_ADMIN_IDL
 #define DS_LOG_ADMIN_IDL
diff --git a/orbsvcs/orbsvcs/DsLogNotification.idl b/orbsvcs/orbsvcs/DsLogNotification.idl
index a01f38763e8..6b8f5ad4b61 100644
--- a/orbsvcs/orbsvcs/DsLogNotification.idl
+++ b/orbsvcs/orbsvcs/DsLogNotification.idl
@@ -1,15 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    DsLogNotification.idl
-//
-// = DESCRIPTION
-//    This module defines the Log Generated Events module
-//    for the OMG's Telecom Event Log Service
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    DsLogNotification.idl
+ *
+ *  $Id$
+ *
+ *  This module defines the Log Generated Events module
+ *  for the OMG's Telecom Event Log Service
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef DS_LOG_NOTIFICATION_IDL
 #define DS_LOG_NOTIFICATION_IDL
diff --git a/orbsvcs/orbsvcs/DsNotifyLogAdmin.idl b/orbsvcs/orbsvcs/DsNotifyLogAdmin.idl
index c1bc5787c57..7af25606e86 100644
--- a/orbsvcs/orbsvcs/DsNotifyLogAdmin.idl
+++ b/orbsvcs/orbsvcs/DsNotifyLogAdmin.idl
@@ -1,18 +1,18 @@
-// $Id$
 
-// ============================================================================
-//
-// = FILENAME
-//    DsNotifyLogAdmin.idl
-//
-// = DESCRIPTION
-//    This module defines the NotifyLog and
-//    NotifyLogFactory interfaces.
-//
-// = AUTHOR
-//    David Hanvey (d.hanvey@qub.ac.uk)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    DsNotifyLogAdmin.idl
+ *
+ *  $Id$
+ *
+ *  This module defines the NotifyLog and
+ *  NotifyLogFactory interfaces.
+ *
+ *
+ *  @author David Hanvey (d.hanvey@qub.ac.uk)
+ */
+//=============================================================================
+
 
 #ifndef DS_NOTIFY_LOG_ADMIN_IDL
 #define DS_NOTIFY_LOG_ADMIN_IDL
@@ -60,7 +60,7 @@ module DsNotifyLogAdmin
         CosNotification::UnsupportedQoS,
         CosNotification::UnsupportedAdmin);
   };
-  
+
 };
 
 #endif /* DS_NOTIFY_LOG_ADMIN_IDL */
diff --git a/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h b/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
index 4c804304f54..bc3f03882db 100644
--- a/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
+++ b/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
@@ -104,7 +104,7 @@ private:
  *
  * @brief Implements a Command object that invokes the
  * disconnected_i() method on the target, passing an argument of type
- * Object. 
+ * Object.
  *
  * <H2>Memory Managment</H2>
  * It does not assume ownership of Object nor the Target
diff --git a/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h b/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
index 6fbb9c609e1..3a0585e8f31 100644
--- a/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
+++ b/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
@@ -31,7 +31,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * The system can then execute the operation without any risk of
  * having the underlying object destroyed.  The advantage of using
  * a reference count is that no mutex or lock needs to be held
- * while the operation is beign executed.
+ * while the operation is being executed.
  * This class implements that common idiom, but it also adds hooks
  * to handle scenarios where more than one operation is performed
  * while holding the reference count.
diff --git a/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp b/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
index 8a6ab4da092..2694b25b984 100644
--- a/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
+++ b/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
@@ -9,4 +9,6 @@
 #include "orbsvcs/ESF/ESF_RefCount_Guard.inl"
 #endif /* __ACE_INLINE__ */
 
+
+
 #endif /* TAO_ESF_REFCOUNT_GUARD_CPP */
diff --git a/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h b/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
index 2bf75f0b5f6..b5c73f89987 100644
--- a/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
+++ b/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
@@ -33,7 +33,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * The system can then execute the operation without any risk of
  * having the underlying object destroyed.  The advantage of using
  * a reference count is that no mutex or lock needs to be held
- * while the operation is beign executed.
+ * while the operation is being executed.
  */
 template<class T>
 class TAO_ESF_RefCount_Guard
diff --git a/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index 5f9b89f50d0..7d725174738 100644
--- a/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -10,6 +10,8 @@
 #include "orbsvcs/Event/ECG_CDR_Message_Sender.inl"
 #endif /* __ACE_INLINE__ */
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
index d5cf9b79530..06a54ac2b5a 100644
--- a/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -58,7 +58,7 @@ public:
    * <is_source_mapping> flag indicates whether this
    * server maps based on event header source or event header type.
    */
-  static TAO_EC_Servant_Var<TAO_ECG_Complex_Address_Server>
+  static PortableServer::Servant_var<TAO_ECG_Complex_Address_Server>
          create (int is_source_mapping = 1);
 
   /// Destructor
diff --git a/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl b/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl
index b47e2db3e68..bafa73ad26f 100644
--- a/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl
+++ b/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl
@@ -4,10 +4,10 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_Complex_Address_Server>
+ACE_INLINE PortableServer::Servant_var<TAO_ECG_Complex_Address_Server>
 TAO_ECG_Complex_Address_Server::create (int is_source_mapping)
 {
-  TAO_EC_Servant_Var<TAO_ECG_Complex_Address_Server> s;
+  PortableServer::Servant_var<TAO_ECG_Complex_Address_Server> s;
   ACE_NEW_RETURN (s,
                   TAO_ECG_Complex_Address_Server (is_source_mapping),
                   s);
diff --git a/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
index d36aef388e9..f3f35179378 100644
--- a/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
@@ -2,6 +2,8 @@
 
 #include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control (void)
diff --git a/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index 490f03f17e1..bdaaa102762 100644
--- a/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -267,7 +267,7 @@ private:
   /// Event Channel Observer.  Detects changes in EC consumer subscriptions.
   /// ORDER DEPENDENCY: this member should be declared before
   /// <auto_observer_disconnect_>.
-  TAO_EC_Servant_Var<Observer> observer_;
+  PortableServer::Servant_var<Observer> observer_;
 
   /// Manages connection of our observer to the Event Channel.
   /// ORDER DEPENDENCY: this member should be declared AFTER <observer_>.
diff --git a/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index 1a780fcb1c5..d8985d46bd2 100644
--- a/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -22,13 +22,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-typedef TAO_EC_Shutdown_Command<TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> >
+typedef TAO_EC_Shutdown_Command<PortableServer::Servant_var<TAO_ECG_UDP_Sender> >
 UDP_Sender_Shutdown;
 
-typedef TAO_EC_Shutdown_Command<TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> >
+typedef TAO_EC_Shutdown_Command<PortableServer::Servant_var<TAO_ECG_UDP_Receiver> >
 UDP_Receiver_Shutdown;
 
-
 int
 TAO_ECG_Mcast_Gateway::init_svcs (void)
 {
@@ -361,7 +360,7 @@ TAO_ECG_Mcast_Gateway::init_address_server (void)
 
   if (this->address_server_type_ == ECG_ADDRESS_SERVER_BASIC)
     {
-      TAO_EC_Servant_Var<TAO_ECG_Simple_Address_Server> impl =
+      PortableServer::Servant_var<TAO_ECG_Simple_Address_Server> impl =
         TAO_ECG_Simple_Address_Server::create ();
       if (!impl.in ())
         return 0;
@@ -375,7 +374,7 @@ TAO_ECG_Mcast_Gateway::init_address_server (void)
 
   else if (this->address_server_type_ == ECG_ADDRESS_SERVER_SOURCE)
     {
-      TAO_EC_Servant_Var<TAO_ECG_Complex_Address_Server> impl =
+      PortableServer::Servant_var<TAO_ECG_Complex_Address_Server> impl =
         TAO_ECG_Complex_Address_Server::create (1);
       if (!impl.in ())
         return 0;
@@ -389,7 +388,7 @@ TAO_ECG_Mcast_Gateway::init_address_server (void)
 
   else if (this->address_server_type_ == ECG_ADDRESS_SERVER_TYPE)
     {
-      TAO_EC_Servant_Var<TAO_ECG_Complex_Address_Server> impl =
+      PortableServer::Servant_var<TAO_ECG_Complex_Address_Server> impl =
         TAO_ECG_Complex_Address_Server::create (0);
       if (!impl.in ())
         return 0;
@@ -481,13 +480,13 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
   return handler;
 }
 
-TAO_EC_Servant_Var<TAO_ECG_UDP_Sender>
+PortableServer::Servant_var<TAO_ECG_UDP_Sender>
 TAO_ECG_Mcast_Gateway::init_sender (
                                RtecEventChannelAdmin::EventChannel_ptr ec,
                                RtecUDPAdmin::AddrServer_ptr address_server,
                                TAO_ECG_Refcounted_Endpoint endpoint_rptr)
 {
-  TAO_EC_Servant_Var<TAO_ECG_UDP_Sender>
+  PortableServer::Servant_var<TAO_ECG_UDP_Sender>
     sender (TAO_ECG_UDP_Sender::create ());
   if (!sender.in ())
     return sender;
@@ -524,13 +523,13 @@ TAO_ECG_Mcast_Gateway::init_sender (
   return sender;
 }
 
-TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver>
+PortableServer::Servant_var<TAO_ECG_UDP_Receiver>
 TAO_ECG_Mcast_Gateway::init_receiver (
                                RtecEventChannelAdmin::EventChannel_ptr ec,
                                RtecUDPAdmin::AddrServer_ptr address_server,
                                TAO_ECG_Refcounted_Endpoint endpoint_rptr)
 {
-  TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver>
+  PortableServer::Servant_var<TAO_ECG_UDP_Receiver>
     receiver (TAO_ECG_UDP_Receiver::create ());
   if (!receiver.in ())
     return receiver;
@@ -609,7 +608,7 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
             address_server_deactivator);
 
   TAO_ECG_Refcounted_Endpoint endpoint_rptr;
-  TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender;
+  PortableServer::Servant_var<TAO_ECG_UDP_Sender> sender;
 
   // Set up event sender.
   if (this->service_type_ == ECG_MCAST_SENDER
@@ -633,7 +632,7 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
     }
 
   // Set up event receiver.
-  TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver;
+  PortableServer::Servant_var<TAO_ECG_UDP_Receiver> receiver;
   if (this->service_type_ == ECG_MCAST_RECEIVER
       || this->service_type_ == ECG_MCAST_TWO_WAY)
     {
diff --git a/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
index e0e03268511..8a588a2dc9e 100644
--- a/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
+++ b/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
@@ -239,12 +239,12 @@ private:
   PortableServer::ServantBase *
         init_address_server (void);
 
-  TAO_EC_Servant_Var<TAO_ECG_UDP_Sender>
+  PortableServer::Servant_var<TAO_ECG_UDP_Sender>
         init_sender (RtecEventChannelAdmin::EventChannel_ptr ec,
                      RtecUDPAdmin::AddrServer_ptr address_server,
                      TAO_ECG_Refcounted_Endpoint endpoint_rptr);
 
-  TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver>
+  PortableServer::Servant_var<TAO_ECG_UDP_Receiver>
         init_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
                        RtecUDPAdmin::AddrServer_ptr address_server,
                        TAO_ECG_Refcounted_Endpoint endpoint_rptr);
diff --git a/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
index b2bc0405641..76341f6ad02 100644
--- a/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+++ b/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
@@ -35,7 +35,7 @@ public:
   /// Create a new TAO_ECG_Simple_Address_Server object.
   /// (Constructor access is restricted to insure that all
   /// TAO_ECG_Simple_Address_Server objects are heap-allocated.)
-  static TAO_EC_Servant_Var<TAO_ECG_Simple_Address_Server> create (void);
+  static PortableServer::Servant_var<TAO_ECG_Simple_Address_Server> create (void);
 
   /// Destructor
   virtual ~TAO_ECG_Simple_Address_Server (void);
diff --git a/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl b/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl
index 0aa18cada97..b8ed7f25560 100644
--- a/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl
+++ b/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl
@@ -4,10 +4,10 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_Simple_Address_Server>
+ACE_INLINE PortableServer::Servant_var<TAO_ECG_Simple_Address_Server>
 TAO_ECG_Simple_Address_Server::create (void)
 {
-  TAO_EC_Servant_Var<TAO_ECG_Simple_Address_Server> s;
+  PortableServer::Servant_var<TAO_ECG_Simple_Address_Server> s;
   ACE_NEW_RETURN (s,
                   TAO_ECG_Simple_Address_Server,
                   s);
diff --git a/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
index fb084a0f08c..b47650a3a8b 100644
--- a/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
@@ -8,6 +8,8 @@
 #include "orbsvcs/Event/ECG_UDP_EH.inl"
 #endif /* __ACE_INLINE__ */
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ECG_UDP_EH::TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv)
diff --git a/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
index 08473e9ffe7..119d4cf8628 100644
--- a/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
@@ -9,6 +9,8 @@
 #include "orbsvcs/Event/ECG_UDP_Out_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint (void)
diff --git a/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index a96ad458bfb..4e34ffe54c0 100644
--- a/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -8,7 +8,6 @@
 #include "orbsvcs/Event/ECG_UDP_Receiver.inl"
 #endif /* __ACE_INLINE__ */
 
-// ****************************************************************
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index 2cb717b5ac8..3d15661f91d 100644
--- a/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -113,7 +113,7 @@ public:
   /// Create a new TAO_ECG_UDP_Receiver object.
   /// (Constructor access is restricted to insure that all
   /// TAO_ECG_UDP_Receiver objects are heap-allocated.)
-  static TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> create (CORBA::Boolean perform_crc = 0);
+  static PortableServer::Servant_var<TAO_ECG_UDP_Receiver> create (CORBA::Boolean perform_crc = 0);
 
   ~TAO_ECG_UDP_Receiver (void);
 
diff --git a/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl b/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
index 130b967dd1d..f344699998c 100644
--- a/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
+++ b/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
@@ -66,10 +66,10 @@ TAO_ECG_UDP_Receiver::TAO_ECG_UDP_Receiver (CORBA::Boolean perform_crc)
 {
 }
 
-ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver>
+ACE_INLINE PortableServer::Servant_var<TAO_ECG_UDP_Receiver>
 TAO_ECG_UDP_Receiver::create (CORBA::Boolean perform_crc)
 {
-  TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> r;
+  PortableServer::Servant_var<TAO_ECG_UDP_Receiver> r;
   ACE_NEW_RETURN (r,
                   TAO_ECG_UDP_Receiver (perform_crc),
                   r);
diff --git a/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
index ee806ec09d6..f33ddd94a66 100644
--- a/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+++ b/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
@@ -17,7 +17,6 @@
 #include "orbsvcs/Event/ECG_UDP_Sender.inl"
 #endif /* __ACE_INLINE__ */
 
-// ****************************************************************
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index 20118e46426..d449b50cb4b 100644
--- a/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -112,7 +112,7 @@ public:
   /// Create a new TAO_ECG_UDP_Sender object.
   /// (Constructor access is restricted to insure that all
   /// TAO_ECG_UDP_Sender objects are heap-allocated.)
-  static TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> create (CORBA::Boolean crc = 0);
+  static PortableServer::Servant_var<TAO_ECG_UDP_Sender> create (CORBA::Boolean crc = 0);
 
   ~TAO_ECG_UDP_Sender (void);
 
@@ -140,7 +140,7 @@ public:
 
   /// Connect or reconnect to the EC with the given subscriptions.
   /**
-   * NOTE: if we are already connected to EC and a reconnection is
+   * @note if we are already connected to EC and a reconnection is
    * necessary, the EC must have reconnects enabled in order for this
    * method to succeed.
    */
diff --git a/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl b/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
index db0e235abbd..99ab17a08c5 100644
--- a/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
+++ b/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
@@ -6,10 +6,10 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_UDP_Sender>
+ACE_INLINE PortableServer::Servant_var<TAO_ECG_UDP_Sender>
 TAO_ECG_UDP_Sender::create (CORBA::Boolean crc)
 {
-  TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> s;
+  PortableServer::Servant_var<TAO_ECG_UDP_Sender> s;
   ACE_NEW_RETURN (s,
                   TAO_ECG_UDP_Sender (crc),
                   s);
diff --git a/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index cc0d14b9d5b..410fc180797 100644
--- a/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -2,6 +2,8 @@
 
 #include "orbsvcs/Event/EC_And_Filter.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_And_Filter::TAO_EC_And_Filter (TAO_EC_Filter* children[],
diff --git a/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
index 0b7607696d3..c1b9f29b326 100644
--- a/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -2,6 +2,8 @@
 
 #include "orbsvcs/Event/EC_ConsumerControl.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_ConsumerControl::TAO_EC_ConsumerControl (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index 910ff83354f..bc6e10440b4 100644
--- a/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -39,6 +39,8 @@
 #include "orbsvcs/Event/EC_Default_Factory.inl"
 #endif /* __ACE_INLINE__ */
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Default_Factory::~TAO_EC_Default_Factory (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index dd04473ef59..8b15c1a39ef 100644
--- a/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -2,6 +2,8 @@
 
 #include "orbsvcs/Event/EC_Disjunction_Filter.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Disjunction_Filter::
diff --git a/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
index 3beaffca0e8..1f42a3a762d 100644
--- a/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
@@ -3,6 +3,8 @@
 #include "orbsvcs/Event/EC_Dispatching.h"
 #include "orbsvcs/Event/EC_ProxySupplier.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Dispatching::~TAO_EC_Dispatching (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
index e8dd40520b6..f8e9cd7023e 100644
--- a/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -4,6 +4,8 @@
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "ace/Dynamic_Service.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Event_Channel::
diff --git a/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/orbsvcs/orbsvcs/Event/EC_Factory.cpp
index 58e3743268b..13afbe4f81a 100644
--- a/orbsvcs/orbsvcs/Event/EC_Factory.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Factory.cpp
@@ -3,6 +3,8 @@
 #include "orbsvcs/Event/EC_Factory.h"
 #include "ace/Dynamic_Service.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTEvent_Serv_Export unsigned short TAO_EC_debug_level;
diff --git a/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
index 06d95f6aed2..24f7ce3a85d 100644
--- a/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
@@ -7,6 +7,8 @@
 #include "orbsvcs/Event/EC_Filter_Builder.inl"
 #endif /* __ACE_INLINE__ */
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Filter_Builder::~TAO_EC_Filter_Builder (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
index e3a65a5a7b6..77bd6021c07 100644
--- a/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
@@ -8,6 +8,8 @@
 #include "orbsvcs/Event/EC_Group_Scheduling.inl"
 #endif /* __ACE_INLINE__ */
 
+
+
 void
 TAO_EC_Group_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *,
diff --git a/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
index 7271282ef5a..205f4429e00 100644
--- a/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
@@ -18,10 +18,6 @@
 #include "orbsvcs/Event/EC_Kokyu_Dispatching.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Event,
-           EC_Kokyu_Dispatching,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *ec, int sched_policy, int sched_scope)
diff --git a/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
index 969aeeafd09..35d28320b76 100644
--- a/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
@@ -15,10 +15,6 @@
 #include "orbsvcs/Event/EC_Kokyu_Factory.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Event,
-           EC_Kokyu_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
index d3700e473f2..9c5b3c5bbb7 100644
--- a/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
@@ -4,7 +4,7 @@
 #include "orbsvcs/Event/EC_QOS_Info.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(Event, EC_Kokyu_Filter, "$Id$")
+
 
 TAO_EC_Kokyu_Filter::
     TAO_EC_Kokyu_Filter (const char* name,
diff --git a/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index 62e4a446f95..4da636491ea 100644
--- a/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -14,10 +14,6 @@
 #include "orbsvcs/Event/EC_Kokyu_Filter_Builder.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Event,
-           EC_Kokyu_Filter_Builder,
-           "$Id$")
-
 const char* designator (long dsgn)
 {
   switch(dsgn)
diff --git a/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
index 891cc55c412..a94a6f5728f 100644
--- a/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
@@ -10,7 +10,7 @@
 #include "orbsvcs/Event/EC_Kokyu_Scheduling.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Event, EC_Kokyu_Scheduling, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
index 1755c5af6d0..986268fa7ae 100644
--- a/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
+++ b/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
@@ -90,101 +90,6 @@ private:
   T target_;
 };
 
-//***************************************************************************
-
-/**
- * @class Servant_Var
- *
- * @brief Provides a type safe counted reference to servants.
- */
-template <class T>
-class TAO_EC_Servant_Var
-{
-public:
-  //! Constructor.  Assumes ownership of \c p.
-  TAO_EC_Servant_Var(T * p = 0);
-
-  //! Copy constructor.  Adds reference to \c rhs.
-  TAO_EC_Servant_Var(TAO_EC_Servant_Var<T> const & rhs);
-
-  //! Assignment operator.  Adds reference to \c rhs.
-  TAO_EC_Servant_Var<T> & operator=(TAO_EC_Servant_Var<T> const & rhs);
-
-  //! Destructor.  Removes a reference from the underlying object,
-  //! possibly destroying it.
-  ~TAO_EC_Servant_Var();
-
-  //! Assignment operator.  Assumes ownership of \c p.
-  TAO_EC_Servant_Var<T> & operator=(T * p);
-
-# if !defined(ACE_LACKS_MEMBER_TEMPLATES)
-  //! Template member constructor from a pointer that will implicitly
-  //! cast to type T.  Assumes ownership of \c p.
-  //! This constructor allows constructs such as:
-  //! Servant_Base<Base> p(new Derived);
-  template <class Y>
-  TAO_EC_Servant_Var(Y * p);
-
-  //! Template member copy constructor from a TAO_EC_Servant_Var<Y>, where
-  //! Y can be implicitly cast to type T.
-  template <class Y>
-  TAO_EC_Servant_Var(TAO_EC_Servant_Var<Y> const & rhs);
-
-  //! Template member assignment operator from a TAO_EC_Servant_Var<Y>, where
-  //! Y can be implicitly cast to type T.
-  template <class Y>
-  TAO_EC_Servant_Var<T> & operator=(TAO_EC_Servant_Var<Y> const & rhs);
-
-  //! Template member assignment operator from a pointer to Y, where Y
-  //! can be implicitly cast to type T.
-  template <class Y>
-  TAO_EC_Servant_Var<T> & operator=(Y * p);
-# endif /* ACE_LACKS_MEMBER_TEMPLATES */
-
-  //! Smart pointer operator-> provides access to the underlying object.
-  T const * operator->() const;
-
-  //! Smart pointer operator-> provides access to the underlying object.
-  T * operator->();
-
-  //! Dereference the underlying object.
-  T const & operator*() const;
-
-  //! Dereference the underlying object.
-  T & operator*();
-
-  //! Return a void pointer to the underlying object.  This allows
-  //! it to be used in conditional code and tested against 0.
-  operator void const * () const;
-
-  //! As an IN parameter.
-  T * in() const;
-
-  //! As an INOUT parameter.
-  T *& inout();
-
-  //! As an OUT parameter.
-  T *& out();
-
-  // Return a pointer to the underlying object, and this counted
-  // reference will no longer own the object.
-  T * _retn();
-
-private:
-  T * ptr_;
-};
-
-//! Compare two TAO_EC_Servant_Vars for equivalence.
-template <class X, class Y>
-bool operator==(TAO_EC_Servant_Var<X> const & x,
-                TAO_EC_Servant_Var<Y> const & y);
-
-//! Compare two TAO_EC_Servant_Vars for non-equivalence.
-template <class X, class Y>
-bool operator!=(TAO_EC_Servant_Var<X> const & x,
-                TAO_EC_Servant_Var<Y> const & y);
-
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl b/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
index 369c23300ec..34a3123876b 100644
--- a/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
+++ b/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
@@ -109,225 +109,5 @@ TAO_EC_Shutdown_Command<T>::execute (void)
 
 //***************************************************************************
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-// Life would be much easier if _add_ref() and _remove_ref()
-// had throw specs of "throw ()"
-
-#include <algorithm>
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-template <class T>
-ACE_INLINE TAO_EC_Servant_Var<T>::
-TAO_EC_Servant_Var(T * p)
-  : ptr_(p)
-{
-}
-
-// If _add_ref throws, this object will not be completely constructed
-// so the destructor will not be called.
-template <class T>
-ACE_INLINE TAO_EC_Servant_Var<T>::
-TAO_EC_Servant_Var(TAO_EC_Servant_Var<T> const & rhs)
-  : ptr_(rhs.ptr_)
-{
-  if (ptr_)
-    {
-      try
-        {
-          ptr_->_add_ref ();
-        }
-      catch (...)
-        {
-          throw;
-        }
-    }
-}
-
-template <class T>
-ACE_INLINE TAO_EC_Servant_Var<T> & TAO_EC_Servant_Var<T>::
-operator=(TAO_EC_Servant_Var<T> const & rhs)
-{
-  TAO_EC_Servant_Var<T> tmp(rhs);
-
-  // std::swap(tmp.ptr_, ptr_);
-  T * swap_temp = tmp.ptr_;
-  tmp.ptr_ = ptr_;
-  ptr_ = swap_temp;
-
-  return *this;
-}
-
-template <class T>
-ACE_INLINE TAO_EC_Servant_Var<T> & TAO_EC_Servant_Var<T>::
-operator=(T * p)
-{
-  TAO_EC_Servant_Var<T> tmp(p);
-
-  // std::swap(tmp.ptr_, ptr_);
-  T * swap_temp = tmp.ptr_;
-  tmp.ptr_ = ptr_;
-  ptr_ = swap_temp;
-
-  return *this;
-}
-
-template <class T>
-ACE_INLINE TAO_EC_Servant_Var<T>::
-~TAO_EC_Servant_Var()
-{
-  // Unfortunately, there is no throw spec on _remove_ref, so we
-  // can't assume that it will not throw.  If it does, then we are in
-  // trouble.  In any event, we can't let the exception escape our
-  // destructor.
-  if (ptr_ != 0)
-  {
-    try
-    {
-      ptr_->_remove_ref ();
-    }
-    catch (...)
-    {
-    }
-  }
-}
-
-#if !defined(ACE_LACKS_MEMBER_TEMPLATES)
-template <class T> template <class Y>
-ACE_INLINE TAO_EC_Servant_Var<T>::
-TAO_EC_Servant_Var(Y * p)
-  : ptr_(p)
-{
-}
-
-template <class T> template <class Y>
-ACE_INLINE TAO_EC_Servant_Var<T>::
-TAO_EC_Servant_Var(TAO_EC_Servant_Var<Y> const & rhs)
-  : ptr_(rhs.in())
-{
-  if (ptr_)
-  {
-    ptr_->_add_ref();
-  }
-}
-
-template <class T> template <class Y>
-ACE_INLINE TAO_EC_Servant_Var<T> & TAO_EC_Servant_Var<T>::
-operator=(TAO_EC_Servant_Var<Y> const & rhs)
-{
-  TAO_EC_Servant_Var<T> tmp(rhs);
-
-  // std::swap(tmp.ptr_, ptr_);
-  T * swap_temp = tmp.ptr_;
-  tmp.ptr_ = ptr_;
-  ptr_ = swap_temp;
-
-  return *this;
-}
-
-template <class T> template <class Y>
-ACE_INLINE TAO_EC_Servant_Var<T> & TAO_EC_Servant_Var<T>::
-operator=(Y * p)
-{
-  TAO_EC_Servant_Var<T> tmp(p);
-
-  // std::swap(tmp.ptr_, ptr_);
-  T * swap_temp = tmp.ptr_;
-  tmp.ptr_ = ptr_;
-  ptr_ = swap_temp;
-
-  return *this;
-}
-#endif /* ACE_LACKS_MEMBER_TEMPLATES */
-
-template <class T>
-ACE_INLINE T const * TAO_EC_Servant_Var<T>::
-operator->() const
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T * TAO_EC_Servant_Var<T>::
-operator->()
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T const & TAO_EC_Servant_Var<T>::
-operator*() const
-{
-  return *ptr_;
-}
-
-template <class T>
-ACE_INLINE T & TAO_EC_Servant_Var<T>::
-operator*()
-{
-  return *ptr_;
-}
-
-template <class T>
-ACE_INLINE TAO_EC_Servant_Var<T>::
-operator void const * () const
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T * TAO_EC_Servant_Var<T>::
-in() const
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T *& TAO_EC_Servant_Var<T>::
-inout()
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T *& TAO_EC_Servant_Var<T>::
-out()
-{
-  TAO_EC_Servant_Var<T> tmp;
-
-  // std::swap(tmp.ptr_, ptr_);
-  T * swap_temp = tmp.ptr_;
-  tmp.ptr_ = ptr_;
-  ptr_ = swap_temp;
-
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T * TAO_EC_Servant_Var<T>::
-_retn()
-{
-  T * rval = ptr_;
-  ptr_ = 0;
-  return rval;
-}
-
-template <class X, class Y>
-ACE_INLINE bool
-operator==(TAO_EC_Servant_Var<X> const & x,
-           TAO_EC_Servant_Var<Y> const & y)
-{
-  return x.in() == y.in();
-}
-
-template <class X, class Y>
-ACE_INLINE bool
-operator!=(TAO_EC_Servant_Var<X> const & x,
-           TAO_EC_Servant_Var<Y> const & y)
-{
-  return x.in() != y.in();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index fe1855d841c..898172f5895 100644
--- a/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -2,6 +2,9 @@
 
 #include "orbsvcs/Event/EC_MT_Dispatching.h"
 
+
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads,
diff --git a/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index 9082e41c54e..b2b0c6b7f43 100644
--- a/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -2,6 +2,8 @@
 
 #include "orbsvcs/Event/EC_Negation_Filter.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Negation_Filter::TAO_EC_Negation_Filter (TAO_EC_Filter* child)
diff --git a/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index b76194a39ef..8304b895e65 100644
--- a/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -19,6 +19,8 @@
 
 #include "tao/ORB_Core.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Null_Factory::TAO_EC_Null_Factory (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index af12eff6d23..414e5d9149c 100644
--- a/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -8,6 +8,7 @@
 #include "orbsvcs/Event/EC_Null_Scheduling.inl"
 #endif /* __ACE_INLINE__ */
 
+
 void
 TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *,
diff --git a/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 3133633764b..a7f902c9b55 100644
--- a/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -10,6 +10,8 @@
 
 #include "ace/Sched_Params.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_Base *ec)
diff --git a/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index b90a69fef5c..4512722d588 100644
--- a/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -193,7 +193,7 @@ TAO_EC_ProxyPushConsumer::deactivate (void)
   catch (const CORBA::Exception&)
     {
       // Exceptions here should not be propagated.  They usually
-      // indicate that an object is beign disconnected twice, or some
+      // indicate that an object is being disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
@@ -241,7 +241,7 @@ TAO_EC_ProxyPushConsumer_Guard::
      proxy_ (proxy),
      locked_ (false)
 {
-  ACE_Guard<ACE_Lock> ace_mon (*this->lock_);
+  ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
   // If the guard fails there is not much we can do, raising an
   // exception is wrong, the client has *no* way to handle that kind
   // of error.  Even worse, there is no exception to raise in that
@@ -268,7 +268,7 @@ TAO_EC_ProxyPushConsumer_Guard::
     return;
 
   {
-    ACE_Guard<ACE_Lock> ace_mon (*this->lock_);
+    ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
     // If the guard fails there is not much we can do, raising an
     // exception is wrong, the client has *no* way to handle that kind
     // of error.  Even worse, there is no exception to raise in that
@@ -278,7 +278,7 @@ TAO_EC_ProxyPushConsumer_Guard::
 
     this->filter->_decr_refcnt ();
 
-    this->refcount_--;
+    --this->refcount_;
     if (this->refcount_ != 0)
       return;
   }
diff --git a/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index feaa1099b1b..c2c252d2545 100644
--- a/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -140,7 +140,7 @@ TAO_EC_ProxyPushSupplier::deactivate (void) throw ()
   catch (const CORBA::Exception&)
     {
       // Exceptions here should not be propagated.  They usually
-      // indicate that an object is beign disconnected twice, or some
+      // indicate that an object is being disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
diff --git a/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp b/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
index 085b3d42b40..522f6ad45e0 100644
--- a/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
@@ -6,3 +6,4 @@
 #include "orbsvcs/Event/EC_QOS_Info.inl"
 #endif /* __ACE_INLINE__ */
 
+
diff --git a/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
index 5668c79f14e..3f2770ff0eb 100644
--- a/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
@@ -3,7 +3,7 @@
 #include "orbsvcs/Event/EC_RTCORBA_Dispatching.h"
 #include "tao/RTCORBA/Priority_Mapping.h"
 
-ACE_RCSID(Event, EC_RTCORBA_Dispatching, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index 36aec7f29d2..48e44f70852 100644
--- a/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -5,7 +5,7 @@
 
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 
-ACE_RCSID(Event, EC_RTCORBA_Factory, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
index bfcab7c04b9..1d384bd5092 100644
--- a/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
@@ -3,6 +3,8 @@
 #include "orbsvcs/Event/EC_Reactive_Dispatching.h"
 #include "orbsvcs/Event/EC_ProxySupplier.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
index 4ae506f4742..4732e146e71 100644
--- a/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
@@ -15,6 +15,8 @@
 #include "orbsvcs/Event/EC_Sched_Factory.inl"
 #endif /* __ACE_INLINE__ */
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index ad650e2df81..1ae39568dea 100644
--- a/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -4,6 +4,8 @@
 #include "orbsvcs/Event/EC_QOS_Info.h"
 #include "ace/Log_Msg.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Sched_Filter::
diff --git a/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
index a931a68578d..edeafe0f87c 100644
--- a/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
@@ -3,6 +3,8 @@
 #include "orbsvcs/Event/EC_Scheduling_Strategy.h"
 #include "orbsvcs/Event/EC_QOS_Info.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index e2d1a4b4608..812865a639a 100644
--- a/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -8,6 +8,8 @@
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base *ec)
diff --git a/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
index 3559f8845df..63c4e91e295 100644
--- a/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -2,6 +2,8 @@
 
 #include "orbsvcs/Event/EC_SupplierControl.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_SupplierControl::TAO_EC_SupplierControl (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
index 14c924048d3..b606d150ec8 100644
--- a/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
@@ -8,6 +8,8 @@
 #include "orbsvcs/Event/EC_Supplier_Filter.inl"
 #endif /* __ACE_INLINE__ */
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
index 401bde143ef..a06f36274f1 100644
--- a/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
@@ -2,6 +2,8 @@
 
 #include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder (void)
diff --git a/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index fdab71df99b..4692939f5fe 100644
--- a/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -182,7 +182,7 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer));
 
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
-  TAO_EC_Dispatching_Task* dtask;
+  TAO_EC_Dispatching_Task* dtask = 0;
 
   if (this->consumer_task_map_.find (consumer, dtask) == -1)
     {
diff --git a/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
index 384e9205880..390c3832b2f 100644
--- a/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
@@ -12,6 +12,8 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_strings.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 unsigned long TAO_EC_TPC_debug_level;
diff --git a/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index 1e46cb97fd1..8ed6366b614 100644
--- a/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -2,6 +2,8 @@
 
 #include "orbsvcs/Event/EC_TPC_ProxyConsumer.h"
 
+
+
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/Event/EC_TPC_Dispatching.h"
 
diff --git a/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index 85aa3c70c77..d70bf720539 100644
--- a/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -6,6 +6,8 @@
 #include "orbsvcs/Event/EC_TPC_ProxySupplier.inl"
 #endif /* __ACE_INLINE__ */
 
+
+
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/Event/EC_TPC_Dispatching.h"
 
diff --git a/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl b/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
index 6e5b54fb0a3..89900d54216 100644
--- a/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
+++ b/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
@@ -10,7 +10,7 @@ ACE_INLINE
 TAO_EC_TPC_ProxyPushSupplier::TAO_EC_TPC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* ec, int validate_connection)
 : TAO_EC_Default_ProxyPushSupplier (ec, validate_connection)
 {
-  if (TAO_EC_TPC_debug_level > 0)        
+  if (TAO_EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) EC_TPC_ProxyPushSupplier::CTOR (%@)\n", this));
 }
 
diff --git a/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
index 8dc4ef63332..d4107aababb 100644
--- a/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
@@ -8,6 +8,8 @@
 #include "ace/Log_Msg.h"
 #include "ace/Sched_Params.h"
 
+
+
 #define TETFSF(flag)  { #flag, flag }
 TAO_EC_Thread_Flags::Supported_Flag TAO_EC_Thread_Flags::supported_flags_[] = {
 #if defined (ACE_HAS_THREADS)
diff --git a/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h b/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h
index ad80bc38f68..d72eeb81f17 100644
--- a/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h
+++ b/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h
@@ -27,7 +27,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
   \class TAO_EC_Thread_Flags
 
   \brief Parse thread flags from string to a long.
- 
+
   Encapsulate flags used for creating threads with \a
   ACE_OS::thr_create and \a ACE_Task::activate.
 
@@ -76,7 +76,7 @@ public:
     \brief Returns value of THR_SCOPE_* used, or zero if unknown.
   */
   long scope() const { return this->scope_; }
- 
+
   /*!
     \brief Returns value of THR_SCHED_* used, or zero if unknown.
   */
@@ -90,7 +90,7 @@ public:
     \return the priority, or ACE_DEFAULT_THREAD_PRIORITY if the scheduler is unknown.
   */
   long default_priority () const;
- 
+
 
 
   struct Supported_Flag
diff --git a/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index 65609ef69ff..b4f61f8a4a4 100644
--- a/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -8,6 +8,8 @@
 #include "orbsvcs/Event/EC_Scheduling_Strategy.h"
 #include "orbsvcs/Event/EC_ProxyConsumer.h" // @@ MSVC 6 bug
 
+
+
 // ****************************************************************
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index a13f0183f36..50f1d01af92 100644
--- a/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -2,6 +2,7 @@
 
 #include "orbsvcs/Event/EC_Type_Filter.h"
 
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header)
diff --git a/orbsvcs/orbsvcs/Event_Utilities.cpp b/orbsvcs/orbsvcs/Event_Utilities.cpp
index 9e4a7b24ea0..a9dc1f48358 100644
--- a/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -12,11 +12,19 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ConsumerQOS_Factory::
-    ACE_ConsumerQOS_Factory (TAO_EC_Event_Initializer initializer)
+    ACE_ConsumerQOS_Factory (TAO_EC_Event_Initializer initializer,
+                             CORBA::ULong qos_max_len)
   : designator_set_ (0),
     event_initializer_ (initializer)
 {
   qos_.is_gateway = 0;
+
+  // Allocate the space requested by the application....
+  qos_.dependencies.resize (qos_max_len);
+
+  // ... now reset the length, we do not want to use any elements in
+  // the sequence that have not been initialized....
+  qos_.dependencies.resize (0);
 }
 
 ACE_ConsumerQOS_Factory::~ACE_ConsumerQOS_Factory (void)
@@ -153,7 +161,7 @@ ACE_ConsumerQOS_Factory::debug (const RtecEventChannelAdmin::ConsumerQOS& qos)
 // ************************************************************
 ACE_SupplierQOS_Factory::
     ACE_SupplierQOS_Factory (TAO_EC_Event_Initializer initializer,
-                             int qos_max_len)
+                             CORBA::ULong qos_max_len)
   : event_initializer_ (initializer)
 {
   qos_.is_gateway = 0;
@@ -178,12 +186,16 @@ ACE_SupplierQOS_Factory::insert (RtecEventComm::EventSourceID sid,
       // There is not enough space for the next element, grow the
       // buffer.
       this->qos_.publications.resize (l + 1);
-
-      // @@ TODO We may want to consider more efficient growing
-      // strategies here, for example, duplicating the size of the
-      // buffer, or growing in fixed sized chunks...
     }
 
+  // @@ TODO We may want to consider more efficient growing
+  // strategies here, for example, duplicating the size of the
+  // buffer, or growing in fixed sized chunks...
+
+  // This needs to accurately reflect the used length, and should always be
+  // set
+  this->qos_.publications.resize (l + 1);
+
   if (this->event_initializer_ != 0)
     (*this->event_initializer_) (qos_.publications[l].event);
   this->qos_.publications[l].event.header.source = sid;
diff --git a/orbsvcs/orbsvcs/Event_Utilities.h b/orbsvcs/orbsvcs/Event_Utilities.h
index 07b0305eb63..80dcde4ad2d 100644
--- a/orbsvcs/orbsvcs/Event_Utilities.h
+++ b/orbsvcs/orbsvcs/Event_Utilities.h
@@ -96,7 +96,8 @@ class TAO_RTEvent_Export ACE_ConsumerQOS_Factory
 {
 public:
   /// Default construction.
-  ACE_ConsumerQOS_Factory (TAO_EC_Event_Initializer initializer = 0);
+  ACE_ConsumerQOS_Factory (TAO_EC_Event_Initializer initializer = 0,
+                           CORBA::ULong qos_max_len = 0);
 
   /// Death and destruction.
   ~ACE_ConsumerQOS_Factory (void);
@@ -211,7 +212,7 @@ class TAO_RTEvent_Export ACE_SupplierQOS_Factory
 public:
   /// Default construction.
   ACE_SupplierQOS_Factory (TAO_EC_Event_Initializer initializer = 0,
-                           int qos_max_len = 0);
+                           CORBA::ULong qos_max_len = 0);
 
   /**
    * Publish @a sid and @a type that is generate by a method described by
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
index 940a7596935..d3b138a0eac 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
@@ -12,10 +12,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfo.h"
 
-ACE_RCSID (FaultTolerance,
-           FT_ClientORBInitializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
index ef3795e1fc2..3fd4f289aaf 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/PolicyC.h"
 
-ACE_RCSID (FaultTolerance,
-           FT_ClientPolicyFactory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index fd0ef8ebc02..fc5f4c97198 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -11,7 +11,7 @@
 #include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(FaultTolerance, FT_ClientPolicy_i, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index 7512098d5fe..4c936a7a8fd 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -15,11 +15,6 @@
 #include "ace/Lock.h"
 #include "ace/Synch_Traits.h"
 
-ACE_RCSID (FaultTolerance,
-           FT_ORBInitializer,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
index 784e1c4dd8b..8566f4f5c7c 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
 #include "orbsvcs/FaultTolerance/FT_ClientORBInitializer.h"
@@ -6,8 +8,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID(FaultTolerance, FT_ClientService_Activate, "$Id$")
-
 static bool initialized = false;
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
index 199956473af..d3ab4c835d7 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
@@ -4,11 +4,6 @@
 #include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h"
 #include "tao/SystemException.h"
 
-
-ACE_RCSID (FaultTolerance,
-           FT_Endpoint_Selector_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_FT_Endpoint_Selector_Factory::TAO_FT_Endpoint_Selector_Factory (void)
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index dc009be5324..fe42488a46f 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 
 #include "tao/MProfile.h"
@@ -10,11 +12,6 @@
 #include "ace/Auto_Ptr.h"
 #include "tao/debug.h"
 
-
-ACE_RCSID (FaultTolerance,
-           TAO_FT_IOGR_Property,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/FaultTolerance/FT_IOGR_Property.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index 142cc8f5a08..4add9825a22 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h"
 
@@ -11,10 +12,6 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (FaultTolerance,
-           FT_Invocation_Endpoint_Selectors,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_FT_Invocation_Endpoint_Selector::TAO_FT_Invocation_Endpoint_Selector (void)
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
index 4d99eaf8b0a..3e94b92af6a 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 #include "orbsvcs/FaultTolerance/FT_ORBInitializer.h"
@@ -9,11 +8,6 @@
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/Exception.h"
 
-
-ACE_RCSID (FaultTolerance,
-           FT_ORBInitializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
index 95f66159e6a..0de8565abfa 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
@@ -7,11 +7,6 @@
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/Exception.h"
 
-
-ACE_RCSID (FaultTolerance,
-           FT_ServerORBInitializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
index 681b774a3db..dba4f8ae445 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
@@ -23,13 +23,6 @@
 #include "tao/LocalObject.h"
 #include "orbsvcs/FaultTolerance/FT_ServerORB_export.h"
 
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// RTCORBA ORB initializer.
@@ -55,10 +48,6 @@ private:
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_FT_SERVERORB_INITIALIZER_H */
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
index 26803b15aaf..3e9074a07c2 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 #include "orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h"
@@ -7,11 +6,6 @@
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/PolicyC.h"
 
-
-ACE_RCSID (FaultTolerance,
-           FT_ServerPolicyFactory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
index ca7daf1007f..b7d45633400 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -10,7 +10,7 @@
 #include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(FaultTolerance, FT_ServerPolicy_i, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
index 34ac0eabd2a..106af4e2fbb 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
@@ -16,12 +16,6 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/FT_CORBA_ORBC.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 #include "orbsvcs/FaultTolerance/FT_ServerORB_export.h"
 #include "tao/LocalObject.h"
 
@@ -74,10 +68,6 @@ private:
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #if defined (__ACE_INLINE__)
 #include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index 0e39d335b7a..e34494173a1 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h"
 #include "tao/IOPC.h"
 #include "tao/ORB_Constants.h"
@@ -8,10 +10,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (FaultTolerance,
-           FT_ServerRequest_Interceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
index be4448486c8..46af5f23fe9 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/FaultTolerance/FT_ServerService_Activate.h"
 #include "orbsvcs/FaultTolerance/FT_ServerORBInitializer.h"
 #include "tao/ORB_Core.h"
@@ -5,8 +7,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID(FaultTolerance, FT_ServerService_Activate, "$Id$")
-
 static bool initialized = false;
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
index 9485b217bec..9c2431b8e15 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
 #include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
 #include "orbsvcs/FaultTolerance/FT_ORBInitializer.h"
@@ -6,8 +8,6 @@
 #include "tao/Service_Callbacks.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID(FaultTolerance, FT_Service_Activate, "$Id$")
-
 static bool initialized = false;
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index e46044243e7..d1b9785cb92 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -15,26 +15,15 @@
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (FaultTolerance,
-           FT_Service_Callbacks,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_FT_Service_Callbacks::TAO_FT_Service_Callbacks (TAO_ORB_Core *orb_core)
-
-  : orb_core_ (orb_core),
-    profile_lock_ (0)
+  : orb_core_ (orb_core)
 {
-  this->profile_lock_ =
-    this->orb_core_->client_factory ()->create_profile_lock ();
 }
 
 TAO_FT_Service_Callbacks::~TAO_FT_Service_Callbacks (void)
 {
-  // Delete the memeory for the lock
-  delete this->profile_lock_;
 }
 
 CORBA::Boolean
@@ -218,9 +207,9 @@ TAO_FT_Service_Callbacks::is_permanent_forward_condition (const CORBA::Object_pt
   if (stub->forward_profiles ())
     {
       // set lock, as forward_profiles might be deleted concurrently
-      ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
+      ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                                 guard,
-                                *stub->profile_lock (),
+                                const_cast <TAO_SYNCH_MUTEX&>(stub->profile_lock ()),
                                 0));
 
       // even now, the forward profiles might have been deleted in the meanwhile
diff --git a/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index de694bb723c..d2685042f83 100644
--- a/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -50,7 +50,7 @@ public:
   virtual ~TAO_FT_Service_Callbacks (void);
 
   /// Select the profile from MProfile as the needs of the services
-  /// may be. Return the profile in <pfile>
+  /// may be. Return the profile in @a pfile
   virtual CORBA::Boolean select_profile (const TAO_MProfile &mprofile,
                                          TAO_Profile *&pfile);
 
@@ -97,10 +97,6 @@ private:
 private:
   /// The ORB core in which we have been activated
   TAO_ORB_Core *orb_core_;
-
-  /// Mutex to protect access to the profile that gets passed along
-  /// @@ Lock needs to be removed...
-  ACE_Lock* profile_lock_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp b/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
index de912b10127..1be01bbea6c 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
@@ -3,10 +3,6 @@
 #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h"
 #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h"
 
-ACE_RCSID (ClientORB,
-           FTRT_ClientORB_Initializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 FTRT_ClientORB_Initializer::FTRT_ClientORB_Initializer (int transaction_depth)
diff --git a/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
index 0776f22a784..c4e102f6fcc 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
@@ -6,10 +6,6 @@
 #include "tao/CDR.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ClientORB,
-           FTRT_ClientORB_Interceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace FTRT {
diff --git a/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
index 649f6dff9ea..35b4c304d90 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
@@ -9,11 +9,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (ClientORB,
-           FTRT_ClientORB_Loader,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_FTRT {
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
index 33811880cec..ffb6e29e2bd 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h"
-#include "ace/Synch_T.h"
 #include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
 #include "orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h"
@@ -13,10 +12,6 @@
 #include "../Utils/ScopeGuard.h"
 #include "../Utils/Log.h"
 
-ACE_RCSID (EventChannel,
-           AMI_Primary_Replication_Strategy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 AMI_Primary_Replication_Strategy::AMI_Primary_Replication_Strategy(bool mt)
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
index d8d4a8ceef0..b58fe8c42f4 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
@@ -5,11 +5,6 @@
 
 #include "ace/Auto_Ptr.h"
 
-
-ACE_RCSID (EventChannel,
-           AMI_Replication_Strategy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 AMI_Replication_Strategy::AMI_Replication_Strategy(bool mt)
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
index 4896b1405d5..846efb58bac 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
 #include "../Utils/Log.h"
 
-ACE_RCSID (EventChannel,
-           Basic_Replication_Strategy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// The mutex has to be recursive; otherwise, if the second replicate_request() is
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
index 208494e8db1..a1edbc382df 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h"
 #include "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h"
 
-ACE_RCSID (EventChannel,
-           TAO_FTEC_ConsumerAdmin,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const FtRtecEventChannelAdmin::OperationType
@@ -26,8 +22,6 @@ TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin (void)
 {
 }
 
-
-
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_FTEC_ConsumerAdmin::obtain_push_supplier (void)
 {
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index 421709b9748..2bb5c55df40 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -15,10 +15,6 @@
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
 
-ACE_RCSID (EventChannel,
-           TAO_FTEC_Event_Channel,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_FTEC_Event_Channel::TAO_FTEC_Event_Channel(CORBA::ORB_var orb,
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
index d44c64cf91d..d9ba04ecf48 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -13,11 +13,6 @@
 #include "../Utils/Safe_InputCDR.h"
 #include "orbsvcs/FtRtecEventCommC.h"
 
-
-ACE_RCSID (EventChannel,
-           FTEC_Event_Channel_Impl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void obtain_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
index 36c72ef69f6..d8f1b55a85e 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
@@ -12,7 +12,6 @@
 #ifndef TAO_FTEC_EVENT_CHANNEL_H
 #define TAO_FTEC_EVENT_CHANNEL_H
 
-#include "ace/Synch_T.h"
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h"
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
index c0bb7566afa..2290a1bebfd 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
@@ -1,4 +1,5 @@
 // $Id$
+
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h"
@@ -7,10 +8,6 @@
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h"
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h"
 
-ACE_RCSID (EventChannel,
-           FTEC_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_FTEC_Basic_Factory::TAO_FTEC_Basic_Factory (void)
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index 50be1542e81..35748435acc 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -1,7 +1,6 @@
-// $Id$
+// // $Id$
 
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h"
-#include "ace/Synch_T.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h"
 #include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
@@ -11,10 +10,6 @@
 #include "tao/CDR.h"
 #include "orbsvcs/PortableGroup/PG_Operators.h"
 
-ACE_RCSID (EventChannel,
-           TAO_FTEC_Group_Manager,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int find_by_location(const FTRT::ManagerInfoList& list,
@@ -110,7 +105,7 @@ void TAO_FTEC_Group_Manager::join_group (
   TAO_FTRTEC::Log(1, ACE_TEXT("join group\n"));
   if (impl_->my_position == 0) {
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
-    ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc);
+    ACE_WRITE_GUARD (FTRTEC::Replication_Service, lock, *svc);
     add_member(info, IOGR_Maker::instance()->get_ref_version()+1);
   }
 }
@@ -161,7 +156,7 @@ void TAO_FTEC_Group_Manager::add_member (
         publisher->setup_info(new_impl->info_list,
                               new_impl->my_position,
                               object_group_ref_version));
-      ACE_AUTO_PTR_RESET(group_info, group_info1.release(), GroupInfoPublisherBase::Info);
+      ACE_auto_ptr_reset(group_info, group_info1.release());
 
       last_one = true;
     }
@@ -247,8 +242,8 @@ void TAO_FTEC_Group_Manager::replica_crashed (
 {
   TAO_FTRTEC::Log(1, ACE_TEXT("TAO_FTEC_Group_Manager::replica_crashed\n"));
   FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
-    ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc);
-    remove_member(location, IOGR_Maker::instance()->get_ref_version()+1);
+  ACE_WRITE_GUARD (FTRTEC::Replication_Service, lock, *svc);
+  remove_member(location, IOGR_Maker::instance()->get_ref_version()+1);
 }
 
 void TAO_FTEC_Group_Manager::remove_member (
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
index 146adb31e89..64aff6a04ba 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
@@ -1,16 +1,11 @@
 // $Id$
 
-
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h"
 #include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h"
 #include "orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
 
-ACE_RCSID (EventChannel,
-           FTEC_ORBInitializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
index bbadda70bea..443c3dac7ef 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
 #include "../Utils/activate_with_id.h"
 
-ACE_RCSID (EventChannel,
-           TAO_FTEC_ProxyPushConsumer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const TAO_FTEC_ProxyPushConsumer::RollbackOperation
@@ -20,15 +16,13 @@ TAO_FTEC_ProxyPushConsumer::TAO_FTEC_ProxyPushConsumer (TAO_EC_Event_Channel_Bas
 {
 }
 
-
 const FtRtecEventChannelAdmin::ObjectId&
 TAO_FTEC_ProxyPushConsumer::id() const
 {
   return object_id_.in();
 }
 
-
-  /// Activate in the POA
+/// Activate in the POA
 void
 TAO_FTEC_ProxyPushConsumer::activate (
      RtecEventChannelAdmin::ProxyPushConsumer_ptr &result)
@@ -46,7 +40,7 @@ TAO_FTEC_ProxyPushConsumer::activate (
   }
 }
 
-    // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
+// = The RtecEventChannelAdmin::ProxyPushConsumer methods...
 void TAO_FTEC_ProxyPushConsumer::connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
                 const RtecEventChannelAdmin::SupplierQOS& qos)
@@ -65,7 +59,7 @@ void TAO_FTEC_ProxyPushConsumer::connect_push_supplier (
 
   try{
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
-    ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
+    ACE_READ_GUARD (FTRTEC::Replication_Service, locker, *svc);
 
     svc->replicate_request(update,
                            &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_consumer);
@@ -87,7 +81,7 @@ void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (void)
   Inherited::disconnect_push_consumer();
 
   FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
-  ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
+  ACE_READ_GUARD (FTRTEC::Replication_Service, locker, *svc);
 
   svc->replicate_request(update, 0);
 }
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
index 941de2b9a07..39a4175c5c5 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
 
-ACE_RCSID (EventChannel,
-           TAO_FTEC_ProxyPushSupplier,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const TAO_FTEC_ProxyPushSupplier::RollbackOperation
@@ -66,7 +62,7 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer (
   try{
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
 
-    ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
+    ACE_READ_GUARD (FTRTEC::Replication_Service, locker, *svc);
 
     svc->replicate_request(update,
       &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_supplier);
@@ -88,7 +84,7 @@ void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void)
   Inherited::disconnect_push_supplier();
   FTRTEC::Replication_Service *svc = FTRTEC::Replication_Service::instance();
 
-  ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
+  ACE_READ_GUARD (FTRTEC::Replication_Service, locker, *svc);
 
   svc->replicate_request(update, 0);
 }
@@ -108,7 +104,7 @@ void TAO_FTEC_ProxyPushSupplier::suspend_connection (void)
   try
   {
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
-    ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
+    ACE_READ_GUARD (FTRTEC::Replication_Service, locker, *svc);
 
     svc->replicate_request(update,
       &FtRtecEventChannelAdmin::EventChannelFacade::resume_push_supplier);
@@ -134,7 +130,7 @@ void TAO_FTEC_ProxyPushSupplier::resume_connection (void)
   try{
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
 
-    ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
+    ACE_READ_GUARD (FTRTEC::Replication_Service, locker, *svc);
 
     svc->replicate_request(update,
       &FtRtecEventChannelAdmin::EventChannelFacade::suspend_push_supplier);
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
index cbf09a94882..e417eb44182 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h"
 #include "tao/Stub.h"
 
-ACE_RCSID (EventChannel,
-           TAO_FTEC_SupplierAdmin,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const FtRtecEventChannelAdmin::OperationType
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
index 2ce6b5872e7..25ae47a7977 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
@@ -5,11 +5,6 @@
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/PortableServer/PortableServer.h"
 
-
-ACE_RCSID (EventChannel,
-           FT_ProxyAdmin_Base,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 FT_ProxyAdmin_Base::FT_ProxyAdmin_Base(PortableServer::ServantBase* servant,
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
index 362604c7599..f1d3cf998bc 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
@@ -3,7 +3,6 @@
 #include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
 #include "tao/PortableServer/POAC.h"
-#include "ace/Synch_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -15,7 +14,6 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::FT_ProxyAdmin(
 {
 }
 
-
 template <class EC_PROXY_ADMIN, class Proxy,
           class ProxyInterface, class State>
 void
@@ -24,12 +22,11 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface,State>::obtain_proxy (
 {
   Request_Context_Repository().set_object_id(op.object_id);
 
-  ProxyInterface_var result
-    =  admin_->obtain();
+  ProxyInterface_var result =  admin_->obtain();
 
   FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
   try{
-    ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
+    ACE_READ_GUARD (FTRTEC::Replication_Service, locker, *svc);
 
     svc->replicate_request(op,
       Proxy::rollback_obtain);
@@ -64,7 +61,7 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (void)
 
   try{
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
-    ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
+    ACE_READ_GUARD_RETURN (FTRTEC::Replication_Service, locker, *svc, 0);
     obj = IOGR_Maker::instance()->forge_iogr(result.in());
 
     result = ProxyInterface::_narrow(obj.in());
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
index 7e225602e4b..6eb812a3fc9 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
@@ -4,10 +4,6 @@
 #include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h"
 #include "ace/Select_Reactor.h"
 
-ACE_RCSID (EventChannel,
-           Fault_Detector,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 Fault_Detector::ReactorTask::ReactorTask()
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
index 200545a05cb..657d30f0c9d 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
@@ -11,10 +11,6 @@
 #include "ace/Acceptor.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (EventChannel,
-           Fault_Detector_Loader,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace FTRTEC {
@@ -49,7 +45,7 @@ namespace FTRTEC {
     if (argc > 0 && ACE_OS::strcasecmp (argv[0], ACE_TEXT("sctp")) == 0)
     {
 #if (TAO_HAS_SCIOP == 1)
-      ACE_AUTO_PTR_RESET(detector_, detector, Fault_Detector);
+      ACE_auto_ptr_reset(detector_, detector);
 #else
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) SCTP not enabled. ",
@@ -59,7 +55,7 @@ namespace FTRTEC {
     }
     else {
       ACE_NEW_RETURN(detector, TCP_Fault_Detector, -1);
-      ACE_AUTO_PTR_RESET(detector_, detector, Fault_Detector);
+      ACE_auto_ptr_reset(detector_, detector);
     }
     return detector_->init(argc, argv);
   }
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
index 4669b5331a4..c7f814cc070 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
@@ -1,4 +1,3 @@
-
 // $Id$
 
 #include "ace/INET_Addr.h"
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index db1ade61aad..06fe24e6903 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -13,10 +13,6 @@
 
 #include "orbsvcs/FTRTC.h"
 
-ACE_RCSID (EventChannel,
-           ForwardCtrlServerInterceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri)
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index e271bafd421..4793489d99f 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -7,10 +7,6 @@
 #include "../Utils/Safe_InputCDR.h"
 #include "../Utils/Log.h"
 
-ACE_RCSID (EventChannel,
-           FtEventServiceInterceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index de996514b2d..085b909aebc 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -7,13 +7,6 @@
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h"
 #include "../Utils/Log.h"
 
-//#include "../Utils/log_obj_endpoints.h"
-
-ACE_RCSID (EventChannel,
-           GroupInfoPublisher,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 GroupInfoPublisherBase::GroupInfoPublisherBase()
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
index 89dd7b88898..ff3188b6ba6 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
@@ -12,10 +12,6 @@
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
 
-ACE_RCSID (EventChannel,
-           IOGR_Maker,
-           "$Id$")
-
 static IOGR_Maker* maker;
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
index ae30ff5a33c..16e3a70b34b 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
@@ -2,11 +2,7 @@
 
 #include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h"
 #include "../Utils/UUID.h"
-
-ACE_RCSID (EventChannel,
-           Identification_Service,
-           "$Id$")
-
+#include "ace/OS_NS_strings.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
index 08b889297b7..e70726ca265 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
@@ -4,10 +4,6 @@
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/Event/EC_ProxySupplier.h"
 
-ACE_RCSID (EventChannel,
-           ProxyConsumerStateWorker,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ProxyConsumerStateWorker::ProxyConsumerStateWorker (
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
index 8f47fd1c894..8c9e8dce508 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/Event/EC_ProxyConsumer.h"
 
-ACE_RCSID (EventChannel,
-           ProxySupplierStateWorker,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ProxySupplierStateWorker::ProxySupplierStateWorker (
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
index 4f6e0df6b6d..b9bf488c9a0 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
@@ -12,11 +12,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_strings.h"
 
-
-ACE_RCSID (EventChannel,
-           Replication_Service,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace FTRTEC
@@ -75,7 +70,7 @@ namespace FTRTEC
       TAO_FTRTEC::Log(3, ACE_TEXT("Basic replication strategy\n"));
     }
 
-     ACE_AUTO_PTR_RESET (replication_strategy, strategy, Replication_Strategy);
+     ACE_auto_ptr_reset (replication_strategy, strategy);
 
       try
       {
@@ -111,7 +106,7 @@ namespace FTRTEC
     ACE_ASSERT(strategy);
 
     if (replication_strategy.get() != strategy) {
-      ACE_AUTO_PTR_RESET(replication_strategy, strategy, Replication_Strategy);
+      ACE_auto_ptr_reset(replication_strategy, strategy);
     }
   }
 
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
index db6c4497c52..357a2396f9b 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
@@ -3,11 +3,6 @@
 #include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h"
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
 
-ACE_RCSID (EventChannel,
-           Replication_Strategy,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 Replication_Strategy::Replication_Strategy()
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index ec5adff88bd..ec58a65597d 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -10,10 +10,6 @@
 #include "tao/AnyTypeCode/IOPA.h"
 #include "ace/TSS_T.h"
 
-ACE_RCSID (EventChannel,
-           Request_Context_Repository,
-           "$Id$")
-
 namespace {
 PortableInterceptor::SlotId object_id_slot;
 PortableInterceptor::SlotId cached_result_slot;
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
index 87e727382ec..5376f4cdb78 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
@@ -41,7 +41,7 @@ namespace PortableInterceptor
  *
  * @brief This class is used to transfer the information between thread context
  *        information and the request context in the portable interceptors. It
- *        encapulates the PICurrent to provide a type safe way for the transfer of
+ *        encapsulates the PICurrent to provide a type safe way for the transfer of
  *        FTEC specific information inside and outside protable interceptors.
  */
 class Request_Context_Repository
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
index e92e73dd491..ec06fa1097e 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
@@ -9,10 +9,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_sys_socket.h"
 
-ACE_RCSID (EventChannel,
-           SCTP_Fault_Detector,
-           "$Id$")
-
 #ifndef SCTP_HEARTBEAT_ITVL
 #define SCTP_HEARTBEAT_ITVL 19
 #endif
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
index 69a0e29bb82..2ca0edfa40d 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/FTRTC.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
 
-ACE_RCSID (EventChannel,
-           Set_Update_Intercetpor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Set_Update_Interceptor::TAO_Set_Update_Interceptor ()
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
index 63ed805a07a..db3f9f2877c 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
@@ -1,10 +1,7 @@
 // $Id$
 
 #include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h"
-
-ACE_RCSID (EventChannel,
-           Update_Manager,
-           "$Id$")
+#include "ace/Guard_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -30,7 +27,7 @@ Update_Manager::~Update_Manager()
 
 void Update_Manager::handle_reply(int id)
 {
-  ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   replied_[id] = true;
 
   if ((replied_ & signal_condition_) == signal_condition_) {
@@ -43,7 +40,7 @@ void Update_Manager::handle_reply(int id)
 
 void Update_Manager::handle_exception(int id)
 {
-  ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   replied_[id] = true;
   ++transaction_level_;
 
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h
index 2fed0651215..d8170e3783b 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h
@@ -13,9 +13,9 @@
 #ifndef UPDATE_MANAGER_H
 #define UPDATE_MANAGER_H
 
-#include "ace/Synch_T.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h"
 #include "tao/orbconf.h"
+#include "ace/Auto_Event.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
index 93879192db3..7f34610440f 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
@@ -5,11 +5,6 @@
 #include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h"
 #include "../Utils/resolve_init.h"
 
-ACE_RCSID (EventChannel,
-           UpdateableHandler,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 UpdateableHandler::UpdateableHandler(AMI_Primary_Replication_Strategy* strategy)
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
index 8485efd4868..a3d024e7eec 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
@@ -2,10 +2,6 @@
 
 #include "orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h"
 
-ACE_RCSID (EventChannel,
-           create_persistent_poa,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa,
diff --git a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp
index 8b902ac91bc..4b684ac136b 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp
@@ -1,13 +1,10 @@
+// $Id$
+
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 #include "tao/Object_KeyC.h"
 #include <algorithm>
 
-ACE_RCSID (EventChannel,
-           replace_key,
-           "$Id$")
-
-
 /// This function was defined in IOGR_Maker.cpp. It is moved
 /// here because the use of <algorithm> header
 /// file conflicts with the use of auto_ptr in the
diff --git a/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index 0fbc19919d8..f6592820c0f 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
 #include "orbsvcs/FtRtEvent/Utils/activate_with_id.h"
 #include "orbsvcs/FtRtEvent/Utils/UUID.h"
@@ -5,10 +7,6 @@
 #include "orbsvcs/FtRtecEventCommS.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (Utils,
-           FTEC_Gateway,
-           "$Id$")
-
 #if !defined(__ACE_INLINE__)
 #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
index 44476a3fc23..ac826856adc 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
@@ -5,6 +5,8 @@
 #include "orbsvcs/FtRtEvent/Utils/Log.inl"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/OS_NS_stdio.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_FTRTEC {
diff --git a/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h b/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h
index 54909fb4e36..bace320d3fc 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h
+++ b/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h
@@ -15,7 +15,6 @@
 #include /**/ "ace/pre.h"
 #include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h"
 #include "tao/Versioned_Namespace.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp b/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp
index 96f0abfbad5..efd4b53376c 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp
@@ -1,8 +1,6 @@
-#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h"
+// $Id$
 
-ACE_RCSID (Utils,
-           Safe_InputCDR,
-           "$Id$")
+#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h"
 
 #if !defined(__ACE_INLINE__)
 #include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl"
diff --git a/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
index 20ff2119ba2..0a67dc6a12d 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
+++ b/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
@@ -1,13 +1,15 @@
 //$Id$
+
 #include "orbsvcs/FtRtEvent/Utils/UUID.h"
 
-ACE_RCSID (Utils,
-           UUID,
-           "$Id$")
 #if !defined(__ACE_INLINE__)
 #include "orbsvcs/FtRtEvent/Utils/UUID.inl"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_netdb.h"
+#include "ace/OS_NS_sys_time.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO_FtRt
 {
@@ -117,7 +119,7 @@ UUID::to_string (char  *string_rep) const
 void
 UUID::create (unsigned char *buffer)
 {
-  static ACE_RANDR_TYPE seed;
+  static unsigned int seed;
 
   if (seed == 0) seed = ACE_OS::getpid();
 
@@ -127,8 +129,8 @@ UUID::create (unsigned char *buffer)
     // initialize the node
     if (ACE_OS::getmacaddress(&node.mac_address) == -1)
     {
-      node.rand_node.rand1 = ACE_OS::rand_r(seed);
-      node.rand_node.rand2 = (unsigned short) ACE_OS::rand_r(seed);
+      node.rand_node.rand1 = ACE_OS::rand_r(&seed);
+      node.rand_node.rand2 = (unsigned short) ACE_OS::rand_r(&seed);
     }
   }
 
@@ -158,7 +160,7 @@ UUID::create (unsigned char *buffer)
   buffer[7] = (unsigned char) (((timestamp >> 56) & 0x0f) + 0x10);
 
   ACE_UINT16  clockSequence = static_cast<
-    ACE_UINT16> (ACE_OS::rand_r(seed) & 0x2ff);
+    ACE_UINT16> (ACE_OS::rand_r(&seed) & 0x2ff);
 
   buffer[8] = (unsigned char) ((clockSequence >> 8) & 0x1f);
   buffer[9] = (unsigned char) (clockSequence & 0x1f);
diff --git a/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h b/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
index a376ea74677..10bdd0834bb 100644
--- a/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
+++ b/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
@@ -14,7 +14,6 @@
 
 #include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h"
 #include "tao/Versioned_Namespace.h"
-#include "ace/OS.h"
 #include "ace/SString.h"
 
 #if defined(TAO_EXPORT_MACRO)
diff --git a/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
index d2015c7cc80..b1e7680abe7 100644
--- a/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+++ b/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/HTIOP/HTIOP_Profile.h"
 #include "ace/HTBP/HTBP_Environment.h"
 #include "ace/HTBP/HTBP_ID_Requestor.h"
+#include "ace/os_include/os_netdb.h"
 
 #include "tao/MProfile.h"
 #include "tao/ORB_Core.h"
@@ -19,10 +20,6 @@
 #include "orbsvcs/HTIOP/HTIOP_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(HTIOP,
-          TAO_HTIOP_Acceptor,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::HTIOP::Acceptor::Acceptor (ACE::HTBP::Environment *ht_env,
diff --git a/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
index c5e411efe7d..a5b8617fd49 100644
--- a/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
+++ b/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
@@ -16,11 +16,6 @@
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Acceptor_Impl.h"
 
-ACE_RCSID (HTIOP,
-           TAO_HTIOP_Completion_Handler,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::HTIOP::Completion_Handler::Completion_Handler (ACE_Thread_Manager *t)
diff --git a/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
index 0dcab5ad0f1..73e5913309b 100644
--- a/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
+++ b/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
@@ -7,6 +7,7 @@
 
 #include "ace/HTBP/HTBP_Stream.h"
 #include "ace/HTBP/HTBP_Session.h"
+#include "ace/os_include/os_netdb.h"
 
 #include "tao/Timeprobe.h"
 #include "tao/debug.h"
@@ -21,11 +22,6 @@
 #include "tao/Resume_Handle.h"
 #include "tao/Protocols_Hooks.h"
 
-ACE_RCSID (HTIOP,
-           TAO_HTIOP_Connection_Handler,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::HTIOP::Connection_Handler::Connection_Handler (ACE_Thread_Manager *t)
diff --git a/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
index 2adb25fc91a..276df2af033 100644
--- a/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+++ b/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
@@ -17,11 +17,7 @@
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Profile_Transport_Resolver.h"
 #include "ace/Strategies_T.h"
-
-ACE_RCSID (HTIOP,
-           TAO_HTIOP_Connector,
-           "$Id$")
-
+#include "ace/OS_NS_strings.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
index eccbb782a3d..b094ba6fa43 100644
--- a/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
+++ b/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
@@ -30,7 +30,6 @@
 
 #include "ace/SOCK_Connector.h"
 #include "ace/Connector.h"
-#include "ace/OS.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE
diff --git a/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
index 0f509ab566f..46bc7c75082 100644
--- a/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
+++ b/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
@@ -9,11 +9,6 @@
 #include "tao/IOPC.h"
 #include "tao/debug.h"
 
-
-ACE_RCSID (HTIOP,
-           TAO_HTIOP_Endpoint,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/HTIOP/HTIOP_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h b/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
index 210d705eb9c..af1ca4bdf61 100644
--- a/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
+++ b/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
@@ -85,8 +85,8 @@ namespace TAO
       /// Makes a copy of <this>
       virtual TAO_Endpoint *duplicate (void);
 
-      /// Return true if this endpoint is equivalent to <other_endpoint>.  Two
-      /// endpoints are equivalent iff their port and host are the same.
+      /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
+      /// endpoints are equivalent if their port and host are the same.
       CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
       /// Return a hash value for this object.
@@ -103,7 +103,7 @@ namespace TAO
       /// ownership of this string.
       const char *host (void) const;
 
-      /// Copy the string <h> into <host_> and return the resulting pointer.
+      /// Copy the string @a h into <host_> and return the resulting pointer.
       /// This object maintains ownership of this string.
       const char *host (const char *h);
 
@@ -117,7 +117,7 @@ namespace TAO
       /// ownership of this string.
       const char *htid (void) const;
 
-      /// Copy the string <h> into <host_> and return the resulting pointer.
+      /// Copy the string @a h into <host_> and return the resulting pointer.
       /// This object maintains ownership of this string.
       const char *htid (const char *h);
 
diff --git a/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
index 34ba5a8f8a1..e390b46cef4 100644
--- a/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
+++ b/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
@@ -6,12 +6,10 @@
 #include "orbsvcs/HTIOP/HTIOP_Profile.h"
 
 #include "ace/HTBP/HTBP_Environment.h"
+#include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_sys_stat.h"
 #include "tao/IOPC.h"
 
-ACE_RCSID (HTIOP,
-           TAOHTIOP_Factory,
-           "$Id$")
-
 static const char the_prefix[] = "htiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
index d58362ced8f..b69a58ea11e 100644
--- a/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+++ b/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
@@ -12,10 +12,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 
-ACE_RCSID(HTIOP,
-          TAO_HTIOP_Profile,
-          "$Id$")
-
 static const char the_prefix[] = "htiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
index e8b9460fda3..dc829f0ec3a 100644
--- a/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
+++ b/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
@@ -21,10 +21,6 @@
 #include "tao/Protocols_Hooks.h"
 #include "tao/Adapter.h"
 
-ACE_RCSID (HTIOP,
-           TAO_HTIOP_Transport,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::HTIOP::Transport::Transport (TAO::HTIOP::Connection_Handler *h,
diff --git a/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
index 242d7c16eea..5fae591d76b 100644
--- a/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
+++ b/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
@@ -29,13 +29,6 @@
 
 #include "ace/Synch.h"
 #include "ace/Svc_Handler.h"
-//#include "HTIOP/HTIOPC.h"
-
-# if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
-#   define ACE_HTBP_STREAM ACE::HTBP::Stream
-# else /* If TEMPLATES are broken in some form or another */
-#   define ACE_HTBP_STREAM ACE::HTBP::Stream, ACE::HTBP::Addr
-#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -52,7 +45,7 @@ namespace TAO
     class Connection_Handler;
 
     // Service Handler for this transport
-    typedef ACE_Svc_Handler<ACE_HTBP_STREAM, ACE_NULL_SYNCH>
+    typedef ACE_Svc_Handler<ACE::HTBP::Stream, ACE_NULL_SYNCH>
     SVC_HANDLER;
 
     /**
diff --git a/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
index 93f65b6b6c8..83b3658a41a 100644
--- a/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
@@ -3,15 +3,9 @@
 #include "orbsvcs/IFRService/AbstractInterfaceDef_i.h"
 #include "orbsvcs/IFRService/Repository_i.h"
 
-ACE_RCSID (IFRService,
-           AbstractInterfaceDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_AbstractInterfaceDef_i::TAO_AbstractInterfaceDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_AbstractInterfaceDef_i::TAO_AbstractInterfaceDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Container_i (repo),
     TAO_Contained_i (repo),
diff --git a/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h b/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
index d47292832c3..7e9ddfcb069 100644
--- a/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
@@ -32,15 +32,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Represents an abstract interface definition.
+ */
 class TAO_IFRService_Export TAO_AbstractInterfaceDef_i
   : public virtual TAO_InterfaceDef_i
 {
-  // = TITLE
-  //    TAO_AbstractInterfaceDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an abstract interface definition.
-  //
 public:
   /// Constructor
   TAO_AbstractInterfaceDef_i (TAO_Repository_i *repo);
diff --git a/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
index 236eecd9931..c099bfd8005 100644
--- a/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
@@ -6,11 +6,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           AliasDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_AliasDef_i::TAO_AliasDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
index 899cbc2050d..5c399b215bc 100644
--- a/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
@@ -32,16 +32,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Represents an OMG IDL typedef that aliases another definition.
+ */
 class TAO_IFRService_Export TAO_AliasDef_i : public virtual TAO_TypedefDef_i
 {
 public:
-  // = TITLE
-  //    TAO_AliasDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an OMG IDL typedef that aliases another definition.
-  //
-public:
   /// Constructor
   TAO_AliasDef_i (TAO_Repository_i *repo);
 
diff --git a/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
index 2fd2fa4d562..217dc001d4f 100644
--- a/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
@@ -6,11 +6,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           ArrayDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ArrayDef_i::TAO_ArrayDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
index f8be90a495a..38e2c4e79f0 100644
--- a/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
@@ -8,16 +8,9 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           AttributeDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_AttributeDef_i::TAO_AttributeDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_AttributeDef_i::TAO_AttributeDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo)
 {
diff --git a/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
index e6deb164007..986d20bc47c 100644
--- a/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
@@ -9,10 +9,6 @@
 #include "orbsvcs/IFRService/IFR_Service_Utils.h"
 #include "ace/SString.h"
 
-ACE_RCSID (IFRService,
-           ComponentContainer_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const char *TAO_ComponentContainer_i::tmp_name_holder_ = 0;
diff --git a/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h b/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
index 94905e6d65d..b7d45eb99fa 100644
--- a/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
+++ b/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
@@ -34,17 +34,14 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Base class used to form a containment hierarchy
+ * for component-related types in the Interface Repository.
+ * Defines the relevant create_* methods.
+ */
 class TAO_IFRService_Export TAO_ComponentContainer_i
   : public virtual TAO_Container_i
 {
-  // = TITLE
-  //    TAO_ComponentContainer_i
-  //
-  // = DESCRIPTION
-  //    Base class used to form a containment hierarchy
-  //    for component-related types in the Interface Repository.
-  //    Defines the relevant create_* methods.
-  //
 public:
   TAO_ComponentContainer_i (TAO_Repository_i *repo);
 
diff --git a/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
index 4efe8c1f0dd..823de5e1217 100644
--- a/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
@@ -12,11 +12,6 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           ComponentDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Specialization.
@@ -161,7 +156,7 @@ TAO_ComponentDef_i::describe_i (void)
     this->repo_->config ()->get_string_value (this->section_key_,
                                               "base_component",
                                               holder);
-                                              
+
   if (status == 0)
     {
       ACE_Configuration_Section_Key base_key;
@@ -173,8 +168,8 @@ TAO_ComponentDef_i::describe_i (void)
                                                 "id",
                                                 holder);
     }
-  
-  // If status wasn't 0, holder will contain the empty string.  
+
+  // If status wasn't 0, holder will contain the empty string.
   cd.base_component = holder.fast_rep ();
 
   CORBA::ULong count = 0;
diff --git a/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
index 7c4ca8835b5..d271e8a2847 100644
--- a/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
@@ -35,15 +35,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Represents a component definition.
+ */
 class TAO_IFRService_Export TAO_ComponentDef_i
   : public virtual TAO_ExtInterfaceDef_i
 {
-  // = TITLE
-  //    TAO_ComponentDef_i
-  //
-  // = DESCRIPTION
-  //    Represents a component definition.
-  //
 public:
   /// Constructor
   TAO_ComponentDef_i (TAO_Repository_i *repo);
diff --git a/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
index 474f85baf57..010b1a3f86b 100644
--- a/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
@@ -2,11 +2,6 @@
 
 #include "orbsvcs/IFRService/ComponentModuleDef_i.h"
 
-ACE_RCSID (IFRService, 
-           ComponentModuleDef_i, 
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ComponentModuleDef_i::TAO_ComponentModuleDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h b/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
index 0205ab7070c..c7e22a9634a 100644
--- a/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
@@ -32,16 +32,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Represents a module definition that may contain Component-related
+ * types.
+ */
 class TAO_IFRService_Export TAO_ComponentModuleDef_i
   : public virtual TAO_ComponentContainer_i
 {
-  // = TITLE
-  //    TAO_ComponentModuleDef_i
-  //
-  // = DESCRIPTION
-  //    Represents a module definition that may contain Component-related
-  //    types.
-  //
 public:
   /// Constructor
   TAO_ComponentModuleDef_i (TAO_Repository_i *repo);
diff --git a/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
index f361f887fc3..b446b9b2731 100644
--- a/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
@@ -14,18 +14,12 @@
 #include "orbsvcs/IFRService/ProvidesDef_i.h"
 #include "orbsvcs/IFRService/UsesDef_i.h"
 
-ACE_RCSID (IFRService,
-           ComponentRepository_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ComponentRepository_i::TAO_ComponentRepository_i (
     CORBA::ORB_ptr orb,
     PortableServer::POA_ptr poa,
-    ACE_Configuration *config
-  )
+    ACE_Configuration *config)
   : TAO_IRObject_i (0),
     TAO_Container_i (0),
     TAO_Repository_i (orb,
diff --git a/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
index c06ce1059cc..01bbe3ccb7c 100644
--- a/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
+++ b/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
@@ -47,18 +47,15 @@ class TAO_UsesDef_i;
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+/**
+ * Provides global access to the Interface Repository,
+ * including access to information related to
+ * CORBA Components.
+ */
 class TAO_IFRService_Export TAO_ComponentRepository_i
   : public virtual TAO_Repository_i,
     public virtual TAO_ComponentContainer_i
 {
-  // = TITLE
-  //    TAO_ComponentRepository_i
-  //
-  // = DESCRIPTION
-  //    Provides global access to the Interface Repository,
-  //    including access to information related to
-  //    CORBA Components.
-  //
 public:
   /// Constructor.
   TAO_ComponentRepository_i (CORBA::ORB_ptr orb,
diff --git a/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
index 532c7b4c749..38359a44621 100644
--- a/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
@@ -10,17 +10,9 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           ConstantDef_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ConstantDef_i::TAO_ConstantDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_ConstantDef_i::TAO_ConstantDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo)
 {
diff --git a/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
index 17844ebd678..181f0007e49 100644
--- a/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
@@ -1,14 +1,9 @@
 // -*- C++ -*-
-
 // $Id$
 
 #include "orbsvcs/IFRService/Repository_i.h"
 #include "orbsvcs/IFRService/ConsumesDef_i.h"
 
-ACE_RCSID (IFRService,
-           ConsumesDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ConsumesDef_i::TAO_ConsumesDef_i (
diff --git a/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
index 90adc1473c2..dd58f1f3810 100644
--- a/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
@@ -32,16 +32,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Represents the definition of an event that is consumed
+ * by a component.
+ */
 class TAO_IFRService_Export TAO_ConsumesDef_i
   : public virtual TAO_EventPortDef_i
 {
-  // = TITLE
-  //    TAO_ConsumesDef_i
-  //
-  // = DESCRIPTION
-  //    Represents the definition of an event that is consumed
-  //    by a component.
-  //
 public:
   /// Constructor
     TAO_ConsumesDef_i (TAO_Repository_i *repo);
@@ -50,8 +47,7 @@ public:
   virtual ~TAO_ConsumesDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (
-    );
+  virtual CORBA::DefinitionKind def_kind (void);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
index 85832e59248..13962884ca7 100644
--- a/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
@@ -6,12 +6,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           Contained_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const char *TAO_Contained_i::tmp_name_holder_ = 0;
diff --git a/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index 88b28241e80..722f0a39605 100644
--- a/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -14,18 +14,11 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           Container_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const char *TAO_Container_i::tmp_name_holder_ = 0;
 
-TAO_Container_i::TAO_Container_i (
-    TAO_Repository_i *repo
-  )
+TAO_Container_i::TAO_Container_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo)
 {
 }
diff --git a/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
index 9d3b9fed6f2..e4d3f6bc2a4 100644
--- a/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
@@ -3,11 +3,6 @@
 #include "orbsvcs/IFRService/EmitsDef_i.h"
 #include "orbsvcs/IFRService/Repository_i.h"
 
-ACE_RCSID (IFRService,
-           EmitsDef_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EmitsDef_i::TAO_EmitsDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
index 4c5b590f3fc..75f3939e359 100644
--- a/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
@@ -32,16 +32,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Represents the definition of an event that is emitted
+ * by a component.
+ */
 class TAO_IFRService_Export TAO_EmitsDef_i
   : public virtual TAO_EventPortDef_i
 {
-  // = TITLE
-  //    TAO_EmitsDef_i
-  //
-  // = DESCRIPTION
-  //    Represents the definition of an event that is emitted
-  //    by a component.
-  //
 public:
   /// Constructor
     TAO_EmitsDef_i (TAO_Repository_i *repo);
diff --git a/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
index 2b80c8608ea..beeaaa4b4f6 100644
--- a/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
@@ -6,11 +6,6 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           EnumDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EnumDef_i::TAO_EnumDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/EnumDef_i.h b/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
index 8d9ade9026a..65b5db71662 100644
--- a/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
@@ -32,16 +32,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Represents an OMG IDL enumeration definition.
+ */
 class TAO_IFRService_Export TAO_EnumDef_i : public virtual TAO_TypedefDef_i
 {
 public:
-  // = TITLE
-  //    TAO_EnumDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an OMG IDL enumeration definition.
-  //
-public:
   /// Constructor
   TAO_EnumDef_i (TAO_Repository_i *repo);
 
diff --git a/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
index 5e96026a120..e6378e02778 100644
--- a/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
@@ -3,11 +3,6 @@
 #include "orbsvcs/IFRService/Repository_i.h"
 #include "orbsvcs/IFRService/EventDef_i.h"
 
-ACE_RCSID (IFRService,
-           EventDef_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EventDef_i::TAO_EventDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
index 5b45b14ee9b..fb09253aaee 100644
--- a/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
@@ -8,11 +8,6 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           EventPortDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EventPortDef_i::TAO_EventPortDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h b/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
index dfef85ad61e..23947ddff95 100644
--- a/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
@@ -34,16 +34,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Represents an event port definition. EmitsDef_i, PublishesDef_i,
+ * and ConsumesDef_i inherit from this.
+ */
 class TAO_IFRService_Export TAO_EventPortDef_i
   : public virtual TAO_Contained_i
 {
-  // = TITLE
-  //    TAO_EventPortDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an event port definition. EmitsDef_i, PublishesDef_i,
-  //    and ConsumesDef_i inherit from this.
-  //
 public:
   //// Constructor
   TAO_EventPortDef_i (TAO_Repository_i *repo);
@@ -51,44 +48,31 @@ public:
   //// Destructor
   virtual ~TAO_EventPortDef_i (void);
 
-  virtual CORBA::ComponentIR::EventDef_ptr event (
-    );
+  virtual CORBA::ComponentIR::EventDef_ptr event (void);
 
-  CORBA::ComponentIR::EventDef_ptr event_i (
-    );
+  CORBA::ComponentIR::EventDef_ptr event_i (void);
 
-  virtual void event (
-      CORBA::ComponentIR::EventDef_ptr event
-    );
+  virtual void event (CORBA::ComponentIR::EventDef_ptr event);
 
-  void event_i (
-      CORBA::ComponentIR::EventDef_ptr event
-    );
+  void event_i (CORBA::ComponentIR::EventDef_ptr event);
 
-  virtual CORBA::Boolean is_a (
-      const char *event_id
-    );
+  virtual CORBA::Boolean is_a (const char *event_id);
 
-  CORBA::Boolean is_a_i (
-      const char *event_id
-    );
+  CORBA::Boolean is_a_i (const char *event_id);
 
   /// This can be the same for the three derived classes, so it is
   /// implemented here.
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe (
-    );
+  virtual CORBA::Contained::Description *describe (void);
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i (
-    );
+  virtual CORBA::Contained::Description *describe_i (void);
 
 private:
   /// Dummy method so we can consolidate derived class methods
   /// in this 'abstract' base class.
-  virtual CORBA::DefinitionKind def_kind (
-    );
+  virtual CORBA::DefinitionKind def_kind (void);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
index 9ec6a018504..987665fe35a 100644
--- a/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
@@ -7,15 +7,9 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
-ACE_RCSID (IFRService,
-           ExceptionDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ExceptionDef_i::TAO_ExceptionDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_ExceptionDef_i::TAO_ExceptionDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
     TAO_Container_i (repo)
diff --git a/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
index ec4fb834abe..cff6a17027a 100644
--- a/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
@@ -33,15 +33,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Represents an exception definition.
+ */
 class TAO_IFRService_Export TAO_ExceptionDef_i : public virtual TAO_Contained_i,
                                                  public virtual TAO_Container_i
 {
-  // = TITLE
-  //    TAO_ExceptionDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an exception definition.
-  //
 public:
   /// Constructor
   TAO_ExceptionDef_i (TAO_Repository_i *repo);
@@ -50,44 +47,31 @@ public:
   virtual ~TAO_ExceptionDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind ()
-;
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// Remove the repository entry.
-  virtual void destroy ()
-;
+  virtual void destroy ();
 
   /// Remove the repository entry.
-  virtual void destroy_i ()
-;
+  virtual void destroy_i ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe ()
-;
+  virtual CORBA::Contained::Description *describe ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i ()
-;
+  virtual CORBA::Contained::Description *describe_i ();
 
-  virtual CORBA::TypeCode_ptr type ()
-;
+  virtual CORBA::TypeCode_ptr type ();
 
-  CORBA::TypeCode_ptr type_i ()
-;
+  CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::StructMemberSeq *members ()
-;
+  virtual CORBA::StructMemberSeq *members ();
 
-  CORBA::StructMemberSeq *members_i ()
-;
+  CORBA::StructMemberSeq *members_i ();
 
-  virtual void members (
-      const CORBA::StructMemberSeq & members)
-;
+  virtual void members (const CORBA::StructMemberSeq & members);
 
-  void members_i (
-      const CORBA::StructMemberSeq & members)
-;
+  void members_i (const CORBA::StructMemberSeq & members);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
index 75bff6fe02b..2833d46a52d 100644
--- a/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
@@ -3,15 +3,10 @@
 #include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h"
 #include "orbsvcs/IFRService/Repository_i.h"
 
-ACE_RCSID (IFRService,
-           ExtAbstractInterfaceDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ExtAbstractInterfaceDef_i::TAO_ExtAbstractInterfaceDef_i (
-    TAO_Repository_i *repo
-  )
+    TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Container_i (repo),
     TAO_Contained_i (repo),
diff --git a/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
index 1034cdc79b6..36063b18354 100644
--- a/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
@@ -35,16 +35,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Mixes in IDL3 attribute exceptions.
+ */
 class TAO_IFRService_Export TAO_ExtAbstractInterfaceDef_i
   : public virtual TAO_AbstractInterfaceDef_i,
     public virtual TAO_InterfaceAttrExtension_i
 {
-  // = TITLE
-  //    TAO_ExtAbstractInterfaceDef_i
-  //
-  // = DESCRIPTION
-  //    Mixes in IDL3 attribute exceptions.
-  //
 public:
   /// Constructor
   TAO_ExtAbstractInterfaceDef_i (TAO_Repository_i *repo);
@@ -52,8 +49,7 @@ public:
   /// Destructor
   virtual ~TAO_ExtAbstractInterfaceDef_i (void);
 
-  virtual void destroy (
-    );
+  virtual void destroy (void);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
index 96e511c2419..659c10e789f 100644
--- a/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
@@ -7,12 +7,6 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           ExtAttributeDef_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ExtAttributeDef_i::TAO_ExtAttributeDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h b/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
index 16ae7ddbec2..64723625f61 100644
--- a/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
@@ -32,15 +32,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Adds IDL3 extensions to AttributeDef.
+ */
 class TAO_IFRService_Export TAO_ExtAttributeDef_i
   : public virtual TAO_AttributeDef_i
 {
-  // = TITLE
-  //    TAO_ExtAttributeDef_i
-  //
-  // = DESCRIPTION
-  //    Adds IDL3 extensions to AttributeDef.
-  //
 public:
   /// Constructor
   TAO_ExtAttributeDef_i (TAO_Repository_i *repo);
@@ -48,45 +45,31 @@ public:
   /// Destructor
   virtual ~TAO_ExtAttributeDef_i (void);
 
-  virtual CORBA::ExcDescriptionSeq *get_exceptions (
-    );
+  virtual CORBA::ExcDescriptionSeq *get_exceptions (void);
 
-  CORBA::ExcDescriptionSeq *get_exceptions_i (
-    );
+  CORBA::ExcDescriptionSeq *get_exceptions_i (void);
 
-  virtual void get_exceptions (
-      const CORBA::ExcDescriptionSeq &get_exceptions
-    );
+  virtual void get_exceptions (const CORBA::ExcDescriptionSeq &get_exceptions);
 
-  void get_exceptions_i (
-      const CORBA::ExcDescriptionSeq &get_exceptions
-    );
+  void get_exceptions_i (const CORBA::ExcDescriptionSeq &get_exceptions);
 
-  virtual CORBA::ExcDescriptionSeq *set_exceptions (
-    );
+  virtual CORBA::ExcDescriptionSeq *set_exceptions (void);
 
-  CORBA::ExcDescriptionSeq *set_exceptions_i (
-    );
+  CORBA::ExcDescriptionSeq *set_exceptions_i (void);
 
   virtual void set_exceptions (
-      const CORBA::ExcDescriptionSeq &set_exceptions
-    );
+      const CORBA::ExcDescriptionSeq &set_exceptions);
 
   void set_exceptions_i (
-      const CORBA::ExcDescriptionSeq &set_exceptions
-    );
+      const CORBA::ExcDescriptionSeq &set_exceptions);
 
-  virtual CORBA::ExtAttributeDescription *describe_attribute (
-    );
+  virtual CORBA::ExtAttributeDescription *describe_attribute (void);
 
-  CORBA::ExtAttributeDescription *describe_attribute_i (
-    );
+  CORBA::ExtAttributeDescription *describe_attribute_i (void);
 
   // Utility function that fills sequence elements for a
   // ComponentDescription.
-  void fill_description (
-      CORBA::ExtAttributeDescription &desc
-    );
+  void fill_description (CORBA::ExtAttributeDescription &desc);
 
 private:
   /// Common code for the set and get varieties.
diff --git a/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
index 30f003136b2..9c75add9a8e 100644
--- a/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
@@ -3,16 +3,9 @@
 #include "orbsvcs/IFRService/ExtInterfaceDef_i.h"
 #include "orbsvcs/IFRService/Repository_i.h"
 
-ACE_RCSID (IFRService, 
-           ExtInterfaceDef_i, 
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ExtInterfaceDef_i::TAO_ExtInterfaceDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_ExtInterfaceDef_i::TAO_ExtInterfaceDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Container_i (repo),
     TAO_Contained_i (repo),
diff --git a/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
index c15b0fc00ef..45e40c2113e 100644
--- a/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
@@ -3,15 +3,9 @@
 #include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h"
 #include "orbsvcs/IFRService/Repository_i.h"
 
-ACE_RCSID (IFRService,
-           ExtLocalInterfaceDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ExtLocalInterfaceDef_i::TAO_ExtLocalInterfaceDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_ExtLocalInterfaceDef_i::TAO_ExtLocalInterfaceDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Container_i (repo),
     TAO_Contained_i (repo),
diff --git a/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
index 59e837ef3de..3c07539de7b 100644
--- a/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
@@ -8,11 +8,6 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           ExtValueDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ExtValueDef_i::TAO_ExtValueDef_i (TAO_Repository_i *repo)
@@ -689,7 +684,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
     this->repo_->config ()->get_string_value (this->section_key_,
                                               "base_value",
                                               holder);
-                                              
+
   if (status == 0)
     {
       ACE_Configuration_Section_Key base_key;
@@ -698,11 +693,11 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                                            base_key,
                                            0);
       this->repo_->config ()->get_string_value (base_key,
-                                                "id",    
+                                                "id",
                                                 holder);
     }
-    
-  // If status isn't 0, then holder will be empty anyway.  
+
+  // If status isn't 0, then holder will be empty anyway.
   fv_desc->base_value = holder.fast_rep ();
   fv_desc->type = this->type_i ();
 
diff --git a/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
index e5ca2a5d3ce..8d5746aeb21 100644
--- a/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
@@ -3,15 +3,9 @@
 #include "orbsvcs/IFRService/Repository_i.h"
 #include "orbsvcs/IFRService/FactoryDef_i.h"
 
-ACE_RCSID (IFRService,
-           FactoryDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_FactoryDef_i::TAO_FactoryDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_FactoryDef_i::TAO_FactoryDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
     TAO_OperationDef_i (repo)
diff --git a/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
index ea69e2420e7..4bd3c1cdfa9 100644
--- a/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
@@ -3,11 +3,6 @@
 #include "orbsvcs/IFRService/Repository_i.h"
 #include "orbsvcs/IFRService/FinderDef_i.h"
 
-ACE_RCSID (IFRService,
-           FinderDef_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_FinderDef_i::TAO_FinderDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
index 0a027ade496..d6595766ee6 100644
--- a/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
@@ -3,10 +3,6 @@
 #include "orbsvcs/IFRService/Repository_i.h"
 #include "orbsvcs/IFRService/FixedDef_i.h"
 
-ACE_RCSID (IFRService,
-           FixedDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_FixedDef_i::TAO_FixedDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
index 7e8838fdee0..04f1a001796 100644
--- a/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
@@ -12,12 +12,6 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           HomeDef_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_HomeDef_i::TAO_HomeDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
index c1252455fe1..fc8b9f2a2d2 100644
--- a/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
@@ -52,119 +52,88 @@ public:
   virtual ~TAO_HomeDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (
-    );
+  virtual CORBA::DefinitionKind def_kind (void);
 
   /// Remove the repository entry.
-  virtual void destroy (
-    );
+  virtual void destroy (void);
 
-  virtual void destroy_i (
-    );
+  virtual void destroy_i (void);
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe (
-    );
+  virtual CORBA::Contained::Description *describe (void);
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i (
-    );
+  virtual CORBA::Contained::Description *describe_i (void);
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type (
-    );
+  virtual CORBA::TypeCode_ptr type (void);
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type_i (
-    );
+  virtual CORBA::TypeCode_ptr type_i (void);
 
-  virtual CORBA::ComponentIR::HomeDef_ptr base_home (
-    );
+  virtual CORBA::ComponentIR::HomeDef_ptr base_home (void);
 
-  CORBA::ComponentIR::HomeDef_ptr base_home_i (
-    );
+  CORBA::ComponentIR::HomeDef_ptr base_home_i (void);
 
-  virtual void base_home (
-      CORBA::ComponentIR::HomeDef_ptr base_home
-    );
+  virtual void base_home (CORBA::ComponentIR::HomeDef_ptr base_home);
 
-  void base_home_i (
-      CORBA::ComponentIR::HomeDef_ptr base_home
-    );
+  void base_home_i (CORBA::ComponentIR::HomeDef_ptr base_home);
 
-  virtual CORBA::InterfaceDefSeq *supported_interfaces (
-    );
+  virtual CORBA::InterfaceDefSeq *supported_interfaces (void);
 
-  CORBA::InterfaceDefSeq *supported_interfaces_i (
-    );
+  CORBA::InterfaceDefSeq *supported_interfaces_i (void);
 
   virtual void supported_interfaces (
-      const CORBA::InterfaceDefSeq &supported_interfaces
-    );
+      const CORBA::InterfaceDefSeq &supported_interfaces);
 
   void supported_interfaces_i (
-      const CORBA::InterfaceDefSeq &supported_interfaces
-    );
+      const CORBA::InterfaceDefSeq &supported_interfaces);
 
-  virtual CORBA::ComponentIR::ComponentDef_ptr managed_component (
-    );
+  virtual CORBA::ComponentIR::ComponentDef_ptr managed_component (void);
 
-  CORBA::ComponentIR::ComponentDef_ptr managed_component_i (
-    );
+  CORBA::ComponentIR::ComponentDef_ptr managed_component_i (void);
 
   virtual void managed_component (
-      CORBA::ComponentIR::ComponentDef_ptr managed_component
-    );
+      CORBA::ComponentIR::ComponentDef_ptr managed_component);
 
   void managed_component_i (
-      CORBA::ComponentIR::ComponentDef_ptr managed_component
-    );
+      CORBA::ComponentIR::ComponentDef_ptr managed_component);
 
-  virtual CORBA::ValueDef_ptr primary_key (
-    );
+  virtual CORBA::ValueDef_ptr primary_key (void);
 
-  CORBA::ValueDef_ptr primary_key_i (
-    );
+  CORBA::ValueDef_ptr primary_key_i (void);
 
-  virtual void primary_key (
-      CORBA::ValueDef_ptr primary_key
-    );
+  virtual void primary_key (CORBA::ValueDef_ptr primary_key);
 
-  void primary_key_i (
-      CORBA::ValueDef_ptr primary_key
-    );
+  void primary_key_i (CORBA::ValueDef_ptr primary_key);
 
   virtual CORBA::ComponentIR::FactoryDef_ptr create_factory (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::ParDescriptionSeq &params,
-      const CORBA::ExceptionDefSeq &exceptions
-    );
+      const CORBA::ExceptionDefSeq &exceptions);
 
   CORBA::ComponentIR::FactoryDef_ptr create_factory_i (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::ParDescriptionSeq &params,
-      const CORBA::ExceptionDefSeq &exceptions
-    );
+      const CORBA::ExceptionDefSeq &exceptions);
 
   virtual CORBA::ComponentIR::FinderDef_ptr create_finder (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::ParDescriptionSeq &params,
-      const CORBA::ExceptionDefSeq &exceptions
-    );
+      const CORBA::ExceptionDefSeq &exceptions);
 
   CORBA::ComponentIR::FinderDef_ptr create_finder_i (
       const char *id,
       const char *name,
       const char *version,
       const CORBA::ParDescriptionSeq &params,
-      const CORBA::ExceptionDefSeq &exceptions
-    );
+      const CORBA::ExceptionDefSeq &exceptions);
 
 private:
   // Common code for create_factory_i and create_finder_i.
@@ -175,8 +144,7 @@ private:
       const char *version,
       const char *sub_section,
       const CORBA::ParDescriptionSeq &params,
-      const CORBA::ExceptionDefSeq &exceptions
-    );
+      const CORBA::ExceptionDefSeq &exceptions);
 
   void fill_op_desc_seq (ACE_Configuration_Section_Key &key,
                          CORBA::OpDescriptionSeq &ods,
diff --git a/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp b/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
index 83c64aff90e..7bf02f0ae7a 100644
--- a/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
@@ -2,11 +2,6 @@
 
 #include "orbsvcs/IFRService/IDLType_i.h"
 
-ACE_RCSID (IFRService, 
-           IDLType_i, 
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IDLType_i::TAO_IDLType_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
index bd51a20b575..b822ade33df 100644
--- a/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+++ b/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
@@ -121,7 +121,7 @@ namespace TAO
             CORBA::Contained_ptr,
             CORBA::Contained_var,
             CORBA::Contained_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -179,7 +179,7 @@ namespace TAO
             CORBA::Container_ptr,
             CORBA::Container_var,
             CORBA::Container_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -197,7 +197,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::Container::DescriptionSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -217,7 +217,7 @@ namespace TAO
             CORBA::ModuleDef_ptr,
             CORBA::ModuleDef_var,
             CORBA::ModuleDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -237,7 +237,7 @@ namespace TAO
             CORBA::ConstantDef_ptr,
             CORBA::ConstantDef_var,
             CORBA::ConstantDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -277,7 +277,7 @@ namespace TAO
             CORBA::StructDef_ptr,
             CORBA::StructDef_var,
             CORBA::StructDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -297,7 +297,7 @@ namespace TAO
             CORBA::UnionDef_ptr,
             CORBA::UnionDef_var,
             CORBA::UnionDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -357,7 +357,7 @@ namespace TAO
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -435,7 +435,7 @@ namespace TAO
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -453,7 +453,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ValueDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -473,7 +473,7 @@ namespace TAO
             CORBA::ValueBoxDef_ptr,
             CORBA::ValueBoxDef_var,
             CORBA::ValueBoxDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -493,7 +493,7 @@ namespace TAO
             CORBA::AbstractInterfaceDef_ptr,
             CORBA::AbstractInterfaceDef_var,
             CORBA::AbstractInterfaceDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -511,7 +511,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::AbstractInterfaceDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -531,7 +531,7 @@ namespace TAO
             CORBA::LocalInterfaceDef_ptr,
             CORBA::LocalInterfaceDef_var,
             CORBA::LocalInterfaceDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -551,7 +551,7 @@ namespace TAO
             CORBA::ExtValueDef_ptr,
             CORBA::ExtValueDef_var,
             CORBA::ExtValueDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -569,7 +569,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ContainedSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -587,7 +587,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::StructMemberSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -605,7 +605,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InitializerSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -623,7 +623,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExtInitializerSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -641,7 +641,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::UnionMemberSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -659,7 +659,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::EnumMemberSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -700,7 +700,7 @@ namespace TAO
     : public
         Basic_Arg_Traits_T<
             CORBA::DefinitionKind,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -721,7 +721,7 @@ namespace TAO
             CORBA::Contained_var,
             CORBA::Contained_out,
             TAO::Objref_Traits<CORBA::Contained>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -739,7 +739,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::Contained::Description,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -760,7 +760,7 @@ namespace TAO
             CORBA::Repository_var,
             CORBA::Repository_out,
             TAO::Objref_Traits<CORBA::Repository>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -781,7 +781,7 @@ namespace TAO
             CORBA::Container_var,
             CORBA::Container_out,
             TAO::Objref_Traits<CORBA::Container>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -799,7 +799,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::Container::DescriptionSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -820,7 +820,7 @@ namespace TAO
             CORBA::ModuleDef_var,
             CORBA::ModuleDef_out,
             TAO::Objref_Traits<CORBA::ModuleDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -841,7 +841,7 @@ namespace TAO
             CORBA::ConstantDef_var,
             CORBA::ConstantDef_out,
             TAO::Objref_Traits<CORBA::ConstantDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -862,7 +862,7 @@ namespace TAO
             CORBA::IDLType_var,
             CORBA::IDLType_out,
             TAO::Objref_Traits<CORBA::IDLType>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -883,7 +883,7 @@ namespace TAO
             CORBA::StructDef_var,
             CORBA::StructDef_out,
             TAO::Objref_Traits<CORBA::StructDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -904,7 +904,7 @@ namespace TAO
             CORBA::UnionDef_var,
             CORBA::UnionDef_out,
             TAO::Objref_Traits<CORBA::UnionDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -925,7 +925,7 @@ namespace TAO
             CORBA::EnumDef_var,
             CORBA::EnumDef_out,
             TAO::Objref_Traits<CORBA::EnumDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -946,7 +946,7 @@ namespace TAO
             CORBA::AliasDef_var,
             CORBA::AliasDef_out,
             TAO::Objref_Traits<CORBA::AliasDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -967,7 +967,7 @@ namespace TAO
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
             TAO::Objref_Traits<CORBA::InterfaceDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -985,7 +985,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1006,7 +1006,7 @@ namespace TAO
             CORBA::ExceptionDef_var,
             CORBA::ExceptionDef_out,
             TAO::Objref_Traits<CORBA::ExceptionDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1027,7 +1027,7 @@ namespace TAO
             CORBA::NativeDef_var,
             CORBA::NativeDef_out,
             TAO::Objref_Traits<CORBA::NativeDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1048,7 +1048,7 @@ namespace TAO
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
             TAO::Objref_Traits<CORBA::ValueDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1066,7 +1066,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1087,7 +1087,7 @@ namespace TAO
             CORBA::ValueBoxDef_var,
             CORBA::ValueBoxDef_out,
             TAO::Objref_Traits<CORBA::ValueBoxDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1108,7 +1108,7 @@ namespace TAO
             CORBA::AbstractInterfaceDef_var,
             CORBA::AbstractInterfaceDef_out,
             TAO::Objref_Traits<CORBA::AbstractInterfaceDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1126,7 +1126,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::AbstractInterfaceDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1147,7 +1147,7 @@ namespace TAO
             CORBA::LocalInterfaceDef_var,
             CORBA::LocalInterfaceDef_out,
             TAO::Objref_Traits<CORBA::LocalInterfaceDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1168,7 +1168,7 @@ namespace TAO
             CORBA::ExtValueDef_var,
             CORBA::ExtValueDef_out,
             TAO::Objref_Traits<CORBA::ExtValueDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1186,7 +1186,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContainedSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1204,7 +1204,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::StructMemberSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1222,7 +1222,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1240,7 +1240,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1258,7 +1258,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::UnionMemberSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1276,7 +1276,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::EnumMemberSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
diff --git a/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp b/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
index eb850447fe4..003a4e8aadf 100644
--- a/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
+++ b/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:683
 
 #ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_BASES_T_CPP_
diff --git a/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
index 9d26126d9b6..fee74e54747 100644
--- a/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+++ b/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
@@ -101,7 +101,7 @@ namespace TAO
     : public
         Basic_SArg_Traits_T<
             CORBA::DefinitionKind,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -121,7 +121,7 @@ namespace TAO
             CORBA::Contained_ptr,
             CORBA::Contained_var,
             CORBA::Contained_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -141,7 +141,7 @@ namespace TAO
             CORBA::Repository_ptr,
             CORBA::Repository_var,
             CORBA::Repository_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -161,7 +161,7 @@ namespace TAO
             CORBA::Container_ptr,
             CORBA::Container_var,
             CORBA::Container_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -181,7 +181,7 @@ namespace TAO
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
             CORBA::IDLType_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -199,7 +199,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InterfaceDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -217,7 +217,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::StructMemberSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -235,7 +235,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExcDescriptionSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -253,7 +253,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::UnionMemberSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -271,7 +271,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::EnumMemberSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -291,7 +291,7 @@ namespace TAO
             CORBA::PrimitiveDef_ptr,
             CORBA::PrimitiveDef_var,
             CORBA::PrimitiveDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -311,7 +311,7 @@ namespace TAO
             CORBA::StringDef_ptr,
             CORBA::StringDef_var,
             CORBA::StringDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -331,7 +331,7 @@ namespace TAO
             CORBA::SequenceDef_ptr,
             CORBA::SequenceDef_var,
             CORBA::SequenceDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -351,7 +351,7 @@ namespace TAO
             CORBA::ArrayDef_ptr,
             CORBA::ArrayDef_var,
             CORBA::ArrayDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -371,7 +371,7 @@ namespace TAO
             CORBA::WstringDef_ptr,
             CORBA::WstringDef_var,
             CORBA::WstringDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -391,7 +391,7 @@ namespace TAO
             CORBA::FixedDef_ptr,
             CORBA::FixedDef_var,
             CORBA::FixedDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -409,7 +409,7 @@ namespace TAO
     : public
         Basic_SArg_Traits_T<
             CORBA::PrimitiveKind,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -427,7 +427,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExceptionDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -445,7 +445,7 @@ namespace TAO
     : public
         Basic_SArg_Traits_T<
             CORBA::AttributeMode,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -465,7 +465,7 @@ namespace TAO
             CORBA::AttributeDef_ptr,
             CORBA::AttributeDef_var,
             CORBA::AttributeDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -483,7 +483,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExtAttributeDescription,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -503,7 +503,7 @@ namespace TAO
             CORBA::ExtAttributeDef_ptr,
             CORBA::ExtAttributeDef_var,
             CORBA::ExtAttributeDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -521,7 +521,7 @@ namespace TAO
     : public
         Basic_SArg_Traits_T<
             CORBA::OperationMode,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -539,7 +539,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ParDescriptionSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -557,7 +557,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ContextIdSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -577,7 +577,7 @@ namespace TAO
             CORBA::OperationDef_ptr,
             CORBA::OperationDef_var,
             CORBA::OperationDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -595,7 +595,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InterfaceDef::FullInterfaceDescription,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -613,7 +613,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -654,7 +654,7 @@ namespace TAO
     : public
         Basic_Arg_Traits_T<
             CORBA::DefinitionKind,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -675,7 +675,7 @@ namespace TAO
             CORBA::Contained_var,
             CORBA::Contained_out,
             TAO::Objref_Traits<CORBA::Contained>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -696,7 +696,7 @@ namespace TAO
             CORBA::Repository_var,
             CORBA::Repository_out,
             TAO::Objref_Traits<CORBA::Repository>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -717,7 +717,7 @@ namespace TAO
             CORBA::Container_var,
             CORBA::Container_out,
             TAO::Objref_Traits<CORBA::Container>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -738,7 +738,7 @@ namespace TAO
             CORBA::IDLType_var,
             CORBA::IDLType_out,
             TAO::Objref_Traits<CORBA::IDLType>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -756,7 +756,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -774,7 +774,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::StructMemberSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -792,7 +792,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExcDescriptionSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -810,7 +810,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::UnionMemberSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -828,7 +828,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::EnumMemberSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -849,7 +849,7 @@ namespace TAO
             CORBA::PrimitiveDef_var,
             CORBA::PrimitiveDef_out,
             TAO::Objref_Traits<CORBA::PrimitiveDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -870,7 +870,7 @@ namespace TAO
             CORBA::StringDef_var,
             CORBA::StringDef_out,
             TAO::Objref_Traits<CORBA::StringDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -891,7 +891,7 @@ namespace TAO
             CORBA::SequenceDef_var,
             CORBA::SequenceDef_out,
             TAO::Objref_Traits<CORBA::SequenceDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -912,7 +912,7 @@ namespace TAO
             CORBA::ArrayDef_var,
             CORBA::ArrayDef_out,
             TAO::Objref_Traits<CORBA::ArrayDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -933,7 +933,7 @@ namespace TAO
             CORBA::WstringDef_var,
             CORBA::WstringDef_out,
             TAO::Objref_Traits<CORBA::WstringDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -954,7 +954,7 @@ namespace TAO
             CORBA::FixedDef_var,
             CORBA::FixedDef_out,
             TAO::Objref_Traits<CORBA::FixedDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -972,7 +972,7 @@ namespace TAO
     : public
         Basic_Arg_Traits_T<
             CORBA::PrimitiveKind,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -990,7 +990,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1008,7 +1008,7 @@ namespace TAO
     : public
         Basic_Arg_Traits_T<
             CORBA::AttributeMode,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1029,7 +1029,7 @@ namespace TAO
             CORBA::AttributeDef_var,
             CORBA::AttributeDef_out,
             TAO::Objref_Traits<CORBA::AttributeDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1047,7 +1047,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtAttributeDescription,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1068,7 +1068,7 @@ namespace TAO
             CORBA::ExtAttributeDef_var,
             CORBA::ExtAttributeDef_out,
             TAO::Objref_Traits<CORBA::ExtAttributeDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1086,7 +1086,7 @@ namespace TAO
     : public
         Basic_Arg_Traits_T<
             CORBA::OperationMode,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1104,7 +1104,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1122,7 +1122,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1143,7 +1143,7 @@ namespace TAO
             CORBA::OperationDef_var,
             CORBA::OperationDef_out,
             TAO::Objref_Traits<CORBA::OperationDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1161,7 +1161,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDef::FullInterfaceDescription,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1179,7 +1179,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
diff --git a/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp b/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
index d95b6d48dac..41877f34ad5 100644
--- a/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
+++ b/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:683
 
 #ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_BASICS_T_CPP_
diff --git a/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
index 08f1b3492b4..cdbe6ff4520 100644
--- a/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+++ b/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
@@ -119,7 +119,7 @@ namespace TAO
             CORBA::Repository_ptr,
             CORBA::Repository_var,
             CORBA::Repository_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -139,7 +139,7 @@ namespace TAO
             CORBA::Container_ptr,
             CORBA::Container_var,
             CORBA::Container_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -159,7 +159,7 @@ namespace TAO
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
             CORBA::IDLType_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -177,7 +177,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InterfaceDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -195,7 +195,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ValueDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -213,7 +213,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InitializerSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -231,7 +231,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExtInitializerSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -249,7 +249,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExceptionDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -267,7 +267,7 @@ namespace TAO
     : public
         Basic_SArg_Traits_T<
             CORBA::OperationMode,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -285,7 +285,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ParDescriptionSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -303,7 +303,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ContextIdSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -323,7 +323,7 @@ namespace TAO
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -343,7 +343,7 @@ namespace TAO
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -363,7 +363,7 @@ namespace TAO
             CORBA::ComponentIR::ComponentDef_ptr,
             CORBA::ComponentIR::ComponentDef_var,
             CORBA::ComponentIR::ComponentDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -383,7 +383,7 @@ namespace TAO
             CORBA::ComponentIR::HomeDef_ptr,
             CORBA::ComponentIR::HomeDef_var,
             CORBA::ComponentIR::HomeDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -403,7 +403,7 @@ namespace TAO
             CORBA::ComponentIR::EventDef_ptr,
             CORBA::ComponentIR::EventDef_var,
             CORBA::ComponentIR::EventDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -423,7 +423,7 @@ namespace TAO
             CORBA::ComponentIR::ProvidesDef_ptr,
             CORBA::ComponentIR::ProvidesDef_var,
             CORBA::ComponentIR::ProvidesDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -443,7 +443,7 @@ namespace TAO
             CORBA::ComponentIR::UsesDef_ptr,
             CORBA::ComponentIR::UsesDef_var,
             CORBA::ComponentIR::UsesDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -463,7 +463,7 @@ namespace TAO
             CORBA::ComponentIR::EmitsDef_ptr,
             CORBA::ComponentIR::EmitsDef_var,
             CORBA::ComponentIR::EmitsDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -483,7 +483,7 @@ namespace TAO
             CORBA::ComponentIR::PublishesDef_ptr,
             CORBA::ComponentIR::PublishesDef_var,
             CORBA::ComponentIR::PublishesDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -503,7 +503,7 @@ namespace TAO
             CORBA::ComponentIR::ConsumesDef_ptr,
             CORBA::ComponentIR::ConsumesDef_var,
             CORBA::ComponentIR::ConsumesDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -523,7 +523,7 @@ namespace TAO
             CORBA::ComponentIR::FactoryDef_ptr,
             CORBA::ComponentIR::FactoryDef_var,
             CORBA::ComponentIR::FactoryDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -543,7 +543,7 @@ namespace TAO
             CORBA::ComponentIR::FinderDef_ptr,
             CORBA::ComponentIR::FinderDef_var,
             CORBA::ComponentIR::FinderDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -584,7 +584,7 @@ namespace TAO
     : public
         Basic_Arg_Traits_T<
             CORBA::DefinitionKind,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -605,7 +605,7 @@ namespace TAO
             CORBA::Repository_var,
             CORBA::Repository_out,
             TAO::Objref_Traits<CORBA::Repository>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -626,7 +626,7 @@ namespace TAO
             CORBA::Container_var,
             CORBA::Container_out,
             TAO::Objref_Traits<CORBA::Container>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -647,7 +647,7 @@ namespace TAO
             CORBA::IDLType_var,
             CORBA::IDLType_out,
             TAO::Objref_Traits<CORBA::IDLType>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -665,7 +665,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -683,7 +683,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -701,7 +701,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -719,7 +719,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -737,7 +737,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -755,7 +755,7 @@ namespace TAO
     : public
         Basic_Arg_Traits_T<
             CORBA::OperationMode,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -773,7 +773,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -791,7 +791,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -812,7 +812,7 @@ namespace TAO
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
             TAO::Objref_Traits<CORBA::InterfaceDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -833,7 +833,7 @@ namespace TAO
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
             TAO::Objref_Traits<CORBA::ValueDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -854,7 +854,7 @@ namespace TAO
             CORBA::ComponentIR::ComponentDef_var,
             CORBA::ComponentIR::ComponentDef_out,
             TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -875,7 +875,7 @@ namespace TAO
             CORBA::ComponentIR::HomeDef_var,
             CORBA::ComponentIR::HomeDef_out,
             TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -896,7 +896,7 @@ namespace TAO
             CORBA::ComponentIR::EventDef_var,
             CORBA::ComponentIR::EventDef_out,
             TAO::Objref_Traits<CORBA::ComponentIR::EventDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -917,7 +917,7 @@ namespace TAO
             CORBA::ComponentIR::ProvidesDef_var,
             CORBA::ComponentIR::ProvidesDef_out,
             TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -938,7 +938,7 @@ namespace TAO
             CORBA::ComponentIR::UsesDef_var,
             CORBA::ComponentIR::UsesDef_out,
             TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -959,7 +959,7 @@ namespace TAO
             CORBA::ComponentIR::EmitsDef_var,
             CORBA::ComponentIR::EmitsDef_out,
             TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -980,7 +980,7 @@ namespace TAO
             CORBA::ComponentIR::PublishesDef_var,
             CORBA::ComponentIR::PublishesDef_out,
             TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1001,7 +1001,7 @@ namespace TAO
             CORBA::ComponentIR::ConsumesDef_var,
             CORBA::ComponentIR::ConsumesDef_out,
             TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1022,7 +1022,7 @@ namespace TAO
             CORBA::ComponentIR::FactoryDef_var,
             CORBA::ComponentIR::FactoryDef_out,
             TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -1043,7 +1043,7 @@ namespace TAO
             CORBA::ComponentIR::FinderDef_var,
             CORBA::ComponentIR::FinderDef_out,
             TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
diff --git a/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp b/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
index 1944c42347d..0dfc2fdd182 100644
--- a/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
+++ b/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:683
 
 #ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_COMPONENTSS_T_CPP_
diff --git a/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
index 6a1b674154a..582234ac51d 100644
--- a/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+++ b/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
@@ -99,7 +99,7 @@ namespace TAO
     : public
         Basic_SArg_Traits_T<
             CORBA::DefinitionKind,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -119,7 +119,7 @@ namespace TAO
             CORBA::Repository_ptr,
             CORBA::Repository_var,
             CORBA::Repository_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -139,7 +139,7 @@ namespace TAO
             CORBA::Container_ptr,
             CORBA::Container_var,
             CORBA::Container_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -159,7 +159,7 @@ namespace TAO
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
             CORBA::IDLType_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -177,7 +177,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InterfaceDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -195,7 +195,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ValueDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -213,7 +213,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InitializerSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -231,7 +231,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExtInitializerSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -249,7 +249,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExceptionDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -267,7 +267,7 @@ namespace TAO
     : public
         Basic_SArg_Traits_T<
             CORBA::AttributeMode,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -287,7 +287,7 @@ namespace TAO
             CORBA::AttributeDef_ptr,
             CORBA::AttributeDef_var,
             CORBA::AttributeDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -307,7 +307,7 @@ namespace TAO
             CORBA::ExtAttributeDef_ptr,
             CORBA::ExtAttributeDef_var,
             CORBA::ExtAttributeDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -325,7 +325,7 @@ namespace TAO
     : public
         Basic_SArg_Traits_T<
             CORBA::OperationMode,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -343,7 +343,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ParDescriptionSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -361,7 +361,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ContextIdSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -381,7 +381,7 @@ namespace TAO
             CORBA::OperationDef_ptr,
             CORBA::OperationDef_var,
             CORBA::OperationDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -401,7 +401,7 @@ namespace TAO
             CORBA::ValueMemberDef_ptr,
             CORBA::ValueMemberDef_var,
             CORBA::ValueMemberDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -421,7 +421,7 @@ namespace TAO
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -439,7 +439,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ValueDef::FullValueDescription,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -457,7 +457,7 @@ namespace TAO
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExtValueDef::ExtFullValueDescription,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -498,7 +498,7 @@ namespace TAO
     : public
         Basic_Arg_Traits_T<
             CORBA::DefinitionKind,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -519,7 +519,7 @@ namespace TAO
             CORBA::Repository_var,
             CORBA::Repository_out,
             TAO::Objref_Traits<CORBA::Repository>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -540,7 +540,7 @@ namespace TAO
             CORBA::Container_var,
             CORBA::Container_out,
             TAO::Objref_Traits<CORBA::Container>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -561,7 +561,7 @@ namespace TAO
             CORBA::IDLType_var,
             CORBA::IDLType_out,
             TAO::Objref_Traits<CORBA::IDLType>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -579,7 +579,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -597,7 +597,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -615,7 +615,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -633,7 +633,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -651,7 +651,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -669,7 +669,7 @@ namespace TAO
     : public
         Basic_Arg_Traits_T<
             CORBA::AttributeMode,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -690,7 +690,7 @@ namespace TAO
             CORBA::AttributeDef_var,
             CORBA::AttributeDef_out,
             TAO::Objref_Traits<CORBA::AttributeDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -711,7 +711,7 @@ namespace TAO
             CORBA::ExtAttributeDef_var,
             CORBA::ExtAttributeDef_out,
             TAO::Objref_Traits<CORBA::ExtAttributeDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -729,7 +729,7 @@ namespace TAO
     : public
         Basic_Arg_Traits_T<
             CORBA::OperationMode,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -747,7 +747,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -765,7 +765,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -786,7 +786,7 @@ namespace TAO
             CORBA::OperationDef_var,
             CORBA::OperationDef_out,
             TAO::Objref_Traits<CORBA::OperationDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -807,7 +807,7 @@ namespace TAO
             CORBA::ValueMemberDef_var,
             CORBA::ValueMemberDef_out,
             TAO::Objref_Traits<CORBA::ValueMemberDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -828,7 +828,7 @@ namespace TAO
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
             TAO::Objref_Traits<CORBA::ValueDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -846,7 +846,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDef::FullValueDescription,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
@@ -864,7 +864,7 @@ namespace TAO
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtValueDef::ExtFullValueDescription,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
diff --git a/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp b/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
index 9bd6f99cb35..b84c9e4a9f1 100644
--- a/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
+++ b/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:683
 
 #ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_EXTENDEDS_T_CPP_
diff --git a/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
index 152fd3098d1..eacb3615531 100644
--- a/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
+++ b/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
@@ -14,10 +14,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Argv_Type_Converter.h"
 
-ACE_RCSID (IFR_Service,
-           IFR_Service_Loader,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IFR_Service_Loader::TAO_IFR_Service_Loader (void)
@@ -37,20 +33,15 @@ TAO_IFR_Service_Loader::init (int argc,
   try
     {
       // Copy command line parameter.
-      ACE_Argv_Type_Converter command_line (argc,
-                                            argv);
+      ACE_Argv_Type_Converter command_line (argc, argv);
 
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (command_line.get_argc (),
-                         command_line.get_ASCII_argv (),
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       // This function call initializes the IFR_Service Service
       CORBA::Object_var object =
-        this->create_object (orb.in (),
-                             command_line.get_argc (),
-                             command_line.get_TCHAR_argv ());
+        this->create_object (orb.in (), argc, argv);
     }
   catch (const CORBA::Exception&)
     {
diff --git a/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index 28accc13147..25a9f53f62f 100644
--- a/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -18,10 +18,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_fcntl.h"
 
-ACE_RCSID (IFR_Service,
-           IFR_Service,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Repository_i *TAO_IFR_Service_Utils::repo_ = 0;
@@ -352,11 +348,11 @@ TAO_IFR_Server::create_repository (void)
                                           repo_ref);
 
   // Write our IOR to a file.
-  
+
   FILE *output_file_ =
     ACE_OS::fopen (OPTIONS::instance ()->ior_output_file (),
                    ACE_TEXT ("w"));
-                   
+
   if (output_file_ == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -585,7 +581,7 @@ TAO_IFR_Service_Utils::id_exists (const char *id,
 {
   // The repo id must not already exist.
   ACE_TString holder;
-  
+
   if (repo->config ()->get_string_value (repo->repo_ids_key (),
                                          id,
                                          holder)
@@ -791,8 +787,8 @@ TAO_IFR_Service_Utils::valid_creation (
 {
   TAO_IFR_Service_Utils::valid_container (container_kind,
                                           contained_kind);
-     
-  /// IDL modules can be reopened, and thus pre-exist.                                        
+
+  /// IDL modules can be reopened, and thus pre-exist.
   if (contained_kind == CORBA::dk_Module)
     {
       return;
diff --git a/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
index 4add4020c6f..71420458e5e 100644
--- a/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -10,12 +10,6 @@
 #include "tao/PortableServer/POA_Current_Impl.h"
 #include "tao/TSS_Resources.h"
 
-
-ACE_RCSID (IFR_Service,
-           IRObject_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IRObject_i::TAO_IRObject_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
index 6865c8e0262..14f30134bf7 100644
--- a/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
@@ -10,18 +10,12 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           InterfaceAttrExtension_i,
-           "$Id$")
-
 // =====================================================================
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_InterfaceAttrExtension_i::TAO_InterfaceAttrExtension_i (
-    TAO_Repository_i *repo
-  )
+    TAO_Repository_i *repo)
   : TAO_IRObject_i (repo)
 {
 }
diff --git a/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
index f824d563205..ac79f5c8673 100644
--- a/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -9,16 +9,9 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           InterfaceDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_InterfaceDef_i::TAO_InterfaceDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_InterfaceDef_i::TAO_InterfaceDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Container_i (repo),
     TAO_Contained_i (repo),
diff --git a/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h b/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
index 1ba33846076..1b71efa507f 100644
--- a/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
@@ -53,74 +53,53 @@ public:
   virtual ~TAO_InterfaceDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (
-    );
+  virtual CORBA::DefinitionKind def_kind (void);
 
-  virtual void destroy (
-    );
+  virtual void destroy (void);
 
-  virtual void destroy_i (
-    );
+  virtual void destroy_i (void);
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe (
-    );
+  virtual CORBA::Contained::Description *describe (void);
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i (
-    );
+  virtual CORBA::Contained::Description *describe_i (void);
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type (
-    );
+  virtual CORBA::TypeCode_ptr type (void);
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type_i (
-    );
+  virtual CORBA::TypeCode_ptr type_i (void);
 
-  virtual CORBA::InterfaceDefSeq *base_interfaces (
-    );
+  virtual CORBA::InterfaceDefSeq *base_interfaces (void);
 
-  CORBA::InterfaceDefSeq *base_interfaces_i (
-    );
+  CORBA::InterfaceDefSeq *base_interfaces_i (void);
 
-  virtual void base_interfaces (
-      const CORBA::InterfaceDefSeq &base_interfaces
-    );
+  virtual void base_interfaces (const CORBA::InterfaceDefSeq &base_interfaces);
 
-  void base_interfaces_i (
-      const CORBA::InterfaceDefSeq &base_interfaces
-    );
+  void base_interfaces_i (const CORBA::InterfaceDefSeq &base_interfaces);
 
-  virtual CORBA::Boolean is_a (
-      const char *interface_id
-    );
+  virtual CORBA::Boolean is_a (const char *interface_id);
 
-  CORBA::Boolean is_a_i (
-      const char *interface_id
-    );
+  CORBA::Boolean is_a_i (const char *interface_id);
 
-  virtual CORBA::InterfaceDef::FullInterfaceDescription *describe_interface (
-    );
+  virtual CORBA::InterfaceDef::FullInterfaceDescription *describe_interface ();
 
-  CORBA::InterfaceDef::FullInterfaceDescription *describe_interface_i (
-    );
+  CORBA::InterfaceDef::FullInterfaceDescription *describe_interface_i (void);
 
   virtual CORBA::AttributeDef_ptr create_attribute (
       const char *id,
       const char *name,
       const char *version,
       CORBA::IDLType_ptr type,
-      CORBA::AttributeMode mode
-    );
+      CORBA::AttributeMode mode);
 
   CORBA::AttributeDef_ptr create_attribute_i (
       const char *id,
       const char *name,
       const char *version,
       CORBA::IDLType_ptr type,
-      CORBA::AttributeMode mode
-    );
+      CORBA::AttributeMode mode);
 
   virtual CORBA::OperationDef_ptr create_operation (
       const char *id,
@@ -130,8 +109,7 @@ public:
       CORBA::OperationMode mode,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
-      const CORBA::ContextIdSeq &contexts
-    );
+      const CORBA::ContextIdSeq &contexts);
 
   CORBA::OperationDef_ptr create_operation_i (
       const char *id,
@@ -141,16 +119,14 @@ public:
       CORBA::OperationMode mode,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
-      const CORBA::ContextIdSeq &contexts
-    );
+      const CORBA::ContextIdSeq &contexts);
 
   /// Gathers the attributes and operations of all the ancestors.
   void interface_contents (
       ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue,
       ACE_Unbounded_Queue<ACE_TString> &path_queue,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited
-    );
+      CORBA::Boolean exclude_inherited);
 
   /// Called from TAO_IFR_Service_Utils::name_exists() when we
   /// are in a list of supported interfaces.
@@ -159,27 +135,23 @@ public:
   /// Depth-first traversal of the inheritance tree to get all the
   /// attributes.
   void inherited_attributes (
-      ACE_Unbounded_Queue<ACE_Configuration_Section_Key> &key_queue
-    );
+      ACE_Unbounded_Queue<ACE_Configuration_Section_Key> &key_queue);
 
   /// Depth-first traversal of the inheritance tree to get all the
   /// operations.
   void inherited_operations (
-      ACE_Unbounded_Queue<ACE_Configuration_Section_Key> &key_queue
-    );
+      ACE_Unbounded_Queue<ACE_Configuration_Section_Key> &key_queue);
 
 private:
   /// Depth-first traversal of the inheritance tree to get all
   /// the base interfaces.
   void base_interfaces_recursive (
       ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue,
-      ACE_Unbounded_Queue<ACE_TString> &path_queue
-    );
+      ACE_Unbounded_Queue<ACE_TString> &path_queue);
 
   /// When creating a new attribute, check for a clash with an inherited
   /// attribute name.
-  void check_inherited (const char *name,
-                        CORBA::DefinitionKind kind);
+  void check_inherited (const char *name, CORBA::DefinitionKind kind);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
index 31eeced9bf2..23a9aaaf2f1 100644
--- a/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
@@ -3,15 +3,9 @@
 #include "orbsvcs/IFRService/LocalInterfaceDef_i.h"
 #include "orbsvcs/IFRService/Repository_i.h"
 
-ACE_RCSID (IFRService,
-           LocalInterfaceDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LocalInterfaceDef_i::TAO_LocalInterfaceDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_LocalInterfaceDef_i::TAO_LocalInterfaceDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Container_i (repo),
     TAO_Contained_i (repo),
diff --git a/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
index 2a31620dd97..a7da3cafef2 100644
--- a/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
@@ -5,12 +5,6 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           ModuleDef_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ModuleDef_i::TAO_ModuleDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
index d8d76b25cce..b7d0b53a7c5 100644
--- a/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
@@ -5,12 +5,6 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           NativeDef_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_NativeDef_i::TAO_NativeDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/NativeDef_i.h b/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
index c0ddcdecf43..05465af6784 100644
--- a/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
@@ -32,16 +32,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Represents an OMG IDL native definition.
+ */
 class TAO_IFRService_Export TAO_NativeDef_i : public virtual TAO_TypedefDef_i
 {
 public:
-  // = TITLE
-  //    TAO_NativeDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an OMG IDL native definition.
-  //
-public:
   /// Constructor
   TAO_NativeDef_i (TAO_Repository_i *repo);
 
diff --git a/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
index 0485f035d34..9048059af33 100644
--- a/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
@@ -9,11 +9,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           OperationDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_OperationDef_i::TAO_OperationDef_i (
diff --git a/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
index 443ddf4d951..8057cb13292 100644
--- a/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
@@ -3,15 +3,9 @@
 #include "orbsvcs/IFRService/Repository_i.h"
 #include "orbsvcs/IFRService/PrimitiveDef_i.h"
 
-ACE_RCSID (IFRService,
-           PrimitiveDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_PrimitiveDef_i::TAO_PrimitiveDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_PrimitiveDef_i::TAO_PrimitiveDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_IDLType_i (repo)
 {
diff --git a/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
index 3db08a3d7f6..866e45d72c7 100644
--- a/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
@@ -8,15 +8,7 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           ProvidesDef_i,
-           "$Id$")
-
-
-TAO_ProvidesDef_i::TAO_ProvidesDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_ProvidesDef_i::TAO_ProvidesDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo)
 {
diff --git a/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
index a41a77b49df..a56cdb69f33 100644
--- a/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
@@ -4,13 +4,7 @@
 #include "orbsvcs/IFRService/PublishesDef_i.h"
 #include "orbsvcs/IFRService/Repository_i.h"
 
-ACE_RCSID (IFRService,
-           PublishesDef_i,
-           "$Id$")
-
-TAO_PublishesDef_i::TAO_PublishesDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_PublishesDef_i::TAO_PublishesDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
     TAO_EventPortDef_i (repo)
diff --git a/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
index 89f245d6467..68d5dfb8c99 100644
--- a/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
@@ -31,16 +31,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Represents the definition of an event that is published
+ * by a component.
+ */
 class TAO_IFRService_Export TAO_PublishesDef_i
   : public virtual TAO_EventPortDef_i
 {
-  // = TITLE
-  //    TAO_PublishesDef_i
-  //
-  // = DESCRIPTION
-  //    Represents the definition of an event that is published
-  //    by a component.
-  //
 public:
   /// Constructor
     TAO_PublishesDef_i (TAO_Repository_i *repo);
diff --git a/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp b/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp
index a6e4c6a6051..1afe5aa9f03 100644
--- a/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp
@@ -3,11 +3,6 @@
 #include "orbsvcs/IFRService/RecursDef_i.h"
 
 
-ACE_RCSID (IFRService,
-           RecursDef_i,
-           "RecursDef_i.cpp,v 1.1 2004/10/18 09:00:00 SMA Exp")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //-----------------------------------------------------------------------------
diff --git a/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index 2614268b0b7..7c21b9d2b84 100644
--- a/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -13,11 +13,6 @@
 #include "ace/Lock_Adapter_T.h"
 #include "ace/SString.h"
 
-ACE_RCSID (IFR_Service,
-           Repository_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb,
diff --git a/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
index d91db54a12d..ebcb39f0971 100644
--- a/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
@@ -7,16 +7,9 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           SequenceDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_SequenceDef_i::TAO_SequenceDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_SequenceDef_i::TAO_SequenceDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_IDLType_i (repo)
 {
diff --git a/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
index ff0658e0d68..3cf74f3419e 100644
--- a/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
@@ -5,11 +5,6 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           StringDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_StringDef_i::TAO_StringDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
index 81ac09e3c46..746c02d3d3b 100644
--- a/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
@@ -8,11 +8,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           StructDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_StructDef_i::TAO_StructDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
index 676a6edffc4..21ce6101074 100644
--- a/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
@@ -5,16 +5,9 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           TypedefDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_TypedefDef_i::TAO_TypedefDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_TypedefDef_i::TAO_TypedefDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
     TAO_IDLType_i (repo)
diff --git a/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
index 49d896fce26..b8f7c8693fe 100644
--- a/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -11,11 +11,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           UnionDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UnionDef_i::TAO_UnionDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
index b99bc7dceb6..d4d3755be87 100644
--- a/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
@@ -33,15 +33,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Represents an OMG IDL union definition.
+ */
 class TAO_IFRService_Export TAO_UnionDef_i : public virtual TAO_TypedefDef_i,
                                              public virtual TAO_Container_i
 {
-  // = TITLE
-  //    TAO_UnionDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an OMG IDL union definition.
-  //
 public:
   /// Constructor
   TAO_UnionDef_i (TAO_Repository_i *repo);
diff --git a/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
index 983fc16f60d..e61129af886 100644
--- a/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
@@ -7,11 +7,6 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           UsesDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UsesDef_i::TAO_UsesDef_i (TAO_Repository_i *repo)
diff --git a/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
index b8d4422d08c..f26ac872e2b 100644
--- a/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
@@ -7,11 +7,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           ValueBoxDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ValueBoxDef_i::TAO_ValueBoxDef_i (
diff --git a/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
index 5a9419312bd..6c7ad6d7266 100644
--- a/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
+++ b/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
@@ -32,15 +32,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * Represents an value box definition.
+ */
 class TAO_IFRService_Export TAO_ValueBoxDef_i : public virtual TAO_TypedefDef_i
 {
 public:
-  // = TITLE
-  //    TAO_ValueBoxDef_i
-  //
-  // = DESCRIPTION
-  //    Represents an value box definition.
-  //
 public:
   /// Constructor
   TAO_ValueBoxDef_i (TAO_Repository_i *repo);
@@ -49,30 +46,23 @@ public:
   virtual ~TAO_ValueBoxDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind ()
-;
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type ()
-;
+  virtual CORBA::TypeCode_ptr type ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type_i ()
-;
+  virtual CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::IDLType_ptr original_type_def ()
-;
+  virtual CORBA::IDLType_ptr original_type_def ();
 
-  CORBA::IDLType_ptr original_type_def_i ()
-;
+  CORBA::IDLType_ptr original_type_def_i ();
 
   virtual void original_type_def (
-      CORBA::IDLType_ptr original_type_def)
-;
+      CORBA::IDLType_ptr original_type_def);
 
   void original_type_def_i (
-      CORBA::IDLType_ptr original_type_def)
-;
+      CORBA::IDLType_ptr original_type_def);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
index ef2dd7b740b..e03411570f4 100644
--- a/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
@@ -9,11 +9,6 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           ValueDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ValueDef_i::TAO_ValueDef_i (TAO_Repository_i *repo)
@@ -741,7 +736,7 @@ TAO_ValueDef_i::is_a_i (const char *id)
     this->repo_->config ()->get_string_value (this->section_key_,
                                               "base_value",
                                               holder);
-                                            
+
   if (status == 0)
     {
       ACE_Configuration_Section_Key base_key;
@@ -1276,7 +1271,7 @@ TAO_ValueDef_i::describe_value_i (void)
   status = this->repo_->config ()->get_string_value (this->section_key_,
                                                      "base_value",
                                                      holder);
-                                                     
+
   if (status == 0)
     {
       ACE_Configuration_Section_Key base_key;
@@ -1288,8 +1283,8 @@ TAO_ValueDef_i::describe_value_i (void)
                                                 "id",
                                             holder);
     }
-  
-  // If status isn't 0, then holder will contain empty string anyway.  
+
+  // If status isn't 0, then holder will contain empty string anyway.
   fv_desc->base_value = holder.fast_rep ();
   fv_desc->type = this->type_i ();
 
@@ -1692,7 +1687,7 @@ TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc)
     this->repo_->config ()->get_string_value (this->section_key_,
                                               "base_value",
                                               holder);
-                                              
+
   if (status == 0)
     {
       ACE_Configuration_Section_Key base_key;
@@ -1704,8 +1699,8 @@ TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc)
                                                 "id",
                                                 holder);
     }
-    
-  // If status isn't 0, then holder will be empty anyway.  
+
+  // If status isn't 0, then holder will be empty anyway.
   desc.base_value = holder.fast_rep ();
 }
 
diff --git a/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
index 3403dbd29f7..a0684102f15 100644
--- a/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
@@ -8,16 +8,9 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           ValueMemberDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_ValueMemberDef_i::TAO_ValueMemberDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_ValueMemberDef_i::TAO_ValueMemberDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo)
 {
diff --git a/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
index 7b51625cbc3..5fb533bf8c0 100644
--- a/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
+++ b/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
@@ -5,16 +5,9 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (IFRService,
-           WstringDef_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_WstringDef_i::TAO_WstringDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_WstringDef_i::TAO_WstringDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_IDLType_i (repo)
 {
diff --git a/orbsvcs/orbsvcs/LifeCycleService.idl b/orbsvcs/orbsvcs/LifeCycleService.idl
index 8322d49137e..a0877328af3 100644
--- a/orbsvcs/orbsvcs/LifeCycleService.idl
+++ b/orbsvcs/orbsvcs/LifeCycleService.idl
@@ -1,18 +1,18 @@
-// $Id$
 
-// ============================================================================
-//
-// = FILENAME
-//    LifeCycleService.idl
-//
-// = DESCRIPTION
-//    A generic creation service named lifecycle service using
-//    the GenericFactory interface of the LifeCycle Service specification.
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    LifeCycleService.idl
+ *
+ *  $Id$
+ *
+ *  A generic creation service named lifecycle service using
+ *  the GenericFactory interface of the LifeCycle Service specification.
+ *
+ *
+ *  @author Michael Kircher (mk1@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef TAO_LIFECYCLESERVICE_IDL
 #define TAO_LIFECYCLESERVICE_IDL
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index 96b28757543..099762d2e15 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h"
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_time.h"
@@ -10,10 +12,6 @@
 #include <sys/sysctl.h>
 #endif
 
-ACE_RCSID (LoadBalancing,
-           LB_CPU_Load_Average_Monitor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor (
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index 35d2952619c..e575f720b12 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h"
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_time.h"
@@ -7,10 +9,6 @@
 #include "ace/os_include/os_netdb.h"
 #include "ace/os_include/sys/os_loadavg.h"
 
-ACE_RCSID (LoadBalancing,
-           LB_CPU_Utilization_Monitor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 double calc_cpu_loading (void)
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
index dbac81329a8..f4b24ada9ec 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_ClientComponent.h"
 #include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h"
 
 #include "tao/ORB_Constants.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (LoadBalancing,
-           LB_ClientComponent,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
index 06ef0a6907c..e864c5988d1 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
@@ -1,12 +1,9 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h"
 #include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h"
-
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (LoadBalancing,
-           LB_ClientORBInitializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index 9ea672e8414..ebc3a86b345 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -1,12 +1,8 @@
-#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h"
+// $Id$
 
+#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h"
 #include "orbsvcs/CosLoadBalancingC.h"
 
-
-ACE_RCSID (LoadBalancing,
-           TAO_LB_ClientRequestInterceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
index a5a5e4666ca..41217b5c678 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_Component.h"
 #include "orbsvcs/LoadBalancing/LB_ORBInitializer.h"
 
@@ -5,10 +7,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (LoadBalancing,
-           LB_Component,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index 3b7127dcd43..150cc923d20 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_IORInterceptor.h"
 #include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h"
 #include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
@@ -5,10 +7,6 @@
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (LoadBalancing,
-           LB_IORInterceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_IORInterceptor::TAO_LB_IORInterceptor (
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index f9969b33d6a..b14c5612c23 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_LeastLoaded.h"
 #include "orbsvcs/LoadBalancing/LB_LoadMap.h"
 #include "orbsvcs/LoadBalancing/LB_Random.h"
@@ -10,12 +12,6 @@
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (LoadBalancing,
-           LB_LeastLoaded,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 #include "orbsvcs/LoadBalancing/LB_LeastLoaded.inl"
 #endif /* defined INLINE */
@@ -35,7 +31,7 @@ TAO_LB_LeastLoaded::TAO_LB_LeastLoaded (PortableServer::POA_ptr poa)
 {
   // A load map that retains previous load values at a given location
   // and lock are only needed if dampening is enabled, i.e. non-zero.
-  if (this->dampening_ != 0)
+  if (!ACE::is_equal (this->dampening_, 0.0f))
     {
       ACE_NEW (this->load_map_, TAO_LB_LoadMap (TAO_PG_MAX_LOCATIONS));
 
@@ -262,7 +258,7 @@ TAO_LB_LeastLoaded::analyze_loads (
 */
           // Perform load rebalancing only if the critical threshold
           // was  set.
-          if (this->critical_threshold_ != 0)
+          if (!ACE::is_equal (this->critical_threshold_, 0.0f))
             {
               if (load.value > this->critical_threshold_)
                 {
@@ -349,7 +345,7 @@ TAO_LB_LeastLoaded::get_location (
                        load.value,
                        min_load));
 */
-          if ((this->reject_threshold_ == 0
+          if ((ACE::is_equal (this->reject_threshold_, 0.0f)
                || load.value < this->reject_threshold_)
               && load.value < min_load)
             {
@@ -357,7 +353,7 @@ TAO_LB_LeastLoaded::get_location (
 //                           "**** LOAD == %f\n",
 //                           load.value));
 
-              if (i > 0 && load.value != 0)
+              if (i > 0 && !ACE::is_equal (load.value, 0.0f))
                 {
                   /*
                     percent difference =
@@ -468,7 +464,7 @@ TAO_LB_LeastLoaded::get_location (
         //ACE_DEBUG ((LM_DEBUG, "LOCATED = %u\n", location_index));
         location = locations[location_index];
       }
-      else if (this->reject_threshold_ != 0)
+      else if (!ACE::is_equal (this->reject_threshold_, 0.0f))
         throw CORBA::TRANSIENT ();
 
 //       ACE_DEBUG ((LM_DEBUG, "LOCATION ID == %s\n", location[0].id.in ()));
@@ -539,7 +535,8 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props)
         }
     }
 
-  if (critical_threshold != 0 && reject_threshold != 0
+  if (!ACE::is_equal (critical_threshold, 0.0f)
+      && !ACE::is_equal (reject_threshold, 0.0f)
       && critical_threshold <= reject_threshold)
     throw PortableGroup::InvalidProperty (ct->nam, ct->val);
 
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl b/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl
index e59193f3c6f..6c68ed57ce5 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl
@@ -16,7 +16,7 @@ TAO_LB_LeastLoaded::effective_load (CORBA::Float previous_load,
   CORBA::Float result =
     this->dampening_ * previous_load + (1 - this->dampening_) * new_load;
 
-  ACE_ASSERT (this->tolerance_ != 0);
+  ACE_ASSERT (!ACE::is_equal (this->tolerance_, 0.0f));
 
   // Compute the effective load.
   result /= this->tolerance_;
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
index 75794766a04..14f936db278 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
@@ -1,9 +1,6 @@
-#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
-
+// $Id$
 
-ACE_RCSID (LoadBalancer,
-           LB_LoadAlert,
-           "$Id$")
+#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
 
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/LoadBalancing/LB_LoadAlert.inl"
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
index 0378e9f584e..36c7c466dab 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_LoadAlertInfo.h"
 #include "orbsvcs/PortableGroup/PG_Operators.h"
 
-ACE_RCSID (LoadBalancing,
-           LB_LoadAlertInfo,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_LoadAlertInfo::TAO_LB_LoadAlertInfo (void)
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
index e62191f1258..f111dda9eb8 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
@@ -1,12 +1,8 @@
-#include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h"
+// $Id$
 
+#include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h"
 #include "tao/debug.h"
 
-
-ACE_RCSID (LoadBalancing,
-           LB_LoadAlert_Handler,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void)
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index eea89c9641d..56b5157d4a7 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_LoadAverage.h"
 #include "orbsvcs/LoadBalancing/LB_LoadMap.h"
 #include "orbsvcs/LoadBalancing/LB_Random.h"
@@ -10,12 +12,6 @@
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (LoadBalancing,
-           LB_LoadAverage,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 #include "orbsvcs/LoadBalancing/LB_LoadAverage.inl"
 #endif /* defined INLINE */
@@ -33,7 +29,7 @@ TAO_LB_LoadAverage::TAO_LB_LoadAverage (PortableServer::POA_ptr poa)
 {
   // A load map that retains previous load values at a given location
   // and lock are only needed if dampening is enabled, i.e. non-zero.
-  if (this->dampening_ != 0)
+  if (!ACE::is_equal (this->dampening_, 0.0f))
     {
       ACE_NEW (this->load_map_, TAO_LB_LoadMap (TAO_PG_MAX_LOCATIONS));
 
@@ -103,7 +99,7 @@ TAO_LB_LoadAverage::push_loads (
     {
       ACE_GUARD (TAO_SYNCH_MUTEX, guard, *this->lock_);
 
-      TAO_LB_LoadMap::ENTRY * entry;
+      TAO_LB_LoadMap::ENTRY * entry = 0;
       if (this->load_map_->find (the_location, entry) == 0)
         {
           CosLoadBalancing::Load & previous_load = entry->int_id_;
@@ -277,7 +273,7 @@ TAO_LB_LoadAverage::analyze_loads (
               CORBA::Float percent_diff =
                   (tmp[j].value / avg_load.value) - 1;
 
-              if (tmp[j].value == avg_load.value)
+              if (ACE::is_equal (tmp[j].value, avg_load.value))
               {
                 percent_diff = 0;
               }
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl
index 347374c1a7c..2ea4c81ca02 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl
@@ -15,7 +15,7 @@ TAO_LB_LoadAverage::effective_load (CORBA::Float previous_load,
   CORBA::Float result =
     this->dampening_ * previous_load + (1 - this->dampening_) * new_load;
 
-  ACE_ASSERT (this->tolerance_ != 0);
+  ACE_ASSERT (!ACE::is_equal (this->tolerance_, 0.0f));
 
   // Compute the effective load.
   result /= this->tolerance_;
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index c5987c02967..ce233f9935f 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_LoadManager.h"
 #include "orbsvcs/LoadBalancing/LB_MemberLocator.h"
 #include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h"
@@ -22,11 +24,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (LoadBalancing,
-           LB_LoadManager,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_LoadManager::TAO_LB_LoadManager (int ping_timeout,
@@ -171,7 +168,7 @@ TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
 
-  TAO_LB_LoadAlertMap::ENTRY * entry;
+  TAO_LB_LoadAlertMap::ENTRY * entry = 0;
   if (this->load_alert_map_.find (the_location, entry) == 0)
     {
       TAO_LB_LoadAlertInfo & info = entry->int_id_;
@@ -225,7 +222,7 @@ TAO_LB_LoadManager::disable_alert (const PortableGroup::Location & the_location)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
 
-  TAO_LB_LoadAlertMap::ENTRY * entry;
+  TAO_LB_LoadAlertMap::ENTRY * entry = 0;
   if (this->load_alert_map_.find (the_location, entry) == 0)
     {
       TAO_LB_LoadAlertInfo & info = entry->int_id_;
@@ -308,7 +305,7 @@ TAO_LB_LoadManager::get_load_alert (
                     this->load_alert_lock_,
                     CosLoadBalancing::LoadAlert::_nil ());
 
-  TAO_LB_LoadAlertMap::ENTRY * entry;
+  TAO_LB_LoadAlertMap::ENTRY * entry = 0;
   if (this->load_alert_map_.find (the_location, entry) == 0)
     {
       TAO_LB_LoadAlertInfo & info = entry->int_id_;
@@ -408,7 +405,7 @@ TAO_LB_LoadManager::get_load_monitor (
                     this->monitor_lock_,
                     CosLoadBalancing::LoadMonitor::_nil ());
 
-  TAO_LB_MonitorMap::ENTRY * entry;
+  TAO_LB_MonitorMap::ENTRY * entry = 0;
   if (this->monitor_map_.find (the_location, entry) == 0)
     {
       return
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
index 49d4f1a30d4..835486fbd85 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
@@ -46,7 +46,7 @@ class TAO_LoadBalancing_Export TAO_LB_LoadManager
 public:
 
   /// Constructor.
-  TAO_LB_LoadManager (int ping_timeout, 
+  TAO_LB_LoadManager (int ping_timeout,
                       int ping_interval);
 
   virtual int svc (void);
@@ -356,7 +356,7 @@ private:
   /// necessary for application-controlled object group membership.
   TAO_PG_ObjectGroupManager object_group_manager_;
 
-  /// The PropertyManager that is reponsible for parsing all criteria,
+  /// The PropertyManager that is responsible for parsing all criteria,
   /// and keeping track of property-type_id associations.
   TAO_PG_PropertyManager property_manager_;
 
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index 072a257810c..90dd6c015e4 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_LoadMinimum.h"
 #include "ace/OS_NS_sys_time.h"
 #include "orbsvcs/LoadBalancing/LB_LoadMap.h"
@@ -11,12 +13,6 @@
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (LoadBalancing,
-           LB_LoadMinimum,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 #include "orbsvcs/LoadBalancing/LB_LoadMinimum.inl"
 #endif /* defined INLINE */
@@ -34,7 +30,7 @@ TAO_LB_LoadMinimum::TAO_LB_LoadMinimum (PortableServer::POA_ptr poa)
 {
   // A load map that retains previous load values at a given location
   // and lock are only needed if dampening is enabled, i.e. non-zero.
-  if (this->dampening_ != 0)
+  if (!ACE::is_equal (this->dampening_, 0.0f))
     {
       ACE_NEW (this->load_map_, TAO_LB_LoadMap (TAO_PG_MAX_LOCATIONS));
 
@@ -104,7 +100,7 @@ TAO_LB_LoadMinimum::push_loads (
     {
       ACE_GUARD (TAO_SYNCH_MUTEX, guard, *this->lock_);
 
-      TAO_LB_LoadMap::ENTRY * entry;
+      TAO_LB_LoadMap::ENTRY * entry = 0;
       if (this->load_map_->find (the_location, entry) == 0)
         {
           CosLoadBalancing::Load & previous_load = entry->int_id_;
@@ -266,7 +262,7 @@ TAO_LB_LoadMinimum::analyze_loads (
           total_load.value = total_load.value + load.value;
           tmp[i] = load;
 
-          if ((load.value < min_load) && (load.value != 0))
+          if ((load.value < min_load) && !ACE::is_equal (load.value, 0.0f))
           {
             min_load = load.value;
           }
@@ -320,7 +316,7 @@ TAO_LB_LoadMinimum::analyze_loads (
               CORBA::Float percent_diff =
                 (tmp[j].value / min_load) - 1;
 
-              if (tmp[j].value == min_load)
+              if (ACE::is_equal (tmp[j].value, min_load))
               {
                 percent_diff = 0;
               }
@@ -413,7 +409,7 @@ TAO_LB_LoadMinimum::get_location (
           if (load.value < min_load)
             {
 
-              if (i > 0 && load.value != 0)
+              if (i > 0 && !ACE::is_equal (load.value, 0.0f))
                 {
                   /*
                     percent difference =
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl
index dc120b38783..638e704525b 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl
@@ -15,7 +15,7 @@ TAO_LB_LoadMinimum::effective_load (CORBA::Float previous_load,
   CORBA::Float result =
     this->dampening_ * previous_load + (1 - this->dampening_) * new_load;
 
-  ACE_ASSERT (this->tolerance_ != 0);
+  ACE_ASSERT (!ACE::is_equal (this->tolerance_, 0.0f));
 
   // Compute the effective load.
   result /= this->tolerance_;
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
index f8e89fb7857..74d0e2e4e1d 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
@@ -1,13 +1,10 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_LoadManager.h"
 #include "orbsvcs/LoadBalancing/LB_MemberLocator.h"
 
 #include "tao/debug.h"
 
-
-ACE_RCSID (LoadBalancing,
-           LB_MemberLocator,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_MemberLocator::TAO_LB_MemberLocator (
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
index 81e9373c6e2..17e3f69d17a 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_ORBInitializer.h"
 #include "orbsvcs/LoadBalancing/LB_IORInterceptor.h"
 #include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
@@ -6,11 +8,6 @@
 
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (LoadBalancing,
-           LB_ORBInitializer,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_ORBInitializer::TAO_LB_ORBInitializer (
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index 8ca8ca70b05..4a2b4d8c673 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -1,11 +1,7 @@
-#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h"
-
-ACE_RCSID (LoadBalancing,
-           LB_ObjectReferenceFactory,
-           "$Id$")
+// $Id$
 
+#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h"
 #include "tao/debug.h"
-
 #include "ace/SString.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
index 1b01771d3b1..1e57e25e8bf 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
@@ -1,14 +1,10 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_Pull_Handler.h"
 #include "orbsvcs/LoadBalancing/LB_LoadManager.h"
 
 #include "tao/debug.h"
 
-
-ACE_RCSID (LoadBalancing,
-           LB_Pull_Handler,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_Pull_Handler::TAO_LB_Pull_Handler (void)
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index 2e85283e384..1f34bee74a9 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/LoadBalancing/LB_Random.h"
 
@@ -6,13 +7,9 @@
 #include "ace/OS_NS_time.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (LoadBalancing,
-           LB_Random,
-           "$Id$")
-
-#ifdef ACE_HAS_PTHREADS_STD
+#ifdef ACE_HAS_PTHREADS
 static pthread_once_t tao_lb_once_control = PTHREAD_ONCE_INIT;
-#endif  /* ACE_HAS_PTHREADS_STD */
+#endif  /* ACE_HAS_PTHREADS */
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -144,12 +141,12 @@ TAO_LB_Random::_tao_next_member (
 void
 TAO_LB_Random::init (void)
 {
-#ifdef ACE_HAS_PTHREADS_STD
+#ifdef ACE_HAS_PTHREADS
   (void) ::pthread_once (&::tao_lb_once_control,
                          ::tao_lb_random_init_routine);
 #else
   ::tao_lb_random_init_routine ();
-#endif  /* ACE_HAS_PTHREADS_STD */
+#endif  /* ACE_HAS_PTHREADS */
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index 1fc61e35f72..e1d131551b6 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/LoadBalancing/LB_RoundRobin.h"
 
@@ -7,10 +8,6 @@
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (LoadBalancing,
-           LB_RoundRobin,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_RoundRobin::TAO_LB_RoundRobin (PortableServer::POA_ptr poa)
@@ -104,12 +101,12 @@ TAO_LB_RoundRobin::next_member (
       // based on the previous location list. It may be invalid
       // if the list of locations are changed since then.
       // We need verify if the suggested location is still exist.
-      // if it does, use it. Otherwise we need look the previous 
+      // if it does, use it. Otherwise we need look the previous
       // location backwards one by one until we find an existing
-      // one in current list then use the next location. If not 
+      // one in current list then use the next location. If not
       // find a match, then start with 0 index.
       bool found = false;
-      
+
       for (CORBA::ULong k = i; k > 0 && !found; --k)
       {
         for (CORBA::ULong j = 0; j < len && !found; ++j)
@@ -125,15 +122,15 @@ TAO_LB_RoundRobin::next_member (
             {
               i = j + 1;
             }
-            
+
             found = true;
           }
         }
       }
-     
+
       if (!found)
         i = 0;
-      
+
       if (len <= i)
         i = 0;  // Reset, i.e. wrap around
 
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index ca239bf7a8d..340279af649 100644
--- a/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -1,15 +1,10 @@
+// $Id$
+
 #include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
 #include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
-
 #include "tao/debug.h"
-
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (LoadBalancing,
-           LB_ServerRequestInterceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_ServerRequestInterceptor::TAO_LB_ServerRequestInterceptor (
diff --git a/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index f981da120cb..0b63a8e911a 100644
--- a/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "orbsvcs/Log/BasicLogFactory_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Log,
-           BasicLogFactory_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_BasicLogFactory_i::TAO_BasicLogFactory_i (void)
diff --git a/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index 34b690b93b4..4344c106a94 100644
--- a/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "orbsvcs/Log/BasicLog_i.h"
 
 #include "orbsvcs/Log/LogMgr_i.h"
 
-ACE_RCSID (Log,
-           BasicLog_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_BasicLog_i::TAO_BasicLog_i (CORBA::ORB_ptr orb,
diff --git a/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
index 9cfdcc692e5..148855076df 100644
--- a/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
+++ b/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "orbsvcs/Log/EventLog_i.h"
 #include "orbsvcs/Log/LogMgr_i.h"
 #include "orbsvcs/Log/LogNotification.h"
 
-ACE_RCSID (Log,
-           EventLogConsumer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Event_LogConsumer::TAO_Event_LogConsumer (TAO_EventLog_i *log)
diff --git a/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index 7122a14caaf..824c49bdf1f 100644
--- a/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "orbsvcs/Log/EventLogFactory_i.h"
 #include "orbsvcs/Log/LogNotification.h"
 #include "orbsvcs/Log/EventLogNotification.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Log,
-           EventLogFactory_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EventLogFactory_i::TAO_EventLogFactory_i (void)
diff --git a/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
index 8320ca9f170..7b3607043d0 100644
--- a/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
+++ b/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
@@ -1,12 +1,10 @@
+// $Id$
+
 #include "orbsvcs/Log/LogNotification.h"
 #include "orbsvcs/Log/EventLogNotification.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Log,
-           EventLogNotification,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EventLogNotification::TAO_EventLogNotification (CosEventChannelAdmin::EventChannel_ptr ec)
diff --git a/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index 0da50068a6e..fdfe45cd4b5 100644
--- a/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -1,12 +1,9 @@
+// $Id$
+
 #include "orbsvcs/Log/EventLog_i.h"
 #include "orbsvcs/Log/LogMgr_i.h"
 #include "orbsvcs/Log/LogNotification.h"
 
-ACE_RCSID (Log,
-           EventLog_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb,
diff --git a/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
index 1c4c6de1c49..e12cfa7ca78 100644
--- a/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
+++ b/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
@@ -1,12 +1,10 @@
+// $Id$
+
 #include "orbsvcs/Log/Hash_Iterator_i.h"
 #include "orbsvcs/Log/Log_Constraint_Interpreter.h"
 #include "orbsvcs/Log/Log_Constraint_Visitors.h"
 #include "orbsvcs/DsLogAdminC.h"
 
-ACE_RCSID (Log,
-           Hash_Iterator_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Hash_Iterator_i::TAO_Hash_Iterator_i (
diff --git a/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
index f869551e68c..cbd7728ff8b 100644
--- a/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+++ b/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/Log/LogMgr_i.h"
 #include "orbsvcs/Log/Hash_LogRecordStore.h"
 #include "orbsvcs/Log/Hash_Iterator_i.h"
@@ -10,10 +12,6 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID (Log,
-           Hash_LogRecordStore,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore (
@@ -468,10 +466,12 @@ TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::TimeT from_time,
 #endif
 
   if (how_many >= 0)
-    ACE_OS::sprintf (constraint, "time >= %s", uint64_formating);
+    ACE_OS::sprintf (constraint, "time >= %s",
+                     ACE_TEXT_ALWAYS_CHAR (uint64_formating));
   else
     {
-      ACE_OS::sprintf (constraint, "time < %s", uint64_formating);
+      ACE_OS::sprintf (constraint, "time < %s",
+                       ACE_TEXT_ALWAYS_CHAR (uint64_formating));
       how_many = -(how_many);
     }
 
diff --git a/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
index 6f1825b1ee8..6dfcabcf013 100644
--- a/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
+++ b/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
@@ -1,12 +1,10 @@
+// $Id$
+
 #include "orbsvcs/Log/Hash_LogStore.h"
 #include "orbsvcs/Log/Hash_LogRecordStore.h"
 #include "orbsvcs/Log/LogMgr_i.h"
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (Log,
-           Hash_LogStore,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Hash_LogStore::TAO_Hash_LogStore(TAO_LogMgr_i* logmgr_i)
@@ -133,7 +131,7 @@ TAO_Hash_LogStore::remove (DsLogAdmin::LogId id)
                             lock_,
                             CORBA::INTERNAL ());
 
-  TAO_Hash_LogRecordStore* recordstore;
+  TAO_Hash_LogRecordStore* recordstore = 0;
 
   int retval = this->hash_map_.unbind (id, recordstore);
   if (retval == 0)
diff --git a/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp b/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp
index 3d8882352c6..fb31e17e4de 100644
--- a/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp
+++ b/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "orbsvcs/Log/Hash_Persistence_Strategy.h"
 #include "orbsvcs/Log/Hash_LogStore.h"
 
-ACE_RCSID (Log,
-           Hash_Persistence_Strategy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Hash_Persistence_Strategy::TAO_Hash_Persistence_Strategy()
diff --git a/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index 5062b59046c..1030312d93e 100644
--- a/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -1,9 +1,6 @@
-#include "orbsvcs/Log/Iterator_i.h"
-
-ACE_RCSID (Log,
-           Iterator_i,
-           "$Id$")
+// $Id$
 
+#include "orbsvcs/Log/Iterator_i.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Log/LogActivator.cpp b/orbsvcs/orbsvcs/Log/LogActivator.cpp
index eb1a0542208..e55967a9c6f 100644
--- a/orbsvcs/orbsvcs/Log/LogActivator.cpp
+++ b/orbsvcs/orbsvcs/Log/LogActivator.cpp
@@ -1,8 +1,6 @@
-#include "orbsvcs/Log/LogActivator.h"
+// $Id$
 
-ACE_RCSID (Log,
-           LogActivator,
-           "$Id$")
+#include "orbsvcs/Log/LogActivator.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 #include "orbsvcs/Log/LogMgr_i.h"
diff --git a/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index 9cd4fa5be5e..42be2a77a14 100644
--- a/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/Log/LogMgr_i.h"
 #include "orbsvcs/Log/LogActivator.h"
 #include "ace/Dynamic_Service.h"
@@ -6,11 +8,6 @@
 #include "orbsvcs/Log/LogStore.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Log,
-           LogMgr_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LogMgr_i::TAO_LogMgr_i ()
diff --git a/orbsvcs/orbsvcs/Log/LogNotification.cpp b/orbsvcs/orbsvcs/Log/LogNotification.cpp
index 1c1ea76adc9..86f552fc827 100644
--- a/orbsvcs/orbsvcs/Log/LogNotification.cpp
+++ b/orbsvcs/orbsvcs/Log/LogNotification.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "orbsvcs/Log/LogNotification.h"
 
 #include "orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID (Log,
-           LogNotification,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LogNotification::TAO_LogNotification (void)
diff --git a/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
index 278039ac40e..dfea7195131 100644
--- a/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
+++ b/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
@@ -1,8 +1,6 @@
-#include "orbsvcs/Log/LogRecordStore.h"
+// $Id$
 
-ACE_RCSID (Log,
-           LogRecordStore,
-           "$Id$")
+#include "orbsvcs/Log/LogRecordStore.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp b/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
index 361a2b53ef4..c1dd0b9b418 100644
--- a/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
+++ b/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
@@ -1,12 +1,9 @@
+// $Id$
+
 #include "orbsvcs/Log/Log_Compaction_Handler.h"
 #include "orbsvcs/Log/Log_i.h"
 #include "ace/Reactor.h"
 
-ACE_RCSID (Log,
-           Log_Compaction_Handler,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Log_Compaction_Handler::TAO_Log_Compaction_Handler (ACE_Reactor* reactor,
diff --git a/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
index c509994c379..529e9a2fca1 100644
--- a/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
+++ b/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
@@ -1,11 +1,8 @@
-#include "orbsvcs/Log/Log_Constraint_Interpreter.h"
+// $Id$
 
+#include "orbsvcs/Log/Log_Constraint_Interpreter.h"
 #include "orbsvcs/Log/Log_Constraint_Visitors.h"
 
-ACE_RCSID (Log,
-           Log_Constraint_Interpreter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter (
diff --git a/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index cc0788b558a..b59b3f57166 100644
--- a/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/Log/Log_Constraint_Visitors.h"
 
 #include "ace/ETCL/ETCL_Constraint.h"
@@ -14,10 +16,6 @@
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
-ACE_RCSID (Log,
-           Log_Constraint_Visitors,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRecord &rec)
@@ -44,7 +42,7 @@ TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRec
 
   // Bind an entry for each item in the record's attribute list.
   CORBA::Long len = rec.attr_list.length ();
-  
+
   for (CORBA::Long i = 0; i < len; ++i)
     {
       this->property_lookup_.bind (ACE_CString (rec.attr_list[i].name,
@@ -571,12 +569,12 @@ TAO_Log_Constraint_Visitor::visit_component (
     {
       TAO_ETCL_Literal_Constraint id;
       this->queue_.dequeue_head (id);
-        
+
       CORBA::Any *any_ptr = 0;
       ACE_NEW_RETURN (any_ptr,
                       CORBA::Any,
                       -1);
-                      
+
       any_ptr->replace (id);
       any_ptr->impl ()->_add_ref ();
       this->current_member_ = any_ptr;
@@ -860,18 +858,15 @@ TAO_Log_Constraint_Visitor::visit_binary_op (
               this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
               break;
             case ETCL_LE:
-              //result = left_operand <= right_operand; // Compile error on LynxOS
-              result = left_operand.operator<= (right_operand);
+              result = left_operand <= right_operand;
               this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
               break;
             case ETCL_GT:
-              //result = left_operand > right_operand; // Compile error on LynxOS
-              result = left_operand.operator> (right_operand);
+              result = left_operand > right_operand;
               this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
               break;
             case ETCL_GE:
-              //result = left_operand >= right_operand; // Compile error on LynxOS
-              result = left_operand.operator>= (right_operand);
+              result = left_operand >= right_operand;
               this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
               break;
             case ETCL_EQ:
@@ -879,8 +874,7 @@ TAO_Log_Constraint_Visitor::visit_binary_op (
               this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
               break;
             case ETCL_NE:
-              //result = left_operand != right_operand; // Compile error on LynxOS
-              result = left_operand.operator!= (right_operand);
+              result = left_operand != right_operand;
               this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
               break;
             case ETCL_PLUS:
@@ -962,7 +956,7 @@ TAO_Log_Constraint_Visitor::visit_in (
               ACE_NEW_RETURN (any_ptr,
                               CORBA::Any,
                               -1);
-                              
+
               CORBA::Any_var component = any_ptr;
               component->replace (bag);
               component->impl ()->_add_ref ();
@@ -1263,7 +1257,7 @@ TAO_Log_Constraint_Visitor::simple_type_match (int expr_type,
     default:
       return false;
   }
-  
+
   return true;
 }
 
diff --git a/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp b/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
index bd4affd95c1..d06f2f32ed6 100644
--- a/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
+++ b/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "orbsvcs/Log/Log_Flush_Handler.h"
 #include "orbsvcs/Log/Log_i.h"
 
-ACE_RCSID (Log,
-           Log_Flush_Handler,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Log_Flush_Handler::TAO_Log_Flush_Handler (ACE_Reactor* reactor,
diff --git a/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h b/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
index 9ae1ef978e2..712d43deb0c 100644
--- a/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
+++ b/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
@@ -43,12 +43,12 @@ namespace CORBA
  * @brief Base Strategy for Log / Log Record Storage
  *
  */
-class TAO_Log_Serv_Export TAO_Log_Persistence_Strategy 
+class TAO_Log_Serv_Export TAO_Log_Persistence_Strategy
   : public ACE_Service_Object
 {
 public:
   /// @brief Log Store Factory
-  virtual TAO_LogStore* 
+  virtual TAO_LogStore*
     create_log_store (TAO_LogMgr_i* logmgr_i)     = 0;
 
 private:
diff --git a/orbsvcs/orbsvcs/Log/Log_i.cpp b/orbsvcs/orbsvcs/Log/Log_i.cpp
index 466dfce94b3..8f43c54d406 100644
--- a/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/Log/Log_i.h"
 #include "orbsvcs/Log/LogMgr_i.h"
 #include "orbsvcs/Time_Utilities.h"
@@ -7,11 +9,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID (Log,
-           Log_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Log Compaction Interval
diff --git a/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
index c4bac928a7b..977fee816fa 100644
--- a/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
+++ b/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "orbsvcs/Log/NotifyLog_i.h"
 #include "orbsvcs/Log/LogMgr_i.h"
 #include "orbsvcs/Log/LogNotification.h"
 
-ACE_RCSID (Log,
-           NotifyLogConsumer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_LogConsumer::TAO_Notify_LogConsumer (TAO_NotifyLog_i *log)
diff --git a/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index 1bae643c4c8..16bce9394ac 100644
--- a/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -1,12 +1,10 @@
+// $Id$
+
 #include "orbsvcs/Log/NotifyLogFactory_i.h"
 #include "orbsvcs/Log/LogNotification.h"
 #include "orbsvcs/Log/NotifyLogNotification.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Log,
-           NotifyLogFactory_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (void)
diff --git a/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
index dc4b8179b12..a3d233de824 100644
--- a/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
+++ b/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
@@ -1,13 +1,10 @@
+// $Id$
+
 #include "orbsvcs/Log/LogNotification.h"
 #include "orbsvcs/Log/NotifyLogNotification.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Log,
-           NotifyLogNotification,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_NotifyLogNotification::TAO_NotifyLogNotification (
diff --git a/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index 5c9e1478f86..22c8d52bde5 100644
--- a/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "orbsvcs/Log/NotifyLog_i.h"
 #include "orbsvcs/Log/LogMgr_i.h"
 #include "orbsvcs/Log/LogNotification.h"
 
-ACE_RCSID (Log,
-           NotifyLog_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb,
diff --git a/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
index 1ad4bf75e82..da181905372 100644
--- a/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
+++ b/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/Log/RTEventLog_i.h"
 #include "orbsvcs/Log/LogMgr_i.h"
 #include "orbsvcs/Log/LogNotification.h"
@@ -13,10 +15,6 @@
 #include "orbsvcs/Event/EC_SupplierControl.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (Log,
-           RTEventLogConsumer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Rtec_LogConsumer::TAO_Rtec_LogConsumer (TAO_RTEventLog_i *log)
diff --git a/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index 0bd46e91f4f..285165b1315 100644
--- a/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/Log/RTEventLogFactory_i.h"
 #include "orbsvcs/Log/LogNotification.h"
 #include "orbsvcs/Log/RTEventLogNotification.h"
@@ -17,11 +19,6 @@
 
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (Log,
-           RTEventLogFactory_i,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTEventLogFactory_i::TAO_RTEventLogFactory_i (void)
diff --git a/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
index 14a78477a3b..8493b9c4f93 100644
--- a/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
+++ b/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/Log/LogNotification.h"
 #include "orbsvcs/Log/RTEventLogNotification.h"
 #include "orbsvcs/Time_Utilities.h"
@@ -18,10 +20,6 @@
 #include "orbsvcs/ESF/ESF_RefCount_Guard.h"
 #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
 
-ACE_RCSID (Log,
-           RTEventLogNotification,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTEventLogNotification::TAO_RTEventLogNotification (
diff --git a/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index 98c04b1dfd5..650b07ee6fb 100644
--- a/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/Log/RTEventLog_i.h"
 #include "orbsvcs/Log/LogMgr_i.h"
 #include "orbsvcs/Log/LogNotification.h"
@@ -13,10 +15,6 @@
 #include "orbsvcs/Event/EC_SupplierControl.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (Log,
-           RTEventLog_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTEventLog_i::TAO_RTEventLog_i (CORBA::ORB_ptr orb,
diff --git a/orbsvcs/orbsvcs/Makefile.am b/orbsvcs/orbsvcs/Makefile.am
deleted file mode 100644
index 42cd1c60455..00000000000
--- a/orbsvcs/orbsvcs/Makefile.am
+++ /dev/null
@@ -1,6057 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-includedir = @includedir@/orbsvcs
-pkgconfigdir = @libdir@/pkgconfig
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-lib_LTLIBRARIES =
-pkgconfig_DATA =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.CosNaming_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  CosNamingC.cpp \
-  CosNamingC.h \
-  CosNamingC.inl \
-  CosNamingS.cpp \
-  CosNamingS.h \
-  CosNamingS.inl
-
-CLEANFILES += \
-  CosNaming-stamp \
-  CosNamingC.cpp \
-  CosNamingC.h \
-  CosNamingC.inl \
-  CosNamingS.cpp \
-  CosNamingS.h \
-  CosNamingS.inl
-
-CosNamingC.cpp CosNamingC.h CosNamingC.inl CosNamingS.cpp CosNamingS.h CosNamingS.inl: CosNaming-stamp
-
-CosNaming-stamp: $(srcdir)/CosNaming.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl
-	@touch $@
-
-nobase_include_HEADERS = \
-  CosNaming.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CosNaming.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosNaming.la
-
-libTAO_CosNaming_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_NAMING_BUILD_DLL
-
-libTAO_CosNaming_la_SOURCES = \
-  CosNamingC.cpp \
-  Naming/Naming_Client.cpp
-
-libTAO_CosNaming_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosNaming_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosNamingC.h \
-  CosNamingC.inl \
-  Naming/Naming_Client.h \
-  Naming/naming_export.h
-
-pkgconfig_DATA += \
-  TAO_CosNaming.pc
-
-CLEANFILES += \
-  TAO_CosNaming.pc
-
-TAO_CosNaming.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST = \
-  CosNaming.rc \
-  TAO_CosNaming.pc.in
-
-
-## Makefile.CosProperty_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  CosPropertyC.cpp \
-  CosPropertyC.h \
-  CosPropertyC.inl \
-  CosPropertyS.cpp \
-  CosPropertyS.h \
-  CosPropertyS.inl
-
-CLEANFILES += \
-  CosProperty-stamp \
-  CosPropertyC.cpp \
-  CosPropertyC.h \
-  CosPropertyC.inl \
-  CosPropertyS.cpp \
-  CosPropertyS.h \
-  CosPropertyS.inl
-
-CosPropertyC.cpp CosPropertyC.h CosPropertyC.inl CosPropertyS.cpp CosPropertyS.h CosPropertyS.inl: CosProperty-stamp
-
-CosProperty-stamp: $(srcdir)/CosProperty.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosProperty.idl
-	@touch $@
-
-nobase_include_HEADERS += \
-  CosProperty.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CosProperty.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosProperty.la
-
-libTAO_CosProperty_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_PROPERTY_BUILD_DLL
-
-libTAO_CosProperty_la_SOURCES = \
-  CosPropertyC.cpp
-
-libTAO_CosProperty_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosProperty_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosPropertyC.h \
-  CosPropertyC.inl \
-  Property/property_export.h
-
-pkgconfig_DATA += \
-  TAO_CosProperty.pc
-
-CLEANFILES += \
-  TAO_CosProperty.pc
-
-TAO_CosProperty.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  TAO_CosProperty.pc.in
-
-
-## Makefile.CosProperty_Skel.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosProperty_Skel.la
-
-libTAO_CosProperty_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_PROPERTY_SKEL_BUILD_DLL
-
-libTAO_CosProperty_Skel_la_SOURCES = \
-  CosPropertyS.cpp
-
-libTAO_CosProperty_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosProperty_Skel_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosPropertyS.h \
-  CosPropertyS.inl \
-  Property/property_skel_export.h
-
-pkgconfig_DATA += \
-  TAO_CosProperty_Skel.pc
-
-CLEANFILES += \
-  TAO_CosProperty_Skel.pc
-
-TAO_CosProperty_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  TAO_CosProperty_Skel.pc.in
-
-
-## Makefile.CosProperty_Serv.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosProperty_Serv.la
-
-libTAO_CosProperty_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_PROPERTY_SERV_BUILD_DLL
-
-libTAO_CosProperty_Serv_la_SOURCES = \
-  Property/CosPropertyService_i.cpp
-
-libTAO_CosProperty_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosProperty_Serv_la_LIBADD = \
-  libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Property/CosPropertyService_i.h \
-  Property/property_serv_export.h
-
-pkgconfig_DATA += \
-  TAO_CosProperty_Serv.pc
-
-CLEANFILES += \
-  TAO_CosProperty_Serv.pc
-
-TAO_CosProperty_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Serv.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  TAO_CosProperty_Serv.pc.in
-
-
-## Makefile.AV.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES += \
-  AVStreamsC.cpp \
-  AVStreamsC.h \
-  AVStreamsC.inl \
-  AVStreamsS.cpp \
-  AVStreamsS.h \
-  AVStreamsS.inl
-
-CLEANFILES += \
-  AVStreams-stamp \
-  AVStreamsC.cpp \
-  AVStreamsC.h \
-  AVStreamsC.inl \
-  AVStreamsS.cpp \
-  AVStreamsS.h \
-  AVStreamsS.inl
-
-AVStreamsC.cpp AVStreamsC.h AVStreamsC.inl AVStreamsS.cpp AVStreamsS.h AVStreamsS.inl: AVStreams-stamp
-
-AVStreams-stamp: $(srcdir)/AVStreams.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Null_MediaCtrlC.cpp \
-  Null_MediaCtrlC.h \
-  Null_MediaCtrlC.inl \
-  Null_MediaCtrlS.cpp \
-  Null_MediaCtrlS.h \
-  Null_MediaCtrlS.inl
-
-CLEANFILES += \
-  Null_MediaCtrl-stamp \
-  Null_MediaCtrlC.cpp \
-  Null_MediaCtrlC.h \
-  Null_MediaCtrlC.inl \
-  Null_MediaCtrlS.cpp \
-  Null_MediaCtrlS.h \
-  Null_MediaCtrlS.inl
-
-Null_MediaCtrlC.cpp Null_MediaCtrlC.h Null_MediaCtrlC.inl Null_MediaCtrlS.cpp Null_MediaCtrlS.h Null_MediaCtrlS.inl: Null_MediaCtrl-stamp
-
-Null_MediaCtrl-stamp: $(srcdir)/Null_MediaCtrl.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  sfpC.cpp \
-  sfpC.h \
-  sfpC.inl \
-  sfpS.cpp \
-  sfpS.h \
-  sfpS.inl
-
-CLEANFILES += \
-  sfp-stamp \
-  sfpC.cpp \
-  sfpC.h \
-  sfpC.inl \
-  sfpS.cpp \
-  sfpS.h \
-  sfpS.inl
-
-sfpC.cpp sfpC.h sfpC.inl sfpS.cpp sfpS.h sfpS.inl: sfp-stamp
-
-sfp-stamp: $(srcdir)/sfp.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_AV.la
-
-libTAO_AV_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_AV_BUILD_DLL
-
-libTAO_AV_la_SOURCES = \
-  AV/AVStreams_i.cpp \
-  AV/AV_Core.cpp \
-  AV/Endpoint_Strategy.cpp \
-  AV/Fill_ACE_QoS.cpp \
-  AV/FlowSpec_Entry.cpp \
-  AV/MCast.cpp \
-  AV/Policy.cpp \
-  AV/Protocol_Factory.cpp \
-  AV/QoS_UDP.cpp \
-  AV/RTCP.cpp \
-  AV/RTCP_Channel.cpp \
-  AV/RTCP_Packet.cpp \
-  AV/RTP.cpp \
-  AV/SCTP_SEQ.cpp \
-  AV/TCP.cpp \
-  AV/Transport.cpp \
-  AV/UDP.cpp \
-  AV/default_resource.cpp \
-  AV/md5c.cpp \
-  AV/media_timer.cpp \
-  AV/sfp.cpp \
-  AVStreamsC.cpp \
-  AVStreamsS.cpp \
-  Null_MediaCtrlC.cpp \
-  Null_MediaCtrlS.cpp \
-  sfpC.cpp \
-  sfpS.cpp
-
-libTAO_AV_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_AV_la_LIBADD = \
-  libTAO_CosNaming.la \
-  libTAO_CosProperty_Serv.la \
-  libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  AV/AVStreams_i.h \
-  AV/AVStreams_i.inl \
-  AV/AV_Core.h \
-  AV/AV_export.h \
-  AV/Endpoint_Strategy.h \
-  AV/Endpoint_Strategy_T.cpp \
-  AV/Endpoint_Strategy_T.h \
-  AV/Fill_ACE_QoS.h \
-  AV/FlowSpec_Entry.h \
-  AV/FlowSpec_Entry.inl \
-  AV/Flows_T.cpp \
-  AV/Flows_T.h \
-  AV/MCast.h \
-  AV/MCast.inl \
-  AV/Policy.h \
-  AV/Policy.inl \
-  AV/Protocol_Factory.h \
-  AV/QoS_UDP.h \
-  AV/QoS_UDP.inl \
-  AV/RTCP.h \
-  AV/RTCP_Channel.h \
-  AV/RTCP_Packet.h \
-  AV/RTP.h \
-  AV/Resource_Factory.h \
-  AV/SCTP_SEQ.h \
-  AV/TCP.h \
-  AV/Transport.h \
-  AV/Transport.inl \
-  AV/UDP.h \
-  AV/UDP.inl \
-  AV/default_resource.h \
-  AV/global.h \
-  AV/md5.h \
-  AV/media_timer.h \
-  AV/ntp-time.h \
-  AV/sfp.h \
-  AVStreams.idl \
-  AVStreamsC.h \
-  AVStreamsC.inl \
-  AVStreamsS.h \
-  AVStreamsS.inl \
-  Null_MediaCtrl.idl \
-  Null_MediaCtrlC.h \
-  Null_MediaCtrlC.inl \
-  Null_MediaCtrlS.h \
-  Null_MediaCtrlS.inl \
-  sfp.idl \
-  sfpC.h \
-  sfpC.inl \
-  sfpS.h \
-  sfpS.inl
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  AV.rc
-
-
-## Makefile.CosConcurrency_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  CosConcurrencyControlC.cpp \
-  CosConcurrencyControlC.h \
-  CosConcurrencyControlC.inl \
-  CosConcurrencyControlS.cpp \
-  CosConcurrencyControlS.h \
-  CosConcurrencyControlS.inl
-
-CLEANFILES += \
-  CosConcurrencyControl-stamp \
-  CosConcurrencyControlC.cpp \
-  CosConcurrencyControlC.h \
-  CosConcurrencyControlC.inl \
-  CosConcurrencyControlS.cpp \
-  CosConcurrencyControlS.h \
-  CosConcurrencyControlS.inl
-
-CosConcurrencyControlC.cpp CosConcurrencyControlC.h CosConcurrencyControlC.inl CosConcurrencyControlS.cpp CosConcurrencyControlS.h CosConcurrencyControlS.inl: CosConcurrencyControl-stamp
-
-CosConcurrencyControl-stamp: $(srcdir)/CosConcurrencyControl.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h $(srcdir)/CosConcurrencyControl.idl
-	@touch $@
-
-nobase_include_HEADERS += \
-  CosConcurrencyControl.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CosConcurrency.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosConcurrency.la
-
-libTAO_CosConcurrency_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_CONCURRENCY_BUILD_DLL
-
-libTAO_CosConcurrency_la_SOURCES = \
-  CosConcurrencyControlC.cpp
-
-libTAO_CosConcurrency_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosConcurrency_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Concurrency/concurrency_export.h \
-  CosConcurrencyControlC.h \
-  CosConcurrencyControlC.inl
-
-pkgconfig_DATA += \
-  TAO_CosConcurrency.pc
-
-CLEANFILES += \
-  TAO_CosConcurrency.pc
-
-TAO_CosConcurrency.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  TAO_CosConcurrency.pc.in
-
-
-## Makefile.CosConcurrency_Skel.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosConcurrency_Skel.la
-
-libTAO_CosConcurrency_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_CONCURRENCY_SKEL_BUILD_DLL
-
-libTAO_CosConcurrency_Skel_la_SOURCES = \
-  CosConcurrencyControlS.cpp
-
-libTAO_CosConcurrency_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosConcurrency_Skel_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosConcurrency.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Concurrency/concurrency_skel_export.h \
-  CosConcurrencyControlS.h \
-  CosConcurrencyControlS.inl
-
-pkgconfig_DATA += \
-  TAO_CosConcurrency_Skel.pc
-
-CLEANFILES += \
-  TAO_CosConcurrency_Skel.pc
-
-TAO_CosConcurrency_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  TAO_CosConcurrency_Skel.pc.in
-
-
-## Makefile.CosConcurrency_Serv.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosConcurrency_Serv.la
-
-libTAO_CosConcurrency_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_CONCURRENCY_SERV_BUILD_DLL
-
-libTAO_CosConcurrency_Serv_la_SOURCES = \
-  Concurrency/CC_Lock.cpp \
-  Concurrency/CC_LockSet.cpp \
-  Concurrency/CC_LockSetFactory.cpp \
-  Concurrency/Concurrency_Loader.cpp \
-  Concurrency/Concurrency_Utils.cpp
-
-libTAO_CosConcurrency_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosConcurrency_Serv_la_LIBADD = \
-  libTAO_CosConcurrency_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosConcurrency.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Concurrency/CC_Lock.h \
-  Concurrency/CC_LockSet.h \
-  Concurrency/CC_LockSetFactory.h \
-  Concurrency/Concurrency_Loader.h \
-  Concurrency/Concurrency_Utils.h \
-  Concurrency/concurrency_serv_export.h
-
-pkgconfig_DATA += \
-  TAO_CosConcurrency_Serv.pc
-
-CLEANFILES += \
-  TAO_CosConcurrency_Serv.pc
-
-TAO_CosConcurrency_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Serv.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  TAO_CosConcurrency_Serv.pc.in
-
-
-## Makefile.CosEvent_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  CosTypedEventCommC.cpp \
-  CosTypedEventCommC.h \
-  CosTypedEventCommC.inl \
-  CosTypedEventCommS.cpp \
-  CosTypedEventCommS.h \
-  CosTypedEventCommS.inl \
-  CosTypedEventCommS_T.cpp \
-  CosTypedEventCommS_T.h
-
-CLEANFILES += \
-  CosTypedEventComm-stamp \
-  CosTypedEventCommC.cpp \
-  CosTypedEventCommC.h \
-  CosTypedEventCommC.inl \
-  CosTypedEventCommS.cpp \
-  CosTypedEventCommS.h \
-  CosTypedEventCommS.inl \
-  CosTypedEventCommS_T.cpp \
-  CosTypedEventCommS_T.h
-
-CosTypedEventCommC.cpp CosTypedEventCommC.h CosTypedEventCommC.inl CosTypedEventCommS.cpp CosTypedEventCommS.h CosTypedEventCommS.inl CosTypedEventCommS_T.cpp CosTypedEventCommS_T.h: CosTypedEventComm-stamp
-
-CosTypedEventComm-stamp: $(srcdir)/CosTypedEventComm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventComm.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CosTypedEventChannelAdminC.cpp \
-  CosTypedEventChannelAdminC.h \
-  CosTypedEventChannelAdminC.inl \
-  CosTypedEventChannelAdminS.cpp \
-  CosTypedEventChannelAdminS.h \
-  CosTypedEventChannelAdminS.inl \
-  CosTypedEventChannelAdminS_T.cpp \
-  CosTypedEventChannelAdminS_T.h
-
-CLEANFILES += \
-  CosTypedEventChannelAdmin-stamp \
-  CosTypedEventChannelAdminC.cpp \
-  CosTypedEventChannelAdminC.h \
-  CosTypedEventChannelAdminC.inl \
-  CosTypedEventChannelAdminS.cpp \
-  CosTypedEventChannelAdminS.h \
-  CosTypedEventChannelAdminS.inl \
-  CosTypedEventChannelAdminS_T.cpp \
-  CosTypedEventChannelAdminS_T.h
-
-CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS.cpp CosTypedEventChannelAdminS.h CosTypedEventChannelAdminS.inl CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminS_T.h: CosTypedEventChannelAdmin-stamp
-
-CosTypedEventChannelAdmin-stamp: $(srcdir)/CosTypedEventChannelAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventChannelAdmin.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CosEventCommC.cpp \
-  CosEventCommC.h \
-  CosEventCommC.inl \
-  CosEventCommS.cpp \
-  CosEventCommS.h \
-  CosEventCommS.inl \
-  CosEventCommS_T.cpp \
-  CosEventCommS_T.h
-
-CLEANFILES += \
-  CosEventComm-stamp \
-  CosEventCommC.cpp \
-  CosEventCommC.h \
-  CosEventCommC.inl \
-  CosEventCommS.cpp \
-  CosEventCommS.h \
-  CosEventCommS.inl \
-  CosEventCommS_T.cpp \
-  CosEventCommS_T.h
-
-CosEventCommC.cpp CosEventCommC.h CosEventCommC.inl CosEventCommS.cpp CosEventCommS.h CosEventCommS.inl CosEventCommS_T.cpp CosEventCommS_T.h: CosEventComm-stamp
-
-CosEventComm-stamp: $(srcdir)/CosEventComm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CosEventChannelAdminC.cpp \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.inl \
-  CosEventChannelAdminS.cpp \
-  CosEventChannelAdminS.h \
-  CosEventChannelAdminS.inl \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS_T.h
-
-CLEANFILES += \
-  CosEventChannelAdmin-stamp \
-  CosEventChannelAdminC.cpp \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.inl \
-  CosEventChannelAdminS.cpp \
-  CosEventChannelAdminS.h \
-  CosEventChannelAdminS.inl \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS_T.h
-
-CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminC.inl CosEventChannelAdminS.cpp CosEventChannelAdminS.h CosEventChannelAdminS.inl CosEventChannelAdminS_T.cpp CosEventChannelAdminS_T.h: CosEventChannelAdmin-stamp
-
-CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl
-	@touch $@
-
-nobase_include_HEADERS += \
-  CosEventChannelAdmin.idl \
-  CosEventComm.idl \
-  CosTypedEventChannelAdmin.idl \
-  CosTypedEventComm.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CosEvent.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosEvent.la
-
-libTAO_CosEvent_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_EVENT_BUILD_DLL
-
-libTAO_CosEvent_la_SOURCES = \
-  CosEventChannelAdminC.cpp \
-  CosEventCommC.cpp \
-  CosTypedEventChannelAdminC.cpp \
-  CosTypedEventCommC.cpp
-
-libTAO_CosEvent_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosEvent_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosEvent/event_export.h \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.inl \
-  CosEventCommC.h \
-  CosEventCommC.inl \
-  CosTypedEventChannelAdminC.h \
-  CosTypedEventChannelAdminC.inl \
-  CosTypedEventCommC.h \
-  CosTypedEventCommC.inl
-
-pkgconfig_DATA += \
-  TAO_CosEvent.pc
-
-CLEANFILES += \
-  TAO_CosEvent.pc
-
-TAO_CosEvent.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosEvent.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosEvent.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CosEvent.rc \
-  TAO_CosEvent.pc.in
-
-
-## Makefile.Svc_Utils.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TimeBaseC.cpp \
-  TimeBaseC.h \
-  TimeBaseC.inl \
-  TimeBaseS.cpp \
-  TimeBaseS.h \
-  TimeBaseS.inl
-
-CLEANFILES += \
-  TimeBase-stamp \
-  TimeBaseC.cpp \
-  TimeBaseC.h \
-  TimeBaseC.inl \
-  TimeBaseS.cpp \
-  TimeBaseS.h \
-  TimeBaseS.inl
-
-TimeBaseC.cpp TimeBaseC.h TimeBaseC.inl TimeBaseS.cpp TimeBaseS.h TimeBaseS.inl: TimeBase-stamp
-
-TimeBase-stamp: $(srcdir)/TimeBase.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  RtecBaseC.cpp \
-  RtecBaseC.h \
-  RtecBaseC.inl \
-  RtecBaseS.cpp \
-  RtecBaseS.h \
-  RtecBaseS.inl
-
-CLEANFILES += \
-  RtecBase-stamp \
-  RtecBaseC.cpp \
-  RtecBaseC.h \
-  RtecBaseC.inl \
-  RtecBaseS.cpp \
-  RtecBaseS.h \
-  RtecBaseS.inl
-
-RtecBaseC.cpp RtecBaseC.h RtecBaseC.inl RtecBaseS.cpp RtecBaseS.h RtecBaseS.inl: RtecBase-stamp
-
-RtecBase-stamp: $(srcdir)/RtecBase.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_Svc_Utils.la
-
-libTAO_Svc_Utils_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_SVC_UTILS_BUILD_DLL
-
-libTAO_Svc_Utils_la_SOURCES = \
-  IOR_Multicast.cpp \
-  RtecBaseC.cpp \
-  RtecBaseS.cpp \
-  Shutdown_Utilities.cpp \
-  TimeBaseC.cpp \
-  TimeBaseS.cpp \
-  Time_Utilities.cpp \
-  Daemon_Utilities.cpp
-
-libTAO_Svc_Utils_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Svc_Utils_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  IOR_Multicast.h \
-  RtecBase.idl \
-  RtecBaseC.h \
-  RtecBaseC.inl \
-  RtecBaseS.h \
-  RtecBaseS.inl \
-  Shutdown_Utilities.h \
-  TimeBase.idl \
-  TimeBaseC.h \
-  TimeBaseC.inl \
-  TimeBaseS.h \
-  TimeBaseS.inl \
-  Time_Utilities.h \
-  Time_Utilities.inl \
-  svc_utils_export.h \
-  Daemon_Utilities.h
-
-pkgconfig_DATA += \
-  TAO_Svc_Utils.pc
-
-CLEANFILES += \
-  TAO_Svc_Utils.pc
-
-TAO_Svc_Utils.pc: ${top_builddir}/config.status ${srcdir}/TAO_Svc_Utils.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_Svc_Utils.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  Svc_Utils.rc \
-  TAO_Svc_Utils.pc.in
-
-
-## Makefile.CosEvent_Skel.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosEvent_Skel.la
-
-libTAO_CosEvent_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_EVENT_SKEL_BUILD_DLL
-
-libTAO_CosEvent_Skel_la_SOURCES = \
-  CosEventChannelAdminS.cpp \
-  CosEventCommS.cpp \
-  CosTypedEventChannelAdminS.cpp \
-  CosTypedEventCommS.cpp
-
-libTAO_CosEvent_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosEvent_Skel_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosEvent/event_skel_export.h \
-  CosEventChannelAdminS.h \
-  CosEventChannelAdminS.inl \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS_T.h \
-  CosEventCommS.h \
-  CosEventCommS.inl \
-  CosEventCommS_T.cpp \
-  CosEventCommS_T.h \
-  CosTypedEventChannelAdminS.h \
-  CosTypedEventChannelAdminS.inl \
-  CosTypedEventChannelAdminS_T.cpp \
-  CosTypedEventChannelAdminS_T.h \
-  CosTypedEventCommS.h \
-  CosTypedEventCommS.inl \
-  CosTypedEventCommS_T.cpp \
-  CosTypedEventCommS_T.h
-
-pkgconfig_DATA += \
-  TAO_CosEvent_Skel.pc
-
-CLEANFILES += \
-  TAO_CosEvent_Skel.pc
-
-TAO_CosEvent_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosEvent_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosEvent_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CosEvent_Skel.rc \
-  TAO_CosEvent_Skel.pc.in
-
-
-## Makefile.CosEvent_Serv.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosEvent_Serv.la
-
-libTAO_CosEvent_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_EVENT_SERV_BUILD_DLL
-
-libTAO_CosEvent_Serv_la_SOURCES = \
-  CosEvent/CEC_ConsumerAdmin.cpp \
-  CosEvent/CEC_ConsumerControl.cpp \
-  CosEvent/CEC_Default_Factory.cpp \
-  CosEvent/CEC_Dispatching.cpp \
-  CosEvent/CEC_Dispatching_Task.cpp \
-  CosEvent/CEC_DynamicImplementation.cpp \
-  CosEvent/CEC_EventChannel.cpp \
-  CosEvent/CEC_Event_Loader.cpp \
-  CosEvent/CEC_Factory.cpp \
-  CosEvent/CEC_MT_Dispatching.cpp \
-  CosEvent/CEC_ProxyPullConsumer.cpp \
-  CosEvent/CEC_ProxyPullSupplier.cpp \
-  CosEvent/CEC_ProxyPushConsumer.cpp \
-  CosEvent/CEC_ProxyPushSupplier.cpp \
-  CosEvent/CEC_Pulling_Strategy.cpp \
-  CosEvent/CEC_Reactive_ConsumerControl.cpp \
-  CosEvent/CEC_Reactive_Pulling_Strategy.cpp \
-  CosEvent/CEC_Reactive_SupplierControl.cpp \
-  CosEvent/CEC_SupplierAdmin.cpp \
-  CosEvent/CEC_SupplierControl.cpp \
-  CosEvent/CEC_TypedConsumerAdmin.cpp \
-  CosEvent/CEC_TypedEvent.cpp \
-  CosEvent/CEC_TypedEventChannel.cpp \
-  CosEvent/CEC_TypedProxyPushConsumer.cpp \
-  CosEvent/CEC_TypedSupplierAdmin.cpp
-
-libTAO_CosEvent_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosEvent_Serv_la_LIBADD = \
-  libTAO_Svc_Utils.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosEvent/CEC_ConsumerAdmin.h \
-  CosEvent/CEC_ConsumerAdmin.inl \
-  CosEvent/CEC_ConsumerControl.h \
-  CosEvent/CEC_Default_Factory.h \
-  CosEvent/CEC_Default_Factory.inl \
-  CosEvent/CEC_Defaults.h \
-  CosEvent/CEC_Dispatching.h \
-  CosEvent/CEC_Dispatching_Task.h \
-  CosEvent/CEC_Dispatching_Task.inl \
-  CosEvent/CEC_DynamicImplementation.h \
-  CosEvent/CEC_DynamicImplementation.inl \
-  CosEvent/CEC_EventChannel.h \
-  CosEvent/CEC_EventChannel.inl \
-  CosEvent/CEC_Event_Loader.h \
-  CosEvent/CEC_Factory.h \
-  CosEvent/CEC_MT_Dispatching.h \
-  CosEvent/CEC_ProxyPullConsumer.h \
-  CosEvent/CEC_ProxyPullConsumer.inl \
-  CosEvent/CEC_ProxyPullSupplier.h \
-  CosEvent/CEC_ProxyPullSupplier.inl \
-  CosEvent/CEC_ProxyPushConsumer.h \
-  CosEvent/CEC_ProxyPushConsumer.inl \
-  CosEvent/CEC_ProxyPushSupplier.h \
-  CosEvent/CEC_ProxyPushSupplier.inl \
-  CosEvent/CEC_Pulling_Strategy.h \
-  CosEvent/CEC_Reactive_ConsumerControl.h \
-  CosEvent/CEC_Reactive_ConsumerControl.inl \
-  CosEvent/CEC_Reactive_Pulling_Strategy.h \
-  CosEvent/CEC_Reactive_Pulling_Strategy.inl \
-  CosEvent/CEC_Reactive_SupplierControl.h \
-  CosEvent/CEC_Reactive_SupplierControl.inl \
-  CosEvent/CEC_SupplierAdmin.h \
-  CosEvent/CEC_SupplierAdmin.inl \
-  CosEvent/CEC_SupplierControl.h \
-  CosEvent/CEC_TypedConsumerAdmin.h \
-  CosEvent/CEC_TypedConsumerAdmin.inl \
-  CosEvent/CEC_TypedEvent.h \
-  CosEvent/CEC_TypedEvent.inl \
-  CosEvent/CEC_TypedEventChannel.h \
-  CosEvent/CEC_TypedEventChannel.inl \
-  CosEvent/CEC_TypedProxyPushConsumer.h \
-  CosEvent/CEC_TypedProxyPushConsumer.inl \
-  CosEvent/CEC_TypedSupplierAdmin.h \
-  CosEvent/CEC_TypedSupplierAdmin.inl \
-  CosEvent/event_serv_export.h
-
-pkgconfig_DATA += \
-  TAO_CosEvent_Serv.pc
-
-CLEANFILES += \
-  TAO_CosEvent_Serv.pc
-
-TAO_CosEvent_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosEvent_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosEvent_Serv.pc.in
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  CosEvent_Serv.rc \
-  TAO_CosEvent_Serv.pc.in
-
-
-## Makefile.CosLifeCycle.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  CosLifeCycleC.cpp \
-  CosLifeCycleC.h \
-  CosLifeCycleC.inl \
-  CosLifeCycleS.cpp \
-  CosLifeCycleS.h \
-  CosLifeCycleS.inl
-
-CLEANFILES += \
-  CosLifeCycle-stamp \
-  CosLifeCycleC.cpp \
-  CosLifeCycleC.h \
-  CosLifeCycleC.inl \
-  CosLifeCycleS.cpp \
-  CosLifeCycleS.h \
-  CosLifeCycleS.inl
-
-CosLifeCycleC.cpp CosLifeCycleC.h CosLifeCycleC.inl CosLifeCycleS.cpp CosLifeCycleS.h CosLifeCycleS.inl: CosLifeCycle-stamp
-
-CosLifeCycle-stamp: $(srcdir)/CosLifeCycle.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  LifeCycleServiceC.cpp \
-  LifeCycleServiceC.h \
-  LifeCycleServiceC.inl \
-  LifeCycleServiceS.cpp \
-  LifeCycleServiceS.h \
-  LifeCycleServiceS.inl
-
-CLEANFILES += \
-  LifeCycleService-stamp \
-  LifeCycleServiceC.cpp \
-  LifeCycleServiceC.h \
-  LifeCycleServiceC.inl \
-  LifeCycleServiceS.cpp \
-  LifeCycleServiceS.h \
-  LifeCycleServiceS.inl
-
-LifeCycleServiceC.cpp LifeCycleServiceC.h LifeCycleServiceC.inl LifeCycleServiceS.cpp LifeCycleServiceS.h LifeCycleServiceS.inl: LifeCycleService-stamp
-
-LifeCycleService-stamp: $(srcdir)/LifeCycleService.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_CosLifeCycle.la
-
-libTAO_CosLifeCycle_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_LIFECYCLE_BUILD_DLL
-
-libTAO_CosLifeCycle_la_SOURCES = \
-  CosLifeCycleC.cpp \
-  CosLifeCycleS.cpp \
-  LifeCycleServiceC.cpp \
-  LifeCycleServiceS.cpp
-
-libTAO_CosLifeCycle_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosLifeCycle_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosLifeCycle.idl \
-  CosLifeCycleC.h \
-  CosLifeCycleC.inl \
-  CosLifeCycleS.h \
-  CosLifeCycleS.inl \
-  LifeCycleService.idl \
-  LifeCycleServiceC.h \
-  LifeCycleServiceC.inl \
-  LifeCycleServiceS.h \
-  LifeCycleServiceS.inl
-
-pkgconfig_DATA += \
-  TAO_CosLifeCycle.pc
-
-CLEANFILES += \
-  TAO_CosLifeCycle.pc
-
-TAO_CosLifeCycle.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosLifeCycle.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosLifeCycle.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CosLifeCycle.rc \
-  TAO_CosLifeCycle.pc.in
-
-
-## Makefile.PortableGroup.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  miopC.cpp \
-  miopC.h \
-  miopC.inl \
-  miopS.cpp \
-  miopS.h \
-  miopS.inl
-
-CLEANFILES += \
-  miop-stamp \
-  miopC.cpp \
-  miopC.h \
-  miopC.inl \
-  miopS.cpp \
-  miopS.h \
-  miopS.inl
-
-miopC.cpp miopC.h miopC.inl miopS.cpp miopS.h miopS.inl: miop-stamp
-
-miop-stamp: $(srcdir)/miop.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableGroup_Simple_DSC.cpp \
-  PortableGroup_Simple_DSC.h \
-  PortableGroup_Simple_DSC.inl \
-  PortableGroup_Simple_DSS.inl
-
-CLEANFILES += \
-  PortableGroup_Simple_DS-stamp \
-  PortableGroup_Simple_DSC.cpp \
-  PortableGroup_Simple_DSC.h \
-  PortableGroup_Simple_DSC.inl \
-  PortableGroup_Simple_DSS.inl
-
-PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl: PortableGroup_Simple_DS-stamp
-
-PortableGroup_Simple_DS-stamp: $(srcdir)/PortableGroup_Simple_DS.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/PortableGroup_Simple_DS.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableGroupC.cpp \
-  PortableGroupC.h \
-  PortableGroupC.inl \
-  PortableGroupS.cpp \
-  PortableGroupS.h \
-  PortableGroupS.inl
-
-CLEANFILES += \
-  PortableGroup-stamp \
-  PortableGroupC.cpp \
-  PortableGroupC.h \
-  PortableGroupC.inl \
-  PortableGroupS.cpp \
-  PortableGroupS.h \
-  PortableGroupS.inl
-
-PortableGroupC.cpp PortableGroupC.h PortableGroupC.inl PortableGroupS.cpp PortableGroupS.h PortableGroupS.inl: PortableGroup-stamp
-
-PortableGroup-stamp: $(srcdir)/PortableGroup.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_PortableGroup.la
-
-libTAO_PortableGroup_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_PORTABLEGROUP_BUILD_DLL
-
-libTAO_PortableGroup_la_SOURCES = \
-  PortableGroup/GOA.cpp \
-  PortableGroup/MIOP.cpp \
-  PortableGroup/PG_Default_Property_Validator.cpp \
-  PortableGroup/PG_FactoryRegistry.cpp \
-  PortableGroup/PG_GenericFactory.cpp \
-  PortableGroup/PG_Group_Factory.cpp \
-  PortableGroup/PG_Group_Guard.cpp \
-  PortableGroup/PG_Location_Equal_To.cpp \
-  PortableGroup/PG_Location_Hash.cpp \
-  PortableGroup/PG_MemberInfo.cpp \
-  PortableGroup/PG_Null_Property_Validator.cpp \
-  PortableGroup/PG_ObjectGroupManager.cpp \
-  PortableGroup/PG_Object_Adapter_Factory.cpp \
-  PortableGroup/PG_Object_Group.cpp \
-  PortableGroup/PG_Object_Group_Manipulator.cpp \
-  PortableGroup/PG_Operators.cpp \
-  PortableGroup/PG_Properties_Encoder.cpp \
-  PortableGroup/PG_Properties_Support.cpp \
-  PortableGroup/PG_PropertyManager.cpp \
-  PortableGroup/PG_Property_Set.cpp \
-  PortableGroup/PG_Property_Utils.cpp \
-  PortableGroup/PG_Servant_Dispatcher.cpp \
-  PortableGroup/PG_Utils.cpp \
-  PortableGroup/PortableGroup_Acceptor_Registry.cpp \
-  PortableGroup/PortableGroup_Loader.cpp \
-  PortableGroup/PortableGroup_ORBInitializer.cpp \
-  PortableGroup/PortableGroup_Request_Dispatcher.cpp \
-  PortableGroup/Portable_Group_Map.cpp \
-  PortableGroup/UIPMC_Acceptor.cpp \
-  PortableGroup/UIPMC_Connection_Handler.cpp \
-  PortableGroup/UIPMC_Connector.cpp \
-  PortableGroup/UIPMC_Endpoint.cpp \
-  PortableGroup/UIPMC_Factory.cpp \
-  PortableGroup/UIPMC_Mcast_Connection_Handler.cpp \
-  PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp \
-  PortableGroup/UIPMC_Profile.cpp \
-  PortableGroup/UIPMC_Transport.cpp \
-  PortableGroup/UIPMC_Wait_Never.cpp \
-  PortableGroupC.cpp \
-  PortableGroupS.cpp \
-  PortableGroup_Simple_DSC.cpp \
-  miopC.cpp \
-  miopS.cpp
-
-libTAO_PortableGroup_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_PortableGroup_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  PortableGroup.idl \
-  PortableGroup/GOA.h \
-  PortableGroup/MIOP.h \
-  PortableGroup/PG_Default_Property_Validator.h \
-  PortableGroup/PG_FactoryRegistry.h \
-  PortableGroup/PG_GenericFactory.h \
-  PortableGroup/PG_Group_Factory.h \
-  PortableGroup/PG_Group_Guard.h \
-  PortableGroup/PG_Location_Equal_To.h \
-  PortableGroup/PG_Location_Equal_To.inl \
-  PortableGroup/PG_Location_Hash.h \
-  PortableGroup/PG_Location_Hash.inl \
-  PortableGroup/PG_MemberInfo.h \
-  PortableGroup/PG_Null_Property_Validator.h \
-  PortableGroup/PG_ObjectGroupManager.h \
-  PortableGroup/PG_Object_Adapter_Factory.h \
-  PortableGroup/PG_Object_Group.h \
-  PortableGroup/PG_Object_Group_Manipulator.h \
-  PortableGroup/PG_Operators.h \
-  PortableGroup/PG_Properties_Encoder.h \
-  PortableGroup/PG_Properties_Encoder.inl \
-  PortableGroup/PG_Properties_Support.h \
-  PortableGroup/PG_PropertyManager.h \
-  PortableGroup/PG_Property_Set.h \
-  PortableGroup/PG_Property_Utils.h \
-  PortableGroup/PG_Servant_Dispatcher.h \
-  PortableGroup/PG_Utils.h \
-  PortableGroup/PortableGroup_Acceptor_Registry.h \
-  PortableGroup/PortableGroup_Loader.h \
-  PortableGroup/PortableGroup_ORBInitializer.h \
-  PortableGroup/PortableGroup_Request_Dispatcher.h \
-  PortableGroup/Portable_Group_Map.h \
-  PortableGroup/UIPMC_Acceptor.h \
-  PortableGroup/UIPMC_Acceptor.inl \
-  PortableGroup/UIPMC_Connection_Handler.h \
-  PortableGroup/UIPMC_Connector.h \
-  PortableGroup/UIPMC_Endpoint.h \
-  PortableGroup/UIPMC_Endpoint.inl \
-  PortableGroup/UIPMC_Factory.h \
-  PortableGroup/UIPMC_Mcast_Connection_Handler.h \
-  PortableGroup/UIPMC_Message_Block_Data_Iterator.h \
-  PortableGroup/UIPMC_Profile.h \
-  PortableGroup/UIPMC_Transport.h \
-  PortableGroup/UIPMC_Wait_Never.h \
-  PortableGroup/portablegroup_export.h \
-  PortableGroupC.h \
-  PortableGroupC.inl \
-  PortableGroupS.h \
-  PortableGroupS.inl \
-  PortableGroup_Simple_DS.idl \
-  PortableGroup_Simple_DSC.h \
-  PortableGroup_Simple_DSC.inl \
-  PortableGroup_Simple_DSS.inl \
-  miop.idl \
-  miopC.h \
-  miopC.inl \
-  miopS.h \
-  miopS.inl
-
-pkgconfig_DATA += \
-  TAO_PortableGroup.pc
-
-CLEANFILES += \
-  TAO_PortableGroup.pc
-
-TAO_PortableGroup.pc: ${top_builddir}/config.status ${srcdir}/TAO_PortableGroup.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_PortableGroup.pc.in
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  PortableGroup.rc \
-  TAO_PortableGroup.pc.in
-
-
-## Makefile.CosLoadBalancing.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  CosLoadBalancingC.cpp \
-  CosLoadBalancingC.h \
-  CosLoadBalancingC.inl \
-  CosLoadBalancingS.cpp \
-  CosLoadBalancingS.h \
-  CosLoadBalancingS.inl
-
-CLEANFILES += \
-  CosLoadBalancing-stamp \
-  CosLoadBalancingC.cpp \
-  CosLoadBalancingC.h \
-  CosLoadBalancingC.inl \
-  CosLoadBalancingS.cpp \
-  CosLoadBalancingS.h \
-  CosLoadBalancingS.inl
-
-CosLoadBalancingC.cpp CosLoadBalancingC.h CosLoadBalancingC.inl CosLoadBalancingS.cpp CosLoadBalancingS.h CosLoadBalancingS.inl: CosLoadBalancing-stamp
-
-CosLoadBalancing-stamp: $(srcdir)/CosLoadBalancing.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  LB_ORTC.cpp \
-  LB_ORTC.h \
-  LB_ORTC.inl \
-  LB_ORTS.h \
-  LB_ORTS.inl
-
-CLEANFILES += \
-  LB_ORT-stamp \
-  LB_ORTC.cpp \
-  LB_ORTC.h \
-  LB_ORTC.inl \
-  LB_ORTS.h \
-  LB_ORTS.inl
-
-LB_ORTC.cpp LB_ORTC.h LB_ORTC.inl LB_ORTS.h LB_ORTS.inl: LB_ORT-stamp
-
-LB_ORT-stamp: $(srcdir)/LB_ORT.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_CosLoadBalancing.la
-
-libTAO_CosLoadBalancing_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_LOADBALANCING_BUILD_DLL
-
-libTAO_CosLoadBalancing_la_SOURCES = \
-  CosLoadBalancingC.cpp \
-  CosLoadBalancingS.cpp \
-  LB_ORTC.cpp \
-  LoadBalancing/LB_CPU_Load_Average_Monitor.cpp \
-  LoadBalancing/LB_CPU_Utilization_Monitor.cpp \
-  LoadBalancing/LB_ClientComponent.cpp \
-  LoadBalancing/LB_ClientORBInitializer.cpp \
-  LoadBalancing/LB_ClientRequestInterceptor.cpp \
-  LoadBalancing/LB_Component.cpp \
-  LoadBalancing/LB_IORInterceptor.cpp \
-  LoadBalancing/LB_LeastLoaded.cpp \
-  LoadBalancing/LB_LoadAlert.cpp \
-  LoadBalancing/LB_LoadAlertInfo.cpp \
-  LoadBalancing/LB_LoadAlert_Handler.cpp \
-  LoadBalancing/LB_LoadAverage.cpp \
-  LoadBalancing/LB_LoadManager.cpp \
-  LoadBalancing/LB_LoadMinimum.cpp \
-  LoadBalancing/LB_MemberLocator.cpp \
-  LoadBalancing/LB_ORBInitializer.cpp \
-  LoadBalancing/LB_ObjectReferenceFactory.cpp \
-  LoadBalancing/LB_Pull_Handler.cpp \
-  LoadBalancing/LB_Random.cpp \
-  LoadBalancing/LB_RoundRobin.cpp \
-  LoadBalancing/LB_ServerRequestInterceptor.cpp
-
-libTAO_CosLoadBalancing_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosLoadBalancing_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosLoadBalancing.idl \
-  CosLoadBalancingC.h \
-  CosLoadBalancingC.inl \
-  CosLoadBalancingS.h \
-  CosLoadBalancingS.inl \
-  LB_ORT.idl \
-  LB_ORTC.h \
-  LB_ORTC.inl \
-  LB_ORTS.h \
-  LB_ORTS.inl \
-  LoadBalancing/LB_CPU_Load_Average_Monitor.h \
-  LoadBalancing/LB_CPU_Utilization_Monitor.h \
-  LoadBalancing/LB_ClientComponent.h \
-  LoadBalancing/LB_ClientORBInitializer.h \
-  LoadBalancing/LB_ClientRequestInterceptor.h \
-  LoadBalancing/LB_Component.h \
-  LoadBalancing/LB_IORInterceptor.h \
-  LoadBalancing/LB_LeastLoaded.h \
-  LoadBalancing/LB_LeastLoaded.inl \
-  LoadBalancing/LB_LoadAlert.h \
-  LoadBalancing/LB_LoadAlert.inl \
-  LoadBalancing/LB_LoadAlertInfo.h \
-  LoadBalancing/LB_LoadAlert_Handler.h \
-  LoadBalancing/LB_LoadAverage.h \
-  LoadBalancing/LB_LoadAverage.inl \
-  LoadBalancing/LB_LoadManager.h \
-  LoadBalancing/LB_LoadMinimum.h \
-  LoadBalancing/LB_LoadMinimum.inl \
-  LoadBalancing/LB_MemberLocator.h \
-  LoadBalancing/LB_ORBInitializer.h \
-  LoadBalancing/LB_ObjectReferenceFactory.h \
-  LoadBalancing/LB_Pull_Handler.h \
-  LoadBalancing/LB_Random.h \
-  LoadBalancing/LB_RoundRobin.h \
-  LoadBalancing/LB_ServerRequestInterceptor.h
-
-pkgconfig_DATA += \
-  TAO_CosLoadBalancing.pc
-
-CLEANFILES += \
-  TAO_CosLoadBalancing.pc
-
-TAO_CosLoadBalancing.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosLoadBalancing.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosLoadBalancing.pc.in
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-EXTRA_DIST += \
-  CosLoadBalancing.rc \
-  TAO_CosLoadBalancing.pc.in
-
-
-## Makefile.CosNaming_Skel.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosNaming_Skel.la
-
-libTAO_CosNaming_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_NAMING_SKEL_BUILD_DLL
-
-libTAO_CosNaming_Skel_la_SOURCES = \
-  CosNamingS.cpp
-
-libTAO_CosNaming_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosNaming_Skel_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosNamingS.h \
-  CosNamingS.inl \
-  Naming/naming_skel_export.h
-
-pkgconfig_DATA += \
-  TAO_CosNaming_Skel.pc
-
-CLEANFILES += \
-  TAO_CosNaming_Skel.pc
-
-TAO_CosNaming_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CosNaming_Skel.rc \
-  TAO_CosNaming_Skel.pc.in
-
-
-## Makefile.CosNaming_Serv.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosNaming_Serv.la
-
-libTAO_CosNaming_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_NAMING_SERV_BUILD_DLL
-
-libTAO_CosNaming_Serv_la_SOURCES = \
-  Naming/Entries.cpp \
-  Naming/Flat_File_Persistence.cpp \
-  Naming/Hash_Naming_Context.cpp \
-  Naming/Naming_Context_Interface.cpp \
-  Naming/Naming_Loader.cpp \
-  Naming/Naming_Server.cpp \
-  Naming/Persistent_Context_Index.cpp \
-  Naming/Persistent_Entries.cpp \
-  Naming/Persistent_Naming_Context.cpp \
-  Naming/Storable.cpp \
-  Naming/Storable_Naming_Context.cpp \
-  Naming/Storable_Naming_Context_Activator.cpp \
-  Naming/Transient_Naming_Context.cpp
-
-libTAO_CosNaming_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosNaming_Serv_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Naming/Entries.h \
-  Naming/Flat_File_Persistence.h \
-  Naming/Hash_Naming_Context.h \
-  Naming/Naming_Context_Interface.h \
-  Naming/Naming_Loader.h \
-  Naming/Naming_Server.h \
-  Naming/Persistent_Context_Index.h \
-  Naming/Persistent_Entries.h \
-  Naming/Persistent_Naming_Context.h \
-  Naming/Storable.h \
-  Naming/Storable.inl \
-  Naming/Storable_Naming_Context.h \
-  Naming/Storable_Naming_Context_Activator.h \
-  Naming/Transient_Naming_Context.h \
-  Naming/naming_serv_export.h \
-  Naming/nsconf.h
-
-pkgconfig_DATA += \
-  TAO_CosNaming_Serv.pc
-
-CLEANFILES += \
-  TAO_CosNaming_Serv.pc
-
-TAO_CosNaming_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming_Serv.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CosNaming_Serv.rc \
-  TAO_CosNaming_Serv.pc.in
-
-
-## Makefile.CosNotification_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  CosNotificationC.cpp \
-  CosNotificationC.h \
-  CosNotificationC.inl \
-  CosNotificationS.cpp \
-  CosNotificationS.h \
-  CosNotificationS.inl
-
-CLEANFILES += \
-  CosNotification-stamp \
-  CosNotificationC.cpp \
-  CosNotificationC.h \
-  CosNotificationC.inl \
-  CosNotificationS.cpp \
-  CosNotificationS.h \
-  CosNotificationS.inl
-
-CosNotificationC.cpp CosNotificationC.h CosNotificationC.inl CosNotificationS.cpp CosNotificationS.h CosNotificationS.inl: CosNotification-stamp
-
-CosNotification-stamp: $(srcdir)/CosNotification.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CosNotifyCommC.cpp \
-  CosNotifyCommC.h \
-  CosNotifyCommC.inl \
-  CosNotifyCommS.cpp \
-  CosNotifyCommS.h \
-  CosNotifyCommS.inl
-
-CLEANFILES += \
-  CosNotifyComm-stamp \
-  CosNotifyCommC.cpp \
-  CosNotifyCommC.h \
-  CosNotifyCommC.inl \
-  CosNotifyCommS.cpp \
-  CosNotifyCommS.h \
-  CosNotifyCommS.inl
-
-CosNotifyCommC.cpp CosNotifyCommC.h CosNotifyCommC.inl CosNotifyCommS.cpp CosNotifyCommS.h CosNotifyCommS.inl: CosNotifyComm-stamp
-
-CosNotifyComm-stamp: $(srcdir)/CosNotifyComm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CosNotifyFilterC.cpp \
-  CosNotifyFilterC.h \
-  CosNotifyFilterC.inl \
-  CosNotifyFilterS.cpp \
-  CosNotifyFilterS.h \
-  CosNotifyFilterS.inl
-
-CLEANFILES += \
-  CosNotifyFilter-stamp \
-  CosNotifyFilterC.cpp \
-  CosNotifyFilterC.h \
-  CosNotifyFilterC.inl \
-  CosNotifyFilterS.cpp \
-  CosNotifyFilterS.h \
-  CosNotifyFilterS.inl
-
-CosNotifyFilterC.cpp CosNotifyFilterC.h CosNotifyFilterC.inl CosNotifyFilterS.cpp CosNotifyFilterS.h CosNotifyFilterS.inl: CosNotifyFilter-stamp
-
-CosNotifyFilter-stamp: $(srcdir)/CosNotifyFilter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CosNotifyChannelAdminC.cpp \
-  CosNotifyChannelAdminC.h \
-  CosNotifyChannelAdminC.inl \
-  CosNotifyChannelAdminS.cpp \
-  CosNotifyChannelAdminS.h \
-  CosNotifyChannelAdminS.inl
-
-CLEANFILES += \
-  CosNotifyChannelAdmin-stamp \
-  CosNotifyChannelAdminC.cpp \
-  CosNotifyChannelAdminC.h \
-  CosNotifyChannelAdminC.inl \
-  CosNotifyChannelAdminS.cpp \
-  CosNotifyChannelAdminS.h \
-  CosNotifyChannelAdminS.inl
-
-CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminC.inl CosNotifyChannelAdminS.cpp CosNotifyChannelAdminS.h CosNotifyChannelAdminS.inl: CosNotifyChannelAdmin-stamp
-
-CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  NotifyExtC.cpp \
-  NotifyExtC.h \
-  NotifyExtC.inl \
-  NotifyExtS.cpp \
-  NotifyExtS.h \
-  NotifyExtS.inl
-
-CLEANFILES += \
-  NotifyExt-stamp \
-  NotifyExtC.cpp \
-  NotifyExtC.h \
-  NotifyExtC.inl \
-  NotifyExtS.cpp \
-  NotifyExtS.h \
-  NotifyExtS.inl
-
-NotifyExtC.cpp NotifyExtC.h NotifyExtC.inl NotifyExtS.cpp NotifyExtS.h NotifyExtS.inl: NotifyExt-stamp
-
-NotifyExt-stamp: $(srcdir)/NotifyExt.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Event_ForwarderC.cpp \
-  Event_ForwarderC.h \
-  Event_ForwarderC.inl \
-  Event_ForwarderS.cpp \
-  Event_ForwarderS.h \
-  Event_ForwarderS.inl
-
-CLEANFILES += \
-  Event_Forwarder-stamp \
-  Event_ForwarderC.cpp \
-  Event_ForwarderC.h \
-  Event_ForwarderC.inl \
-  Event_ForwarderS.cpp \
-  Event_ForwarderS.h \
-  Event_ForwarderS.inl
-
-Event_ForwarderC.cpp Event_ForwarderC.h Event_ForwarderC.inl Event_ForwarderS.cpp Event_ForwarderS.h Event_ForwarderS.inl: Event_Forwarder-stamp
-
-Event_Forwarder-stamp: $(srcdir)/Event_Forwarder.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl
-	@touch $@
-
-nobase_include_HEADERS += \
-  CosNotification.idl \
-  CosNotifyChannelAdmin.idl \
-  CosNotifyComm.idl \
-  CosNotifyFilter.idl \
-  Event_Forwarder.idl \
-  NotifyExt.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CosNotification.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosNotification.la
-
-libTAO_CosNotification_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFY_BUILD_DLL
-
-libTAO_CosNotification_la_SOURCES = \
-  CosNotificationC.cpp \
-  CosNotifyChannelAdminC.cpp \
-  CosNotifyCommC.cpp \
-  CosNotifyFilterC.cpp \
-  Event_ForwarderC.cpp \
-  Notify/Notify_Extensions.cpp \
-  NotifyExtC.cpp
-
-libTAO_CosNotification_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosNotification_la_LIBADD = \
-  libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosNotificationC.h \
-  CosNotificationC.inl \
-  CosNotifyChannelAdminC.h \
-  CosNotifyChannelAdminC.inl \
-  CosNotifyCommC.h \
-  CosNotifyCommC.inl \
-  CosNotifyFilterC.h \
-  CosNotifyFilterC.inl \
-  Event_ForwarderC.h \
-  Event_ForwarderC.inl \
-  Notify/Notify_Extensions.h \
-  Notify/notify_export.h \
-  NotifyExtC.h \
-  NotifyExtC.inl
-
-pkgconfig_DATA += \
-  TAO_CosNotification.pc
-
-CLEANFILES += \
-  TAO_CosNotification.pc
-
-TAO_CosNotification.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNotification.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNotification.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CosNotification.rc \
-  TAO_CosNotification.pc.in
-
-
-## Makefile.CosNotification_MC.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-BUILT_SOURCES += \
-  Notify/MonitorControl/NotificationServiceMCC.cpp \
-  Notify/MonitorControl/NotificationServiceMCC.h \
-  Notify/MonitorControl/NotificationServiceMCC.inl \
-  Notify/MonitorControl/NotificationServiceMCS.cpp \
-  Notify/MonitorControl/NotificationServiceMCS.h \
-  Notify/MonitorControl/NotificationServiceMCS.inl
-
-CLEANFILES += \
-  Notify/MonitorControl/NotificationServiceMC-stamp \
-  Notify/MonitorControl/NotificationServiceMCC.cpp \
-  Notify/MonitorControl/NotificationServiceMCC.h \
-  Notify/MonitorControl/NotificationServiceMCC.inl \
-  Notify/MonitorControl/NotificationServiceMCS.cpp \
-  Notify/MonitorControl/NotificationServiceMCS.h \
-  Notify/MonitorControl/NotificationServiceMCS.inl
-
-Notify/MonitorControl/NotificationServiceMCC.cpp Notify/MonitorControl/NotificationServiceMCC.h Notify/MonitorControl/NotificationServiceMCC.inl Notify/MonitorControl/NotificationServiceMCS.cpp Notify/MonitorControl/NotificationServiceMCS.h Notify/MonitorControl/NotificationServiceMCS.inl: Notify/MonitorControl/NotificationServiceMC-stamp
-
-Notify/MonitorControl/NotificationServiceMC-stamp: $(srcdir)/Notify/MonitorControl/NotificationServiceMC.idl $(TAO_IDL_DEP)
-	mkdir -p Notify/MonitorControl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -I$(TAO_ROOT)/orbsvcs -o Notify/MonitorControl -Wb,export_macro=TAO_Notify_MC_Export -Wb,export_include=orbsvcs/Notify/MonitorControl/notify_mc_export.h $(srcdir)/Notify/MonitorControl/NotificationServiceMC.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_CosNotification_MC.la
-
-libTAO_CosNotification_MC_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_NOTIFY_MC_BUILD_DLL
-
-libTAO_CosNotification_MC_la_SOURCES = \
-  Notify/MonitorControl/Control.cpp \
-  Notify/MonitorControl/Control_Registry.cpp \
-  Notify/MonitorControl/MonitorManager.cpp \
-  Notify/MonitorControl/NotificationServiceMCC.cpp \
-  Notify/MonitorControl/NotificationServiceMCS.cpp \
-  Notify/MonitorControl/NotificationServiceMonitor_i.cpp \
-  Notify/MonitorControl/Timestamp_Monitor.cpp
-
-libTAO_CosNotification_MC_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosNotification_MC_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Notify/MonitorControl/Control.h \
-  Notify/MonitorControl/Control_Registry.h \
-  Notify/MonitorControl/MonitorManager.h \
-  Notify/MonitorControl/NotificationServiceMC.idl \
-  Notify/MonitorControl/NotificationServiceMCC.h \
-  Notify/MonitorControl/NotificationServiceMCC.inl \
-  Notify/MonitorControl/NotificationServiceMCS.h \
-  Notify/MonitorControl/NotificationServiceMCS.inl \
-  Notify/MonitorControl/NotificationServiceMonitor_i.h \
-  Notify/MonitorControl/Timestamp_Monitor.h \
-  Notify/MonitorControl/notify_mc_export.h
-
-endif !BUILD_WINCE
-endif BUILD_EXCEPTIONS
-
-## Makefile.CosNotification_Skel.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosNotification_Skel.la
-
-libTAO_CosNotification_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFY_SKEL_BUILD_DLL
-
-libTAO_CosNotification_Skel_la_SOURCES = \
-  CosNotificationS.cpp \
-  CosNotifyChannelAdminS.cpp \
-  CosNotifyCommS.cpp \
-  CosNotifyFilterS.cpp \
-  Event_ForwarderS.cpp \
-  NotifyExtS.cpp
-
-libTAO_CosNotification_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosNotification_Skel_la_LIBADD = \
-  libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosNotification.la \
-  libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosNotificationS.h \
-  CosNotificationS.inl \
-  CosNotifyChannelAdminS.h \
-  CosNotifyChannelAdminS.inl \
-  CosNotifyCommS.h \
-  CosNotifyCommS.inl \
-  CosNotifyFilterS.h \
-  CosNotifyFilterS.inl \
-  Event_ForwarderS.h \
-  Event_ForwarderS.inl \
-  Notify/notify_skel_export.h \
-  NotifyExtS.h \
-  NotifyExtS.inl
-
-pkgconfig_DATA += \
-  TAO_CosNotification_Skel.pc
-
-CLEANFILES += \
-  TAO_CosNotification_Skel.pc
-
-TAO_CosNotification_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNotification_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNotification_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CosNotification_Skel.rc \
-  TAO_CosNotification_Skel.pc.in
-
-
-## Makefile.CosNotification_Serv.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosNotification_Serv.la
-
-libTAO_CosNotification_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFY_SERV_BUILD_DLL
-
-libTAO_CosNotification_Serv_la_SOURCES = \
-  Notify/Admin.cpp \
-  Notify/AdminProperties.cpp \
-  Notify/Any/AnyEvent.cpp \
-  Notify/Any/CosEC_ProxyPushConsumer.cpp \
-  Notify/Any/CosEC_ProxyPushSupplier.cpp \
-  Notify/Any/ProxyPushConsumer.cpp \
-  Notify/Any/ProxyPushSupplier.cpp \
-  Notify/Any/PushConsumer.cpp \
-  Notify/Any/PushSupplier.cpp \
-  Notify/Bit_Vector.cpp \
-  Notify/Buffering_Strategy.cpp \
-  Notify/Builder.cpp \
-  Notify/Consumer.cpp \
-  Notify/ConsumerAdmin.cpp \
-  Notify/CosNotify_Initializer.cpp \
-  Notify/CosNotify_Service.cpp \
-  Notify/Default_Factory.cpp \
-  Notify/Delivery_Request.cpp \
-  Notify/ETCL_Filter.cpp \
-  Notify/ETCL_FilterFactory.cpp \
-  Notify/Event.cpp \
-  Notify/EventChannel.cpp \
-  Notify/EventChannelFactory.cpp \
-  Notify/EventType.cpp \
-  Notify/EventTypeSeq.cpp \
-  Notify/Event_Manager.cpp \
-  Notify/Event_Persistence_Factory.cpp \
-  Notify/FilterAdmin.cpp \
-  Notify/ID_Factory.cpp \
-  Notify/Method_Request.cpp \
-  Notify/Method_Request_Dispatch.cpp \
-  Notify/Method_Request_Event.cpp \
-  Notify/Method_Request_Lookup.cpp \
-  Notify/Method_Request_Shutdown.cpp \
-  Notify/Method_Request_Updates.cpp \
-  Notify/Name_Value_Pair.cpp \
-  Notify/Notify_Constraint_Interpreter.cpp \
-  Notify/Notify_Constraint_Visitors.cpp \
-  Notify/Notify_Default_CO_Factory.cpp \
-  Notify/Notify_Default_Collection_Factory.cpp \
-  Notify/Notify_Default_EMO_Factory.cpp \
-  Notify/Notify_Default_POA_Factory.cpp \
-  Notify/Notify_EventChannelFactory_i.cpp \
-  Notify/Object.cpp \
-  Notify/POA_Helper.cpp \
-  Notify/Peer.cpp \
-  Notify/Persistent_File_Allocator.cpp \
-  Notify/Properties.cpp \
-  Notify/PropertySeq.cpp \
-  Notify/Property_Boolean.cpp \
-  Notify/Proxy.cpp \
-  Notify/ProxyConsumer.cpp \
-  Notify/ProxySupplier.cpp \
-  Notify/QoSProperties.cpp \
-  Notify/Random_File.cpp \
-  Notify/Reactive_Task.cpp \
-  Notify/Reconnection_Registry.cpp \
-  Notify/Refcountable.cpp \
-  Notify/Routing_Slip.cpp \
-  Notify/Routing_Slip_Persistence_Manager.cpp \
-  Notify/Routing_Slip_Queue.cpp \
-  Notify/Sequence/SequenceProxyPushConsumer.cpp \
-  Notify/Sequence/SequenceProxyPushSupplier.cpp \
-  Notify/Sequence/SequencePushConsumer.cpp \
-  Notify/Sequence/SequencePushSupplier.cpp \
-  Notify/Service.cpp \
-  Notify/Standard_Event_Persistence.cpp \
-  Notify/Structured/StructuredEvent.cpp \
-  Notify/Structured/StructuredProxyPushConsumer.cpp \
-  Notify/Structured/StructuredProxyPushSupplier.cpp \
-  Notify/Structured/StructuredPushConsumer.cpp \
-  Notify/Structured/StructuredPushSupplier.cpp \
-  Notify/Subscription_Change_Worker.cpp \
-  Notify/Supplier.cpp \
-  Notify/SupplierAdmin.cpp \
-  Notify/ThreadPool_Task.cpp \
-  Notify/Timer_Queue.cpp \
-  Notify/Timer_Reactor.cpp \
-  Notify/Topology_Loader.cpp \
-  Notify/Topology_Object.cpp \
-  Notify/Topology_Saver.cpp \
-  Notify/Validate_Client_Task.cpp \
-  Notify/Worker_Task.cpp
-
-libTAO_CosNotification_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosNotification_Serv_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosNotification_Skel.la \
-  libTAO_CosEvent_Skel.la \
-  libTAO_CosNotification.la \
-  libTAO_CosEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Notify/Admin.h \
-  Notify/Admin.inl \
-  Notify/AdminProperties.h \
-  Notify/AdminProperties.inl \
-  Notify/Any/AnyEvent.h \
-  Notify/Any/CosEC_ProxyPushConsumer.h \
-  Notify/Any/CosEC_ProxyPushSupplier.h \
-  Notify/Any/ProxyPushConsumer.h \
-  Notify/Any/ProxyPushSupplier.h \
-  Notify/Any/PushConsumer.h \
-  Notify/Any/PushSupplier.h \
-  Notify/Bit_Vector.h \
-  Notify/Buffering_Strategy.h \
-  Notify/Builder.h \
-  Notify/Consumer.h \
-  Notify/Consumer.inl \
-  Notify/ConsumerAdmin.h \
-  Notify/CosNotify_Initializer.h \
-  Notify/CosNotify_Service.h \
-  Notify/Default_Factory.h \
-  Notify/Delivery_Request.h \
-  Notify/Delivery_Request.inl \
-  Notify/ETCL_Filter.h \
-  Notify/ETCL_FilterFactory.h \
-  Notify/Event.h \
-  Notify/Event.inl \
-  Notify/EventChannel.h \
-  Notify/EventChannelFactory.h \
-  Notify/EventType.h \
-  Notify/EventType.inl \
-  Notify/EventTypeSeq.h \
-  Notify/Event_Manager.h \
-  Notify/Event_Persistence_Factory.h \
-  Notify/FilterAdmin.h \
-  Notify/FilterAdmin.inl \
-  Notify/ID_Factory.h \
-  Notify/ID_Factory.inl \
-  Notify/Method_Request.h \
-  Notify/Method_Request_Dispatch.h \
-  Notify/Method_Request_Event.h \
-  Notify/Method_Request_Lookup.h \
-  Notify/Method_Request_Shutdown.h \
-  Notify/Method_Request_Updates.h \
-  Notify/Method_Request_Updates_T.cpp \
-  Notify/Name_Value_Pair.h \
-  Notify/Notify_Constraint_Interpreter.h \
-  Notify/Notify_Constraint_Visitors.h \
-  Notify/Notify_Default_CO_Factory.h \
-  Notify/Notify_Default_Collection_Factory.h \
-  Notify/Notify_Default_EMO_Factory.h \
-  Notify/Notify_Default_POA_Factory.h \
-  Notify/Notify_EventChannelFactory_i.h \
-  Notify/Object.h \
-  Notify/Object.inl \
-  Notify/POA_Helper.h \
-  Notify/POA_Helper.inl \
-  Notify/Peer.h \
-  Notify/Persistent_File_Allocator.h \
-  Notify/Properties.h \
-  Notify/Properties.inl \
-  Notify/PropertySeq.h \
-  Notify/PropertySeq.inl \
-  Notify/Property_Boolean.h \
-  Notify/Property_Boolean.inl \
-  Notify/Proxy.h \
-  Notify/Proxy.inl \
-  Notify/ProxyConsumer.h \
-  Notify/ProxyConsumer.inl \
-  Notify/ProxyConsumer_T.cpp \
-  Notify/ProxySupplier.h \
-  Notify/ProxySupplier.inl \
-  Notify/ProxySupplier_T.cpp \
-  Notify/Proxy_T.cpp \
-  Notify/QoSProperties.h \
-  Notify/QoSProperties.inl \
-  Notify/Random_File.h \
-  Notify/Reactive_Task.h \
-  Notify/Reactive_Task.inl \
-  Notify/Reconnection_Registry.h \
-  Notify/Refcountable.h \
-  Notify/Routing_Slip.h \
-  Notify/Routing_Slip_Persistence_Manager.h \
-  Notify/Routing_Slip_Queue.h \
-  Notify/Sequence/SequenceProxyPushConsumer.h \
-  Notify/Sequence/SequenceProxyPushSupplier.h \
-  Notify/Sequence/SequencePushConsumer.h \
-  Notify/Sequence/SequencePushSupplier.h \
-  Notify/Service.h \
-  Notify/Standard_Event_Persistence.h \
-  Notify/Structured/StructuredEvent.h \
-  Notify/Structured/StructuredProxyPushConsumer.h \
-  Notify/Structured/StructuredProxyPushSupplier.h \
-  Notify/Structured/StructuredPushConsumer.h \
-  Notify/Structured/StructuredPushSupplier.h \
-  Notify/Subscription_Change_Worker.h \
-  Notify/Supplier.h \
-  Notify/Supplier.inl \
-  Notify/SupplierAdmin.h \
-  Notify/ThreadPool_Task.h \
-  Notify/Timer_Queue.h \
-  Notify/Timer_Reactor.h \
-  Notify/Topology_Loader.h \
-  Notify/Topology_Object.h \
-  Notify/Topology_Object.inl \
-  Notify/Topology_Saver.h \
-  Notify/Validate_Client_Task.h \
-  Notify/Worker_Task.h \
-  Notify/notify_serv_export.h
-
-pkgconfig_DATA += \
-  TAO_CosNotification_Serv.pc
-
-CLEANFILES += \
-  TAO_CosNotification_Serv.pc
-
-TAO_CosNotification_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNotification_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNotification_Serv.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CosNotification_Serv.rc \
-  TAO_CosNotification_Serv.pc.in
-
-
-## Makefile.CosNotification_MC_Ext.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-BUILT_SOURCES += \
-  Notify/MonitorControlExt/NotifyMonitoringExtC.cpp \
-  Notify/MonitorControlExt/NotifyMonitoringExtC.h \
-  Notify/MonitorControlExt/NotifyMonitoringExtC.inl \
-  Notify/MonitorControlExt/NotifyMonitoringExtS.cpp \
-  Notify/MonitorControlExt/NotifyMonitoringExtS.h \
-  Notify/MonitorControlExt/NotifyMonitoringExtS.inl
-
-CLEANFILES += \
-  Notify/MonitorControlExt/NotifyMonitoringExt-stamp \
-  Notify/MonitorControlExt/NotifyMonitoringExtC.cpp \
-  Notify/MonitorControlExt/NotifyMonitoringExtC.h \
-  Notify/MonitorControlExt/NotifyMonitoringExtC.inl \
-  Notify/MonitorControlExt/NotifyMonitoringExtS.cpp \
-  Notify/MonitorControlExt/NotifyMonitoringExtS.h \
-  Notify/MonitorControlExt/NotifyMonitoringExtS.inl
-
-Notify/MonitorControlExt/NotifyMonitoringExtC.cpp Notify/MonitorControlExt/NotifyMonitoringExtC.h Notify/MonitorControlExt/NotifyMonitoringExtC.inl Notify/MonitorControlExt/NotifyMonitoringExtS.cpp Notify/MonitorControlExt/NotifyMonitoringExtS.h Notify/MonitorControlExt/NotifyMonitoringExtS.inl: Notify/MonitorControlExt/NotifyMonitoringExt-stamp
-
-Notify/MonitorControlExt/NotifyMonitoringExt-stamp: $(srcdir)/Notify/MonitorControlExt/NotifyMonitoringExt.idl $(TAO_IDL_DEP)
-	mkdir -p Notify/MonitorControlExt
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -o Notify/MonitorControlExt -Wb,export_macro=TAO_Notify_MC_Ext_Export -Wb,export_include=orbsvcs/Notify/MonitorControlExt/notify_mc_ext_export.h $(srcdir)/Notify/MonitorControlExt/NotifyMonitoringExt.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_CosNotification_MC_Ext.la
-
-libTAO_CosNotification_MC_Ext_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFY_MC_EXT_BUILD_DLL
-
-libTAO_CosNotification_MC_Ext_la_SOURCES = \
-  Notify/MonitorControlExt/MC_Default_Factory.cpp \
-  Notify/MonitorControlExt/MC_Notify_Service.cpp \
-  Notify/MonitorControlExt/MonitorConsumerAdmin.cpp \
-  Notify/MonitorControlExt/MonitorEventChannel.cpp \
-  Notify/MonitorControlExt/MonitorEventChannelFactory.cpp \
-  Notify/MonitorControlExt/MonitorSupplierAdmin.cpp \
-  Notify/MonitorControlExt/NotifyMonitoringExtC.cpp \
-  Notify/MonitorControlExt/NotifyMonitoringExtS.cpp
-
-libTAO_CosNotification_MC_Ext_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosNotification_MC_Ext_la_LIBADD = \
-  libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  libTAO_CosNotification_Skel.la \
-  libTAO_CosEvent_Skel.la \
-  libTAO_CosNotification.la \
-  libTAO_CosEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Notify/MonitorControlExt/MC_Default_Factory.h \
-  Notify/MonitorControlExt/MC_Notify_Service.h \
-  Notify/MonitorControlExt/MonitorConsumerAdmin.h \
-  Notify/MonitorControlExt/MonitorEventChannel.h \
-  Notify/MonitorControlExt/MonitorEventChannelFactory.h \
-  Notify/MonitorControlExt/MonitorSupplierAdmin.h \
-  Notify/MonitorControlExt/NotifyMonitoringExt.idl \
-  Notify/MonitorControlExt/NotifyMonitoringExtC.h \
-  Notify/MonitorControlExt/NotifyMonitoringExtC.inl \
-  Notify/MonitorControlExt/NotifyMonitoringExtS.h \
-  Notify/MonitorControlExt/NotifyMonitoringExtS.inl \
-  Notify/MonitorControlExt/notify_mc_ext_export.h
-
-endif !BUILD_WINCE
-endif BUILD_EXCEPTIONS
-
-## Makefile.CosNotification_Persist.am
-
-if BUILD_ACEXML
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-lib_LTLIBRARIES += libTAO_CosNotification_Persist.la
-
-libTAO_CosNotification_Persist_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(ACE_ROOT)/ACEXML/common \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFY_PERSIST_BUILD_DLL
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-libTAO_CosNotification_Persist_la_CPPFLAGS += \
-  $(ACE_ZZIP_CPPFLAGS) \
-  $(ACE_ZLIB_CPPFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
-libTAO_CosNotification_Persist_la_SOURCES = \
-  Notify/XML_Loader.cpp \
-  Notify/XML_Saver.cpp \
-  Notify/XML_Topology_Factory.cpp
-
-libTAO_CosNotification_Persist_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-libTAO_CosNotification_Persist_la_LDFLAGS += \
-  $(ACE_ZZIP_LDFLAGS) \
-  $(ACE_ZLIB_LDFLAGS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
-libTAO_CosNotification_Persist_la_LIBADD = \
-  $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
-  $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
-  libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  libTAO_CosNotification_Skel.la \
-  libTAO_CosEvent_Skel.la \
-  libTAO_CosNotification.la \
-  libTAO_CosEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-if BUILD_ZLIB
-if BUILD_ZZIP
-libTAO_CosNotification_Persist_la_LIBADD += \
-  $(ACE_ZZIP_LIBS) \
-  $(ACE_ZLIB_LIBS)
-endif BUILD_ZZIP
-endif BUILD_ZLIB
-
-nobase_include_HEADERS += \
-  Notify/XML_Loader.h \
-  Notify/XML_Saver.h \
-  Notify/XML_Topology_Factory.h \
-  Notify/notify_persist_export.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_ACEXML
-
-## Makefile.CosTime.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TimeServiceC.cpp \
-  TimeServiceC.h \
-  TimeServiceC.inl \
-  TimeServiceS.cpp \
-  TimeServiceS.h \
-  TimeServiceS.inl
-
-CLEANFILES += \
-  TimeService-stamp \
-  TimeServiceC.cpp \
-  TimeServiceC.h \
-  TimeServiceC.inl \
-  TimeServiceS.cpp \
-  TimeServiceS.h \
-  TimeServiceS.inl
-
-TimeServiceC.cpp TimeServiceC.h TimeServiceC.inl TimeServiceS.cpp TimeServiceS.h TimeServiceS.inl: TimeService-stamp
-
-TimeService-stamp: $(srcdir)/TimeService.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_CosTime.la
-
-libTAO_CosTime_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_TIME_BUILD_DLL
-
-libTAO_CosTime_la_SOURCES = \
-  Time/TAO_TIO.cpp \
-  Time/TAO_Time_Service_Clerk.cpp \
-  Time/TAO_Time_Service_Server.cpp \
-  Time/TAO_UTO.cpp \
-  Time/Timer_Helper.cpp \
-  TimeServiceC.cpp \
-  TimeServiceS.cpp
-
-libTAO_CosTime_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosTime_la_LIBADD = \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Time/TAO_TIO.h \
-  Time/TAO_Time_Service_Clerk.h \
-  Time/TAO_Time_Service_Server.h \
-  Time/TAO_UTO.h \
-  Time/Timer_Helper.h \
-  Time/time_export.h \
-  TimeService.idl \
-  TimeServiceC.h \
-  TimeServiceC.inl \
-  TimeServiceS.h \
-  TimeServiceS.inl
-
-pkgconfig_DATA += \
-  TAO_CosTime.pc
-
-CLEANFILES += \
-  TAO_CosTime.pc
-
-TAO_CosTime.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTime.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTime.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CosTime.rc \
-  TAO_CosTime.pc.in
-
-
-## Makefile.CosTrading_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  CosTradingC.cpp \
-  CosTradingC.h \
-  CosTradingC.inl \
-  CosTradingS.cpp \
-  CosTradingS.h \
-  CosTradingS.inl
-
-CLEANFILES += \
-  CosTrading-stamp \
-  CosTradingC.cpp \
-  CosTradingC.h \
-  CosTradingC.inl \
-  CosTradingS.cpp \
-  CosTradingS.h \
-  CosTradingS.inl
-
-CosTradingC.cpp CosTradingC.h CosTradingC.inl CosTradingS.cpp CosTradingS.h CosTradingS.inl: CosTrading-stamp
-
-CosTrading-stamp: $(srcdir)/CosTrading.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CosTradingReposC.cpp \
-  CosTradingReposC.h \
-  CosTradingReposC.inl \
-  CosTradingReposS.cpp \
-  CosTradingReposS.h \
-  CosTradingReposS.inl
-
-CLEANFILES += \
-  CosTradingRepos-stamp \
-  CosTradingReposC.cpp \
-  CosTradingReposC.h \
-  CosTradingReposC.inl \
-  CosTradingReposS.cpp \
-  CosTradingReposS.h \
-  CosTradingReposS.inl
-
-CosTradingReposC.cpp CosTradingReposC.h CosTradingReposC.inl CosTradingReposS.cpp CosTradingReposS.h CosTradingReposS.inl: CosTradingRepos-stamp
-
-CosTradingRepos-stamp: $(srcdir)/CosTradingRepos.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CosTradingDynamicC.cpp \
-  CosTradingDynamicC.h \
-  CosTradingDynamicC.inl \
-  CosTradingDynamicS.cpp \
-  CosTradingDynamicS.h \
-  CosTradingDynamicS.inl
-
-CLEANFILES += \
-  CosTradingDynamic-stamp \
-  CosTradingDynamicC.cpp \
-  CosTradingDynamicC.h \
-  CosTradingDynamicC.inl \
-  CosTradingDynamicS.cpp \
-  CosTradingDynamicS.h \
-  CosTradingDynamicS.inl
-
-CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicC.inl CosTradingDynamicS.cpp CosTradingDynamicS.h CosTradingDynamicS.inl: CosTradingDynamic-stamp
-
-CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl
-	@touch $@
-
-nobase_include_HEADERS += \
-  CosTrading.idl \
-  CosTradingDynamic.idl \
-  CosTradingRepos.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CosTrading.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosTrading.la
-
-libTAO_CosTrading_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_TRADING_BUILD_DLL
-
-libTAO_CosTrading_la_SOURCES = \
-  CosTradingC.cpp \
-  CosTradingDynamicC.cpp \
-  CosTradingReposC.cpp
-
-libTAO_CosTrading_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosTrading_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosTradingC.h \
-  CosTradingC.inl \
-  CosTradingDynamicC.h \
-  CosTradingDynamicC.inl \
-  CosTradingReposC.h \
-  CosTradingReposC.inl \
-  Trader/trading_export.h
-
-pkgconfig_DATA += \
-  TAO_CosTrading.pc
-
-CLEANFILES += \
-  TAO_CosTrading.pc
-
-TAO_CosTrading.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTrading.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTrading.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CosTrading.rc \
-  TAO_CosTrading.pc.in
-
-
-## Makefile.CosTrading_Skel.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosTrading_Skel.la
-
-libTAO_CosTrading_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_TRADING_SKEL_BUILD_DLL
-
-libTAO_CosTrading_Skel_la_SOURCES = \
-  CosTradingDynamicS.cpp \
-  CosTradingReposS.cpp \
-  CosTradingS.cpp
-
-libTAO_CosTrading_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosTrading_Skel_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CosTradingDynamicS.h \
-  CosTradingDynamicS.inl \
-  CosTradingReposS.h \
-  CosTradingReposS.inl \
-  CosTradingS.h \
-  CosTradingS.inl \
-  Trader/trading_skel_export.h
-
-pkgconfig_DATA += \
-  TAO_CosTrading_Skel.pc
-
-CLEANFILES += \
-  TAO_CosTrading_Skel.pc
-
-TAO_CosTrading_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTrading_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTrading_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CosTrading_Skel.rc \
-  TAO_CosTrading_Skel.pc.in
-
-
-## Makefile.CosTrading_Serv.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_CosTrading_Serv.la
-
-libTAO_CosTrading_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_TRADING_SERV_BUILD_DLL
-
-libTAO_CosTrading_Serv_la_SOURCES = \
-  Trader/Constraint_Interpreter.cpp \
-  Trader/Constraint_Nodes.cpp \
-  Trader/Constraint_Visitors.cpp \
-  Trader/Constraint_l.cpp \
-  Trader/Constraint_y.cpp \
-  Trader/Interpreter.cpp \
-  Trader/Interpreter_Utils.cpp \
-  Trader/Offer_Database.cpp \
-  Trader/Offer_Iterators.cpp \
-  Trader/Service_Type_Repository.cpp \
-  Trader/Trader.cpp \
-  Trader/Trader_Constraint_Visitors.cpp \
-  Trader/Trader_Interfaces.cpp \
-  Trader/Trader_Utils.cpp \
-  Trader/Trading_Loader.cpp
-
-libTAO_CosTrading_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CosTrading_Serv_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Trader/Constraint_Interpreter.h \
-  Trader/Constraint_Nodes.h \
-  Trader/Constraint_Nodes.inl \
-  Trader/Constraint_Visitors.h \
-  Trader/Interpreter.h \
-  Trader/Interpreter_Utils.h \
-  Trader/Interpreter_Utils_T.cpp \
-  Trader/Offer_Database.h \
-  Trader/Offer_Iterators.h \
-  Trader/Offer_Iterators_T.cpp \
-  Trader/Service_Type_Repository.h \
-  Trader/Trader.h \
-  Trader/Trader_Constraint_Visitors.h \
-  Trader/Trader_Interfaces.h \
-  Trader/Trader_T.cpp \
-  Trader/Trader_Utils.h \
-  Trader/Trading_Loader.h \
-  Trader/trading_serv_export.h
-
-pkgconfig_DATA += \
-  TAO_CosTrading_Serv.pc
-
-CLEANFILES += \
-  TAO_CosTrading_Serv.pc
-
-TAO_CosTrading_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTrading_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTrading_Serv.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CosTrading_Serv.rc \
-  TAO_CosTrading_Serv.pc.in
-
-
-## Makefile.DsLogAdmin_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  DsLogAdminC.cpp \
-  DsLogAdminC.h \
-  DsLogAdminC.inl \
-  DsLogAdminS.cpp \
-  DsLogAdminS.h \
-  DsLogAdminS.inl
-
-CLEANFILES += \
-  DsLogAdmin-stamp \
-  DsLogAdminC.cpp \
-  DsLogAdminC.h \
-  DsLogAdminC.inl \
-  DsLogAdminS.cpp \
-  DsLogAdminS.h \
-  DsLogAdminS.inl
-
-DsLogAdminC.cpp DsLogAdminC.h DsLogAdminC.inl DsLogAdminS.cpp DsLogAdminS.h DsLogAdminS.inl: DsLogAdmin-stamp
-
-DsLogAdmin-stamp: $(srcdir)/DsLogAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  DsLogNotificationC.cpp \
-  DsLogNotificationC.h \
-  DsLogNotificationC.inl \
-  DsLogNotificationS.cpp \
-  DsLogNotificationS.h \
-  DsLogNotificationS.inl
-
-CLEANFILES += \
-  DsLogNotification-stamp \
-  DsLogNotificationC.cpp \
-  DsLogNotificationC.h \
-  DsLogNotificationC.inl \
-  DsLogNotificationS.cpp \
-  DsLogNotificationS.h \
-  DsLogNotificationS.inl
-
-DsLogNotificationC.cpp DsLogNotificationC.h DsLogNotificationC.inl DsLogNotificationS.cpp DsLogNotificationS.h DsLogNotificationS.inl: DsLogNotification-stamp
-
-DsLogNotification-stamp: $(srcdir)/DsLogNotification.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl
-	@touch $@
-
-nobase_include_HEADERS += \
-  DsLogAdmin.idl \
-  DsLogNotification.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.DsLogAdmin.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_DsLogAdmin.la
-
-libTAO_DsLogAdmin_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_LOG_BUILD_DLL
-
-libTAO_DsLogAdmin_la_SOURCES = \
-  DsLogAdminC.cpp \
-  DsLogNotificationC.cpp
-
-libTAO_DsLogAdmin_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsLogAdmin_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  DsLogAdminC.h \
-  DsLogAdminC.inl \
-  DsLogNotificationC.h \
-  DsLogNotificationC.inl \
-  Log/log_export.h
-
-pkgconfig_DATA += \
-  TAO_DsLogAdmin.pc
-
-CLEANFILES += \
-  TAO_DsLogAdmin.pc
-
-TAO_DsLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsLogAdmin.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsLogAdmin.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  DsLogAdmin.rc \
-  TAO_DsLogAdmin.pc.in
-
-
-## Makefile.DsEventLogAdmin_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  DsEventLogAdminC.cpp \
-  DsEventLogAdminC.h \
-  DsEventLogAdminC.inl \
-  DsEventLogAdminS.cpp \
-  DsEventLogAdminS.h \
-  DsEventLogAdminS.inl
-
-CLEANFILES += \
-  DsEventLogAdmin-stamp \
-  DsEventLogAdminC.cpp \
-  DsEventLogAdminC.h \
-  DsEventLogAdminC.inl \
-  DsEventLogAdminS.cpp \
-  DsEventLogAdminS.h \
-  DsEventLogAdminS.inl
-
-DsEventLogAdminC.cpp DsEventLogAdminC.h DsEventLogAdminC.inl DsEventLogAdminS.cpp DsEventLogAdminS.h DsEventLogAdminS.inl: DsEventLogAdmin-stamp
-
-DsEventLogAdmin-stamp: $(srcdir)/DsEventLogAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl
-	@touch $@
-
-nobase_include_HEADERS += \
-  DsEventLogAdmin.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.DsEventLogAdmin.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_DsEventLogAdmin.la
-
-libTAO_DsEventLogAdmin_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_EVENTLOG_BUILD_DLL
-
-libTAO_DsEventLogAdmin_la_SOURCES = \
-  DsEventLogAdminC.cpp
-
-libTAO_DsEventLogAdmin_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsEventLogAdmin_la_LIBADD = \
-  libTAO_CosEvent.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  DsEventLogAdminC.h \
-  DsEventLogAdminC.inl \
-  Log/eventlog_export.h
-
-pkgconfig_DATA += \
-  TAO_DsEventLogAdmin.pc
-
-CLEANFILES += \
-  TAO_DsEventLogAdmin.pc
-
-TAO_DsEventLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsEventLogAdmin.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsEventLogAdmin.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  DsEventLogAdmin.rc \
-  TAO_DsEventLogAdmin.pc.in
-
-
-## Makefile.DsLogAdmin_Skel.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_DsLogAdmin_Skel.la
-
-libTAO_DsLogAdmin_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_LOG_SKEL_BUILD_DLL
-
-libTAO_DsLogAdmin_Skel_la_SOURCES = \
-  DsLogAdminS.cpp \
-  DsLogNotificationS.cpp
-
-libTAO_DsLogAdmin_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsLogAdmin_Skel_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  DsLogAdminS.h \
-  DsLogAdminS.inl \
-  DsLogNotificationS.h \
-  DsLogNotificationS.inl \
-  Log/log_skel_export.h
-
-pkgconfig_DATA += \
-  TAO_DsLogAdmin_Skel.pc
-
-CLEANFILES += \
-  TAO_DsLogAdmin_Skel.pc
-
-TAO_DsLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsLogAdmin_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsLogAdmin_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  TAO_DsLogAdmin_Skel.pc.in
-
-
-## Makefile.DsLogAdmin_Serv.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_DsLogAdmin_Serv.la
-
-libTAO_DsLogAdmin_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_LOG_SERV_BUILD_DLL
-
-libTAO_DsLogAdmin_Serv_la_SOURCES = \
-  Log/BasicLogFactory_i.cpp \
-  Log/BasicLog_i.cpp \
-  Log/Hash_Iterator_i.cpp \
-  Log/Hash_LogRecordStore.cpp \
-  Log/Hash_LogStore.cpp \
-  Log/Hash_Persistence_Strategy.cpp \
-  Log/Iterator_i.cpp \
-  Log/LogActivator.cpp \
-  Log/LogMgr_i.cpp \
-  Log/LogNotification.cpp \
-  Log/LogRecordStore.cpp \
-  Log/Log_Compaction_Handler.cpp \
-  Log/Log_Constraint_Interpreter.cpp \
-  Log/Log_Constraint_Visitors.cpp \
-  Log/Log_Flush_Handler.cpp \
-  Log/Log_i.cpp
-
-libTAO_DsLogAdmin_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsLogAdmin_Serv_la_LIBADD = \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Log/BasicLogFactory_i.h \
-  Log/BasicLog_i.h \
-  Log/Hash_Iterator_i.h \
-  Log/Hash_LogRecordStore.h \
-  Log/Hash_LogStore.h \
-  Log/Hash_Persistence_Strategy.h \
-  Log/Iterator_i.h \
-  Log/LogActivator.h \
-  Log/LogMgr_i.h \
-  Log/LogNotification.h \
-  Log/LogRecordStore.h \
-  Log/LogStore.h \
-  Log/Log_Compaction_Handler.h \
-  Log/Log_Constraint_Interpreter.h \
-  Log/Log_Constraint_Visitors.h \
-  Log/Log_Flush_Handler.h \
-  Log/Log_Persistence_Strategy.h \
-  Log/Log_i.h \
-  Log/log_serv_export.h
-
-pkgconfig_DATA += \
-  TAO_DsLogAdmin_Serv.pc
-
-CLEANFILES += \
-  TAO_DsLogAdmin_Serv.pc
-
-TAO_DsLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsLogAdmin_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsLogAdmin_Serv.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  TAO_DsLogAdmin_Serv.pc.in
-
-
-## Makefile.DsEventLogAdmin_Skel.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_DsEventLogAdmin_Skel.la
-
-libTAO_DsEventLogAdmin_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_EVENTLOG_SKEL_BUILD_DLL
-
-libTAO_DsEventLogAdmin_Skel_la_SOURCES = \
-  DsEventLogAdminS.cpp
-
-libTAO_DsEventLogAdmin_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsEventLogAdmin_Skel_la_LIBADD = \
-  libTAO_CosEvent_Skel.la \
-  libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_DsEventLogAdmin.la \
-  libTAO_CosEvent.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  DsEventLogAdminS.h \
-  DsEventLogAdminS.inl \
-  Log/eventlog_skel_export.h
-
-pkgconfig_DATA += \
-  TAO_DsEventLogAdmin_Skel.pc
-
-CLEANFILES += \
-  TAO_DsEventLogAdmin_Skel.pc
-
-TAO_DsEventLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsEventLogAdmin_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsEventLogAdmin_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  TAO_DsEventLogAdmin_Skel.pc.in
-
-
-## Makefile.DsEventLogAdmin_Serv.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_DsEventLogAdmin_Serv.la
-
-libTAO_DsEventLogAdmin_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_EVENTLOG_SERV_BUILD_DLL
-
-libTAO_DsEventLogAdmin_Serv_la_SOURCES = \
-  Log/EventLogConsumer.cpp \
-  Log/EventLogFactory_i.cpp \
-  Log/EventLogNotification.cpp \
-  Log/EventLog_i.cpp
-
-libTAO_DsEventLogAdmin_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsEventLogAdmin_Serv_la_LIBADD = \
-  libTAO_CosEvent_Serv.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  libTAO_DsLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  libTAO_Svc_Utils.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_DsEventLogAdmin_Skel.la \
-  libTAO_CosEvent_Skel.la \
-  libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_DsEventLogAdmin.la \
-  libTAO_CosEvent.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Log/EventLogConsumer.h \
-  Log/EventLogFactory_i.h \
-  Log/EventLogNotification.h \
-  Log/EventLog_i.h \
-  Log/eventlog_serv_export.h
-
-pkgconfig_DATA += \
-  TAO_DsEventLogAdmin_Serv.pc
-
-CLEANFILES += \
-  TAO_DsEventLogAdmin_Serv.pc
-
-TAO_DsEventLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsEventLogAdmin_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsEventLogAdmin_Serv.pc.in
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  TAO_DsEventLogAdmin_Serv.pc.in
-
-
-## Makefile.DsNotifyLogAdmin_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  DsNotifyLogAdminC.cpp \
-  DsNotifyLogAdminC.h \
-  DsNotifyLogAdminC.inl \
-  DsNotifyLogAdminS.cpp \
-  DsNotifyLogAdminS.h \
-  DsNotifyLogAdminS.inl
-
-CLEANFILES += \
-  DsNotifyLogAdmin-stamp \
-  DsNotifyLogAdminC.cpp \
-  DsNotifyLogAdminC.h \
-  DsNotifyLogAdminC.inl \
-  DsNotifyLogAdminS.cpp \
-  DsNotifyLogAdminS.h \
-  DsNotifyLogAdminS.inl
-
-DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h DsNotifyLogAdminC.inl DsNotifyLogAdminS.cpp DsNotifyLogAdminS.h DsNotifyLogAdminS.inl: DsNotifyLogAdmin-stamp
-
-DsNotifyLogAdmin-stamp: $(srcdir)/DsNotifyLogAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl
-	@touch $@
-
-nobase_include_HEADERS += \
-  DsNotifyLogAdmin.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.DsNotifyLogAdmin.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin.la
-
-libTAO_DsNotifyLogAdmin_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFYLOG_BUILD_DLL
-
-libTAO_DsNotifyLogAdmin_la_SOURCES = \
-  DsNotifyLogAdminC.cpp
-
-libTAO_DsNotifyLogAdmin_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsNotifyLogAdmin_la_LIBADD = \
-  libTAO_CosNotification.la \
-  libTAO_DsEventLogAdmin.la \
-  libTAO_CosEvent.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  DsNotifyLogAdminC.h \
-  DsNotifyLogAdminC.inl \
-  Log/notifylog_export.h
-
-pkgconfig_DATA += \
-  TAO_DsNotifyLogAdmin.pc
-
-CLEANFILES += \
-  TAO_DsNotifyLogAdmin.pc
-
-TAO_DsNotifyLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsNotifyLogAdmin.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsNotifyLogAdmin.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  DsNotifyLogAdmin.rc \
-  TAO_DsNotifyLogAdmin.pc.in
-
-
-## Makefile.DsNotifyLogAdmin_Skel.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin_Skel.la
-
-libTAO_DsNotifyLogAdmin_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFYLOG_SKEL_BUILD_DLL
-
-libTAO_DsNotifyLogAdmin_Skel_la_SOURCES = \
-  DsNotifyLogAdminS.cpp
-
-libTAO_DsNotifyLogAdmin_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsNotifyLogAdmin_Skel_la_LIBADD = \
-  libTAO_CosNotification_Skel.la \
-  libTAO_DsEventLogAdmin_Skel.la \
-  libTAO_CosEvent_Skel.la \
-  libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_DsNotifyLogAdmin.la \
-  libTAO_CosNotification.la \
-  libTAO_DsEventLogAdmin.la \
-  libTAO_CosEvent.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  DsNotifyLogAdminS.h \
-  DsNotifyLogAdminS.inl \
-  Log/notifylog_skel_export.h
-
-pkgconfig_DATA += \
-  TAO_DsNotifyLogAdmin_Skel.pc
-
-CLEANFILES += \
-  TAO_DsNotifyLogAdmin_Skel.pc
-
-TAO_DsNotifyLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsNotifyLogAdmin_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsNotifyLogAdmin_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  TAO_DsNotifyLogAdmin_Skel.pc.in
-
-
-## Makefile.DsNotifyLogAdmin_Serv.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin_Serv.la
-
-libTAO_DsNotifyLogAdmin_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFYLOG_SERV_BUILD_DLL
-
-libTAO_DsNotifyLogAdmin_Serv_la_SOURCES = \
-  Log/NotifyLogConsumer.cpp \
-  Log/NotifyLogFactory_i.cpp \
-  Log/NotifyLogNotification.cpp \
-  Log/NotifyLog_i.cpp
-
-libTAO_DsNotifyLogAdmin_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \
-  libTAO_DsLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  libTAO_Svc_Utils.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_DsNotifyLogAdmin_Skel.la \
-  libTAO_CosNotification_Skel.la \
-  libTAO_DsEventLogAdmin_Skel.la \
-  libTAO_CosEvent_Skel.la \
-  libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_DsNotifyLogAdmin.la \
-  libTAO_CosNotification.la \
-  libTAO_DsEventLogAdmin.la \
-  libTAO_CosEvent.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Log/NotifyLogConsumer.h \
-  Log/NotifyLogFactory_i.h \
-  Log/NotifyLogNotification.h \
-  Log/NotifyLog_i.h \
-  Log/notifylog_serv_export.h
-
-pkgconfig_DATA += \
-  TAO_DsNotifyLogAdmin_Serv.pc
-
-CLEANFILES += \
-  TAO_DsNotifyLogAdmin_Serv.pc
-
-TAO_DsNotifyLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsNotifyLogAdmin_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsNotifyLogAdmin_Serv.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  TAO_DsNotifyLogAdmin_Serv.pc.in
-
-
-## Makefile.FTORB_Utils.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  FT_CORBA_ORBC.cpp \
-  FT_CORBA_ORBC.h \
-  FT_CORBA_ORBC.inl \
-  FT_CORBA_ORBS.cpp \
-  FT_CORBA_ORBS.h \
-  FT_CORBA_ORBS.inl
-
-CLEANFILES += \
-  FT_CORBA_ORB-stamp \
-  FT_CORBA_ORBC.cpp \
-  FT_CORBA_ORBC.h \
-  FT_CORBA_ORBC.inl \
-  FT_CORBA_ORBS.cpp \
-  FT_CORBA_ORBS.h \
-  FT_CORBA_ORBS.inl
-
-FT_CORBA_ORBC.cpp FT_CORBA_ORBC.h FT_CORBA_ORBC.inl FT_CORBA_ORBS.cpp FT_CORBA_ORBS.h FT_CORBA_ORBS.inl: FT_CORBA_ORB-stamp
-
-FT_CORBA_ORB-stamp: $(srcdir)/FT_CORBA_ORB.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_FTORB_Utils.la
-
-libTAO_FTORB_Utils_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_FT_ORB_UTILS_BUILD_DLL
-
-libTAO_FTORB_Utils_la_SOURCES = \
-  FT_CORBA_ORBC.cpp \
-  FT_CORBA_ORBS.cpp \
-  FaultTolerance/FT_IOGR_Property.cpp
-
-libTAO_FTORB_Utils_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_FTORB_Utils_la_LIBADD = \
-  libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Channel_Clients_T.cpp \
-  FT_CORBA_ORB.idl \
-  FT_CORBA_ORBC.h \
-  FT_CORBA_ORBC.inl \
-  FT_CORBA_ORBS.h \
-  FT_CORBA_ORBS.inl \
-  FaultTolerance/FT_IOGR_Property.h \
-  FaultTolerance/FT_IOGR_Property.inl \
-  FaultTolerance/FT_ORB_Utils_export.h
-
-pkgconfig_DATA += \
-  TAO_FTORB_Utils.pc
-
-CLEANFILES += \
-  TAO_FTORB_Utils.pc
-
-TAO_FTORB_Utils.pc: ${top_builddir}/config.status ${srcdir}/TAO_FTORB_Utils.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_FTORB_Utils.pc.in
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  TAO_FTORB_Utils.pc.in
-
-
-## Makefile.FTRT_ClientORB.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_FTRT_ClientORB.la
-
-libTAO_FTRT_ClientORB_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_FTRT_BUILD_DLL
-
-libTAO_FTRT_ClientORB_la_SOURCES = \
-  FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp \
-  FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp \
-  FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
-
-libTAO_FTRT_ClientORB_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_FTRT_ClientORB_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h \
-  FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h \
-  FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RTEvent.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  RtecDefaultEventDataC.cpp \
-  RtecDefaultEventDataC.h \
-  RtecDefaultEventDataC.inl \
-  RtecDefaultEventDataS_T.cpp
-
-CLEANFILES += \
-  RtecDefaultEventData-stamp \
-  RtecDefaultEventDataC.cpp \
-  RtecDefaultEventDataC.h \
-  RtecDefaultEventDataC.inl \
-  RtecDefaultEventDataS_T.cpp
-
-RtecDefaultEventDataC.cpp RtecDefaultEventDataC.h RtecDefaultEventDataC.inl RtecDefaultEventDataS_T.cpp: RtecDefaultEventData-stamp
-
-RtecDefaultEventData-stamp: $(srcdir)/RtecDefaultEventData.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecDefaultEventData.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  RtecEventCommC.cpp \
-  RtecEventCommC.h \
-  RtecEventCommC.inl \
-  RtecEventCommS_T.cpp
-
-CLEANFILES += \
-  RtecEventComm-stamp \
-  RtecEventCommC.cpp \
-  RtecEventCommC.h \
-  RtecEventCommC.inl \
-  RtecEventCommS_T.cpp
-
-RtecEventCommC.cpp RtecEventCommC.h RtecEventCommC.inl RtecEventCommS_T.cpp: RtecEventComm-stamp
-
-RtecEventComm-stamp: $(srcdir)/RtecEventComm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventComm.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  RtecEventChannelAdminC.cpp \
-  RtecEventChannelAdminC.h \
-  RtecEventChannelAdminC.inl \
-  RtecEventChannelAdminS_T.cpp
-
-CLEANFILES += \
-  RtecEventChannelAdmin-stamp \
-  RtecEventChannelAdminC.cpp \
-  RtecEventChannelAdminC.h \
-  RtecEventChannelAdminC.inl \
-  RtecEventChannelAdminS_T.cpp
-
-RtecEventChannelAdminC.cpp RtecEventChannelAdminC.h RtecEventChannelAdminC.inl RtecEventChannelAdminS_T.cpp: RtecEventChannelAdmin-stamp
-
-RtecEventChannelAdmin-stamp: $(srcdir)/RtecEventChannelAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventChannelAdmin.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  RtecUDPAdminC.cpp \
-  RtecUDPAdminC.h \
-  RtecUDPAdminC.inl \
-  RtecUDPAdminS_T.cpp
-
-CLEANFILES += \
-  RtecUDPAdmin-stamp \
-  RtecUDPAdminC.cpp \
-  RtecUDPAdminC.h \
-  RtecUDPAdminC.inl \
-  RtecUDPAdminS_T.cpp
-
-RtecUDPAdminC.cpp RtecUDPAdminC.h RtecUDPAdminC.inl RtecUDPAdminS_T.cpp: RtecUDPAdmin-stamp
-
-RtecUDPAdmin-stamp: $(srcdir)/RtecUDPAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_RTEvent.la
-
-libTAO_RTEvent_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_RTEVENT_BUILD_DLL
-
-libTAO_RTEvent_la_SOURCES = \
-  Event_Utilities.cpp \
-  RtecDefaultEventDataC.cpp \
-  RtecEventChannelAdminC.cpp \
-  RtecEventCommC.cpp \
-  RtecUDPAdminC.cpp
-
-libTAO_RTEvent_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTEvent_la_LIBADD = \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Event/event_export.h \
-  Event/event_skel_export.h \
-  Event_Utilities.h \
-  Event_Utilities.inl \
-  RtecDefaultEventData.idl \
-  RtecDefaultEventDataC.h \
-  RtecDefaultEventDataC.inl \
-  RtecEventChannelAdmin.idl \
-  RtecEventChannelAdminC.h \
-  RtecEventChannelAdminC.inl \
-  RtecEventComm.idl \
-  RtecEventCommC.h \
-  RtecEventCommC.inl \
-  RtecUDPAdmin.idl \
-  RtecUDPAdminC.h \
-  RtecUDPAdminC.inl
-
-pkgconfig_DATA += \
-  TAO_RTEvent.pc
-
-CLEANFILES += \
-  TAO_RTEvent.pc
-
-TAO_RTEvent.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  RTEvent.rc \
-  TAO_RTEvent.pc.in
-
-
-## Makefile.RTEvent_Skel.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_RTEvent_Skel.la
-
-libTAO_RTEvent_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_RTEVENT_SKEL_BUILD_DLL
-
-libTAO_RTEvent_Skel_la_SOURCES = \
-  RtecDefaultEventDataS.cpp \
-  RtecEventChannelAdminS.cpp \
-  RtecEventCommS.cpp \
-  RtecUDPAdminS.cpp
-
-libTAO_RTEvent_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTEvent_Skel_la_LIBADD = \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Event/event_skel_export.h \
-  RtecDefaultEventDataS.h \
-  RtecDefaultEventDataS.inl \
-  RtecEventChannelAdminS.h \
-  RtecEventChannelAdminS.inl \
-  RtecEventCommS.h \
-  RtecEventCommS.inl \
-  RtecUDPAdminS.h \
-  RtecUDPAdminS.inl
-
-pkgconfig_DATA += \
-  TAO_RTEvent_Skel.pc
-
-CLEANFILES += \
-  TAO_RTEvent_Skel.pc
-
-TAO_RTEvent_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  RTEvent_Skel.rc \
-  TAO_RTEvent_Skel.pc.in
-
-
-## Makefile.RTEvent_Serv.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-lib_LTLIBRARIES += libTAO_RTEvent_Serv.la
-
-libTAO_RTEvent_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_RTEVENT_SERV_BUILD_DLL
-
-libTAO_RTEvent_Serv_la_SOURCES = \
-  Event/ECG_Adapters.cpp \
-  Event/ECG_CDR_Message_Receiver.cpp \
-  Event/ECG_CDR_Message_Sender.cpp \
-  Event/ECG_Complex_Address_Server.cpp \
-  Event/ECG_ConsumerEC_Control.cpp \
-  Event/ECG_Mcast_EH.cpp \
-  Event/ECG_Mcast_Gateway.cpp \
-  Event/ECG_Reactive_ConsumerEC_Control.cpp \
-  Event/ECG_Reconnect_ConsumerEC_Control.cpp \
-  Event/ECG_Simple_Address_Server.cpp \
-  Event/ECG_Simple_Mcast_EH.cpp \
-  Event/ECG_UDP_EH.cpp \
-  Event/ECG_UDP_Out_Endpoint.cpp \
-  Event/ECG_UDP_Receiver.cpp \
-  Event/ECG_UDP_Sender.cpp \
-  Event/EC_And_Filter.cpp \
-  Event/EC_Basic_Factory.cpp \
-  Event/EC_Basic_Filter_Builder.cpp \
-  Event/EC_Bitmask_Filter.cpp \
-  Event/EC_Channel_Destroyer.cpp \
-  Event/EC_Conjunction_Filter.cpp \
-  Event/EC_ConsumerAdmin.cpp \
-  Event/EC_ConsumerControl.cpp \
-  Event/EC_Default_Factory.cpp \
-  Event/EC_Default_ProxyConsumer.cpp \
-  Event/EC_Default_ProxySupplier.cpp \
-  Event/EC_Disjunction_Filter.cpp \
-  Event/EC_Dispatching.cpp \
-  Event/EC_Dispatching_Task.cpp \
-  Event/EC_Event_Channel.cpp \
-  Event/EC_Event_Channel_Base.cpp \
-  Event/EC_Factory.cpp \
-  Event/EC_Filter.cpp \
-  Event/EC_Filter_Builder.cpp \
-  Event/EC_Gateway.cpp \
-  Event/EC_Gateway_IIOP.cpp \
-  Event/EC_Gateway_IIOP_Factory.cpp \
-  Event/EC_Group_Scheduling.cpp \
-  Event/EC_Lifetime_Utils.cpp \
-  Event/EC_MT_Dispatching.cpp \
-  Event/EC_Masked_Type_Filter.cpp \
-  Event/EC_Negation_Filter.cpp \
-  Event/EC_Null_Factory.cpp \
-  Event/EC_Null_Scheduling.cpp \
-  Event/EC_ObserverStrategy.cpp \
-  Event/EC_Per_Supplier_Filter.cpp \
-  Event/EC_Prefix_Filter_Builder.cpp \
-  Event/EC_ProxyConsumer.cpp \
-  Event/EC_ProxySupplier.cpp \
-  Event/EC_Proxy_Disconnector.cpp \
-  Event/EC_QOS_Info.cpp \
-  Event/EC_Reactive_ConsumerControl.cpp \
-  Event/EC_Reactive_Dispatching.cpp \
-  Event/EC_Reactive_SupplierControl.cpp \
-  Event/EC_Reactive_Timeout_Generator.cpp \
-  Event/EC_Scheduling_Strategy.cpp \
-  Event/EC_SupplierAdmin.cpp \
-  Event/EC_SupplierControl.cpp \
-  Event/EC_Supplier_Filter.cpp \
-  Event/EC_Supplier_Filter_Builder.cpp \
-  Event/EC_TPC_Dispatching.cpp \
-  Event/EC_TPC_Dispatching_Task.cpp \
-  Event/EC_TPC_Factory.cpp \
-  Event/EC_TPC_ProxyConsumer.cpp \
-  Event/EC_TPC_ProxySupplier.cpp \
-  Event/EC_Thread_Flags.cpp \
-  Event/EC_Timeout_Filter.cpp \
-  Event/EC_Timeout_Generator.cpp \
-  Event/EC_Trivial_Supplier_Filter.cpp \
-  Event/EC_Type_Filter.cpp \
-  Event/EC_UDP_Admin.cpp
-
-libTAO_RTEvent_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTEvent_Serv_la_LIBADD = \
-  libTAO_RTEvent_Skel.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Channel_Clients_T.cpp \
-  Channel_Clients_T.h \
-  Channel_Clients_T.inl \
-  Event/ECG_Adapters.h \
-  Event/ECG_CDR_Message_Receiver.h \
-  Event/ECG_CDR_Message_Receiver.inl \
-  Event/ECG_CDR_Message_Sender.h \
-  Event/ECG_CDR_Message_Sender.inl \
-  Event/ECG_Complex_Address_Server.h \
-  Event/ECG_Complex_Address_Server.inl \
-  Event/ECG_ConsumerEC_Control.h \
-  Event/ECG_Mcast_EH.h \
-  Event/ECG_Mcast_EH.inl \
-  Event/ECG_Mcast_Gateway.h \
-  Event/ECG_Mcast_Gateway.inl \
-  Event/ECG_Reactive_ConsumerEC_Control.h \
-  Event/ECG_Reconnect_ConsumerEC_Control.h \
-  Event/ECG_Simple_Address_Server.h \
-  Event/ECG_Simple_Address_Server.inl \
-  Event/ECG_Simple_Mcast_EH.h \
-  Event/ECG_UDP_EH.h \
-  Event/ECG_UDP_EH.inl \
-  Event/ECG_UDP_Out_Endpoint.h \
-  Event/ECG_UDP_Out_Endpoint.inl \
-  Event/ECG_UDP_Receiver.h \
-  Event/ECG_UDP_Receiver.inl \
-  Event/ECG_UDP_Sender.h \
-  Event/ECG_UDP_Sender.inl \
-  Event/EC_And_Filter.h \
-  Event/EC_Basic_Factory.h \
-  Event/EC_Basic_Filter_Builder.h \
-  Event/EC_Basic_Filter_Builder.inl \
-  Event/EC_Bitmask_Filter.h \
-  Event/EC_Busy_Lock.cpp \
-  Event/EC_Busy_Lock.h \
-  Event/EC_Busy_Lock.inl \
-  Event/EC_Channel_Destroyer.h \
-  Event/EC_Conjunction_Filter.h \
-  Event/EC_ConsumerAdmin.h \
-  Event/EC_ConsumerControl.h \
-  Event/EC_Default_Factory.h \
-  Event/EC_Default_Factory.inl \
-  Event/EC_Default_ProxyConsumer.h \
-  Event/EC_Default_ProxySupplier.h \
-  Event/EC_Disjunction_Filter.h \
-  Event/EC_Dispatching.h \
-  Event/EC_Dispatching_Task.h \
-  Event/EC_Dispatching_Task.inl \
-  Event/EC_Event_Channel.h \
-  Event/EC_Event_Channel_Base.h \
-  Event/EC_Event_Channel_Base.inl \
-  Event/EC_Factory.h \
-  Event/EC_Filter.h \
-  Event/EC_Filter.inl \
-  Event/EC_Filter_Builder.h \
-  Event/EC_Filter_Builder.inl \
-  Event/EC_Gateway.h \
-  Event/EC_Gateway_IIOP.h \
-  Event/EC_Gateway_IIOP_Factory.h \
-  Event/EC_Gateway_IIOP_Factory.inl \
-  Event/EC_Group_Scheduling.h \
-  Event/EC_Group_Scheduling.inl \
-  Event/EC_Lifetime_Utils.h \
-  Event/EC_Lifetime_Utils.inl \
-  Event/EC_Lifetime_Utils_T.cpp \
-  Event/EC_Lifetime_Utils_T.h \
-  Event/EC_Lifetime_Utils_T.inl \
-  Event/EC_MT_Dispatching.h \
-  Event/EC_Masked_Type_Filter.h \
-  Event/EC_Negation_Filter.h \
-  Event/EC_Null_Factory.h \
-  Event/EC_Null_Scheduling.h \
-  Event/EC_Null_Scheduling.inl \
-  Event/EC_ObserverStrategy.h \
-  Event/EC_ObserverStrategy.inl \
-  Event/EC_Per_Supplier_Filter.h \
-  Event/EC_Per_Supplier_Filter.inl \
-  Event/EC_Prefix_Filter_Builder.h \
-  Event/EC_Prefix_Filter_Builder.inl \
-  Event/EC_ProxyConsumer.h \
-  Event/EC_ProxyConsumer.inl \
-  Event/EC_ProxySupplier.h \
-  Event/EC_ProxySupplier.inl \
-  Event/EC_Proxy_Disconnector.h \
-  Event/EC_QOS_Info.h \
-  Event/EC_QOS_Info.inl \
-  Event/EC_Reactive_ConsumerControl.h \
-  Event/EC_Reactive_ConsumerControl.inl \
-  Event/EC_Reactive_Dispatching.h \
-  Event/EC_Reactive_SupplierControl.h \
-  Event/EC_Reactive_SupplierControl.inl \
-  Event/EC_Reactive_Timeout_Generator.h \
-  Event/EC_Scheduling_Strategy.h \
-  Event/EC_SupplierAdmin.h \
-  Event/EC_SupplierControl.h \
-  Event/EC_Supplier_Filter.h \
-  Event/EC_Supplier_Filter.inl \
-  Event/EC_Supplier_Filter_Builder.h \
-  Event/EC_TPC_Dispatching.h \
-  Event/EC_TPC_Dispatching_Task.h \
-  Event/EC_TPC_Factory.h \
-  Event/EC_TPC_ProxyConsumer.h \
-  Event/EC_TPC_ProxySupplier.h \
-  Event/EC_TPC_ProxySupplier.inl \
-  Event/EC_Thread_Flags.h \
-  Event/EC_Timeout_Filter.h \
-  Event/EC_Timeout_Filter.inl \
-  Event/EC_Timeout_Generator.h \
-  Event/EC_Timeout_Generator.inl \
-  Event/EC_Trivial_Supplier_Filter.h \
-  Event/EC_Type_Filter.h \
-  Event/EC_UDP_Admin.h
-
-pkgconfig_DATA += \
-  TAO_RTEvent_Serv.pc
-
-CLEANFILES += \
-  TAO_RTEvent_Serv.pc
-
-TAO_RTEvent_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent_Serv.pc.in
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  RTEvent_Serv.rc \
-  TAO_RTEvent_Serv.pc.in
-
-
-## Makefile.FtRtEvent.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES += \
-  FTRTC.cpp \
-  FTRTC.h \
-  FTRTC.inl \
-  FTRTS.cpp \
-  FTRTS.h \
-  FTRTS.inl
-
-CLEANFILES += \
-  FTRT-stamp \
-  FTRTC.cpp \
-  FTRTC.h \
-  FTRTC.inl \
-  FTRTS.cpp \
-  FTRTS.h \
-  FTRTS.inl
-
-FTRTC.cpp FTRTC.h FTRTC.inl FTRTS.cpp FTRTS.h FTRTS.inl: FTRT-stamp
-
-FTRT-stamp: $(srcdir)/FTRT.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  FtRtecEventCommC.cpp \
-  FtRtecEventCommC.h \
-  FtRtecEventCommC.inl \
-  FtRtecEventCommS.cpp \
-  FtRtecEventCommS.h \
-  FtRtecEventCommS.inl
-
-CLEANFILES += \
-  FtRtecEventComm-stamp \
-  FtRtecEventCommC.cpp \
-  FtRtecEventCommC.h \
-  FtRtecEventCommC.inl \
-  FtRtecEventCommS.cpp \
-  FtRtecEventCommS.h \
-  FtRtecEventCommS.inl
-
-FtRtecEventCommC.cpp FtRtecEventCommC.h FtRtecEventCommC.inl FtRtecEventCommS.cpp FtRtecEventCommS.h FtRtecEventCommS.inl: FtRtecEventComm-stamp
-
-FtRtecEventComm-stamp: $(srcdir)/FtRtecEventComm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  FTRT_GroupManagerC.cpp \
-  FTRT_GroupManagerC.h \
-  FTRT_GroupManagerC.inl \
-  FTRT_GroupManagerS.cpp \
-  FTRT_GroupManagerS.h \
-  FTRT_GroupManagerS.inl
-
-CLEANFILES += \
-  FTRT_GroupManager-stamp \
-  FTRT_GroupManagerC.cpp \
-  FTRT_GroupManagerC.h \
-  FTRT_GroupManagerC.inl \
-  FTRT_GroupManagerS.cpp \
-  FTRT_GroupManagerS.h \
-  FTRT_GroupManagerS.inl
-
-FTRT_GroupManagerC.cpp FTRT_GroupManagerC.h FTRT_GroupManagerC.inl FTRT_GroupManagerS.cpp FTRT_GroupManagerS.h FTRT_GroupManagerS.inl: FTRT_GroupManager-stamp
-
-FTRT_GroupManager-stamp: $(srcdir)/FTRT_GroupManager.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  FtRtecEventChannelAdminC.cpp \
-  FtRtecEventChannelAdminC.h \
-  FtRtecEventChannelAdminC.inl \
-  FtRtecEventChannelAdminS.cpp \
-  FtRtecEventChannelAdminS.h \
-  FtRtecEventChannelAdminS.inl
-
-CLEANFILES += \
-  FtRtecEventChannelAdmin-stamp \
-  FtRtecEventChannelAdminC.cpp \
-  FtRtecEventChannelAdminC.h \
-  FtRtecEventChannelAdminC.inl \
-  FtRtecEventChannelAdminS.cpp \
-  FtRtecEventChannelAdminS.h \
-  FtRtecEventChannelAdminS.inl
-
-FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminC.inl FtRtecEventChannelAdminS.cpp FtRtecEventChannelAdminS.h FtRtecEventChannelAdminS.inl: FtRtecEventChannelAdmin-stamp
-
-FtRtecEventChannelAdmin-stamp: $(srcdir)/FtRtecEventChannelAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_FtRtEvent.la
-
-libTAO_FtRtEvent_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_FTRTEVENT_BUILD_DLL
-
-libTAO_FtRtEvent_la_SOURCES = \
-  FTRTC.cpp \
-  FTRTS.cpp \
-  FTRT_GroupManagerC.cpp \
-  FTRT_GroupManagerS.cpp \
-  FtRtEvent/Utils/FTEC_Gateway.cpp \
-  FtRtEvent/Utils/Log.cpp \
-  FtRtEvent/Utils/Safe_InputCDR.cpp \
-  FtRtEvent/Utils/UUID.cpp \
-  FtRtecEventChannelAdminC.cpp \
-  FtRtecEventChannelAdminS.cpp \
-  FtRtecEventCommC.cpp \
-  FtRtecEventCommS.cpp
-
-libTAO_FtRtEvent_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_FtRtEvent_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  libTAO_RTEvent_Serv.la \
-  libTAO_RTEvent_Skel.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  libTAO_FTORB_Utils.la \
-  libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  FTRT.idl \
-  FTRTC.h \
-  FTRTC.inl \
-  FTRTS.h \
-  FTRTS.inl \
-  FTRT_GroupManager.idl \
-  FTRT_GroupManagerC.h \
-  FTRT_GroupManagerC.inl \
-  FTRT_GroupManagerS.h \
-  FTRT_GroupManagerS.inl \
-  FtRtEvent/Utils/FTEC_Gateway.h \
-  FtRtEvent/Utils/FTEC_Gateway.inl \
-  FtRtEvent/Utils/Log.h \
-  FtRtEvent/Utils/Log.inl \
-  FtRtEvent/Utils/Safe_InputCDR.h \
-  FtRtEvent/Utils/Safe_InputCDR.inl \
-  FtRtEvent/Utils/UUID.h \
-  FtRtEvent/Utils/UUID.inl \
-  FtRtecEventChannelAdmin.idl \
-  FtRtecEventChannelAdminC.h \
-  FtRtecEventChannelAdminC.inl \
-  FtRtecEventChannelAdminS.h \
-  FtRtecEventChannelAdminS.inl \
-  FtRtecEventComm.idl \
-  FtRtecEventCommC.h \
-  FtRtecEventCommC.inl \
-  FtRtecEventCommS.h \
-  FtRtecEventCommS.inl
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.FTRT_EventChannel.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-lib_LTLIBRARIES += libTAO_FTRT_EventChannel.la
-
-libTAO_FTRT_EventChannel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_FTRTEC_BUILD_DLL
-
-libTAO_FTRT_EventChannel_la_SOURCES = \
-  FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp \
-  FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp \
-  FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp \
-  FtRtEvent/EventChannel/Dynamic_Bitset.cpp \
-  FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp \
-  FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp \
-  FtRtEvent/EventChannel/FTEC_Event_Channel.cpp \
-  FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp \
-  FtRtEvent/EventChannel/FTEC_Factory.cpp \
-  FtRtEvent/EventChannel/FTEC_Group_Manager.cpp \
-  FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp \
-  FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp \
-  FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp \
-  FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp \
-  FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp \
-  FtRtEvent/EventChannel/Fault_Detector.cpp \
-  FtRtEvent/EventChannel/Fault_Detector_Loader.cpp \
-  FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp \
-  FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp \
-  FtRtEvent/EventChannel/GroupInfoPublisher.cpp \
-  FtRtEvent/EventChannel/IOGR_Maker.cpp \
-  FtRtEvent/EventChannel/Identification_Service.cpp \
-  FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp \
-  FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp \
-  FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp \
-  FtRtEvent/EventChannel/Replication_Service.cpp \
-  FtRtEvent/EventChannel/Replication_Strategy.cpp \
-  FtRtEvent/EventChannel/Request_Context_Repository.cpp \
-  FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp \
-  FtRtEvent/EventChannel/Set_Update_Interceptor.cpp \
-  FtRtEvent/EventChannel/Update_Manager.cpp \
-  FtRtEvent/EventChannel/UpdateableHandler.cpp \
-  FtRtEvent/EventChannel/create_persistent_poa.cpp \
-  FtRtEvent/EventChannel/replace_key.cpp
-
-libTAO_FTRT_EventChannel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_FTRT_EventChannel_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  libTAO_FtRtEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  libTAO_RTEvent_Serv.la \
-  libTAO_RTEvent_Skel.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  libTAO_FTORB_Utils.la \
-  libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h \
-  FtRtEvent/EventChannel/AMI_Replication_Strategy.h \
-  FtRtEvent/EventChannel/Basic_Replication_Strategy.h \
-  FtRtEvent/EventChannel/ConnectionHandler_T.cpp \
-  FtRtEvent/EventChannel/ConnectionHandler_T.h \
-  FtRtEvent/EventChannel/Dynamic_Bitset.h \
-  FtRtEvent/EventChannel/Dynamic_Bitset.inl \
-  FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h \
-  FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h \
-  FtRtEvent/EventChannel/FTEC_Event_Channel.h \
-  FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h \
-  FtRtEvent/EventChannel/FTEC_Factory.h \
-  FtRtEvent/EventChannel/FTEC_Group_Manager.h \
-  FtRtEvent/EventChannel/FTEC_ORBInitializer.h \
-  FtRtEvent/EventChannel/FTEC_ProxyConsumer.h \
-  FtRtEvent/EventChannel/FTEC_ProxySupplier.h \
-  FtRtEvent/EventChannel/FTEC_SupplierAdmin.h \
-  FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h \
-  FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp \
-  FtRtEvent/EventChannel/FT_ProxyAdmin_T.h \
-  FtRtEvent/EventChannel/Fault_Detector.h \
-  FtRtEvent/EventChannel/Fault_Detector_Loader.h \
-  FtRtEvent/EventChannel/Fault_Detector_T.cpp \
-  FtRtEvent/EventChannel/Fault_Detector_T.h \
-  FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h \
-  FtRtEvent/EventChannel/FtEventServiceInterceptor.h \
-  FtRtEvent/EventChannel/GroupInfoPublisher.h \
-  FtRtEvent/EventChannel/IOGR_Maker.h \
-  FtRtEvent/EventChannel/Identification_Service.h \
-  FtRtEvent/EventChannel/ObjectGroupManagerHandler.h \
-  FtRtEvent/EventChannel/ProxyConsumerStateWorker.h \
-  FtRtEvent/EventChannel/ProxySupplierStateWorker.h \
-  FtRtEvent/EventChannel/Replication_Service.h \
-  FtRtEvent/EventChannel/Replication_Strategy.h \
-  FtRtEvent/EventChannel/Request_Context_Repository.h \
-  FtRtEvent/EventChannel/SCTP_Fault_Detector.h \
-  FtRtEvent/EventChannel/Set_Update_Interceptor.h \
-  FtRtEvent/EventChannel/Update_Manager.h \
-  FtRtEvent/EventChannel/UpdateableHandler.h \
-  FtRtEvent/EventChannel/create_persistent_poa.h \
-  FtRtEvent/EventChannel/ftrtec_export.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.FT_ClientORB.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-lib_LTLIBRARIES += libTAO_FT_ClientORB.la
-
-libTAO_FT_ClientORB_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_FT_CLIENTORB_BUILD_DLL
-
-libTAO_FT_ClientORB_la_SOURCES = \
-  FaultTolerance/FT_ClientORBInitializer.cpp \
-  FaultTolerance/FT_ClientPolicyFactory.cpp \
-  FaultTolerance/FT_ClientPolicy_i.cpp \
-  FaultTolerance/FT_ClientRequest_Interceptor.cpp \
-  FaultTolerance/FT_ClientService_Activate.cpp \
-  FaultTolerance/FT_Endpoint_Selector_Factory.cpp \
-  FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp \
-  FaultTolerance/FT_Service_Callbacks.cpp
-
-libTAO_FT_ClientORB_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_FT_ClientORB_la_LIBADD = \
-  libTAO_FTORB_Utils.la \
-  libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  FaultTolerance/FT_ClientORBInitializer.h \
-  FaultTolerance/FT_ClientPolicyFactory.h \
-  FaultTolerance/FT_ClientPolicy_i.h \
-  FaultTolerance/FT_ClientPolicy_i.inl \
-  FaultTolerance/FT_ClientRequest_Interceptor.h \
-  FaultTolerance/FT_ClientService_Activate.h \
-  FaultTolerance/FT_Endpoint_Selector_Factory.h \
-  FaultTolerance/FT_Invocation_Endpoint_Selectors.h \
-  FaultTolerance/FT_Service_Callbacks.h
-
-pkgconfig_DATA += \
-  TAO_FT_ClientORB.pc
-
-CLEANFILES += \
-  TAO_FT_ClientORB.pc
-
-TAO_FT_ClientORB.pc: ${top_builddir}/config.status ${srcdir}/TAO_FT_ClientORB.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_FT_ClientORB.pc.in
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-EXTRA_DIST += \
-  TAO_FT_ClientORB.pc.in
-
-
-## Makefile.FT_ServerORB.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-lib_LTLIBRARIES += libTAO_FT_ServerORB.la
-
-libTAO_FT_ServerORB_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_FT_SERVERORB_BUILD_DLL
-
-libTAO_FT_ServerORB_la_SOURCES = \
-  FaultTolerance/FT_ServerORBInitializer.cpp \
-  FaultTolerance/FT_ServerPolicyFactory.cpp \
-  FaultTolerance/FT_ServerPolicy_i.cpp \
-  FaultTolerance/FT_ServerRequest_Interceptor.cpp \
-  FaultTolerance/FT_ServerService_Activate.cpp
-
-libTAO_FT_ServerORB_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_FT_ServerORB_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  libTAO_FTORB_Utils.la \
-  libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  FaultTolerance/FT_ServerORBInitializer.h \
-  FaultTolerance/FT_ServerPolicyFactory.h \
-  FaultTolerance/FT_ServerPolicy_i.h \
-  FaultTolerance/FT_ServerPolicy_i.inl \
-  FaultTolerance/FT_ServerRequest_Interceptor.h \
-  FaultTolerance/FT_ServerService_Activate.h
-
-pkgconfig_DATA += \
-  TAO_FT_ServerORB.pc
-
-CLEANFILES += \
-  TAO_FT_ServerORB.pc
-
-TAO_FT_ServerORB.pc: ${top_builddir}/config.status ${srcdir}/TAO_FT_ServerORB.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_FT_ServerORB.pc.in
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  TAO_FT_ServerORB.pc.in
-
-
-## Makefile.FaultTolerance.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES += \
-  FT_CORBAC.cpp \
-  FT_CORBAC.h \
-  FT_CORBAC.inl \
-  FT_CORBAS.cpp \
-  FT_CORBAS.h \
-  FT_CORBAS.inl
-
-CLEANFILES += \
-  FT_CORBA-stamp \
-  FT_CORBAC.cpp \
-  FT_CORBAC.h \
-  FT_CORBAC.inl \
-  FT_CORBAS.cpp \
-  FT_CORBAS.h \
-  FT_CORBAS.inl
-
-FT_CORBAC.cpp FT_CORBAC.h FT_CORBAC.inl FT_CORBAS.cpp FT_CORBAS.h FT_CORBAS.inl: FT_CORBA-stamp
-
-FT_CORBA-stamp: $(srcdir)/FT_CORBA.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  FT_ReplicaC.cpp \
-  FT_ReplicaC.h \
-  FT_ReplicaC.inl \
-  FT_ReplicaS.cpp \
-  FT_ReplicaS.h \
-  FT_ReplicaS.inl
-
-CLEANFILES += \
-  FT_Replica-stamp \
-  FT_ReplicaC.cpp \
-  FT_ReplicaC.h \
-  FT_ReplicaC.inl \
-  FT_ReplicaS.cpp \
-  FT_ReplicaS.h \
-  FT_ReplicaS.inl
-
-FT_ReplicaC.cpp FT_ReplicaC.h FT_ReplicaC.inl FT_ReplicaS.cpp FT_ReplicaS.h FT_ReplicaS.inl: FT_Replica-stamp
-
-FT_Replica-stamp: $(srcdir)/FT_Replica.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  FT_NotifierC.cpp \
-  FT_NotifierC.h \
-  FT_NotifierC.inl \
-  FT_NotifierS.cpp \
-  FT_NotifierS.h \
-  FT_NotifierS.inl
-
-CLEANFILES += \
-  FT_Notifier-stamp \
-  FT_NotifierC.cpp \
-  FT_NotifierC.h \
-  FT_NotifierC.inl \
-  FT_NotifierS.cpp \
-  FT_NotifierS.h \
-  FT_NotifierS.inl
-
-FT_NotifierC.cpp FT_NotifierC.h FT_NotifierC.inl FT_NotifierS.cpp FT_NotifierS.h FT_NotifierS.inl: FT_Notifier-stamp
-
-FT_Notifier-stamp: $(srcdir)/FT_Notifier.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  FT_FaultDetectorFactoryC.cpp \
-  FT_FaultDetectorFactoryC.h \
-  FT_FaultDetectorFactoryC.inl \
-  FT_FaultDetectorFactoryS.cpp \
-  FT_FaultDetectorFactoryS.h \
-  FT_FaultDetectorFactoryS.inl
-
-CLEANFILES += \
-  FT_FaultDetectorFactory-stamp \
-  FT_FaultDetectorFactoryC.cpp \
-  FT_FaultDetectorFactoryC.h \
-  FT_FaultDetectorFactoryC.inl \
-  FT_FaultDetectorFactoryS.cpp \
-  FT_FaultDetectorFactoryS.h \
-  FT_FaultDetectorFactoryS.inl
-
-FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryC.inl FT_FaultDetectorFactoryS.cpp FT_FaultDetectorFactoryS.h FT_FaultDetectorFactoryS.inl: FT_FaultDetectorFactory-stamp
-
-FT_FaultDetectorFactory-stamp: $(srcdir)/FT_FaultDetectorFactory.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  FT_ReplicationManagerC.cpp \
-  FT_ReplicationManagerC.h \
-  FT_ReplicationManagerC.inl \
-  FT_ReplicationManagerS.cpp \
-  FT_ReplicationManagerS.h \
-  FT_ReplicationManagerS.inl
-
-CLEANFILES += \
-  FT_ReplicationManager-stamp \
-  FT_ReplicationManagerC.cpp \
-  FT_ReplicationManagerC.h \
-  FT_ReplicationManagerC.inl \
-  FT_ReplicationManagerS.cpp \
-  FT_ReplicationManagerS.h \
-  FT_ReplicationManagerS.inl
-
-FT_ReplicationManagerC.cpp FT_ReplicationManagerC.h FT_ReplicationManagerC.inl FT_ReplicationManagerS.cpp FT_ReplicationManagerS.h FT_ReplicationManagerS.inl: FT_ReplicationManager-stamp
-
-FT_ReplicationManager-stamp: $(srcdir)/FT_ReplicationManager.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_FaultTolerance.la
-
-libTAO_FaultTolerance_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_FT_BUILD_DLL
-
-libTAO_FaultTolerance_la_SOURCES = \
-  FT_CORBAC.cpp \
-  FT_CORBAS.cpp \
-  FT_FaultDetectorFactoryC.cpp \
-  FT_FaultDetectorFactoryS.cpp \
-  FT_NotifierC.cpp \
-  FT_NotifierS.cpp \
-  FT_ReplicaC.cpp \
-  FT_ReplicaS.cpp \
-  FT_ReplicationManagerC.cpp \
-  FT_ReplicationManagerS.cpp
-
-libTAO_FaultTolerance_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_FaultTolerance_la_LIBADD = \
-  libTAO_FT_ServerORB.la \
-  libTAO_FT_ClientORB.la \
-  libTAO_FTORB_Utils.la \
-  libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  libTAO_CosNotification.la \
-  libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  FT_CORBA.idl \
-  FT_CORBAC.h \
-  FT_CORBAC.inl \
-  FT_CORBAS.h \
-  FT_CORBAS.inl \
-  FT_FaultDetectorFactory.idl \
-  FT_FaultDetectorFactoryC.h \
-  FT_FaultDetectorFactoryC.inl \
-  FT_FaultDetectorFactoryS.h \
-  FT_FaultDetectorFactoryS.inl \
-  FT_Notifier.idl \
-  FT_NotifierC.h \
-  FT_NotifierC.inl \
-  FT_NotifierS.h \
-  FT_NotifierS.inl \
-  FT_Replica.idl \
-  FT_ReplicaC.h \
-  FT_ReplicaC.inl \
-  FT_ReplicaS.h \
-  FT_ReplicaS.inl \
-  FT_ReplicationManager.idl \
-  FT_ReplicationManagerC.h \
-  FT_ReplicationManagerC.inl \
-  FT_ReplicationManagerS.h \
-  FT_ReplicationManagerS.inl \
-  FaultTolerance/fault_tol_export.h
-
-pkgconfig_DATA += \
-  TAO_FaultTolerance.pc
-
-CLEANFILES += \
-  TAO_FaultTolerance.pc
-
-TAO_FaultTolerance.pc: ${top_builddir}/config.status ${srcdir}/TAO_FaultTolerance.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_FaultTolerance.pc.in
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-EXTRA_DIST += \
-  FaultTolerance.rc \
-  TAO_FaultTolerance.pc.in
-
-
-## Makefile.HTIOP.am
-
-if BUILD_ACE_UUID
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES += \
-  HTIOPC.cpp \
-  HTIOPC.h \
-  HTIOPC.inl \
-  HTIOPS.h
-
-CLEANFILES += \
-  HTIOP-stamp \
-  HTIOPC.cpp \
-  HTIOPC.h \
-  HTIOPC.inl \
-  HTIOPS.h
-
-HTIOPC.cpp HTIOPC.h HTIOPC.inl HTIOPS.h: HTIOP-stamp
-
-HTIOP-stamp: $(srcdir)/HTIOP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS $(srcdir)/HTIOP.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  HTIOP/htiop_endpointsC.cpp \
-  HTIOP/htiop_endpointsC.h \
-  HTIOP/htiop_endpointsS.h
-
-CLEANFILES += \
-  HTIOP/htiop_endpoints-stamp \
-  HTIOP/htiop_endpointsC.cpp \
-  HTIOP/htiop_endpointsC.h \
-  HTIOP/htiop_endpointsS.h
-
-HTIOP/htiop_endpointsC.cpp HTIOP/htiop_endpointsC.h HTIOP/htiop_endpointsS.h: HTIOP/htiop_endpoints-stamp
-
-HTIOP/htiop_endpoints-stamp: $(srcdir)/HTIOP/htiop_endpoints.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS -Sci -Gp -Gd -Sa -Sorb -o HTIOP $(srcdir)/HTIOP/htiop_endpoints.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_HTIOP.la
-
-libTAO_HTIOP_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(ACE_ROOT)/protocols \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DHTIOP_BUILD_DLL
-
-libTAO_HTIOP_la_SOURCES = \
-  HTIOP/HTIOP_Acceptor.cpp \
-  HTIOP/HTIOP_Acceptor_Impl.cpp \
-  HTIOP/HTIOP_Completion_Handler.cpp \
-  HTIOP/HTIOP_Connection_Handler.cpp \
-  HTIOP/HTIOP_Connector.cpp \
-  HTIOP/HTIOP_Connector_Impl.cpp \
-  HTIOP/HTIOP_Endpoint.cpp \
-  HTIOP/HTIOP_Factory.cpp \
-  HTIOP/HTIOP_Profile.cpp \
-  HTIOP/HTIOP_Transport.cpp \
-  HTIOP/htiop_endpointsC.cpp \
-  HTIOPC.cpp
-
-libTAO_HTIOP_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_HTIOP_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Channel_Clients_T.cpp \
-  HTIOP.idl \
-  HTIOP/HTIOP_Acceptor.h \
-  HTIOP/HTIOP_Acceptor.inl \
-  HTIOP/HTIOP_Acceptor_Impl.h \
-  HTIOP/HTIOP_Completion_Handler.h \
-  HTIOP/HTIOP_Connection_Handler.h \
-  HTIOP/HTIOP_Connector.h \
-  HTIOP/HTIOP_Connector_Impl.h \
-  HTIOP/HTIOP_Endpoint.h \
-  HTIOP/HTIOP_Endpoint.inl \
-  HTIOP/HTIOP_Factory.h \
-  HTIOP/HTIOP_Profile.h \
-  HTIOP/HTIOP_Transport.h \
-  HTIOP/htiop_endpoints.pidl \
-  HTIOP/htiop_endpointsC.h \
-  HTIOP/htiop_endpointsS.h \
-  HTIOPC.h \
-  HTIOPC.inl \
-  HTIOPS.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_UUID
-
-## Makefile.IFRService.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-lib_LTLIBRARIES += libTAO_IFRService.la
-
-libTAO_IFRService_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_IFRSERVICE_BUILD_DLL
-
-libTAO_IFRService_la_SOURCES = \
-  IFRService/AbstractInterfaceDef_i.cpp \
-  IFRService/AliasDef_i.cpp \
-  IFRService/ArrayDef_i.cpp \
-  IFRService/AttributeDef_i.cpp \
-  IFRService/ComponentContainer_i.cpp \
-  IFRService/ComponentDef_i.cpp \
-  IFRService/ComponentModuleDef_i.cpp \
-  IFRService/ComponentRepository_i.cpp \
-  IFRService/ConstantDef_i.cpp \
-  IFRService/ConsumesDef_i.cpp \
-  IFRService/Contained_i.cpp \
-  IFRService/Container_i.cpp \
-  IFRService/EmitsDef_i.cpp \
-  IFRService/EnumDef_i.cpp \
-  IFRService/EventDef_i.cpp \
-  IFRService/EventPortDef_i.cpp \
-  IFRService/ExceptionDef_i.cpp \
-  IFRService/ExtAbstractInterfaceDef_i.cpp \
-  IFRService/ExtAttributeDef_i.cpp \
-  IFRService/ExtInterfaceDef_i.cpp \
-  IFRService/ExtLocalInterfaceDef_i.cpp \
-  IFRService/ExtValueDef_i.cpp \
-  IFRService/FactoryDef_i.cpp \
-  IFRService/FinderDef_i.cpp \
-  IFRService/FixedDef_i.cpp \
-  IFRService/HomeDef_i.cpp \
-  IFRService/IDLType_i.cpp \
-  IFRService/IFR_BaseS.cpp \
-  IFRService/IFR_BasicS.cpp \
-  IFRService/IFR_ComponentsS.cpp \
-  IFRService/IFR_ExtendedS.cpp \
-  IFRService/IFR_Service_Loader.cpp \
-  IFRService/IFR_Service_Utils.cpp \
-  IFRService/IRObject_i.cpp \
-  IFRService/InterfaceAttrExtension_i.cpp \
-  IFRService/InterfaceDef_i.cpp \
-  IFRService/LocalInterfaceDef_i.cpp \
-  IFRService/ModuleDef_i.cpp \
-  IFRService/NativeDef_i.cpp \
-  IFRService/OperationDef_i.cpp \
-  IFRService/Options.cpp \
-  IFRService/PrimitiveDef_i.cpp \
-  IFRService/ProvidesDef_i.cpp \
-  IFRService/PublishesDef_i.cpp \
-  IFRService/RecursDef_i.cpp \
-  IFRService/Repository_i.cpp \
-  IFRService/SequenceDef_i.cpp \
-  IFRService/StringDef_i.cpp \
-  IFRService/StructDef_i.cpp \
-  IFRService/TypedefDef_i.cpp \
-  IFRService/UnionDef_i.cpp \
-  IFRService/UsesDef_i.cpp \
-  IFRService/ValueBoxDef_i.cpp \
-  IFRService/ValueDef_i.cpp \
-  IFRService/ValueMemberDef_i.cpp \
-  IFRService/WstringDef_i.cpp
-
-libTAO_IFRService_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_IFRService_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  IFRService/AbstractInterfaceDef_i.h \
-  IFRService/AliasDef_i.h \
-  IFRService/ArrayDef_i.h \
-  IFRService/AttributeDef_i.h \
-  IFRService/ComponentContainer_i.h \
-  IFRService/ComponentDef_i.h \
-  IFRService/ComponentModuleDef_i.h \
-  IFRService/ComponentRepository_i.h \
-  IFRService/ConstantDef_i.h \
-  IFRService/ConsumesDef_i.h \
-  IFRService/Contained_i.h \
-  IFRService/Container_i.h \
-  IFRService/EmitsDef_i.h \
-  IFRService/EnumDef_i.h \
-  IFRService/EventDef_i.h \
-  IFRService/EventPortDef_i.h \
-  IFRService/ExceptionDef_i.h \
-  IFRService/ExtAbstractInterfaceDef_i.h \
-  IFRService/ExtAttributeDef_i.h \
-  IFRService/ExtInterfaceDef_i.h \
-  IFRService/ExtLocalInterfaceDef_i.h \
-  IFRService/ExtValueDef_i.h \
-  IFRService/FactoryDef_i.h \
-  IFRService/FinderDef_i.h \
-  IFRService/FixedDef_i.h \
-  IFRService/HomeDef_i.h \
-  IFRService/IDLType_i.h \
-  IFRService/IFR_BaseS.h \
-  IFRService/IFR_BaseS.inl \
-  IFRService/IFR_BaseS_T.cpp \
-  IFRService/IFR_BaseS_T.h \
-  IFRService/IFR_BaseS_T.inl \
-  IFRService/IFR_BasicS.h \
-  IFRService/IFR_BasicS.inl \
-  IFRService/IFR_BasicS_T.cpp \
-  IFRService/IFR_BasicS_T.h \
-  IFRService/IFR_BasicS_T.inl \
-  IFRService/IFR_ComponentsS.h \
-  IFRService/IFR_ComponentsS.inl \
-  IFRService/IFR_ComponentsS_T.cpp \
-  IFRService/IFR_ComponentsS_T.h \
-  IFRService/IFR_ComponentsS_T.inl \
-  IFRService/IFR_ExtendedS.h \
-  IFRService/IFR_ExtendedS.inl \
-  IFRService/IFR_ExtendedS_T.cpp \
-  IFRService/IFR_ExtendedS_T.h \
-  IFRService/IFR_ExtendedS_T.inl \
-  IFRService/IFR_Service_Loader.h \
-  IFRService/IFR_Service_Utils.h \
-  IFRService/IFR_Service_Utils_T.cpp \
-  IFRService/IFR_Service_Utils_T.h \
-  IFRService/IFR_macro.h \
-  IFRService/IRObject_i.h \
-  IFRService/InterfaceAttrExtension_i.h \
-  IFRService/InterfaceDef_i.h \
-  IFRService/LocalInterfaceDef_i.h \
-  IFRService/ModuleDef_i.h \
-  IFRService/NativeDef_i.h \
-  IFRService/OperationDef_i.h \
-  IFRService/Options.h \
-  IFRService/PrimitiveDef_i.h \
-  IFRService/ProvidesDef_i.h \
-  IFRService/PublishesDef_i.h \
-  IFRService/RecursDef_i.h \
-  IFRService/Repository_i.h \
-  IFRService/SequenceDef_i.h \
-  IFRService/StringDef_i.h \
-  IFRService/StructDef_i.h \
-  IFRService/TypedefDef_i.h \
-  IFRService/UnionDef_i.h \
-  IFRService/UsesDef_i.h \
-  IFRService/ValueBoxDef_i.h \
-  IFRService/ValueDef_i.h \
-  IFRService/ValueMemberDef_i.h \
-  IFRService/WstringDef_i.h \
-  IFRService/concrete_classes.h \
-  IFRService/ifr_service_export.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  IFRService.rc
-
-
-## Makefile.RTCORBAEvent.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-lib_LTLIBRARIES += libTAO_RTCORBAEvent.la
-
-libTAO_RTCORBAEvent_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_RTCORBAEVENT_BUILD_DLL
-
-libTAO_RTCORBAEvent_la_SOURCES = \
-  Event/EC_RTCORBA_Dispatching.cpp \
-  Event/EC_RTCORBA_Factory.cpp
-
-libTAO_RTCORBAEvent_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTCORBAEvent_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  libTAO_RTEvent_Serv.la \
-  libTAO_RTEvent_Skel.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Event/EC_RTCORBA_Dispatching.h \
-  Event/EC_RTCORBA_Factory.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RTEventLogAdmin_IDL.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  RTEventLogAdminC.cpp \
-  RTEventLogAdminC.h \
-  RTEventLogAdminC.inl \
-  RTEventLogAdminS.cpp \
-  RTEventLogAdminS.h \
-  RTEventLogAdminS.inl
-
-CLEANFILES += \
-  RTEventLogAdmin-stamp \
-  RTEventLogAdminC.cpp \
-  RTEventLogAdminC.h \
-  RTEventLogAdminC.inl \
-  RTEventLogAdminS.cpp \
-  RTEventLogAdminS.h \
-  RTEventLogAdminS.inl
-
-RTEventLogAdminC.cpp RTEventLogAdminC.h RTEventLogAdminC.inl RTEventLogAdminS.cpp RTEventLogAdminS.h RTEventLogAdminS.inl: RTEventLogAdmin-stamp
-
-RTEventLogAdmin-stamp: $(srcdir)/RTEventLogAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h $(srcdir)/RTEventLogAdmin.idl
-	@touch $@
-
-nobase_include_HEADERS += \
-  RTEventLogAdmin.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RTEventLogAdmin.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_RTEventLogAdmin.la
-
-libTAO_RTEventLogAdmin_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_RTEVENTLOG_BUILD_DLL
-
-libTAO_RTEventLogAdmin_la_SOURCES = \
-  RTEventLogAdminC.cpp
-
-libTAO_RTEventLogAdmin_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTEventLogAdmin_la_LIBADD = \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Log/rteventlog_export.h \
-  RTEventLogAdminC.h \
-  RTEventLogAdminC.inl
-
-pkgconfig_DATA += \
-  TAO_RTEventLogAdmin.pc
-
-CLEANFILES += \
-  TAO_RTEventLogAdmin.pc
-
-TAO_RTEventLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin.pc.in
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  TAO_RTEventLogAdmin.pc.in
-
-
-## Makefile.RTSched.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  RtecSchedulerC.cpp \
-  RtecSchedulerC.h \
-  RtecSchedulerC.inl \
-  RtecSchedulerS.cpp \
-  RtecSchedulerS.h \
-  RtecSchedulerS.inl
-
-CLEANFILES += \
-  RtecScheduler-stamp \
-  RtecSchedulerC.cpp \
-  RtecSchedulerC.h \
-  RtecSchedulerC.inl \
-  RtecSchedulerS.cpp \
-  RtecSchedulerS.h \
-  RtecSchedulerS.inl
-
-RtecSchedulerC.cpp RtecSchedulerC.h RtecSchedulerC.inl RtecSchedulerS.cpp RtecSchedulerS.h RtecSchedulerS.inl: RtecScheduler-stamp
-
-RtecScheduler-stamp: $(srcdir)/RtecScheduler.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_RTSched.la
-
-libTAO_RTSched_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_RTSCHED_BUILD_DLL
-
-libTAO_RTSched_la_SOURCES = \
-  RtecSchedulerC.cpp \
-  RtecSchedulerS.cpp \
-  Runtime_Scheduler.cpp \
-  Sched/Config_Scheduler.cpp \
-  Sched/DynSched.cpp \
-  Sched/Reconfig_Sched_Utils.cpp \
-  Sched/SchedEntry.cpp \
-  Sched/Scheduler.cpp \
-  Sched/Scheduler_Generic.cpp \
-  Sched/Strategy_Scheduler.cpp \
-  Scheduler_Factory.cpp \
-  Scheduler_Utilities.cpp
-
-libTAO_RTSched_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTSched_la_LIBADD = \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  RtecScheduler.idl \
-  RtecSchedulerC.h \
-  RtecSchedulerC.inl \
-  RtecSchedulerS.h \
-  RtecSchedulerS.inl \
-  Runtime_Scheduler.h \
-  Sched/Config_Scheduler.h \
-  Sched/DynSched.h \
-  Sched/DynSched.inl \
-  Sched/Reconfig_Sched_Utils.h \
-  Sched/Reconfig_Sched_Utils_T.cpp \
-  Sched/SchedEntry.h \
-  Sched/SchedEntry.inl \
-  Sched/Scheduler.h \
-  Sched/Scheduler_Generic.h \
-  Sched/Strategy_Scheduler.h \
-  Scheduler_Factory.h \
-  Scheduler_Factory.inl \
-  Scheduler_Utilities.h \
-  Scheduler_Utilities.inl
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  RTSched.rc
-
-
-## Makefile.RTEventLogAdmin_Skel.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_RTEventLogAdmin_Skel.la
-
-libTAO_RTEventLogAdmin_Skel_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_RTEVENTLOG_SKEL_BUILD_DLL
-
-libTAO_RTEventLogAdmin_Skel_la_SOURCES = \
-  RTEventLogAdminS.cpp
-
-libTAO_RTEventLogAdmin_Skel_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTEventLogAdmin_Skel_la_LIBADD = \
-  libTAO_RTEvent_Skel.la \
-  libTAO_DsLogAdmin_Skel.la \
-  libTAO_RTEventLogAdmin.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Log/rteventlog_skel_export.h \
-  RTEventLogAdminS.h \
-  RTEventLogAdminS.inl
-
-pkgconfig_DATA += \
-  TAO_RTEventLogAdmin_Skel.pc
-
-CLEANFILES += \
-  TAO_RTEventLogAdmin_Skel.pc
-
-TAO_RTEventLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  TAO_RTEventLogAdmin_Skel.pc.in
-
-
-## Makefile.RTEventLogAdmin_Serv.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-lib_LTLIBRARIES += libTAO_RTEventLogAdmin_Serv.la
-
-libTAO_RTEventLogAdmin_Serv_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_RTEVENTLOG_SERV_BUILD_DLL
-
-libTAO_RTEventLogAdmin_Serv_la_SOURCES = \
-  Log/RTEventLogConsumer.cpp \
-  Log/RTEventLogFactory_i.cpp \
-  Log/RTEventLogNotification.cpp \
-  Log/RTEventLog_i.cpp
-
-libTAO_RTEventLogAdmin_Serv_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTEventLogAdmin_Serv_la_LIBADD = \
-  libTAO_RTSched.la \
-  libTAO_CosNaming.la \
-  libTAO_RTEvent_Serv.la \
-  libTAO_DsLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  libTAO_RTEventLogAdmin_Skel.la \
-  libTAO_RTEvent_Skel.la \
-  libTAO_DsLogAdmin_Skel.la \
-  libTAO_RTEventLogAdmin.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Log/RTEventLogConsumer.h \
-  Log/RTEventLogFactory_i.h \
-  Log/RTEventLogNotification.h \
-  Log/RTEventLog_i.h \
-  Log/rteventlog_serv_export.h
-
-pkgconfig_DATA += \
-  TAO_RTEventLogAdmin_Serv.pc
-
-CLEANFILES += \
-  TAO_RTEventLogAdmin_Serv.pc
-
-TAO_RTEventLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  TAO_RTEventLogAdmin_Serv.pc.in
-
-
-## Makefile.RTKokyuEvent.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-lib_LTLIBRARIES += libTAO_RTKokyuEvent.la
-
-libTAO_RTKokyuEvent_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(ACE_ROOT)/Kokyu \
-  -DTAO_RTKOKYUEVENT_BUILD_DLL
-
-libTAO_RTKokyuEvent_la_SOURCES = \
-  Event/EC_Kokyu_Dispatching.cpp \
-  Event/EC_Kokyu_Factory.cpp \
-  Event/EC_Kokyu_Filter.cpp \
-  Event/EC_Kokyu_Filter_Builder.cpp \
-  Event/EC_Kokyu_Scheduling.cpp
-
-libTAO_RTKokyuEvent_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTKokyuEvent_la_LIBADD = \
-  $(ACE_BUILDDIR)/Kokyu/libKokyu.la \
-  libTAO_RTSched.la \
-  libTAO_CosNaming.la \
-  libTAO_RTEvent_Serv.la \
-  libTAO_RTEvent_Skel.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Event/EC_Kokyu_Dispatching.h \
-  Event/EC_Kokyu_Dispatching.inl \
-  Event/EC_Kokyu_Factory.h \
-  Event/EC_Kokyu_Factory.inl \
-  Event/EC_Kokyu_Filter.h \
-  Event/EC_Kokyu_Filter_Builder.h \
-  Event/EC_Kokyu_Filter_Builder.inl \
-  Event/EC_Kokyu_Scheduling.h \
-  Event/EC_Kokyu_Scheduling.inl
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RTSchedEvent.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-lib_LTLIBRARIES += libTAO_RTSchedEvent.la
-
-libTAO_RTSchedEvent_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_RTSCHEDEVENT_BUILD_DLL
-
-libTAO_RTSchedEvent_la_SOURCES = \
-  Event/EC_Gateway_Sched.cpp \
-  Event/EC_Priority_Dispatching.cpp \
-  Event/EC_Priority_Scheduling.cpp \
-  Event/EC_Sched_Factory.cpp \
-  Event/EC_Sched_Filter.cpp \
-  Event/EC_Sched_Filter_Builder.cpp
-
-libTAO_RTSchedEvent_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTSchedEvent_la_LIBADD = \
-  libTAO_RTSched.la \
-  libTAO_CosNaming.la \
-  libTAO_RTEvent_Serv.la \
-  libTAO_RTEvent_Skel.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Event/EC_Gateway_Sched.h \
-  Event/EC_Priority_Dispatching.h \
-  Event/EC_Priority_Scheduling.h \
-  Event/EC_Priority_Scheduling.inl \
-  Event/EC_Sched_Factory.h \
-  Event/EC_Sched_Factory.inl \
-  Event/EC_Sched_Filter.h \
-  Event/EC_Sched_Filter_Builder.h \
-  Event/EC_Sched_Filter_Builder.inl
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  RTSchedEvent.rc
-
-
-## Makefile.RT_Notification.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-lib_LTLIBRARIES += libTAO_RT_Notification.la
-
-libTAO_RT_Notification_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_RT_NOTIFY_BUILD_DLL
-
-libTAO_RT_Notification_la_SOURCES = \
-  Notify/RT_Builder.cpp \
-  Notify/RT_Factory.cpp \
-  Notify/RT_Notify_Service.cpp \
-  Notify/RT_POA_Helper.cpp \
-  Notify/RT_Properties.cpp \
-  Notify/Structured/RT_StructuredProxyPushSupplier.cpp
-
-libTAO_RT_Notification_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RT_Notification_la_LIBADD = \
-  libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  libTAO_CosNotification_Skel.la \
-  libTAO_CosEvent_Skel.la \
-  libTAO_CosNotification.la \
-  libTAO_CosEvent.la \
-  libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Notify/RT_Builder.h \
-  Notify/RT_Factory.h \
-  Notify/RT_Notify_Service.h \
-  Notify/RT_POA_Helper.h \
-  Notify/RT_Properties.h \
-  Notify/RT_Properties.inl \
-  Notify/Structured/RT_StructuredProxyPushSupplier.h
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  RT_Notification.rc
-
-
-## Makefile.Security.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-BUILT_SOURCES += \
-  CSIC.cpp \
-  CSIC.h \
-  CSIC.inl \
-  CSIS.inl
-
-CLEANFILES += \
-  CSI-stamp \
-  CSIC.cpp \
-  CSIC.h \
-  CSIC.inl \
-  CSIS.inl
-
-CSIC.cpp CSIC.h CSIC.inl CSIS.inl: CSI-stamp
-
-CSI-stamp: $(srcdir)/CSI.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CSIIOPC.cpp \
-  CSIIOPC.h \
-  CSIIOPC.inl \
-  CSIIOPS.inl
-
-CLEANFILES += \
-  CSIIOP-stamp \
-  CSIIOPC.cpp \
-  CSIIOPC.h \
-  CSIIOPC.inl \
-  CSIIOPS.inl
-
-CSIIOPC.cpp CSIIOPC.h CSIIOPC.inl CSIIOPS.inl: CSIIOP-stamp
-
-CSIIOP-stamp: $(srcdir)/CSIIOP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  GSSUPC.cpp \
-  GSSUPC.h \
-  GSSUPC.inl \
-  GSSUPS.inl
-
-CLEANFILES += \
-  GSSUP-stamp \
-  GSSUPC.cpp \
-  GSSUPC.h \
-  GSSUPC.inl \
-  GSSUPS.inl
-
-GSSUPC.cpp GSSUPC.h GSSUPC.inl GSSUPS.inl: GSSUP-stamp
-
-GSSUP-stamp: $(srcdir)/GSSUP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  SecurityC.cpp \
-  SecurityC.h \
-  SecurityC.inl \
-  SecurityS.cpp \
-  SecurityS.h \
-  SecurityS.inl
-
-CLEANFILES += \
-  Security-stamp \
-  SecurityC.cpp \
-  SecurityC.h \
-  SecurityC.inl \
-  SecurityS.cpp \
-  SecurityS.h \
-  SecurityS.inl
-
-SecurityC.cpp SecurityC.h SecurityC.inl SecurityS.cpp SecurityS.h SecurityS.inl: Security-stamp
-
-Security-stamp: $(srcdir)/Security.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  SecurityLevel1C.cpp \
-  SecurityLevel1C.h \
-  SecurityLevel1C.inl \
-  SecurityLevel1S.cpp \
-  SecurityLevel1S.h \
-  SecurityLevel1S.inl
-
-CLEANFILES += \
-  SecurityLevel1-stamp \
-  SecurityLevel1C.cpp \
-  SecurityLevel1C.h \
-  SecurityLevel1C.inl \
-  SecurityLevel1S.cpp \
-  SecurityLevel1S.h \
-  SecurityLevel1S.inl
-
-SecurityLevel1C.cpp SecurityLevel1C.h SecurityLevel1C.inl SecurityLevel1S.cpp SecurityLevel1S.h SecurityLevel1S.inl: SecurityLevel1-stamp
-
-SecurityLevel1-stamp: $(srcdir)/SecurityLevel1.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  SecurityLevel2C.cpp \
-  SecurityLevel2C.h \
-  SecurityLevel2C.inl \
-  SecurityLevel2S.cpp \
-  SecurityLevel2S.h \
-  SecurityLevel2S.inl
-
-CLEANFILES += \
-  SecurityLevel2-stamp \
-  SecurityLevel2C.cpp \
-  SecurityLevel2C.h \
-  SecurityLevel2C.inl \
-  SecurityLevel2S.cpp \
-  SecurityLevel2S.h \
-  SecurityLevel2S.inl
-
-SecurityLevel2C.cpp SecurityLevel2C.h SecurityLevel2C.inl SecurityLevel2S.cpp SecurityLevel2S.h SecurityLevel2S.inl: SecurityLevel2-stamp
-
-SecurityLevel2-stamp: $(srcdir)/SecurityLevel2.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  SecurityLevel3C.cpp \
-  SecurityLevel3C.h \
-  SecurityLevel3C.inl \
-  SecurityLevel3S.inl
-
-CLEANFILES += \
-  SecurityLevel3-stamp \
-  SecurityLevel3C.cpp \
-  SecurityLevel3C.h \
-  SecurityLevel3C.inl \
-  SecurityLevel3S.inl
-
-SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3C.inl SecurityLevel3S.inl: SecurityLevel3-stamp
-
-SecurityLevel3-stamp: $(srcdir)/SecurityLevel3.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_Security.la
-
-libTAO_Security_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_SECURITY_BUILD_DLL
-
-libTAO_Security_la_SOURCES = \
-  CSIC.cpp \
-  CSIIOPC.cpp \
-  GSSUPC.cpp \
-  Security/CSI_Utils.cpp \
-  Security/SL2_EstablishTrustPolicy.cpp \
-  Security/SL2_QOPPolicy.cpp \
-  Security/SL2_SecurityManager.cpp \
-  Security/SL3_ContextEstablishmentPolicy.cpp \
-  Security/SL3_CredentialsAcquirerFactory.cpp \
-  Security/SL3_CredentialsCurator.cpp \
-  Security/SL3_ObjectCredentialsPolicy.cpp \
-  Security/SL3_PolicyFactory.cpp \
-  Security/SL3_SecurityCurrent.cpp \
-  Security/SL3_SecurityCurrent_Impl.cpp \
-  Security/SL3_SecurityManager.cpp \
-  Security/Security_Current.cpp \
-  Security/Security_Current_Impl.cpp \
-  Security/Security_ORBInitializer.cpp \
-  Security/Security_PolicyFactory.cpp \
-  SecurityC.cpp \
-  SecurityLevel1C.cpp \
-  SecurityLevel1S.cpp \
-  SecurityLevel2C.cpp \
-  SecurityLevel2S.cpp \
-  SecurityLevel3C.cpp \
-  SecurityS.cpp
-
-libTAO_Security_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Security_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CSI.idl \
-  CSIC.h \
-  CSIC.inl \
-  CSIIOP.idl \
-  CSIIOPC.h \
-  CSIIOPC.inl \
-  CSIIOPS.inl \
-  CSIS.inl \
-  GSSUP.idl \
-  GSSUPC.h \
-  GSSUPC.inl \
-  GSSUPS.inl \
-  Security.idl \
-  Security/CSI_Utils.h \
-  Security/SL2_EstablishTrustPolicy.h \
-  Security/SL2_QOPPolicy.h \
-  Security/SL2_SecurityManager.h \
-  Security/SL3_ContextEstablishmentPolicy.h \
-  Security/SL3_CredentialsAcquirerFactory.h \
-  Security/SL3_CredentialsCurator.h \
-  Security/SL3_ObjectCredentialsPolicy.h \
-  Security/SL3_PolicyFactory.h \
-  Security/SL3_SecurityCurrent.h \
-  Security/SL3_SecurityCurrent.inl \
-  Security/SL3_SecurityCurrent_Impl.h \
-  Security/SL3_SecurityManager.h \
-  Security/Security_Current.h \
-  Security/Security_Current.inl \
-  Security/Security_Current_Impl.h \
-  Security/Security_ORBInitializer.h \
-  Security/Security_PolicyFactory.h \
-  Security/security_export.h \
-  SecurityC.h \
-  SecurityC.inl \
-  SecurityLevel1.idl \
-  SecurityLevel1C.h \
-  SecurityLevel1C.inl \
-  SecurityLevel1S.h \
-  SecurityLevel1S.inl \
-  SecurityLevel2.idl \
-  SecurityLevel2C.h \
-  SecurityLevel2C.inl \
-  SecurityLevel2S.h \
-  SecurityLevel2S.inl \
-  SecurityLevel3.idl \
-  SecurityLevel3C.h \
-  SecurityLevel3C.inl \
-  SecurityLevel3S.inl \
-  SecurityS.h \
-  SecurityS.inl
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  Security.rc
-
-
-## Makefile.SSLIOP.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-BUILT_SOURCES += \
-  SSLIOPC.cpp \
-  SSLIOPC.h \
-  SSLIOPC.inl \
-  SSLIOPS.h
-
-CLEANFILES += \
-  SSLIOP-stamp \
-  SSLIOPC.cpp \
-  SSLIOPC.h \
-  SSLIOPC.inl \
-  SSLIOPS.h
-
-SSLIOPC.cpp SSLIOPC.h SSLIOPC.inl SSLIOPS.h: SSLIOP-stamp
-
-SSLIOP-stamp: $(srcdir)/SSLIOP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS $(srcdir)/SSLIOP.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  SSLIOP/ssl_endpointsC.cpp \
-  SSLIOP/ssl_endpointsC.h \
-  SSLIOP/ssl_endpointsS.h
-
-CLEANFILES += \
-  SSLIOP/ssl_endpoints-stamp \
-  SSLIOP/ssl_endpointsC.cpp \
-  SSLIOP/ssl_endpointsC.h \
-  SSLIOP/ssl_endpointsS.h
-
-SSLIOP/ssl_endpointsC.cpp SSLIOP/ssl_endpointsC.h SSLIOP/ssl_endpointsS.h: SSLIOP/ssl_endpoints-stamp
-
-SSLIOP/ssl_endpoints-stamp: $(srcdir)/SSLIOP/ssl_endpoints.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS -Sci -Gp -Gd -Sa -Sorb -o SSLIOP $(srcdir)/SSLIOP/ssl_endpoints.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_SSLIOP.la
-
-libTAO_SSLIOP_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@ \
-  -DTAO_SSLIOP_BUILD_DLL
-
-libTAO_SSLIOP_la_SOURCES = \
-  ./SSLIOP/IIOP_SSL_Acceptor.cpp \
-  ./SSLIOP/IIOP_SSL_Connection_Handler.cpp \
-  ./SSLIOP/IIOP_SSL_Connector.cpp \
-  ./SSLIOP/IIOP_SSL_Transport.cpp \
-  ./SSLIOP/SSLIOP_Accept_Strategy.cpp \
-  ./SSLIOP/SSLIOP_Acceptor.cpp \
-  ./SSLIOP/SSLIOP_ClientCredentials.cpp \
-  ./SSLIOP/SSLIOP_Connection_Handler.cpp \
-  ./SSLIOP/SSLIOP_Connector.cpp \
-  ./SSLIOP/SSLIOP_Credentials.cpp \
-  ./SSLIOP/SSLIOP_CredentialsAcquirer.cpp \
-  ./SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp \
-  ./SSLIOP/SSLIOP_Current.cpp \
-  ./SSLIOP/SSLIOP_Current_Impl.cpp \
-  ./SSLIOP/SSLIOP_EVP_PKEY.cpp \
-  ./SSLIOP/SSLIOP_Endpoint.cpp \
-  ./SSLIOP/SSLIOP_Factory.cpp \
-  ./SSLIOP/SSLIOP_Invocation_Interceptor.cpp \
-  ./SSLIOP/SSLIOP_ORBInitializer.cpp \
-  ./SSLIOP/SSLIOP_OwnCredentials.cpp \
-  ./SSLIOP/SSLIOP_Profile.cpp \
-  ./SSLIOP/SSLIOP_TargetCredentials.cpp \
-  ./SSLIOP/SSLIOP_Transport.cpp \
-  ./SSLIOP/SSLIOP_Util.cpp \
-  ./SSLIOP/params_dup.c \
-  ./SSLIOP/ssl_endpointsC.cpp \
-  SSLIOPC.cpp
-
-libTAO_SSLIOP_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @ACE_TLS_LDFLAGS@
-
-libTAO_SSLIOP_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-nobase_include_HEADERS += \
-  ./SSLIOP/IIOP_SSL_Acceptor.h \
-  ./SSLIOP/IIOP_SSL_Connection_Handler.h \
-  ./SSLIOP/IIOP_SSL_Connection_Handler.inl \
-  ./SSLIOP/IIOP_SSL_Connector.h \
-  ./SSLIOP/IIOP_SSL_Transport.h \
-  ./SSLIOP/SSLIOP_Accept_Strategy.h \
-  ./SSLIOP/SSLIOP_Acceptor.h \
-  ./SSLIOP/SSLIOP_Acceptor.inl \
-  ./SSLIOP/SSLIOP_ClientCredentials.h \
-  ./SSLIOP/SSLIOP_Connection_Handler.h \
-  ./SSLIOP/SSLIOP_Connection_Handler.inl \
-  ./SSLIOP/SSLIOP_Connector.h \
-  ./SSLIOP/SSLIOP_Credentials.h \
-  ./SSLIOP/SSLIOP_Credentials.inl \
-  ./SSLIOP/SSLIOP_CredentialsAcquirer.h \
-  ./SSLIOP/SSLIOP_CredentialsAcquirerFactory.h \
-  ./SSLIOP/SSLIOP_Current.h \
-  ./SSLIOP/SSLIOP_Current.inl \
-  ./SSLIOP/SSLIOP_Current_Impl.h \
-  ./SSLIOP/SSLIOP_Current_Impl.inl \
-  ./SSLIOP/SSLIOP_EVP_PKEY.h \
-  ./SSLIOP/SSLIOP_Endpoint.h \
-  ./SSLIOP/SSLIOP_Endpoint.inl \
-  ./SSLIOP/SSLIOP_Export.h \
-  ./SSLIOP/SSLIOP_Factory.h \
-  ./SSLIOP/SSLIOP_Invocation_Interceptor.h \
-  ./SSLIOP/SSLIOP_ORBInitializer.h \
-  ./SSLIOP/SSLIOP_OpenSSL_st_T.cpp \
-  ./SSLIOP/SSLIOP_OpenSSL_st_T.h \
-  ./SSLIOP/SSLIOP_OpenSSL_st_T.inl \
-  ./SSLIOP/SSLIOP_OwnCredentials.h \
-  ./SSLIOP/SSLIOP_Profile.h \
-  ./SSLIOP/SSLIOP_SSL.h \
-  ./SSLIOP/SSLIOP_TargetCredentials.h \
-  ./SSLIOP/SSLIOP_Transport.h \
-  ./SSLIOP/SSLIOP_Util.h \
-  ./SSLIOP/SSLIOP_X509.h \
-  ./SSLIOP/params_dup.h \
-  SSLIOP.idl \
-  SSLIOP/ssl_endpoints.pidl \
-  SSLIOP/ssl_endpointsC.h \
-  SSLIOP/ssl_endpointsS.h \
-  SSLIOPC.h \
-  SSLIOPC.inl \
-  SSLIOPS.h
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  SSLIOP.rc
-
-
-## 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/orbsvcs/orbsvcs/Naming/Entries.cpp b/orbsvcs/orbsvcs/Naming/Entries.cpp
index aae10d1aa90..69061e2ce04 100644
--- a/orbsvcs/orbsvcs/Naming/Entries.cpp
+++ b/orbsvcs/orbsvcs/Naming/Entries.cpp
@@ -12,7 +12,7 @@
 
 #include "orbsvcs/Naming/Entries.h"
 
-ACE_RCSID(Naming, Entries, "$Id$")
+
 
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h b/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h
index 8c76dbc99a3..7b03ba75b03 100644
--- a/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h
+++ b/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h
@@ -86,7 +86,7 @@ public:
   // Factory Methods
 
   /// Create the stream that can operate on a disk file
-  virtual TAO_Storable_Base *create_stream(const ACE_CString & file, 
+  virtual TAO_Storable_Base *create_stream(const ACE_CString & file,
                                            const ACE_TCHAR * mode);
 };
 
diff --git a/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
index 2e143e47c8a..f3b6182e33e 100644
--- a/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -13,21 +13,12 @@
 #include "orbsvcs/Naming/nsconf.h"
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (Naming,
-           Hash_Naming_Context,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// -------------------------------------------------
-
 TAO_Bindings_Map::~TAO_Bindings_Map (void)
 {
 }
 
-// -------------------------------------------------
-
 TAO_Hash_Naming_Context::TAO_Hash_Naming_Context (PortableServer::POA_ptr poa,
                                                   const char *poa_id)
   : context_ (0),
diff --git a/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index d01a51f75f4..df5cb7b77e7 100644
--- a/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -332,7 +332,7 @@ TAO_Naming_Context::to_url_is_alnum_or_punctuation (char c)
   if (ACE_OS::ace_isalnum (c))
     return 1;
 
-  // NON US-ASCII charcters excluding those in this array are the
+  // NON US-ASCII characters excluding those in this array are the
   // characters that need to be escaped
   static char non_escaped_punctuation[] =
     { ';', '/', ':', '?', '@', '=', '+', '$', ',', '-',
diff --git a/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index 52d30d4c3ef..44736086700 100644
--- a/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -17,7 +17,7 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Argv_Type_Converter.h"
 
-ACE_RCSID (Naming, Naming_Loader, "$Id$")
+
 
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index ae8c95cc794..236e97accb8 100644
--- a/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -29,10 +29,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (Naming,
-           Naming_Server,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Naming_Server::TAO_Naming_Server (void)
@@ -725,7 +721,8 @@ TAO_Naming_Server::fini (void)
   // the Naming Service
   try
     {
-      this->ns_poa_->destroy (1, 1);
+      if (!CORBA::is_nil (this->ns_poa_.in ()))
+        this->ns_poa_->destroy (1, 1);
 
       CORBA::Object_var table_object =
         this->orb_->resolve_initial_references ("IORTable");
diff --git a/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
index 424bfb6b9b9..e003601379c 100644
--- a/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
+++ b/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
@@ -25,12 +25,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_NS_Node)
 
-# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
 template <class T>
 ACE_NS_Node<T>::~ACE_NS_Node (void)
 {
 }
-# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
 
 template <class T>
 ACE_NS_Node<T>::ACE_NS_Node (const T &i, ACE_NS_Node<T> *n)
diff --git a/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
index 9b263f431b1..212f2cbc280 100644
--- a/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
+++ b/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
@@ -46,10 +46,7 @@ public:
   friend class ACE_Unbounded_List<T>;
   friend class ACE_Unbounded_List_Iterator<T>;
 
-# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
-  /// This isn't necessary, but it keeps some compilers happy.
   ~ACE_NS_Node (void);
-# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
 
 private:
   // = Initialization methods
diff --git a/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index 70f6caf7b04..34b74c6b5de 100644
--- a/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -238,15 +238,7 @@ TAO_Persistent_Context_Index::create_index (void)
       return -1;
     }
 
-#if !defined (CHORUS)
   ACE_MMAP_Memory_Pool::OPTIONS options (base_address_);
-#else
-  // Use base address == 0, don't use a fixed address.
-  ACE_MMAP_Memory_Pool::OPTIONS options (0,
-                                         0,
-                                         0,
-                                         ACE_CHORUS_LOCAL_NAME_SPACE_T_SIZE);
-#endif /* CHORUS */
 
   // Create the allocator with the appropriate options.  The name used
   // for  the lock is the same as one used for the file.
diff --git a/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index 68943e2458e..caa29847f7b 100644
--- a/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/Naming/Persistent_Naming_Context.h"
 #include "orbsvcs/Naming/Persistent_Context_Index.h"
 #include "orbsvcs/Naming/Bindings_Iterator_T.h"
@@ -5,15 +7,10 @@
 
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (Naming,
-           Persistent_Naming_Context,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
-TAO_Persistent_Bindings_Map::unbind (const char *id,
-                                     const char *kind)
+TAO_Persistent_Bindings_Map::unbind (const char *id, const char *kind)
 {
   TAO_Persistent_ExtId name (id, kind);
   TAO_Persistent_IntId entry;
diff --git a/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index 3b9aae5b30b..e37f995cce6 100644
--- a/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -1,26 +1,13 @@
+// $Id$
+
 #include "orbsvcs/Naming/Storable_Naming_Context.h"
 #include "orbsvcs/Naming/Bindings_Iterator_T.h"
 
 #include "tao/debug.h"
 
-// The following #pragma is needed to disable a warning that occurs
-// in MSVC 6 due to the overly long debugging symbols generated for
-// the ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_...> > template
-// instance used by some of the methods in this file.
-#ifdef _MSC_VER
-#  pragma warning(disable: 4786)  /* identifier was truncated to '255'
-                                     characters in the browser
-                                     information */
-#endif  /* _MSC_VER */
-
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Naming,
-           Storable_Naming_Context,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const char * TAO_Storable_Naming_Context::root_name_;
diff --git a/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index e1c0b8c0956..34eef002ead 100644
--- a/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -13,7 +13,7 @@
 #include "orbsvcs/Naming/Bindings_Iterator_T.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Naming, Transient_Naming_Context, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Notify/Admin.cpp b/orbsvcs/orbsvcs/Notify/Admin.cpp
index 6580e815f82..171fae5d70a 100644
--- a/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/Notify/Admin.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Notify,
-           TAO_Notify_Admin,
-           "$Id$")
-
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 
 #include "orbsvcs/Notify/Container_T.h"
diff --git a/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
index 37798f3088f..d1a249052ba 100644
--- a/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
+++ b/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/Notify/AdminProperties.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Notify,
-           TAO_Notify_AdminProperties,
-           "$Id$")
-
 #include "orbsvcs/CosNotificationC.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -40,7 +36,7 @@ TAO_Notify_AdminProperties::init (const CosNotification::PropertySeq& prop_seq)
   this->reject_new_events_.set (*this);
 
   //@@ check if unsupported property was set.
-  // This will happen when number of successfull inits != numbers of items bound in map_.
+  // This will happen when number of successful inits != numbers of items bound in map_.
 
   return 0;
 }
diff --git a/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
index 35c1afd2b2b..14ce46c8381 100644
--- a/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+++ b/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
@@ -1,11 +1,7 @@
 // $Id$
 
 #include "orbsvcs/Notify/Any/AnyEvent.h"
-
-ACE_RCSID (Notify, TAO_Notify_AnyEvent, "$Id$")
-
 #include "orbsvcs/Notify/Consumer.h"
-
 #include "tao/corba.h"
 #include "tao/debug.h"
 
diff --git a/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
index 1e89277bde1..8f2b142f342 100644
--- a/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
+++ b/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h"
-
-ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushConsumer, "$Id$")
-
 #include "tao/debug.h"
 #include "orbsvcs/Notify/AdminProperties.h"
 #include "orbsvcs/Notify/Method_Request_Lookup.h"
@@ -83,7 +80,7 @@ TAO_Notify_CosEC_ProxyPushConsumer::validate ()
   {
     if (TAO_debug_level > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) TAO_Notify_CosEC_ProxyPushConsumer::validate(%d)")
                   ACE_TEXT ("disconnecting \n"), this->id ()));
     }
diff --git a/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
index 176300553e5..9603d8a9636 100644
--- a/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
+++ b/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h"
-
-ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushSupplier, "$Id$")
-
 #include "tao/debug.h"
 #include "orbsvcs/Notify/Any/PushConsumer.h"
 
@@ -60,7 +57,7 @@ TAO_Notify_CosEC_ProxyPushSupplier::validate ()
   {
     if (TAO_debug_level > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) TAO_Notify_CosEC_ProxyPushSupplier::validate(%d)")
                   ACE_TEXT ("disconnecting \n"), this->id ()));
     }
diff --git a/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
index ae52b9b62e4..92362902145 100644
--- a/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Any/ProxyPushConsumer.h"
-
-ACE_RCSID (Notify, TAO_Notify_ProxyPushConsumer, "$Id$")
-
 #include "tao/debug.h"
 #include "orbsvcs/Notify/AdminProperties.h"
 #include "orbsvcs/Notify/Properties.h"
@@ -86,7 +83,7 @@ TAO_Notify_ProxyPushConsumer::validate ()
   {
     if (TAO_debug_level > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) TAO_Notify_ProxyPushConsumer::validate(%d)")
                   ACE_TEXT ("disconnecting \n"), this->id ()));
     }
diff --git a/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
index ecd4ae32f88..aae6d178396 100644
--- a/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
+++ b/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Any/ProxyPushSupplier.h"
-
-ACE_RCSID (Notify, TAO_Notify_ProxyPushSupplier, "$Id$")
-
 #include "tao/debug.h"
 #include "orbsvcs/Notify/Any/PushConsumer.h"
 #include "orbsvcs/Notify/Properties.h"
@@ -68,7 +65,7 @@ TAO_Notify_ProxyPushSupplier::validate ()
   {
     if (TAO_debug_level > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) TAO_Notify_ProxyPushSupplier::validate(%d)")
                   ACE_TEXT ("disconnecting \n"), this->id ()));
     }
diff --git a/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index dd6ec81d500..45b6ffbdc18 100644
--- a/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Any/PushConsumer.h"
-
-ACE_RCSID (Notify,
-           TAO_Notify_PushConsumer,
-           "$Id$")
-
 #include "ace/Bound_Ptr.h"
 #include "tao/Stub.h" // For debug messages printing out ORBid.
 #include "tao/ORB_Core.h"
diff --git a/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
index 8a7db5acc4f..d3a63c25dc0 100644
--- a/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
+++ b/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
@@ -1,8 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Any/PushSupplier.h"
-
-ACE_RCSID (Notify, TAO_Notify_PushSupplier, "$Id$")
 #include "orbsvcs/Notify/Properties.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
index d21469c2806..fcba741ef1f 100644
--- a/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
+++ b/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
@@ -2,9 +2,6 @@
 
 #include "orbsvcs/Notify/Buffering_Strategy.h"
 
-ACE_RCSID (Notify, Buffering_Strategy, "$Id$")
-
-
 #include "orbsvcs/Notify/Method_Request.h"
 #include "orbsvcs/Notify/Notify_Extensions.h"
 #include "orbsvcs/Notify/QoSProperties.h"
@@ -224,7 +221,7 @@ TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request_Queueable* met
 int
 TAO_Notify_Buffering_Strategy::dequeue (TAO_Notify_Method_Request_Queueable* &method_request, const ACE_Time_Value *abstime)
 {
-  ACE_Message_Block *mb;
+  ACE_Message_Block *mb = 0;
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1);
 
diff --git a/orbsvcs/orbsvcs/Notify/Builder.cpp b/orbsvcs/orbsvcs/Notify/Builder.cpp
index c070f593e15..931ffbf8bc7 100644
--- a/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -1,10 +1,6 @@
 // $Id$
 #include "orbsvcs/Notify/Builder.h"
 
-ACE_RCSID (Notify,
-           Builder,
-           "$Id$")
-
 #include "ace/Dynamic_Service.h"
 
 #include "tao/PortableServer/PortableServerC.h"
diff --git a/orbsvcs/orbsvcs/Notify/Consumer.cpp b/orbsvcs/orbsvcs/Notify/Consumer.cpp
index 79638daa595..3f794fd2c7f 100644
--- a/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -6,8 +6,6 @@
 #include "orbsvcs/Notify/Consumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (RT_Notify, TAO_Notify_Consumer, "$Id$")
-
 #include "orbsvcs/Notify/Timer.h"
 #include "orbsvcs/Notify/ProxySupplier.h"
 #include "orbsvcs/Notify/Method_Request_Event.h"
@@ -221,7 +219,6 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request)
             catch (const CORBA::Exception&)
               {
                 // todo is there something meaningful we can do here?
-                ;
               }
             break;
           }
@@ -501,11 +498,15 @@ TAO_Notify_Consumer::dispatch_pending (void)
 
 
 // virtual: this is the default, overridden for SequencePushConsumer
+// FUZZ: disable check_for_ACE_Guard
 bool
-TAO_Notify_Consumer::dispatch_from_queue (Request_Queue & requests, ACE_Guard <TAO_SYNCH_MUTEX> & ace_mon)
+TAO_Notify_Consumer::dispatch_from_queue (
+  Request_Queue & requests,
+  ACE_Guard <TAO_SYNCH_MUTEX> & ace_mon)
 {
+// FUZZ: enable check_for_ACE_Guard
   bool result = true;
-  TAO_Notify_Method_Request_Event_Queueable * request;
+  TAO_Notify_Method_Request_Event_Queueable * request = 0;
   if (requests.dequeue_head (request) == 0)
     {
       ace_mon.release ();
@@ -588,8 +589,8 @@ TAO_Notify_Consumer::dispatch_from_queue (Request_Queue & requests, ACE_Guard <T
   return result;
 }
 
-//@@todo: rather than is_error, use pacing interval so it will be configurable
-//@@todo: find some way to use batch buffering stratgy for sequence consumers.
+/// @todo: rather than is_error, use pacing interval so it will be configurable
+/// @todo: find some way to use batch buffering stratgy for sequence consumers.
 void
 TAO_Notify_Consumer::schedule_timer (bool is_error)
 {
@@ -747,8 +748,8 @@ TAO_Notify_Consumer::is_alive (bool allow_nil_consumer)
   {
     // The consumer may not connected or the consumer did
     // not provide a callback. In this case, the liveliness
-    // check should return true so it will be validated in 
-    // next period. 
+    // check should return true so it will be validated in
+    // next period.
     if (allow_nil_consumer)
       return true;
     else
@@ -788,12 +789,12 @@ TAO_Notify_Consumer::is_alive (bool allow_nil_consumer)
         for (CORBA::ULong i = 0; i < policy_list.length (); i++)
           policy_list[i]->destroy ();
 
-        do_liveliness_check 
-          = (last_ping_ == ACE_Time_Value::zero ? true 
+        do_liveliness_check
+          = (last_ping_ == ACE_Time_Value::zero ? true
           : now - last_ping_.value () >= TAO_Notify_PROPERTIES::instance()->validate_client_delay ());
       }
       else
-        do_liveliness_check = 
+        do_liveliness_check =
           now - last_ping_.value () >= TAO_Notify_PROPERTIES::instance()->validate_client_interval ();
 
       if (CORBA::is_nil (rtt_obj_.in ()))
@@ -813,7 +814,7 @@ TAO_Notify_Consumer::is_alive (bool allow_nil_consumer)
   catch (CORBA::Exception& ex)
     {
       if (DEBUG_LEVEL > 0)
-      {        
+      {
         ex._tao_print_exception ("TAO_Notify_Consumer::is_alive: false");
       }
     }
diff --git a/orbsvcs/orbsvcs/Notify/Consumer.h b/orbsvcs/orbsvcs/Notify/Consumer.h
index ec4ddbc956a..b7a3e5242ee 100644
--- a/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -137,6 +137,7 @@ protected:
 
   DispatchStatus dispatch_request (TAO_Notify_Method_Request_Event * request);
 
+// FUZZ: disable check_for_ACE_Guard
   /**
    * \brief Attempt to dispatch event from a queue.
    *
@@ -150,6 +151,7 @@ protected:
   virtual bool dispatch_from_queue (
     Request_Queue & requests,
     ACE_Guard <TAO_SYNCH_MUTEX> & ace_mon);
+// FUZZ: enable check_for_ACE_Guard
 
   void enqueue_request(TAO_Notify_Method_Request_Event * request);
 
diff --git a/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index fd77dc396f7..de8fc25335f 100644
--- a/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/ConsumerAdmin.h"
-
-ACE_RCSID (RT_Notify,
-           TAO_Notify_ConsumerAdmin,
-           "$Id$")
-
 #include "orbsvcs/Notify/Subscription_Change_Worker.h"
 #include "orbsvcs/Notify/Proxy.h"
 #include "orbsvcs/Notify/EventChannel.h"
diff --git a/orbsvcs/orbsvcs/Notify/Consumer_Map.h b/orbsvcs/orbsvcs/Notify/Consumer_Map.h
index eec7e570347..4210fb99c45 100644
--- a/orbsvcs/orbsvcs/Notify/Consumer_Map.h
+++ b/orbsvcs/orbsvcs/Notify/Consumer_Map.h
@@ -32,8 +32,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * @brief The Event Map for Consumers.
  *
  */
-typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxySupplier, 
-                               TAO_SYNCH_RW_MUTEX> 
+typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxySupplier,
+                               TAO_SYNCH_RW_MUTEX>
   TAO_Notify_Consumer_Map;
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp b/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
index 86d6e46106a..6ee12bec12f 100644
--- a/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
+++ b/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/CosNotify_Initializer.h"
-
-ACE_RCSID(Notify, TAO_Notify_CosNotify_Initializer, "$Id$")
-
 #include "orbsvcs/Notify/CosNotify_Service.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index d7477c9b8a1..0362bcd53af 100644
--- a/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -12,10 +12,6 @@
 #include "orbsvcs/NotifyExtC.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Notify,
-           TAO_CosNotify_Service,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CosNotify_Service::TAO_CosNotify_Service (void)
diff --git a/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
index 9b2e3482483..cad7acc0732 100644
--- a/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+++ b/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Default_Factory.h"
-
-ACE_RCSID (Notify,
-           TAO_Notify_Default_Factory,
-           "$Id$")
-
 #include "orbsvcs/Notify/EventChannelFactory.h"
 #include "orbsvcs/Notify/EventChannel.h"
 #include "orbsvcs/Notify/Admin.h"
diff --git a/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index a1d68620aea..66c9ed15961 100644
--- a/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/ETCL_Filter.h"
-
-ACE_RCSID(Notify,
-          TAO_Notify_ETCL_Filter,
-          "$Id$")
-
 #include "ace/Auto_Ptr.h"
 #include "tao/debug.h"
 #include "orbsvcs/Notify/Notify_Constraint_Visitors.h"
diff --git a/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index 3dc1b144832..afae176dab5 100644
--- a/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -52,7 +52,7 @@ public:
 
   TAO_Notify::Topology_Object* load_child (
     const ACE_CString &type,
-    CORBA::Long id, 
+    CORBA::Long id,
     const TAO_Notify::NVPList& attrs);
 
 
diff --git a/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index daced62a97a..4ce532c053d 100644
--- a/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -1,20 +1,14 @@
 // $Id$
 
 #include "orbsvcs/Notify/ETCL_FilterFactory.h"
-
-ACE_RCSID(Notify, TAO_Notify_ETCL_FilterFactory, "$Id$")
-
 #include "orbsvcs/Notify/ETCL_Filter.h"
 #include "orbsvcs/Notify/Properties.h"
 #include "tao/debug.h"
 
-
 #ifndef DEBUG_LEVEL
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_ETCL_FilterFactory::TAO_Notify_ETCL_FilterFactory (void) :
@@ -25,7 +19,7 @@ TAO_Notify_ETCL_FilterFactory::TAO_Notify_ETCL_FilterFactory (void) :
 TAO_Notify_ETCL_FilterFactory::~TAO_Notify_ETCL_FilterFactory ()
 {
   FILTERMAP::ITERATOR iterator (this->filters_);
-  
+
   for (FILTERMAP::ENTRY *entry = 0;
     iterator.next (entry) != 0;
     iterator.advance ())
@@ -107,8 +101,8 @@ TAO_Notify_ETCL_FilterFactory::create_filter (
   filter = 0;
 
   ACE_NEW_THROW_EX (filter,
-                    TAO_Notify_ETCL_Filter (this->filter_poa_.in (), 
-                                            constraint_grammar, 
+                    TAO_Notify_ETCL_Filter (this->filter_poa_.in (),
+                                            constraint_grammar,
                                             id),
                     CORBA::NO_MEMORY ());
 
@@ -116,8 +110,8 @@ TAO_Notify_ETCL_FilterFactory::create_filter (
   {
     throw CORBA::INTERNAL ();
     return 0;
-  }  
-  
+  }
+
   PortableServer::ObjectId_var oid;
   try
     {
@@ -151,7 +145,7 @@ TAO_Notify_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 
-void 
+void
 TAO_Notify_ETCL_FilterFactory::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   bool changed = true;
@@ -188,7 +182,7 @@ TAO_Notify_ETCL_FilterFactory::load_child (const ACE_CString &type,
     if (attrs.find ("FilterId", value))
     {
       TAO_Notify_Object::ID const id = ACE_OS::atoi (value);
-      if (DEBUG_LEVEL) 
+      if (DEBUG_LEVEL)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("(%P|%t) reload filter %d\n"),
                     static_cast<int> (id)
@@ -199,7 +193,7 @@ TAO_Notify_ETCL_FilterFactory::load_child (const ACE_CString &type,
       TAO_Notify_ETCL_Filter* filter = 0;
       this->create_filter (0, id, filter);
       filter->load_attrs (attrs);
- 
+
       return  filter;
     }
   }
@@ -215,10 +209,10 @@ TAO_Notify_ETCL_FilterFactory::release (void)
 }
 
 
-TAO_Notify_Object::ID 
+TAO_Notify_Object::ID
 TAO_Notify_ETCL_FilterFactory::get_filter_id (CosNotifyFilter::Filter_ptr filter)
 {
-  ::PortableServer::Servant svt 
+  ::PortableServer::Servant svt
     = this->filter_poa_->reference_to_servant (filter);
 
   FILTERMAP::ITERATOR iterator (this->filters_);
@@ -236,7 +230,7 @@ TAO_Notify_ETCL_FilterFactory::get_filter_id (CosNotifyFilter::Filter_ptr filter
 }
 
 
-CosNotifyFilter::Filter_ptr 
+CosNotifyFilter::Filter_ptr
 TAO_Notify_ETCL_FilterFactory::get_filter (const TAO_Notify_Object::ID& id)
 {
   TAO_Notify_ETCL_Filter* filter = 0;
@@ -247,7 +241,7 @@ TAO_Notify_ETCL_FilterFactory::get_filter (const TAO_Notify_Object::ID& id)
     CORBA::Object_var obj =
       this->filter_poa_->servant_to_reference (filter);
 
-    CosNotifyFilter::Filter_var filter 
+    CosNotifyFilter::Filter_var filter
       = CosNotifyFilter::Filter::_narrow (obj.in ());
 
     return filter._retn ();
diff --git a/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
index ce95bb061ea..0e1012360e2 100644
--- a/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
+++ b/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
@@ -26,7 +26,7 @@
 #include "orbsvcs/Notify/ID_Factory.h"
 #include "orbsvcs/Notify/ETCL_Filter.h"
 #include "orbsvcs/Notify/Topology_Saver.h"
-  
+
 
 #if defined(_MSC_VER)
 #pragma warning(push)
@@ -73,7 +73,7 @@ public:
 
   virtual TAO_Notify::Topology_Object* load_child (
           const ACE_CString &type,
-          CORBA::Long id, 
+          CORBA::Long id,
           const TAO_Notify::NVPList& attrs);
 
   virtual TAO_Notify_Object::ID get_filter_id (CosNotifyFilter::Filter_ptr filter);
@@ -82,7 +82,7 @@ public:
 
 protected:
 
-  CosNotifyFilter::Filter_ptr 
+  CosNotifyFilter::Filter_ptr
     create_filter (const char *constraint_grammar,
                    const TAO_Notify_Object::ID& id,
                    TAO_Notify_ETCL_Filter*& filter);
diff --git a/orbsvcs/orbsvcs/Notify/Event.cpp b/orbsvcs/orbsvcs/Notify/Event.cpp
index 44bf84dc9fd..003b4e6cd5c 100644
--- a/orbsvcs/orbsvcs/Notify/Event.cpp
+++ b/orbsvcs/orbsvcs/Notify/Event.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/Notify/Event.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Notify,
-           TAO_Notify_Event,
-           "$Id$")
-
 #include "tao/debug.h"
 #include "tao/CDR.h"
 #include "orbsvcs/CosNotificationC.h"
diff --git a/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index 3e5e7aed22b..922b871eeaa 100644
--- a/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -25,8 +25,6 @@
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
-ACE_RCSID(Notify, TAO_Notify_EventChannel, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 typedef TAO_Notify_Find_Worker_T<TAO_Notify_ConsumerAdmin
@@ -112,7 +110,7 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
 
   this->set_admin (initial_admin);
 
-  PortableServer::POA_var default_poa = 
+  PortableServer::POA_var default_poa =
     TAO_Notify_PROPERTIES::instance ()->default_poa ();
 
   this->default_filter_factory_ =
@@ -456,7 +454,7 @@ TAO_Notify_EventChannel::save_persistent (TAO_Notify::Topology_Saver& saver)
 
     bool want_all_children = saver.begin_object(
       this->id(), "channel", attrs, changed);
-  
+
     this->default_filter_factory_servant_->save_persistent (saver);
 
     TAO_Notify::Save_Persist_Worker<TAO_Notify_ConsumerAdmin> ca_wrk(saver, want_all_children);
@@ -513,7 +511,7 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type,
   }
   else if (type == "consumer_admin")
   {
-    if (DEBUG_LEVEL) 
+    if (DEBUG_LEVEL)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) EventChannel reload consumer_admin %d\n")
                   , static_cast<int> (id)
@@ -536,7 +534,7 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type,
   }
   else if (type == "supplier_admin")
   {
-    if (DEBUG_LEVEL) 
+    if (DEBUG_LEVEL)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) EventChannel reload supplier_admin %d\n")
                   , static_cast<int> (id)
diff --git a/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index 462aa969035..9f13cd4ec58 100644
--- a/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/EventChannelFactory.h"
-
-ACE_RCSID(Notify,
-          TAO_Notify_EventChannelFactory,
-          "$Id$")
-
 #include "orbsvcs/Notify/Properties.h"
 #include "orbsvcs/Notify/Factory.h"
 #include "orbsvcs/Notify/Builder.h"
diff --git a/orbsvcs/orbsvcs/Notify/EventType.cpp b/orbsvcs/orbsvcs/Notify/EventType.cpp
index b5f38dc130d..66dcf492e9d 100644
--- a/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -12,10 +12,6 @@
 
 #include "orbsvcs/Notify/Topology_Saver.h"
 
-ACE_RCSID (Notify,
-           TAO_Notify_EventType,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_EventType
diff --git a/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index d309deb5b96..5828fd92d0f 100644
--- a/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -9,8 +9,6 @@
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
-ACE_RCSID(Notify, TAO_Notify_EventTypeSeq, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (void)
diff --git a/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
index e5441d5d6a9..bb33172973f 100644
--- a/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+++ b/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Event_Manager.h"
-
-ACE_RCSID(Notify, TAO_Notify_Event_Manager, "$Id$")
-
 #include "orbsvcs/Notify/ProxyConsumer.h"
 #include "orbsvcs/Notify/ProxySupplier.h"
 #include "orbsvcs/Notify/Consumer_Map.h"
diff --git a/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
index d270d180db0..eb443c36ce5 100644
--- a/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
+++ b/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
@@ -9,10 +9,6 @@
 #include "orbsvcs/Notify/Event_Map_Entry_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Notify,
-           TAO_Notify_Event_Map_Entry_T,
-           "$Id$")
-
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "orbsvcs/Notify/Properties.h"
 #include "orbsvcs/Notify/Factory.h"
diff --git a/orbsvcs/orbsvcs/Notify/Event_Map_T.inl b/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
index 3e69b9b475f..e2859f9c93b 100644
--- a/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
+++ b/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
@@ -30,7 +30,7 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::find (const TAO_Notify_EventType& event
       for(Iterator_Type i = this->map_.begin (); i != end; ++i)
         {
           if ((*i).ext_id_ == event_type)
-            {                            
+            {
               entry = (*i).int_id_;
               entry->_incr_refcnt ();
               return entry;
diff --git a/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp b/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
index 3caa8a0c5a1..efa5868c157 100644
--- a/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
+++ b/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
@@ -1,8 +1,6 @@
-#include "orbsvcs/Notify/Event_Persistence_Factory.h"
+// $Id$
 
-ACE_RCSID (Notify,
-           Event_Persistence_Factory,
-           "$Id$")
+#include "orbsvcs/Notify/Event_Persistence_Factory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
index 47debb424d5..6a4f41e219c 100644
--- a/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+++ b/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
@@ -6,8 +6,6 @@
 #include "orbsvcs/Notify/FilterAdmin.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, FilterAdmin, "$Id$")
-
 #include "orbsvcs/Notify/Topology_Saver.h"
 #include "orbsvcs/Notify/Properties.h"
 #include "orbsvcs/Notify/EventChannelFactory.h"
@@ -164,7 +162,7 @@ TAO_Notify_FilterAdmin::load_child (const ACE_CString &type, CORBA::Long id,
 
    TAO_Notify_FilterFactory* factory = ec_->default_filter_factory_servant ();
    CosNotifyFilter::Filter_var filter = factory->get_filter (mapid);
- 
+
     if (! CORBA::is_nil(filter.in()))
     {
       this->filter_ids_.set_last_used(id);
diff --git a/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index 77c27c7e2e8..d988afabfa2 100644
--- a/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -26,7 +26,7 @@
 #include "orbsvcs/Notify/Topology_Object.h"
 #include "orbsvcs/Notify/EventChannel.h"
 
-class TAO_Notify_EventChannel; 
+class TAO_Notify_EventChannel;
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Notify/FilterFactory.h b/orbsvcs/orbsvcs/Notify/FilterFactory.h
index 7810a37421b..bc9398463b2 100644
--- a/orbsvcs/orbsvcs/Notify/FilterFactory.h
+++ b/orbsvcs/orbsvcs/Notify/FilterFactory.h
@@ -33,7 +33,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * @brief Service Object to obtain a CosNotifyFilter::FilterFactory reference.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_FilterFactory 
+class TAO_Notify_Serv_Export TAO_Notify_FilterFactory
   : public ACE_Service_Object, public TAO_Notify::Topology_Object
 {
 public:
diff --git a/orbsvcs/orbsvcs/Notify/ID_Factory.cpp b/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
index 71f0721ee0e..a3dfb15c323 100644
--- a/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
+++ b/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
@@ -6,8 +6,6 @@
 #include "orbsvcs/Notify/ID_Factory.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_ID_Factory, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_ID_Factory::TAO_Notify_ID_Factory (void)
diff --git a/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/orbsvcs/orbsvcs/Notify/Method_Request.cpp
index 87d4f220bca..89f4e5c1672 100644
--- a/orbsvcs/orbsvcs/Notify/Method_Request.cpp
+++ b/orbsvcs/orbsvcs/Notify/Method_Request.cpp
@@ -5,9 +5,6 @@
 #include "orbsvcs/Time_Utilities.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID(Notify, TAO_Notify_Method_Request_Queueable, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Method_Request::~TAO_Notify_Method_Request (void)
diff --git a/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index 46c78c8cf82..4c3e8b47459 100644
--- a/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Method_Request_Dispatch.h"
-
-ACE_RCSID(Notify, TAO_Notify_Method_Request_Dispatch, "$Id$")
-
 #include "orbsvcs/Notify/ProxySupplier.h"
 #include "orbsvcs/Notify/Consumer.h"
 #include "orbsvcs/Notify/Admin.h"
diff --git a/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
index 29dacfce71b..23ccc52f11c 100644
--- a/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
+++ b/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
@@ -3,8 +3,6 @@
 #include "orbsvcs/Notify/Method_Request_Event.h"
 #include "orbsvcs/Notify/Delivery_Request.h"
 
-ACE_RCSID (Notify, TAO_Notify_Method_Request_Event_Queueable, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Method_Request_Event::TAO_Notify_Method_Request_Event (
diff --git a/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index fd33fd2fefe..6a0120758fd 100644
--- a/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Method_Request_Lookup.h"
-
-ACE_RCSID(Notify, TAO_Notify_Method_Request_Lookup, "$Id$")
-
 #include "orbsvcs/Notify/Consumer_Map.h"
 #include "orbsvcs/Notify/ProxySupplier.h"
 #include "orbsvcs/Notify/ProxyConsumer.h"
diff --git a/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
index 2720a530fc1..e64ba1478b2 100644
--- a/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
+++ b/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
@@ -3,8 +3,6 @@
 #include "orbsvcs/Notify/Method_Request_Shutdown.h"
 #include "orbsvcs/Notify/ThreadPool_Task.h"
 
-ACE_RCSID(Notify, TAO_Notify_Method_Request_Shutdown, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Method_Request_Shutdown::TAO_Notify_Method_Request_Shutdown (TAO_Notify_ThreadPool_Task* task)
diff --git a/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
index 61215e49d58..c0be8172969 100644
--- a/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
+++ b/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Method_Request_Updates.h"
-
-ACE_RCSID(Notify, TAO_Notify_Method_Request_Updates, "$Id$")
-
 #include "tao/debug.h"
 #include "orbsvcs/Notify/Proxy.h"
 #include "orbsvcs/Notify/Peer.h"
diff --git a/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
index b9f4bd3d89e..1a29bd03d23 100644
--- a/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
+++ b/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
@@ -86,7 +86,7 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[])
 
   // Force the ARGV_T to copy the elements added by the add() method
   this->task_.argv_.argv ();
-  
+
   // Rember that Monitor has been configured
   this->initialized_ = true;
   return 0;
diff --git a/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp b/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
index 309e82806a7..473b4e8d4d0 100644
--- a/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
+++ b/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
@@ -32,7 +32,7 @@ public:
       {
         CosNotifyChannelAdmin::ConsumerAdmin_var admin =
           this->ec_->get_consumeradmin (this->id_);
-          
+
         if (!CORBA::is_nil (admin.in ()))
           {
             admin->destroy ();
@@ -80,7 +80,7 @@ TAO_MonitorConsumerAdmin::register_stats_controls (
                     Monitor_Base (this->queue_size_stat_name_.c_str (),
                                   Monitor_Control_Types::MC_NUMBER),
                     CORBA::NO_MEMORY ());
-                    
+
   if (!mec->register_statistic (this->queue_size_stat_name_, this->queue_size_))
     {
       // The constructor sets the refcount to 1 so this call will
@@ -111,13 +111,13 @@ TAO_MonitorConsumerAdmin::register_stats_controls (
                                           this->id ()),
                     CORBA::NO_MEMORY ());
   TAO_Control_Registry* cinstance = TAO_Control_Registry::instance ();
-  
+
   if (!cinstance->add (control))
     {
       delete control;
       ACE_ERROR ((LM_ERROR,
                   "Unable to add control: %s\n",
-                  this->control_name_.c_str ()));                 
+                  this->control_name_.c_str ()));
     }
 }
 
@@ -130,7 +130,7 @@ TAO_MonitorConsumerAdmin::obtain_named_notification_push_supplier (
   // First, make sure we can get down to the real ec type.
   TAO_MonitorEventChannel* ec =
     dynamic_cast<TAO_MonitorEventChannel*> (this->ec_.get ());
-    
+
   if (ec == 0)
     {
       throw CORBA::INTERNAL ();
@@ -155,7 +155,7 @@ TAO_MonitorConsumerAdmin::obtain_notification_push_supplier (
   // First, make sure we can get down to the real ec type.
   TAO_MonitorEventChannel* ec =
     dynamic_cast<TAO_MonitorEventChannel*> (this->ec_.get ());
-    
+
   if (ec == 0)
     {
       throw CORBA::INTERNAL ();
@@ -219,14 +219,14 @@ TAO_MonitorConsumerAdmin::stat_name (void)const
 }
 
 
-void 
+void
 TAO_MonitorConsumerAdmin::destroy (void)
 {
   this->remove ();
   this->TAO_Notify_ConsumerAdmin::destroy ();
 }
 
-void 
+void
 TAO_MonitorConsumerAdmin::remove (void)
 {
   // First, make sure we can get down to the real ec type
diff --git a/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp b/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp
index c2c6bf79371..6af8a90efe3 100644
--- a/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp
+++ b/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp
@@ -38,7 +38,7 @@ public:
       is_supplier_ (is_supplier)
   {
   }
-  
+
   virtual void update (void) {
     if (this->type () == Monitor_Control_Types::MC_LIST)
       {
@@ -57,7 +57,7 @@ public:
           this->receive (this->interf_->get_consumers (0));
       }
   }
-   
+
 private:
   bool is_supplier_;
 };
@@ -96,13 +96,13 @@ public:
     is_supplier_ (is_supplier)
   {
   }
-  
+
   virtual void update (void)
   {
     if (this->type () == Monitor_Control_Types::MC_LIST)
       {
         Monitor_Control_Types::NameList list;
-        
+
         if (this->is_supplier_)
           {
             this->interf_->get_supplieradmins (&list);
@@ -111,11 +111,11 @@ public:
           {
             this->interf_->get_consumeradmins (&list);
           }
-          
+
         this->receive (list);
       }
     else
-      { 
+      {
         if (this->is_supplier_)
           {
             this->receive (this->interf_->get_supplieradmins (0));
@@ -186,7 +186,7 @@ public:
                                                       type)
   {
   }
-  
+
   virtual void update (void)
   {
     Monitor_Control_Types::NameList list;
@@ -251,7 +251,7 @@ public:
   virtual bool execute (const char* command)
   {
     bool status = true;
-    
+
     if (this->is_supplier_)
       {
         if (ACE_OS::strcmp (command, TAO_NS_CONTROL_REMOVE_SUPPLIER) == 0)
@@ -299,10 +299,10 @@ TAO_MonitorEventChannel::TAO_MonitorEventChannel (const char* name)
 TAO_MonitorEventChannel::~TAO_MonitorEventChannel (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->names_mutex_);
-  
+
   Monitor_Point_Registry* instance = Monitor_Point_Registry::instance ();
   size_t size = this->stat_names_.size ();
-  
+
   for (size_t i = 0; i < size; ++i)
     {
       instance->remove (this->stat_names_[i].c_str ());
@@ -310,7 +310,7 @@ TAO_MonitorEventChannel::~TAO_MonitorEventChannel (void)
 
   TAO_Control_Registry* cinstance = TAO_Control_Registry::instance ();
   size = this->control_names_.size ();
-  
+
   for (size_t i = 0; i < size; ++i)
     {
       cinstance->remove (this->control_names_[i]);
@@ -330,14 +330,14 @@ TAO_MonitorEventChannel::register_statistic (const ACE_CString& name,
   // Add the statistic to the registry and
   // add the name to the statistic names list.
   bool added = Monitor_Point_Registry::instance ()->add (stat);
-  
+
   if (added)
     {
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->names_mutex_, added);
-      
+
       this->stat_names_.push_back (name);
     }
-    
+
   return added;
 }
 
@@ -354,7 +354,7 @@ TAO_MonitorEventChannel::unregister_statistic (const ACE_CString& name)
 
       this->remove_list_name (this->stat_names_, name);
     }
-    
+
   return removed;
 }
 
@@ -369,9 +369,9 @@ TAO_MonitorEventChannel::map_supplier_proxy (
     }
 
   ACE_CString full = this->name_ + "/" + name;
-  
+
   ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->supplier_mutex_);
-  
+
   if (this->is_duplicate_name (this->supplier_map_, full))
     {
       throw NotifyMonitoringExt::NameAlreadyUsed ();
@@ -391,11 +391,11 @@ TAO_MonitorEventChannel::map_supplier_proxy (
                     CORBA::NO_MEMORY ());
 
   TAO_Control_Registry* cinstance = TAO_Control_Registry::instance ();
-  
+
   if (cinstance->add (rcsc))
     {
       ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->names_mutex_);
-      
+
       this->control_names_.push_back (full);
     }
   else
@@ -418,9 +418,9 @@ TAO_MonitorEventChannel::map_consumer_proxy (
     }
 
   ACE_CString full = this->name_ + "/" + name;
-  
+
   ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->consumer_mutex_);
-  
+
   if (this->is_duplicate_name (this->consumer_map_, full))
     {
       throw NotifyMonitoringExt::NameAlreadyUsed ();
@@ -440,11 +440,11 @@ TAO_MonitorEventChannel::map_consumer_proxy (
                     CORBA::NO_MEMORY ());
 
   TAO_Control_Registry* cinstance = TAO_Control_Registry::instance ();
-  
+
   if (cinstance->add (rcsc))
     {
       ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->names_mutex_);
-      
+
       this->control_names_.push_back (full);
     }
   else
@@ -462,11 +462,11 @@ TAO_MonitorEventChannel::cleanup_proxy (CosNotifyChannelAdmin::ProxyID id,
                                         bool experienced_timeout)
 {
   ACE_CString name;
-  
+
   if (is_supplier)
     {
       ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->supplier_mutex_);
-      
+
       // It may seem like a good idea to throw a
       // NotifyMonitoringExt::NameMapError() exception if we can't unbind the
       // id from the map, but we can't.  This method is called indirectly
@@ -489,7 +489,7 @@ TAO_MonitorEventChannel::cleanup_proxy (CosNotifyChannelAdmin::ProxyID id,
   else
     {
       ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->consumer_mutex_);
-      
+
       // The same goes for this one too.
       this->consumer_map_.unbind (id, name);
     }
@@ -500,7 +500,7 @@ TAO_MonitorEventChannel::cleanup_proxy (CosNotifyChannelAdmin::ProxyID id,
       cinstance->remove (name);
 
       ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->names_mutex_);
-      
+
       this->remove_list_name (this->control_names_, name);
     }
 }
@@ -510,7 +510,7 @@ TAO_MonitorEventChannel::remove_consumeradmin (
   CosNotifyChannelAdmin::ProxyID id)
 {
   ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->consumeradmin_mutex_);
-  
+
   this->consumeradmin_map_.unbind (id);
 }
 
@@ -519,7 +519,7 @@ TAO_MonitorEventChannel::remove_supplieradmin (
   CosNotifyChannelAdmin::ProxyID id)
 {
   ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->supplieradmin_mutex_);
-  
+
   this->supplieradmin_map_.unbind (id);
 }
 
@@ -542,7 +542,7 @@ TAO_MonitorEventChannel::add_stats (const char* name)
                         CORBA::NO_MEMORY ());
       ACE_Time_Value tv (ACE_OS::gettimeofday ());
       timestamp->receive (tv.sec () + (tv.usec () / 1000000.0));
-      
+
       if (!this->register_statistic (stat_name, timestamp))
         {
           ACE_ERROR ((LM_ERROR,
@@ -562,7 +562,7 @@ TAO_MonitorEventChannel::add_stats (const char* name)
                           stat_name.c_str (),
                           Monitor_Control_Types::MC_NUMBER),
                         CORBA::NO_MEMORY ());
-                        
+
       if (!this->register_statistic (stat_name, consumers))
         {
           ACE_ERROR ((LM_ERROR,
@@ -582,14 +582,14 @@ TAO_MonitorEventChannel::add_stats (const char* name)
                           stat_name.c_str (),
                           Monitor_Control_Types::MC_LIST),
                         CORBA::NO_MEMORY ());
-                        
+
       if (!this->register_statistic (stat_name, consumers))
         {
           ACE_ERROR ((LM_ERROR,
                       "Unable to add statistic %s\n",
                       stat_name.c_str ()));
         }
-        
+
       // Registry manages refcount, so we do this regardless.
       consumers->remove_ref ();
 
@@ -623,14 +623,14 @@ TAO_MonitorEventChannel::add_stats (const char* name)
                           Monitor_Control_Types::MC_NUMBER,
                           true),
                         CORBA::NO_MEMORY ());
-                        
+
       if (!this->register_statistic (stat_name, suppliers))
         {
           ACE_ERROR ((LM_ERROR,
                       "Unable to add statistic %s\n",
                       stat_name.c_str ()));
         }
-        
+
       // Registry manages refcount, so we do this regardless.
       suppliers->remove_ref ();
 
@@ -644,14 +644,14 @@ TAO_MonitorEventChannel::add_stats (const char* name)
                           Monitor_Control_Types::MC_LIST,
                           true),
                         CORBA::NO_MEMORY ());
-                        
+
       if (!this->register_statistic (stat_name, suppliers))
         {
           ACE_ERROR ((LM_ERROR,
                       "Unable to add statistic %s\n",
                       stat_name.c_str ()));
         }
-        
+
       // Registry manages refcount, so we do this regardless.
       suppliers->remove_ref ();
 
@@ -664,14 +664,14 @@ TAO_MonitorEventChannel::add_stats (const char* name)
                           stat_name.c_str (),
                           Monitor_Control_Types::MC_NUMBER),
                         CORBA::NO_MEMORY ());
-                        
+
       if (!this->register_statistic (stat_name, conadmins))
         {
           ACE_ERROR ((LM_ERROR,
                       "Unable to add statistic %s\n",
                       stat_name.c_str ()));
         }
-        
+
       // Registry manages refcount, so we do this regardless.
       conadmins->remove_ref ();
 
@@ -684,14 +684,14 @@ TAO_MonitorEventChannel::add_stats (const char* name)
                           stat_name.c_str (),
                           Monitor_Control_Types::MC_LIST),
                         CORBA::NO_MEMORY ());
-                        
+
       if (!this->register_statistic (stat_name, conadmins))
         {
           ACE_ERROR ((LM_ERROR,
                       "Unable to add statistic %s\n",
                       stat_name.c_str ()));
         }
-        
+
       // Registry manages refcount, so we do this regardless.
       conadmins->remove_ref ();
 
@@ -705,14 +705,14 @@ TAO_MonitorEventChannel::add_stats (const char* name)
                           Monitor_Control_Types::MC_NUMBER,
                           true),
                         CORBA::NO_MEMORY ());
-                        
+
       if (!this->register_statistic (stat_name, supadmins))
         {
           ACE_ERROR ((LM_ERROR,
                       "Unable to add statistic %s\n",
                       stat_name.c_str ()));
         }
-        
+
       // Registry manages refcount, so we do this regardless.
       supadmins->remove_ref ();
 
@@ -726,14 +726,14 @@ TAO_MonitorEventChannel::add_stats (const char* name)
                           Monitor_Control_Types::MC_LIST,
                           true),
                         CORBA::NO_MEMORY ());
-                        
+
       if (!this->register_statistic (stat_name, supadmins))
         {
           ACE_ERROR ((LM_ERROR,
                       "Unable to add statistic %s\n",
                       stat_name.c_str ()));
         }
-        
+
       // Registry manages refcount, so we do this regardless.
       supadmins->remove_ref ();
 
@@ -745,14 +745,14 @@ TAO_MonitorEventChannel::add_stats (const char* name)
                                       Monitor_Control_Types::MC_NUMBER,
                                       false),
                         CORBA::NO_MEMORY ());
-                        
+
       if (!this->register_statistic (stat_name, events))
         {
           ACE_ERROR ((LM_ERROR,
                       "Unable to add statistic %s\n",
                       stat_name.c_str ()));
         }
-       
+
       // Registry manages refcount, so we do this regardless.
       events->remove_ref ();
 
@@ -765,7 +765,7 @@ TAO_MonitorEventChannel::add_stats (const char* name)
                                       Monitor_Control_Types::MC_NUMBER,
                                       true),
                         CORBA::NO_MEMORY ());
-                        
+
       events->add_to_registry ();
       events->remove_ref ();
 
@@ -775,14 +775,14 @@ TAO_MonitorEventChannel::add_stats (const char* name)
                         OldestEvent (this, stat_name.c_str (),
                                      Monitor_Control_Types::MC_TIME),
                         CORBA::NO_MEMORY ());
-                        
+
       if (!this->register_statistic (stat_name, oldest))
         {
           ACE_ERROR ((LM_ERROR,
                       "Unable to add statistic %s\n",
                       stat_name.c_str ()));
         }
-        
+
       // Registry manages refcount, so we do this regardless.
       oldest->remove_ref ();
 
@@ -794,14 +794,14 @@ TAO_MonitorEventChannel::add_stats (const char* name)
                                           stat_name.c_str (),
                                           Monitor_Control_Types::MC_LIST),
                         CORBA::NO_MEMORY ());
-                        
+
       if (!this->register_statistic (stat_name, slowest))
         {
           ACE_ERROR ((LM_ERROR,
                       "Unable to add statistic %s\n",
                       stat_name.c_str ()));
         }
-        
+
       // Registry manages refcount, so we do this regardless.
       slowest->remove_ref ();
 
@@ -826,7 +826,7 @@ TAO_MonitorEventChannel::add_stats (const char* name)
                         ShutdownControl (this,
                                          this->name_),
                         CORBA::NO_MEMORY ());
-                        
+
       if (cinstance->add (sd))
         {
           ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->names_mutex_);
@@ -867,7 +867,7 @@ TAO_MonitorEventChannel::named_new_for_consumers (
   // WARNING: Internal knowledge of TAO.
   TAO_MonitorConsumerAdmin* low_admin =
     dynamic_cast<TAO_MonitorConsumerAdmin*> (admin->_servant ());
-    
+
   if (low_admin == 0)
     {
       // This shouldn't happen.
@@ -877,7 +877,7 @@ TAO_MonitorEventChannel::named_new_for_consumers (
     {
       // Build up the full name.
       ACE_CString full = this->name_ + "/";
-      
+
       if (name == 0)
         {
           char idname[64];
@@ -892,7 +892,7 @@ TAO_MonitorEventChannel::named_new_for_consumers (
       ACE_WRITE_GUARD_RETURN (TAO_SYNCH_RW_MUTEX, guard,
                               this->consumeradmin_mutex_,
                               CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
-                              
+
       if (this->is_duplicate_name (this->consumeradmin_map_, full))
         {
           throw NotifyMonitoringExt::NameAlreadyUsed ();
@@ -934,7 +934,7 @@ TAO_MonitorEventChannel::named_new_for_suppliers (
   // WARNING: Internal knowledge of TAO.
   TAO_MonitorSupplierAdmin* low_admin =
     dynamic_cast<TAO_MonitorSupplierAdmin*> (admin->_servant ());
-    
+
   if (low_admin == 0)
     {
       // This shouldn't happen
@@ -944,7 +944,7 @@ TAO_MonitorEventChannel::named_new_for_suppliers (
     {
       // Build up the full name
       ACE_CString full = this->name_ + "/";
-      
+
       if (name == 0)
         {
           char idname[64];
@@ -984,18 +984,18 @@ TAO_MonitorEventChannel::get_consumers (
   CosNotifyChannelAdmin::AdminIDSeq_var conadmin_ids =
     this->get_all_consumeradmins ();
   CORBA::ULong length = conadmin_ids->length ();
-  
+
   for (CORBA::ULong j = 0; j < length; ++j)
     {
       CosNotifyChannelAdmin::ConsumerAdmin_var admin =
         this->get_consumeradmin (conadmin_ids[j]);
-        
+
       if (!CORBA::is_nil (admin.in ()))
         {
           CosNotifyChannelAdmin::ProxyIDSeq_var proxys =
             admin->push_suppliers ();
           CORBA::ULong plen = proxys->length ();
-          
+
           if (plen > 0)
             {
               ACE_READ_GUARD_RETURN (TAO_SYNCH_RW_MUTEX,
@@ -1015,7 +1015,7 @@ TAO_MonitorEventChannel::get_consumers (
                   else
                     {
                       ACE_CString name;
-                      
+
                       if (this->supplier_map_.find (proxys[i], name) == 0)
                         {
                           count++;
@@ -1026,7 +1026,7 @@ TAO_MonitorEventChannel::get_consumers (
             }
         }
     }
-    
+
   return count;
 }
 
@@ -1053,18 +1053,18 @@ TAO_MonitorEventChannel::get_suppliers (
   CosNotifyChannelAdmin::AdminIDSeq_var supadmin_ids =
     this->get_all_supplieradmins ();
   CORBA::ULong length = supadmin_ids->length ();
-  
+
   for (CORBA::ULong j = 0; j < length; ++j)
     {
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
         this->get_supplieradmin (supadmin_ids[j]);
-        
+
       if (!CORBA::is_nil (admin.in ()))
         {
           CosNotifyChannelAdmin::ProxyIDSeq_var proxys =
             admin->push_consumers ();
           CORBA::ULong plen = proxys->length ();
-          
+
           if (plen > 0)
             {
               ACE_READ_GUARD_RETURN (TAO_SYNCH_RW_MUTEX,
@@ -1084,7 +1084,7 @@ TAO_MonitorEventChannel::get_suppliers (
                   else
                     {
                       ACE_CString name;
-                      
+
                       if (this->consumer_map_.find (proxys[i], name) == 0)
                         {
                           count++;
@@ -1095,7 +1095,7 @@ TAO_MonitorEventChannel::get_suppliers (
             }
         }
     }
-    
+
   return count;
 }
 
@@ -1110,7 +1110,7 @@ TAO_MonitorEventChannel::get_consumeradmins (
 
   CosNotifyChannelAdmin::AdminIDSeq_var admin_ids =
     this->get_all_consumeradmins ();
-    
+
   return this->get_admins (this->consumeradmin_map_,
                            admin_ids.in (),
                            names);
@@ -1127,7 +1127,7 @@ TAO_MonitorEventChannel::get_supplieradmins (
 
   CosNotifyChannelAdmin::AdminIDSeq_var admin_ids =
     this->get_all_supplieradmins ();
-    
+
   return this->get_admins (this->supplieradmin_map_,
                            admin_ids.in (),
                            names);
@@ -1141,7 +1141,7 @@ TAO_MonitorEventChannel::get_admins (
 {
   size_t count = 0;
   CORBA::ULong length = admin_ids.length ();
-  
+
   for (CORBA::ULong j = 0; j < length; ++j)
     {
       if (names == 0)
@@ -1154,7 +1154,7 @@ TAO_MonitorEventChannel::get_admins (
       else
         {
           ACE_CString name;
-          
+
           if (map.find (admin_ids[j], name) == 0)
             {
               count++;
@@ -1162,7 +1162,7 @@ TAO_MonitorEventChannel::get_admins (
             }
         }
     }
-    
+
   return count;
 }
 
@@ -1172,14 +1172,14 @@ TAO_MonitorEventChannel::get_threadpool_task (
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     this->get_consumeradmin (id);
-    
+
   if (!CORBA::is_nil (admin.in ()))
     {
       // WARNING: Internal knowledge of TAO and the Notification
       // Service implementation.
       TAO_Notify_ConsumerAdmin* low_admin =
         dynamic_cast<TAO_Notify_ConsumerAdmin*> (admin->_servant ());
-        
+
       if (low_admin != 0)
         {
           return
@@ -1198,16 +1198,16 @@ TAO_MonitorEventChannel::calculate_queue_size (bool count)
   CosNotifyChannelAdmin::AdminIDSeq_var conadmin_ids =
     this->get_all_consumeradmins ();
   CORBA::ULong length = conadmin_ids->length ();
-  
+
   for (CORBA::ULong j = 0; j < length; j++)
     {
       TAO_Notify_ThreadPool_Task* task =
         this->get_threadpool_task (conadmin_ids[j]);
-        
+
       if (task != 0)
         {
           TAO_Notify_Message_Queue* queue = task->msg_queue ();
-            
+
           if (count)
             {
               size += queue->message_count ();
@@ -1237,17 +1237,17 @@ TAO_MonitorEventChannel::determine_slowest_consumer (
   CosNotifyChannelAdmin::AdminIDSeq_var conadmin_ids =
     this->get_all_consumeradmins ();
   CORBA::ULong length = conadmin_ids->length ();
-  
+
   for (CORBA::ULong j = 0; j < length; ++j)
     {
       TAO_Notify_ThreadPool_Task* task =
         this->get_threadpool_task (conadmin_ids[j]);
-        
+
       if (task != 0)
         {
           TAO_Notify_Message_Queue* queue = task->msg_queue ();
           size_t count = queue->message_count ();
-          
+
           if (count > largest)
             {
               largest = count;
@@ -1260,23 +1260,23 @@ TAO_MonitorEventChannel::determine_slowest_consumer (
     {
       CosNotifyChannelAdmin::ConsumerAdmin_var admin =
         this->get_consumeradmin (id);
-        
+
       if (!CORBA::is_nil (admin.in ()))
         {
           CosNotifyChannelAdmin::ProxyIDSeq_var proxys =
             admin->push_suppliers ();
           CORBA::ULong plen = proxys->length ();
-          
+
           if (plen > 0)
             {
               ACE_READ_GUARD (TAO_SYNCH_RW_MUTEX,
                               guard,
                               this->supplier_mutex_);
-                              
+
               for (CORBA::ULong i = 0; i < plen; ++i)
                 {
                   ACE_CString name;
-                  
+
                   if (this->supplier_map_.find (proxys[i], name) == 0)
                     {
                       names->push_back (name);
@@ -1303,17 +1303,17 @@ TAO_MonitorEventChannel::get_oldest_event (void)
   // Loop through each consumer admins thread pool task and have the
   // buffering strategy give us the time of the oldest event.
   ACE_Time_Value tv (ACE_Time_Value::max_time);
-  
+
   for (CORBA::ULong j = 0; j < length; ++j)
     {
       TAO_Notify_ThreadPool_Task* task =
         this->get_threadpool_task (conadmin_ids[j]);
-        
+
       if (task != 0)
         {
           ACE_Time_Value old =
             task->buffering_strategy ()->oldest_event ();
-            
+
           if (old < tv)
             {
               tv = old;
@@ -1339,17 +1339,17 @@ TAO_MonitorEventChannel::is_duplicate_name (
 {
   Map::const_iterator itr (map);
   Map::value_type* entry = 0;
-  
+
   while (itr.next (entry))
     {
       if (name == entry->item ())
         {
           return true;
         }
-        
+
       itr.advance ();
     }
-    
+
   return false;
 }
 
@@ -1359,7 +1359,7 @@ TAO_MonitorEventChannel::remove_list_name (
   const ACE_CString& name)
 {
   size_t size = list.size ();
-  
+
   for (size_t i = 0; i < size; ++i)
     {
       if (list[i] == name)
@@ -1374,10 +1374,10 @@ TAO_MonitorEventChannel::remove_list_name (
                 {
                   list[i] = list[size - 1];
                 }
-                
+
               list.resize (size - 1, "");
             }
-            
+
           break;
         }
     }
@@ -1392,19 +1392,19 @@ TAO_MonitorEventChannel::destroy_consumer (
   CosNotifyChannelAdmin::AdminIDSeq_var conadmin_ids =
     this->get_all_consumeradmins ();
   CORBA::ULong length = conadmin_ids->length ();
-  
+
   for (CORBA::ULong j = 0; j < length; ++j)
     {
       CosNotifyChannelAdmin::ConsumerAdmin_var admin =
         this->get_consumeradmin (conadmin_ids[j]);
-        
+
       if (!CORBA::is_nil (admin.in ()))
         {
           try
             {
               CosNotifyChannelAdmin::ProxySupplier_var supplier =
                             admin->get_proxy_supplier(id);
-                            
+
               if (!CORBA::is_nil(supplier.in()))
                 {
                   // WARNING: Internal knowledge of TAO and the
@@ -1435,19 +1435,19 @@ TAO_MonitorEventChannel::destroy_supplier (
   CosNotifyChannelAdmin::AdminIDSeq_var supadmin_ids =
     this->get_all_supplieradmins ();
   CORBA::ULong length = supadmin_ids->length ();
-  
+
   for (CORBA::ULong j = 0; j < length; ++j)
     {
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
         this->get_supplieradmin (supadmin_ids[j]);
-        
+
       if (!CORBA::is_nil (admin.in ()))
         {
           try
             {
               CosNotifyChannelAdmin::ProxyConsumer_var consumer =
                             admin->get_proxy_consumer(id);
-                            
+
               if (!CORBA::is_nil(consumer.in()))
                 {
                   // WARNING: Internal knowledge of TAO and the
diff --git a/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp b/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp
index b4d9df059ea..3cbd5a684a6 100644
--- a/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp
+++ b/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp
@@ -31,7 +31,7 @@ public:
     active_ (active)
   {
   }
-  
+
   virtual void update (void)
   {
     if (this->type () == Monitor_Control_Types::MC_LIST)
@@ -63,17 +63,17 @@ TAO_MonitorEventChannelFactory::TAO_MonitorEventChannelFactory (
       ACE_CString dir_name (this->name_ + "/");
       ACE_CString stat_name (dir_name +
                              NotifyMonitoringExt::ActiveEventChannelCount);
-                             
+
       EventChannels* event_channels = 0;
       ACE_NEW (event_channels,
                EventChannels (this,
                               stat_name,
                               Monitor_Control_Types::MC_NUMBER,
                               true));
-                              
-      event_channels->add_to_registry (); 
+
+      event_channels->add_to_registry ();
       event_channels->remove_ref ();
-          
+
       this->stat_names_.push_back (stat_name);
 
       stat_name = dir_name + NotifyMonitoringExt::InactiveEventChannelCount;
@@ -83,12 +83,12 @@ TAO_MonitorEventChannelFactory::TAO_MonitorEventChannelFactory (
                               stat_name,
                               Monitor_Control_Types::MC_NUMBER,
                               false));
-                              
-      event_channels->add_to_registry ();     
+
+      event_channels->add_to_registry ();
       event_channels->remove_ref ();
-          
+
       this->stat_names_.push_back (stat_name);
-         
+
       stat_name = dir_name + NotifyMonitoringExt::ActiveEventChannelNames;
       event_channels = 0;
       ACE_NEW (event_channels,
@@ -96,10 +96,10 @@ TAO_MonitorEventChannelFactory::TAO_MonitorEventChannelFactory (
                               stat_name,
                               Monitor_Control_Types::MC_LIST,
                               true));
-                              
+
       event_channels->add_to_registry ();
       event_channels->remove_ref ();
-          
+
       this->stat_names_.push_back (stat_name);
 
       stat_name = dir_name + NotifyMonitoringExt::InactiveEventChannelNames;
@@ -109,33 +109,33 @@ TAO_MonitorEventChannelFactory::TAO_MonitorEventChannelFactory (
                               stat_name,
                               Monitor_Control_Types::MC_LIST,
                               false));
-                              
+
       event_channels->add_to_registry ();
       event_channels->remove_ref ();
-          
+
       this->stat_names_.push_back (stat_name);
 
       stat_name = dir_name + NotifyMonitoringExt::EventChannelCreationTime;
       Monitor_Base* timestamp = 0;
       ACE_NEW (timestamp,
                Timestamp_Monitor (stat_name.c_str ()));
-                              
+
       ACE_Time_Value tv (ACE_OS::gettimeofday());
       timestamp->receive (tv.sec () + (tv.usec () / 1000000.0));
-      
+
       timestamp->add_to_registry ();
       timestamp->remove_ref ();
-          
+
       this->stat_names_.push_back (stat_name);
-      
+
       Monitor_Point_Registry* instance =
         Monitor_Point_Registry::instance ();
 
       ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->mutex_);
-      
+
       Monitor_Base* names =
         instance->get (NotifyMonitoringExt::EventChannelFactoryNames);
-        
+
       if (names == 0)
         {
           stat_name = NotifyMonitoringExt::EventChannelFactoryNames;
@@ -145,7 +145,7 @@ TAO_MonitorEventChannelFactory::TAO_MonitorEventChannelFactory (
                             CORBA::NO_MEMORY ());
           names->add_to_registry ();
         }
-        
+
       Monitor_Control_Types::NameList list = names->get_list ();
       list.push_back (this->name_);
       names->receive (list);
@@ -157,7 +157,7 @@ TAO_MonitorEventChannelFactory::~TAO_MonitorEventChannelFactory (void)
 {
   Monitor_Point_Registry* instance = Monitor_Point_Registry::instance ();
   size_t size = this->stat_names_.size ();
-  
+
   for (size_t i = 0; i < size; ++i)
     {
       instance->remove (this->stat_names_[i].c_str ());
@@ -235,7 +235,7 @@ TAO_MonitorEventChannelFactory::create_channel (
   // Make sure we can get down to the real event channel
   TAO_MonitorEventChannel* mec =
     dynamic_cast<TAO_MonitorEventChannel*> (ec->_servant ());
-    
+
   if (mec == 0)
     {
       throw CORBA::INTERNAL ();
@@ -270,13 +270,13 @@ TAO_MonitorEventChannelFactory::remove (TAO_Notify_EventChannel* channel)
 {
   TAO_MonitorEventChannel* mec =
     dynamic_cast<TAO_MonitorEventChannel*> (channel);
-    
+
   if (mec != 0)
     {
       ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->mutex_);
       this->map_.unbind (mec->name ());
     }
-    
+
   this->TAO_Notify_EventChannelFactory::remove (channel);
 }
 
@@ -287,18 +287,18 @@ TAO_MonitorEventChannelFactory::get_suppliers (
   size_t count = 0;
   CosNotifyChannelAdmin::EventChannel_var ec =
     this->get_event_channel (id);
-    
+
   if (!CORBA::is_nil (ec.in ()))
     {
       CosNotifyChannelAdmin::AdminIDSeq_var supadmin_ids =
         ec->get_all_supplieradmins ();
       CORBA::ULong length = supadmin_ids->length ();
-      
+
       for (CORBA::ULong j = 0; j < length; ++j)
         {
           CosNotifyChannelAdmin::SupplierAdmin_var admin =
             ec->get_supplieradmin (supadmin_ids[j]);
-            
+
           if (!CORBA::is_nil (admin.in ()))
             {
               CosNotifyChannelAdmin::ProxyIDSeq_var proxys =
@@ -307,7 +307,7 @@ TAO_MonitorEventChannelFactory::get_suppliers (
             }
         }
     }
-    
+
   return count;
 }
 
@@ -318,18 +318,18 @@ TAO_MonitorEventChannelFactory::get_consumers (
   size_t count = 0;
   CosNotifyChannelAdmin::EventChannel_var ec =
     this->get_event_channel (id);
-    
+
   if (!CORBA::is_nil (ec.in ()))
     {
       CosNotifyChannelAdmin::AdminIDSeq_var conadmin_ids =
         ec->get_all_consumeradmins ();
       CORBA::ULong length = conadmin_ids->length ();
-      
+
       for (CORBA::ULong j = 0; j < length; ++j)
         {
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
             ec->get_consumeradmin (conadmin_ids[j]);
-            
+
           if (!CORBA::is_nil (admin.in ()))
             {
               CosNotifyChannelAdmin::ProxyIDSeq_var proxys =
@@ -338,7 +338,7 @@ TAO_MonitorEventChannelFactory::get_consumers (
             }
         }
     }
-    
+
   return count;
 }
 
@@ -351,7 +351,7 @@ TAO_MonitorEventChannelFactory::get_ecs (
   CosNotifyChannelAdmin::ChannelIDSeq_var ids = this->get_all_channels ();
 
   CORBA::ULong total = ids->length ();
-  
+
   for (CORBA::ULong i = 0; i < total; ++i)
     {
       CosNotifyChannelAdmin::ChannelID id = ids[i];
@@ -359,7 +359,7 @@ TAO_MonitorEventChannelFactory::get_ecs (
 
       // Check for connected consumers.
       size_t consumers = this->get_consumers (id);
-      
+
       if (consumers > 0)
         {
           want_event_channel = active;
@@ -370,7 +370,7 @@ TAO_MonitorEventChannelFactory::get_ecs (
         {
           // Check for connected suppliers
           size_t suppliers = this->get_suppliers (id);
-          
+
           if (suppliers > 0)
             {
               want_event_channel = active;
@@ -380,24 +380,24 @@ TAO_MonitorEventChannelFactory::get_ecs (
       if (want_event_channel)
         {
           count++;
-          
+
           if (names != 0)
             {
               ACE_READ_GUARD_RETURN (TAO_SYNCH_RW_MUTEX,
                                      guard,
                                      this->mutex_,
                                      0);
-                                     
+
               Map::iterator itr (this->map_);
               Map::value_type* entry = 0;
-              
+
               while (itr.next (entry))
                 {
                   if (id == entry->item ())
                     {
                       names->push_back (entry->key ());
                     }
-                    
+
                   itr.advance ();
                 }
             }
diff --git a/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h b/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
index 29ffa7cd26c..f15f886431a 100644
--- a/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
+++ b/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
@@ -30,7 +30,7 @@ public:
   /// Remove the statistics for this event channel
   ~TAO_MonitorSupplierAdmin (void);
 
-  /// Register our statistic and control objects 
+  /// Register our statistic and control objects
   void register_stats_controls (TAO_MonitorEventChannel* mec,
                                 const ACE_CString& name);
 
diff --git a/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp b/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
index 166ec1ed817..8fda09e37df 100644
--- a/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
+++ b/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
@@ -2,8 +2,8 @@
 
 #include "orbsvcs/Notify/Name_Value_Pair.h"
 #include "orbsvcs/Notify/Property_T.h"
-#include "ace/OS_String.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_ctype.h"
 
 namespace
 {
diff --git a/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
index 579b773fec3..d731d5e7bb9 100644
--- a/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
+++ b/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/Notify/EventType.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Notify,
-           NS_Constraint_Interpreter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Constraint_Interpreter::TAO_Notify_Constraint_Interpreter (void)
diff --git a/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index 2cda51d0939..82db9bbe20a 100644
--- a/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -462,7 +462,7 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc (
       ACE_NEW_RETURN (any_ptr,
                       CORBA::Any,
                       -1);
-                      
+
       (*any_ptr) <<= name.c_str ();
       this->current_value_ = any_ptr;
 
@@ -473,7 +473,7 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc (
       ACE_NEW_RETURN (any_ptr,
                       CORBA::Any (any),
                       -1);
-                      
+
       this->current_value_ = any_ptr;
       return comp->accept (this);
     }
@@ -686,7 +686,7 @@ TAO_Notify_Constraint_Visitor::visit_component (
 
           TAO_ETCL_Literal_Constraint id;
           this->queue_.dequeue_head (id);
-                          
+
           any_ptr->replace (id);
           any_ptr->impl ()->_add_ref ();
           this->current_value_ = any_ptr;
@@ -785,7 +785,7 @@ TAO_Notify_Constraint_Visitor::visit_default (ETCL_Default *def)
     TAO_ETCL_Literal_Constraint disc_value;
     this->queue_.dequeue_head (disc_value);
     TAO_ETCL_Literal_Constraint default_index_value (default_index);
-    
+
     return (disc_value == default_index_value);
   }
   catch (const CORBA::Exception&)
@@ -817,10 +817,10 @@ TAO_Notify_Constraint_Visitor::visit_exist (ETCL_Exist *exist)
         {
           // If the implicit id is empty, then we must default
           // it to the filterable data and set up the value pointer.
-          
+
           ETCL_Identifier* ident =
             dynamic_cast<ETCL_Identifier*> (component);
-            
+
           if (ident != 0)
             {
               this->implicit_id_ = FILTERABLE_DATA;
@@ -1045,18 +1045,15 @@ TAO_Notify_Constraint_Visitor::visit_binary_op (ETCL_Binary_Expr *binary,
             this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
             break;
           case ETCL_LE:
-            // result = left_operand <= right_operand; // Compile error on LynxOS
-            result = left_operand.operator<= (right_operand);
+            result = left_operand <= right_operand;
             this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
             break;
           case ETCL_GT:
-            // result = left_operand > right_operand; // Compile error on LynxOS
-            result = left_operand.operator> (right_operand);
+            result = left_operand > right_operand;
             this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
             break;
           case ETCL_GE:
-            //result = left_operand >= right_operand; // Compile error on LynxOS
-            result = left_operand.operator>= (right_operand);
+            result = left_operand >= right_operand;
             this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
             break;
           case ETCL_EQ:
@@ -1064,8 +1061,7 @@ TAO_Notify_Constraint_Visitor::visit_binary_op (ETCL_Binary_Expr *binary,
             this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
             break;
           case ETCL_NE:
-            //result = left_operand != right_operand; // Compile error on LynxOS
-            result = left_operand.operator!= (right_operand);
+            result = left_operand != right_operand;
             this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
             break;
           case ETCL_PLUS:
@@ -1142,7 +1138,7 @@ TAO_Notify_Constraint_Visitor::visit_in (ETCL_Binary_Expr *binary)
               ACE_NEW_RETURN (any_ptr,
                               CORBA::Any,
                               -1);
-                              
+
               CORBA::Any_var component = any_ptr;
               component->replace (bag);
               component->impl ()->_add_ref ();
@@ -1451,7 +1447,7 @@ TAO_Notify_Constraint_Visitor::simple_type_match (int expr_type,
   default:
     return false;
   }
-  
+
   return true;
 }
 
diff --git a/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
index 5110d567625..8c4240d3562 100644
--- a/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
+++ b/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
@@ -2,9 +2,6 @@
 
 #include "orbsvcs/Notify/Notify_Default_CO_Factory.h"
 
-ACE_RCSID(Notify, Notify_Default_CO_Factory, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
index 37a286dbb99..1df38ad143d 100644
--- a/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
+++ b/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
@@ -2,9 +2,6 @@
 
 #include "orbsvcs/Notify/Notify_Default_Collection_Factory.h"
 
-ACE_RCSID(Notify, Notify_Default_Collection_Factory, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
index 2c9cc3f9237..bf1a26405e5 100644
--- a/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
+++ b/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
@@ -2,9 +2,6 @@
 
 #include "orbsvcs/Notify/Notify_Default_EMO_Factory.h"
 
-ACE_RCSID(Notify, Notify_Default_EMO_Factory, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
index 6d32c554047..d10cea93e9a 100644
--- a/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
+++ b/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
@@ -2,9 +2,6 @@
 
 #include "orbsvcs/Notify/Notify_Default_POA_Factory.h"
 
-ACE_RCSID(Notify, Notify_Default_POA_Factory, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/orbsvcs/orbsvcs/Notify/Object.cpp b/orbsvcs/orbsvcs/Notify/Object.cpp
index 4b87e5105c1..8bedd6b771f 100644
--- a/orbsvcs/orbsvcs/Notify/Object.cpp
+++ b/orbsvcs/orbsvcs/Notify/Object.cpp
@@ -14,8 +14,6 @@
 #include "orbsvcs/Notify/Object.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_Object, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Object::TAO_Notify_Object (void)
diff --git a/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
index 4a4f21f3595..12c6dfaa571 100644
--- a/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
+++ b/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
@@ -6,8 +6,6 @@
 #include "orbsvcs/Notify/POA_Helper.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_Notify_POA_Helper, "$Id$")
-
 #include "tao/debug.h"
 //#define DEBUG_LEVEL 10
 #ifndef DEBUG_LEVEL
@@ -160,9 +158,9 @@ TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& i
   if (DEBUG_LEVEL > 0)
     {
       CORBA::String_var the_name = this->poa_->the_name ();
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) POA_Helper Activating object with ")
-                  ACE_TEXT ("id = %d in  POA : %C\n"), 
+                  ACE_TEXT ("id = %d in  POA : %C\n"),
                   id, the_name.in ()
                   ));
     }
@@ -181,9 +179,9 @@ TAO_Notify_POA_Helper::activate_with_id (PortableServer::Servant servant, CORBA:
   if (DEBUG_LEVEL > 0)
     {
       CORBA::String_var the_name = this->poa_->the_name ();
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) POA_Helper Activating object with ")
-                  ACE_TEXT ("existing id = %d in  POA : %C\n"), 
+                  ACE_TEXT ("existing id = %d in  POA : %C\n"),
                   id, the_name.in ()
                   ));
     }
@@ -206,9 +204,9 @@ TAO_Notify_POA_Helper::deactivate (CORBA::Long id) const
   if (DEBUG_LEVEL > 0)
     {
       CORBA::String_var the_name = this->poa_->the_name ();
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) POA_Helper Deactivating object with")
-                  ACE_TEXT ("id = %d in  POA : %C\n"), 
+                  ACE_TEXT ("id = %d in  POA : %C\n"),
                   id, the_name.in ()));
     }
   poa_->deactivate_object (oid.in ());
diff --git a/orbsvcs/orbsvcs/Notify/Peer.cpp b/orbsvcs/orbsvcs/Notify/Peer.cpp
index 93b5e957cbf..638f137837c 100644
--- a/orbsvcs/orbsvcs/Notify/Peer.cpp
+++ b/orbsvcs/orbsvcs/Notify/Peer.cpp
@@ -1,11 +1,7 @@
 // $Id$
 
 #include "orbsvcs/Notify/Peer.h"
-
-ACE_RCSID(Notify, TAO_Notify_Peer, "$Id$")
-
 #include "orbsvcs/Notify/Proxy.h"
-
 #include "tao/debug.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
index 00a36bb6797..251350631ca 100644
--- a/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
+++ b/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
@@ -169,8 +169,8 @@ Persistent_File_Allocator::allocate()
     // allocate non-existent blocks.  FIX this
   }
   if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG,
-    ACE_TEXT ("(%P|%t) Persistent_File_Allocator::allocate: %d\n"),
-    static_cast<int> (block_number)
+    ACE_TEXT ("(%P|%t) Persistent_File_Allocator::allocate: %B\n"),
+    block_number
     ));
   result = this->allocate_at(block_number);
   return result;
@@ -182,8 +182,8 @@ Persistent_File_Allocator::allocate_at(size_t block_number)
   Persistent_Storage_Block* result = 0;
   this->used(block_number);
   if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG,
-    ACE_TEXT ("(%P|%t) Persistent_File_Allocator::allocate at : %d\n"),
-    static_cast<int> (block_number)
+    ACE_TEXT ("(%P|%t) Persistent_File_Allocator::allocate at : %B\n"),
+    block_number
     ));
   ACE_NEW_RETURN(result, Persistent_Storage_Block(
     block_number,
@@ -209,8 +209,8 @@ Persistent_File_Allocator::used(size_t block_number)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_);
   if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG,
-    ACE_TEXT ("(%P|%t) Persistent_File_Allocator::used: %d\n"),
-    static_cast<int> (block_number)
+    ACE_TEXT ("(%P|%t) Persistent_File_Allocator::used: %B\n"),
+    block_number
     ));
   ACE_ASSERT (!this->free_blocks_.is_set (block_number));
   this->free_blocks_.set_bit(block_number, true);
@@ -220,8 +220,8 @@ void
 Persistent_File_Allocator::free(size_t block_number)
 {
   if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG,
-    ACE_TEXT ("(%P|%t) Persistent_File_Allocator::free: %d\n"),
-    static_cast<int> (block_number)
+    ACE_TEXT ("(%P|%t) Persistent_File_Allocator::free: %B\n"),
+    block_number
     ));
   ACE_ASSERT (this->free_blocks_.is_set (block_number));
   this->free_block(block_number);
@@ -278,16 +278,16 @@ Persistent_File_Allocator::write(Persistent_Storage_Block* psb)
     if (!psb->get_allocator_owns())
     {
       if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
-        ACE_TEXT ("(%P|%t) Copy PSB %d\n")
-        , static_cast<int> (psb->block_number ())
+        ACE_TEXT ("(%P|%t) Copy PSB %B\n")
+        , psb->block_number ()
         ));
       ACE_NEW_RETURN(ourpsb, Persistent_Storage_Block(*psb), false);
       ourpsb->set_allocator_owns(true);
     }
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->queue_lock_, false);
     if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
-      ACE_TEXT ("(%P|%t) Queueing PSB to write block %d\n")
-      , static_cast<int> (psb->block_number ())
+      ACE_TEXT ("(%P|%t) Queueing PSB to write block %B\n")
+      , psb->block_number ()
       ));
     result = (0 == this->block_queue_.enqueue_tail(ourpsb));
     this->wake_up_thread_.signal();
diff --git a/orbsvcs/orbsvcs/Notify/Properties.cpp b/orbsvcs/orbsvcs/Notify/Properties.cpp
index 0256a0470b0..94efb2e50af 100644
--- a/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -8,10 +8,6 @@
 #include "orbsvcs/Notify/Properties.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Notify,
-           TAO_Notify_Properties,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Properties::TAO_Notify_Properties (void)
diff --git a/orbsvcs/orbsvcs/Notify/Properties.h b/orbsvcs/orbsvcs/Notify/Properties.h
index 3419780448e..a61b936f5c4 100644
--- a/orbsvcs/orbsvcs/Notify/Properties.h
+++ b/orbsvcs/orbsvcs/Notify/Properties.h
@@ -169,10 +169,10 @@ protected:
 
   /// The default PC QoS Properties.
   CosNotification::QoSProperties pc_qos_;
-  
+
   /// The default consumer admin filter operator.
   CosNotifyChannelAdmin::InterFilterGroupOperator defaultConsumerAdminFilterOp_;
-  
+
   /// The default supplier admin filter operator.
   CosNotifyChannelAdmin::InterFilterGroupOperator defaultSupplierAdminFilterOp_;
 };
diff --git a/orbsvcs/orbsvcs/Notify/PropertySeq.cpp b/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
index bd8adc484f6..3c16c4a998d 100644
--- a/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
+++ b/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
@@ -6,8 +6,6 @@
 #include "orbsvcs/Notify/PropertySeq.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_PropertySeq, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_PropertySeq::TAO_Notify_PropertySeq (void)
diff --git a/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp b/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
index 378ca42dc41..a18ef874290 100644
--- a/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
+++ b/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
@@ -6,8 +6,6 @@
 #include "orbsvcs/Notify/Property_Boolean.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_Property_Boolean, "$Id$")
-
 #include "orbsvcs/Notify/PropertySeq.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Notify/Property_T.cpp b/orbsvcs/orbsvcs/Notify/Property_T.cpp
index 75b5675e2d5..3bf8ec43400 100644
--- a/orbsvcs/orbsvcs/Notify/Property_T.cpp
+++ b/orbsvcs/orbsvcs/Notify/Property_T.cpp
@@ -9,10 +9,6 @@
 #include "orbsvcs/Notify/Property_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Notify, 
-           TAO_Notify_Property_T, 
-           "$Id$")
-
 #include "orbsvcs/Notify/PropertySeq.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Notify/Proxy.cpp b/orbsvcs/orbsvcs/Notify/Proxy.cpp
index 1e8638a4b15..c9a6215ad8d 100644
--- a/orbsvcs/orbsvcs/Notify/Proxy.cpp
+++ b/orbsvcs/orbsvcs/Notify/Proxy.cpp
@@ -6,8 +6,6 @@
 #include "orbsvcs/Notify/Proxy.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_Proxy, "$Id$")
-
 #include "orbsvcs/Notify/Peer.h"
 #include "orbsvcs/Notify/Proxy.h"
 #include "orbsvcs/Notify/Method_Request_Updates.h"
diff --git a/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index 34d4c95c72e..5b3b6da7382 100644
--- a/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -6,8 +6,6 @@
 #include "orbsvcs/Notify/ProxyConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_ProxyConsumer, "$Id$")
-
 #include "tao/debug.h"
 #include "ace/Atomic_Op.h"
 #include "orbsvcs/Notify/Supplier.h"
@@ -188,14 +186,14 @@ TAO_Notify_ProxyConsumer::destroy (void)
 }
 
 
-ACE_Time_Value 
+ACE_Time_Value
 TAO_Notify_ProxyConsumer::last_ping() const
 {
   return this->last_ping_.value ();
 }
 
 
-void 
+void
 TAO_Notify_ProxyConsumer::last_ping(const ACE_Time_Value& tv)
 {
   this->last_ping_ = tv;
diff --git a/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index f191c6d45ac..e6a802e905e 100644
--- a/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -70,7 +70,7 @@ public:
 
   ACE_Time_Value last_ping() const;
   void last_ping(const ACE_Time_Value& tv);
- 
+
 protected:
   /// Access the Supplier
   TAO_Notify_Supplier* supplier (void);
@@ -78,7 +78,7 @@ protected:
   /// Accept an event from the Supplier
   void push_i (TAO_Notify_Event * event);
 
-  /// Last time either push an event or validate connection 
+  /// Last time either push an event or validate connection
   /// via _non_exist call.
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, ACE_Time_Value> last_ping_;
 
diff --git a/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index c45db8705d1..aef2fa47d3b 100644
--- a/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -6,8 +6,6 @@
 #include "orbsvcs/Notify/ProxySupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_ProxySupplier, "$Id$")
-
 #include "orbsvcs/Notify/Event_Manager.h"
 #include "orbsvcs/Notify/AdminProperties.h"
 #include "orbsvcs/Notify/Consumer.h"
diff --git a/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
index 4e71dc92d60..0c69b40abf9 100644
--- a/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
+++ b/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
@@ -6,8 +6,6 @@
 #include "orbsvcs/Notify/QoSProperties.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_QoSProperties, "$Id$")
-
 #include "orbsvcs/Notify/Property.h"
 #include "orbsvcs/Notify/Notify_Extensions.h"
 
diff --git a/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
index 8fe73daef1c..feb4243bef7 100644
--- a/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -10,10 +10,6 @@
 #include "orbsvcs/NotifyExtC.h"
 #include "orbsvcs/Notify/Object.h"
 
-ACE_RCSID (RT_Notify,
-           TAO_Notify_RT_Builder,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_RT_Builder::TAO_Notify_RT_Builder (void)
diff --git a/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
index 6080ff879b5..a8d76ace45b 100644
--- a/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
+++ b/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
@@ -3,9 +3,6 @@
 #include "orbsvcs/Notify/RT_Factory.h"
 #include "orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h"
 
-ACE_RCSID(RT_Notify, TAO_Notify_RT_Factory, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_RT_Factory::TAO_Notify_RT_Factory (void)
diff --git a/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
index 55b8f625fb4..604d36d8a89 100644
--- a/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
+++ b/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/RT_Notify_Service.h"
-
-ACE_RCSID(RT_Notify, TAO_Notify_RT_Notify_Service, "$Id$")
-
 #include "ace/Dynamic_Service.h"
 #include "orbsvcs/Notify/Properties.h"
 #include "orbsvcs/Notify/RT_Properties.h"
diff --git a/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
index 6b63aba2149..0a82670bc4f 100644
--- a/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -7,10 +7,6 @@
 #include "orbsvcs/Notify/RT_Properties.h"
 #include "ace/SString.h"
 
-ACE_RCSID (Notify,
-           TAO_Notify_RT_POA_Helper,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_RT_POA_Helper::~TAO_Notify_RT_POA_Helper ()
diff --git a/orbsvcs/orbsvcs/Notify/RT_Properties.cpp b/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
index 20131d3e299..86502f17a4c 100644
--- a/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
+++ b/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
@@ -7,9 +7,6 @@
 #include "orbsvcs/Notify/RT_Properties.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_Notify_RT_Properties, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_RT_Properties::TAO_Notify_RT_Properties (void)
diff --git a/orbsvcs/orbsvcs/Notify/Random_File.cpp b/orbsvcs/orbsvcs/Notify/Random_File.cpp
index 5b1c6f1c230..e8790ae3e34 100644
--- a/orbsvcs/orbsvcs/Notify/Random_File.cpp
+++ b/orbsvcs/orbsvcs/Notify/Random_File.cpp
@@ -2,9 +2,12 @@
 
 #include "orbsvcs/Notify/Random_File.h"
 
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_fcntl.h"
 #include "tao/debug.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/Guard_T.h"
+
 //#define DEBUG_LEVEL 9
 #ifndef DEBUG_LEVEL
 # define DEBUG_LEVEL TAO_debug_level
@@ -89,8 +92,8 @@ Random_File::write(const size_t block_number, void* buf, bool atomic)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, false);
   if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG,
-    ACE_TEXT ("(%P|%t) Write block %d %c\n"),
-    static_cast<int> (block_number),
+    ACE_TEXT ("(%P|%t) Write block %B %c\n"),
+    block_number,
     (atomic ? '*' : ' ')
     ));
   bool result = this->seek(block_number);
@@ -124,8 +127,8 @@ Random_File::read(const size_t block_number, void* buf)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, false);
   if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG,
-    ACE_TEXT ("(%P|%t) Read block %d\n"),
-    static_cast<int> (block_number)
+    ACE_TEXT ("(%P|%t) Read block %B\n"),
+    block_number
     ));
   bool result = this->seek(block_number);
   if (result)
diff --git a/orbsvcs/orbsvcs/Notify/Random_File.h b/orbsvcs/orbsvcs/Notify/Random_File.h
index 0f197c6dceb..de0bcae03d0 100644
--- a/orbsvcs/orbsvcs/Notify/Random_File.h
+++ b/orbsvcs/orbsvcs/Notify/Random_File.h
@@ -26,7 +26,6 @@
 #include "tao/Versioned_Namespace.h"
 #include "ace/FILE.h"
 #include "ace/streams.h"
-#include "ace/Synch_T.h"
 
 #include "tao/orbconf.h"
 
diff --git a/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
index 519d55d2b0b..bcb6ba730c9 100644
--- a/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
+++ b/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
@@ -6,8 +6,6 @@
 #include "orbsvcs/Notify/Reactive_Task.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_Reactive_Task, "$Id$")
-
 #include "orbsvcs/Notify/Timer_Reactor.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/orbsvcs/orbsvcs/Notify/Refcountable.cpp
index 0d06a3c0e05..c80e3402a6f 100644
--- a/orbsvcs/orbsvcs/Notify/Refcountable.cpp
+++ b/orbsvcs/orbsvcs/Notify/Refcountable.cpp
@@ -3,11 +3,8 @@
 #include "orbsvcs/Notify/Refcountable.h"
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
-
 #include "ace/Guard_T.h"
 
-ACE_RCSID(Notify, TAO_Notify_Refcountable, "$Id$")
-
 #if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
 
 #include <map>
@@ -79,7 +76,7 @@ TAO_Notify_Refcountable::~TAO_Notify_Refcountable ()
   {
     ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) with refcount:%d destroyed incorrectly.\n",
         e.obj, e.class_name, e.obj->ref_id_, e.obj->refcount_.value() ));
- 
+
     if ( e.obj != this || e.obj->ref_id_ != this->ref_id_ )
     {
       ACE_DEBUG ((LM_DEBUG, "  with an ID mismatch %x->%d != %x->%d!\n",
@@ -156,10 +153,10 @@ TAO_Notify_Tracker::~TAO_Notify_Tracker()
 void
 TAO_Notify_Tracker::dump( const char* title )
 {
-  ACE_Guard<TAO_SYNCH_MUTEX> grd(this->lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   ACE_DEBUG ((LM_DEBUG,"\nTAO_Notify_Tracker: %s\n", (title ? title : "dump")));
- 
+
   EntityMap::const_iterator iter( map_.begin() );
   while ( iter != map_.end() )
   {
@@ -191,9 +188,9 @@ TAO_Notify_Tracker::add( TAO_Notify_Refcountable* p )
 {
   if ( p == 0 ) return;
 
-  ACE_Guard<TAO_SYNCH_MUTEX> grd(this->lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   int id = ++id_counter_;
- 
+
   Entry e = { p, typeid(*p).name() };
   std::pair< EntityMap::iterator, bool > result =
     map_.insert( std::make_pair( id, e ) );
@@ -215,7 +212,7 @@ TAO_Notify_Tracker::remove( const TAO_Notify_Refcountable* p )
 {
   if ( p == 0 ) return;
 
-  ACE_Guard<TAO_SYNCH_MUTEX> grd(this->lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   int ref_id = p->ref_id_;
   EntityMap::iterator iter( map_.find( ref_id ) );
   if ( iter == map_.end() )
@@ -237,7 +234,7 @@ TAO_Notify_Tracker::find( const TAO_Notify_Refcountable* p ) const
   Entry e = { 0, "" };
   if ( p == 0 ) return e;
 
-  ACE_Guard<TAO_SYNCH_MUTEX> grd(this->lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   int ref_id = p->ref_id_;
   EntityMap::const_iterator iter( map_.find( ref_id ) );
   if ( iter != map_.end() )
diff --git a/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp b/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
index 9f037fef711..d2168a2af03 100644
--- a/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
+++ b/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
@@ -9,6 +9,4 @@
 #include "orbsvcs/Notify/Refcountable_Guard_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Notify, TAO_Notify_Refcountable_Guard_T, "$Id$")
-
 #endif /* TAO_Notify_REFCOUNTABLE_GUARD_T_CPP */
diff --git a/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
index 373c38dcc21..991f591e056 100644
--- a/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
+++ b/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
@@ -66,38 +66,38 @@ Routing_Slip::create (const TAO_Notify_Event::Ptr& event)
   {
     ACE_ERROR ((LM_ERROR,
       ACE_TEXT ("(%P|%t) Routing_Slip_Statistics\n")
-      ACE_TEXT ("  enter_transient              \t%d\n")
-      ACE_TEXT ("  continue_transient           \t%d\n")
-      ACE_TEXT ("  enter_reloaded               \t%d\n")
-      ACE_TEXT ("  enter_new                    \t%d\n")
-      ACE_TEXT ("  continue_new                 \t%d\n")
-      ACE_TEXT ("  enter_complete_while_new     \t%d\n")
-      ACE_TEXT ("  enter_saving                 \t%d\n")
-      ACE_TEXT ("  enter_saved                  \t%d\n")
-      ACE_TEXT ("  enter_updating               \t%d\n")
-      ACE_TEXT ("  enter_changed_while_saving   \t%d\n")
-      ACE_TEXT ("  continue_changed_while_saving\t%d\n")
-      ACE_TEXT ("  enter_changed                \t%d\n")
-      ACE_TEXT ("  continue_changed             \t%d\n")
-      ACE_TEXT ("  enter_complete               \t%d\n")
-      ACE_TEXT ("  enter_deleting               \t%d\n")
-      ACE_TEXT ("  enter_terminal               \t%d\n")
-      , static_cast<int> (count_enter_transient_)
-      , static_cast<int> (count_continue_transient_)
-      , static_cast<int> (count_enter_reloaded_)
-      , static_cast<int> (count_enter_new_)
-      , static_cast<int> (count_continue_new_)
-      , static_cast<int> (count_enter_complete_while_new_)
-      , static_cast<int> (count_enter_saving_)
-      , static_cast<int> (count_enter_saved_)
-      , static_cast<int> (count_enter_updating_)
-      , static_cast<int> (count_enter_changed_while_saving_)
-      , static_cast<int> (count_continue_changed_while_saving_)
-      , static_cast<int> (count_enter_changed_)
-      , static_cast<int> (count_continue_changed_)
-      , static_cast<int> (count_enter_complete_)
-      , static_cast<int> (count_enter_deleting_)
-      , static_cast<int> (count_enter_terminal_)
+      ACE_TEXT ("  enter_transient              \t%B\n")
+      ACE_TEXT ("  continue_transient           \t%B\n")
+      ACE_TEXT ("  enter_reloaded               \t%B\n")
+      ACE_TEXT ("  enter_new                    \t%B\n")
+      ACE_TEXT ("  continue_new                 \t%B\n")
+      ACE_TEXT ("  enter_complete_while_new     \t%B\n")
+      ACE_TEXT ("  enter_saving                 \t%B\n")
+      ACE_TEXT ("  enter_saved                  \t%B\n")
+      ACE_TEXT ("  enter_updating               \t%B\n")
+      ACE_TEXT ("  enter_changed_while_saving   \t%B\n")
+      ACE_TEXT ("  continue_changed_while_saving\t%B\n")
+      ACE_TEXT ("  enter_changed                \t%B\n")
+      ACE_TEXT ("  continue_changed             \t%B\n")
+      ACE_TEXT ("  enter_complete               \t%B\n")
+      ACE_TEXT ("  enter_deleting               \t%B\n")
+      ACE_TEXT ("  enter_terminal               \t%B\n")
+      , count_enter_transient_
+      , count_continue_transient_
+      , count_enter_reloaded_
+      , count_enter_new_
+      , count_continue_new_
+      , count_enter_complete_while_new_
+      , count_enter_saving_
+      , count_enter_saved_
+      , count_enter_updating_
+      , count_enter_changed_while_saving_
+      , count_continue_changed_while_saving_
+      , count_enter_changed_
+      , count_continue_changed_
+      , count_enter_complete_
+      , count_enter_deleting_
+      , count_enter_terminal_
       ));
   }
   return result;
@@ -174,7 +174,7 @@ Routing_Slip::Routing_Slip(
   , complete_requests_ (0)
   , rspm_ (0)
 {
-  Routing_Slip_Guard guard (sequence_lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, sequence_lock_);
   this->sequence_ = ++routing_slip_sequence_;
   if (DEBUG_LEVEL > 1) ACE_DEBUG ((LM_DEBUG,
       ACE_TEXT ("(%P|%t) Routing Slip #%d: constructor\n"),
@@ -218,7 +218,7 @@ Routing_Slip::event () const
 void
 Routing_Slip::wait_persist ()
 {
-  Routing_Slip_Guard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
   while (!this->is_safe_)
   {
     this->until_safe_.wait ();
@@ -232,17 +232,16 @@ Routing_Slip::route (TAO_Notify_ProxyConsumer* pc, bool reliable_channel)
 
   TAO_Notify_ProxyConsumer::Ptr pcgrd(pc);
 
-  Routing_Slip_Guard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
-  size_t request_id = delivery_requests_.size ();
+  size_t const request_id = delivery_requests_.size ();
 
   if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG,
-      ACE_TEXT ("(%P|%t) Routing Slip #%d: add Delivery_Request #%d: lookup, completed %d of %d\n"),
+      ACE_TEXT ("(%P|%t) Routing Slip #%d: add Delivery_Request #%B: lookup, completed %B of %B\n"),
       this->sequence_,
-      static_cast<int> (request_id),
-      static_cast<int> (this->complete_requests_),
-      static_cast<int> (this->delivery_requests_.size ())
-      ));
+      request_id,
+      this->complete_requests_,
+      this->delivery_requests_.size ()));
 
   Delivery_Request_Ptr request (new Delivery_Request (this->this_ptr_, request_id));
   this->delivery_requests_.push_back (request);
@@ -288,7 +287,7 @@ Routing_Slip::forward (TAO_Notify_ProxySupplier* ps, bool filter)
   ACE_ASSERT (this->state_ == rssCREATING);
 
   TAO_Notify_ProxySupplier::Ptr psgrd(ps);
-  Routing_Slip_Guard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
   enter_state_transient (guard);
   guard.acquire();
@@ -341,18 +340,17 @@ Routing_Slip::dispatch (
   ACE_ASSERT (this->state_ != rssCREATING);
 
   TAO_Notify_ProxySupplier::Ptr psgrd(ps);
-  Routing_Slip_Guard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
   size_t request_id = delivery_requests_.size ();
 
   if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG,
-      ACE_TEXT ("(%P|%t) Routing Slip #%d: add Delivery_Request #%d: Dispatch %s; completed %d of %d\n"),
+      ACE_TEXT ("(%P|%t) Routing Slip #%d: add Delivery_Request #%B: Dispatch %s; completed %B of %B\n"),
       this->sequence_,
-      static_cast<int> (request_id),
+      request_id,
       filter ? ACE_TEXT ("Filter") : ACE_TEXT ("No Filter"),
-      static_cast<int> (this->complete_requests_),
-      static_cast<int> (this->delivery_requests_.size ())
-      ));
+      this->complete_requests_,
+      this->delivery_requests_.size ()));
 
   Delivery_Request_Ptr request (new Delivery_Request (this->this_ptr_, request_id));
   if (! ps->has_shutdown() )
@@ -362,10 +360,10 @@ Routing_Slip::dispatch (
       guard.release ();
       if (DEBUG_LEVEL > 8)
         ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) Routing Slip #%d: dispatching Delivery_Request %d to "
+                    "(%P|%t) Routing Slip #%d: dispatching Delivery_Request %B to "
                     "proxy supplier %d\n",
                     this->sequence_,
-                    static_cast<int> (request_id),
+                    request_id,
                     ps->id()));
       ps->execute_task (method);
     }
@@ -373,10 +371,10 @@ Routing_Slip::dispatch (
     {
       if (DEBUG_LEVEL > 5)
         ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) Routing Slip #%d: not dispatching Delivery_Request %d to "
+                    "(%P|%t) Routing Slip #%d: not dispatching Delivery_Request %B to "
                     "proxy supplier %d; already shut down\n",
                     this->sequence_,
-                    static_cast<int> (request_id),
+                    request_id,
                     ps->id()));
     }
 }
@@ -387,19 +385,18 @@ Routing_Slip::dispatch (
 void
 Routing_Slip::delivery_request_complete (size_t request_id)
 {
-  Routing_Slip_Guard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
   ACE_ASSERT (request_id < this->delivery_requests_.size ());
   // reset the pointer to allow the delivery_request to be deleted.
   this->delivery_requests_[request_id].reset ();
   this->complete_requests_ += 1;
 
   if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG,
-      ACE_TEXT ("(%P|%t) Routing Slip #%d: delivery_request_complete #%d: completed %d of %d\n"),
+      ACE_TEXT ("(%P|%t) Routing Slip #%d: delivery_request_complete #%B: completed %B of %B\n"),
       this->sequence_,
-      static_cast<int> (request_id),
-      static_cast<int> (this->complete_requests_),
-      static_cast<int> (this->delivery_requests_.size ())
-      ));
+      request_id,
+      this->complete_requests_,
+      this->delivery_requests_.size ()));
   State state = this->state_;
   switch (state)
   {
@@ -452,7 +449,7 @@ Routing_Slip::delivery_request_complete (size_t request_id)
 void
 Routing_Slip::at_front_of_persist_queue ()
 {
-  Routing_Slip_Guard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
   State state = this->state_;
   switch (state)
   {
@@ -511,8 +508,7 @@ Routing_Slip::persist_complete ()
 {
   // keep this object around til this method returns.
   Routing_Slip_Ptr me(this->this_ptr_);
-  Routing_Slip_Guard guard (this->internals_);
-  ACE_ASSERT (guard.locked ());
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
   // allow the ConsumerProxy to return from the CORBA push call.
   if (! is_safe_)
@@ -911,7 +907,7 @@ Routing_Slip::reconnect (void)
   enter_state_saved (guard);
 
   //@@todo is there a worker_task available to do this?
-  size_t count = this->delivery_methods_.size ();
+  size_t const count = this->delivery_methods_.size ();
   for (size_t nmethod = 0; nmethod < count; ++nmethod)
   {
     this->delivery_methods_[nmethod]->execute ();
diff --git a/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/orbsvcs/orbsvcs/Notify/Routing_Slip.h
index da894894c01..5ccf95d5484 100644
--- a/orbsvcs/orbsvcs/Notify/Routing_Slip.h
+++ b/orbsvcs/orbsvcs/Notify/Routing_Slip.h
@@ -65,7 +65,9 @@ class Routing_Slip_Queue;
  */
 class TAO_Notify_Serv_Export Routing_Slip : public Persistent_Callback
 {
+// FUZZ: disable check_for_ACE_Guard
   typedef ACE_Guard< TAO_SYNCH_MUTEX > Routing_Slip_Guard;
+// FUZZ: enable check_for_ACE_Guard
 public:
   /// "Factory" method for normal use.
   static Routing_Slip_Ptr create (const TAO_Notify_Event::Ptr& event);
@@ -79,7 +81,7 @@ public:
 
   void reconnect (void);
 
-  /// destructor (should be private but that inspires compiler wars)
+  /// Destructor (should be private but that inspires compiler wars)
   virtual ~Routing_Slip ();
 
   //////////////////
diff --git a/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
index d669f2dde34..baba1386099 100644
--- a/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
+++ b/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
@@ -580,7 +580,7 @@ Routing_Slip_Persistence_Manager::build_chain(
     mblk = mblk->cont();
     remainder = this->fill_block(*first_block, pos, mblk, 0);
   }
-  first_header.data_size = 
+  first_header.data_size =
     static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (data_size - remainder);
   first_header.next_overflow = 0;
 
@@ -598,7 +598,7 @@ Routing_Slip_Persistence_Manager::build_chain(
     prevhdr->next_overflow = ACE_Utils::truncate_cast<Block_Number> (curblk->block_number());
     prevhdr->put_header(*prevblk);
     pos = hdr->put_header(*curblk);
-    hdr->data_size = 
+    hdr->data_size =
       static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (remainder);
 
     size_t offset_into_msg = mblk->length() - remainder;
@@ -610,7 +610,7 @@ Routing_Slip_Persistence_Manager::build_chain(
       remainder = this->fill_block(*curblk, pos, mblk, 0);
     }
 
-    hdr->data_size = hdr->data_size - 
+    hdr->data_size = hdr->data_size -
       static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (remainder);
     if (prevblk != first_block)
     {
diff --git a/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h b/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
index 0fba1e66f35..bb233b6cc97 100644
--- a/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
+++ b/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
@@ -27,7 +27,6 @@
 #include "tao/Versioned_Namespace.h"
 #include "tao/orbconf.h"
 #include "ace/Message_Block.h"
-#include "ace/Synch_T.h"
 #include "ace/Containers_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp b/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
index 4447981d06f..d796caafcd4 100644
--- a/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
+++ b/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
@@ -28,14 +28,12 @@ namespace TAO_Notify
   void
   Routing_Slip_Queue::add (const Routing_Slip_Ptr & routing_slip)
   {
-    Guard guard (internals_);
-    ACE_ASSERT (guard.locked()); // check recursion
+    ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
     if (this->allowed_ == 0)
     {
       ++this->active_;
       guard.release ();
       routing_slip->at_front_of_persist_queue ();
-//      guard.acquire ();
     }
     else
     {
@@ -46,8 +44,7 @@ namespace TAO_Notify
 
   void Routing_Slip_Queue::complete ()
   {
-    Guard guard (internals_);
-    ACE_ASSERT (guard.locked()); // check recursion
+    ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
     ACE_ASSERT (this->active_ > 0);
     --this->active_;
     dispatch (guard);
@@ -92,8 +89,8 @@ namespace TAO_Notify
   void
   Routing_Slip_Queue::set_allowed (size_t allowed)
   {
-    Guard guard (internals_);
-    size_t allowed_was = this->allowed_;
+    ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
+    size_t const allowed_was = this->allowed_;
     this->allowed_ = allowed;
     if (allowed == 0 && allowed_was != 0)
     {
diff --git a/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h b/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
index 832d04aac40..9912a881334 100644
--- a/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
+++ b/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
@@ -43,7 +43,9 @@ namespace TAO_Notify
   class TAO_Notify_Serv_Export Routing_Slip_Queue
   {
     typedef ACE_Unbounded_Queue <Routing_Slip_Ptr> Queue;
+// FUZZ: disable check_for_ACE_Guard
     typedef ACE_Guard< TAO_SYNCH_MUTEX > Guard;
+// FUZZ: enable check_for_ACE_Guard
   public:
     /**
      * \brief Construct setting "allowed".
diff --git a/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
index 94a211a19fb..953bbbef2ff 100644
--- a/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
+++ b/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h"
-
-ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushConsumer, "$Id$")
-
 #include "tao/debug.h"
 #include "orbsvcs/Notify/Sequence/SequencePushSupplier.h"
 #include "orbsvcs/Notify/AdminProperties.h"
@@ -92,7 +89,7 @@ TAO_Notify_SequenceProxyPushConsumer::validate ()
   {
     if (TAO_debug_level > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) TAO_Notify_SequenceProxyPushConsumer::validate(%d)")
                   ACE_TEXT ("disconnecting \n"), this->id ()));
     }
diff --git a/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
index ee4f19c74db..20eea7db03d 100644
--- a/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
+++ b/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h"
-
-ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushSupplier, "$Id$")
-
 #include "tao/debug.h"
 #include "orbsvcs/Notify/Sequence/SequencePushConsumer.h"
 #include "orbsvcs/Notify/Properties.h"
@@ -69,7 +66,7 @@ TAO_Notify_SequenceProxyPushSupplier::validate ()
   {
     if (TAO_debug_level > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) TAO_Notify_SequenceProxyPushSupplier::validate(%d)")
                   ACE_TEXT ("disconnecting \n"), this->id ()));
     }
diff --git a/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
index f0e73cac8dc..040c6248479 100644
--- a/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Sequence/SequencePushConsumer.h"
-
-ACE_RCSID (Notify, TAO_Notify_SequencePushConsumer, "$Id$")
-
 #include "ace/Truncate.h"
 #include "ace/Reactor.h"
 #include "tao/debug.h"
@@ -96,8 +93,10 @@ TAO_Notify_SequencePushConsumer::release (void)
   //@@ inform factory
 }
 
+// FUZZ: disable check_for_ACE_Guard
 bool
 TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, ACE_Guard <TAO_SYNCH_MUTEX> & ace_mon)
+// FUZZ: enable check_for_ACE_Guard
 {
   bool result = true;
   if (DEBUG_LEVEL > 0)
diff --git a/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
index 3279e6ee66c..c859f4ebf26 100644
--- a/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
+++ b/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
@@ -35,9 +35,6 @@ class TAO_Notify_Timer;
 
 /**
  * @class TAO_Notify_SequencePushConsumer
- *
- * @brief
- *
  */
 class TAO_Notify_Serv_Export TAO_Notify_SequencePushConsumer
   : public TAO_Notify_Consumer
@@ -55,15 +52,16 @@ public:
   virtual bool enqueue_if_necessary(
     TAO_Notify_Method_Request_Event * request);
 
+// FUZZ: disable check_for_ACE_Guard
   virtual bool dispatch_from_queue (
     Request_Queue & requests,
     ACE_Guard <TAO_SYNCH_MUTEX> & ace_mon);
+// FUZZ: enable check_for_ACE_Guard
 
-
-  /// Push <event> to this consumer.
+  /// Push @a event to this consumer.
   virtual void push (const CORBA::Any& event);
 
-  // Push event.
+  /// Push event.
   virtual void push (const CosNotification::StructuredEvent & event);
 
   /// Push a batch of events to this consumer.
diff --git a/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
index be8c3139944..692250847cb 100644
--- a/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
+++ b/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Sequence/SequencePushSupplier.h"
-
-ACE_RCSID (Notify, TAO_Notify_SequencePushSupplier, "$Id$")
-
 #include "orbsvcs/Notify/Properties.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Notify/Service.cpp b/orbsvcs/orbsvcs/Notify/Service.cpp
index 7dbbdd51b1c..86623a3a2ef 100644
--- a/orbsvcs/orbsvcs/Notify/Service.cpp
+++ b/orbsvcs/orbsvcs/Notify/Service.cpp
@@ -3,10 +3,6 @@
 #include "orbsvcs/Notify/Service.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (Notify,
-           TAO_Notify_Service,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Service::~TAO_Notify_Service (void)
diff --git a/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index 68c829d0191..382c218fb2a 100644
--- a/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -3,11 +3,8 @@
 #include "orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h"
 #include "tao/debug.h"
 
-#include "tao/debug.h"
 #include "orbsvcs/Notify/Method_Request_Dispatch.h"
 
-ACE_RCSID (Notify, TAO_Notify_RT_StructuredProxyPushSupplier, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_RT_StructuredProxyPushSupplier::TAO_Notify_RT_StructuredProxyPushSupplier (void)
diff --git a/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
index d99bb2d71c0..01f2d086736 100644
--- a/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Structured/StructuredEvent.h"
-
-ACE_RCSID(RT_Notify, TAO_Notify_StructuredEvent, "$Id$")
-
 #include "orbsvcs/Notify/PropertySeq.h"
 #include "orbsvcs/Notify/Consumer.h"
 #include "tao/debug.h"
diff --git a/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index 7612a072d1f..f4ef5cee6fb 100644
--- a/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h"
-
-ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushConsumer, "$Id$")
-
 #include "ace/Bound_Ptr.h"
 #include "ace/Auto_Ptr.h"
 #include "tao/debug.h"
@@ -88,7 +85,7 @@ TAO_Notify_StructuredProxyPushConsumer::validate ()
   {
     if (TAO_debug_level > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) TAO_Notify_StructuredProxyPushConsumer::validate(%d)")
                   ACE_TEXT("disconnecting \n"), this->id ()));
     }
diff --git a/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
index d3f32c65017..47c93c2d2a4 100644
--- a/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -8,9 +8,6 @@
 #include "orbsvcs/Notify/Structured/StructuredPushConsumer.h"
 #include "orbsvcs/Notify/Properties.h"
 
-
-ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushSupplier, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_StructuredProxyPushSupplier::TAO_Notify_StructuredProxyPushSupplier (void)
@@ -72,7 +69,7 @@ TAO_Notify_StructuredProxyPushSupplier::validate ()
   {
     if (TAO_debug_level > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) TAO_Notify_StructuredProxyPushSupplier::validate(%d)")
                   ACE_TEXT ("disconnecting \n"), this->id ()));
     }
diff --git a/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
index efea0f8111c..4078536d4ab 100644
--- a/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -1,8 +1,5 @@
 // $Id$
 #include "orbsvcs/Notify/Structured/StructuredPushConsumer.h"
-
-ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushConsumer, "$Id$")
-
 #include "ace/Bound_Ptr.h"
 #include "tao/Stub.h" // For debug messages printing out ORBid.
 #include "tao/ORB_Core.h"
@@ -93,8 +90,8 @@ TAO_Notify_StructuredPushConsumer::push (const CORBA::Any& event)
   if ( !connection_valid ) {
     try
       {
-        CORBA::PolicyList_var inconsistent_policies; 
-        this->push_consumer_->_validate_connection (inconsistent_policies.out()); 
+        CORBA::PolicyList_var inconsistent_policies;
+        this->push_consumer_->_validate_connection (inconsistent_policies.out());
       }
     catch (const CORBA::COMM_FAILURE&)
       {
@@ -126,8 +123,8 @@ TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent&
   if ( !connection_valid ) {
     try
       {
-        CORBA::PolicyList_var inconsistent_policies; 
-        this->push_consumer_->_validate_connection (inconsistent_policies.out()); 
+        CORBA::PolicyList_var inconsistent_policies;
+        this->push_consumer_->_validate_connection (inconsistent_policies.out());
       }
     catch (const CORBA::COMM_FAILURE&)
       {
diff --git a/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
index 09619c5b83f..7a63b07e5bd 100644
--- a/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
+++ b/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
@@ -1,8 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Structured/StructuredPushSupplier.h"
-
-ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushSupplier, "$Id$")
 #include "orbsvcs/Notify/Properties.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
index d4b8d62f7b1..ee2a9a2c4d3 100644
--- a/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
+++ b/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
@@ -48,7 +48,7 @@ public:
   virtual ACE_CString get_ior (void) const;
 
 protected:
-  
+
   virtual CORBA::Object_ptr get_supplier (void);
 
   /// The Supplier
diff --git a/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp b/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
index 1249bb447f7..2a6902f07a9 100644
--- a/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
+++ b/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
@@ -4,9 +4,6 @@
 
 #include "orbsvcs/Notify/Proxy.h"
 
-ACE_RCSID(Notify, TAO_Subscription_Change_Worker, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Subscription_Change_Worker::TAO_Notify_Subscription_Change_Worker (
diff --git a/orbsvcs/orbsvcs/Notify/Supplier.cpp b/orbsvcs/orbsvcs/Notify/Supplier.cpp
index e4cde846df6..f2e9ec6c8ad 100644
--- a/orbsvcs/orbsvcs/Notify/Supplier.cpp
+++ b/orbsvcs/orbsvcs/Notify/Supplier.cpp
@@ -11,8 +11,6 @@
 #include "orbsvcs/Notify/Supplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_Supplier, "$Id$")
-
 #include "orbsvcs/Notify/ProxyConsumer.h"
 #include "orbsvcs/Notify/Proxy.h"
 
@@ -57,8 +55,8 @@ TAO_Notify_Supplier::is_alive (bool allow_nil_supplier)
   {
     // The supplier may not connected or the supplier did
     // not provide a callback. In this case, the liveliness
-    // check should return true so it will be validated in 
-    // next period. 
+    // check should return true so it will be validated in
+    // next period.
     if (allow_nil_supplier)
       return true;
     else
@@ -98,12 +96,12 @@ TAO_Notify_Supplier::is_alive (bool allow_nil_supplier)
         for (CORBA::ULong i = 0; i < policy_list.length (); i++)
           policy_list[i]->destroy ();
 
-        do_liveliness_check 
-          = (last_ping == ACE_Time_Value::zero ? true 
+        do_liveliness_check
+          = (last_ping == ACE_Time_Value::zero ? true
           : now - last_ping >= TAO_Notify_PROPERTIES::instance()->validate_client_delay ());
       }
       else
-        do_liveliness_check = 
+        do_liveliness_check =
           now - last_ping >= TAO_Notify_PROPERTIES::instance()->validate_client_interval ();
 
       if (CORBA::is_nil (rtt_obj_.in ()))
@@ -123,7 +121,7 @@ TAO_Notify_Supplier::is_alive (bool allow_nil_supplier)
   catch (CORBA::Exception& ex)
     {
       if (DEBUG_LEVEL > 0)
-      {        
+      {
         ex._tao_print_exception ("TAO_Notify_Supplier::is_alive: false");
       }
     }
diff --git a/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index 0e8fca3488d..81fee5f301f 100644
--- a/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/SupplierAdmin.h"
-
-ACE_RCSID (RT_Notify,
-           TAO_Notify_SupplierAdmin,
-           "$Id$")
-
 #include "orbsvcs/Notify/Builder.h"
 #include "orbsvcs/Notify/ProxyConsumer.h"
 #include "orbsvcs/Notify/EventChannel.h"
diff --git a/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index 2adb7572771..6659132f04e 100644
--- a/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/ThreadPool_Task.h"
-
-ACE_RCSID(Notify, TAO_Notify_ThreadPool_Task, "$Id$")
-
 #include "orbsvcs/Notify/Properties.h"
 #include "orbsvcs/Notify/Timer_Queue.h"
 #include "orbsvcs/Notify/Buffering_Strategy.h"
diff --git a/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp b/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
index 642f313f2f3..9b46dc770da 100644
--- a/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
+++ b/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
@@ -2,8 +2,6 @@
 
 #include "orbsvcs/Notify/Timer_Queue.h"
 
-ACE_RCSID (Notify, TAO_Notify_Timer_Queue, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Timer_Queue::TAO_Notify_Timer_Queue (void)
diff --git a/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp b/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
index 195a487b1a6..cc1e944a3a8 100644
--- a/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
+++ b/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Notify/Timer_Reactor.h"
-
-ACE_RCSID (Notify,
-           Timer_Reactor,
-           "$Id$")
-
 #include "orbsvcs/Notify/Properties.h"
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
diff --git a/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp b/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp
index 5d76943f6cf..0f5338aaf05 100644
--- a/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp
+++ b/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp
@@ -1,8 +1,6 @@
 /* -*- C++ -*- $Id$ */
-#include "Validate_Client_Task.h"
-
-ACE_RCSID(Notify, Validate_Client_Task, "$Id$")
 
+#include "Validate_Client_Task.h"
 #include "EventChannelFactory.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
diff --git a/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h b/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
index 63ea04584dd..c7617c94a47 100644
--- a/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
+++ b/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
@@ -41,7 +41,7 @@ class TAO_Notify_EventChannelFactory;
  * = LOCKING
  * = TODO
  */
-class TAO_Notify_Serv_Export TAO_Notify_validate_client_Task 
+class TAO_Notify_Serv_Export TAO_Notify_validate_client_Task
   : public ACE_Task<ACE_NULL_SYNCH>
 {
 public:
@@ -65,7 +65,7 @@ private:
   /// The delay of first time validate.
   ACE_Time_Value delay_;
 
-  /// The validate interval 
+  /// The validate interval
   ACE_Time_Value interval_;
 
   /// The event channel
diff --git a/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp b/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp
index a9576fb69de..b1090cd9b3f 100644
--- a/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp
+++ b/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp
@@ -28,7 +28,7 @@ namespace TAO_Notify
     {
       if (TAO_debug_level > 0)
       {
-        ACE_DEBUG ((LM_DEBUG, 
+        ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT("(%P|%t)Validate_Worker<TOPOOBJ>::work: obj is nil\n")));
       }
     }
diff --git a/orbsvcs/orbsvcs/Notify/Worker_Task.cpp b/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
index 6fb6d3c2e6b..206db007990 100644
--- a/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
+++ b/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
@@ -2,8 +2,6 @@
 
 #include "orbsvcs/Notify/Worker_Task.h"
 
-ACE_RCSID(Notify, TAO_Notify_Worker_Task, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Worker_Task::TAO_Notify_Worker_Task (void)
diff --git a/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
index 90b3b415903..a3468558fa4 100644
--- a/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+++ b/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
@@ -37,7 +37,7 @@ namespace TAO_Notify
   {
     ACE_OS::snprintf(file_path, MAXPATHLEN, ACE_TEXT("%s.%3.3d"),
       this->base_name_.c_str (),
-      nfile);
+      static_cast<int> (nfile));
   }
 
   void
diff --git a/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index 8ba5df3f778..a95b5e934b2 100644
--- a/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -1,9 +1,6 @@
-#include "orbsvcs/PortableGroup/GOA.h"
-
-ACE_RCSID (PortableGroup,
-           GOA,
-           "$Id$")
+// $Id$
 
+#include "orbsvcs/PortableGroup/GOA.h"
 #include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h"
 #include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
 
diff --git a/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp b/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
index ac2bbec66cf..aad6e727273 100644
--- a/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/MIOP.h"
 #include "orbsvcs/PortableGroup/UIPMC_Factory.h"
 #include "ace/Service_Config.h"
 #include "orbsvcs/PortableGroup/PortableGroup_Loader.h"
 #include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h"
 
-ACE_RCSID (PortableGroup,
-           UIPMC_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
index a7f6649c96c..eb8926d3d3b 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
@@ -1,12 +1,8 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_Default_Property_Validator.h"
 #include "orbsvcs/PortableGroup/PG_Operators.h"
 
-
-ACE_RCSID (PortableGroup,
-           PG_Default_Property_Validator,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator (void)
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 9d5f89873a7..107a4776314 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 #define METHOD_ENTRY(name)            \
   if (TAO_debug_level <= 6){} else    \
     ACE_DEBUG (( LM_DEBUG,            \
-    "Enter %s\n", #name               \
+    "Enter %C\n", #name               \
       ))
 
 // Use this macro to return from CORBA methods
@@ -37,7 +37,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 #define METHOD_RETURN(name)           \
   if (TAO_debug_level <= 6){} else    \
     ACE_DEBUG (( LM_DEBUG,            \
-      "Leave %s\n", #name             \
+      "Leave %C\n", #name             \
       ));                             \
   return /* value goes here */
 
@@ -103,7 +103,7 @@ int TAO::PG_FactoryRegistry::parse_args (int argc, ACE_TCHAR * argv[])
       break;
     }
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -244,8 +244,7 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb)
     this->this_name_.length (1);
     this->this_name_[0].id = CORBA::string_dup (this->ns_name_.c_str ());
 
-    this->naming_context_->rebind (this->this_name_, this->this_obj_.in()  //CORBA::Object::_duplicate(this_obj)
-                            );
+    this->naming_context_->rebind (this->this_name_, this->this_obj_.in());
   }
 
   return result;
@@ -278,12 +277,10 @@ TAO::PG_FactoryRegistry::RoleInfo::RoleInfo(size_t estimated_number_entries)
 {
 }
 
-
 void TAO::PG_FactoryRegistry::register_factory (
     const char * role,
     const char * type_id,
-    const PortableGroup::FactoryInfo & factory_info
-  )
+    const PortableGroup::FactoryInfo & factory_info)
 {
   METHOD_ENTRY(TAO::PG_FactoryRegistry::register_factory);
 
@@ -302,7 +299,7 @@ void TAO::PG_FactoryRegistry::register_factory (
                         RoleInfo(5),
                         CORBA::NO_MEMORY());
 
-      ACE_AUTO_PTR_RESET (safe_entry, role_info, RoleInfo);
+      ACE_auto_ptr_reset (safe_entry, role_info);
       role_info->type_id_ = type_id;
     }
   else
@@ -350,8 +347,7 @@ void TAO::PG_FactoryRegistry::register_factory (
 
 void TAO::PG_FactoryRegistry::unregister_factory (
     const char * role,
-    const PortableGroup::Location & location
-  )
+    const PortableGroup::Location & location)
 {
   METHOD_ENTRY(TAO::PG_FactoryRegistry::unregister_factory);
 
@@ -483,8 +479,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_role (
 }
 
 void TAO::PG_FactoryRegistry::unregister_factory_by_location (
-    const PortableGroup::Location & location
-  )
+    const PortableGroup::Location & location)
 {
   METHOD_ENTRY(TAO::PG_FactoryRegistry::unregister_factory_by_location);
 
@@ -596,8 +591,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
 
 ::PortableGroup::FactoryInfos * TAO::PG_FactoryRegistry::list_factories_by_role (
     const char * role,
-    CORBA::String_out type_id
-  )
+    CORBA::String_out type_id)
 {
   METHOD_ENTRY(TAO::PG_FactoryRegistry::list_factories_by_role);
 
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index ed1207b79bb..ac5645eed9f 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -175,17 +175,6 @@ namespace TAO
     ACE_CString identity_;
 
     /**
-     * Protect internal state.
-     * Mutex should be locked by corba methods, or by
-     * external (public) methods before calling implementation
-     * methods.
-     * Implementation methods should assume the mutex is
-     * locked if necessary.
-     */
-    TAO_SYNCH_MUTEX internals_;
-    typedef ACE_Guard<TAO_SYNCH_MUTEX> InternalGuard;
-
-    /**
      * The orb
      */
     CORBA::ORB_var orb_;
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index 0cd2d3e3fb4..6b0647da9a7 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_GenericFactory.h"
 #include "orbsvcs/PortableGroup/PG_MemberInfo.h"
 #include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
@@ -9,11 +11,6 @@
 
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (PortableGroup,
-           PG_GenericFactory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_GenericFactory::TAO_PG_GenericFactory (
@@ -306,7 +303,7 @@ TAO_PG_GenericFactory::delete_member (
               }
               catch (const CORBA::Exception& ex)
               {
-                 // Common failure is CORBA::TRANSIENT due to remote factory 
+                 // Common failure is CORBA::TRANSIENT due to remote factory
                  // is shutdown.
                  // We just ignore the exception and continue.
                  if (TAO_debug_level > 0)
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index dbcc166adf9..fc10e0bb552 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -17,11 +17,6 @@
 #include "orbsvcs/PortableGroup/PG_Object_Group.h"
 #include <orbsvcs/PortableGroup/PG_Utils.h>
 
-ACE_RCSID (PortableGroup,
-           PG_Group_Factory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PG_Group_Factory::PG_Group_Factory ()
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
index ce526f75c30..575362b9f4a 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
@@ -1,14 +1,11 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_Group_Guard.h"
 
 #include "orbsvcs/PortableGroup/PG_GenericFactory.h"
 #include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
 
 
-ACE_RCSID (PortableGroup,
-           PG_Group_Guard,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_Group_Guard::TAO_PG_Group_Guard (
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
index 2fc8e11dadc..297498d0f5a 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
 
-ACE_RCSID (PortableGroup,
-           PG_Location_Equal_To,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 #include "orbsvcs/PortableGroup/PG_Location_Equal_To.inl"
 #endif  /* !__ACE_INLINE__ */
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
index 0197726bfe8..041dcd7e9bf 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 #include "orbsvcs/PortableGroup/PG_Location_Hash.h"
@@ -8,6 +7,3 @@
 #include "orbsvcs/PortableGroup/PG_Location_Hash.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (PortableGroup,
-           PG_Location_Hash,
-           "$Id$")
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
index 74de3930c4d..de149f4b401 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_MemberInfo.h"
 #include "orbsvcs/PortableGroup/PG_Operators.h"
 
-ACE_RCSID (PortableGroup,
-           PG_MemberInfo,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
index ea6a1a9b6ab..e658eb7d75b 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
@@ -1,9 +1,6 @@
-#include "orbsvcs/PortableGroup/PG_Null_Property_Validator.h"
-
+// $Id$
 
-ACE_RCSID (PortableGroup,
-           PG_Null_Property_Validator,
-           "$Id$")
+#include "orbsvcs/PortableGroup/PG_Null_Property_Validator.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 2825fe51ec1..4a26a14dde9 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
 #include "orbsvcs/PortableGroup/PG_GenericFactory.h"
 #include "orbsvcs/PortableGroup/PG_conf.h"
@@ -9,11 +11,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Reverse_Lock_T.h"
 
-ACE_RCSID (PortableGroup,
-           PG_ObjectGroupManager,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager (void)
@@ -222,7 +219,7 @@ TAO_PG_ObjectGroupManager::remove_member (
 
   if (to_be_removed == -1)
     throw PortableGroup::ObjectGroupNotFound ();
- 
+
   // remove the element from the array and resize the array.
   const size_t groups_len = groups->size ();
   size_t j;
@@ -342,7 +339,7 @@ TAO_PG_ObjectGroupManager::groups_at_location (
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
-  TAO_PG_ObjectGroup_Array * groups;
+  TAO_PG_ObjectGroup_Array * groups = 0;
   if (this->location_map_.find (the_location, groups) == 0)
     {
       CORBA::ULong len = static_cast<CORBA::ULong> (groups->size ());
@@ -779,7 +776,7 @@ TAO_PG_ObjectGroupManager::member_count (
     bool is_alive)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
-  
+
   TAO_PG_ObjectGroup_Map_Entry * group_entry = 0;
   if (this->object_group_map_.find (oid, group_entry) != 0)
     throw PortableGroup::ObjectGroupNotFound ();
@@ -788,13 +785,13 @@ TAO_PG_ObjectGroupManager::member_count (
   TAO_PG_MemberInfo_Set & member_infos = group_entry->member_infos;
 
   TAO_PG_MemberInfo_Set::iterator end = member_infos.end ();
-  
+
   for (TAO_PG_MemberInfo_Set::iterator i = member_infos.begin ();
        i != end;
        ++i)
   {
     if ((*i).is_alive == is_alive)
-    { 
+    {
       ++count;
     }
   }
@@ -809,7 +806,7 @@ TAO_PG_ObjectGroupManager::is_alive (
     CORBA::Object_ptr member)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
-  
+
   TAO_PG_ObjectGroup_Map_Entry * group_entry = 0;
   if (this->object_group_map_.find (oid, group_entry) != 0)
     throw PortableGroup::ObjectGroupNotFound ();
@@ -817,25 +814,25 @@ TAO_PG_ObjectGroupManager::is_alive (
   TAO_PG_MemberInfo_Set & member_infos = group_entry->member_infos;
 
   TAO_PG_MemberInfo_Set::iterator end = member_infos.end ();
-  
+
   for (TAO_PG_MemberInfo_Set::iterator i = member_infos.begin ();
        i != end;
        ++i)
   {
     if ((*i).member->_is_equivalent (member))
-    { 
+    {
       return (*i).is_alive;
     }
   }
 
-  throw PortableGroup::MemberNotFound (); 
+  throw PortableGroup::MemberNotFound ();
 }
 
 
 void TAO_PG_ObjectGroupManager::remove_inactive_members ()
 {
   TAO_PG_MemberInfo_Set inactive_members;
-  
+
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
     inactive_members = this->inactive_members_;
@@ -884,13 +881,13 @@ TAO_PG_ObjectGroupManager::get_members (bool is_alive)
 }
 
 void
-TAO_PG_ObjectGroupManager::validate_members (CORBA::ORB_ptr orb, 
+TAO_PG_ObjectGroupManager::validate_members (CORBA::ORB_ptr orb,
                                              const TimeBase::TimeT& timeout)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
       ACE_TEXT ("(%P|%t)TAO_PG_ObjectGroupManager::validate_members start\n")));
-    
+
   /// Get list of active member info.
   TAO_PG_MemberInfo_Set active_members = this->get_members (true);
 
@@ -934,24 +931,24 @@ TAO_PG_ObjectGroupManager::validate_members (CORBA::ORB_ptr orb,
   }
 
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
       ACE_TEXT ("(%P|%t)TAO_PG_ObjectGroupManager::validate_members end\n")));
 }
 
 bool
-TAO_PG_ObjectGroupManager::ping (CORBA::ORB_ptr orb, 
-                                 CORBA::Object_var& obj, 
+TAO_PG_ObjectGroupManager::ping (CORBA::ORB_ptr orb,
+                                 CORBA::Object_var& obj,
                                  const TimeBase::TimeT& tt)
 {
   bool status = true;
   if (CORBA::is_nil (obj.in ()))
     throw CORBA::OBJECT_NOT_EXIST ();
-  
+
   // The ping() is used by LoadBalancer which may use RW strategy.
   // The validate thread invokes the _non_existent call to members
   // sequencially. We have to put a timeout on the call in case
   // the client side is not processing ORB requests at this time.
-  // In the event that the timeout exception occurs, we will assume 
+  // In the event that the timeout exception occurs, we will assume
   // that the peer is still around.  If we get any other exception
   // we will say that the member is not available anymore.
   TimeBase::TimeT timeout = tt;
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
index c88007d70f3..394693e1d32 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
@@ -185,7 +185,7 @@ public:
    */
   void generic_factory (TAO_PG_GenericFactory * generic_factory);
 
-  /// Get active or inactive member count in a group. 
+  /// Get active or inactive member count in a group.
   size_t member_count (
     const PortableServer::ObjectId & oid, bool is_active);
 
@@ -193,7 +193,7 @@ public:
   bool is_alive (
     const PortableServer::ObjectId & oid,
     CORBA::Object_ptr member);
- 
+
   /// Remove the inactive members.
   void remove_inactive_members ();
 
@@ -246,10 +246,10 @@ private:
 
   /// Help function to get active or inactive member infos.
   TAO_PG_MemberInfo_Set get_members (bool is_alive);
-  
+
   /// Ping the remote to verify the connections.
-  bool ping (CORBA::ORB_ptr orb, 
-             CORBA::Object_var& obj, 
+  bool ping (CORBA::ORB_ptr orb,
+             CORBA::Object_var& obj,
              const TimeBase::TimeT& tt);
 
   /// Reference to the POA that created the object group references.
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
index f8545615ad6..8dffab00f89 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
@@ -6,10 +6,6 @@
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (TAO_PortableGroup,
-           PG_Object_Adapter_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_Object_Adapter_Factory::TAO_PG_Object_Adapter_Factory (void)
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
index 6436536b524..8e91038f8be 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
@@ -16,11 +16,6 @@
 #include "tao/debug.h"
 #include <ace/OS_NS_stdio.h>
 
-ACE_RCSID (PortableGroup,
-           PG_Object_Group_Manipulator,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PG_Object_Group_Manipulator::PG_Object_Group_Manipulator ()
@@ -52,8 +47,8 @@ PortableServer::ObjectId * TAO::PG_Object_Group_Manipulator::convert_ogid_to_oid
   // 4294967295 -- Largest 32 bit unsigned integer
   char oid_str[11];
   ACE_OS::snprintf (oid_str, sizeof(oid_str),
-                   "%lu",
-                   static_cast<ACE_UINT32> (ogid));
+                    ACE_UINT32_FORMAT_SPECIFIER_ASCII,
+                    static_cast<ACE_UINT32> (ogid));
   oid_str[sizeof(oid_str) - 1] = '\0';
 
   return PortableServer::string_to_ObjectId (oid_str);
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
index 9513dc724bb..b1e5cf40dad 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_Operators.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (PortableGroup,
-           PG_Operators,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
index d1780105873..19730933562 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
@@ -43,10 +43,6 @@ namespace TAO_PG
    */
   class TAO_PortableGroup_Export Properties_Encoder
   {
-    // Originally NamedValue was an ACE_Pair, but ACE_Pair allows operator ==
-    // (delegating to the member's operators ==.)  Since CORBA::Any does
-    // not support operator ==, this confused gcc version 2.9-gnupro-98r2
-    // on LynxOS pfadev04 3.0.1 110298-G PowerPC
     struct NamedValue
     {
     public:
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
index bda9edab8c9..e74a5d11f27 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/PortableGroup/PG_PropertyManager.h"
 #include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
@@ -8,10 +9,6 @@
 
 #include "ace/SString.h"
 
-ACE_RCSID (PortableGroup,
-           PG_PropertyManager,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_PropertyManager::TAO_PG_PropertyManager (
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
index 897facce517..56f9c43973e 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_Property_Utils.h"
 #include "orbsvcs/PortableGroup/PG_Operators.h"
 
-ACE_RCSID (PortableGroup,
-           PG_Property_Utils,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
index 1eb65a2faf7..2b66804cf46 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
@@ -3,10 +3,6 @@
 #include "orbsvcs/PortableGroup/GOA.h"
 #include "orbsvcs/PortableGroup/PG_Servant_Dispatcher.h"
 
-ACE_RCSID(PortableGroup,
-          PG_Servant_Dispatcher,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher (void)
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
index a57079ffea8..5d7a25aaa63 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_Utils.h"
 
 #include "tao/MProfile.h"
@@ -8,11 +10,6 @@
 
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (PortableGroup,
-           PG_Utils,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
index e14b009500d..612d7574bc2 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
@@ -11,10 +11,6 @@
 #include "tao/Leader_Follower.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (PortableGroup,
-           PortableGroup_Acceptor_Registry,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PortableGroup_Acceptor_Registry::TAO_PortableGroup_Acceptor_Registry (void)
diff --git a/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index 21af9105f43..493ac22733e 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -7,11 +7,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (PortableGroup,
-           PortableGroup_Loader,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void)
diff --git a/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
index 2b41c002875..8d134432c58 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -8,10 +8,6 @@
 #include "tao/PI/ORBInitInfo.h"
 #include "tao/debug.h"
 
-ACE_RCSID (PortableGroup,
-           PortableGroup_ORBInitializer,
-           "$Id$")
-
 static const char pg_poa_factory_name[] = "TAO_GOA";
 static const ACE_TCHAR pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
   "TAO_GOA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", "");
diff --git a/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
index 8909696e8b4..d23f4f3366c 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
@@ -7,10 +7,6 @@
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (PortableGroup,
-           PortableGroup_Request_Dispatcher,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher (void)
diff --git a/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
index 6edab1cdea8..ba010089dc8 100644
--- a/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
@@ -5,10 +5,6 @@
 #include "tao/TAO_Server_Request.h"
 #include "tao/CDR.h"
 
-ACE_RCSID (PortableGroup,
-           Portable_Group_Map,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Constructor.
@@ -69,7 +65,7 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair (
   new_entry->key = key;
 
   // First, check if the GroupId is already in the map.
-  Map_Entry *entry;
+  Map_Entry *entry = 0;
   if (this->map_.find (group_id,
                        entry) == 0)
     {
diff --git a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
index 8edd78de92b..818ee4c1eb8 100644
--- a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -1,5 +1,4 @@
 // This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
 #include "orbsvcs/PortableGroup/UIPMC_Profile.h"
@@ -18,10 +17,6 @@
 #include "orbsvcs/PortableGroup/UIPMC_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (PortableGroup,
-           UIPMC_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Acceptor::TAO_UIPMC_Acceptor (void)
diff --git a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
index 59c1270b87b..e66f18ff5a7 100644
--- a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
+++ b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
@@ -34,7 +34,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// TAO UIPMC_Acceptor concrete call defination
+// TAO UIPMC_Acceptor concrete call definition
 
 /**
  * @class TAO_UIPMC_Acceptor
diff --git a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
index 2b28cb7716f..70b68065b90 100644
--- a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
@@ -1,5 +1,4 @@
 // This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
 
@@ -18,11 +17,6 @@
 #include "tao/Resume_Handle.h"
 #include "tao/Protocols_Hooks.h"
 
-
-ACE_RCSID(PortableGroup,
-          UIPMC_Connection_Handler,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (ACE_Thread_Manager *t)
diff --git a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index a606d5a4770..212f03bc30e 100644
--- a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -13,9 +13,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (PortableGroup,
-           UIPMC_Connector, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Connector::TAO_UIPMC_Connector (void)
diff --git a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
index c427ebec59d..54974a7fc9a 100644
--- a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
@@ -10,11 +10,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Memory.h"
 
-ACE_RCSID (tao,
-           UIPMC_Endpoint,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/PortableGroup/UIPMC_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
index 5402b4dad28..e4c0b82097e 100644
--- a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
+++ b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
@@ -64,8 +64,8 @@ public:
   /// Makes a copy of <this>
   virtual TAO_Endpoint *duplicate (void);
 
-  /// Return true if this endpoint is equivalent to <other_endpoint>.  Two
-  /// endpoints are equivalent iff their port and host are the same.
+  /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
+  /// endpoints are equivalent if their port and host are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
diff --git a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
index f15e8375597..b7791358d93 100644
--- a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
@@ -6,10 +6,6 @@
 #include "ace/OS_NS_strings.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (PortableGroup,
-           UIPMC_Factory,
-           "$Id$")
-
 static const char the_prefix[] = "uipmc";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
index f9af18c659e..dc4dc4b0de4 100644
--- a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
@@ -1,8 +1,6 @@
 // This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
-
 #include "orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h"
 #include "orbsvcs/PortableGroup/UIPMC_Endpoint.h"
 
@@ -18,11 +16,6 @@
 #include "tao/Resume_Handle.h"
 #include "tao/Protocols_Hooks.h"
 
-
-ACE_RCSID(PortableGroup,
-          UIPMC_Mcast_Connection_Handler,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Mcast_Connection_Handler::TAO_UIPMC_Mcast_Connection_Handler (
diff --git a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index 7a6210bcb95..0fd854dfe70 100644
--- a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -12,10 +12,6 @@
 #include "orbsvcs/miopC.h"
 #include "orbsvcs/PortableGroupC.h"
 
-ACE_RCSID (PortableGroup,
-           UIPMC_Profile,
-           "$Id$")
-
 static const char the_prefix[] = "miop";
 
 // UIPMC doesn't support object keys, so send profiles by default in the GIOP 1.2 target
@@ -554,7 +550,8 @@ TAO_UIPMC_Profile::to_string (void)
   char * buf = CORBA::string_alloc (static_cast<CORBA::ULong> (buflen));
 
   ACE_OS::sprintf (buf,
-                   "corbaloc:%s:%c.%c@%c.%c-%s-%llu",
+                   "corbaloc:%s:%c.%c@%c.%c-%s-"
+                   ACE_UINT64_FORMAT_SPECIFIER_ASCII,
                    ::the_prefix,
                    digits [this->version_.major],
                    digits [this->version_.minor],
@@ -566,7 +563,7 @@ TAO_UIPMC_Profile::to_string (void)
   if (this->has_ref_version_)
     {
       ACE_OS::sprintf (&buf[ACE_OS::strlen (buf)],
-                       "-%lu",
+                       "-" ACE_UINT32_FORMAT_SPECIFIER_ASCII,
                        this->ref_version_);
     }
 
diff --git a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index 0668f01185b..82dfde4bbe9 100644
--- a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -20,10 +20,6 @@
 #include "tao/Resume_Handle.h"
 #include "tao/GIOP_Message_Base.h"
 
-ACE_RCSID (PortableGroup,
-           UIPMC_Transport,
-           "$Id$")
-
 // Local MIOP Definitions:
 
 // Note: We currently support packet fragmentation on transmit, but
diff --git a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
index 0e1a0f1bc89..0b914a84235 100644
--- a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
@@ -5,8 +5,6 @@
 #include "tao/Transport.h"
 #include "tao/debug.h"
 
-ACE_RCSID(tao, Wait_On_Leader_Follower, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Wait_Never::TAO_UIPMC_Wait_Never (TAO_Transport *transport)
@@ -37,15 +35,13 @@ TAO_UIPMC_Wait_Never::can_process_upcalls (void) const
 }
 
 int
-TAO_UIPMC_Wait_Never::sending_request (TAO_ORB_Core *,
-                                       int)
+TAO_UIPMC_Wait_Never::sending_request (TAO_ORB_Core *, int)
 {
   return 0;
 }
 
 int
-TAO_UIPMC_Wait_Never::wait (ACE_Time_Value *,
-                            TAO_Synch_Reply_Dispatcher &)
+TAO_UIPMC_Wait_Never::wait (ACE_Time_Value *, TAO_Synch_Reply_Dispatcher &)
 {
   return -1;
 }
diff --git a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
index 9f39cd77b91..ff56a990894 100644
--- a/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
+++ b/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_UIPMC_WAIT_NEVER_H
 #define TAO_UIPMC_WAIT_NEVER_H
 #include /**/ "ace/pre.h"
diff --git a/orbsvcs/orbsvcs/PortableGroup_Simple_DS.idl b/orbsvcs/orbsvcs/PortableGroup_Simple_DS.idl
index 5da9ea78453..e7ca24867fe 100644
--- a/orbsvcs/orbsvcs/PortableGroup_Simple_DS.idl
+++ b/orbsvcs/orbsvcs/PortableGroup_Simple_DS.idl
@@ -29,7 +29,7 @@ module PortableGroup
   typedef unsigned long long ObjectGroupId;
   typedef unsigned long ObjectGroupRefVersion;
 
-  struct TagGroupTaggedComponent 
+  struct TagGroupTaggedComponent
   { // tag = TAG_GROUP;
     GIOP::Version component_version;
     GroupDomainId group_domain_id;
diff --git a/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 5b8bb50d2f0..993f6eb0225 100644
--- a/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -14,7 +14,7 @@
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Property, CosPropertyService_i, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/RTEvent.mpc b/orbsvcs/orbsvcs/RTEvent.mpc
index ed71e741c86..6cf7d7f789c 100644
--- a/orbsvcs/orbsvcs/RTEvent.mpc
+++ b/orbsvcs/orbsvcs/RTEvent.mpc
@@ -3,7 +3,7 @@
 
 project(RTEvent) : orbsvcslib, orbsvcs_output, install, svc_utils, tao_versioning_idl_defaults {
   sharedname   = TAO_RTEvent
-  idlflags    += -GT -Gstl \
+  idlflags    += -GT \
                  -Wb,stub_export_macro=TAO_RTEvent_Export \
                  -Wb,stub_export_include=orbsvcs/Event/event_export.h \
                  -Wb,skel_export_macro=TAO_RTEvent_Skel_Export \
diff --git a/orbsvcs/orbsvcs/RTEventLogAdmin.idl b/orbsvcs/orbsvcs/RTEventLogAdmin.idl
index ed434537190..75b44da7eee 100644
--- a/orbsvcs/orbsvcs/RTEventLogAdmin.idl
+++ b/orbsvcs/orbsvcs/RTEventLogAdmin.idl
@@ -1,18 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    RTEventLogAdmin.idl
-//
-// = DESCRIPTION
-//    This module defines the EventLog and
-//    EventLogFactory interfaces.
-//
-// = AUTHOR
-//    D A Hanvey (d.hanvey@qub.ac.uk)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    RTEventLogAdmin.idl
+ *
+ *  $Id$
+ *
+ *  This module defines the EventLog and
+ *  EventLogFactory interfaces.
+ *
+ *
+ *  @author D A Hanvey (d.hanvey@qub.ac.uk)
+ */
+//=============================================================================
+
 
 #ifndef RTEVENT_LOG_ADMIN_IDL
 #define RTEVENT_LOG_ADMIN_IDL
@@ -50,7 +50,7 @@ module RTEventLogAdmin
         DsLogAdmin::InvalidThreshold);
 
   };
-  
+
 };
 
 #endif /* RTEVENT_LOG_ADMIN_IDL */
diff --git a/orbsvcs/orbsvcs/RTSched.mpc b/orbsvcs/orbsvcs/RTSched.mpc
index 12973736031..dbcc9924533 100644
--- a/orbsvcs/orbsvcs/RTSched.mpc
+++ b/orbsvcs/orbsvcs/RTSched.mpc
@@ -3,8 +3,7 @@
 
 project(RTSched) : orbsvcslib, orbsvcs_output, install, naming, portableserver, svc_utils, tao_versioning_idl_defaults {
   sharedname   = TAO_RTSched
-  idlflags    += -Gstl \
-                 -Wb,export_macro=TAO_RTSched_Export \
+  idlflags    += -Wb,export_macro=TAO_RTSched_Export \
                  -Wb,export_include=orbsvcs/Sched/sched_export.h
   dynamicflags += TAO_RTSCHED_BUILD_DLL
   tagchecks   += Sched
diff --git a/orbsvcs/orbsvcs/RtecScheduler.idl b/orbsvcs/orbsvcs/RtecScheduler.idl
index 374ef6c195b..ddbbea4405a 100644
--- a/orbsvcs/orbsvcs/RtecScheduler.idl
+++ b/orbsvcs/orbsvcs/RtecScheduler.idl
@@ -15,7 +15,7 @@ module RtecScheduler
 
   typedef long Period_t; // 100 nanoseconds
 
-  typedef long Threads_t; 
+  typedef long Threads_t;
 
   typedef sequence<Period_t> Period_Set;
 
diff --git a/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp b/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
index badd9295d96..375cd3450d1 100644
--- a/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
@@ -1,13 +1,9 @@
-#include "orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h"
+// $Id$
 
+#include "orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 
-
-ACE_RCSID (SSLIOP,
-           IIOP_SSL_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor (void)
diff --git a/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
index 931390e9573..1e7a4804c0f 100644
--- a/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
 #include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
@@ -6,12 +8,6 @@
 #include "tao/ORB.h"
 #include "tao/debug.h"
 
-
-ACE_RCSID (SSLIOP,
-           IIOP_SSL_Connection_Handler,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 #include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index 5d36ff0c404..f4a8504a424 100644
--- a/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/IIOP_SSL_Connector.h"
 
 #include "tao/debug.h"
@@ -12,17 +14,12 @@
 #include "tao/Transport_Descriptor_Interface.h"
 #include "ace/Strategies_T.h"
 
-
-ACE_RCSID (SSLIOP,
-           IIOP_SSL_Connector,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::IIOP_SSL_Connector::IIOP_SSL_Connector (void)
   : TAO_IIOP_Connector (),
     connect_strategy_ (),
-    base_connector_ ()
+    base_connector_ (0)
 {
 }
 
diff --git a/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
index 44dba5ecf25..399e55748cd 100644
--- a/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
+++ b/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
@@ -63,7 +63,7 @@ namespace TAO
 
     typedef ACE_Connect_Strategy<IIOP_SSL_Connection_Handler,
                                  ACE_SOCK_CONNECTOR>
-            CONNECT_STRATEGY ;
+            CONNECT_STRATEGY;
 
     typedef ACE_Strategy_Connector<IIOP_SSL_Connection_Handler,
                                    ACE_SOCK_CONNECTOR>
diff --git a/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
index 716031f3707..c722e802ca9 100644
--- a/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h"
 #include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Util.h"
@@ -7,11 +9,6 @@
 #include "tao/Timeprobe.h"
 #include "tao/debug.h"
 
-
-ACE_RCSID (SSLIOP,
-           IIOP_SSL_Transport,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::IIOP_SSL_Transport::IIOP_SSL_Transport (
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
index 89812c36e09..ab121b2166c 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
@@ -1,9 +1,6 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h"
-
+// $Id$
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Accept_Strategy,
-           "$Id$")
+#include "orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -11,7 +8,7 @@ TAO::SSLIOP::Accept_Strategy::Accept_Strategy (
   TAO_ORB_Core * orb_core,
   const ACE_Time_Value & timeout)
   : TAO_Accept_Strategy<TAO::SSLIOP::Connection_Handler,
-                        ACE_SSL_SOCK_ACCEPTOR> (orb_core),
+                        ACE_SSL_SOCK_Acceptor> (orb_core),
     timeout_ (timeout)
 {
 }
@@ -54,9 +51,10 @@ TAO::SSLIOP::Accept_Strategy::accept_svc_handler (handler_type * svc_handler)
       // close() method resets it.
       ACE_Errno_Guard error (errno);
 
-      // Close down handler to avoid memory leaks.
-      svc_handler->close (0);
+      // It doesn't make sense to close the handler since it didn't open.
+      svc_handler->transport ()->remove_reference ();
 
+      // #REFCOUNT# is zero at this point.
       return -1;
     }
   else
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h
index 46fabac8fb0..8c79d322359 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h
@@ -64,7 +64,7 @@ namespace TAO
      */
     class Accept_Strategy
       : public TAO_Accept_Strategy<TAO::SSLIOP::Connection_Handler,
-                                   ACE_SSL_SOCK_ACCEPTOR>
+                                   ACE_SSL_SOCK_Acceptor>
     {
     public:
 
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 2966cb4bc9e..3cb850dc6f3 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
 
@@ -12,11 +14,6 @@
 #include "orbsvcs/SSLIOP/SSLIOP_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Acceptor::Acceptor (::Security::QOP qop,
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
index 0bdde1c0a35..d3e265a55f6 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
@@ -57,7 +57,7 @@ namespace TAO
       /// Destructor.
       ~Acceptor (void);
 
-      typedef TAO_Strategy_Acceptor<Connection_Handler, ACE_SSL_SOCK_ACCEPTOR> BASE_ACCEPTOR;
+      typedef TAO_Strategy_Acceptor<Connection_Handler, ACE_SSL_SOCK_Acceptor> BASE_ACCEPTOR;
       typedef TAO_Creation_Strategy<Connection_Handler> CREATION_STRATEGY;
       typedef TAO_Concurrency_Strategy<Connection_Handler> CONCURRENCY_STRATEGY;
       typedef Accept_Strategy ACCEPT_STRATEGY;
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
index caf7948dc48..1f8364db77a 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
@@ -3,12 +3,6 @@
 #include "orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h"
 #include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_ClientCredentials,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::ClientCredentials::ClientCredentials (
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index 5a1ad3a040b..6860cb8f6e6 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Util.h"
@@ -18,12 +20,6 @@
 # include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Connection_Handler,
-           "$Id$")
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Connection_Handler::Connection_Handler (
@@ -92,7 +88,7 @@ TAO::SSLIOP::Connection_Handler::open (void *)
   protocol_properties.no_delay_ =
     this->orb_core ()->orb_params ()->nodelay ();
   protocol_properties.keep_alive_ =
-    this->orb_core ()->orb_params ()->sock_keepalive (); 
+    this->orb_core ()->orb_params ()->sock_keepalive ();
 
   TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
@@ -128,7 +124,7 @@ TAO::SSLIOP::Connection_Handler::open (void *)
     return -1;
 #endif /* ! ACE_LACKS_TCP_NODELAY */
 
-  //support ORBKeepalive in SSL mode 
+  //support ORBKeepalive in SSL mode
   if (protocol_properties.keep_alive_)
     {
       if (this->peer ().
@@ -140,7 +136,7 @@ TAO::SSLIOP::Connection_Handler::open (void *)
         {
           return -1;
         }
-    } 
+    }
 
   if (this->transport ()->wait_strategy ()->non_blocking ())
     {
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index ed3028f69d6..d6d908922b3 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Connector.h"
 #include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
@@ -19,17 +21,13 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Connector,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Connector::Connector (::Security::QOP qop)
   : TAO::IIOP_SSL_Connector (),
     qop_ (qop),
     connect_strategy_ (),
-    base_connector_ ()
+    base_connector_ (0)
 {
 }
 
@@ -516,8 +514,6 @@ TAO::SSLIOP::Connector::ssliop_connect (
 
             }
         }
-
-      safe_handler.release ();
     }
   else
     {
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
index f560142bf1c..94832510162 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
@@ -124,11 +124,11 @@ namespace TAO
           CONNECT_CREATION_STRATEGY;
 
       typedef ACE_Connect_Strategy<Connection_Handler,
-                                   ACE_SSL_SOCK_CONNECTOR>
+                                   ACE_SSL_SOCK_Connector>
           CONNECT_STRATEGY;
 
       typedef ACE_Strategy_Connector<Connection_Handler,
-                                     ACE_SSL_SOCK_CONNECTOR>
+                                     ACE_SSL_SOCK_Connector>
           BASE_CONNECTOR;
 
     private:
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
index 1b6a4d0ede2..ae78b5fe44b 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -1,15 +1,9 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h"
+// $Id$
 
+#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h"
 #include "tao/ORB_Constants.h"
-
 #include "ace/SString.h"
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_Credentials,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/SSLIOP/SSLIOP_Credentials.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
index 321c571255d..46e33cd0d63 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -13,12 +13,6 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_CredentialsAcquirer,
-           "$Id$")
-
-
 // -------------------------------------------------------
 
 #if (defined (TAO_HAS_VERSIONED_NAMESPACE) && TAO_HAS_VERSIONED_NAMESPACE == 1)
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
index 98408532f38..07bbe863916 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
@@ -3,12 +3,6 @@
 #include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h"
 #include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h"
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_CredentialsAcquirerFactory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 SecurityLevel3::CredentialsAcquirer_ptr
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index ac8e8f2694a..601bc8e52fb 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -1,12 +1,8 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Current.h"
 #include "tao/debug.h"
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_Current,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/SSLIOP/SSLIOP_Current.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
index e625059d78c..9fafd66c03c 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -1,12 +1,6 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.h"
-
-#include "ace/OS_String.h"
-
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_Current_Impl,
-           "$Id$")
+// $Id$
 
+#include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.h"
 
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl"
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
index 020904b53d2..8768012be44 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h"
 
@@ -8,12 +9,6 @@
 #include <openssl/dh.h>
 #include "orbsvcs/SSLIOP/params_dup.h"
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_EVP_PKEY,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ::EVP_PKEY *
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
index eb0685a867c..0373200cec8 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h"
 
 #include "tao/IIOP_Endpoint.h"
@@ -8,11 +10,6 @@
 
 #include "tao/debug.h"
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Endpoint,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/SSLIOP/SSLIOP_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
index aa860e89bca..694f530f58b 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
@@ -234,7 +234,7 @@ namespace TAO
       /**
        * Return true if this endpoint is equivalent to @param
        * other_endpoint.
-       * Two synthetic endpoints are equivalent iff their iiop counterparts are
+       * Two synthetic endpoints are equivalent if their iiop counterparts are
        * equivalent, and, if both have non-zero ssl ports, their ssl
        * ports are the same.
        */
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index da3299661ce..777609a0b2c 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Factory.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Connector.h"
@@ -13,11 +15,6 @@
 #include "ace/SSL/sslconf.h"
 #include "ace/SSL/SSL_Context.h"
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Factory,
-           "$Id$")
-
-
 // An SSL session id seed value. Needs not be too unique, just somewhat
 // different. See the OpenSSL manual
 static const unsigned char session_id_context_[] =
@@ -144,9 +141,13 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[])
   // underlying SSL library (e.g. OpenSSL), which occurs when an
   // ACE_SSL_Context is instantiated.
 
+  // This directive processing initializes ACE_SSL_Context as well
+  // as registers ACE_SSL for correct cleanup.
+  ACE_Service_Config::process_directive (
+    ACE_STATIC_SERVICE_DIRECTIVE ("ACE_SSL_Initializer", ""));
+
   // The code is cleaner this way anyway.
   ACE_SSL_Context * ssl_ctx = ACE_SSL_Context::instance ();
-  ACE_ASSERT (ssl_ctx != 0);
 
   size_t session_id_len =
     (sizeof session_id_context_ >= SSL_MAX_SSL_SESSION_ID_LENGTH)
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
index 066417608a3..fce8f35cd85 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Current.h"
 
@@ -12,11 +14,6 @@
 #include <openssl/x509.h>   // @@ For debugging code below
 #endif /* SSLIOP_DEBUG_PEER_CERTIFICATE */
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Invocation_Interceptor,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Server_Invocation_Interceptor::Server_Invocation_Interceptor
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index c988544f555..d36fcaddd00 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -1,11 +1,6 @@
-#include "orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h"
-
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_ORBInitializer,
-           "$Id$")
-
+// $Id$
 
+#include "orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Current.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h"
 //#include "SSLIOP_IORInterceptor.h"
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
index 9aa5424db18..bd2cd76bdbd 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
@@ -2,12 +2,6 @@
 
 #include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_OwnCredentials,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::OwnCredentials::OwnCredentials (X509 *cert, EVP_PKEY *evp)
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
index a0bfb2ce2ae..f9532b3596c 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
@@ -1,13 +1,10 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
 #include "orbsvcs/SSLIOP/ssl_endpointsC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Profile,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (const ACE_INET_Addr & addr,
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
index 6e5d711b3a7..9090daa0e77 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
@@ -1,9 +1,6 @@
-#include "orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h"
-
+// $Id$
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_TargetCredentials,
-           "$Id$")
+#include "orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index acee802653c..1e5f5c3996b 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Transport.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
@@ -16,11 +18,6 @@
 #include "tao/Acceptor_Registry.h"
 #include "tao/Thread_Lane_Resources.h"
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Transport,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Transport::Transport (
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
index 6d32bec493e..50f2fc551f1 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
@@ -46,7 +46,7 @@ namespace TAO
 {
   namespace SSLIOP
   {
-    typedef ACE_Svc_Handler<ACE_SSL_SOCK_STREAM, ACE_NULL_SYNCH> SVC_HANDLER;
+    typedef ACE_Svc_Handler<ACE_SSL_SOCK_Stream, ACE_NULL_SYNCH> SVC_HANDLER;
 
     class Handler_Base;
     class Connection_Handler;
diff --git a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
index f84609e3eb3..33b43104058 100644
--- a/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
+++ b/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
@@ -1,11 +1,6 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Util.h"
-
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_Util,
-           "$Id$")
-
+// $Id$
 
+#include "orbsvcs/SSLIOP/SSLIOP_Util.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Current.h"
 
diff --git a/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index c1e5d7aa9ac..6a7caa5457c 100644
--- a/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -9,6 +9,7 @@
 
 #include "orbsvcs/Sched/Config_Scheduler.h"
 
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Config_Scheduler::ACE_Config_Scheduler (void)
diff --git a/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index bf3921e1948..eef07d5a93b 100644
--- a/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -7,15 +7,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
+#include "orbsvcs/RtecSchedulerS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecSchedulerS.h"
 #include "orbsvcs/Event_Service_Constants.h"
-
 #include "orbsvcs/Sched/sched_export.h"
 
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
diff --git a/orbsvcs/orbsvcs/Sched/DynSched.cpp b/orbsvcs/orbsvcs/Sched/DynSched.cpp
index f8d35344158..d75102fed6d 100644
--- a/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -21,6 +21,7 @@
 #include "orbsvcs/Sched/DynSched.inl"
 #endif /* __ACE_INLINE__ */
 
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //////////////////////
@@ -356,7 +357,7 @@ ACE_DynScheduler::get_rt_info (Object_Name name,
     }
 }
 
-
+
 
 
 int ACE_DynScheduler::priority (
diff --git a/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index 7fc84f72aca..eced05efa7b 100644
--- a/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ b/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
@@ -18,6 +18,9 @@
 
 #include "orbsvcs/Time_Utilities.h"
 
+
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ///////////////////////////
diff --git a/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index e7052c5f0dc..d64f8fe9b6d 100644
--- a/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -242,7 +242,7 @@ init (int config_count,
         }
 
       // Release the auto_ptr so it does not clean
-      // up the sucessfully bound config info.
+      // up the successfully bound config info.
       new_config_info_ptr.release ();
 
       // Increase the count of successfully bound config infos.
@@ -2574,7 +2574,7 @@ assign_priorities_i (void)
             }
 
           // Release the auto_ptr so it does not clean
-          // up the sucessfully bound config info.
+          // up the successfully bound config info.
           new_config_info_ptr.release ();
         }
     }
diff --git a/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index ec93af8e7b5..b94d0709197 100644
--- a/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -18,6 +18,8 @@
 #include "orbsvcs/Sched/SchedEntry.inl"
 #endif /* __ACE_INLINE__ */
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 Task_Entry::Task_Entry (void)
diff --git a/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 24818216453..fe7f854be25 100644
--- a/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -16,6 +16,7 @@
 
 #include "ace/Lock_Adapter_T.h"
 
+
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 // class Scheduler static members
diff --git a/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
index 118f0848df0..dee012d8eb6 100644
--- a/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -14,6 +14,8 @@
 #include "orbsvcs/Sched/Scheduler_Generic.h"
 #include "ace/OS_NS_stdio.h"
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 7aefb40796c..196ac5af086 100644
--- a/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 #include "ace/Null_Mutex.h"
 
@@ -192,7 +191,7 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming,
   try
     {
       CosNaming::Name schedule_name (1);
-      schedule_name.length (1);
+      schedule_name.resize (1);
       schedule_name[0].id = CORBA::string_dup (name);
       CORBA::Object_var objref =
         naming->resolve (schedule_name);
@@ -343,13 +342,11 @@ int ACE_Scheduler_Factory::dump_schedule
       if (file == 0)
           return -1;
     }
-  ACE_OS::fprintf (file, header);
+  ACE_OS::fprintf (file, "%s", header);
 
   // Indicate anomalies encountered during scheduling.
 
-  ACE_OS::fprintf(file, (anomalies.size () > 0
-                         ? start_anomalies_found
-                         : start_anomalies_none));
+
 
   for (i = 0; i < anomalies.size (); ++i)
     {
@@ -389,7 +386,7 @@ int ACE_Scheduler_Factory::dump_schedule
     }
 
   // Print out operation QoS info.
-  ACE_OS::fprintf (file, start_infos);
+  ACE_OS::fprintf (file, "%s", start_infos);
 
   for (i = 0;
        i < infos.size ();
@@ -438,9 +435,9 @@ int ACE_Scheduler_Factory::dump_schedule
   ACE_OS::fprintf(file, "\n");
 
   if (infos.size () > 0)
-    ACE_OS::fprintf (file, end_infos);
+    ACE_OS::fprintf (file, "%s", end_infos);
   else
-    ACE_OS::fprintf (file, end_infos_empty);
+    ACE_OS::fprintf (file, "%s", end_infos_empty);
 
   // Print out banner indicating which dependencies are dumped.
   if (dump_disabled_dependencies)
@@ -453,7 +450,7 @@ int ACE_Scheduler_Factory::dump_schedule
     }
 
   // Print out operation dependency info.
-  ACE_OS::fprintf (file, start_dependencies);
+  ACE_OS::fprintf (file, "%s", start_dependencies);
 
   for (i = 0;
        i < dependencies.size ();
@@ -485,13 +482,13 @@ int ACE_Scheduler_Factory::dump_schedule
   ACE_OS::fprintf (file, "\n");
 
   if (dependencies.size () > 0)
-    ACE_OS::fprintf (file, end_dependencies);
+    ACE_OS::fprintf (file, "%s", end_dependencies);
   else
-    ACE_OS::fprintf (file, end_dependencies_empty);
+    ACE_OS::fprintf (file, "%s", end_dependencies_empty);
 
 
   // Print out queue configuration info.
-  ACE_OS::fprintf (file, start_configs);
+  ACE_OS::fprintf (file, "%s", start_configs);
 
   for (i = 0;
        i < configs.size ();
@@ -513,11 +510,11 @@ int ACE_Scheduler_Factory::dump_schedule
   ACE_OS::fprintf (file, "\n");
 
   if (configs.size () > 0)
-    ACE_OS::fprintf (file, end_configs);
+    ACE_OS::fprintf (file, "%s", end_configs);
   else
-    ACE_OS::fprintf (file, end_configs_empty);
+    ACE_OS::fprintf (file, "%s", end_configs_empty);
 
-  ACE_OS::fprintf (file, footer);
+  ACE_OS::fprintf (file, "%s", footer);
   ACE_OS::fclose (file);
   return 0;
 }
diff --git a/orbsvcs/orbsvcs/Scheduler_Factory.inl b/orbsvcs/orbsvcs/Scheduler_Factory.inl
index 2c01870582f..a93a0002f14 100644
--- a/orbsvcs/orbsvcs/Scheduler_Factory.inl
+++ b/orbsvcs/orbsvcs/Scheduler_Factory.inl
@@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // the factory is uninitialized, or in a config or runtime mode of
 // operation.
 
-ACE_INLINE ACE_Scheduler_Factory::Factory_Status 
+ACE_INLINE ACE_Scheduler_Factory::Factory_Status
 ACE_Scheduler_Factory::status (void)
 {
   return status_;
diff --git a/orbsvcs/orbsvcs/Scheduler_Utilities.cpp b/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
index 91bd0d15e32..e9dcddf977e 100644
--- a/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
+++ b/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
@@ -6,4 +6,3 @@
 #include "orbsvcs/Scheduler_Utilities.inl"
 #endif /* __ACE_INLINE__ */
 
-
diff --git a/orbsvcs/orbsvcs/Security/CSI_Utils.cpp b/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
index 0e7c1a01478..8ee9ee108cd 100644
--- a/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
+++ b/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
@@ -2,16 +2,9 @@
 
 #include "orbsvcs/Security/CSI_Utils.h"
 #include "orbsvcs/CSIC.h"
-
 #include "tao/CDR.h"
-
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (Security,
-           CSI_Utils,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
index c4473d5e5fa..1519307d289 100644
--- a/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
+++ b/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
@@ -1,15 +1,9 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/Security/SL2_EstablishTrustPolicy.h"
-
 #include "tao/ORB_Constants.h"
 
-
-ACE_RCSID (Security,
-           SL2_EstablishTrustPolicy,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Security::EstablishTrustPolicy::EstablishTrustPolicy (
diff --git a/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
index 3d025263540..0aa7c3d65c4 100644
--- a/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
+++ b/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
@@ -1,15 +1,9 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/Security/SL2_QOPPolicy.h"
-
 #include "tao/ORB_Constants.h"
 
-
-ACE_RCSID (Security,
-           SL2_QOPPolicy,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Security::QOPPolicy::QOPPolicy (::Security::QOP qop)
diff --git a/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
index b4a6777ca9e..390fe24f253 100644
--- a/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
+++ b/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
@@ -9,11 +9,6 @@
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Creation_Time.h"
 
-ACE_RCSID (Security,
-           SL2_SecurityManager,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Security::SecurityManager::SecurityManager (/* unknown */)
@@ -159,7 +154,7 @@ TAO::Security::AccessDecision::access_allowed_i (OBJECT_KEY &key,
 
   // Look up the target in access_map_; if there, return the value,
   // otherwise return the default value.
-  CORBA::Boolean access_decision;
+  CORBA::Boolean access_decision = false;
   if (this->access_map_.find (key, access_decision) == -1)
     {
       // Couldn't find the IOR in the map, so we use the default
diff --git a/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
index f37c826cfd1..41fde030644 100644
--- a/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
+++ b/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
@@ -2,11 +2,6 @@
 
 #include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
 
-
-ACE_RCSID (Security,
-           SL3_ContextEstablishmentPolicy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SL3::ContextEstablishmentPolicy::ContextEstablishmentPolicy (
diff --git a/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp b/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
index 80a5304154e..380cd4f9263 100644
--- a/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
+++ b/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
@@ -1,9 +1,6 @@
-#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
-
+// $Id$
 
-ACE_RCSID (Security,
-           SL3_CredentialsAcquirerFactory,
-           "$Id$")
+#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index 9c89692440f..547af03b869 100644
--- a/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -3,11 +3,6 @@
 #include "orbsvcs/Security/SL3_CredentialsCurator.h"
 #include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
 
-
-ACE_RCSID (Security,
-           SL3_CredentialsCurator,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -185,7 +180,7 @@ SecurityLevel3::OwnCredentials_ptr
 TAO::SL3::CredentialsCurator::get_own_credentials (
     const char * credentials_id)
 {
-  Credentials_Table::ENTRY * entry;
+  Credentials_Table::ENTRY * entry = 0;
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -205,7 +200,7 @@ void
 TAO::SL3::CredentialsCurator::release_own_credentials (
     const char * credentials_id)
 {
-  Credentials_Table::ENTRY * entry;
+  Credentials_Table::ENTRY * entry = 0;
 
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
 
diff --git a/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
index 78ca31f5279..f1940488326 100644
--- a/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
+++ b/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
@@ -2,12 +2,6 @@
 
 #include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
 
-
-ACE_RCSID (Security,
-           SL3_ObjectCredentialsPolicy,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SL3::ObjectCredentialsPolicy::ObjectCredentialsPolicy (
diff --git a/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
index cf05bd9ba75..129ce8fca7f 100644
--- a/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+++ b/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
@@ -4,12 +4,6 @@
 #include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
 #include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
 
-
-ACE_RCSID (Security,
-           SL3_PolicyFactory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
diff --git a/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
index faec8ac6679..a31cdef7d67 100644
--- a/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
+++ b/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
@@ -2,12 +2,6 @@
 
 #include "orbsvcs/Security/SL3_SecurityCurrent.h"
 
-
-ACE_RCSID (Security,
-           SL3_SecurityCurrent,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/Security/SL3_SecurityCurrent.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp b/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
index 14b7a548c16..77208fa2c9e 100644
--- a/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
+++ b/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
@@ -1,12 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h"
 
-ACE_RCSID (Security,
-           SL3_Security_Current_Impl,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SL3::SecurityCurrent_Impl::~SecurityCurrent_Impl (void)
diff --git a/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
index bb9f8b58bbb..7dee871bd4a 100644
--- a/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
+++ b/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
@@ -4,12 +4,6 @@
 #include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
 #include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
 
-
-ACE_RCSID (Security,
-           SL3_SecurityManager,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SL3::SecurityManager::SecurityManager (
diff --git a/orbsvcs/orbsvcs/Security/Security_Current.cpp b/orbsvcs/orbsvcs/Security/Security_Current.cpp
index 4e77c95f72b..296197f3334 100644
--- a/orbsvcs/orbsvcs/Security/Security_Current.cpp
+++ b/orbsvcs/orbsvcs/Security/Security_Current.cpp
@@ -1,12 +1,9 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/Security/Security_Current.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Security,
-           Security_Current,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/Security/Security_Current.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp b/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
index a0239a9ca7d..6627d37f847 100644
--- a/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
+++ b/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/Security/Security_Current_Impl.h"
 
-ACE_RCSID (Security,
-           SL3_Security_Current_Impl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Security::Current_Impl::~Current_Impl (void)
diff --git a/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index 8c54dca4e95..52a1c563892 100644
--- a/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -1,16 +1,10 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/Security/Security_ORBInitializer.h"
 
-ACE_RCSID (Security,
-           Security_ORBInitializer,
-           "$Id$")
-
-
-#if 1
 #include "orbsvcs/Security/Security_Current.h"
 #include "orbsvcs/Security/SL2_SecurityManager.h"
-#endif
 #include "orbsvcs/Security/SL3_SecurityCurrent.h"
 #include "orbsvcs/Security/SL3_CredentialsCurator.h"
 #include "orbsvcs/Security/SL3_SecurityManager.h"
diff --git a/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index 4d0ff92fb13..9462e58aa60 100644
--- a/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -1,11 +1,7 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/Security/Security_PolicyFactory.h"
-
-ACE_RCSID (Security,
-           Security_PolicyFactory,
-           "$Id$")
-
 #include "orbsvcs/Security/SL2_QOPPolicy.h"
 #include "orbsvcs/Security/SL2_EstablishTrustPolicy.h"
 
diff --git a/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index 74ef744e13b..a6c436edf00 100644
--- a/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/Time/TAO_UTO.h"
 #include "orbsvcs/Time/TAO_TIO.h"
 #include "orbsvcs/Time/TAO_Time_Service_Server.h"
@@ -6,10 +8,6 @@
 
 #include "tao/debug.h"
 
-ACE_RCSID (Time,
-           TAO_Time_Service_Server,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor.
diff --git a/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index 1572866de25..2c40eb6e7bf 100644
--- a/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -3,13 +3,6 @@
 
 #include "orbsvcs/Time/TAO_UTO.h"
 #include "orbsvcs/Time/TAO_TIO.h"
-#include "ace/OS.h"
-
-
-ACE_RCSID (Time,
-           TAO_UTO,
-           "$Id$")
-
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index af7d98e3e3f..744860c67ff 100644
--- a/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/Time/Timer_Helper.h"
 #include "orbsvcs/Time/TAO_Time_Service_Clerk.h"
 
@@ -6,11 +8,6 @@
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID (Time,
-           Timer_Helper,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 Timer_Helper::Timer_Helper (void)
diff --git a/orbsvcs/orbsvcs/Time_Utilities.cpp b/orbsvcs/orbsvcs/Time_Utilities.cpp
index 4b7d1280b59..1bb51c844ab 100644
--- a/orbsvcs/orbsvcs/Time_Utilities.cpp
+++ b/orbsvcs/orbsvcs/Time_Utilities.cpp
@@ -6,6 +6,8 @@
 # include "orbsvcs/Time_Utilities.inl"
 #endif /* __ACE_INLINE__ */
 
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Number of nanoseconds between CORBA and POSIX epochs.
diff --git a/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index c36317d1a59..1f0cd227d4b 100644
--- a/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -4,11 +4,6 @@
 #include "orbsvcs/Trader/Trader_Constraint_Visitors.h"
 #include "orbsvcs/Trader/Constraint_Tokens.h"
 
-ACE_RCSID (Trader,
-           Constraint_Interpreter,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Constraint_Interpreter::TAO_Constraint_Interpreter (
diff --git a/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index e6a8a444d21..41eef2b6963 100644
--- a/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -11,10 +11,6 @@
 #include "orbsvcs/Trader/Constraint_Nodes.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Trader,
-           Constraint_Nodes,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
@@ -302,7 +298,7 @@ TAO_Literal_Constraint::TAO_Literal_Constraint (void)
 TAO_Literal_Constraint::
 TAO_Literal_Constraint (const TAO_Literal_Constraint& lit)
   : TAO_Constraint(),
-    type_ (TAO_UNKNOWN) 
+    type_ (TAO_UNKNOWN)
 {
   this->copy (lit);
 }
@@ -592,7 +588,7 @@ operator== (const TAO_Literal_Constraint& left,
       return_value = (ACE_OS::strcmp ((const char*) left, (const char*) right) == 0);
       break;
     case TAO_DOUBLE:
-      return_value = (CORBA::Double) left == (CORBA::Double) right;
+      return_value = ACE::is_equal ((CORBA::Double) left, (CORBA::Double) right);
       break;
     case TAO_SIGNED:
       return_value = static_cast<CORBA::LongLong> (left) ==
@@ -676,7 +672,7 @@ operator> (const TAO_Literal_Constraint& left,
 bool
 operator== (CORBA::Double left, const TAO_Literal_Constraint& right)
 {
-  return (left == (CORBA::Double) right);
+  return ACE::is_equal (left, (CORBA::Double) right);
 }
 
 bool
@@ -796,7 +792,7 @@ operator/ (const TAO_Literal_Constraint& left,
     {
     case TAO_DOUBLE:
       {
-        if ((CORBA::Double) right == 0.0) 
+        if (ACE::is_equal ((CORBA::Double) right, 0.0))
           return TAO_Literal_Constraint ((CORBA::Double) 0.0);
 
         CORBA::Double result = (CORBA::Double) left / (CORBA::Double) right;
@@ -804,7 +800,7 @@ operator/ (const TAO_Literal_Constraint& left,
       }
     case TAO_SIGNED:
       {
-        if (static_cast<CORBA::LongLong> (right) == 0) 
+        if (static_cast<CORBA::LongLong> (right) == 0)
           return TAO_Literal_Constraint (static_cast<CORBA::LongLong> (0));
 
         CORBA::LongLong result = static_cast<CORBA::LongLong> (left) /
@@ -813,7 +809,7 @@ operator/ (const TAO_Literal_Constraint& left,
       }
     case TAO_UNSIGNED:
       {
-        if (static_cast<CORBA::ULongLong> (right) == 0) 
+        if (static_cast<CORBA::ULongLong> (right) == 0)
           return TAO_Literal_Constraint (static_cast<CORBA::ULongLong> (0));
 
         CORBA::ULongLong result = static_cast<CORBA::ULongLong> (left) /
diff --git a/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index 62213724089..fe4e3b5184a 100644
--- a/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -9,12 +9,6 @@
 
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (Trader,
-           Constraint_Visitors,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue (void)
@@ -715,7 +709,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   try
     {
       CORBA::Float value = dyn_any.get_float ();
-      return_value = (value == element);
+      return_value = ACE::is_equal (value, element);
     }
   catch (const CORBA::Exception&){}
   return return_value;
@@ -730,7 +724,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   try
     {
       CORBA::Double value = dyn_any.get_double ();
-      return_value = (value == element);
+      return_value = ACE::is_equal (value, element);
     }
   catch (const CORBA::Exception&){}
   return return_value;
@@ -985,8 +979,8 @@ visit_div (TAO_Binary_Constraint* boolean_div)
           break;
         case TAO_DOUBLE:
           right_isnt_zero =
-            (static_cast<CORBA::Double>
-               (*dynamic_cast<TAO_Literal_Constraint*> (right)) != 0.0);
+            ACE::is_inequal (static_cast<CORBA::Double>
+               (*dynamic_cast<TAO_Literal_Constraint*> (right)), 0.0);
           break;
         }
 
diff --git a/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
index 28a91e0e0e1..804b04ff30b 100644
--- a/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ b/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
@@ -2,7 +2,6 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Id$
  */
 
 #define FLEX_SCANNER
@@ -418,19 +417,16 @@ char *yytext;
 #define INITIAL 0
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-// $Id$
-// ========================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    constraint.l
-//
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//
-// ========================================================================
+//=============================================================================
+/**
+ *  @file    Constraint_l.cpp
+ *
+ *  $Id$
+ *
+ *  @author Seth Widoff <sbw1@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Trader/Constraint_Interpreter.h"
 #include "orbsvcs/Trader/Constraint_Nodes.h"
diff --git a/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
index 68364873652..6ac6210a27e 100644
--- a/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
+++ b/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
@@ -1,6 +1,6 @@
 #ifndef lint
 static char const
-yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28 2000/01/17 02:04:06 bde Exp $";
+yyrcsid[] = "$Id$";
 #endif
 #include "ace/os_include/os_stdlib.h"
 #define YYBYACC 1
@@ -13,19 +13,6 @@ yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28 2000/01/17 02:04:06 bd
 #define YYRECOVERING() (yyerrflag!=0)
 
 #define YYPREFIX "yy"
-  /* $Id$*/
-/* ========================================================================*/
-/**/
-/* = LIBRARY*/
-/*    orbsvcs*/
-/* */
-/* = FILENAME*/
-/*    constraint.y*/
-/**/
-/* = AUTHOR*/
-/*    Seth Widoff <sbw1@cs.wustl.edu>*/
-/**/
-/* ========================================================================*/
 
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdlib.h"
diff --git a/orbsvcs/orbsvcs/Trader/Locking.h b/orbsvcs/orbsvcs/Trader/Locking.h
deleted file mode 100644
index e01ba419b43..00000000000
--- a/orbsvcs/orbsvcs/Trader/Locking.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Locking.h
- *
- *  $Id$
- *
- *  @author Marina Spivak <marina@cs.wustl.edu>
- *  @author Seth Widoff <sbw1@cs.wustl.edu>
- *  @author Irfan Pyarali <irfan@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LOCKING_H
-#define TAO_LOCKING_H
-
-#include /**/ "ace/pre.h"
-
-// Macros for obtaining read/write locks that are
-// automatically released at the end of scope.
-// In case of failure, CORBA::SystemException is thrown.
-
-#define TAO_WRITE_GUARD(MUTEX,OBJ,LOCK) \
-ACE_Write_Guard<MUTEX> OBJ (LOCK); \
-if (OBJ.locked () == 0) \
-  TAO_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO));
-
-#define TAO_READ_GUARD(MUTEX,OBJ,LOCK) \
-ACE_Read_Guard<MUTEX> OBJ (LOCK); \
-if (OBJ.locked () == 0) \
-  TAO_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO));
-
-#define TAO_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \
-ACE_Write_Guard<MUTEX> OBJ (LOCK); \
-if (OBJ.locked () == 0) \
-  TAO_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), RETURN);
-
-#define TAO_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \
-ACE_Read_Guard<MUTEX> OBJ (LOCK); \
-if (OBJ.locked () == 0) \
-  TAO_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), RETURN);
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_LOCKING_H */
diff --git a/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index f8a41ab797b..4de1e115937 100644
--- a/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -2,7 +2,7 @@
 
 #include "orbsvcs/Trader/Offer_Iterators.h"
 
-ACE_RCSID(Trader, Offer_Iterators, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index bdc558cdd52..fe308c0373a 100644
--- a/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -1,15 +1,8 @@
 // $Id$
 
 #include "orbsvcs/Trader/Service_Type_Repository.h"
-
 #include "ace/Lock_Adapter_T.h"
 
-
-ACE_RCSID (Trader,
-           Service_Type_Repository,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Service_Type_Repository::TAO_Service_Type_Repository (ACE_Lock* lock)
diff --git a/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index 4c6add58960..d247e3754a1 100644
--- a/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -73,7 +73,7 @@ public:
 
   // If the "name" parameter is malformed, then the
   // CosTrading::IllegalServiceType exception is raised.  If the type
-  // already exists, then the ServiceTypeExists exception is raised. °
+  // already exists, then the ServiceTypeExists exception is raised.
   // If the "if_name" parameter is not a sub-type of the interface
   // associated with a service type from which this service type is
   // derived, such that substitutability would be violated, then the
diff --git a/orbsvcs/orbsvcs/Trader/Trader.cpp b/orbsvcs/orbsvcs/Trader/Trader.cpp
index 7b0ab0b58de..a98f86cced7 100644
--- a/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -11,10 +11,6 @@
 // The following #include is needed only for the instantiation pragmas.
 #include "orbsvcs/Trader/Trader_Interfaces.h"
 
-ACE_RCSID (Trader,
-           Trader,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Trader_Base::TAO_Trader_Base (void)
diff --git a/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index c9c562d8d3a..8548c920629 100644
--- a/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -137,7 +137,7 @@ public:
   // constraint.
 
   // The returned offers are passed back in one of two ways (or a
-  // combination of both). °The "offers" return result conveys a list
+  // combination of both). The "offers" return result conveys a list
   // of offers and the "offer_itr" is a reference to an interface at
   // which offers can be obtained. The "how_many" parameter states
   // how many offers are to be returned via the "offers" result, any
@@ -297,14 +297,14 @@ public:
   // identifies the service type, which contains the interface type of
   // the "reference" and a set of named property types that may be
   // used in further describing this offer (i.e., it restricts what is
-  // acceptable in the properties parameter). °
+  // acceptable in the properties parameter).
 
   // If the string
   // representation of the "type" does not obey the rules for
-  // identifiers, then an IllegalServiceType exception is raised. ° If
+  // identifiers, then an IllegalServiceType exception is raised. If
   // the "type" is correct syntactically but a trader is able to
   // unambiguously determine that it is not a recognized service type,
-  // then an UnknownServiceType exception is raised. °
+  // then an UnknownServiceType exception is raised.
 
   // If the trader
   // can determine that the interface type of the "reference"
@@ -314,21 +314,21 @@ public:
   // the property value types defined for those names. They describe
   // the service being offered. This description typically covers
   // behavioral, non-functional, and non-computational aspects of the
-  // service. °
+  // service.
 
   // If any of the property names do not obey the syntax
   // rules for PropertyNames, then an IllegalPropertyName exception is
-  // raised. °
+  // raised.
 
   // If the type of any of the property values is not the
   // same as the declared type (declared in the service type), then a
   // PropertyTypeMismatch exception is raised.
 
-  // ° If an attempt is made to assign a dynamic property value to a
+  // If an attempt is made to assign a dynamic property value to a
   // readonly property, then the ReadonlyDynamicProperty exception is
-  // raised. ° If the "properties" parameter omits any property
+  // raised. If the "properties" parameter omits any property
   // declared in the service type with a mode of mandatory, then a
-  // MissingMandatoryProperty exception is raised. ° If two or more
+  // MissingMandatoryProperty exception is raised. If two or more
   // properties with the same property name are included in this
   // parameter, the DuplicatePropertyName exception is raised.
   // END SPEC
@@ -339,11 +339,11 @@ public:
   // The withdraw operation removes the service offer from the trader
   // (i.e., after withdraw the offer can no longer be returned as the
   // result of a query). The offer is identified by the "id" parameter
-  // which was originally returned by export. ° If the string
+  // which was originally returned by export. If the string
   // representation of "id" does not obey the rules for offer
-  // identifiers, then an IllegalOfferId exception is raised. ° If the
+  // identifiers, then an IllegalOfferId exception is raised. If the
   // "id" is legal but there is no offer within the trader with that
-  // "id," then an UnknownOfferId exception is raised. ° If the "id"
+  // "id," then an UnknownOfferId exception is raised. If the "id"
   // identifies a proxy offer rather than an ordinary offer, then a
   // ProxyOfferId exception is raised.
   // END SPEC
@@ -357,11 +357,11 @@ public:
   // of the offered service, the "type" of the service offer, and the
   // "properties" that describe this offer of service. The offer is
   // identified by the "id" parameter which was originally returned by
-  // export. ° If the string representation of "id" does not obey the
+  // export. If the string representation of "id" does not obey the
   // rules for object identifiers, then an IllegalOfferId exception is
-  // raised. ° If the "id" is legal but there is no offer within the
+  // raised. If the "id" is legal but there is no offer within the
   // trader with that "id," then an UnknownOfferId exception is
-  // raised. ° If the "id" identifies a proxy offer rather than an
+  // raised. If the "id" identifies a proxy offer rather than an
   // ordinary offer, then a ProxyOfferId exception is raised.
   // END SPEC
 
@@ -373,30 +373,30 @@ public:
   // The modify operation is used to change the description of a
   // service as held within a service offer. The object reference and
   // the service type associated with the offer cannot be
-  // changed. This operation may: ° add new (non-mandatory) properties
-  // to describe an offer, ° change the values of some existing (not
-  // readonly) properties, or ° delete existing (neither mandatory nor
+  // changed. This operation may: add new (non-mandatory) properties
+  // to describe an offer, change the values of some existing (not
+  // readonly) properties, or delete existing (neither mandatory nor
   // readonly) properties.
 
   // The modify operation either succeeds completely or it fails
   // completely. The offer is identified by the "id" parameter which
-  // was originally returned by export. ° If the string representation
+  // was originally returned by export. If the string representation
   // of "id" does not obey the rules for offer identifiers, then an
-  // IllegalOfferId exception is raised. ° If the "id" is legal but
+  // IllegalOfferId exception is raised. If the "id" is legal but
   // there is no offer within the trader with that "id," then an
-  // UnknownOfferId exception is raised. ° If the "id" identifies a
+  // UnknownOfferId exception is raised. If the "id" identifies a
   // proxy offer rather than an ordinary offer, then a ProxyOfferId
   // exception is raised.
 
   // The "del_list" parameter gives the names of the properties that
   // are no longer to be recorded for the identified offer. Future
-  // query and describe operations will not see these properties. ° If
+  // query and describe operations will not see these properties. If
   // any of the names within the "del_list" do not obey the rules for
   // PropertyName's, then an IllegalPropertyName exception is
-  // raised. ° If a "name" is legal but there is no property for the
+  // raised. If a "name" is legal but there is no property for the
   // offer with that "name," then an UnknownPropertyName exception is
-  // raised. ° If the list includes a property that has a mandatory
-  // mode, then the MandatoryProperty exception is raised. ° If the
+  // raised. If the list includes a property that has a mandatory
+  // mode, then the MandatoryProperty exception is raised. If the
   // same property name is included two or more times in this
   // parameter, the DuplicatePropertyName exception is raised.
 
@@ -404,17 +404,17 @@ public:
   // properties to be changed. If the property is not in the offer,
   // then the modify operation adds it. The modified (or added)
   // property values are returned in future query and describe
-  // operations in place of the original values. ° If any of the names
+  // operations in place of the original values. If any of the names
   // within the "modify_list" do not obey the rules for
   // PropertyName's, then an IllegalPropertyName exception is
-  // raised. ° If the list includes a property that has a readonly
+  // raised. If the list includes a property that has a readonly
   // mode, then the ReadonlyProperty exception is raised unless that
   // readonly property is not currently recorded for the offer. The
   // ReadonlyDynamicProperty exception is raised if an attempt is made
-  // to assign a dynamic property value to a readonly property. ° If
+  // to assign a dynamic property value to a readonly property. If
   // the value of any modified property is of a type that is not the
   // same as the type expected, then the PropertyTypeMismatch
-  // exception is raised. ° If two or more properties with the same
+  // exception is raised. If two or more properties with the same
   // property name are included in this argument, the
   // DuplicatePropertyName exception is raised.
 
@@ -434,16 +434,16 @@ public:
   // The "type" parameter conveys the required service type. Each
   // offer of the specified type will have the constraint expression
   // applied to it. If it matches the constraint expression, then the
-  // offer will be withdrawn.° If "type" does not obey the rules for
-  // service types, then an IllegalServiceType exception is raised. °
+  // offer will be withdrawn. If "type" does not obey the rules for
+  // service types, then an IllegalServiceType exception is raised.
   // If the "type" is correct syntactically but is not recognized as a
   // service type by the trader, then an UnknownServiceType exception
   // is raised.
 
   // The constraint "constr" is the means by which the client
   // restricts the set of offers to those that are intended for
-  // withdrawal. ° If "constr" does not obey the syntax rules for a
-  // constraint then an IllegalConstraint exception is raised. ° If
+  // withdrawal. If "constr" does not obey the syntax rules for a
+  // constraint then an IllegalConstraint exception is raised. If
   // the constraint fails to match with any offer of the specified
   // service type, then a NoMatchingOffers exception is raised.
   // END SPEC
@@ -456,13 +456,13 @@ public:
   // another trader. In particular, it is used when exporting to a
   // trader that is known by a name rather than by an object
   // reference. The client provides the name, which will be a sequence
-  // of name components. ° If the content of the parameter cannot
+  // of name components. If the content of the parameter cannot
   // yield legal syntax for the first component, then the
   // IllegalTraderName exception is raised. Otherwise, the first name
-  // component is compared against the name held in each link. ° If no
+  // component is compared against the name held in each link. If no
   // match is found, or the trader does not support links, the
   // UnknownTraderName exception is raised. Otherwise, the trader
-  // obtains the register_if held as part of the matched link. ° If
+  // obtains the register_if held as part of the matched link. If
   // the Register interface is not nil, then the trader binds to the
   // Register interface and invokes resolve but passes the TraderName
   // with the first component removed; if it is nil, then the
@@ -587,10 +587,10 @@ public:
   // offers are not returned via this operation. If the trader does
   // not support the Register interface, the NotImplemented exception
   // is raised. The returned identifiers are passed back in one of two
-  // ways (or a combination of both). ° The "ids" return result
+  // ways (or a combination of both). The "ids" return result
   // conveys a list of offer identifiers and the "id_itr" is a
   // reference to an interface at which additional offer identities
-  // can be obtained. ° The "how_many" parameter states how many
+  // can be obtained. The "how_many" parameter states how many
   // identifiers are to be returned via the "ids" result; any
   // remaining are available via the iterator interface. If the
   // "how_many" exceeds the number of offers held in the trader, then
@@ -705,9 +705,9 @@ public:
   // IllegalLinkName is raised. An UnknownLinkName exception is raised
   // if the named link is not found in the trader.
 
-  // The operation returns a LinkInfo structure comprising: ° the
-  // Lookup interface of the target trading service, ° the Register
-  // interface of the target trading service, and ° the default, as
+  // The operation returns a LinkInfo structure comprising: the
+  // Lookup interface of the target trading service, the Register
+  // interface of the target trading service, and the default, as
   // well as the limiting follow behavior of the named link.
 
   // If the target service does not support the Register interface,
diff --git a/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index f2316c9c9ed..75b59671a9f 100644
--- a/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -3,7 +3,7 @@
 #include "orbsvcs/Trader/Trader_Utils.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Trader, Trader_Utils, "$Id$")
+
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index 03fae65eb2f..6a539435f81 100644
--- a/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -261,14 +261,14 @@ public:
   // implementation of the trader. However, some names are
   // standardized where they effect the interpretation of other
   // parameters or where they may impact linking and federation of
-  // traders. ° If a policy name in this parameter does not obey the
+  // traders. If a policy name in this parameter does not obey the
   // syntactic rules for legal PolicyName's, then an IllegalPolicyName
-  // exception is raised. ° If the type of the value associated with a
+  // exception is raised. If the type of the value associated with a
   // policy differs from that specified in this specification, then a
-  // PolicyTypeMismatch exception is raised. ° If subsequent
+  // PolicyTypeMismatch exception is raised. If subsequent
   // processing of a PolicyValue yields any errors (e.g., the
   // starting_trader policy value is malformed), then an
-  // InvalidPolicyValue exception is raised. ° If the same policy name
+  // InvalidPolicyValue exception is raised. If the same policy name
   // is included two or more times in this parameter, then the
   // DuplicatePolicyName exception is raised.
   // END SPEC
diff --git a/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index 549179fdaef..00267cfddd7 100644
--- a/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -28,7 +28,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (Trader, Trading_Loader, "$Id$")
+
 
 TAO_Trading_Loader::TAO_Trading_Loader (void)
   : federate_ (0),
diff --git a/orbsvcs/orbsvcs/miop.idl b/orbsvcs/orbsvcs/miop.idl
index 5cb773a2cd5..5551037bbc9 100644
--- a/orbsvcs/orbsvcs/miop.idl
+++ b/orbsvcs/orbsvcs/miop.idl
@@ -1,20 +1,14 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO_PortableGroup
-//
-// = FILENAME
-//   miop.pidl
-//
-// = DESCRIPTION
-//
-//   This file contains MIOP packet and profile information from
-//   the MIOP specification.
-//
-// ================================================================
+//=============================================================================
+/**
+ *  @file   miop.idl
+ *
+ *  $Id$
+ *
+ * This file contains MIOP packet and profile information from
+ * the MIOP specification.
+ */
+//=============================================================================
+
 
 #ifndef MIOP_IDL
 #define MIOP_IDL
@@ -43,7 +37,7 @@ module MIOP
   typedef GIOP::Version Version;
 
   typedef string Address;
- 
+
   typedef sequence<IOP::TaggedComponent> Component_Seq;
   struct UIPMC_ProfileBody
   {
diff --git a/orbsvcs/orbsvcs/sfp.idl b/orbsvcs/orbsvcs/sfp.idl
index 0a8ab39b698..34b115a7633 100644
--- a/orbsvcs/orbsvcs/sfp.idl
+++ b/orbsvcs/orbsvcs/sfp.idl
@@ -10,6 +10,8 @@
 module flowProtocol
 {
   typedef CORBA::ULongSeq my_seq_ulong;
+  typedef char cmagic_nr[4];
+
   enum MsgType
   {
     // The MsgTypes Start and struct Start,StartReply and struct
@@ -34,7 +36,7 @@ module flowProtocol
 
   struct frameHeader
   {
-    char magic_number[4];
+    cmagic_nr magic_number;
     //    my_seq_char magic_number;
     // '=', 'S', 'F', 'P'
     octet flags;
@@ -48,7 +50,7 @@ module flowProtocol
   struct fragment
   {
     //    my_seq_char magic_number;
-    char magic_number[4];
+    cmagic_nr magic_number;
     // 'F', 'R', 'A', 'G'
     octet flags;
     // bit 1 = more fragments, %%bit 0 = byteorder
@@ -62,7 +64,7 @@ module flowProtocol
 
   struct Start
   {
-    char magic_number[4];
+    cmagic_nr magic_number;
     //    my_seq_char magic_number;
     // '=', 'S', 'T', 'A'
     octet major_version;
@@ -77,7 +79,7 @@ module flowProtocol
   struct StartReply
   {
     //    my_seq_char magic_number;
-    char magic_number[4];
+    cmagic_nr magic_number;
     // "=",'S','T','R'
     octet flags;
     // bit 0 = byte order, 1 = exception
@@ -114,7 +116,7 @@ module flowProtocol
   struct credit
   {
     //    my_seq_char magic_number;
-    char magic_number[4];
+    cmagic_nr magic_number;
     // "=",'C','R','E'
     unsigned long cred_num;
   };
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp b/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
index 88faddf22e0..2376ebf01d5 100644
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
+++ b/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
@@ -1,15 +1,9 @@
-#include "ORBInitializer.h"
+// $Id$
 
+#include "ORBInitializer.h"
 #include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
-
 #include "tao/ORB_Constants.h"
 
-
-ACE_RCSID (CPU_Loaded,
-           ORBInitializer,
-           "$Id$")
-
-
 ORBInitializer::ORBInitializer (void)
   : load_alert_ ()
 {
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp b/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
index 4ac4714e6a4..eb1cdae5378 100644
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
+++ b/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
@@ -1,14 +1,9 @@
-//
 // $Id$
-//
+
 #include "Roundtrip.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/ACE.h"
 
-ACE_RCSID(LoadBalancing,
-          Roundtrip,
-          "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     count_ (0)
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
index de5c83a8867..d9d70b561d6 100644
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
+++ b/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
@@ -10,10 +10,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(LoadBalancing,
-          client,
-          "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 100;
 int do_dump_history = 0;
@@ -66,7 +62,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
index fad24330e63..57ce03b9cae 100644
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
+++ b/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
@@ -66,7 +66,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml b/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml
index 5b2a58bb6f0..51612b28d17 100644
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml
+++ b/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml
@@ -5,6 +5,6 @@
  <!--  $Id$ -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am b/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am
deleted file mode 100644
index 9aa3215a760..00000000000
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        RPS
-
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
deleted file mode 100644
index 14a46fd1ac1..00000000000
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
+++ /dev/null
@@ -1,164 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.LoadBalancing_Performance_IDL.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LoadBalancing_Performance_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  ORBInitializer.h \
-  RPS_Monitor.h \
-  Roundtrip.h \
-  ServerRequestInterceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LoadBalancing_Performance_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  ORBInitializer.cpp \
-  RPS_Monitor.cpp \
-  Roundtrip.cpp \
-  ServerRequestInterceptor.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  ORBInitializer.h \
-  RPS_Monitor.h \
-  Roundtrip.h \
-  ServerRequestInterceptor.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
index 5c189e8c0af..64b74b48366 100644
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
+++ b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "ORBInitializer.h"
 #include "ServerRequestInterceptor.h"
 
@@ -6,10 +8,6 @@
 
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (LoadBalancing,
-           ORBInitializer,
-           "$Id$")
-
 ORBInitializer::ORBInitializer (void)
   : load_alert_ (),
     interceptor_ (0)
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
index 686a1545115..7e5fc2084e5 100644
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
+++ b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "RPS_Monitor.h"
 #include "ServerRequestInterceptor.h"
 #include "ace/UUID.h"
 #include "ace/OS_NS_sys_time.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (LoadBalancing,
-           RPS_Monitor,
-           "$Id$")
-
 RPS_Monitor::RPS_Monitor (ServerRequestInterceptor * interceptor)
   : location_ (1),
     interceptor_ (interceptor),
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
index abf3b4db251..7fba1a65442 100644
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
+++ b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
@@ -1,14 +1,9 @@
-//
 // $Id$
-//
+
 #include "Roundtrip.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/ACE.h"
 
-ACE_RCSID(LoadBalancing,
-          Roundtrip,
-          "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     count_ (0)
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
index fa7f88a1ce8..9acee119ccd 100644
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
+++ b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
@@ -1,8 +1,6 @@
-#include "ServerRequestInterceptor.h"
+// $Id$
 
-ACE_RCSID (LoadBalancing,
-           ServerRequestInterceptor,
-           "$Id$")
+#include "ServerRequestInterceptor.h"
 
 ServerRequestInterceptor::ServerRequestInterceptor (void)
   : request_count_ (0)
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
index 917377f31c8..5c026612150 100644
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
+++ b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
@@ -11,10 +11,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(LoadBalancing,
-          client,
-          "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 100;
 int do_dump_history = 0;
@@ -68,7 +64,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
index 1c9af24ed06..b63cdad8681 100644
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
+++ b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
@@ -12,10 +12,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID (LoadBalancing,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 CORBA::Float reject_threshold = 0;
@@ -68,7 +64,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -135,16 +131,16 @@ join_object_group (CORBA::ORB_ptr orb,
           strategy_info.name = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(strategy));
 
           if (ACE_OS::strcasecmp (strategy, ACE_TEXT("LeastLoaded")) == 0
-              && (reject_threshold != 0
-                  || critical_threshold != 0
-                  || dampening != 0))
+              && (!ACE::is_equal (reject_threshold, (CORBA::Float)0.0)
+                  || !ACE::is_equal (critical_threshold, (CORBA::Float)0.0)
+                  || !ACE::is_equal (dampening, (CORBA::Float)0.0)))
             {
               CORBA::ULong len = 1;
 
               PortableGroup::Properties & props =
                 strategy_info.props;
 
-              if (reject_threshold != 0)
+              if (!ACE::is_equal (reject_threshold, (CORBA::Float)0.0))
                 {
                   const CORBA::ULong i = len - 1;
 
@@ -156,7 +152,7 @@ join_object_group (CORBA::ORB_ptr orb,
                   props[i].val <<= reject_threshold;
                 }
 
-              if (critical_threshold != 0)
+              if (!ACE::is_equal (critical_threshold, (CORBA::Float)0.0))
                 {
                   const CORBA::ULong i = len - 1;
 
@@ -168,7 +164,7 @@ join_object_group (CORBA::ORB_ptr orb,
                   props[i].val <<= critical_threshold;
                 }
 
-              if (dampening != 0)
+              if (!ACE::is_equal (dampening, (CORBA::Float)0.0))
                 {
                   const CORBA::ULong i = len - 1;
 
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf
index 9e0c5ed01ed..40babaf2989 100644
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf
+++ b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf
@@ -2,5 +2,5 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml
index 5b2a58bb6f0..51612b28d17 100644
--- a/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml
+++ b/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml
@@ -5,6 +5,6 @@
  <!--  $Id$ -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/orbsvcs/performance-tests/LoadBalancing/Makefile.am b/orbsvcs/performance-tests/LoadBalancing/Makefile.am
deleted file mode 100644
index afd8e97163f..00000000000
--- a/orbsvcs/performance-tests/LoadBalancing/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        LBPerf
-
diff --git a/orbsvcs/performance-tests/Makefile.am b/orbsvcs/performance-tests/Makefile.am
deleted file mode 100644
index 15ab91dc242..00000000000
--- a/orbsvcs/performance-tests/Makefile.am
+++ /dev/null
@@ -1,14 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        LoadBalancing \
-        RTEvent
-
diff --git a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
deleted file mode 100644
index efd385b5a93..00000000000
--- a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Colocated_Roundtrip.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = driver
-
-driver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-driver_SOURCES = \
-  driver.cpp
-
-driver_LDFLAGS = \
-  -L../lib
-
-driver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
index 4843a18ed81..ae26fe26f32 100644
--- a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
+++ b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
@@ -30,7 +30,7 @@
 #include "ace/Basic_Stats.h"
 #include "ace/Barrier.h"
 
-ACE_RCSID(TAO_PERF_RTEC_Colocated_Roundtrip, driver, "$Id$")
+
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf
index 8cd51345cc5..0df0a724d88 100644
--- a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf
+++ b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null -ECDispatching reactive"
diff --git a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf
index d98222a2a0a..973cb68f1bd 100644
--- a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf
+++ b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf
@@ -1,3 +1,4 @@
 # $Id$
+
 static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping continuous"
 static EC_Factory "-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null -ECDispatching reactive"
diff --git a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf
index 502bc5cdb1e..12daa113142 100644
--- a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf
+++ b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null -ECDispatching mt -ECDispatchingThreads 2"
diff --git a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf
index 8cd51345cc5..0df0a724d88 100644
--- a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf
+++ b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null -ECDispatching reactive"
diff --git a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf
index 712b90b6074..8ace9f96217 100644
--- a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf
+++ b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter per-supplier -ECDispatching reactive"
diff --git a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf
index 49c7ad0b504..3555b71a80c 100644
--- a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf
+++ b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:copy_on_read:list -ECProxyPushSupplierCollection mt:copy_on_read:list -ECSupplierFilter null"
diff --git a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf
index 691efd9c506..ba9b436f095 100644
--- a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf
+++ b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null"
diff --git a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf
index f49ae54a94a..5fc2a1bdf34 100644
--- a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf
+++ b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECSupplierFilter null"
diff --git a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf
index 50aa86ff59a..8c2c15b50f9 100644
--- a/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf
+++ b/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECSupplierFilter null"
diff --git a/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am b/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
deleted file mode 100644
index 42b93750990..00000000000
--- a/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
+++ /dev/null
@@ -1,124 +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:
-## ../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.Federated_Roundtrip_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -I../lib
-
-client_SOURCES = \
-  client.cpp
-
-client_LDFLAGS = \
-  -L../lib
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Federated_Roundtrip_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -I../lib
-
-server_SOURCES = \
-  server.cpp
-
-server_LDFLAGS = \
-  -L../lib
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
index da435eb281a..e54ad32bcdf 100644
--- a/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
+++ b/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
@@ -28,7 +28,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/Barrier.h"
 
-ACE_RCSID(TAO_RTEC_PERF_Roundtrip, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 int nthreads   = 0;
@@ -120,7 +120,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf b/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf
index 7cc3d800820..cf44b51c14b 100644
--- a/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf
+++ b/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECObserver basic -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list"
diff --git a/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp b/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
index 6bd62249ff8..6a4e11c00f9 100644
--- a/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
+++ b/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
@@ -14,10 +14,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (TAO_PERF_RTEC_Federated_Roundtrip,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 int iterations = 10000;
 int nthreads   = 1;
@@ -72,7 +68,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/performance-tests/RTEvent/Makefile.am b/orbsvcs/performance-tests/RTEvent/Makefile.am
deleted file mode 100644
index c4a6b0c9764..00000000000
--- a/orbsvcs/performance-tests/RTEvent/Makefile.am
+++ /dev/null
@@ -1,19 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        lib \
-        TCP_Baseline \
-        Roundtrip \
-        RTCORBA_Callback \
-        RTCORBA_Baseline \
-        Federated_Roundtrip \
-        Colocated_Roundtrip
-
diff --git a/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
deleted file mode 100644
index 0dfdf83833e..00000000000
--- a/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
+++ /dev/null
@@ -1,169 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Baseline_IDL.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RTCORBA_Baseline_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDFLAGS = \
-  -L../lib
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RTCORBA_Baseline_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDFLAGS = \
-  -L../lib
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
index 538c0ed5471..d45fea1df25 100644
--- a/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
+++ b/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
@@ -1,13 +1,8 @@
-//
 // $Id$
-//
+
 #include "Roundtrip.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Baseline,
-           Roundtrip,
-           "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
   , gsf_ (ACE_High_Res_Timer::calibrate ())
diff --git a/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
index 91f36dea63a..5ae3ab1372e 100644
--- a/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
+++ b/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
@@ -20,10 +20,6 @@
 #include "ace/Barrier.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (TAO_RTEC_PERF_RTCORBA_Baseline,
-           client,
-           "$Id$")
-
 class Roundtrip_Task : public ACE_Task_Base
 {
 public:
diff --git a/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf b/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf
index 493ad253959..ccadb38d92a 100644
--- a/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf
+++ b/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct"
diff --git a/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp b/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
index 69ea18b3656..ec0709c89f3 100644
--- a/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
+++ b/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
@@ -14,10 +14,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (TAO_PERF_RTEC_RTCORBA_Baseline,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 int use_rt_corba = 0;
 int nthreads = 0;
@@ -54,7 +50,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp b/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
index 8ac7e2263f2..5aa0fa496d7 100644
--- a/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
+++ b/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
@@ -1,14 +1,9 @@
-//
 // $Id$
-//
+
 #include "Callback.h"
 #include "Implicit_Deactivator.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
-           Callback,
-           "$Id$")
-
 Callback::Callback (int iterations,
                     PortableServer::POA_ptr poa)
   : sample_history_ (iterations)
diff --git a/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
deleted file mode 100644
index aa3f6a2948c..00000000000
--- a/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
+++ /dev/null
@@ -1,173 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Callback_IDL.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RTCORBA_Callback_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-client_SOURCES = \
-  Callback.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Callback.h
-
-client_LDFLAGS = \
-  -L../lib
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RTCORBA_Callback_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-server_SOURCES = \
-  Session.cpp \
-  Session_Factory.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Session.h \
-  Session_Factory.h
-
-server_LDFLAGS = \
-  -L../lib
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp b/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
index 3bfa987de59..b4197076226 100644
--- a/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
+++ b/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
@@ -1,13 +1,8 @@
-//
 // $Id$
-//
+
 #include "Session.h"
 #include "Implicit_Deactivator.h"
 
-ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
-           Session,
-           "$Id$")
-
 Session::Session (Test::Callback_ptr cb,
                   PortableServer::POA_ptr poa)
   : cb_ (Test::Callback::_duplicate (cb))
diff --git a/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
index 20de05953e5..b661e16884b 100644
--- a/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
+++ b/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
@@ -1,14 +1,9 @@
-//
 // $Id$
-//
+
 #include "Session_Factory.h"
 #include "Session.h"
 #include "Servant_var.h"
 
-ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
-           Session_Factory,
-           "$Id$")
-
 Session_Factory::Session_Factory (CORBA::ORB_ptr orb,
                                   PortableServer::POA_ptr poa)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
index 21ba728121e..947b298cb46 100644
--- a/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
+++ b/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
@@ -26,10 +26,6 @@
 #include "ace/Barrier.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (TAO_PERF_RTEC_RTCORBA_Baseline,
-           client,
-           "$Id$")
-
 class Roundtrip_Task : public ACE_Task_Base
 {
 public:
diff --git a/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf b/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf
index 3a353fa3bf6..581511699c1 100644
--- a/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf
+++ b/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping continuous"
diff --git a/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp b/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
index 8ca08730ef7..2330cc8bf77 100644
--- a/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
+++ b/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
@@ -17,10 +17,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (TAO_PERF_RTEC_RTCORBA_Baseline,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 int use_rt_corba = 0;
 int nthreads = 0;
@@ -57,7 +53,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am b/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
deleted file mode 100644
index c8810abaa5c..00000000000
--- a/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
+++ /dev/null
@@ -1,122 +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:
-## ../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.Roundtrip_RTEvent_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-client_SOURCES = \
-  client.cpp
-
-client_LDFLAGS = \
-  -L../lib
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Roundtrip_RTEvent_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-server_SOURCES = \
-  server.cpp
-
-server_LDFLAGS = \
-  -L../lib
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
index bb3905eca7b..eb121a24cfb 100644
--- a/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
+++ b/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
@@ -27,7 +27,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/Barrier.h"
 
-ACE_RCSID(TAO_RTEC_PERF_Roundtrip, client, "$Id$")
+
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf
index 3c107d1ba17..f9a939fc386 100644
--- a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf
+++ b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECDispatching reactive"
diff --git a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf
index 3a353fa3bf6..581511699c1 100644
--- a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf
+++ b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping continuous"
diff --git a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf
index 3d04d8461d0..e89e706864a 100644
--- a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf
+++ b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECDispatching mt -ECDispatchingThreads 2"
diff --git a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf
index 49c7ad0b504..3555b71a80c 100644
--- a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf
+++ b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:copy_on_read:list -ECProxyPushSupplierCollection mt:copy_on_read:list -ECSupplierFilter null"
diff --git a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf
index 691efd9c506..ba9b436f095 100644
--- a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf
+++ b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null"
diff --git a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf
index f49ae54a94a..5fc2a1bdf34 100644
--- a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf
+++ b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECSupplierFilter null"
diff --git a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf
index 50aa86ff59a..8c2c15b50f9 100644
--- a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf
+++ b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECSupplierFilter null"
diff --git a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf
index b187ff3ed6b..565f60fc1e3 100644
--- a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf
+++ b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECSupplierFilter null"
diff --git a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf
index e578b42e926..4228e17fdae 100644
--- a/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf
+++ b/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECSupplierFilter per-supplier"
diff --git a/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf b/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf
index b0e36ffb28b..de0654c551d 100644
--- a/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf
+++ b/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list"
diff --git a/orbsvcs/performance-tests/RTEvent/Roundtrip/run_dispatching.sh b/orbsvcs/performance-tests/RTEvent/Roundtrip/run_dispatching.sh
index 4414a4ebf64..26156eb862c 100755
--- a/orbsvcs/performance-tests/RTEvent/Roundtrip/run_dispatching.sh
+++ b/orbsvcs/performance-tests/RTEvent/Roundtrip/run_dispatching.sh
@@ -12,7 +12,7 @@ IOR=test.ior
 for c in $LOW_PRIORITY; do
 #   date
 #   echo reactive $c
-# 
+#
 #   /bin/rm -f $IOR
 #   ssh celegorm "cd /project/celegorm/coryan/EC_Roundtrip ; ./server -ORBSvcConf ec.dispatching_reactive.conf -o $IOR" >server.log 2>&1 </dev/null &
 #   while [ ! -f $IOR ]; do
@@ -20,10 +20,10 @@ for c in $LOW_PRIORITY; do
 #   done
 #   ./client -d -h 1000 -l 2000 -i 500 -n $c -k file://$IOR > ec_dispatching_reactive.$c.txt 2>&1
 #   wait
-# 
+#
 #   date
 #   echo threaded $c
-# 
+#
 #   /bin/rm -f $IOR
 #   ssh celegorm "cd /project/celegorm/coryan/EC_Roundtrip ; ./server -ORBSvcConf ec.dispatching_threaded.conf -o $IOR" >server.log 2>&1 </dev/null &
 #   while [ ! -f $IOR ]; do
diff --git a/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
index 1c7b871c3fb..22f9e9ac5fb 100644
--- a/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
+++ b/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
@@ -19,10 +19,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (TAO_PERF_RTEC_Roundtrip,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 int use_rt_corba = 0;
 int nthreads = 0;
@@ -59,7 +55,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am b/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
deleted file mode 100644
index ad9acd52f05..00000000000
--- a/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
+++ /dev/null
@@ -1,122 +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:
-## ../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.TCP_Baseline_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-client_SOURCES = \
-  client.cpp
-
-client_LDFLAGS = \
-  -L../lib
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.TCP_Baseline_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-server_SOURCES = \
-  server.cpp
-
-server_LDFLAGS = \
-  -L../lib
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp b/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
index a76fc1f6064..d868c001b7c 100644
--- a/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
+++ b/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
@@ -15,10 +15,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/orbconf.h"
 
-ACE_RCSID (TAO_RTEC_PERF_TCP_Baseline,
-           client,
-           "$Id$")
-
 ACE_TCHAR const *hi_endpoint = ACE_TEXT ("localhost:12345");
 ACE_TCHAR const *lo_endpoint = ACE_TEXT ("localhost:23456");
 
@@ -314,6 +310,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                          argv [0]),
                         1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp b/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
index d2ec3272b97..8fe531f77bb 100644
--- a/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
+++ b/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
@@ -11,10 +11,6 @@
 #include "ace/TP_Reactor.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (TAO_PERF_RTEC_TCP_Baseline,
-           server,
-           "$Id$")
-
 int use_rt   = 0;
 int nthreads = 1;
 ACE_TCHAR const * hi_endpoint = ACE_TEXT ("localhost:12345");
@@ -198,6 +194,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp b/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
index 402c9187779..957979b3786 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
@@ -13,10 +13,6 @@
 #include "Client_Group.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC,
-           Client_Group,
-           "$Id$")
-
 void
 Client_Group::init (CORBA::Long experiment_id,
                     CORBA::Long base_event_type,
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp b/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp
index 1e78be0907e..29b268be8ba 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp
@@ -9,11 +9,6 @@
 #include "Client_Options.h"
 
 #include "ace/Log_Msg.h"
-#include "ace/OS.h"
-
-ACE_RCSID (TAO_PERF_RTEC,
-           Client_Options,
-           "$Id$")
 
 Client_Options::Client_Options (int &argc, ACE_TCHAR *argv[])
   : ior (ACE_TEXT("file://test.ior"))
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp b/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
index d2c71bd2cb9..f0762588e6f 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
@@ -13,10 +13,6 @@
 #include "Client_Pair.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC,
-           Client_Pair,
-           "$Id$")
-
 void
 Client_Pair::init (CORBA::Long experiment_id,
                    CORBA::Long base_event_type,
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
index 9045c8ee020..6d588f69a1c 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
@@ -11,10 +11,6 @@
 #include "orbsvcs/Event_Service_Constants.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (TAO_PERF_RTEC,
-           Consumer,
-           "$Id$")
-
 Consumer::Consumer (CORBA::Long experiment_id,
                     CORBA::Long event_type,
                     CORBA::ULong iterations,
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
index 189ae8297ee..804089b2a68 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
@@ -18,10 +18,6 @@
 #include "ace/Basic_Stats.h"
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (TAO_RTEC_Perf,
-           Control,
-           "$Id$")
-
 Control::Control (size_t peers_expected,
                   size_t iterations,
                   int do_dump_history,
@@ -118,22 +114,18 @@ Control::join (Federated_Test::Peer_ptr peer)
                 this->peers_[j]->setup_loopback (experiment_id,
                                                  base_event_type);
 
-              ACE_AUTO_PTR_RESET (disconnects[lcount],
+              ACE_auto_ptr_reset (disconnects[lcount],
                                   new Loopback_Disconnect (
-                                        loopbacks[lcount].in ()),
-                                  Loopback_Disconnect
-                                 );
+                                        loopbacks[lcount].in ()));
               lcount++;
 
               loopbacks[lcount] =
                 this->peers_[j]->setup_loopback (experiment_id,
                                                  base_event_type + 2);
 
-              ACE_AUTO_PTR_RESET (disconnects[lcount],
+              ACE_auto_ptr_reset (disconnects[lcount],
                                   new Loopback_Disconnect (
-                                        loopbacks[lcount].in ()),
-                                  Loopback_Disconnect
-                                 );
+                                        loopbacks[lcount].in ()));
               lcount++;
             }
         }
diff --git a/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp b/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
index 6657f5294fd..78ee7c5fa8d 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
@@ -12,10 +12,6 @@
 #include "EC_Destroyer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC,
-           EC_Destroyer,
-           "$Id$")
-
 EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec)
   :  ec_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec))
 {
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
index c97cc03f939..ce11922f158 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
@@ -10,10 +10,6 @@
 #include "Auto_Disconnect.h"
 #include "Implicit_Deactivator.h"
 
-ACE_RCSID (TAO_RTEC_Perf,
-           Loopback,
-           "$Id$")
-
 Loopback::Loopback (CORBA::Long experiment_id,
                     CORBA::Long base_event_type,
                     PortableServer::POA_ptr supplier_poa,
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
index 2fd3d0911e3..49b85e70d32 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
@@ -10,10 +10,6 @@
 #include "Implicit_Deactivator.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-ACE_RCSID (PERF_RTEC,
-           Loopback_Consumer,
-           "$Id$")
-
 Loopback_Consumer::
 Loopback_Consumer (CORBA::Long experiment_id,
                    CORBA::Long event_type,
@@ -21,7 +17,7 @@ Loopback_Consumer (CORBA::Long experiment_id,
                    PortableServer::POA_ptr poa)
   : experiment_id_ (experiment_id)
   , event_type_ (event_type)
-  , supplier_ (TAO::Utils::Servant_Var<Loopback_Supplier>::_duplicate (supplier))
+  , supplier_ (PortableServer::Servant_var<Loopback_Supplier>::_duplicate (supplier))
   , default_POA_ (PortableServer::POA::_duplicate (poa))
 {
 }
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
index 4d7f1fd1ec9..5751b666e80 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
+++ b/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
@@ -9,7 +9,6 @@
 #define TAO_PERF_RTEC_LOOPBACK_CONSUMER_H
 
 #include "Loopback_Supplier.h"
-#include "tao/Utils/Servant_Var.h"
 #include "orbsvcs/RtecEventCommS.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
@@ -59,7 +58,7 @@ private:
   CORBA::Long event_type_;
 
   /// The supplier used to close the loopback
-  TAO::Utils::Servant_Var<Loopback_Supplier> supplier_;
+  PortableServer::Servant_var<Loopback_Supplier> supplier_;
 
   /// The proxy this object is connected to
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier_;
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp b/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
index cde25535480..96cb7b8f762 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
@@ -13,10 +13,6 @@
 #include "Loopback_Pair.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC,
-           Loopback_Pair,
-           "$Id$")
-
 void
 Loopback_Pair::init (CORBA::Long experiment_id,
                      CORBA::Long base_event_type,
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
index 02a00e848fa..4e9560dd25b 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
@@ -9,10 +9,6 @@
 #include "Loopback_Supplier.h"
 #include "Implicit_Deactivator.h"
 
-ACE_RCSID (TAO_PERF_RTEC,
-           Loopback_Supplier,
-           "$Id$")
-
 Loopback_Supplier::Loopback_Supplier (CORBA::Long experiment_id,
                                       CORBA::Long response_type,
                                       PortableServer::POA_ptr poa)
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp b/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
index 4ca093c4c0d..187c085031a 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
@@ -77,11 +77,10 @@ Low_Priority_Setup (int consumer_count,
                             this->clients_[j].supplier (),
                             barrier);
       this->tasks_[j].thr_mgr (&this->thr_mgr_);
-      ACE_AUTO_PTR_RESET (this->stoppers_[j],
+      ACE_auto_ptr_reset (this->stoppers_[j],
                           new Send_Task_Stopper (thread_priority,
                                                  thread_sched_class,
-                                                 &this->tasks_[j]),
-                          Send_Task_Stopper);
+                                                 &this->tasks_[j]));
     }
 }
 
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Makefile.am b/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
deleted file mode 100644
index bafd6a7a54e..00000000000
--- a/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
+++ /dev/null
@@ -1,172 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RTEC_Perf.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  Federated_TestC.cpp \
-  Federated_TestC.h \
-  Federated_TestC.inl \
-  Federated_TestS.cpp \
-  Federated_TestS.h \
-  Federated_TestS.inl
-
-CLEANFILES = \
-  Federated_Test-stamp \
-  Federated_TestC.cpp \
-  Federated_TestC.h \
-  Federated_TestC.inl \
-  Federated_TestS.cpp \
-  Federated_TestS.h \
-  Federated_TestS.inl
-
-Federated_TestC.cpp Federated_TestC.h Federated_TestC.inl Federated_TestS.cpp Federated_TestS.h Federated_TestS.inl: Federated_Test-stamp
-
-Federated_Test-stamp: $(srcdir)/Federated_Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h $(srcdir)/Federated_Test.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libTAO_RTEC_Perf.la
-
-libTAO_RTEC_Perf_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_RTEC_PERF_BUILD_DLL
-
-libTAO_RTEC_Perf_la_SOURCES = \
-  Client_Group.cpp \
-  Client_Options.cpp \
-  Client_Pair.cpp \
-  Consumer.cpp \
-  Control.cpp \
-  EC_Destroyer.cpp \
-  Federated_TestC.cpp \
-  Federated_TestS.cpp \
-  Implicit_Deactivator.cpp \
-  Loopback.cpp \
-  Loopback_Consumer.cpp \
-  Loopback_Pair.cpp \
-  Loopback_Supplier.cpp \
-  ORB_Holder.cpp \
-  ORB_Shutdown.cpp \
-  ORB_Task.cpp \
-  ORB_Task_Activator.cpp \
-  Peer_Base.cpp \
-  PriorityBand_Setup.cpp \
-  RTCORBA_Setup.cpp \
-  RTClient_Setup.cpp \
-  RTEC_Initializer.cpp \
-  RTPOA_Setup.cpp \
-  RTServer_Setup.cpp \
-  RT_Class.cpp \
-  Send_Task.cpp \
-  Send_Task_Stopper.cpp \
-  Supplier.cpp \
-  SyncScope_Setup.cpp
-
-noinst_HEADERS = \
-  Auto_Disconnect.cpp \
-  Auto_Disconnect.h \
-  Auto_Disconnect.inl \
-  Client_Group.h \
-  Client_Group.inl \
-  Client_Options.h \
-  Client_Pair.h \
-  Client_Pair.inl \
-  Consumer.h \
-  Control.h \
-  EC_Destroyer.h \
-  EC_Destroyer.inl \
-  Federated_Test.idl \
-  Federated_TestC.h \
-  Federated_TestC.inl \
-  Federated_TestS.h \
-  Federated_TestS.inl \
-  Implicit_Deactivator.h \
-  Implicit_Deactivator.inl \
-  Loopback.h \
-  Loopback_Consumer.h \
-  Loopback_Pair.h \
-  Loopback_Pair.inl \
-  Loopback_Supplier.h \
-  Low_Priority_Setup.cpp \
-  Low_Priority_Setup.h \
-  Low_Priority_Setup.inl \
-  ORB_Holder.h \
-  ORB_Holder.inl \
-  ORB_Shutdown.h \
-  ORB_Shutdown.inl \
-  ORB_Task.h \
-  ORB_Task.inl \
-  ORB_Task_Activator.h \
-  ORB_Task_Activator.inl \
-  Peer_Base.h \
-  PriorityBand_Setup.h \
-  PriorityBand_Setup.inl \
-  RIR_Narrow.cpp \
-  RIR_Narrow.h \
-  RTCORBA_Setup.h \
-  RTCORBA_Setup.inl \
-  RTClient_Setup.h \
-  RTClient_Setup.inl \
-  RTEC_Initializer.h \
-  RTPOA_Setup.h \
-  RTPOA_Setup.inl \
-  RTServer_Setup.h \
-  RTServer_Setup.inl \
-  RT_Class.h \
-  RT_Class.inl \
-  Send_Task.h \
-  Send_Task_Stopper.h \
-  Send_Task_Stopper.inl \
-  Servant_var.cpp \
-  Servant_var.h \
-  Servant_var.inl \
-  Shutdown.cpp \
-  Shutdown.h \
-  Shutdown.inl \
-  Supplier.h \
-  SyncScope_Setup.h \
-  SyncScope_Setup.inl \
-  Task_Activator.cpp \
-  Task_Activator.h \
-  Task_Activator.inl \
-  rtec_perf_export.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp b/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
index 9150dbcf94c..ed37ad358a2 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
@@ -12,10 +12,6 @@
 #include "ORB_Holder.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC,
-           ORB_Holder,
-           "$Id$")
-
 ORB_Holder::ORB_Holder (int &argc, ACE_TCHAR *argv[],
                         const char *orb_id)
   :  orb_ (CORBA::ORB_init (argc, argv, orb_id))
diff --git a/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp b/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp
index 2071b0a718e..820e0ec31fa 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp
@@ -11,6 +11,3 @@
 #include "ORB_Shutdown.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           ORB_Shutdown, 
-           "$Id$")
diff --git a/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp b/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
index 4723f9ae360..920f5c3fcb1 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
@@ -12,10 +12,6 @@
 #include "ORB_Task.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC,
-           ORB_Task,
-           "$Id$")
-
 ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp b/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
index d4e996064cd..2a130c4e3a9 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
@@ -12,10 +12,6 @@
 #include "ORB_Task_Activator.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC,
-           ORB_Task_Activator,
-           "$Id$")
-
 ORB_Task_Activator::~ORB_Task_Activator (void)
 {
   if (this->task_ == 0)
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
index 4ca0fac10f4..8aeefc70de5 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
@@ -18,10 +18,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Gateway_IIOP.h"
 
-ACE_RCSID (TAO_RTEC_Perf,
-           Peer_Base,
-           "$Id$")
-
 Peer_Base::Peer_Base (CORBA::ORB_ptr orb,
                       RTServer_Setup &rtserver_setup)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
index cb603af9459..87fb9af468f 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
@@ -15,10 +15,6 @@
 #include "PriorityBand_Setup.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC,
-           PriorityBand_Setup,
-           "$Id$")
-
 PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb,
                                         const RTCORBA_Setup &rtcorba_setup)
 {
diff --git a/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp b/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
index 357e58b3856..3228ad46f8c 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
@@ -31,7 +31,7 @@ RIR_Narrow<Interface>::resolve (CORBA::ORB_ptr orb,
       if (CORBA::is_nil (intface.in ()))
         {
           ACE_ERROR ((LM_ERROR,
-                      "Panic - error while narrowing <%s>\n",
+                      "Panic - error while narrowing <%C>\n",
                       object_id));
           ACE_OS::exit (1);
         }
diff --git a/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp b/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
index 6c49ea4b684..3c4f495bb3a 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
@@ -16,10 +16,6 @@
 #include "RTCORBA_Setup.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC,
-           RTCORBA_Setup,
-           "$Id$")
-
 RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb,
                               const RT_Class &rtclass,
                               int nthreads)
diff --git a/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
index a9bc97712f4..83ebbe83f19 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
@@ -16,10 +16,6 @@
 #include "RTClient_Setup.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC,
-           RTClient_Setup,
-           "$Id$")
-
 RTClient_Setup::RTClient_Setup (int use_rt_corba,
                                 CORBA::ORB_ptr orb,
                                 const RT_Class &rt_class,
@@ -30,19 +26,15 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba,
 
   if (use_rt_corba)
     {
-      ACE_AUTO_PTR_RESET (this->rtcorba_setup_,
+      ACE_auto_ptr_reset (this->rtcorba_setup_,
                           new RTCORBA_Setup (orb,
                                              rt_class,
-                                             nthreads),
-                          RTCORBA_Setup
-                         );
+                                             nthreads));
 
 #if 0
-      ACE_AUTO_PTR_RESET (this->priorityband_setup_,
+      ACE_auto_ptr_reset (this->priorityband_setup_,
                           new PriorityBand_Setup (orb,
-                                                  *this->rtcorba_setup_),
-                          PriorityBand_Setup
-                         );
+                                                  *this->rtcorba_setup_));
 
 #endif /* 0 */
     }
diff --git a/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
index 6b843e524bf..53f0bdce60b 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
@@ -15,10 +15,6 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (TAO_PERF_RTEC,
-           RTEC_Initializer,
-           "$Id$")
-
 TAO_EC_Event_Channel *
 RTEC_Initializer::create (PortableServer::POA_ptr consumer_poa,
                           PortableServer::POA_ptr supplier_poa,
diff --git a/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp b/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
index 985b07682cf..a43595cff10 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
@@ -17,10 +17,6 @@
 #include "RTPOA_Setup.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC,
-           RTPOA_Setup,
-           "$Id$")
-
 RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb,
                           const RTCORBA_Setup &rtcorba_setup)
 {
diff --git a/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp b/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
index 1ea7d0eee78..c02073eb0b8 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
@@ -16,10 +16,6 @@
 #include "RTServer_Setup.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC,
-           RTServer_Setup,
-           "$Id$")
-
 RTServer_Setup::RTServer_Setup (int use_rt_corba,
                                 CORBA::ORB_ptr orb,
                                 const RT_Class &rt_class,
@@ -32,11 +28,9 @@ RTServer_Setup::RTServer_Setup (int use_rt_corba,
 
   if (use_rt_corba)
     {
-      ACE_AUTO_PTR_RESET (this->rtpoa_setup_,
+      ACE_auto_ptr_reset (this->rtpoa_setup_,
                           new RTPOA_Setup (orb,
-                                           *this->rtcorba_setup ()),
-                          RTPOA_Setup
-                         );
+                                           *this->rtcorba_setup ()));
 
       this->poa_ =
         this->rtpoa_setup_->poa ();
diff --git a/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp b/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp
index 65abada52e8..81f33b8e8ad 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/RT_Class.cpp
@@ -15,10 +15,6 @@
 #include "RT_Class.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           RT_Class, 
-           "$Id$")
-
 RT_Class::RT_Class (void)
   : prc_sched_class_ (ACE_SCHED_FIFO)
   , thr_sched_class_ (THR_SCHED_FIFO)
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
index ef58db60e53..2c43bc84650 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
@@ -13,10 +13,6 @@
 #include "ace/Barrier.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (TAO_PERF_RTEC,
-           Send_Task,
-           "$Id$")
-
 Send_Task::Send_Task (void)
   : iterations_ (0)
   , period_in_usecs_ (0)
@@ -43,7 +39,7 @@ Send_Task::init (int iterations,
   this->event_type_ = event_type;
   this->event_source_ = event_source;
   this->supplier_ =
-    TAO::Utils::Servant_Var<Supplier>::_duplicate (supplier);
+    PortableServer::Servant_var<Supplier>::_duplicate (supplier);
   this->barrier_ = barrier;
 }
 
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h b/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
index 318bb24e2aa..289f94d4569 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
+++ b/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
@@ -9,7 +9,6 @@
 #ifndef TAO_PERF_RTEC_SEND_TASK_H
 #define TAO_PERF_RTEC_SEND_TASK_H
 
-#include "tao/Utils/Servant_Var.h"
 #include "Supplier.h"
 #include "ace/Task.h"
 #include "ace/Synch_Traits.h"
@@ -34,9 +33,9 @@ public:
   /// Constructor
   Send_Task (void);
 
-  /// This is for compilers that are a PITA complaining that we are 
-  /// hiding something. 
-  virtual int init (int argc, ACE_TCHAR *argv[]) 
+  /// This is for compilers that are a PITA complaining that we are
+  /// hiding something.
+  virtual int init (int argc, ACE_TCHAR *argv[])
   {
     return ACE_Task_Base::init (argc, argv);
   }
@@ -66,7 +65,7 @@ private:
 
   int event_source_;
 
-  TAO::Utils::Servant_Var<Supplier> supplier_;
+  PortableServer::Servant_var<Supplier> supplier_;
 
   ACE_Barrier *barrier_;
 
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp b/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
index 6b8779e632e..c27da909e78 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
@@ -12,10 +12,6 @@
 #include "Send_Task_Stopper.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC,
-           Send_Task_Stopper,
-           "$Id$")
-
 Send_Task_Stopper::~Send_Task_Stopper (void)
 {
   if (this->task_ == 0)
diff --git a/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
index 4763b3abcd1..cdb96845dd8 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
@@ -9,10 +9,6 @@
 #include "Supplier.h"
 #include "Implicit_Deactivator.h"
 
-ACE_RCSID (TAO_PERF_RTEC,
-           Supplier,
-           "$Id$")
-
 Supplier::Supplier (CORBA::Long experiment_id,
                     CORBA::Long event_type,
                     CORBA::Long event_range,
diff --git a/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
index 7ef6f47af0b..0bcb54cf650 100644
--- a/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
+++ b/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
@@ -14,10 +14,6 @@
 #include "SyncScope_Setup.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC,
-           SyncScope_Setup,
-           "$Id$")
-
 SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb,
                                   Messaging::SyncScope value)
 {
diff --git a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
index c0e7641448b..a4b5d883089 100644
--- a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
+++ b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
@@ -1,22 +1,19 @@
-//$Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage
-//
-// = FILENAME
-//    Connection_Manager.h
-//
-// = DESCRIPTION
-//    This is a helper class that allows the senders bind to multiple
-//    receivers and receivers to bind to senders. It also lets the
-//    senders and receivers disconnect streams.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Connection_Manager.h
+ *
+ *  $Id$
+ *
+ *  This is a helper class that allows the senders bind to multiple
+ *  receivers and receivers to bind to senders. It also lets the
+ *  senders and receivers disconnect streams.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
@@ -30,51 +27,53 @@ class Endpoint_Addresses
   ACE_CString receiver_addr;
 };
 
+/**
+ * @class Connection_Manager
+ *
+ * @brief Defines the Connection Manager.
+ *
+ * This is a helper class that allows the senders bind to
+ * multiple receivers and receivers to bind to senders. It also
+ * lets the senders and receivers disconnect streams.
+ */
 class Connection_Manager
 {
-  // = TITLE
-  //    Defines the Connection Manager.
-  //
-  // = DESCRIPTION
-  //    This is a helper class that allows the senders bind to
-  //    multiple receivers and receivers to bind to senders. It also
-  //    lets the senders and receivers disconnect streams.
 public:
 
+  /// Constructor
   Connection_Manager (void);
-  // Constructor
 
+  /// Destructor
   ~Connection_Manager (void);
-  // Destructor
 
+  /// Initialize this class.
   int init (CORBA::ORB_ptr orb);
-  // Initialize this class.
 
+  /// Method that binds the sender to the Naming Service and retreives
+  /// the references of any registered receivers.
   void bind_to_receivers (const ACE_CString &sender_name,
                           AVStreams::MMDevice_ptr sender);
-  // Method that binds the sender to the Naming Service and retreives
-  // the references of any registered receivers.
 
+  /// Connect to the receivers that we found.
   void connect_to_receivers (AVStreams::MMDevice_ptr sender);
-  // Connect to the receivers that we found.
 
+  /// Bind receiver to the sender.
   void bind_to_sender (const ACE_CString &sender_name,
                        const ACE_CString &receiver_name,
                        AVStreams::MMDevice_ptr receiver);
-  // Bind receiver to the sender.
 
+  /// Connect to the sender that we found.
   void connect_to_sender (void);
-  // Connect to the sender that we found.
 
+  /// Destroy all streams.
   void destroy (void);
-  // Destroy all streams.
 
+  /// Destroy streams associated with <flowname>.
   void destroy (const ACE_CString &flowname);
-  // Destroy streams associated with <flowname>.
 
+  /// Add new streamctrl.
   void add_streamctrl (const ACE_CString &flowname,
                        TAO_StreamEndPoint *endpoint);
-  // Add new streamctrl.
 
   // Map of receivers.
   typedef ACE_Hash_Map_Manager<ACE_CString,
@@ -117,8 +116,8 @@ protected:
 
   void add_to_receivers (CosNaming::BindingList &binding_list);
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
   // The maps.
   Receivers receivers_;
diff --git a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
deleted file mode 100644
index 0bfe196d9ba..00000000000
--- a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
+++ /dev/null
@@ -1,129 +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:
-## ../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.AVS_Asynch_Three_Stage_Dist.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += distributer
-
-distributer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-distributer_SOURCES = \
-  Connection_Manager.cpp \
-  distributer.cpp \
-  Connection_Manager.h \
-  distributer.h
-
-distributer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Asynch_Three_Stage_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  Connection_Manager.cpp \
-  receiver.cpp \
-  Connection_Manager.h \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Asynch_Three_Stage_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  Connection_Manager.cpp \
-  sender.cpp \
-  Connection_Manager.h \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
index 0c87366090b..2f175688b15 100644
--- a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
+++ b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
@@ -1,39 +1,38 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage
-//
-// = FILENAME
-//    distributer.h
-//
-// = DESCRIPTION
-//    Process to receive data from the sender and send it to the
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    distributer.h
+ *
+ *  $Id$
+ *
+ *  Process to receive data from the sender and send it to the
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Connection_Manager.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Policy.h"
 
+/**
+ * @class Distributer_Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Distributer_Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Distributer_Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -46,45 +45,50 @@ public:
   int handle_destroy (void);
 
 private:
+  /// Count of the frames passing through us.
   int frame_count_;
-  // Count of the frames passing through us.
 };
 
+/**
+ * @class Distributer_Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Distributer_Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// Receiver application callback.
   Distributer_Receiver_Callback callback_;
-  // Receiver application callback.
 };
 
+/**
+ * @class Distributer_Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Distributer_Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -99,58 +103,60 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_B
            AV_Null_MediaCtrl>
         RECEIVER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Distributer
+ *
+ * @brief Distributer Application.
+ *
+ * The distributer is the intermediate receiver that receives
+ * data from the sender and forwards to a receiver.
+ */
 class Distributer
 {
-  // = TITLE
-  //    Distributer Application.
-  //
-  // = DESCRIPTION
-  //    The distributer is the intermediate receiver that receives
-  //    data from the sender and forwards to a receiver.
 public:
+  /// Constructor
   Distributer (void);
-  // Constructor
 
+  /// Destructor.
   ~Distributer (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize data components.
 
+  /// Parse args.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parse args.
 
   // Flag to know when we are done.
   int done (void) const;
   void done (int);
 
+  /// Accessor to connection manager.
   Connection_Manager &connection_manager (void);
-  // Accessor to connection manager.
 
 protected:
+  /// Connection manager.
   Connection_Manager connection_manager_;
-  // Connection manager.
 
+  /// The sender endpoint strategy.
   SENDER_ENDPOINT_STRATEGY sender_endpoint_strategy_;
-  // The sender endpoint strategy.
 
+  /// The receiver endpoint strategy.
   RECEIVER_ENDPOINT_STRATEGY receiver_endpoint_strategy_;
-  // The receiver endpoint strategy.
 
+  /// The distributer receiver multimedia device
   TAO_MMDevice* distributer_receiver_mmdevice_;
-  // The distributer receiver multimedia device
 
+  /// The distributer receiver multimedia device
   TAO_MMDevice* distributer_sender_mmdevice_;
-  // The distributer receiver multimedia device
 
+  /// The name of the sender to connect to.
   ACE_CString sender_name_;
-  // The name of the sender to connect to.
 
+  /// Our name.
   ACE_CString distributer_name_;
-  // Our name.
 
+  /// Flag to know when we are done.
   int done_;
-  // Flag to know when we are done.
 
   ACE_TString addr_file_;
 };
diff --git a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
index c19fc47ea40..9b0d3bca61d 100644
--- a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
+++ b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
@@ -1,39 +1,38 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Connection_Manager.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Policy.h"
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -46,76 +45,80 @@ public:
   int handle_destroy (void);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// Receiver application callback.
   Receiver_Callback callback_;
-  // Receiver application callback.
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  /// Constructor
   Receiver (void);
-  // Constructor
 
+  /// Destructor.
   ~Receiver (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize data components.
 
+  /// Parse args.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parse args.
 
+  /// Name of the output file.
   ACE_TString output_file_name (void);
-  // Name of the output file.
 
 protected:
+  /// Connection manager.
   Connection_Manager connection_manager_;
-  // Connection manager.
 
+  /// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reactive strategy.
 
+  /// The receiver MMDevice.
   AVStreams::MMDevice_var mmdevice_obj_;
-  // The receiver MMDevice.
 
+  /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  // Receiver MMDevice.
 
+  /// The sender MMDevice
   AVStreams::MMDevice_var sender_mmdevice_;
-  // The sender MMDevice
 
+  /// File name of the file into which received data is written.
   ACE_TString output_file_name_;
-  // File name of the file into which received data is written.
 
   ACE_TString addr_file_;
 
+  /// Sender name.
   ACE_CString sender_name_;
-  // Sender name.
 
+  /// Receiver name.
   ACE_CString receiver_name_;
-  // Receiver name.
 };
diff --git a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
index 7b620447411..2969753c16c 100755
--- a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
@@ -66,25 +66,25 @@ if ($sv1->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV = $sv->CreateProcess ("sender", 
+$SV = $sv->CreateProcess ("sender",
                           " -ORBInitRef NameService=file://$sv_nsiorfile ".
                           "-s sender -r 10 ".
                           "-f $sv_inputfile");
-$SV1 = $sv1->CreateProcess ("sender", 
+$SV1 = $sv1->CreateProcess ("sender",
                             " -ORBInitRef NameService=file://$sv1_nsiorfile ".
                             "-s sender -r 10 ".
                             "-f $sv1_inputfile");
-$RE1 = $re1->CreateProcess ("receiver", 
+$RE1 = $re1->CreateProcess ("receiver",
                             " -ORBInitRef NameService=file://$re1_nsiorfile ".
                             "-s distributer -r receiver1 ".
                             "-f $re1_outputfile1");
-$RE2 = $re2->CreateProcess ("receiver", 
+$RE2 = $re2->CreateProcess ("receiver",
                             " -ORBInitRef NameService=file://$re2_nsiorfile ".
                             "-s distributer -r receiver2 ".
                             "-f $re2_outputfile2");
-$DI = $di->CreateProcess ("distributer", 
+$DI = $di->CreateProcess ("distributer",
                           " -ORBInitRef NameService=file://$di_nsiorfile ".
                           "-s sender -r distributer ");
 
diff --git a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
index 979a4f00fd1..9e439b9736d 100644
--- a/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
+++ b/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
@@ -1,46 +1,46 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Connection_Manager.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -49,58 +49,60 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  // = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  /// Constructor
   Sender (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR **argv);
-  // Method to initialize the various data components.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// Accessor to the connection manager.
   Connection_Manager &connection_manager (void);
-  // Accessor to the connection manager.
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR **argv);
-  // Method to parse the command line arguments.
 
+  /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  // The endpoint strategy used by the sender.
 
+  /// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_TString filename_;
-  // File from which data is read.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// File from which data is read.
   ACE_TString addr_file_;
-  // File from which data is read.
 
+  /// Rate at which the data will be sent.
   double frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
+  /// Name of this sender.
   ACE_TString sender_name_;
-  // Name of this sender.
 
   // Connection manager.
   Connection_Manager connection_manager_;
diff --git a/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
deleted file mode 100644
index 4478a21beba..00000000000
--- a/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
+++ /dev/null
@@ -1,90 +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:
-## ../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.AVS_Bidirectional_Flows_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  receiver.cpp \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Bidirectional_Flows_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  sender.cpp \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
index 93444f3f843..bf4b9a7f835 100644
--- a/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
+++ b/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
@@ -1,22 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
@@ -24,17 +21,19 @@
 #include "orbsvcs/AV/Policy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -47,93 +46,97 @@ public:
   int handle_destroy (void);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 
 private:
+  /// Receiver application callback.
   Receiver_Callback callback_;
-  // Receiver application callback.
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  /// Constructor
   Receiver (void);
-  // Constructor
 
+  /// Destructor.
   ~Receiver (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   TAO_AV_Protocol_Object * protocol_object (void);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
   FILE * input_file (void);
 
 protected:
+  /// The Naming Service Client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service Client.
 
+  /// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reactive strategy.
 
+  /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  // Receiver MMDevice.
 
+  /// Rate at which the data will be sent.
   int frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object *protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_CString filename_;
-  // File from which data is read.
 
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
 };
diff --git a/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl b/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
index bd50addba68..fc3027f3164 100755
--- a/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
@@ -48,13 +48,13 @@ if ($cl->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV = $sv->CreateProcess ("receiver", 
+$SV = $sv->CreateProcess ("receiver",
                           " -ORBDebugLevel $debug_level ".
                           " -ORBInitRef NameService=file://$sv_nsiorfile ".
                           "-f $sv_outputfile");
-$CL = $cl->CreateProcess ("sender", 
+$CL = $cl->CreateProcess ("sender",
                           " -ORBInitRef NameService=file://$cl_nsiorfile ".
                           "-f $cl_inputfile -r 2");
 
diff --git a/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
index f520f67548e..b15329a5f1d 100644
--- a/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
+++ b/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
@@ -1,39 +1,38 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Sender_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Sender_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Sender_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -46,28 +45,31 @@ public:
   //  int handle_destroy (void);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 };
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   Sender_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -76,74 +78,76 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  // = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  /// Constructor
   Sender (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Method to initialize the various data components.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
   int eof (void);
 
   void shutdown (void);
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Method that binds the sender to the receiver.
   int bind_to_receiver (void);
-  // Method that binds the sender to the receiver.
 
+  /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  // The endpoint strategy used by the sender.
 
+  /// The receiver MMDevice that the sender connects to.
   AVStreams::MMDevice_var receiver_mmdevice_;
-  // The receiver MMDevice that the sender connects to.
 
+  /// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// Stream controller
   TAO_StreamCtrl *streamctrl_;
-  // Stream controller
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_CString filename_;
-  // File from which data is read.
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// Selected protocol - default is UDP
   ACE_CString protocol_;
-  // Selected protocol - default is UDP
 
+  /// Rate at which the data will be sent.
   int frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object *protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 
   int eof_;
 };
diff --git a/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
index 0e0547a14b4..d4ea1ef6e15 100644
--- a/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
+++ b/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
@@ -1,22 +1,19 @@
-//$Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Component_Switching
-//
-// = FILENAME
-//    Connection_Manager.h
-//
-// = DESCRIPTION
-//    This is a helper class that allows the senders bind to multiple
-//    receivers and receivers to bind to senders. It also lets the
-//    senders and receivers disconnect streams.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Connection_Manager.h
+ *
+ *  $Id$
+ *
+ *  This is a helper class that allows the senders bind to multiple
+ *  receivers and receivers to bind to senders. It also lets the
+ *  senders and receivers disconnect streams.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef CONNECTION_MANAGER_H
 #define CONNECTION_MANAGER_H
@@ -26,57 +23,59 @@
 #include "orbsvcs/AV/Protocol_Factory.h"
 #include "tao/PortableServer/PortableServer.h"
 
+/**
+ * @class Connection_Manager
+ *
+ * @brief Defines the Connection Manager.
+ *
+ * This is a helper class that allows the senders bind to
+ * multiple receivers and receivers to bind to senders. It also
+ * lets the senders and receivers disconnect streams.
+ */
 class Connection_Manager
 {
-  // = TITLE
-  //    Defines the Connection Manager.
-  //
-  // = DESCRIPTION
-  //    This is a helper class that allows the senders bind to
-  //    multiple receivers and receivers to bind to senders. It also
-  //    lets the senders and receivers disconnect streams.
 public:
 
+  /// Constructor
   Connection_Manager (void);
-  // Constructor
 
+  /// Destructor
   ~Connection_Manager (void);
-  // Destructor
 
+  /// Initialize this class.
   int init (CORBA::ORB_ptr orb);
-  // Initialize this class.
 
+  /// Method that binds the sender to the Naming Service and retreives
+  /// the references of any registered receivers.
   void bind_to_receivers (const ACE_CString &sender_name,
                           AVStreams::MMDevice_ptr sender);
-  // Method that binds the sender to the Naming Service and retreives
-  // the references of any registered receivers.
 
+  /// Connect to the receivers that we found.
   void connect_to_receivers (void);
-  // Connect to the receivers that we found.
 
+  /// Bind receiver to the sender.
   void bind_to_sender (const ACE_CString &sender_name,
                        const ACE_CString &receiver_name,
                        AVStreams::MMDevice_ptr receiver);
-  // Bind receiver to the sender.
 
+  /// Connect to the sender that we found.
   void connect_to_sender (void);
-  // Connect to the sender that we found.
 
+  /// Destroy streams associated with <flowname>.
   void destroy (const ACE_CString &flowname);
-  // Destroy streams associated with <flowname>.
 
+  /// Unbind the sender from the Naming Service
   void unbind_sender (const ACE_CString &sender_name,
                       AVStreams::MMDevice_ptr sender_mmdevice) ;
-  // Unbind the sender from the Naming Service
 
+  /// Unbind the Receiver from the Naming Service
   void unbind_receiver (const ACE_CString &sender_name,
                         const ACE_CString &receiver_name,
                         AVStreams::MMDevice_ptr receiver_mmdevice);
-  // Unbind the Receiver from the Naming Service
 
+  /// Add new streamctrl.
   void add_streamctrl (const ACE_CString &flowname,
                        TAO_StreamEndPoint *endpoint);
-  // Add new streamctrl.
 
   // Map of receivers.
   typedef ACE_Hash_Map_Manager<ACE_CString,
@@ -107,8 +106,8 @@ protected:
 
   void add_to_receivers (CosNaming::BindingList &binding_list);
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
   // The maps.
   Receivers receivers_;
diff --git a/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
deleted file mode 100644
index cfd81793eb9..00000000000
--- a/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
+++ /dev/null
@@ -1,138 +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:
-## ../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.AVS_Component_Switching_Dist.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += distributer
-
-distributer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-distributer_SOURCES = \
-  Connection_Manager.cpp \
-  distributer.cpp \
-  Connection_Manager.h \
-  distributer.h
-
-distributer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Component_Switching_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  Connection_Manager.cpp \
-  receiver.cpp \
-  Connection_Manager.h \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Component_Switching_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  Connection_Manager.cpp \
-  sender.cpp \
-  Connection_Manager.h \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf b/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf
index 05579a12523..3384dd0187e 100644
--- a/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf
+++ b/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf
@@ -2,7 +2,7 @@
 #
 
 # This configuration file is used to use only the default TAO
-# strategies 
+# strategies
 
 static Advanced_Resource_Factory "-ORBReactorType select_mt"
 
diff --git a/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
index 92e253a219e..42b4a0e1719 100644
--- a/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
+++ b/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
@@ -1,55 +1,57 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Component_Switching
-//
-// = FILENAME
-//    distributer.h
-//
-// = DESCRIPTION
-//    Process to receive data from the sender and send it to the
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    distributer.h
+ *
+ *  $Id$
+ *
+ *  Process to receive data from the sender and send it to the
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Connection_Manager.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Policy.h"
 
+/**
+ * @class Signal_Handler
+ TITLE
+ * This class Handles the SIGINT signal through the Reactor.
+ * Useful to gracefully release the process
+ */
 class Signal_Handler : public ACE_Event_Handler
 {
-  // TITLE
-  //   This class Handles the SIGINT signal through the Reactor.
-  //   Useful to gracefully release the process
 
 public:
 
   Signal_Handler (void);
 
+  /// Override this method to implement graceful shutdown.
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
-  // Override this method to implement graceful shutdown.
 
 };
 
 
+/**
+ * @class Distributer_Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Distributer_Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  //// Constructor.
   Distributer_Receiver_Callback (void);
-  /// Constructor.
 
   /// Method that is called when there is data to be received from a
   /// sender.
@@ -66,28 +68,30 @@ public:
   void flowname (const ACE_CString &flowname);
 
 private:
+  //// Count of the frames passing through us.
   int frame_count_;
-  /// Count of the frames passing through us.
 
+  //// Flowname of the flow.
   ACE_CString flowname_;
-  /// Flowname of the flow.
 };
 
+/**
+ * @class Distributer_Sender_Callback
+ *
+ * @brief Defines a class for the distributer application callback
+ * for receiving data.
+ *
+ * This class overides the methods of the TAO_AV_Callback so the
+ * AVStreams can make upcalls to the application.
+ */
 class Distributer_Sender_Callback : public TAO_AV_Callback
 {
-  /// = TITLE
-  //    Defines a class for the distributer application callback
-  //    for receiving data.
-  //
-  // = DESCRIPTION
-  //    This class overides the methods of the TAO_AV_Callback so the
-  //    AVStreams can make upcalls to the application.
 
 public:
 
+  //// Called when the sender has finished reading the file and wants
+  //// to close down the connection.
   int handle_destroy (void);
-  /// Called when the sender has finished reading the file and wants
-  /// to close down the connection.
 
   /// Accessor methods for the flowname of the callback.
   ACE_CString &flowname (void);
@@ -99,49 +103,54 @@ private:
 
 };
 
+/**
+ * @class Distributer_Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Distributer_Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   /// Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
+  //// Store the reference to the protocol object corresponding
+  //// to the transport
   int set_protocol_object (const char *,
                            TAO_AV_Protocol_Object *object);
-  /// Store the reference to the protocol object corresponding
-  /// to the transport
 
+  //// Called when a sender makes a connection request.
   virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec);
-  /// Called when a sender makes a connection request.
 
 private:
+  //// Receiver application callback.
   Distributer_Receiver_Callback callback_;
-  /// Receiver application callback.
 };
 
+/**
+ * @class Distributer_Sender_StreamEndPoint
+ *
+ * @brief /    Defines a sender stream endpoint.
+ */
 class Distributer_Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  /// = TITLE
-  ///    Defines a sender stream endpoint.
 public:
+  //// Create the application callback and return its handle to
+  //// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  /// Create the application callback and return its handle to
-  /// AVStreams for further application callbacks.
 
+  //// Set protocol object corresponding to the transport protocol
+  //// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  /// Set protocol object corresponding to the transport protocol
-  /// chosen.
 
 protected:
+  //// Application callback.
   Distributer_Sender_Callback callback_;
-  /// Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -156,74 +165,76 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_B
            AV_Null_MediaCtrl>
         RECEIVER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Distributer
+ *
+ * @brief Distributer Application.
+ *
+ * The distributer is the intermediate receiver that receives
+ * data from the sender and forwards to a receiver.
+ */
 class Distributer
 {
-  // = TITLE
-  //    Distributer Application.
-  //
-  // = DESCRIPTION
-  //    The distributer is the intermediate receiver that receives
-  //    data from the sender and forwards to a receiver.
 public:
+  //// Constructor
   Distributer (void);
-  /// Constructor
 
+  //// Destructor.
   ~Distributer (void);
-  /// Destructor.
 
+  //// Initialize data components.
   int init (int argc,
             ACE_TCHAR **argv);
-  /// Initialize data components.
 
+  //// Parse args.
   int parse_args (int argc,
                   ACE_TCHAR **argv);
-  /// Parse args.
 
   /// Flag to know when we are done.
   bool done (void) const;
   void done (bool);
 
+  //// Accessor to connection manager.
   Connection_Manager &connection_manager (void);
-  /// Accessor to connection manager.
 
+  //// Called when stream created
   void stream_created (void);
-  /// Called when stream created
 
+  //// Called when stream destroyed
   void stream_destroyed (void);
-  /// Called when stream destroyed
 
+  ////Unbind the sender and receiver from the Naming Service
   void shut_down (void);
-  ///Unbind the sender and receiver from the Naming Service
 
 protected:
+  //// Connection manager.
   Connection_Manager connection_manager_;
-  /// Connection manager.
 
+  //// The sender endpoint strategy.
   SENDER_ENDPOINT_STRATEGY sender_endpoint_strategy_;
-  /// The sender endpoint strategy.
 
+  //// The receiver endpoint strategy.
   RECEIVER_ENDPOINT_STRATEGY receiver_endpoint_strategy_;
-  /// The receiver endpoint strategy.
 
+  //// The distributer receiver multimedia device
   TAO_MMDevice* distributer_receiver_mmdevice_;
-  /// The distributer receiver multimedia device
 
+  //// The distributer receiver multimedia device
   TAO_MMDevice* distributer_sender_mmdevice_;
-  /// The distributer receiver multimedia device
 
+  //// The name of the sender to connect to.
   ACE_CString sender_name_;
-  /// The name of the sender to connect to.
 
+  //// Our name.
   ACE_CString distributer_name_;
-  /// Our name.
 
+  //// Flag to know when we are done.
   bool done_;
-  /// Flag to know when we are done.
 
+  //// Number of active streams. When a stream is disconnected this
+  //// count is decremented.
   int stream_count_;
-  /// Number of active streams. When a stream is disconnected this
-  /// count is decremented.
 
+  //// Reference to the signal handler.
   Signal_Handler signal_handler_;
-  /// Reference to the signal handler.
 };
diff --git a/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
index f7bc3b61361..c911c6d4fb3 100644
--- a/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
+++ b/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
@@ -1,54 +1,56 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Component_Switching
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Connection_Manager.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Policy.h"
 
+/**
+ * @class Signal_Handler
+ TITLE
+ * This class Handles the SIGINT signal through the Reactor.
+ * Useful to gracefully release the process
+ */
 class Signal_Handler : public ACE_Event_Handler
 {
-  // TITLE
-  //   This class Handles the SIGINT signal through the Reactor.
-  //   Useful to gracefully release the process
 
 public:
 
   Signal_Handler (void);
 
+  /// Override this method to implement graceful shutdown.
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
-  // Override this method to implement graceful shutdown.
 
 };
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  //// Constructor.
   Receiver_Callback (void);
-  /// Constructor.
 
   /// Method that is called when there is data to be received from a
   /// sender.
@@ -63,58 +65,62 @@ public:
   void flowname (const ACE_CString &flowname);
 
 private:
+  //// Keeping a count of the incoming frames.
   int frame_count_;
-  /// Keeping a count of the incoming frames.
 
+  //// Flowname of the flow.
   ACE_CString flowname_;
-  /// Flowname of the flow.
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   /// Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
+  //// Called when a distributor tries to connect to the receiver
   virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec);
-  /// Called when a distributor tries to connect to the receiver
 
 private:
+  //// Receiver application callback.
   Receiver_Callback callback_;
-  /// Receiver application callback.
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  //// Constructor
   Receiver (void);
-  /// Constructor
 
+  //// Destructor.
   virtual ~Receiver (void);
-  /// Destructor.
 
+  //// Initialize data components.
   int init (int argc,
             ACE_TCHAR **argv);
-  /// Initialize data components.
 
+  //// Parse args.
   int parse_args (int argc,
                   ACE_TCHAR **argv);
-  /// Parse args.
 
+  //// Name of the output file.
   ACE_CString output_file_name (void);
-  /// Name of the output file.
 
   ACE_CString sender_name (void);
   ACE_CString receiver_name (void);
@@ -122,31 +128,31 @@ public:
   void shut_down (void);
 
 protected:
+  //// Connection manager.
   Connection_Manager connection_manager_;
-  /// Connection manager.
 
+  //// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  /// The endpoint reactive strategy.
 
+  //// The receiver MMDevice.
   AVStreams::MMDevice_var mmdevice_obj_;
-  /// The receiver MMDevice.
 
+  //// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  /// Receiver MMDevice.
 
+  //// The sender MMDevice
   AVStreams::MMDevice_var sender_mmdevice_;
-  /// The sender MMDevice
 
+  //// File name of the file into which received data is written.
   ACE_CString output_file_name_;
-  /// File name of the file into which received data is written.
 
+  //// Sender name.
   ACE_CString sender_name_;
-  /// Sender name.
 
+  //// Receiver name.
   ACE_CString receiver_name_;
-  /// Receiver name.
 
+  //// Reference to the signal handler.
   Signal_Handler signal_handler_;
-  /// Reference to the signal handler.
 };
diff --git a/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl b/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
index 1a778d7edd4..6ba74fc7770 100755
--- a/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
@@ -96,58 +96,58 @@ if ($sv3->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           "-ORBDottedDecimalAddresses 1 ".
                           " -o $ns_nsiorfile");
-$SV1 = $sv1->CreateProcess ("sender", 
+$SV1 = $sv1->CreateProcess ("sender",
                           " -ORBDebugLevel $debug_level ".
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $sv1_conffile ".
                           "-ORBInitRef NameService=file://$sv1_nsiorfile ".
                           "-s sender -r 30 ".
                           "-f $sv1_inputfile");
-$SV2 = $sv2->CreateProcess ("sender", 
+$SV2 = $sv2->CreateProcess ("sender",
                           " -ORBDebugLevel $debug_level ".
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $sv2_conffile ".
                           "-ORBInitRef NameService=file://$sv2_nsiorfile ".
                           "-s sender -r 30 ".
                           "-f $sv2_inputfile");
-$SV3 = $sv3->CreateProcess ("sender", 
+$SV3 = $sv3->CreateProcess ("sender",
                           " -ORBDebugLevel $debug_level ".
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $sv3_conffile ".
                           "-ORBInitRef NameService=file://$sv3_nsiorfile ".
                           "-s sender -r 30 ".
                           "-f $sv3_inputfile");
-$RE1 = $re1->CreateProcess ("receiver", 
+$RE1 = $re1->CreateProcess ("receiver",
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $re1_conffile ".
                           "-ORBInitRef NameService=file://$re1_nsiorfile ".
                           "-s distributer -r receiver1 ".
                           "-f $re1_outputfile1");
-$RE2 = $re2->CreateProcess ("receiver", 
+$RE2 = $re2->CreateProcess ("receiver",
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $re2_conffile ".
                           "-ORBInitRef NameService=file://$re2_nsiorfile ".
                           "-s distributer -r receiver2 ".
                           "-f $re2_outputfile2");
-$DI1 = $di1->CreateProcess ("distributer", 
+$DI1 = $di1->CreateProcess ("distributer",
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $di1_conffile ".
                           "-ORBInitRef NameService=file://$di1_nsiorfile ".
                           "-s sender -r distributer ");
-$DI2 = $di2->CreateProcess ("distributer", 
+$DI2 = $di2->CreateProcess ("distributer",
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $di2_conffile ".
                           "-ORBInitRef NameService=file://$di2_nsiorfile ".
                           "-s sender -r distributer ");
-$DI3 = $di3->CreateProcess ("distributer", 
+$DI3 = $di3->CreateProcess ("distributer",
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $di3_conffile ".
                           "-ORBInitRef NameService=file://$di3_nsiorfile ".
                           "-s sender -r distributer ");
-$DI4 = $di4->CreateProcess ("distributer", 
+$DI4 = $di4->CreateProcess ("distributer",
                           "-ORBDottedDecimalAddresses 1 ".
                           " -ORBSvcConf $di4_conffile ".
                           "-ORBInitRef NameService=file://$di4_nsiorfile ".
diff --git a/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/orbsvcs/tests/AVStreams/Component_Switching/sender.h
index f5a14c6e06e..ec43f3e526e 100644
--- a/orbsvcs/tests/AVStreams/Component_Switching/sender.h
+++ b/orbsvcs/tests/AVStreams/Component_Switching/sender.h
@@ -1,91 +1,98 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Component_Switching
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Connection_Manager.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Signal_Handler
+ *
+ * This class Handles the SIGINT signal through the Reactor.
+ * Useful to gracefully release the process
+ */
 class Signal_Handler : public ACE_Event_Handler
 {
-  // TITLE
-  //   This class Handles the SIGINT signal through the Reactor.
-  //   Useful to gracefully release the process
 
 public:
 
   Signal_Handler (void);
 
+  /// Override this method to implement graceful shutdown.
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
-  // Override this method to implement graceful shutdown.
 
 };
 
 
+/**
+ * @class Sender_Callback
+ *
+ * @brief Defines a class for the sender application callback.
+ *
+ * This class overides the methods of the TAO_AV_Callback so the
+ * AVStreams can make upcalls to the application.
+ */
 class Sender_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Defines a class for the sender application callback.
-  //
-  // = DESCRIPTION
-  //    This class overides the methods of the TAO_AV_Callback so the
-  //    AVStreams can make upcalls to the application.
 
 public:
 
+  /**
+   * Called when the sender has finished reading the file and wants
+   * to close down the connection. Also called when the distributer
+   * tears down the connection when it switches to a new sender.
+   */
   int handle_destroy (void);
-  /// Called when the sender has finished reading the file and wants
-  /// to close down the connection. Also called when the distributer
-  /// tears down the connection when it switches to a new sender.
 
+  /// Accessor methods for the flowname of the callback
   ACE_CString &flowname (void);
   void flowname (const ACE_CString &flowname);
-  /// Accessor methods for the flowname of the callback
 
 private:
+  //// Flowname of the callback.
   ACE_CString flowname_;
-  /// Flowname of the callback.
 };
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  //// Create the application callback and return its handle to
+  //// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  /// Create the application callback and return its handle to
-  /// AVStreams for further application callbacks.
 
+  //// Set protocol object corresponding to the transport protocol
+  //// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  /// Set protocol object corresponding to the transport protocol
-  /// chosen.
 
+  //// Perform application specific actions before accepting new
+  //// connections.
   CORBA::Boolean handle_preconnect (AVStreams::flowSpec &flowspec);
-  /// Perform application specific actions before accepting new
-  /// connections.
 
 protected:
+  //// Application callback.
   Sender_Callback callback_;
-  /// Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -94,64 +101,66 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  /// = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  //// Constructor
   Sender (void);
-  /// Constructor
 
+  //// Destructor
   ~Sender (void);
-  /// Destructor
 
   void shut_down (void);
 
+  //// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  /// Method to initialize the various data components.
 
+  //// Method to pace and send data from a file.
   int pace_data (void);
-  /// Method to pace and send data from a file.
 
+  //// Accessor to the connection manager.
   Connection_Manager &connection_manager (void);
-  /// Accessor to the connection manager.
 
 private:
+  //// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  /// Method to parse the command line arguments.
 
+  //// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  /// The endpoint strategy used by the sender.
 
+  //// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  /// The sender MMDevice.
 
+  //// Number of frames sent.
   int frame_count_;
-  /// Number of frames sent.
 
+  //// File from which data is read.
   ACE_CString filename_;
-  /// File from which data is read.
 
+  //// File handle of the file read from.
   FILE *input_file_;
-  /// File handle of the file read from.
 
+  //// Rate at which the data will be sent.
   double frame_rate_;
-  /// Rate at which the data will be sent.
 
+  //// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  /// Message block into which data is read from a file and then sent.
 
+  //// Name of this sender.
   ACE_CString sender_name_;
-  /// Name of this sender.
 
+  //// Connection manager.
   Connection_Manager connection_manager_;
-  /// Connection manager.
 
+  //// Reference to the signal handler.
   Signal_Handler signal_handler_;
-  /// Reference to the signal handler.
 };
diff --git a/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
deleted file mode 100644
index 5f011923973..00000000000
--- a/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
+++ /dev/null
@@ -1,90 +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:
-## ../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.AVS_Full_Profile_Ftp.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ftp
-
-ftp_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ftp_SOURCES = \
-  ftp.cpp \
-  ftp.h
-
-ftp_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Full_Profile_Server.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  server.cpp \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl b/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
index 152b75c34c7..4c48c39bccf 100755
--- a/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
@@ -63,7 +63,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
 print STDERR "Starting Naming Service\n";
@@ -106,16 +106,16 @@ for $protocol (@protocols) {
     else {
         $outputfile = $protocol."_output";
     }
-    
+
     my $sv_outputfile = $sv->LocalFile ($outputfile);
     $ns->DeleteFile ($outputfile);
 
-    $SV = $sv->CreateProcess ("server", 
+    $SV = $sv->CreateProcess ("server",
                               "-ORBInitRef NameService=file://$sv_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-f $sv_outputfile");
 
-    $CL = $cl->CreateProcess ("ftp", 
+    $CL = $cl->CreateProcess ("ftp",
                               "-ORBInitRef NameService=file://$cl_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-f $cl_inputfile");
diff --git a/orbsvcs/tests/AVStreams/Latency/Makefile.am b/orbsvcs/tests/AVStreams/Latency/Makefile.am
deleted file mode 100644
index c1854631a69..00000000000
--- a/orbsvcs/tests/AVStreams/Latency/Makefile.am
+++ /dev/null
@@ -1,133 +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:
-## ../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.AVS_Latency_Cntl.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += control
-
-control_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-control_SOURCES = \
-  control.cpp \
-  ping.h \
-  pong.h
-
-control_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Latency_Ping.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ping
-
-ping_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ping_SOURCES = \
-  ping.cpp \
-  ping.h
-
-ping_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Latency_Pong.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += pong
-
-pong_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-pong_SOURCES = \
-  pong.cpp \
-  pong.h
-
-pong_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/AVStreams/Latency/control.cpp b/orbsvcs/tests/AVStreams/Latency/control.cpp
index 11e43114d84..a1b75c9e6f7 100644
--- a/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -8,10 +8,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/INET_Addr.h"
 
-ACE_RCSID (Latency,
-           ping,
-           "$Id$")
-
 const ACE_TCHAR *ping_ior = ACE_TEXT ("file://ping.ior");
 const ACE_TCHAR *pong_ior = ACE_TEXT ("file://pong.ior");
 const ACE_TCHAR *ping_address = ACE_TEXT ("localhost:12345");
@@ -73,7 +69,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       }
 
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/AVStreams/Latency/ping.cpp b/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 2f339f6f4f8..ea93745ba03 100644
--- a/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -9,10 +9,6 @@
 #include "ace/Stats.h"
 #include "ace/Throughput_Stats.h"
 
-ACE_RCSID (Latency,
-           ping,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("ping.ior");
 const char *protocol = "RTP/UDP";
 int milliseconds = 100;
@@ -89,7 +85,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       pong_protocols[0] = CORBA::string_dup ("UDP=localhost:23456");
     }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/AVStreams/Latency/ping.h b/orbsvcs/tests/AVStreams/Latency/ping.h
index 88e6fc31b97..da4a6975074 100644
--- a/orbsvcs/tests/AVStreams/Latency/ping.h
+++ b/orbsvcs/tests/AVStreams/Latency/ping.h
@@ -1,17 +1,14 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/AVStreams/Latency
-//
-// = FILENAME
-//   ping.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   ping.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_PING_H
 #define TAO_PING_H
@@ -43,17 +40,17 @@ public:
                             TAO_AV_Callback *&callback);
 
 private:
+  /// The callback object...
   Ping_Recv_Callback callback_;
-  // The callback object...
 };
 
 class Pong_Send_Callback : public TAO_AV_Callback
 {
 public:
 
+  /// Ad-hoc method to send a response outside the context of a
+  /// handle_timeout.
   int send_response (ACE_hrtime_t stamp);
-  // Ad-hoc method to send a response outside the context of a
-  // handle_timeout.
 
   virtual int handle_timeout (void *arg);
   virtual int handle_end_stream (void);
diff --git a/orbsvcs/tests/AVStreams/Latency/pong.cpp b/orbsvcs/tests/AVStreams/Latency/pong.cpp
index d029d1648bb..8a074684bdc 100644
--- a/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -11,10 +11,6 @@
 #include "ace/Stats.h"
 #include "ace/Throughput_Stats.h"
 
-ACE_RCSID (Latency,
-           ping,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("pong.ior");
 const char *protocol = "RTP/UDP";
 int milliseconds = 100;
@@ -106,7 +102,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       ping_protocols[0] = CORBA::string_dup ("UDP=localhost:12345");
     }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/AVStreams/Latency/pong.h b/orbsvcs/tests/AVStreams/Latency/pong.h
index 92d90adaad4..2a03d29116d 100644
--- a/orbsvcs/tests/AVStreams/Latency/pong.h
+++ b/orbsvcs/tests/AVStreams/Latency/pong.h
@@ -1,17 +1,13 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/AVStreams/Latency
-//
-// = FILENAME
-//   ping.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   pong.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
 
 #ifndef TAO_PONG_H
 #define TAO_PONG_H
@@ -39,8 +35,8 @@ public:
                             TAO_AV_Callback *&callback);
 
 private:
+  /// The callback object...
   Pong_Recv_Callback callback_;
-  // The callback object...
 };
 
 class Ping_Send_Callback : public TAO_AV_Callback
@@ -54,11 +50,11 @@ public:
                             void *&arg);
 
 private:
+  /// the timeout value
   ACE_Time_Value timeout_;
-  // the timeout value
 
+  /// Pre-allocate the message block to send...
   ACE_Message_Block frame_;
-  // Pre-allocate the message block to send...
   int count_;
 
 };
@@ -71,8 +67,8 @@ public:
                             TAO_AV_Callback *&callback);
 
 private:
+  /// The callback object...
   Ping_Send_Callback callback_;
-  // The callback object...
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A <TAO_StreamEndPoint_A,TAO_VDev,AV_Null_MediaCtrl> Reactive_Strategy;
diff --git a/orbsvcs/tests/AVStreams/Latency/run_test.pl b/orbsvcs/tests/AVStreams/Latency/run_test.pl
index fc02f4b2fd8..b2158898318 100755
--- a/orbsvcs/tests/AVStreams/Latency/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Latency/run_test.pl
@@ -34,11 +34,11 @@ $pong->DeleteFile ($pongiorfile);
 $ctrl->DeleteFile ($pingiorfile);
 $ctrl->DeleteFile ($pongiorfile);
 
-$PING = $ping->CreateProcess ("ping", 
+$PING = $ping->CreateProcess ("ping",
                               " -o $ping_pingiorfile");
-$PONG = $pong->CreateProcess ("pong", 
+$PONG = $pong->CreateProcess ("pong",
                               " -o $pong_pongiorfile");
-$CTRL = $ctrl->CreateProcess ("control", 
+$CTRL = $ctrl->CreateProcess ("control",
                               " -ORBDebugLevel $debug_level ".
                               " -f file://$ctrl_pingiorfile ".
                               " -g file://$ctrl_pongiorfile");
diff --git a/orbsvcs/tests/AVStreams/Latency/svc.conf b/orbsvcs/tests/AVStreams/Latency/svc.conf
index 55dab11ac36..580f3233481 100644
--- a/orbsvcs/tests/AVStreams/Latency/svc.conf
+++ b/orbsvcs/tests/AVStreams/Latency/svc.conf
@@ -1,5 +1,5 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorType select_st  -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBClientConnectionHandler ST"
diff --git a/orbsvcs/tests/AVStreams/Latency/svc.conf.xml b/orbsvcs/tests/AVStreams/Latency/svc.conf.xml
index 5f7c667443f..0f0e38f5e02 100644
--- a/orbsvcs/tests/AVStreams/Latency/svc.conf.xml
+++ b/orbsvcs/tests/AVStreams/Latency/svc.conf.xml
@@ -4,6 +4,6 @@
  <!--  $Id$ -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st  -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler ST"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler ST"/>
 </ACE_Svc_Conf>
diff --git a/orbsvcs/tests/AVStreams/Makefile.am b/orbsvcs/tests/AVStreams/Makefile.am
deleted file mode 100644
index 6f3ac2f1651..00000000000
--- a/orbsvcs/tests/AVStreams/Makefile.am
+++ /dev/null
@@ -1,26 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Asynch_Three_Stage \
-        Bidirectional_Flows \
-        Component_Switching \
-        Full_Profile \
-        Latency \
-        Modify_QoS \
-        Multicast \
-        Multicast_Full_Profile \
-        Multiple_Flows \
-        Pluggable \
-        Pluggable_Flow_Protocol \
-        Simple_Three_Stage \
-        Simple_Two_Stage \
-        Simple_Two_Stage_With_QoS
-
diff --git a/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
deleted file mode 100644
index 99b358a677f..00000000000
--- a/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
+++ /dev/null
@@ -1,90 +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:
-## ../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.AVS_Modify_QoS_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  receiver.cpp \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Modify_QoS_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  sender.cpp \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl b/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl
index 1fbf0f3461f..78128ef34fc 100755
--- a/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl
@@ -47,13 +47,13 @@ if ($cl->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV = $sv->CreateProcess ("receiver", 
+$SV = $sv->CreateProcess ("receiver",
                           " -ORBDebugLevel $debug_level ".
                           " -ORBInitRef NameService=file://$sv_nsiorfile ".
                           "-f $sv_outputfile");
-$CL = $cl->CreateProcess ("sender", 
+$CL = $cl->CreateProcess ("sender",
                           " -ORBInitRef NameService=file://$cl_nsiorfile ".
                           "-f $cl_inputfile");
 
diff --git a/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/orbsvcs/tests/AVStreams/Multicast/Makefile.am
deleted file mode 100644
index df58023ae4a..00000000000
--- a/orbsvcs/tests/AVStreams/Multicast/Makefile.am
+++ /dev/null
@@ -1,96 +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:
-## ../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.AVS_Multicast_Ftp.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ftp
-
-ftp_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ftp_SOURCES = \
-  ftp.cpp \
-  ftp.h
-
-ftp_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Multicast_Server.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  server.cpp \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/AVStreams/Multicast/components_svc.conf b/orbsvcs/tests/AVStreams/Multicast/components_svc.conf
index 4c6d9054999..fd70a6b6c7b 100644
--- a/orbsvcs/tests/AVStreams/Multicast/components_svc.conf
+++ b/orbsvcs/tests/AVStreams/Multicast/components_svc.conf
@@ -1,8 +1,8 @@
 # $Id$
 #
 #static Advanced_Resource_Factory "-ORBresources global -ORBReactorType select_st  -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
-#static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-#static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST"
+#static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
+#static Client_Strategy_Factory "-ORBClientConnectionHandler ST"
 
 static Advanced_Resource_Factory "-ORBReactorType select_mt"
 
diff --git a/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml b/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml
index 4ddaaf0c147..705c51a7f77 100644
--- a/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml
+++ b/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml
@@ -4,7 +4,7 @@
  <!--  $Id$ -->
  <!--  -->
  <!-- static Advanced_Resource_Factory "-ORBReactorType select_st  -ORBInputCDRAllocator null  -ORBConnectionCacheLock null" -->
- <!-- static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0" -->
- <!-- static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST" -->
+ <!-- static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0" -->
+ <!-- static Client_Strategy_Factory "-ORBClientConnectionHandler ST" -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
 </ACE_Svc_Conf>
diff --git a/orbsvcs/tests/AVStreams/Multicast/run_test.pl b/orbsvcs/tests/AVStreams/Multicast/run_test.pl
index 94d4db635e8..0ad321e25b7 100755
--- a/orbsvcs/tests/AVStreams/Multicast/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Multicast/run_test.pl
@@ -57,17 +57,17 @@ if ($cl->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV1 = $sv1->CreateProcess ("server", 
+$SV1 = $sv1->CreateProcess ("server",
                             " -ORBDebugLevel $debug_level ".
                             " -ORBInitRef NameService=file://$sv1_nsiorfile ".
                             "-f $sv1_test1file");
-$SV2 = $sv2->CreateProcess ("server", 
+$SV2 = $sv2->CreateProcess ("server",
                             " -ORBDebugLevel $debug_level ".
                             " -ORBInitRef NameService=file://$sv2_nsiorfile ".
                             "-f $sv2_test2file");
-$CL = $cl->CreateProcess ("ftp", 
+$CL = $cl->CreateProcess ("ftp",
                           "-ORBSvcConf $cl_conffile ".
                           " -ORBInitRef NameService=file://$cl_nsiorfile ".
                           "-f $cl_inputfile");
diff --git a/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
deleted file mode 100644
index 27b52a09998..00000000000
--- a/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
+++ /dev/null
@@ -1,90 +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:
-## ../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.AVS_Multicast_Full_Profile_Ftp.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ftp
-
-ftp_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ftp_SOURCES = \
-  ftp.cpp \
-  ftp.h
-
-ftp_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Multicast_Full_Profile_Server.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  server.cpp \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 2659afd4333..a92bef825b8 100644
--- a/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -357,10 +357,10 @@ Client::run (void)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
   try
     {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA");
 
diff --git a/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl b/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
index 0d9682f3dea..ff8ed76bf9c 100755
--- a/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
@@ -53,17 +53,17 @@ if ($cl->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV1 = $sv1->CreateProcess ("server", 
+$SV1 = $sv1->CreateProcess ("server",
                             " -ORBDebugLevel $debug_level ".
                             " -ORBInitRef NameService=file://$sv1_nsiorfile ".
                             "-f $sv1_test1file");
-$SV2 = $sv2->CreateProcess ("server", 
+$SV2 = $sv2->CreateProcess ("server",
                             " -ORBDebugLevel $debug_level ".
                             " -ORBInitRef NameService=file://$sv2_nsiorfile ".
                             "-f $sv2_test2file");
-$CL = $cl->CreateProcess ("ftp", 
+$CL = $cl->CreateProcess ("ftp",
                           " -ORBInitRef NameService=file://$cl_nsiorfile ".
                           "-f $cl_inputfile");
 
diff --git a/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
deleted file mode 100644
index 606125b7ed3..00000000000
--- a/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
+++ /dev/null
@@ -1,90 +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:
-## ../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.AVS_Multiple_Flows_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  receiver.cpp \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Multiple_Flows_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  sender.cpp \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
index 0de06e4e856..8499a0c0b01 100644
--- a/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
+++ b/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
@@ -1,22 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
@@ -24,17 +21,19 @@
 #include "orbsvcs/AV/Policy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -49,89 +48,93 @@ public:
   void flowname (const char*);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
   ACE_CString flowname_;
 
+  /// File handle of the file into which received data is written.
   FILE *output_file_;
-  // File handle of the file into which received data is written.
 
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  /// Constructor
   Receiver (void);
-  // Constructor
 
+  /// Destructor.
   ~Receiver (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   TAO_AV_Protocol_Object * protocol_object (void);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
 protected:
+  /// The Naming Service Client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service Client.
 
+  /// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reactive strategy.
 
+  /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  // Receiver MMDevice.
 
+  /// Rate at which the data will be sent.
   int frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object *protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_CString filename_;
-  // File from which data is read.
 
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
 };
diff --git a/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl b/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
index 2bb6b037ceb..7e3996c2608 100755
--- a/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
@@ -47,13 +47,13 @@ if ($cl->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV = $sv->CreateProcess ("receiver", 
+$SV = $sv->CreateProcess ("receiver",
                           " -ORBDebugLevel $debug_level ".
                           " -ORBInitRef NameService=file://$sv_nsiorfile ".
                           "-f $sv_outputfile");
-$CL = $cl->CreateProcess ("sender", 
+$CL = $cl->CreateProcess ("sender",
                           " -ORBInitRef NameService=file://$cl_nsiorfile ".
                           "-f $cl_inputfile -r 2");
 
diff --git a/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
index eaf1e328782..9b63e818546 100644
--- a/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
+++ b/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
@@ -1,22 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
@@ -26,24 +23,27 @@
 typedef ACE_Unbounded_Set<TAO_AV_Protocol_Object*> ProtocolObject_Set;
 typedef ACE_Unbounded_Set_Iterator<TAO_AV_Protocol_Object*> ProtocolObject_SetItor;
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -52,71 +52,73 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  // = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  /// Constructor
   Sender (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Method to initialize the various data components.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
   void shutdown (void);
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Method that binds the sender to the receiver.
   int bind_to_receiver (void);
-  // Method that binds the sender to the receiver.
 
+  /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  // The endpoint strategy used by the sender.
 
+  /// The receiver MMDevice that the sender connects to.
   AVStreams::MMDevice_var receiver_mmdevice_;
-  // The receiver MMDevice that the sender connects to.
 
+  /// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// Stream controller
   TAO_StreamCtrl *streamctrl_;
-  // Stream controller
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_CString filename_;
-  // File from which data is read.
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// Selected protocol - default is UDP
   ACE_CString protocol_;
-  // Selected protocol - default is UDP
 
+  /// Rate at which the data will be sent.
   int frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   ProtocolObject_Set protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 
 };
diff --git a/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
deleted file mode 100644
index d6a771ebaaf..00000000000
--- a/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
+++ /dev/null
@@ -1,90 +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:
-## ../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.AVS_Pluggable_Ftp.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ftp
-
-ftp_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ftp_SOURCES = \
-  ftp.cpp \
-  ftp.h
-
-ftp_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Pluggable_Server.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  server.cpp \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index 50ae2bb556c..b658ce53e2f 100644
--- a/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Pluggable
-//
-// = FILENAME
-//    ftp.h
-//
-// = DESCRIPTION
-//    Ftp client to send data
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ftp.h
+ *
+ *  $Id$
+ *
+ *  Ftp client to send data
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 
 #ifndef TAO_AV_FTP_H
@@ -29,140 +26,146 @@
 #include "orbsvcs/AV/Protocol_Factory.h"
 
 
+/**
+ * @class FTP_Client_Callback
+ *
+ * @brief Defines the client applcation callback.
+ *
+ * This class can override the methods of
+ * the TAO_AV_Callback to do application
+ * specific processing.
+ */
 class FTP_Client_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Defines the client applcation callback.
-  //
-  // = DESCRIPTION
-  //    This class can override the methods of
-  //    the TAO_AV_Callback to do application
-  //    specific processing.
 public:
+  ///Constructor
   FTP_Client_Callback (void);
-  //Constructor
 };
 
 
+/**
+ * @class FTP_Client_StreamEndPoint
+ *
+ * @brief Defines the client stream endpoint.
+ *
+ * This class overrides the methods of TAO_ClientStreamendpoint
+ * so the application can perform its processing during post and pre
+ * connection set up.
+ */
 class FTP_Client_StreamEndPoint  : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines the client stream endpoint.
-  //
-  // = DESCRIPTION
-  //    This class overrides the methods of TAO_ClientStreamendpoint
-  //    so the application can perform its processing during post and pre
-  //    connection set up.
 
 public:
+  ///Contructor
   FTP_Client_StreamEndPoint (void);
-  //Contructor
 
+  /// Create the application client callback and return its handle to the
+  /// AVSTreams for further application callbacks
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
-  // Create the application client callback and return its handle to the
-  // AVSTreams for further application callbacks
 
+  /// Set protocol object corresponding to the transport protocol chosen.
   virtual int set_protocol_object (const char *flowname,
                                    TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol chosen.
 
 protected:
+  /// reference to the cllient application callback.
   FTP_Client_Callback callback_;
-  // reference to the cllient application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A <FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> ENDPOINT_STRATEGY;
 
 
+/**
+ * @class Client
+ *
+ * @brief Defines the Client Application
+ *
+ * The actual client program that acts as the ftp client that streams data
+ * to the ftp servers that are waiting for data.
+ */
 class Client
 {
-  // = TITLE
-  //    Defines the Client Application
-  //
-  // = DESCRIPTION
-  //    The actual client program that acts as the ftp client that streams data
-  //    to the ftp servers that are waiting for data.
 public:
+  /// Constructor
   Client (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Method to initialize the various data components.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void set_protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// File handle from which data is read to be sent.
   FILE *file (void);
-  // File handle from which data is read to be sent.
 
+  /// The stream control interface that manages the stream set up
   TAO_StreamCtrl* streamctrl (void);
-  // The stream control interface that manages the stream set up
 
+  /// name of the flow set up.
   char *flowname (void);
-  // name of the flow set up.
 
+  /// The requested frame rate for sending each frame of data read from the file.
   int frame_rate (void);
-  // The requested frame rate for sending each frame of data read from the file.
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Method that binds the ftp client to the server
   int bind_to_server (void);
-  // Method that binds the ftp client to the server
 
+  /// The reacfive strategy of the client.
   ENDPOINT_STRATEGY endpoint_strategy_;
-  // The reacfive strategy of the client.
 
+  /// The server MMDevice that the ftpo client connects to
   AVStreams::MMDevice_var server_mmdevice_;
-  // The server MMDevice that the ftpo client connects to
 
+  /// The ftp client MMDevice.
   TAO_MMDevice client_mmdevice_;
-  // The ftp client MMDevice.
 
+  /// Video stream controller
   TAO_StreamCtrl streamctrl_;
-  // Video stream controller
 
+  /// Number of frames sent.
   int count_;
-  // Number of frames sent.
 
   int argc_;
   ACE_TCHAR **argv_;
 
+  /// File from which data is read.
   const char *filename_;
-  // File from which data is read.
 
+  /// Address of the ftp client host machine or a multicast address - Default is
+  /// UDP multicast addess
   const char *address_;
-  // Address of the ftp client host machine or a multicast address - Default is
-  // UDP multicast addess
   const char *peer_addr_str_;
 
+  /// The Naming Service client.
   TAO_Naming_Client my_naming_client_;
-  // The Naming Service client.
 
+  /// File handle of the file read from.
   FILE *fp_;
-  // File handle of the file read from.
 
+  /// Selected protocol - default is UDP
   char *protocol_;
-  // Selected protocol - default is UDP
 
   char *flowname_;
 
+  /// If set to 1 then use sfp as the flow carrier protocol.
   int use_sfp_;
-  // If set to 1 then use sfp as the flow carrier protocol.
 
   int frame_rate_;
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb;
-  // Message block into which data is read from a file and then sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object* protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 
 };
 
diff --git a/orbsvcs/tests/AVStreams/Pluggable/run_test.pl b/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
index 1591969296e..4f128a1530f 100755
--- a/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
@@ -65,7 +65,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
 print STDERR "Starting Naming Service\n";
@@ -112,12 +112,12 @@ for $protocol (@protocols) {
     my $sv_outputfile = $sv->LocalFile ($outputfile);
     $ns->DeleteFile ($outputfile);
 
-    $SV = $sv->CreateProcess ("server", 
+    $SV = $sv->CreateProcess ("server",
                               "-ORBInitRef NameService=file://$sv_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-f $sv_outputfile");
 
-    $CL = $cl->CreateProcess ("ftp", 
+    $CL = $cl->CreateProcess ("ftp",
                               "-ORBInitRef NameService=file://$cl_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-p $protocol ".
diff --git a/orbsvcs/tests/AVStreams/Pluggable/server.h b/orbsvcs/tests/AVStreams/Pluggable/server.h
index bdb3544c767..7982865da72 100644
--- a/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Pluggable
-//
-// = FILENAME
-//    ftp.h
-//
-// = DESCRIPTION
-//    Ftp server to receive data
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    server.h
+ *
+ *  $Id$
+ *
+ *  Ftp server to receive data
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
@@ -22,14 +19,16 @@
 #include "orbsvcs/AV/Policy.h"
 
 
+/**
+ * @class FTP_Server_Callback
+ *
+ * @brief Defines a class for the server application callback.
+ *
+ * This class overides the methods of the TAO_AV_Callback so the
+ * AVStreams can make upcalls to the application.
+ */
 class FTP_Server_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Defines a class for the server application callback.
-  //
-  // = DESCRIPTION
-  //    This class overides the methods of the TAO_AV_Callback so the
-  //    AVStreams can make upcalls to the application.
 
 public:
 
@@ -43,51 +42,55 @@ public:
   int handle_destroy (void);
 };
 
+/**
+ * @class FTP_Server_StreamEndPoint
+ *
+ * @brief Defines the aplication stream endpoint
+ *
+ * This is the class that overrides the tao_server_enpodint to handle
+ * pre and post connect processing.
+ */
 class FTP_Server_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Defines the aplication stream endpoint
-  //
-  // = DESCRIPTION
-  //    This is the class that overrides the tao_server_enpodint to handle
-  //    pre and post connect processing.
 public:
   // Create the server application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// reference to the server application callback.
   FTP_Server_Callback callback_;
-  // reference to the server application callback.
 };
 
+/**
+ * @class Server
+ *
+ * @brief Defines the server application class.
+ * = DESCRIPOTION
+ * The actual server progarm that acts as the ftp server that receives data
+ * sent by the ftp client.
+ */
 class Server
 {
-  // = TITLE
-  //    Defines the server application class.
-  //
-  // = DESCRIPOTION
-  //    The actual server progarm that acts as the ftp server that receives data
-  //    sent by the ftp client.
 public:
+  /// Constructor
   Server (void);
-  // Constructor
 
+  /// Deestructor.
   ~Server (void);
-  // Deestructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
 protected:
+  /// The Naming Service Client.
   TAO_Naming_Client my_naming_client_;
-  // The Naming Service Client.
 
+  /// The endpoint reacxtive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reacxtive strategy.
 
+  /// The server MMDevice.
   TAO_MMDevice *mmdevice_;
-  // The server MMDevice.
 };
diff --git a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
deleted file mode 100644
index aded0981dda..00000000000
--- a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
+++ /dev/null
@@ -1,115 +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:
-## ../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.AVS_Pluggable_Flow_Protocol_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  receiver.cpp \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Pluggable_Flow_Protocol_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  sender.cpp \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Pluggable_Flow_Protocol_Ts.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_LTLIBRARIES = libTAO_TS.la
-
-libTAO_TS_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_TS_BUILD_DLL
-
-libTAO_TS_la_SOURCES = \
-  TimeStamp.cpp
-
-noinst_HEADERS = \
-  TimeStamp.h
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
index 59cfb9a300b..9f6c885497e 100644
--- a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
+++ b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
@@ -1,6 +1,7 @@
 #include "TimeStamp.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/OS_NS_strings.h"
 
 // $Id$
 //TimeStamp Protocol Object
@@ -51,7 +52,7 @@ TimeStamp_Protocol_Object::handle_input (void)
 //                n,
 //                frame_size));
 
-//        ACE_Message_Block* mb;
+//        ACE_Message_Block* mb = 0;
 //        ACE_NEW_RETURN (mb,
 //                    ACE_Message_Block(frame_size),
 //                    -1);
@@ -93,7 +94,7 @@ TimeStamp_Protocol_Object::handle_input (void)
 //                  "(%N|%l) Frame Size %d\n",
 //                  n));
 
-//      ACE_Message_Block* mb;
+//      ACE_Message_Block* mb = 0;
 //      ACE_NEW_RETURN (mb,
 //                      ACE_Message_Block (frame_size),
 //                      -1);
diff --git a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index b74633ec3ea..e4c9cb5470e 100644
--- a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -2,7 +2,6 @@
 
 #include "receiver.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS_String.h"
 #include "ace/High_Res_Timer.h"
 
 static FILE *output_file = 0;
diff --git a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
index 5e813d38c08..d976fce3eef 100644
--- a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
+++ b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
@@ -1,39 +1,38 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Policy.h"
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -46,54 +45,58 @@ public:
   int handle_destroy (void);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// Receiver application callback.
   Receiver_Callback callback_;
-  // Receiver application callback.
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  /// Constructor
   Receiver (void);
-  // Constructor
 
+  /// Destructor.
   ~Receiver (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
 protected:
+  /// The Naming Service Client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service Client.
 
+  /// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reactive strategy.
 
+  /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  // Receiver MMDevice.
 };
diff --git a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
index 2f91b783982..fe3aa213aac 100755
--- a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
@@ -47,13 +47,13 @@ if ($cl->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV = $sv->CreateProcess ("receiver", 
+$SV = $sv->CreateProcess ("receiver",
                           " -ORBDebugLevel $debug_level ".
                           " -ORBInitRef NameService=file://$sv_nsiorfile ".
                           "-f $sv_outputfile");
-$CL = $cl->CreateProcess ("sender", 
+$CL = $cl->CreateProcess ("sender",
                           "-ORBDebugLevel 2 ".
                           " -ORBInitRef NameService=file://$cl_nsiorfile ".
                           "-f $cl_inputfile -r 2");
diff --git a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
index 687bdfec133..0eb3343f85e 100644
--- a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
+++ b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
@@ -1,46 +1,46 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -49,68 +49,70 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  // = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  /// Constructor
   Sender (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Method to initialize the various data components.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Method that binds the sender to the receiver.
   int bind_to_receiver (void);
-  // Method that binds the sender to the receiver.
 
+  /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  // The endpoint strategy used by the sender.
 
+  /// The receiver MMDevice that the sender connects to.
   AVStreams::MMDevice_var receiver_mmdevice_;
-  // The receiver MMDevice that the sender connects to.
 
+  /// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// Stream controller
   TAO_StreamCtrl *streamctrl_;
-  // Stream controller
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_CString filename_;
-  // File from which data is read.
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// Selected protocol - default is UDP
   ACE_CString protocol_;
-  // Selected protocol - default is UDP
 
+  /// Rate at which the data will be sent.
   int frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object *protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 };
diff --git a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf
index d4f2cd01350..befaf7cda62 100644
--- a/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf
+++ b/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf
@@ -1,5 +1,7 @@
+# $Id$
+
 dynamic AV_Default_Resource_Factory Service_Object * TAO_AV:_make_TAO_AV_Default_Resource_Factory() ""
 dynamic TimeStamp_Protocol_Factory Service_Object * TAO_TS:_make_TimeStamp_Protocol_Factory() ""
-static AV_Default_Resource_Factory "-AVFlowProtocolFactory TimeStamp_Protocol_Factory" 
+static AV_Default_Resource_Factory "-AVFlowProtocolFactory TimeStamp_Protocol_Factory"
 dynamic UDP_Factory Service_Object * TAO_AV:_make_TAO_AV_UDP_Factory() ""
-static AV_Default_Resource_Factory "-AVTransportFactory UDP_Factory" 
+static AV_Default_Resource_Factory "-AVTransportFactory UDP_Factory"
diff --git a/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
deleted file mode 100644
index ec0501a9959..00000000000
--- a/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
+++ /dev/null
@@ -1,123 +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:
-## ../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.AVS_Simple_Three_Stage_Dist.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += distributer
-
-distributer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-distributer_SOURCES = \
-  distributer.cpp \
-  distributer.h
-
-distributer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Simple_Three_Stage_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  receiver.cpp \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Simple_Three_Stage_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  sender.cpp \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
index a403d445404..d89a33a5d12 100644
--- a/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
+++ b/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
@@ -1,39 +1,38 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage
-//
-// = FILENAME
-//    distributer.h
-//
-// = DESCRIPTION
-//    Process to receive data from the sender and send it to the
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    distributer.h
+ *
+ *  $Id$
+ *
+ *  Process to receive data from the sender and send it to the
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Policy.h"
 
+/**
+ * @class Distributer_Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Distributer_Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Distributer_Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -46,45 +45,50 @@ public:
   int handle_destroy (void);
 
 private:
+  /// Count of the frames passing through us.
   int frame_count_;
-  // Count of the frames passing through us.
 };
 
+/**
+ * @class Distributer_Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Distributer_Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// Receiver application callback.
   Distributer_Receiver_Callback callback_;
-  // Receiver application callback.
 };
 
+/**
+ * @class Distributer_Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Distributer_Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -99,71 +103,73 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_B
            AV_Null_MediaCtrl>
         RECEIVER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Distributer
+ *
+ * @brief Distributer Application.
+ *
+ * The distributer is the intermediate receiver that receives
+ * data from the sender and forwards to a receiver.
+ */
 class Distributer
 {
-  // = TITLE
-  //    Distributer Application.
-  //
-  // = DESCRIPTION
-  //    The distributer is the intermediate receiver that receives
-  //    data from the sender and forwards to a receiver.
 public:
+  /// Constructor
   Distributer (void);
-  // Constructor
 
+  /// Destructor.
   ~Distributer (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
+  /// Resolve the reference of the mmdevice from the naming service.
   void bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
                          const ACE_CString &mmdevice_name);
-  // Resolve the reference of the mmdevice from the naming service.
 
+  /// Get the stream control of the receiver
   TAO_StreamCtrl *receiver_streamctrl (void);
-  // Get the stream control of the receiver
 
+  /// Accessor methods to set/get our sender protocol object
   int sender_protocol_object  (TAO_AV_Protocol_Object *object);
   TAO_AV_Protocol_Object *sender_protocol_object (void);
-  // Accessor methods to set/get our sender protocol object
 
   // Flag to know when we are done.
   int done (void) const;
   void done (int);
 
 protected:
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
+  /// The sender endpoint strategy.
   SENDER_ENDPOINT_STRATEGY sender_endpoint_strategy_;
-  // The sender endpoint strategy.
 
+  /// The receiver endpoint strategy.
   RECEIVER_ENDPOINT_STRATEGY receiver_endpoint_strategy_;
-  // The receiver endpoint strategy.
 
+  /// The distributer receiver multimedia device
   TAO_MMDevice* distributer_receiver_mmdevice_;
-  // The distributer receiver multimedia device
 
+  /// The distributer receiver multimedia device
   TAO_MMDevice* distributer_sender_mmdevice_;
-  // The distributer receiver multimedia device
 
+  /// The receiver MMDevice.
   AVStreams::MMDevice_var receiver_mmdevice_;
-  // The receiver MMDevice.
 
+  /// The sender MMDevice.
   AVStreams::MMDevice_var sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// The sender protocol object
   TAO_AV_Protocol_Object *sender_protocol_object_;
-  // The sender protocol object
 
+  /// Stream controller for the receivers
   TAO_StreamCtrl* receiver_streamctrl_;
-  // Stream controller for the receivers
 
+  /// Selected protocol - default is UDP
   ACE_CString protocol_;
-  // Selected protocol - default is UDP
 
+  /// Flag to know when we are done.
   int done_;
-  // Flag to know when we are done.
 };
diff --git a/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
index e7076f5686e..d976fce3eef 100644
--- a/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
+++ b/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
@@ -1,39 +1,38 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Policy.h"
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -46,54 +45,58 @@ public:
   int handle_destroy (void);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// Receiver application callback.
   Receiver_Callback callback_;
-  // Receiver application callback.
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  /// Constructor
   Receiver (void);
-  // Constructor
 
+  /// Destructor.
   ~Receiver (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
 protected:
+  /// The Naming Service Client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service Client.
 
+  /// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reactive strategy.
 
+  /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  // Receiver MMDevice.
 };
diff --git a/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl b/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl
index 759584647d6..0dd3f388e65 100755
--- a/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl
@@ -50,16 +50,16 @@ if ($sv->PutFile ($inputfile) == -1) {
     exit 1;
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
-$SV = $sv->CreateProcess ("sender", 
+$SV = $sv->CreateProcess ("sender",
                           " -ORBDebugLevel $debug_level ".
                           " -ORBInitRef NameService=file://$sv_nsiorfile ".
                           "-f $sv_inputfile");
-$RE = $re->CreateProcess ("receiver", 
+$RE = $re->CreateProcess ("receiver",
                           " -ORBInitRef NameService=file://$re_nsiorfile ".
                           "-f $re_outputfile");
-$DI = $di->CreateProcess ("distributer", 
+$DI = $di->CreateProcess ("distributer",
                           " -ORBInitRef NameService=file://$di_nsiorfile ");
 
 print STDERR "Starting Naming Service\n";
diff --git a/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
index 0bcd944b1e8..b0e4269dc09 100644
--- a/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
+++ b/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
@@ -1,46 +1,46 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -49,64 +49,66 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  // = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  /// Constructor
   Sender (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Method to initialize the various data components.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
   void streamctrl (AVStreams::StreamCtrl_ptr streamctrl);
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  // The endpoint strategy used by the sender.
 
+  /// The receiver MMDevice that the sender connects to.
   AVStreams::MMDevice_var receiver_mmdevice_;
-  // The receiver MMDevice that the sender connects to.
 
+  /// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// Stream controller
   AVStreams::StreamCtrl_ptr streamctrl_;
-  // Stream controller
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_CString filename_;
-  // File from which data is read.
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// Rate at which the data will be sent.
   double frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object *protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 };
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
deleted file mode 100644
index 2df05d9674f..00000000000
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
+++ /dev/null
@@ -1,94 +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:
-## ../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.AVS_Simple_Two_Stage_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  Receiver_Stats.cpp \
-  receiver.cpp \
-  Receiver_Stats.h \
-  Receiver_Stats.inl \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Simple_Two_Stage_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  sender.cpp \
-  Receiver_Stats.inl \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp b/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
index 3ea29febda8..5f85dccebff 100644
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
+++ b/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
@@ -8,7 +8,7 @@
 #include "Receiver_Stats.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Receiver_Stats, "$Id$")
+
 
 void
 Receiver_Stats::accumulate (const Receiver_Stats &rhs)
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
index 3c00059838b..b5288300a36 100644
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
+++ b/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
@@ -1,22 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
@@ -24,17 +21,19 @@
 #include "orbsvcs/AV/Policy.h"
 #include "Receiver_Stats.h"
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -49,61 +48,65 @@ public:
   void dump_samples (const char* file);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 
   Receiver_Stats stats_;
 
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// Receiver application callback.
   Receiver_Callback callback_;
-  // Receiver application callback.
 
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  /// Constructor
   Receiver (void);
-  // Constructor
 
+  /// Destructor.
   ~Receiver (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
 
 protected:
+  /// The Naming Service Client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service Client.
 
+  /// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reactive strategy.
 
+  /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  // Receiver MMDevice.
 
 
 };
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl b/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
index 3d26e83d6a4..6b822f19ce1 100755
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
@@ -65,7 +65,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
 print STDERR "Starting Naming Service\n";
@@ -111,12 +111,12 @@ for $protocol (@protocols) {
     my $sv_outputfile = $sv->LocalFile ($outputfile);
     $ns->DeleteFile ($outputfile);
 
-    $SV = $sv->CreateProcess ("receiver", 
+    $SV = $sv->CreateProcess ("receiver",
                               "-ORBInitRef NameService=file://$sv_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-f $sv_outputfile");
 
-    $CL = $cl->CreateProcess ("sender", 
+    $CL = $cl->CreateProcess ("sender",
                               "-ORBInitRef NameService=file://$cl_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-p $protocol ".
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
index a64de401230..d10071d5561 100644
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
+++ b/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
@@ -1,46 +1,46 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -49,82 +49,84 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  // = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  /// Constructor
   Sender (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Method to initialize the various data components.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Method that binds the sender to the receiver.
   int bind_to_receiver (void);
-  // Method that binds the sender to the receiver.
 
+  /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  // The endpoint strategy used by the sender.
 
+  /// The receiver MMDevice that the sender connects to.
   AVStreams::MMDevice_var receiver_mmdevice_;
-  // The receiver MMDevice that the sender connects to.
 
+  /// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// Stream controller
   TAO_StreamCtrl *streamctrl_;
-  // Stream controller
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_TString filename_;
-  // File from which data is read.
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// Selected protocol - default is UDP
   ACE_TString protocol_;
-  // Selected protocol - default is UDP
 
+  /// Rate at which the data will be sent.
   double frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object *protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 
+  /// Destination Address.
   char* address_;
-  // Destination Address.
 
+  /// Destination Address.
   char* peer_address_;
-  // Destination Address.
 
+  /// Local secondary addresses
   char** local_sec_addrs_;
-  // Local secondary addresses
 
+  /// Peer secondary addresses
   char** peer_sec_addrs_;
-  // Peer secondary addresses
 
   int num_local_sec_addrs_;
   int num_peer_sec_addrs_;
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am b/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
deleted file mode 100644
index 8c5fb6f43a2..00000000000
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
+++ /dev/null
@@ -1,90 +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:
-## ../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.AVS_Simple_Two_Stage_With_QoS_Recv.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  receiver.cpp \
-  receiver.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.AVS_Simple_Two_Stage_With_QoS_Send.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  sender.cpp \
-  sender.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
index 3b94e1d1e42..fb5d11e2cdb 100644
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
+++ b/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
@@ -1,22 +1,19 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple
-//
-// = FILENAME
-//    receiver.h
-//
-// = DESCRIPTION
-//    This application receives data from a AV sender and writes it to
-//    a file.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    receiver.h
+ *
+ *  $Id$
+ *
+ *  This application receives data from a AV sender and writes it to
+ *  a file.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
@@ -24,17 +21,19 @@
 #include "orbsvcs/AV/Policy.h"
 
 
+/**
+ * @class Receiver_Callback
+ *
+ * @brief Application defined callback object.
+ *
+ * AVStreams calls this class when data shows up from a sender.
+ */
 class Receiver_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Application defined callback object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class when data shows up from a sender.
 public:
 
+  /// Constructor.
   Receiver_Callback (void);
-  // Constructor.
 
   // Method that is called when there is data to be received from a
   // sender.
@@ -47,54 +46,58 @@ public:
   int handle_destroy (void);
 
 private:
+  /// Keeping a count of the incoming frames.
   int frame_count_;
-  // Keeping a count of the incoming frames.
 };
 
+/**
+ * @class Receiver_StreamEndPoint
+ *
+ * @brief Application defined stream endpoint object.
+ *
+ * AVStreams calls this class during connection setup.
+ */
 class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Application defined stream endpoint object.
-  //
-  // = DESCRIPTION
-  //    AVStreams calls this class during connection setup.
 public:
   // Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
 private:
+  /// Receiver application callback.
   Receiver_Callback callback_;
-  // Receiver application callback.
 };
 
+/**
+ * @class Receiver
+ *
+ * @brief Receiver application class.
+ *
+ * This class receives data from a AV sender and writes it to
+ * a file.
+ */
 class Receiver
 {
-  // = TITLE
-  //    Receiver application class.
-  //
-  // = DESCRIPTION
-  //    This class receives data from a AV sender and writes it to
-  //    a file.
 public:
+  /// Constructor
   Receiver (void);
-  // Constructor
 
+  /// Destructor.
   ~Receiver (void);
-  // Destructor.
 
+  /// Initialize data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize data components.
 
 protected:
+  /// The Naming Service Client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service Client.
 
+  /// The endpoint reactive strategy.
   TAO_AV_Endpoint_Reactive_Strategy_B
   <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reactive strategy.
 
+  /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-  // Receiver MMDevice.
 };
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl b/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
index 3d26e83d6a4..6b822f19ce1 100755
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
+++ b/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
@@ -65,7 +65,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
 print STDERR "Starting Naming Service\n";
@@ -111,12 +111,12 @@ for $protocol (@protocols) {
     my $sv_outputfile = $sv->LocalFile ($outputfile);
     $ns->DeleteFile ($outputfile);
 
-    $SV = $sv->CreateProcess ("receiver", 
+    $SV = $sv->CreateProcess ("receiver",
                               "-ORBInitRef NameService=file://$sv_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-f $sv_outputfile");
 
-    $CL = $cl->CreateProcess ("sender", 
+    $CL = $cl->CreateProcess ("sender",
                               "-ORBInitRef NameService=file://$cl_nsiorfile ".
                               "-ORBDebugLevel $debug ".
                               "-p $protocol ".
diff --git a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
index 49e6dffa56d..3ee93e5654f 100644
--- a/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
+++ b/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
@@ -1,49 +1,49 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS
-//
-// = FILENAME
-//    sender.h
-//
-// = DESCRIPTION
-//    This application reads data from a file and sends it to s
-//    receiver through an RSVP enabled stream.
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sender.h
+ *
+ *  $Id$
+ *
+ *  This application reads data from a file and sends it to s
+ *  receiver through an RSVP enabled stream.
+ *
+ *
+ *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+/**
+ * @class Sender_StreamEndPoint
+ *
+ * @brief Defines a sender stream endpoint.
+ */
 class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a sender stream endpoint.
 public:
+  /// Create the application callback and return its handle to
+  /// AVStreams for further application callbacks.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  // Create the application callback and return its handle to
-  // AVStreams for further application callbacks.
 
+  /// Set protocol object corresponding to the transport protocol
+  /// chosen.
   int set_protocol_object (const char *flowname,
                            TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol
-  // chosen.
 
   CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
                              const AVStreams::flowSpec &/* the_flows */
                              );
 protected:
+  /// Application callback.
   TAO_AV_Callback callback_;
-  // Application callback.
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A
@@ -52,79 +52,81 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A
            AV_Null_MediaCtrl>
         SENDER_ENDPOINT_STRATEGY;
 
+/**
+ * @class Sender
+ *
+ * @brief Sender Application.
+ *
+ * Class is responsible for streaming (and pacing) data to a
+ * receiver.
+ */
 class Sender
 {
-  // = TITLE
-  //    Sender Application.
-  //
-  // = DESCRIPTION
-  //    Class is responsible for streaming (and pacing) data to a
-  //    receiver.
 public:
+  /// Constructor
   Sender (void);
-  // Constructor
 
+  /// Method to initialize the various data components.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Method to initialize the various data components.
 
+  /// Method to pace and send data from a file.
   int pace_data (void);
-  // Method to pace and send data from a file.
 
+  /// Set the protocol object corresponding to the transport protocol chosen.
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
 
+  /// Method to populate the required qos.
   void fill_qos (AVStreams::streamQoS &);
-  // Method to populate the required qos.
 
 private:
+  /// Method to parse the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Method to parse the command line arguments.
 
+  /// Method that binds the sender to the receiver.
   int bind_to_receiver (void);
-  // Method that binds the sender to the receiver.
 
+  /// The endpoint strategy used by the sender.
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
-  // The endpoint strategy used by the sender.
 
+  /// The receiver MMDevice that the sender connects to.
   AVStreams::MMDevice_var receiver_mmdevice_;
-  // The receiver MMDevice that the sender connects to.
 
+  /// The sender MMDevice.
   TAO_MMDevice *sender_mmdevice_;
-  // The sender MMDevice.
 
+  /// Stream controller
   TAO_StreamCtrl *streamctrl_;
-  // Stream controller
 
+  /// Number of frames sent.
   int frame_count_;
-  // Number of frames sent.
 
+  /// File from which data is read.
   ACE_CString filename_;
-  // File from which data is read.
 
+  /// The Naming Service client.
   TAO_Naming_Client naming_client_;
-  // The Naming Service client.
 
+  /// File handle of the file read from.
   FILE *input_file_;
-  // File handle of the file read from.
 
+  /// Selected protocol - default is UDP
   ACE_CString protocol_;
-  // Selected protocol - default is UDP
 
+  /// Rate at which the data will be sent.
   double frame_rate_;
-  // Rate at which the data will be sent.
 
+  /// Message block into which data is read from a file and then sent.
   ACE_Message_Block mb_;
-  // Message block into which data is read from a file and then sent.
 
+  /// Protocol object corresponding to the transport protocol selected.
   TAO_AV_Protocol_Object *protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
 
+  /// Destination Address.
   ACE_TCHAR *address_;
-  // Destination Address.
 
+  /// Destination Address.
   ACE_TCHAR *peer_addr_;
-  // Destination Address.
 
   ACE_CString flowname_;
 };
diff --git a/orbsvcs/tests/BiDir_CORBALOC/Makefile.am b/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
deleted file mode 100644
index 229d00ecf2c..00000000000
--- a/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
+++ /dev/null
@@ -1,85 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.BiDirCORBALOC_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TimeModuleC.cpp \
-  TimeModuleC.h \
-  TimeModuleC.inl \
-  TimeModuleS.cpp \
-  TimeModuleS.h \
-  TimeModuleS.inl
-
-CLEANFILES = \
-  TimeModule-stamp \
-  TimeModuleC.cpp \
-  TimeModuleC.h \
-  TimeModuleC.inl \
-  TimeModuleS.cpp \
-  TimeModuleS.h \
-  TimeModuleS.inl
-
-TimeModuleC.cpp TimeModuleC.h TimeModuleC.inl TimeModuleS.cpp TimeModuleS.h TimeModuleS.inl: TimeModule-stamp
-
-TimeModule-stamp: $(srcdir)/TimeModule.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/TimeModule.idl
-	@touch $@
-
-noinst_PROGRAMS = TimeServer
-
-TimeServer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-TimeServer_SOURCES = \
-  TimeModuleC.cpp \
-  TimeModuleS.cpp \
-  TimeServer.cpp \
-  TimeModuleC.h \
-  TimeModuleC.inl \
-  TimeModuleS.h \
-  TimeModuleS.inl
-
-TimeServer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/BiDir_CORBALOC/run_test.pl b/orbsvcs/tests/BiDir_CORBALOC/run_test.pl
index aca5e9267b2..959027251ff 100755
--- a/orbsvcs/tests/BiDir_CORBALOC/run_test.pl
+++ b/orbsvcs/tests/BiDir_CORBALOC/run_test.pl
@@ -30,7 +30,7 @@ my $iorbase = "test.ior";
 my $server_iorfile = $server->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../Naming_Service/Naming_Service",
+$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming",
                               "-ORBEndpoint iiop://$host:$orb_port -o $server_iorfile");
 $CL = $client->CreateProcess ("TimeServer",
                               "-ORBInitRef NameService=corbaloc:iiop:$host:$orb_port/NameService");
diff --git a/orbsvcs/tests/Bug_1334_Regression/Makefile.am b/orbsvcs/tests/Bug_1334_Regression/Makefile.am
deleted file mode 100644
index f467720c66e..00000000000
--- a/orbsvcs/tests/Bug_1334_Regression/Makefile.am
+++ /dev/null
@@ -1,48 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1334_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/Bug_1334_Regression/run_test.pl b/orbsvcs/tests/Bug_1334_Regression/run_test.pl
index b56a844d301..a32c695222c 100755
--- a/orbsvcs/tests/Bug_1334_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_1334_Regression/run_test.pl
@@ -34,7 +34,7 @@ $CLI = $ns->CreateProcess ("client");
 
 # Fire up the Name Service
 #
-$NS = $ns->CreateProcess ("../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming",
                           "-ORBDebugLevel $debug_level ".
                           "-o $ns_nsiorfile");
 $NS_status = $NS->Spawn ();
@@ -64,7 +64,7 @@ if ($CLI_status != 0) {
         print STDERR "ERROR: Closing Name Service returned $NS_status\n";
     }
     $ns->DeleteFile ($nsiorfile);
-    exit 1;    
+    exit 1;
 }
 
 # Now try it with a duff ior in the environment variable.
@@ -80,7 +80,7 @@ if ($CLI_status != 1) {
         print STDERR "ERROR: Closing Name Service returned $NS_status\n";
     }
     $ns->DeleteFile ($nsiorfile);
-    exit 1;    
+    exit 1;
 }
 
 # Now try with a duff ior in the environment variable but overridden by
@@ -97,7 +97,7 @@ if ($CLI_status != 0) {
         print STDERR "ERROR: Closing Name Service returned $NS_status\n";
     }
     $ns->DeleteFile ($nsiorfile);
-    exit 1;    
+    exit 1;
 }
 
 # Clean up and return
diff --git a/orbsvcs/tests/Bug_1393_Regression/Makefile.am b/orbsvcs/tests/Bug_1393_Regression/Makefile.am
deleted file mode 100644
index 4e42c806b57..00000000000
--- a/orbsvcs/tests/Bug_1393_Regression/Makefile.am
+++ /dev/null
@@ -1,46 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1393_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_1393_Regression/run_test.pl b/orbsvcs/tests/Bug_1393_Regression/run_test.pl
index a8832ba2f0a..ddfff9c21e6 100755
--- a/orbsvcs/tests/Bug_1393_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_1393_Regression/run_test.pl
@@ -24,7 +24,7 @@ my $tao_idl_bin = "$ENV{ACE_ROOT}/bin";
 my $service = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $client  = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
 my $taoifr  = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n";
- 
+
 # The idl file to be used for the test
 my $test_idl = "test.idl";
 my $ifr_ior  = "ifr.ior";
@@ -38,7 +38,7 @@ $client->DeleteFile ($ifr_ior);
 $taoifr->DeleteFile ($ifr_ior);
 
 $TAO_IDL     = $service->CreateProcess("$tao_idl_bin/tao_idl", "$service_test_idl");
-$IFR_SERVICE = $service->CreateProcess("$ifr_service_bin/IFR_Service", "-o $service_ifr_ior");
+$IFR_SERVICE = $service->CreateProcess("$ifr_service_bin/tao_ifr_service", "-o $service_ifr_ior");
 $TAO_IFR     = $service->CreateProcess("$tao_ifr_bin/tao_ifr",
                                        "-ORBInitRef InterfaceRepository=file://$taoifr_ifr_ior ".
                                        "$taoifr_test_idl");
@@ -65,7 +65,7 @@ if ($result == 0) {
             last;
         }
     }
-    close (HANDLE);  
+    close (HANDLE);
 }
 
 # Check result of idl compiler test
@@ -90,7 +90,7 @@ if ($result != 0) {
 if ($service->WaitForFileTimed ($ifr_ior, $service->ProcessStartWaitInterval()) == -1) {
     print STDERR "ERROR: cannot find $service_ifr_ior\n";
     $IFR_SERVICE->Kill (); $IFR_SERVICE->TimedWait (1);
-    $status = 1; 
+    $status = 1;
 }
 
 if ($service->GetFile ($test_idl) == -1) {
@@ -123,7 +123,7 @@ if ($client->PutFile ($ifr_ior) == -1) {
     exit 1;
 }
 
-# Use the iao_ifr utility to add our test IDL 
+# Use the iao_ifr utility to add our test IDL
 $result = $TAO_IFR->SpawnWaitKill ($taoifr->ProcessStartWaitInterval() + 15);
 
 if ($result != 0) {
@@ -131,7 +131,7 @@ if ($result != 0) {
    $status = 1;
 }
 
-# Invoke the client code that retrieves the interface and checks it's not munged   
+# Invoke the client code that retrieves the interface and checks it's not munged
 $result = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 15);
 
 if ($result != 0) {
diff --git a/orbsvcs/tests/Bug_1395_Regression/Makefile.am b/orbsvcs/tests/Bug_1395_Regression/Makefile.am
deleted file mode 100644
index 81c1b21dd82..00000000000
--- a/orbsvcs/tests/Bug_1395_Regression/Makefile.am
+++ /dev/null
@@ -1,110 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1395_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1395_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1395_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  server.cpp \
-  Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_1395_Regression/client.cpp b/orbsvcs/tests/Bug_1395_Regression/client.cpp
index 5b159a6fc72..506f0220319 100644
--- a/orbsvcs/tests/Bug_1395_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_1395_Regression/client.cpp
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_1395_Regression/run_test.pl b/orbsvcs/tests/Bug_1395_Regression/run_test.pl
index a6ec278de0b..0e7cb9f2f87 100755
--- a/orbsvcs/tests/Bug_1395_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_1395_Regression/run_test.pl
@@ -54,9 +54,9 @@ $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_
                                         "-ORBInitRef ImplRepoService=file://$server_imr_ior ".
                                         "-ORBUseIMR 1");
 $CL = $client->CreateProcess ("client", "-k file://$client_srv_ior");
-$LC = $locator->CreateProcess ("$imr_bin_path/ImplRepo_Service", "-o $locator_imr_ior ".
+$LC = $locator->CreateProcess ("$imr_bin_path/tao_imr_locator", "-o $locator_imr_ior ".
                                                                  "-ORBEndpoint iiop://:$port");
-$AC = $activator->CreateProcess ("$imr_bin_path/ImR_Activator", 
+$AC = $activator->CreateProcess ("$imr_bin_path/tao_imr_activator",
                                  "-o $activator_actv_ior ".
                                  "-ORBInitRef ImplRepoService=file://$activator_imr_ior");
 
diff --git a/orbsvcs/tests/Bug_1395_Regression/server.cpp b/orbsvcs/tests/Bug_1395_Regression/server.cpp
index 3ace4f1a72d..383d446bfcf 100644
--- a/orbsvcs/tests/Bug_1395_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_1395_Regression/server.cpp
@@ -47,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_1436_Regression/run_test.pl b/orbsvcs/tests/Bug_1436_Regression/run_test.pl
index eed9ffff0cc..5e399f43fdb 100755
--- a/orbsvcs/tests/Bug_1436_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_1436_Regression/run_test.pl
@@ -52,7 +52,7 @@ $tao_ifr_result_file     = $ifr_service->LocalFile ($result_files[1]);
 $ifr_service->DeleteFile ($result_files[0]);
 $tao_ifr->DeleteFile ($result_files[1]);
 
-$IFRSERVICE = $ifr_service->CreateProcess("$ifr_bin_path/IFR_Service", "-ORBdebuglevel $debug_level ".
+$IFRSERVICE = $ifr_service->CreateProcess("$ifr_bin_path/tao_ifr_service", "-ORBdebuglevel $debug_level ".
                                          "-ORBLogFile $ifr_service_result_file ".
                                          "-o $ifr_service_iorfile");
 $TAOIFR = $tao_ifr->CreateProcess("$tao_ifr_bin_path/tao_ifr", "-ORBLogFile $tao_ifr_result_file ".
diff --git a/orbsvcs/tests/Bug_1437_Regression/run_test.pl b/orbsvcs/tests/Bug_1437_Regression/run_test.pl
index 8c87f4bac7f..d0d1f3be8bc 100755
--- a/orbsvcs/tests/Bug_1437_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_1437_Regression/run_test.pl
@@ -39,11 +39,11 @@ $tao_imr->DeleteFile ($imr_ior);
 # Run the IMR locator on a fixed port
 my $locator_port = $locator->RandomPort();
 
-$LC = $locator->CreateProcess ("../../ImplRepo_Service/ImplRepo_Service",
+$LC = $locator->CreateProcess ("../../ImplRepo_Service/tao_imr_locator",
                                "-ORBdebuglevel $debug_level -o $locator_imr_iorfile ".
                                "-ORBEndpoint iiop://:$locator_port");
 
-$AC = $activator->CreateProcess ("../../ImplRepo_Service/ImR_Activator",
+$AC = $activator->CreateProcess ("../../ImplRepo_Service/tao_imr_activator",
                                  "-ORBdebuglevel $debug_level -o $activator_iorfile ".
                                  "-ORBInitRef ImplRepoService=file://$activator_imr_iorfile");
 
diff --git a/orbsvcs/tests/Bug_1630_Regression/Makefile.am b/orbsvcs/tests/Bug_1630_Regression/Makefile.am
deleted file mode 100644
index cbbfd8ad9c7..00000000000
--- a/orbsvcs/tests/Bug_1630_Regression/Makefile.am
+++ /dev/null
@@ -1,46 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1630_testclient.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = testclient
-
-testclient_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-testclient_SOURCES = \
-  testclient.cpp
-
-testclient_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_1630_Regression/run_test.pl b/orbsvcs/tests/Bug_1630_Regression/run_test.pl
index 13b337b9020..492320b2a85 100755
--- a/orbsvcs/tests/Bug_1630_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_1630_Regression/run_test.pl
@@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level -o $server_iorfile");
 $CL = $client->CreateProcess ("testclient", "-ORBInitRef InterfaceRepository=file://$client_iorfile");
 
diff --git a/orbsvcs/tests/Bug_2074_Regression/Makefile.am b/orbsvcs/tests/Bug_2074_Regression/Makefile.am
deleted file mode 100644
index 72b36c37461..00000000000
--- a/orbsvcs/tests/Bug_2074_Regression/Makefile.am
+++ /dev/null
@@ -1,57 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2074_Regression_Test.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-test_SOURCES = \
-  ORB_Task.cpp \
-  test.cpp \
-  ORB_Task.h
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp b/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
index 8b28339da93..43136853f36 100644
--- a/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
+++ b/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
@@ -10,7 +10,7 @@
 #include "tao/Messaging/Messaging.h"
 #include "orbsvcs/CosNamingC.h"
 
-ACE_RCSID(Bug_2074_Regression, ORB_Task, "$Id$")
+
 
 ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc b/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc
new file mode 100644
index 00000000000..73eec09226d
--- /dev/null
+++ b/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project(*Client) : namingexe, portableserver, messaging {
+  exename  = client
+}
+
diff --git a/orbsvcs/tests/Bug_2112_Regression/client.cpp b/orbsvcs/tests/Bug_2112_Regression/client.cpp
new file mode 100644
index 00000000000..64b1aa5d13f
--- /dev/null
+++ b/orbsvcs/tests/Bug_2112_Regression/client.cpp
@@ -0,0 +1,63 @@
+// $Id$
+
+#include "ace/Log_Msg.h"
+#include "tao/corba.h"
+#include "tao/TimeBaseC.h"
+#include "tao/Messaging/Messaging.h"
+#include "orbsvcs/CosNamingC.h"
+
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+  int retval = 0;
+  // Initialise ORB
+  CORBA::ORB_var Orb = CORBA::ORB_init(argc, argv);
+
+  // Set round-trip timeout
+  const int timeout_secs = 5;
+
+  CORBA::Object_var obj = Orb->resolve_initial_references ("ORBPolicyManager");
+  CORBA::PolicyManager_var policy_manager =
+    CORBA::PolicyManager::_narrow (obj.in());
+
+  CORBA::PolicyList policy_list;
+  policy_list.length(0);
+  policy_manager->set_policy_overrides(policy_list, CORBA::SET_OVERRIDE);
+
+  TimeBase::TimeT timeout = timeout_secs * 10000000;
+  CORBA::Any orb_timeout;
+  orb_timeout <<= timeout;
+  policy_list.length(1);
+  policy_list[0] = Orb->create_policy(
+    Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, orb_timeout);
+
+  policy_manager->set_policy_overrides(policy_list, CORBA::SET_OVERRIDE);
+
+  // Now try to contact a server.
+  // Use a remote machine that is unreachable on the network.
+  const char * obj_ref = "corbaloc:iiop:1.0@123.123.123.123:4567/NameService";
+
+  obj = Orb->string_to_object(obj_ref);
+
+  CosNaming::NamingContext_var inc;
+  if(!CORBA::is_nil(obj.in ()))
+    {
+      ACE_DEBUG(( LM_INFO, "Attempting to contact %C\n", obj_ref ));
+      try
+        {
+          inc = CosNaming::NamingContext::_narrow(obj.in());
+          ACE_DEBUG(( LM_INFO, "OK\n" ));
+        }
+      catch(const CORBA::TRANSIENT &)
+        {
+          ACE_ERROR ((LM_ERROR, "Error, caught transient exception\n"));
+          retval = 1;
+        }
+      catch(const CORBA::TIMEOUT &)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Caught correct timeout\n"));
+        }
+    }
+
+  return retval;
+}
+
diff --git a/orbsvcs/tests/Bug_2112_Regression/run_test.pl b/orbsvcs/tests/Bug_2112_Regression/run_test.pl
new file mode 100755
index 00000000000..b625ebe7487
--- /dev/null
+++ b/orbsvcs/tests/Bug_2112_Regression/run_test.pl
@@ -0,0 +1,22 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+
+$SV = $server->CreateProcess ("client", "");
+
+$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
+
+if ($test != 0) {
+    print STDERR "ERROR: test returned $test\n";
+    exit 1;
+}
+
+exit 0;
diff --git a/orbsvcs/tests/Bug_2137_Regression/Makefile.am b/orbsvcs/tests/Bug_2137_Regression/Makefile.am
deleted file mode 100644
index 13c4b1693c1..00000000000
--- a/orbsvcs/tests/Bug_2137_Regression/Makefile.am
+++ /dev/null
@@ -1,65 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2137_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2137_Regression/client.cpp b/orbsvcs/tests/Bug_2137_Regression/client.cpp
index cfcd3ec5afc..1d3c0dac05e 100644
--- a/orbsvcs/tests/Bug_2137_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2137_Regression/client.cpp
@@ -26,7 +26,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2247_Regression/Makefile.am b/orbsvcs/tests/Bug_2247_Regression/Makefile.am
deleted file mode 100644
index d94e337933d..00000000000
--- a/orbsvcs/tests/Bug_2247_Regression/Makefile.am
+++ /dev/null
@@ -1,135 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2247_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_2247_Regression_Manager.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Manager
-
-Manager_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Manager_SOURCES = \
-  Manager.cpp \
-  testC.cpp \
-  Manager.h
-
-Manager_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2247_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index cd38accf129..3b87dbd6560 100644
--- a/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -71,7 +71,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2247_Regression/server.cpp b/orbsvcs/tests/Bug_2247_Regression/server.cpp
index 0e6e4335996..95d4bc297a8 100644
--- a/orbsvcs/tests/Bug_2247_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2247_Regression/server.cpp
@@ -32,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2248_Regression/Client_i.h b/orbsvcs/tests/Bug_2248_Regression/Client_i.h
index e85d58ef471..402529f99c6 100644
--- a/orbsvcs/tests/Bug_2248_Regression/Client_i.h
+++ b/orbsvcs/tests/Bug_2248_Regression/Client_i.h
@@ -1,15 +1,17 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Client_i.h
-//
-// = DESCRIPTION
-//    A helper class for the client
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Client_i.h
+ *
+ *  $Id$
+ *
+ *  A helper class for the client
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef BUG_2248_REGRESSION_CLIENT_I_H
 #define BUG_2248_REGRESSION_CLIENT_I_H
@@ -24,11 +26,11 @@
 class Client_i
 {
 public:
+  /// Our constructor
   Client_i (CORBA::ORB_ptr orb);
-  // Our constructor
 
+  /// Initialize the ORB etc.
   int init (void);
-  // Initialize the ORB etc.
 
 private:
   CORBA::ORB_var orb_;
diff --git a/orbsvcs/tests/Bug_2248_Regression/Makefile.am b/orbsvcs/tests/Bug_2248_Regression/Makefile.am
deleted file mode 100644
index b42d58a398e..00000000000
--- a/orbsvcs/tests/Bug_2248_Regression/Makefile.am
+++ /dev/null
@@ -1,179 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2248_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  testsC.cpp \
-  testsC.h \
-  testsC.inl \
-  testsS.cpp \
-  testsS.h \
-  testsS.inl
-
-CLEANFILES += \
-  tests-stamp \
-  testsC.cpp \
-  testsC.h \
-  testsC.inl \
-  testsS.cpp \
-  testsS.h \
-  testsS.inl
-
-testsC.cpp testsC.h testsC.inl testsS.cpp testsS.h testsS.inl: tests-stamp
-
-tests-stamp: $(srcdir)/tests.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/tests.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl \
-  tests.idl
-
-## Makefile.Bug_2248_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  client.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2248_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  testsC.cpp \
-  testsS.cpp \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2248_Regression/client.cpp b/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 9cc9cdb2f6e..c45ace22ae6 100644
--- a/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -11,7 +11,7 @@
 #include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "ace/OS_NS_stdio.h"
-#include "ace/OS.h"
+#include "ace/OS_NS_unistd.h"
 
 // Files which have the IOR
 const ACE_TCHAR *first_ior = 0;
@@ -71,7 +71,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2248_Regression/server.cpp b/orbsvcs/tests/Bug_2248_Regression/server.cpp
index 59feb7de5cb..cabcf8fbc13 100644
--- a/orbsvcs/tests/Bug_2248_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2248_Regression/server.cpp
@@ -42,7 +42,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
index ce5558c04f2..8814ead3a6c 100644
--- a/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 CORBA::Boolean
 Hello::ids_differ_ = 1;
diff --git a/orbsvcs/tests/Bug_2285_Regression/Makefile.am b/orbsvcs/tests/Bug_2285_Regression/Makefile.am
deleted file mode 100644
index 15f7ed015e1..00000000000
--- a/orbsvcs/tests/Bug_2285_Regression/Makefile.am
+++ /dev/null
@@ -1,251 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2285_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2285_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2285_Regression_Client2.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client2
-
-client2_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client2_SOURCES = \
-  TestC.cpp \
-  client2.cpp \
-  Hello.h \
-  ServerORBInitializer.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor.h \
-  ServerRequest_Interceptor2.h
-
-client2_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2285_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer.cpp \
-  ServerRequest_Interceptor.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  ServerORBInitializer.h \
-  ServerRequest_Interceptor.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2285_Regression_Server2.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server2
-
-server2_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server2_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer2.cpp \
-  ServerRequest_Interceptor2.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server2.cpp \
-  Hello.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor2.h
-
-server2_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
index b4bcbcaeda5..b5d5b8e6d6e 100644
--- a/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
+++ b/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
@@ -1,3 +1,4 @@
+// $Id$
 // -*- C++ -*-
 
 #include "ServerRequest_Interceptor.h"
@@ -11,10 +12,6 @@
 #include "ace/OS_NS_string.h"
 #include "Hello.h"
 
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor,
-           "$Id$")
-
 TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor (void)
 : orb_ (0),
   client_id_ (0)
diff --git a/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
index a98700b1e51..655ddbf58fb 100644
--- a/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
+++ b/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequest_Interceptor2.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -14,10 +15,6 @@
 #include "Hello.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor2,
-           "$Id$")
-
 TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
 : orb_ (0),
   client_id_ (0)
diff --git a/orbsvcs/tests/Bug_2285_Regression/Test.idl b/orbsvcs/tests/Bug_2285_Regression/Test.idl
index 00cc73c174e..1b66c41a709 100644
--- a/orbsvcs/tests/Bug_2285_Regression/Test.idl
+++ b/orbsvcs/tests/Bug_2285_Regression/Test.idl
@@ -16,18 +16,18 @@ module Test
     oneway void shutdown ();
 
     // Methods for first test
-    
+
     // The client first calls this to generate a (user) exception
     // which is handled in the application code
     void throw_exception () raises (MyException);
-    
+
     // Starts the nested sequence - client calls...
     boolean call_me_back (in Hello me);
-    
+
     // ... then the server calls this back onto the client,
     // which prompts the client to call...
     boolean call_back ();
-    
+
     // ... this ! The server interceptor will have been recording
     // if any retention ID has been reused in the sequence of invocations
     // @return true for all different, false otherwise.
diff --git a/orbsvcs/tests/Bug_2285_Regression/client.cpp b/orbsvcs/tests/Bug_2285_Regression/client.cpp
index 97f77e1ffaa..0ae6bcb47a9 100644
--- a/orbsvcs/tests/Bug_2285_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2285_Regression/client.cpp
@@ -7,7 +7,7 @@
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "Hello.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/orbsvcs/tests/Bug_2285_Regression/client2.cpp
index 9b9e21b6bec..8f46138e1ef 100644
--- a/orbsvcs/tests/Bug_2285_Regression/client2.cpp
+++ b/orbsvcs/tests/Bug_2285_Regression/client2.cpp
@@ -9,7 +9,7 @@
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 //const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
@@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2285_Regression/run_test2.pl b/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
index 8fd2f4fe3f6..b13c3915082 100755
--- a/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
+++ b/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
@@ -83,7 +83,7 @@ for($i = 0; $i < $number_of_servers; $i++) {
 # Loops are cheap.
 for ($i = 0; $i < $number_of_servers; $i++) {
     $result = wait_get_send_ior($i);
- 
+
     if ($result != 0) {
         for ($j = 0; $j < $i + 1; $j++) {
             $SV[$j]->Kill (); $SV[$j]->TimedWait (1);
diff --git a/orbsvcs/tests/Bug_2285_Regression/server.cpp b/orbsvcs/tests/Bug_2285_Regression/server.cpp
index 8c84289abfd..1dae1234895 100644
--- a/orbsvcs/tests/Bug_2285_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2285_Regression/server.cpp
@@ -11,10 +11,6 @@
 #include "tao/PI/PI.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
 
@@ -40,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/orbsvcs/tests/Bug_2285_Regression/server2.cpp
index 55ce7d5c579..b29fc630c62 100644
--- a/orbsvcs/tests/Bug_2285_Regression/server2.cpp
+++ b/orbsvcs/tests/Bug_2285_Regression/server2.cpp
@@ -9,10 +9,6 @@
 #include "tao/PI/PI.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("");
 
 CORBA::ULong my_id_number = 0;
@@ -45,7 +41,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
index c20b692c4af..1c7d9ff5608 100644
--- a/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_2287_Regression/Makefile.am b/orbsvcs/tests/Bug_2287_Regression/Makefile.am
deleted file mode 100644
index 4050cbe0fde..00000000000
--- a/orbsvcs/tests/Bug_2287_Regression/Makefile.am
+++ /dev/null
@@ -1,152 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2287_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2287_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2287_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer2.cpp \
-  ServerRequest_Interceptor2.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor2.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
index d009ae9a5ab..eacb684044c 100644
--- a/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
+++ b/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequest_Interceptor2.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -15,10 +16,6 @@
 #include "ace/OS_NS_sys_time.h"
 #include "tao/PI/PIForwardRequestC.h"
 
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor2,
-           "$Id$")
-
 TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
 : orb_ (0),
   expired_ (0)
diff --git a/orbsvcs/tests/Bug_2287_Regression/client.cpp b/orbsvcs/tests/Bug_2287_Regression/client.cpp
index da8bd5258d7..894f0b52923 100644
--- a/orbsvcs/tests/Bug_2287_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2287_Regression/client.cpp
@@ -7,7 +7,7 @@
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "Hello.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2287_Regression/run_test.pl b/orbsvcs/tests/Bug_2287_Regression/run_test.pl
index b1492af15f9..018f2f5eac3 100755
--- a/orbsvcs/tests/Bug_2287_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_2287_Regression/run_test.pl
@@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 
diff --git a/orbsvcs/tests/Bug_2287_Regression/server.cpp b/orbsvcs/tests/Bug_2287_Regression/server.cpp
index 6b6bf38037b..58a197d2436 100644
--- a/orbsvcs/tests/Bug_2287_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2287_Regression/server.cpp
@@ -13,10 +13,6 @@
 // Make sure this file is included to avoid permanent forward problems in win32.
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
 
@@ -42,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2316_Regression/Makefile.am b/orbsvcs/tests/Bug_2316_Regression/Makefile.am
deleted file mode 100644
index 5fcd376fff9..00000000000
--- a/orbsvcs/tests/Bug_2316_Regression/Makefile.am
+++ /dev/null
@@ -1,129 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2316_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2316_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Test_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2316_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_impl.cpp \
-  server.cpp \
-  Test_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2316_Regression/Test.idl b/orbsvcs/tests/Bug_2316_Regression/Test.idl
index 36820e2b6d1..e79f3b87281 100644
--- a/orbsvcs/tests/Bug_2316_Regression/Test.idl
+++ b/orbsvcs/tests/Bug_2316_Regression/Test.idl
@@ -1,7 +1,7 @@
 // $Id$
 
 #ifndef _TEST_IDL_
-#define _TEST_IDL_ 
+#define _TEST_IDL_
 
 interface server
 {
diff --git a/orbsvcs/tests/Bug_2316_Regression/Test_impl.h b/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
index 5ecc2954d86..cf80fb9115d 100644
--- a/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
+++ b/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
@@ -4,7 +4,7 @@
 #define TEST_IMPL_HPP
 
 #include "TestS.h"
-    
+
 class Server_impl   : public virtual POA_server
 {
 public:
@@ -13,7 +13,7 @@ public:
   virtual void shutdown ();
 
 private:
-  CORBA::ORB_var orb_;    
+  CORBA::ORB_var orb_;
 };
 
 #endif /* TEST_IMPL_HPP */
diff --git a/orbsvcs/tests/Bug_2316_Regression/server.cpp b/orbsvcs/tests/Bug_2316_Regression/server.cpp
index 8901b60621d..5f02be738fa 100644
--- a/orbsvcs/tests/Bug_2316_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2316_Regression/server.cpp
@@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2316_Regression/svc.conf b/orbsvcs/tests/Bug_2316_Regression/svc.conf
index 65508eb6d59..5099f572598 100644
--- a/orbsvcs/tests/Bug_2316_Regression/svc.conf
+++ b/orbsvcs/tests/Bug_2316_Regression/svc.conf
@@ -1,4 +1,5 @@
 # $Id$
+
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
 dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
diff --git a/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp b/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp
index cd1f6e360cf..23e2e601a64 100644
--- a/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp
+++ b/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp
@@ -57,7 +57,7 @@ MessageLog::~MessageLog ()
 void
 MessageLog::register_message_send (int message_num)
 {
-  ACE_Guard<ACE_Mutex> guard(this->mutex_);
+  ACE_GUARD (ACE_Mutex, ace_mon, this->mutex_);
   if (0 <= message_num && message_num < this->expected_)
     {
       this->sent_[message_num]++;
@@ -66,7 +66,7 @@ MessageLog::register_message_send (int message_num)
     {
       this->overdoseS_++;
     }
-  
+
   if (!this->supress_)
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -78,7 +78,7 @@ MessageLog::register_message_send (int message_num)
 void
 MessageLog::register_message_recv (int message_num)
 {
-  ACE_Guard<ACE_Mutex> guard(this->mutex_);
+  ACE_GUARD (ACE_Mutex, ace_mon, this->mutex_);
   if (0 <= message_num && message_num < this->expected_)
     {
       this->rcvd_[message_num]++;
diff --git a/orbsvcs/tests/Bug_2377_Regression/Makefile.am b/orbsvcs/tests/Bug_2377_Regression/Makefile.am
deleted file mode 100644
index 226d1539305..00000000000
--- a/orbsvcs/tests/Bug_2377_Regression/Makefile.am
+++ /dev/null
@@ -1,91 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2377_Regression_Test.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-CLEANFILES = \
-  Hello-stamp \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp
-
-Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Hello.idl
-	@touch $@
-
-noinst_PROGRAMS = uipmc_test
-
-uipmc_test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-uipmc_test_SOURCES = \
-  HelloC.cpp \
-  HelloS.cpp \
-  Hello_Impl.cpp \
-  uipmc_test.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.h \
-  HelloS.inl \
-  Hello_Impl.h
-
-uipmc_test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2377_Regression/svc.conf b/orbsvcs/tests/Bug_2377_Regression/svc.conf
index 1510ade0e8f..9fa10a35d9f 100644
--- a/orbsvcs/tests/Bug_2377_Regression/svc.conf
+++ b/orbsvcs/tests/Bug_2377_Regression/svc.conf
@@ -1,5 +1,7 @@
+# $Id$
+
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
 dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock thread -ORBAllowReactivationOfSystemids 1"
-static Client_Strategy_Factory "-ORBProfileLock thread -ORBClientConnectionHandler MT"
+static Server_Strategy_Factory "-ORBConcurrency reactive -ORBAllowReactivationOfSystemids 1"
+static Client_Strategy_Factory "-ORBClientConnectionHandler MT"
diff --git a/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp b/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
index 09e8e6aad40..f6e0c0122e1 100644
--- a/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
+++ b/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
@@ -61,7 +61,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
     }
   while (true);
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -121,7 +121,7 @@ public:
           {
             int c = 0;
             {
-              ACE_Guard<ACE_Mutex> guard (this->mutex_);
+              ACE_GUARD_RETURN (ACE_Mutex, ace_mon, this->mutex_, 0);
               c = this->count_++;
             }
 
diff --git a/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
index 81115492175..dfa637f9960 100644
--- a/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
@@ -5,7 +5,7 @@
 #include "ServerRequest_Interceptor2.h"
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_2615_Regression/Makefile.am b/orbsvcs/tests/Bug_2615_Regression/Makefile.am
deleted file mode 100644
index 35af4cabe88..00000000000
--- a/orbsvcs/tests/Bug_2615_Regression/Makefile.am
+++ /dev/null
@@ -1,152 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2615_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2615_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor2.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2615_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer2.cpp \
-  ServerRequest_Interceptor2.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor2.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp b/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
index 7dd4cec52fe..74d342ba8ab 100644
--- a/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
+++ b/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequest_Interceptor2.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -15,10 +16,6 @@
 #include "ace/OS_NS_sys_time.h"
 #include "tao/PI/PIForwardRequestC.h"
 
-ACE_RCSID (FaultTolerance,
-           ServerRequest_Interceptor2,
-           "$Id$")
-
 CORBA::Boolean
 ServerRequest_Interceptor2::has_ft_request_sc_ = false;
 
diff --git a/orbsvcs/tests/Bug_2615_Regression/Test.idl b/orbsvcs/tests/Bug_2615_Regression/Test.idl
index 13acc187276..dc6d9c82e4e 100644
--- a/orbsvcs/tests/Bug_2615_Regression/Test.idl
+++ b/orbsvcs/tests/Bug_2615_Regression/Test.idl
@@ -13,11 +13,11 @@ module Test
      */
     oneway void shutdown ();
 
-    // Lets make sure things are working
+    /// Lets make sure things are working
     void ping ();
 
-    // Calling this method returns true iff a FT request
-    // service context was received in the server
+    /// Calling this method returns true if a FT request
+    /// service context was received in the server
     boolean has_ft_request_service_context ();
   };
 };
diff --git a/orbsvcs/tests/Bug_2615_Regression/client.cpp b/orbsvcs/tests/Bug_2615_Regression/client.cpp
index 8de294f3253..2632105c7f5 100644
--- a/orbsvcs/tests/Bug_2615_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2615_Regression/client.cpp
@@ -7,7 +7,7 @@
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "Hello.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://ior.ior");
 const ACE_TCHAR *iogr = ACE_TEXT("file://iogr.ior");
@@ -37,7 +37,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2615_Regression/run_test.pl b/orbsvcs/tests/Bug_2615_Regression/run_test.pl
index ee23d89724a..10e7d173aa4 100755
--- a/orbsvcs/tests/Bug_2615_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_2615_Regression/run_test.pl
@@ -33,7 +33,7 @@ my $client_iogrfile = $client->LocalFile ($iogrbase);
 $server->DeleteFile($iogrbase);
 $client->DeleteFile($iogrbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile " .
                               "-p $server_iogrfile");
diff --git a/orbsvcs/tests/Bug_2615_Regression/server.cpp b/orbsvcs/tests/Bug_2615_Regression/server.cpp
index a1206b32b29..7da2b3117cf 100644
--- a/orbsvcs/tests/Bug_2615_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2615_Regression/server.cpp
@@ -11,10 +11,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "Hello.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior.ior");
 const ACE_TCHAR *iogr_output_file = ACE_TEXT("iogr.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
@@ -44,7 +40,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2709_Regression/Makefile.am b/orbsvcs/tests/Bug_2709_Regression/Makefile.am
deleted file mode 100644
index b89cb7be2c6..00000000000
--- a/orbsvcs/tests/Bug_2709_Regression/Makefile.am
+++ /dev/null
@@ -1,179 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2709_Regression_Idl.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2709_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestImpl.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Server_Task.h \
-  TestImpl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2709_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-server_SOURCES = \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestImpl.cpp \
-  TestS.cpp \
-  server.cpp \
-  Server_Task.h \
-  TestImpl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2709_Regression/run_test.pl b/orbsvcs/tests/Bug_2709_Regression/run_test.pl
index 7200081f22a..953172a670c 100755
--- a/orbsvcs/tests/Bug_2709_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_2709_Regression/run_test.pl
@@ -32,7 +32,7 @@ $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 $client->DeleteFile($colloc_iorfile);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 
diff --git a/orbsvcs/tests/Bug_2709_Regression/server.cpp b/orbsvcs/tests/Bug_2709_Regression/server.cpp
index 7d862a52fd9..d5170de178d 100644
--- a/orbsvcs/tests/Bug_2709_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2709_Regression/server.cpp
@@ -1,6 +1,4 @@
-//
 // $Id$
-//
 
 #include "TestImpl.h"
 #include "ace/Get_Opt.h"
@@ -9,10 +7,6 @@
 #include "tao/IORTable/IORTable.h"
 #include "Server_Task.h"
 
-ACE_RCSID (Hello,
-           server,
-           "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 
 int
diff --git a/orbsvcs/tests/Bug_2777_Regression/run_test.pl b/orbsvcs/tests/Bug_2777_Regression/run_test.pl
index 37848fcc6ec..60fbbfbcf21 100755
--- a/orbsvcs/tests/Bug_2777_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_2777_Regression/run_test.pl
@@ -37,8 +37,8 @@ for my $p (@nslist_paths) {
     $nslist_path = $use_path . '/tao_nslist';
     last;
   }
-  if ($exec_extn ne "" && -e $p . '/tao_nslist' . $exec_extn) {
-    $nslist_path = $use_path . '/tao_nslist' . $exec_extn;
+  if ($exec_extn ne "" && -e $p->[0] . '/tao_nslist' . $exec_extn) {
+    $nslist_path = $use_path . '/tao_nslist';
     last;
   }
 }
@@ -48,8 +48,16 @@ if ($nslist_path eq "") {
     exit 1;
 }
 
+## The two test targets will communicate over shared memory (SHMIOP) so they
+## can't be 32-bit and 64-bit executables on the same host.
+my $target_ns_list = 2;
+if (exists $ENV{'DOC_TEST_2_EXE_SUBDIR'} && $ENV{'DOC_TEST_2_OS'} eq 'local' &&
+    $ENV{'DOC_TEST_2_EXE_SUBDIR'} ne $PerlACE::Process::ExeSubDir) {
+  $target_ns_list = 1;
+}
+
 my $ns_service = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-my $ns_list = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+my $ns_list = PerlACE::TestTarget::create_target ($target_ns_list) || die "Create target $target_ns_list failed\n";
 
 my $iorbase = "ns.ior";
 my $ns_service_iorfile = $ns_service->LocalFile ($iorbase);
@@ -57,7 +65,7 @@ my $ns_list_iorfile = $ns_list->LocalFile ($iorbase);
 $ns_service->DeleteFile($iorbase);
 $ns_list->DeleteFile($iorbase);
 
-$NS = $ns_service->CreateProcess ("../../../../TAO/orbsvcs/Naming_Service/Naming_Service",
+$NS = $ns_service->CreateProcess ("../../../../TAO/orbsvcs/Naming_Service/tao_cosnaming",
                                   "-ORBdebuglevel $debug_level -o $ns_service_iorfile ".
                                   "-ORBObjRefStyle URL -ORBEndpoint shmiop:// -ORBSvcConfDirective ".
                                   "\"dynamic SHMIOP_Factory Service_Object ".
diff --git a/orbsvcs/tests/Bug_2800_Regression/Hello.cpp b/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
index df5dc90d3d9..752bb07aa19 100644
--- a/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_2800_Regression/Makefile.am b/orbsvcs/tests/Bug_2800_Regression/Makefile.am
deleted file mode 100644
index 15321a05bce..00000000000
--- a/orbsvcs/tests/Bug_2800_Regression/Makefile.am
+++ /dev/null
@@ -1,156 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2800_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2800_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h \
-  NamingTask.h \
-  NsShutdown.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2800_Regression_NsMain.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += nsmain
-
-nsmain_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-nsmain_SOURCES = \
-  Hello.cpp \
-  NamingTask.cpp \
-  NsShutdown.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  nsmain.cpp \
-  Hello.h \
-  NamingTask.h \
-  NsShutdown.h
-
-nsmain_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2800_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp b/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
index ae73a73eefd..567d1fd0e70 100644
--- a/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
+++ b/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
@@ -1,11 +1,6 @@
-//
 // $Id$
-//
-#include "NsShutdown.h"
 
-ACE_RCSID(Hello,
-          NsShutdown,
-          "$Id$")
+#include "NsShutdown.h"
 
 NsShutdown::NsShutdown (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_2800_Regression/client.cpp b/orbsvcs/tests/Bug_2800_Regression/client.cpp
index 17f6fe73f85..d3f2259fc2f 100644
--- a/orbsvcs/tests/Bug_2800_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2800_Regression/client.cpp
@@ -4,7 +4,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://shutdown.ior");
 bool shutdown_nsmain = false;
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
index abced085c27..abbfd795475 100644
--- a/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
+++ b/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
@@ -4,7 +4,6 @@
 #include "Hello.h"
 #include "NsShutdown.h"
 #include "orbsvcs/CosNamingC.h"
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ns.ior");
@@ -58,7 +57,7 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv)
         shutdown_ns_ = true;
         break;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -80,7 +79,7 @@ int TestTask::svc()
       ACE_ERROR_RETURN ((LM_ERROR,
                           "Cannot open output file for writing IOR: ns.ior\n"),
                           1);
-    ACE_OS::fprintf (output_file, "%s", ACE_TEXT_CHAR_TO_TCHAR (namingServiceA_.ior ()));
+    ACE_OS::fprintf (output_file, "%s", namingServiceA_.ior ());
     ACE_OS::fclose (output_file);
 
     // Get reference to Root POA
diff --git a/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl b/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl
index de736f305a2..dcfb93f9dc7 100755
--- a/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl
+++ b/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl
@@ -50,9 +50,9 @@ $ns2->DeleteFile ($ns2_ior);
 $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile");
 $CL = $client->CreateProcess ("client", "");
 
-$NS1 = $ns1->CreateProcess("../../Naming_Service/Naming_Service",
+$NS1 = $ns1->CreateProcess("../../Naming_Service/tao_cosnaming",
                            "-ORBEndPoint $ns_endpoint1 -o $ns1_iorfile -m 0");
-$NS2 = $ns2->CreateProcess("../../Naming_Service/Naming_Service",
+$NS2 = $ns2->CreateProcess("../../Naming_Service/tao_cosnaming",
                            "-ORBEndPoint $ns_endpoint2 -o $ns2_iorfile -m 0");
 
 # Run two Naming Servers
diff --git a/orbsvcs/tests/Bug_2800_Regression/server.cpp b/orbsvcs/tests/Bug_2800_Regression/server.cpp
index 9dd4570db86..128d429cd5a 100644
--- a/orbsvcs/tests/Bug_2800_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2800_Regression/server.cpp
@@ -50,7 +50,7 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv)
         ior_output_file = get_opts.opt_arg ();
         break;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2925_Regression/Makefile.am b/orbsvcs/tests/Bug_2925_Regression/Makefile.am
deleted file mode 100644
index a3a747f9c7c..00000000000
--- a/orbsvcs/tests/Bug_2925_Regression/Makefile.am
+++ /dev/null
@@ -1,137 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2925_Regression_IDL.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-CLEANFILES = \
-  Hello-stamp \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp
-
-Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Hello.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Hello.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2925_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  HelloC.cpp \
-  client.cpp \
-  Hello_Impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DiffServPolicy.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2925_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  HelloC.cpp \
-  HelloS.cpp \
-  Hello_Impl.cpp \
-  server.cpp \
-  Hello_Impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DiffServPolicy.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_2925_Regression/client.cpp b/orbsvcs/tests/Bug_2925_Regression/client.cpp
index 22f428a8c99..bd6e67c94b9 100644
--- a/orbsvcs/tests/Bug_2925_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2925_Regression/client.cpp
@@ -105,7 +105,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
     }
   while (true);
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -130,7 +130,7 @@ public:
           {
             CORBA::Short c = 0;
             {
-              ACE_Guard<ACE_Mutex> guard (this->mutex_);
+              ACE_GUARD_RETURN (ACE_Mutex, ace_mon, this->mutex_, 0);
               c = this->count_++;
             }
 
diff --git a/orbsvcs/tests/Bug_2925_Regression/run_test.pl b/orbsvcs/tests/Bug_2925_Regression/run_test.pl
index 595d9064fd1..5a906d21c11 100755
--- a/orbsvcs/tests/Bug_2925_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_2925_Regression/run_test.pl
@@ -11,7 +11,7 @@ use PerlACE::TestTarget;
 $status = 0;
 $debug_level = '0';
 $miop_address = '230.255.255.33';
-$port = '7394'; 
+$port = '7394';
 
 foreach $i (@ARGV) {
     if ($i eq '-debug') {
@@ -28,7 +28,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-u corbaloc:miop:1.0\@1.0-cdmwftdomain-1/$miop_address:$port " .
                               "-o $server_iorfile");
diff --git a/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl b/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl
index faceeae6586..7f548cc0884 100755
--- a/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl
+++ b/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl
@@ -11,7 +11,7 @@ use PerlACE::TestTarget;
 $status = 0;
 $debug_level = '0';
 $miop_address = '[FF01:0:0:0:0:0:BEBE:75]';
-$port = '5555'; 
+$port = '5555';
 
 foreach $i (@ARGV) {
     if ($i eq '-debug') {
@@ -28,7 +28,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-u corbaloc:miop:1.0\@1.0-cdmwftdomain-1/$miop_address:$port " .
                               "-o $server_iorfile");
diff --git a/orbsvcs/tests/Bug_2925_Regression/server.cpp b/orbsvcs/tests/Bug_2925_Regression/server.cpp
index 5bfada12cd4..56129a8e434 100644
--- a/orbsvcs/tests/Bug_2925_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_2925_Regression/server.cpp
@@ -48,7 +48,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
     }
   while (true);
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_2925_Regression/svc.conf b/orbsvcs/tests/Bug_2925_Regression/svc.conf
index 1510ade0e8f..9fa10a35d9f 100644
--- a/orbsvcs/tests/Bug_2925_Regression/svc.conf
+++ b/orbsvcs/tests/Bug_2925_Regression/svc.conf
@@ -1,5 +1,7 @@
+# $Id$
+
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
 dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock thread -ORBAllowReactivationOfSystemids 1"
-static Client_Strategy_Factory "-ORBProfileLock thread -ORBClientConnectionHandler MT"
+static Server_Strategy_Factory "-ORBConcurrency reactive -ORBAllowReactivationOfSystemids 1"
+static Client_Strategy_Factory "-ORBClientConnectionHandler MT"
diff --git a/orbsvcs/tests/Bug_3215_Regression/Hello.cpp b/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
index b838677dfdc..185704c073d 100644
--- a/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_3215_Regression/Makefile.am b/orbsvcs/tests/Bug_3215_Regression/Makefile.am
deleted file mode 100644
index aa52b9bff6c..00000000000
--- a/orbsvcs/tests/Bug_3215_Regression/Makefile.am
+++ /dev/null
@@ -1,152 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_3215_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_3215_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_3215_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer2.cpp \
-  ServerRequest_Interceptor2.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor2.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp b/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
index 4306f129fe2..6f9554e3515 100644
--- a/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
+++ b/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequest_Interceptor2.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -17,10 +18,6 @@
 
 int invocation_count = 0;
 
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor2,
-           "$Id$")
-
 TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
 : orb_ (0),
   expired_ (0)
diff --git a/orbsvcs/tests/Bug_3215_Regression/client.cpp b/orbsvcs/tests/Bug_3215_Regression/client.cpp
index f026595737b..76d5260263b 100644
--- a/orbsvcs/tests/Bug_3215_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_3215_Regression/client.cpp
@@ -7,7 +7,7 @@
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "Hello.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3215_Regression/run_test.pl b/orbsvcs/tests/Bug_3215_Regression/run_test.pl
index 33d5a50cb28..9d5b15d0ea3 100755
--- a/orbsvcs/tests/Bug_3215_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_3215_Regression/run_test.pl
@@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 
diff --git a/orbsvcs/tests/Bug_3215_Regression/server.cpp b/orbsvcs/tests/Bug_3215_Regression/server.cpp
index a321f4d6d21..db81c1d7630 100644
--- a/orbsvcs/tests/Bug_3215_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_3215_Regression/server.cpp
@@ -13,10 +13,6 @@
 // Make sure this file is included to avoid permanent forward problems in win32.
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
 
@@ -42,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -54,7 +50,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   TAO_IOP::TAO_IOR_Manipulation::IORList iors (1);
   iors.length(1);
   iors [0] = CORBA::Object::_duplicate (ref);
-    
+
   CORBA::Object_var new_ref =
     iorm->merge_iors (iors );
 
@@ -130,34 +126,34 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
-      
-      
+
+
       CORBA::PolicyList policies (2);
       policies.length (2);
 
       policies[0] =
         root_poa->create_id_assignment_policy (PortableServer::USER_ID
                                                );
-      
+
 
       policies[1] =
         root_poa->create_lifespan_policy (PortableServer::PERSISTENT
                                           );
-      
+
 
       PortableServer::POA_var my_poa =
         root_poa->create_POA ("my_poa",
                               poa_manager.in (),
                               policies
                               );
-      
+
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
           policy->destroy ();
-          
+
         }
 
 
@@ -169,29 +165,29 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                       Hello (orb.in (), Test::Hello::_nil ()),
                       1);
       PortableServer::ServantBase_var holder (hello_impl);
-                      
+
       PortableServer::ObjectId_var server_id =
         PortableServer::string_to_ObjectId ("server_id");
 
       my_poa->activate_object_with_id (server_id.in (),
                                        hello_impl
                                        );
-      
+
 
       CORBA::Object_var hello =
         my_poa->id_to_reference (server_id.in () );
-      
-      
+
+
       CORBA::String_var ior =
         orb->object_to_string (hello.in () );
-      
-      
+
+
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
                                          0
                                          );
-      
+
 
       // Narrow
       iorm =
@@ -199,14 +195,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       CORBA::Object_var iortmp =
         orb->string_to_object (ior.in ());
-      
+
       CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, iortmp.in ());
-      
-      
+
+
       CORBA::String_var iorgr_string =
         orb->object_to_string (iogr.in () );
-      
-      
+
+
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
       if (output_file == 0)
@@ -218,17 +214,17 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_OS::fclose (output_file);
 
       temp_initializer->set_server_iogr (iogr.in ());
-          
+
       poa_manager->activate ();
-      
+
 
       orb->run ();
-      
+
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
       root_poa->destroy (1, 1 );
-      
+
 
       orb->destroy ();
     }
@@ -238,7 +234,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                            "Exception caught:");
       return 1;
     }
-  
+
 
   return 0;
 }
diff --git a/orbsvcs/tests/Bug_3216_Regression/Hello.cpp b/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
index 73c4c9fe95e..c5463121e4f 100644
--- a/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 CORBA::Boolean
 Hello::normal_context_ok_ = 0;
diff --git a/orbsvcs/tests/Bug_3216_Regression/Makefile.am b/orbsvcs/tests/Bug_3216_Regression/Makefile.am
deleted file mode 100644
index 43079feed0d..00000000000
--- a/orbsvcs/tests/Bug_3216_Regression/Makefile.am
+++ /dev/null
@@ -1,152 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_3216_Regression_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_3216_Regression_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h \
-  ServerORBInitializer.h \
-  ServerRequest_Interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_3216_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer.cpp \
-  ServerRequest_Interceptor.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  ServerORBInitializer.h \
-  ServerRequest_Interceptor.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp b/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
index 62d2fa1b2ec..e4bc728b877 100644
--- a/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
+++ b/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequest_Interceptor.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -11,10 +12,6 @@
 #include "ace/OS_NS_string.h"
 #include "Hello.h"
 
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor,
-           "$Id$")
-
 TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor (void)
 : orb_ (0),
   client_id_ (0)
diff --git a/orbsvcs/tests/Bug_3216_Regression/client.cpp b/orbsvcs/tests/Bug_3216_Regression/client.cpp
index 280732d27b9..d29d8ce1854 100644
--- a/orbsvcs/tests/Bug_3216_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_3216_Regression/client.cpp
@@ -7,7 +7,7 @@
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "Hello.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3216_Regression/run_test.pl b/orbsvcs/tests/Bug_3216_Regression/run_test.pl
index b1492af15f9..018f2f5eac3 100755
--- a/orbsvcs/tests/Bug_3216_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_3216_Regression/run_test.pl
@@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 
diff --git a/orbsvcs/tests/Bug_3216_Regression/server.cpp b/orbsvcs/tests/Bug_3216_Regression/server.cpp
index cb35a50ec49..6aa822e5431 100644
--- a/orbsvcs/tests/Bug_3216_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_3216_Regression/server.cpp
@@ -11,10 +11,6 @@
 #include "tao/PI/PI.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
 
@@ -40,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp b/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
index 899ea6a9869..74f821455e5 100644
--- a/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
+++ b/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
@@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 
-int 
+int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
@@ -50,53 +50,53 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       CORBA::Object_var naming_obj =
         orb->resolve_initial_references ("NameService");
-     
+
       CosNaming::NamingContext_var naming_context =
         CosNaming::NamingContext::_narrow(naming_obj.in());
-     
+
       CosNaming::Name name;
       name.length (1);
       name[0].id = CORBA::string_dup("MyEventChannel");
       CORBA::Object_var ecObj = naming_context->resolve(name);
-           
-      CosNotifyChannelAdmin::EventChannel_var ec = 
+
+      CosNotifyChannelAdmin::EventChannel_var ec =
         CosNotifyChannelAdmin::EventChannel::_narrow(ecObj.in());
-     
+
       CosNotifyChannelAdmin::AdminID adminid;
       CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
         CosNotifyChannelAdmin::OR_OP;
-      
-      CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin = 
-        ec->new_for_consumers(ifgop, 
+
+      CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
+        ec->new_for_consumers(ifgop,
                               adminid);
-      
+
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
-                  
-      PortableServer::POA_var poa = 
+
+      PortableServer::POA_var poa =
         PortableServer::POA::_narrow (poa_object.in());
-      
+
       StructuredEventConsumer_i  servant (orb);
 
       PortableServer::ObjectId_var objectId = poa->activate_object (&servant);
-      
+
       CORBA::Object_var consumer_obj = poa->id_to_reference (objectId.in ());
 
-      CosNotifyComm::StructuredPushConsumer_var consumer = 
+      CosNotifyComm::StructuredPushConsumer_var consumer =
         CosNotifyComm::StructuredPushConsumer::_narrow (consumer_obj.in ());
-      
-      CosNotifyChannelAdmin::ProxyID consumeradmin_proxy_id; 
-      
+
+      CosNotifyChannelAdmin::ProxyID consumeradmin_proxy_id;
+
       CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier =
         consumer_admin->obtain_notification_push_supplier(
                                   CosNotifyChannelAdmin::STRUCTURED_EVENT,
                                   consumeradmin_proxy_id);
-      
+
       supplier_proxy = CosNotifyChannelAdmin::StructuredProxyPushSupplier::
         _narrow(proxy_supplier.in());
-      
+
       supplier_proxy->connect_structured_push_consumer(consumer.in());
-           
+
 
 
 
@@ -117,14 +117,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
 
-      PortableServer::POAManager_var poa_manager = poa->the_POAManager(); 
-      
+      PortableServer::POAManager_var poa_manager = poa->the_POAManager();
+
       poa_manager->activate();
-        
+
       ACE_Time_Value run_time(12);
       orb->run(&run_time);
 
-      if ( servant.nummsgs() > 0 ) 
+      if ( servant.nummsgs() > 0 )
       {
         std::cout << "Success pass " << pass << ": events received " << std::endl;
       }
@@ -132,7 +132,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       {
         std::cout << "ERROR pass " << pass << ": no events received " << std::endl;
       }
-  
+
   }
   catch(const CORBA::Exception& ex)
     {
diff --git a/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp b/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
index 8d6d23b5a00..ceb378aefae 100644
--- a/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
+++ b/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "orbsvcs/CosNotifyCommC.h"
@@ -13,51 +13,51 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
 
-  CORBA::Object_var naming_obj = 
+  CORBA::Object_var naming_obj =
     orb_->resolve_initial_references ("NameService");
-      
+
   CosNaming::NamingContext_var naming_context =
     CosNaming::NamingContext::_narrow (naming_obj.in());
 
   CosNaming::Name name;
   name.length (1);
   name[0].id = CORBA::string_dup ("NotifyEventChannelFactory");
-  
+
   CORBA::Object_var obj = naming_context->resolve (name);
 
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ());
-      
+
   CosNotifyChannelAdmin::ChannelID id;
   CosNotification::QoSProperties initial_qos;
   CosNotification::AdminProperties initial_admin;
-  
+
   CosNotifyChannelAdmin::EventChannel_var ec =
     notify_factory->create_channel (initial_qos,
                                     initial_admin,
                                     id);
 
   name[0].id = CORBA::string_dup ("MyEventChannel");
-  
+
   naming_context->rebind (name, ec.in());
-  
-  CosNotifyChannelAdmin::AdminID adminid; 
-  CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = 
-    CosNotifyChannelAdmin::OR_OP;  
-  
+
+  CosNotifyChannelAdmin::AdminID adminid;
+  CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
+    CosNotifyChannelAdmin::OR_OP;
+
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
     ec->new_for_suppliers (ifgop, adminid);
-  
+
   CosNotifyChannelAdmin::ProxyID supplieradmin_proxy_id;
-  
+
   CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer =
     supplier_admin->obtain_notification_push_consumer(
                                  CosNotifyChannelAdmin::STRUCTURED_EVENT,
                                  supplieradmin_proxy_id);
-  
-  StructuredEventSupplier_i *servant = 
+
+  StructuredEventSupplier_i *servant =
     new StructuredEventSupplier_i(orb_.in());
-  
+
   CORBA::Object_var poa_obj = orb_->resolve_initial_references ("RootPOA");
   PortableServer::POA_var poa = PortableServer::POA::_narrow (poa_obj.in ());
   PortableServer::POAManager_var mgr = poa->the_POAManager ();
@@ -67,12 +67,12 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
 
   CORBA::Object_var supplier_obj = poa->id_to_reference (objectId.in ());
 
-  CosNotifyComm::StructuredPushSupplier_var supplier = 
+  CosNotifyComm::StructuredPushSupplier_var supplier =
     CosNotifyComm::StructuredPushSupplier::_narrow (supplier_obj.in ());
-  
-  consumer_proxy_ = 
+
+  consumer_proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxy_consumer.in());
-  
+
   consumer_proxy_->
     connect_structured_push_supplier (supplier.in());
 }
@@ -87,29 +87,29 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message)
 {
-  
+
   ACE_OS::printf("Message from: %s\nSubject:      %s\nMessage:      %s\n",
                  user_name, subject, message);
   //cout << "Message from: " << user_name << endl;
   //cout << "Subject:      " << subject << endl;
   //cout << "Message:      " << message << endl;
-  
- 
+
+
   // Event Definition
-  CosNotification::StructuredEvent event; 
-  
-  event.header.fixed_header.event_type.domain_name = 
+  CosNotification::StructuredEvent event;
+
+  event.header.fixed_header.event_type.domain_name =
     CORBA::string_dup("OCI_TAO");
   // string
-  event.header.fixed_header.event_type.type_name = 
+  event.header.fixed_header.event_type.type_name =
     CORBA::string_dup("examples");
   // string
-  event.header.fixed_header.event_name = 
+  event.header.fixed_header.event_name =
     CORBA::string_dup("myevent");
-  
+
   // OptionalHeaderFields
-  // PropertySeq           
-  
+  // PropertySeq
+
   // sequence<Property>: string name, any value
   event.filterable_data.length (3);
   event.filterable_data[0].name = CORBA::string_dup("Message from:");
@@ -118,7 +118,7 @@ CORBA::Boolean Messenger_i::send_message (
   event.filterable_data[1].value <<= (const char *)subject;
   event.filterable_data[2].name = CORBA::string_dup("Message:");
   event.filterable_data[2].value <<= (const char *)message;
-  
+
   std::cout << "pushing " << std::endl;
   consumer_proxy_->push_structured_event(event);
 
diff --git a/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h b/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
index a11046ec762..4edfe313641 100644
--- a/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
+++ b/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
@@ -11,7 +11,7 @@ class  Messenger_i : public POA_Messenger
 {
  public:
   Messenger_i (CORBA::ORB_ptr orb);
-  
+
   virtual ~Messenger_i (void);
 
   CORBA::Boolean send_message (const char * user_name,
@@ -23,7 +23,7 @@ class  Messenger_i : public POA_Messenger
   CosNotifyChannelAdmin::StructuredProxyPushConsumer_var consumer_proxy_;
 };
 
-#endif 
+#endif
 
 
 
diff --git a/orbsvcs/tests/Bug_3387_Regression/NotSvc.conf b/orbsvcs/tests/Bug_3387_Regression/NotSvc.conf
index 1be0fc11b43..e7e13170555 100644
--- a/orbsvcs/tests/Bug_3387_Regression/NotSvc.conf
+++ b/orbsvcs/tests/Bug_3387_Regression/NotSvc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static TAO_CosNotify_Service "-DispatchingThreads 1"
 #dynamic TAO_MonitorAndControl Service_Object * TAO_CosNotification_MC:_make_TAO_MonitorAndControl () "-ORBArg "-ORBDefaultInitRef iiop://dvlcps2a-pri:12345""
 #dynamic TAO_MC_Notify_Service Service_Object * TAO_CosNotification_MC_Ext:_make_TAO_MC_Notify_Service () "-DispatchingThreads 1"
diff --git a/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp b/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
index aabf120fa4f..df513d49278 100644
--- a/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
+++ b/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
@@ -11,7 +11,7 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb)
 {
 }
 
-void 
+void
 StructuredEventConsumer_i::push_structured_event(
        const CosNotification::StructuredEvent &event
       )
@@ -20,10 +20,10 @@ StructuredEventConsumer_i::push_structured_event(
   std::cout << "event received " << std::endl;
 
   const char *value;
-  
+
   for (unsigned int i=0; i<event.filterable_data.length(); i++) {
     event.filterable_data[i].value >>= value;
-    std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl; 
+    std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl;
   }
   count_++;
   if ( count_ >= 3 )
@@ -33,7 +33,7 @@ StructuredEventConsumer_i::push_structured_event(
 
 }
 
-void 
+void
 StructuredEventConsumer_i::disconnect_structured_push_consumer()
 {
 
@@ -48,11 +48,11 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer()
 
 void
 StructuredEventConsumer_i::offer_change(
-        const CosNotification::EventTypeSeq &, 
+        const CosNotification::EventTypeSeq &,
         const CosNotification::EventTypeSeq &
       )
 {
-} 
+}
 
 int
 StructuredEventConsumer_i::nummsgs()
diff --git a/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h b/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
index a2b07b3fd30..9be7bc4cbdc 100644
--- a/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
+++ b/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
@@ -6,7 +6,7 @@
 
 #include "orbsvcs/CosNotifyCommS.h"
 
-class StructuredEventConsumer_i : 
+class StructuredEventConsumer_i :
   public virtual POA_CosNotifyComm::StructuredPushConsumer
 {
 public:
@@ -30,4 +30,4 @@ private:
     int count_;
 };
 
-#endif 
+#endif
diff --git a/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp b/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
index d31ac1ec23d..24a2c4424a3 100644
--- a/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
+++ b/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 #include "StructuredEventSupplier_i.h"
 #include "tao/PortableServer/PS_CurrentC.h"
 
@@ -12,7 +12,7 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
 {
 
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
-   PortableServer::Current_var current = 
+   PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
@@ -22,9 +22,9 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
 
 void
 StructuredEventSupplier_i::subscription_change (
-                    const CosNotification::EventTypeSeq &, 
+                    const CosNotification::EventTypeSeq &,
                     const CosNotification::EventTypeSeq &
       )
 {
-}       
+}
 
diff --git a/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h b/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
index 8a3ab506e1f..376fb3873c7 100644
--- a/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
+++ b/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
@@ -5,7 +5,7 @@
 
 #include "orbsvcs/CosNotifyCommS.h"
 
-class StructuredEventSupplier_i : 
+class StructuredEventSupplier_i :
   public virtual POA_CosNotifyComm::StructuredPushSupplier
 {
 public:
@@ -13,7 +13,7 @@ public:
     StructuredEventSupplier_i(CORBA::ORB_ptr orb);
     virtual void disconnect_structured_push_supplier ();
 
-    
+
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
@@ -23,4 +23,4 @@ private:
     CORBA::ORB_var orb_;
 };
 
-#endif 
+#endif
diff --git a/orbsvcs/tests/Bug_3387_Regression/run_test.pl b/orbsvcs/tests/Bug_3387_Regression/run_test.pl
index 90e063d85cd..d802120f688 100755
--- a/orbsvcs/tests/Bug_3387_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_3387_Regression/run_test.pl
@@ -51,9 +51,9 @@ $consumer2->DeleteFile ($ns_ior);
 $nt_service->DeleteFile ($nt_ior);
 $server->DeleteFile ($msngr_ior);
 
-$NMS = $nm_service->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service",
+$NMS = $nm_service->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                                   "-ORBdebuglevel $debug_level -o $nm_ns_ior");
-$NFS = $nt_service->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service",
+$NFS = $nt_service->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification",
                                   "-ORBdebuglevel $debug_level -ORBInitRef NameService=file://$nt_ns_ior ".
                                   "-IORoutput $nt_nt_ior -UseSeparateDispatchingORB 1 ".
                                   "-ORBSvcConf $nt_svc_conf");
diff --git a/orbsvcs/tests/Bug_3418_Regression/Test.cpp b/orbsvcs/tests/Bug_3418_Regression/Test.cpp
index 124ac3c41bb..ad01818d727 100644
--- a/orbsvcs/tests/Bug_3418_Regression/Test.cpp
+++ b/orbsvcs/tests/Bug_3418_Regression/Test.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "tao/corba.h"
 #include "ace/ARGV.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (tests,
-           server,
-           "$Id$")
-
 // SSLIOP
 const ACE_TCHAR argStrB[] = ACE_TEXT("BBB -ORBGestalt LOCAL -ORBId ORB-B -ORBSvcConf b.conf");
 
diff --git a/orbsvcs/tests/Bug_3418_Regression/b.conf b/orbsvcs/tests/Bug_3418_Regression/b.conf
index 039fbc84c51..5847fa22a03 100644
--- a/orbsvcs/tests/Bug_3418_Regression/b.conf
+++ b/orbsvcs/tests/Bug_3418_Regression/b.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/orbsvcs/tests/Bug_3418_Regression/m.conf b/orbsvcs/tests/Bug_3418_Regression/m.conf
index e69de29bb2d..02b5f165e45 100644
--- a/orbsvcs/tests/Bug_3418_Regression/m.conf
+++ b/orbsvcs/tests/Bug_3418_Regression/m.conf
@@ -0,0 +1,2 @@
+# $Id$
+
diff --git a/orbsvcs/tests/Bug_3444_Regression/Test.idl b/orbsvcs/tests/Bug_3444_Regression/Test.idl
index b471add6bec..32ec9db32c9 100644
--- a/orbsvcs/tests/Bug_3444_Regression/Test.idl
+++ b/orbsvcs/tests/Bug_3444_Regression/Test.idl
@@ -1,7 +1,7 @@
 // $Id$
 
 #ifndef _TEST_IDL_
-#define _TEST_IDL_ 
+#define _TEST_IDL_
 
 module Test
 {
diff --git a/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp b/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
index eac16dcaaf2..5773b0d7be3 100644
--- a/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
+++ b/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
@@ -2,7 +2,7 @@
 
 #include "Test_impl.h"
 
-ACE_RCSID(Bug_3444_Regression, Test_impl, "$Id$")
+
 
 Server_impl::Server_impl (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_3444_Regression/Test_impl.h b/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
index 12a504f7230..2201809a698 100644
--- a/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
+++ b/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
@@ -4,7 +4,7 @@
 #define TEST_IMPL_HPP
 
 #include "TestS.h"
-    
+
 class Server_impl : public virtual POA_Test::Server
 {
 public:
@@ -13,7 +13,7 @@ public:
   virtual void shutdown ();
 
 private:
-  CORBA::ORB_var orb_;    
+  CORBA::ORB_var orb_;
 };
 
 #endif /* TEST_IMPL_HPP */
diff --git a/orbsvcs/tests/Bug_3444_Regression/client.cpp b/orbsvcs/tests/Bug_3444_Regression/client.cpp
index 3ccacdb17f2..a1017e32240 100644
--- a/orbsvcs/tests/Bug_3444_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_3444_Regression/client.cpp
@@ -4,7 +4,7 @@
 #include "ace/Get_Opt.h"
 #include "TestC.h"
 
-ACE_RCSID(Bug_3444_Regression, client, "$Id$")
+
 
 const ACE_TCHAR *ior_server = 0;
 
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3444_Regression/diop_svc.conf b/orbsvcs/tests/Bug_3444_Regression/diop_svc.conf
index 214923a8c1d..a9376895eac 100644
--- a/orbsvcs/tests/Bug_3444_Regression/diop_svc.conf
+++ b/orbsvcs/tests/Bug_3444_Regression/diop_svc.conf
@@ -1,3 +1,4 @@
 # $Id$
+
 dynamic DIOP_Factory Service_Object * TAO_Strategies:_make_TAO_DIOP_Protocol_Factory() ""
 dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory() "-ORBProtocolFactory DIOP_Factory"
diff --git a/orbsvcs/tests/Bug_3444_Regression/miop_svc.conf b/orbsvcs/tests/Bug_3444_Regression/miop_svc.conf
index 65508eb6d59..5099f572598 100644
--- a/orbsvcs/tests/Bug_3444_Regression/miop_svc.conf
+++ b/orbsvcs/tests/Bug_3444_Regression/miop_svc.conf
@@ -1,4 +1,5 @@
 # $Id$
+
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
 dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
diff --git a/orbsvcs/tests/Bug_3444_Regression/run_test.pl b/orbsvcs/tests/Bug_3444_Regression/run_test.pl
index db6949d6f35..51ce276ec70 100755
--- a/orbsvcs/tests/Bug_3444_Regression/run_test.pl
+++ b/orbsvcs/tests/Bug_3444_Regression/run_test.pl
@@ -40,7 +40,7 @@ sub run_test {
 
     $test->DeleteFile($iorbase);
     $test->DeleteFile($log);
-    
+
     my($svc_conf);
     if ($test_conf ne ''){
         $tmp_test_conf = $test->LocalFile ($test_conf);
diff --git a/orbsvcs/tests/Bug_3444_Regression/server.cpp b/orbsvcs/tests/Bug_3444_Regression/server.cpp
index df20af73877..7e8d81fbd08 100644
--- a/orbsvcs/tests/Bug_3444_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_3444_Regression/server.cpp
@@ -5,7 +5,7 @@
 #include "ace/Get_Opt.h"
 #include "orbsvcs/PortableGroup/GOA.h"
 
-ACE_RCSID(Bug_3444_Regression, server, "$Id$")
+
 
 const ACE_TCHAR *uipmc_url = 0;
 const ACE_TCHAR *ior_output_file = 0;
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3486_Regression/Makefile.am b/orbsvcs/tests/Bug_3486_Regression/Makefile.am
deleted file mode 100644
index 7ee7f0b5e7a..00000000000
--- a/orbsvcs/tests/Bug_3486_Regression/Makefile.am
+++ /dev/null
@@ -1,97 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2926_Regression_Lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_LTLIBRARIES = libbug2926.la
-
-libbug2926_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DBUG2926_BUILD_DLL
-
-libbug2926_la_SOURCES = \
-  DllORB.cpp
-
-noinst_HEADERS = \
-  DllORB.h
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2926_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-server_SOURCES = \
-  server.cpp \
-  DllORB.h \
-  bug2926_export.h
-
-server_LDADD = \
-  libbug2926.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Bug_3486_Regression/server.cpp b/orbsvcs/tests/Bug_3486_Regression/server.cpp
index bb6965a4127..3360f87fe7e 100644
--- a/orbsvcs/tests/Bug_3486_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_3486_Regression/server.cpp
@@ -27,17 +27,16 @@ ACE_TCHAR const * const scpc_unloadNamingService = ACE_REMOVE_SERVICE_DIRECTIVE(
 
 void loadunloadcycle()
 {
-  int result = 0;
-
   ACE_DEBUG((
     LM_DEBUG,
     ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n")
   ));
 
-  result = ACE_Service_Config::process_directive(scpc_loadOrb);
+  int result = ACE_Service_Config::process_directive(scpc_loadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done. Result: <%d>\n"),
+    result
   ));
 
   DllORB * p_orb =
@@ -67,7 +66,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadNamingService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NamingService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NamingService done. Result: <%d>\n"),
+    result
   ));
 
   TAO_Naming_Loader * p_NamingService =
@@ -87,7 +87,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNamingService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NamingService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NamingService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -97,9 +98,11 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 }
+
 int ACE_TMAIN (int , ACE_TCHAR **)
 {
   ACE_DEBUG((
diff --git a/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp b/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
index 7b9497529ec..04ad5ba319a 100644
--- a/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "Hello.cpp,v 1.3 2002/01/29 20:21:07 okellogg Exp")
+
 
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_3598b_Regression/client.cpp b/orbsvcs/tests/Bug_3598b_Regression/client.cpp
index f86033651b1..fe0146360f8 100644
--- a/orbsvcs/tests/Bug_3598b_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_3598b_Regression/client.cpp
@@ -7,7 +7,7 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 
-ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp")
+
 
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3598b_Regression/server.cpp b/orbsvcs/tests/Bug_3598b_Regression/server.cpp
index 95d61429e99..2017e62d471 100644
--- a/orbsvcs/tests/Bug_3598b_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_3598b_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3673_Regression/Hello.cpp b/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
index df5dc90d3d9..752bb07aa19 100644
--- a/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
+++ b/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp b/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
index ae73a73eefd..567d1fd0e70 100644
--- a/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
+++ b/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
@@ -1,11 +1,6 @@
-//
 // $Id$
-//
-#include "NsShutdown.h"
 
-ACE_RCSID(Hello,
-          NsShutdown,
-          "$Id$")
+#include "NsShutdown.h"
 
 NsShutdown::NsShutdown (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/Bug_3673_Regression/client.cpp b/orbsvcs/tests/Bug_3673_Regression/client.cpp
index f4a7a4a42a9..2c7da5f61d3 100644
--- a/orbsvcs/tests/Bug_3673_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_3673_Regression/client.cpp
@@ -4,7 +4,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://shutdown.ior");
 bool shutdown_nsmain = false;
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp b/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
index abced085c27..abbfd795475 100644
--- a/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
+++ b/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
@@ -4,7 +4,6 @@
 #include "Hello.h"
 #include "NsShutdown.h"
 #include "orbsvcs/CosNamingC.h"
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ns.ior");
@@ -58,7 +57,7 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv)
         shutdown_ns_ = true;
         break;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -80,7 +79,7 @@ int TestTask::svc()
       ACE_ERROR_RETURN ((LM_ERROR,
                           "Cannot open output file for writing IOR: ns.ior\n"),
                           1);
-    ACE_OS::fprintf (output_file, "%s", ACE_TEXT_CHAR_TO_TCHAR (namingServiceA_.ior ()));
+    ACE_OS::fprintf (output_file, "%s", namingServiceA_.ior ());
     ACE_OS::fclose (output_file);
 
     // Get reference to Root POA
diff --git a/orbsvcs/tests/Bug_3673_Regression/server.cpp b/orbsvcs/tests/Bug_3673_Regression/server.cpp
index 9dd4570db86..128d429cd5a 100644
--- a/orbsvcs/tests/Bug_3673_Regression/server.cpp
+++ b/orbsvcs/tests/Bug_3673_Regression/server.cpp
@@ -50,7 +50,7 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv)
         ior_output_file = get_opts.opt_arg ();
         break;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc b/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc
new file mode 100644
index 00000000000..953f52f8c53
--- /dev/null
+++ b/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc
@@ -0,0 +1,5 @@
+// -*- MPC -*-
+// $Id$
+
+project: taoserver, avoids_corba_e_micro, imr_client {
+}
diff --git a/orbsvcs/tests/Bug_3891_Regression/Test.idl b/orbsvcs/tests/Bug_3891_Regression/Test.idl
new file mode 100644
index 00000000000..052df98670f
--- /dev/null
+++ b/orbsvcs/tests/Bug_3891_Regression/Test.idl
@@ -0,0 +1,10 @@
+//
+// $Id$
+//
+
+module Test
+{
+  interface Hello
+  {
+  };
+};
diff --git a/orbsvcs/tests/Bug_3891_Regression/run_test.pl b/orbsvcs/tests/Bug_3891_Regression/run_test.pl
new file mode 100755
index 00000000000..f054190c492
--- /dev/null
+++ b/orbsvcs/tests/Bug_3891_Regression/run_test.pl
@@ -0,0 +1,87 @@
+# $Id$
+
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+use strict;
+
+my $status = 0;
+my $debug_level = '0';
+
+foreach my $i (@ARGV) {
+    if ($i eq '-debug') {
+        $debug_level = '10';
+    }
+}
+
+my $imr = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $si = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+my $implrepo_server = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator";
+
+my $implrepo_ior = "implrepo.ior";
+
+my $imr_imriorfile = $imr->LocalFile ($implrepo_ior);
+my $si_imriorfile = $si->LocalFile ($implrepo_ior);
+
+# Make sure the files are gone, so we can wait on them.
+$imr->DeleteFile ($implrepo_ior);
+$si->DeleteFile ($implrepo_ior);
+
+my $SVR = $imr->CreateProcess ("server", "-ORBDebugLevel $debug_level " .
+                               "-ORBUseImr 1 " .
+                               "-ORBInitRef ImplRepoService=file://$si_imriorfile");
+
+my $IR = $imr->CreateProcess ($implrepo_server, "-d 1 -t 5 " .
+                              "-o $imr_imriorfile");
+print ">>> " . $IR->CommandLine() . "\n";
+
+my $IR_status = $IR->Spawn ();
+
+if ($IR_status != 0) {
+    print STDERR "ERROR: ImplRepo Service returned $IR_status\n";
+    exit 1;
+}
+
+if ($imr->WaitForFileTimed ($implrepo_ior,$imr->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$imr_imriorfile>\n";
+    $IR->Kill (); $IR->TimedWait (1);
+    exit 1;
+}
+
+if ($imr->GetFile ($implrepo_ior) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$imr_imriorfile>\n";
+    $IR->Kill (); $IR->TimedWait (1);
+    exit 1;
+}
+if ($si->PutFile ($implrepo_ior) == -1) {
+    print STDERR "ERROR: cannot set file <$si_imriorfile>\n";
+    $IR->Kill (); $IR->TimedWait (1);
+    exit 1;
+}
+
+print ">>> " . $SVR->CommandLine() . "\n";
+
+my $SVR_status = $SVR->SpawnWaitKill ($si->ProcessStartWaitInterval());
+
+if ($SVR_status != 0) {
+    print STDERR "ERROR: server returned $SVR_status\n";
+    $IR->Kill (); $IR->TimedWait (1);
+    exit 1;
+}
+
+
+$IR_status = $IR->TerminateWaitKill ($imr->ProcessStopWaitInterval());
+
+if ($IR_status != 0) {
+    print STDERR "ERROR: ImplRepo Server returned $IR_status\n";
+    $status = 1;
+}
+
+$imr->DeleteFile ($implrepo_ior);
+$si->DeleteFile ($implrepo_ior);
+
+exit $status;
diff --git a/orbsvcs/tests/Bug_3891_Regression/server.cpp b/orbsvcs/tests/Bug_3891_Regression/server.cpp
new file mode 100644
index 00000000000..88736989e5d
--- /dev/null
+++ b/orbsvcs/tests/Bug_3891_Regression/server.cpp
@@ -0,0 +1,74 @@
+// $Id$
+#include "TestS.h"
+#include "tao/Stub.h"
+#include "ace/OS_NS_string.h"
+#ifdef TAO_AS_STATIC_LIBS
+# include "tao/ImR_Client/ImR_Client.h"
+#endif
+
+class Hello : public virtual POA_Test::Hello
+{
+};
+
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references ("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      if (CORBA::is_nil (root_poa.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Panic: nil RootPOA\n"), 1);
+
+      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
+
+      PortableServer::LifespanPolicy_var life =
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
+
+      PortableServer::IdAssignmentPolicy_var assign =
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
+
+      CORBA::PolicyList pols;
+      pols.length (2);
+      pols[0] = PortableServer::LifespanPolicy::_duplicate (life.in ());
+      pols[1] = PortableServer::IdAssignmentPolicy::_duplicate (assign.in ());
+
+      PortableServer::POA_var poa =
+        root_poa->create_POA ("ImRified POA", poa_manager.in (), pols);
+      life->destroy ();
+      assign->destroy ();
+
+      Hello *hello_impl = 0;
+      ACE_NEW_RETURN (hello_impl, Hello, 1);
+      PortableServer::ServantBase_var owner_transfer (hello_impl);
+
+      PortableServer::ObjectId_var id =
+        PortableServer::string_to_ObjectId ("Test 3891 Object");
+
+      poa->activate_object_with_id (id.in (), hello_impl);
+
+      CORBA::Object_var obj = poa->id_to_reference (id.in ());
+
+      if (!obj->_stubobj ()->type_id.in () ||
+          ACE_OS::strcmp (obj->_stubobj ()->type_id.in (),
+                          hello_impl->_repository_id ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR, "ERROR: type_id is incorrect\n"), 1);
+        }
+
+      root_poa->destroy (1, 1);
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp b/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp
index c0236657c25..e4d8195ffbd 100644
--- a/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp
+++ b/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         // This is a hack but that is okay!
         return 0;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp b/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
index 5dd84ffaf9d..ff30844d186 100644
--- a/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
+++ b/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
@@ -6,7 +6,7 @@
 #include "tao/ORB_Core.h"
 #include "TestC.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
+
 
 Client_Task::Client_Task (CosNaming::NamingContext_ptr root_context,
                           CORBA::ORB_ptr corb,
diff --git a/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp b/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
index 9cfd6c265c9..3048e6f95f7 100644
--- a/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
+++ b/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
@@ -6,7 +6,7 @@
 #include "tao/ORB_Table.h"
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
   Hello::Hello (CORBA::ORB_ptr orb,
               ACE_thread_t thrid)
diff --git a/orbsvcs/tests/COIOP_Naming_Test/Hello.h b/orbsvcs/tests/COIOP_Naming_Test/Hello.h
index 556409e5d00..1d5e27d075f 100644
--- a/orbsvcs/tests/COIOP_Naming_Test/Hello.h
+++ b/orbsvcs/tests/COIOP_Naming_Test/Hello.h
@@ -8,8 +8,6 @@
 
 #include "TestS.h"
 
-#include "ace/OS.h"
-
 /// Implement the Test::Hello interface
 class Hello
   : public virtual POA_Test::Hello
diff --git a/orbsvcs/tests/COIOP_Naming_Test/Makefile.am b/orbsvcs/tests/COIOP_Naming_Test/Makefile.am
deleted file mode 100644
index 21d72917248..00000000000
--- a/orbsvcs/tests/COIOP_Naming_Test/Makefile.am
+++ /dev/null
@@ -1,99 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.COIOP_Naming_Test_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.COIOP_Naming_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = COIOP_Naming_Test
-
-COIOP_Naming_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-COIOP_Naming_Test_SOURCES = \
-  COIOP_Test.cpp \
-  Client_Task.cpp \
-  Hello.cpp \
-  NamingTask.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  NamingTask.h \
-  Server_Task.h
-
-COIOP_Naming_Test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp b/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
index 768850a5536..95e4325db81 100644
--- a/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
+++ b/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
@@ -1,17 +1,11 @@
-//
 // $Id$
-//
+
 #include "Server_Task.h"
 #include "TestS.h"
 #include "Hello.h"
 
 #include "ace/Manual_Event.h"
 
-ACE_RCSID(Collocated_Test,
-          Server_Task,
-          "$Id$")
-
-
 Server_Task::Server_Task (CosNaming::NamingContext_ptr root_context,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
diff --git a/orbsvcs/tests/Concurrency/CC_client.cpp b/orbsvcs/tests/Concurrency/CC_client.cpp
index 4415eb811f5..cf78842e84d 100644
--- a/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -1,22 +1,19 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    CC_client.h
-//
-// = DESCRIPTION
-//      This is the test class for the concurrency service. The class
-//      implements a client to the concurrency service.
-//      This file contains the main function for the test.
-//
-// = AUTHORS
-//      Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CC_client.cpp
+ *
+ *  $Id$
+ *
+ *    This is the test class for the concurrency service. The class
+ *    implements a client to the concurrency service.
+ *    This file contains the main function for the test.
+ *
+ *
+ *  @author   Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "CC_client.h"
 
@@ -29,7 +26,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_fcntl.h"
 
-ACE_RCSID(Concurrency, CC_client, "$Id$")
+
 
 // Constructor.
 CC_Client::CC_Client (void)
diff --git a/orbsvcs/tests/Concurrency/CC_client.h b/orbsvcs/tests/Concurrency/CC_client.h
index 870459d47e6..fa7e965546b 100644
--- a/orbsvcs/tests/Concurrency/CC_client.h
+++ b/orbsvcs/tests/Concurrency/CC_client.h
@@ -1,22 +1,18 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Concurrency
-//
-// = FILENAME
-//    CC_client.h
-//
-// = DESCRIPTION
-//      This class implements a client used to test the CosConcurrency
-//      service.
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CC_client.h
+ *
+ *  $Id$
+ *
+ *    This class implements a client used to test the CosConcurrency
+ *    service.
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 
@@ -43,100 +39,102 @@ extern FILE *ace_cc_yyin;
 // end of parser stuff
 
 
+/**
+ * @class CC_Client
+ *
+ * @brief Defines a class that encapsulates the behaviour of a clien of
+ * the concurrency service.
+ *
+ * This class declares an interface to run the test client for
+ * the concurrency service.
+ */
 class CC_Client
 {
-  // = TITLE
-  //    Defines a class that encapsulates the behaviour of a clien of
-  //    the concurrency service.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the test client for
-  //    the concurrency service.
 public:
   // = Initialization and termination methods.
+  /// Default constructor.
   CC_Client (void);
-  // Default constructor.
 
+  /// Destructor.
   ~CC_Client (void);
-  // Destructor.
 
+  /// Run the test.
   int run (void);
-  // Run the test.
 
+  /// Initialize the test with the parameters from the command line.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the test with the parameters from the command line.
 
 private:
+  /// Function to initialize the naming service.
   int init_naming_service (void);
-  // Function to initialize the naming service.
 
+  /// Function to parse the command line arguments.
   int parse_args (void);
-  // Function to parse the command line arguments.
 
+  /// Function to read the ior from the given file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the ior from the given file.
 
+  /// Runs the basic tests (on a single lock set). Returns CC_SUCCESS
+  /// upon success CC_FAIL otherwise.
   int run_basic_tests (void);
-  // Runs the basic tests (on a single lock set). Returns CC_SUCCESS
-  // upon success CC_FAIL otherwise.
 
+  /// Runs the extended tests (on more lock sets). Returns CC_SUCCESS
+  /// upon success CC_FAIL otherwise.
   int run_extended_tests (ACE_TCHAR *params);
-  // Runs the extended tests (on more lock sets). Returns CC_SUCCESS
-  // upon success CC_FAIL otherwise.
 
+  /// Checks the parameters given to the run_extended_tests() function.
+  /// returns -1 if an error is found.
   int check_extended_test_params(ACE_TCHAR *params);
-  // Checks the parameters given to the run_extended_tests() function.
-  // returns -1 if an error is found.
 
+  /// A pointer to the naming service used for this test.
   CC_naming_service *naming_service_;
-  // A pointer to the naming service used for this test.
 
+  /// File from which to obtain the IOR.
   FILE *cc_factory_ior_file_;
-  // File from which to obtain the IOR.
 
+  /// The factory key for the lock set factory.
   char *cc_factory_key_;
-  // The factory key for the lock set factory.
 
+  /// File handle to read the IOR.
   ACE_HANDLE f_handle_;
-  // File handle to read the IOR.
 
+  /// Flag to tell server to shutdown.
   int shutdown_;
-  // Flag to tell server to shutdown.
 
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
   //  CosConcurrencyControl::LockSetFactory_var factory_;
   // factory pointer for the lock set. @@TAO maybe to be used when naming
   // service is not used (for simple testing)
 
+  /// The number of arguments passed on the command line.
   int argc_;
-  // The number of arguments passed on the command line.
 
+  /// The arguments from the command line.
   ACE_TCHAR **argv_;
-  // The arguments from the command line.
 
+  /// Flag to tell the client whether to use the naming service or not
+  /// to find the concurrency control factory.
   int use_naming_service_;
-  // Flag to tell the client whether to use the naming service or not
-  // to find the concurrency control factory.
 
+  /// flag to tell which test should be run.
   int run_basic_tests_;
-  // flag to tell which test should be run.
 
+  /// flag to tell which test should be run.
   int run_extended_tests_;
-  // flag to tell which test should be run.
 
+  /// Parameters to the extended tests. The parameters are of the
+  /// following format: <test>:<parm1>:<parm2>...
   ACE_TCHAR *extended_tests_params_;
-  // Parameters to the extended tests. The parameters are of the
-  // following format: <test>:<parm1>:<parm2>...
 
+  /// Flag to tell whethter to use a script file to run the tests.
   int use_script_file_;
-  // Flag to tell whethter to use a script file to run the tests.
 
+  /// The script file to run
   ACE_TCHAR *script_file_;
-  // The script file to run
 
+  /// Prints out the options to the program.
   void print_usage (void);
-  // Prints out the options to the program.
 };
 #endif /* !defined (_CC_CLIENT_H_) */
diff --git a/orbsvcs/tests/Concurrency/CC_command.cpp b/orbsvcs/tests/Concurrency/CC_command.cpp
index ea8cf35a225..30b8c30e49d 100644
--- a/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -1,19 +1,16 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    CC_command.cpp
-//
-// = DESCRIPTION
-//      This is the command classes for the test of the concurrency service.
-//
-// = AUTHORS
-//      Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    CC_command.cpp
+ *
+ *  $Id$
+ *
+ *    This is the command classes for the test of the concurrency service.
+ *
+ *
+ *  @author   Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "CC_command.h"
 #include "CC_test_utils.h"
@@ -26,12 +23,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (Concurrency,
-           CC_command,
-           "$Id$")
-
-
 CC_Command::~CC_Command(void)
 {
 }
diff --git a/orbsvcs/tests/Concurrency/CC_command.h b/orbsvcs/tests/Concurrency/CC_command.h
index dbd70e7ac12..fd0d1625147 100644
--- a/orbsvcs/tests/Concurrency/CC_command.h
+++ b/orbsvcs/tests/Concurrency/CC_command.h
@@ -1,474 +1,512 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Concurrency
-//
-// = FILENAME
-//    CC_command.h
-//
-// = DESCRIPTION
-//      This file implements the command possible to execute on the
-//      concurrency service's lock set interface. The file also contains
-//      an implementation of a command list used by the command parser to
-//      store the commands to be executed.
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CC_command.h
+ *
+ *  $Id$
+ *
+ *    This file implements the command possible to execute on the
+ *    concurrency service's lock set interface. The file also contains
+ *    an implementation of a command list used by the command parser to
+ *    store the commands to be executed.
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/CosConcurrencyControlC.h"
 
 #ifndef _CC_COMMAND_H_
 #define _CC_COMMAND_H_
 
+/**
+ * @class CC_Command
+ *
+ * @brief Defines an abstact class for the commands towards the lock set
+ *
+ * This class declares an interface to run a test towards one or more
+ * lock sets in the concurrency service. The class provides a virtual
+ * execute method that is common for all its subclasses. It is also the
+ * the base class for the auxillary commands start, wait, and sleep.
+ */
 class CC_Command
-  // = TITLE
-  //    Defines an abstact class for the commands towards the lock set
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run a test towards one or more
-  //    lock sets in the concurrency service. The class provides a virtual
-  //    execute method that is common for all its subclasses. It is also the
-  //    the base class for the auxillary commands start, wait, and sleep.
 {
  public:
+  /// Destructor
   virtual ~CC_Command(void);
-  // Destructor
 
+  /// Abstract execute method
   virtual int execute() = 0;
-  // Abstract execute method
 
  protected:
+  /// Function to look up the lock set we are operating on, or if the
+  /// name is "" return the global lock set variable
   CosConcurrencyControl::LockSet_var
     GetLockSet (const char *lock_set_name);
-  // Function to look up the lock set we are operating on, or if the
-  // name is "" return the global lock set variable
 
+  /// Default constructor. We do not want instances of this class
   CC_Command(void);
-  // Default constructor. We do not want instances of this class
 
+  /**
+   * The last exception raised in one of the test commands. This variable
+   * is checked by all commands in order to determine if an exception has
+   * been raised. This is necessary because sometimes we want to check that
+   * an event caused an exception (done by the CC_Excep_Cmd command class)
+   * as part of the testing.
+   */
   static CORBA::Exception *excep_;
-  // The last exception raised in one of the test commands. This variable
-  // is checked by all commands in order to determine if an exception has
-  // been raised. This is necessary because sometimes we want to check that
-  // an event caused an exception (done by the CC_Excep_Cmd command class)
-  // as part of the testing.
 
+  /// This is the default lock set. The variable is either set by a create
+  /// command without name or by the lookup command.
   static CosConcurrencyControl::LockSet_var cc_lockset_;
-  // This is the default lock set. The variable is either set by a create
-  // command without name or by the lookup command.
 
  private:
 };
 
+/**
+ * @class CC_Start_Cmd
+ *
+ * @brief Defines a class for the start command
+ *
+ * This class represents the start command. The start command is used
+ * to start a new process with another script file in order to test the
+ * aspects of the concurrency service that requires several processes
+ * running at the same time.
+ */
 class CC_Start_Cmd : public CC_Command
-  // = TITLE
-  //    Defines a class for the start command
-  //
-  // = DESCRIPTION
-  //   This class represents the start command. The start command is used
-  //   to start a new process with another script file in order to test the
-  //   aspects of the concurrency service that requires several processes
-  //   running at the same time.
 {
  public:
+  /// Constructor
   CC_Start_Cmd (const char *config_file_name);
-  // Constructor
 
+  /// Destructor
   virtual ~CC_Start_Cmd();
-  // Destructor
 
+  /// Start the child process. The current version does not wait for the
+  /// process to terminate.
   virtual int execute(void);
-  // Start the child process. The current version does not wait for the
-  // process to terminate.
 
 private:
+  /// The name of the script file
   char *cfg_name_;
-  // The name of the script file
 };
 
+/**
+ * @class CC_CreateLockSet_Cmd
+ *
+ * @brief Defines a class for the create command on the lock set factory
+ *
+ * This class represents the create command on the lock set factory.
+ * The lock set is registered in the naming service with the provided
+ * name.
+ */
 class CC_CreateLockSet_Cmd : public CC_Command
-  // = TITLE
-  //    Defines a class for the create command on the lock set factory
-  //
-  // = DESCRIPTION
-  //   This class represents the create command on the lock set factory.
-  //   The lock set is registered in the naming service with the provided
-  //   name.
 {
  public:
+  /// Constructor
   CC_CreateLockSet_Cmd (const char *lock_set_name);
-  // Constructor
 
+  /// Destructor
   virtual ~CC_CreateLockSet_Cmd ();
-  // Destructor
 
+  /// Executes the command, i.e. creates the lock set and binds the name
+  /// in the naming service.
   virtual int execute(void);
-  // Executes the command, i.e. creates the lock set and binds the name
-  // in the naming service.
 
 private:
+  /// The name used to bind in the naming service.
   char *name_;
-  // The name used to bind in the naming service.
 };
 
+/**
+ * @class CC_Lock_Cmd:public
+ *
+ * @brief Defines a class for the lock command on the lock set
+ *
+ * This class represents the lock command on the lock set. The lock set
+ * is looked up in the naming service.
+ */
 class CC_Lock_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the lock command on the lock set
-  //
-  // = DESCRIPTION
-  //   This class represents the lock command on the lock set. The lock set
-  //   is looked up in the naming service.
 {
  public:
+  /// Constructor.
   CC_Lock_Cmd(const char *lock_set_name,
               CosConcurrencyControl::lock_mode mode);
-  // Constructor.
 
+  /// Destructor
   virtual ~CC_Lock_Cmd();
-  // Destructor
 
+  /// Executes the command, i.e. looks up the lock set with the requested
+  /// name in the naming server and executes the lock command on that lock set.
   virtual int execute(void);
-  // Executes the command, i.e. looks up the lock set with the requested
-  // name in the naming server and executes the lock command on that lock set.
 
 private:
+  /// The name to look up in the naming service.
   char *name_;
-  // The name to look up in the naming service.
 
+  /// The mode of the lock.
   CosConcurrencyControl::lock_mode mode_;
-  // The mode of the lock.
 };
 
+/**
+ * @class CC_UnLock_Cmd:public
+ *
+ * @brief Defines a class for the unlock command on the lock set
+ *
+ * This class represents the unlock command on the lock set. The lock set
+ * is looked up in the naming service.
+ */
 class CC_UnLock_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the unlock command on the lock set
-  //
-  // = DESCRIPTION
-  //   This class represents the unlock command on the lock set. The lock set
-  //   is looked up in the naming service.
 {
  public:
+  /// Constructor.
   CC_UnLock_Cmd(const char *lock_set_name,
                 CosConcurrencyControl::lock_mode mode);
-  // Constructor.
 
+  /// Destructor
   virtual ~CC_UnLock_Cmd();
-  // Destructor
 
+  /**
+   * Executes the command, i.e. looks up the lock set with the requested
+   * name in the naming server and executes the unlock command on that
+   * lock set.
+   */
   virtual int execute(void);
-  // Executes the command, i.e. looks up the lock set with the requested
-  // name in the naming server and executes the unlock command on that
-  // lock set.
 
 private:
+  /// The name to look up in the naming service.
   char *name_;
-  // The name to look up in the naming service.
 
+  /// The mode of the lock.
   CosConcurrencyControl::lock_mode mode_;
-  // The mode of the lock.
 };
 
+/**
+ * @class CC_TryLock_Cmd:public
+ *
+ * @brief Defines a class for the try_lock command on the lock set
+ *
+ * This class represents the try_lock command on the lock set. The lock set
+ * is looked up in the naming service.
+ */
 class CC_TryLock_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the try_lock command on the lock set
-  //
-  // = DESCRIPTION
-  //   This class represents the try_lock command on the lock set. The lock set
-  //   is looked up in the naming service.
 {
  public:
+  /// Constructor
   CC_TryLock_Cmd(const char *lock_set_name,
                  CosConcurrencyControl::lock_mode mode);
-  // Constructor
 
+  /// Destructor
   virtual ~CC_TryLock_Cmd();
-  // Destructor
 
+  /**
+   * Executes the command, i.e. looks up the lock set with the requested
+   * name in the naming server and executes the try_lock command on that
+   * lock set.
+   */
   virtual int execute(void);
-  // Executes the command, i.e. looks up the lock set with the requested
-  // name in the naming server and executes the try_lock command on that
-  // lock set.
 
 private:
+  /// The name to look up in the naming service.
   char *name_;
-  // The name to look up in the naming service.
 
+  /// The mode of the lock.
   CosConcurrencyControl::lock_mode mode_;
-  // The mode of the lock.
 };
 
+/**
+ * @class CC_ChangeMode_Cmd:public
+ *
+ * @brief Defines a class for the change_mode command on the lock set
+ *
+ * This class represents the change_mode command on the lock set.
+ * The lock set is looked up in the naming service.
+ */
 class CC_ChangeMode_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the change_mode command on the lock set
-  //
-  // = DESCRIPTION
-  //   This class represents the change_mode command on the lock set.
-  //   The lock set is looked up in the naming service.
 {
  public:
+  /// Constructor
   CC_ChangeMode_Cmd (const char *lock_set_name,
                      CosConcurrencyControl::lock_mode held_mode,
                      CosConcurrencyControl::lock_mode new_mode);
-  // Constructor
 
+  /// Destructor
   virtual ~CC_ChangeMode_Cmd();
-  // Destructor
 
+  /**
+   * Executes the command, i.e. looks up the lock set with the requested
+   * name in the naming server and executes the change_mode command on that
+   * lock set.
+   */
   virtual int execute(void);
-  // Executes the command, i.e. looks up the lock set with the requested
-  // name in the naming server and executes the change_mode command on that
-  // lock set.
 
 private:
+  /// The name to look up in the naming service.
   char *name_;
-  // The name to look up in the naming service.
 
+  /// The mode of the held lock
   CosConcurrencyControl::lock_mode held_mode_;
-  // The mode of the held lock
 
+  /// The new mode of the lock
   CosConcurrencyControl::lock_mode new_mode_;
-  // The new mode of the lock
 };
 
+/**
+ * @class CC_Sleep_Cmd:public
+ *
+ * @brief Defines a class for the sleep command
+ *
+ * This class represents the sleep command. This command is used to make
+ * the script pause for the requested number of second, e.g. to wait for
+ * another process to start.
+ */
 class CC_Sleep_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the sleep command
-  //
-  // = DESCRIPTION
-  //   This class represents the sleep command. This command is used to make
-  //   the script pause for the requested number of second, e.g. to wait for
-  //   another process to start.
 {
  public:
+  /// Constructor.
   CC_Sleep_Cmd(int seconds);
-  // Constructor.
 
+  /// Destructor.
   virtual ~CC_Sleep_Cmd();
-  // Destructor.
 
+  /// Executes the command.
   virtual int execute(void);
-  // Executes the command.
 
  private:
+  /// The number of seconds to sleep
   int time_;
-  // The number of seconds to sleep
 };
 
+/**
+ * @class CC_Repeat_Cmd:public
+ *
+ * @brief Defines a class for the repeat command
+ *
+ * This class represents the repeat command. This command is used to make
+ * the script repeat the test the requested number of times.
+ * The command is curently NOT implemented.
+ */
 class CC_Repeat_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the repeat command
-  //
-  // = DESCRIPTION
-  //   This class represents the repeat command. This command is used to make
-  //   the script repeat the test the requested number of times.
-  //   The command is curently NOT implemented.
 {
  public:
+  /// Constructor.
   CC_Repeat_Cmd(int times);
-  // Constructor.
 
+  /// Destructor.
   virtual ~CC_Repeat_Cmd();
-  // Destructor.
 
+  /// Executes the command.
   virtual int execute(void);
-  // Executes the command.
  private:
+  /// The number of times the commands should be repeated
   int times_;
-  // The number of times the commands should be repeated
 };
 
+/**
+ * @class CC_Wait_Cmd:public
+ *
+ * @brief Defines a class for the wait command
+ *
+ * This class represents the wait command. This command is used to make
+ * the script wait for the user to press return. It is possible to print
+ * different prompts, e.g. instructions.
+ */
 class CC_Wait_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the wait command
-  //
-  // = DESCRIPTION
-  //   This class represents the wait command. This command is used to make
-  //   the script wait for the user to press return. It is possible to print
-  //   different prompts, e.g. instructions.
 {
  public:
+  /// Constructor.
   CC_Wait_Cmd (const char *prompt);
-  // Constructor.
 
+  /// Destructor.
   virtual ~CC_Wait_Cmd();
-  // Destructor.
 
+  /// Executes the command.
   virtual int execute(void);
-  // Executes the command.
 
 private:
+  /// The prompt to print on the screen
   char *prompt_;
-  // The prompt to print on the screen
 };
 
+/**
+ * @class CC_Excep_Cmd
+ *
+ * @brief Defines a class for the excep command
+ *
+ * This class represents the excep command. This command is used to make
+ * the script capable of dealing with cases where an exception is raised
+ * as part of the testing.
+ */
 class CC_Excep_Cmd : public CC_Command
-  // = TITLE
-  //    Defines a class for the excep command
-  //
-  // = DESCRIPTION
-  //   This class represents the excep command. This command is used to make
-  //   the script capable of dealing with cases where an exception is raised
-  //   as part of the testing.
 {
  public:
+  /// Constructor.
   CC_Excep_Cmd (const char *excep);
-  // Constructor.
 
+  /// Destructor.
   virtual ~CC_Excep_Cmd(void);
-  // Destructor.
 
+  /**
+   * Executes the command. Checks to see if the excep_ class variable is set,
+   * and if that's the case check that it is of the expected type. If not the
+   * test fails.
+   */
   virtual int execute(void);
-  // Executes the command. Checks to see if the excep_ class variable is set,
-  // and if that's the case check that it is of the expected type. If not the
-  // test fails.
 
 private:
+  /// The string representation of the expected exception
   char *ex_;
-  // The string representation of the expected exception
 };
 
+/**
+ * @class CC_Dummy_Cmd:
+ *
+ * @brief Defines a class for the dummy command
+ *
+ * This class represents the dummy command. This command is used to
+ * put in a command in the chain that does nothing.
+ */
 class CC_Dummy_Cmd: public CC_Command
-  // = TITLE
-  //    Defines a class for the dummy command
-  //
-  // = DESCRIPTION
-  //   This class represents the dummy command. This command is used to
-  //   put in a command in the chain that does nothing.
 {
  public:
+  /// Constructor.
   CC_Dummy_Cmd(void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~CC_Dummy_Cmd(void);
-  // Destructor.
 
+  /// Executes the command, i.e. does nothing.
   virtual int execute(void);
-  // Executes the command, i.e. does nothing.
 
  private:
 };
 
+/**
+ * @class CC_Print_Cmd:
+ *
+ * @brief Defines a class for the print command
+ *
+ * This class represents the print command. This command is used to
+ * print a message on stdout
+ */
 class CC_Print_Cmd: public CC_Command
-  // = TITLE
-  //    Defines a class for the print command
-  //
-  // = DESCRIPTION
-  //   This class represents the print command. This command is used to
-  //   print a message on stdout
 {
 public:
+  /// Constructor.
   CC_Print_Cmd (const char *message);
-  // Constructor.
 
+  /// Destructor.
   virtual ~CC_Print_Cmd(void);
-  // Destructor.
 
+  /// Executes the command.
   virtual int execute(void);
-  // Executes the command.
 
 private:
+  /// Holds the message to print
   char *msg_;
-  // Holds the message to print
 };
 
+/**
+ * @class CC_Lookup_Cmd:public
+ *
+ * @brief Defines a class for the lookup command.
+ *
+ * This class represents the lookup command. The lock set
+ * is looked up in the naming service and the class variable
+ * cc_lockset_ is set accordingly.
+ */
 class CC_Lookup_Cmd:public CC_Command
-  // = TITLE
-  //    Defines a class for the lookup command.
-  //
-  // = DESCRIPTION
-  //   This class represents the lookup command. The lock set
-  //   is looked up in the naming service and the class variable
-  //   cc_lockset_ is set accordingly.
 {
 public:
+  /// Constructor
   CC_Lookup_Cmd (const char *lock_set_name);
-  // Constructor
 
+  /// Destructor
   virtual ~CC_Lookup_Cmd();
-  // Destructor
 
+  /// Executes the command, i.e. looks up the lock set with the requested
+  /// name in the naming server and sets the cc_lockset_ variable.
   virtual int execute(void);
-  // Executes the command, i.e. looks up the lock set with the requested
-  // name in the naming server and sets the cc_lockset_ variable.
 
 private:
+  /// The name to look up in the naming service.
   char *name_;
-  // The name to look up in the naming service.
 
 };
 
+/**
+ * @class CC_CommandElem
+ *
+ * @brief Defines a class for a command element
+ *
+ * This class implements a command element used in the command list
+ * below. The class is a simple tupple holding a pointer to the command
+ * and a pointer to the next element in the list.
+ */
 class CC_CommandElem
-  // = TITLE
-  //    Defines a class for a command element
-  //
-  // = DESCRIPTION
-  //    This class implements a command element used in the command list
-  //    below. The class is a simple tupple holding a pointer to the command
-  //    and a pointer to the next element in the list.
 {
  public:
+  /// Constructor.
   CC_CommandElem (CC_Command *cmd, CC_CommandElem *next);
-  // Constructor.
 
+  /// Destructor.
   ~CC_CommandElem(void);
-  // Destructor.
 
+  /// Returns a pointer to the command in this element
   CC_Command *GetCommand(void);
-  // Returns a pointer to the command in this element
 
+  /// Returns the pointer to the next element
   CC_CommandElem *GetNext(void);
-  // Returns the pointer to the next element
 
+  /// Sets the next pointer
   void SetNext(CC_CommandElem *next);
-  // Sets the next pointer
 
  private:
+  /// Pointer to the next element
   CC_CommandElem *next_;
-  // Pointer to the next element
 
+  /// Pointer to the command element
   CC_Command *cmd_;
-  // Pointer to the command element
 };
 
+/**
+ * @class CC_CommandList
+ *
+ * @brief Defines a class for a command list
+ *
+ * This class implements a command list used from the script parser
+ * to store the parsed commands The class implements a simple single
+ * linked list.
+ */
 class CC_CommandList
-  // = TITLE
-  //    Defines a class for a command list
-  //
-  // = DESCRIPTION
-  //    This class implements a command list used from the script parser
-  //    to store the parsed commands The class implements a simple single
-  //    linked list.
 {
  public:
+  /// Constructor.
   CC_CommandList(void);
-  // Constructor.
 
+  /// Destructor.
   ~CC_CommandList(void);
-  // Destructor.
 
+  /// Adds the command to the list
   int add(CC_Command *cmd);
-  // Adds the command to the list
 
+  /// Executes all the commands in the list from head to tail
   int execute(void);
-  // Executes all the commands in the list from head to tail
 
+  /// Sets the number of times to repeat the script
   void setrepeat(int times);
-  // Sets the number of times to repeat the script
 
  private:
+  ///  The head of the command list
   CC_CommandElem *head_;
-  //  The head of the command list
 
+  /// The last inserted element
   CC_CommandElem *last_;
-  // The last inserted element
 
+  /// The number of times the script should be repeated
   int times_;
-  // The number of times the script should be repeated
 };
 
 #endif /* _CC_COMMAND_H_ */
diff --git a/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/orbsvcs/tests/Concurrency/CC_command.tab.cpp
index 016c8412b4f..b8156f3dba6 100644
--- a/orbsvcs/tests/Concurrency/CC_command.tab.cpp
+++ b/orbsvcs/tests/Concurrency/CC_command.tab.cpp
@@ -239,7 +239,7 @@ static const short ace_cc_yycheck[] = {     4,
 #define ACE_CC_YYSTACK_USE_ALLOCA
 #define alloca __builtin_alloca
 #else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || (defined (__sun) && defined (__i386))
 #define ACE_CC_YYSTACK_USE_ALLOCA
 #include <alloca.h>
 #else /* not sparc */
@@ -369,7 +369,7 @@ int ace_cc_yydebug;     /*  nonzero means print parse trace */
 #ifndef ACE_CC_YYMAXDEPTH
 #define ACE_CC_YYMAXDEPTH 10000
 #endif
-
+
 /* Define __ace_cc_yy_memcpy.  Note that the size argument
    should be passed with type unsigned int, because that is what the non-GCC
    definitions require.  With GCC, __builtin_memcpy takes an arg
@@ -413,7 +413,7 @@ __ace_cc_yy_memcpy (char *to, char *from, unsigned int count)
 
 #endif
 #endif
-
+
 
 
 /* The user can define ACE_CC_YYPARSE_PARAM as the name of an argument to be passed
@@ -486,7 +486,7 @@ ace_cc_yyparse(ACE_CC_YYPARSE_PARAM_ARG)
   ACE_CC_YYSTYPE ace_cc_yyval;    /*  the variable used to return   */
         /*  semantic values from the action */
         /*  routines        */
-
+  ace_cc_yyval.id = 0;
   int ace_cc_yylen;
 
 #if ACE_CC_YYDEBUG != 0
@@ -838,7 +838,7 @@ case 30:
 }
    /* the action file gets copied in in place of this dollarsign */
 
-
+
   ace_cc_yyvsp -= ace_cc_yylen;
   ace_cc_yyssp -= ace_cc_yylen;
 #ifdef ACE_CC_YYLSP_NEEDED
diff --git a/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index 523154493e4..a274387a7af 100644
--- a/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -1,27 +1,24 @@
-// $Id
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Concurrency
-//
-// = FILENAME
-//    CC_naming_service.cpp
-//
-// = DESCRIPTION
-//      This class implements the naming services necessary to test the
-//      concurrency service
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CC_naming_service.cpp
+ *
+ *  $Id$
+ *
+ *    This class implements the naming services necessary to test the
+ *    concurrency service
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "CC_naming_service.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(Concurrency, CC_naming_service, "$Id$")
+
 
 CC_naming_service::CC_naming_service (CORBA::ORB_var orb)
   : cc_factory_key_ (0),
diff --git a/orbsvcs/tests/Concurrency/CC_naming_service.h b/orbsvcs/tests/Concurrency/CC_naming_service.h
index 9a992338ee2..b5ef3db0f05 100644
--- a/orbsvcs/tests/Concurrency/CC_naming_service.h
+++ b/orbsvcs/tests/Concurrency/CC_naming_service.h
@@ -1,22 +1,18 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Concurrency
-//
-// = FILENAME
-//    CC_naming_service.h
-//
-// = DESCRIPTION
-//      This class implements the naming services necessary to test the
-//      concurrency service.
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CC_naming_service.h
+ *
+ *  $Id$
+ *
+ *    This class implements the naming services necessary to test the
+ *    concurrency service.
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/CosConcurrencyControlC.h"
 #include "orbsvcs/CosNamingC.h"
@@ -25,60 +21,62 @@
 #ifndef _CC_NAMING_SERVICE_H_
 #define _CC_NAMING_SERVICE_H_
 
+/**
+ * @class CC_naming_service
+ *
+ * @brief Defines a class that encapsulates the necessary naming service
+ * functions for the concurrency service.
+ *
+ * This class declares an interface to the naming service for the
+ * concurrency service tests.
+ */
 class CC_naming_service
 {
-  // = TITLE
-  //    Defines a class that encapsulates the necessary naming service
-  //    functions for the concurrency service.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to the naming service for the
-  //    concurrency service tests.
 public:
+  /// Default constructor
   CC_naming_service ();
-  // Default constructor
 
+  /// Constructor
   CC_naming_service (CORBA::ORB_var orb_);
-  // Constructor
 
+  /// Default destructor.
   ~CC_naming_service (void);
-  // Default destructor.
 
+  /// Initialization method must be called after first call of Instance()
+  /// in order to initialize the object correctly
   void Init (CORBA::ORB_var orb_);
-  // Initialization method must be called after first call of Instance()
-  // in order to initialize the object correctly
 
+  /// Lookup a name in the naming service (context, name)
   CORBA::Object_var get_obj_from_name (const char *c_name,
                                        const char *name);
-  // Lookup a name in the naming service (context, name)
 
+  /// Bind a name in the concurrency context.
   void bind_name (const char *n,
                   CORBA::Object_ptr obj);
-  // Bind a name in the concurrency context.
 
+  /// Gets the cc lock set factory which is common for all tests.
   CosConcurrencyControl::LockSetFactory_var get_lock_set_factory (void);
-  // Gets the cc lock set factory which is common for all tests.
 
+  /// The naming service object is a singleton
   static CC_naming_service *Instance(void);
-  // The naming service object is a singleton
 
 private:
+  /// Function to initialize the naming service.
   int init_naming_service (void);
-  // Function to initialize the naming service.
 
+  /// Key of factory obj ref.
   char *cc_factory_key_;
-  // Key of factory obj ref.
 
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
+  /// Name service wrapper class
   TAO_Naming_Client my_name_client_;
-  // Name service wrapper class
 
+  /// factory pointer for the lock set.
   CosConcurrencyControl::LockSetFactory_var factory_;
-  // factory pointer for the lock set.
 
+  /// The instance of the naming service object
   static CC_naming_service *instance_;
-  // The instance of the naming service object
 };
 #endif /* !defined (_CC_NAMING_SERVICE_H_) */
diff --git a/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index 4080b9e369f..fa812004497 100644
--- a/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -1,29 +1,23 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    CC_test_utils.cpp
-//
-// = DESCRIPTION
-//      This class provides a namespace for utility functions for the
-//      concurrency service test.
-//
-// = AUTHORS
-//      Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    CC_test_utils.cpp
+ *
+ *  $Id$
+ *
+ *    This class provides a namespace for utility functions for the
+ *    concurrency service test.
+ *
+ *
+ *  @author   Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "CC_test_utils.h"
 #include "CC_naming_service.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(Concurrency, CC_test_utils, "$Id$")
-
 char *CC_TestUtils::get_lock_mode_name (CosConcurrencyControl::lock_mode mode)
 {
   if (mode==CosConcurrencyControl::read)
diff --git a/orbsvcs/tests/Concurrency/CC_test_utils.h b/orbsvcs/tests/Concurrency/CC_test_utils.h
index 4c1a643f863..a9964b7fd66 100644
--- a/orbsvcs/tests/Concurrency/CC_test_utils.h
+++ b/orbsvcs/tests/Concurrency/CC_test_utils.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    CC_test_utils.h
-//
-// = DESCRIPTION
-//      This class provides a namespace for utility functions for the
-//      concurrency service test.
-//
-// = AUTHORS
-//      Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    CC_test_utils.h
+ *
+ *  $Id$
+ *
+ *    This class provides a namespace for utility functions for the
+ *    concurrency service test.
+ *
+ *
+ *  @author   Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/CosConcurrencyControlC.h"
 
@@ -25,12 +22,12 @@
 class CC_TestUtils
 {
  public:
+  /// Function to return a human readable string from a lock_mode enum.
   static char *get_lock_mode_name (CosConcurrencyControl::lock_mode mode);
-  // Function to return a human readable string from a lock_mode enum.
 
+  /// Creates a lock set by means of th lock set factory in the concurrency
+  /// service server.
   static CosConcurrencyControl::LockSet_ptr create_lock_set (void);
-  // Creates a lock set by means of th lock set factory in the concurrency
-  // service server.
  private:
 };
 
diff --git a/orbsvcs/tests/Concurrency/CC_tests.cpp b/orbsvcs/tests/Concurrency/CC_tests.cpp
index cda1e777953..9155a075edc 100644
--- a/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -1,28 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Concurrency
-//
-// = FILENAME
-//    CC_tests.h
-//
-// = DESCRIPTION
-//      This class implements a number of test objects to test the
-//      concurrency service.
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CC_tests.cpp
+ *
+ *  $Id$
+ *
+ *    This class implements a number of test objects to test the
+ *    concurrency service.
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "CC_tests.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(Concurrency, CC_tests, "$Id$")
-
 CC_Test::CC_Test (CC_naming_service *ns)
   : result (CC_FAIL),
     naming_service_ (ns)
diff --git a/orbsvcs/tests/Concurrency/CC_tests.h b/orbsvcs/tests/Concurrency/CC_tests.h
index 9f0083fd2ad..94e50852ee1 100644
--- a/orbsvcs/tests/Concurrency/CC_tests.h
+++ b/orbsvcs/tests/Concurrency/CC_tests.h
@@ -1,22 +1,18 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Concurrency
-//
-// = FILENAME
-//    CC_tests.h
-//
-// = DESCRIPTION
-//      This class implements a number of test objects to test the
-//      concurrency service.
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    CC_tests.h
+ *
+ *  $Id$
+ *
+ *    This class implements a number of test objects to test the
+ *    concurrency service.
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/CosConcurrencyControlC.h"
 #include "orbsvcs/CosNamingC.h"
@@ -32,152 +28,177 @@ enum
   CC_SUCCESS = 1
 };
 
+/**
+ * @class CC_Test
+ *
+ * @brief Defines an abstract base class for a test
+ *
+ * This class declares an interface to run the test of the
+ * concurrency service.
+ */
 class CC_Test
 {
-  // = TITLE
-  //    Defines an abstract base class for a test
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the test of the
-  //    concurrency service.
 public:
+  /// Default constructor
   CC_Test (CC_naming_service *ns);
-  // Default constructor
 
+  /// Destructor
   virtual ~CC_Test (void);
-  // Destructor
 
+  /// Run the test times_to_run number of times. Returns CC_SUCCESS on
+  /// success CC_FAIL otherwise.
   virtual int run (int times_to_run = 1) = 0;
-  // Run the test times_to_run number of times. Returns CC_SUCCESS on
-  // success CC_FAIL otherwise.
 
+  /// Create a new lock set using the default global lock set factory
+  /// from the naming service.
   CosConcurrencyControl::LockSet_ptr create_lock_set (void);
-  // Create a new lock set using the default global lock set factory
-  // from the naming service.
 
+  /// Returns a human readable string from the lock mode enum.
   char *get_lock_mode_name (CosConcurrencyControl::lock_mode mode);
-  // Returns a human readable string from the lock mode enum.
 
 protected:
+  /// The result of the test being performed.
   int result;
-  // The result of the test being performed.
 
+  /// The naming service beeing used to register and look up locks
   CC_naming_service *naming_service_;
-  // The naming service beeing used to register and look up locks
 };
 
+/**
+ * @class Test_Single_Lock_With_Mode
+ *
+ * @brief This is a simple test that checks that it is possible to set
+ * the lock in the desired mode, try it, and release it.
+ */
 class Test_Single_Lock_With_Mode : public CC_Test
 {
-  // = TITLE
-  //   This is a simple test that checks that it is possible to set
-  //   the lock in the desired mode, try it, and release it.
 public:
+  /**
+   * Default constructor. The naming service must be initialized
+   * before calling this method. The mode is the mode of the lock to
+   * be tested.
+   */
   Test_Single_Lock_With_Mode (CC_naming_service *naming_service,
                               CosConcurrencyControl::lock_mode mode);
-  // Default constructor. The naming service must be initialized
-  // before calling this method. The mode is the mode of the lock to
-  // be tested.
 
+  /// Destructor
   virtual ~Test_Single_Lock_With_Mode (void);
-  // Destructor
 
+  /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
-  // Runs the test the specified number of times.
 
 private:
+  /// The lock mode of the lock being tested
   CosConcurrencyControl::lock_mode mode_;
-  // The lock mode of the lock being tested
 };
 
+/**
+ * @class Test_Setup_LockSet
+ *
+ * @brief This class creates a read lock, registeres it with the naming
+ * service and locks it.
+ */
 class Test_Setup_LockSet : public CC_Test
 {
-  // = TITLE
-  //   This class creates a read lock, registeres it with the naming
-  //   service and locks it.
 public:
+  /**
+   * Default constructor. The naming service must be initialized
+   * before calling this method. The name is the name the lock will be
+   * registered under in the naming service.
+   */
   Test_Setup_LockSet (CC_naming_service *naming_service_,
                       char *name);
-  // Default constructor. The naming service must be initialized
-  // before calling this method. The name is the name the lock will be
-  // registered under in the naming service.
 
+  /// Destructor
   virtual ~Test_Setup_LockSet (void);
-  // Destructor
 
+  /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
-  // Runs the test the specified number of times.
 
 private:
+  /// The name of the lock
   char *my_name_;
-  // The name of the lock
 };
 
+/**
+ * @class Test_Use_Already_Created_LockSet
+ *
+ * @brief This class looks up the lock in the naming service and locks
+ * it.
+ */
 class Test_Use_Already_Created_LockSet : public CC_Test
 {
-  // = TITLE
-  //   This class looks up the lock in the naming service and locks
-  //   it.
 public:
+  /**
+   * Default constructor. The naming service must be initialized
+   * before calling this method. The name is the name the lock will be
+   * looked up under in the naming service.
+   */
   Test_Use_Already_Created_LockSet (CC_naming_service *naming_service_,
                                    char *name);
-  // Default constructor. The naming service must be initialized
-  // before calling this method. The name is the name the lock will be
-  // looked up under in the naming service.
 
+  /// Destructor
   virtual ~Test_Use_Already_Created_LockSet (void);
-  // Destructor
 
+  /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
-  // Runs the test the specified number of times.
 
 private:
+  /// The name of the lock
   char *my_name_;
-  // The name of the lock
 };
 
+/**
+ * @class Test_Unlock_Already_Created_LockSet
+ *
+ * @brief This class looks up the lock in the naming service and unlocks
+ * it.
+ */
 class Test_Unlock_Already_Created_LockSet : public CC_Test
 {
-  // = TITLE
-  //   This class looks up the lock in the naming service and unlocks
-  //   it.
 public:
+  /**
+   * Default constructor. The naming service must be initialized
+   * before calling this method. The name is the name the lock will be
+   * looked up under in the naming service.
+   */
   Test_Unlock_Already_Created_LockSet (CC_naming_service *naming_service_,
                                        char *name);
-  // Default constructor. The naming service must be initialized
-  // before calling this method. The name is the name the lock will be
-  // looked up under in the naming service.
 
+  /// Destructor
   virtual ~Test_Unlock_Already_Created_LockSet (void);
-  // Destructor
 
+  /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
-  // Runs the test the specified number of times.
 
 private:
+  /// The name of the lock
   char *my_name_;
-  // The name of the lock
 };
 
+/**
+ * @class Test_Release_Not_Held_Lock
+ *
+ * @brief This class tests that the LockNotHeld exception is thrown if a
+ * not held lock is released.
+ */
 class Test_Release_Not_Held_Lock : public CC_Test
 {
-  // = TITLE
-  //   This class tests that the LockNotHeld exception is thrown if a
-  //   not held lock is released.
 public:
+  /// Default constructor. The naming service must be initialized
+  /// before calling this method. The mode is the mode of the lock
   Test_Release_Not_Held_Lock (CC_naming_service *naming_service_,
                                 CosConcurrencyControl::lock_mode mode_);
-  // Default constructor. The naming service must be initialized
-  // before calling this method. The mode is the mode of the lock
 
+  /// Destructor
   virtual ~Test_Release_Not_Held_Lock (void);
-  // Destructor
 
+  /// Runs the test the specified number of times.
   virtual int run (int times_to_run = 1);
-  // Runs the test the specified number of times.
 
 private:
+  /// The lock mode of the lock being tested
   CosConcurrencyControl::lock_mode mode_;
-  // The lock mode of the lock being tested
 };
 
 #endif /* !defined (_CC_TESTS_H_) */
diff --git a/orbsvcs/tests/Concurrency/Makefile.am b/orbsvcs/tests/Concurrency/Makefile.am
deleted file mode 100644
index c81514493b2..00000000000
--- a/orbsvcs/tests/Concurrency/Makefile.am
+++ /dev/null
@@ -1,64 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CC_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = CC_client
-
-CC_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-CC_client_SOURCES = \
-  CC_client.cpp \
-  CC_command.cpp \
-  CC_command.tab.cpp \
-  CC_naming_service.cpp \
-  CC_test_utils.cpp \
-  CC_tests.cpp \
-  lex.CC_command.cpp \
-  CC_client.h \
-  CC_command.h \
-  CC_command.tab.h \
-  CC_naming_service.h \
-  CC_test_utils.h \
-  CC_tests.h
-
-CC_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Concurrency/lex.CC_command.cpp b/orbsvcs/tests/Concurrency/lex.CC_command.cpp
index b70ca157c86..136dd3e56f8 100644
--- a/orbsvcs/tests/Concurrency/lex.CC_command.cpp
+++ b/orbsvcs/tests/Concurrency/lex.CC_command.cpp
@@ -1,8 +1,7 @@
-// $Id$
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp
+ * $Id$
  */
 
 #define FLEX_SCANNER
@@ -440,23 +439,12 @@ static char *ace_cc_yy_last_accepting_cpos;
 #define ACE_CC_YY_RESTORE_ACE_CC_YY_MORE_OFFSET
 char *ace_cc_yytext;
 #define INITIAL 0
-/* $Id$
- * ============================================================================
- *
- * = LIBRARY
- *    TAO/orbsvcs/tests
- *
- * = FILENAME
- *    CC_command.l
- *
- * = DESCRIPTION
- *   This is the lex file for the concurrency service script language.
- *
- * = AUTHORS
- *  Torben Worm <tworm@cs.wustl.edu>
- *
- * ============================================================================
+//=============================================================================
+/**
+ * This is the lex file for the concurrency service script language.
  */
+//=============================================================================
+
 #define ACE_CC_YY_NO_UNPUT 1
 #define ACE_CC_YY_NO_INPUT 1
 #define ACE_CC_YY_ALWAYS_INTERACTIVE 1
diff --git a/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index 4853c5b86f0..e2bde895acb 100644
--- a/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -7,10 +7,6 @@
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 
-ACE_RCSID (CEC_Tests,
-           Disconnect,
-           "$Id$")
-
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks);
 
diff --git a/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index d321d47a740..b17aca95c9e 100644
--- a/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -7,10 +7,6 @@
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 
-ACE_RCSID (CEC_Tests,
-           MT_Disconnect,
-           "$Id$")
-
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks);
 
diff --git a/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
index e0799f95255..6f731c8056f 100644
--- a/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
+++ b/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Cos Event Channel tests
-//
-// = FILENAME
-//   MT_Disconnect.h
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   MT_Disconnect.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef CEC_MT_DISCONNECT_H
 #define CEC_MT_DISCONNECT_H
@@ -27,23 +23,23 @@
 class MTD_Task : public ACE_Task_Base
 {
 public:
+  /// Create the task...
   MTD_Task (CosEventChannelAdmin::EventChannel_ptr ec,
         int use_callbacks);
-  // Create the task...
 
   // = Check the ACE_Task_Base documentation.
   int svc (void);
 
+  /// Run a single iteration of the test
   void run_iteration (void);
-  // Run a single iteration of the test
 
 private:
+  /// The event channel used on the test
   CosEventChannelAdmin::EventChannel_var event_channel;
-  // The event channel used on the test
 
+  /// Does the event channel send any callback messages when a client
+  /// diconnects
   int use_callbacks;
-  // Does the event channel send any callback messages when a client
-  // diconnects
 };
 
 #endif /* EC_DISCONNECT_H */
diff --git a/orbsvcs/tests/CosEvent/Basic/Makefile.am b/orbsvcs/tests/CosEvent/Basic/Makefile.am
deleted file mode 100644
index eaef4a840af..00000000000
--- a/orbsvcs/tests/CosEvent/Basic/Makefile.am
+++ /dev/null
@@ -1,304 +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:
-## ../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.CosEvent_Basic_Disconnect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Disconnect
-
-Disconnect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Disconnect_SOURCES = \
-  Disconnect.cpp \
-  MT_Disconnect.h \
-  Random.h
-
-Disconnect_LDFLAGS = \
-  -L../lib
-
-Disconnect_LDADD = \
-  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.CosEvent_Basic_MT_Disconnect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += MT_Disconnect
-
-MT_Disconnect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-MT_Disconnect_SOURCES = \
-  MT_Disconnect.cpp \
-  MT_Disconnect.h
-
-MT_Disconnect_LDFLAGS = \
-  -L../lib
-
-MT_Disconnect_LDADD = \
-  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.CosEvent_Basic_Pull_Push_Event.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Pull_Push_Event
-
-Pull_Push_Event_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Pull_Push_Event_SOURCES = \
-  Pull_Push_Event.cpp \
-  MT_Disconnect.h \
-  Random.h
-
-Pull_Push_Event_LDFLAGS = \
-  -L../lib
-
-Pull_Push_Event_LDADD = \
-  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.CosEvent_Basic_Push_Event.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Push_Event
-
-Push_Event_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Push_Event_SOURCES = \
-  Push_Event.cpp \
-  MT_Disconnect.h \
-  Random.h
-
-Push_Event_LDFLAGS = \
-  -L../lib
-
-Push_Event_LDADD = \
-  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.CosEvent_Basic_Random.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Random
-
-Random_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Random_SOURCES = \
-  Random.cpp \
-  Random.h
-
-Random_LDFLAGS = \
-  -L../lib
-
-Random_LDADD = \
-  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.CosEvent_Basic_Shutdown.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Shutdown
-
-Shutdown_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Shutdown_SOURCES = \
-  Shutdown.cpp \
-  MT_Disconnect.h \
-  Random.h
-
-Shutdown_LDFLAGS = \
-  -L../lib
-
-Shutdown_LDADD = \
-  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index 1a73a9003b2..d3d9825a637 100644
--- a/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (CEC_Tests_Basic,
-           Pull_Push_Event,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index 7e1783336a1..415f034369c 100644
--- a/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (CEC_Tests_Basic,
-           Push_Event,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/CosEvent/Basic/Random.cpp b/orbsvcs/tests/CosEvent/Basic/Random.cpp
index 75f4e5fcd15..5f04dc9119c 100644
--- a/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -7,10 +7,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (CEC_Tests,
-           Random,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/CosEvent/Basic/Random.h b/orbsvcs/tests/CosEvent/Basic/Random.h
index 8e67e20bdcd..9ce0d4363bf 100644
--- a/orbsvcs/tests/CosEvent/Basic/Random.h
+++ b/orbsvcs/tests/CosEvent/Basic/Random.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS COS Event Channel tests
-//
-// = FILENAME
-//   Random.h
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Random.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef EC_RANDOM_H
 #define EC_RANDOM_H
@@ -41,8 +37,8 @@ class RND_Consumer
   // = DESCRIPTION
   //
 public:
+  /// Constructor
   RND_Consumer (RND_Driver *driver);
-  // Constructor
 
   void push (const CORBA::Any &event);
   void disconnect_push_consumer (void);
@@ -51,14 +47,14 @@ public:
   void disconnect (void);
 
 protected:
+  /// The driver
   RND_Driver *driver_;
-  // The driver
 
+  /// The supplier.
   CosEventChannelAdmin::ProxyPushSupplier_var proxy_;
-  // The supplier.
 
+  /// Synch
   TAO_SYNCH_MUTEX lock_;
-  // Synch
 };
 
 inline
@@ -95,27 +91,27 @@ class RND_Supplier
   // = DESCRIPTION
   //
 public:
+  /// Constructor
   RND_Supplier (void);
-  // Constructor
 
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin);
   void disconnect (void);
 
+  /// Push a single event...
   void push_new_event (void);
   void push (CORBA::Any &event);
-  // Push a single event...
 
   virtual void disconnect_push_supplier (void);
 
+  /// Active method
   virtual int svc (void);
-  // Active method
 
 private:
+  /// The supplier.
   CosEventChannelAdmin::ProxyPushConsumer_var proxy_;
-  // The supplier.
 
+  /// Synch
   TAO_SYNCH_MUTEX lock_;
-  // Synch
 };
 
 inline
@@ -130,37 +126,37 @@ class RND_Driver
 public:
   RND_Driver (void);
 
+  /// Run the test
   int run (int argc, ACE_TCHAR *argv[]);
-  // Run the test
 
+  /// The main timer has expired
   void timer (const CORBA::Any &e);
-  // The main timer has expired
 
+  /// One of the consumers has received an event
   void event (const CORBA::Any &e);
-  // One of the consumers has received an event
 
 private:
   RND_Driver (const RND_Driver &);
   RND_Driver& operator= (const RND_Driver &);
 
 private:
+  /// The supplier
   RND_Supplier supplier_;
-  // The supplier
 
+  /// Number of suppliers
   int nsuppliers_;
-  // Number of suppliers
 
+  /// The suppliers
   RND_Supplier **suppliers_;
-  // The suppliers
 
+  /// Number of consumers
   int nconsumers_;
-  // Number of consumers
 
+  /// The consumers
   RND_Consumer **consumers_;
-  // The consumers
 
+  /// Maximum recursion
   int max_recursion_;
-  // Maximum recursion
 
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin_;
   CosEventChannelAdmin::SupplierAdmin_var supplier_admin_;
diff --git a/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index 02f0eb83977..fa4eba583c6 100644
--- a/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 
-ACE_RCSID( CEC_Tests_Basic,
-           Shutdown,
-           "$Id$")
-
 static void run_test (PortableServer::POA_ptr poa,
                       int with_callbacks);
 
diff --git a/orbsvcs/tests/CosEvent/Basic/svc.pull.conf b/orbsvcs/tests/CosEvent/Basic/svc.pull.conf
index 42dae9435e6..ddc08485f9a 100644
--- a/orbsvcs/tests/CosEvent/Basic/svc.pull.conf
+++ b/orbsvcs/tests/CosEvent/Basic/svc.pull.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static CEC_Factory "-CECReactivePullingPeriod 10000"
diff --git a/orbsvcs/tests/CosEvent/Makefile.am b/orbsvcs/tests/CosEvent/Makefile.am
deleted file mode 100644
index ffb416ac4a2..00000000000
--- a/orbsvcs/tests/CosEvent/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Timeout \
-        lib \
-        Basic
-
diff --git a/orbsvcs/tests/CosEvent/Timeout/Makefile.am b/orbsvcs/tests/CosEvent/Timeout/Makefile.am
deleted file mode 100644
index 42cc127d425..00000000000
--- a/orbsvcs/tests/CosEvent/Timeout/Makefile.am
+++ /dev/null
@@ -1,62 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Timeout_Timeout.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS = TimeoutTest
-
-TimeoutTest_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-TimeoutTest_SOURCES = \
-  TestEventConsumer_i.cpp \
-  TimeoutTestMain.cpp \
-  TestEventConsumer_i.h
-
-TimeoutTest_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/CosEvent/Timeout/cosevent.conf b/orbsvcs/tests/CosEvent/Timeout/cosevent.conf
index 1fa9bf39317..fb4042955e1 100644
--- a/orbsvcs/tests/CosEvent/Timeout/cosevent.conf
+++ b/orbsvcs/tests/CosEvent/Timeout/cosevent.conf
@@ -1,3 +1,4 @@
 # $Id$
+
 static CEC_Factory "-CECSupplierControl reactive -CECConsumerControl reactive -CECDispatching mt -CECConsumerOperationTimeout 3000000 -CECSupplierOperationTimeout 3000000"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection"
diff --git a/orbsvcs/tests/CosEvent/Timeout/run_test.pl b/orbsvcs/tests/CosEvent/Timeout/run_test.pl
index e78f65f3ce7..76f860d3f32 100755
--- a/orbsvcs/tests/CosEvent/Timeout/run_test.pl
+++ b/orbsvcs/tests/CosEvent/Timeout/run_test.pl
@@ -39,11 +39,11 @@ my $client_ior1file = $client->LocalFile ($ior1file);
 $client->DeleteFile($ior1file);
 
 
-$SV1 = $server1->CreateProcess ("$PerlACE::TAO_ROOT/orbsvcs/Naming_Service/Naming_Service",
+$SV1 = $server1->CreateProcess ("$PerlACE::TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file");
 
-$SV2 = $server2->CreateProcess ("$PerlACE::TAO_ROOT/orbsvcs/CosEvent_Service/CosEvent_Service",
+$SV2 = $server2->CreateProcess ("$PerlACE::TAO_ROOT/orbsvcs/CosEvent_Service/tao_cosevent",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBSvcConf cosevent.conf " .
                               "-b -o $server2_ior2file " .
@@ -104,7 +104,7 @@ if ($server2->WaitForFileTimed ($ior2file,
     exit 1;
 }
 
-sleep(10); 
+sleep(10);
 
 $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
 
diff --git a/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index d51f9d3e32b..92c6b7f9f71 100644
--- a/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -3,7 +3,7 @@
 #include "Counting_Consumer.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(CEC_Tests, CEC_Count_Consumer, "$Id$")
+
 
 CEC_Counting_Consumer::CEC_Counting_Consumer (const char* name)
   : event_count (0),
diff --git a/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
index e3d0304fc2e..39f095099e0 100644
--- a/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
+++ b/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Cos Event Channel testsuite
-//
-// = FILENAME
-//   Counting_Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Counting_Consumer.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef CEC_COUNTING_CONSUMER_H
 #define CEC_COUNTING_CONSUMER_H
@@ -27,87 +23,89 @@
 #include "orbsvcs/CosEventChannelAdminC.h"
 #include "ace/Task.h"
 
+/**
+ * @class CEC_Counting_Consumer
+ *
+ * @brief Simple consumer object to implement EC tests.
+ *
+ * This is a simple consumer that counts the events it receives.
+ */
 class CEC_Test_Export CEC_Counting_Consumer : public POA_CosEventComm::PushConsumer
 {
-  // = TITLE
-  //   Simple consumer object to implement EC tests.
-  //
-  // = DESCRIPTION
-  //   This is a simple consumer that counts the events it receives.
-  //
 public:
+  /// Constructor
   CEC_Counting_Consumer (const char* name);
-  // Constructor
 
+  /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   void disconnect (void);
-  // Simple connect/disconnect methods..
 
+  /// Print out an error message if the event count is too far from the
+  /// expected count.
   void dump_results (int expected_count, int tolerance);
-  // Print out an error message if the event count is too far from the
-  // expected count.
 
   // = The CosEventComm::PushConsumer methods
 
+  /// The skeleton methods.
   virtual void push (const CORBA::Any& events);
   virtual void disconnect_push_consumer (void);
-  // The skeleton methods.
 
+  /// Keep track of the number of events received.
   CORBA::ULong event_count;
-  // Keep track of the number of events received.
 
+  /// Keep track of the number of disconnect calls received.
   CORBA::ULong disconnect_count;
-  // Keep track of the number of disconnect calls received.
 
 protected:
+  /// The proxy
   CosEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
-  // The proxy
 
+  /// The name
   const char* name_;
-  // The name
 };
 
 // ****************************************************************
 
+/**
+ * @class CEC_Pull_Counting_Consumer
+ *
+ * @brief Simple consumer object to implement EC tests.
+ *
+ * This is a simple consumer that counts the events it receives.
+ */
 class CEC_Test_Export CEC_Pull_Counting_Consumer : public POA_CosEventComm::PullConsumer
 {
-  // = TITLE
-  //   Simple consumer object to implement EC tests.
-  //
-  // = DESCRIPTION
-  //   This is a simple consumer that counts the events it receives.
-  //
 public:
+  /// Constructor
   CEC_Pull_Counting_Consumer (const char* name);
-  // Constructor
 
+  /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   void disconnect (void);
-  // Simple connect/disconnect methods..
 
+  /// Print out an error message if the event count is too far from the
+  /// expected count.
   void dump_results (int expected_count, int tolerance);
-  // Print out an error message if the event count is too far from the
-  // expected count.
 
   CORBA::Any *pull (void);
   CORBA::Any *try_pull (CORBA::Boolean_out has_event);
 
   // = The CosEventComm::PullConsumer methods
+  /// The skeleton methods.
   virtual void disconnect_pull_consumer (void);
-  // The skeleton methods.
 
+  /// Keep track of the number of events received.
   CORBA::ULong event_count;
-  // Keep track of the number of events received.
 
+  /// Keep track of the number of disconnect calls received.
   CORBA::ULong disconnect_count;
-  // Keep track of the number of disconnect calls received.
 
 protected:
+  /// The proxy
   CosEventChannelAdmin::ProxyPullSupplier_var supplier_proxy_;
-  // The proxy
 
+  /// The name
   const char* name_;
-  // The name
 };
 
 // ****************************************************************
@@ -115,9 +113,9 @@ protected:
 class CEC_Test_Export CEC_Counting_Consumer_Task : public ACE_Task_Base
 {
 public:
+  /// Create the task...
   CEC_Counting_Consumer_Task (CEC_Pull_Counting_Consumer *consumer,
                               int milliseconds = 0);
-  // Create the task...
 
   // = Check the ACE_Task_Base documentation.
   int svc (void);
@@ -125,22 +123,22 @@ public:
   void stop (void);
   CORBA::ULong pull_count (void);
 
+  /// Run a single iteration of the test
   void run (void);
-  // Run a single iteration of the test
 
 private:
+  /// The consumer we are turning into an active object
   CEC_Pull_Counting_Consumer *consumer_;
-  // The consumer we are turning into an active object
 
+  /// Set to 1 when the test must stop
   int stop_flag_;
-  // Set to 1 when the test must stop
 
+  /// Count the number of pull() calls
   CORBA::ULong pull_count_;
-  // Count the number of pull() calls
 
+  /// If not zero then pause for <milliseconds> before sending each
+  /// event.
   int milliseconds_;
-  // If not zero then pause for <milliseconds> before sending each
-  // event.
 
   TAO_SYNCH_MUTEX lock_;
 };
diff --git a/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index 1fcfae99a24..841d66408af 100644
--- a/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -3,7 +3,7 @@
 #include "Counting_Supplier.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(CEC_Tests, CEC_Count_Supplier, "$Id$")
+
 
 CEC_Counting_Supplier::CEC_Counting_Supplier (void)
   :  event_count (0),
diff --git a/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
index 2ff59be1e18..86b6b1eaf65 100644
--- a/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
+++ b/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Cos Event Channel testsuite
-//
-// = FILENAME
-//   Counting_Supplier
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Counting_Supplier.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef CEC_COUNTING_SUPPLIER_H
 #define CEC_COUNTING_SUPPLIER_H
@@ -27,47 +23,48 @@
 #include "orbsvcs/CosEventChannelAdminC.h"
 #include "ace/Task.h"
 
+/**
+ * @class CEC_Counting_Supplier
+ *
+ * @brief Simple supplier object
+ *
+ * This class is a supplier of events.
+ */
 class CEC_Test_Export CEC_Counting_Supplier : public POA_CosEventComm::PushSupplier
 {
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //   This class is a supplier of events.
-  //
 public:
+  /// Constructor
   CEC_Counting_Supplier (void);
-  // Constructor
 
   // = The CosEventComm::PushSupplier methods
 
+  /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
   void disconnect (void);
-  // Simple connect/disconnect methods..
 
+  /// Push an event.
   void push (const CORBA::Any& events);
-  // Push an event.
 
+  /// The skeleton methods.
   virtual void disconnect_push_supplier (void);
-  // The skeleton methods.
 
+  /// Count the number of events sent
   CORBA::ULong event_count;
-  // Count the number of events sent
 
+  /// Count the number of disconnect_push_supplier calls
   CORBA::ULong disconnect_count;
-  // Count the number of disconnect_push_supplier calls
 
 private:
+  /// Our proxy
   CosEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
-  // Our proxy
 };
 
 class CEC_Test_Export CEC_Counting_Supplier_Task : public ACE_Task_Base
 {
 public:
+  /// Create the task...
   CEC_Counting_Supplier_Task (CEC_Counting_Supplier *supplier,
                               int milliseconds = 0);
-  // Create the task...
 
   // = Check the ACE_Task_Base documentation.
   int svc (void);
@@ -75,60 +72,61 @@ public:
   void stop (void);
   CORBA::ULong push_count (void);
 
+  /// Run a single iteration of the test
   void run (void);
-  // Run a single iteration of the test
 
 private:
+  /// The supplier we are turning into an active object
   CEC_Counting_Supplier *supplier_;
-  // The supplier we are turning into an active object
 
+  /// Set to 1 when the test must stop
   int stop_flag_;
-  // Set to 1 when the test must stop
 
+  /// Count the number of push() calls
   CORBA::ULong push_count_;
-  // Count the number of push() calls
 
+  /// If not zero then pause for <milliseconds> before sending each
+  /// event.
   int milliseconds_;
-  // If not zero then pause for <milliseconds> before sending each
-  // event.
 
   TAO_SYNCH_MUTEX lock_;
 };
 
 // ****************************************************************
 
+/**
+ * @class CEC_Pull_Counting_Supplier
+ *
+ * @brief Simple supplier object
+ *
+ * This class is a supplier of events.
+ */
 class CEC_Test_Export CEC_Pull_Counting_Supplier : public POA_CosEventComm::PullSupplier
 {
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //   This class is a supplier of events.
-  //
 public:
+  /// Constructor
   CEC_Pull_Counting_Supplier (void);
-  // Constructor
 
   // = The CosEventComm::PullSupplier methods
 
+  /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
   void disconnect (void);
-  // Simple connect/disconnect methods..
 
   // The PullSupplier methods.
   CORBA::Any* pull (void);
   CORBA::Any* try_pull (CORBA::Boolean_out has_event);
   virtual void disconnect_pull_supplier (void);
 
+  /// Count the number of events sent
   CORBA::ULong event_count;
-  // Count the number of events sent
 
+  /// Count the number of disconnect_pull_supplier calls
   CORBA::ULong disconnect_count;
-  // Count the number of disconnect_pull_supplier calls
 
 private:
+  /// Our proxy
   CosEventChannelAdmin::ProxyPullConsumer_var consumer_proxy_;
-  // Our proxy
 };
 
 #endif /* ECT_SUPPLIER_H */
diff --git a/orbsvcs/tests/CosEvent/lib/Makefile.am b/orbsvcs/tests/CosEvent/lib/Makefile.am
deleted file mode 100644
index 132f55111fc..00000000000
--- a/orbsvcs/tests/CosEvent/lib/Makefile.am
+++ /dev/null
@@ -1,50 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CosEvent_Test_Lib.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libCECTests.la
-
-libCECTests_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DCEC_TEST_BUILD_DLL
-
-libCECTests_la_SOURCES = \
-  Counting_Consumer.cpp \
-  Counting_Supplier.cpp
-
-noinst_HEADERS = \
-  Counting_Consumer.h \
-  Counting_Supplier.h \
-  cectest_export.h
-
-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/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index e2dad9a73b6..645249e32af 100644
--- a/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -18,10 +18,6 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Custom_Marshal,
-           ECM_Consumer,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
@@ -250,7 +246,8 @@ Driver::push_consumer (void* /* consumer_cookie */,
       for (CORBA::ULong j = 0; j < n; ++j)
         {
           ECM_IDLData::Point& p = info.trajectory[j];
-          if (p.x != j || p.y != j*j)
+          if (static_cast<CORBA::ULong>(p.x) != j ||
+              static_cast<CORBA::ULong>(p.y) != j*j)
             {
               ACE_DEBUG ((LM_DEBUG,
                           "invalid data in trajectory[%d] = (%f,%f)\n",
@@ -411,4 +408,3 @@ void
 Test_Consumer::disconnect_push_consumer (void)
 {
 }
-
diff --git a/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp b/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
index 6d7f7c3e48e..a6a580f0a65 100644
--- a/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
+++ b/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
@@ -3,7 +3,7 @@
 #include "ECM_Data.h"
 #include "tao/CDR.h"
 
-ACE_RCSID(EC_Custom_Marshal, ECM_Data, "$Id$")
+
 
 CORBA::Boolean
 operator<< (TAO_OutputCDR& cdr, ECM_Data& x)
diff --git a/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index bcb95d23cfb..5e85a0ee5d9 100644
--- a/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -16,7 +16,7 @@
 #include "ECM_Data.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(EC_Custom_Marshal, ECM_Supplier, "$Id$")
+
 
 ECMS_Driver::ECMS_Driver (void)
   : n_suppliers_ (1),
diff --git a/orbsvcs/tests/EC_Custom_Marshal/Makefile.am b/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
deleted file mode 100644
index 511657f204d..00000000000
--- a/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
+++ /dev/null
@@ -1,146 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.EC_Custom_Marshal_IDL.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  dataC.cpp \
-  dataC.h \
-  dataC.inl \
-  dataS.cpp \
-  dataS.h \
-  dataS.inl
-
-CLEANFILES = \
-  data-stamp \
-  dataC.cpp \
-  dataC.h \
-  dataC.inl \
-  dataS.cpp \
-  dataS.h \
-  dataS.inl
-
-dataC.cpp dataC.h dataC.inl dataS.cpp dataS.h dataS.inl: data-stamp
-
-data-stamp: $(srcdir)/data.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/data.idl
-	@touch $@
-
-noinst_HEADERS = \
-  data.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.ECM_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += ECM_Consumer
-
-ECM_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ECM_Consumer_SOURCES = \
-  ECM_Consumer.cpp \
-  ECM_Data.cpp \
-  dataC.cpp \
-  ECM_Consumer.h \
-  ECM_Data.h
-
-ECM_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.ECM_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ECM_Supplier
-
-ECM_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ECM_Supplier_SOURCES = \
-  ECM_Data.cpp \
-  ECM_Supplier.cpp \
-  dataC.cpp \
-  dataS.cpp \
-  ECM_Data.h \
-  ECM_Supplier.h
-
-ECM_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
index 1337d5b8996..3134151727d 100755
--- a/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
+++ b/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
@@ -31,11 +31,11 @@ $server3->DeleteFile ($naming_ior);
 $client->DeleteFile ($naming_ior);
 
 
-$SV1 = $server1->CreateProcess ("../../Naming_Service/Naming_Service",
+$SV1 = $server1->CreateProcess ("../../Naming_Service/tao_cosnaming",
                                 "-ORBNameServicePort $port " .
                                 "-o $server1_naming_ior");
 
-$SV2 = $server2->CreateProcess ("../../Event_Service/Event_Service",
+$SV2 = $server2->CreateProcess ("../../Event_Service/tao_rtevent",
                                 "-ORBInitRef NameService=file://$server2_naming_ior");
 
 $SV3 = $server3->CreateProcess ("ECM_Supplier",
diff --git a/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp b/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
index 723910ec736..f4bbba4a267 100644
--- a/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
+++ b/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
@@ -4,10 +4,6 @@
 #include "AddrServer.h"
 #include "ace/INET_Addr.h"
 
-ACE_RCSID(EC_MT_Mcast,
-          AddrServer,
-          "$Id$")
-
 AddrServer::AddrServer (const ACE_INET_Addr& addr)
 {
 #if defined (ACE_HAS_IPV6)
diff --git a/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
index 2d48ae0266f..4f6034189b0 100644
--- a/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
+++ b/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-ACE_RCSID(EC_MT_Mcast,
-          Consumer,
-          "$Id$")
-
 Consumer::Consumer (void)
   : event_count_ (0)
 {
diff --git a/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index dda31a733bb..d4c4d253821 100644
--- a/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -16,10 +16,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_MT_Mcast,
-           MCast,
-           "$Id$")
-
 const ACE_TCHAR *udp_mcast_address =
     ACE_TEXT (ACE_DEFAULT_MULTICAST_ADDR) ACE_TEXT(":10001");
 
@@ -176,7 +172,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       // Now we setup the sender:
-      TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender;
+      PortableServer::Servant_var<TAO_ECG_UDP_Sender> sender;
       sender = TAO_ECG_UDP_Sender::create();
 
       sender->init (event_channel.in (),
@@ -198,7 +194,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       sender->connect (sub);
 
       // To receive events we need to setup an event handler:
-      TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver;
+      PortableServer::Servant_var<TAO_ECG_UDP_Receiver> receiver;
       receiver = TAO_ECG_UDP_Receiver::create();
 
       TAO_ECG_Mcast_EH mcast_eh (&*receiver);
@@ -374,6 +370,6 @@ int parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/orbsvcs/tests/EC_MT_Mcast/Makefile.am b/orbsvcs/tests/EC_MT_Mcast/Makefile.am
deleted file mode 100644
index 2d4e76e9d6c..00000000000
--- a/orbsvcs/tests/EC_MT_Mcast/Makefile.am
+++ /dev/null
@@ -1,67 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.EC_MT_Mcast.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = MCast
-
-MCast_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-MCast_SOURCES = \
-  AddrServer.cpp \
-  Consumer.cpp \
-  MCast.cpp \
-  Supplier.cpp \
-  AddrServer.h \
-  Consumer.h \
-  Supplier.h
-
-MCast_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
index ff590115fb7..ad2d5afda4c 100644
--- a/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
+++ b/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-ACE_RCSID(EC_MT_Mcast,
-          Supplier,
-          "$Id$")
-
 Supplier::Supplier (void)
 {
 }
diff --git a/orbsvcs/tests/EC_MT_Mcast/svc.conf b/orbsvcs/tests/EC_MT_Mcast/svc.conf
index c6fce32e1bc..62619ef796e 100644
--- a/orbsvcs/tests/EC_MT_Mcast/svc.conf
+++ b/orbsvcs/tests/EC_MT_Mcast/svc.conf
@@ -1,5 +1,6 @@
 # $Id$
+
 static EC_Factory "-ECObserver basic -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECDispatching reactive -ECScheduling null -ECFiltering prefix -ECSupplierFiltering per-supplier"
-static Client_Strategy_Factory "-ORBProfileLock thread -ORBClientConnectionHandler MT"
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock thread"
+static Client_Strategy_Factory "-ORBClientConnectionHandler MT"
+static Server_Strategy_Factory "-ORBConcurrency reactive"
 static Advanced_Resource_Factory "-ORBReactorType tp -ORBInputCDRAllocator thread -ORBConnectionCacheLock thread"
diff --git a/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 75d1ae02c5d..10b0777b219 100644
--- a/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -23,10 +23,6 @@
 #include "EC_Mcast.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (EC_Mcast,
-           EC_Mcast,
-           "$Id$")
-
 ECM_Driver::ECM_Driver (void)
   : event_period_ (250000),
     event_count_ (100),
@@ -205,8 +201,7 @@ ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->open (this->event_count_,
-                                         ec);
+      this->local_federations_[i]->open (this->event_count_, ec);
     }
 }
 
@@ -218,8 +213,7 @@ ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec)
   interval *= 10;
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->activate (ec,
-                                             interval);
+      this->local_federations_[i]->activate (ec, interval);
     }
 }
 
@@ -256,8 +250,7 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec)
       ACE_NEW (clone,
                TAO_ECG_UDP_Out_Endpoint (this->endpoint_));
 
-      this->all_federations_[i]->open (clone,
-                                       ec);
+      this->all_federations_[i]->open (clone, ec);
     }
 }
 
@@ -743,7 +736,7 @@ ECM_Consumer::ECM_Consumer (ECM_Local_Federation *federation)
 void
 ECM_Consumer::open (const char*,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                    ACE_RANDR_TYPE &seed)
+                    unsigned int *seed)
 {
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -758,7 +751,7 @@ ECM_Consumer::open (const char*,
 }
 
 void
-ECM_Consumer::connect (ACE_RANDR_TYPE &seed)
+ECM_Consumer::connect (unsigned int *seed)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
@@ -887,7 +880,7 @@ ECM_Local_Federation::open (int event_count,
 
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/consumer");
-  this->consumer_.open (buf, ec, this->seed_);
+  this->consumer_.open (buf, ec, &this->seed_);
 
   this->last_subscription_change_ = ACE_OS::gettimeofday ();
 }
@@ -940,7 +933,7 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
   ACE_Time_Value delta = ACE_OS::gettimeofday () -
     this->last_subscription_change_;
 
-  unsigned int x = ACE_OS::rand_r (this->seed_);
+  unsigned int x = ACE_OS::rand_r (&this->seed_);
   double p = double (x) / RAND_MAX;
   double maxp = double (delta.msec ()) / this->subscription_change_period_;
 
@@ -950,7 +943,7 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
                   "Reconfiguring federation %s: %f %f [%d]\n",
                   this->name (), p, maxp, x));
       this->consumer_.disconnect ();
-      this->consumer_.connect (this->seed_);
+      this->consumer_.connect (&this->seed_);
       this->last_subscription_change_ = ACE_OS::gettimeofday ();
     }
 }
diff --git a/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index c9d20cce869..52437fb8233 100644
--- a/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -141,7 +141,7 @@ private:
   char** consumer_names_;
   CORBA::ULong* consumer_ipaddr_;
 
-  TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender_;
+  PortableServer::Servant_var<TAO_ECG_UDP_Sender> sender_;
   // The sender
 
   TAO_EC_Simple_AddrServer addr_server_;
@@ -221,13 +221,13 @@ public:
 
   void open (const char* name,
              RtecEventChannelAdmin::EventChannel_ptr event_channel,
-             ACE_RANDR_TYPE &seed);
+             unsigned int *seed);
   // This method connects the consumer to the EC.
 
   void close (void);
   // Disconnect from the EC.
 
-  void connect (ACE_RANDR_TYPE& seed);
+  void connect (unsigned int *seed);
   void disconnect (void);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
@@ -345,7 +345,7 @@ private:
   // The last time we changed our publication, so we don't change too
   // often.
 
-  TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver_;
+  PortableServer::Servant_var<TAO_ECG_UDP_Receiver> receiver_;
   // This object reads the events and pushes them into the EC. Notice
   // that it can receive events from multiple Event Handlers.
 
@@ -357,7 +357,7 @@ private:
   // @@ TODO Eventually we may need several of this objects to handle
   // OS limitations on the number of multicast groups per socket.
 
-  ACE_RANDR_TYPE seed_;
+  unsigned int seed_;
   // The seed for a random number generator.
 
   CORBA::ULong subscription_change_period_;
diff --git a/orbsvcs/tests/EC_Mcast/Makefile.am b/orbsvcs/tests/EC_Mcast/Makefile.am
deleted file mode 100644
index efc0e0bf21c..00000000000
--- a/orbsvcs/tests/EC_Mcast/Makefile.am
+++ /dev/null
@@ -1,62 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.EC_Mcast.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = EC_Mcast
-
-EC_Mcast_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-EC_Mcast_SOURCES = \
-  EC_Mcast.cpp \
-  EC_Mcast.h \
-  EC_Mcast.inl
-
-EC_Mcast_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/EC_Mcast/svc.conf b/orbsvcs/tests/EC_Mcast/svc.conf
index 7505d001e70..06cdae7a509 100644
--- a/orbsvcs/tests/EC_Mcast/svc.conf
+++ b/orbsvcs/tests/EC_Mcast/svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier -ECObserver basic"
diff --git a/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index ce33914cfba..e7e6a91b20d 100644
--- a/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -27,10 +27,6 @@
 # include <sys/lwp.h> /* for _lwp_self */
 #endif /* sun */
 
-ACE_RCSID (EC_Multiple,
-           EC_Multiple,
-           "$Id$")
-
 Test_ECG::Test_ECG (void)
   : lcl_name_ ("Test_ECG"),
     rmt_name_ (""),
@@ -66,8 +62,8 @@ Test_ECG::Test_ECG (void)
 void
 print_priority_info (const char *const name)
 {
-#if defined (ACE_HAS_PTHREADS_STD) || defined (sun)
-#if defined (ACE_HAS_PTHREADS_STD)
+#if defined (ACE_HAS_PTHREADS) || defined (sun)
+#if defined (ACE_HAS_PTHREADS)
   struct sched_param param;
   int policy, status;
 
@@ -95,7 +91,7 @@ print_priority_info (const char *const name)
   }
 #else
   ACE_UNUSED_ARG (name);
-#endif /* ACE_HAS_PTHREADS_STD */
+#endif /* ACE_HAS_PTHREADS */
 
 #ifdef sun
   // Find what scheduling class the thread's LWP is in.
@@ -125,7 +121,7 @@ print_priority_info (const char *const name)
 #endif /* sun */
 #else
   ACE_UNUSED_ARG (name);
-#endif /* ACE_HAS_PTHREADS_STD */
+#endif /* ACE_HAS_PTHREADS || sun */
 }
 
 int
diff --git a/orbsvcs/tests/EC_Multiple/Makefile.am b/orbsvcs/tests/EC_Multiple/Makefile.am
deleted file mode 100644
index ef1eaba0a3f..00000000000
--- a/orbsvcs/tests/EC_Multiple/Makefile.am
+++ /dev/null
@@ -1,68 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.EC_Multiple.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = EC_Multiple
-
-EC_Multiple_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-EC_Multiple_SOURCES = \
-  EC_Multiple.cpp \
-  EC_Multiple.h \
-  Scheduler_Runtime1.h \
-  Scheduler_Runtime2.h \
-  Scheduler_Runtime_Dynamic.h
-
-EC_Multiple_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSchedEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/EC_Multiple/run_test.pl b/orbsvcs/tests/EC_Multiple/run_test.pl
index 5db73ceb7a6..9c0dbe4cabd 100755
--- a/orbsvcs/tests/EC_Multiple/run_test.pl
+++ b/orbsvcs/tests/EC_Multiple/run_test.pl
@@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../Naming_Service/Naming_Service",
+$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level -o $server_iorfile");
 
 $CL = $client->CreateProcess ("EC_Multiple",
diff --git a/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 26d765f6145..d651ccb46aa 100644
--- a/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -14,10 +14,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Throughput,
-           ECT_Consumer,
-           "$Id$")
-
 Test_Consumer::Test_Consumer (ECT_Driver *driver,
                               void *cookie,
                               int n_suppliers,
diff --git a/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 0694c7b8b5c..95b06fd8819 100644
--- a/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -16,10 +16,6 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Throughput,
-           ECT_Consumer_Driver,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp b/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
index 0aaabaaa42e..d97704bf08a 100644
--- a/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
+++ b/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
@@ -3,7 +3,7 @@
 #include "ECT_Driver.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID(EC_Throughput, ECT_Driver, "$Id$")
+
 
 ECT_Driver::~ECT_Driver (void)
 {
diff --git a/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 3357ec50f68..99b7357252a 100644
--- a/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -16,10 +16,6 @@
 #include "ace/ACE.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Throughput,
-           ECT_Supplier,
-           "$Id$")
-
 Test_Supplier::Test_Supplier (ECT_Driver *driver)
   :  driver_ (driver),
      supplier_ (this),
diff --git a/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 3cafc9acc7f..09ff18e842e 100644
--- a/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -16,10 +16,6 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Throughput,
-           ECT_Supplier_Driver,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 267d2cd920f..45a91c2599b 100644
--- a/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -20,10 +20,7 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_errno.h"
-
-ACE_RCSID (EC_Throughput,
-           ECT_Throughput,
-           "$Id$")
+#include "ace/OS_NS_unistd.h"
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
index 084a636c7d3..e3a3ae718ff 100644
--- a/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
+++ b/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
@@ -23,11 +23,6 @@
 
 class ECT_Throughput : public ECT_Driver
 {
-  //
-  // = TITLE
-  //
-  // = DESCRIPTION
-  //
 public:
   ECT_Throughput (void);
 
diff --git a/orbsvcs/tests/EC_Throughput/Makefile.am b/orbsvcs/tests/EC_Throughput/Makefile.am
deleted file mode 100644
index 4f04ed9e586..00000000000
--- a/orbsvcs/tests/EC_Throughput/Makefile.am
+++ /dev/null
@@ -1,157 +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:
-## ../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.ECT_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += ECT_Consumer
-
-ECT_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ECT_Consumer_SOURCES = \
-  ECT_Consumer.cpp \
-  ECT_Consumer_Driver.cpp \
-  ECT_Driver.cpp \
-  ECT_Consumer.h \
-  ECT_Consumer_Driver.h \
-  ECT_Driver.h
-
-ECT_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.ECT_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ECT_Supplier
-
-ECT_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ECT_Supplier_SOURCES = \
-  ECT_Driver.cpp \
-  ECT_Supplier.cpp \
-  ECT_Supplier_Driver.cpp \
-  ECT_Driver.h \
-  ECT_Supplier.h \
-  ECT_Supplier_Driver.h
-
-ECT_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.ECT_Throughput.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ECT_Throughput
-
-ECT_Throughput_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-ECT_Throughput_SOURCES = \
-  ECT_Consumer.cpp \
-  ECT_Driver.cpp \
-  ECT_Supplier.cpp \
-  ECT_Throughput.cpp \
-  ECT_Consumer.h \
-  ECT_Driver.h \
-  ECT_Supplier.h \
-  ECT_Throughput.h
-
-ECT_Throughput_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/EC_Throughput/ec.conf b/orbsvcs/tests/EC_Throughput/ec.conf
index ebab986872a..056cb5a366e 100644
--- a/orbsvcs/tests/EC_Throughput/ec.conf
+++ b/orbsvcs/tests/EC_Throughput/ec.conf
@@ -1,3 +1,4 @@
 # $Id$
+
 static EC_Factory "-ECdispatching reactive -ECfiltering basic -ECproxyconsumerlock thread -ECsupplierfiltering per-supplier"
 static Resource_Factory "-ORBDropRepliesDuringShutdown 0"
diff --git a/orbsvcs/tests/EC_Throughput/run_test.pl b/orbsvcs/tests/EC_Throughput/run_test.pl
index 9c58bdefefc..b0b895329d4 100755
--- a/orbsvcs/tests/EC_Throughput/run_test.pl
+++ b/orbsvcs/tests/EC_Throughput/run_test.pl
@@ -31,9 +31,9 @@ my $ns_nsiorfile = $ns->LocalFile ($nsiorfile);
 my $es_nsiorfile = $es->LocalFile ($nsiorfile);
 my $con_nsiorfile = $con->LocalFile ($nsiorfile);
 my $sup_nsiorfile = $sup->LocalFile ($nsiorfile);
-my $test_ecconffile = $test->LocalFile ($ecconffile); 
-my $es_ecconffile = $es->LocalFile ($ecconffile); 
-my $test_ecmtconffile = $test->LocalFile ($ecmtconffile); 
+my $test_ecconffile = $test->LocalFile ($ecconffile);
+my $es_ecconffile = $es->LocalFile ($ecconffile);
+my $test_ecmtconffile = $test->LocalFile ($ecmtconffile);
 $ns->DeleteFile ($nsiorfile);
 $es->DeleteFile ($nsiorfile);
 $con->DeleteFile ($nsiorfile);
@@ -41,7 +41,7 @@ $sup->DeleteFile ($nsiorfile);
 
 print STDERR "================ Collocated tests, single threaded\n";
 
-$T = $test->CreateProcess ("ECT_Throughput", 
+$T = $test->CreateProcess ("ECT_Throughput",
                            "-ORBSvcConf $test_ecconffile ".
                            "-u 10000 -n 1 -t 0 -c 4");
 
@@ -53,7 +53,7 @@ if ($T_status != 0) {
 
 print STDERR "================ Collocated tests, multi threaded\n";
 
-$T = $test->CreateProcess ("ECT_Throughput", 
+$T = $test->CreateProcess ("ECT_Throughput",
                            "-ORBSvcConf $test_ecmtconffile ".
                            "-u 10000 -n 1 -t 0 -c 4");
 
@@ -65,10 +65,10 @@ if ($T_status != 0) {
 
 print STDERR "================ Remote test\n";
 
-$NS = $ns->CreateProcess ("../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming",
                            "-o $ns_nsiorfile");
 
-$ES = $es->CreateProcess ("../../Event_Service/Event_Service",
+$ES = $es->CreateProcess ("../../Event_Service/tao_rtevent",
                           "-ORBInitRef NameService=file://$es_nsiorfile ".
                           "-ORBSvcConf $es_ecconffile ".
                           "-s local");
diff --git a/orbsvcs/tests/EC_Throughput/run_test_overflow.pl b/orbsvcs/tests/EC_Throughput/run_test_overflow.pl
index 697f4ec9a3e..f14d715d09e 100755
--- a/orbsvcs/tests/EC_Throughput/run_test_overflow.pl
+++ b/orbsvcs/tests/EC_Throughput/run_test_overflow.pl
@@ -31,7 +31,7 @@ my $es_nsiorfile = $es->LocalFile ($nsiorfile);
 my $con_nsiorfile = $con->LocalFile ($nsiorfile);
 my $sup_nsiorfile = $sup->LocalFile ($nsiorfile);
 my $sup2_nsiorfile = $sup2->LocalFile ($nsiorfile);
-my $es_ecmtconffile = $es->LocalFile ($ecmtconffile); 
+my $es_ecmtconffile = $es->LocalFile ($ecmtconffile);
 $ns->DeleteFile ($nsiorfile);
 $es->DeleteFile ($nsiorfile);
 $con->DeleteFile ($nsiorfile);
@@ -41,10 +41,10 @@ $sup2->DeleteFile ($nsiorfile);
 
 print STDERR "================ Overflow test\n";
 
-$NS = $ns->CreateProcess ("../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
 
-$ES = $es->CreateProcess ("../../Event_Service/Event_Service",
+$ES = $es->CreateProcess ("../../Event_Service/tao_rtevent",
                           "-ORBInitRef NameService=file://$es_nsiorfile ".
                           " -ORBSvcConf $es_ecmtconffile ".
                           " -s local");
@@ -57,7 +57,7 @@ $CON = $con->CreateProcess ("ECT_Consumer",
 $SUP = $sup->CreateProcess ("ECT_Supplier",
                             "-ORBInitRef NameService=file://$sup_nsiorfile ".
                             " -s 3 -u 10000 -n 1 -t 0 -b 8");
-                            
+
 $SUP2 = $sup2->CreateProcess ("ECT_Supplier",
                               "-ORBInitRef NameService=file://$sup2_nsiorfile ".
                               " -s 1 -u 10 -n 1 -t 0");
diff --git a/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index 35422a94695..bc35adba8ca 100644
--- a/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -10,10 +10,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Atomic_Reconnect,
-           "$Id$")
-
 const int event_type = 20;
 const int event_source = 10;
 
diff --git a/orbsvcs/tests/Event/Basic/BCast.cpp b/orbsvcs/tests/Event/Basic/BCast.cpp
index 4eb3e8d4968..e12521fccba 100644
--- a/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -8,10 +8,6 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/INET_Addr.h"
 
-ACE_RCSID (EC_Tests_Basic,
-           BCast,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/Bitmask.cpp b/orbsvcs/tests/Event/Basic/Bitmask.cpp
index 29ab5292c67..86be16f5328 100644
--- a/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -8,10 +8,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Bitmask,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/Complex.cpp b/orbsvcs/tests/Event/Basic/Complex.cpp
index e0297bb91d2..1607d15d60c 100644
--- a/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -7,10 +7,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Complex,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/Control.cpp b/orbsvcs/tests/Event/Basic/Control.cpp
index 52b1b07b4a9..0714f229a4a 100644
--- a/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/orbsvcs/tests/Event/Basic/Control.cpp
@@ -10,10 +10,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Control,
-           "$Id$")
-
 const int event_type = 20;
 const int event_source = 10;
 
diff --git a/orbsvcs/tests/Event/Basic/Disconnect.cpp b/orbsvcs/tests/Event/Basic/Disconnect.cpp
index 87a6716299c..cb3153210b4 100644
--- a/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -8,10 +8,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Disconnect,
-           "$Id$")
-
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks);
 
diff --git a/orbsvcs/tests/Event/Basic/Gateway.cpp b/orbsvcs/tests/Event/Basic/Gateway.cpp
index 8f11228326e..f112f9f6d9a 100644
--- a/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -8,10 +8,6 @@
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "orbsvcs/Event/EC_Gateway_IIOP.h"
 
-ACE_RCSID (EC_Tests,
-           Gateway,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index fa4957da024..a447a99d4a2 100644
--- a/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -9,10 +9,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           MT_Disconnect,
-           "$Id$")
-
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks);
 
diff --git a/orbsvcs/tests/Event/Basic/Makefile.am b/orbsvcs/tests/Event/Basic/Makefile.am
deleted file mode 100644
index eb08fabc9ac..00000000000
--- a/orbsvcs/tests/Event/Basic/Makefile.am
+++ /dev/null
@@ -1,755 +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:
-## ../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.Event_Basic_Atomic_Reconnect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Atomic_Reconnect
-
-Atomic_Reconnect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Atomic_Reconnect_SOURCES = \
-  Atomic_Reconnect.cpp \
-  Atomic_Reconnect.h
-
-Atomic_Reconnect_LDFLAGS = \
-  -L../lib
-
-Atomic_Reconnect_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_BCast.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += BCast
-
-BCast_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-BCast_SOURCES = \
-  BCast.cpp \
-  BCast.h
-
-BCast_LDFLAGS = \
-  -L../lib
-
-BCast_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Bitmask.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Bitmask
-
-Bitmask_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Bitmask_SOURCES = \
-  Bitmask.cpp \
-  Atomic_Reconnect.h \
-  BCast.h \
-  Control.h \
-  MT_Disconnect.h \
-  Observer.h \
-  Random.h \
-  Reconnect.h \
-  Schedule.h \
-  Shutdown.h
-
-Bitmask_LDFLAGS = \
-  -L../lib
-
-Bitmask_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Complex.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Complex
-
-Complex_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Complex_SOURCES = \
-  Complex.cpp \
-  Atomic_Reconnect.h \
-  BCast.h \
-  Control.h \
-  MT_Disconnect.h \
-  Observer.h \
-  Random.h \
-  Reconnect.h \
-  Schedule.h \
-  Shutdown.h
-
-Complex_LDFLAGS = \
-  -L../lib
-
-Complex_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Control.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Control
-
-Control_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Control_SOURCES = \
-  Control.cpp \
-  Control.h
-
-Control_LDFLAGS = \
-  -L../lib
-
-Control_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Disconnect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Disconnect
-
-Disconnect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Disconnect_SOURCES = \
-  Disconnect.cpp \
-  Atomic_Reconnect.h \
-  BCast.h \
-  Control.h \
-  MT_Disconnect.h \
-  Observer.h \
-  Random.h \
-  Reconnect.h \
-  Schedule.h \
-  Shutdown.h
-
-Disconnect_LDFLAGS = \
-  -L../lib
-
-Disconnect_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Gateway.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Gateway
-
-Gateway_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Gateway_SOURCES = \
-  Gateway.cpp \
-  Atomic_Reconnect.h \
-  BCast.h \
-  Control.h \
-  MT_Disconnect.h \
-  Observer.h \
-  Random.h \
-  Reconnect.h \
-  Schedule.h \
-  Shutdown.h
-
-Gateway_LDFLAGS = \
-  -L../lib
-
-Gateway_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_MT_Disconnect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += MT_Disconnect
-
-MT_Disconnect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-MT_Disconnect_SOURCES = \
-  MT_Disconnect.cpp \
-  MT_Disconnect.h
-
-MT_Disconnect_LDFLAGS = \
-  -L../lib
-
-MT_Disconnect_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Negation.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Negation
-
-Negation_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Negation_SOURCES = \
-  Negation.cpp \
-  Atomic_Reconnect.h \
-  BCast.h \
-  Control.h \
-  MT_Disconnect.h \
-  Observer.h \
-  Random.h \
-  Reconnect.h \
-  Schedule.h \
-  Shutdown.h
-
-Negation_LDFLAGS = \
-  -L../lib
-
-Negation_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Observer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Observer
-
-Observer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Observer_SOURCES = \
-  Observer.cpp \
-  Observer.h
-
-Observer_LDFLAGS = \
-  -L../lib
-
-Observer_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Random.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Random
-
-Random_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Random_SOURCES = \
-  Random.cpp \
-  Random.h
-
-Random_LDFLAGS = \
-  -L../lib
-
-Random_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Reconnect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Reconnect
-
-Reconnect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Reconnect_SOURCES = \
-  Reconnect.cpp \
-  Reconnect.h
-
-Reconnect_LDFLAGS = \
-  -L../lib
-
-Reconnect_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Shutdown.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Shutdown
-
-Shutdown_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Shutdown_SOURCES = \
-  Shutdown.cpp \
-  Shutdown.h
-
-Shutdown_LDFLAGS = \
-  -L../lib
-
-Shutdown_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Timeout.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Timeout
-
-Timeout_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Timeout_SOURCES = \
-  Timeout.cpp \
-  Atomic_Reconnect.h \
-  BCast.h \
-  Control.h \
-  MT_Disconnect.h \
-  Observer.h \
-  Random.h \
-  Reconnect.h \
-  Schedule.h \
-  Shutdown.h
-
-Timeout_LDFLAGS = \
-  -L../lib
-
-Timeout_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Basic_Wildcard.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Wildcard
-
-Wildcard_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Wildcard_SOURCES = \
-  Wildcard.cpp \
-  Atomic_Reconnect.h \
-  BCast.h \
-  Control.h \
-  MT_Disconnect.h \
-  Observer.h \
-  Random.h \
-  Reconnect.h \
-  Schedule.h \
-  Shutdown.h
-
-Wildcard_LDFLAGS = \
-  -L../lib
-
-Wildcard_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Basic/Negation.cpp b/orbsvcs/tests/Event/Basic/Negation.cpp
index 0de338ee369..0ec7aaa6dfe 100644
--- a/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -8,10 +8,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Negation,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/Observer.cpp b/orbsvcs/tests/Event/Basic/Observer.cpp
index 1b0a42e01f1..302bb16f9e8 100644
--- a/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -8,10 +8,6 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID (EC_Tests_Basic,
-           Observer,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
@@ -48,7 +44,7 @@ EC_Master::run (int argc, ACE_TCHAR* argv[])
       // test.
       ACE_High_Res_Timer::calibrate ();
 
-      this->seed_ = static_cast<ACE_RANDR_TYPE> (ACE_OS::time (0));
+      this->seed_ = static_cast<unsigned int> (ACE_OS::time (0));
 
       this->initialize_orb_and_poa (argc, argv);
 
@@ -65,7 +61,7 @@ EC_Master::run (int argc, ACE_TCHAR* argv[])
       {
         for (int i = 0; i != this->n_channels_; ++i)
           {
-            ACE_OS::rand_r (this->seed_);
+            ACE_OS::rand_r (&this->seed_);
             ACE_NEW_RETURN (this->channels_[i],
                             EC_Observer (this,
                                          this->seed_,
@@ -213,7 +209,7 @@ EC_Master::channel (int i) const
 // ****************************************************************
 
 EC_Observer::EC_Observer (EC_Master *master,
-                          ACE_RANDR_TYPE seed,
+                          unsigned int seed,
                           CORBA::ORB_ptr orb,
                           PortableServer::POA_ptr root_poa,
                           int id)
@@ -344,7 +340,7 @@ EC_Observer::connect_consumer (
       this->EC_Driver::connect_consumer (consumer_admin, i);
       return;
     }
-  unsigned int x = ACE_OS::rand_r (this->seed_);
+  unsigned int x = ACE_OS::rand_r (&this->seed_);
   if (x < RAND_MAX / 8)
     this->EC_Driver::connect_consumer (consumer_admin, i);
 }
@@ -353,7 +349,7 @@ void
 EC_Observer::consumer_push (void*,
                             const RtecEventComm::EventSet&)
 {
-  unsigned int x = ACE_OS::rand_r (this->seed_);
+  unsigned int x = ACE_OS::rand_r (&this->seed_);
   if (x < (RAND_MAX / 64))
     {
       if (this->verbose ())
diff --git a/orbsvcs/tests/Event/Basic/Observer.h b/orbsvcs/tests/Event/Basic/Observer.h
index 498e5bc6873..a1036f5dafe 100644
--- a/orbsvcs/tests/Event/Basic/Observer.h
+++ b/orbsvcs/tests/Event/Basic/Observer.h
@@ -52,7 +52,7 @@ private:
 
 private:
   /// The seed
-  ACE_RANDR_TYPE seed_;
+  unsigned int seed_;
 
   /// The driver programs
   int n_channels_;
@@ -76,7 +76,7 @@ class EC_Observer : public EC_Driver
 public:
   /// Constructor
   EC_Observer (EC_Master *master,
-               ACE_RANDR_TYPE seed,
+               unsigned int seed,
                CORBA::ORB_ptr orb,
                PortableServer::POA_ptr root_poa,
                int id);
@@ -104,7 +104,7 @@ public:
 
 private:
   EC_Master *master_;
-  ACE_RANDR_TYPE seed_;
+  unsigned int seed_;
   int id_;
 
   TAO_EC_Gateway_IIOP *gwys_;
diff --git a/orbsvcs/tests/Event/Basic/Random.cpp b/orbsvcs/tests/Event/Basic/Random.cpp
index 8cba24c7e04..77a600c59ef 100644
--- a/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/orbsvcs/tests/Event/Basic/Random.cpp
@@ -9,10 +9,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Tests,
-           Random,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/Random.h b/orbsvcs/tests/Event/Basic/Random.h
index 566080cc4b1..cdfe706e511 100644
--- a/orbsvcs/tests/Event/Basic/Random.h
+++ b/orbsvcs/tests/Event/Basic/Random.h
@@ -23,14 +23,12 @@
 
 class RND_Driver;
 
+/**
+ * Simple consumer object
+ */
 class RND_Consumer
   : public POA_RtecEventComm::PushConsumer
 {
-  // = TITLE
-  //   Simple consumer object
-  //
-  // = DESCRIPTION
-  //
 public:
   /// Constructor
   RND_Consumer (RND_Driver *driver);
@@ -77,15 +75,13 @@ RND_Timer::RND_Timer (RND_Driver *driver)
 
 // ****************************************************************
 
+/**
+ * Simple supplier object
+ */
 class RND_Supplier
   : public POA_RtecEventComm::PushSupplier
   , public ACE_Task_Base
 {
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //
 public:
   /// Constructor
   RND_Supplier (int verbose);
diff --git a/orbsvcs/tests/Event/Basic/Reconnect.cpp b/orbsvcs/tests/Event/Basic/Reconnect.cpp
index bf88d4568a3..31e4d1de658 100644
--- a/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -7,10 +7,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID (EC_Tests_Basic,
-           Reconnect,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/Schedule.cpp b/orbsvcs/tests/Event/Basic/Schedule.cpp
index ed84937dff7..c0461b8125f 100644
--- a/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -11,7 +11,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
 
-ACE_RCSID(EC_Tests_Basic, Schedule, "$Id$")
+
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/orbsvcs/tests/Event/Basic/Shutdown.cpp b/orbsvcs/tests/Event/Basic/Shutdown.cpp
index d23fda2966e..7e308b5124d 100644
--- a/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ b/orbsvcs/tests/Event/Basic/Shutdown.cpp
@@ -4,7 +4,7 @@
 #include "Consumer.h"
 #include "Supplier.h"
 
-ACE_RCSID(EC_Tests_Basic, Shutdown, "$Id$")
+
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/orbsvcs/tests/Event/Basic/Timeout.cpp b/orbsvcs/tests/Event/Basic/Timeout.cpp
index 21978e810d8..0dd7e45e059 100644
--- a/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -8,12 +8,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Timeout,
-           "$Id$")
-
-// ****************************************************************
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/Wildcard.cpp b/orbsvcs/tests/Event/Basic/Wildcard.cpp
index 366be7854f9..3dc6d2d4c6a 100644
--- a/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -7,10 +7,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests,
-           Wildcard,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Basic/control.conf b/orbsvcs/tests/Event/Basic/control.conf
index bfedbdcfa71..72c79a15f2b 100644
--- a/orbsvcs/tests/Event/Basic/control.conf
+++ b/orbsvcs/tests/Event/Basic/control.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECConsumerControl reactive -ECSupplierControl reactive -ECConsumerControlPeriod 50000 -ECSupplierControlPeriod 50000"
diff --git a/orbsvcs/tests/Event/Basic/exhaustive_test.pl b/orbsvcs/tests/Event/Basic/exhaustive_test.pl
index 7ff0920f1b1..633e3d5fdc1 100755
--- a/orbsvcs/tests/Event/Basic/exhaustive_test.pl
+++ b/orbsvcs/tests/Event/Basic/exhaustive_test.pl
@@ -17,10 +17,10 @@ $conf_file = PerlACE::LocalFile ("exhaustive$PerlACE::svcconf_ext");
 
 @dispatching_configs   = ("-ECDispatching reactive",
                           "-ECDispatching mt -ECDispatchingThreads 4");
-@collection_strategies = ("copy_on_read", 
-                          "copy_on_write", 
+@collection_strategies = ("copy_on_read",
+                          "copy_on_write",
                           "delayed");
-@collection_types      = ("list", 
+@collection_types      = ("list",
                           "rb_tree");
 @filtering_configs     = ("-ECFiltering prefix -ECSupplierFilter per-supplier",
                           "-ECFiltering prefix -ECSupplierFilter null");
@@ -30,7 +30,7 @@ foreach $d (@dispatching_configs) {
         foreach $c (@collection_strategies) {
             foreach $t (@collection_types) {
                 my $collection = "mt:".$c.":".$t;
-                
+
                 my $config = 'static EC_Factory "'
                              .$d
                              ." -ECProxyPushConsumerCollection ".$collection
diff --git a/orbsvcs/tests/Event/Basic/mt.svc.conf b/orbsvcs/tests/Event/Basic/mt.svc.conf
index 8ba2c743960..7b3c1adee6f 100644
--- a/orbsvcs/tests/Event/Basic/mt.svc.conf
+++ b/orbsvcs/tests/Event/Basic/mt.svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECObserver null -ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECdispatching reactive -ECscheduling null -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/orbsvcs/tests/Event/Basic/observer.conf b/orbsvcs/tests/Event/Basic/observer.conf
index c4639fe7f59..bfd14ad37e3 100644
--- a/orbsvcs/tests/Event/Basic/observer.conf
+++ b/orbsvcs/tests/Event/Basic/observer.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECObserver basic -ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECDispatching reactive -ECscheduling null -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/orbsvcs/tests/Event/Basic/svc.complex.conf b/orbsvcs/tests/Event/Basic/svc.complex.conf
index 0b3e29e08b1..6c00cf04975 100644
--- a/orbsvcs/tests/Event/Basic/svc.complex.conf
+++ b/orbsvcs/tests/Event/Basic/svc.complex.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECdispatching reactive -ECfiltering prefix -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/orbsvcs/tests/Event/Basic/svc.conf b/orbsvcs/tests/Event/Basic/svc.conf
index c4d0cc45fbf..09d8c58d194 100644
--- a/orbsvcs/tests/Event/Basic/svc.conf
+++ b/orbsvcs/tests/Event/Basic/svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECdispatching reactive -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/orbsvcs/tests/Event/Makefile.am b/orbsvcs/tests/Event/Makefile.am
deleted file mode 100644
index 7663a0d02bd..00000000000
--- a/orbsvcs/tests/Event/Makefile.am
+++ /dev/null
@@ -1,18 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Mcast \
-        ThreadFlags \
-        UDP \
-        lib \
-        Performance \
-        Basic
-
diff --git a/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp b/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
index 6255f267333..1ae3cae880d 100644
--- a/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
+++ b/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
@@ -5,7 +5,7 @@
 #include "orbsvcs/RtecEventCommC.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://as.ior");
 
diff --git a/orbsvcs/tests/Event/Mcast/AddrServer/Makefile.am b/orbsvcs/tests/Event/Mcast/AddrServer/Makefile.am
deleted file mode 100644
index 67e03d2e9fe..00000000000
--- a/orbsvcs/tests/Event/Mcast/AddrServer/Makefile.am
+++ /dev/null
@@ -1,100 +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:
-## ../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.AddrServer_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-client_SOURCES = \
-  Client.cpp \
-  TestAddrServer.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.AddrServer_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-server_SOURCES = \
-  Server.cpp \
-  TestAddrServer.cpp \
-  TestAddrServer.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
index ce760d23290..4d7b998dd0a 100644
--- a/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
+++ b/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
@@ -10,10 +10,10 @@ EC_Wrapper::EC_Wrapper (void)
 {
 }
 
-TAO_EC_Servant_Var<EC_Wrapper>
+PortableServer::Servant_var<EC_Wrapper>
 EC_Wrapper::create (void)
 {
-  TAO_EC_Servant_Var<EC_Wrapper> w;
+  PortableServer::Servant_var<EC_Wrapper> w;
   ACE_NEW_RETURN (w,
                   EC_Wrapper,
                   w);
diff --git a/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
index 83874c32241..56b377c7878 100644
--- a/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
+++ b/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
@@ -32,7 +32,7 @@ public:
   /// Create a new EC_Wrapper object.
   /// (Constructor access is restricted to insure that all
   /// EC_Wrapper objects are heap-allocated.)
-  static TAO_EC_Servant_Var<EC_Wrapper> create (void);
+  static PortableServer::Servant_var<EC_Wrapper> create (void);
 
   /// Destructor.  Destroys the Event Channel implementation.
   virtual ~EC_Wrapper (void);
@@ -72,7 +72,7 @@ private:
   /// Event Channel implementation.
   /*
    * Once Event Channel implementation is made reference-counted, this
-   * pointer should turn into a Servant_Var.
+   * pointer should turn into a Servant_var.
    */
   TAO_EC_Event_Channel *ec_impl_;
 
diff --git a/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
index 9b3800d166d..943195e2bb9 100644
--- a/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
+++ b/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
@@ -105,7 +105,7 @@ Gateway_EC::run (int argc, ACE_TCHAR ** argv)
       manager->activate ();
 
       // Set up EC.
-      TAO_EC_Servant_Var<EC_Wrapper> ec_wrapper (EC_Wrapper::create ());
+      PortableServer::Servant_var<EC_Wrapper> ec_wrapper (EC_Wrapper::create ());
       if (!ec_wrapper.in ())
         return -1;
 
diff --git a/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/orbsvcs/tests/Event/Mcast/Common/Makefile.am
deleted file mode 100644
index 443c61d62a5..00000000000
--- a/orbsvcs/tests/Event/Mcast/Common/Makefile.am
+++ /dev/null
@@ -1,53 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.ECMcastTests_lib.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_LTLIBRARIES = libECMcastTests.la
-
-libECMcastTests_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DECMCASTTESTS_BUILD_DLL
-
-libECMcastTests_la_SOURCES = \
-  EC_Wrapper.cpp \
-  Gateway_EC.cpp
-
-noinst_HEADERS = \
-  ECMcastTests_export.h \
-  EC_Wrapper.h \
-  Gateway_EC.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
deleted file mode 100644
index 9f8acb43baf..00000000000
--- a/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
+++ /dev/null
@@ -1,156 +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:
-## ../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.Complex_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += consumer
-
-consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-consumer_SOURCES = \
-  consumer.cpp \
-  Constants.h
-
-consumer_LDFLAGS = \
-  -L../Common
-
-consumer_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Complex_Gateway_Ec.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += gateway-ec
-
-gateway_ec_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-gateway_ec_SOURCES = \
-  gateway-ec.cpp \
-  Constants.h
-
-gateway_ec_LDFLAGS = \
-  -L../Common
-
-gateway_ec_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Complex_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += supplier
-
-supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-supplier_SOURCES = \
-  supplier.cpp \
-  Constants.h
-
-supplier_LDFLAGS = \
-  -L../Common
-
-supplier_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf b/orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf
index fefd2eec034..1d65bf87fe8 100644
--- a/orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf
+++ b/orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf
@@ -1,3 +1,4 @@
 # $Id$
+
 static EC_Factory "-ECObserver basic -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
 static ECG_Mcast_Gateway "-ECGService receiver -ECGHandler complex -ECGAddressServer type -ECGAddressServerArg '17@230.100.0.7:12700 18@230.100.0.8:12700 19@230.100.0.9:12700'"
diff --git a/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
index e2d4ebd7219..bc9c677cd1d 100644
--- a/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
+++ b/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
@@ -157,7 +157,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         return 1;
 
       // Create the consumer and register it with POA.
-      TAO_EC_Servant_Var<EC_Consumer> consumer_impl =
+      PortableServer::Servant_var<EC_Consumer> consumer_impl =
         new EC_Consumer (orb, ec);
 
       if (!consumer_impl.in ())
diff --git a/orbsvcs/tests/Event/Mcast/Complex/run_test.pl b/orbsvcs/tests/Event/Mcast/Complex/run_test.pl
index fe9d79a0e18..7fa7648f7e7 100755
--- a/orbsvcs/tests/Event/Mcast/Complex/run_test.pl
+++ b/orbsvcs/tests/Event/Mcast/Complex/run_test.pl
@@ -118,7 +118,7 @@ sub run_test
         print STDERR "ERROR: supplier returned $process_status\n";
         $status = 1;
         kill_processes ();
-        return $status; 
+        return $status;
     }
 
     # Shutdown.
@@ -197,7 +197,7 @@ sub analyze_results {
         }
         close (TEST_OUTPUT);
     }
-    
+
     my $all_received = 1;
     if ($a_events != 100 || $b_events != 100 || $c_events != 100) {
         $all_received = 0;
@@ -206,7 +206,7 @@ sub analyze_results {
                 ."\t$b_events B events, expected 100\n"
                     ."\t$c_events C events, expected 100\n";
     }
-    
+
     if ($all_received && $status == 0) {
         print STDERR "SUCCESS\n";
         return 0;
diff --git a/orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf b/orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf
index 7135b8f4957..17d535d40f5 100644
--- a/orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf
+++ b/orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf
@@ -1,3 +1,4 @@
 # $Id$
+
 static EC_Factory "-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
 static ECG_Mcast_Gateway "-ECGService sender -ECGAddressServer type -ECGAddressServerArg '17@230.100.0.7:12700 18@230.100.0.8:12700 19@230.100.0.9:12700'"
diff --git a/orbsvcs/tests/Event/Mcast/Makefile.am b/orbsvcs/tests/Event/Mcast/Makefile.am
deleted file mode 100644
index 3d177fbffcc..00000000000
--- a/orbsvcs/tests/Event/Mcast/Makefile.am
+++ /dev/null
@@ -1,18 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AddrServer \
-        Common \
-        Complex \
-        RTEC_MCast_Federated \
-        Simple \
-        Two_Way
-
diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
index 10c7ff35b06..8708015e3d0 100644
--- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
+++ b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
@@ -22,7 +22,7 @@ EchoEventConsumer_i::EchoEventConsumer_i(CORBA::ORB_ptr orb, int event_limit)
 void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events)
 {
   // Loop through the events, looking for shutdown events.
-  for (u_int i = 0; i < events.length (); ++i) 
+  for (u_int i = 0; i < events.length (); ++i)
     {
       //ACE_OS::printf(".");
       // Extract event data from the any.
@@ -37,14 +37,14 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events)
           << "  source: " << events[i].header.source;
 
 #if !defined (TAO_LACKS_EVENT_CHANNEL_ANY)
-      if (events[i].data.any_value >>= eventData) 
+      if (events[i].data.any_value >>= eventData)
         {
           out << "  text: "   << eventData;
         }
 #else
       if (events[i].data.payload.length() > 0)
         {
-          out << "  text: " << 
+          out << "  text: " <<
             (const char *)events[i].data.payload.get_buffer();
         }
 #endif  /* !TAO_LACKS_EVENT_CHANNEL_ANY */
diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index 50216f31ff9..ed54c02d3d9 100644
--- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -150,7 +150,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       RtecUDPAdmin::AddrServer::_narrow(tmpobj.in());
 
     // Create and initialize the sender object
-    TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender =
+    PortableServer::Servant_var<TAO_ECG_UDP_Sender> sender =
                                 TAO_ECG_UDP_Sender::create();
     TAO_ECG_UDP_Out_Endpoint endpoint;
     // need to be explicit about the address type when built with
@@ -179,7 +179,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     sender->connect (sub);
 
     // Create and initialize the receiver
-    TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver =
+    PortableServer::Servant_var<TAO_ECG_UDP_Receiver> receiver =
                                       TAO_ECG_UDP_Receiver::create();
 
     // TAO_ECG_UDP_Receiver::init() takes a TAO_ECG_Refcounted_Endpoint.
@@ -200,7 +200,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       auto_ptr<TAO_ECG_Mcast_EH> mcast_eh(new TAO_ECG_Mcast_EH (receiver.in()));
       mcast_eh->reactor (orb->orb_core ()->reactor ());
       mcast_eh->open (ec.in());
-      ACE_AUTO_PTR_RESET(eh,mcast_eh.release(),ACE_Event_Handler);
+      ACE_auto_ptr_reset(eh,mcast_eh.release());
       //eh.reset(mcast_eh.release());
     } else {
       auto_ptr<TAO_ECG_UDP_EH> udp_eh (new TAO_ECG_UDP_EH (receiver.in()));
@@ -209,7 +209,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       if (udp_eh->open (local_addr) == -1)
         ACE_ERROR ((LM_ERROR,"Cannot open EH\n"));
 
-      ACE_AUTO_PTR_RESET(eh,udp_eh.release(),ACE_Event_Handler);
+      ACE_auto_ptr_reset(eh,udp_eh.release());
       //eh.reset(udp_eh.release());
     }
 
diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am
deleted file mode 100644
index ba7e9e16b05..00000000000
--- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../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.RTEC_MCast_Federated_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += EchoEventConsumer
-
-EchoEventConsumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-EchoEventConsumer_SOURCES = \
-  EchoEventConsumerMain.cpp \
-  EchoEventConsumer_i.cpp \
-  EchoEventConsumer_i.h
-
-EchoEventConsumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RTEC_MCast_Federated_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += EchoEventSupplier
-
-EchoEventSupplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-EchoEventSupplier_SOURCES = \
-  EchoEventSupplierMain.cpp \
-  EchoEventSupplier_i.cpp \
-  SimpleAddressServer.cpp \
-  EchoEventSupplier_i.h \
-  SimpleAddressServer.h
-
-EchoEventSupplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl
index 747d3611fde..ca08884713e 100755
--- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl
+++ b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl
@@ -99,7 +99,7 @@ $consumer2->DeleteFile ($ns_ior);
 $supplier1->DeleteFile ($ec1_ior);
 $supplier2->DeleteFile ($ec2_ior);
 
-$NS = $nservice->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service",
+$NS = $nservice->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                                "$debug -o $ns_ns_ior $end_point:$ns_port");
 my $sp1_args = "$debug -ORBInitRef NameService=file://$supplier1_ns_ior ".
                "-ORBSvcConf $supplier1_sp_conf $end_point -iorfile $supplier1_ec1_ior";
diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf
index 5ec352ab7be..eb17a579188 100644
--- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf
+++ b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECobserver basic -ECConsumerControl Reactive"
diff --git a/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
deleted file mode 100644
index 86f05f9504a..00000000000
--- a/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
+++ /dev/null
@@ -1,156 +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:
-## ../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.Simple_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += consumer
-
-consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-consumer_SOURCES = \
-  consumer.cpp \
-  Constants.h
-
-consumer_LDFLAGS = \
-  -L../Common
-
-consumer_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Simple_Gateway_Ec.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += gateway-ec
-
-gateway_ec_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-gateway_ec_SOURCES = \
-  gateway-ec.cpp \
-  Constants.h
-
-gateway_ec_LDFLAGS = \
-  -L../Common
-
-gateway_ec_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Simple_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += supplier
-
-supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-supplier_SOURCES = \
-  supplier.cpp \
-  Constants.h
-
-supplier_LDFLAGS = \
-  -L../Common
-
-supplier_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
index ce905b3945c..2738362a2a6 100644
--- a/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
+++ b/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
@@ -126,7 +126,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         return 1;
 
       // Create the consumer and register it with POA.
-      TAO_EC_Servant_Var<EC_Consumer> consumer_impl =
+      PortableServer::Servant_var<EC_Consumer> consumer_impl =
         new EC_Consumer (orb, ec);
 
       if (!consumer_impl.in ())
diff --git a/orbsvcs/tests/Event/Mcast/Simple/run_test.pl b/orbsvcs/tests/Event/Mcast/Simple/run_test.pl
index 86285dfb808..286196cc55f 100755
--- a/orbsvcs/tests/Event/Mcast/Simple/run_test.pl
+++ b/orbsvcs/tests/Event/Mcast/Simple/run_test.pl
@@ -67,13 +67,13 @@ sub run_test {
         kill_processes ();
         return -1;
     }
-    
+
     # Consumer EC.
     if (run_ec (1, $consumer_conffile[$index], $consumer_iorfile) != 0) {
         kill_processes ();
         return -1;
     }
-    
+
     # Consumer.
     $ps[2] = $test->CreateProcess ("consumer", "-ORBLogFile $output_files[2] ".
                                                "-ORBInitRef Event_Service=file://$consumer_iorfile");
@@ -81,10 +81,10 @@ sub run_test {
         kill_processes ();
         return -1;
     }
-    
+
     # Give consumer a chance to connect to its EC before firing off the supplier.
     sleep ($sleeptime);
-    
+
     # Supplier.
     $ps[3] = $test->CreateProcess ("supplier", "-ORBLogFile $output_files[3] ".
                                                "-ORBInitRef Event_Service=file://$supplier_iorfile");
@@ -172,16 +172,16 @@ sub analyze_results {
     }
 
     close (TEST_OUTPUT);
-    
+
     if ($events_received != 100) {
         print STDERR "ERROR: consumer received $events_received events, expected 100\n";
     }
-    
+
     if ($events_received == 100 && $status == 0) {
         print STDERR "SUCCESS\n";
         return 0;
     }
- 
+
     print STDERR "ERROR - check $output_files[$process_id] for full output.\n";
     return -1;
 }
diff --git a/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
deleted file mode 100644
index 48cbe92f4b6..00000000000
--- a/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
+++ /dev/null
@@ -1,112 +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:
-## ../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.Two_Way_Application.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += application
-
-application_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-application_SOURCES = \
-  application.cpp \
-  Constants.h
-
-application_LDFLAGS = \
-  -L../Common
-
-application_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Two_Way_Gateway_Ec.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += gateway-ec
-
-gateway_ec_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
-
-gateway_ec_SOURCES = \
-  gateway-ec.cpp \
-  Constants.h
-
-gateway_ec_LDFLAGS = \
-  -L../Common
-
-gateway_ec_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
index 90e1eda5d73..3ac17021462 100644
--- a/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
+++ b/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
@@ -571,7 +571,7 @@ int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   // We may want this to be alive beyond the next block.
-  TAO_EC_Servant_Var<Heartbeat_Application> app;
+  PortableServer::Servant_var<Heartbeat_Application> app;
 
   try
     {
diff --git a/orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf b/orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf
index e87f9196f76..01725399041 100644
--- a/orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf
+++ b/orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf
@@ -1,3 +1,4 @@
 # $Id$
+
 static EC_Factory "-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
 static ECG_Mcast_Gateway "-ECGService two_way -ECGAddressServerArg 230.100.1.7:26700"
diff --git a/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl b/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl
index eac3e3f580f..96cad33de96 100755
--- a/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl
+++ b/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl
@@ -124,7 +124,7 @@ sub analyze_results {
         print STDERR "ERROR: Could not open $filename\n";
         return -1;
     }
-    
+
     my $status = 0;
     while (<TEST_OUTPUT>) {
         if (m/total of/) {
@@ -143,7 +143,7 @@ sub analyze_results {
         }
     }
     close (TEST_OUTPUT);
-    
+
     foreach $pid (keys %heartbeats) {
         my $ideal_heartbeats = $apps_number * 50;
         my $received_heartbeats = $heartbeats{$pid};
@@ -165,7 +165,7 @@ sub analyze_results {
         print STDERR "SUCCESS\n";
         return 0;
     }
- 
+
     print STDERR "ERROR - check $filename for full output.\n";
     return -1;
 }
diff --git a/orbsvcs/tests/Event/Performance/Connect.cpp b/orbsvcs/tests/Event/Performance/Connect.cpp
index 1b1145d67dc..91e0b6738a3 100644
--- a/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -8,10 +8,6 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (EC_Tests_Performance,
-           Connect,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Performance/Connect.h b/orbsvcs/tests/Event/Performance/Connect.h
index 1e78e417819..97b1482ebf2 100644
--- a/orbsvcs/tests/Event/Performance/Connect.h
+++ b/orbsvcs/tests/Event/Performance/Connect.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Connect
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Connect.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef EC_CONNECT_H
 #define EC_CONNECT_H
@@ -24,35 +20,35 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class EC_Connect
+ *
+ * @brief Test the EC connection feature
+ *
+ * The EC can be configured to allow re-connection of suppliers
+ * and consumers, this test verifies that:
+ * + The EC does *not* allow connections if the feature is
+ * disabled (the default)
+ * + The EC does allow connections if the feature is enabled
+ * and:
+ * - There are no memory leaks
+ * - Compares the time required for a connection vs a complete
+ * connect/disconnect cycle, specially as the number of
+ * suppliers and consumers increases.
+ */
 class EC_Connect : public EC_Driver
 {
-  //
-  // = TITLE
-  //   Test the EC connection feature
-  //
-  // = DESCRIPTION
-  //   The EC can be configured to allow re-connection of suppliers
-  //   and consumers, this test verifies that:
-  //   + The EC does *not* allow connections if the feature is
-  //     disabled (the default)
-  //   + The EC does allow connections if the feature is enabled
-  //     and:
-  //     - There are no memory leaks
-  //     - Compares the time required for a connection vs a complete
-  //       connect/disconnect cycle, specially as the number of
-  //       suppliers and consumers increases.
-  //
 public:
+  /// Constructor
   EC_Connect (void);
-  // Constructor
 
   // = The EC_Driver methods
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_usage (void);
   virtual void print_args (void) const;
 
+  /// Don't run the suppliers, just test connect and disconnect calls.
   void execute_test (void);
-  // Don't run the suppliers, just test connect and disconnect calls.
 
   virtual void dump_results (void);
 
@@ -78,8 +74,8 @@ private:
   ACE_Throughput_Stats consumer_disconnect_;
   ACE_Throughput_Stats supplier_disconnect_;
 
+  /// What is connected first?
   int order_;
-  // What is connected first?
 };
 
 // ****************************************************************
diff --git a/orbsvcs/tests/Event/Performance/Inversion.cpp b/orbsvcs/tests/Event/Performance/Inversion.cpp
index 6b240c1f941..56f18c95d59 100644
--- a/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -8,10 +8,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/Arg_Shifter.h"
 
-ACE_RCSID (EC_Tests_Performance,
-           Inversion,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Performance/Inversion.h b/orbsvcs/tests/Event/Performance/Inversion.h
index c73eb43bbc8..19a7af0b111 100644
--- a/orbsvcs/tests/Event/Performance/Inversion.h
+++ b/orbsvcs/tests/Event/Performance/Inversion.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Inversion
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Inversion.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef EC_INVERSION_H
 #define EC_INVERSION_H
@@ -23,38 +19,42 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class EC_Inversion
+ *
+ * @brief Measure priority inversions in the EC.
+ *
+ */
 class EC_Inversion : public EC_Driver
 {
-  //
-  // = TITLE
-  //   Measure priority inversions in the EC.
-  //
-  // = DESCRIPTION
-  //
 public:
+  /// Constructor
   EC_Inversion (void);
-  // Constructor
 
   // = The EC_Driver methods
+  /**
+   * Parse the arguments, but override the number of consumers.
+   * The options controlling the event types are ignored, and only two
+   * consumers are created.
+   */
   int parse_args (int &argc, ACE_TCHAR *argv[]);
-  // Parse the arguments, but override the number of consumers.
-  // The options controlling the event types are ignored, and only two
-  // consumers are created.
 
+  /**
+   * In this test there are two consumers, the high priority consumer
+   * receives only events from a single high priority supplier.  The
+   * other consumer receives events from a set of low priority
+   * suppliers.
+   */
   virtual void connect_consumers (void);
   virtual void connect_suppliers (void);
-  // In this test there are two consumers, the high priority consumer
-  // receives only events from a single high priority supplier.  The
-  // other consumer receives events from a set of low priority
-  // suppliers.
 
+  /// Activate the suppliers at different priorities
   virtual void activate_tasks (void);
-  // Activate the suppliers at different priorities
 
 private:
+  /// If set then both low priority and high priority suppliers
+  /// generate the same events.
   int same_events_;
-  // If set then both low priority and high priority suppliers
-  // generate the same events.
 };
 
 #endif /* EC_INVERSION_H */
diff --git a/orbsvcs/tests/Event/Performance/Latency.cpp b/orbsvcs/tests/Event/Performance/Latency.cpp
index 279aaad2520..9b1f4d5bc5e 100644
--- a/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -13,7 +13,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(EC_Tests_Performance, Latency, "$Id$")
+
 
 int iterations = 1000;
 int do_dump_history = 0;
@@ -266,7 +266,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Event/Performance/Latency.h b/orbsvcs/tests/Event/Performance/Latency.h
index f09e9ad531e..9711d7989ad 100644
--- a/orbsvcs/tests/Event/Performance/Latency.h
+++ b/orbsvcs/tests/Event/Performance/Latency.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Latency
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Latency.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef EC_LATENCY_H
 #define EC_LATENCY_H
diff --git a/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index e2e7e8e4937..9de21e581d9 100644
--- a/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -12,7 +12,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(EC_Tests_Performance, Latency_Server, "$Id$")
+
 
 const ACE_TCHAR *ior_file_name = ACE_TEXT("ec.ior");
 
@@ -155,6 +155,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/orbsvcs/tests/Event/Performance/Makefile.am b/orbsvcs/tests/Event/Performance/Makefile.am
deleted file mode 100644
index 1b5ed68fe9b..00000000000
--- a/orbsvcs/tests/Event/Performance/Makefile.am
+++ /dev/null
@@ -1,254 +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:
-## ../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.Event_Performance_Connect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Connect
-
-Connect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Connect_SOURCES = \
-  Connect.cpp \
-  Connect.h
-
-Connect_LDFLAGS = \
-  -L../lib
-
-Connect_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Performance_Inversion.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Inversion
-
-Inversion_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Inversion_SOURCES = \
-  Inversion.cpp \
-  Inversion.h
-
-Inversion_LDFLAGS = \
-  -L../lib
-
-Inversion_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Performance_Latency.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Latency
-
-Latency_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Latency_SOURCES = \
-  Latency.cpp \
-  Latency.h
-
-Latency_LDFLAGS = \
-  -L../lib
-
-Latency_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Performance_Latency_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Latency_Server
-
-Latency_Server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Latency_Server_SOURCES = \
-  Latency_Server.cpp \
-  Connect.h \
-  Inversion.h \
-  Latency.h \
-  Throughput.h
-
-Latency_Server_LDFLAGS = \
-  -L../lib
-
-Latency_Server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Event_Performance_Throughput.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Throughput
-
-Throughput_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
-
-Throughput_SOURCES = \
-  Throughput.cpp \
-  Throughput.h
-
-Throughput_LDFLAGS = \
-  -L../lib
-
-Throughput_LDADD = \
-  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/Performance/Throughput.cpp b/orbsvcs/tests/Event/Performance/Throughput.cpp
index c3babe4dd4e..dddde59bcfa 100644
--- a/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (EC_Tests_Performance,
-           Throughput,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/Event/Performance/Throughput.h b/orbsvcs/tests/Event/Performance/Throughput.h
index 20b5bc63fcf..966c0f6b586 100644
--- a/orbsvcs/tests/Event/Performance/Throughput.h
+++ b/orbsvcs/tests/Event/Performance/Throughput.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Throughput
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Throughput.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef EC_THROUGHPUT_H
 #define EC_THROUGHPUT_H
@@ -23,32 +19,32 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class EC_Throughput
+ *
+ * @brief Test the EC throughput
+ *
+ */
 class EC_Throughput : public EC_Driver
 {
-  //
-  // = TITLE
-  //   Test the EC throughput
-  //
-  // = DESCRIPTION
-  //
 public:
+  /// Constructor
   EC_Throughput (void);
-  // Constructor
 
   // = The EC_Driver methods
+  /// add some command line args to enable/disable throughputions
   virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_args (void) const;
   virtual void print_usage (void);
-  // add some command line args to enable/disable throughputions
 
+  /// set the throughpution flags
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
-  // set the throughpution flags
 
+  /// Don't run the suppliers, just test connect and disconnect calls.
   void execute_test (void);
-  // Don't run the suppliers, just test connect and disconnect calls.
 
+  /// Don't dump the EC_Driver results, they are meaningless.
   void dump_results (void);
-  // Don't dump the EC_Driver results, they are meaningless.
 
 private:
 };
diff --git a/orbsvcs/tests/Event/Performance/ec.list.conf b/orbsvcs/tests/Event/Performance/ec.list.conf
index 5c28ef28fec..0abb338df0e 100644
--- a/orbsvcs/tests/Event/Performance/ec.list.conf
+++ b/orbsvcs/tests/Event/Performance/ec.list.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection st:delayed:list -ECProxyPushSupplierCollection st:delayed:list -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"
diff --git a/orbsvcs/tests/Event/Performance/ec.mt.conf b/orbsvcs/tests/Event/Performance/ec.mt.conf
index c9583c1847d..a5e1e08f1ac 100644
--- a/orbsvcs/tests/Event/Performance/ec.mt.conf
+++ b/orbsvcs/tests/Event/Performance/ec.mt.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECDispatching mt -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"
diff --git a/orbsvcs/tests/Event/Performance/ec.rb_tree.conf b/orbsvcs/tests/Event/Performance/ec.rb_tree.conf
index 1032eb4807c..1b8f1e89741 100644
--- a/orbsvcs/tests/Event/Performance/ec.rb_tree.conf
+++ b/orbsvcs/tests/Event/Performance/ec.rb_tree.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection st:delayed:rb_tree -ECProxyPushSupplierCollection st:delayed:rb_tree -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"
diff --git a/orbsvcs/tests/Event/Performance/ec.st.conf b/orbsvcs/tests/Event/Performance/ec.st.conf
index 6e185e74acb..725d02ac3a1 100644
--- a/orbsvcs/tests/Event/Performance/ec.st.conf
+++ b/orbsvcs/tests/Event/Performance/ec.st.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECProxyPushConsumerCollection st:immediate:list -ECProxyPushSupplierCollection st:immediate:list -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"
diff --git a/orbsvcs/tests/Event/Performance/latency.conf b/orbsvcs/tests/Event/Performance/latency.conf
index 35359a852cb..df7a3a2dc55 100644
--- a/orbsvcs/tests/Event/Performance/latency.conf
+++ b/orbsvcs/tests/Event/Performance/latency.conf
@@ -1,4 +1,5 @@
 # $Id$
+
 # tp is now the default reactor type
 # static Resource_Factory "-ORBReactorType tp"
 static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
diff --git a/orbsvcs/tests/Event/ThreadFlags/Makefile.am b/orbsvcs/tests/Event/ThreadFlags/Makefile.am
deleted file mode 100644
index 10fcbfa4263..00000000000
--- a/orbsvcs/tests/Event/ThreadFlags/Makefile.am
+++ /dev/null
@@ -1,60 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.TFTest.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = testflags
-
-testflags_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-testflags_SOURCES = \
-  testflags.cpp
-
-testflags_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/ThreadFlags/testflags.cpp b/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
index 9ced5ca501e..b38aaa13633 100644
--- a/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
+++ b/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
@@ -9,7 +9,7 @@
 #include "ace/OS_NS_Thread.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID(EC_Tests, testflags, "$Id$")
+
 
 /*
   Here are the scenarios we need to test:
diff --git a/orbsvcs/tests/Event/UDP/AddrServer.cpp b/orbsvcs/tests/Event/UDP/AddrServer.cpp
index 0ee93ca95cb..7992bc6f951 100644
--- a/orbsvcs/tests/Event/UDP/AddrServer.cpp
+++ b/orbsvcs/tests/Event/UDP/AddrServer.cpp
@@ -3,7 +3,7 @@
 #include "AddrServer.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID(EC_Examples, AddrServer, "$Id$")
+
 
 AddrServer::AddrServer (const ACE_INET_Addr& addr)
 {
diff --git a/orbsvcs/tests/Event/UDP/AddrServer.h b/orbsvcs/tests/Event/UDP/AddrServer.h
index 2df463629ac..3f10baed395 100644
--- a/orbsvcs/tests/Event/UDP/AddrServer.h
+++ b/orbsvcs/tests/Event/UDP/AddrServer.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   AddrServer.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef ADDRSERVER_H
 #define ADDRSERVER_H
@@ -21,23 +17,24 @@
 #include "orbsvcs/RtecUDPAdminS.h"
 #include "ace/INET_Addr.h"
 
+/**
+ * @class AddrServer
+ *
+ * @brief A simple AddrServer
+ *
+ * The EC is able to use multiple multicast groups to transmit its
+ * data, the is given control over the mapping between the Event
+ * (type,source) pair and the (ipaddr,port) pair using a
+ * AddrServer.
+ * This class implements a very simple server that simply maps the
+ * <type> component to the <ipaddr> and uses a fixed <port>,
+ * provided at initialization time.
+ */
 class AddrServer : public POA_RtecUDPAdmin::AddrServer
 {
-  // = TITLE
-  //   A simple AddrServer
-  //
-  // = DESCRIPTION
-  //   The EC is able to use multiple multicast groups to transmit its
-  //   data, the is given control over the mapping between the Event
-  //   (type,source) pair and the (ipaddr,port) pair using a
-  //   AddrServer.
-  //   This class implements a very simple server that simply maps the
-  //   <type> component to the <ipaddr> and uses a fixed <port>,
-  //   provided at initialization time.
-  //
 public:
+  /// Constructor
   AddrServer (const ACE_INET_Addr& addr);
-  // Constructor
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
@@ -48,8 +45,8 @@ public:
 
 
 private:
+  /// The address
   ACE_INET_Addr addr_;
-  // The address
 };
 
 #include /**/ "ace/post.h"
diff --git a/orbsvcs/tests/Event/UDP/Consumer.cpp b/orbsvcs/tests/Event/UDP/Consumer.cpp
index 362b64604a6..89dd8c30951 100644
--- a/orbsvcs/tests/Event/UDP/Consumer.cpp
+++ b/orbsvcs/tests/Event/UDP/Consumer.cpp
@@ -6,10 +6,6 @@
 
 #include "TestC.h"
 
-ACE_RCSID (EC_Examples,
-           Consumer,
-           "$Id$")
-
 Consumer::Consumer (bool valuetype)
   : event_count_ (0),
     valuetype_ (valuetype)
diff --git a/orbsvcs/tests/Event/UDP/Consumer.h b/orbsvcs/tests/Event/UDP/Consumer.h
index e805bbb8236..aeb512ae5aa 100644
--- a/orbsvcs/tests/Event/UDP/Consumer.h
+++ b/orbsvcs/tests/Event/UDP/Consumer.h
@@ -1,18 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Consumer.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef CONSUMER_H
 #define CONSUMER_H
@@ -24,38 +20,39 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Consumer
+ *
+ * @brief Simple consumer object
+ *
+ * This class is a consumer of events.
+ * It simply subscribes to one event type.
+ */
 class Consumer : public POA_RtecEventComm::PushConsumer
 {
-  // = TITLE
-  //   Simple consumer object
-  //
-  // = DESCRIPTION
-  //   This class is a consumer of events.
-  //   It simply subscribes to one event type.
-  //
 public:
+  /// Constructor
   Consumer (bool valuetype);
-  // Constructor
 
+  /// Connect to the Event Channel
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  // Connect to the Event Channel
 
+  /// Disconnect from the event channel
   void disconnect (void);
-  // Disconnect from the event channel
 
   // = The RtecEventComm::PushConsumer methods
 
+  /// The skeleton methods.
   virtual void push (const RtecEventComm::EventSet& events);
   virtual void disconnect_push_consumer (void);
-  // The skeleton methods.
 
   CORBA::ULong event_count (void) const;
 private:
+  /// Keep track of the number of events received.
   CORBA::ULong event_count_;
-  // Keep track of the number of events received.
 
+  /// The proxy
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy_;
-  // The proxy
 
   bool valuetype_;
 };
diff --git a/orbsvcs/tests/Event/UDP/Makefile.am b/orbsvcs/tests/Event/UDP/Makefile.am
deleted file mode 100644
index db85cf06b59..00000000000
--- a/orbsvcs/tests/Event/UDP/Makefile.am
+++ /dev/null
@@ -1,145 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RtEC_UDP_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.RtEC_UDP_Receiver.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-receiver_SOURCES = \
-  AddrServer.cpp \
-  Consumer.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  receiver.cpp \
-  AddrServer.h \
-  Consumer.h
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.RtEC_UDP_Sender.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-sender_SOURCES = \
-  AddrServer.cpp \
-  Supplier.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  sender.cpp \
-  AddrServer.h \
-  Supplier.h
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/UDP/Supplier.cpp b/orbsvcs/tests/Event/UDP/Supplier.cpp
index 72c83e70cdc..1138ba409f4 100644
--- a/orbsvcs/tests/Event/UDP/Supplier.cpp
+++ b/orbsvcs/tests/Event/UDP/Supplier.cpp
@@ -4,10 +4,6 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-ACE_RCSID (EC_Examples,
-           Supplier,
-           "$Id$")
-
 Supplier::Supplier (bool valuetype) : valuetype_ (valuetype), event_count_ (0)
 {
 }
diff --git a/orbsvcs/tests/Event/UDP/Supplier.h b/orbsvcs/tests/Event/UDP/Supplier.h
index 52c17eb22f9..23ea368ef62 100644
--- a/orbsvcs/tests/Event/UDP/Supplier.h
+++ b/orbsvcs/tests/Event/UDP/Supplier.h
@@ -1,18 +1,13 @@
 /* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Supplier
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   Supplier.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
 
 #ifndef SUPPLIER_H
 #define SUPPLIER_H
@@ -25,39 +20,40 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Supplier
+ *
+ * @brief Simple supplier object
+ *
+ * This class is a supplier of events.
+ * It simply publishes one event type, when the perform_push()
+ * method is invoked it pushes the event through the event service
+ */
 class Supplier : public POA_RtecEventComm::PushSupplier
 {
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //   This class is a supplier of events.
-  //   It simply publishes one event type, when the perform_push()
-  //   method is invoked it pushes the event through the event service
-  //
 public:
+  /// Constructor
   Supplier (bool valuetype);
-  // Constructor
 
+  /// Connect to the event channel
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  // Connect to the event channel
 
+  /// Disconnect from the event channel
   void disconnect (void);
-  // Disconnect from the event channel
 
+  /// Push a single event
   void perform_push (void);
-  // Push a single event
 
   // = The RtecEventComm::PushSupplier methods
 
+  /// The skeleton methods.
   virtual void disconnect_push_supplier (void);
-  // The skeleton methods.
 
 private:
   void insert_into_any (CORBA::Any& any, Components::EventBase* vb);
 
+  /// The proxy
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy_;
-  // The proxy
 
   bool valuetype_;
 
diff --git a/orbsvcs/tests/Event/UDP/receiver.cpp b/orbsvcs/tests/Event/UDP/receiver.cpp
index 0eac152ebb1..2b94d185d48 100644
--- a/orbsvcs/tests/Event/UDP/receiver.cpp
+++ b/orbsvcs/tests/Event/UDP/receiver.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "Consumer.h"
 #include "AddrServer.h"
 #include "orbsvcs/Event_Service_Constants.h"
@@ -14,10 +13,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "TestC.h"
 
-ACE_RCSID (EC_Examples,
-           MCast,
-           "$Id$")
-
 const ACE_TCHAR *udp_mcast_address =
     ACE_TEXT (ACE_DEFAULT_MULTICAST_ADDR) ACE_TEXT(":10001");
 
@@ -160,7 +155,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
       // To receive events we need to setup an event handler:
-      TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver = TAO_ECG_UDP_Receiver::create();
+      PortableServer::Servant_var<TAO_ECG_UDP_Receiver> receiver =
+        TAO_ECG_UDP_Receiver::create();
       TAO_ECG_Mcast_EH mcast_eh (&(*receiver));
 
       // The event handler uses the ORB reactor to wait for multicast
@@ -327,6 +323,6 @@ int parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/orbsvcs/tests/Event/UDP/sender.cpp b/orbsvcs/tests/Event/UDP/sender.cpp
index c0ac8a4a6f5..3a83d94c10d 100644
--- a/orbsvcs/tests/Event/UDP/sender.cpp
+++ b/orbsvcs/tests/Event/UDP/sender.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "Supplier.h"
 #include "AddrServer.h"
 #include "orbsvcs/Event_Service_Constants.h"
@@ -13,10 +12,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Examples,
-           MCast,
-           "$Id$")
-
 const ACE_TCHAR *udp_mcast_address =
     ACE_TEXT (ACE_DEFAULT_MULTICAST_ADDR) ACE_TEXT(":10001");
 
@@ -144,7 +139,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       // Now we setup the sender:
-      TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender = TAO_ECG_UDP_Sender::create();
+      PortableServer::Servant_var<TAO_ECG_UDP_Sender> sender =
+        TAO_ECG_UDP_Sender::create();
       sender->init (event_channel.in (),
                     address_server.in (),
                     endpoint);
@@ -278,6 +274,6 @@ int parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/orbsvcs/tests/Event/UDP/svc.conf b/orbsvcs/tests/Event/UDP/svc.conf
index d0297d4649e..9b72e028412 100644
--- a/orbsvcs/tests/Event/UDP/svc.conf
+++ b/orbsvcs/tests/Event/UDP/svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static EC_Factory "-ECObserver basic -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECDispatching reactive -ECScheduling null -ECFiltering prefix -ECSupplierFilter per-supplier"
diff --git a/orbsvcs/tests/Event/lib/Consumer.cpp b/orbsvcs/tests/Event/lib/Consumer.cpp
index 8494bae5c9a..afc80cd72de 100644
--- a/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -6,10 +6,6 @@
 
 #include "tao/debug.h"
 
-ACE_RCSID (EC_Tests,
-           EC_Consumer,
-           "$Id$")
-
 EC_Consumer::EC_Consumer (EC_Driver *driver,
                           void *cookie)
   : driver_ (driver),
diff --git a/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index a022244d3cb..cf78deb34e1 100644
--- a/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "Counting_Consumer.h"
 
-ACE_RCSID(EC_Tests, EC_Count_Consumer, "$Id$")
+
 
 EC_Counting_Consumer::EC_Counting_Consumer (const char* name)
   : event_count (0),
diff --git a/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index 0ce3c6e4be9..35da042eb61 100644
--- a/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -4,10 +4,6 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Tests,
-           EC_Count_Supplier,
-           "$Id$")
-
 EC_Counting_Supplier::EC_Counting_Supplier (void)
   :  event_count (0),
      disconnect_count (0),
diff --git a/orbsvcs/tests/Event/lib/Driver.cpp b/orbsvcs/tests/Event/lib/Driver.cpp
index 4202c834f61..4c3d1c11106 100644
--- a/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/orbsvcs/tests/Event/lib/Driver.cpp
@@ -26,7 +26,7 @@
 #include "Driver.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(EC_Tests, EC_Driver, "$Id$")
+
 
 EC_Driver::EC_Driver (void)
   :  n_consumers_ (1),
diff --git a/orbsvcs/tests/Event/lib/Makefile.am b/orbsvcs/tests/Event/lib/Makefile.am
deleted file mode 100644
index cc6f3bd2da2..00000000000
--- a/orbsvcs/tests/Event/lib/Makefile.am
+++ /dev/null
@@ -1,60 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Event_Test_Lib.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_LTLIBRARIES = libECTests.la
-
-libECTests_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DEC_TEST_BUILD_DLL
-
-libECTests_la_SOURCES = \
-  Consumer.cpp \
-  Counting_Consumer.cpp \
-  Counting_Supplier.cpp \
-  Driver.cpp \
-  Supplier.cpp
-
-noinst_HEADERS = \
-  Consumer.h \
-  Counting_Consumer.h \
-  Counting_Supplier.h \
-  Driver.h \
-  Driver.inl \
-  Supplier.h \
-  ectest_export.h
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Event/lib/Supplier.cpp b/orbsvcs/tests/Event/lib/Supplier.cpp
index 7e68e48dc01..d7f95265e8d 100644
--- a/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -7,10 +7,6 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Tests,
-           EC_Supplier,
-           "$Id$")
-
 EC_Supplier::EC_Supplier (EC_Driver *driver,
                           void* cookie)
   :  driver_ (driver),
diff --git a/orbsvcs/tests/FT_App/FT_Client.cpp b/orbsvcs/tests/FT_App/FT_Client.cpp
index d9c33457395..d220a23984d 100644
--- a/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -184,12 +184,14 @@ FTClientMain::parse_args (int argc, ACE_TCHAR *argv[])
         this->inFile_ = ACE_OS::fopen (this->inFileName_, "r");
         if(this->inFile_ && !ferror (this->inFile_))
         {
-          ACE_OS::fprintf (stdout, "FT Client: Reading commands from %s\n", this->inFileName_);
+          ACE_OS::fprintf (stdout, "FT Client: Reading commands from %s\n",
+                           ACE_TEXT_ALWAYS_CHAR (this->inFileName_));
           this->commandIn_ = this->inFile_;
         }
         else
         {
-          ACE_OS::fprintf (stderr, "FT Client: Can't open input file: %s\n", this->inFileName_);
+          ACE_OS::fprintf (stderr, "FT Client: Can't open input file: %s\n",
+                           ACE_TEXT_ALWAYS_CHAR (this->inFileName_));
           result = -1;
         }
         break;
@@ -510,7 +512,11 @@ int FTClientMain::next_replica (void)
   }
   else
   {
-    ACE_OS::fprintf (stderr, "***OUT_OF_REPLICAS*** %d\n", this->replica_pos_);
+    ACE_OS::fprintf (stderr,
+                     "***OUT_OF_REPLICAS*** "
+                     ACE_SIZE_T_FORMAT_SPECIFIER_ASCII
+                     "\n",
+                     this->replica_pos_);
   }
   return result;
 }
diff --git a/orbsvcs/tests/FT_App/FT_Creator.cpp b/orbsvcs/tests/FT_App/FT_Creator.cpp
index cf764bf72c4..6a08013f12b 100644
--- a/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -192,7 +192,8 @@ int FTAPP::FT_Creator::run (void)
       CORBA::String_var iogr = this->orb_->object_to_string (group.in ());
 
       char iogr_filename[1000];
-      ACE_OS::snprintf (iogr_filename, sizeof(iogr_filename), "%s%s_%d.iogr",
+      ACE_OS::snprintf (iogr_filename, sizeof(iogr_filename),
+        "%s%s_" ACE_SIZE_T_FORMAT_SPECIFIER_ASCII ".iogr",
         this->prefix_.c_str (),
         role,
         this->iogr_seq_);
@@ -213,7 +214,8 @@ int FTAPP::FT_Creator::run (void)
     if(this->ns_register_)
     {
       char iogr_name[1000];
-      ACE_OS::snprintf (iogr_name, sizeof(iogr_name), "%s_%s_%d",
+      ACE_OS::snprintf (iogr_name, sizeof(iogr_name),
+        "%s_%s_" ACE_SIZE_T_FORMAT_SPECIFIER_ASCII,
         this->prefix_.c_str (),
         role,
         this->iogr_seq_);
diff --git a/orbsvcs/tests/FT_App/FT_Creator.h b/orbsvcs/tests/FT_App/FT_Creator.h
index 1f8c767c02c..44e7b6125f4 100644
--- a/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/orbsvcs/tests/FT_App/FT_Creator.h
@@ -100,7 +100,7 @@ namespace FTAPP
     /**
      * sequence number applied to created IOGRs
      */
-    unsigned long iogr_seq_;
+    size_t iogr_seq_;
 
     /**
      * prefix for names
diff --git a/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index 350aa991349..371ec0151eb 100644
--- a/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -89,9 +89,8 @@ FT_ReplicaFactory_i::FT_ReplicaFactory_i ()
 
 FT_ReplicaFactory_i::~FT_ReplicaFactory_i ()
 {
-  //scope the guard
   {
-    InternalGuard guard (this->internals_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
     // be sure all replicas are gone
     // before this object disappears
@@ -234,7 +233,7 @@ int FT_ReplicaFactory_i::parse_args (int argc, ACE_TCHAR * argv[])
       break;
     }
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -482,15 +481,14 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb)
     this->this_name_.length (1);
     this->this_name_[0].id = CORBA::string_dup (this->ns_name_.c_str ());
 
-    this->naming_context_->rebind (this->this_name_, this_obj.in()  // CORBA::Object::_duplicate(this_obj)
-                            );
+    this->naming_context_->rebind (this->this_name_, this_obj.in());
   }
 
   // if we're testing.  Create a replica at startup time
   if (this->test_output_file_ != 0)
   {
     // shouldn't be necessary, but create_replica assumes this
-    InternalGuard guard (this->internals_);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->internals_, 1);
     FT_TestReplica_i * replica = create_replica ("test");
 
     PortableServer::POA_var poa = replica->_default_POA ();
@@ -561,7 +559,7 @@ int FT_ReplicaFactory_i::fini (void)
 
 void FT_ReplicaFactory_i::remove_replica(CORBA::ULong id, FT_TestReplica_i * replica)
 {
-  InternalGuard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
   if (id < this->replicas_.size())
   {
     if(this->replicas_[id] == replica)
@@ -595,12 +593,11 @@ void FT_ReplicaFactory_i::remove_replica(CORBA::ULong id, FT_TestReplica_i * rep
 CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
-    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-  )
+    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id)
 {
   METHOD_ENTRY(FT_ReplicaFactory_i::create_object);
   ACE_UNUSED_ARG (type_id);
-  InternalGuard guard (this->internals_);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->internals_, CORBA::Object::_nil ());
 
   ::TAO::PG_Property_Set decoder (the_criteria);
 
@@ -682,12 +679,11 @@ FT_TestReplica_i * FT_ReplicaFactory_i::create_replica(const char * name)
 }
 
 void FT_ReplicaFactory_i::delete_object (
-    const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-  )
+    const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id)
 {
   METHOD_ENTRY(FT_ReplicaFactory_i::delete_object);
 
-  InternalGuard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
   CORBA::ULong factoryId;
   factory_creation_id >>= factoryId;
@@ -712,13 +708,13 @@ void FT_ReplicaFactory_i::delete_object (
 CORBA::Boolean FT_ReplicaFactory_i::is_alive (void)
 {
   METHOD_RETURN(FT_ReplicaFactory_i::is_alive)
-    1;
+    true;
 }
 
 void FT_ReplicaFactory_i::shutdown (void)
 {
   METHOD_ENTRY(FT_FaultDetectorFactory_i::shutdown);
-  InternalGuard guard (this->internals_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
   shutdown_i ();
   this->quit_requested_ = 1;
   METHOD_RETURN(FT_FaultDetectorFactory_i::shutdown);
diff --git a/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index 44362b7092b..b4a38b107bb 100644
--- a/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -161,7 +161,6 @@ private:
    * locked if necessary.
    */
   TAO_SYNCH_MUTEX internals_;
-  typedef ACE_Guard<TAO_SYNCH_MUTEX> InternalGuard;
 
   /**
    * The orb
diff --git a/orbsvcs/tests/FT_App/Makefile.am b/orbsvcs/tests/FT_App/Makefile.am
deleted file mode 100644
index 48f82a8bec2..00000000000
--- a/orbsvcs/tests/FT_App/Makefile.am
+++ /dev/null
@@ -1,486 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.FT_App_Analyzer.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ft_analyzer
-
-ft_analyzer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ft_analyzer_SOURCES = \
-  FTAPP_Analyzer_Main.cpp \
-  StubBatchConsumer.cpp \
-  StubFaultAnalyzer.cpp \
-  StubFaultConsumer.cpp \
-  StubBatchConsumer.h \
-  StubFaultAnalyzer.h \
-  StubFaultConsumer.h
-
-ft_analyzer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_App_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  FT_TestReplicaC.cpp \
-  FT_TestReplicaC.h \
-  FT_TestReplicaC.inl \
-  FT_TestReplicaS.cpp \
-  FT_TestReplicaS.h \
-  FT_TestReplicaS.inl
-
-CLEANFILES = \
-  FT_TestReplica-stamp \
-  FT_TestReplicaC.cpp \
-  FT_TestReplicaC.h \
-  FT_TestReplicaC.inl \
-  FT_TestReplicaS.cpp \
-  FT_TestReplicaS.h \
-  FT_TestReplicaS.inl
-
-FT_TestReplicaC.cpp FT_TestReplicaC.h FT_TestReplicaC.inl FT_TestReplicaS.cpp FT_TestReplicaS.h FT_TestReplicaS.inl: FT_TestReplica-stamp
-
-FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/FT_TestReplica.idl
-	@touch $@
-
-noinst_HEADERS = \
-  FT_TestReplica.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.FT_App_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ft_client
-
-ft_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ft_client_SOURCES = \
-  FT_Client.cpp \
-  FT_TestReplicaC.cpp \
-  FT_Creator.h \
-  FT_ReplicaFactory_i.h \
-  FT_TestReplica_i.h \
-  ReplicationManagerFaultConsumerAdapter.h \
-  StubBatchConsumer.h \
-  StubFaultAnalyzer.h \
-  StubFaultConsumer.h \
-  StubFaultNotifier.h \
-  TAO_Object_Group_Creator.h
-
-ft_client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_App_Creator.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ft_create
-
-ft_create_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ft_create_SOURCES = \
-  FT_Creator.cpp \
-  TAO_Object_Group_Creator.cpp \
-  FT_Creator.h \
-  TAO_Object_Group_Creator.h
-
-ft_create_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_App_FactoryRegistry.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ft_registry
-
-ft_registry_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ft_registry_SOURCES = \
-  FTAPP_FactoryRegistry_Main.cpp
-
-ft_registry_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_App_FaultConsumer.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ft_fault_consumer
-
-ft_fault_consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ft_fault_consumer_SOURCES = \
-  FTAPP_FaultConsumer_Main.cpp \
-  ReplicationManagerFaultConsumerAdapter.cpp \
-  ReplicationManagerFaultConsumerAdapter.h
-
-ft_fault_consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/FT_ReplicationManager/libTAO_ReplicationManagerLib.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_App_Notifier.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ft_notifier
-
-ft_notifier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ft_notifier_SOURCES = \
-  FTAPP_Notifier_Main.cpp \
-  StubFaultNotifier.cpp \
-  StubFaultNotifier.h
-
-ft_notifier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_App_RMController.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += replmgr_controller
-
-replmgr_controller_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-replmgr_controller_SOURCES = \
-  FT_ReplicationManagerController.cpp \
-  FT_Creator.h \
-  FT_ReplicaFactory_i.h \
-  FT_TestReplica_i.h \
-  ReplicationManagerFaultConsumerAdapter.h \
-  StubBatchConsumer.h \
-  StubFaultAnalyzer.h \
-  StubFaultConsumer.h \
-  StubFaultNotifier.h \
-  TAO_Object_Group_Creator.h
-
-replmgr_controller_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FT_App_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ft_replica
-
-ft_replica_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ft_replica_SOURCES = \
-  FT_Replica.cpp \
-  FT_ReplicaFactory_i.cpp \
-  FT_TestReplicaC.cpp \
-  FT_TestReplicaS.cpp \
-  FT_TestReplica_i.cpp \
-  FT_ReplicaFactory_i.h \
-  FT_TestReplica_i.h
-
-ft_replica_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index 5d123ccb437..2b8903ed3d3 100644
--- a/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -115,7 +115,8 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb)
   this->factory_ = ::FT::FaultDetectorFactory::_narrow(detector_obj.in ());
   if (CORBA::is_nil(this->factory_.in ()))
   {
-    ACE_OS::fprintf (stderr, "Can't resolve Detector Factory IOR %s\n", this->detector_ior_);
+    ACE_OS::fprintf (stderr, "Can't resolve Detector Factory IOR %s\n",
+                     ACE_TEXT_ALWAYS_CHAR (this->detector_ior_));
     result = -1;
   }
 
@@ -125,7 +126,8 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb)
   this->notifier_ = ::FT::FaultNotifier::_narrow(not_obj.in ());
   if (CORBA::is_nil(this->notifier_.in ()))
   {
-    ACE_OS::fprintf (stderr, "Can't resolve Notifier IOR %s\n", this->notifier_ior_);
+    ACE_OS::fprintf (stderr, "Can't resolve Notifier IOR %s\n",
+                     ACE_TEXT_ALWAYS_CHAR (this->notifier_ior_));
     result = -1;
   }
 
diff --git a/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index 5b84af9a390..e51a9eacf59 100644
--- a/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -182,7 +182,8 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb)
   this->factory_ = ::FT::FaultDetectorFactory::_narrow(obj.in ());
   if (CORBA::is_nil(this->factory_.in ()))
   {
-    ACE_OS::fprintf (stderr, "Can't resolve Detector Factory IOR %s\n", this->detector_ior_);
+    ACE_OS::fprintf (stderr, "Can't resolve Detector Factory IOR %s\n",
+                     ACE_TEXT_ALWAYS_CHAR (this->detector_ior_));
     result = -1;
   }
   if (result == 0)
diff --git a/orbsvcs/tests/FT_App/run_test_demo.pl b/orbsvcs/tests/FT_App/run_test_demo.pl
index 56226d77fe4..4ed9b4fa641 100755
--- a/orbsvcs/tests/FT_App/run_test_demo.pl
+++ b/orbsvcs/tests/FT_App/run_test_demo.pl
@@ -262,7 +262,7 @@ $hostname = $rp_manager->HostName ();
 $port = $rp_manager->RandomPort ();
 
 $RM = $rp_manager->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/FT_ReplicationManager" .
-                                  "$build_directory/FT_ReplicationManager",
+                                  "$build_directory/tao_ft_replicationmanager",
                                   "-o $rp_manager_ior " .
                                   "-ORBEndpoint iiop://$hostname:$port");
 
@@ -271,18 +271,18 @@ $RMC = $rp_manager_controller->CreateProcess (".$build_directory/replmgr_control
                                  "-x");
 
 $NOT = $fault_notifier->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Notifier" .
-                                       "$build_directory/Fault_Notifier" ,
+                                       "$build_directory/tao_fault_notifier" ,
                                         "-ORBInitRef ReplicationManager=corbaloc::$hostname:$port/ReplicationManager " .
                                         "-o $fault_notifier_ior -q");
 
 $DET1 = $fault_detector1->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Detector" .
-                                       "$build_directory/Fault_Detector" ,
+                                       "$build_directory/tao_fault_detector" ,
                                        "-ORBInitRef ReplicationManager=corbaloc::$hostname:$port/ReplicationManager " .
                                        "-o $fault_detector1_ior " .
                                        "-l $location1 -q");
 
 $DET2 = $fault_detector2->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Detector" .
-                                       "$build_directory/Fault_Detector" ,
+                                       "$build_directory/tao_fault_detector" ,
                                        "-ORBInitRef ReplicationManager=corbaloc::$hostname:$port/ReplicationManager " .
                                        "-o $fault_detector1_ior " .
                                        "-l $location2 -q");
diff --git a/orbsvcs/tests/FT_App/run_test_detector.pl b/orbsvcs/tests/FT_App/run_test_detector.pl
index 694895a5c81..f1c992aa1f9 100755
--- a/orbsvcs/tests/FT_App/run_test_detector.pl
+++ b/orbsvcs/tests/FT_App/run_test_detector.pl
@@ -179,12 +179,12 @@ $REP2 = $ft_replica2->CreateProcess (".$build_directory/ft_replica" ,
                                      "-l loc2 -i type1 -q -p $ft_replica2_client_data");
 
 $DET = $fault_detector->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Detector" .
-                                       "$build_directory/Fault_Detector" ,
+                                       "$build_directory/tao_fault_detector" ,
                                        "-ORBInitRef ReplicationManager=corbaloc::$hostname:$port/ReplicationManager " .
                                        "-o $fault_detector_ior -q");
 
 $NOT = $fault_notifier->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Notifier" .
-                                       "$build_directory/Fault_Notifier" ,
+                                       "$build_directory/tao_fault_notifier" ,
                                         "-ORBInitRef ReplicationManager=corbaloc::$hostname:$port/ReplicationManager " .
                                         "-o $fault_notifier_ior -q " .
                                         "-d file://$notifier_detector_ior " .
diff --git a/orbsvcs/tests/FT_App/run_test_fault_consumer.pl b/orbsvcs/tests/FT_App/run_test_fault_consumer.pl
index 66329347408..ae538957384 100755
--- a/orbsvcs/tests/FT_App/run_test_fault_consumer.pl
+++ b/orbsvcs/tests/FT_App/run_test_fault_consumer.pl
@@ -203,7 +203,7 @@ $REP2 = $ft_replica2->CreateProcess (".$build_directory/ft_replica" ,
                                      "-l loc2 -i type1 -q -p $ft_replica2_client_data");
 
 $DET = $fault_detector->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Detector" .
-                                       "$build_directory/Fault_Detector" ,
+                                       "$build_directory/tao_fault_detector" ,
                                        "-r " .
                                        "-o $fault_detector_ior -q");
 
diff --git a/orbsvcs/tests/FT_App/run_test_notifier.pl b/orbsvcs/tests/FT_App/run_test_notifier.pl
index 6e1a692b23c..f7c64ef1da6 100755
--- a/orbsvcs/tests/FT_App/run_test_notifier.pl
+++ b/orbsvcs/tests/FT_App/run_test_notifier.pl
@@ -200,12 +200,12 @@ $REP2 = $ft_replica2->CreateProcess (".$build_directory/ft_replica" ,
                                      "-l loc2 -i type1 -q -p $ft_replica2_client_data");
 
 $DET = $fault_detector->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Detector" .
-                                       "$build_directory/Fault_Detector" ,
+                                       "$build_directory/tao_fault_detector" ,
                                        "-r " .
                                        "-o $fault_detector_ior -q");
 
 $NOT = $fault_notifier->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Notifier" .
-                                       "$build_directory/Fault_Notifier" ,
+                                       "$build_directory/tao_fault_notifier" ,
                                         "-r " .
                                         "-o $fault_notifier_ior -q");
 
diff --git a/orbsvcs/tests/FT_App/run_test_registry.pl b/orbsvcs/tests/FT_App/run_test_registry.pl
index 6948b684dd2..ef7689ddce0 100755
--- a/orbsvcs/tests/FT_App/run_test_registry.pl
+++ b/orbsvcs/tests/FT_App/run_test_registry.pl
@@ -306,7 +306,7 @@ $hostname = $rp_manager->HostName ();
 $port = $rp_manager->RandomPort ();
 
 $RM = $rp_manager->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/FT_ReplicationManager" .
-                                  "$build_directory/FT_ReplicationManager",
+                                  "$build_directory/tao_ft_replicationmanager",
                                   "-o $rp_manager_ior " .
                                   "-ORBEndpoint iiop://$hostname:$port");
 my($RMC);
diff --git a/orbsvcs/tests/FT_App/run_test_rmnotifier.pl b/orbsvcs/tests/FT_App/run_test_rmnotifier.pl
index 2dd3ac6a488..de1938d0a3c 100755
--- a/orbsvcs/tests/FT_App/run_test_rmnotifier.pl
+++ b/orbsvcs/tests/FT_App/run_test_rmnotifier.pl
@@ -203,7 +203,7 @@ $client->DeleteFile ($replica2_ior);
 
 ### Create process
 $RM = $rp_manager->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/FT_ReplicationManager" .
-                                  "$build_directory/FT_ReplicationManager",
+                                  "$build_directory/tao_ft_replicationmanager",
                                   "-o $rp_manager_ior " .
                                   "-ORBEndpoint iiop://$hostname:$port");
 
@@ -222,12 +222,12 @@ $REP2 = $ft_replica2->CreateProcess (".$build_directory/ft_replica" ,
                                      "-l loc2 -i type1 -q -p $ft_replica2_client_data");
 
 $DET = $fault_detector->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Detector" .
-                                       "$build_directory/Fault_Detector" ,
+                                       "$build_directory/tao_fault_detector" ,
                                        "-ORBInitRef ReplicationManager=corbaloc::$hostname:$port/ReplicationManager " .
                                        "-o $fault_detector_ior -q");
 
 $NOT = $fault_notifier->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Notifier" .
-                                       "$build_directory/Fault_Notifier" ,
+                                       "$build_directory/tao_fault_notifier" ,
                                         "-ORBInitRef ReplicationManager=corbaloc::$hostname:$port/ReplicationManager " .
                                         "-o $fault_notifier_ior -q");
 
diff --git a/orbsvcs/tests/FT_App/run_test_rmregistry.pl b/orbsvcs/tests/FT_App/run_test_rmregistry.pl
index f0b28c6240e..95b802a8f10 100755
--- a/orbsvcs/tests/FT_App/run_test_rmregistry.pl
+++ b/orbsvcs/tests/FT_App/run_test_rmregistry.pl
@@ -257,7 +257,7 @@ $client3->DeleteFile ($replica6_ior);
 $client3->DeleteFile ($replica3_iogr);
 
 $RM = $rp_manager->CreateProcess ("$ENV{'TAO_ROOT'}/orbsvcs/FT_ReplicationManager" .
-                                  "$build_directory/FT_ReplicationManager",
+                                  "$build_directory/tao_ft_replicationmanager",
                                   "-o $rp_manager_ior " .
                                   "-ORBEndpoint iiop://$hostname:$port");
 
diff --git a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
deleted file mode 100644
index 57b1109aacb..00000000000
--- a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
+++ /dev/null
@@ -1,155 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.GroupRef_Manipulation_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -DCORBA3 $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.GroupRef_Manipulation_Client.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.GroupRef_Manipulation_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
index 9dea6f91d01..fe9454b050f 100644
--- a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
+++ b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
@@ -1,12 +1,9 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_ORBInitializer.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (ForwardRequest,
-           Server_ORBInitializer,
-           "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "Server_Request_Interceptor.h"
diff --git a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index 496a3d40a98..053d4054198 100644
--- a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_Request_Interceptor.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -7,10 +8,6 @@
 #include "tao/CDR.h"
 #include "testS.h"
 
-ACE_RCSID (ForwardRequest,
-           Server_Request_Interceptor,
-           "$Id$")
-
 static const CORBA::ULong expected_version = 5;
 
 Server_Request_Interceptor::Server_Request_Interceptor (void)
diff --git a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index 6b8b91aa288..b10636850e8 100644
--- a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "testC.h"
@@ -6,10 +7,6 @@
 #include "tao/PI/PI.h"
 #include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
 
-ACE_RCSID (Group_Ref_Manip,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = 0;
 
 
diff --git a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index 9e33bcc9650..428c66100ee 100644
--- a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
@@ -14,10 +15,6 @@
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 
-ACE_RCSID (ForwardRequest,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_file = 0;
 
 int
diff --git a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
index b25a7d02ce9..a845f0270e1 100644
--- a/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
+++ b/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "test_i.h"
 
-ACE_RCSID (ForwardRequest,
-           test_i,
-           "$Id$")
-
 test_i::test_i (CORBA::Short num,
                 CORBA::ORB_ptr orb)
   : number_ (num),
diff --git a/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
index 5b95112cdf1..38db7554b84 100644
--- a/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
+++ b/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    test
-//
-// = FILENAME
-//    Client_i.h
-//
-// = DESCRIPTION
-//    A helper class for the client
-//
-// = AUTHOR
-//     Bala Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Client_i.h
+ *
+ *  $Id$
+ *
+ *  A helper class for the client
+ *
+ *
+ *  @author  Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TEST_FT_IOGR_CLIENT_I_H
 #define TEST_FT_IOGR_CLIENT_I_H
@@ -30,11 +27,11 @@
 class Client_i
 {
 public:
+  /// Our constructor
   Client_i (CORBA::ORB_ptr orb);
-  // Our constructor
 
+  /// Initialize the ORB etc.
   void init (void);
-  // Initialize the ORB etc.
 
 private:
   CORBA::ORB_var orb_;
diff --git a/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am b/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
deleted file mode 100644
index ea307be2674..00000000000
--- a/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
+++ /dev/null
@@ -1,149 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.FaultTolerance_IOGR_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.FaultTolerance_IOGR_Manager.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Manager
-
-Manager_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Manager_SOURCES = \
-  Manager.cpp \
-  testC.cpp \
-  Manager.h
-
-Manager_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FaultTolerance_IOGR_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 47fe59c26fc..a70dbe81524 100644
--- a/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -51,7 +51,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
index b674782986f..e46b0ad131e 100644
--- a/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
+++ b/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
@@ -1,22 +1,18 @@
-//$Id$
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//   test
-//
-// = FILENAME
-//    Manager.h
-//
-// = DESCRIPTION
-//    A manager class that merger IORS and designates primary
-//
-// = AUTHOR
-//     Bala Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Manager.h
+ *
+ *  $Id$
+ *
+ *  A manager class that merger IORS and designates primary
+ *
+ *
+ *  @author  Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 #ifndef TEST_FT_IOGR_MANAGER_H
 #define TEST_FT_IOGR_MANAGER_H
 
@@ -36,29 +32,29 @@ public:
 
   // Initialize the ORB, POA etc.
 
+  /// Merges the different IORS
   int make_merged_iors (void);
-  // Merges the different IORS
 
+  /// Sets the properties for the profiles
   int set_properties (void);
-  // Sets the properties for the profiles
 
+  /// Run the  ORB event loop..
   int run (void);
-  // Run the  ORB event loop..
 
+  /// Write the merged IOR to a file
   int write_to_file (void);
-  // Write the merged IOR to a file
 
+  /// Return the pointer to the copy of our ORB
   CORBA::ORB_ptr orb (void);
-  // Return the pointer to the copy of our ORB
 private:
   CORBA::Object_var object_primary_;
   CORBA::Object_var object_secondary_;
 
+  /// The merged IOR set
   CORBA::Object_var merged_set_;
-  // The merged IOR set
 
+  /// Our ORB
   CORBA::ORB_var orb_;
-  // Our ORB
 };
 
 #endif /*TEST_FT_IOGR_MANAGER_H */
diff --git a/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index c98be431d71..1d08ce00953 100644
--- a/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -27,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index 65f59b5c21d..ed8c1b4122d 100644
--- a/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -6,7 +6,7 @@
 //#include "test_i.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(MT_Client, test_i, "$Id$")
+
 
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
index 47adea6b740..43c11edfb1e 100644
--- a/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
+++ b/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
@@ -1,37 +1,35 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/FaultTolerance/IOGR
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Bala Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_FT_IOGR_TEST_I_H
 #define TAO_FT_IOGR_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// ctor
   Simple_Server_i (void);
-  // ctor
 
   // = The Simple_Server methods.
   void remote_call (void);
diff --git a/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
index 45141f4d2c3..29d8bf5eead 100644
--- a/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
+++ b/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
@@ -1,30 +1,22 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//   tests/FaultTolerance/IOGRManipulation
-//
-//
-// = FILENAME
-//     IOGRTest.cpp
-//
-// = DESCRIPTION
-//   This program tests the basic functionality FT IOGR implementation
-//
-// = AUTHOR
-//     Bala Natarajan <bala@cs.wustl.edu>
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     IOGRTest.cpp
+ *
+ *  $Id$
+ *
+ * This program tests the basic functionality FT IOGR implementation
+ *
+ *
+ *  @author  Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "tao/ORB.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 
-ACE_RCSID(IOGRManipluation,
-          IOGRTest,
-          "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am b/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
deleted file mode 100644
index f446221ab9c..00000000000
--- a/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
+++ /dev/null
@@ -1,67 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.IOGRTest.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = IOGRTest
-
-IOGRTest_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-IOGRTest_SOURCES = \
-  IOGRTest.cpp
-
-IOGRTest_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/FaultTolerance/Makefile.am b/orbsvcs/tests/FaultTolerance/Makefile.am
deleted file mode 100644
index fdc9d775202..00000000000
--- a/orbsvcs/tests/FaultTolerance/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        GroupRef_Manipulation \
-        IOGR \
-        IOGRManipulation
-
diff --git a/orbsvcs/tests/FtRtEvent/Makefile.am b/orbsvcs/tests/FtRtEvent/Makefile.am
deleted file mode 100644
index 895035c4bad..00000000000
--- a/orbsvcs/tests/FtRtEvent/Makefile.am
+++ /dev/null
@@ -1,128 +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:
-## ../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.FtRtEvent_Consumer.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += consumer
-
-consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-consumer_SOURCES = \
-  PushConsumer.cpp \
-  consumer.cpp \
-  PushConsumer.h
-
-consumer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FtRtEvent_Supplier.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += supplier
-
-supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-supplier_SOURCES = \
-  PushSupplier.cpp \
-  supplier.cpp \
-  PushSupplier.h
-
-supplier_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index 1cbdb689a45..dd1428179db 100644
--- a/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (FtRtEvent,
-           PushConsumer,
-           "$Id$")
-
 PushConsumer_impl::PushConsumer_impl(CORBA::ORB_ptr orb)
 : orb_(CORBA::ORB::_duplicate(orb))
 {
diff --git a/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 693fe30f472..1be4464c3b5 100644
--- a/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -9,10 +9,6 @@
 #include "tao/Stub.h"
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 
-ACE_RCSID (FtRtEvent,
-           PushSupplier,
-           "$Id$")
-
 int
 PushSupplier_impl::ReactorTask::svc (void)
 {
diff --git a/orbsvcs/tests/FtRtEvent/consumer.cpp b/orbsvcs/tests/FtRtEvent/consumer.cpp
index 7992c1dbe64..653956af79b 100644
--- a/orbsvcs/tests/FtRtEvent/consumer.cpp
+++ b/orbsvcs/tests/FtRtEvent/consumer.cpp
@@ -15,10 +15,6 @@
 /// include this file to statically linked with Transaction Depth
 #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
 
-ACE_RCSID (FtRtEvent,
-           consumer,
-           "$Id$")
-
 CORBA::ORB_var orb;
 auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway;
 
@@ -71,7 +67,7 @@ get_event_channel(int argc, ACE_TCHAR** argv)
 
     if (use_gateway)
     {
-      ACE_AUTO_PTR_RESET (gateway, new TAO_FTRTEC::FTEC_Gateway(orb.in(), channel.in()), TAO_FTRTEC::FTEC_Gateway);
+      ACE_auto_ptr_reset (gateway, new TAO_FTRTEC::FTEC_Gateway(orb.in(), channel.in()));
       return gateway->_this();
     }
     else
diff --git a/orbsvcs/tests/FtRtEvent/supplier.cpp b/orbsvcs/tests/FtRtEvent/supplier.cpp
index a17ddeb4ba1..38239fbc6b7 100644
--- a/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -14,10 +14,6 @@
 /// include this file to statically linked with Transaction Depth
 #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
 
-ACE_RCSID (FtRtEvent,
-           supplier,
-           "$Id$")
-
 ACE_Time_Value timer_interval(1,0);
 CORBA::ORB_var orb;
 auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway;
@@ -77,7 +73,7 @@ get_event_channel(int argc, ACE_TCHAR** argv)
     if (use_gateway)
     {
       // use local gateway to communicate with FTRTEC
-      ACE_AUTO_PTR_RESET (gateway, new TAO_FTRTEC::FTEC_Gateway (orb.in (), channel.in ()), TAO_FTRTEC::FTEC_Gateway);
+      ACE_auto_ptr_reset (gateway, new TAO_FTRTEC::FTEC_Gateway (orb.in (), channel.in ()));
       return gateway->_this ();
     }
     else
diff --git a/orbsvcs/tests/HTIOP/AMI/Makefile.am b/orbsvcs/tests/HTIOP/AMI/Makefile.am
deleted file mode 100644
index 3e75798249d..00000000000
--- a/orbsvcs/tests/HTIOP/AMI/Makefile.am
+++ /dev/null
@@ -1,172 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.HTIOP_AMI_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-CLEANFILES = \
-  ami_test-stamp \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp
-
-ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ami_test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.HTIOP_AMI_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTEST_OUTPUT_HAS_DLL=0
-
-client_SOURCES = \
-  Test_Output.cpp \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  client.cpp \
-  ami_test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.HTIOP_AMI_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTEST_OUTPUT_HAS_DLL=0
-
-server_SOURCES = \
-  Test_Output.cpp \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  ami_test_i.cpp \
-  server.cpp \
-  ami_test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.HTIOP_AMI_Simple_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += simple_client
-
-simple_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTEST_OUTPUT_HAS_DLL=0
-
-simple_client_SOURCES = \
-  Test_Output.cpp \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  simple_client.cpp \
-  ami_test_i.h
-
-simple_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/HTIOP/AMI/ami_test.idl b/orbsvcs/tests/HTIOP/AMI/ami_test.idl
index df28b53177a..c4d33f656f8 100644
--- a/orbsvcs/tests/HTIOP/AMI/ami_test.idl
+++ b/orbsvcs/tests/HTIOP/AMI/ami_test.idl
@@ -1,24 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/AMI
-//
-// = FILENAME
-//    ami_test.idl
-//
-// = DESCRIPTION
-//    IDL description of the AMI Test interface
-//
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>,
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
-
-
-module A 
+
+//=============================================================================
+/**
+ *  @file    ami_test.idl
+ *
+ *  $Id$
+ *
+ *  IDL description of the AMI Test interface
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
+
+
+module A
   {
     exception DidTheRightThing {
       long id;
@@ -27,13 +24,13 @@ module A
 
     interface AMI_Test
       {
-        long foo (out long out_l, 
+        long foo (out long out_l,
                   in long in_l,
                   in string in_str)
           raises (DidTheRightThing);
-  
+
         attribute long yadda;
-        
+
         oneway void shutdown ();
       };
 
diff --git a/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp b/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
index d5e5ea40f22..ea0980fbae4 100644
--- a/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
+++ b/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
@@ -1,26 +1,23 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/AMI
-//
-// = FILENAME
-//    ami_test_i.cpp
-//
-// = DESCRIPTION
-//    Implementation of the AMI Test interface.
-//
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>,
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ami_test_i.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the AMI Test interface.
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #include "ami_test_i.h"
 #include "tao/debug.h"
 
-ACE_RCSID(AMI, ami_test_i, "$Id$")
+
 
 AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/orbsvcs/tests/HTIOP/AMI/ami_test_i.h b/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
index edc62b03212..c68c30c50c8 100644
--- a/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
+++ b/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/AMI
-//
-// = FILENAME
-//   ami_test_i.h
-//
-// = AUTHOR
-//   Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   ami_test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #ifndef TAO_AMI_TEST_I_H
 #define TAO_AMI_TEST_I_H
 
 #include "ami_testS.h"
 
+/**
+ * @class AMI_Test_i
+ *
+ * @brief AMI Test implementation
+ *
+ * Implements the AMI_Test interface in test.idl
+ */
 class AMI_Test_i : public POA_A::AMI_Test
 {
-  // = TITLE
-  //   AMI Test implementation
-  //
-  // = DESCRIPTION
-  //   Implements the AMI_Test interface in test.idl
-  //
 public:
+  /// ctor
   AMI_Test_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // The AMI_Test methods.
   CORBA::Long foo (CORBA::Long_out out_l,
diff --git a/orbsvcs/tests/HTIOP/AMI/client.cpp b/orbsvcs/tests/HTIOP/AMI/client.cpp
index 872febf29b6..29025fc16a1 100644
--- a/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -1,21 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/AMI
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    A client which uses the AMI callback model.
-//
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>,
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  A client which uses the AMI callback model.
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/Get_Opt.h"
@@ -23,7 +19,7 @@
 #include "ami_testC.h"
 #include "ami_testS.h"
 
-ACE_RCSID(AMI, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
@@ -64,34 +60,35 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
+/**
+ * @class Client
+ *
+ * @brief Run the client thread
+ *
+ * Use the ACE_Task_Base class to run the client threads.
+ */
 class Client : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run the client thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads.
-  //
 public:
+  /// ctor
   Client (A::AMI_Test_ptr server, int niterations);
-  // ctor
 
+  /// The thread entry point.
   virtual int svc (void);
-  // The thread entry point.
 
   // private:
+  /// Var for the AMI_Test object.
   A::AMI_Test_var ami_test_var_;
-  // Var for the AMI_Test object.
 
+  /// The number of iterations on each client thread.
   int niterations_;
-  // The number of iterations on each client thread.
 
+  /// Var for AMI_AMI_Test_ReplyHandler object.
   A::AMI_AMI_TestHandler_var the_handler_var_;
-  // Var for AMI_AMI_Test_ReplyHandler object.
 };
 
 class Handler : public POA_A::AMI_AMI_TestHandler
diff --git a/orbsvcs/tests/HTIOP/AMI/exclusive.conf b/orbsvcs/tests/HTIOP/AMI/exclusive.conf
index 37d1ecd17d9..75cf010d3f9 100644
--- a/orbsvcs/tests/HTIOP/AMI/exclusive.conf
+++ b/orbsvcs/tests/HTIOP/AMI/exclusive.conf
@@ -1,9 +1,10 @@
+# $Id$
 
 dynamic HTIOP_Factory Service_Object *
         TAO_HTIOP:_make_TAO_HTIOP_Protocol_Factory ()
         "-inside 1"
 
 static Client_Strategy_Factory
-        "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBclientconnectionhandler ST"
+        "-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST"
 
 static Resource_Factory "-ORBProtocolFactory HTIOP_Factory"
diff --git a/orbsvcs/tests/HTIOP/AMI/muxed.conf b/orbsvcs/tests/HTIOP/AMI/muxed.conf
index 99322cdc625..18ed71ce0ef 100644
--- a/orbsvcs/tests/HTIOP/AMI/muxed.conf
+++ b/orbsvcs/tests/HTIOP/AMI/muxed.conf
@@ -1,9 +1,10 @@
+# $Id$
 
 dynamic HTIOP_Factory Service_Object *
         TAO_HTIOP:_make_TAO_HTIOP_Protocol_Factory ()
         "-inside 1"
 
 static Client_Strategy_Factory
-        "-ORBTransportMuxStrategy MUXED -ORBProfileLock null -ORBClientConnectionHandler ST"
+        "-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST"
 
 static Resource_Factory "-ORBProtocolFactory HTIOP_Factory"
diff --git a/orbsvcs/tests/HTIOP/AMI/server.cpp b/orbsvcs/tests/HTIOP/AMI/server.cpp
index f4b50e9c0bd..c3f615b3802 100644
--- a/orbsvcs/tests/HTIOP/AMI/server.cpp
+++ b/orbsvcs/tests/HTIOP/AMI/server.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/AMI
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    Implementation of the server.
-//
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>,
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the server.
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #include "ami_test_i.h"
 
@@ -23,7 +20,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_sys_socket.h"
 
-ACE_RCSID(AMI, server, "$Id$")
+
 
 const ACE_TCHAR *ior_output_file = 0;
 
@@ -51,7 +48,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index e3fefcf0c4b..8d23e53976b 100644
--- a/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/AMI
-//
-// = FILENAME
-//    simple_client.cpp
-//
-// = DESCRIPTION
-//    A very simple client which uses the AMI callback model.
-//
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>,
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    simple_client.cpp
+ *
+ *  $Id$
+ *
+ *  A very simple client which uses the AMI callback model.
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #include "../test_config.h"
 
@@ -26,7 +23,7 @@
 #include "ami_testC.h"
 #include "ami_testS.h"
 
-ACE_RCSID(AMI, simple_client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
@@ -65,18 +62,18 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
 class Handler : public POA_A::AMI_AMI_TestHandler
 {
 public:
+  /// Constructor.
   Handler (void) {};
-  // Constructor.
 
+  /// Destructor.
     ~Handler (void) {};
-  // Destructor.
 
   void foo (CORBA::Long ami_return_val,
             CORBA::Long out_l)
diff --git a/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am b/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
deleted file mode 100644
index 9fef0dfb4de..00000000000
--- a/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
+++ /dev/null
@@ -1,117 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.HTIOP_BiDirectional_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.HTIOP_BiDirectional_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.HTIOP_BiDirectional_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index e73deb4202f..667b818d227 100644
--- a/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -5,7 +5,7 @@
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(BiDirectional, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl b/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl
index 0aa55173539..7b86d30207f 100755
--- a/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl
+++ b/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl
@@ -37,14 +37,14 @@ $client->DeleteFile($iorbase);
 
 $hostname = $server->HostName();
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBEndPoint htiop://$hostname: " .
                               "-ORBSvcConf $server_conf " .
                               "-i $iterations " .
                               "-o $server_iorfile");
 
-                              
+
 $CL = $client->CreateProcess ("client",
                               "-ORBSvcConf $client_conf " .
                               "-k file://$client_iorfile");
diff --git a/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index 6459299e22c..fe74f720fe2 100644
--- a/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -6,7 +6,7 @@
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(BiDirectional, server, "$Id$")
+
 
 const ACE_TCHAR *ior_output_file = 0;
 int no_iterations = 10;
@@ -36,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index ae60fd04171..d2bdb7e602e 100644
--- a/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -11,7 +11,7 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(BiDirectional, test_i, "$Id$")
+
 
 void
 Callback_i::shutdown (void)
diff --git a/orbsvcs/tests/HTIOP/BiDirectional/test_i.h b/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
index cc4725dc141..3914ef78a3e 100644
--- a/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
+++ b/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
@@ -1,59 +1,58 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/BiDirectional
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_BIDIRECTIONAL_TEST_I_H
 #define TAO_BIDIRECTIONAL_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Callback_i
+ *
+ * @brief A callback object to the "client"
+ *
+ * To test that the server can call the client on the same
+ * connection that was established by the client
+ */
 class Callback_i : public POA_Callback
 {
-  // = TITLE
-  //   A callback object to the "client"
-  //
-  // = DESCRIPTION
-  //   To test that the server can call the client on the same
-  //   connection that was established by the client
-  //
 public:
+  /// ctor
   Callback_i (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// Safe way to shutdown
   void shutdown (void);
-  // Safe way to shutdown
 
+  /// The callback method
   void callback_method (void);
-  // The callback method
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 
 };
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback);
@@ -65,17 +64,17 @@ public:
   int call_client (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
+  /// Flag to indicate, whether we are ready for a remote call.
   int flag_;
-  // Flag to indicate, whether we are ready for a remote call.
 
+  /// Callback Object
   Callback_var callback_;
-  // Callback Object
 
+  /// Number of times the callback needs to be called
   int no_iterations_;
-  // Number of times the callback needs to be called
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/orbsvcs/tests/HTIOP/HT_Config.conf b/orbsvcs/tests/HTIOP/HT_Config.conf
index 353b30b2af8..722033221ce 100644
--- a/orbsvcs/tests/HTIOP/HT_Config.conf
+++ b/orbsvcs/tests/HTIOP/HT_Config.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 [htbp]
 # The Proxy_port and proxy_host values control how the HTIOP "inside" peers
 # to connect to "outside" peers. In situations where the process inside a
diff --git a/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/orbsvcs/tests/HTIOP/Hello/Hello.cpp
index dd1638af6b2..085f99d3e35 100644
--- a/orbsvcs/tests/HTIOP/Hello/Hello.cpp
+++ b/orbsvcs/tests/HTIOP/Hello/Hello.cpp
@@ -3,7 +3,7 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+
 
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/orbsvcs/tests/HTIOP/Hello/Makefile.am b/orbsvcs/tests/HTIOP/Hello/Makefile.am
deleted file mode 100644
index 59105f25917..00000000000
--- a/orbsvcs/tests/HTIOP/Hello/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.HTIOP_Hello_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.HTIOP_Hello_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTEST_OUTPUT_HAS_DLL=0
-
-client_SOURCES = \
-  TestC.cpp \
-  Test_Output.cpp \
-  client.cpp \
-  ../test_config.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.HTIOP_Hello_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTEST_OUTPUT_HAS_DLL=0
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Test_Output.cpp \
-  server.cpp \
-  ../test_config.h \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/HTIOP/Hello/client.cpp b/orbsvcs/tests/HTIOP/Hello/client.cpp
index f7a982b8175..55c56357743 100644
--- a/orbsvcs/tests/HTIOP/Hello/client.cpp
+++ b/orbsvcs/tests/HTIOP/Hello/client.cpp
@@ -4,7 +4,7 @@
 #include <ace/Get_Opt.h>
 
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/HTIOP/Hello/run_test.pl b/orbsvcs/tests/HTIOP/Hello/run_test.pl
index 3d43aaa7419..ec0de31327f 100755
--- a/orbsvcs/tests/HTIOP/Hello/run_test.pl
+++ b/orbsvcs/tests/HTIOP/Hello/run_test.pl
@@ -49,7 +49,7 @@ foreach $i (@ARGV) {
     }
 }
 
-$NS = $ns_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service",
+$NS = $ns_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming",
                                   "-ORBSvcConf $ns_service_srv_conf -ORBEndpoint \"iiop://;".
                                   "htiop://$host:$name_port\" -o $ns_service_ns_ior");
 
diff --git a/orbsvcs/tests/HTIOP/Hello/server.cpp b/orbsvcs/tests/HTIOP/Hello/server.cpp
index 742f0526599..8b81e46ec7f 100644
--- a/orbsvcs/tests/HTIOP/Hello/server.cpp
+++ b/orbsvcs/tests/HTIOP/Hello/server.cpp
@@ -6,10 +6,6 @@
 #include "tao/IORTable/IORTable.h"
 #include "orbsvcs/CosNamingC.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -34,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/HTIOP/Makefile.am b/orbsvcs/tests/HTIOP/Makefile.am
deleted file mode 100644
index 8493fa2444c..00000000000
--- a/orbsvcs/tests/HTIOP/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AMI \
-        BiDirectional \
-        Hello
-
diff --git a/orbsvcs/tests/IOR_MCast/MCast.idl b/orbsvcs/tests/IOR_MCast/MCast.idl
index bd46594a6f4..44e31968528 100644
--- a/orbsvcs/tests/IOR_MCast/MCast.idl
+++ b/orbsvcs/tests/IOR_MCast/MCast.idl
@@ -2,7 +2,7 @@
 
 module MCast
 {
-  
+
   interface Server
   {
     // = TITLE
@@ -11,9 +11,9 @@ module MCast
     //     Prints out the status.
 
     boolean connect_server ();
-    // Return <true> if the server received the 
+    // Return <true> if the server received the
     // request from the client.
-    
+
   };
 
 };
diff --git a/orbsvcs/tests/IOR_MCast/Makefile.am b/orbsvcs/tests/IOR_MCast/Makefile.am
deleted file mode 100644
index 46caee6f32b..00000000000
--- a/orbsvcs/tests/IOR_MCast/Makefile.am
+++ /dev/null
@@ -1,125 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.IOR_MCast_Idl.am
-
-BUILT_SOURCES = \
-  MCastC.cpp \
-  MCastC.h \
-  MCastC.inl \
-  MCastS.cpp \
-  MCastS.h \
-  MCastS.inl
-
-CLEANFILES = \
-  MCast-stamp \
-  MCastC.cpp \
-  MCastC.h \
-  MCastC.inl \
-  MCastS.cpp \
-  MCastS.h \
-  MCastS.inl
-
-MCastC.cpp MCastC.h MCastC.inl MCastS.cpp MCastS.h MCastS.inl: MCast-stamp
-
-MCast-stamp: $(srcdir)/MCast.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/MCast.idl
-	@touch $@
-
-noinst_HEADERS = \
-  MCast.idl
-
-## Makefile.IOR_MCast_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  MCastC.cpp \
-  MCastS.cpp \
-  MCast_Server_i.cpp \
-  client.cpp \
-  ior_mcast_client_i.cpp \
-  server_i.cpp \
-  MCast_Server_i.h \
-  ior_mcast_client_i.h \
-  server_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.IOR_MCast_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  MCastC.cpp \
-  MCastS.cpp \
-  MCast_Server_i.cpp \
-  server.cpp \
-  server_i.cpp \
-  MCast_Server_i.h \
-  server_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/IOR_MCast/client.cpp b/orbsvcs/tests/IOR_MCast/client.cpp
index 6764fe26742..f70cc79d142 100644
--- a/orbsvcs/tests/IOR_MCast/client.cpp
+++ b/orbsvcs/tests/IOR_MCast/client.cpp
@@ -8,8 +8,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       ior_mcast_Client_i client;
 
-      int init_result;
-      init_result = client.init (argc, argv);
+      int status = client.init (argc, argv);
+      ACE_UNUSED_ARG (status);
 
       return 0;
     }
diff --git a/orbsvcs/tests/IOR_MCast/server_i.cpp b/orbsvcs/tests/IOR_MCast/server_i.cpp
index 311f9c1aa48..95d01f170db 100644
--- a/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -164,6 +164,6 @@ Server_i::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am b/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am
deleted file mode 100644
index 0314c21e1b6..00000000000
--- a/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2604_Idl.am
-
-BUILT_SOURCES = \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-CLEANFILES = \
-  Messenger-stamp \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl: Messenger-stamp
-
-Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Messenger.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Messenger.idl
-
-## Makefile.Bug_2604_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += MessengerClient
-
-MessengerClient_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-MessengerClient_SOURCES = \
-  MessengerC.cpp \
-  MessengerClient.cpp \
-  Messenger_i.h
-
-MessengerClient_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2604_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += MessengerServer
-
-MessengerServer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-MessengerServer_SOURCES = \
-  MessengerC.cpp \
-  MessengerS.cpp \
-  MessengerServer.cpp \
-  Messenger_i.cpp \
-  Messenger_i.h
-
-MessengerServer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp b/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
index 68051ed2221..1d60a35a43d 100644
--- a/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
+++ b/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl b/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl
index 915aedadd47..7db496ad976 100755
--- a/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl
+++ b/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl
@@ -26,8 +26,8 @@ my $DEBUG_LEVEL = 2;
 my $OBJ_REF_STYLE = "-ORBObjRefStyle url";
 
 my $implrepo_server =
-    "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImplRepo_Service";
-my $imr_activator = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImR_Activator";
+    "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator";
+my $imr_activator = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator";
 my $tao_imr = "$ENV{ACE_ROOT}/bin/tao_imr";
 
 my $imriorfile = "imr.ior";
diff --git a/orbsvcs/tests/ImplRepo/Bug_689_Regression/Makefile.am b/orbsvcs/tests/ImplRepo/Bug_689_Regression/Makefile.am
deleted file mode 100644
index b58761ff065..00000000000
--- a/orbsvcs/tests/ImplRepo/Bug_689_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_689_Regression_Idl.am
-
-BUILT_SOURCES = \
-  bug_689_regressionC.cpp \
-  bug_689_regressionC.h \
-  bug_689_regressionC.inl \
-  bug_689_regressionS.cpp \
-  bug_689_regressionS.h \
-  bug_689_regressionS.inl
-
-CLEANFILES = \
-  bug_689_regression-stamp \
-  bug_689_regressionC.cpp \
-  bug_689_regressionC.h \
-  bug_689_regressionC.inl \
-  bug_689_regressionS.cpp \
-  bug_689_regressionS.h \
-  bug_689_regressionS.inl
-
-bug_689_regressionC.cpp bug_689_regressionC.h bug_689_regressionC.inl bug_689_regressionS.cpp bug_689_regressionS.h bug_689_regressionS.inl: bug_689_regression-stamp
-
-bug_689_regression-stamp: $(srcdir)/bug_689_regression.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/bug_689_regression.idl
-	@touch $@
-
-noinst_HEADERS = \
-  bug_689_regression.idl
-
-## Makefile.Bug_689_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  bug_689_regressionC.cpp \
-  client.cpp \
-  bug_689_regression_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_689_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  bug_689_regressionC.cpp \
-  bug_689_regressionS.cpp \
-  bug_689_regression_i.cpp \
-  server.cpp \
-  bug_689_regression_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl b/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl
index 22f0cd1a530..bb278211006 100644
--- a/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl
+++ b/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl
@@ -4,5 +4,6 @@
 
 interface bug_689_regression
 {
+  void noop ();
   oneway void shutdown ();
 };
diff --git a/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp b/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
index 21c140d56a3..0dd9ad68b58 100644
--- a/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
+++ b/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
@@ -15,3 +15,7 @@ bug_689_regression_i::shutdown (void)
 {
   this->orb_->shutdown (0);
 }
+
+void bug_689_regression_i::noop (void)
+{
+}
diff --git a/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h b/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
index eda0fe6f835..b215bd5224d 100644
--- a/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
+++ b/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
@@ -12,6 +12,8 @@ public:
 
   virtual void shutdown (void);
 
+  virtual void noop (void);
+
 private:
   CORBA::ORB_var orb_;
 };
diff --git a/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp b/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
index 504f91cd53d..6475eb4fd19 100644
--- a/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
+++ b/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
@@ -5,10 +5,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/Argv_Type_Converter.h"
 
-ACE_RCSID(Bug_689_Regression,
-          client,
-          "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://server.ior");
 
 int
@@ -33,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -61,6 +57,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                             1);
         }
 
+      servant->noop ();
       servant->shutdown ();
 
       ACE_Time_Value tv (0, 500);
diff --git a/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl b/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
index be6c0529a55..c0814c6973d 100755
--- a/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
+++ b/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
@@ -42,26 +42,26 @@ $act->DeleteFile ($actiorfile);
 $srv->DeleteFile ($srviorfile);
 $cli->DeleteFile ($srviorfile);
 
-$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/ImplRepo_Service", 
+$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator",
                             "-o $imr_imriorfile");
-$ACT = $act->CreateProcess ("../../../ImplRepo_Service/ImR_Activator", 
+$ACT = $act->CreateProcess ("../../../ImplRepo_Service/tao_imr_activator",
                             "-o $act_actiorfile ".
                             "-ORBInitRef ImplRepoService=file://$act_imriorfile");
 $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr");
 $CLI = $cli->CreateProcess ("client",
-                            "-k file://$cli_srviorfile");
+                            "-k file://$cli_srviorfile -ORBDebugLevel $debug_level");
 $SRV = $srv->CreateProcess ("server");
 
 my $server_cmd = $SRV->Executable();
 my $srv_server_cmd = $imr->LocalFile ($server_cmd);
 
-$TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ". 
+$TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
                 "add test_server -c \"$srv_server_cmd ".
                 "-ORBInitRef ImplRepoService=file://$imr_imriorfile ".
-                "-ORBUseIMR 1 ".
+                "-ORBUseIMR 1 -ORBDebugLevel $debug_level ".
                 "-o $srv_srviorfile\"");
-                            
-                            
+
+
 # We want the tao_imr executable to be found exactly in the path
 # given, without being modified by the value of -ExeSubDir.
 # So, we tell its Process object to ignore the setting of -ExeSubDir.
diff --git a/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp b/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
index 43174ea972c..85218e307d6 100644
--- a/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
+++ b/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
@@ -8,10 +8,6 @@
 
 #include "bug_689_regression_i.h"
 
-ACE_RCSID (Bug_689_Regression,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior");
 
 int
@@ -36,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/ImplRepo/Makefile.am b/orbsvcs/tests/ImplRepo/Makefile.am
deleted file mode 100644
index abf5d112994..00000000000
--- a/orbsvcs/tests/ImplRepo/Makefile.am
+++ /dev/null
@@ -1,208 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-SUBDIRS = \
-        . \
-        Bug_2604_Regression \
-        Bug_689_Regression \
-        NameService \
-        scale
-
-noinst_PROGRAMS =
-
-## Makefile.airplane_idl.am
-
-BUILT_SOURCES = \
-  AirplaneC.cpp \
-  AirplaneC.h \
-  AirplaneC.inl \
-  AirplaneS.cpp \
-  AirplaneS.h \
-  AirplaneS.inl
-
-CLEANFILES = \
-  Airplane-stamp \
-  AirplaneC.cpp \
-  AirplaneC.h \
-  AirplaneC.inl \
-  AirplaneS.cpp \
-  AirplaneS.h \
-  AirplaneS.inl
-
-AirplaneC.cpp AirplaneC.h AirplaneC.inl AirplaneS.cpp AirplaneS.h AirplaneS.inl: Airplane-stamp
-
-Airplane-stamp: $(srcdir)/Airplane.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Airplane.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Airplane.idl
-
-## Makefile.airplane_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += airplane_client
-
-airplane_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-airplane_client_SOURCES = \
-  AirplaneC.cpp \
-  AirplaneS.cpp \
-  airplane_client.cpp \
-  airplane_client_i.cpp \
-  airplane_client_i.h
-
-airplane_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.airplane_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += airplane_server
-
-airplane_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-airplane_server_SOURCES = \
-  AirplaneC.cpp \
-  AirplaneS.cpp \
-  airplane_i.cpp \
-  airplane_server.cpp \
-  airplane_server_i.cpp \
-  airplane_i.h \
-  airplane_server_i.h
-
-airplane_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.nestea_idl.am
-
-BUILT_SOURCES += \
-  NesteaC.cpp \
-  NesteaC.h \
-  NesteaC.inl \
-  NesteaS.cpp \
-  NesteaS.h \
-  NesteaS.inl
-
-CLEANFILES += \
-  Nestea-stamp \
-  NesteaC.cpp \
-  NesteaC.h \
-  NesteaC.inl \
-  NesteaS.cpp \
-  NesteaS.h \
-  NesteaS.inl
-
-NesteaC.cpp NesteaC.h NesteaC.inl NesteaS.cpp NesteaS.h NesteaS.inl: Nestea-stamp
-
-Nestea-stamp: $(srcdir)/Nestea.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Nestea.idl
-	@touch $@
-
-noinst_HEADERS += \
-  Nestea.idl
-
-## Makefile.nestea_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += nestea_client
-
-nestea_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-nestea_client_SOURCES = \
-  NesteaC.cpp \
-  NesteaS.cpp \
-  nestea_client.cpp \
-  nestea_client_i.cpp \
-  nestea_client_i.h
-
-nestea_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.nestea_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += nestea_server
-
-nestea_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-nestea_server_SOURCES = \
-  NesteaC.cpp \
-  NesteaS.cpp \
-  nestea_i.cpp \
-  nestea_server.cpp \
-  nestea_server_i.cpp \
-  nestea_i.h \
-  nestea_server_i.h
-
-nestea_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/ImplRepo/NameService/Makefile.am b/orbsvcs/tests/ImplRepo/NameService/Makefile.am
deleted file mode 100644
index 8ced4a626dc..00000000000
--- a/orbsvcs/tests/ImplRepo/NameService/Makefile.am
+++ /dev/null
@@ -1,48 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.ImplRepo_NameService.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-test_SOURCES = \
-  test.cpp
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/ImplRepo/NameService/run_test.pl b/orbsvcs/tests/ImplRepo/NameService/run_test.pl
index 5cfc27fd95a..aa6e68e3414 100755
--- a/orbsvcs/tests/ImplRepo/NameService/run_test.pl
+++ b/orbsvcs/tests/ImplRepo/NameService/run_test.pl
@@ -38,11 +38,11 @@ my $act_actiorfile = $act->LocalFile ($actiorfile);
 my $ns_nsiorfile = $ns->LocalFile ($nsiorfile);
 my $test_nsiorfile = $test->LocalFile ($nsiorfile);
 
-$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/ImplRepo_Service");
+$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator");
 
-$ACT = $act->CreateProcess ("../../../ImplRepo_Service/ImR_Activator");
+$ACT = $act->CreateProcess ("../../../ImplRepo_Service/tao_imr_activator");
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service");
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming");
 my $ns_cmd = $NS->Executable();
 my $ns_ns_cmd = $imr->LocalFile ($ns_cmd);
 
diff --git a/orbsvcs/tests/ImplRepo/Nestea.idl b/orbsvcs/tests/ImplRepo/Nestea.idl
index b101254bfe4..4528c671079 100644
--- a/orbsvcs/tests/ImplRepo/Nestea.idl
+++ b/orbsvcs/tests/ImplRepo/Nestea.idl
@@ -7,7 +7,7 @@ interface Nestea_Bookshelf
   // Add a number of cans to the bookshelf.
 
   void crush (in long cans);
-  // Crush some of those cans. 
+  // Crush some of those cans.
 
   long bookshelf_size ();
   // How many cans are in the collection?
diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp b/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
index 948d9e7102f..b54d49e1e3d 100755
--- a/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
+++ b/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
@@ -9,9 +9,6 @@
 #include "ORB_Task.h"
 #include "tao/Environment.h"
 
-ACE_RCSID (ReconnectServer,
-           ORB_Task, "$Id$")
-
 ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp b/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
index 4efc786b6a0..bc61035a1b9 100755
--- a/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
+++ b/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
@@ -3,12 +3,11 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 #include <ace/Task.h>
-#include <ace/OS.h>
-
+#include "ace/OS_NS_unistd.h"
 
 const ACE_TCHAR *ior_input_file = ACE_TEXT ("file://serverA.ior");
 int test_duration_sec = 15;
-bool expect_object_not_exist = false; 
+bool expect_object_not_exist = false;
 
 class Client_Task : public ACE_Task_Base
 {
@@ -23,7 +22,7 @@ class Client_Task : public ACE_Task_Base
     virtual int svc (void)
     {
       ACE_Time_Value start = ACE_OS::gettimeofday ();
-      ACE_Time_Value elapsed; 
+      ACE_Time_Value elapsed;
       int i = 0;
       while (elapsed < ACE_Time_Value (test_duration_sec))
       {
@@ -45,7 +44,7 @@ class Client_Task : public ACE_Task_Base
           caught_object_not_exist_ = true;
           ACE_OS::sleep (1);
         }
-        catch (const CORBA::Exception & /*ex*/) 
+        catch (const CORBA::Exception & /*ex*/)
         {
           //ex._tao_print_exception ("Exception caught:");
           communication_failed_ = true;
@@ -54,7 +53,7 @@ class Client_Task : public ACE_Task_Base
         ++i;
         elapsed = ACE_OS::gettimeofday () - start;
       }
-          
+
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)Client thread exit \n")));
       return 0;
     }
@@ -102,14 +101,14 @@ parse_args (int argc, ACE_TCHAR* argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-  try 
+  try
   {
     CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
@@ -137,7 +136,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     Client_Task task (test.in ());
     task.activate (THR_NEW_LWP | THR_JOINABLE, 1, 1);
-    
+
     ACE_Time_Value tv(test_duration_sec);
     orb->run (&tv);
 
@@ -156,7 +155,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t)Client test failed.\n")), 1);
     }
   }
-  catch (const CORBA::Exception &ex) 
+  catch (const CORBA::Exception &ex)
   {
     ex._tao_print_exception ("Exception caught by client:");
     return 1;
diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl b/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl
index dc0bf0c1061..9d89fcd08cf 100755
--- a/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl
+++ b/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl
@@ -67,7 +67,7 @@ $srvb->DeleteFile ($srvbiorfile);
 $cli->DeleteFile ($srvaiorfile);
 
 
-$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/ImplRepo_Service",
+$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator",
                             "-ORBEndpoint "."$protocol"."://:".$port." ".
                             "-UnregisterIfAddressReused ".
                             "-d $imr_debug_level ".
diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp b/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
index 5ec4ae92f9b..e42e5b9f394 100755
--- a/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
+++ b/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
@@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  
+
   return 0;
 }
 
@@ -51,7 +51,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       rootPOA->the_POAManager ();
 
     CORBA::PolicyList policies (5);
-    policies.length (5); 
+    policies.length (5);
 
     // Lifespan policy
     policies[0] =
@@ -116,7 +116,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     rootPOA->destroy (1, 1);
     orb->destroy ();
   }
-  catch (const CORBA::Exception &ex) 
+  catch (const CORBA::Exception &ex)
   {
     ex._tao_print_exception ("Exception caught by serverA:");
     return 1;
diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp b/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
index 2049cc94590..06f6c1fe2a2 100755
--- a/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
+++ b/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
@@ -4,7 +4,7 @@
 #include "tao/ImR_Client/ImR_Client.h"
 #include <ace/Task.h>
 #include <ace/Get_Opt.h>
-#include <ace/OS.h>
+#include "ace/OS_NS_unistd.h"
 
 const ACE_TCHAR * ior_output_file = ACE_TEXT ("serverB.ior");
 // server_notify_delay between resolving RootPOA init ref and create_POA.
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  
+
   return 0;
 }
 
@@ -64,7 +64,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       rootPOA->the_POAManager ();
 
     CORBA::PolicyList policies (5);
-    policies.length (5); 
+    policies.length (5);
 
     // Lifespan policy
     policies[0] =
@@ -131,7 +131,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     rootPOA->destroy (1, 1);
     orb->destroy ();
   }
-  catch (const CORBA::Exception &ex) 
+  catch (const CORBA::Exception &ex)
   {
     ex._tao_print_exception ("Exception caught by serverB:");
     return 1;
diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h b/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
index ccb9c6c524c..4c0e0ef2ceb 100755
--- a/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
+++ b/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
@@ -13,12 +13,12 @@ class  Test_Dummy_i
   : public virtual POA_Test::Dummy
 {
 public:
-  // Constructor 
+  // Constructor
   Test_Dummy_i (void);
-  
-  // Destructor 
+
+  // Destructor
   virtual ~Test_Dummy_i (void);
-  
+
   virtual  char * getMessage (void);
 };
 
@@ -26,17 +26,17 @@ class  Test_Time_i
   : public virtual POA_Test::Time
 {
 public:
-  // Constructor 
+  // Constructor
   Test_Time_i (void);
-  
-  // Destructor 
+
+  // Destructor
   virtual ~Test_Time_i (void);
-  
+
   virtual
   ::CORBA::Long current_time (
       void
     );
-  
+
   virtual
   void shutdown (
       void
diff --git a/orbsvcs/tests/ImplRepo/airplane_client.cpp b/orbsvcs/tests/ImplRepo/airplane_client.cpp
index 7bfd7b75f2f..dec10fef0a1 100644
--- a/orbsvcs/tests/ImplRepo/airplane_client.cpp
+++ b/orbsvcs/tests/ImplRepo/airplane_client.cpp
@@ -4,10 +4,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ImplRepo,
-           airplane_client,
-           "$Id$")
-
 // This function runs the test.
 
 int
diff --git a/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 5b0f945c09d..df7a00e9391 100644
--- a/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -6,7 +6,7 @@
 #include "ace/Read_Buffer.h"
 #include "ace/ACE.h"
 
-ACE_RCSID(ImplRepo, airplane_client_i, "$Id$")
+
 
 // Constructor.
 Airplane_Client_i::Airplane_Client_i (void)
diff --git a/orbsvcs/tests/ImplRepo/airplane_i.cpp b/orbsvcs/tests/ImplRepo/airplane_i.cpp
index 34a220acb2b..a10f3868cab 100644
--- a/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -5,13 +5,8 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID (ImplRepo,
-           airplane_i,
-           "$Id$")
-
 // Constructor
-
-  Airplane_i::Airplane_i ()
+Airplane_i::Airplane_i ()
 {
   // Seed the random number generator
   ACE_OS::srand (static_cast<u_int> (ACE_OS::time (0L)));
diff --git a/orbsvcs/tests/ImplRepo/airplane_server.cpp b/orbsvcs/tests/ImplRepo/airplane_server.cpp
index 55b71a4297e..a7323cc4414 100644
--- a/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -2,10 +2,6 @@
 
 #include "airplane_server_i.h"
 
-ACE_RCSID (ImplRepo,
-           airplane_server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 9ed10ba34ef..58dd5d3959e 100644
--- a/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -12,10 +12,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID (ImplRepo,
-           airplane_server_i,
-           "$Id$")
-
 // The server name of the Aiprlane Server
 const char SERVER_NAME[] = "airplane_server";
 
diff --git a/orbsvcs/tests/ImplRepo/locked/run_test.pl b/orbsvcs/tests/ImplRepo/locked/run_test.pl
index 2965e83a10e..ce09e2aa427 100755
--- a/orbsvcs/tests/ImplRepo/locked/run_test.pl
+++ b/orbsvcs/tests/ImplRepo/locked/run_test.pl
@@ -35,7 +35,7 @@ $ti->DeleteFile ($imriorfile);
 $imr->DeleteFile ($imrpfile);
 
 
-$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/ImplRepo_Service");
+$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator");
 $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr");
 
 # We want the tao_imr executable to be found exactly in the path
diff --git a/orbsvcs/tests/ImplRepo/nestea_client.cpp b/orbsvcs/tests/ImplRepo/nestea_client.cpp
index 2951b0b1106..dc1cbfb2509 100644
--- a/orbsvcs/tests/ImplRepo/nestea_client.cpp
+++ b/orbsvcs/tests/ImplRepo/nestea_client.cpp
@@ -4,10 +4,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ImplRepo,
-           nestea_client,
-           "$Id$")
-
 // This function runs the test.
 
 int
diff --git a/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index bce2b51d639..0372682f06b 100644
--- a/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -6,7 +6,7 @@
 #include "ace/Read_Buffer.h"
 #include "ace/ACE.h"
 
-ACE_RCSID(ImplRepo, nestea_client_i, "$Id$")
+
 
 // Constructor.
 Nestea_Client_i::Nestea_Client_i (void)
diff --git a/orbsvcs/tests/ImplRepo/nestea_i.cpp b/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 13363307324..c508ff5f744 100644
--- a/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -11,7 +11,7 @@
 
 const size_t MAX_UINT32_STR_LEN = 11;  // Largest UINT32 is 8589934591 + NUL is 11 characters
 
-ACE_RCSID(ImplRepo, nestea_i, "$Id$")
+
 
 Nestea_i::Nestea_i (CORBA::ORB_ptr orb, const ACE_TCHAR *filename)
 : cans_ (0)
diff --git a/orbsvcs/tests/ImplRepo/nestea_server.cpp b/orbsvcs/tests/ImplRepo/nestea_server.cpp
index 1177d965430..c382406ccd3 100644
--- a/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -2,7 +2,7 @@
 
 #include "nestea_server_i.h"
 
-ACE_RCSID(ImplRepo, nestea_server, "$Id$")
+
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index 7c07ae8c949..b64dffa1938 100644
--- a/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -11,7 +11,7 @@
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(ImplRepo, nestea_server_i, "$Id$")
+
 
 // The file to save the persistent state to.
 const ACE_TCHAR NESTEA_DATA_FILENAME[] = ACE_TEXT("nestea.dat");
diff --git a/orbsvcs/tests/ImplRepo/run_test.pl b/orbsvcs/tests/ImplRepo/run_test.pl
index 40404e87ddd..318943a5fc9 100755
--- a/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/orbsvcs/tests/ImplRepo/run_test.pl
@@ -49,8 +49,8 @@ my $imr_host = $imr->HostName ();
 my $port = 12345;
 my $endpoint = "-ORBEndpoint " . "$protocol" . "://:" . $port;
 
-$IMR = $imr->CreateProcess ("../../ImplRepo_Service/ImplRepo_Service");
-$ACT = $act->CreateProcess ("../../ImplRepo_Service/ImR_Activator");
+$IMR = $imr->CreateProcess ("../../ImplRepo_Service/tao_imr_locator");
+$ACT = $act->CreateProcess ("../../ImplRepo_Service/tao_imr_activator");
 $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr");
 
 # We want the tao_imr executable to be found exactly in the path
@@ -284,8 +284,8 @@ sub nt_service_test
 
     # To avoid having to ensure that they LocalSystem account has the correct path
     # we simply copy the imr executables to the same directory as the DLL's.
-    my $BIN_IMR = $bin_imr->CreateProcess ("$ENV{ACE_ROOT}/lib/ImplRepo_Service","");
-    my $BIN_ACT = $bin_act->CreateProcess ("$ENV{ACE_ROOT}/lib/ImR_Activator","");
+    my $BIN_IMR = $bin_imr->CreateProcess ("$ENV{ACE_ROOT}/lib/tao_imr_locator","");
+    my $BIN_ACT = $bin_act->CreateProcess ("$ENV{ACE_ROOT}/lib/tao_imr_activator","");
     $BIN_IMR->IgnoreExeSubDir(1);
     $BIN_ACT->IgnoreExeSubDir(1);
 
@@ -331,7 +331,7 @@ sub nt_service_test
         print STDERR "ERROR: BIN ImR Service returned $BIN_IMR_status\n";
     }
 
-    print "Removing ImplRepo_Service copy.\n";
+    print "Removing tao_imr_locator copy.\n";
     $bin_imr->DeleteFile ($BIN_IMR->Executable ());
     $bin_act->DeleteFile ($BIN_ACT->Executable ());
 
diff --git a/orbsvcs/tests/ImplRepo/scale/Makefile.am b/orbsvcs/tests/ImplRepo/scale/Makefile.am
deleted file mode 100644
index 93f63101b2e..00000000000
--- a/orbsvcs/tests/ImplRepo/scale/Makefile.am
+++ /dev/null
@@ -1,111 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.scaletest_idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.scaletest_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  server_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.scaletest_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  server_i.cpp \
-  testC.cpp \
-  testS.cpp \
-  server_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/ImplRepo/scale/client.conf b/orbsvcs/tests/ImplRepo/scale/client.conf
index 87e77efbd29..2a50e68f218 100644
--- a/orbsvcs/tests/ImplRepo/scale/client.conf
+++ b/orbsvcs/tests/ImplRepo/scale/client.conf
@@ -1,4 +1,6 @@
+# $Id$
+
 # This file is here just in case you want to run some of the tests manually
-# and don't want the client to jump back in the reactor during the 
-# invocation. 
+# and don't want the client to jump back in the reactor during the
+# invocation.
 static Client_Strategy_Factory "-ORBClientConnectionHandler rw"
diff --git a/orbsvcs/tests/ImplRepo/scale/run_test.pl b/orbsvcs/tests/ImplRepo/scale/run_test.pl
index 1e373359210..c71955fc0a6 100755
--- a/orbsvcs/tests/ImplRepo/scale/run_test.pl
+++ b/orbsvcs/tests/ImplRepo/scale/run_test.pl
@@ -46,8 +46,8 @@ my $act_actiorfile = $act->LocalFile ($actiorfile);
 my $imr_persistxml = $imr->LocalFile ($persistxml);
 my $imr_persistdat = $imr->LocalFile ($persistdat);
 
-$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImplRepo_Service");
-$ACT = $act->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImR_Activator");
+$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator");
+$ACT = $act->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator");
 $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr");
 $SRV = $srv->CreateProcess ("server");
 $CLI = $cli->CreateProcess ("client");
@@ -67,7 +67,7 @@ $imr->DeleteFile ($persistdat);
 sub scale_test
 {
     print "Running scale test with $servers_count servers and $obj_count objects.\n";
-    
+
     my $result = 0;
     my $start_time = time();
 
@@ -104,7 +104,7 @@ sub scale_test
     }
 
     if ($use_activator) {
-    
+
         $ACT->Arguments ("-d 1 -o $act_actiorfile -ORBInitRef ImplRepoService=file://$act_imriorfile");
         $ACT_status = $ACT->Spawn ();
         if ($ACT_status != 0) {
@@ -135,7 +135,7 @@ sub scale_test
                 }
             }
         }
-        
+
         $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile list");
         $result = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
         if ($TI_status != 0) {
@@ -145,9 +145,9 @@ sub scale_test
             return 1;
         }
     }
-    
+
     for(my $i = 0; $i < $servers_count; $i++ ) {
-    
+
         my $startfile = $objprefix . "_$i.status";
         my $srv_startfile = $srv->LocalFile ($startfile);
         $srv->DeleteFile ($objprefix . "_$i.status");
@@ -203,7 +203,7 @@ sub scale_test
                 last;
             }
         }
-        
+
         if ($status == 1) {
             last;
         }
@@ -216,7 +216,7 @@ sub scale_test
             $status = 1;
         }
     }
-    
+
     my $IMR_status = $IMR->TerminateWaitKill ($imr->ProcessStopWaitInterval());
     if ($IMR_status != 0) {
         print STDERR "ERROR: IMR returned $IMR_status\n";
@@ -225,7 +225,7 @@ sub scale_test
 
     my $test_time = time() - $start_time;
     my $total_objs = $obj_count * $servers_count;
-    
+
     print "\nFinished. The test took $test_time seconds for $total_objs imr-ified objects.\n";
 
     return $status;
diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am
deleted file mode 100644
index 4aaef665047..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am
+++ /dev/null
@@ -1,118 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.IFR_Application_Test_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  ifr_dii_client.cpp \
-  ifr_dii_client.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.IFR_Application_Test_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
index e50a8aa33f6..c579d5e1fc3 100644
--- a/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
@@ -3,10 +3,6 @@
 
 #include "ifr_dii_client.h"
 
-ACE_RCSID (Application_Test,
-           client,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index 06b8431f84c..04f3971aef5 100644
--- a/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -4,10 +4,6 @@
 #include "ifr_dii_client.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Application_Test,
-           ifr_dii_client,
-           "$Id$")
-
 IFR_DII_Client::IFR_DII_Client (void)
   : namespace_name (CORBA::string_dup ("warehouse")),
     interface_name (CORBA::string_dup ("inventory")),
@@ -88,7 +84,7 @@ IFR_DII_Client::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt opts (argc, argv, ACE_TEXT("k:nd"));
   int c;
-  
+
   while ((c = opts ()) != -1)
     switch (c)
       {
@@ -325,7 +321,7 @@ IFR_DII_Client::invoke_and_display (void)
 
       ACE_ASSERT ((*args->item (2)->value () >>= price) == true);
 
-      ACE_ASSERT (price == 13.49f);
+      ACE_ASSERT (ACE::is_equal (price, 13.49f));
 
       if (this->debug_)
         {
diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
index 883b60c38cc..59de7ee6a6c 100755
--- a/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
@@ -57,7 +57,7 @@ my $client_ior2file = $client->LocalFile ($ior2file);
 $client->DeleteFile($ior1file);
 $client->DeleteFile($ior2file);
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-o $server1_ior1file");
 
 
diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index 9407a53a1da..8470b696545 100644
--- a/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -6,7 +6,7 @@
 #include "orbsvcs/Shutdown_Utilities.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Application_Test, server, "$Id$")
+
 
 static const ACE_TCHAR *ior_output_file = ACE_TEXT("iorfile");
 
diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
index 08a803ea8d8..f8ba51d221b 100644
--- a/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
@@ -5,12 +5,6 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (Application_Test,
-           test_i,
-           "$Id$")
-
-
 CORBA::Boolean
 inventory_i::getCDinfo (const char * artist,
                         char *& title,
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile.am b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile.am
deleted file mode 100644
index c997324070e..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile.am
+++ /dev/null
@@ -1,46 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2962_Regression.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
index 89b8e9873c6..7183a29b2a1 100755
--- a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
@@ -36,7 +36,7 @@ my $client_ior1file = $client->LocalFile ($ior1file);
 $client->DeleteFile($ior1file);
 
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file");
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl
index d4637db8784..2704eabe9bf 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl
@@ -2,9 +2,10 @@
 #ifndef __IFR_NESTING_ARRAY_TEST_DEFINED
 #define __IFR_NESTING_ARRAY_TEST_DEFINED
 
+typedef short ShortArray_1[1];
 struct MyStruct
 {
-  short innerArray[1];             // Must NOT be [2] to show up the problem.
+  ShortArray_1 innerArray;             // Must NOT be [2] to show up the problem.
 };
 
 typedef MyStruct arrayOfStruct[2]; // Must be arrayOfStruct[2] to pass client.cpp test
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile.am b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile.am
deleted file mode 100644
index 73594351b9d..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile.am
+++ /dev/null
@@ -1,47 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_3155_Regression_Test_Idl.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = test_idl
-
-test_idl_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/include
-
-test_idl_SOURCES = \
-  test_idl.cpp
-
-test_idl_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
index 964366267d1..904b0962e00 100755
--- a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
@@ -36,7 +36,7 @@ my $client_ior1file = $client->LocalFile ($ior1file);
 $client->DeleteFile($ior1file);
 
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file");
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl
index 19207b58862..8230f0955fb 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl
@@ -8,15 +8,15 @@ module C1
 };
 
 module M1
-{ 
+{
   valuetype VT; // Forward declare
 };
 
 module M1
-{ 
+{
   valuetype VT :  // Full definition
    ::C1::EB
-  {   
+  {
     public long id;
   };
 };
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
index 851a4413e21..ed87bdd9215 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
@@ -49,7 +49,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         }
     }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Makefile.am b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Makefile.am
deleted file mode 100644
index 7939f5049c2..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Makefile.am
+++ /dev/null
@@ -1,48 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_3174_Regression_Test_Idl.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = test_idl
-
-test_idl_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_idl_SOURCES = \
-  test_idl.cpp
-
-test_idl_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
index c5e6b022b7c..da59c80ef20 100755
--- a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
@@ -36,7 +36,7 @@ my $client_ior1file = $client->LocalFile ($ior1file);
 $client->DeleteFile($ior1file);
 
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file");
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
index f53a114a07d..d6af0b90df0 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
@@ -45,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         }
     }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
index ba4780cedca..3775c2138e2 100755
--- a/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
@@ -38,7 +38,7 @@ $client1->DeleteFile($ior1file);
 my $client2_ior1file = $client2->LocalFile ($ior1file);
 $client2->DeleteFile($ior1file);
 
-$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level " .
                               "$nice " .
                               "-o $server_ior1file " .
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Makefile.am b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Makefile.am
deleted file mode 100644
index 3ab4a032327..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_3495_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_3495_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch "$@"
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_3495_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestImpl.cpp \
-  TestS.cpp \
-  server.cpp \
-  TestImpl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl
index c0bf60dfe90..6e5d83ab0fc 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl
@@ -27,7 +27,7 @@ module Test {
     } thisonly;
   };
 
-  exception exceptionOne 
+  exception exceptionOne
   {
     union ExceptionUnion switch (ErrorType)
     {
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
index 4fd7f422bbd..4c7e5147a03 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // .\be\be_codegen.cpp:1179
 
 #include "TestImpl.h"
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
index 4a4bc5670dd..e3e10eea60e 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
@@ -17,12 +17,12 @@ class  Test_interfaceOne_i
   : public virtual POA_Test::interfaceOne
 {
 public:
-  // Constructor 
+  // Constructor
   Test_interfaceOne_i (void);
-  
-  // Destructor 
+
+  // Destructor
   virtual ~Test_interfaceOne_i (void);
-  
+
   virtual void getstruct (::Test::structOne_out tester);
 };
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
index 0585d1bc80c..a6763a1a819 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
@@ -7,7 +7,7 @@
 #include "tao/IFR_Client/IFR_Client_Adapter_Impl.h"
 
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl
index 5573c301189..8b9cf6f3503 100755
--- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl
@@ -48,7 +48,7 @@ $client->DeleteFile($ior1file);
 $client->DeleteFile($ior2file);
 
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file");
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
index fb4470ea53f..42753283c2b 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
@@ -34,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl
index d221f710a57..9416cb1dbb6 100755
--- a/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl
@@ -33,7 +33,7 @@ $server->DeleteFile($iorfile);
 my $client_iorfile = $client->LocalFile ($iorfile);
 $client->DeleteFile($iorfile);
 
-$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level " .
                               "$nice " .
                               "-o $server_iorfile " .
diff --git a/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl
index ade44a59b4a..af326620b2d 100755
--- a/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl
@@ -23,7 +23,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               " $nice " .
                               " -o $server_iorfile " .
                               " $locking");
@@ -113,7 +113,7 @@ $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               " $nice " .
                               " -o $server_iorfile " .
                               " $locking");
diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am
deleted file mode 100644
index 471b2f19e9a..00000000000
--- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am
+++ /dev/null
@@ -1,48 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.IFR_IDL3_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = IDL3_Test
-
-IDL3_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-IDL3_Test_SOURCES = \
-  client.cpp \
-  idl3_client.cpp \
-  idl3_client.h
-
-IDL3_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
index f43536c1139..a4e9f470c67 100644
--- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
@@ -3,10 +3,6 @@
 
 #include "idl3_client.h"
 
-ACE_RCSID (Application_Test,
-           client,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index 28de390cbe2..5bb899c36d5 100644
--- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -6,10 +6,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Application_Test,
-           ifr_dii_client,
-           "$Id$")
-
 // All the magic quantities are here at the top.
 
 const char *COMPONENT_ID = "IDL:mod/test_component:1.0";
diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h b/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
index 16f3ebafd93..d11a20d1309 100644
--- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
+++ b/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
@@ -1,53 +1,52 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/InterfaceRepo
-//
-// = FILENAME
-//    idl3_client.h
-//
-// = DESCRIPTION
-//    This class tests the IFR support for CCM-related types.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    idl3_client.h
+ *
+ *  $Id$
+ *
+ *  This class tests the IFR support for CCM-related types.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef IDL3_CLIENT_H
 #define IDL3_CLIENT_H
 
 #include "tao/IFR_Client/IFR_ComponentsC.h"
 
+/**
+ * @class IDL3_Client
+ *
+ * @brief Component-aware IFR Client Implementation
+ *
+ * Class wrapper for a client which tests the Interface Repository
+ * support for the OMG IDL3 extensions.
+ */
 class IDL3_Client
 {
-  // = TITLE
-  //     Component-aware IFR Client Implementation
-  //
-  // = DESCRIPTION
-  //     Class wrapper for a client which tests the Interface Repository
-  //     support for the OMG IDL3 extensions.
 public:
+  /// Constructor
   IDL3_Client (void);
-  // Constructor
 
+  /// Destructor
   ~IDL3_Client (void);
-  // Destructor
 
+  /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the ORB and get the IFR object reference.
 
+  /// Execute test code.
   int run (void);
-  // Execute test code.
 
 private:
+  /// Process the command line arguments.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
-  // Process the command line arguments.
 
   int component_test (void);
   int home_test (void);
@@ -104,14 +103,14 @@ private:
   int home_finder_test (CORBA::ComponentIR::HomeDescription *);
 
 private:
+  /// Flag to output detailed error messages.
   bool debug_;
-  // Flag to output detailed error messages.
 
+  /// Storage of the ORB reference.
   CORBA::ORB_var orb_;
-  // Storage of the ORB reference.
 
+  /// Storage of the IFR reference.
   CORBA::Repository_var repo_;
-  // Storage of the IFR reference.
 };
 
 #endif /* IDL3_CLIENT_H */
diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
index 4f5376f4174..5a00c31e3dc 100755
--- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
@@ -42,7 +42,7 @@ my $client_ior1file = $client->LocalFile ($ior1file);
 $client->DeleteFile($ior1file);
 
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file");
 
diff --git a/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl
index d03196aeee2..0e65910adfb 100755
--- a/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl
@@ -34,7 +34,7 @@ sub idl_filenames {
 # Input: array of idl file names
 # Output: array of idl file names that had a failure
 sub phase1 {
-    my $SVC = $ifr_service->CreateProcess ("../../../IFR_Service/IFR_Service",
+    my $SVC = $ifr_service->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                                            "-o $ifr_service_iorfile");
 
     my $CMP = $tao_ifr->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_ifr",
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am
deleted file mode 100644
index 10fb0b1efaa..00000000000
--- a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am
+++ /dev/null
@@ -1,47 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.IFR_Inheritance_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = IFR_Inheritance_Test
-
-IFR_Inheritance_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-IFR_Inheritance_Test_SOURCES = \
-  main.cpp
-
-IFR_Inheritance_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
index 9709b6e5e76..261138e3244 100644
--- a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
@@ -6,10 +6,6 @@
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/ORB.h"
 
-ACE_RCSID (IFR_Inheritance_Test,
-           main,
-           "$Id$")
-
 void printContents (const CORBA::ContainedSeq& cont)
 {
   try
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl
index 42b85861cf6..db72c527087 100755
--- a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl
@@ -56,22 +56,22 @@ my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed
 my $iorbase = "if_repo.ior";
 my $testoutputfilename = "IFR_Inheritance_test.output";
 
-my $log1 = "server1.log"; 
+my $log1 = "server1.log";
 my $log2 = "server2.log";
 my $log3 = "client.log";
 
 my $log1_test = $test->LocalFile ($log1);
-my $log2_test = $test->LocalFile ($log2); 
+my $log2_test = $test->LocalFile ($log2);
 my $log3_test = $test->LocalFile ($log3);
 
 $test->DeleteFile ($log1);
-$test->DeleteFile ($log2); 
+$test->DeleteFile ($log2);
 $test->DeleteFile ($log3);
 
 my $test_iorfile = $test->LocalFile ($iorbase);
 $test->DeleteFile($iorbase);
 
-$SV1 = $test->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $test->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               " -o $test_iorfile " .
                               "-ORBLogFile $log1_test");
 
@@ -79,10 +79,10 @@ $SV2 = $test->CreateProcess ("$tao_ifr",
                               " IFR_Inheritance_Test.idl " .
                               "-ORBInitRef InterfaceRepository=file://$test_iorfile " .
                               "-ORBLogFile $log2_test");
-                              
+
 $CL = $test->CreateProcess ("IFR_Inheritance_Test",
                               "-ORBInitRef InterfaceRepository=file://$test_iorfile " .
-                              "-ORBLogFile $log3_test"); 
+                              "-ORBLogFile $log3_test");
 
 $server_status = $SV1->Spawn ();
 
@@ -162,7 +162,7 @@ if ($server_status != 0) {
 }
 
 $test->DeleteFile ($log1);
-$test->DeleteFile ($log2); 
+$test->DeleteFile ($log2);
 $test->DeleteFile ($log3);
 $test->DeleteFile($iorbase);
 
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile.am
deleted file mode 100644
index 6bbf5b89144..00000000000
--- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile.am
+++ /dev/null
@@ -1,108 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.IFR_Self_Recursive_IDL_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch "$@"
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.IFR_Self_Recursive_IDL_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  GoodDay.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  GoodDay.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.IFR_Self_Recursive_IDL_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  GoodDay.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl
index 7eec6e81c13..2ede1277b90 100644
--- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl
@@ -20,13 +20,13 @@ module Test
      * This method is used to simplify the test shutdown process
      */
     oneway void shutdown ();
-    
+
     struct RoughWeek
     {
       BadDay isitok;
       SeqBadDay bad;
     };
-    
+
     RoughWeek this_week ();
   };
 };
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
index 69c98cebb82..b2c994851b7 100644
--- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
@@ -31,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl
index cbcc3d17844..730bbad28a0 100755
--- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl
@@ -49,7 +49,7 @@ my $client_ior2file = $client->LocalFile ($ior2file);
 $client->DeleteFile($ior1file);
 $client->DeleteFile($ior2file);
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               "-o $server1_ior1file");
 
 
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
index 0e2399a8d78..5df03c2b300 100644
--- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
@@ -31,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index afb0049f33a..079010fab3b 100644
--- a/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -9,10 +9,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
 
-ACE_RCSID (IFR_Test,
-           Admin_Client,
-           "$Id$")
-
 Admin_Client::Admin_Client (void)
   : debug_ (0),
     all_tests_ (1),
@@ -2034,7 +2030,7 @@ Admin_Client::constant_test (void)
                   out_double_val));
     }
 
-  ACE_ASSERT (out_double_val == double_val);
+  ACE_ASSERT (ACE::is_equal (out_double_val, double_val));
 
   ivar = this->repo_->get_primitive (CORBA::pk_short);
   cvar->type_def (ivar.in ());
@@ -2090,7 +2086,7 @@ Admin_Client::constant_test (void)
                   out_float_val));
     }
 
-  ACE_ASSERT (out_float_val == float_val);
+  ACE_ASSERT (ACE::is_equal (out_float_val, float_val));
 
   ivar = this->repo_->get_primitive (CORBA::pk_ulonglong);
   cvar->type_def (ivar.in ());
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h b/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
index a550a1a9809..882e2ca3242 100644
--- a/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/InterfaceRepo
-//
-// = FILENAME
-//    Admin_Client.h
-//
-// = DESCRIPTION
-//    This class tests the functionality of the IFR methods by inserting
-//    IR objects into the repository by hand, querying them, moving them,
-//    and destroying them.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Admin_Client.h
+ *
+ *  $Id$
+ *
+ *  This class tests the functionality of the IFR methods by inserting
+ *  IR objects into the repository by hand, querying them, moving them,
+ *  and destroying them.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #if !defined (ADMIN_CLIENT_H)
 #define ADMIN_CLIENT_H
@@ -27,29 +24,32 @@
 
 const CORBA::ULong NUMBER_OF_TESTS = 11;
 
+/**
+ * @class Admin_Client
+ *
+ * @brief Administrating IFR Client Implementation
+ *
+ * Class wrapper for a client which puts the Interface Repository
+ * methods through their paces.
+ */
 class Admin_Client
 {
-  // = TITLE
-  //     Administrating IFR Client Implementation
-  //
-  // = DESCRIPTION
-  //     Class wrapper for a client which puts the Interface Repository
-  //     methods through their paces.
 public:
+  /// Constructor
   Admin_Client (void);
-  // Constructor
 
+  /// Destructor
   ~Admin_Client (void);
-  // Destructor
 
+  /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the ORB and get the IFR object reference.
 
+  /// Execute test code.
   int run (void);
-  // Execute test code.
 
 private:
+  /// The various IFR tests.
   void array_test (void);
   void enum_test (void);
   void alias_test (void);
@@ -61,35 +61,34 @@ private:
   void interface_test (void);
   void move_test (void);
   void module_test (void);
-  // The various IFR tests.
 
+  /// Process the command line arguments.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
-  // Process the command line arguments.
 
+  /// Array of pointers to the test functions.
   void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(void);
-  // Array of pointers to the test functions.
 
+  /// Array of test names used in selection of one test.
   static const char *test_names_[];
-  // Array of test names used in selection of one test.
 
+  /// Flag to output results of IFR queries.
   CORBA::Boolean debug_;
-  // Flag to output results of IFR queries.
 
+  /// Are we running all the tests or just one?
   CORBA::Boolean all_tests_;
-  // Are we running all the tests or just one?
 
+  /// Array index of the selected test function.
   CORBA::ULong which_test_;
-  // Array index of the selected test function.
 
+  /// # of times to run each test.
   CORBA::ULong iterations_;
-  // # of times to run each test.
 
+  /// Storage of the ORB reference.
   CORBA::ORB_var orb_;
-  // Storage of the ORB reference.
 
+  /// Storage of the IFR reference.
   CORBA::Repository_var repo_;
-  // Storage of the IFR reference.
 };
 
 #endif /* ADMIN_CLIENT_H */
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am
deleted file mode 100644
index d97df280f9a..00000000000
--- a/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am
+++ /dev/null
@@ -1,48 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.IFR_IFR_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = IFR_Test
-
-IFR_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-IFR_Test_SOURCES = \
-  Admin_Client.cpp \
-  client.cpp \
-  Admin_Client.h
-
-IFR_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
index 3c1af54c6b7..eec00db242d 100644
--- a/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
@@ -3,10 +3,6 @@
 
 #include "Admin_Client.h"
 
-ACE_RCSID (IFR_Test,
-           client,
-           "$Id$")
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Admin_Client admin_client;
diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
index 71038761a52..671dea8d432 100755
--- a/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
@@ -43,7 +43,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               " $nice " .
                               " -o $server_iorfile " .
                               " $locking");
diff --git a/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index bf95c26b6c8..8369b482eb0 100644
--- a/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -8,10 +8,6 @@
 #include "ace/Throughput_Stats.h"
 #include "ace/Sample_History.h"
 
-ACE_RCSID (Latency_Test,
-           Latency_Query_Client,
-           "$Id$")
-
 const CORBA::ULong DEFAULT_NUMCALLS = 20000;
 
 Latency_Query_Client::Latency_Query_Client (void)
diff --git a/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h b/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
index 4e0c3bf6c4f..97c5eaa6b4e 100644
--- a/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
+++ b/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/InterfaceRepo
-//
-// = FILENAME
-//    Latency_Query_Client.h
-//
-// = DESCRIPTION
-//    This class tests the latency of queries made on the IFR.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Latency_Query_Client.h
+ *
+ *  $Id$
+ *
+ *  This class tests the latency of queries made on the IFR.
+ *
+ *
+ *  @author Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #if !defined (LATENCY_QUERY_CLIENT_H)
 #define LATENCY_QUERY_CLIENT_H
@@ -23,55 +20,57 @@
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/ORB.h"
 
+/**
+ * @class Latency_Query_Client
+ *
+ * @brief Querying IFR Client Implementation
+ *
+ * Class wrapper for a client which queries the Interface Repository.
+ */
 class Latency_Query_Client
 {
-  // = TITLE
-  //     Querying IFR Client Implementation
-  //
-  // = DESCRIPTION
-  //     Class wrapper for a client which queries the Interface Repository.
 public:
+  /// Constructor
   Latency_Query_Client (void);
-  // Constructor
 
+  /// Destructor
   ~Latency_Query_Client (void);
-  // Destructor
 
+  /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the ORB and get the IFR object reference.
 
+  /// Execute test code.
   int run (void);
-  // Execute test code.
 private:
+  /// Process the command line arguments.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
-  // Process the command line arguments.
 
+  /// Put in something to query about.
   int populate_ifr (void);
-  // Put in something to query about.
 
 private:
+  /// Toggle debugging output.
   bool debug_;
-  // Toggle debugging output.
 
+  /// Toggle saving of dump history.
   bool do_dump_history_;
-  // Toggle saving of dump history.
 
+  /// Number of queries in a run.
   CORBA::ULong iterations_;
-  // Number of queries in a run.
 
+  /// Storage of the ORB reference.
   CORBA::ORB_var orb_;
-  // Storage of the ORB reference.
 
+  /// Storage of the IFR reference.
   CORBA::Repository_var repo_;
-  // Storage of the IFR reference.
 
 //  CORBA::AliasDef_var tdef_;
   // Storage of the typedef definition that we will query.
 
+  /// Storage of the attribute definition we will query.
   CORBA::AttributeDef_var attr_;
-  // Storage of the attribute definition we will query.
 };
 
 #endif /* LATENCY_QUERY_CLIENT_H */
diff --git a/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
deleted file mode 100644
index 5cd0c3a6029..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
+++ /dev/null
@@ -1,50 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Latency_Test.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Latency_Query_Client.cpp \
-  client.cpp \
-  Latency_Query_Client.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
index 3561ace0f15..4e919008a6b 100644
--- a/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
@@ -3,17 +3,12 @@
 
 #include "Latency_Query_Client.h"
 
-ACE_RCSID (Latency__Test,
-           client,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Latency_Query_Client client;
 
-  int retval = client.init (argc,
-                            argv);
+  int retval = client.init (argc, argv);
 
   if (retval == -1)
     {
diff --git a/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl
index f262590cf39..8c5b05b1f78 100755
--- a/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl
@@ -42,7 +42,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               " $nice " .
                               " -o $server_iorfile");
 
diff --git a/orbsvcs/tests/InterfaceRepo/Makefile.am b/orbsvcs/tests/InterfaceRepo/Makefile.am
deleted file mode 100644
index 771e756d881..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Makefile.am
+++ /dev/null
@@ -1,23 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Application_Test \
-        Bug_2962_Regression \
-        Bug_3155_Regression \
-        Bug_3174_Regression \
-        Bug_3495_Regression \
-        IDL3_Test \
-        IFR_Inheritance_Test \
-        IFR_Self_Recursive_IDL_Test \
-        IFR_Test \
-        Latency_Test \
-        Persistence_Test
-
diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am
deleted file mode 100644
index 434c936a151..00000000000
--- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am
+++ /dev/null
@@ -1,48 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.IFR_Persistence_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Persistence_Test
-
-Persistence_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Persistence_Test_SOURCES = \
-  Ptest.cpp \
-  test.cpp \
-  Ptest.h
-
-Persistence_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index fc7606b14ea..b1a5fab848f 100644
--- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -5,7 +5,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Persistence_Test, Ptest, "$Id$")
+
 
 Ptest::Ptest (void)
   : debug_ (0),
diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
index 7c2477dbb1b..a8936af2dd0 100644
--- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
+++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/InterfaceRepo
-//
-// = FILENAME
-//    Ptest.h
-//
-// = DESCRIPTION
-//    This code tests the persistence of the IFR by inserting
-//    IR objects into the repository with one function, and querying the
-//    repository with another, with a repository shutdown in between.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Ptest.h
+ *
+ *  $Id$
+ *
+ *  This code tests the persistence of the IFR by inserting
+ *  IR objects into the repository with one function, and querying the
+ *  repository with another, with a repository shutdown in between.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #if !defined (PTEST_H)
 #define PTEST_H
@@ -25,50 +22,52 @@
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/ORB.h"
 
+/**
+ * @class Ptest
+ *
+ * @brief IFR Persistence test Implementation
+ *
+ * Class wrapper for code which either populates or queries the
+ * Interface Repository. Designed to be used with a Perl script
+ * which can start and stop both this process and the repository
+ * process in the necessary order.
+ */
 class Ptest
 {
-  // = TITLE
-  //     IFR Persistence test Implementation
-  //
-  // = DESCRIPTION
-  //     Class wrapper for code which either populates or queries the
-  //     Interface Repository. Designed to be used with a Perl script
-  //     which can start and stop both this process and the repository
-  //     process in the necessary order.
 public:
+  /// Constructor
   Ptest (void);
-  // Constructor
 
+  /// Destructor
   ~Ptest (void);
-  // Destructor
 
+  /// Initialize the ORB and get the IFR object reference.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the ORB and get the IFR object reference.
 
+  /// Execute test code.
   int run (void);
-  // Execute test code.
 
 private:
+  /// The two IFR tests.
   void populate (void);
   int query (void);
-  // The two IFR tests.
 
+  /// Process the command line arguments.
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
-  // Process the command line arguments.
 
+  /// Flag to output results of IFR queries.
   CORBA::Boolean debug_;
-  // Flag to output results of IFR queries.
 
+  /// Are we populating a new IFR or querying a persistent one?
   CORBA::Boolean query_;
-  // Are we populating a new IFR or querying a persistent one?
 
+  /// Storage of the ORB reference.
   CORBA::ORB_var orb_;
-  // Storage of the ORB reference.
 
+  /// Storage of the IFR reference.
   CORBA::Repository_var repo_;
-  // Storage of the IFR reference.
 };
 
 #endif /* PTEST_H */
diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
index 98575290ded..de3b93855ef 100755
--- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
@@ -38,7 +38,7 @@ $server->DeleteFile($iorbase);
 $server->DeleteFile($backing_file);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               " -o $server_iorfile " .
                               " $persistent");
 
diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf b/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf
index ea66c67064d..b6856698e51 100644
--- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf
+++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static Resource_Factory "-ORBDropRepliesDuringShutdown 0"
diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp b/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
index 77a52ea4f66..e55bfc1f40e 100644
--- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
@@ -3,10 +3,6 @@
 
 #include "Ptest.h"
 
-ACE_RCSID (Persistence_Test,
-           test,
-           "$Id$")
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Ptest ptest;
diff --git a/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
index f26859c4528..b88aec910d0 100644
--- a/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
@@ -12,7 +12,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
-  TAO_IFR_Client_Adapter *ifr_client = 
+  TAO_IFR_Client_Adapter *ifr_client =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
       TAO_ORB_Core::ifr_client_adapter_name ());
 
@@ -32,11 +32,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                          "get interface returned nil ref\n"),
                         1);
     }
-  
+
   CORBA::ContainedSeq_var attributes =
     intDef->contents (CORBA::dk_Attribute, 1);
   CORBA::ULong n_ats = attributes->length ();
-  
+
   CORBA::ULong index = 0UL;
   CORBA::String_var name = attributes[index]->name ();
   ACE_DEBUG ((LM_DEBUG,
diff --git a/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl
index f13eba613c8..5b23ca74b7b 100755
--- a/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl
+++ b/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl
@@ -39,7 +39,7 @@ my $client_ior1file = $client->LocalFile ($ior1file);
 $client->DeleteFile($ior1file);
 
 
-$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service",
+$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service",
                               " $nice " .
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file " .
diff --git a/orbsvcs/tests/Interoperable_Naming/Makefile.am b/orbsvcs/tests/Interoperable_Naming/Makefile.am
deleted file mode 100644
index 99599451fa6..00000000000
--- a/orbsvcs/tests/Interoperable_Naming/Makefile.am
+++ /dev/null
@@ -1,83 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Interoperable_Naming.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.cpp \
-  Web_ServerS.h \
-  Web_ServerS.inl
-
-CLEANFILES = \
-  Web_Server-stamp \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.cpp \
-  Web_ServerS.h \
-  Web_ServerS.inl
-
-Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl: Web_Server-stamp
-
-Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Web_ServerC.cpp \
-  Web_ServerS.cpp \
-  client.cpp \
-  ncontextext_client_i.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.h \
-  Web_ServerS.inl \
-  ncontextext_client_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/Interoperable_Naming/Web_Server.idl b/orbsvcs/tests/Interoperable_Naming/Web_Server.idl
index 97bda28066e..dc209bd7343 100644
--- a/orbsvcs/tests/Interoperable_Naming/Web_Server.idl
+++ b/orbsvcs/tests/Interoperable_Naming/Web_Server.idl
@@ -1,21 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/Interoperable_Naming/
-//
-// = FILENAME
-//    Web_Server.idl
-//
-// = DESCRIPTION
-//     IDL schema definition for Web server interface.
-//
-// = AUTHORS
-//     Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Web_Server.idl
+ *
+ *  $Id$
+ *
+ *   IDL schema definition for Web server interface.
+ *
+ *
+ *  @author  Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 module Web_Server
 {
diff --git a/orbsvcs/tests/Interoperable_Naming/client.cpp b/orbsvcs/tests/Interoperable_Naming/client.cpp
index b55b30aedb2..4d634bee99d 100644
--- a/orbsvcs/tests/Interoperable_Naming/client.cpp
+++ b/orbsvcs/tests/Interoperable_Naming/client.cpp
@@ -1,22 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/Interoperable_Naming/
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//     This implements a simple CORBA client for the
-//     CosNaming::NamingContextExt example
-//
-// = AUTHORS
-//     Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *   This implements a simple CORBA client for the
+ *   CosNaming::NamingContextExt example
+ *
+ *
+ *  @author  Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #include "ncontextext_client_i.h"
 
diff --git a/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index e682b3a7ade..949beb9c17c 100644
--- a/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -1,23 +1,19 @@
-// $Id$
-//
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/ORBSVCS/tests/SimpleNaming
-//
-// = FILENAME
-//    ncontextext_client_i.cpp
-//
-// = DESCRIPTION
-//    This class implements a simple CORBA client which
-//    converts a Name to a string and viceversa, forms a IIOPNAME
-//    url address and can resolve a stringified name.
-//
-// = AUTHORS
-//    Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//============================================================
+
+//=============================================================================
+/**
+ *  @file    ncontextext_client_i.cpp
+ *
+ *  $Id$
+ *
+ *  This class implements a simple CORBA client which
+ *  converts a Name to a string and viceversa, forms a IIOPNAME
+ *  url address and can resolve a stringified name.
+ *
+ *
+ *  @author Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #include "ncontextext_client_i.h"
 #include "tao/debug.h"
diff --git a/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
index 7c3743c0230..b5c4c253a7e 100644
--- a/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
+++ b/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/ORBSVCS/tests/SimpleNaming
-//
-// = FILENAME
-//    ncontextext_client_i.h
-//
-// = DESCRIPTION
-//    This class implements a simple CORBA client which
-//    converts a Name to a string and viceversa, forms a IIOPNAME
-//    url address and can resolve a stringified name.
-//
-// = AUTHORS
-//    Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//============================================================
+
+//=============================================================================
+/**
+ *  @file    ncontextext_client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements a simple CORBA client which
+ *  converts a Name to a string and viceversa, forms a IIOPNAME
+ *  url address and can resolve a stringified name.
+ *
+ *
+ *  @author Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 
 #if !defined (NCONTEXTEXT_CLIENT_I_H)
@@ -26,55 +23,58 @@
 #include "Web_ServerC.h"
 #include "orbsvcs/CosNamingC.h"
 
+/**
+ * @class NContextExt_Client_i
+ *
+ * @brief NContextExt Client Implementation
+ *
+ */
 class NContextExt_Client_i
 {
-  // = TITLE
-  //     NContextExt Client Implementation
-  //
-  // = DESCRIPTION
-  //
 
  public:
   // = COnstructor and destructor.
   NContextExt_Client_i (void);
   ~NContextExt_Client_i (void);
 
+  /// Execute the client example code.
   int run (void);
-  // Execute the client example code.
 
+  /// Initialize the client communication endpoint with the server.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize the client communication endpoint with the server.
 
  private:
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /**
+   * Prints the values of the original name, strigified name and
+   * destringified name. Also, prints the value of the address of the
+   * naming context, a name that identifies a binding in that naming
+   * context and the corresponding iioploc URL
+   * representation.
+   */
   void print_values (CosNaming::Name name,
                      CORBA::String_var str_name,
                      CosNaming::Name nm,
                      CORBA::String_var obj_name,
                      CORBA::String_var url_string);
-  // Prints the values of the original name, strigified name and
-  // destringified name. Also, prints the value of the address of the
-  // naming context, a name that identifies a binding in that naming
-  // context and the corresponding iioploc URL
-  // representation.
 
+  /// Generates a random name
   char * get_name (void);
-  // Generates a random name
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// Naming context
   CosNaming::NamingContextExt_var naming_context_;
-  // Naming context
 
+  /// Flag to check if '-v' option is set.
   CORBA::Boolean view_;
-  // Flag to check if '-v' option is set.
 
 };
 
diff --git a/orbsvcs/tests/Interoperable_Naming/run_test.pl b/orbsvcs/tests/Interoperable_Naming/run_test.pl
index eb89e694837..3d21cdd25f0 100755
--- a/orbsvcs/tests/Interoperable_Naming/run_test.pl
+++ b/orbsvcs/tests/Interoperable_Naming/run_test.pl
@@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../Naming_Service/Naming_Service",
+$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 $CL = $client->CreateProcess ("client", "-s -ORBInitRef NameService=file://$client_iorfile");
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
index f6b1b39ac23..8d733337167 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
@@ -1,12 +1,8 @@
+// $Id$
+
 #include "Basic.h"
 #include "LB_server.h"
 
-
-ACE_RCSID (Application_Controlled,
-           Basic,
-           "$Id$")
-
-
 Basic::Basic (CORBA::Object_ptr object_group,
               CosLoadBalancing::LoadManager_ptr lm,
               CORBA::ORB_ptr orb,
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
index aedbaa8910d..0ffd18e95b9 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Basic.h"
 
 #include "TestC.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Application_Controlled,
-           LB_server,
-           "$Id$")
-
 LB_server::LB_server (int argc, ACE_TCHAR **argv)
   : argc_ (argc)
   , argv_ (argv)
@@ -93,7 +91,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
deleted file mode 100644
index cf8c8ca4ca1..00000000000
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
+++ /dev/null
@@ -1,146 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Application_Controlled_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Application_Controlled_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Basic.h \
-  LB_server.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Application_Controlled_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Basic.cpp \
-  LB_server.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Basic.h \
-  LB_server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
index 738a237d01f..a167ce93a54 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Application_Controlled,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://obj.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
index 46b8699f5f0..23770a7b286 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
@@ -44,7 +44,7 @@ my $client_ior2file = $client->LocalFile ($ior2file);
 $client->DeleteFile($ior2file);
 
 
-$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/LoadManager",
+$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file " .
                               ($^O eq 'MSWin32' ?
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
index d03bc0f5895..88bc5f6819e 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Basic.h"
 
-ACE_RCSID (Application_Controlled,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf
index ea66c67064d..b6856698e51 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf
@@ -1,2 +1,3 @@
 # $Id$
+
 static Resource_Factory "-ORBDropRepliesDuringShutdown 0"
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf
index 06c425e3ecf..e02d5089fce 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf
@@ -1,3 +1,3 @@
-# $Id $
+# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
index e876ece085c..eeb61688925 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
@@ -1,11 +1,8 @@
+// $Id$
+
 #include "Basic.h"
 #include "LB_server.h"
-#include "ace/OS.h"
-
-
-ACE_RCSID (DeadMemberDetection_App_Ctrl,
-           Basic,
-           "$Id$")
+#include "ace/OS_NS_unistd.h"
 
 extern int pong_delay;
 
@@ -29,7 +26,7 @@ Basic::Basic (CORBA::Object_ptr object_group,
 
 
 /// Default _non_existent: always returns false.
-CORBA::Boolean 
+CORBA::Boolean
 Basic::_non_existent (void)
 {
   if (pong_delay > 0)
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
index 3841887fb5f..c0aede26ecc 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Basic.h"
 
 #include "TestC.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (DeadMemberDetection_App_Ctrl,
-           LB_server,
-           "$Id$")
-
 extern const ACE_TCHAR *group_file;
 extern const ACE_TCHAR *group_ior;
 extern const ACE_TCHAR *direct_obj_file;
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Makefile.am b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Makefile.am
deleted file mode 100755
index cf8c8ca4ca1..00000000000
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Makefile.am
+++ /dev/null
@@ -1,146 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Application_Controlled_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Application_Controlled_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Basic.h \
-  LB_server.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Application_Controlled_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Basic.cpp \
-  LB_server.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Basic.h \
-  LB_server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
index 5d68484928e..e7749681cc7 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
@@ -1,11 +1,10 @@
+// $Id$
+
 #include "TestC.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS.h"
 #include "ace/Vector_T.h"
-
-ACE_RCSID (DeadMemberDetection_App_Ctrl,
-           client,
-           "$Id$")
+#include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_unistd.h"
 
 const ACE_TCHAR *group_file = ACE_TEXT("group.ior");
 const ACE_TCHAR *group_ior = ACE_TEXT("file://group.ior");
@@ -46,14 +45,14 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
 
 
-int dead_member_rr_test (CORBA::ORB_ptr orb, 
-                         const ACE_TCHAR *group_ior, 
+int dead_member_rr_test (CORBA::ORB_ptr orb,
+                         const ACE_TCHAR *group_ior,
                          Test::Basic_ptr direct_basic)
 {
   int status = 0;
@@ -92,7 +91,7 @@ int dead_member_rr_test (CORBA::ORB_ptr orb,
 
         basic->exit ();
       }
-      else 
+      else
         direct_basic->exit ();
 
       if (iter == 3)
@@ -125,8 +124,8 @@ int dead_member_rr_test (CORBA::ORB_ptr orb,
 }
 
 
-int hang_member_rr_test (CORBA::ORB_ptr orb, 
-                         const ACE_TCHAR *group_ior, 
+int hang_member_rr_test (CORBA::ORB_ptr orb,
+                         const ACE_TCHAR *group_ior,
                          Test::Basic_ptr /*direct_basic*/)
 {
   int status = 0;
@@ -186,7 +185,7 @@ int hang_member_rr_test (CORBA::ORB_ptr orb,
     catch (const ::CORBA::COMM_FAILURE& /*ex*/)
     {
       // It is possible that the LB has not detected the server 2 exit as it hangs
-      // and returns the reference to the hang server(server 2) for 4th iteration. 
+      // and returns the reference to the hang server(server 2) for 4th iteration.
       // So the 4th operation could get the COMM_FAILURE or TRANSIENT exceptions.
       if (iter != 3)
       {
@@ -214,8 +213,8 @@ int hang_member_rr_test (CORBA::ORB_ptr orb,
 }
 
 
-int dead_member_rand_test (CORBA::ORB_ptr orb, 
-                           const ACE_TCHAR *group_ior, 
+int dead_member_rand_test (CORBA::ORB_ptr orb,
+                           const ACE_TCHAR *group_ior,
                            Test::Basic_ptr /*direct_basic*/)
 {
   int status = 0;
@@ -247,7 +246,7 @@ int dead_member_rand_test (CORBA::ORB_ptr orb,
       ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Client request handled by object at <%s>\n",
         the_string.in ()));
 
-      // Any picked member will not be picked again since they exit right after 
+      // Any picked member will not be picked again since they exit right after
       // this request.
       for (size_t j = 0; j < locations.size (); ++j)
       {
@@ -255,8 +254,8 @@ int dead_member_rand_test (CORBA::ORB_ptr orb,
         {
           status = 1;
         }
-      }    
-     
+      }
+
       if (status == 0)
         locations.push_back (the_string.in ());
 
@@ -291,8 +290,8 @@ int dead_member_rand_test (CORBA::ORB_ptr orb,
 }
 
 
-int hang_member_rand_test (CORBA::ORB_ptr orb, 
-                           const ACE_TCHAR *group_ior, 
+int hang_member_rand_test (CORBA::ORB_ptr orb,
+                           const ACE_TCHAR *group_ior,
                            Test::Basic_ptr /*direct_basic*/)
 {
   int status = 0;
@@ -330,11 +329,11 @@ int hang_member_rand_test (CORBA::ORB_ptr orb,
         {
           status = 1;
         }
-      }    
-     
+      }
+
       if (status == 0)
         locations.push_back (the_string.in ());
-     
+
      if (iter == 3)
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)Request %d should not complete\n"), iter));
@@ -359,7 +358,7 @@ int hang_member_rand_test (CORBA::ORB_ptr orb,
     catch (const ::CORBA::COMM_FAILURE& /*ex*/)
     {
       // It is possible that the LB has not detected the server 2 exit as it hangs
-      // and returns the reference to the hang server(server 2) for 4th iteration. 
+      // and returns the reference to the hang server(server 2) for 4th iteration.
       // So the 4th operation could get the COMM_FAILURE or TRANSIENT exceptions.
       if (iter != 3)
       {
@@ -439,7 +438,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         else
           status = dead_member_rand_test (orb.in (), group_ior, direct_basic.in ());
       else
-      {    
+      {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)Invalid strategy \n")));
         status = 1;
       }
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf
index ceefb555c38..687382aac65 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf
@@ -1,4 +1,4 @@
-# $Id $
+# $Id$
 
 static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1"
 
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl
index 3b495f39dfa..1a4e8ea13ed 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl
@@ -24,28 +24,28 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file";
 
 
 @tests =
-    (   {   
+    (   {
          description => "Dead Member Detection",
          strategy  => "RoundRobin",
          svr1_args => "$init_ref -n 1 -o $ior2file",
          svr2_args => "$init_ref -n 2 -k file://$ior2file -j $ior3file",
          svr3_args => "$init_ref -n 3 -k file://$ior2file",
          client_args => "-k file://$ior2file -j file://$ior3file -s RoundRobin",
-        }, {   
+        }, {
          description => "Hang Member Detection",
          strategy  => "RoundRobin",
          svr1_args => "$init_ref -n 1 -o $ior2file",
          svr2_args => "$init_ref -n 2 -k file://$ior2file -j $ior3file -l 2",
          svr3_args => "$init_ref -n 3 -k file://$ior2file",
          client_args => "-k file://$ior2file -j file://$ior3file -s RoundRobin -l",
-        }, {   
+        }, {
          description => "Dead Member Detection",
          strategy  => "Random",
          svr1_args => "$init_ref -n 1 -o $ior2file",
          svr2_args => "$init_ref -n 2 -k file://$ior2file -j $ior3file",
          svr3_args => "$init_ref -n 3 -k file://$ior2file",
          client_args => "-k file://$ior2file -j file://$ior3file -s Random",
-        }, {   
+        }, {
          description => "Hang Member Detection",
          strategy  => "Random",
          svr1_args => "$init_ref -n 1 -o $ior2file",
@@ -75,21 +75,21 @@ for $test (@tests) {
     $server2->DeleteFile($ior3file);
 
     $status = 0;
-    #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log 
-    $LM = $server1->CreateProcess ("../../../../LoadBalancer/LoadManager",
-                                "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3" 
+    #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log
+    $LM = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager",
+                                "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3"
                                 . " -ORBSvcConf $lm_conf");
     $SV1 = $server2->CreateProcess ("server", $test->{svr1_args});
     $SV2 = $server3->CreateProcess ("server", $test->{svr2_args});
     $SV3 = $server4->CreateProcess ("server", $test->{svr3_args});
     $CL = $client->CreateProcess ("client", $test->{client_args});
-    
+
     print STDERR "\n\n======== $test->{description} with $test->{strategy} ================\n";
     print STDERR "\n";
 
     print STDERR "== Start Load Banlancer.\n";
     print STDERR $LM->CommandLine () . "\n";
-    
+
     $LM->Spawn ();
 
     if ($server1->WaitForFileTimed ($ior1file, $server1->ProcessStartWaitInterval()) == -1) {
@@ -97,13 +97,13 @@ for $test (@tests) {
         $LM->Kill (); $LM->TimedWait (1);
         exit 1;
     }
-    
+
     if ($server1->GetFile ($ior1file) == -1) {
         print STDERR "ERROR: cannot retrieve file <$server1_ior1file>\n";
         $LM->Kill (); $LM->TimedWait (1);
         exit 1;
     }
- 
+
     if ($server2->PutFile ($ior2file) == -1) {
         print STDERR "ERROR: cannot set file <$server2_ior2file>\n";
         $LM->Kill (); $LM->TimedWait (1);
@@ -120,7 +120,7 @@ for $test (@tests) {
         $SV1->Kill (); $SV1->TimedWait (1);
         exit 1;
     }
-    
+
     if ($server2->GetFile ($ior2file) == -1) {
         print STDERR "ERROR: cannot retrieve file <$server2_ior2file>\n";
         $LM->Kill ();
@@ -147,7 +147,7 @@ for $test (@tests) {
         $SV2->Kill (); $SV2->TimedWait (1);
         exit 1;
     }
-    
+
     if ($server3->GetFile ($ior3file) == -1) {
         print STDERR "ERROR: cannot retrieve file <$server3_ior1file>\n";
         $LM->Kill ();
@@ -173,7 +173,7 @@ for $test (@tests) {
         $status = 1;
     }
 
-    $server = $SV3->WaitKill ($server2->ProcessStopWaitInterval()); 
+    $server = $SV3->WaitKill ($server2->ProcessStopWaitInterval());
 
     if ($server != 0) {
         print STDERR "ERROR: server 3 returned $server\n";
@@ -203,7 +203,7 @@ for $test (@tests) {
     $server1->DeleteFile($ior1file);
     $server2->DeleteFile($ior2file);
     $server3->DeleteFile($ior3file);
-    
+
     if ($status == 0) {
       print STDERR "$description test passed.\n";
     }
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
index c3a2cc28124..546d0c60179 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
@@ -1,13 +1,10 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Basic.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS.h"
 #include "ace/Task.h"
 
-ACE_RCSID (DeadMemberDetection_App_Ctrl,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *group_file = ACE_TEXT("group.ior");
 const ACE_TCHAR *group_ior = ACE_TEXT("file://group.ior");
 
@@ -51,7 +48,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -82,7 +79,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         return 1;
 
       const char ** location = 0;
-      
+
       switch (server_id)
       {
         case 1:
@@ -115,7 +112,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                              server_id),
                       1);
       PortableServer::ServantBase_var owner_transfer(basic_servant);
-    
+
       if (lb_server.register_servant (basic_servant, *location) == -1)
         {
           (void) lb_server.destroy ();
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf
index 4521e5070db..0cc4559a431 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf
@@ -1,4 +1,4 @@
-# $Id $
+# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
 static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1"
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
index 66afe43d0b1..bcb1292951f 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
@@ -1,11 +1,10 @@
+// $Id$
+
 #include "Factory.h"
 #include "Simple.h"
 
 #include "TestC.h"
-
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           Factory,
-           "$Id$")
+#include "ace/OS_NS_unistd.h"
 
 Factory::Factory (int id)
 : id_ (id)
@@ -60,12 +59,9 @@ Factory::create_object (
   return obj_._retn ();
 }
 
-#include <ace/OS.h>
-
 void
 Factory::delete_object (
-    const PortableGroup::GenericFactory::FactoryCreationId &
-      fcid)
+    const PortableGroup::GenericFactory::FactoryCreationId & fcid)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T delete_object \n"));
   ACE_OS::sleep (10);
@@ -95,7 +91,7 @@ Factory::delete_object (
 }
 
 
-CORBA::Object_ptr 
+CORBA::Object_ptr
 Factory::get_object () const
 {
   return this->obj_.in ();
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp
index dea1b129921..24553e7f9eb 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp
@@ -1,9 +1,6 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Factory_Map.h"
 
 
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           Factory_Map,
-           "$Id$")
-
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp
index 1dbc2b3c9bd..3b9f3ed923c 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp
@@ -1,5 +1,4 @@
+// $Id$
+
 #include "Factory_Struct.h"
 
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           Factory_Struct,
-           "$Id$")
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
index a2ce2a65d0e..a7367b2f44b 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "LB_Factory_Server.h"
 #include "Simple.h"
 #include "Factory.h"
@@ -6,10 +8,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           LB_Factory_Server,
-           "$Id$")
-
 const ACE_TCHAR* factory1_file = ACE_TEXT ("factory1.ior");
 const ACE_TCHAR* factory2_file = ACE_TEXT ("factory2.ior");
 const ACE_TCHAR* factory3_file = ACE_TEXT ("factory3.ior");
@@ -124,7 +122,7 @@ LB_Factory_Server::parse_args (int& argc, ACE_TCHAR **& argv)
       }
 
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -164,16 +162,16 @@ LB_Factory_Server::init (void)
                            " (%P|%t) Unable to get Load Manager Reference\n"),
                           1);
 
-     
+
       Factory* servant = new Factory(server_id_);
       PortableServer::ServantBase_var owner_transfer(servant);
       obj = servant->_this ();
-      PortableGroup::GenericFactory_var factory_obj 
+      PortableGroup::GenericFactory_var factory_obj
         = PortableGroup::GenericFactory::_narrow (obj.in ());
       CORBA::String_var ior =
         this->orb_->object_to_string (factory_obj.in ());
 
-      this->write_ior_to_file (ior.in (), 
+      this->write_ior_to_file (ior.in (),
         ACE_TEXT_ALWAYS_CHAR (this->factory_ior_file_.c_str ()));
 
       if (this->server_id_ == 2)
@@ -188,7 +186,7 @@ LB_Factory_Server::init (void)
 
         CORBA::Object_var obj = simple_servant->_this ();
         CORBA::String_var ior = this->orb_->object_to_string (obj.in ());
-        this->write_ior_to_file (ior.in (), 
+        this->write_ior_to_file (ior.in (),
           ACE_TEXT_ALWAYS_CHAR (direct_obj2_file));
       }
     }
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
index 0a9e7731251..6bbc51ac1fc 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Simple.h"
 #include "Factory.h"
@@ -6,10 +8,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           LB_server,
-           "$Id$")
-
 const char *location1 = "MyLocation 1";
 const char *location2 = "MyLocation 2";
 const char *location3 = "MyLocation 3";
@@ -124,7 +122,7 @@ LB_server::parse_args (int& argc, ACE_TCHAR **& argv)
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -184,15 +182,15 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2, const char
       const char *repository_id = "IDL:Test/Simple:1.0";
 
       CORBA::Object_var obj = this->orb_->string_to_object (factory1_ior);
-      PortableGroup::GenericFactory_var factory1_obj = 
+      PortableGroup::GenericFactory_var factory1_obj =
         PortableGroup::GenericFactory::_narrow (obj.in ());
 
       obj = this->orb_->string_to_object (factory2_ior);
-      PortableGroup::GenericFactory_var factory2_obj = 
+      PortableGroup::GenericFactory_var factory2_obj =
         PortableGroup::GenericFactory::_narrow (obj.in ());
 
       obj = this->orb_->string_to_object (factory3_ior);
-      PortableGroup::GenericFactory_var factory3_obj = 
+      PortableGroup::GenericFactory_var factory3_obj =
         PortableGroup::GenericFactory::_narrow (obj.in ());
 
       PortableGroup::FactoriesValue  factory_infos;
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Makefile.am b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Makefile.am
deleted file mode 100755
index 94dc1c8ff17..00000000000
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Makefile.am
+++ /dev/null
@@ -1,153 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Infrastructure_Controlled_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Infrastructure_Controlled_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Factory.h \
-  Factory_Map.h \
-  Factory_Struct.h \
-  LB_server.h \
-  Simple.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Infrastructure_Controlled_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Factory.cpp \
-  Factory_Map.cpp \
-  Factory_Struct.cpp \
-  LB_server.cpp \
-  Simple.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Factory.h \
-  Factory_Map.h \
-  Factory_Struct.h \
-  LB_server.h \
-  Simple.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
index 37b7d6b5046..feb230318fa 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
@@ -1,10 +1,7 @@
-#include "Simple.h"
-#include "ace/OS.h"
-
+// $Id$
 
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           Simple,
-           "$Id$")
+#include "Simple.h"
+#include "ace/OS_NS_unistd.h"
 
 extern int pong_delay;
 
@@ -18,7 +15,7 @@ Simple::Simple (int server_id)
 }
 
 /// Default _non_existent: always returns false.
-CORBA::Boolean 
+CORBA::Boolean
 Simple::_non_existent (void)
 {
   if (pong_delay > 0)
@@ -53,7 +50,7 @@ Simple::get_string (void)
   }
 }
 
-void 
+void
 Simple::exit (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Simple::exit  server %d exit \n",
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
index 065d913e181..7de73d898a5 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
@@ -1,13 +1,10 @@
+// $Id$
+
 #include "TestC.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS.h"
 #include "ace/Vector_T.h"
-
-
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           client,
-           "$Id$")
-
+#include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_unistd.h"
 
 const ACE_TCHAR* group_ior = ACE_TEXT ("file:://group.ior");
 const ACE_TCHAR* direct_obj2_ior = ACE_TEXT ("file://direct_obj2.ior");
@@ -45,13 +42,13 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
 
-int dead_member_rr_test (CORBA::ORB_ptr orb, 
-                         const ACE_TCHAR* group_ior, 
+int dead_member_rr_test (CORBA::ORB_ptr orb,
+                         const ACE_TCHAR* group_ior,
                          Test::Simple_ptr direct_simple)
 {
   int status = 0;
@@ -90,7 +87,7 @@ int dead_member_rr_test (CORBA::ORB_ptr orb,
 
         simple->exit ();
       }
-      else 
+      else
         direct_simple->exit ();
 
       if (iter == 3)
@@ -123,8 +120,8 @@ int dead_member_rr_test (CORBA::ORB_ptr orb,
 }
 
 
-int hang_member_rr_test (CORBA::ORB_ptr orb, 
-                         const ACE_TCHAR* group_ior, 
+int hang_member_rr_test (CORBA::ORB_ptr orb,
+                         const ACE_TCHAR* group_ior,
                          Test::Simple_ptr /*direct_simple*/)
 {
   int status = 0;
@@ -185,7 +182,7 @@ int hang_member_rr_test (CORBA::ORB_ptr orb,
     catch (const ::CORBA::COMM_FAILURE& /*ex*/)
     {
       // It is possible that the LB has not detected the server 2 exit as it hangs
-      // and returns the reference to the hang server(server 2) for 4th iteration. 
+      // and returns the reference to the hang server(server 2) for 4th iteration.
       // So the 4th operation could get the COMM_FAILURE or TRANSIENT exceptions.
       if (iter != 3)
       {
@@ -208,13 +205,13 @@ int hang_member_rr_test (CORBA::ORB_ptr orb,
       throw;
     }
   }
- 
+
   return status;
 }
 
 
-int dead_member_rand_test (CORBA::ORB_ptr orb, 
-                           const ACE_TCHAR* group_ior, 
+int dead_member_rand_test (CORBA::ORB_ptr orb,
+                           const ACE_TCHAR* group_ior,
                            Test::Simple_ptr /*direct_simple*/)
 {
   int status = 0;
@@ -246,7 +243,7 @@ int dead_member_rand_test (CORBA::ORB_ptr orb,
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client request handled by object at <%s>\n",
         the_string.in ()));
 
-      // Any picked member will not be picked again since they exit right after 
+      // Any picked member will not be picked again since they exit right after
       // this request.
       for (size_t j = 0; j < locations.size (); ++j)
       {
@@ -254,8 +251,8 @@ int dead_member_rand_test (CORBA::ORB_ptr orb,
         {
           status = 1;
         }
-      }    
-     
+      }
+
       if (status == 0)
         locations.push_back (the_string.in ());
 
@@ -290,8 +287,8 @@ int dead_member_rand_test (CORBA::ORB_ptr orb,
 }
 
 
-int hang_member_rand_test (CORBA::ORB_ptr orb, 
-                           const ACE_TCHAR* group_ior, 
+int hang_member_rand_test (CORBA::ORB_ptr orb,
+                           const ACE_TCHAR* group_ior,
                            Test::Simple_ptr /*direct_simple*/)
 {
   int status = 0;
@@ -329,11 +326,11 @@ int hang_member_rand_test (CORBA::ORB_ptr orb,
         {
           status = 1;
         }
-      }    
-     
+      }
+
       if (status == 0)
         locations.push_back (the_string.in ());
-     
+
      if (iter == 3)
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)Request %d should not complete\n"), iter));
@@ -358,7 +355,7 @@ int hang_member_rand_test (CORBA::ORB_ptr orb,
     catch (const ::CORBA::COMM_FAILURE& /*ex*/)
     {
       // It is possible that the LB has not detected the server 2 exit as it hangs
-      // and returns the reference to the hang server(server 2) for 4th iteration. 
+      // and returns the reference to the hang server(server 2) for 4th iteration.
       // So the 4th operation could get the COMM_FAILURE or TRANSIENT exceptions.
       if (iter != 3)
       {
@@ -426,7 +423,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         else
           status = dead_member_rand_test (orb.in (),group_ior, direct_simple.in ());
       else
-      {    
+      {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)Invalid strategy \n")));
         status = 1;
       }
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp
index 0695d186eb7..e7b491f6c55 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "LB_Factory_Server.h"
 #include "Factory.h"
 #include "Simple.h"
 
-ACE_RCSID (DeadMemberDetection_Inf_Ctrl,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf
index ceefb555c38..687382aac65 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf
@@ -1,4 +1,4 @@
-# $Id $
+# $Id$
 
 static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1"
 
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl
index 323d1de9d0e..1f868f756c5 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl
@@ -27,7 +27,7 @@ $lm_conf = $^O eq 'MSWin32' ? "windows$PerlACE::svcconf_ext"
 $init_ref = "-ORBInitRef LoadManager=file://$ior1file";
 
 
-@tests = ({   
+@tests = ({
             description => "Dead Member Detection",
             strategy  => "RoundRobin",
             svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file",
@@ -35,7 +35,7 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file";
             svr2_args => "$init_ref -n 2 -o $ior4file -j $ior6file",
             svr3_args => "$init_ref -n 3 -o $ior5file",
             client_args => "-k file://$ior2file -j file://$ior6file -s RoundRobin",
-          },{   
+          },{
             description => "Hang Member Detection",
             strategy  => "RoundRobin",
             svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file",
@@ -43,7 +43,7 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file";
             svr2_args => "$init_ref -n 2 -o $ior4file -j $ior6file -l 2",
             svr3_args => "$init_ref -n 3 -o $ior5file",
             client_args => "-k file://$ior2file -j file://$ior6file -s RoundRobin -l",
-          },{   
+          },{
             description => "Dead Member Detection",
             strategy  => "Random",
             svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file",
@@ -51,7 +51,7 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file";
             svr2_args => "$init_ref -n 2 -o $ior4file -j $ior6file",
             svr3_args => "$init_ref -n 3 -o $ior5file",
             client_args => "-k file://$ior2file -j file://$ior6file -s Random",
-          },{ 
+          },{
             description => "Hang Member Detection",
             strategy  => "Random",
             svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file",
@@ -88,9 +88,9 @@ for $test (@tests) {
     $server5->DeleteFile($ior5file);
 
     $status = 0;
-    #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log 
-    $LM = $server1->CreateProcess ("../../../../LoadBalancer/LoadManager",
-                                "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3" 
+    #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log
+    $LM = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager",
+                                "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3"
                                 . " -ORBSvcConf $lm_conf");
     $SV = $server2->CreateProcess ("server", $test->{svr_args});
     $SV1 = $server3->CreateProcess ("factory_server", $test->{svr1_args});
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp
index 154eb412484..2158e314e99 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Factory.h"
 #include "Simple.h"
 
-ACE_RCSID (Infrastructure_Controlled,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf
index 4521e5070db..0cc4559a431 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf
@@ -1,4 +1,4 @@
-# $Id $
+# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
 static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1"
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
index 6e0079fac75..5615e8b55cb 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
@@ -1,12 +1,10 @@
+// $Id$
+
 #include "Factory.h"
 #include "Simple.h"
 
 #include "TestC.h"
 
-ACE_RCSID (Infrastructure_Controlled,
-           Factory,
-           "$Id$")
-
 Factory::Factory (void)
 {
    this->fcid_ = 0;
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp
index 375784f2fd3..99a52abe6ae 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp
@@ -1,9 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Factory_Map.h"
 
-
-ACE_RCSID (Infrastructure_Controlled,
-           Factory_Map,
-           "$Id$")
-
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp
index 4459fe3e227..3b9f3ed923c 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp
@@ -1,5 +1,4 @@
+// $Id$
+
 #include "Factory_Struct.h"
 
-ACE_RCSID (Infrastructure_Controlled,
-           Factory_Struct,
-           "$Id$")
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
index 86b6fd95662..8a6c30869a8 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Simple.h"
 #include "Factory.h"
@@ -5,10 +7,6 @@
 #include "TestC.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Infrastructure_Controlled,
-           LB_server,
-           "$Id$")
-
 LB_server::LB_server (int argc, ACE_TCHAR **argv)
   : argc_ (argc)
   , argv_ (argv)
@@ -103,7 +101,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
deleted file mode 100644
index 94dc1c8ff17..00000000000
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
+++ /dev/null
@@ -1,153 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Infrastructure_Controlled_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Infrastructure_Controlled_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Factory.h \
-  Factory_Map.h \
-  Factory_Struct.h \
-  LB_server.h \
-  Simple.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Infrastructure_Controlled_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Factory.cpp \
-  Factory_Map.cpp \
-  Factory_Struct.cpp \
-  LB_server.cpp \
-  Simple.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Factory.h \
-  Factory_Map.h \
-  Factory_Struct.h \
-  LB_server.h \
-  Simple.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
index 1b3a9a3a99a..22d5988dafb 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
@@ -1,10 +1,6 @@
-#include "Simple.h"
-
-
-ACE_RCSID (Infrastructure_Controlled,
-           Simple,
-           "$Id$")
+// $Id$
 
+#include "Simple.h"
 
 Simple::Simple (void)
 {
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
index ac7013e0e2e..4b7b468b90c 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
@@ -1,12 +1,8 @@
+// $Id$
+
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-
-ACE_RCSID (Infrastructure_Controlled,
-           client,
-           "$Id$")
-
-
 const ACE_TCHAR *ior = ACE_TEXT("file://obj.ior");
 
 int
@@ -31,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
index 338e3e858a3..d3adbd6af18 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
@@ -44,7 +44,7 @@ my $client_ior2file = $client->LocalFile ($ior2file);
 $client->DeleteFile($ior2file);
 
 
-$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/LoadManager",
+$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file " .
                               ($^O eq 'MSWin32' ?
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
index 844e2ebe789..85c32ae81d4 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Factory.h"
 #include "Simple.h"
 
-ACE_RCSID (Infrastructure_Controlled,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf
index 06c425e3ecf..e02d5089fce 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf
@@ -1,3 +1,3 @@
-# $Id $
+# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am b/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am
deleted file mode 100644
index 94ee8bc71d4..00000000000
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Application_Controlled \
-        Infrastructure_Controlled \
-        Manage_Object_Group
-
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
index dee11993c13..abf25b3e295 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
@@ -1,12 +1,8 @@
+// $Id$
+
 #include "Basic.h"
 #include "LB_server.h"
 
-
-ACE_RCSID (Application_Controlled,
-           Basic,
-           "$Id$")
-
-
 Basic::Basic (CORBA::Object_ptr object_group,
               CosLoadBalancing::LoadManager_ptr lm,
               CORBA::ORB_ptr orb,
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
index d60e020d6f5..1f3f96e5155 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Basic.h"
 #include "Simple.h"
@@ -5,10 +7,6 @@
 #include "TestC.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Application_Controlled,
-           LB_server,
-           "$Id$")
-
 LB_server::LB_server (int argc, ACE_TCHAR **argv)
   : argc_ (argc)
   , argv_ (argv)
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am
deleted file mode 100644
index 41dcd1e8545..00000000000
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am
+++ /dev/null
@@ -1,102 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Manage_Object_Group_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Basic.cpp \
-  LB_server.cpp \
-  Simple.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Basic.h \
-  LB_server.h \
-  Simple.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
index 323bbfa3662..6e779f63ad8 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
@@ -1,12 +1,8 @@
+// $Id$
+
 #include "Simple.h"
 #include "LB_server.h"
 
-
-ACE_RCSID (Application_Controlled,
-           Simple,
-           "$Id$")
-
-
 Simple::Simple (CORBA::Object_ptr object_group,
                 CosLoadBalancing::LoadManager_ptr lm,
                 CORBA::ORB_ptr orb,
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl
index b4d1827cd86..65b12717476 100755
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl
@@ -25,7 +25,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("../../../../LoadBalancer/LoadManager",
+$SV = $server->CreateProcess ("../../../../LoadBalancer/tao_loadmanager",
                               "-o $server_iorfile " .
                               ($^O eq 'MSWin32' ?
                                            " -ORBSvcConf $lm_conf" : ''));
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
index 10414746f55..6aeca31a7e0 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "LB_server.h"
 #include "Basic.h"
 #include "Simple.h"
 
-ACE_RCSID (Manage_object_group,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf
index 06c425e3ecf..e02d5089fce 100644
--- a/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf
+++ b/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf
@@ -1,3 +1,3 @@
-# $Id $
+# $Id$
 
 dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
diff --git a/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am b/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am
deleted file mode 100644
index 1caa1b015f9..00000000000
--- a/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am
+++ /dev/null
@@ -1,63 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.LoadMonitorCPU_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
index 3efdbb0d9e3..f3b3f015ab1 100644
--- a/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
+++ b/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
@@ -5,10 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (CPU,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *location = ACE_TEXT("MyLocation");
 
 const int MAX_RETRIES = 10;
diff --git a/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl b/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl
index f7ae1f2ca6c..8a2495f4e98 100755
--- a/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl
+++ b/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl
@@ -38,11 +38,11 @@ my $client_iorfile = $client->LocalFile ($iorfile);
 $client->DeleteFile($iorfile);
 
 
-$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/LoadManager",
+$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_iorfile");
 
-$SV2 = $server2->CreateProcess ("../../../../LoadBalancer/LoadMonitor",
+$SV2 = $server2->CreateProcess ("../../../../LoadBalancer/tao_loadmonitor",
                               "-ORBdebuglevel $debug_level " .
                               "-l $location " .
                               "-t CPU -s PULL " .
diff --git a/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am b/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am
deleted file mode 100644
index cc16d67d6f5..00000000000
--- a/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        CPU
-
diff --git a/orbsvcs/tests/LoadBalancing/Makefile.am b/orbsvcs/tests/LoadBalancing/Makefile.am
deleted file mode 100644
index aa65f76e141..00000000000
--- a/orbsvcs/tests/LoadBalancing/Makefile.am
+++ /dev/null
@@ -1,14 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        GenericFactory \
-        LoadMonitor
-
diff --git a/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index 6f494c4f02b..c6ad51dd4e8 100644
--- a/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "Basic_Log_Test.h"
 
 #include "tao/debug.h"
@@ -8,15 +10,9 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (Basic_Log_Test,
-           Basic_Log_Test,
-           "$Id$")
-
-
 const char* BasicLog_Test::basic_log_factory_name_= "BasicLogFactory";
 const char* BasicLog_Test::naming_sevice_name_ = "NameService";
 
-
 BasicLog_Test::BasicLog_Test(void)
   : logServiceIor_ (0)
 {
@@ -305,6 +301,8 @@ int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords)
         CORBA::String_var t(str.c_str ());
         record[0] <<= t.in ();
         basicLog_->write_records(record);
+        if (l == 0)
+          break; // silence an 'infinite loop' warning
     }
   }
   else
diff --git a/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am b/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am
deleted file mode 100644
index 004410c7c11..00000000000
--- a/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am
+++ /dev/null
@@ -1,57 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Log_Basic_Log_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Basic_Log_Test.cpp \
-  client.cpp \
-  Basic_Log_Test.h
-
-client_LDADD = \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-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/orbsvcs/tests/Log/Basic_Log_Test/client.cpp b/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
index f0336387ac3..d3a01e870dd 100644
--- a/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
+++ b/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "Basic_Log_Test.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_main.h"
 
-ACE_RCSID (Basic_Log_Test,
-           client,
-           "$Id$")
-
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
@@ -13,106 +11,120 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   ACE_DEBUG((LM_DEBUG, "\nBasic Log test \n\n"));
 
-  if (log_test.init(argc, argv) == -1)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "xx - Failed initializing BasicLog_Test.\n"),-1);
-    }
+  try
+    {
+      if (log_test.init(argc, argv) == -1)
+        {
+          ACE_ERROR_RETURN((LM_ERROR,
+                            "xx - Failed initializing BasicLog_Test.\n"),
+                           -1);
+        }
 
-  // We may want to replace this with a run on the BasicLog_Test.
-  // If we cannot create a log, there is no use continuing.
-  // Create a log with max size (octets) of 1000.
-  if (log_test.test_CreateLog(1000) == -1)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "xx - Failed creating log and bailing out.\n"),-1);
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"** - The creating log test succeeded.\n\n"));
-    }
+      // We may want to replace this with a run on the BasicLog_Test.
+      // If we cannot create a log, there is no use continuing.
+      // Create a log with max size (octets) of 1000.
+      if (log_test.test_CreateLog(1000) == -1)
+        {
+          ACE_ERROR_RETURN((LM_ERROR,
+                            "xx - Failed creating log and bailing out.\n"),
+                           -1);
+        }
+      else
+        {
+          ACE_DEBUG((LM_DEBUG,
+                     "** - The creating log test succeeded.\n\n"));
+        }
 
-  // go easy until this works
-  //@@ use ACE_U64_TO_U32 to convert ULongLong to ULong
-  //in call to test_retrieval
-/*  if (log_test.test_retrieval(10) == -1)
-    {
-      ACE_DEBUG((LM_ERROR,"The test of retrieval failed.\n"));
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"The test of retrieval succeeded.\n"));
-    }
-*/
-        if (log_test.test_log_destroy() == -1)
-           {
-           ACE_ERROR_RETURN((LM_ERROR,
-           "xx - Failed destroying  log.\n\n"),-1);
-           }
-           else
-           {
-           ACE_DEBUG((LM_ERROR,"** - The destroying log test succeeded.\n\n"));
-           }
+      // go easy until this works
+      //@@ use ACE_U64_TO_U32 to convert ULongLong to ULong
+      //in call to test_retrieval
+    /*  if (log_test.test_retrieval(10) == -1)
+        {
+          ACE_DEBUG((LM_ERROR,"The test of retrieval failed.\n"));
+        }
+      else
+        {
+          ACE_DEBUG((LM_ERROR,"The test of retrieval succeeded.\n"));
+        }
+    */
+      if (log_test.test_log_destroy() == -1)
+        {
+          ACE_ERROR_RETURN((LM_ERROR,
+                            "xx - Failed destroying  log.\n\n"),
+                           -1);
+        }
+      else
+        {
+          ACE_DEBUG((LM_DEBUG,
+                     "** - The destroying log test succeeded.\n\n"));
+        }
 
-           if (log_test.test_CreateLog(1000) == -1)
-           {
-           ACE_ERROR_RETURN((LM_ERROR,
-           "xx - Failed creating log and bailing out.\n\n"),-1);
-           }
+      if (log_test.test_CreateLog(1000) == -1)
+        {
+          ACE_ERROR_RETURN((LM_ERROR,
+                            "xx - Failed creating log and bailing out.\n\n"),
+                           -1);
+        }
 
-  if (log_test.test_capacity_alarm_threshold() == -1)
-    {
-      ACE_DEBUG((LM_ERROR,"xx - The capacity alarm threshold test failed.\n\n"));
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"** - The capacity alarm threshold test succeeded.\n\n"));
-    }
+      if (log_test.test_capacity_alarm_threshold() == -1)
+        {
+          ACE_ERROR((LM_ERROR,"xx - The capacity alarm threshold test failed.\n\n"));
+        }
+      else
+        {
+          ACE_DEBUG((LM_DEBUG,"** - The capacity alarm threshold test succeeded.\n\n"));
+        }
 
-  if (log_test.test_LogAction() == -1)
-    {
-      ACE_DEBUG((LM_ERROR,"xx - The log action test failed.\n\n"));
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"** - The log action test succeeded.\n\n"));
-    }
+      if (log_test.test_LogAction() == -1)
+        {
+          ACE_ERROR((LM_ERROR,"xx - The log action test failed.\n\n"));
+        }
+      else
+        {
+          ACE_DEBUG((LM_DEBUG,"** - The log action test succeeded.\n\n"));
+        }
 
-  if (log_test.test_adminState() == -1)
-    {
-      ACE_DEBUG((LM_ERROR,"xx - The administration test failed.\n\n"));
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"** - The administration test succeeded.\n\n"));
-    }
+      if (log_test.test_adminState() == -1)
+        {
+          ACE_ERROR((LM_ERROR,"xx - The administration test failed.\n\n"));
+        }
+      else
+        {
+          ACE_DEBUG((LM_DEBUG,"** - The administration test succeeded.\n\n"));
+        }
 
-  if (log_test.test_logSize() == -1)
-    {
-      ACE_DEBUG((LM_ERROR,"xx - The log size test failed.\n\n"));
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"** - The log size test succeeded.\n\n"));
-    }
+      if (log_test.test_logSize() == -1)
+        {
+          ACE_ERROR((LM_ERROR,"xx - The log size test failed.\n\n"));
+        }
+      else
+        {
+          ACE_DEBUG((LM_DEBUG,"** - The log size test succeeded.\n\n"));
+        }
 
-  /* if (log_test.test_logCompaction(30) == -1)
-    {
-      ACE_DEBUG((LM_ERROR,"xx - The test of log compaction failed.\n\n"));
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"** - The test of log compaction succeeded.\n\n"));
-    }
-  */
+      /* if (log_test.test_logCompaction(30) == -1)
+        {
+          ACE_DEBUG((LM_ERROR,"xx - The test of log compaction failed.\n\n"));
+        }
+      else
+        {
+          ACE_DEBUG((LM_ERROR,"** - The test of log compaction succeeded.\n\n"));
+        }
+      */
 
-  if (log_test.test_week_mask() == -1)
-    {
-      ACE_DEBUG((LM_ERROR,"xx - The week mask test failed.\n\n"));
-    }
-  else
-    {
-      ACE_DEBUG((LM_ERROR,"** - The week mask test succeeded.\n\n"));
+      if (log_test.test_week_mask() == -1)
+        {
+          ACE_ERROR((LM_ERROR,"xx - The week mask test failed.\n\n"));
+        }
+      else
+        {
+          ACE_DEBUG((LM_DEBUG,"** - The week mask test succeeded.\n\n"));
+        }
+    }
+  catch (const ::CORBA::Exception &e)
+    {
+      e._tao_print_exception("Caught CORBA exception");
+      return 1;
     }
 
   return 0;
diff --git a/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl b/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl
index 923dc36f9fc..f4f800fa36c 100755
--- a/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl
+++ b/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl
@@ -20,7 +20,7 @@ foreach $i (@ARGV) {
 my $ns_service = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $lg_service = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
 my $client = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n";
- 
+
 my $iorbase = "ns.ior";
 my $ns_iorfile = $ns_service->LocalFile ($iorbase);
 my $lg_iorfile = $lg_service->LocalFile ($iorbase);
@@ -29,9 +29,9 @@ $ns_service->DeleteFile ($iorbase);
 $lg_service->DeleteFile ($iorbase);
 $client->DeleteFile ($iorbase);
 
-$NS = $ns_service->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns_service->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                                   "-o $ns_iorfile");
-$LS = $lg_service->CreateProcess ("../../../Logging_Service/Basic_Logging_Service/Basic_Logging_Service",
+$LS = $lg_service->CreateProcess ("../../../Logging_Service/Basic_Logging_Service/tao_tls_basic",
                                   "-ORBInitRef NameService=file://$lg_iorfile");
 $CL = $client->CreateProcess ("client", "-ORBInitRef NameService=file://$client_iorfile");
 
@@ -79,7 +79,7 @@ if ($process_status != 0) {
     exit 1;
 }
 
-# Give time for logging service to initialize and install its object 
+# Give time for logging service to initialize and install its object
 # reference in the nameing service.
 sleep (10);
 
diff --git a/orbsvcs/tests/Log/Makefile.am b/orbsvcs/tests/Log/Makefile.am
deleted file mode 100644
index af99ab0bd2b..00000000000
--- a/orbsvcs/tests/Log/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Basic_Log_Test
-
diff --git a/orbsvcs/tests/Makefile.am b/orbsvcs/tests/Makefile.am
deleted file mode 100644
index 5c41ef319fc..00000000000
--- a/orbsvcs/tests/Makefile.am
+++ /dev/null
@@ -1,64 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AVStreams \
-        BiDir_CORBALOC \
-        Bug_1334_Regression \
-        Bug_1393_Regression \
-        Bug_1395_Regression \
-        Bug_1630_Regression \
-        Bug_2074_Regression \
-        Bug_2137_Regression \
-        Bug_2247_Regression \
-        Bug_2248_Regression \
-        Bug_2285_Regression \
-        Bug_2287_Regression \
-        Bug_2316_Regression \
-        Bug_2377_Regression \
-        Bug_2615_Regression \
-        Bug_2709_Regression \
-        Bug_2800_Regression \
-        Bug_2925_Regression \
-        Bug_3215_Regression \
-        Bug_3216_Regression \
-        COIOP_Naming_Test \
-        Concurrency \
-        CosEvent \
-        EC_Custom_Marshal \
-        EC_MT_Mcast \
-        EC_Mcast \
-        EC_Multiple \
-        EC_Throughput \
-        Event \
-        FT_App \
-        FaultTolerance \
-        FtRtEvent \
-        HTIOP \
-        IOR_MCast \
-        ImplRepo \
-        InterfaceRepo \
-        Interoperable_Naming \
-        LoadBalancing \
-        Log \
-        Miop \
-        Notify \
-        Property \
-        Redundant_Naming \
-        Sched \
-        Sched_Conf \
-        Security \
-        Simple_Naming \
-        Time \
-        Trading \
-        ior_corbaname \
-        tests_svc_loader \
-        unit
-
diff --git a/orbsvcs/tests/Miop/Makefile.am b/orbsvcs/tests/Miop/Makefile.am
deleted file mode 100644
index 2cf8fffb790..00000000000
--- a/orbsvcs/tests/Miop/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        McastHello
-
diff --git a/orbsvcs/tests/Miop/McastHello/Makefile.am b/orbsvcs/tests/Miop/McastHello/Makefile.am
deleted file mode 100644
index 914981d4fa6..00000000000
--- a/orbsvcs/tests/Miop/McastHello/Makefile.am
+++ /dev/null
@@ -1,129 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.McastHello_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.McastHello_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  McastHello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.McastHello_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  McastHello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  McastHello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/orbsvcs/tests/Miop/McastHello/McastHello.cpp
index 10dd672650c..f195a6e5c9a 100644
--- a/orbsvcs/tests/Miop/McastHello/McastHello.cpp
+++ b/orbsvcs/tests/Miop/McastHello/McastHello.cpp
@@ -3,7 +3,7 @@
 //
 #include "McastHello.h"
 
-ACE_RCSID(McastHello, McastHello, "$Id$")
+
 
 McastHello::McastHello (CORBA::ORB_ptr orb,
                         int instance)
diff --git a/orbsvcs/tests/Miop/McastHello/client.cpp b/orbsvcs/tests/Miop/McastHello/client.cpp
index a012ab1bfa6..a84044b4085 100644
--- a/orbsvcs/tests/Miop/McastHello/client.cpp
+++ b/orbsvcs/tests/Miop/McastHello/client.cpp
@@ -5,7 +5,7 @@
 #include "tao/Object_T.h"
 #include "orbsvcs/PortableGroup/MIOP.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+
 
 #define MAX_MIOP_OCTET_SEQUENCE  (ACE_MAX_DGRAM_SIZE - 272 /* MIOP_MAX_HEADER_SIZE */)
 
diff --git a/orbsvcs/tests/Miop/McastHello/server.cpp b/orbsvcs/tests/Miop/McastHello/server.cpp
index c09b7a55253..c29b43793c7 100644
--- a/orbsvcs/tests/Miop/McastHello/server.cpp
+++ b/orbsvcs/tests/Miop/McastHello/server.cpp
@@ -6,10 +6,6 @@
 #include "orbsvcs/PortableGroup/MIOP.h"
 #include "orbsvcs/PortableGroup/GOA.h"
 
-ACE_RCSID (McastHello,
-           server,
-           "$Id$")
-
 static const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 // Use a multicast address in the administrative "site local" range, 239.255.0.0 to
@@ -45,7 +41,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -84,7 +80,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
                            1);
-      ACE_OS::fprintf (output_file, "%s", group_ior);
+      ACE_OS::fprintf (output_file, "%s", ACE_TEXT_ALWAYS_CHAR (group_ior));
       ACE_OS::fclose (output_file);
 
       PortableServer::ObjectId_var id =
diff --git a/orbsvcs/tests/Miop/McastHello/svc.conf b/orbsvcs/tests/Miop/McastHello/svc.conf
index 91cae79b5a3..84ef77cf1c6 100644
--- a/orbsvcs/tests/Miop/McastHello/svc.conf
+++ b/orbsvcs/tests/Miop/McastHello/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
 #static PortableGroup_Loader ""
diff --git a/orbsvcs/tests/Notify/Basic/AdminProperties.h b/orbsvcs/tests/Notify/Basic/AdminProperties.h
index 9a74a888f9c..d0fac5425c6 100644
--- a/orbsvcs/tests/Notify/Basic/AdminProperties.h
+++ b/orbsvcs/tests/Notify/Basic/AdminProperties.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   AdminProperties.h
-//
-// = DESCRIPTION
-//   Test for EC Admin QoS properties.
-//
-// = AUTHOR
-//   Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   AdminProperties.h
+ *
+ *  $Id$
+ *
+ * Test for EC Admin QoS properties.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ADMINPROPERTIES
 #define ADMINPROPERTIES
@@ -41,26 +41,27 @@ protected:
 };
 
 
+/**
+ * @class AdminProperties_Task
+ *
+ * @brief Run a thread to dispatch events.
+ *
+ * Use the ACE_Task_Base class.
+ */
 class AdminProperties_Task : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a thread to dispatch events.
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class.
-  //
 
 public:
+  /// Constructor.
   AdminProperties_Task (void);
-  // Constructor.
 
   /// Init this object.
   void init (TAO_Notify_Tests_StructuredPushSupplier *supplier, AdminProperties* client);
 
   virtual int init (int argc, ACE_TCHAR *argv []);
 
+  /// The thread entry point.
   virtual int svc (void);
-  // The thread entry point.
 
 private:
   /// Supplier
@@ -72,18 +73,19 @@ private:
 
 /***************************************************************************/
 
+/**
+ * @class AdminProperties
+ *
+ * @brief AdminProperties
+ *
+ * Test for Notify EC properties -
+ * max_queue_length
+ * max_consumers
+ * max_suppliers
+ * reject_new_events
+ */
 class AdminProperties : public Notify_Test_Client
 {
-  // = TITLE
-  //   AdminProperties
-  //
-  // = DESCRIPTION
-  //   Test for Notify EC properties -
-  //   max_queue_length
-  //   max_consumers
-  //   max_suppliers
-  //   reject_new_events
-  //
 
   friend class AdminProperties_StructuredPushConsumer;
   friend class AdminProperties_Task;
@@ -96,8 +98,8 @@ public:
 
   // Initialization.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
 private:
   void create_suppliers (void);
@@ -111,20 +113,20 @@ private:
   void test_max_queue_length (bool reject);
 
   // Data Members
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Values for Admin Properties supplied by user.
   CORBA::Long max_queue_length_;
   CORBA::Long max_consumers_;
   CORBA::Long max_suppliers_;
   CORBA::Boolean reject_new_events_;
-  // Values for Admin Properties supplied by user.
 
   /// Number of consumers to connect to check MaxConsumers property.
   CORBA::Long consumers_;
@@ -132,8 +134,8 @@ private:
   /// Number of suppliers to connect to check MaxSuppliers property.
   CORBA::Long suppliers_;
 
+  /// Number of events to send to the channel.
   CORBA::Long event_count_;
-  // Number of events to send to the channel.
 
   /// Count of consumers successfully connect to the EC.
   int suppliers_connected_count_;
diff --git a/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index e041818db73..6891dcd7cd1 100644
--- a/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -5,7 +5,7 @@
 #include "tao/debug.h"
 #include "ConnectDisconnect.h"
 
-ACE_RCSID (Notify_Tests, ConnectDisconnect, "$Id$")
+
 
 #define CD_IMPLEMENT_ENTITY(X)\
 \
diff --git a/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
index ecb0315ab1e..3c00ffca5d1 100644
--- a/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
+++ b/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   ConnectDisconnect.h
-//
-// = DESCRIPTION
-//   Test connect-disconnect methods of Notify.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   ConnectDisconnect.h
+ *
+ *  $Id$
+ *
+ * Test connect-disconnect methods of Notify.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_CONNECT_DISCONNECT_H
 #define NOTIFY_CONNECT_DISCONNECT_H
@@ -31,9 +31,12 @@
 
 class ConnectDisconnect;
 
+/**
+ * @class CD_Entity
+ The entity that connects/disconnects.
+ */
 class CD_Entity
 {
-  // The entity that connects/disconnects.
 public:
   CD_Entity (ConnectDisconnect* cd, int id);
   ~CD_Entity ();
@@ -66,64 +69,64 @@ public:
   ConnectDisconnect (void);
   virtual ~ConnectDisconnect ();
 
+  /// Keeps track of how many objects were destroyed.
   void on_entity_destroyed (void);
-  // Keeps track of how many objects were destroyed.
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
+  /// initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
-  // initialization.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
+  /// End the test.
   void end_test (void);
-  // End the test.
 
+  /// Check if we got the expected results.
   int check_results (void);
-  // Check if we got the expected results.
 
 protected:
+  /// Create EC.
   void create_EC (void);
-  // Create EC.
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Arrays of Consumers.
   TAO_Notify_Tests_PushConsumer** any_consumer_;
   TAO_Notify_Tests_StructuredPushConsumer** structured_consumer_;
   TAO_Notify_Tests_SequencePushConsumer** sequence_consumer_;
-  // Arrays of Consumers.
 
+  /// arrays of Suppliers
   TAO_Notify_Tests_PushSupplier** any_supplier_;
   TAO_Notify_Tests_StructuredPushSupplier** structured_supplier_;
   TAO_Notify_Tests_SequencePushSupplier** sequence_supplier_;
-  // arrays of Suppliers
 
+  /// Count of clients destroyed. for c consumers, s suppliers and for t times.
+  /// this should be (s+c)*t.
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
-  // Count of clients destroyed. for c consumers, s suppliers and for t times.
-  // this should be (s+c)*t.
 
   int expected_count_; // (s+c)*t
 
   // = command line params
 
+  /// The number of iterations to connect disconnect.
   int count_;
-  // The number of iterations to connect disconnect.
 
+  /// The number of counsumers to create.
   int consumers_;
-  // The number of counsumers to create.
 
+  /// The number of suppliers to create.
   int suppliers_;
-  // The number of suppliers to create.
 };
 
 /***************************************************************************/
diff --git a/orbsvcs/tests/Notify/Basic/Events.cpp b/orbsvcs/tests/Notify/Basic/Events.cpp
index 2adf54c8439..5ec7883937c 100644
--- a/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -5,7 +5,7 @@
 #include "tao/debug.h"
 #include "Events.h"
 
-ACE_RCSID (Notify_Tests, Events, "$Id$")
+
 
 /***************************************************************************/
 
diff --git a/orbsvcs/tests/Notify/Basic/Events.h b/orbsvcs/tests/Notify/Basic/Events.h
index cfde51db870..1d60ed55ce0 100644
--- a/orbsvcs/tests/Notify/Basic/Events.h
+++ b/orbsvcs/tests/Notify/Basic/Events.h
@@ -1,18 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Events.h
-//
-// = DESCRIPTION
-//   Test to check if events are received by all 3 types of consumers.
-//   This is intended to be a simple test without any filters with default subscription (all events).
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Events.h
+ *
+ *  $Id$
+ *
+ * Test to check if events are received by all 3 types of consumers.
+ * This is intended to be a simple test without any filters with default subscription (all events).
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_TESTS_EventS_H
 #define NOTIFY_TESTS_EventS_H
@@ -31,8 +31,8 @@ class Events;
 class Event_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
+  /// Contructor.
   Event_StructuredPushConsumer (Events *test_client);
-  // Contructor.
 
   // = StructuredPushSupplier methods.
   virtual void push_structured_event (
@@ -48,11 +48,11 @@ protected:
 class Event_StructuredPushSupplier : public TAO_Notify_Tests_StructuredPushSupplier
 {
 public:
+  /// Constructor.
   Event_StructuredPushSupplier (Events * test_client);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Event_StructuredPushSupplier (void);
-  // Destructor.
 
 protected:
   Events* test_client_;
@@ -70,49 +70,49 @@ public:
   int parse_args (int argc,
                   ACE_TCHAR *argv[]) ;
 
+  /// Initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
-  // Initialization.
 
+  /// Called when an event is received.
   void on_event_received (void);
-  // Called when an event is received.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
+  /// End the test.
   void end_test (void);
-  // End the test.
 
+  /// check if we got the expected results.
   int check_results (void);
-  // check if we got the expected results.
 
 protected:
+  /// Create EC
   void create_EC (void);
-  // Create EC
 
+  /// Number of events received so far.
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
-  // Number of events received so far.
 
   /// Use the default admins.
   int use_default_admin_;
 
+  /// Number of events to send
   int event_count_;
-  // Number of events to send
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumer
   TAO_Notify_Tests_StructuredPushConsumer* consumer_;
-  // Consumer
 
+  /// Supplier
   TAO_Notify_Tests_StructuredPushSupplier* supplier_;
-  // Supplier
 
 private:
   friend class Event_StructuredPushSupplier;
diff --git a/orbsvcs/tests/Notify/Basic/Filter.cpp b/orbsvcs/tests/Notify/Basic/Filter.cpp
index 754a6e91714..904a3a3a3f5 100644
--- a/orbsvcs/tests/Notify/Basic/Filter.cpp
+++ b/orbsvcs/tests/Notify/Basic/Filter.cpp
@@ -5,7 +5,7 @@
 #include "tao/debug.h"
 #include "Filter.h"
 
-ACE_RCSID (Notify_Tests, Filter, "$Id$")
+
 
 Filter::Filter (void)
   : event_count_ (5)
diff --git a/orbsvcs/tests/Notify/Basic/Filter.h b/orbsvcs/tests/Notify/Basic/Filter.h
index d12e786693d..bb862c1830a 100644
--- a/orbsvcs/tests/Notify/Basic/Filter.h
+++ b/orbsvcs/tests/Notify/Basic/Filter.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Filter.h
-//
-// = DESCRIPTION
-//   Filter test any supplier to any consumer.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Filter.h
+ *
+ *  $Id$
+ *
+ * Filter test any supplier to any consumer.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_TESTS_FILTER_H
 #define NOTIFY_TESTS_FILTER_H
@@ -34,16 +34,16 @@ public:
   Filter (void);
   virtual ~Filter (void);
 
+  /// initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
-  // initialization.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
 protected:
+  /// Create EC
   void create_EC (void);
-  // Create EC
 
   /// Run some tests to check the filters.
   void run_filter_test (CosNotifyFilter::FilterAdmin_ptr);
@@ -60,26 +60,26 @@ protected:
   /// The default filter factory.
   CosNotifyFilter::FilterFactory_var ffact_;
 
+  /// Number of events received so far.
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
-  // Number of events received so far.
 
+  /// Number of events to send
   int event_count_;
-  // Number of events to send
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumer.
   TAO_Notify_Tests_PushConsumer* consumer_;
-  // Consumer.
 
+  /// Supplier.
   TAO_Notify_Tests_PushSupplier* supplier_;
-  // Supplier.
 };
 
 /***************************************************************************/
diff --git a/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 6ca0434e2b7..290f38aded1 100644
--- a/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -7,10 +7,6 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "IdAssignment.h"
 
-ACE_RCSID (Notify_Tests,
-           IdAssignment,
-           "$Id$")
-
 IdAssignment::IdAssignment (void)
   : iter_ (3),
     ec_count_ (3),
diff --git a/orbsvcs/tests/Notify/Basic/IdAssignment.h b/orbsvcs/tests/Notify/Basic/IdAssignment.h
index d9e97907f28..4efd019fedf 100644
--- a/orbsvcs/tests/Notify/Basic/IdAssignment.h
+++ b/orbsvcs/tests/Notify/Basic/IdAssignment.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   IdAssignment.h
-//
-// = DESCRIPTION
-//   Test to check if ec, admin  are assigned id's correctly.
-//
-// = AUTHORS
-//   Chanaka Liyanaarachchi <chanaka@ociweb.com> and Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   IdAssignment.h
+ *
+ *  $Id$
+ *
+ * Test to check if ec, admin  are assigned id's correctly.
+ *
+ *
+ *  @author Chanaka Liyanaarachchi <chanaka@ociweb.com> and Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef IDASSIGNMENT_H
 #define IDASSIGNMENT_H
@@ -53,17 +53,17 @@ private:
   // = Data members.
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
 
+  /// Number of iterations for the test.
   int iter_;
-  // Number of iterations for the test.
 
+  /// Numbers of EC's to create.
   int ec_count_;
-  // Numbers of EC's to create.
 
+  /// Number of consumer admins to create per ec.
   int consumer_admin_count_;
-  // Number of consumer admins to create per ec.
 
+  /// Number of consumer admins to create per ec.
   int supplier_admin_count_;
-  // Number of consumer admins to create per ec.
 };
 
 #endif /* IDASSIGNMENT_H */
diff --git a/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 4bb5813dbb1..2de58de6f29 100644
--- a/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -9,10 +9,6 @@
 
 #include "LifeCycle.h"
 
-ACE_RCSID (Notify_Tests,
-           LifeCycle,
-           "$Id$")
-
 LifeCycle::LifeCycle (void)
   : count_ (10)
 {
diff --git a/orbsvcs/tests/Notify/Basic/LifeCycle.h b/orbsvcs/tests/Notify/Basic/LifeCycle.h
index 87150f7377c..93cbd9a134d 100644
--- a/orbsvcs/tests/Notify/Basic/LifeCycle.h
+++ b/orbsvcs/tests/Notify/Basic/LifeCycle.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   LifeCycle.h
-//
-// = DESCRIPTION
-//   Test to check it ec and admin objects are destroyed.
-//
-// = AUTHOR
-//   Chanaka Liyanaarachchi <chanaka@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   LifeCycle.h
+ *
+ *  $Id$
+ *
+ * Test to check it ec and admin objects are destroyed.
+ *
+ *
+ *  @author Chanaka Liyanaarachchi <chanaka@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_LIFECYCLETST_H
 #define NOTIFY_LIFECYCLETST_H
@@ -41,8 +41,8 @@ private:
    CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
    CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
 
+  /// Number of times to create destroy.
   int count_;
-  // Number of times to create destroy.
 };
 
 #endif /* NOTIFY_LIFECYCLETST_H */
diff --git a/orbsvcs/tests/Notify/Basic/Makefile.am b/orbsvcs/tests/Notify/Basic/Makefile.am
deleted file mode 100644
index 19f235d8ea3..00000000000
--- a/orbsvcs/tests/Notify/Basic/Makefile.am
+++ /dev/null
@@ -1,554 +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:
-## ../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.Basic_Notify_AdminProperties.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += AdminProperties
-
-AdminProperties_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-AdminProperties_SOURCES = \
-  AdminProperties.cpp \
-  AdminProperties.h
-
-AdminProperties_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-AdminProperties_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_ConnectDisconnect.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += ConnectDisconnect
-
-ConnectDisconnect_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-ConnectDisconnect_SOURCES = \
-  ConnectDisconnect.cpp \
-  ConnectDisconnect.h
-
-ConnectDisconnect_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-ConnectDisconnect_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_Events.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Events
-
-Events_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Events_SOURCES = \
-  Events.cpp \
-  Events.h
-
-Events_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Events_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_Filter.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Filter
-
-Filter_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Filter_SOURCES = \
-  Filter.cpp \
-  Filter.h
-
-Filter_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Filter_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_IdAssignment.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += IdAssignment
-
-IdAssignment_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-IdAssignment_SOURCES = \
-  IdAssignment.cpp \
-  IdAssignment.h
-
-IdAssignment_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-IdAssignment_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_LifeCycle.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += LifeCycle
-
-LifeCycle_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-LifeCycle_SOURCES = \
-  LifeCycle.cpp \
-  LifeCycle.h
-
-LifeCycle_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-LifeCycle_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_MultiTypes.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += MultiTypes
-
-MultiTypes_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-MultiTypes_SOURCES = \
-  MultiTypes.cpp \
-  MultiTypes.h
-
-MultiTypes_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-MultiTypes_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_Sequence.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence
-
-Sequence_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_SOURCES = \
-  Sequence.cpp \
-  Sequence.h
-
-Sequence_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_Simple.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Simple
-
-Simple_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Simple_SOURCES = \
-  Simple.cpp \
-  Simple.h
-
-Simple_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Simple_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Basic_Notify_Updates.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Updates
-
-Updates_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Updates_SOURCES = \
-  Updates.cpp \
-  Updates.h
-
-Updates_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Updates_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index aebb3cf1a7b..382a27887f1 100644
--- a/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -5,7 +5,7 @@
 #include "tao/debug.h"
 #include "MultiTypes.h"
 
-ACE_RCSID (Notify_Tests, MultiTypes, "$Id$")
+
 
 //*****************************************************************************************************
 
diff --git a/orbsvcs/tests/Notify/Basic/MultiTypes.h b/orbsvcs/tests/Notify/Basic/MultiTypes.h
index 758913b46df..30b5e3c1154 100644
--- a/orbsvcs/tests/Notify/Basic/MultiTypes.h
+++ b/orbsvcs/tests/Notify/Basic/MultiTypes.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   MultiTypes.h
-//
-// = DESCRIPTION
-//   Test connect-disconnect methods of Notify.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   MultiTypes.h
+ *
+ *  $Id$
+ *
+ * Test connect-disconnect methods of Notify.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_MULTI_TYPES_H
 #define NOTIFY_MULTI_TYPES_H
@@ -92,44 +92,44 @@ public:
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
+  /// initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
-  // initialization.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
+  /// End the test.
   void end_test (void);
-  // End the test.
 
+  /// Check if we got the expected results.
   int check_results (void);
-  // Check if we got the expected results.
 
 protected:
   // Wait to receive events.
   void wait_for_all_consumers (int expected_count_per_consumer);
 
+  /// Create EC.
   void create_EC (void);
-  // Create EC.
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumers.
   TAO_Notify_Tests_PushConsumer* any_consumer_;
   TAO_Notify_Tests_StructuredPushConsumer* structured_consumer_;
   TAO_Notify_Tests_SequencePushConsumer* sequence_consumer_;
-  // Consumers.
 
+  /// Suppliers
   TAO_Notify_Tests_PushSupplier* any_supplier_;
   TAO_Notify_Tests_StructuredPushSupplier* structured_supplier_;
   TAO_Notify_Tests_SequencePushSupplier* sequence_supplier_;
-  // Suppliers
 
   // Count of Any events received;
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> any_event_count_;
diff --git a/orbsvcs/tests/Notify/Basic/Sequence.cpp b/orbsvcs/tests/Notify/Basic/Sequence.cpp
index ef04ba96627..6b345e31871 100644
--- a/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -6,7 +6,7 @@
 #include "tao/debug.h"
 #include "Sequence.h"
 
-ACE_RCSID (Notify_Tests, Sequence, "$Id$")
+
 
 /***************************************************************************/
 
diff --git a/orbsvcs/tests/Notify/Basic/Sequence.h b/orbsvcs/tests/Notify/Basic/Sequence.h
index 1a049c46c81..1fc734e51a8 100644
--- a/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Events.h
-//
-// = DESCRIPTION
-//   Test Sequence support in Notification.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Sequence.h
+ *
+ *  $Id$
+ *
+ * Test Sequence support in Notification.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_TESTS_SEQUENCE_H
 #define NOTIFY_TESTS_SEQUENCE_H
@@ -47,11 +47,11 @@ protected:
 class SequencePushSupplier : public TAO_Notify_Tests_SequencePushSupplier
 {
 public:
+  /// Constructor.
   SequencePushSupplier (Sequence * test_client);
-  // Constructor.
 
+  /// Destructor.
   virtual ~SequencePushSupplier (void);
-  // Destructor.
 
 protected:
   Sequence* test_client_;
@@ -69,28 +69,28 @@ public:
   int parse_args (int argc,
                   ACE_TCHAR *argv[]) ;
 
+  /// Initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
-  // Initialization.
 
+  /// Called when an event is received.
   void on_event_received (void);
-  // Called when an event is received.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
+  /// End the test.
   void end_test (void);
-  // End the test.
 
+  /// check if we got the expected results.
   int check_results (void);
-  // check if we got the expected results.
 
 protected:
+  /// Create EC
   void create_EC (void);
-  // Create EC
 
+  /// Number of events to send
   int event_count_;
-  // Number of events to send
 
   /// Batch size send by supplier.
   CORBA::ULong supplier_batch_size_;
@@ -107,20 +107,20 @@ protected:
 
   ACE_Time_Value consumer_delay_;
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumer
   TAO_Notify_Tests_SequencePushConsumer* consumer_;
-  // Consumer
 
+  /// Supplier
   TAO_Notify_Tests_SequencePushSupplier* supplier_;
-  // Supplier
 
 private:
   friend class SequencePushSupplier;
diff --git a/orbsvcs/tests/Notify/Basic/Simple.cpp b/orbsvcs/tests/Notify/Basic/Simple.cpp
index 919c22d568f..5cc9b2df6ec 100644
--- a/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -5,7 +5,7 @@
 #include "tao/debug.h"
 #include "Simple.h"
 
-ACE_RCSID (Notify_Tests, Simple, "$Id$")
+
 
 //***************************************************************************
 
diff --git a/orbsvcs/tests/Notify/Basic/Simple.h b/orbsvcs/tests/Notify/Basic/Simple.h
index 697b0762258..1c6c8b04d9f 100644
--- a/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/orbsvcs/tests/Notify/Basic/Simple.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Simple_Test.h
-//
-// = DESCRIPTION
-//   Simple test any supplier to any consumer.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Simple.h
+ *
+ *  $Id$
+ *
+ * Simple test any supplier to any consumer.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_TESTS_SIMPLE_H
 #define NOTIFY_TESTS_SIMPLE_H
@@ -32,8 +32,8 @@ class Simple_Test;
 class Event_AnyPushConsumer : public TAO_Notify_Tests_PushConsumer
 {
 public:
+  /// Contructor.
   Event_AnyPushConsumer (Simple_Test *test_client);
-  // Contructor.
 
   // = PushSupplier methods
   virtual void push (
@@ -49,11 +49,11 @@ protected:
 class Event_AnyPushSupplier : public TAO_Notify_Tests_PushSupplier
 {
 public:
+  /// Constructor.
   Event_AnyPushSupplier (Simple_Test * test_client);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Event_AnyPushSupplier (void);
-  // Destructor.
 
 protected:
   Simple_Test* test_client_;
@@ -71,46 +71,46 @@ public:
   int parse_args (int argc,
                   ACE_TCHAR *argv[]) ;
 
+  /// initialization.
   int init (int argc,
             ACE_TCHAR *argv []);
-  // initialization.
 
+  /// Called when an event is received.
   void on_event_received (void);
-  // Called when an event is received.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
+  /// End the test.
   void end_test (void);
-  // End the test.
 
+  /// check if we got the expected results.
   int check_results (void);
-  // check if we got the expected results.
 
 protected:
+  /// Create EC
   void create_EC (void);
-  // Create EC
 
+  /// Number of events received so far.
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
-  // Number of events received so far.
 
+  /// Number of events to send
   int event_count_;
-  // Number of events to send
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumer.
   TAO_Notify_Tests_PushConsumer* consumer_;
-  // Consumer.
 
+  /// Supplier.
   TAO_Notify_Tests_PushSupplier* supplier_;
-  // Supplier.
 
 private:
   friend class Event_AnyPushSupplier;
diff --git a/orbsvcs/tests/Notify/Basic/Updates.cpp b/orbsvcs/tests/Notify/Basic/Updates.cpp
index 426f2f2525e..cb23b49b2b2 100644
--- a/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -5,7 +5,7 @@
 #include "tao/debug.h"
 #include "Updates.h"
 
-ACE_RCSID (Notify_Tests, Updates, "$Id$")
+
 
 Updates_StructuredPushConsumer::Updates_StructuredPushConsumer (Updates *test_client)
   : test_client_ (test_client)
diff --git a/orbsvcs/tests/Notify/Basic/Updates.h b/orbsvcs/tests/Notify/Basic/Updates.h
index 8dc9988396c..238a4d22a6c 100644
--- a/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/orbsvcs/tests/Notify/Basic/Updates.h
@@ -1,18 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Updates.h
-//
-// = DESCRIPTION
-//   Test to check if <offer_change> and <subscription_change> messages are
-//   received correctly.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Updates.h
+ *
+ *  $Id$
+ *
+ * Test to check if <offer_change> and <subscription_change> messages are
+ * received correctly.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_TESTS_UPDATES_H
 #define NOTIFY_TESTS_UPDATES_H
@@ -31,12 +31,12 @@ class Updates;
 class Updates_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
+  /// Contructor.
   Updates_StructuredPushConsumer (Updates *test_client);
-  // Contructor.
 
+  /// Offer change is conveyed here.
   virtual void offer_change (const CosNotification::EventTypeSeq & added,
                              const CosNotification::EventTypeSeq & removed);
-  // Offer change is conveyed here.
 
 protected:
   Updates * test_client_;
@@ -47,17 +47,17 @@ protected:
 class Updates_StructuredPushSupplier : public TAO_Notify_Tests_StructuredPushSupplier
 {
 public:
+  /// Constructor.
   Updates_StructuredPushSupplier (Updates * test_client);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Updates_StructuredPushSupplier ();
-  // Destructor.
 
+  /// Subscription change is conveyed here.
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
     );
-  // Subscription change is conveyed here.
 
 protected:
   Updates* test_client_;
@@ -72,11 +72,11 @@ public:
   Updates (void);
   virtual ~Updates ();
 
+  /// initialization.
   int init (int argc, ACE_TCHAR *argv []);
-  // initialization.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
   /// print_event_types
   void print_event_types (const CosNotification::EventTypeSeq &types);
@@ -88,8 +88,8 @@ public:
   void wait_for_updates (int expected_added, int expected_removed);
 
 protected:
+  /// Create EC
   void create_EC (void);
-  // Create EC
 
   /// Helper to add types.
   void add_type (CosNotification::EventTypeSeq& type_seq, const char* type);
@@ -110,23 +110,23 @@ protected:
   int added_count_;
 
   /// Count of removed updates received
+  /// Check if these are equal to <update_count_> at the end of the test.
   int removed_count_;
-  // Check if these are equal to <update_count_> at the end of the test.
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumer
   TAO_Notify_Tests_StructuredPushConsumer* consumer_;
-  // Consumer
 
+  /// Supplier
   TAO_Notify_Tests_StructuredPushSupplier* supplier_;
-  // Supplier
 
 private:
   friend class Updates_StructuredPushSupplier;
diff --git a/orbsvcs/tests/Notify/Basic/notify.mt.conf b/orbsvcs/tests/Notify/Basic/notify.mt.conf
index 1ed64ed8d98..c29d66b76e5 100644
--- a/orbsvcs/tests/Notify/Basic/notify.mt.conf
+++ b/orbsvcs/tests/Notify/Basic/notify.mt.conf
@@ -1,2 +1,3 @@
 ##$Id$
+
 static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 2"
diff --git a/orbsvcs/tests/Notify/Basic/notify.reactive.conf b/orbsvcs/tests/Notify/Basic/notify.reactive.conf
index ca5144bd072..dff4aaaa23e 100644
--- a/orbsvcs/tests/Notify/Basic/notify.reactive.conf
+++ b/orbsvcs/tests/Notify/Basic/notify.reactive.conf
@@ -1,2 +1,3 @@
 ##$Id$
+
 static Notify_Default_Event_Manager_Objects_Factory ""
diff --git a/orbsvcs/tests/Notify/Basic/notify.rt.conf b/orbsvcs/tests/Notify/Basic/notify.rt.conf
index 50faf80e5ee..66d57097409 100644
--- a/orbsvcs/tests/Notify/Basic/notify.rt.conf
+++ b/orbsvcs/tests/Notify/Basic/notify.rt.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
 # Uncomment this line to use SCHED_FIFO
diff --git a/orbsvcs/tests/Notify/Basic/run_test.pl b/orbsvcs/tests/Notify/Basic/run_test.pl
index d932d53a3d1..18bb43b7e11 100755
--- a/orbsvcs/tests/Notify/Basic/run_test.pl
+++ b/orbsvcs/tests/Notify/Basic/run_test.pl
@@ -88,7 +88,7 @@ else {
     @test_configs = @ARGV;
 }
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                               "-o $ns_nsiorfile");
 
 $NS_status = $NS->Spawn ();
@@ -130,7 +130,7 @@ for $config (@test_configs) {
 
     my $nfs_config = $nfs->LocalFile ($config);
 
-    $NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+    $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                                 ' '.$dispatch_opt.' '.
                                 "-ORBInitRef NameService=file://$nfs_nsiorfile " .
                                 "-IORoutput $nfs_nfsiorfile " .
diff --git a/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
index 77fa68d147b..fd4cf5dd974 100755
--- a/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
+++ b/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
@@ -88,7 +88,7 @@ else {
     @test_configs = @ARGV;
 }
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                               "-o $ns_nsiorfile");
 
 $NS_status = $NS->Spawn ();
@@ -130,7 +130,7 @@ for $config (@test_configs) {
 
     my $nfs_config = $nfs->LocalFile ($config);
 
-    $NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+    $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                                 ' '.$dispatch_opt.' '.
                                 "-ORBInitRef NameService=file://$nfs_nsiorfile " .
                                 "-IORoutput $nfs_nfsiorfile " .
diff --git a/orbsvcs/tests/Notify/Blocking/Makefile.am b/orbsvcs/tests/Notify/Blocking/Makefile.am
deleted file mode 100644
index 38bdbffa469..00000000000
--- a/orbsvcs/tests/Notify/Blocking/Makefile.am
+++ /dev/null
@@ -1,165 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Blocking_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Blocking_Ntf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Blocking_Ntf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h b/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
index afc3eff9095..4a57491090c 100644
--- a/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Structured_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A structured push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Structured_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A structured push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 #define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
index 2b96ae1eb14..575f3ef3a49 100644
--- a/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
@@ -65,7 +65,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
         argv [0]),
         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 5950b53d657..9b566741411 100644
--- a/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -103,7 +103,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Blocking/notify.conf b/orbsvcs/tests/Notify/Blocking/notify.conf
index f15e4999f71..4b52ccb153a 100644
--- a/orbsvcs/tests/Notify/Blocking/notify.conf
+++ b/orbsvcs/tests/Notify/Blocking/notify.conf
@@ -1,7 +1,7 @@
 ## $Id$
 #
 ## Load the static Cos Notification Service
-## The BlockingPolicy requires the notify service to use the following settings to prevent 
+## The BlockingPolicy requires the notify service to use the following settings to prevent
 ## dispatch threads from handling supplier-side requests. This would allow dispatch threads
 ## to block on the condition variables used for the blocking feature, which would prevent
 ## the thread from handling the consumer response, resulting in deadlock.
diff --git a/orbsvcs/tests/Notify/Blocking/run_test.pl b/orbsvcs/tests/Notify/Blocking/run_test.pl
index 920ae28ce41..c8049870a7b 100755
--- a/orbsvcs/tests/Notify/Blocking/run_test.pl
+++ b/orbsvcs/tests/Notify/Blocking/run_test.pl
@@ -45,10 +45,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port ".
                             "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am b/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am
deleted file mode 100644
index 165bfe4f544..00000000000
--- a/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am
+++ /dev/null
@@ -1,165 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1385_Regression_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Bug_1385_Regression_Ntf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1385_Regression_Ntf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp b/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp
index cc1f4b56d33..3b2206a0a7c 100644
--- a/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp
@@ -56,7 +56,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
             argv [0]),
             -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp b/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
index 2ce242dca15..320d9f2849f 100644
--- a/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
@@ -105,7 +105,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf b/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf
index f15e4999f71..4b52ccb153a 100644
--- a/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf
+++ b/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf
@@ -1,7 +1,7 @@
 ## $Id$
 #
 ## Load the static Cos Notification Service
-## The BlockingPolicy requires the notify service to use the following settings to prevent 
+## The BlockingPolicy requires the notify service to use the following settings to prevent
 ## dispatch threads from handling supplier-side requests. This would allow dispatch threads
 ## to block on the condition variables used for the blocking feature, which would prevent
 ## the thread from handling the consumer response, resulting in deadlock.
diff --git a/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl b/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl
index a3dfdb4af87..3bcef988967 100755
--- a/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl
+++ b/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl
@@ -45,10 +45,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port ".
                             "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Bug_1884_Regression/common.h b/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
index 3520155bf02..4ba52e0064b 100644
--- a/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
+++ b/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
@@ -5,7 +5,7 @@
 #include <iostream>
 const char *ior = "file://ecf.ior";
 
-CosNotifyChannelAdmin::EventChannel_var 
+CosNotifyChannelAdmin::EventChannel_var
 get_event_channel(CORBA::ORB_ptr orb)
 
 {
@@ -20,8 +20,8 @@ get_event_channel(CORBA::ORB_ptr orb)
 
   if (CORBA::is_nil(obj.in ()))
   {
-    std::cerr << "Bad ec_fact.ior " << std::endl; 
-    ACE_OS::exit (1);    
+    std::cerr << "Bad ec_fact.ior " << std::endl;
+    ACE_OS::exit (1);
   }
 
   CosNotifyChannelAdmin::EventChannelFactory_var factory =
@@ -40,20 +40,20 @@ get_event_channel(CORBA::ORB_ptr orb)
   }
   catch (CORBA::SystemException& se )
   {
-    std::cerr << "System exception occurred during get_all_channels: " 
+    std::cerr << "System exception occurred during get_all_channels: "
       << se << std::endl;
     throw;
   }
 
   if( channelIdSeq->length() == 0 )
   {
-    try 
+    try
     {
       ec = factory->create_channel( init_qos, init_admin, id);
     }
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during find_channel: " 
+      std::cerr << "System exception occurred during find_channel: "
         << se << std::endl;
       throw;
     }
@@ -65,14 +65,14 @@ get_event_channel(CORBA::ORB_ptr orb)
     }
     catch (CosNotifyChannelAdmin::ChannelNotFound& )
     {
-      std::cerr << "ChannelNotFound: " 
+      std::cerr << "ChannelNotFound: "
         << channelIdSeq[0] << std::endl;
       throw;
     }
 
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during get_event_channel: " 
+      std::cerr << "System exception occurred during get_event_channel: "
         << se << std::endl;
       throw;
     }
diff --git a/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp b/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
index ed839a353d0..571c229299c 100644
--- a/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
+++ b/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
@@ -9,7 +9,7 @@ int runtime = 5; //sec
 
 
 namespace CosNotifyCommImpl{
-  class StructuredPushConsumer: public virtual POA_CosNotifyComm:: StructuredPushConsumer 
+  class StructuredPushConsumer: public virtual POA_CosNotifyComm:: StructuredPushConsumer
   {
   public:
     StructuredPushConsumer () : received_ (false) {};
@@ -20,24 +20,24 @@ namespace CosNotifyCommImpl{
     {
       received_ = true;
       std::cout << "Received an event...," << std::endl;
-      std::cout << "event.header.fixed_header.event_type.domain_name = " 
-        << event.header.fixed_header.event_type.domain_name 
+      std::cout << "event.header.fixed_header.event_type.domain_name = "
+        << event.header.fixed_header.event_type.domain_name
         << std::endl;
-      std::cout << "event.header.fixed_header.event_type.type_name = " 
+      std::cout << "event.header.fixed_header.event_type.type_name = "
         << event.header.fixed_header.event_type.type_name
         << std::endl;
 
     };
 
     void disconnect_structured_push_consumer()
-    {};         
+    {};
 
     void offer_change (
       const CosNotification::EventTypeSeq &,
       const CosNotification::EventTypeSeq &)
     {};
 
-    bool received_events () 
+    bool received_events ()
     {
       return this->received_;
     };
@@ -61,8 +61,8 @@ int parse_args (int argc, ACE_TCHAR *argv[])
 
     default:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("usage:  %s -t <runtime>\n"), 
-                         argv [0]), 
+                         ACE_TEXT ("usage:  %s -t <runtime>\n"),
+                         argv [0]),
                         -1);
   }
 
@@ -81,7 +81,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     PortableServer::POA_var root_poa = PortableServer::POA::_narrow(poa_obj.in());
 
     poa_manager = root_poa->the_POAManager();
-    
+
     if (parse_args (argc, argv) != 0)
       return 1;
 
@@ -92,7 +92,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in());
 
     //Instanciating the Consumer
-    CosNotifyComm::StructuredPushConsumer_var spc = 
+    CosNotifyComm::StructuredPushConsumer_var spc =
       CosNotifyComm::StructuredPushConsumer::_nil();
 
     CosNotifyCommImpl::StructuredPushConsumer *pImpl_spc = new CosNotifyCommImpl::StructuredPushConsumer;
@@ -128,7 +128,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
     //Attaching a filter to pps
-    CosNotifyFilter::FilterFactory_var dff = 
+    CosNotifyFilter::FilterFactory_var dff =
       ec->default_filter_factory();
 
     ACE_ASSERT(!CORBA::is_nil(dff.in()));
@@ -150,7 +150,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     constraints[0].constraint_expr = CORBA::string_dup(
       "");
 
-    filter->add_constraints(constraints);                                       
+    filter->add_constraints(constraints);
 
     pps->add_filter(filter.in());
 
diff --git a/orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf b/orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf
index 8c29f3485b8..8a700d63f50 100644
--- a/orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf
+++ b/orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory()  "-save_base_path ./persistency.notif  -load_base_path  ./persistency.notif  -backup_count 1 -v"
 
diff --git a/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
index 538dcf9abe0..8c3ac52b03a 100644
--- a/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
+++ b/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
@@ -8,7 +8,7 @@
 
 const char *ior = "file://ecf.ior";
 
-CosNotifyChannelAdmin::EventChannel_var 
+CosNotifyChannelAdmin::EventChannel_var
 get_event_channel(CORBA::ORB_ptr orb)
 
 {
@@ -25,7 +25,7 @@ get_event_channel(CORBA::ORB_ptr orb)
 
   if (CORBA::is_nil(obj.in ()))
   {
-    std::cerr << "Bad ec_fact.ior " << std::endl; 
+    std::cerr << "Bad ec_fact.ior " << std::endl;
     exit(1);
   }
 
@@ -46,7 +46,7 @@ get_event_channel(CORBA::ORB_ptr orb)
   }
   catch (CORBA::SystemException& se )
   {
-    std::cerr << "System exception occurred during get_all_channels: " 
+    std::cerr << "System exception occurred during get_all_channels: "
       << se << std::endl;
     exit(1);
   }
@@ -54,13 +54,13 @@ get_event_channel(CORBA::ORB_ptr orb)
   if( channelIdSeq->length() == 0 )
   {
 
-    try 
+    try
     {
       ec = factory->create_channel( init_qos, init_admin, id);
     }
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during find_channel: " 
+      std::cerr << "System exception occurred during find_channel: "
         << se << std::endl;
       exit(1);
     }
@@ -72,14 +72,14 @@ get_event_channel(CORBA::ORB_ptr orb)
     }
     catch (CosNotifyChannelAdmin::ChannelNotFound&)
     {
-      std::cerr << "ChannelNotFound: " 
+      std::cerr << "ChannelNotFound: "
         << channelIdSeq[0] << std::endl;
       exit(1);
     }
 
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during get_event_channel: " 
+      std::cerr << "System exception occurred during get_event_channel: "
         << se << std::endl;
       exit(1);
     }
@@ -89,9 +89,9 @@ get_event_channel(CORBA::ORB_ptr orb)
   return ec._retn();
 }
 
-   
-void match_structure_test (const CosNotifyFilter::Filter_var& filter, 
-                           const CosNotification::StructuredEvent& event, 
+
+void match_structure_test (const CosNotifyFilter::Filter_var& filter,
+                           const CosNotification::StructuredEvent& event,
                            bool & expected_result)
 {
   bool bResult = false;
@@ -104,7 +104,7 @@ void match_structure_test (const CosNotifyFilter::Filter_var& filter,
   }
   catch (CORBA::SystemException& se )
   {
-    std::cerr << "System exception occurred during match_structured: " 
+    std::cerr << "System exception occurred during match_structured: "
       << se << std::endl;
     exit(1);
   }
@@ -141,22 +141,22 @@ void update_constraints (const CosNotifyFilter::Filter_var& filter,
     constraints[0].event_types = event_types;
     constraints[0].constraint_expr = CORBA::string_dup("");
 
-    CosNotifyFilter::ConstraintInfoSeq_var cons_info 
-      = filter->add_constraints(constraints);                                   
+    CosNotifyFilter::ConstraintInfoSeq_var cons_info
+      = filter->add_constraints(constraints);
 
     std::cout << "Constructing a filter..." << std::endl;
 
     for (CORBA::ULong i = 0; i < event_types.length(); ++i)
     {
-      std::cout << "\tevent_types[" << i << "].domain_name=" 
+      std::cout << "\tevent_types[" << i << "].domain_name="
         << event_types[i].domain_name
         << std::endl;
-      std::cout << "\tevent_types[" << i << "].type_name=" 
+      std::cout << "\tevent_types[" << i << "].type_name="
         << event_types[i].type_name
         << std::endl;
     }
 
-    std::cout << "\tIts constraint =" 
+    std::cout << "\tIts constraint ="
       << constraints[0].constraint_expr.in ()
       << std::endl;
 }
@@ -182,7 +182,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in());
 
     //Attaching a filter to pps
-    CosNotifyFilter::FilterFactory_var dff = 
+    CosNotifyFilter::FilterFactory_var dff =
       ec->default_filter_factory();
 
     ACE_ASSERT(!CORBA::is_nil(dff.in()));
@@ -201,10 +201,10 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     event.remainder_of_body <<= "";
 
     std::cout << "Constructing a test event" << std::endl;
-    std::cout << "\tIts header.fixed_header.event_type.domain_name=" 
+    std::cout << "\tIts header.fixed_header.event_type.domain_name="
       << event.header.fixed_header.event_type.domain_name
       << std::endl;
-    std::cout << "\tIts header.fixed_header.event_type.type_name=" 
+    std::cout << "\tIts header.fixed_header.event_type.type_name="
       << event.header.fixed_header.event_type.type_name
       << std::endl;
 
diff --git a/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl b/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl
index b4fae61a0be..76161b1c493 100755
--- a/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl
+++ b/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl
@@ -45,7 +45,7 @@ if ($#ARGV >= 0 && $ARGV[0] eq '-p') {
     $consumer_runtime = 20;
 }
 
-my $NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+my $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                                "-ORBDebugLevel $debug_level ".
                                "-NoNameSvc -IORoutput $nfs_nfsiorfile $svcconf " .
                                "-ORBEndpoint iiop://$host:$port");
@@ -54,7 +54,7 @@ my $CON = $con->CreateProcess ("consumer", "$nts_ref -t $consumer_runtime");
 my $FLT = $flt->CreateProcess ("filter", "$nts_ref");
 
 
-print "\n*********** Starting the Notify_Service  ***********\n\n";
+print "\n*********** Starting the Notify Service  ***********\n\n";
 $NFS_status = $NFS->Spawn ();
 if ($NFS_status != 0) {
     print STDERR "ERROR: Notify Service returned $NFS_status\n";
@@ -90,7 +90,7 @@ if ($CON_status != 0) {
 sleep(5);
 
 if ($persistent_test == 1) {
-    print "*********** Killing the first Notify_Service   ***********\n";
+    print "*********** Killing the first Notify Service   ***********\n";
     $NFS_status = $NFS->TerminateWaitKill ($nfs->ProcessStopWaitInterval());
     if ($NFS_status != 0) {
         print STDERR "ERROR: Notification Service returned $NFS_status\n";
@@ -101,7 +101,7 @@ if ($persistent_test == 1) {
 
     $nfs->DeleteFile ($nfsiorfile);
 
-    print "*********** Starting the second Notify_Service ***********\n";
+    print "*********** Starting the second Notify Service ***********\n";
     print STDERR $NFS->CommandLine (). "\n";
     $NFS_status = $NFS->Spawn ();
     if ($NFS_status != 0) {
@@ -116,7 +116,7 @@ if ($persistent_test == 1) {
         exit 1;
     }
 
-    sleep(5); 
+    sleep(5);
 }
 
 print "\n*********** Starting the notification Supplier ***********\n\n";
diff --git a/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp b/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
index 5088b562343..96990ac6304 100644
--- a/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
+++ b/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
 #include "common.h"
-#include "ace/OS.h"
-
 
 namespace CosNotifyCommImpl{
-  class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier 
+  class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier
   {
   public:
     void disconnect_structured_push_supplier()
     {};
-    void subscription_change( const CosNotification::EventTypeSeq&, 
+    void subscription_change( const CosNotification::EventTypeSeq&,
       const CosNotification::EventTypeSeq&)
     {};
 
@@ -38,7 +36,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in());
 
     //Instanciating the Supplier
-    CosNotifyComm::StructuredPushSupplier_var sps = 
+    CosNotifyComm::StructuredPushSupplier_var sps =
       CosNotifyComm::StructuredPushSupplier::_nil();
 
 
@@ -102,17 +100,17 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     event.remainder_of_body <<= "";
 
     std::cout << "Sending a demo event...," << std::endl;
-    std::cout << "event.header.fixed_header.event_type.domain_name = " 
-      << event.header.fixed_header.event_type.domain_name 
+    std::cout << "event.header.fixed_header.event_type.domain_name = "
+      << event.header.fixed_header.event_type.domain_name
       << std::endl;
-    std::cout << "event.header.fixed_header.event_type.type_name = " 
+    std::cout << "event.header.fixed_header.event_type.type_name = "
       << event.header.fixed_header.event_type.type_name
       << std::endl;
 
 
     try{
       ppc->push_structured_event(event);
-    }   
+    }
     catch (CORBA::SystemException& se)
     {
       std::cerr << "System exception occurred during push: "
diff --git a/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp b/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
index ea848c0f6f5..dabaa4e737f 100644
--- a/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
+++ b/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
@@ -61,11 +61,11 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
-static CosNotifyFilter::Filter_ptr 
+static CosNotifyFilter::Filter_ptr
 create_proxyFilter (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyFilter::FilterFactory_var ffact =
@@ -100,7 +100,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                     CORBA::NO_MEMORY ());
 
   consumer_1->init (client->root_poa ());
-  
+
   consumer_1->_connect (admin, filter);
 }
 
diff --git a/orbsvcs/tests/Notify/Bug_2415_Regression/Makefile.am b/orbsvcs/tests/Notify/Bug_2415_Regression/Makefile.am
deleted file mode 100644
index 148624d30f0..00000000000
--- a/orbsvcs/tests/Notify/Bug_2415_Regression/Makefile.am
+++ /dev/null
@@ -1,161 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2415_Regression.am
-
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.Bug_2415_Regression.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Consumer
-
-Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Consumer_SOURCES = \
-  Notify_Push_Consumer.cpp \
-  Sequence_Consumer.cpp \
-  goC.cpp \
-  Notify_Push_Consumer.h
-
-Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2415_Regression.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Supplier
-
-Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Supplier_SOURCES = \
-  Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Push_Consumer.h
-
-Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.h b/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.h
index 0599cf07acc..418a73fd358 100644
--- a/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_PUSH_CONSUMER_H
 #define TAO_NOTIFY_PUSH_CONSUMER_H
 #include "Notify_StructuredPushConsumer.h"
diff --git a/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp b/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
index d033f457c44..dcff65c1ebd 100644
--- a/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
+++ b/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
@@ -91,7 +91,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
     case 'o':
       ior_output_file = get_opts.optarg;
       break;
- 
+
     case 'd':
       domain = get_opts.optarg;
       break;
@@ -105,7 +105,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl b/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl
index c2db939f062..628d56e77ea 100755
--- a/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl
+++ b/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl
@@ -48,10 +48,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                           " -ORBEndpoint iiop://$ns_host:$ns_port");
 
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=corbaloc::" .
                             "$ns_host:$ns_port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
@@ -212,7 +212,7 @@ $nfs->DeleteFile ($nfsiorfile);
 
 
 
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=corbaloc::" .
                             "$ns_host:$ns_port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp b/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
index 5c468af3148..8657a7df797 100644
--- a/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
+++ b/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
@@ -57,7 +57,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am b/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am
deleted file mode 100644
index f5ccede2003..00000000000
--- a/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am
+++ /dev/null
@@ -1,165 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2561_Regression_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Bug_2561_Regression_Ntf_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Consumer
-
-Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Consumer_SOURCES = \
-  Consumer.cpp \
-  Notify_Push_Consumer.cpp \
-  goC.cpp \
-  Notify_Push_Consumer.h
-
-Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2561_Regression_Ntf_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Supplier
-
-Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Supplier_SOURCES = \
-  Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Push_Consumer.h
-
-Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.h b/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.h
index c4a675b8f94..00158ec1f23 100644
--- a/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A sequence push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A sequence push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_PUSH_CONSUMER_H
 #define TAO_NOTIFY_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp b/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
index 3e686e7e445..956e6538775 100644
--- a/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
+++ b/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
@@ -106,7 +106,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl b/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl
index 89adc2131a9..b1a0704fbc5 100755
--- a/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl
+++ b/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl
@@ -49,10 +49,10 @@ $sup->DeleteFile ($supiorfile);
 $con1->DeleteFile ($supiorfile);
 $con2->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port ".
                             "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Bug_2926_Regression/Makefile.am b/orbsvcs/tests/Notify/Bug_2926_Regression/Makefile.am
deleted file mode 100644
index 7ee7f0b5e7a..00000000000
--- a/orbsvcs/tests/Notify/Bug_2926_Regression/Makefile.am
+++ /dev/null
@@ -1,97 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2926_Regression_Lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_LTLIBRARIES = libbug2926.la
-
-libbug2926_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DBUG2926_BUILD_DLL
-
-libbug2926_la_SOURCES = \
-  DllORB.cpp
-
-noinst_HEADERS = \
-  DllORB.h
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2926_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-server_SOURCES = \
-  server.cpp \
-  DllORB.h \
-  bug2926_export.h
-
-server_LDADD = \
-  libbug2926.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp b/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
index c4bdf91925c..5fc7d89a1f8 100644
--- a/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
+++ b/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
@@ -29,17 +29,16 @@ ACE_TCHAR const * const scpc_unloadNotifyService = ACE_REMOVE_SERVICE_DIRECTIVE(
 
 void loadunloadcycle()
 {
-  int result = 0;
-
   ACE_DEBUG((
     LM_DEBUG,
     ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n")
   ));
 
-  result = ACE_Service_Config::process_directive(scpc_loadOrb);
+  int result = ACE_Service_Config::process_directive(scpc_loadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done. Result: <%d>\n"),
+    result
   ));
 
   DllORB * p_orb =
@@ -69,7 +68,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   TAO_CosNotify_Service * p_notifyService =
@@ -105,7 +105,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -115,9 +116,11 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 }
+
 int ACE_TMAIN (int , ACE_TCHAR **)
 {
   ACE_DEBUG((
diff --git a/orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am b/orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am
deleted file mode 100644
index 3b0cea80a90..00000000000
--- a/orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am
+++ /dev/null
@@ -1,88 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_3252_Regression_Lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_LTLIBRARIES = libBug_3252.la
-
-libBug_3252_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DBUG_3252_REGRESSION_BUILD_DLL
-
-libBug_3252_la_SOURCES = \
-  DllOrb.cpp
-
-noinst_HEADERS = \
-  DllOrb.h
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_3252_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-server_SOURCES = \
-  server.cpp \
-  DllOrb.h \
-  bug_3252_export.h
-
-server_LDADD = \
-  libBug_3252.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
index 5f6a4383598..7d3320078be 100644
--- a/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
+++ b/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "ace/ARGV.h"
-#include "ace/OS.h"
 #include "ace/Service_Config.h"
 #include "ace/Log_Msg.h"
 
diff --git a/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl b/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl
index 2c7ea9306ad..68621bd68c7 100755
--- a/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl
+++ b/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl
@@ -37,12 +37,12 @@ $server2->DeleteFile($ior2file);
 $hostname = $server1->HostName ();
 $port = $server1->RandomPort ();
 
-$SV1 = $server1->CreateProcess ("../../../Naming_Service/Naming_Service",
+$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBEndpoint iiop://$hostname:$port " .
                               "-o $server1_ior1file");
 
-$SV2 = $server2->CreateProcess ("../../../Notify_Service/Notify_Service",
+$SV2 = $server2->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBInitRef NameService=iioploc://$hostname:$port/NameService " .
                               "-IORoutput $server2_ior2file " .
diff --git a/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp b/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
index 33d43fe2910..d25ac609f5a 100644
--- a/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
+++ b/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
@@ -29,17 +29,16 @@ ACE_TCHAR const * const scpc_unloadNotifyService = ACE_REMOVE_SERVICE_DIRECTIVE(
 
 void loadunloadcycle()
 {
-  int result = 0;
-
   ACE_DEBUG((
     LM_DEBUG,
     ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n")
   ));
 
-  result = ACE_Service_Config::process_directive(scpc_loadOrb);
+  int result = ACE_Service_Config::process_directive(scpc_loadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done. Result: <%d>\n"),
+    result
   ));
 
   DllORB * p_orb =
@@ -68,7 +67,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   TAO_Notify_Service_Driver * p_notifyService =
@@ -88,7 +88,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -98,9 +99,11 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 }
+
 int ACE_TMAIN (int , ACE_TCHAR **)
 {
   ACE_DEBUG((
diff --git a/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp b/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp
index efd2bf5bffc..ad64a1153a1 100644
--- a/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp
+++ b/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp
@@ -33,12 +33,12 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
           name.length (1);
           name[0].id = CORBA::string_dup ("Channel1");
           CORBA::Object_var obj1 = naming->resolve (name);
-          
+
           ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Successfully retrieved Challel1\n")));
 
           name[0].id = CORBA::string_dup ("Channel2");
           CORBA::Object_var obj2 = naming->resolve (name);
-          
+
           ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Successfully retrieved Challel2\n")));
         }
     }
diff --git a/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl b/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl
index c21727fe388..8e22b4e2ccb 100755
--- a/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl
+++ b/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl
@@ -41,7 +41,7 @@ $hostname = $server1->HostName ();
 $port = $server1->RandomPort ();
 
 
-$SV1 = $server1->CreateProcess ("../../../Naming_Service/Naming_Service",
+$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBEndpoint iiop://$hostname:$port " .
                               "-o $server1_ior1file");
diff --git a/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp b/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
index d17740078c4..e1f8cf2af79 100644
--- a/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
+++ b/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
@@ -35,11 +35,11 @@ parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("h:p:o:"));
   int c;
-  
+
   ACE_TCHAR *hostname = 0;
   ACE_TCHAR *port = 0;
   ACE_TCHAR *ior_file = 0;
-  
+
   while ((c = get_opts ()) != -1)
     switch (c)
       {
@@ -52,14 +52,14 @@ parse_args (int argc, ACE_TCHAR *argv[])
       case 'o':
         ior_file = get_opts.opt_arg ();
         break;
-        
+
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
            "usage:  %s "
            "-h <hostname> "
            "-p <port> "
-           "-o <ior> "           
+           "-o <ior> "
            "\n",
            argv [0]),-1);
       }
@@ -69,7 +69,7 @@ if ( hostname == 0 || port == 0 || ior_file == 0){
            "usage:  %s "
            "-h <hostname> "
            "-p <port> "
-           "-o <ior> "           
+           "-o <ior> "
            "\n",
            argv [0]),-1);
 }
@@ -84,22 +84,21 @@ ACE_OS::sprintf(scpc_loadOrb, str,  hostname, port);
 
 return 0;
 }
-                                                                
+
 
 
 void loadunloadcycle()
 {
-  int result = 0;
-
   ACE_DEBUG((
     LM_DEBUG,
     ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n")
   ));
 
-  result = ACE_Service_Config::process_directive(scpc_loadOrb);
+  int result = ACE_Service_Config::process_directive(scpc_loadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done. Result: <%d>\n"),
+    result
   ));
 
   DllORB * p_orb =
@@ -128,7 +127,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   TAO_Notify_Service_Driver * p_notifyService =
@@ -148,7 +148,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -158,7 +159,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 }
 
@@ -168,7 +170,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     LM_DEBUG,
     ACE_TEXT ("(%P|%t) main - entered\n")
   ));
-  
+
   if (parse_args (argc, argv) != 0)
         return 1;
 
diff --git a/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp b/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
index cd124d8fed8..8a922af1a48 100644
--- a/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
+++ b/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
@@ -38,17 +38,16 @@ ACE_TCHAR const * const scpc_unloadNameService = ACE_REMOVE_SERVICE_DIRECTIVE("t
 
 void loadunloadcycle()
 {
-  int result = 0;
-
   ACE_DEBUG((
     LM_DEBUG,
     ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n")
   ));
 
-  result = ACE_Service_Config::process_directive(scpc_loadOrb);
+  int result = ACE_Service_Config::process_directive(scpc_loadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done. Result: <%d>\n"),
+    result
   ));
 
   DllORB * p_orb =
@@ -77,13 +76,15 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadNameService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NamingService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NamingService done. Result: <%d>\n"),
+    result
   ));
 
   result = ACE_Service_Config::process_directive(scpc_loadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -98,7 +99,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -108,7 +110,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNameService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NameService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NameService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -118,9 +121,11 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 }
+
 int ACE_TMAIN (int , ACE_TCHAR **)
 {
   ACE_DEBUG((
diff --git a/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp b/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
index 22b8f0329ef..6434be8a632 100644
--- a/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
+++ b/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
@@ -29,17 +29,16 @@ ACE_TCHAR const * const scpc_unloadNotifyService = ACE_REMOVE_SERVICE_DIRECTIVE(
 
 void loadunloadcycle()
 {
-  int result = 0;
-
   ACE_DEBUG((
     LM_DEBUG,
     ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n")
   ));
 
-  result = ACE_Service_Config::process_directive(scpc_loadOrb);
+  int result = ACE_Service_Config::process_directive(scpc_loadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done. Result: <%d>\n"),
+    result
   ));
 
   DllORB * p_orb =
@@ -68,7 +67,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   TAO_Notify_Service_Driver * p_notifyService =
@@ -88,7 +88,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -98,9 +99,11 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 }
+
 int ACE_TMAIN (int , ACE_TCHAR **)
 {
   ACE_DEBUG((
diff --git a/orbsvcs/tests/Notify/Bug_3688_Regression/common.h b/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
index 3520155bf02..4ba52e0064b 100755
--- a/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
+++ b/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
@@ -5,7 +5,7 @@
 #include <iostream>
 const char *ior = "file://ecf.ior";
 
-CosNotifyChannelAdmin::EventChannel_var 
+CosNotifyChannelAdmin::EventChannel_var
 get_event_channel(CORBA::ORB_ptr orb)
 
 {
@@ -20,8 +20,8 @@ get_event_channel(CORBA::ORB_ptr orb)
 
   if (CORBA::is_nil(obj.in ()))
   {
-    std::cerr << "Bad ec_fact.ior " << std::endl; 
-    ACE_OS::exit (1);    
+    std::cerr << "Bad ec_fact.ior " << std::endl;
+    ACE_OS::exit (1);
   }
 
   CosNotifyChannelAdmin::EventChannelFactory_var factory =
@@ -40,20 +40,20 @@ get_event_channel(CORBA::ORB_ptr orb)
   }
   catch (CORBA::SystemException& se )
   {
-    std::cerr << "System exception occurred during get_all_channels: " 
+    std::cerr << "System exception occurred during get_all_channels: "
       << se << std::endl;
     throw;
   }
 
   if( channelIdSeq->length() == 0 )
   {
-    try 
+    try
     {
       ec = factory->create_channel( init_qos, init_admin, id);
     }
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during find_channel: " 
+      std::cerr << "System exception occurred during find_channel: "
         << se << std::endl;
       throw;
     }
@@ -65,14 +65,14 @@ get_event_channel(CORBA::ORB_ptr orb)
     }
     catch (CosNotifyChannelAdmin::ChannelNotFound& )
     {
-      std::cerr << "ChannelNotFound: " 
+      std::cerr << "ChannelNotFound: "
         << channelIdSeq[0] << std::endl;
       throw;
     }
 
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during get_event_channel: " 
+      std::cerr << "System exception occurred during get_event_channel: "
         << se << std::endl;
       throw;
     }
diff --git a/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp b/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
index fd08aa2024c..9ab2f4ee5c7 100755
--- a/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
+++ b/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
@@ -9,7 +9,7 @@ int runtime = 5; //sec
 
 
 namespace CosNotifyCommImpl{
-  class StructuredPushConsumer: public virtual POA_CosNotifyComm:: StructuredPushConsumer 
+  class StructuredPushConsumer: public virtual POA_CosNotifyComm:: StructuredPushConsumer
   {
   public:
     StructuredPushConsumer () : received_ (false) {};
@@ -20,23 +20,23 @@ namespace CosNotifyCommImpl{
     {
       received_ = true;
       std::cout << "Received an event...," << std::endl;
-      std::cout << "event.header.fixed_header.event_type.domain_name = " 
-        << event.header.fixed_header.event_type.domain_name 
+      std::cout << "event.header.fixed_header.event_type.domain_name = "
+        << event.header.fixed_header.event_type.domain_name
         << std::endl;
-      std::cout << "event.header.fixed_header.event_type.type_name = " 
+      std::cout << "event.header.fixed_header.event_type.type_name = "
         << event.header.fixed_header.event_type.type_name
         << std::endl;
     };
 
     void disconnect_structured_push_consumer()
-    {};         
+    {};
 
     void offer_change (
       const CosNotification::EventTypeSeq &,
       const CosNotification::EventTypeSeq &)
     {};
 
-    bool received_events () 
+    bool received_events ()
     {
       return this->received_;
     };
@@ -60,8 +60,8 @@ int parse_args (int argc, ACE_TCHAR *argv[])
 
     default:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("usage:  %s -t <runtime>\n"), 
-                         argv [0]), 
+                         ACE_TEXT ("usage:  %s -t <runtime>\n"),
+                         argv [0]),
                         -1);
   }
 
@@ -80,7 +80,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     PortableServer::POA_var root_poa = PortableServer::POA::_narrow(poa_obj.in());
 
     poa_manager = root_poa->the_POAManager();
-    
+
     if (parse_args (argc, argv) != 0)
       return 1;
 
@@ -91,7 +91,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in());
 
     //Instanciating the Consumer
-    CosNotifyComm::StructuredPushConsumer_var spc = 
+    CosNotifyComm::StructuredPushConsumer_var spc =
       CosNotifyComm::StructuredPushConsumer::_nil();
 
     CosNotifyCommImpl::StructuredPushConsumer *pImpl_spc = new CosNotifyCommImpl::StructuredPushConsumer;
@@ -127,7 +127,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
     //Attaching a filter to pps
-    CosNotifyFilter::FilterFactory_var dff = 
+    CosNotifyFilter::FilterFactory_var dff =
       ec->default_filter_factory();
 
     ACE_ASSERT(!CORBA::is_nil(dff.in()));
@@ -149,7 +149,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     constraints[0].constraint_expr = CORBA::string_dup(
       "$data == 1 or $data == 2 or $data == 4");
 
-    filter->add_constraints(constraints);                                       
+    filter->add_constraints(constraints);
 
     pps->add_filter(filter.in());
 
@@ -158,7 +158,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     std::cout << "The filter's event_types[0].type_name = " <<  event_types[0].type_name << std::endl;
     std::cout << "The filter's event_types[1].domain_name = " <<  event_types[1].domain_name << std::endl;
     std::cout << "The filter's event_types[1].type_name = " <<  event_types[1].type_name << std::endl;
-    std::cout << "The filter's constraint_expr=" << constraints[0].constraint_expr << std::endl; 
+    std::cout << "The filter's constraint_expr=" << constraints[0].constraint_expr << std::endl;
 
     //Connecting a Supplier to a Proxy Consumer
     try
@@ -185,7 +185,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     if (pImpl_spc->received_events ())
     {
       //Consumer should not receive any events as the user defined constraint takes
-      //effect. 
+      //effect.
       std::cerr << "Test failed - should not receive test events." << std::endl;
       return 1;
     }
diff --git a/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl b/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl
index e2e8a36d14f..868bb9bcb7e 100755
--- a/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl
+++ b/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl
@@ -34,7 +34,7 @@ $server1->DeleteFile($ior1file);
 $hostname = $server1->HostName ();
 $port = $server1->RandomPort ();
 
-$SV1 = $server1->CreateProcess ("../../../Notify_Service/Notify_Service",
+$SV1 = $server1->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                               "-ORBdebuglevel $debug_level " .
                               "-NoNameSvc -IORoutput $server1_ior1file $svcconf " .
                               "-ORBEndpoint iiop://$hostname:$port");
@@ -49,7 +49,7 @@ $CL = $client->CreateProcess ("consumer",
                               "-t $consumer_runtime");
 
 
-print "\n*********** Starting the Notify_Service  ***********\n\n";
+print "\n*********** Starting the Notify Service  ***********\n\n";
 print $SV1->CommandLine ()."\n";
 
 $server_status = $SV1->Spawn ();
diff --git a/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp b/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
index 5ee3773c559..6c48e903007 100755
--- a/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
+++ b/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
@@ -1,17 +1,16 @@
 // $Id$
 
 #include "common.h"
-#include "ace/OS.h"
-
+#include "ace/OS_NS_unistd.h"
 
 namespace CosNotifyCommImpl{
-  class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier 
+  class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier
   {
   public:
     void disconnect_structured_push_supplier()
     {
     };
-    void subscription_change( const CosNotification::EventTypeSeq&, 
+    void subscription_change( const CosNotification::EventTypeSeq&,
       const CosNotification::EventTypeSeq&)
     {};
 
@@ -39,7 +38,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in());
 
     //Instanciating the Supplier
-    CosNotifyComm::StructuredPushSupplier_var sps = 
+    CosNotifyComm::StructuredPushSupplier_var sps =
       CosNotifyComm::StructuredPushSupplier::_nil();
 
 
@@ -107,18 +106,18 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     event.remainder_of_body <<= data;
 
     std::cout << "Sending a demo event...," << std::endl;
-    std::cout << "event.header.fixed_header.event_type.domain_name = " 
-      << event.header.fixed_header.event_type.domain_name 
+    std::cout << "event.header.fixed_header.event_type.domain_name = "
+      << event.header.fixed_header.event_type.domain_name
       << std::endl;
-    std::cout << "event.header.fixed_header.event_type.type_name = " 
+    std::cout << "event.header.fixed_header.event_type.type_name = "
       << event.header.fixed_header.event_type.type_name
       << std::endl;
-    std::cout << "event.filterable_data: data=" << data << std::endl; 
+    std::cout << "event.filterable_data: data=" << data << std::endl;
 
 
     try{
       ppc->push_structured_event(event);
-    }   
+    }
     catch (CORBA::SystemException& se)
     {
       std::cerr << "System exception occurred during push: "
diff --git a/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp b/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
index 948e64a01fe..7de79fcc106 100644
--- a/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
+++ b/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
@@ -92,7 +92,6 @@ int publish()
 
 int loadunloadcycle()
 {
-  int result = 0;
   int publish_result = 0;
 
   ACE_DEBUG((
@@ -100,10 +99,11 @@ int loadunloadcycle()
     ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n")
   ));
 
-  result = ACE_Service_Config::process_directive(scpc_loadOrb);
+  int result = ACE_Service_Config::process_directive(scpc_loadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done. Result: <%d>\n"),
+    result
   ));
 
   DllORB * p_orb =
@@ -132,13 +132,15 @@ int loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadNameService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NamingService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NamingService done. Result: <%d>\n"),
+    result
   ));
 
   result = ACE_Service_Config::process_directive(scpc_loadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   publish_result = publish();
@@ -155,7 +157,8 @@ int loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNotifyService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NotifyService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -165,7 +168,8 @@ int loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadNameService);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NameService done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading NameService done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -175,7 +179,8 @@ int loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 
   return publish_result;
diff --git a/orbsvcs/tests/Notify/Destroy/Makefile.am b/orbsvcs/tests/Notify/Destroy/Makefile.am
deleted file mode 100644
index 0b722e2d475..00000000000
--- a/orbsvcs/tests/Notify/Destroy/Makefile.am
+++ /dev/null
@@ -1,76 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Notify_Test_Destroy.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Notify_Tests_Destroy
-
-Notify_Tests_Destroy_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Notify_Tests_Destroy_SOURCES = \
-  main.cpp
-
-Notify_Tests_Destroy_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Notify_Tests_Destroy_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Discarding/Makefile.am b/orbsvcs/tests/Notify/Discarding/Makefile.am
deleted file mode 100644
index 61cb5c1c45b..00000000000
--- a/orbsvcs/tests/Notify/Discarding/Makefile.am
+++ /dev/null
@@ -1,277 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Discarding_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Discarding_Ntf_Seq_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Consumer
-
-Sequence_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Consumer_SOURCES = \
-  Notify_Sequence_Push_Consumer.cpp \
-  Sequence_Consumer.cpp \
-  goC.cpp \
-  Notify_Sequence_Push_Consumer.h
-
-Sequence_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Discarding_Ntf_Seq_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Supplier
-
-Sequence_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Supplier_SOURCES = \
-  Sequence_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
-
-Sequence_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Discarding_Ntf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Discarding_Ntf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h b/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
index e19763cb7e5..1e23933c853 100644
--- a/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Sequence_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A sequence push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Sequence_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A sequence push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 #define TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h b/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
index bd58ab5e9f8..21bd72f89b8 100644
--- a/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Structured_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A structured push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Structured_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A structured push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 #define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index 28740cd1d36..6a847e4dd87 100644
--- a/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -91,7 +91,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
         argv [0]),
         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index 99ad2a417f2..1f7f6fb57f0 100644
--- a/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -128,7 +128,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index e0993c96011..d29d4721eb7 100644
--- a/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -80,7 +80,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 2fea44d1b94..65ccb52dbb8 100644
--- a/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -119,7 +119,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Discarding/run_test.pl b/orbsvcs/tests/Notify/Discarding/run_test.pl
index d845bcd2de5..561fb5199e1 100755
--- a/orbsvcs/tests/Notify/Discarding/run_test.pl
+++ b/orbsvcs/tests/Notify/Discarding/run_test.pl
@@ -65,10 +65,10 @@ foreach my $arg (@ARGV) {
     }
 }
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                           "-ORBEndpoint iiop://$host:$port -o $ns_nsiorfile");
 
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Driver/Makefile.am b/orbsvcs/tests/Notify/Driver/Makefile.am
deleted file mode 100644
index e34669e2e5e..00000000000
--- a/orbsvcs/tests/Notify/Driver/Makefile.am
+++ /dev/null
@@ -1,75 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Notify_Test_Driver.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Notify_Tests_Driver
-
-Notify_Tests_Driver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Notify_Tests_Driver_SOURCES = \
-  main.cpp
-
-Notify_Tests_Driver_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Notify_Tests_Driver_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Lanes/consumer.conf b/orbsvcs/tests/Notify/Lanes/consumer.conf
index 98c0f0ed303..b1cb8925002 100644
--- a/orbsvcs/tests/Notify/Lanes/consumer.conf
+++ b/orbsvcs/tests/Notify/Lanes/consumer.conf
@@ -1,5 +1,7 @@
+# $Id$
+
 ##---- Load the Factories------
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
 # Uncomment this line to use SCHED_FIFO
 #dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/orbsvcs/tests/Notify/Lanes/notify.conf b/orbsvcs/tests/Notify/Lanes/notify.conf
index 85d6b72357e..d1479eec5d8 100644
--- a/orbsvcs/tests/Notify/Lanes/notify.conf
+++ b/orbsvcs/tests/Notify/Lanes/notify.conf
@@ -1,8 +1,9 @@
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
+# $Id$
+
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
 # Uncomment this line to use SCHED_FIFO
-#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"         
+#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
-dynamic TAO_Notify_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_Notify_Tests_RT_Test_FilterFactory () ""        
-dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""         
-
+dynamic TAO_Notify_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_Notify_Tests_RT_Test_FilterFactory () ""
+dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/tests/Notify/Lanes/run_test.pl b/orbsvcs/tests/Notify/Lanes/run_test.pl
index a2de8ac8d5c..b77703511bd 100755
--- a/orbsvcs/tests/Notify/Lanes/run_test.pl
+++ b/orbsvcs/tests/Notify/Lanes/run_test.pl
@@ -63,10 +63,10 @@ my $client2_client_ior = $client2->LocalFile ($client_ior);
 $client2->DeleteFile($ior1file);
 $client2->DeleteFile($client_ior);
 
-$SV1 = $server1->CreateProcess ("../../../Naming_Service/Naming_Service",
+$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                               "-o $server1_ior1file");
 
-$SV2 = $server2->CreateProcess ("../../../Notify_Service/Notify_Service",
+$SV2 = $server2->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                                 "-ORBInitRef NameService=file://$server2_ior1file " .
                                 "-IORoutput $server2_ior2file " .
                                 "-ORBSvcConf $server2_conf");
diff --git a/orbsvcs/tests/Notify/MC/Makefile.am b/orbsvcs/tests/Notify/MC/Makefile.am
deleted file mode 100644
index ba4140102ce..00000000000
--- a/orbsvcs/tests/Notify/MC/Makefile.am
+++ /dev/null
@@ -1,212 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MonitorControl_Idl.am
-
-BUILT_SOURCES = \
-  MonitorTestInterfaceC.cpp \
-  MonitorTestInterfaceC.h \
-  MonitorTestInterfaceC.inl \
-  MonitorTestInterfaceS.cpp \
-  MonitorTestInterfaceS.h \
-  MonitorTestInterfaceS.inl
-
-CLEANFILES = \
-  MonitorTestInterface-stamp \
-  MonitorTestInterfaceC.cpp \
-  MonitorTestInterfaceC.h \
-  MonitorTestInterfaceC.inl \
-  MonitorTestInterfaceS.cpp \
-  MonitorTestInterfaceS.h \
-  MonitorTestInterfaceS.inl
-
-MonitorTestInterfaceC.cpp MonitorTestInterfaceC.h MonitorTestInterfaceC.inl MonitorTestInterfaceS.cpp MonitorTestInterfaceS.h MonitorTestInterfaceS.inl: MonitorTestInterface-stamp
-
-MonitorTestInterface-stamp: $(srcdir)/MonitorTestInterface.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/MonitorTestInterface.idl
-	@touch $@
-
-noinst_HEADERS = \
-  MonitorTestInterface.idl
-
-## Makefile.MonitorControl_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  MonitorTestInterfaceC.cpp \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.MonitorControl_Monitor.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS += test_monitor
-
-test_monitor_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-test_monitor_SOURCES = \
-  MonitorTestInterfaceC.cpp \
-  MonitorTestInterfaceS.cpp \
-  test_monitor.cpp \
-  Notify_Structured_Push_Consumer.h
-
-test_monitor_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC_Ext.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-endif BUILD_EXCEPTIONS
-
-## Makefile.MonitorControl_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  MonitorTestInterfaceC.cpp \
-  Structured_Supplier.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp b/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
index 067765465e1..5989ecf4601 100644
--- a/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
@@ -72,7 +72,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
             argv [0]),
             -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp b/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp
index 8ea812e3c91..e5efded21fa 100644
--- a/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp
@@ -63,7 +63,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/MC/run_test.pl b/orbsvcs/tests/Notify/MC/run_test.pl
index fd5d46ad8ba..9f91eb1ea4d 100755
--- a/orbsvcs/tests/Notify/MC/run_test.pl
+++ b/orbsvcs/tests/Notify/MC/run_test.pl
@@ -86,9 +86,9 @@ if ($nfs->PutFile ($notify_conf) == -1) {
     exit 1;
 }
 
-my $NS = $ns->CreateProcess("../../../Naming_Service/Naming_Service",
+my $NS = $ns->CreateProcess("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port -o $nsiorfile");
-my $NFS = $nfs->CreateProcess("../../../Notify_Service/Notify_Service",
+my $NFS = $nfs->CreateProcess("../../../Notify_Service/tao_cosnotification",
                               "-ORBDebugLevel $debug_level ".
                               "$nscorbaloc " .
                               "-IORoutput $nfs_nfsiorfile " .
diff --git a/orbsvcs/tests/Notify/MC/test_monitor.cpp b/orbsvcs/tests/Notify/MC/test_monitor.cpp
index 787ea85518c..921d0e673de 100644
--- a/orbsvcs/tests/Notify/MC/test_monitor.cpp
+++ b/orbsvcs/tests/Notify/MC/test_monitor.cpp
@@ -76,7 +76,7 @@ MonitorTestInterface_i::running (MonitorTestInterface::Which proc)
       data = this->nsm_->get_statistic (str.c_str ());
       num = data->data_union.num ();
 
-      if (num.dlist[0].value != 0)
+      if (!ACE::is_equal (num.dlist[0].value, 0.0))
         {
           ACE_ERROR ((LM_ERROR,
                       "ERROR: There should be no active Event "
@@ -87,7 +87,7 @@ MonitorTestInterface_i::running (MonitorTestInterface::Which proc)
       data = this->nsm_->get_statistic (str.c_str ());
       num = data->data_union.num ();
 
-      if (num.dlist[0].value != 0)
+      if (!ACE::is_equal (num.dlist[0].value, 0.0))
         {
           ACE_ERROR ((LM_ERROR,
                       "ERROR: There should be no inactive Event "
@@ -116,20 +116,20 @@ MonitorTestInterface_i::running (MonitorTestInterface::Which proc)
       str = this->base_ + NotifyMonitoringExt::EventChannelConsumerCount;
       data = this->nsm_->get_statistic (str.c_str ());
       num = data->data_union.num ();
-      if (num.dlist[0].value != 1)
+      if (!ACE::is_equal (num.dlist[0].value, 1.0))
         ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should be only one Consumer\n"));
 
       str = this->base_ + NotifyMonitoringExt::EventChannelConsumerAdminCount;
       data = nsm_->get_statistic(str.c_str ());
       num = data->data_union.num ();
-      if (num.dlist[0].value != 1)
+      if (!ACE::is_equal (num.dlist[0].value, 1.0))
         ACE_ERROR ((LM_ERROR,
                         "Monitor: ERROR: There should be only one ConsumerAdmin\n"));
 
       str = this->base_ + NotifyMonitoringExt::EventChannelQueueElementCount;
       data = nsm_->get_statistic(str.c_str ());
       num = data->data_union.num ();
-      if (num.dlist[0].value != 0)
+      if (!ACE::is_equal (num.dlist[0].value, 0.0))
         ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should be no events queued\n"));
 
         brain_dump ("Running Consumer");
@@ -142,13 +142,13 @@ MonitorTestInterface_i::running (MonitorTestInterface::Which proc)
       data = nsm_->get_statistic(str.c_str ());
       num = data->data_union.num ();
 
-      if (num.dlist[0].value != 1)
+      if (!ACE::is_equal (num.dlist[0].value, 1.0))
         ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should be only one Supplier\n"));
 
       str = this->base_ + NotifyMonitoringExt::EventChannelSupplierAdminCount;
       data = nsm_->get_statistic(str.c_str ());
       num = data->data_union.num ();
-      if (num.dlist[0].value != 1)
+      if (!ACE::is_equal (num.dlist[0].value, 1.0))
         ACE_ERROR ((LM_ERROR,
               "Monitor: ERROR: There should be only one SupplierAdmin\n"));
         brain_dump ("Running Supplier");
@@ -313,18 +313,18 @@ MonitorTestInterface_i::finished (MonitorTestInterface::Which proc)
         nsm_->get_statistic(consumerCountName.c_str ());
       Monitor::Numeric consumerCountNum =
         consumerCountData->data_union.num ();
-      if (consumerCountNum.last != 1)
+      if (!ACE::is_equal (consumerCountNum.last, 1.0))
       ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should still be one Consumer\n"));
-  
+
       ACE_CString queueElementName = this->base_ + NotifyMonitoringExt::EventChannelQueueElementCount;
       Monitor::Data_var queueElementData =
         nsm_->get_statistic(queueElementName.c_str ());
       Monitor::Numeric queueElementNum =
         queueElementData->data_union.num ();
-      if (queueElementNum.last == 0)
+      if (ACE::is_equal (queueElementNum.last, 0.0))
       ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should be at least one "
                             "event queued\n"));
-  
+
       ACE_CString adminNamesName  = this->base_ + NotifyMonitoringExt::EventChannelConsumerAdminNames;
       Monitor::Data_var adminNamesData =
         nsm_->get_statistic(adminNamesName.c_str ());
@@ -348,9 +348,9 @@ MonitorTestInterface_i::finished (MonitorTestInterface::Which proc)
             ACE_ERROR ((LM_ERROR, "Monitor: ERROR: The most recent queue size [%f] should not be greater than 2000.\n",
               queueSizeNum.last));
       }
-  
+
       consumer_stats_check();
-  
+
       brain_dump ("Finished Supplier");
       break;
       }
diff --git a/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am b/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
deleted file mode 100644
index c9d8fd10330..00000000000
--- a/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
+++ /dev/null
@@ -1,173 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_Dispatching_Idl.am
-
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.MT_Dispatching_Ntf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.MT_Dispatching_Ntf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp b/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
index 4c74caed6df..1f9b1bb3594 100644
--- a/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
+++ b/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "Notify_Structured_Push_Consumer.h"
 #include "Notify_Test_Client.h"
-#include "ace/OS.h"
+#include "ace/OS_NS_unistd.h"
 
 Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
   const char* name,
diff --git a/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h b/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
index 9f3e4ed57f4..bf647535a2d 100644
--- a/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Structured_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A structured push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Structured_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A structured push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 #define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index facf5ed49d5..e9079f7bd8d 100644
--- a/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -65,7 +65,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
         argv [0]),
         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index 43e2318f8e7..2ba2db51a86 100644
--- a/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -113,7 +113,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
index 6c2ce6a6810..6ab17265e41 100755
--- a/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
+++ b/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
@@ -68,10 +68,10 @@ $con->DeleteFile ($coniorfile);
    },
 );
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                                 "-o $ns_nsiorfile");
 
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ".
             " -IORoutput $nfs_nfsiorfile";
 
diff --git a/orbsvcs/tests/Notify/Makefile.am b/orbsvcs/tests/Notify/Makefile.am
deleted file mode 100644
index fd57f40dcae..00000000000
--- a/orbsvcs/tests/Notify/Makefile.am
+++ /dev/null
@@ -1,40 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Bug_3252_Regression \
-        PluggableTopology \
-        Test_Filter \
-        XML_Persistence \
-        lib \
-        Structured_Multi_Filter \
-        Structured_Filter \
-        Sequence_Multi_Filter \
-        Sequence_Multi_ETCL_Filter \
-        Reconnecting \
-        RT_lib \
-        Persistent_Filter \
-        Persistent_POA \
-        Ordering \
-        MT_Dispatching \
-        MC \
-        Driver \
-        Discarding \
-        Destroy \
-        Bug_2561_Regression \
-        Bug_1385_Regression \
-        Blocking \
-        Basic \
-        Timeout \
-	Validate_Client
-
-if BUILD_TESTS
-SUBDIRS += performance-tests
-endif
diff --git a/orbsvcs/tests/Notify/Ordering/Makefile.am b/orbsvcs/tests/Notify/Ordering/Makefile.am
deleted file mode 100644
index 5df0e8ce7dd..00000000000
--- a/orbsvcs/tests/Notify/Ordering/Makefile.am
+++ /dev/null
@@ -1,277 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Ordering_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Ordering_Ntf_Seq_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Consumer
-
-Sequence_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Consumer_SOURCES = \
-  Notify_Sequence_Push_Consumer.cpp \
-  Sequence_Consumer.cpp \
-  goC.cpp \
-  Notify_Sequence_Push_Consumer.h
-
-Sequence_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Ordering_Ntf_Seq_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Supplier
-
-Sequence_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Supplier_SOURCES = \
-  Sequence_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
-
-Sequence_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Ordering_Ntf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Ordering_Ntf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h b/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
index 8468813f787..0e63e08d773 100644
--- a/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Ordering
-//
-// = FILENAME
-//   Notify_Sequence_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A sequence push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Sequence_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A sequence push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 #define TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h b/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
index 0d948b295a2..f669d12c7b5 100644
--- a/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Ordering
-//
-// = FILENAME
-//   Notify_Structured_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A structured push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Structured_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A structured push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 #define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index 16015d954ac..603b8e6b1a6 100644
--- a/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -86,7 +86,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
         argv [0]),
         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index bf6ee1b19d8..5af7cd0b8e6 100644
--- a/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -125,7 +125,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index ecf6941a992..4687bc05bbd 100644
--- a/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -83,7 +83,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
         argv [0]),
         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index 3356d0c552d..3ff196671a8 100644
--- a/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -126,7 +126,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Ordering/run_test.pl b/orbsvcs/tests/Notify/Ordering/run_test.pl
index 815c8362fa9..5d8f51278f9 100755
--- a/orbsvcs/tests/Notify/Ordering/run_test.pl
+++ b/orbsvcs/tests/Notify/Ordering/run_test.pl
@@ -65,10 +65,10 @@ foreach my $arg (@ARGV) {
     }
 }
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                           "-ORBEndpoint iiop://$host:$port -o $ns_nsiorfile");
 
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp b/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
index 3176f89fcdd..70e81593cce 100644
--- a/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
+++ b/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
@@ -2,9 +2,7 @@
 
 #include "Filter.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS.h"
-
-ACE_RCSID(Filter, Filter, "Filter.cpp,v 1.13 2002/05/28 20:24:16 pradeep Exp")
+#include "ace/OS_NS_unistd.h"
 
 #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
 #define NAMING_SERVICE_NAME "NameService"
diff --git a/orbsvcs/tests/Notify/Persistent_Filter/Filter.h b/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
index 59f6477c7af..665038d7cd4 100644
--- a/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
+++ b/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Filter.h
-//
-// = DESCRIPTION
-//   Class to demo structured event filtering.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Filter.h
+ *
+ *  $Id$
+ *
+ * Class to demo structured event filtering.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_FILTER_CLIENT_H
 #define NOTIFY_FILTER_CLIENT_H
@@ -29,123 +29,126 @@
 class Filter_StructuredPushConsumer;
 class Filter_StructuredPushSupplier;
 
+/**
+ * @class FilterClient
+ *
+ * @brief Filter Client
+ *
+ * Client example that shows how to do Structured Event filtering
+ * in the Notification Service.
+ */
 class FilterClient
 {
-  // = TITLE
-  //   Filter Client
-  // = DESCRIPTION
-  //   Client example that shows how to do Structured Event filtering
-  //   in the Notification Service.
 
  public:
   // = Initialization and Termination
+  /// Constructor
   FilterClient (void);
-  // Constructor
 
+  /// Destructor
   ~FilterClient ();
-  // Destructor
 
+  /// Init the Client.
   void init_supplier (int argc, ACE_TCHAR *argv []);
   void init_consumer (int argc, ACE_TCHAR *argv []);
-  // Init the Client.
 
+  /// Run the demo.
   void run_supplier ();
   void run_consumer ();
-  // Run the demo.
 
+  /// Consumer calls done, We're done.
   void done (void);
-  // Consumer calls done, We're done.
 
  protected:
 
   int parse_args (int argc,
                   ACE_TCHAR *argv[]);
 
+  /// Initializes the ORB.
   void init_ORB (int& argc, ACE_TCHAR **& argv);
-  // Initializes the ORB.
 
+  /// Try to get hold of a running naming service.
   void resolve_naming_service ();
-  // Try to get hold of a running naming service.
 
+  /// Try to resolve the Notify factory from the Naming service.
   void resolve_Notify_factory ();
-  // Try to resolve the Notify factory from the Naming service.
 
+  /// Create an EC.
   void create_EC ();
   void get_EC ();
-  // Create an EC.
 
+  /// Create the Supplier Admin.
   void create_supplieradmin();
-  // Create the Supplier Admin.
   void get_supplieradmin();
 
+  /// Create the Consumer Admin.
   void create_consumeradmin ();
-  // Create the Consumer Admin.
   void get_consumeradmin ();
 
+  /// Create and initialize the consumers.
   void create_consumers ();
-  // Create and initialize the consumers.
 
+  /// create and initialize the suppliers.
   void create_suppliers ();
-  // create and initialize the suppliers.
 
+  /// send the events.
   void send_events ();
-  // send the events.
 
   void wait_ready ();
 
   void wait_consumer_complete ();
 
-  void verify_filter (CosNotifyFilter::FilterAdmin_var& admin, 
+  void verify_filter (CosNotifyFilter::FilterAdmin_var& admin,
                       const char* constraint_expr,
                       const char* mod_constraint_expr);
 
   // = Data Members
+  /// Reference to the root poa.
   PortableServer::POA_var root_poa_;
-  // Reference to the root poa.
 
+  /// The ORB that we use.
   CORBA::ORB_var orb_;
-  // The ORB that we use.
 
+  /// Handle to the name service.
   CosNaming::NamingContext_var naming_context_;
-  // Handle to the name service.
 
+  /// Channel factory.
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
-  // Channel factory.
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The group operator between admin-proxy's.
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_;
-  // The group operator between admin-proxy's.
 
+  /// Initial qos specified to the factory when creating the EC.
   CosNotification::QoSProperties initial_qos_;
-  // Initial qos specified to the factory when creating the EC.
 
+  /// Initial admin props specified to the factory when creating the EC.
   CosNotification::AdminProperties initial_admin_;
-  // Initial admin props specified to the factory when creating the EC.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_1_;
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_2_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumer #1
   Filter_StructuredPushConsumer* consumer_1;
-  // Consumer #1
 
+  /// Consumer #2
   Filter_StructuredPushConsumer* consumer_2;
-  // Consumer #2
 
+  /// Supplier #1
   Filter_StructuredPushSupplier* supplier_1;
-  // Supplier #1
 
+  /// Supplier #2
   Filter_StructuredPushSupplier* supplier_2;
-  // Supplier #2
 
   CosNotifyChannelAdmin::AdminID adminid_1_id_;
   CosNotifyChannelAdmin::AdminID adminid_2_id_;
-  
+
   CosNotifyChannelAdmin::ChannelID channel_id_;
 
   bool use_persistent_;
@@ -157,45 +160,46 @@ class FilterClient
 };
 
 /*****************************************************************/
+/**
+ * @class Filter_StructuredPushConsumer
+ *
+ * @brief Filter_StructuredPushConsumer
+ *
+ * Consumer for the Filter example.
+ */
 class Filter_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPushConsumer
 {
-  // = TITLE
-  //   Filter_StructuredPushConsumer
-  //
-  // = DESCRIPTION
-  //   Consumer for the Filter example.
-  //
 
  public:
   // = Initialization and Termination code
+  /// Constructor.
   Filter_StructuredPushConsumer (FilterClient* filter, const char *my_name);
-  // Constructor.
 
+  /// Connect the Consumer to the EventChannel.
+  /// Creates a new proxy supplier and connects to it.
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  // Connect the Consumer to the EventChannel.
-  // Creates a new proxy supplier and connects to it.
 
+  /// Disconnect from the supplier.
   virtual void disconnect ();
-  // Disconnect from the supplier.
 
 protected:
   // = Data members
 
+  /// The callback for <done>
   FilterClient* filter_;
-  // The callback for <done>
 
+  /// The name of this consumer.
   ACE_CString my_name_;
-  // The name of this consumer.
 
+  /// The proxy that we are connected to.
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_;
-  // The proxy that we are connected to.
 
+  /// The proxy_supplier id.
   CosNotifyChannelAdmin::ProxyID proxy_supplier_id_;
-  // The proxy_supplier id.
 
   // = Methods
+  /// Destructor
   virtual ~Filter_StructuredPushConsumer (void);
-  // Destructor
 
   // = NotifyPublish method
     virtual void offer_change (
@@ -213,43 +217,44 @@ protected:
 
 /*****************************************************************/
 
+ /**
+  * @class Filter_StructuredPushSupplier
+  *
+  * @brief Filter_StructuredPushSupplier
+  *
+  * Supplier for the filter example.
+  */
 class Filter_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPushSupplier
 {
-  // = TITLE
-  //   Filter_StructuredPushSupplier
-  //
-  // = DESCRIPTION
-  //   Supplier for the filter example.
-  //
  public:
   // = Initialization and Termination code
+  /// Constructor.
   Filter_StructuredPushSupplier (const char* my_name);
-  // Constructor.
 
+  /// Connect the Supplier to the EventChannel.
+  /// Creates a new proxy supplier and connects to it.
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  // Connect the Supplier to the EventChannel.
-  // Creates a new proxy supplier and connects to it.
 
+  /// Disconnect from the supplier.
   void disconnect ();
-  // Disconnect from the supplier.
 
+  /// Send one event.
   virtual void send_event (const CosNotification::StructuredEvent& event);
-  // Send one event.
 
 protected:
   // = Data members
+  /// The name of this consumer.
   ACE_CString my_name_;
-  // The name of this consumer.
 
+  /// The proxy that we are connected to.
   CosNotifyChannelAdmin::StructuredProxyPushConsumer_var proxy_consumer_;
-  // The proxy that we are connected to.
 
+  /// This supplier's id.
   CosNotifyChannelAdmin::ProxyID proxy_consumer_id_;
-  // This supplier's id.
 
   // = Protected Methods
+  /// Destructor
   virtual ~Filter_StructuredPushSupplier ();
-  // Destructor
 
   // = NotifySubscribe
   virtual void subscription_change (
diff --git a/orbsvcs/tests/Notify/Persistent_Filter/Makefile.am b/orbsvcs/tests/Notify/Persistent_Filter/Makefile.am
deleted file mode 100644
index 83d7ba78ff8..00000000000
--- a/orbsvcs/tests/Notify/Persistent_Filter/Makefile.am
+++ /dev/null
@@ -1,95 +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:
-## ../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.consumer.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += consumer
-
-consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-consumer_SOURCES = \
-  Filter.cpp \
-  consumer.cpp \
-  Filter.h
-
-consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.supplier.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += supplier
-
-supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-supplier_SOURCES = \
-  Filter.cpp \
-  supplier.cpp \
-  Filter.h
-
-supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign
-
-## 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/orbsvcs/tests/Notify/Persistent_Filter/NS.conf b/orbsvcs/tests/Notify/Persistent_Filter/NS.conf
index b5fc33c0af7..20a0b65985f 100644
--- a/orbsvcs/tests/Notify/Persistent_Filter/NS.conf
+++ b/orbsvcs/tests/Notify/Persistent_Filter/NS.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static TAO_CosNotify_Service "-AllocateTaskPerProxy -DispatchingThreads 1 -SourceThreads 1 -AllowReconnect -ValidateClient -ValidateClientDelay 1 -ValidateClientInterval 10 "
 
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory()  "-save_base_path ./persistency.notif  -load_base_path  ./persistency.notif  -backup_count 1 -v"
diff --git a/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl b/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl
index d9f1a785e00..7c75cc1a151 100755
--- a/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl
+++ b/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl
@@ -47,10 +47,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $nfs->DeleteFile ($persistent_xml);
 $nfs->DeleteFile ($persistent_000);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                                 "-o $ns_nsiorfile");
 
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBSvcConf $nfs_svc_conf -ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile ";
 
 $SUP = $sup->CreateProcess ("supplier");
@@ -93,9 +93,9 @@ if ($con->PutFile ($nsiorfile) == -1) {
 sub run_test
 {
     my $client_args = shift;
-    
+
     $nfs->DeleteFile ($nfsiorfile);
-    
+
     $NFS->Arguments ($NFS_Args);
     $args = $NFS->Arguments ();
     print STDERR "Running Notification with arguments: $args\n";
@@ -133,7 +133,7 @@ sub run_test
         $NFS->Kill (); $NFS->TimedWait (1);
         exit 1;
     }
-    
+
     $CON_status = $CON->WaitKill ($con->ProcessStartWaitInterval()+$experiment_timeout);
     if ($CON_status != 0) {
         print STDERR "ERROR: Consumer returned $CON_status\n";
diff --git a/orbsvcs/tests/Notify/Persistent_POA/Makefile.am b/orbsvcs/tests/Notify/Persistent_POA/Makefile.am
deleted file mode 100644
index f557f1ca703..00000000000
--- a/orbsvcs/tests/Notify/Persistent_POA/Makefile.am
+++ /dev/null
@@ -1,108 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Persistent_POA_Notify_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  ./goC.cpp \
-  ./goC.h \
-  ./goC.inl \
-  ./goS.cpp \
-  ./goS.h \
-  ./goS.inl
-
-CLEANFILES = \
-  ./go-stamp \
-  ./goC.cpp \
-  ./goC.h \
-  ./goC.inl \
-  ./goS.cpp \
-  ./goS.h \
-  ./goS.inl
-
-./goC.cpp ./goC.h ./goC.inl ./goS.cpp ./goS.h ./goS.inl: ./go-stamp
-
-./go-stamp: $(srcdir)/../Blocking/go.idl $(TAO_IDL_DEP)
-	mkdir -p .
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -o . $(srcdir)/../Blocking/go.idl
-	@touch $@
-
-noinst_PROGRAMS = Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  goC.h \
-  goC.inl \
-  goS.h \
-  goS.inl
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp b/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
index 66f5039e52b..4dc868c7be3 100644
--- a/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
@@ -105,7 +105,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Persistent_POA/run_test.pl b/orbsvcs/tests/Notify/Persistent_POA/run_test.pl
index 5a855a090e0..5b675c57c69 100755
--- a/orbsvcs/tests/Notify/Persistent_POA/run_test.pl
+++ b/orbsvcs/tests/Notify/Persistent_POA/run_test.pl
@@ -50,10 +50,10 @@ $sup->DeleteFile ($nfs2iorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port ".
                             "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBEndpoint iiop://$nfs_host:$nfs_port " .
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
@@ -82,7 +82,7 @@ if ($ns->WaitForFileTimed ($nsiorfile,$ns->ProcessStartWaitInterval()) == -1) {
     exit 1;
 }
 
-print "*********** Starting the first Notify_Service  ***********\n";
+print "*********** Starting the first Notify Service  ***********\n";
 $NFS_status = $NFS->Spawn ();
 if ($NFS_status != 0) {
     print STDERR "ERROR: Notify Service returned $NFS_status\n";
@@ -124,7 +124,7 @@ if ($SUP_status != 0) {
 print "*********** Allowing time to register the ec   ***********\n";
 sleep(3);
 
-print "*********** Killing the first Notify_Service   ***********\n";
+print "*********** Killing the first Notify Service   ***********\n";
 $NFS_status = $NFS->Kill ($nfs->ProcessStopWaitInterval());
 if ($NFS_status != 0) {
     print STDERR "ERROR: Notify Service returned $NFS_status\n";
@@ -134,7 +134,7 @@ if ($NFS_status != 0) {
 }
 sleep(1);
 
-print "*********** Starting the second Notify_Service ***********\n";
+print "*********** Starting the second Notify Service ***********\n";
 my $args = $NFS->Arguments();
 my $l = index($args, $nfs_nfsiorfile);
 substr($args, $l, length($nfs_nfsiorfile)) = $nfs_nfs2iorfile;
diff --git a/orbsvcs/tests/Notify/PluggableTopology/Makefile.am b/orbsvcs/tests/Notify/PluggableTopology/Makefile.am
deleted file mode 100644
index 4760078a202..00000000000
--- a/orbsvcs/tests/Notify/PluggableTopology/Makefile.am
+++ /dev/null
@@ -1,97 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.PlugTop_Lib.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libNotifyPlugTop.la
-
-libNotifyPlugTop_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DPLUGTOP_BUILD_DLL
-
-libNotifyPlugTop_la_SOURCES = \
-  Test_Saver.cpp \
-  Test_Topology_Factory.cpp
-
-noinst_HEADERS = \
-  Test_Saver.h \
-  Test_Topology_Factory.h
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.PlugTop.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = main
-
-main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-main_SOURCES = \
-  main.cpp
-
-main_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf b/orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf
index 008cb4abe88..2f3e1e99e58 100644
--- a/orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf
+++ b/orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf
@@ -1,3 +1,4 @@
-#
+# $Id$
+
 dynamic TopologyFactory Service_Object * NotifyPlugTop:_make_Test_Topology_Factory() ""
 #dynamic TopologyFactory Service_Object * TAO_CosNotification:_make_XML_Topology_Factory() ""
\ No newline at end of file
diff --git a/orbsvcs/tests/Notify/RT_lib/Makefile.am b/orbsvcs/tests/Notify/RT_lib/Makefile.am
deleted file mode 100644
index 1c565445f95..00000000000
--- a/orbsvcs/tests/Notify/RT_lib/Makefile.am
+++ /dev/null
@@ -1,61 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RT_Notify_lib.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_LTLIBRARIES = libTAO_RT_NotifyTests.la
-
-libTAO_RT_NotifyTests_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_RT_NOTIFY_TEST_BUILD_DLL
-
-libTAO_RT_NotifyTests_la_SOURCES = \
-  RT_Application_Command.cpp \
-  RT_Factories_Define.cpp \
-  RT_POA_Command.cpp \
-  RT_Priority_Mapping.cpp
-
-libTAO_RT_NotifyTests_la_LDFLAGS = \
- -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-noinst_HEADERS = \
-  RT_Application_Command.h \
-  RT_POA_Command.h \
-  RT_Priority_Mapping.h
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
index cdb315860a1..c365a16f619 100644
--- a/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
+++ b/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
@@ -2,7 +2,7 @@
 
 #include "RT_Application_Command.h"
 
-ACE_RCSID(lib, TAO_RT_Application_Command, "$Id$")
+
 
 #include "../lib/LookupManager.h"
 #include "RT_Priority_Mapping.h"
diff --git a/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp b/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
index 35be49f7be6..40b4b622f9c 100644
--- a/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
+++ b/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "../lib/Factories_Define.h"
 
-ACE_RCSID(lib, TAO_Notify_Tests_Factories_Define, "$Id$")
+
 
 #include "rt_notify_test_export.h"
 #include "../lib/Name.h"
diff --git a/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index c29c721f8df..42f2427f0ba 100644
--- a/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -2,7 +2,7 @@
 
 #include "RT_POA_Command.h"
 
-ACE_RCSID(lib, TAO_RT_POA_Command, "$Id$")
+
 
 #include "tao/debug.h"
 #include "../lib/LookupManager.h"
diff --git a/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
index 7b9cf2c5d67..ea665041c17 100644
--- a/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
+++ b/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
@@ -2,7 +2,7 @@
 
 #include "RT_Priority_Mapping.h"
 
-ACE_RCSID(lib, RT_Priority_Mapping, "$Id$")
+
 
 #include "../lib/LookupManager.h"
 
diff --git a/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 7607939e5a9..a8c48427f85 100644
--- a/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -8,7 +8,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID (Notify_Tests, Consumer_Main, "$Id$")
+
 
 static const char NOTIFY_FACTORY_NAME[] = "NotifyEventChannelFactory";
 static const char NAMING_SERVICE_NAME[] = "NameService";
diff --git a/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/orbsvcs/tests/Notify/Reconnecting/Consumer.h
index 358c29600c6..7ddaef1a363 100644
--- a/orbsvcs/tests/Notify/Reconnecting/Consumer.h
+++ b/orbsvcs/tests/Notify/Reconnecting/Consumer.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Consumer.h
-//
-// = DESCRIPTION
-//   Test Consumer reconnect to existing channel/admin/proxy Notification Service
-//
-// = AUTHOR
-//    Dale Wilson <wilson_d@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Consumer.h
+ *
+ *  $Id$
+ *
+ * Test Consumer reconnect to existing channel/admin/proxy Notification Service
+ *
+ *
+ *  @author Dale Wilson <wilson_d@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef RECONNECTNG_CONSUMER_H
 #define RECONNECTNG_CONSUMER_H
diff --git a/orbsvcs/tests/Notify/Reconnecting/Makefile.am b/orbsvcs/tests/Notify/Reconnecting/Makefile.am
deleted file mode 100644
index fea25e761a2..00000000000
--- a/orbsvcs/tests/Notify/Reconnecting/Makefile.am
+++ /dev/null
@@ -1,130 +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:
-## ../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.Reconnecting_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Consumer
-
-Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Consumer_SOURCES = \
-  Consumer.cpp \
-  Consumer.h
-
-Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Reconnecting_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Supplier
-
-Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Supplier_SOURCES = \
-  Supplier.cpp \
-  Supplier.h
-
-Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index bd32b35229d..83a78e4a669 100644
--- a/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -8,7 +8,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (Notify_Tests, Supplier_Main, "$Id$")
+
 
 static const char NOTIFY_FACTORY_NAME[] = "NotifyEventChannelFactory";
 static const char NAMING_SERVICE_NAME[] = "NameService";
@@ -232,7 +232,8 @@ Supplier_Main::parse_args (int argc, ACE_TCHAR *argv[])
     }
     else
     {
-      ACE_OS::fprintf(stderr, "Unrecognized argument: %s\n", argv[narg]);
+      ACE_OS::fprintf(stderr, "Unrecognized argument: %s\n",
+                      ACE_TEXT_ALWAYS_CHAR (argv[narg]));
       usage (stderr);
       result = -1;
     }
diff --git a/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/orbsvcs/tests/Notify/Reconnecting/Supplier.h
index 6d998403a03..746bf190a4d 100644
--- a/orbsvcs/tests/Notify/Reconnecting/Supplier.h
+++ b/orbsvcs/tests/Notify/Reconnecting/Supplier.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Supplier.h
-//
-// = DESCRIPTION
-//   Test Supplier reconnect to existing channel/admin/proxy Notification Service
-//
-// = AUTHOR
-//    Dale Wilson <wilson_d@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Supplier.h
+ *
+ *  $Id$
+ *
+ * Test Supplier reconnect to existing channel/admin/proxy Notification Service
+ *
+ *
+ *  @author Dale Wilson <wilson_d@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef RECONNECTNG_SUPPLIER_H
 #define RECONNECTNG_SUPPLIER_H
diff --git a/orbsvcs/tests/Notify/Reconnecting/event.conf b/orbsvcs/tests/Notify/Reconnecting/event.conf
index b1a5edc1876..4b454a220b1 100644
--- a/orbsvcs/tests/Notify/Reconnecting/event.conf
+++ b/orbsvcs/tests/Notify/Reconnecting/event.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 #
 static TAO_CosNotify_Service "-AllowReconnect"
 #
diff --git a/orbsvcs/tests/Notify/Reconnecting/ns_mt.conf b/orbsvcs/tests/Notify/Reconnecting/ns_mt.conf
index 47da73eb47f..a1a23b01338 100644
--- a/orbsvcs/tests/Notify/Reconnecting/ns_mt.conf
+++ b/orbsvcs/tests/Notify/Reconnecting/ns_mt.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 #
 ## -DispatchingThreads N - creates a thread pool for dispatching and consumer side filter eval
 ## -SourceThreads M - creates a thread pool for lookup and supplier side filter eval
diff --git a/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf b/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf
index 02ba9ed52ba..bd5b1a06bc7 100644
--- a/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf
+++ b/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static TAO_CosNotify_Service "-DispatchingThreads 2 -SourceThreads 2 -AllowReconnect"
 #
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-base_path ./reconnect_test"
diff --git a/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf b/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf
index ede1e8d298c..621898f97cc 100644
--- a/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf
+++ b/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static TAO_CosNotify_Service "-DispatchingThreads 2 -SourceThreads 2 -AllowReconnect"
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-base_path ./reconnect_test"
 
diff --git a/orbsvcs/tests/Notify/Reconnecting/ns_st.conf b/orbsvcs/tests/Notify/Reconnecting/ns_st.conf
index 3ff9ed61cbb..a1d4cb4bfea 100644
--- a/orbsvcs/tests/Notify/Reconnecting/ns_st.conf
+++ b/orbsvcs/tests/Notify/Reconnecting/ns_st.conf
@@ -1,4 +1,5 @@
-#
+# $Id$
+
 static TAO_CosNotify_Service "-AllowReconnect"
 
 
diff --git a/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf b/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf
index eb8e1f29923..bef31a80273 100644
--- a/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf
+++ b/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static TAO_CosNotify_Service "-AllowReconnect"
 #
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-v -base_path ./reconnect_test"
diff --git a/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf b/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf
index daf2927299f..4aef148abe4 100644
--- a/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf
+++ b/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 static TAO_CosNotify_Service "-AllowReconnect"
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-v -base_path ./reconnect_test"
diff --git a/orbsvcs/tests/Notify/Reconnecting/run_test.pl b/orbsvcs/tests/Notify/Reconnecting/run_test.pl
index 238e2230830..c480127704c 100755
--- a/orbsvcs/tests/Notify/Reconnecting/run_test.pl
+++ b/orbsvcs/tests/Notify/Reconnecting/run_test.pl
@@ -127,7 +127,7 @@ my $ns_args = "-ORBSvcConf $nfs_svcconf $ns_base_args";
 # Delete the all of the files used in the test
 
 # Define the processes first
-my $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service");
+my $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification");
 my $CON = $con->CreateProcess ("Consumer");
 my $SUP = $sup->CreateProcess ("Supplier");
 
@@ -597,7 +597,7 @@ $nfs->DeleteFile ($save_001);
 $nfs->DeleteFile ($eventpersist);
 $sup->DeleteFile ($supplier_pause);
 
-## Wait a bit to avoid lingering sockets from the previous Notify_Service
+## Wait a bit to avoid lingering sockets from the previous tao_cosnotification
 sleep(3);
 
 $NFS->Arguments("-ORBSvcConf $nfs_st_both $ns_base_args");
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
deleted file mode 100644
index 1ba8d6e2113..00000000000
--- a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
+++ /dev/null
@@ -1,173 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Seq_Multi_ETCL_Filter_Idl.am
-
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Sequence_Consumer
-
-Sequence_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Consumer_SOURCES = \
-  Notify_Sequence_Push_Consumer.cpp \
-  Sequence_Consumer.cpp \
-  goC.cpp \
-  Notify_Sequence_Push_Consumer.h
-
-Sequence_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += Sequence_Supplier
-
-Sequence_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Supplier_SOURCES = \
-  Sequence_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h
-
-Sequence_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
index cdb1c927dc9..a0fcac7d195 100644
--- a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Sequence_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A sequence push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Sequence_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A sequence push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 #define TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index b28b7d70b8c..6a993cc4634 100644
--- a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -64,7 +64,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index b322efcdc1c..d26b4e145fe 100644
--- a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -104,7 +104,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
index bc55c1e5e0c..5339c6bf664 100755
--- a/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
+++ b/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
@@ -42,9 +42,9 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am b/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
deleted file mode 100644
index f9bc71a9cdd..00000000000
--- a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
+++ /dev/null
@@ -1,165 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Seq_Multi_Filter_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Seq_Multi_Filter_Ntf_Seq_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Consumer
-
-Sequence_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Consumer_SOURCES = \
-  Notify_Sequence_Push_Consumer.cpp \
-  Sequence_Consumer.cpp \
-  goC.cpp \
-  Notify_Sequence_Push_Consumer.h
-
-Sequence_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Seq_Multi_Filter_Ntf_Seq_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Supplier
-
-Sequence_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Supplier_SOURCES = \
-  Sequence_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h
-
-Sequence_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h b/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
index d6fc3520099..42105aae12e 100644
--- a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Sequence_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A sequence push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Sequence_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A sequence push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 #define TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index d88b6646b70..63ba5eae30f 100644
--- a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -69,7 +69,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
         argv [0]),
         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index b459ab8a1f1..4a5d5d1375e 100644
--- a/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -105,7 +105,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl b/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
index e07c4db5e43..f01efb1d81a 100755
--- a/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
+++ b/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
@@ -42,9 +42,9 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Structured_Filter/Makefile.am b/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
deleted file mode 100644
index 1a00eeb3ee6..00000000000
--- a/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
+++ /dev/null
@@ -1,165 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Struct_Filter_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Struct_Filter_Ntf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Struct_Filter_Ntf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h b/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
index 3649d2d46a9..0a7047a000a 100644
--- a/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Structured_Filter
-//
-// = FILENAME
-//   Notify_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A structured push consumer implementation.
-//
-// = AUTHOR
-//    Chip Jones <jones_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A structured push consumer implementation.
+ *
+ *
+ *  @author Chip Jones <jones_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef NOTIFY_PUSH_CONSUMER_H
 #define NOTIFY_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index a77b479e09c..1f69fde7e44 100644
--- a/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -90,7 +90,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Structured_Filter/run_test.pl b/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
index 31aeb78a3fc..51105e42a9d 100755
--- a/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
+++ b/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
@@ -45,10 +45,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port ".
                             "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am b/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
deleted file mode 100644
index a07a0d73a7b..00000000000
--- a/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
+++ /dev/null
@@ -1,166 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Struct_Multi_Filter_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Struct_Multi_Filter_Ntf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Struct_Multi_Filter_Ntf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Notify_Push_Supplier.cpp \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Push_Supplier.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h b/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
index 2d17ace210b..28aba1c7f4d 100644
--- a/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Structured_Filter
-//
-// = FILENAME
-//   Notify_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A structured push consumer implementation.
-//
-// = AUTHOR
-//    Chip Jones <jones_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A structured push consumer implementation.
+ *
+ *
+ *  @author Chip Jones <jones_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef NOTIFY_PUSH_CONSUMER_H
 #define NOTIFY_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl b/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
index 77c757099e6..282592ff95d 100755
--- a/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
+++ b/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
@@ -45,10 +45,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                             "-ORBEndpoint iiop://$host:$port ".
                             "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                             "-ORBInitRef NameService=iioploc://" .
                             "$host:$port/NameService " .
                             "-IORoutput $nfs_nfsiorfile -ORBSvcConf " .
diff --git a/orbsvcs/tests/Notify/Test_Filter/Makefile.am b/orbsvcs/tests/Notify/Test_Filter/Makefile.am
deleted file mode 100644
index a02868bb942..00000000000
--- a/orbsvcs/tests/Notify/Test_Filter/Makefile.am
+++ /dev/null
@@ -1,51 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.TAO_RT_NotifyTests_Filter.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_LTLIBRARIES = libTAO_RT_NotifyTests_Filter.la
-
-libTAO_RT_NotifyTests_Filter_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_RT_Test_Filter_BUILD_DLL
-
-libTAO_RT_NotifyTests_Filter_la_SOURCES = \
-  RT_Test_Filter.cpp \
-  RT_Test_FilterFactory.cpp
-
-noinst_HEADERS = \
-  RT_Test_Filter.h \
-  RT_Test_FilterFactory.h
-
-endif BUILD_RT_CORBA
-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/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
index 6db332ceea9..8b86e1cdeb2 100644
--- a/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+++ b/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
@@ -2,7 +2,7 @@
 
 #include "RT_Test_Filter.h"
 
-ACE_RCSID(Notify, TAO_RT_Test_Filter, "$Id$")
+
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
diff --git a/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
index f5a5401b6d2..ec9df0597f2 100644
--- a/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
+++ b/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
@@ -2,7 +2,7 @@
 
 #include "RT_Test_FilterFactory.h"
 
-ACE_RCSID(Notify, TAO_RT_Test_FilterFactory, "$Id$")
+
 
 #include "RT_Test_Filter.h"
 #include "tao/debug.h"
@@ -86,13 +86,13 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create_mapping_filter (const char * /*co
   throw CORBA::NO_IMPLEMENT ();
 }
 
-TAO_Notify_Object::ID 
+TAO_Notify_Object::ID
 TAO_Notify_Tests_RT_Test_FilterFactory::get_filter_id (CosNotifyFilter::Filter_ptr /*filter*/)
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
-CosNotifyFilter::Filter_ptr 
+CosNotifyFilter::Filter_ptr
 TAO_Notify_Tests_RT_Test_FilterFactory::get_filter (const TAO_Notify_Object::ID& /*id*/)
 {
   throw CORBA::NO_IMPLEMENT ();
@@ -105,7 +105,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::release (void)
   //@@ inform factory
 }
 
-void 
+void
 TAO_Notify_Tests_RT_Test_FilterFactory::save_persistent (TAO_Notify::Topology_Saver& /*saver*/)
 {
   throw CORBA::NO_IMPLEMENT ();
diff --git a/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
index 34d0240c104..2249dcaef0e 100644
--- a/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
+++ b/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
@@ -59,7 +59,7 @@ public:
   virtual TAO_Notify_Object::ID get_filter_id (CosNotifyFilter::Filter_ptr filter);
   virtual CosNotifyFilter::Filter_ptr get_filter (const TAO_Notify_Object::ID& id);
   virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
-    
+
 protected:
   /// Release this object.
   virtual void release (void);
diff --git a/orbsvcs/tests/Notify/ThreadPool/consumer.conf b/orbsvcs/tests/Notify/ThreadPool/consumer.conf
index 872c66654d7..e603c22efa9 100644
--- a/orbsvcs/tests/Notify/ThreadPool/consumer.conf
+++ b/orbsvcs/tests/Notify/ThreadPool/consumer.conf
@@ -1,5 +1,7 @@
+# $Id$
+
 ##---- Load the Factories------
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
 # Uncomment this line to use SCHED_FIFO
 #dynamic TAO_RT_ORB_Loader Service_Object * TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/orbsvcs/tests/Notify/ThreadPool/notify.conf b/orbsvcs/tests/Notify/ThreadPool/notify.conf
index f56362f30ea..50c432612e5 100644
--- a/orbsvcs/tests/Notify/ThreadPool/notify.conf
+++ b/orbsvcs/tests/Notify/ThreadPool/notify.conf
@@ -1,8 +1,10 @@
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
+# $Id$
+
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
 # Uncomment this line to use SCHED_FIFO
-#dynamic TAO_RT_ORB_Loader Service_Object * TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"         
+#dynamic TAO_RT_ORB_Loader Service_Object * TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 #
-dynamic TAO_Notify_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_Notify_Tests_RT_Test_FilterFactory () ""        
-dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""         
+dynamic TAO_Notify_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_Notify_Tests_RT_Test_FilterFactory () ""
+dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
 
diff --git a/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/orbsvcs/tests/Notify/ThreadPool/run_test.pl
index 95f9b1ce05a..49f88ff5158 100755
--- a/orbsvcs/tests/Notify/ThreadPool/run_test.pl
+++ b/orbsvcs/tests/Notify/ThreadPool/run_test.pl
@@ -51,10 +51,10 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", 
+$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                           " -o $ns_nsiorfile");
 
-$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile";
 
 $SUP = $sup->CreateProcess ("../Driver/Notify_Tests_Driver");
diff --git a/orbsvcs/tests/Notify/ThreadPool/supplier.conf b/orbsvcs/tests/Notify/ThreadPool/supplier.conf
index 7ef7b0b4b1c..846fb7a81c4 100644
--- a/orbsvcs/tests/Notify/ThreadPool/supplier.conf
+++ b/orbsvcs/tests/Notify/ThreadPool/supplier.conf
@@ -11,7 +11,7 @@
 ##
 #
 ##---- Load the Factories------
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
 #
 # Uncomment this line to use SCHED_FIFO
 #dynamic TAO_RT_ORB_Loader Service_Object * TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
diff --git a/orbsvcs/tests/Notify/Timeout/Makefile.am b/orbsvcs/tests/Notify/Timeout/Makefile.am
deleted file mode 100644
index e35bb52531c..00000000000
--- a/orbsvcs/tests/Notify/Timeout/Makefile.am
+++ /dev/null
@@ -1,165 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Timeout_Idl.am
-
-BUILT_SOURCES = \
-  sigC.cpp \
-  sigC.h \
-  sigC.inl \
-  sigS.cpp \
-  sigS.h \
-  sigS.inl
-
-CLEANFILES = \
-  sig-stamp \
-  sigC.cpp \
-  sigC.h \
-  sigC.inl \
-  sigS.cpp \
-  sigS.h \
-  sigS.inl
-
-sigC.cpp sigC.h sigC.inl sigS.cpp sigS.h sigS.inl: sig-stamp
-
-sig-stamp: $(srcdir)/sig.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/sig.idl
-	@touch "$@"
-
-noinst_HEADERS = \
-  sig.idl
-
-## Makefile.Timeout_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  sigC.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Timeout_Supplier.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  sigC.cpp \
-  sigS.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp b/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp
index dd542ab52e6..7c75f2e34ea 100644
--- a/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp
@@ -47,7 +47,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
             argv [0]),
             -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp b/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
index 8e1ad42cc2f..f358d6d62c5 100644
--- a/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
@@ -86,7 +86,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/Timeout/run_test.pl b/orbsvcs/tests/Notify/Timeout/run_test.pl
index 55eb2bc6d09..04384ec2fa9 100755
--- a/orbsvcs/tests/Notify/Timeout/run_test.pl
+++ b/orbsvcs/tests/Notify/Timeout/run_test.pl
@@ -49,9 +49,9 @@ $nfs->DeleteFile ($nfsiorfile);
 $sup->DeleteFile ($supiorfile);
 $con->DeleteFile ($supiorfile);
 
-my $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
+my $NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming",
                              "-o $ns_nsiorfile");
-my $NFS = $ns->CreateProcess ("../../../Notify_Service/Notify_Service",
+my $NFS = $ns->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                               "-ORBInitRef NameService=file://$nfs_nsiorfile " .
                               "-IORoutput $nfs_nfsiorfile -Timeout 750");
 my $SUP = $ns->CreateProcess("Structured_Supplier",
@@ -137,7 +137,7 @@ if ($con->PutFile ($supiorfile) == -1) {
 }
 
 ## Wait for the supplier to create the event channel in
-## the Notify_Service and register it with the Name Service
+## the tao_cosnotification and register it with the Name Service
 sleep(2);
 
 $CON_status = $CON->SpawnWaitKill ($con->ProcessStartWaitInterval()+5);
diff --git a/orbsvcs/tests/Notify/Validate_Client/Makefile.am b/orbsvcs/tests/Notify/Validate_Client/Makefile.am
deleted file mode 100644
index 93b3f902784..00000000000
--- a/orbsvcs/tests/Notify/Validate_Client/Makefile.am
+++ /dev/null
@@ -1,51 +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:
-## /tao_builds/phil/wustl/ACE+TAO+CIAO/ACE_wrappers/build/native/bin/mwc.pl -type automake
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Validate_Client_Proxy_Dummy.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = proxy_dummy
-
-proxy_dummy_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-proxy_dummy_SOURCES = \
-  proxy_dummy.cpp
-
-proxy_dummy_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign
-
-## 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/orbsvcs/tests/Notify/Validate_Client/notify.conf b/orbsvcs/tests/Notify/Validate_Client/notify.conf
index 2d7e425ac16..4bd43d29c0c 100644
--- a/orbsvcs/tests/Notify/Validate_Client/notify.conf
+++ b/orbsvcs/tests/Notify/Validate_Client/notify.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static TAO_CosNotify_Service "-AllocateTaskPerProxy -DispatchingThreads 1 -SourceThreads 1 -AllowReconnect -ValidateClient -ValidateClientDelay 1 -ValidateClientInterval 2"
 
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory()  "-save_base_path ./persistency.notif  -load_base_path  ./persistency.notif  -backup_count 1 -v"
diff --git a/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp b/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
index 79f179f8bfb..4e55535a11e 100644
--- a/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
+++ b/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
@@ -6,10 +6,6 @@
 #include "tao/PortableServer/POAC.h"
 #include "tao/PortableServer/POAManagerC.h"
 
-ACE_RCSID (Validate_Client,
-           gen_data,
-           "$Id$")
-
 const ACE_TCHAR *output_filename = ACE_TEXT ("persistence.notify.xml");
 
 // must be char
@@ -133,7 +129,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -176,8 +172,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                            output_file),
                            1);
       const char * dummy_consumer_proxy = ior.in();
-      
-      ACE_OS::fprintf (output_file, format, 
+
+      ACE_OS::fprintf (output_file, format,
                        dummy_consumer_proxy, dummy_consumer_proxy,
                        dummy_consumer_proxy, dummy_consumer_proxy);
       ACE_OS::fclose (output_file);
diff --git a/orbsvcs/tests/Notify/Validate_Client/run_test.pl b/orbsvcs/tests/Notify/Validate_Client/run_test.pl
index e58ae336829..bd749040b32 100755
--- a/orbsvcs/tests/Notify/Validate_Client/run_test.pl
+++ b/orbsvcs/tests/Notify/Validate_Client/run_test.pl
@@ -39,7 +39,7 @@ $server->DeleteFile($iorbase);
 $client->DeleteFile ($persistent_file_xml);
 $client->DeleteFile ($persistent_file_000);
 
-$SV = $server->CreateProcess ("../../../Notify_Service/Notify_Service",
+$SV = $server->CreateProcess ("../../../Notify_Service/tao_cosnotification",
                               "-ORBdebuglevel $debug_level " .
                               "-NoNameSvc " .
                               "-IORoutput $server_iorfile " .
diff --git a/orbsvcs/tests/Notify/XML_Persistence/Makefile.am b/orbsvcs/tests/Notify/XML_Persistence/Makefile.am
deleted file mode 100644
index ea6e19e65b1..00000000000
--- a/orbsvcs/tests/Notify/XML_Persistence/Makefile.am
+++ /dev/null
@@ -1,69 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.XML_Persistence.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = main
-
-main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-main_SOURCES = \
-  main.cpp
-
-main_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/XML_Persistence/svc.conf b/orbsvcs/tests/Notify/XML_Persistence/svc.conf
index c0d276565cb..b748463e64a 100644
--- a/orbsvcs/tests/Notify/XML_Persistence/svc.conf
+++ b/orbsvcs/tests/Notify/XML_Persistence/svc.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 1"
 dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-v -save_base_path ./abc -load_base_path ./loadtest -backup_count 2 -no_timestamp"
diff --git a/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
index 7c1933fb08c..afe3264bded 100644
--- a/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+++ b/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
@@ -3,11 +3,6 @@
 #include "Activation_Manager.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_netdb.h"
-
-ACE_RCSID (lib,
-           TAO_Activation_Manager,
-           "$Id$")
-
 #include "LookupManager.h"
 #include "Command_Builder.h"
 #include "Name.h"
diff --git a/orbsvcs/tests/Notify/lib/Application_Command.cpp b/orbsvcs/tests/Notify/lib/Application_Command.cpp
index 4cad93833a9..d7d2f4b7575 100644
--- a/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -2,7 +2,7 @@
 
 #include "Application_Command.h"
 
-ACE_RCSID(lib, TAO_Application_Command, "$Id$")
+
 
 #include "tao/PortableServer/PortableServer.h"
 #include "LookupManager.h"
diff --git a/orbsvcs/tests/Notify/lib/Command.cpp b/orbsvcs/tests/Notify/lib/Command.cpp
index 1704b36dcc1..9e483b37962 100644
--- a/orbsvcs/tests/Notify/lib/Command.cpp
+++ b/orbsvcs/tests/Notify/lib/Command.cpp
@@ -7,7 +7,7 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(lib, TAO_Command, "$Id$")
+
 
 TAO_Notify_Tests_Command::TAO_Notify_Tests_Command (void)
   :next_ (0), command_ (INVALID)
diff --git a/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/orbsvcs/tests/Notify/lib/Command_Builder.cpp
index 071f6da5141..debce6d572b 100644
--- a/orbsvcs/tests/Notify/lib/Command_Builder.cpp
+++ b/orbsvcs/tests/Notify/lib/Command_Builder.cpp
@@ -7,7 +7,7 @@
 #include "Command_Factory.h"
 #include "Name.h"
 
-ACE_RCSID(lib, TAO_Command_Builder, "$Id$")
+
 
 TAO_Notify_Tests_Command_Builder::TAO_Notify_Tests_Command_Builder (void)
   :start_command_ (0)
diff --git a/orbsvcs/tests/Notify/lib/Command_Factory.cpp b/orbsvcs/tests/Notify/lib/Command_Factory.cpp
index 5005641fe4a..792a1cf69bb 100644
--- a/orbsvcs/tests/Notify/lib/Command_Factory.cpp
+++ b/orbsvcs/tests/Notify/lib/Command_Factory.cpp
@@ -3,7 +3,7 @@
 
 #include "Command_Factory.h"
 
-ACE_RCSID(lib, TAO_Command_Factory, "$Id$")
+
 
 TAO_Notify_Tests_Command_Factory::TAO_Notify_Tests_Command_Factory (void)
 {
diff --git a/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp b/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
index a4bca1a5c56..a1f7102c400 100644
--- a/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
+++ b/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
@@ -5,7 +5,7 @@
 
 #include "Command_Factory_T.h"
 
-ACE_RCSID(Notify, TAO_Command_Factory_T, "$Id$")
+
 
 #include "ace/Dynamic_Service.h"
 #include "tao/debug.h"
diff --git a/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
index dc6d3d6a7e1..ddb0f7ad687 100644
--- a/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
+++ b/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
@@ -2,7 +2,7 @@
 
 #include "ConsumerAdmin_Command.h"
 
-ACE_RCSID(lib, TAO_ConsumerAdmin_Command, "$Id$")
+
 
 #include "LookupManager.h"
 #include "Name.h"
diff --git a/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index 7647879b111..19e8d2357ac 100644
--- a/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -4,7 +4,7 @@
 
 #include "Consumer_T.h"
 
-ACE_RCSID(Notify, TAO_Notify_Tests_Consumer_T, "$Id$")
+
 
 template <class Consumer_Traits>
 TAO_Notify_Tests_Consumer_T<Consumer_Traits>::TAO_Notify_Tests_Consumer_T (void)
diff --git a/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
index e4550193bd1..93e07d08887 100644
--- a/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
+++ b/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "Direct_Consumer.h"
 
-ACE_RCSID(lib, TAO_Direct_Consumer, "$Id$")
+
 
 #include "LookupManager.h"
 
diff --git a/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
index a57d98f22ef..a3dfe8a7080 100644
--- a/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
+++ b/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
@@ -6,7 +6,7 @@
 #include "Direct_Supplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_Tests_Direct_Supplier, "$Id$")
+
 
 #include "LookupManager.h"
 
diff --git a/orbsvcs/tests/Notify/lib/Driver.cpp b/orbsvcs/tests/Notify/lib/Driver.cpp
index 871ea1c1872..742e65d3281 100644
--- a/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -2,7 +2,7 @@
 
 #include "Driver.h"
 
-ACE_RCSID(lib, TAO_Driver, "$Id$")
+
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Thread_Manager.h"
diff --git a/orbsvcs/tests/Notify/lib/Driver.h b/orbsvcs/tests/Notify/lib/Driver.h
index 0b2697da8f7..3069f2c13c3 100644
--- a/orbsvcs/tests/Notify/lib/Driver.h
+++ b/orbsvcs/tests/Notify/lib/Driver.h
@@ -37,12 +37,6 @@ class TAO_Notify_Tests_Activation_Manager;
  */
 class TAO_Notify_Tests_Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   TAO_Notify_Tests_Worker (void);
   // ctor
@@ -62,14 +56,13 @@ private:
 
 
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class TAO_Notify_Tests_ORB_Run_Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   TAO_Notify_Tests_ORB_Run_Worker (void);
   // ctor
diff --git a/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index caa4a37b107..3f424e30fca 100644
--- a/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -3,7 +3,7 @@
 #include "EventChannel_Command.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(lib, TAO_EventChannel_Command, "$Id$")
+
 
 #include "LookupManager.h"
 #include "Name.h"
diff --git a/orbsvcs/tests/Notify/lib/Factories_Define.cpp b/orbsvcs/tests/Notify/lib/Factories_Define.cpp
index 337e8651108..346d3876902 100644
--- a/orbsvcs/tests/Notify/lib/Factories_Define.cpp
+++ b/orbsvcs/tests/Notify/lib/Factories_Define.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "Factories_Define.h"
 
-ACE_RCSID(lib, TAO_Notify_Tests_Factories_Define, "$Id$")
+
 
 #include "Name.h"
 #include "Command_Factory_T.h"
diff --git a/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/orbsvcs/tests/Notify/lib/Filter_Command.cpp
index af99168980b..083b6711bb6 100644
--- a/orbsvcs/tests/Notify/lib/Filter_Command.cpp
+++ b/orbsvcs/tests/Notify/lib/Filter_Command.cpp
@@ -3,7 +3,7 @@
 #include "Filter_Command.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(lib, TAO_Filter_Command, "$Id$")
+
 
 #include "LookupManager.h"
 #include "Name.h"
diff --git a/orbsvcs/tests/Notify/lib/LookupManager.cpp b/orbsvcs/tests/Notify/lib/LookupManager.cpp
index 67b09574776..1524e8e0a3d 100644
--- a/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -3,7 +3,7 @@
 #include "LookupManager.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(lib, TAO_LookupManager, "$Id$")
+
 
 #include "Name.h"
 
diff --git a/orbsvcs/tests/Notify/lib/Makefile.am b/orbsvcs/tests/Notify/lib/Makefile.am
deleted file mode 100644
index 1fc6f37334b..00000000000
--- a/orbsvcs/tests/Notify/lib/Makefile.am
+++ /dev/null
@@ -1,174 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.NotifyTests_Lib.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  Activation_ManagerC.cpp \
-  Activation_ManagerC.h \
-  Activation_ManagerC.inl \
-  Activation_ManagerS.cpp \
-  Activation_ManagerS.h \
-  Activation_ManagerS.inl
-
-CLEANFILES = \
-  Activation_Manager-stamp \
-  Activation_ManagerC.cpp \
-  Activation_ManagerC.h \
-  Activation_ManagerC.inl \
-  Activation_ManagerS.cpp \
-  Activation_ManagerS.h \
-  Activation_ManagerS.inl
-
-Activation_ManagerC.cpp Activation_ManagerC.h Activation_ManagerC.inl Activation_ManagerS.cpp Activation_ManagerS.h Activation_ManagerS.inl: Activation_Manager-stamp
-
-Activation_Manager-stamp: $(srcdir)/Activation_Manager.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Activation_Manager.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libTAO_NotifyTests.la
-
-libTAO_NotifyTests_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_NOTIFY_TEST_BUILD_DLL
-
-libTAO_NotifyTests_la_SOURCES = \
-  Activation_Manager.cpp \
-  Activation_ManagerC.cpp \
-  Activation_ManagerS.cpp \
-  Application_Command.cpp \
-  Command.cpp \
-  Command_Builder.cpp \
-  Command_Factory.cpp \
-  ConsumerAdmin_Command.cpp \
-  Direct_Consumer.cpp \
-  Direct_Supplier.cpp \
-  Driver.cpp \
-  EventChannel_Command.cpp \
-  Factories_Define.cpp \
-  Filter_Command.cpp \
-  LookupManager.cpp \
-  Name.cpp \
-  Notify_Test_Client.cpp \
-  Options_Parser.cpp \
-  Peer.cpp \
-  Periodic_Consumer.cpp \
-  Periodic_Consumer_Command.cpp \
-  Periodic_Supplier.cpp \
-  Periodic_Supplier_Command.cpp \
-  Priority_Mapping.cpp \
-  PushConsumer.cpp \
-  PushSupplier.cpp \
-  Relay_Consumer.cpp \
-  SequencePushConsumer.cpp \
-  SequencePushSupplier.cpp \
-  StructuredEvent.cpp \
-  StructuredPushConsumer.cpp \
-  StructuredPushSupplier.cpp \
-  SupplierAdmin_Command.cpp \
-  Task_Callback.cpp \
-  Task_Stats.cpp \
-  common.cpp
-
-noinst_HEADERS = \
-  Activation_Manager.h \
-  Activation_Manager.idl \
-  Activation_ManagerC.h \
-  Activation_ManagerC.inl \
-  Activation_ManagerS.h \
-  Activation_ManagerS.inl \
-  Application_Command.h \
-  Command.h \
-  Command_Builder.h \
-  Command_Factory.h \
-  Command_Factory_T.cpp \
-  Command_Factory_T.h \
-  ConsumerAdmin_Command.h \
-  Consumer_T.cpp \
-  Consumer_T.h \
-  Direct_Consumer.h \
-  Direct_Supplier.h \
-  Direct_Supplier.inl \
-  Driver.h \
-  Driver_Base.h \
-  EventChannel_Command.h \
-  Factories_Define.h \
-  Filter_Command.h \
-  LookupManager.h \
-  Name.h \
-  Notify_PushConsumer.h \
-  Notify_PushSupplier.h \
-  Notify_SequencePushConsumer.h \
-  Notify_SequencePushSupplier.h \
-  Notify_StructuredPushConsumer.h \
-  Notify_StructuredPushSupplier.h \
-  Notify_Test_Client.h \
-  Options_Parser.h \
-  Peer.h \
-  Peer.inl \
-  Peer_T.cpp \
-  Peer_T.h \
-  Periodic_Consumer.h \
-  Periodic_Consumer_Command.h \
-  Periodic_Supplier.h \
-  Periodic_Supplier_Command.h \
-  Priority_Mapping.h \
-  PushConsumer.h \
-  PushConsumer.inl \
-  PushSupplier.h \
-  PushSupplier.inl \
-  Relay_Consumer.h \
-  Relay_Consumer.inl \
-  SequencePushConsumer.h \
-  SequencePushConsumer.inl \
-  SequencePushSupplier.h \
-  SequencePushSupplier.inl \
-  StructuredEvent.h \
-  StructuredPushConsumer.h \
-  StructuredPushConsumer.inl \
-  StructuredPushSupplier.h \
-  StructuredPushSupplier.inl \
-  SupplierAdmin_Command.h \
-  Supplier_T.cpp \
-  Supplier_T.h \
-  Task_Callback.h \
-  Task_Stats.h \
-  Task_Stats.inl \
-  common.h \
-  notify_test_export.h
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/lib/Name.cpp b/orbsvcs/tests/Notify/lib/Name.cpp
index b8a3081afbe..44b649dffb7 100644
--- a/orbsvcs/tests/Notify/lib/Name.cpp
+++ b/orbsvcs/tests/Notify/lib/Name.cpp
@@ -2,7 +2,7 @@
 
 #include "Name.h"
 
-ACE_RCSID(lib, TAO_Name, "$Id$")
+
 
 #define TAO_Notify_Tests_DECLARE_NAME(target, name) \
 const char* const TAO_Notify_Tests_Name::target = name;
diff --git a/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h b/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
index 0a66baa40e3..274e3ca068b 100644
--- a/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
+++ b/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
@@ -1,28 +1,25 @@
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Notify_PushConsumer.h
-//
-// = DESCRIPTION
-//   This is a utility class is to be used by clients of the Notification
-//   Service to implement the servant for CosNotifyComm::PushConsumer
-//
-// = HOW-TO
-//   1. Derive from Notify_ProxyConsumer and implement <push>.
-//   2. Create the servant on the heap.(refcounted servant).
-//   3. Initialize the object, provide a POA.
-//   4. To connect, call <connect>, this will activate the object in the POA.
-//       You must provide a ConsumerAdmin to <connect>.
-//   5. To disconnect, call <disconnect> this will also deactivate the object.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_PushConsumer.h
+ *
+ *  $Id$
+ *
+ * This is a utility class is to be used by clients of the Notification
+ * Service to implement the servant for CosNotifyComm::PushConsumer
+ *
+ * = HOW-TO
+ * 1. Derive from Notify_ProxyConsumer and implement <push>.
+ * 2. Create the servant on the heap.(refcounted servant).
+ * 3. Initialize the object, provide a POA.
+ * 4. To connect, call <connect>, this will activate the object in the POA.
+ *     You must provide a ConsumerAdmin to <connect>.
+ * 5. To disconnect, call <disconnect> this will also deactivate the object.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_NOTIFY_PUSHCONSUMER_H
 #define TAO_NOTIFY_PUSHCONSUMER_H
diff --git a/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h b/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
index 453abae9d5a..7f3485a5b43 100644
--- a/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
+++ b/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Notify_SequencePushConsumer.h
-//
-// = DESCRIPTION
-//   This is a utility class is to be used by clients of the Notification
-//   Service to implement the servant for CosNotifyComm::SequencePushConsumer
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_SequencePushConsumer.h
+ *
+ *  $Id$
+ *
+ * This is a utility class is to be used by clients of the Notification
+ * Service to implement the servant for CosNotifyComm::SequencePushConsumer
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_SEQUENCEPUSHCONSUMER_H
 #define NOTIFY_SEQUENCEPUSHCONSUMER_H
diff --git a/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h b/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
index 74fd09d4498..b43bbbc41d7 100644
--- a/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
+++ b/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
@@ -1,21 +1,16 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Notify_SequencePushSupplier
-//
-// = DESCRIPTION
-//   This class is to be used by clients of the Notification Service
-//   to implement Sequence Push Suppliers.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_SequencePushSupplier.h
+ *
+ *  $Id$
+ *
+ * This class is to be used by clients of the Notification Service
+ * to implement Sequence Push Suppliers.
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
 
 #ifndef TAO_NOTIFY_SEQUENCEPUSHSUPPLIER_H
 #define TAO_NOTIFY_SEQUENCEPUSHSUPPLIER_H
diff --git a/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h b/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
index 8364a0394b3..292b6a7c595 100644
--- a/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
+++ b/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Notify_StructuredPushConsumer.h
-//
-// = DESCRIPTION
-//   This is a utility class is to be used by clients of the Notification
-//   Service to implement the servant for CosNotifyComm::PushConsumer
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_StructuredPushConsumer.h
+ *
+ *  $Id$
+ *
+ * This is a utility class is to be used by clients of the Notification
+ * Service to implement the servant for CosNotifyComm::PushConsumer
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_STRUCTUREDPUSHCONSUMER_H
 #define NOTIFY_STRUCTUREDPUSHCONSUMER_H
diff --git a/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h b/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
index ecc804ae3aa..dde3618d7c1 100644
--- a/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
+++ b/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
@@ -1,21 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Notify_StructuredPushSupplier
-//
-// = DESCRIPTION
-//   This class is to be used by clients of the Notification Service
-//   to implement Structured Push Suppliers.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_StructuredPushSupplier.h
+ *
+ *  $Id$
+ *
+ * This class is to be used by clients of the Notification Service
+ * to implement Structured Push Suppliers.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
 
 #ifndef TAO_NOTIFY_STRUCTUREDPUSHSUPPLIER_H
 #define TAO_NOTIFY_STRUCTUREDPUSHSUPPLIER_H
diff --git a/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
index fb95de7463a..346a41a23e8 100644
--- a/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
+++ b/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "Notify_Test_Client.h"
-
-ACE_RCSID (lib,
-           Notify_Test_Client,
-           "$Id$")
-
 #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
 #define NAMING_SERVICE_NAME "NameService"
 
diff --git a/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
index 8df3e0f673f..07baebcd5e4 100644
--- a/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
+++ b/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
@@ -1,17 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Notify_Test_Client.h
-//
-// = DESCRIPTION
-//   Prototype Test Driver for all the Notify tests.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Test_Client.h
+ *
+ *  $Id$
+ *
+ * Prototype Test Driver for all the Notify tests.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_TEST_CLIENT_H
 #define NOTIFY_TEST_CLIENT_H
@@ -25,87 +25,90 @@
 
 class TAO_Notify_Tests_Peer;
 
+/**
+ * @class Notify_Test_Client
+ *
+ * @brief Notify_Test_Client
+ *
+ * Shows how consumers Notify_Test_Client for events.
+ */
 class TAO_NOTIFY_TEST_Export Notify_Test_Client
 {
-  // = TITLE
-  //   Notify_Test_Client
-  // = DESCRIPTION
-  //   Shows how consumers Notify_Test_Client for events.
 
 public:
   // = Initialization and Termination
   Notify_Test_Client (void);
   virtual ~Notify_Test_Client ();
 
+  /// starts the orb and resolves the notify factory via a naming service.
   virtual int init (int argc, ACE_TCHAR *argv []);
-  // starts the orb and resolves the notify factory via a naming service.
 
+  /// Allow the user to override this empty method
   virtual int parse_args (int argc, ACE_TCHAR* argv[]);
-  // Allow the user to override this empty method
 
+  /// Call ORB::run to accept requests.
   int ORB_run (void);
   int ORB_run (ACE_Time_Value& tv);
-  // Call ORB::run to accept requests.
 
+  /// How many clients will call consumer_done.
   void consumer_start (TAO_Notify_Tests_Peer*);
-  // How many clients will call consumer_done.
 
+  /// Callback for clients to unregister themselves.
   void consumer_done (TAO_Notify_Tests_Peer*);
-  // Callback for clients to unregister themselves.
 
+  /// Access the done boolean.
   bool is_done (void) const;
-  // Access the done boolean.
 
+  /// Access the ORB.  This class retains ownership.
   CORBA::ORB_ptr orb (void);
-  // Access the ORB.  This class retains ownership.
 
+  /// Access the Root POA.  This class retains ownership.
   PortableServer::POA_ptr root_poa (void);
-  // Access the Root POA.  This class retains ownership.
 
+  /// Access the Naming Context.  This class retains ownership.
   CosNaming::NamingContext_ptr naming_context (void);
-  // Access the Naming Context.  This class retains ownership.
 
+  /// Access the Notify Factory.  This class retains ownership.
   CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void);
-  // Access the Notify Factory.  This class retains ownership.
 
+  /// Create an Event Channel.  Ownership is passed to the caller.
   CosNotifyChannelAdmin::EventChannel_ptr create_event_channel (
                                               const char* name,
                                               bool resolve
                                             );
-  // Create an Event Channel.  Ownership is passed to the caller.
 
 protected:
+  /// Initializes the ORB.
   int init_ORB (int argc,
                 ACE_TCHAR *argv []);
-  // Initializes the ORB.
 
+  /// Try to get hold of a running naming service.
   void resolve_naming_service (void);
-  // Try to get hold of a running naming service.
 
+  /// Try to resolve the Notify factory from the Naming service.
   void resolve_Notify_factory (void);
-  // Try to resolve the Notify factory from the Naming service.
 
   // = Data Members
+  /// Reference to the root poa.
   PortableServer::POA_var root_poa_;
-  // Reference to the root poa.
 
+  /// The ORB that we use.
   CORBA::ORB_var orb_;
-  // The ORB that we use.
 
+  /// Handle to the name service.
   CosNaming::NamingContext_var naming_context_;
-  // Handle to the name service.
 
+  /// Channel factory.
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
-  // Channel factory.
 
+  /// The group operator between admin-proxy's.
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_;
-  // The group operator between admin-proxy's.
 
+  /// Initial qos specified to the factory when creating the EC.
   CosNotification::QoSProperties initial_qos_;
-  // Initial qos specified to the factory when creating the EC.
 
+  /// Initial admin props specified to the factory when creating the EC.
   CosNotification::AdminProperties initial_admin_;
-  // Initial admin props specified to the factory when creating the EC.
 
 private:
   ACE_Atomic_Op< TAO_SYNCH_MUTEX, int > num_clients_;
diff --git a/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index d60d6a1cfbf..032255f285c 100644
--- a/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "Options_Parser.h"
-
-ACE_RCSID (lib,
-           TAO_Options_Parser,
-           "$Id$")
-
 #include "orbsvcs/NotifyExtC.h"
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
diff --git a/orbsvcs/tests/Notify/lib/Options_Parser.h b/orbsvcs/tests/Notify/lib/Options_Parser.h
index 743073b3248..27542746489 100644
--- a/orbsvcs/tests/Notify/lib/Options_Parser.h
+++ b/orbsvcs/tests/Notify/lib/Options_Parser.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_OPTIONS_PARSER_H
diff --git a/orbsvcs/tests/Notify/lib/Peer.cpp b/orbsvcs/tests/Notify/lib/Peer.cpp
index f4b14d6cdf8..2012aeebbb3 100644
--- a/orbsvcs/tests/Notify/lib/Peer.cpp
+++ b/orbsvcs/tests/Notify/lib/Peer.cpp
@@ -6,10 +6,6 @@
 #include "Peer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (lib,
-           TAO_Peer,
-           "$Id$")
-
 #include "Name.h"
 #include "LookupManager.h"
 #include "Options_Parser.h"
diff --git a/orbsvcs/tests/Notify/lib/Peer_T.cpp b/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 2f54bdbbf88..62a30ea9a2a 100644
--- a/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -5,10 +5,6 @@
 
 #include "Peer_T.h"
 
-ACE_RCSID (Notify,
-           TAO_Notify_Tests_Peer_T,
-           "$Id$")
-
 #include "ace/Arg_Shifter.h"
 #include "Name.h"
 #include "LookupManager.h"
diff --git a/orbsvcs/tests/Notify/lib/Peer_T.h b/orbsvcs/tests/Notify/lib/Peer_T.h
index 6c82ff95f31..39369c6ee34 100644
--- a/orbsvcs/tests/Notify/lib/Peer_T.h
+++ b/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_PEER_T_H
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index 8c9797dce3b..0f81dbae0ec 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -13,10 +13,6 @@
 #include "LookupManager.h"
 #include "Priority_Mapping.h"
 
-ACE_RCSID (RT_Notify,
-           TAO_Notify_Tests_Periodic_Consumer,
-           "$Id$")
-
 int WARMUP_COUNT = 10;
 
 TAO_Notify_Tests_Periodic_Consumer::TAO_Notify_Tests_Periodic_Consumer (void)
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index 9d53353228b..aa951675a6b 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_PERIODIC_CONSUMER_H
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index 366c24113e5..beb4edbb007 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "Periodic_Consumer_Command.h"
-
-ACE_RCSID (lib,
-           TAO_Periodic_Consumer_Command,
-           "$Id$")
-
 #include "LookupManager.h"
 #include "Name.h"
 #include "Periodic_Consumer.h"
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index 9818f461ab7..68008e4981d 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_PERIODICCONSUMER_COMMAND_H
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index 7aab7760d8e..eea04d1e903 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -15,10 +15,6 @@
 #include "LookupManager.h"
 #include "Priority_Mapping.h"
 
-ACE_RCSID (RT_Notify,
-           TAO_Notify_Tests_Periodic_Supplier,
-           "$Id$")
-
 TAO_Notify_Tests_Periodic_Supplier::TAO_Notify_Tests_Periodic_Supplier (void)
   : barrier_ (0),
     priority_ (0),
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index 1ccedf9b240..3237daf6d7f 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_PERIODIC_SUPPLIER_H
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index 946f81ebda9..a7b182245c9 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "Periodic_Supplier_Command.h"
-
-ACE_RCSID (lib,
-           TAO_Periodic_Supplier_Command,
-           "$Id$")
-
 #include "LookupManager.h"
 #include "Name.h"
 #include "Periodic_Supplier.h"
diff --git a/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index bd261f52491..82a6831d61a 100644
--- a/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_Tests_PERIODICSUPPLIER_COMMAND_H
diff --git a/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp b/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
index 870eef04d59..79ca0812d95 100644
--- a/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
+++ b/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
@@ -2,7 +2,7 @@
 
 #include "Priority_Mapping.h"
 
-ACE_RCSID(lib, Priority_Mapping, "$Id$")
+
 
 TAO_Notify_Tests_Priority_Mapping::~TAO_Notify_Tests_Priority_Mapping (void)
 {
diff --git a/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/orbsvcs/tests/Notify/lib/PushConsumer.cpp
index 27cb0748b62..79ef0239bcd 100644
--- a/orbsvcs/tests/Notify/lib/PushConsumer.cpp
+++ b/orbsvcs/tests/Notify/lib/PushConsumer.cpp
@@ -6,7 +6,7 @@
 #include "PushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(lib, TAO_PushConsumer, "$Id$")
+
 
 TAO_Notify_Tests_PushConsumer_Traits::TAO_Notify_Tests_PushConsumer_Traits (void)
   :type_ (CosNotifyChannelAdmin::ANY_EVENT)
diff --git a/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/orbsvcs/tests/Notify/lib/PushSupplier.cpp
index 335efc1ec7e..b01c70d6913 100644
--- a/orbsvcs/tests/Notify/lib/PushSupplier.cpp
+++ b/orbsvcs/tests/Notify/lib/PushSupplier.cpp
@@ -6,7 +6,7 @@
 #include "PushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(lib, TAO_PushSupplier, "$Id$")
+
 
 TAO_Notify_Tests_PushSupplier_Traits::TAO_Notify_Tests_PushSupplier_Traits (void)
   :type_ (CosNotifyChannelAdmin::ANY_EVENT)
diff --git a/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
index 252d400bd7b..f1fbdc1589c 100644
--- a/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
+++ b/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "Relay_Consumer.h"
 
-ACE_RCSID(Notify, TAO_Notify_Tests_Relay_Consumer, "$Id$")
+
 
 #include "LookupManager.h"
 
diff --git a/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
index 169b179a4aa..08e1ceff1db 100644
--- a/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
+++ b/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
@@ -6,7 +6,7 @@
 #include "SequencePushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(lib, TAO_SequencePushConsumer, "$Id$")
+
 
 TAO_Notify_Tests_SequencePushConsumer_Traits::TAO_Notify_Tests_SequencePushConsumer_Traits (void)
   :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
diff --git a/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
index 36537a16048..e98fb96a64d 100644
--- a/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
+++ b/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
@@ -6,7 +6,7 @@
 #include "SequencePushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(lib, TAO_SequencePushSupplier, "$Id$")
+
 
 TAO_Notify_Tests_SequencePushSupplier_Traits::TAO_Notify_Tests_SequencePushSupplier_Traits (void)
   :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
diff --git a/orbsvcs/tests/Notify/lib/StructuredEvent.cpp b/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
index 6c6a9882916..df0a5070e30 100644
--- a/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
+++ b/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
@@ -2,7 +2,7 @@
 
 #include "StructuredEvent.h"
 
-ACE_RCSID(RT_Notify, TAO_Notify_Tests_StructuredEvent, "$Id$")
+
 
 TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent (void)
 {
diff --git a/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
index eb7973ba0e6..a63246fb1ed 100644
--- a/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
+++ b/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
@@ -6,7 +6,7 @@
 #include "StructuredPushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(lib, TAO_StructuredPushConsumer, "$Id$")
+
 
 TAO_Notify_Tests_StructuredPushConsumer_Traits::TAO_Notify_Tests_StructuredPushConsumer_Traits (void)
   :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
diff --git a/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
index d5cc66c07d0..ec7504e106f 100644
--- a/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
+++ b/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
@@ -6,7 +6,7 @@
 #include "StructuredPushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(lib, TAO_StructuredPushSupplier, "$Id$")
+
 
 TAO_Notify_Tests_StructuredPushSupplier_Traits::TAO_Notify_Tests_StructuredPushSupplier_Traits (void)
   :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
diff --git a/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index ce6077a3632..00bbda0d9e2 100644
--- a/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -2,7 +2,7 @@
 
 #include "SupplierAdmin_Command.h"
 
-ACE_RCSID(lib, TAO_SupplierAdmin_Command, "$Id$")
+
 
 #include "LookupManager.h"
 #include "Name.h"
diff --git a/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index 86d43a54f03..f7a32546bf1 100644
--- a/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -4,7 +4,7 @@
 
 #include "Supplier_T.h"
 
-ACE_RCSID(Notify, TAO_Notify_Tests_Supplier_T, "$Id$")
+
 
 template <class Supplier_Traits>
 TAO_Notify_Tests_Supplier_T<Supplier_Traits>::TAO_Notify_Tests_Supplier_T (void)
diff --git a/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/orbsvcs/tests/Notify/lib/Task_Stats.cpp
index 3669f3987a1..5420c116b22 100644
--- a/orbsvcs/tests/Notify/lib/Task_Stats.cpp
+++ b/orbsvcs/tests/Notify/lib/Task_Stats.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
 #include "Task_Stats.h"
-#include "ace/OS.h"
+#include "ace/ACE.h"
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
@@ -61,7 +61,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int
   FILE* output_file = ACE_OS::fopen (file_name, "w");
 
   // first dump what the caller has to say.
-  ACE_OS::fprintf (output_file, "%s\n",msg);
+  ACE_OS::fprintf (output_file, "%s\n", ACE_TEXT_ALWAYS_CHAR (msg));
 
   // next, compose and dump what we want to say.
 
@@ -70,7 +70,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int
 
   char out_msg[BUFSIZ];
 
-  if (seconds == 0 || samples_count_ == 0)
+  if (ACE::is_equal (seconds, 0.0) || samples_count_ == 0)
   {
         ACE_OS::sprintf (out_msg,
                    "# No samples recorded\n");
@@ -83,7 +83,9 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int
   double t_avg = samples_count_ / seconds;
 
   ACE_OS::sprintf (out_msg,
-                   "# Throughput: %.2f (events/second) [%u samples in %.2f seconds]\n",
+                   "# Throughput: %.2f (events/second) ["
+                   ACE_SIZE_T_FORMAT_SPECIFIER_ASCII
+                   " samples in %.2f seconds]\n",
                    t_avg, samples_count_, seconds);
   ACE_OS::fprintf (output_file, "%s",out_msg);
 
diff --git a/orbsvcs/tests/Notify/lib/common.h b/orbsvcs/tests/Notify/lib/common.h
index 7704baa6a25..fa0a5fb4b7d 100644
--- a/orbsvcs/tests/Notify/lib/common.h
+++ b/orbsvcs/tests/Notify/lib/common.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/lib
-//
-// = FILENAME
-//   common.h
-//
-// = DESCRIPTION
-//   A couple of useful functions
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   common.h
+ *
+ *  $Id$
+ *
+ * A couple of useful functions
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_COMMON_H
 #define TAO_COMMON_H
 
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am b/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
deleted file mode 100644
index 1c6add36f4c..00000000000
--- a/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
+++ /dev/null
@@ -1,277 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Filter_Idl.am
-
-BUILT_SOURCES = \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-CLEANFILES = \
-  go-stamp \
-  goC.cpp \
-  goC.h \
-  goC.inl \
-  goS.cpp \
-  goS.h \
-  goS.inl
-
-goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp
-
-go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl
-	@touch $@
-
-noinst_HEADERS = \
-  go.idl
-
-## Makefile.Filter_Notify_Perf_Sequence_Consumer.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Consumer
-
-Sequence_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Consumer_SOURCES = \
-  Notify_Sequence_Push_Consumer.cpp \
-  Sequence_Consumer.cpp \
-  goC.cpp \
-  Notify_Sequence_Push_Consumer.h
-
-Sequence_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Filter_Ntf_Perf_Seq_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Sequence_Supplier
-
-Sequence_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Sequence_Supplier_SOURCES = \
-  Sequence_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
-
-Sequence_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Sequence_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Filter_Ntf_Perf_Struct_Cons.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Consumer
-
-Structured_Consumer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Consumer_SOURCES = \
-  Notify_Structured_Push_Consumer.cpp \
-  Structured_Consumer.cpp \
-  goC.cpp \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Consumer_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Consumer_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Filter_Ntf_Perf_Struct_Supp.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Structured_Supplier
-
-Structured_Supplier_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Structured_Supplier_SOURCES = \
-  Structured_Supplier.cpp \
-  goC.cpp \
-  goS.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
-
-Structured_Supplier_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Structured_Supplier_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h b/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
index ac3e9d44568..1b3e96fd666 100644
--- a/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Sequence_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A sequence push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Sequence_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A sequence push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 #define TAO_NOTIFY_SEQUENCE_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h b/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
index 9d7d0cdd158..a9413e7f69b 100644
--- a/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
+++ b/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
@@ -1,20 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   Notify_Structured_Push_Consumer.h
-//
-// = DESCRIPTION
-//   A structured push consumer implementation.
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Notify_Structured_Push_Consumer.h
+ *
+ *  $Id$
+ *
+ * A structured push consumer implementation.
+ *
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 #ifndef TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 #define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
index cac550ca29e..11b00de9bcc 100644
--- a/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
+++ b/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
@@ -74,7 +74,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index a1025de2028..d8b969cc3b1 100644
--- a/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -104,7 +104,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
index 850a9061f4a..aee14a0ca01 100644
--- a/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
+++ b/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
@@ -72,7 +72,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index 8063e25ffbe..56488818be0 100644
--- a/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -104,7 +104,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
         -1);
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl b/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
index 987280e3a79..88fc0406dd1 100755
--- a/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
@@ -38,10 +38,10 @@ my $port = $nm_service->RandomPort();
 my $host = $nm_service->HostName();
 
 my $initref = "-ORBInitRef NameService=iioploc://$host:$port/NameService ";
-      
-$NS = $nm_service->CreateProcess ("../../../../Naming_Service/Naming_Service",
+
+$NS = $nm_service->CreateProcess ("../../../../Naming_Service/tao_cosnaming",
                                   "-ORBEndpoint iiop://$host:$port -o $ns_naming_ior");
-$TS = $nt_service->CreateProcess ("../../../../Notify_Service/Notify_Service", $initref.
+$TS = $nt_service->CreateProcess ("../../../../Notify_Service/tao_cosnotification", $initref.
                                   "-IORoutput $ts_notify_ior -ORBSvcConf $ts_notify_conf");
 $STS = $supplier->CreateProcess ("Structured_Supplier", $initref.
                                  "-o $supplier_supplier_ior");
@@ -71,7 +71,7 @@ sub run_test {
         $SP->Kill (); $SP->TimedWait (1);
         return 1;
     }
-    
+
     if ($supplier->GetFile ($supplier_ior) == -1) {
         print STDERR "ERROR: cannot retrieve file <$supplier_supplier_ior>\n";
         $SP->Kill (); $SP->TimedWait (1);
diff --git a/orbsvcs/tests/Notify/performance-tests/Makefile.am b/orbsvcs/tests/Notify/performance-tests/Makefile.am
deleted file mode 100644
index de02210c1a5..00000000000
--- a/orbsvcs/tests/Notify/performance-tests/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Filter \
-        RedGreen \
-        Throughput
-
diff --git a/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am b/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
deleted file mode 100644
index d0ee8a5cb74..00000000000
--- a/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
+++ /dev/null
@@ -1,77 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RedGreen_Ntf_Perf_RedGreen.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = RedGreen_Test
-
-RedGreen_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-RedGreen_Test_SOURCES = \
-  RedGreen_Test.cpp \
-  main.cpp \
-  RedGreen_Test.h
-
-RedGreen_Test_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-RedGreen_Test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index 081af8ac861..e02c7b18110 100644
--- a/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -7,10 +7,6 @@
 #include "orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Notify,
-           RedGreen_Test,
-           "$Id$")
-
 #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
 #define NAMING_SERVICE_NAME "NameService"
 
diff --git a/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index 2eeae43842c..720939e4b2c 100644
--- a/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -1,18 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   RedGreen_Test.h
-//
-// = DESCRIPTION
-//   Performance test to show improvement in Notify performance by picking the
-//   correcting configuration.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   RedGreen_Test.h
+ *
+ *  $Id$
+ *
+ * Performance test to show improvement in Notify performance by picking the
+ * correcting configuration.
+ *
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_RedGreen_Test_CLIENT_H
 #define NOTIFY_RedGreen_Test_CLIENT_H
@@ -34,37 +34,41 @@
 class RedGreen_Test_StructuredPushConsumer;
 class RedGreen_Test_StructuredPushSupplier;
 
+/**
+ * @class Worker
+ *
+ * @brief Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
+  /// Constructor.
   Worker (void);
-  // Constructor.
 
   void orb (CORBA::ORB_ptr orb);
 
+  /// The thread entry point.
   virtual int svc (void);
-  // The thread entry point.
 
   // Shutdown ORB
   void done (void);
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 };
 
+/**
+ * @class RedGreen_Test
+ *
+ * @brief RedGreen_Test
+ *
+ * Shows how consumers RedGreen_Test for events.
+ */
 class RedGreen_Test
 {
-  // = TITLE
-  //   RedGreen_Test
-  // = DESCRIPTION
-  //   Shows how consumers RedGreen_Test for events.
 
  public:
   // = Initialization
@@ -75,82 +79,82 @@ class RedGreen_Test
 
   void dump_results (void);
 
+  /// Initialize the Client.
   void init (int argc,
              ACE_TCHAR *argv []);
-  // Initialize the Client.
 
+  /// Run the demo.
   void run (void);
-  // Run the demo.
 
+  /// Called when all events we are waiting for have occured.
   void done (void);
-  // Called when all events we are waiting for have occured.
 
+  /// Destroy from the EC
   void destroy_ec (void);
-  // Destroy from the EC
 
   int burst_size_;
   Worker worker_;
   int nthreads_;
 
  protected:
+  /// Initializes the ORB.
   void init_ORB (int argc,
                  ACE_TCHAR *argv []);
-  // Initializes the ORB.
 
+  /// Try to get hold of a running naming service.
   void resolve_naming_service (void);
-  // Try to get hold of a running naming service.
 
+  /// Try to resolve the Notify factory from the Naming service.
   void resolve_Notify_factory (void);
-  // Try to resolve the Notify factory from the Naming service.
 
+  /// Create an EC.
   void create_EC (void);
-  // Create an EC.
 
+  /// Create the Supplier Admin.
   void create_supplieradmin(void);
-  // Create the Supplier Admin.
 
+  /// Create the Consumer Admin.
   void create_consumeradmin (void);
-  // Create the Consumer Admin.
 
+  /// Create and initialize the consumers.
   void create_consumers (void);
-  // Create and initialize the consumers.
 
+  /// create and initialize the suppliers.
   void create_suppliers (void);
-  // create and initialize the suppliers.
 
+  /// send the events.
   void send_events (void);
-  // send the events.
 
   // = Data Members.
+  /// Reference to the root poa.
   PortableServer::POA_var root_poa_;
-  // Reference to the root poa.
 
+  /// The ORB that we use.
   CORBA::ORB_var orb_;
-  // The ORB that we use.
 
+  /// Handle to the name service.
   CosNaming::NamingContext_var naming_context_;
-  // Handle to the name service.
 
+  /// Channel factory.
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
-  // Channel factory.
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The group operator between admin-proxy's.
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_;
-  // The group operator between admin-proxy's.
 
+  /// Initial qos specified to the factory when creating the EC.
   CosNotification::QoSProperties initial_qos_;
-  // Initial qos specified to the factory when creating the EC.
 
+  /// Initial admin props specified to the factory when creating the EC.
   CosNotification::AdminProperties initial_admin_;
-  // Initial admin props specified to the factory when creating the EC.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
   RedGreen_Test_StructuredPushConsumer* normal_consumer_;
   RedGreen_Test_StructuredPushConsumer* slow_consumer_;
@@ -171,49 +175,49 @@ class RedGreen_Test_StructuredPushConsumer
 
  public:
   // = Initialization and Termination code
+  /// Constructor.
   RedGreen_Test_StructuredPushConsumer (RedGreen_Test* RedGreen_Test);
-  // Constructor.
 
+  /// Connect the Consumer to the EventChannel.
+  /// Creates a new proxy supplier and connects to it.
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  // Connect the Consumer to the EventChannel.
-  // Creates a new proxy supplier and connects to it.
 
+  /// Disconnect from the supplier.
   virtual void disconnect (void);
-  // Disconnect from the supplier.
 
+  /// Accessor for the Proxy that we're connected to.
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (
       void
     );
-  // Accessor for the Proxy that we're connected to.
 
+  /// Accumulate the throughput statistics into <throughput>
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
-  // Accumulate the throughput statistics into <throughput>
 
+  /// Accumulate the throughput statistics into <throughput>
   void dump_stats (const ACE_TCHAR* msg, ACE_UINT32 gsf);
-  // Accumulate the throughput statistics into <throughput>
 
 protected:
   // = Data members
+  /// The proxy that we are connected to.
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_;
-  // The proxy that we are connected to.
 
+  /// The proxy_supplier id.
   CosNotifyChannelAdmin::ProxyID proxy_supplier_id_;
-  // The proxy_supplier id.
 
+  /// callback <done>
   RedGreen_Test* RedGreen_Test_;
-  // callback <done>
 
+  /// Protect internal state
   TAO_SYNCH_MUTEX lock_;
-  // Protect internal state
 
   int push_count_;
 
+  /// Used for reporting stats
   ACE_Throughput_Stats throughput_;
-  // Used for reporting stats
 
   // = Methods
+  /// Destructor
   virtual ~RedGreen_Test_StructuredPushConsumer (void);
-  // Destructor
 
   // = NotifyPublish method
   virtual void offer_change (
@@ -255,39 +259,39 @@ class RedGreen_Test_StructuredPushSupplier
   //
  public:
   // = Initialization and Termination code
+  /// Constructor.
   RedGreen_Test_StructuredPushSupplier (void);
-  // Constructor.
 
+  /// Connect the Supplier to the EventChannel.
+  /// Creates a new proxy supplier and connects to it.
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  // Connect the Supplier to the EventChannel.
-  // Creates a new proxy supplier and connects to it.
 
+  /// Disconnect from the supplier.
   void disconnect (void);
-  // Disconnect from the supplier.
 
+  /// Send one event.
   virtual void send_event (CosNotification::StructuredEvent& event);
-  // Send one event.
 
+  /// Accumulate the throughput statistics into <throughput>
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
-  // Accumulate the throughput statistics into <throughput>
 
+  /// Accumulate the throughput statistics into <throughput>
   void dump_stats (const ACE_TCHAR* msg, ACE_UINT32 gsf);
-  // Accumulate the throughput statistics into <throughput>
 
 protected:
   // = Data members
+  /// The proxy that we are connected to.
   CosNotifyChannelAdmin::StructuredProxyPushConsumer_var proxy_consumer_;
-  // The proxy that we are connected to.
 
+  /// This supplier's id.
   CosNotifyChannelAdmin::ProxyID proxy_consumer_id_;
-  // This supplier's id.
 
+  /// Measure the elapsed time spent while sending the events.
   ACE_Throughput_Stats throughput_;
-  // Measure the elapsed time spent while sending the events.
 
   // = Protected Methods
+  /// Destructor
   virtual ~RedGreen_Test_StructuredPushSupplier ();
-  // Destructor
 
   // = NotifyRedGreen_Test
   virtual void subscription_change (
diff --git a/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf b/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf
index 6c62c9bb7c2..9d3a088919d 100644
--- a/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf
+++ b/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf
@@ -1,4 +1,5 @@
 ## $Id$
+
 static Notify_Default_Event_Manager_Objects_Factory "-AllocateTaskperProxy -DispatchingThreads 1"
 
 
diff --git a/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf b/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf
index 9965c905158..8fb85f0082f 100644
--- a/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf
+++ b/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf
@@ -1,2 +1,3 @@
 ## $Id$
+
 static Notify_Default_Event_Manager_Objects_Factory "-SourceThreads 2"
\ No newline at end of file
diff --git a/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl b/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
index 200c2019316..cd32f090a3e 100755
--- a/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
@@ -32,9 +32,9 @@ $nt_service->DeleteFile ($notify_ior);
 $nt_service->DeleteFile ($naming_ior);
 $test->DeleteFile ($naming_ior);
 
-$NM_SV = $nm_service->CreateProcess ("../../../../Naming_Service/Naming_Service", "-o $nm_service_nmiorfile");
+$NM_SV = $nm_service->CreateProcess ("../../../../Naming_Service/tao_cosnaming", "-o $nm_service_nmiorfile");
 $T = $test->CreateProcess ("RedGreen_Test", "-ORBInitRef NameService=file://$test_nmiorfile");
-$NT_SV = $nt_service->CreateProcess ("../../../../Notify_Service/Notify_Service", "");
+$NT_SV = $nt_service->CreateProcess ("../../../../Notify_Service/tao_cosnotification", "");
 
 $nm_service_status = $NM_SV->Spawn ();
 
diff --git a/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf b/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf
index 71ec9c42ce6..878eb245f3d 100644
--- a/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf
+++ b/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf
@@ -1 +1,3 @@
+# $Id$
+
 static Resource_Factory "-ORBReactorMaskSignals 0"
diff --git a/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
deleted file mode 100644
index 201e70546db..00000000000
--- a/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
+++ /dev/null
@@ -1,77 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Throughput_Ntf_Perf_Throughput.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Throughput
-
-Throughput_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
-  -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-Throughput_SOURCES = \
-  Throughput.cpp \
-  Throughput.h
-
-Throughput_LDFLAGS = \
-  -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib
-
-Throughput_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 845f2830de4..b8727bcd8c5 100644
--- a/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -5,17 +5,12 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "ace/Synch.h"
-#include "ace/OS.h"
 #include "ace/Dynamic_Service.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/Messaging/Messaging.h"
 #include "orbsvcs/Notify/Service.h"
 #include "orbsvcs/Time_Utilities.h"
 
-ACE_RCSID (Notify_Tests,
-           Throughput,
-           "$Id$")
-
 /***************************************************************************/
 
 Throughput_StructuredPushConsumer::Throughput_StructuredPushConsumer (
diff --git a/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index 1132a4e8631..db80e448756 100644
--- a/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -1,16 +1,14 @@
 /* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = FILENAME
-//   Throughput.h
-//
-// = DESCRIPTION
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
+//=============================================================================
+/**
+ *  @file   Throughput.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef NOTIFY_Throughput_H
 #define NOTIFY_Throughput_H
@@ -29,28 +27,29 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+/**
+ * @class Worker
+ *
+ * @brief Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
+  /// ctor
   Worker (void);
-  // ctor
 
   void orb (CORBA::ORB_ptr orb);
 
+  /// The thread entry point.
   virtual int svc (void);
-  // The thread entry point.
 
   int done_;
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 };
 
 /***************************************************************************/
@@ -61,34 +60,34 @@ class Throughput_StructuredPushConsumer
   : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
+  /// Contructor.
   Throughput_StructuredPushConsumer (Notify_Throughput *test_client);
-  // Contructor.
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
       );
 
+  /// Accumulate the throughput statistics into <throughput>
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
-  // Accumulate the throughput statistics into <throughput>
 
+  /// Accumulate the throughput statistics into <throughput>
   void dump_stats (const ACE_TCHAR* msg, ACE_UINT32 gsf);
-  // Accumulate the throughput statistics into <throughput>
 
 protected:
   Notify_Throughput * test_client_;
 
+  /// Protect internal state
   TAO_SYNCH_MUTEX lock_;
-  // Protect internal state
 
+  /// The timestamp for the first message received
   ACE_hrtime_t throughput_start_;
-  // The timestamp for the first message received
 
+  /// Used for reporting stats
   ACE_Throughput_Stats throughput_;
-  // Used for reporting stats
 
+  /// The number of push() calls
   int push_count_;
-  // The number of push() calls
 };
 
 /***************************************************************************/
@@ -98,32 +97,32 @@ class Throughput_StructuredPushSupplier
     public ACE_Task_Base
 {
 public:
+  /// Constructor.
   Throughput_StructuredPushSupplier (Notify_Throughput * test_client);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Throughput_StructuredPushSupplier ();
-  // Destructor.
 
   // = The ACE_Task_Base methods....
   virtual int svc (void);
 
+  /// Accumulate the throughput statistics into <throughput>
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
-  // Accumulate the throughput statistics into <throughput>
 
+  /// Accumulate the throughput statistics into <throughput>
   void dump_stats (const ACE_TCHAR* msg, ACE_UINT32 gsf);
-  // Accumulate the throughput statistics into <throughput>
 
 protected:
   Notify_Throughput* test_client_;
 
+  /// Count the number of push() calls
   int push_count_;
-  // Count the number of push() calls
 
+  /// The time for the first event sent
   ACE_hrtime_t throughput_start_;
-  // The time for the first event sent
 
+  /// Measure the elapsed time spent while sending the events.
   ACE_Throughput_Stats throughput_;
-  // Measure the elapsed time spent while sending the events.
 };
 
 /***************************************************************************/
@@ -137,79 +136,79 @@ public:
 
   int parse_args(int argc, ACE_TCHAR *argv[]) ;
 
+  /// initialization.
   int init (int argc, ACE_TCHAR *argv []);
-  // initialization.
 
+  /// Run the test.
   void run_test (void);
-  // Run the test.
 
+  /// Peers call this when done.
   void peer_done (void);
-  // Peers call this when done.
 
+  /// check if we got the expected results.
   void dump_results (void);
-  // check if we got the expected results.
 
   Worker worker_;
 protected:
+  /// Create participants.
   void create_EC (void);
-  // Create participants.
 
+  /// is the ec collocated.
   CORBA::Boolean collocated_ec_;
-  // is the ec collocated.
 
+  /// How many bursts we will send from each supplier.
   int burst_count_;
-  // How many bursts we will send from each supplier.
 
+  /// The time between each event burst, in microseconds.
   int burst_pause_;
-  // The time between each event burst, in microseconds.
 
+  /// Number of events to send per supplier in every burst
   int burst_size_;
-  // Number of events to send per supplier in every burst
 
+  /// data size to transmit.
   int payload_size_;
-  // data size to transmit.
 
+  /// the payload.
   char *payload_;
-  // the payload.
 
+  /// Consumer count
   int consumer_count_;
-  // Consumer count
 
+  /// Supplier count
   int supplier_count_;
-  // Supplier count
 
+  /// Number of events received that each consumer expects to see.
   int perconsumer_count_;
-  // Number of events received that each consumer expects to see.
 
+  /// The name of the EC to resolve.
   ACE_CString ec_name_;
-  // The name of the EC to resolve.
 
+  /// The one channel that we create using the factory.
   CosNotifyChannelAdmin::EventChannel_var ec_;
-  // The one channel that we create using the factory.
 
+  /// The consumer admin used by consumers.
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  // The consumer admin used by consumers.
 
+  /// The supplier admin used by suppliers.
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
-  // The supplier admin used by suppliers.
 
+  /// Consumers
   Throughput_StructuredPushConsumer** consumers_;
-  // Consumers
 
+  /// Suppliers
   Throughput_StructuredPushSupplier** suppliers_;
-  // Suppliers
 
   int nthreads_;
 
   // = Helpers to signal done.
+  /// how many peers are done.
   int peer_done_count_;
-  // how many peers are done.
 
+  /// The lock to serialize access to members.
   TAO_SYNCH_MUTEX lock_;
-  // The lock to serialize access to members.
 
+  /// exit wait condition
   TAO_SYNCH_CONDITION condition_;
-  // exit wait condition
 private:
   friend class Throughput_StructuredPushSupplier;
   friend class Throughput_StructuredPushConsumer;
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
index 0515ecbd0db..7e1c32ee057 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
@@ -1,2 +1,4 @@
+## $Id$
+
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
index a747c353448..c58381f28ec 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
@@ -1,3 +1,5 @@
+## $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
index 540f585bbd0..1154c82070a 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
@@ -85,9 +85,9 @@ $con->DeleteFile ($supiorfile);
 #    DeleteFile($file) or die "Could not delete $file";
 #}
 
-$NS = $ns->CreateProcess ("../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile";
 
 $SUP = $sup->CreateProcess ("../../../Driver/Notify_Tests_Driver");
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
index 0515ecbd0db..18d4f90968b 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
index a747c353448..4c20b15d32f 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
index 5d3fb306395..7d4bd7e216f 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
@@ -85,9 +85,9 @@ $con->DeleteFile ($supiorfile);
 #    DeleteFile($file) or die "Could not delete $file";
 #}
 
-$NS = $ns->CreateProcess ("../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile";
 
 $SUP = $sup->CreateProcess ("../../../Driver/Notify_Tests_Driver");
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
index 7ba4be37cda..393c5812cb4 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
@@ -44,7 +44,7 @@ $supplier->DeleteFile ($consumer_ior);
 $consumer->DeleteFile ($naming_ior);
 $consumer->DeleteFile ($consumer_ior);
 
-$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level -o $nm_service_nmiorfile");
 
 $SP = $supplier->CreateProcess ("../../../../Driver/Notify_Tests_Driver",
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
index 766d4286349..3a759aeb3b2 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
@@ -44,7 +44,7 @@ $supplier->DeleteFile ($consumer_ior);
 $consumer->DeleteFile ($naming_ior);
 $consumer->DeleteFile ($consumer_ior);
 
-$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level -o $nm_service_nmiorfile");
 
 $SP = $supplier->CreateProcess ("../../../../Driver/Notify_Tests_Driver",
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
index 276d14817fd..3ca61b9dda4 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
@@ -60,7 +60,7 @@ $sup->DeleteFile ($reliorfile);
 $con->DeleteFile ($chighdat);
 $sup->DeleteFile ($shighdat);
 
-$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
 
 $SUP = $sup->CreateProcess ("../../../../Driver/Notify_Tests_Driver");
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl
index 716e97cb155..520c3289059 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl
@@ -60,7 +60,7 @@ $sup->DeleteFile ($reliorfile);
 $con->DeleteFile ($chighdat);
 $sup->DeleteFile ($shighdat);
 
-$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
 
 $SUP = $sup->CreateProcess ("../../../../Driver/Notify_Tests_Driver");
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
index 8774d46bf67..6b0f5032ee3 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
@@ -30,7 +30,7 @@ my $collocated_iorfile = $collocated->LocalFile($iorbase);
 $nm_service->DeleteFile($iorbase);
 $collocated->DeleteFile($iorbase);
 
-$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                                      "-ORBdebuglevel $debug_level -o $nm_service_iorfile");
 
 $CL = $collocated->CreateProcess ("../../../../Driver/Notify_Tests_Driver",
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
index 865a3a106ca..009ac28cfad 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
@@ -32,7 +32,7 @@ my $collocated_iorfile = $collocated->LocalFile($iorbase);
 $nm_service->DeleteFile($iorbase);
 $collocated->DeleteFile($iorbase);
 
-$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                                      "-ORBdebuglevel $debug_level -o $nm_service_iorfile");
 
 $CL = $collocated->CreateProcess ("../../../../Driver/Notify_Tests_Driver",
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
index 61456d1a199..aff8be2188f 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
@@ -1,2 +1,4 @@
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""         
+# $Id$
+
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
 
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
index 9a2e6577459..7348bd02884 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
@@ -85,9 +85,9 @@ $con->DeleteFile ($supiorfile);
 $con->DeleteFile ($chighdat);
 $sup->DeleteFile ($shighdat);
 
-$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ".
             "-IORoutput $nfs_nfsiorfile ".
             "-ORBSvcConf $nfs_nfsconffile";
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
index a747c353448..4c20b15d32f 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
index 9d339a00db7..0e1050e731a 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
@@ -85,9 +85,9 @@ $con->DeleteFile ($supiorfile);
 $con->DeleteFile ($chighdat);
 $sup->DeleteFile ($shighdat);
 
-$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ".
             "-IORoutput $nfs_nfsiorfile ".
             "-ORBSvcConf $nfs_nfsconffile";
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
index 0515ecbd0db..18d4f90968b 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
index a747c353448..4c20b15d32f 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
index c3429f9f78a..be792c12a4a 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
@@ -58,18 +58,18 @@ my $nt_service = PerlACE::TestTarget::create_target (2) || die "Create target 2
 my $nm_ior = "naming.ior";
 my $nt_ior = "notify.ior";
 
-my $nt_service_nt_conf = $nt_service->LocalFile($nt_conf); 
+my $nt_service_nt_conf = $nt_service->LocalFile($nt_conf);
 my $nm_service_nm_ior  = $nm_service->LocalFile($nm_ior);
 my $nt_service_nm_ior  = $nt_service->LocalFile($nm_ior);
-my $nt_service_nt_ior  = $nt_service->LocalFile($nt_ior); 
+my $nt_service_nt_ior  = $nt_service->LocalFile($nt_ior);
 $nm_service->DeleteFile($nm_ior);
 $nt_service->DeleteFile($nm_ior);
 $nt_service->DeleteFile($nt_ior);
 
-$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/Naming_Service",
+$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/tao_cosnaming",
                                      "-ORBDebugLevel $debug_level -o $nm_service_nm_ior");
 
-$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/Notify_Service",
+$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/tao_cosnotification",
                                      "-ORBInitRef NameService=file://$nt_service_nm_ior ".
                                      "-IORoutput $nt_service_nt_ior ".
                                      "-ORBSvcConf $nt_service_nt_conf ".
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
index b6bc4c2b26e..4ea15e40ba8 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
@@ -81,9 +81,9 @@ $nt_service_ntconffile = $nt_service->LocalFile($notify_conf);
 $high_path_hpconffile = $high_path->LocalFile($high_path_conf);
 $other_path_opconffile = $other_path->LocalFile($other_paths_conf);
 
-$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/Naming_Service",
+$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/tao_cosnaming",
                                      "-o $nm_service_nmiorfile $debug");
-$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/Notify_Service",
+$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/tao_cosnotification",
                                      "-ORBInitRef NameService=file://$nt_service_nmiorfile ".
                                      "-IORoutput $nt_service_ntiorfile ".
                                      "-ORBSvcConf $nt_service_ntconffile $debug");
diff --git a/orbsvcs/tests/Property/Makefile.am b/orbsvcs/tests/Property/Makefile.am
deleted file mode 100644
index 3ac2d8c9a85..00000000000
--- a/orbsvcs/tests/Property/Makefile.am
+++ /dev/null
@@ -1,85 +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:
-## ../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.Property_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  client.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Property_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  server.cpp \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/Property/client.cpp b/orbsvcs/tests/Property/client.cpp
index 8c0a7edd4e5..c5dbbbe2a28 100644
--- a/orbsvcs/tests/Property/client.cpp
+++ b/orbsvcs/tests/Property/client.cpp
@@ -1,25 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/Property
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//    Test client for the Property Service.
-//
-// = AUTHORS
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  Test client for the Property Service.
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "client.h"
 #include "tao/debug.h"
 
-ACE_RCSID(CosPropertyService, client, "$Id$")
+
 
   Client::Client (void)
 {
diff --git a/orbsvcs/tests/Property/client.h b/orbsvcs/tests/Property/client.h
index 9ab696bd6c1..db212a0b0bb 100644
--- a/orbsvcs/tests/Property/client.h
+++ b/orbsvcs/tests/Property/client.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/Property
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION
-//    Test client for the Property Service.
-//
-// = AUTHORS
-//   Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.h
+ *
+ *  $Id$
+ *
+ *  Test client for the Property Service.
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef PROPERTY_CLIENT_H
 #define PROPERTY_CLIENT_H
@@ -33,72 +30,74 @@
 #include "orbsvcs/Property/CosPropertyService_i.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 
+/**
+ * @class Client
+ *
+ * @brief Client for A/V Streams demo.
+ *
+ * Encapsulates client functionality.
+ */
 class Client
 {
-  // = TITLE
-  //    Client for A/V Streams demo.
-  //
-  // = DESCRIPTION
-  //    Encapsulates client functionality.
 public:
+  /// Constructor.
   Client (void);
-  // Constructor.
 
+  /// Initialize the ORB etc, and bind the MMDevices.
   int init (int argc,
             ACE_TCHAR **argv);
-  // Initialize the ORB etc, and bind the MMDevices.
 
+  /// Run the client.  This will call StreamCtrl::bind_devs.
   int run (void);
-  // Run the client.  This will call StreamCtrl::bind_devs.
 
+  /// Testing  the property service methods.
   int property_tester (void);
-  // Testing  the property service methods.
 
 protected:
+  /// Bind to the remote MMDevice.
   int bind_to_remote_mmdevice (int argc,
                                ACE_TCHAR *argv[]);
-  // Bind to the remote MMDevice.
 
   // = Property Testing.
 
+  /// Testing the define property method.
   int test_define_property (void);
-  // Testing the define property method.
 
+  /// Testing the number of properties, currently in the Property Set.
   int test_get_number_of_properties (void);
-  // Testing the number of properties, currently in the Property Set.
 
+  ///Testing get_all_property_names.
   int test_get_all_property_names (void);
-  //Testing get_all_property_names.
 
+  /// Testing get_property_value.
   int test_get_property_value (void);
-  // Testing get_property_value.
 
+  ///Testing get_properties.  Give the names and get their properties.
   int test_get_properties (void);
-  //Testing get_properties.  Give the names and get their properties.
 
+  /// Testing get_all_properties.
   int test_get_all_properties (void);
-  // Testing get_all_properties.
 
+  /// Testing delete_property.
   int test_delete_property (const char *property_name);
-  // Testing delete_property.
 
+  /// Testing delete_properties.
   int test_delete_properties (void);
-  // Testing delete_properties.
 
+  /// Defining a sequence of properties.
   int test_define_properties (void);
-  // Defining a sequence of properties.
 
+  /// Defines properties with various modes.
   int test_define_property_with_mode (void);
-  // Defines properties with various modes.
 
+  /// The ORB manager, handles ORB initialization etc.
   TAO_ORB_Manager manager_;
-  // The ORB manager, handles ORB initialization etc.
 
+  /// The Naming Client handles Naming Service work
   TAO_Naming_Client my_name_client_;
-  // The Naming Client handles Naming Service work
 
+  /// To test propertySetDef interface.
   CosPropertyService::PropertySetDef_var propsetdef_;
-  // To test propertySetDef interface.
 };
 
 #endif /* COSPROPERTYSERVICE_CLIENT_H */
diff --git a/orbsvcs/tests/Property/main.cpp b/orbsvcs/tests/Property/main.cpp
index 66d117d3feb..4044d2734a0 100644
--- a/orbsvcs/tests/Property/main.cpp
+++ b/orbsvcs/tests/Property/main.cpp
@@ -18,7 +18,7 @@
 #include "orbsvcs/CosPropertyS.h"
 #include "orbsvcs/Property/CosPropertyService_i.h"
 
-ACE_RCSID(CosPropertyService, main, "$Id$")
+
 
 class TAO_PropertySet_Tester
 {
diff --git a/orbsvcs/tests/Property/run_test.pl b/orbsvcs/tests/Property/run_test.pl
index b25091d754b..bc53ac19b04 100755
--- a/orbsvcs/tests/Property/run_test.pl
+++ b/orbsvcs/tests/Property/run_test.pl
@@ -33,9 +33,9 @@ $n_service->DeleteFile($iorbase);
 $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level ".
                                         "-ORBInitRef NameService=file://$server_iorfile");
 $CL = $client->CreateProcess ("client", "-ORBInitRef NameService=file://$client_iorfile");
-$NS = $n_service->CreateProcess ("../../Naming_Service/Naming_Service", "-o $n_service_iorfile");
+$NS = $n_service->CreateProcess ("../../Naming_Service/tao_cosnaming", "-o $n_service_iorfile");
 
-print STDERR "Starting Naming_Service\n";
+print STDERR "Starting tao_cosnaming\n";
 
 $n_service_status = $NS->Spawn ();
 
diff --git a/orbsvcs/tests/Property/server.cpp b/orbsvcs/tests/Property/server.cpp
index ec2c85ac2e5..165bf7e98de 100644
--- a/orbsvcs/tests/Property/server.cpp
+++ b/orbsvcs/tests/Property/server.cpp
@@ -1,24 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/CosPropertyService
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    Test server for the CosPropertyService
-//
-// = AUTHORS
-//   Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  Test server for the CosPropertyService
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "server.h"
 
-ACE_RCSID(CosPropertyService, server, "$Id$")
+
 
 // Main program
 
diff --git a/orbsvcs/tests/Property/server.h b/orbsvcs/tests/Property/server.h
index fde9aab4489..4c9fd930d7a 100644
--- a/orbsvcs/tests/Property/server.h
+++ b/orbsvcs/tests/Property/server.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/CosPropertyService
-//
-// = FILENAME
-//    server.h
-//
-// = DESCRIPTION
-//    Test server for the CosPropertyService.
-//
-// = AUTHORS
-//    Alexander Babu Arulanthu <alex.cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    server.h
+ *
+ *  $Id$
+ *
+ *  Test server for the CosPropertyService.
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex.cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef COSPROPERTYSERVICE_SERVER_H
 #define COSPROPERTYSERVICE_SERVER_H
diff --git a/orbsvcs/tests/Redundant_Naming/Makefile.am b/orbsvcs/tests/Redundant_Naming/Makefile.am
deleted file mode 100644
index 79a86c475a5..00000000000
--- a/orbsvcs/tests/Redundant_Naming/Makefile.am
+++ /dev/null
@@ -1,81 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Redundant_Naming_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  test_objectC.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.cpp \
-  test_objectS.h \
-  test_objectS.inl
-
-CLEANFILES = \
-  test_object-stamp \
-  test_objectC.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.cpp \
-  test_objectS.h \
-  test_objectS.inl
-
-test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl: test_object-stamp
-
-test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  test_objectC.cpp \
-  test_objectS.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.h \
-  test_objectS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/Redundant_Naming/client.cpp b/orbsvcs/tests/Redundant_Naming/client.cpp
index 263084c4d5f..f54ada2e199 100644
--- a/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -2,12 +2,6 @@
 
 // ============================================================================
 //
-// = LIBRARY
-//    TAO/orbsvcs/Naming_Service/
-//
-// = FILENAME
-//    client.cpp
-//
 // = DESCRIPTION
 //      This class implements a CORBA client for a redundant CosNaming
 //      Service using stubs generated by the TAO ORB IDL compiler.
@@ -23,10 +17,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Simple_Naming,
-           client,
-           "$Id$")
-
 #if defined (_MSC_VER)
 # pragma warning (disable : 4250)
 #endif /* _MSC_VER */
diff --git a/orbsvcs/tests/Redundant_Naming/run_test.pl b/orbsvcs/tests/Redundant_Naming/run_test.pl
index c20ddc54ed2..849a56c486c 100755
--- a/orbsvcs/tests/Redundant_Naming/run_test.pl
+++ b/orbsvcs/tests/Redundant_Naming/run_test.pl
@@ -78,7 +78,7 @@ else {
 # in files to find the individual copies of the Naming Servers.
 
 my $args = "-ORBEndPoint $ns_endpoint1 -o $test_iorfile1 -m 0 -r NameService";
-my $prog = "$startdir/../../Naming_Service/Naming_Service";
+my $prog = "$startdir/../../Naming_Service/tao_cosnaming";
 
 $NS1 = $test->CreateProcess ("$prog", "$args");
 
@@ -94,7 +94,7 @@ if ($test->WaitForFileTimed ($iorfile1,
 }
 
 $args = "-ORBEndPoint $ns_endpoint2 -o $test_iorfile2 -m 0 -r NameService";
-$prog = "$startdir/../../Naming_Service/Naming_Service";
+$prog = "$startdir/../../Naming_Service/tao_cosnaming";
 
 $NS2 = $test->CreateProcess ("$prog", "$args");
 
diff --git a/orbsvcs/tests/Sched/DynSched_Test.cpp b/orbsvcs/tests/Sched/DynSched_Test.cpp
index b0567d8321c..0667203a972 100644
--- a/orbsvcs/tests/Sched/DynSched_Test.cpp
+++ b/orbsvcs/tests/Sched/DynSched_Test.cpp
@@ -6,10 +6,6 @@
 # include <quantify.h>
 #endif /* ACE_HAS_QUANTIFY */
 
-ACE_RCSID (Sched,
-           DynSched_Test,
-           "$Id$")
-
 // period times, in 100 nanoseconds
 #define ONE_HZ    10000000
 #define FIVE_HZ    2000000
diff --git a/orbsvcs/tests/Sched/Makefile.am b/orbsvcs/tests/Sched/Makefile.am
deleted file mode 100644
index 8bc86453037..00000000000
--- a/orbsvcs/tests/Sched/Makefile.am
+++ /dev/null
@@ -1,51 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Sched.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Sched
-
-Sched_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Sched_SOURCES = \
-  DynSched_Test.cpp
-
-Sched_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/Sched_Conf/Makefile.am b/orbsvcs/tests/Sched_Conf/Makefile.am
deleted file mode 100644
index 70335c7c397..00000000000
--- a/orbsvcs/tests/Sched_Conf/Makefile.am
+++ /dev/null
@@ -1,53 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Sched_Conf.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Sched_Conf
-
-Sched_Conf_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Sched_Conf_SOURCES = \
-  Sched_Conf.cpp \
-  Sched_Conf_Anomalies_Runtime.h \
-  Sched_Conf_Runtime.h
-
-Sched_Conf_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index d3dda03a311..8726ac155a7 100644
--- a/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -11,10 +11,6 @@
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 
-ACE_RCSID (Sched_Conf,
-           Sched_Conf,
-           "$Id$")
-
 const ACE_TCHAR *service_name = ACE_TEXT("ScheduleService");
 
 const char* format_string = " {%-12s, %d, %d, %d, %d, %8d, "
diff --git a/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index 5d1d575a31e..bf367eee839 100644
--- a/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -11,7 +11,7 @@
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 
-ACE_RCSID(Sched_Conf, Sched_Conf_Anomalies, "$Id$")
+
 
 const char* service_name = "ScheduleService";
 
diff --git a/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h b/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
index 2662b3acb41..b221cecf8e5 100644
--- a/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
+++ b/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
@@ -53,7 +53,7 @@ static int configs_size = sizeof(configs)/sizeof(configs[0]);
 
 
 // This sets up Scheduler_Factory to use the runtime version.
-int scheduler_factory_setup = 
+int scheduler_factory_setup =
   ACE_Scheduler_Factory::use_runtime (configs_size, configs, infos_size, infos);
 
 // EOF
diff --git a/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index 4f2cbe98442..e345717497c 100644
--- a/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -14,7 +14,7 @@
 
 #include "Sched_Conf_Runtime.h"
 
-ACE_RCSID(Sched_Conf, Sched_Conf_Runtime, "$Id$")
+
 
 
 
diff --git a/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h b/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
index b0fa2c85cbd..5b13c8e4912 100644
--- a/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
+++ b/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
@@ -56,7 +56,7 @@ static int configs_size = sizeof(configs)/sizeof(configs[0]);
 
 
 // This sets up Scheduler_Factory to use the runtime version.
-int scheduler_factory_setup = 
+int scheduler_factory_setup =
   ACE_Scheduler_Factory::use_runtime (configs_size, configs, infos_size, infos);
 
 // EOF
diff --git a/orbsvcs/tests/Security/BiDirectional/Makefile.am b/orbsvcs/tests/Security/BiDirectional/Makefile.am
deleted file mode 100644
index 8c40fc85d1b..00000000000
--- a/orbsvcs/tests/Security/BiDirectional/Makefile.am
+++ /dev/null
@@ -1,117 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Secure_BiDir_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Secure_BiDir_SSL_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Secure_BiDir_SSL_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/BiDirectional/client.conf b/orbsvcs/tests/Security/BiDirectional/client.conf
index c827b49249a..b65ac0f47e6 100644
--- a/orbsvcs/tests/Security/BiDirectional/client.conf
+++ b/orbsvcs/tests/Security/BiDirectional/client.conf
@@ -1,10 +1,12 @@
-dynamic SSLIOP_Factory Service_Object * 
-  TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() 
-  "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey 'PEM:ssl/client-key.pem' -SSLCertificate 'PEM:ssl/client-cert.pem' -SSLCAFile 'PEM:ssl/ca.pem'" 
+# $Id$
 
-dynamic Advanced_Resource_Factory Service_Object* 
-  TAO_Strategies:_make_TAO_Advanced_Resource_Factory () 
+dynamic SSLIOP_Factory Service_Object *
+  TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
+  "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey 'PEM:ssl/client-key.pem' -SSLCertificate 'PEM:ssl/client-cert.pem' -SSLCAFile 'PEM:ssl/ca.pem'"
+
+dynamic Advanced_Resource_Factory Service_Object*
+  TAO_Strategies:_make_TAO_Advanced_Resource_Factory ()
   "-ORBProtocolFactory SSLIOP_Factory"
-  
+
 static Client_Strategy_Factory  "-ORBConnectStrategy blocked"
 
diff --git a/orbsvcs/tests/Security/BiDirectional/client.cpp b/orbsvcs/tests/Security/BiDirectional/client.cpp
index 89f5843811b..392443b78c6 100644
--- a/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -9,7 +9,7 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 
-ACE_RCSID(BiDirectional, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
@@ -39,7 +39,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -173,6 +173,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       root_poa->destroy (1, 1);
 
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/orbsvcs/tests/Security/BiDirectional/run_test.pl b/orbsvcs/tests/Security/BiDirectional/run_test.pl
index d3e18164e16..4cba833ddf5 100755
--- a/orbsvcs/tests/Security/BiDirectional/run_test.pl
+++ b/orbsvcs/tests/Security/BiDirectional/run_test.pl
@@ -17,8 +17,8 @@ $conf_client = "";
 $conf_server = "";
 $iter = 10;
 
-sub options () { 
-    my $help = 0;       # handled locally 
+sub options () {
+    my $help = 0;       # handled locally
     my $man = 0;        # handled locally
     my $ssl = 1;        # handled locally
     my $dotdec = 0;     # handled locally
@@ -27,15 +27,15 @@ sub options () {
     my $chost;        # handled locally
 
     # Process options.
-    if ( @ARGV > 0 ) { 
-        GetOptions ('help|?' => \$help, 
-                'manual' => \$man, 
-                'iter=i' => \$iter, 
-                'ssl' => \$ssl, 
-                'dd=s' => \$dotdec, 
-                'shost=s' => \$shost, 
-                'chost=s' => \$chost, 
-                'debug=i' => \$debug) or pod2usage(2); 
+    if ( @ARGV > 0 ) {
+        GetOptions ('help|?' => \$help,
+                'manual' => \$man,
+                'iter=i' => \$iter,
+                'ssl' => \$ssl,
+                'dd=s' => \$dotdec,
+                'shost=s' => \$shost,
+                'chost=s' => \$chost,
+                'debug=i' => \$debug) or pod2usage(2);
     }
 
     if ($ssl) {
@@ -66,18 +66,18 @@ sub options () {
 
     if ( $man or $help ) {
         # Load Pod::Usage only if needed.
-        require "Pod/Usage.pm"; 
-        import Pod::Usage; 
+        require "Pod/Usage.pm";
+        import Pod::Usage;
         pod2usage(1) if $help;
-        pod2usage(VERBOSE => 2) if $man; 
+        pod2usage(VERBOSE => 2) if $man;
         return 0;
-    } 
+    }
     return 1;
 }
 
 
 # Make sure OpenSSL knows where to find the trust store
-$ENV{'SSL_CERT_DIR'} = './ssl'; 
+$ENV{'SSL_CERT_DIR'} = './ssl';
 
 options () or die "Error: Nothing executed";
 
@@ -92,13 +92,13 @@ $client->DeleteFile($iorbase);
 
 print STDERR "Executing: server $conf_server $opt -o $iorbase -i $iter\n";
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "$conf_server " .
                               "$opt " .
                               "-o $server_iorfile " .
                               "-i $iter");
 
-$CL = $client->CreateProcess ("client", 
+$CL = $client->CreateProcess ("client",
                               "$conf_client " .
                               "$opt " .
                               "-k file://$client_iorfile");
@@ -157,7 +157,7 @@ run_test.pl - A driver to run the test
 =head1 SYNOPSIS
 
 B<run_test.pl> [B<-help|?>] [B<-iter iterations>] [B<-chost host>]
-               [B<-dd who>] [B<-shost host>] [B<-man>] [B<-ssl>] 
+               [B<-dd who>] [B<-shost host>] [B<-man>] [B<-ssl>]
                [B<-debug level>]
 
 
@@ -167,7 +167,7 @@ This is a test that exercises the birectional GIOP connection
 implementation in TAO over SSLIOP connection. Start the server like this
 
     $ server -ORBSvcConf server.conf -o <file.ior> -i <no_iterations>
-    $ client -ORBSvcConf client.conf -k file://<file.ior> -x 
+    $ client -ORBSvcConf client.conf -k file://<file.ior> -x
 
 Or, simply
 
@@ -188,13 +188,13 @@ added support for SSLIOP.
 [B<-help|?>]
     Print a short help message
 
-[B<-iter iterations>] 
+[B<-iter iterations>]
     The number of iterations to make. Default is 10.
 
-[B<-chost hostname>] 
+[B<-chost hostname>]
     The hostname_in_ior for the client. Used only if specified.
 
-[B<-shost hostname>] 
+[B<-shost hostname>]
     The hostname_in_ior for the server. Used only if specified.
 
 [B<-man>]
@@ -205,7 +205,7 @@ added support for SSLIOP.
     server or both. Values of who can be "client", "server" or
     "client,server".
 
-[B<-ssl>] 
+[B<-ssl>]
     Enables the use of SSLIOP instead of IIOP. Default.
 
 [B<-debug level>]
diff --git a/orbsvcs/tests/Security/BiDirectional/server.conf b/orbsvcs/tests/Security/BiDirectional/server.conf
index 6ad7e6d78a8..39bf82dd312 100644
--- a/orbsvcs/tests/Security/BiDirectional/server.conf
+++ b/orbsvcs/tests/Security/BiDirectional/server.conf
@@ -1,10 +1,12 @@
-dynamic SSLIOP_Factory Service_Object * 
-  TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() 
+# $Id$
+
+dynamic SSLIOP_Factory Service_Object *
+  TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
   "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey 'PEM:ssl/server-key.pem' -SSLCertificate 'PEM:ssl/server-cert.pem' -SSLCAFile 'PEM:ssl/ca.pem'"
 
-dynamic Advanced_Resource_Factory Service_Object* 
-  TAO_Strategies:_make_TAO_Advanced_Resource_Factory () 
+dynamic Advanced_Resource_Factory Service_Object*
+  TAO_Strategies:_make_TAO_Advanced_Resource_Factory ()
   "-ORBProtocolFactory SSLIOP_Factory"
-  
+
 static Client_Strategy_Factory  "-ORBConnectStrategy blocked"
 
diff --git a/orbsvcs/tests/Security/BiDirectional/server.cpp b/orbsvcs/tests/Security/BiDirectional/server.cpp
index f1190f6653f..8991d3db473 100644
--- a/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -6,7 +6,7 @@
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(BiDirectional, server, "$Id$")
+
 
 const ACE_TCHAR *ior_output_file = 0;
 int no_iterations = 10;
@@ -36,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -143,6 +143,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1, 1);
+
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index a4438816292..6bb15414370 100644
--- a/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -11,7 +11,7 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(BiDirectional, test_i, "$Id$")
+
 
 void
 Callback_i::shutdown (void)
diff --git a/orbsvcs/tests/Security/BiDirectional/test_i.h b/orbsvcs/tests/Security/BiDirectional/test_i.h
index cc4725dc141..3914ef78a3e 100644
--- a/orbsvcs/tests/Security/BiDirectional/test_i.h
+++ b/orbsvcs/tests/Security/BiDirectional/test_i.h
@@ -1,59 +1,58 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/BiDirectional
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_BIDIRECTIONAL_TEST_I_H
 #define TAO_BIDIRECTIONAL_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Callback_i
+ *
+ * @brief A callback object to the "client"
+ *
+ * To test that the server can call the client on the same
+ * connection that was established by the client
+ */
 class Callback_i : public POA_Callback
 {
-  // = TITLE
-  //   A callback object to the "client"
-  //
-  // = DESCRIPTION
-  //   To test that the server can call the client on the same
-  //   connection that was established by the client
-  //
 public:
+  /// ctor
   Callback_i (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// Safe way to shutdown
   void shutdown (void);
-  // Safe way to shutdown
 
+  /// The callback method
   void callback_method (void);
-  // The callback method
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 
 };
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback);
@@ -65,17 +64,17 @@ public:
   int call_client (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
+  /// Flag to indicate, whether we are ready for a remote call.
   int flag_;
-  // Flag to indicate, whether we are ready for a remote call.
 
+  /// Callback Object
   Callback_var callback_;
-  // Callback Object
 
+  /// Number of times the callback needs to be called
   int no_iterations_;
-  // Number of times the callback needs to be called
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/orbsvcs/tests/Security/Big_Request/Big_Request.mpc b/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
index 85e6ce4428f..ffd4c35b7d9 100644
--- a/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
+++ b/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*security client): taoclient, anytypecode, ssl {
+project(*security client): taoclient {
   after += *idl
   Source_Files {
     TX_ObjectC.cpp
@@ -18,7 +18,7 @@ project(*security client): taoclient, anytypecode, ssl {
   }
 }
 
-project(*security server): taoserver, ssl {
+project(*security server): taoserver {
   after += *idl
   Source_Files {
     TX_Object_i.cpp
diff --git a/orbsvcs/tests/Security/Big_Request/Makefile.am b/orbsvcs/tests/Security/Big_Request/Makefile.am
deleted file mode 100644
index 2cd5fcec6b0..00000000000
--- a/orbsvcs/tests/Security/Big_Request/Makefile.am
+++ /dev/null
@@ -1,124 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Big_Request_Idl.am
-
-BUILT_SOURCES = \
-  TX_ObjectC.cpp \
-  TX_ObjectC.h \
-  TX_ObjectC.inl \
-  TX_ObjectS.cpp \
-  TX_ObjectS.h \
-  TX_ObjectS.inl
-
-CLEANFILES = \
-  TX_Object-stamp \
-  TX_ObjectC.cpp \
-  TX_ObjectC.h \
-  TX_ObjectC.inl \
-  TX_ObjectS.cpp \
-  TX_ObjectS.h \
-  TX_ObjectS.inl
-
-TX_ObjectC.cpp TX_ObjectC.h TX_ObjectC.inl TX_ObjectS.cpp TX_ObjectS.h TX_ObjectS.inl: TX_Object-stamp
-
-TX_Object-stamp: $(srcdir)/TX_Object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TX_Object.idl
-	@touch $@
-
-noinst_HEADERS = \
-  TX_Object.idl
-
-## Makefile.Big_Request_Security_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_SSL
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-client_SOURCES = \
-  TX_ObjectC.cpp \
-  client.cpp \
-  TX_Object_i.h
-
-client_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-client_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_EXCEPTIONS
-
-## Makefile.Big_Request_Security_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  TX_ObjectC.cpp \
-  TX_ObjectS.cpp \
-  TX_Object_i.cpp \
-  server.cpp \
-  TX_Object_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-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/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
index 4cea1fa04b9..ea411dbe319 100644
--- a/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
+++ b/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
@@ -1,12 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "TX_Object_i.h"
 
-ACE_RCSID (Big_Request,
-           TX_Object_i,
-           "$Id$")
-
-
 TX_Object_i::TX_Object_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     data_ ()
diff --git a/orbsvcs/tests/Security/Big_Request/client.cpp b/orbsvcs/tests/Security/Big_Request/client.cpp
index 2a79ca57c78..7258aedbb7a 100644
--- a/orbsvcs/tests/Security/Big_Request/client.cpp
+++ b/orbsvcs/tests/Security/Big_Request/client.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "TX_ObjectC.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
 
-ACE_RCSID (Big_Request,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 const char *cert_file = "cacert.pem";
 long number_iterations = 1;
@@ -48,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -122,6 +120,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         {
           txObject->shutdown ();
         }
+
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/orbsvcs/tests/Security/Big_Request/server.cpp b/orbsvcs/tests/Security/Big_Request/server.cpp
index a535b6b2e50..06510884f27 100644
--- a/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -1,3 +1,4 @@
+// $Id$
 
 #include "TX_Object_i.h"
 #include "ace/Get_Opt.h"
@@ -6,10 +7,6 @@
 #include "ace/SString.h"
 #include "ace/Task.h"
 
-ACE_RCSID (Big_Request,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 const char *cert_file = "cacert.pem";
 
@@ -65,7 +62,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc b/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc
index 17cb4d65c5f..f48d7df4255 100644
--- a/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc
+++ b/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc
@@ -8,7 +8,7 @@ project(*idl) : taoidldefaults {
   custom_only = 1
 }
 
-project(*security server): taoserver, orbsvcslib, security, ssliop, pi_server, codecfactory, interceptors {
+project(*security server): taoserver, security {
   after += *idl
   Source_Files {
     Foo_i.cpp
@@ -20,7 +20,7 @@ project(*security server): taoserver, orbsvcslib, security, ssliop, pi_server, c
   }
 }
 
-project(*security client): taoexe, orbsvcslib, security, pi, codecfactory, interceptors {
+project(*security client): taoclient, security {
   after += *idl
   exename = client
   Source_Files {
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp b/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
index afb59f51dc3..be296431912 100644
--- a/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
+++ b/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
@@ -1,15 +1,10 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Foo_i.h"
-
 #include "ace/OS_NS_string.h"
 
 
-ACE_RCSID (Bug_1107_Regression,
-           Foo_i,
-           "$Id$")
-
-
 Foo_i::Foo_i (CORBA::ORB_ptr orb,
               SecurityLevel3::SecurityCurrent_ptr current)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/Makefile.am b/orbsvcs/tests/Security/Bug_1107_Regression/Makefile.am
deleted file mode 100644
index 13a6e70f84d..00000000000
--- a/orbsvcs/tests/Security/Bug_1107_Regression/Makefile.am
+++ /dev/null
@@ -1,138 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1107_Regression_Idl.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.Bug_1107_Regression_Security_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  FooC.cpp \
-  client.cpp \
-  Foo_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1107_Regression_Security_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  server.cpp \
-  Foo_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp b/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
index 49e36cbd76e..6ac9c87c891 100644
--- a/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
+++ b/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 
@@ -6,14 +7,10 @@
 #include "orbsvcs/SecurityC.h"
 #include "ace/SString.h"
 
-ACE_RCSID (Bug_1107_Regression,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 const char *cert_file = "cacert.pem";
 
-void
+int
 insecure_invocation_test (CORBA::ORB_ptr orb,
                           CORBA::Object_ptr obj)
 {
@@ -49,7 +46,7 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
                   "nil.\n",
                   ior));
 
-      throw CORBA::INTERNAL ();
+      return 1;
     }
 
   try
@@ -64,17 +61,17 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
                   "(%P|%t) Received CORBA::NO_PERMISSION from "
                   "server, as expected.\n"));
 
-      return;
+      return 0;
     }
 
   ACE_ERROR ((LM_ERROR,
               "(%P|%t) ERROR: CORBA::NO_PERMISSION was not thrown.\n"
               "(%P|%t) ERROR: It should have been thrown.\n"));
 
-  throw CORBA::INTERNAL ();
+  return 1;
 }
 
-void
+int
 secure_invocation_test (CORBA::Object_ptr object)
 {
   Foo::Bar_var server =
@@ -87,13 +84,15 @@ secure_invocation_test (CORBA::Object_ptr object)
                   "nil.\n",
                   ior));
 
-      throw CORBA::INTERNAL ();
+      return 1;
     }
 
   // This invocation should return successfully.
   server->baz ();
 
   server->shutdown ();
+
+  return 0;
 }
 
 int
@@ -114,18 +113,19 @@ parse_args (int argc, ACE_TCHAR *argv[])
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Usage:  %s "
-                           "-k <ior> "
+                           "-k <ior>"
                            "\n",
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
+  int status = 0;
   bool set_cert_file = true;
   try
     {
@@ -165,42 +165,54 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           // then result in a CORBA::NO_PERMISSION exception.
           //
           // The server is not shutdown by this test.
-          insecure_invocation_test (orb.in (), object.in ());
+          status = insecure_invocation_test (orb.in (), object.in ());
+          ACE_DEBUG ((LM_DEBUG,
+                      "insecure_invocation_test returned <%d>\n",
+                      status));
         }
 
       // This test uses the default secure SSLIOP settings to securely
       // invoke a method on the server.  No exception should occur.
       //
       // The server *is* shutdown by this test.
-      if (!set_cert_file)
-        ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR);
-      secure_invocation_test (object.in ());
-      if (!set_cert_file)
-        ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR);
+      try
+        {
+          status = secure_invocation_test (object.in ());
+          ACE_DEBUG ((LM_DEBUG,
+                      "secure_invocation_test returned <%d>\n",
+                      status));
+        }
+      catch (CORBA::Exception const &ex)
+        {
+          if (set_cert_file)
+            {
+              ex._tao_print_exception ("Caught unexpected exception "
+                                       "(probable failure):");
+              status = 1;
+            }
+          else
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "Caught an exception as expected due "
+                          "to the SSL_CERT_FILE environment "
+                          "variable not being set.\n"));
+            }
+        }
 
       orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
-      ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR);
-      if (set_cert_file)
-        {
-          ex._tao_print_exception ("Caught unexpected exception "
-                                   "(probable failure):");
-          return 1;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "Caught an excep. as expected due "
-                                "to the SSL_CERT_FILE environment "
-                                "variable\nnot being set.\n"));
-          return 0;
-        }
+      ex._tao_print_exception ("Exception in main:");
+      return 1;
     }
 
-  ACE_DEBUG ((LM_DEBUG,
-              "\n"
-              "Bug_1107_Regression test passed.\n"));
+  if (status == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "\n"
+                  "Bug_1107_Regression test passed.\n"));
+    }
 
-  return 0;
+  return status;
 }
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp b/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
index 7ddd787fc56..9bfc639bbfe 100644
--- a/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
+++ b/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
@@ -1,14 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "Foo_i.h"
 #include "ace/SString.h"
 
-ACE_RCSID (Bug_1107_Regression,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 const char *cert_file = "cacert.pem";
 
@@ -33,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp b/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
index 94e400077c2..8e1ad8e0a71 100644
--- a/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
+++ b/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
@@ -5,7 +5,7 @@
 #include "Client_Task.h"
 #include "MessengerC.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
+
 
 Client_Task::Client_Task (
         CORBA::ORB_ptr corb,
diff --git a/orbsvcs/tests/Security/Bug_2908_Regression/Makefile.am b/orbsvcs/tests/Security/Bug_2908_Regression/Makefile.am
deleted file mode 100644
index 335614ec755..00000000000
--- a/orbsvcs/tests/Security/Bug_2908_Regression/Makefile.am
+++ /dev/null
@@ -1,152 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2908_Regression_Idl.am
-
-BUILT_SOURCES = \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-CLEANFILES = \
-  Messenger-stamp \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl: Messenger-stamp
-
-Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Messenger.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Messenger.idl
-
-## Makefile.Bug_2908_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-client_SOURCES = \
-  MessengerC.cpp \
-  MessengerClient.cpp \
-  Client_Task.h \
-  Messenger_i.h
-
-client_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2908_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  Client_Task.cpp \
-  MessengerC.cpp \
-  MessengerS.cpp \
-  MessengerServer.cpp \
-  Messenger_i.cpp \
-  Client_Task.h \
-  Messenger_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp b/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
index 1b82a2e98a5..ce03557b106 100644
--- a/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
+++ b/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
@@ -27,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Bug_2908_Regression/client.conf b/orbsvcs/tests/Security/Bug_2908_Regression/client.conf
index 87da295875f..6dd5426760e 100644
--- a/orbsvcs/tests/Security/Bug_2908_Regression/client.conf
+++ b/orbsvcs/tests/Security/Bug_2908_Regression/client.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:clientKey.pem -SSLCertificate PEM:clientCert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/orbsvcs/tests/Security/Bug_2908_Regression/server.conf b/orbsvcs/tests/Security/Bug_2908_Regression/server.conf
index 791a6774ce9..bed3fed0a1b 100644
--- a/orbsvcs/tests/Security/Bug_2908_Regression/server.conf
+++ b/orbsvcs/tests/Security/Bug_2908_Regression/server.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:serverKey.pem -SSLCertificate PEM:serverCert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/orbsvcs/tests/Security/Callback/Makefile.am b/orbsvcs/tests/Security/Callback/Makefile.am
deleted file mode 100644
index 01af58ae695..00000000000
--- a/orbsvcs/tests/Security/Callback/Makefile.am
+++ /dev/null
@@ -1,153 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Callback_Idl.am
-
-BUILT_SOURCES = \
-  serverC.cpp \
-  serverC.h \
-  serverC.inl \
-  serverS.cpp \
-  serverS.h \
-  serverS.inl
-
-CLEANFILES = \
-  server-stamp \
-  serverC.cpp \
-  serverC.h \
-  serverC.inl \
-  serverS.cpp \
-  serverS.h \
-  serverS.inl
-
-serverC.cpp serverC.h serverC.inl serverS.cpp serverS.h serverS.inl: server-stamp
-
-server-stamp: $(srcdir)/server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/server.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  clientC.cpp \
-  clientC.h \
-  clientC.inl \
-  clientS.cpp \
-  clientS.h \
-  clientS.inl
-
-CLEANFILES += \
-  client-stamp \
-  clientC.cpp \
-  clientC.h \
-  clientC.inl \
-  clientS.cpp \
-  clientS.h \
-  clientS.inl
-
-clientC.cpp clientC.h clientC.inl clientS.cpp clientS.h clientS.inl: client-stamp
-
-client-stamp: $(srcdir)/client.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/client.idl
-	@touch $@
-
-noinst_HEADERS = \
-  client.idl \
-  server.idl
-
-## Makefile.Callback_Security_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_SSL
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-client_SOURCES = \
-  client.cpp \
-  clientC.cpp \
-  clientS.cpp \
-  client_i.cpp \
-  serverC.cpp \
-  client_i.h
-
-client_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-client_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_EXCEPTIONS
-
-## Makefile.Callback_Security_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  clientC.cpp \
-  server.cpp \
-  serverC.cpp \
-  serverS.cpp \
-  server_i.cpp \
-  server_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-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/orbsvcs/tests/Security/Callback/client.cpp b/orbsvcs/tests/Security/Callback/client.cpp
index 69b4693c129..a45e7478e04 100644
--- a/orbsvcs/tests/Security/Callback/client.cpp
+++ b/orbsvcs/tests/Security/Callback/client.cpp
@@ -1,16 +1,12 @@
+// $Id$
+
 #include "ace/Log_Msg.h"
 #include "serverC.h"
 #include "client_i.h"
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Callback,
-           client,
-           "$Id$")
-
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://server.ior");
-
 const ACE_TCHAR  *cert_file = ACE_TEXT ("cacert.pem");
 
 int
diff --git a/orbsvcs/tests/Security/Callback/client_i.cpp b/orbsvcs/tests/Security/Callback/client_i.cpp
index e91058cf879..eea77b0a2cb 100644
--- a/orbsvcs/tests/Security/Callback/client_i.cpp
+++ b/orbsvcs/tests/Security/Callback/client_i.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "ace/Log_Msg.h"
 #include "client_i.h"
 
-ACE_RCSID (Callback,
-           client_i,
-           "$Id$")
-
 client_i::client_i (server_ptr s)
   : server_ (server::_duplicate (s))
 {
diff --git a/orbsvcs/tests/Security/Callback/server.cpp b/orbsvcs/tests/Security/Callback/server.cpp
index 3da387d4370..04cbecc6590 100644
--- a/orbsvcs/tests/Security/Callback/server.cpp
+++ b/orbsvcs/tests/Security/Callback/server.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "ace/Log_Msg.h"
 #include "server_i.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Callback,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior");
 const ACE_TCHAR *cert_file = ACE_TEXT("cacert.pem");
 
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Callback/server_i.cpp b/orbsvcs/tests/Security/Callback/server_i.cpp
index 873cf521f55..2b5031d8560 100644
--- a/orbsvcs/tests/Security/Callback/server_i.cpp
+++ b/orbsvcs/tests/Security/Callback/server_i.cpp
@@ -1,8 +1,6 @@
-#include "server_i.h"
+// $Id$
 
-ACE_RCSID (Callback,
-           server_i,
-           "$Id$")
+#include "server_i.h"
 
 server_i::server_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/orbsvcs/tests/Security/Crash_Test/Makefile.am b/orbsvcs/tests/Security/Crash_Test/Makefile.am
deleted file mode 100644
index 6d97144d2ed..00000000000
--- a/orbsvcs/tests/Security/Crash_Test/Makefile.am
+++ /dev/null
@@ -1,151 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Security_Crash_Test_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Security_Crash_Test_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Security_Crash_Test_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/Crash_Test/client.cpp b/orbsvcs/tests/Security/Crash_Test/client.cpp
index 387181cca2a..48599b596a6 100644
--- a/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ b/orbsvcs/tests/Security/Crash_Test/client.cpp
@@ -6,10 +6,6 @@
 #include "ace/SString.h"
 #include "testC.h"
 
-ACE_RCSID (Send_File,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 const char *cert_file = "cacert.pem";
 
@@ -43,7 +39,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Crash_Test/run_test.pl b/orbsvcs/tests/Security/Crash_Test/run_test.pl
index c09c115eeb4..900fefac7f1 100755
--- a/orbsvcs/tests/Security/Crash_Test/run_test.pl
+++ b/orbsvcs/tests/Security/Crash_Test/run_test.pl
@@ -30,7 +30,6 @@ my $server_iorfile = $server->LocalFile ($iorbase);
 my $client1_iorfile = $client1->LocalFile ($iorbase);
 my $client2_iorfile = $client2->LocalFile ($iorbase);
 my $client3_iorfile = $client3->LocalFile ($iorbase);
-
 $server->DeleteFile($iorbase);
 $client1->DeleteFile($iorbase);
 $client2->DeleteFile($iorbase);
@@ -76,6 +75,11 @@ local $start_time = time();
 local $max_running_time = 500; # < 10 minutes
 local $elapsed = time() - $start_time;
 
+if ($ARGV[0] eq '-quick')  {
+    $elapsed = 0;
+    $max_running_time = 1;
+}
+
 while($status == 0 && $elapsed < $max_running_time){
 
     # Start the server
@@ -251,4 +255,9 @@ while($status == 0 && $elapsed < $max_running_time){
     $elapsed = time() - $start_time;
 }
 
+$server->DeleteFile($iorbase);
+$client1->DeleteFile($iorbase);
+$client2->DeleteFile($iorbase);
+$client3->DeleteFile($iorbase);
+
 exit $status;
diff --git a/orbsvcs/tests/Security/Crash_Test/server.cpp b/orbsvcs/tests/Security/Crash_Test/server.cpp
index 1be2a7de439..8c6c7caecfd 100644
--- a/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -6,10 +6,6 @@
 #include "ace/SString.h"
 #include "test_i.h"
 
-ACE_RCSID (Send_File,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 const char *cert_file = "cacert.pem";
 
@@ -34,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -134,6 +130,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       root_poa->destroy (1, 1);
 
       ACE_OS::sleep (1);
+
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/orbsvcs/tests/Security/Crash_Test/test_i.cpp
index 225c91d9abd..137ca4f0ec5 100644
--- a/orbsvcs/tests/Security/Crash_Test/test_i.cpp
+++ b/orbsvcs/tests/Security/Crash_Test/test_i.cpp
@@ -6,10 +6,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Send_File,
-           test_i,
-           "$Id$")
-
 void
 Simple_Server_i::send_line (const char *)
 {
diff --git a/orbsvcs/tests/Security/Crash_Test/test_i.h b/orbsvcs/tests/Security/Crash_Test/test_i.h
index 729b1d933f8..c9ff4b29ab3 100644
--- a/orbsvcs/tests/Security/Crash_Test/test_i.h
+++ b/orbsvcs/tests/Security/Crash_Test/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Send_File
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_SEND_FILE_TEST_I_H
 #define TAO_SEND_FILE_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   void send_line (const char *line);
diff --git a/orbsvcs/tests/Security/EndpointPolicy/Makefile.am b/orbsvcs/tests/Security/EndpointPolicy/Makefile.am
deleted file mode 100644
index d41627b774c..00000000000
--- a/orbsvcs/tests/Security/EndpointPolicy/Makefile.am
+++ /dev/null
@@ -1,68 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.EndpointPolicy_Test.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-bin_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-test_SOURCES = \
-  test.cpp
-
-test_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_EndpointPolicy.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/EndpointPolicy/svc.conf b/orbsvcs/tests/Security/EndpointPolicy/svc.conf
index 6f3231c6716..05966f6443c 100644
--- a/orbsvcs/tests/Security/EndpointPolicy/svc.conf
+++ b/orbsvcs/tests/Security/EndpointPolicy/svc.conf
@@ -1,3 +1,4 @@
+# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/orbsvcs/tests/Security/EndpointPolicy/test.cpp b/orbsvcs/tests/Security/EndpointPolicy/test.cpp
index 19904fd2479..0aeea98134d 100644
--- a/orbsvcs/tests/Security/EndpointPolicy/test.cpp
+++ b/orbsvcs/tests/Security/EndpointPolicy/test.cpp
@@ -41,7 +41,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                          argv [0]),
                         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/InsecureReferences/Makefile.am b/orbsvcs/tests/Security/InsecureReferences/Makefile.am
deleted file mode 100644
index 113224144b6..00000000000
--- a/orbsvcs/tests/Security/InsecureReferences/Makefile.am
+++ /dev/null
@@ -1,67 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.InsecureReferences_Test.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-test_SOURCES = \
-  test.cpp
-
-test_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/InsecureReferences/client.conf b/orbsvcs/tests/Security/InsecureReferences/client.conf
index 6f3231c6716..05966f6443c 100644
--- a/orbsvcs/tests/Security/InsecureReferences/client.conf
+++ b/orbsvcs/tests/Security/InsecureReferences/client.conf
@@ -1,3 +1,4 @@
+# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/orbsvcs/tests/Security/InsecureReferences/test.cpp b/orbsvcs/tests/Security/InsecureReferences/test.cpp
index 89f1a561c9f..f4376b7d0b5 100644
--- a/orbsvcs/tests/Security/InsecureReferences/test.cpp
+++ b/orbsvcs/tests/Security/InsecureReferences/test.cpp
@@ -44,7 +44,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                          argv [0]),
                         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -146,6 +146,8 @@ parse_objref (int argc, ACE_TCHAR *argv[])
         CORBA::ORB_init (argc, argv);
 
       obj = orb->string_to_object (iorstr);
+
+      orb->destroy ();
     }
   catch (CORBA::Exception &ex)
     {
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h b/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
index 85099621dfa..c7b0f235f7b 100644
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
+++ b/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ===========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Security/MT_SSLIOP
-//
-// = FILENAME
-//   Client_Worker.h
-//
-// = AUTHOR
-//   Anand Krishnan
-//
-// ===========================================================================
+
+//=============================================================================
+/**
+ *  @file   Client_Worker.h
+ *
+ *  $Id$
+ *
+ *  @author Anand Krishnan
+ */
+//=============================================================================
+
 
 #ifndef MT_SSLIOP_CLIENT_WORKER_H
 #define MT_SSLIOP_CLIENT_WORKER_H
@@ -26,32 +23,33 @@
 #include "testC.h"
 
 
+/**
+ * @class Client_Worker
+ *
+ * @brief Run the Client_Worker Thread
+ *
+ * Use the ACE_Task_Base class to run the client threads
+ */
 class Client_Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run the Client_Worker Thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads
-  //
 
 public:
+  /// ctor
   Client_Worker (Simple_Server_ptr server, int niterations);
-  // ctor
 
+  /// thread entry point
   virtual int svc (void);
-  // thread entry point
 
 private:
+  /// Validate the connection
   void validate_connection (void);
-  // Validate the connection
 
 private:
+  /// The server.
   Simple_Server_var server_;
-  // The server.
 
+  /// The number of iterations on each client thread.
   int niterations_;
-  // The number of iterations on each client thread.
 };
 
 #if defined(_MSC_VER)
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am b/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
deleted file mode 100644
index eabcde4fddd..00000000000
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
+++ /dev/null
@@ -1,134 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_IIOP_SSL_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.MT_IIOP_SSL_Security_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Client_Worker.cpp \
-  client.cpp \
-  testC.cpp \
-  Client_Worker.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MT_IIOP_SSL_Security_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  Server_Worker.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_Worker.h \
-  test_i.h \
-  test_i.inl
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf b/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf
index bf9048990f4..fe8f854a0dd 100644
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf
+++ b/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf
@@ -1,4 +1,5 @@
 #$Id$
+
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
         "-SSLNoProtection -SSLAuthenticate  NONE"
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
index 53af9eeb98d..a819b37e393 100644
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+++ b/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
@@ -46,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf b/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf
index d486769062b..c2d659f95eb 100644
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf
+++ b/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf
@@ -1,4 +1,5 @@
 #$Id$
+
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
         "-SSLNoProtection -SSLPrivateKey  PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
index dfca2b5c55d..ab199af47fa 100644
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
+++ b/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -100,6 +100,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       worker.thr_mgr ()->wait ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
+
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
index ba8e1b90c52..98af071916a 100644
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ b/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
@@ -12,10 +12,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (MT_IIOP_SSL,
-           test_i,
-           "$Id$")
-
 void
 Simple_Server_i::ping (void)
 {
diff --git a/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h b/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
index 61eb06ce0b5..c7ec4e6a1c2 100644
--- a/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
+++ b/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Server
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_MT_SERVER_TEST_I_H
 #define TAO_MT_SERVER_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   void ping (void);
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
index 1d56173a596..68683c2c101 100644
--- a/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
+++ b/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
@@ -1,17 +1,14 @@
-// $Id$
 
-// ===========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Security/MT_SSLIOP
-//
-// = FILENAME
-//   Client_Worker.h
-//
-// = AUTHOR
-//   Anand Krishnan
-//
-// ===========================================================================
+//=============================================================================
+/**
+ *  @file   Client_Worker.h
+ *
+ *  $Id$
+ *
+ *  @author Anand Krishnan
+ */
+//=============================================================================
+
 
 #ifndef MT_SSLIOP_CLIENT_WORKER_H
 #define MT_SSLIOP_CLIENT_WORKER_H
@@ -26,37 +23,38 @@
 #include "testC.h"
 
 
+/**
+ * @class Client_Worker
+ *
+ * @brief Run the Client_Worker Thread
+ *
+ * Use the ACE_Task_Base class to run the client threads
+ */
 class Client_Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run the Client_Worker Thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads
-  //
 
 public:
+  /// ctor
   Client_Worker (Simple_Server_ptr server,
                  Another_One_ptr another,
                  int niterations);
-  // ctor
 
+  /// thread entry point
   virtual int svc (void);
-  // thread entry point
 
 private:
+  /// Validate the connection
   void validate_connection (void);
-  // Validate the connection
 
 private:
+  /// The server.
   Simple_Server_var server_;
-  // The server.
 
+  /// Another object served by the same server as server_.
   Another_One_var another_;
-  // Another object served by the same server as server_.
 
+  /// The number of iterations on each client thread.
   int niterations_;
-  // The number of iterations on each client thread.
 };
 
 #if defined(_MSC_VER)
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am b/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
deleted file mode 100644
index 318db7b954b..00000000000
--- a/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
+++ /dev/null
@@ -1,130 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_SSLIOP_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.MT_SSLIOP_Security_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_SSL
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-client_SOURCES = \
-  Client_Worker.cpp \
-  client.cpp \
-  testC.cpp \
-  Client_Worker.h \
-  test_i.inl
-
-client_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-client_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_EXCEPTIONS
-
-## Makefile.MT_SSLIOP_Security_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  Server_Worker.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_Worker.h \
-  test_i.h \
-  test_i.inl
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-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/orbsvcs/tests/Security/MT_SSLIOP/client.conf b/orbsvcs/tests/Security/MT_SSLIOP/client.conf
index fc1422ac496..5403109ed69 100644
--- a/orbsvcs/tests/Security/MT_SSLIOP/client.conf
+++ b/orbsvcs/tests/Security/MT_SSLIOP/client.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
         "-SSLCertificate PEM:selfsigncert.pem"
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index 174338d5535..39f3fc928d8 100644
--- a/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -48,7 +48,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/server.conf b/orbsvcs/tests/Security/MT_SSLIOP/server.conf
index 31d7b2979b8..fec138accdb 100644
--- a/orbsvcs/tests/Security/MT_SSLIOP/server.conf
+++ b/orbsvcs/tests/Security/MT_SSLIOP/server.conf
@@ -1,3 +1,4 @@
+# $Id$
 
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index cf7b33bc8af..0ee69874025 100644
--- a/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -54,7 +54,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -161,6 +161,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       worker.thr_mgr ()->wait ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
+
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index 634b0fd9e27..ed3db5f624d 100644
--- a/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -7,10 +7,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (MT_Server,
-           test_i,
-           "$Id$")
-
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x)
 {
diff --git a/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
index 28dafc13474..0ec089a3b61 100644
--- a/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
+++ b/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Server
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_MT_SERVER_TEST_I_H
 #define TAO_MT_SERVER_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
@@ -36,29 +34,30 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 
+/**
+ * @class Another_One_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Another_One_i : public POA_Another_One
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Another_One_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/orbsvcs/tests/Security/Makefile.am b/orbsvcs/tests/Security/Makefile.am
deleted file mode 100644
index 4e4d399993a..00000000000
--- a/orbsvcs/tests/Security/Makefile.am
+++ /dev/null
@@ -1,26 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        BiDirectional \
-        Big_Request \
-        Bug_1107_Regression \
-        Bug_2908_Regression \
-        Callback \
-        Crash_Test \
-        EndpointPolicy \
-        InsecureReferences \
-        MT_IIOP_SSL \
-        MT_SSLIOP \
-        Secure_Invocation \
-        mixed_security_test \
-        ssliop_CSD \
-        ssliop_corbaloc
-
diff --git a/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp b/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
index 299f4a79f7f..1d7af9b5648 100644
--- a/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
+++ b/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id:$
+// $Id$
 
 #include "Foo_i.h"
 
diff --git a/orbsvcs/tests/Security/Null_Cipher/Makefile.am b/orbsvcs/tests/Security/Null_Cipher/Makefile.am
deleted file mode 100644
index 83b0cafc241..00000000000
--- a/orbsvcs/tests/Security/Null_Cipher/Makefile.am
+++ /dev/null
@@ -1,138 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Secure_Invocation_Idl.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.Secure_Invocation_Security_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  FooC.cpp \
-  client.cpp \
-  Foo_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Secure_Invocation_Security_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  server.cpp \
-  Foo_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/Null_Cipher/client.cpp b/orbsvcs/tests/Security/Null_Cipher/client.cpp
index b610aff6f31..0b7c505dec5 100644
--- a/orbsvcs/tests/Security/Null_Cipher/client.cpp
+++ b/orbsvcs/tests/Security/Null_Cipher/client.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id:$
+// $Id$
 //
 
 #include "ace/Get_Opt.h"
@@ -26,10 +26,10 @@ null_cipher_test (CORBA::ORB_ptr orb,
   //trust <<= establish_trust;
 
   CORBA::PolicyList policy_list (2);
-  policy_list.length (1); 
+  policy_list.length (1);
   policy_list[0] =
     orb->create_policy (Security::SecQOPPolicy, protection);
-//   policy_list[1] = 
+//   policy_list[1] =
 //     orb->create_policy (Security::SecEstablishTrustPolicy, trust);
 
   // Create an object reference that uses plain IIOP (i.e. no
@@ -88,7 +88,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Null_Cipher/server.cpp b/orbsvcs/tests/Security/Null_Cipher/server.cpp
index 38c87f1c0f5..74a08a7095b 100644
--- a/orbsvcs/tests/Security/Null_Cipher/server.cpp
+++ b/orbsvcs/tests/Security/Null_Cipher/server.cpp
@@ -1,14 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "Foo_i.h"
 #include "ace/SString.h"
 
-ACE_RCSID (Secure_Invocation,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 const char *cert_file = "cacert.pem";
 
@@ -33,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
index e40e0f69e13..df429bfaeb2 100644
--- a/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
+++ b/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
@@ -1,15 +1,9 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Foo_i.h"
-
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (Secure_Invocation,
-           Foo_i,
-           "$Id$")
-
-
 Foo_i::Foo_i (CORBA::ORB_ptr orb,
               SecurityLevel3::SecurityCurrent_ptr current)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/orbsvcs/tests/Security/Secure_Invocation/Makefile.am b/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
deleted file mode 100644
index 83b0cafc241..00000000000
--- a/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
+++ /dev/null
@@ -1,138 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Secure_Invocation_Idl.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.Secure_Invocation_Security_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  FooC.cpp \
-  client.cpp \
-  Foo_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Secure_Invocation_Security_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  server.cpp \
-  Foo_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index 1ee4e0773e2..e81a2cf2f83 100644
--- a/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 
@@ -6,10 +7,6 @@
 #include "orbsvcs/SecurityC.h"
 #include "ace/SString.h"
 
-ACE_RCSID (Secure_Invocation,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 const char *cert_file = "cacert.pem";
 
@@ -117,7 +114,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index 723915cf2c1..3acd85c9486 100644
--- a/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -1,14 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "Foo_i.h"
 #include "ace/SString.h"
 
-ACE_RCSID (Secure_Invocation,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 const char *cert_file = "cacert.pem";
 
@@ -33,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp b/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
index aa1368d5e67..ccaf134b109 100644
--- a/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
+++ b/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
@@ -1,15 +1,9 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Foo_i.h"
-
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (Secure_Invocation,
-           Foo_i,
-           "$Id$")
-
-
 Foo_i::Foo_i (CORBA::ORB_ptr orb,
               SecurityLevel3::SecurityCurrent_ptr current)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/orbsvcs/tests/Security/mixed_security_test/Makefile.am b/orbsvcs/tests/Security/mixed_security_test/Makefile.am
deleted file mode 100644
index aa8d9cc7ade..00000000000
--- a/orbsvcs/tests/Security/mixed_security_test/Makefile.am
+++ /dev/null
@@ -1,139 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.mixed_security_idl.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.mixed_security_security_client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  FooC.cpp \
-  client.cpp \
-  Foo_i.h \
-  constants.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.mixed_security_security_server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  server.cpp \
-  Foo_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/mixed_security_test/client.cpp b/orbsvcs/tests/Security/mixed_security_test/client.cpp
index 2973a2fcb41..2e77ad1b931 100644
--- a/orbsvcs/tests/Security/mixed_security_test/client.cpp
+++ b/orbsvcs/tests/Security/mixed_security_test/client.cpp
@@ -1,17 +1,12 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
-
 #include "orbsvcs/SecurityC.h"
-
 #include "FooC.h"
 #include "constants.h"
 
-ACE_RCSID (Secure_Invocation,
-           client,
-           "$Id$")
-
 bool shutdown_server = true;
 
 class ClientTest
diff --git a/orbsvcs/tests/Security/mixed_security_test/server.cpp b/orbsvcs/tests/Security/mixed_security_test/server.cpp
index 2615b696aa4..523c8fc8148 100644
--- a/orbsvcs/tests/Security/mixed_security_test/server.cpp
+++ b/orbsvcs/tests/Security/mixed_security_test/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include <ace/SString.h>
 #include <ace/ARGV.h>
@@ -9,10 +10,6 @@
 #include "Foo_i.h"
 #include "constants.h"
 
-ACE_RCSID (Secure_Invocation,
-           server,
-           "$Id$")
-
 /*
   This tests the ability to use the SecurityManager/AccessDecision tools
   to permit unsecured access to specific object references, while all other
diff --git a/orbsvcs/tests/Security/ssliop_CSD/Makefile.am b/orbsvcs/tests/Security/ssliop_CSD/Makefile.am
deleted file mode 100644
index 38bc4230cb1..00000000000
--- a/orbsvcs/tests/Security/ssliop_CSD/Makefile.am
+++ /dev/null
@@ -1,145 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Ssliop_CSD_Idl.am
-
-BUILT_SOURCES = \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-CLEANFILES = \
-  Messenger-stamp \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl: Messenger-stamp
-
-Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Messenger.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Messenger.idl
-
-## Makefile.Ssliop_CSD_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += MessengerClient
-
-MessengerClient_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-MessengerClient_SOURCES = \
-  MessengerC.cpp \
-  MessengerClient.cpp \
-  Messenger_i.h
-
-MessengerClient_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-MessengerClient_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Ssliop_CSD_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-
-noinst_PROGRAMS += MessengerServer
-
-MessengerServer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-MessengerServer_SOURCES = \
-  MessengerC.cpp \
-  MessengerS.cpp \
-  MessengerServer.cpp \
-  Messenger_i.cpp \
-  Messenger_i.h
-
-MessengerServer_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-MessengerServer_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp b/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
index 06c32756aed..2011be2c41b 100644
--- a/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
+++ b/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
@@ -55,12 +55,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-    CORBA::String_var message = CORBA::string_dup( 
+    CORBA::String_var message = CORBA::string_dup(
       "Implementing security policy now!" );
-    messenger->send_message( "Chief of Security", 
+    messenger->send_message( "Chief of Security",
                              "New Directive",
                              message.inout() );
     std::cout << "message was sent" << std::endl;
+
+    orb->destroy ();
   }
 
   catch(const CORBA::Exception& ex) {
diff --git a/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp b/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
index b5e36458b92..6e8c488cbc9 100644
--- a/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
+++ b/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -56,14 +56,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     // Register the servant with the RootPOA, obtain its object
     // reference, stringify it, and write it to a file.
-    PortableServer::ObjectId_var oid = 
+    PortableServer::ObjectId_var oid =
       poa->activate_object( &messenger_servant );
     CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
     CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
     std::ofstream iorFile( ACE_TEXT_ALWAYS_CHAR(ior_output_file) );
     iorFile << str.in() << std::endl;
     iorFile.close();
-    std::cout << "IOR written to file " << ACE_TEXT_ALWAYS_CHAR(ior_output_file) << std::endl;   
+    std::cout << "IOR written to file " << ACE_TEXT_ALWAYS_CHAR(ior_output_file) << std::endl;
 
     // Accept requests
     orb->run();
diff --git a/orbsvcs/tests/Security/ssliop_CSD/csd.conf b/orbsvcs/tests/Security/ssliop_CSD/csd.conf
index e59fb4ac94c..4eccadbc649 100644
--- a/orbsvcs/tests/Security/ssliop_CSD/csd.conf
+++ b/orbsvcs/tests/Security/ssliop_CSD/csd.conf
@@ -1 +1,3 @@
+# $Id$
+
 dynamic TAO_CSD_TP_Strategy_Factory Service_Object * TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2"
diff --git a/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am b/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
deleted file mode 100644
index 01d2844f4b2..00000000000
--- a/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
+++ /dev/null
@@ -1,85 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Corbaloc_Ssliop_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  test_objectC.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.cpp \
-  test_objectS.h \
-  test_objectS.inl
-
-CLEANFILES = \
-  test_object-stamp \
-  test_objectC.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.cpp \
-  test_objectS.h \
-  test_objectS.inl
-
-test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl: test_object-stamp
-
-test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  test_objectC.cpp \
-  test_objectS.cpp \
-  client.h \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.h \
-  test_objectS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/Security/ssliop_corbaloc/client.conf b/orbsvcs/tests/Security/ssliop_corbaloc/client.conf
index 880c1b7d372..4624af11b7a 100644
--- a/orbsvcs/tests/Security/ssliop_corbaloc/client.conf
+++ b/orbsvcs/tests/Security/ssliop_corbaloc/client.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
         "-SSLPrivateKey PEM:pvtkey-client.pem -SSLCertificate PEM:selfsigncert-client.pem"
diff --git a/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index db19df43db4..7c4c5c250b8 100644
--- a/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -1,28 +1,26 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Naming_Service/
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple CORBA client for the CosNaming
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan <sergio@cs.wustl.edu>,
-//      Marina Spivak <marina@cs.wustl.edu>, and
-//      Douglas C. Schmidt <schmidt@cs.wustl.edu>
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *    This class implements a simple CORBA client for the CosNaming
+ *    example using stubs generated by the TAO ORB IDL compiler.
+ *
+ *
+ *  @author   Sergio Flores-Gaitan <sergio@cs.wustl.edu>
+ *  @author   Marina Spivak <marina@cs.wustl.edu>
+ *  @author and   Douglas C. Schmidt <schmidt@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "client.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Simple_Naming, client, "$Id$")
+
 
 #if defined (_MSC_VER)
 # pragma warning (disable : 4250)
@@ -33,19 +31,19 @@ class My_Test_Object :
 {
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   My_Test_Object (CORBA::Short id = 0);
-  // Constructor.
 
+  /// Destructor.
   ~My_Test_Object (void);
-  // Destructor.
 
   // = Interface implementation accessor methods.
 
+  /// Sets id.
   void id (CORBA::Short id);
-  // Sets id.
 
+  /// Gets id.
   CORBA::Short id (void);
-  // Gets id.
 
 private:
   short id_;
diff --git a/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/orbsvcs/tests/Security/ssliop_corbaloc/client.h
index dffdf271fd1..faf0c8ea0fe 100644
--- a/orbsvcs/tests/Security/ssliop_corbaloc/client.h
+++ b/orbsvcs/tests/Security/ssliop_corbaloc/client.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION
-//      This class tests the facilities to connect to the naming service.
-//
-// = AUTHORS
-//      Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.h
+ *
+ *  $Id$
+ *
+ *    This class tests the facilities to connect to the naming service.
+ *
+ *
+ *  @author   Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "test_objectS.h"
 #include "orbsvcs/CosNamingC.h"
@@ -23,149 +20,163 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "ace/Task.h"
 
+/**
+ * @class Naming_Test
+ *
+ * @brief This is an abstract class which is subclassed
+ * to create different Naming Service tests.
+ *
+ * This is a basic example of the "Strategy" pattern.  This class
+ * provides a common interface for different tests (or
+ * "strategies"), so that a specific test to be used can be
+ * chosen at runtime.
+ */
 class Naming_Test
 {
-  // = TITLE
-  //    This is an abstract class which is subclassed
-  //    to create different Naming Service tests.
-  //
-  // = DESCRIPTION
-  //    This is a basic example of the "Strategy" pattern.  This class
-  //    provides a common interface for different tests (or
-  //    "strategies"), so that a specific test to be used can be
-  //    chosen at runtime.
 
 public:
+  /// Execute the test code.  <root_context> is the context to assume
+  /// as the root for all tests operations.
   virtual ~Naming_Test (void) {}
   virtual int execute (TAO_Naming_Client &root_context) = 0;
-  // Execute the test code.  <root_context> is the context to assume
-  // as the root for all tests operations.
 };
 
+/**
+ * @class Simple_Test
+ *
+ * @brief This class implements a simple Naming Service test.
+ *
+ * The test binds(), resolves(), and unbinds() an object
+ * reference from the given Naming Context.
+ */
 class Simple_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a simple Naming Service test.
-  //
-  // = DESCRIPTION
-  //    The test binds(), resolves(), and unbinds() an object
-  //    reference from the given Naming Context.
 public:
+  /// Execute the simple test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the simple test code.
 };
 
+/**
+ * @class MT_Test
+ *
+ * @brief This class implements a simple Multithreaded (multiclient) Naming Service test.
+ *
+ * The test spawns multiple threads: each attempts to
+ * bind(), resolve(), and unbind() an object
+ * reference using the same name, and the same Naming Context.
+ */
 class MT_Test : public Naming_Test, public ACE_Task_Base
 {
-  // = TITLE
-  //    This class implements a simple Multithreaded (multiclient) Naming Service test.
-  //
-  // = DESCRIPTION
-  //    The test spawns multiple threads: each attempts to
-  //    bind(), resolve(), and unbind() an object
-  //    reference using the same name, and the same Naming Context.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.  Takes in an orb pointer and number of threads to spawn.
   MT_Test (CORBA::ORB_ptr orb,
            int size = 10);
-  // Constructor.  Takes in an orb pointer and number of threads to spawn.
 
+  /// Execute the MT test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the MT test code.
 
+  /// This code is executed by each thread.
   virtual int svc (void);
-  // This code is executed by each thread.
 
 private:
+  /// Number of threads to spawn.  By default is set to 10.
   int size_;
-  // Number of threads to spawn.  By default is set to 10.
 
+  /// A pointer to our ORB.
   CORBA::ORB_var orb_;
-  // A pointer to our ORB.
 
+  /**
+   * IOR in the string format for Naming Service we are to deal with.
+   * Each thread will use string_to_object() and this IOR to create
+   * its own NamingContext stub for invoking operations on the
+   * Naming Service.  If all threads try to use the same stub, bad things
+   * happen...
+   */
   char* name_service_ior_;
-  // IOR in the string format for Naming Service we are to deal with.
-  // Each thread will use string_to_object() and this IOR to create
-  // its own NamingContext stub for invoking operations on the
-  // Naming Service.  If all threads try to use the same stub, bad things
-  // happen...
 
   // This can be replaced with CORBA::String_var when <string_to_object>
   // is fixed - this will clean up the memory properly.
 
+  /// Holds name used for registering the object with Naming Service.
   CosNaming::Name test_name_;
-  // Holds name used for registering the object with Naming Service.
 
+  /// Holds object to be registered with the Naming Service by each thread.
   Test_Object_var test_ref_;
-  // Holds object to be registered with the Naming Service by each thread.
 
 };
 
+/**
+ * @class Tree_Test
+ *
+ * @brief This class implements a test of all Naming Service functions
+ * on a tree of Naming Contexts.
+ *
+ * Bind_context() under the root context with the name level1.
+ * Create_new_context(), bind() foo object into it, and
+ * bind the context into root/level1 under the name level2.
+ * Resolve (root/level1/level2/foo).
+ * Unbind (root/level1/level2/foo).
+ * Bind (root/level1/level2/foo, obj)
+ * Create_new_context()
+ * and invoke rebind_context() to substitute it for the current
+ * level2 context.
+ * Bind (root/level1/level2/foo, obj)
+ * Resolve (root/level1/level2/foo).
+ * Rebind() to have a different object under the name bar.
+ * Resolve (root/level1/level2/foo) to make sure correct reference is returned.
+ */
 class Tree_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of all Naming Service functions
-  //    on a tree of Naming Contexts.
-  //
-  // = DESCRIPTION
-  //    Bind_context() under the root context with the name level1.
-  //    Create_new_context(), bind() foo object into it, and
-  //    bind the context into root/level1 under the name level2.
-  //    Resolve (root/level1/level2/foo).
-  //    Unbind (root/level1/level2/foo).
-  //    Bind (root/level1/level2/foo, obj)
-  //    Create_new_context()
-  //    and invoke rebind_context() to substitute it for the current
-  //    level2 context.
-  //    Bind (root/level1/level2/foo, obj)
-  //    Resolve (root/level1/level2/foo).
-  //    Rebind() to have a different object under the name bar.
-  //    Resolve (root/level1/level2/foo) to make sure correct reference is returned.
 public:
+  /// Execute the tree test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the tree test code.
 };
 
+/**
+ * @class Iterator_Test
+ *
+ * @brief This class implements a test of Naming Service functions
+ * which involve BindingIterator.
+ *
+ * The test binds foo1, foo2, foo3, and foo4 objects to the
+ * Naming Context.  It lists() one binding and receives
+ * BindingIterator to iterate over the rest of the bindings.  It
+ * then invokes next_one(), next_n(2), next_one(), and destroy()
+ * on the iterator.
+ */
 class Iterator_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of Naming Service functions
-  //    which involve BindingIterator.
-  //
-  // = DESCRIPTION
-  //    The test binds foo1, foo2, foo3, and foo4 objects to the
-  //    Naming Context.  It lists() one binding and receives
-  //    BindingIterator to iterate over the rest of the bindings.  It
-  //    then invokes next_one(), next_n(2), next_one(), and destroy()
-  //    on the iterator.
 public:
+  /// Execute the iterator test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the iterator test code.
 };
 
+/**
+ * @class Exceptions_Test
+ *
+ * @brief This class implements a test of exceptions in the Naming Service.
+ *
+ * Makes sure that Naming Service throws exceptions as expected, and
+ * data inside exceptions is set correctly.  The test creates a tree of
+ * of Naming Contexts: root context -> level1 -> level2.  It then binds() an
+ * object with the name foo to each of Naming Contexts in the tree.
+ * Invoke resolve() with a Name of length 0 - make sure we get InvalidName exception.
+ * Invoke bind( foo, obj) on root context - make sure we get AlreadyBound exception.
+ * Invoke bind( level1/foo, obj) on root context - make sure we get AlreadyBound exc.
+ * Invoke unbind( level1/level2/bar) on root context - make sure we get NotFound exc.
+ * with why = not_object, rest_of_name = bar.
+ * Invoke unbind( level1/level3/foo) on root context - make sure we get NotFound exc.
+ * with why = missing_node, rest_of_name = level3/foo.
+ * Invoke unbind( level1/foo/foo) on root context - make sure we get NotFound exc.
+ * with why = not_context, rest_of_name = foo/foo.
+ */
 class Exceptions_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of exceptions in the Naming Service.
-  //
-  // = DESCRIPTION
-  //    Makes sure that Naming Service throws exceptions as expected, and
-  //    data inside exceptions is set correctly.  The test creates a tree of
-  //    of Naming Contexts: root context -> level1 -> level2.  It then binds() an
-  //    object with the name foo to each of Naming Contexts in the tree.
-  //    Invoke resolve() with a Name of length 0 - make sure we get InvalidName exception.
-  //    Invoke bind( foo, obj) on root context - make sure we get AlreadyBound exception.
-  //    Invoke bind( level1/foo, obj) on root context - make sure we get AlreadyBound exc.
-  //    Invoke unbind( level1/level2/bar) on root context - make sure we get NotFound exc.
-  //    with why = not_object, rest_of_name = bar.
-  //    Invoke unbind( level1/level3/foo) on root context - make sure we get NotFound exc.
-  //    with why = missing_node, rest_of_name = level3/foo.
-  //    Invoke unbind( level1/foo/foo) on root context - make sure we get NotFound exc.
-  //    with why = not_context, rest_of_name = foo/foo.
 public:
+  /// Execute the exceptions test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the exceptions test code.
 
 private:
   // the following functions isolate specific tests due to the
@@ -179,23 +190,23 @@ private:
   void not_found_test3 (TAO_Naming_Client &root_context);
 };
 
+/**
+ * @class Destroy_Test
+ *
+ * @brief This class implements a test of destroy() function
+ * in the Naming Service.
+ *
+ * Create a context and bind an object under it.
+ * Attempt to destroy the context - NotEmpty exception should be raised.
+ * Unbind the object and call destroy on the context.
+ * Attempt to call destroy on the object again - OBJECT_NOT_EXIST
+ * exception should be raised.
+ */
 class Destroy_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of destroy() function
-  //    in the Naming Service.
-  //
-  // = DESCRIPTION
-  //    Create a context and bind an object under it.
-  //    Attempt to destroy the context - NotEmpty exception should be raised.
-  //
-  //    Unbind the object and call destroy on the context.
-  //    Attempt to call destroy on the object again - OBJECT_NOT_EXIST
-  //    exception should be raised.
-  //
 public:
+  /// Execute the destroy test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the destroy test code.
 
 private:
   // = The following functions isolate specific tests.
@@ -203,100 +214,106 @@ private:
   void not_exist_test (CosNaming::NamingContext_var &ref);
 };
 
+/**
+ * @class Persistent_Test_Begin
+ *
+ * @brief This class implements the first part of the Persistent Naming
+ * Service test.
+ *
+ * This test creates the Naming Context hierarchy:
+ * root -> level1_context -> level2_context,
+ * and prints out the ior of the <level1_context>.
+ */
 class Persistent_Test_Begin : public Naming_Test
 {
-  // = TITLE
-  //    This class implements the first part of the Persistent Naming
-  //    Service test.
-  //
-  // = DESCRIPTION
-  //    This test creates the Naming Context hierarchy:
-  //    root -> level1_context -> level2_context,
-  //    and prints out the ior of the <level1_context>.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.  Takes in an orb pointer.
   Persistent_Test_Begin (CORBA::ORB_ptr orb,
                          FILE * ior_output_file);
-  // Constructor.  Takes in an orb pointer.
 
+  /// Destructor.
   virtual ~Persistent_Test_Begin (void);
-  // Destructor.
 
+  /// Execute the persistent test (part 1) code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the persistent test (part 1) code.
 
 private:
 
+  /// A pointer to our ORB (needed for object/string conversion).
   CORBA::ORB_var orb_;
-  // A pointer to our ORB (needed for object/string conversion).
 
+  /// File where we output the ior for use by part 2 of persistent test.
   FILE *file_;
-  // File where we output the ior for use by part 2 of persistent test.
 };
 
+/**
+ * @class Persistent_Test_End
+ *
+ * @brief This class implements the second part of the Persistent Naming
+ * Service test.
+ *
+ * This test attempts to resolve <level2_context> both through the
+ * <root> Naming Context, which it gets from <resolve_initial_references>, and
+ * through <level1_context> stringified ior, which it gets from part 1 of
+ * the persistent test.  The results of both methods are then
+ * compared for equality.
+ */
 class Persistent_Test_End : public Naming_Test
 {
-  // = TITLE
-  //    This class implements the second part of the Persistent Naming
-  //    Service test.
-  //
-  // = DESCRIPTION
-  //   This test attempts to resolve <level2_context> both through the
-  //   <root> Naming Context, which it gets from <resolve_initial_references>, and
-  //   through <level1_context> stringified ior, which it gets from part 1 of
-  //   the persistent test.  The results of both methods are then
-  //   compared for equality.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.  Takes in an orb pointer and the ior received from
+  /// <Persistent_Test_Begin>.
   Persistent_Test_End (CORBA::ORB_ptr orb,
                        const ACE_TCHAR * ior);
-  // Constructor.  Takes in an orb pointer and the ior received from
-  // <Persistent_Test_Begin>.
 
+  /// Destructor.
   virtual ~Persistent_Test_End (void);
-  // Destructor.
 
+  /// Execute the persistent test (part 2).
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the persistent test (part 2).
 
 private:
 
+  /// A pointer to our ORB (used for string/object conversion).
   CORBA::ORB_var orb_;
-  // A pointer to our ORB (used for string/object conversion).
 
+  /// IOR of <level1_context> recorded during the run of part 1 of
+  /// persistent test.
   const ACE_TCHAR* ior_;
-  // IOR of <level1_context> recorded during the run of part 1 of
-  // persistent test.
 };
 
+/**
+ * @class CosNaming_Client
+ *
+ * @brief Defines a class that encapsulates behaviour of the CosNaming
+ * client example.  Provides a better understanding of the logic
+ * in an object-oriented way.
+ *
+ * This class declares an interface to run the example client for
+ * CosNaming CORBA server.  All the complexity for initializing
+ * the server is hidden in the class.  Just the <run> interface
+ * is needed.
+ */
 class CosNaming_Client
 {
-  // = TITLE,
-  //    Defines a class that encapsulates behaviour of the CosNaming
-  //    client example.  Provides a better understanding of the logic
-  //    in an object-oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    CosNaming CORBA server.  All the complexity for initializing
-  //    the server is hidden in the class.  Just the <run> interface
-  //    is needed.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.
   CosNaming_Client (void);
-  // Constructor.
 
+  /// Destructor.
   ~CosNaming_Client (void);
-  // Destructor.
 
+  /// Execute client example code.
   int run (void);
-  // Execute client example code.
 
+  /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the client communication endpoint with server.
 
   // = Symbolic ids.
   enum OBJ_ID
@@ -306,22 +323,22 @@ public:
   };
 
 private:
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// A pointer to the specific Naming Service test a client will
+  /// execute.
   Naming_Test *test_;
-  // A pointer to the specific Naming Service test a client will
-  // execute.
 
+  /// Our ORB manager helper class.
   TAO_ORB_Manager orbmgr_;
-  // Our ORB manager helper class.
 
+  /// Our naming client helper class.
   TAO_Naming_Client naming_client_;
-  // Our naming client helper class.
 };
diff --git a/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl b/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
index e2530f2bc2f..90c93878d60 100755
--- a/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
+++ b/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
@@ -66,7 +66,7 @@ $cli->DeleteFile ($nsiorfile);
 sub name_server
 {
     my $args = "-ORBNameServicePort $ns_multicast_port -o $ns_nsiorfile -m 1 @_";
-    my $prog = "../../../Naming_Service/Naming_Service";
+    my $prog = "../../../Naming_Service/tao_cosnaming";
     $NS = $ns->CreateProcess ($prog, $args);
 
     $ns->DeleteFile ($nsiorfile);
@@ -119,7 +119,7 @@ $orb_debug_level =  ($quiet || $debug_level == 0) ? "" : "-ORBDebugLevel $debug_
 
 # Options for all simple tests recognized by the 'client' program.
 @opts = (
-         "-s -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService" 
+         "-s -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService"
                 . " -ORBSvcConf $cli_cliconffile $orb_debug_level",
          "-t -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService"
                 . " -ORBSvcConf $cli_cliconffile $orb_debug_level",
@@ -129,7 +129,7 @@ $orb_debug_level =  ($quiet || $debug_level == 0) ? "" : "-ORBDebugLevel $debug_
                 . " -ORBSvcConf $cli_cliconffile $orb_debug_level",
          "-y -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService"
                 . " -ORBSvcConf $cli_cliconffile $orb_debug_level",
-         
+
          );
 
 @server_opts = (
@@ -137,13 +137,13 @@ $orb_debug_level =  ($quiet || $debug_level == 0) ? "" : "-ORBDebugLevel $debug_
                         . " -ORBSvcConf $ns_nsconffile $orb_debug_level",
                 "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port"
                         . " -ORBSvcConf $ns_nsconffile $orb_debug_level",
-                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" 
+                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port"
                         . " -ORBSvcConf $ns_nsconffile $orb_debug_level",
-                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" 
+                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port"
                         . " -ORBSvcConf $ns_nsconffile $orb_debug_level",
-                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" 
+                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port"
                         . " -ORBSvcConf $ns_nsconffile $orb_debug_level",
-                
+
                 );
 
 @comments = (
@@ -165,7 +165,7 @@ foreach $o (@opts) {
         print STDERR " - Skipping, use -s to run the SSL tests";
         next;
     }
-    
+
     print STDERR "\n";
     name_server ($server_opts[$test_number]);
     client ($o);
@@ -178,7 +178,7 @@ foreach $o (@opts) {
     }
 
     ## For some reason, only on Windows XP, we need to
-    ## wait before starting another Naming_Service when
+    ## wait before starting another tao_cosnaming when
     ## the mmap persistence option is used
     if ($^O eq "MSWin32") {
       sleep(1);
diff --git a/orbsvcs/tests/Security/ssliop_corbaloc/server.conf b/orbsvcs/tests/Security/ssliop_corbaloc/server.conf
index 672a471014d..fec138accdb 100644
--- a/orbsvcs/tests/Security/ssliop_corbaloc/server.conf
+++ b/orbsvcs/tests/Security/ssliop_corbaloc/server.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object *
         TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
         "-SSLPrivateKey  PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"
diff --git a/orbsvcs/tests/Simple_Naming/Makefile.am b/orbsvcs/tests/Simple_Naming/Makefile.am
deleted file mode 100644
index 09889240ec1..00000000000
--- a/orbsvcs/tests/Simple_Naming/Makefile.am
+++ /dev/null
@@ -1,85 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Simple_Naming_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  test_objectC.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.cpp \
-  test_objectS.h \
-  test_objectS.inl
-
-CLEANFILES = \
-  test_object-stamp \
-  test_objectC.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.cpp \
-  test_objectS.h \
-  test_objectS.inl
-
-test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl: test_object-stamp
-
-test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  test_objectC.cpp \
-  test_objectS.cpp \
-  client.h \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.h \
-  test_objectS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/Simple_Naming/client.cpp b/orbsvcs/tests/Simple_Naming/client.cpp
index 6f0b6211149..d8996e15ceb 100644
--- a/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/orbsvcs/tests/Simple_Naming/client.cpp
@@ -1,28 +1,26 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Naming_Service/
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple CORBA client for the CosNaming
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan <sergio@cs.wustl.edu>,
-//      Marina Spivak <marina@cs.wustl.edu>, and
-//      Douglas C. Schmidt <schmidt@cs.wustl.edu>
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *    This class implements a simple CORBA client for the CosNaming
+ *    example using stubs generated by the TAO ORB IDL compiler.
+ *
+ *
+ *  @author   Sergio Flores-Gaitan <sergio@cs.wustl.edu>
+ *  @author   Marina Spivak <marina@cs.wustl.edu>
+ *  @author and   Douglas C. Schmidt <schmidt@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "client.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Simple_Naming, client, "$Id$")
+
 
 #if defined (_MSC_VER)
 # pragma warning (disable : 4250)
@@ -33,19 +31,19 @@ class My_Test_Object :
 {
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   My_Test_Object (CORBA::Short id = 0);
-  // Constructor.
 
+  /// Destructor.
   ~My_Test_Object (void);
-  // Destructor.
 
   // = Interface implementation accessor methods.
 
+  /// Sets id.
   void id (CORBA::Short id);
-  // Sets id.
 
+  /// Gets id.
   CORBA::Short id (void);
-  // Gets id.
 
 private:
   short id_;
diff --git a/orbsvcs/tests/Simple_Naming/client.h b/orbsvcs/tests/Simple_Naming/client.h
index 81a3daa428b..ad381cd66bd 100644
--- a/orbsvcs/tests/Simple_Naming/client.h
+++ b/orbsvcs/tests/Simple_Naming/client.h
@@ -1,21 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION
-//      This class tests the facilities to connect to the naming service.
-//
-// = AUTHORS
-//      Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.h
+ *
+ *  $Id$
+ *
+ *    This class tests the facilities to connect to the naming service.
+ *
+ *
+ *  @author   Marina Spivak <marina@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "test_objectS.h"
 #include "orbsvcs/CosNamingC.h"
@@ -23,23 +20,25 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "ace/Task.h"
 
+/**
+ * @class Naming_Test
+ *
+ * @brief This is an abstract class which is subclassed
+ * to create different Naming Service tests.
+ *
+ * This is a basic example of the "Strategy" pattern.  This class
+ * provides a common interface for different tests (or
+ * "strategies"), so that a specific test to be used can be
+ * chosen at runtime.
+ */
 class Naming_Test
 {
-  // = TITLE
-  //    This is an abstract class which is subclassed
-  //    to create different Naming Service tests.
-  //
-  // = DESCRIPTION
-  //    This is a basic example of the "Strategy" pattern.  This class
-  //    provides a common interface for different tests (or
-  //    "strategies"), so that a specific test to be used can be
-  //    chosen at runtime.
 
 public:
+  /// Execute the test code.  <root_context> is the context to assume
+  /// as the root for all tests operations.
   virtual ~Naming_Test (void);
   virtual int execute (TAO_Naming_Client &root_context) = 0;
-  // Execute the test code.  <root_context> is the context to assume
-  // as the root for all tests operations.
 
 protected:
   Naming_Test (PortableServer::POA_ptr poa);
@@ -47,136 +46,148 @@ protected:
   PortableServer::POA_var poa_;
 };
 
+/**
+ * @class Simple_Test
+ *
+ * @brief This class implements a simple Naming Service test.
+ *
+ * The test binds(), resolves(), and unbinds() an object
+ * reference from the given Naming Context.
+ */
 class Simple_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a simple Naming Service test.
-  //
-  // = DESCRIPTION
-  //    The test binds(), resolves(), and unbinds() an object
-  //    reference from the given Naming Context.
 public:
   Simple_Test (PortableServer::POA_ptr poa);
 
+  /// Execute the simple test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the simple test code.
 };
 
+/**
+ * @class MT_Test
+ *
+ * @brief This class implements a simple Multithreaded (multiclient) Naming Service test.
+ *
+ * The test spawns multiple threads: each attempts to
+ * bind(), resolve(), and unbind() an object
+ * reference using the same name, and the same Naming Context.
+ */
 class MT_Test : public Naming_Test, public ACE_Task_Base
 {
-  // = TITLE
-  //    This class implements a simple Multithreaded (multiclient) Naming Service test.
-  //
-  // = DESCRIPTION
-  //    The test spawns multiple threads: each attempts to
-  //    bind(), resolve(), and unbind() an object
-  //    reference using the same name, and the same Naming Context.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.  Takes in an orb pointer and number of threads to spawn.
   MT_Test (CORBA::ORB_ptr orb,
            PortableServer::POA_ptr poa,
            int size = 10);
-  // Constructor.  Takes in an orb pointer and number of threads to spawn.
 
+  /// Execute the MT test code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the MT test code.
 
+  /// This code is executed by each thread.
   virtual int svc (void);
-  // This code is executed by each thread.
 
 private:
+  /// Number of threads to spawn.  By default is set to 10.
   int size_;
-  // Number of threads to spawn.  By default is set to 10.
 
+  /// A pointer to our ORB.
   CORBA::ORB_var orb_;
-  // A pointer to our ORB.
 
+  /**
+   * IOR in the string format for Naming Service we are to deal with.
+   * Each thread will use string_to_object() and this IOR to create
+   * its own NamingContext stub for invoking operations on the
+   * Naming Service.  If all threads try to use the same stub, bad things
+   * happen...
+   */
   CORBA::String_var name_service_ior_;
-  // IOR in the string format for Naming Service we are to deal with.
-  // Each thread will use string_to_object() and this IOR to create
-  // its own NamingContext stub for invoking operations on the
-  // Naming Service.  If all threads try to use the same stub, bad things
-  // happen...
 
   // This can be replaced with CORBA::String_var when <string_to_object>
   // is fixed - this will clean up the memory properly.
 
+  /// Holds name used for registering the object with Naming Service.
   CosNaming::Name test_name_;
-  // Holds name used for registering the object with Naming Service.
 
+  /// Holds object to be registered with the Naming Service by each thread.
   Test_Object_var test_ref_;
-  // Holds object to be registered with the Naming Service by each thread.
 
 };
 
+/**
+ * @class Tree_Test
+ *
+ * @brief This class implements a test of all Naming Service functions
+ * on a tree of Naming Contexts.
+ *
+ * Bind_context() under the root context with the name level1.
+ * Create_new_context(), bind() foo object into it, and
+ * bind the context into root/level1 under the name level2.
+ * Resolve (root/level1/level2/foo).
+ * Unbind (root/level1/level2/foo).
+ * Bind (root/level1/level2/foo, obj)
+ * Create_new_context()
+ * and invoke rebind_context() to substitute it for the current
+ * level2 context.
+ * Bind (root/level1/level2/foo, obj)
+ * Resolve (root/level1/level2/foo).
+ * Rebind() to have a different object under the name bar.
+ * Resolve (root/level1/level2/foo) to make sure correct reference is returned.
+ */
 class Tree_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of all Naming Service functions
-  //    on a tree of Naming Contexts.
-  //
-  // = DESCRIPTION
-  //    Bind_context() under the root context with the name level1.
-  //    Create_new_context(), bind() foo object into it, and
-  //    bind the context into root/level1 under the name level2.
-  //    Resolve (root/level1/level2/foo).
-  //    Unbind (root/level1/level2/foo).
-  //    Bind (root/level1/level2/foo, obj)
-  //    Create_new_context()
-  //    and invoke rebind_context() to substitute it for the current
-  //    level2 context.
-  //    Bind (root/level1/level2/foo, obj)
-  //    Resolve (root/level1/level2/foo).
-  //    Rebind() to have a different object under the name bar.
-  //    Resolve (root/level1/level2/foo) to make sure correct reference is returned.
 public:
+  /// Execute the tree test code.
   Tree_Test (PortableServer::POA_ptr poa);
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the tree test code.
 };
 
+/**
+ * @class Iterator_Test
+ *
+ * @brief This class implements a test of Naming Service functions
+ * which involve BindingIterator.
+ *
+ * The test binds foo1, foo2, foo3, and foo4 objects to the
+ * Naming Context.  It lists() one binding and receives
+ * BindingIterator to iterate over the rest of the bindings.  It
+ * then invokes next_one(), next_n(2), next_one(), and destroy()
+ * on the iterator.
+ */
 class Iterator_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of Naming Service functions
-  //    which involve BindingIterator.
-  //
-  // = DESCRIPTION
-  //    The test binds foo1, foo2, foo3, and foo4 objects to the
-  //    Naming Context.  It lists() one binding and receives
-  //    BindingIterator to iterate over the rest of the bindings.  It
-  //    then invokes next_one(), next_n(2), next_one(), and destroy()
-  //    on the iterator.
 public:
+  /// Execute the iterator test code.
   Iterator_Test (PortableServer::POA_ptr poa);
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the iterator test code.
 };
 
+/**
+ * @class Exceptions_Test
+ *
+ * @brief This class implements a test of exceptions in the Naming Service.
+ *
+ * Makes sure that Naming Service throws exceptions as expected, and
+ * data inside exceptions is set correctly.  The test creates a tree of
+ * of Naming Contexts: root context -> level1 -> level2.  It then binds() an
+ * object with the name foo to each of Naming Contexts in the tree.
+ * Invoke resolve() with a Name of length 0 - make sure we get InvalidName exception.
+ * Invoke bind( foo, obj) on root context - make sure we get AlreadyBound exception.
+ * Invoke bind( level1/foo, obj) on root context - make sure we get AlreadyBound exc.
+ * Invoke unbind( level1/level2/bar) on root context - make sure we get NotFound exc.
+ * with why = not_object, rest_of_name = bar.
+ * Invoke unbind( level1/level3/foo) on root context - make sure we get NotFound exc.
+ * with why = missing_node, rest_of_name = level3/foo.
+ * Invoke unbind( level1/foo/foo) on root context - make sure we get NotFound exc.
+ * with why = not_context, rest_of_name = foo/foo.
+ */
 class Exceptions_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of exceptions in the Naming Service.
-  //
-  // = DESCRIPTION
-  //    Makes sure that Naming Service throws exceptions as expected, and
-  //    data inside exceptions is set correctly.  The test creates a tree of
-  //    of Naming Contexts: root context -> level1 -> level2.  It then binds() an
-  //    object with the name foo to each of Naming Contexts in the tree.
-  //    Invoke resolve() with a Name of length 0 - make sure we get InvalidName exception.
-  //    Invoke bind( foo, obj) on root context - make sure we get AlreadyBound exception.
-  //    Invoke bind( level1/foo, obj) on root context - make sure we get AlreadyBound exc.
-  //    Invoke unbind( level1/level2/bar) on root context - make sure we get NotFound exc.
-  //    with why = not_object, rest_of_name = bar.
-  //    Invoke unbind( level1/level3/foo) on root context - make sure we get NotFound exc.
-  //    with why = missing_node, rest_of_name = level3/foo.
-  //    Invoke unbind( level1/foo/foo) on root context - make sure we get NotFound exc.
-  //    with why = not_context, rest_of_name = foo/foo.
 public:
+  /// Execute the exceptions test code.
   Exceptions_Test (PortableServer::POA_ptr poa);
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the exceptions test code.
 
 private:
   // the following functions isolate specific tests due to the
@@ -190,24 +201,24 @@ private:
   void not_found_test3 (TAO_Naming_Client &root_context);
 };
 
+/**
+ * @class Destroy_Test
+ *
+ * @brief This class implements a test of destroy() function
+ * in the Naming Service.
+ *
+ * Create a context and bind an object under it.
+ * Attempt to destroy the context - NotEmpty exception should be raised.
+ * Unbind the object and call destroy on the context.
+ * Attempt to call destroy on the object again - OBJECT_NOT_EXIST
+ * exception should be raised.
+ */
 class Destroy_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements a test of destroy() function
-  //    in the Naming Service.
-  //
-  // = DESCRIPTION
-  //    Create a context and bind an object under it.
-  //    Attempt to destroy the context - NotEmpty exception should be raised.
-  //
-  //    Unbind the object and call destroy on the context.
-  //    Attempt to call destroy on the object again - OBJECT_NOT_EXIST
-  //    exception should be raised.
-  //
 public:
+  /// Execute the destroy test code.
   Destroy_Test (PortableServer::POA_ptr poa);
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the destroy test code.
 
 private:
   // = The following functions isolate specific tests.
@@ -215,130 +226,138 @@ private:
   void not_exist_test (CosNaming::NamingContext_var &ref);
 };
 
+/**
+ * @class Persistent_Test_Begin
+ *
+ * @brief This class implements the first part of the Persistent Naming
+ * Service test.
+ *
+ * This test creates the Naming Context hierarchy:
+ * root -> level1_context -> level2_context,
+ * and prints out the ior of the <level1_context>.
+ */
 class Persistent_Test_Begin : public Naming_Test
 {
-  // = TITLE
-  //    This class implements the first part of the Persistent Naming
-  //    Service test.
-  //
-  // = DESCRIPTION
-  //    This test creates the Naming Context hierarchy:
-  //    root -> level1_context -> level2_context,
-  //    and prints out the ior of the <level1_context>.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.  Takes in an orb pointer.
   Persistent_Test_Begin (CORBA::ORB_ptr orb,
                          PortableServer::POA_ptr poa,
                          FILE * ior_output_file);
-  // Constructor.  Takes in an orb pointer.
 
+  /// Destructor.
   virtual ~Persistent_Test_Begin (void);
-  // Destructor.
 
+  /// Execute the persistent test (part 1) code.
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the persistent test (part 1) code.
 
 private:
 
+  /// A pointer to our ORB (needed for object/string conversion).
   CORBA::ORB_var orb_;
-  // A pointer to our ORB (needed for object/string conversion).
 
+  /// File where we output the ior for use by part 2 of persistent test.
   FILE *file_;
-  // File where we output the ior for use by part 2 of persistent test.
 };
 
+/**
+ * @class Persistent_Test_End
+ *
+ * @brief This class implements the second part of the Persistent Naming
+ * Service test.
+ *
+ * This test attempts to resolve <level2_context> both through the
+ * <root> Naming Context, which it gets from <resolve_initial_references>, and
+ * through <level1_context> stringified ior, which it gets from part 1 of
+ * the persistent test.  The results of both methods are then
+ * compared for equality.
+ */
 class Persistent_Test_End : public Naming_Test
 {
-  // = TITLE
-  //    This class implements the second part of the Persistent Naming
-  //    Service test.
-  //
-  // = DESCRIPTION
-  //   This test attempts to resolve <level2_context> both through the
-  //   <root> Naming Context, which it gets from <resolve_initial_references>, and
-  //   through <level1_context> stringified ior, which it gets from part 1 of
-  //   the persistent test.  The results of both methods are then
-  //   compared for equality.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.  Takes in an orb pointer and the ior received from
+  /// <Persistent_Test_Begin>.
   Persistent_Test_End (CORBA::ORB_ptr orb,
                        PortableServer::POA_ptr poa,
                        const ACE_TCHAR * ior);
-  // Constructor.  Takes in an orb pointer and the ior received from
-  // <Persistent_Test_Begin>.
 
+  /// Destructor.
   virtual ~Persistent_Test_End (void);
-  // Destructor.
 
+  /// Execute the persistent test (part 2).
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the persistent test (part 2).
 
 private:
 
+  /// A pointer to our ORB (used for string/object conversion).
   CORBA::ORB_var orb_;
-  // A pointer to our ORB (used for string/object conversion).
 
+  /// IOR of <level1_context> recorded during the run of part 1 of
+  /// persistent test.
   const ACE_TCHAR* ior_;
-  // IOR of <level1_context> recorded during the run of part 1 of
-  // persistent test.
 };
 
+/**
+ * @class Persistent_List_Test
+ *
+ * @brief This class implements the third part of the Persistent Naming
+ * Service test.
+ *
+ * This test attempts to invoke various list() methods on different
+ * known contexts.
+ */
 class Persistent_List_Test : public Naming_Test
 {
-  // = TITLE
-  //    This class implements the third part of the Persistent Naming
-  //    Service test.
-  //
-  // = DESCRIPTION
-  //   This test attempts to invoke various list() methods on different
-  //   known contexts.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.  Takes in an orb pointer.
   Persistent_List_Test (CORBA::ORB_ptr orb,
                         PortableServer::POA_ptr poa);
-  // Constructor.  Takes in an orb pointer.
 
+  /// Destructor.
   virtual ~Persistent_List_Test (void);
-  // Destructor.
 
+  /// Execute the persistent test (part 3).
   virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the persistent test (part 3).
 
 private:
 
+  /// A pointer to our ORB (used for string/object conversion).
   CORBA::ORB_var orb_;
-  // A pointer to our ORB (used for string/object conversion).
 };
 
+/**
+ * @class CosNaming_Client
+ *
+ * @brief Defines a class that encapsulates behaviour of the CosNaming
+ * client example.  Provides a better understanding of the logic
+ * in an object-oriented way.
+ *
+ * This class declares an interface to run the example client for
+ * CosNaming CORBA server.  All the complexity for initializing
+ * the server is hidden in the class.  Just the <run> interface
+ * is needed.
+ */
 class CosNaming_Client
 {
-  // = TITLE,
-  //    Defines a class that encapsulates behaviour of the CosNaming
-  //    client example.  Provides a better understanding of the logic
-  //    in an object-oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    CosNaming CORBA server.  All the complexity for initializing
-  //    the server is hidden in the class.  Just the <run> interface
-  //    is needed.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.
   CosNaming_Client (void);
-  // Constructor.
 
+  /// Destructor.
   ~CosNaming_Client (void);
-  // Destructor.
 
+  /// Execute client example code.
   int run (void);
-  // Execute client example code.
 
+  /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the client communication endpoint with server.
 
   // = Symbolic ids.
   enum OBJ_ID
@@ -348,22 +367,22 @@ public:
   };
 
 private:
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// A pointer to the specific Naming Service test a client will
+  /// execute.
   Naming_Test *test_;
-  // A pointer to the specific Naming Service test a client will
-  // execute.
 
+  /// Our ORB manager helper class.
   TAO_ORB_Manager orbmgr_;
-  // Our ORB manager helper class.
 
+  /// Our naming client helper class.
   TAO_Naming_Client naming_client_;
-  // Our naming client helper class.
 };
diff --git a/orbsvcs/tests/Simple_Naming/run_test.pl b/orbsvcs/tests/Simple_Naming/run_test.pl
index 3cf845a3e17..78cfc80e755 100755
--- a/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -67,7 +67,7 @@ $test->DeleteFile($persistent_log_file);
 sub name_server
 {
     my $args = "-ORBMulticastDiscoveryEndpoint $multicast:$ns_multicast_port -o $test_iorfile -m 1 @_";
-    my $prog = "$startdir/../../Naming_Service/Naming_Service";
+    my $prog = "$startdir/../../Naming_Service/tao_cosnaming";
 
     $SV = $test->CreateProcess ("$prog", "$args");
 
@@ -151,7 +151,7 @@ foreach $o (@opts) {
     $SV->Kill ();
 
     ## For some reason, only on Windows XP, we need to
-    ## wait before starting another Naming_Service when
+    ## wait before starting another tao_cosnaming when
     ## the mmap persistence option is used
     if ($^O eq "MSWin32") {
       sleep(1);
diff --git a/orbsvcs/tests/Simple_Naming/run_test_ffp.pl b/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
index 75d04a4e2fa..5ef2c750ed4 100755
--- a/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
+++ b/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
@@ -44,7 +44,7 @@ $test->DeleteFile($persistent_ior_file);
 sub name_server
 {
     my $args = "-ORBNameServicePort $ns_multicast_port -o $test_iorfile -m 1 @_";
-    my $prog = "../../Naming_Service/Naming_Service";
+    my $prog = "../../Naming_Service/tao_cosnaming";
 
     $SV = $test->CreateProcess ("$prog", "$args");
 
@@ -125,7 +125,7 @@ foreach $o (@opts) {
     $SV->Kill ();
 
     ## For some reason, only on Windows XP, we need to
-    ## wait before starting another Naming_Service when
+    ## wait before starting another tao_cosnaming when
     ## the mmap persistence option is used
     if ($^O eq "MSWin32") {
       sleep(1);
diff --git a/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl b/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
index bd1aba10894..363ca918d35 100755
--- a/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
+++ b/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
@@ -67,7 +67,7 @@ $test->DeleteFile($persistent_ior_file);
 sub name_server
 {
     my $args = "-ORBMulticastDiscoveryEndpoint $multicast:$ns_multicast_port -o $test_iorfile -m 1 @_";
-    my $prog = "$startdir/../../Naming_Service/Naming_Service";
+    my $prog = "$startdir/../../Naming_Service/tao_cosnaming";
 
     $SV = $test->CreateProcess ("$prog", "$args");
 
@@ -150,7 +150,7 @@ foreach $o (@opts) {
     $SV->Kill ();
 
     ## For some reason, only on Windows XP, we need to
-    ## wait before starting another Naming_Service when
+    ## wait before starting another tao_cosnaming when
     ## the mmap persistence option is used
     if ($^O eq "MSWin32") {
       sleep(1);
diff --git a/orbsvcs/tests/Time/Client_i.cpp b/orbsvcs/tests/Time/Client_i.cpp
index 4ebf36f362b..91b296ff008 100644
--- a/orbsvcs/tests/Time/Client_i.cpp
+++ b/orbsvcs/tests/Time/Client_i.cpp
@@ -11,7 +11,7 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID(Time_Service, Client_i, "$Id$")
+
 
 // Constructor.
 
diff --git a/orbsvcs/tests/Time/Client_i.h b/orbsvcs/tests/Time/Client_i.h
index 7bc002f65bd..e49a5b5a7f7 100644
--- a/orbsvcs/tests/Time/Client_i.h
+++ b/orbsvcs/tests/Time/Client_i.h
@@ -1,99 +1,100 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Time_Service
-//
-// = FILENAME
-//    Client_i.h
-//
-// = DESCRIPTION
-//    This class implements a simple CORBA client that accesses a Time Service
-//    server.
-//
-// = AUTHORS
-//    Vishal Kachroo <vishal@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements a simple CORBA client that accesses a Time Service
+ *  server.
+ *
+ *
+ *  @author Vishal Kachroo <vishal@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/TimeServiceC.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 
+/**
+ * @class Client_i
+ *
+ * @brief Client implementation to access the Time Service server.
+ *
+ * Class wrapper for a client that gets the IOR of the clerk
+ * running on its machine and uses it to get the globally
+ * synchronized time
+ */
 class Client_i
 {
-  // = TITLE
-  //     Client implementation to access the Time Service server.
-  //
-  // = DESCRIPTION
-  //     Class wrapper for a client that gets the IOR of the clerk
-  //     running on its machine and uses it to get the globally
-  //     synchronized time
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Client_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~Client_i (void);
-  // Destructor.
 
+  /// Execute client example code.
   int run (void);
-  // Execute client example code.
 
+  /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize the client communication endpoint with server.
 
+  /**
+   * This test throws an exception that the operation
+   * <secure_universal_time> has not been currently implemented in the
+   * given server.
+   */
   void test_for_secure_universal_time (void);
-  // This test throws an exception that the operation
-  // <secure_universal_time> has not been currently implemented in the
-  // given server.
 
+  /// Tests if the server returns a valid time.
   void test_for_universal_time (void);
-  // Tests if the server returns a valid time.
 
+  /// Tests if the server returns a new UTO filled with the given time.
   void test_for_new_universal_time (void);
-  // Tests if the server returns a new UTO filled with the given time.
 
+  /// Tests if the returned UTO has the same value as the given UTC.
   void test_for_uto_from_utc (void);
-  // Tests if the returned UTO has the same value as the given UTC.
 
+  /// Tests if a new TIO is created according to the given bounds.
   void test_for_new_interval (void);
-  // Tests if a new TIO is created according to the given bounds.
 
 private:
+  /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the server IOR from a file.
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// To initialize the naming service and get a clerk IOR.
    int obtain_initial_references (void);
-  // To initialize the naming service and get a clerk IOR.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// IOR of the obj ref of the server.
   char *ior_;
-  // IOR of the obj ref of the server.
 
+  /// Number of times to invoke the <time> operation.
   u_int loop_count_;
-  // Number of times to invoke the <time> operation.
 
+  /// Flag for server shutdown.
   int shutdown_;
-  // Flag for server shutdown.
 
+  /// Time Service Server object ptr.
   CosTime::TimeService_var clerk_;
-  // Time Service Server object ptr.
 
+  /// An instance of the name client used for resolving the Time
+  /// Service object.
   TAO_Naming_Client my_name_client_;
-  // An instance of the name client used for resolving the Time
-  // Service object.
 
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
 };
diff --git a/orbsvcs/tests/Time/Makefile.am b/orbsvcs/tests/Time/Makefile.am
deleted file mode 100644
index 6beaf43556d..00000000000
--- a/orbsvcs/tests/Time/Makefile.am
+++ /dev/null
@@ -1,53 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Time_Orbsvcs_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Client_i.cpp \
-  client.cpp \
-  Client_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/Time/client.cpp b/orbsvcs/tests/Time/client.cpp
index 855b3ef59e4..463436ae292 100644
--- a/orbsvcs/tests/Time/client.cpp
+++ b/orbsvcs/tests/Time/client.cpp
@@ -3,7 +3,7 @@
 #include "Client_i.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(Time, client, "$Id$")
+
 
 // This function runs the Time Service client test.
 
diff --git a/orbsvcs/tests/Time/run_test.pl b/orbsvcs/tests/Time/run_test.pl
index e6e798a372a..2f164522d22 100755
--- a/orbsvcs/tests/Time/run_test.pl
+++ b/orbsvcs/tests/Time/run_test.pl
@@ -34,8 +34,8 @@ $clerk->DeleteFile($srv_ior);
 $clerk->DeleteFile($clk_ior);
 $client->DeleteFile($clk_ior);
 
-$SV = $server->CreateProcess ("../../Time_Service/Time_Service_Server", "-o $server_srv_ior");
-$CK = $server->CreateProcess ("../../Time_Service/Time_Service_Clerk",
+$SV = $server->CreateProcess ("../../Time_Service/tao_costime_server", "-o $server_srv_ior");
+$CK = $server->CreateProcess ("../../Time_Service/tao_costime_clerk",
                               "-f $clerk_srv_ior -o $clerk_clk_ior -t 2");
 $CL = $client->CreateProcess ("client", "-f $client_clk_ior");
 
diff --git a/orbsvcs/tests/Trading/Makefile.am b/orbsvcs/tests/Trading/Makefile.am
deleted file mode 100644
index 83bd8465203..00000000000
--- a/orbsvcs/tests/Trading/Makefile.am
+++ /dev/null
@@ -1,218 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Trading_Test_Lib.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TTestC.cpp \
-  TTestC.h \
-  TTestC.inl \
-  TTestS.cpp \
-  TTestS.h \
-  TTestS.inl
-
-CLEANFILES = \
-  TTest-stamp \
-  TTestC.cpp \
-  TTestC.h \
-  TTestC.inl \
-  TTestS.cpp \
-  TTestS.h \
-  TTestS.inl
-
-TTestC.cpp TTestC.h TTestC.inl TTestS.cpp TTestS.h TTestS.inl: TTest-stamp
-
-TTest-stamp: $(srcdir)/TTest.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -I..\..\.. -I..\..\..\orbsvcs -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h $(srcdir)/TTest.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libTTest.la
-
-libTTest_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_TTEST_BUILD_DLL
-
-libTTest_la_SOURCES = \
-  Offer_Exporter.cpp \
-  Offer_Importer.cpp \
-  Service_Type_Exporter.cpp \
-  Simple_Dynamic.cpp \
-  TT_Info.cpp \
-  TTestC.cpp \
-  TTestS.cpp
-
-noinst_HEADERS = \
-  Offer_Exporter.h \
-  Offer_Importer.h \
-  Service_Type_Exporter.h \
-  Simple_Dynamic.h \
-  TT_Info.h \
-  TTest.idl \
-  TTestC.h \
-  TTestC.inl \
-  TTestS.h \
-  TTestS.inl \
-  ttest_export.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Trading_Colocated_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += colocated_test
-
-colocated_test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-colocated_test_SOURCES = \
-  colocated_test.cpp \
-  Offer_Exporter.h \
-  Offer_Importer.h \
-  Service_Type_Exporter.h \
-  Simple_Dynamic.h \
-  TT_Info.h \
-  ttest_export.h
-
-colocated_test_LDADD = \
-  libTTest.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Trading_Export_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += export_test
-
-export_test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-export_test_SOURCES = \
-  export_test.cpp \
-  Offer_Exporter.h \
-  Offer_Importer.h \
-  Service_Type_Exporter.h \
-  Simple_Dynamic.h \
-  TT_Info.h \
-  ttest_export.h
-
-export_test_LDADD = \
-  libTTest.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Trading_Import_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += import_test
-
-import_test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-import_test_SOURCES = \
-  import_test.cpp \
-  Offer_Exporter.h \
-  Offer_Importer.h \
-  Service_Type_Exporter.h \
-  Simple_Dynamic.h \
-  TT_Info.h \
-  ttest_export.h
-
-import_test_LDADD = \
-  libTTest.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/Trading/Offer_Exporter.cpp b/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 37d47ce97a9..670a64a50e2 100644
--- a/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -4,7 +4,7 @@
 #include "ace/INET_Addr.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Trading, Offer_Exporter, "$Id$")
+
 
 TAO_Offer_Exporter::
 TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
diff --git a/orbsvcs/tests/Trading/Offer_Importer.cpp b/orbsvcs/tests/Trading/Offer_Importer.cpp
index 020b8a3357b..ac8b5a1014f 100644
--- a/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -2,7 +2,7 @@
 
 #include "Offer_Importer.h"
 
-ACE_RCSID(Trading, Offer_Importer, "$Id$")
+
 
 TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
                                         CORBA::Boolean verbose)
diff --git a/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 7c031fbd322..3de513e69a9 100644
--- a/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -2,7 +2,7 @@
 
 #include "Service_Type_Exporter.h"
 
-ACE_RCSID(Trading, Service_Type_Exporter, "$Id$")
+
 
 TAO_Service_Type_Exporter::
 TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
diff --git a/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index a7731f8777b..8e20d0f6d71 100644
--- a/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -5,7 +5,7 @@
 
 #include "Simple_Dynamic.h"
 
-ACE_RCSID(Trading, Simple_Dynamic, "$Id$")
+
 
 template <class T>
 TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp)
diff --git a/orbsvcs/tests/Trading/TT_Info.cpp b/orbsvcs/tests/Trading/TT_Info.cpp
index 249235b8fb0..56617c9fdab 100644
--- a/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/orbsvcs/tests/Trading/TT_Info.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Trading, TT_Info, "$Id$")
+
 
 const char* TT_Info::INTERFACE_NAMES[] =
 {
diff --git a/orbsvcs/tests/Trading/colocated_test.cpp b/orbsvcs/tests/Trading/colocated_test.cpp
index 5278a192b6b..884e1caff30 100644
--- a/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/orbsvcs/tests/Trading/colocated_test.cpp
@@ -9,10 +9,6 @@
 #include "orbsvcs/Trader/Trader.h"
 #include "orbsvcs/Trader/Service_Type_Repository.h"
 
-ACE_RCSID (Trading,
-           colocated_test,
-           "$Id$")
-
 void
 parse_args (int argc, ACE_TCHAR *argv[],
             CORBA::Boolean& verbose)
diff --git a/orbsvcs/tests/Trading/export_test.cpp b/orbsvcs/tests/Trading/export_test.cpp
index 6be271ef53e..5ed77a2cbc3 100644
--- a/orbsvcs/tests/Trading/export_test.cpp
+++ b/orbsvcs/tests/Trading/export_test.cpp
@@ -9,10 +9,6 @@
 #include "orbsvcs/Trader/Service_Type_Repository.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Trading,
-           export_test,
-           "$Id$")
-
 const ACE_TCHAR *done_file = ACE_TEXT("export_test_ready");
 
 int
diff --git a/orbsvcs/tests/Trading/import_test.cpp b/orbsvcs/tests/Trading/import_test.cpp
index 967aa928e1f..e1200d35c19 100644
--- a/orbsvcs/tests/Trading/import_test.cpp
+++ b/orbsvcs/tests/Trading/import_test.cpp
@@ -3,7 +3,7 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "Offer_Importer.h"
 
-ACE_RCSID(Trading, import_test, "$Id$")
+
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/orbsvcs/tests/Trading/run_test.pl b/orbsvcs/tests/Trading/run_test.pl
index 0335a86ee00..6a399032b54 100755
--- a/orbsvcs/tests/Trading/run_test.pl
+++ b/orbsvcs/tests/Trading/run_test.pl
@@ -41,7 +41,7 @@ $import_test->DeleteFile($iorbase);
 my $export_ready_file = $export_test->LocalFile ($ready);
 $export_test->DeleteFile($ready);
 
-$SV = $server->CreateProcess ("../../Trading_Service/Trading_Service",
+$SV = $server->CreateProcess ("../../Trading_Service/tao_costrading",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBEndpoint iiop://:$port " .
                               "-TSdumpior $server_iorfile");
diff --git a/orbsvcs/tests/ior_corbaname/Makefile.am b/orbsvcs/tests/ior_corbaname/Makefile.am
deleted file mode 100644
index 402c86fcc33..00000000000
--- a/orbsvcs/tests/ior_corbaname/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.ior_corbaname_idl.am
-
-BUILT_SOURCES = \
-  corbanameC.cpp \
-  corbanameC.h \
-  corbanameC.inl \
-  corbanameS.cpp \
-  corbanameS.h \
-  corbanameS.inl
-
-CLEANFILES = \
-  corbaname-stamp \
-  corbanameC.cpp \
-  corbanameC.h \
-  corbanameC.inl \
-  corbanameS.cpp \
-  corbanameS.h \
-  corbanameS.inl
-
-corbanameC.cpp corbanameC.h corbanameC.inl corbanameS.cpp corbanameS.h corbanameS.inl: corbaname-stamp
-
-corbaname-stamp: $(srcdir)/corbaname.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/corbaname.idl
-	@touch $@
-
-noinst_HEADERS = \
-  corbaname.idl
-
-## Makefile.ior_corbaname_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  corbanameC.cpp \
-  ior_corbaname_client_i.cpp \
-  ior_corbaname_client_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.ior_corbaname_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  corbanameC.cpp \
-  corbanameS.cpp \
-  server.cpp \
-  status_i.cpp \
-  status_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/orbsvcs/tests/ior_corbaname/client.cpp b/orbsvcs/tests/ior_corbaname/client.cpp
index ebd1dbce9dc..38bc49a4ee9 100644
--- a/orbsvcs/tests/ior_corbaname/client.cpp
+++ b/orbsvcs/tests/ior_corbaname/client.cpp
@@ -1,23 +1,18 @@
-// $Id$
-//
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/ior_corbaname/
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//     This implements a simple CORBA client for the
-//     corbaname: style IOR parser
-//
-// = AUTHOR
-//     Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *   This implements a simple CORBA client for the
+ *   corbaname: style IOR parser
+ *
+ *
+ *  @author  Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #include "ior_corbaname_client_i.h"
 
diff --git a/orbsvcs/tests/ior_corbaname/corbaname.idl b/orbsvcs/tests/ior_corbaname/corbaname.idl
index d0650d5d6b9..5544216a4a3 100644
--- a/orbsvcs/tests/ior_corbaname/corbaname.idl
+++ b/orbsvcs/tests/ior_corbaname/corbaname.idl
@@ -2,19 +2,19 @@
 
 module corbaname
 {
-  
+
   interface Status
   {
     // = TITLE
-    //     A simple interface to check the status of 
+    //     A simple interface to check the status of
     //     connection between the client and the server.
     //
     // = DESCRIPTION
     //     Prints out the status.
 
     boolean print_status ();
-    // Return <true> if the server received the 
+    // Return <true> if the server received the
     // request from the client.
-        
+
   };
 };
diff --git a/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
index 901bed185e4..00e39c3e1c6 100644
--- a/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
+++ b/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
@@ -1,23 +1,19 @@
-// $Id$
-//
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/tests/ior_corbaname/
-//
-// = FILENAME
-//    ior_corbaname_client_i.cpp
-//
-// = DESCRIPTION
-//    This example implements a simple client which sends a corbaname:
-//    style url to the server and gets a response from the
-//    server to indicate that the server has received the request.
-//
-// = AUTHORS
-//    Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//============================================================
+
+//=============================================================================
+/**
+ *  @file    ior_corbaname_client_i.cpp
+ *
+ *  $Id$
+ *
+ *  This example implements a simple client which sends a corbaname:
+ *  style url to the server and gets a response from the
+ *  server to indicate that the server has received the request.
+ *
+ *
+ *  @author Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #include "ior_corbaname_client_i.h"
 #include "ace/Get_Opt.h"
diff --git a/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
index 18ab287ea32..01b69e8bbfc 100644
--- a/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
+++ b/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/tests/ior_corbaname/
-//
-// = FILENAME
-//    ior_corbaname_client_i.h
-//
-// = DESCRIPTION
-//    This class implements a simple client which sends a corbaname:
-//    style url to the server and gets a response from the
-//    server to indicate that the server has received the request.
-//
-// = AUTHORS
-//    Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//============================================================
+
+//=============================================================================
+/**
+ *  @file    ior_corbaname_client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements a simple client which sends a corbaname:
+ *  style url to the server and gets a response from the
+ *  server to indicate that the server has received the request.
+ *
+ *
+ *  @author Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #if !defined (IOR_CORBANAME_CLIENT_I_H)
 #define IOR_CORBANAME_CLIENT_I_H
@@ -25,38 +22,39 @@
 #include "corbanameC.h"
 #include "orbsvcs/CosNamingC.h"
 
+/**
+ * @class IOR_corbaname_Client_i
+ *
+ * @brief NContextExt Client Implementation
+ *
+ */
 class IOR_corbaname_Client_i
 {
-  // = TITLE
-  //     NContextExt Client Implementation
-  //
-  // = DESCRIPTION
-  //
 
  public:
   // = Constructor and destructor.
   IOR_corbaname_Client_i (void);
   ~IOR_corbaname_Client_i (void);
 
+  /// Execute the client example code.
   int run (void);
-  // Execute the client example code.
 
+  /// Initialize the client communication endpoint with the server.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the client communication endpoint with the server.
 
  private:
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// ORB
   CORBA::ORB_var orb_;
-  // ORB
 
+  /// Naming context
   CosNaming::NamingContextExt_var naming_context_;
-  // Naming context
 };
 
 #endif /* IOR_CORBANAME_CLIENT_I_H */
diff --git a/orbsvcs/tests/tests_svc_loader/Makefile.am b/orbsvcs/tests/tests_svc_loader/Makefile.am
deleted file mode 100644
index 31eae6825ea..00000000000
--- a/orbsvcs/tests/tests_svc_loader/Makefile.am
+++ /dev/null
@@ -1,44 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.tests_svc_loader.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = tests_svc_loader
-
-tests_svc_loader_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-tests_svc_loader_SOURCES = \
-  tests_svc_loader.cpp
-
-tests_svc_loader_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/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
index 75926732c39..b90b58eef5a 100644
--- a/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
+++ b/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
@@ -1,26 +1,23 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs/tests/tests_svc_loader
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//   This directory contains a client that checks if a given object
-//   reference points to an existing object or not and prints a debug
-//   statement to reflect the same. This client is to be used in
-//   conjunction with testing the dynamically loadable services. If
-//   the service is loaded successfully, the object reference from the
-//   server would be a valid one and the corresponding debug statement
-//   is printed out. Or viceversa.
-//
-// = AUTHOR
-//     Priyanka Gontla <pgontla@ece.uci.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    tests_svc_loader.cpp
+ *
+ *  $Id$
+ *
+ * This directory contains a client that checks if a given object
+ * reference points to an existing object or not and prints a debug
+ * statement to reflect the same. This client is to be used in
+ * conjunction with testing the dynamically loadable services. If
+ * the service is loaded successfully, the object reference from the
+ * server would be a valid one and the corresponding debug statement
+ * is printed out. Or viceversa.
+ *
+ *
+ *  @author  Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #include "tao/ORB.h"
 #include "tao/Object.h"
@@ -30,10 +27,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/CORBA_macros.h"
 
-ACE_RCSID (tests_svc_loader,
-           tests_svc_loader,
-           "$Id$")
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv [])
 {
   try
diff --git a/orbsvcs/tests/unit/Makefile.am b/orbsvcs/tests/unit/Makefile.am
deleted file mode 100644
index f625b1eaf6a..00000000000
--- a/orbsvcs/tests/unit/Makefile.am
+++ /dev/null
@@ -1,14 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Notify \
-        Trading
-
diff --git a/orbsvcs/tests/unit/Notify/MC/Control/Makefile.am b/orbsvcs/tests/unit/Notify/MC/Control/Makefile.am
deleted file mode 100644
index 36de58cb465..00000000000
--- a/orbsvcs/tests/unit/Notify/MC/Control/Makefile.am
+++ /dev/null
@@ -1,58 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Control.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS = Control
-
-Control_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Control_SOURCES = \
-  Control.cpp
-
-Control_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-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/orbsvcs/tests/unit/Notify/MC/Makefile.am b/orbsvcs/tests/unit/Notify/MC/Makefile.am
deleted file mode 100644
index 55d478023e5..00000000000
--- a/orbsvcs/tests/unit/Notify/MC/Makefile.am
+++ /dev/null
@@ -1,18 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Control \
-        MonitorControlExt \
-        MonitorManager \
-        NotificationServiceMonitor \
-        Statistic \
-        Statistic_Registry
-
diff --git a/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am b/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am
deleted file mode 100644
index 845eaf08bb0..00000000000
--- a/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am
+++ /dev/null
@@ -1,68 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.MonitorControlExt.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS = MonitorControlExt
-
-MonitorControlExt_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-MonitorControlExt_SOURCES = \
-  MonitorControlExt.cpp
-
-MonitorControlExt_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC_Ext.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-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/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp b/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
index 63fc5154dae..dda9336defb 100644
--- a/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
+++ b/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
@@ -35,17 +35,17 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-      
+
       CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
         PortableServer::POA::_narrow (obj.in ());
-        
+
       PortableServer::POAManager_var poa_manager = poa->the_POAManager ();
       poa_manager->activate ();
 
       TAO_Notify_Service* notify_service =
         TAO_Notify_Service::load_default ();
-      
+
       if (notify_service == 0)
         {
           error ("Unable to load the Notify Service");
@@ -59,7 +59,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
          notify_service->create (poa.in (), ecf_name.c_str ());
       NotifyMonitoringExt::EventChannelFactory_var monitor_ec_factory =
         NotifyMonitoringExt::EventChannelFactory::_narrow (ecf.in ());
-        
+
       if (CORBA::is_nil (monitor_ec_factory.in ()))
         {
          error ("Unable to create the Monitoring Event Channel Factory");
@@ -69,7 +69,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
       CosNotification::AdminProperties admin_prop;
       CosNotifyChannelAdmin::ChannelID id;
       const ACE_CString ec_name ("test1");
-      
+
       CosNotifyChannelAdmin::EventChannel_var ec =
         monitor_ec_factory->create_named_channel (qos_prop,
                                                   admin_prop,
@@ -77,7 +77,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
                                                   ec_name.c_str ());
       NotifyMonitoringExt::EventChannel_var mec =
         NotifyMonitoringExt::EventChannel::_narrow (ec.in ());
-        
+
       if (CORBA::is_nil (mec.in ()))
         {
           error ("Unable to narrow the event channel");
@@ -104,9 +104,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
         ecf_name
         + "/"
         + ACE_CString (NotifyMonitoringExt::InactiveEventChannelCount);
-        
+
       Monitor_Base* stat = instance->get (stat_name);
-      
+
       if (stat == 0)
         {
           error ("Could not find InactiveEventChannelCount statistic");
@@ -114,8 +114,8 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       stat->update ();
       double count = stat->last_sample ();
-      
-      if (count != 1)
+
+      if (!ACE::is_equal (count, 1.0))
         {
           error ("Invalid inactive event channel count");
         }
@@ -124,9 +124,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
         ecf_name
         + "/"
         + ACE_CString (NotifyMonitoringExt::ActiveEventChannelCount);
-        
+
       stat = instance->get (stat_name);
-      
+
       if (stat == 0)
         {
           error ("Could not find ActiveEventChannelCount statistic");
@@ -134,8 +134,8 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       stat->update ();
       count = stat->last_sample ();
-      
-      if (count != 0)
+
+      if (!ACE::is_equal (count, 0.0))
         {
           error ("Invalid active event channel count");
         }
@@ -144,9 +144,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
         ecf_name
         + "/"
         + ACE_CString (NotifyMonitoringExt::InactiveEventChannelNames);
-        
+
       stat = instance->get (stat_name);
-      
+
       if (stat == 0)
         {
           error ("Could not find InactiveEventChannels statistic");
@@ -154,14 +154,14 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       stat->update ();
       Monitor_Control_Types::NameList list = stat->get_list ();
-      
+
       if (list.size () != 1)
         {
           error ("Invalid inactive event channel list");
         }
 
       ACE_CString full_ec_name (ecf_name + "/" + ec_name);
-      
+
       if (list[0] != full_ec_name)
         {
           error ("Wrong event channel name");
@@ -179,7 +179,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
             mec->named_new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
                                           aid,
                                           "TestSupplierAdmin");
-                                          
+
           error ("Expected a SupplierAdmin "
                  "NotifyMonitoringExt::NameAlreadyUsed exception");
         }
@@ -197,7 +197,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       NotifyMonitoringExt::SupplierAdmin_var madmin =
         NotifyMonitoringExt::SupplierAdmin::_narrow (admin.in ());
-        
+
       if (CORBA::is_nil (madmin.in ()))
         {
           error ("Could not narrow the supplier admin");
@@ -215,7 +215,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
           CosNotifyChannelAdmin::ProxyConsumer_var fake =
             madmin->obtain_named_notification_push_consumer
             (CosNotifyChannelAdmin::STRUCTURED_EVENT, pid, "supplier");
-            
+
           error ("Expected a ProxyConsumer "
                  "NotifyMonitoringExt::NameAlreadyUsed exception");
         }
@@ -230,9 +230,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
         + ec_name
         + "/"
         + ACE_CString (NotifyMonitoringExt::EventChannelSupplierCount);
-        
+
       stat = instance->get (stat_name);
-      
+
       if (stat == 0)
         {
           error ("Could not find the event channel suppliers statistic");
@@ -240,8 +240,8 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       stat->update ();
       count = stat->last_sample ();
-      
-      if (count != 1)
+
+      if (!ACE::is_equal (count, 1.0))
         {
           error ("Invalid supplier count");
         }
@@ -277,7 +277,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
             mec->named_new_for_consumers (CosNotifyChannelAdmin::AND_OP,
                                           aid,
                                           "TestConsumerAdmin");
-                                          
+
           error ("Expected a ConsumerAdmin "
                  "NotifyMonitoringExt::NameAlreadyUsed exception");
         }
@@ -295,7 +295,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       NotifyMonitoringExt::ConsumerAdmin_var mcadmin =
         NotifyMonitoringExt::ConsumerAdmin::_narrow (cadmin.in ());
-        
+
       if (CORBA::is_nil (mcadmin.in ()))
         {
           error ("Could not narrow the consumer admin");
@@ -314,7 +314,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
               CosNotifyChannelAdmin::STRUCTURED_EVENT,
               pid,
               "consumer");
-              
+
           error ("Expected a ProxySupplier "
                  "NotifyMonitoringExt::NameAlreadyUsed exception");
         }
@@ -329,9 +329,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
         + ec_name
         + "/"
         + ACE_CString (NotifyMonitoringExt::EventChannelConsumerCount);
-        
+
       stat = instance->get (stat_name);
-      
+
       if (stat == 0)
         {
           error ("Could not find the event channel consumers statistic");
@@ -339,8 +339,8 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       stat->update ();
       count = stat->last_sample ();
-      
-      if (count != 1)
+
+      if (!ACE::is_equal (count, 1.0))
         {
           error ("Invalid consumer count");
         }
diff --git a/orbsvcs/tests/unit/Notify/MC/MonitorManager/Makefile.am b/orbsvcs/tests/unit/Notify/MC/MonitorManager/Makefile.am
deleted file mode 100644
index 992187c9ef8..00000000000
--- a/orbsvcs/tests/unit/Notify/MC/MonitorManager/Makefile.am
+++ /dev/null
@@ -1,73 +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:
-## ../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.MonitorManager_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS += MonitorClient
-
-MonitorClient_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-MonitorClient_SOURCES = \
-  MonitorClient.cpp
-
-MonitorClient_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-endif BUILD_EXCEPTIONS
-
-## Makefile.MonitorManager_Server.am
-
-noinst_PROGRAMS += MonitorManager
-
-MonitorManager_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
-
-MonitorManager_SOURCES = \
-  MonitorManager.cpp
-
-MonitorManager_LDADD = \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf b/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf
index 74f5e5224b2..1d72c863f98 100644
--- a/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf
+++ b/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf
@@ -1 +1,3 @@
+# $Id$
+
 dynamic TAO_MonitorAndControl Service_Object * TAO_CosNotification_MC:_make_TAO_MonitorAndControl () "-NoNameSvc -ORBArg -ORBListenEndpoints -ORBArg iiop://127.0.0.1:32101"
diff --git a/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/Makefile.am b/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/Makefile.am
deleted file mode 100644
index 0e0f057a3c1..00000000000
--- a/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/Makefile.am
+++ /dev/null
@@ -1,58 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.NotificationServiceMonitor.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS = NotificationServiceMonitor
-
-NotificationServiceMonitor_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-NotificationServiceMonitor_SOURCES = \
-  NotificationServiceMonitor.cpp
-
-NotificationServiceMonitor_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-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/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp b/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
index 18d10324597..81c20d2f598 100644
--- a/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
+++ b/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
@@ -128,7 +128,7 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       index = start_size + 1;
       num = data[index].data_union.num ();
 
-      if (num.average != 4.5)
+      if (!ACE::is_equal (num.average, 4.5))
         {
           error ("get_statistics() return the wrong data");
         }
diff --git a/orbsvcs/tests/unit/Notify/MC/Statistic/Makefile.am b/orbsvcs/tests/unit/Notify/MC/Statistic/Makefile.am
deleted file mode 100644
index 7c4cdda1f45..00000000000
--- a/orbsvcs/tests/unit/Notify/MC/Statistic/Makefile.am
+++ /dev/null
@@ -1,58 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Statistic.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS = Statistic
-
-Statistic_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Statistic_SOURCES = \
-  Statistic.cpp
-
-Statistic_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-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/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp b/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
index 2db160fceb1..c6a81b78d8c 100644
--- a/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
+++ b/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
@@ -27,8 +27,8 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       counter.receive (0.0);
       counter.receive (0.0);
       counter.receive (0.0);
-      
-      if (counter.last_sample() != 3)
+
+      if (!ACE::is_equal (counter.last_sample(), 3.0))
         {
           error ("Counter Monitor_Control::receive() failed");
         }
@@ -40,23 +40,23 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       number.receive (size);
       size = 42;
       number.receive (size);
-      
-      if (number.average () != 20)
+
+      if (!ACE::is_equal (number.average (), 20.0))
         {
           error ("Number Monitor_Base::average() failed");
         }
-        
-      if (number.minimum_sample () != 8)
+
+      if (!ACE::is_equal (number.minimum_sample (), 8.0))
         {
           error ("Number Monitor_Base::minimum_sample() failed");
         }
-        
-      if (number.maximum_sample () != 42)
+
+      if (!ACE::is_equal (number.maximum_sample (), 42.0))
         {
           error ("Number Monitor_Base::maximum_sample() failed");
         }
-        
-      if (number.sum_of_squares () != 1928)
+
+      if (!ACE::is_equal (number.sum_of_squares (), 1928.0))
         {
           error ("Number Monitor_Base::sum_of_squares() failed");
         }
@@ -65,18 +65,18 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       stime.receive (1183466309.01234);
       stime.receive (1183466377.9922);
       stime.receive (1083466309.88374);
-      
-      if (stime.average () != 1150132998.96276)
+
+      if (!ACE::is_equal (stime.average (), 1150132998.96276))
         {
           error ("Time Monitor_Base::average() failed");
         }
-        
-      if (stime.minimum_sample () != 1083466309.88374)
+
+      if (!ACE::is_equal (stime.minimum_sample (), 1083466309.88374))
         {
           error ("Time Monitor_Base::minimum_sample() failed");
         }
-        
-      if (stime.maximum_sample () != 1183466377.9922)
+
+      if (!ACE::is_equal (stime.maximum_sample (), 1183466377.9922))
         {
           error ("Time Monitor_Base::maximum_sample() failed");
         }
@@ -85,7 +85,7 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       interval.receive (.8);
       interval.receive (.1);
       interval.receive (.42);
-      
+
       // This multiplication and casting is necessary since the machine
       // representation of the floating point values in the receive()
       // calls are not exactly what is represented by the text of the code.
@@ -93,17 +93,17 @@ ACE_TMAIN (int, ACE_TCHAR*[])
         {
           error ("Interval Monitor_Base::average() failed");
         }
-        
-      if (interval.minimum_sample () != .1)
+
+      if (!ACE::is_equal (interval.minimum_sample (), 0.1))
         {
           error ("Interval Monitor_Base::minimum_sample() failed");
         }
-        
-      if (interval.maximum_sample () != .8)
+
+      if (!ACE::is_equal (interval.maximum_sample (), 0.8))
         {
           error ("Interval Monitor_Base::maximum_sample() failed");
         }
-        
+
       if (static_cast<int> (interval.sum_of_squares () * 10000) != 8264)
         {
           error ("Interval Monitor_Base::sum_of_squares() failed");
@@ -115,7 +115,7 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       l.push_back ("two");
       l.push_back ("three");
       list.receive (l);
-      
+
       if (list.count () != 3)
         {
           error ("List Monitor_Base::receive() failed");
diff --git a/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Makefile.am b/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Makefile.am
deleted file mode 100644
index a5989740c23..00000000000
--- a/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Makefile.am
+++ /dev/null
@@ -1,58 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Statistic_Registry.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS = Statistic_Registry
-
-Statistic_Registry_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Statistic_Registry_SOURCES = \
-  Statistic_Registry.cpp
-
-Statistic_Registry_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-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/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp b/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
index c3f330b31b8..6d3a54b2593 100644
--- a/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
+++ b/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
@@ -29,7 +29,7 @@ ACE_TMAIN (int, ACE_TCHAR*[])
 
       // Test registry acquisition.
       Monitor_Point_Registry* reg = Monitor_Point_Registry::instance ();
-      
+
       if (reg == 0)
         {
           error ("Monitor_Point_Registry::instance() failed");
@@ -75,7 +75,7 @@ ACE_TMAIN (int, ACE_TCHAR*[])
                       Monitor_Base ("test1",
                                     Monitor_Control_Types::MC_COUNTER),
                       2);
-                      
+
       if (reg->add (s) == false)
         {
           error ("re-addition Monitor_Point_Registry::add() failed");
@@ -85,7 +85,7 @@ ACE_TMAIN (int, ACE_TCHAR*[])
                       Monitor_Base ("test2",
                                     Monitor_Control_Types::MC_NUMBER),
                       2);
-                      
+
       if (reg->add (s) == false)
         {
           error ("second Monitor_Point_Registry::add() failed");
diff --git a/orbsvcs/tests/unit/Notify/Makefile.am b/orbsvcs/tests/unit/Notify/Makefile.am
deleted file mode 100644
index 78e59ea6b49..00000000000
--- a/orbsvcs/tests/unit/Notify/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        MC
-
diff --git a/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp b/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
index edc28721c2c..10c97dc3c24 100644
--- a/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
+++ b/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
@@ -16,14 +16,14 @@ public:
   virtual int visit_constraint (TAO_Unary_Constraint*);
 
   virtual int visit_with (TAO_Unary_Constraint*) { return 1; }
-  virtual int visit_min (TAO_Unary_Constraint*) { return 1; }  
-  virtual int visit_max (TAO_Unary_Constraint*) { return 1; }  
+  virtual int visit_min (TAO_Unary_Constraint*) { return 1; }
+  virtual int visit_max (TAO_Unary_Constraint*) { return 1; }
   virtual int visit_first (TAO_Noop_Constraint*) { return 1; }
   virtual int visit_random (TAO_Noop_Constraint*) { return 1; }
 
   virtual int visit_and (TAO_Binary_Constraint*) { return 1; }
-  virtual int visit_or (TAO_Binary_Constraint*) { return 1; }  
-  virtual int visit_not (TAO_Unary_Constraint*) { return 1; }   
+  virtual int visit_or (TAO_Binary_Constraint*) { return 1; }
+  virtual int visit_not (TAO_Unary_Constraint*) { return 1; }
 
   virtual int visit_exist (TAO_Unary_Constraint*) { return 1; }
   virtual int visit_unary_minus (TAO_Unary_Constraint*) { return 1; }
@@ -31,7 +31,7 @@ public:
   virtual int visit_add (TAO_Binary_Constraint*) { return 1; }
   virtual int visit_sub (TAO_Binary_Constraint*) { return 1; }
   virtual int visit_mult (TAO_Binary_Constraint*) { return 1; }
-  virtual int visit_div (TAO_Binary_Constraint*) { return 1; }  
+  virtual int visit_div (TAO_Binary_Constraint*) { return 1; }
 
   virtual int visit_twiddle (TAO_Binary_Constraint*) { return 1; }
   virtual int visit_in (TAO_Binary_Constraint*) { return 1; }
@@ -129,7 +129,7 @@ Literal_Interpreter<const char*>::compare (const char* expected) const
 template<class T> bool
 Literal_Interpreter<T>::compare (T expected) const
 {
-  return (static_cast<T> (this->constraint_) == expected);
+  return ACE::is_equal (static_cast<T> (this->constraint_), expected);
 }
 
 template<class T> void
diff --git a/orbsvcs/tests/unit/Trading/Interpreter/Makefile.am b/orbsvcs/tests/unit/Trading/Interpreter/Makefile.am
deleted file mode 100644
index af99264e7ad..00000000000
--- a/orbsvcs/tests/unit/Trading/Interpreter/Makefile.am
+++ /dev/null
@@ -1,58 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Interpreter.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Interpreter
-
-Interpreter_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-Interpreter_SOURCES = \
-  Interpreter.cpp
-
-Interpreter_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/orbsvcs/tests/unit/Trading/Makefile.am b/orbsvcs/tests/unit/Trading/Makefile.am
deleted file mode 100644
index add42f9d0ae..00000000000
--- a/orbsvcs/tests/unit/Trading/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Interpreter
-
diff --git a/performance-tests/Alt_Mapping/StringMember/StringMember.mpc b/performance-tests/Alt_Mapping/StringMember/StringMember.mpc
index 07808bd7fca..289f3d36ff5 100644
--- a/performance-tests/Alt_Mapping/StringMember/StringMember.mpc
+++ b/performance-tests/Alt_Mapping/StringMember/StringMember.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults {
                 -Wb,stub_export_include=string_member_stub_export.h \
                 -Wb,skel_export_macro=STRING_MEMBER_SKEL_Export \
                 -Wb,skel_export_include=string_member_skel_export.h \
-                -Gxhst -Gxhsk -Gstl
+                -Gxhst -Gxhsk
 
     StringMember.idl
   }
diff --git a/performance-tests/Anyop/Makefile.am b/performance-tests/Anyop/Makefile.am
deleted file mode 100644
index a8183324a56..00000000000
--- a/performance-tests/Anyop/Makefile.am
+++ /dev/null
@@ -1,76 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Anyop.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = anyop
-
-anyop_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-anyop_SOURCES = \
-  anyop.cpp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-anyop_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/performance-tests/Anyop/anyop.cpp b/performance-tests/Anyop/anyop.cpp
index d6141a3a87c..fd82626063f 100644
--- a/performance-tests/Anyop/anyop.cpp
+++ b/performance-tests/Anyop/anyop.cpp
@@ -1,22 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/performance-tests/Anyop
-//
-// = FILENAME
-//   anyop.cpp
-//
-// = DESCRIPTION
-//   Modified from anyop.cpp in Param_Test to benchmark Any insertion and
-//   extraction operators for various IDL types.
-//
-// = AUTHORS
-//   Carlos O'Ryan
-//   Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   anyop.cpp
+ *
+ *  $Id$
+ *
+ * Modified from anyop.cpp in Param_Test to benchmark Any insertion and
+ * extraction operators for various IDL types.
+ *
+ *
+ *  @author Carlos O'RyanJeff Parsons
+ */
+//=============================================================================
+
 
 #include "testC.h"
 #include "tao/debug.h"
@@ -30,10 +26,6 @@
 #include "ace/Sample_History.h"
 #include "ace/Sched_Params.h"
 
-ACE_RCSID (Anyop,
-           anyop,
-           "$Id$")
-
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
diff --git a/performance-tests/Anyop/test.idl b/performance-tests/Anyop/test.idl
index f9a3350f85a..20dc75c7a23 100644
--- a/performance-tests/Anyop/test.idl
+++ b/performance-tests/Anyop/test.idl
@@ -1,24 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Anyop
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//    The basis for this file is the IDL file in TAO/tests/Param_Test
-//    but modified slightly for testing the performance of Any
-//    insertion and extraction operators. Not every IDL type in this
-//    file is tested yet.
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//    Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    test.idl
+ *
+ *  $Id$
+ *
+ *  The basis for this file is the IDL file in TAO/tests/Param_Test
+ *  but modified slightly for testing the performance of Any
+ *  insertion and extraction operators. Not every IDL type in this
+ *  file is tested yet.
+ *
+ *
+ *  @author Aniruddha Gokhale Jeff Parsons
+ */
+//=============================================================================
+
 
 #include <orb.idl>
 
@@ -346,7 +342,7 @@ interface Param_Test
   // Use of forward due to deprecation of anonymous types
   // Test used to use anon type to define the children value.
 
-  
+
   struct Recursive_Struct;
   typedef sequence<Recursive_Struct> Recursive_Seq;
 
diff --git a/performance-tests/CSD_Strategy/Makefile.am b/performance-tests/CSD_Strategy/Makefile.am
deleted file mode 100644
index 866ff552f62..00000000000
--- a/performance-tests/CSD_Strategy/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        TestInf \
-        TestServant \
-        TestApps
-
diff --git a/performance-tests/CSD_Strategy/TestApps/Makefile.am b/performance-tests/CSD_Strategy/TestApps/Makefile.am
deleted file mode 100644
index ed77c6dd74e..00000000000
--- a/performance-tests/CSD_Strategy/TestApps/Makefile.am
+++ /dev/null
@@ -1,100 +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:
-## ../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.csd_test_client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/performance-tests/CSD_Strategy \
-  -I$(TAO_BUILDDIR)/performance-tests/CSD_Strategy
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDFLAGS = \
-  -L$(TAO_ROOT)/performance-tests/CSD_Strategy/TestInf -L$(TAO_ROOT)/performance-tests/CSD_Strategy/TestServant
-
-client_main_LDADD = \
-  $(top_builddir)/performance-tests/CSD_Strategy/TestServant/libCSD_PT_TestServant.la \
-  $(top_builddir)/performance-tests/CSD_Strategy/TestInf/libCSD_PT_TestInf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.csd_test_server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/performance-tests/CSD_Strategy \
-  -I$(TAO_BUILDDIR)/performance-tests/CSD_Strategy
-
-server_main_SOURCES = \
-  ServerApp.cpp \
-  server_main.cpp \
-  ServerApp.h
-
-server_main_LDFLAGS = \
-  -L$(TAO_ROOT)/performance-tests/CSD_Strategy/TestInf -L$(TAO_ROOT)/performance-tests/CSD_Strategy/TestServant
-
-server_main_LDADD = \
-  $(top_builddir)/performance-tests/CSD_Strategy/TestServant/libCSD_PT_TestServant.la \
-  $(top_builddir)/performance-tests/CSD_Strategy/TestInf/libCSD_PT_TestInf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp b/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
index def6132f088..21233a9ff7a 100644
--- a/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
+++ b/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
@@ -5,7 +5,6 @@
 #include "TestInf/AppShutdown.h"
 #include "TestInf/TestAppExceptionC.h"
 #include "TestServant/Foo_ClientEngine.h"
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 #include "ace/Time_Value.h"
 #include "ace/High_Res_Timer.h"
diff --git a/performance-tests/CSD_Strategy/TestInf/AppHelper.h b/performance-tests/CSD_Strategy/TestInf/AppHelper.h
index 88aa3b38408..f0ab9e023b2 100644
--- a/performance-tests/CSD_Strategy/TestInf/AppHelper.h
+++ b/performance-tests/CSD_Strategy/TestInf/AppHelper.h
@@ -6,10 +6,8 @@
 #include "TestInf/TestAppExceptionC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
-
 template <typename T>
 struct RefHelper
 {
diff --git a/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp b/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp
index c975dea0986..3ff4b93526b 100644
--- a/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp
+++ b/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp
@@ -55,7 +55,7 @@ AppShutdown::client_done()
   unsigned cur_shutdown;
 
   {
-    GuardType guard(this->lock_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
     cur_shutdown = ++this->num_clients_shutdown_;
   }
 
diff --git a/performance-tests/CSD_Strategy/TestInf/AppShutdown.h b/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
index eee1be40ac1..5c059a8e5e8 100644
--- a/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
+++ b/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
@@ -23,11 +23,7 @@ class CSD_PT_TestInf_Export AppShutdown
     static AppShutdown* instance ();
 
   private:
-
-    typedef TAO_SYNCH_MUTEX LockType;
-    typedef ACE_Guard<LockType> GuardType;
-
-    LockType lock_;
+    TAO_SYNCH_MUTEX lock_;
     CORBA::ORB_var orb_;
     unsigned num_clients_;
     unsigned num_clients_shutdown_;
diff --git a/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp b/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
index d2f2a9e5bb9..088566ac96b 100644
--- a/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
+++ b/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
@@ -1,22 +1,20 @@
 // $Id$
 // This may look like C, but it's really -*- C++ -*-
+
 #include "ClientTask.h"
 #include "tao/Exception.h"
 #include "ace/SString.h"
 
-
 ClientTask::ClientTask()
   : failure_count_(0),
     num_loops_(1)
 {
 }
 
-
 ClientTask::~ClientTask()
 {
 }
 
-
 void
 ClientTask::add_engine(ClientEngine* engine)
 {
@@ -25,18 +23,16 @@ ClientTask::add_engine(ClientEngine* engine)
   this->engines_.push_back(engine_handle);
 }
 
-
 void
 ClientTask::num_loops(unsigned num_loops)
 {
   this->num_loops_ = num_loops;
 }
 
-
 int
 ClientTask::open(void*)
 {
-  size_t num_threads = this->engines_.size();
+  size_t const num_threads = this->engines_.size();
 
   if (num_threads == 0)
     {
@@ -66,7 +62,7 @@ ClientTask::svc()
   unsigned num_loops;
 
   {
-    GuardType guard(this->lock_);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
     this->engines_.get(engine, this->engines_.size() - 1);
     this->engines_.pop_back();
     num_loops = this->num_loops_;
@@ -76,8 +72,8 @@ ClientTask::svc()
   {
     if (engine->execute(num_loops) == false)
       {
-        GuardType guard(this->lock_);
-        this->failure_count_++;
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+        ++this->failure_count_;
       }
   }
   catch (const CORBA::Exception& ex)
@@ -85,16 +81,16 @@ ClientTask::svc()
     ex._tao_print_exception (
       "ClientTask::svc Caught exception from execute():");
 
-    GuardType guard(this->lock_);
-    this->failure_count_ ++;
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+    ++this->failure_count_ ;
   }
   catch (...)
   {
     ACE_ERROR((LM_ERROR,
                "(%P|%t) ClientTask::svc caught unknown (...) exception "\
                "in execute() " ));
-    GuardType guard(this->lock_);
-    this->failure_count_++;
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+    ++this->failure_count_;
   }
 
   return 0;
diff --git a/performance-tests/CSD_Strategy/TestInf/ClientTask.h b/performance-tests/CSD_Strategy/TestInf/ClientTask.h
index d7c8ce5a488..fe25eb3b470 100644
--- a/performance-tests/CSD_Strategy/TestInf/ClientTask.h
+++ b/performance-tests/CSD_Strategy/TestInf/ClientTask.h
@@ -38,16 +38,12 @@ class CSD_PT_TestInf_Export ClientTask : public ACE_Task_Base
 
 
   private:
-
-     typedef TAO_SYNCH_MUTEX     LockType;
-     typedef ACE_Guard<LockType> GuardType;
-
      typedef ACE_Vector<ClientEngine_Handle> EngineVector;
 
-     LockType     lock_;
-     EngineVector engines_;
-     unsigned     failure_count_;
-     unsigned     num_loops_;
+     TAO_SYNCH_MUTEX lock_;
+     EngineVector    engines_;
+     unsigned        failure_count_;
+     unsigned        num_loops_;
 };
 
 #endif
diff --git a/performance-tests/CSD_Strategy/TestInf/Makefile.am b/performance-tests/CSD_Strategy/TestInf/Makefile.am
deleted file mode 100644
index 6df0e90deff..00000000000
--- a/performance-tests/CSD_Strategy/TestInf/Makefile.am
+++ /dev/null
@@ -1,190 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.csd_pt_testinf.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES += \
-  FooExceptionC.cpp \
-  FooExceptionC.h \
-  FooExceptionC.inl \
-  FooExceptionS.cpp \
-  FooExceptionS.h \
-  FooExceptionS.inl
-
-CLEANFILES += \
-  FooException-stamp \
-  FooExceptionC.cpp \
-  FooExceptionC.h \
-  FooExceptionC.inl \
-  FooExceptionS.cpp \
-  FooExceptionS.h \
-  FooExceptionS.inl
-
-FooExceptionC.cpp FooExceptionC.h FooExceptionC.inl FooExceptionS.cpp FooExceptionS.h FooExceptionS.inl: FooException-stamp
-
-FooException-stamp: $(srcdir)/FooException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=TestInf/CSD_PT_TestInf_Export.h $(srcdir)/FooException.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TestAppExceptionC.cpp \
-  TestAppExceptionC.h \
-  TestAppExceptionC.inl \
-  TestAppExceptionS.cpp \
-  TestAppExceptionS.h \
-  TestAppExceptionS.inl
-
-CLEANFILES += \
-  TestAppException-stamp \
-  TestAppExceptionC.cpp \
-  TestAppExceptionC.h \
-  TestAppExceptionC.inl \
-  TestAppExceptionS.cpp \
-  TestAppExceptionS.h \
-  TestAppExceptionS.inl
-
-TestAppExceptionC.cpp TestAppExceptionC.h TestAppExceptionC.inl TestAppExceptionS.cpp TestAppExceptionS.h TestAppExceptionS.inl: TestAppException-stamp
-
-TestAppException-stamp: $(srcdir)/TestAppException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=TestInf/CSD_PT_TestInf_Export.h $(srcdir)/TestAppException.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CancelledExceptionC.cpp \
-  CancelledExceptionC.h \
-  CancelledExceptionC.inl \
-  CancelledExceptionS.cpp \
-  CancelledExceptionS.h \
-  CancelledExceptionS.inl
-
-CLEANFILES += \
-  CancelledException-stamp \
-  CancelledExceptionC.cpp \
-  CancelledExceptionC.h \
-  CancelledExceptionC.inl \
-  CancelledExceptionS.cpp \
-  CancelledExceptionS.h \
-  CancelledExceptionS.inl
-
-CancelledExceptionC.cpp CancelledExceptionC.h CancelledExceptionC.inl CancelledExceptionS.cpp CancelledExceptionS.h CancelledExceptionS.inl: CancelledException-stamp
-
-CancelledException-stamp: $(srcdir)/CancelledException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=TestInf/CSD_PT_TestInf_Export.h $(srcdir)/CancelledException.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CustomExceptionC.cpp \
-  CustomExceptionC.h \
-  CustomExceptionC.inl \
-  CustomExceptionS.cpp \
-  CustomExceptionS.h \
-  CustomExceptionS.inl
-
-CLEANFILES += \
-  CustomException-stamp \
-  CustomExceptionC.cpp \
-  CustomExceptionC.h \
-  CustomExceptionC.inl \
-  CustomExceptionS.cpp \
-  CustomExceptionS.h \
-  CustomExceptionS.inl
-
-CustomExceptionC.cpp CustomExceptionC.h CustomExceptionC.inl CustomExceptionS.cpp CustomExceptionS.h CustomExceptionS.inl: CustomException-stamp
-
-CustomException-stamp: $(srcdir)/CustomException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=TestInf/CSD_PT_TestInf_Export.h $(srcdir)/CustomException.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libCSD_PT_TestInf.la
-
-libCSD_PT_TestInf_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tao \
-  -I$(TAO_ROOT)/performance-tests/CSD_Strategy \
-  -I$(TAO_BUILDDIR)/performance-tests/CSD_Strategy \
-  -DCSD_PT_TESTINF_BUILD_DLL
-
-libCSD_PT_TestInf_la_SOURCES = \
-  AppHelper.cpp \
-  AppShutdown.cpp \
-  CancelledExceptionC.cpp \
-  CancelledExceptionS.cpp \
-  ClientEngine.cpp \
-  ClientTask.cpp \
-  CustomExceptionC.cpp \
-  CustomExceptionS.cpp \
-  FooExceptionC.cpp \
-  FooExceptionS.cpp \
-  OrbRunner.cpp \
-  OrbShutdownTask.cpp \
-  OrbTask.cpp \
-  TestAppBase.cpp \
-  TestAppExceptionC.cpp \
-  TestAppExceptionS.cpp
-
-noinst_HEADERS = \
-  AppHelper.h \
-  AppShutdown.h \
-  CancelledException.idl \
-  CancelledExceptionC.h \
-  CancelledExceptionC.inl \
-  CancelledExceptionS.h \
-  CancelledExceptionS.inl \
-  ClientEngine.h \
-  ClientTask.h \
-  CustomException.idl \
-  CustomExceptionC.h \
-  CustomExceptionC.inl \
-  CustomExceptionS.h \
-  CustomExceptionS.inl \
-  FooException.idl \
-  FooExceptionC.h \
-  FooExceptionC.inl \
-  FooExceptionS.h \
-  FooExceptionS.inl \
-  OrbRunner.h \
-  OrbShutdownTask.h \
-  OrbTask.h \
-  ServantList_T.cpp \
-  ServantList_T.h \
-  TestAppBase.h \
-  TestAppException.idl \
-  TestAppExceptionC.h \
-  TestAppExceptionC.inl \
-  TestAppExceptionS.h \
-  TestAppExceptionS.inl
-
-endif BUILD_THREADS
-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/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h b/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
index e864489f9b3..118e5afd81d 100644
--- a/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
+++ b/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
@@ -5,7 +5,7 @@
 #include "CSD_PT_TestServant_Export.h"
 
 
-class CSD_PT_TestServant_Export Foo_Statistics 
+class CSD_PT_TestServant_Export Foo_Statistics
 {
   public:
 
diff --git a/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp b/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
index 195be3b7c02..15fc4cd2002 100644
--- a/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
+++ b/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
@@ -1,12 +1,8 @@
 // $Id$
 #include "Foo_i.h"
 #include "TestInf/AppShutdown.h"
-#include "ace/OS.h"
 #include "ace/Time_Value.h"
 
-
-
-
 Foo_i::Foo_i()
 {
   for (unsigned i = 0; i < 5; i++)
diff --git a/performance-tests/CSD_Strategy/TestServant/Makefile.am b/performance-tests/CSD_Strategy/TestServant/Makefile.am
deleted file mode 100644
index d8fe3a634e5..00000000000
--- a/performance-tests/CSD_Strategy/TestServant/Makefile.am
+++ /dev/null
@@ -1,89 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.csd_pt_testservant.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/performance-tests/CSD_Strategy -Wb,export_macro=CSD_PT_TestServant_Export -Wb,export_include=TestServant/CSD_PT_TestServant_Export.h $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libCSD_PT_TestServant.la
-
-libCSD_PT_TestServant_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/performance-tests/CSD_Strategy \
-  -I$(TAO_BUILDDIR)/performance-tests/CSD_Strategy \
-  -I$(TAO_ROOT)/tao \
-  -DCSD_PT_TESTSERVANT_BUILD_DLL
-
-libCSD_PT_TestServant_la_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_ClientEngine.cpp \
-  Foo_Statistics.cpp \
-  Foo_i.cpp
-
-libCSD_PT_TestServant_la_LDFLAGS = \
- -L$(TAO_ROOT)/performance-tests/CSD_Strategy/TestInf
-
-noinst_HEADERS = \
-  Foo.idl \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl \
-  Foo_ClientEngine.h \
-  Foo_Statistics.h \
-  Foo_i.h
-
-endif BUILD_THREADS
-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/performance-tests/Callback/Callback_i.cpp b/performance-tests/Callback/Callback_i.cpp
index 74416a50d0b..f2ca5619ba6 100644
--- a/performance-tests/Callback/Callback_i.cpp
+++ b/performance-tests/Callback/Callback_i.cpp
@@ -8,8 +8,6 @@
 
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID(Callback, Callback_i, "$Id$")
-
 int
 Callback_i::done (void)
 {
diff --git a/performance-tests/Callback/Makefile.am b/performance-tests/Callback/Makefile.am
deleted file mode 100644
index 6801739baf3..00000000000
--- a/performance-tests/Callback/Makefile.am
+++ /dev/null
@@ -1,133 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Callback_Perf_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  callbackC.cpp \
-  callbackC.h \
-  callbackC.inl \
-  callbackS.cpp \
-  callbackS.h \
-  callbackS.inl
-
-CLEANFILES = \
-  callback-stamp \
-  callbackC.cpp \
-  callbackC.h \
-  callbackC.inl \
-  callbackS.cpp \
-  callbackS.h \
-  callbackS.inl
-
-callbackC.cpp callbackC.h callbackC.inl callbackS.cpp callbackS.h callbackS.inl: callback-stamp
-
-callback-stamp: $(srcdir)/callback.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/callback.idl
-	@touch $@
-
-noinst_HEADERS = \
-  callback.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Callback_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Callback_i.cpp \
-  callbackC.cpp \
-  callbackS.cpp \
-  client.cpp \
-  Callback_i.h \
-  Callback_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Callback_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_i.cpp \
-  callbackC.cpp \
-  callbackS.cpp \
-  server.cpp \
-  Server_i.h \
-  Server_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Callback/Server_i.cpp b/performance-tests/Callback/Server_i.cpp
index 354be854fb7..1deaefea278 100644
--- a/performance-tests/Callback/Server_i.cpp
+++ b/performance-tests/Callback/Server_i.cpp
@@ -6,8 +6,6 @@
 #include "Server_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Callback, Server_i, "$Id$")
-
 void
 Server_i::set_callback (Test::Callback_ptr callback)
 {
diff --git a/performance-tests/Callback/callback.idl b/performance-tests/Callback/callback.idl
index 7ac2851dc01..690687b4287 100644
--- a/performance-tests/Callback/callback.idl
+++ b/performance-tests/Callback/callback.idl
@@ -9,7 +9,7 @@ module Test {
   /// we stick the native high resolution timer value there.
   typedef unsigned long long TimeStamp;
 
-  /// Simulated 
+  /// Simulated
   typedef sequence<octet> Payload;
 
   /// Define the callback interface
diff --git a/performance-tests/Callback/client.cpp b/performance-tests/Callback/client.cpp
index ec8fe1f4791..d0768ef335f 100644
--- a/performance-tests/Callback/client.cpp
+++ b/performance-tests/Callback/client.cpp
@@ -15,8 +15,6 @@
 #include "ace/Task.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(Callback, client, "$Id$")
-
 int iterations = 1000;
 int do_dump_history = 0;
 const ACE_TCHAR *ior = ACE_TEXT("file://server.ior");
@@ -221,7 +219,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Callback/server.cpp b/performance-tests/Callback/server.cpp
index bd90e183963..aa4900c158c 100644
--- a/performance-tests/Callback/server.cpp
+++ b/performance-tests/Callback/server.cpp
@@ -9,8 +9,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(Callback, server, "$Id$")
-
 const ACE_TCHAR *ior_file_name = ACE_TEXT("test.ior");
 
 /// Parse the arguments.
@@ -144,6 +142,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/performance-tests/Cubit/Makefile.am b/performance-tests/Cubit/Makefile.am
deleted file mode 100644
index 93fa7615065..00000000000
--- a/performance-tests/Cubit/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        TAO
-
diff --git a/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am b/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am
deleted file mode 100644
index 60c44693f0b..00000000000
--- a/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am
+++ /dev/null
@@ -1,85 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.DII_Cubit_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  cubitC.cpp \
-  cubitC.h \
-  cubitC.inl \
-  cubitS.h \
-  cubitS.inl
-
-CLEANFILES = \
-  cubit-stamp \
-  cubitC.cpp \
-  cubitC.h \
-  cubitC.inl \
-  cubitS.h \
-  cubitS.inl
-
-cubitC.cpp cubitC.h cubitC.inl cubitS.h cubitS.inl: cubit-stamp
-
-cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Gd $(srcdir)/cubit.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  cubitC.cpp \
-  cubitC.h \
-  cubitC.inl \
-  cubitS.h \
-  cubitS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index 2fb388676a4..1320adc03b8 100644
--- a/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -1,22 +1,19 @@
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//      TAO/tests/Cubit/TAO/DII_Cubit
-//
-// = FILENAME
-//      client.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple CORBA client of the Cubit
-//      interface using DII functionality.
-//
-// = AUTHOR
-//      Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+
+//=============================================================================
+/**
+ *  @file      client.cpp
+ *
+ *  $Id$
+ *
+ *    This class implements a simple CORBA client of the Cubit
+ *    interface using DII functionality.
+ *
+ *
+ *  @author   Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "tao/DynamicInterface/Request.h"
 #include "tao/debug.h"
@@ -31,8 +28,6 @@
 // interested in timing comparisons anyway.
 #include "../IDL_Cubit/cubitC.h"
 
-ACE_RCSID(DII_Cubit, client, "$Id$")
-
   // Some constants used below.
 const CORBA::ULong DEFAULT_LOOP_COUNT = 250;
 const char *DEFAULT_FACTORY_IOR = "ior00";
@@ -42,44 +37,46 @@ const int SMALL_LONG_SEQ_LENGTH = 4;
 const int LARGE_LONG_SEQ_LENGTH = 1024;
 const int NUMBER_OF_TESTS = 10;
 
+/**
+ * @class DII_Cubit_Client
+ *
+ * @brief Defines a class that encapsulates behaviour of a Cubit client
+ * that makes requests using DII rather than stubs.
+ *
+ * This class declares an interface to run an example client for
+ * a Cubit CORBA server.  All the complexity for initializing the
+ * client is hidden in the class.  Just the run() interface is
+ * needed.
+ */
 class DII_Cubit_Client
 {
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of a Cubit client
-  //    that makes requests using DII rather than stubs.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run an example client for
-  //    a Cubit CORBA server.  All the complexity for initializing the
-  //    client is hidden in the class.  Just the run() interface is
-  //    needed.
 public:
   // = Constructor and destructor.
+  /// Constructor.
   DII_Cubit_Client (void);
-  // Constructor.
 
+  /// Destructor.
   ~DII_Cubit_Client (void);
-  // Destructor.
 
+  /// Initialize the ORB and gets the Cubit objref.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the ORB and gets the Cubit objref.
 
+  /// Execute client example code.
   int run (void);
-  // Execute client example code.
 
 private:
+  /// Gets objref through naming service.
   int init_naming_service (void);
-  // Gets objref through naming service.
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// Function to read the cubit factory IOR from a file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the cubit factory IOR from a file.
 
+  /// Prints the timing stats.
   void print_stats (const char *call_name,
                     ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
-  // Prints the timing stats.
 
   // = DII versions of Cubit operations:
 
@@ -93,54 +90,54 @@ private:
 
   // = Wrappers for cubing small and large sequences w/o args:
 
+  /// Wrapper for the mixin call, just to be neat.
   void cube_small_long_seq (void);
   void cube_large_long_seq (void);
   void cube_small_octet_seq (void);
   void cube_large_octet_seq (void);
   void cube_mixin (void);
-  // Wrapper for the mixin call, just to be neat.
 
+  /// Array of pointers to the operation functions.
   void (DII_Cubit_Client::*op_array_[NUMBER_OF_TESTS])(void);
-  // Array of pointers to the operation functions.
 
+  /// Array of labels for passing to print_stats.
   static const char *stats_messages_[];
-  // Array of labels for passing to print_stats.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// # of calls in test loop.
   CORBA::ULong loop_count_;
-  // # of calls in test loop.
 
+  /// Flag to tell server to exit.
   int shutdown_;
-  // Flag to tell server to exit.
 
+  /// Storage of the ORB reference.
   CORBA::ORB_var orb_var_;
-  // Storage of the ORB reference.
 
+  /// Storage of the Cubit_factory objref
   CORBA::Object_var factory_var_;
-  // Storage of the Cubit_factory objref
 
+  /// Storage of the Cubit objref.
   CORBA::Object_var obj_var_;
-  // Storage of the Cubit objref.
 
+  /// # of calls made to functions.
   CORBA::ULong call_count_;
-  // # of calls made to functions.
 
+  /// # of errors incurred in the lifetime of the application.
   CORBA::ULong error_count_;
-  // # of errors incurred in the lifetime of the application.
 
+  /// IOR of the factory used to make a Cubit object.
   ACE_CString factory_IOR_;
-  // IOR of the factory used to make a Cubit object.
 
+  /// File from which to obtain the IOR.
   FILE *cubit_factory_ior_file_;
-  // File from which to obtain the IOR.
 
+  /// File handle to read the IOR.
   ACE_HANDLE f_handle_;
-  // File handle to read the IOR.
 };
 
 // Constructor
diff --git a/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl b/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl
index 92b4d12154a..68ce2b6165b 100644
--- a/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl
+++ b/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl
@@ -149,9 +149,9 @@ interface Cubit
 
   void cube_rti_data (in RtiPacket input,
                       out RtiPacket output);
-  
+
   // A work around for problems with SHMIOP since this test uses
-  // this. 
+  // this.
   void ping ();
 };
 
diff --git a/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl b/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl
index 7fb96cdaf75..07761f56263 100755
--- a/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl
+++ b/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl
@@ -55,7 +55,7 @@ for (my $i = 0; $i <= $#ARGV; $i++) {
         $server_flags .= " -ORBgioplite ";
     }
     else {
-        print STDERR "ERROR: Unknown Option: ".$ARGV[$i]."\n";    
+        print STDERR "ERROR: Unknown Option: ".$ARGV[$i]."\n";
     }
 }
 
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index ff17f55bab5..b71c28d89de 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -15,10 +15,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (IDL_Cubit,
-           Cubit_Client,
-           "Cubit_Client.cpp,v 1.31 1999/08/04 07:15:14 nanbor Exp")
-
 #if defined (ACE_ENABLE_TIMEPROBES)
 
   static const char *Cubit_Client_Timeprobe_Description[] =
@@ -168,7 +164,7 @@ Cubit_Client::Cubit_Client (int shutdown)
 {
 }
 
-// Simple function that returns the substraction of 117 from the
+// Simple function that returns the subtraction of 117 from the
 // parameter.
 
 int
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
index 0c969d01ac9..8f5cebe215a 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
@@ -1,22 +1,20 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    Cubit_Client.h
-//
-// = DESCRIPTION
-//      This class implements a simple "cube" CORBA client for the Cubit
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//    Aniruddha Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Cubit_Client.h
+ *
+ *  $Id$
+ *
+ *    This class implements a simple "cube" CORBA client for the Cubit
+ *    example using stubs generated by the TAO ORB IDL compiler.
+ *
+ *
+ *  @author Aniruddha Gokhale
+ *  @author Sumedh Mungee
+ *  @author and Sergio Flores-Gaitan
+ */
+//=============================================================================
+
 
 #ifndef _CUBIT_CLIENT_H
 #define _CUBIT_CLIENT_H
@@ -31,147 +29,149 @@
 #include "tao/ORB_Constants.h"
 #include "cubitC.h"
 
+/**
+ * @class Cubit_Client
+ *
+ * @brief Defines a class that encapsulates behaviour of the Cubit client
+ * example.  Provides a better understanding of the logic in an
+ * object oriented way.
+ *
+ * This class declares an interface to run the example client for
+ * Cubit CORBA server.  All the complexity for initializing the
+ * server is hidden in the class.  Just the run() interface is needed.
+ */
 class Cubit_Client
 {
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the Cubit client
-  //    example.  Provides a better understanding of the logic in an
-  //    object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    Cubit CORBA server.  All the complexity for initializing the
-  //    server is hidden in the class.  Just the run() interface is needed.
 public:
   // = Constructor and destructor.
   Cubit_Client (int shutdown = 0);
 
   ~Cubit_Client (void);
 
+  /// Execute client example code.
   int run ();
-  // Execute client example code.
 
+  /// Initialize the client communication endpoint with server.
+  /// <collocation_test_ior> is used to pass in the ior file name.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the client communication endpoint with server.
-  // <collocation_test_ior> is used to pass in the ior file name.
 
 private:
+  /// Simple function that returns the subtraction of 117 from the
+  /// parameter.
   int func (u_int i);
-  // Simple function that returns the substraction of 117 from the
-  // parameter.
 
+  /// Function to read the cubit factory ior from a file.
   int read_ior (const ACE_TCHAR *filename);
-  // Function to read the cubit factory ior from a file.
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// Obtain the bit mask representation of the specified test
   u_int opt_to_mask (const ACE_TCHAR *opt);
-  // Obtain the bit mask representation of the specified test
 
+  /// Enable the specified test.
   void enable_test (u_int mask);
-  // Enable the specified test.
 
+  /// Disable the specified test.
   void disable_test (u_int mask);
-  // Disable the specified test.
 
+  /// Check if the specified test has been enabled.
   int check_enabled (u_int mask) const;
-  // Check if the specified test has been enabled.
 
+  /// Prints the time stats.
   void print_stats (const char *call_name,
                     ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
-  // Prints the time stats.
 
+  /// Exercise the union.  Cube a union.
   void cube_union (void);
-  // Exercise the union.  Cube a union.
 
+  /// calculate the cube from a struct.
   void cube_struct (int i);
-  // calculate the cube from a struct.
 
+  /// calculate the cube from a long.
   void cube_long (int i);
-  // calculate the cube from a long.
 
+  /// Oneway operation test.
   void cube_oneway (int i);
-  // Oneway operation test.
 
+  /// Twoway operation test.
   void cube_void (int i);
-  // Twoway operation test.
 
+  /// Cube an octet.
   void cube_octet (int i);
-  // Cube an octet.
 
+  /// Cube a short.
   void cube_short (int i);
-  // Cube a short.
 
+  /// Cube a sequence <l> is the length of the sequence.
   void cube_long_sequence (int i, int l);
-  // Cube a sequence <l> is the length of the sequence.
 
+  /// Cube a sequence of octets, <l> is the length of the sequence.
   void cube_octet_sequence (int i, int l);
-  // Cube a sequence of octets, <l> is the length of the sequence.
 
+  /// Cube a sequence of manys, <l> is the length of the sequence.
   void cube_many_sequence (int i, int l);
-  // Cube a sequence of manys, <l> is the length of the sequence.
 
+  /// Cube a sequence <l> is the length of the sequence.
   void cube_rti_data (int i, int numUpdates, int numAttrs);
-  // Cube a sequence <l> is the length of the sequence.
 
+  /// calculate the cube from a struct in an any.
   void cube_any_struct (int i);
-  // calculate the cube from a struct in an any.
 
+  /// calculate the cube from a long in an any.
   void cube_any (int i);
-  // calculate the cube from a long in an any.
 
+  /// Invoke the method with <do_shutdown> != 0 to shutdown the server.
   int shutdown_server (int do_shutdown);
-  // Invoke the method with <do_shutdown> != 0 to shutdown the server.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// Key of factory obj ref.
   ACE_TCHAR *cubit_factory_key_;
-  // Key of factory obj ref.
 
+  /// Number of times to do the cube operations.
   u_int loop_count_;
-  // Number of times to do the cube operations.
 
+  /// Flag to tell server to shutdown.
   int shutdown_;
-  // Flag to tell server to shutdown.
 
+  /// If set the test goes into quiet mode
   int quiet_;
-  // If set the test goes into quiet mode
 
+  /// Remember our orb, must show up before the other objects to
+  /// shutdown in the proper order.
   CORBA::ORB_var orb_;
-  // Remember our orb, must show up before the other objects to
-  // shutdown in the proper order.
 
+  /// factory pointer for cubit.
   Cubit_Factory_var factory_;
-  // factory pointer for cubit.
 
+  /// Cubit obj ref.
   Cubit_var cubit_;
-  // Cubit obj ref.
 
+  /// # of calls made to functions.
   u_int call_count_;
-  // # of calls made to functions.
 
+  /// # of errors incurred in the lifetime of the application.
   u_int error_count_;
-  // # of errors incurred in the lifetime of the application.
 
+  /// File from which to obtain the IOR.
   FILE *cubit_factory_ior_file_;
-  // File from which to obtain the IOR.
 
+  /// File handle to read the IOR.
   ACE_HANDLE f_handle_;
-  // File handle to read the IOR.
 
+  /// The number of bytes to send in the octet sequence test.
   u_int bytes_in_octet_sequence_;
-  // The number of bytes to send in the octet sequence test.
 
+  /// Bitset that determines which tests get run.
   u_int test_enable_bitset_;
-  // Bitset that determines which tests get run.
 
+  /// Bitset that determines which tests do not get run.
   u_int test_disable_bitset_;
-  // Bitset that determines which tests do not get run.
 };
 
 #endif /* _CUBIT_CLIENT_H */
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index 4ec1bf43590..e7d09d1577e 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -5,8 +5,6 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(IDL_Cubit, Cubit_Server, "$Id$")
-
 Cubit_Server::Cubit_Server (void)
   : ior_output_file_ (0),
     orb_manager_ (),
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h b/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
index 692283a8cea..37459496aef 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
@@ -1,22 +1,18 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    Cubit_Server.h
-//
-// = DESCRIPTION
-//      This class implements a simple "cube" CORBA server for the Cubit
-//      example using skeletons generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//    Nagarajan Surendran (naga@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Cubit_Server.h
+ *
+ *  $Id$
+ *
+ *    This class implements a simple "cube" CORBA server for the Cubit
+ *    example using skeletons generated by the TAO ORB IDL compiler.
+ *
+ *
+ *  @author Nagarajan Surendran (naga@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef _CUBIT_SERVER_H
 #define _CUBIT_SERVER_H
@@ -32,52 +28,54 @@
 #include "Cubit_Client.h"
 #include "Cubit_i.h"
 
+/**
+ * @class Cubit_Server
+ *
+ * @brief Defines a Cubit Server class that implements the functionality
+ * of a server process as an object.
+ *
+ * The interface is quite simple. A server program has to call
+ * init to initialize the cubit_server's state and then call run
+ * to run the orb.
+ */
 class Cubit_Server
 {
-  // = TITLE
-  //   Defines a Cubit Server class that implements the functionality
-  //   of a server process as an object.
-  //
-  // = DESCRIPTION
-  //   The interface is quite simple. A server program has to call
-  //   init to initialize the cubit_server's state and then call run
-  //   to run the orb.
 public:
   // = Initialization and termination methods.
+  /// Default constructor
   Cubit_Server (void);
-  // Default constructor
 
+  /// Destructor
   ~Cubit_Server (void);
-  // Destructor
 
+  /// Initialize the Cubit_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
-  // Initialize the Cubit_Server state - parsing arguments and ...
 
+  /// Run the orb
   int run (void);
-  // Run the orb
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// File to output the cubit factory IOR.
   FILE* ior_output_file_;
-  // File to output the cubit factory IOR.
 
+  /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
 
+  /// Implementation object of the cubit factory.
   Cubit_Factory_i *factory_impl_;
-  // Implementation object of the cubit factory.
 
+  /// Id of the factory.
   CORBA::String_var factory_id_;
-  // Id of the factory.
 
+  /// Number of commandline arguments.
   int argc_;
-  // Number of commandline arguments.
 
+  /// commandline arguments.
   ACE_TCHAR **argv_;
-  // commandline arguments.
 };
 
 #endif /* _CUBIT_SERVER_H */
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index ae8fce95a5b..37acb7c6821 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -1,17 +1,15 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    Cubit_i.cpp
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Cubit_i.cpp
+ *
+ *  $Id$
+ *
+ *  @author Andy Gokhale
+ *  @author Sumedh Mungee and Sergio Flores-Gaitan
+ */
+//=============================================================================
+
 
 #include "Cubit_Client.h"
 #include "Cubit_i.h"
@@ -23,10 +21,6 @@
 
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (IDL_Cubit,
-           Cubit_i,
-           "Cubit_i.cpp,v 1.8 1999/07/07 15:01:28 irfan Exp")
-
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *Cubit_i_Timeprobe_Description[] =
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
index 4de76ae2b4d..7b2083f6784 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    Cubit_Client.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Cubit_i.h
+ *
+ *  $Id$
+ *
+ *  @author Andy Gokhale
+ *  @author Sumedh Mungee and Sergio Flores-Gaitan
+ */
+//=============================================================================
 
 #ifndef _CUBIT_I_H
 #define _CUBIT_I_H
@@ -21,67 +18,69 @@
 // Forward declarations.
 class Cubit_i;
 
+/**
+ * @class Cubit_i
+ *
+ * @brief Illustrates how to integrate a servant with the generated
+ * skeleton.
+ *
+ * Implementation of the cubit example at the servant side.
+ * Cubes an octet, short, long, struct and union.
+ */
 class Cubit_i : public POA_Cubit
 {
-  // = TITLE
-  //    Illustrates how to integrate a servant with the generated
-  //    skeleton.
-  //
-  // = DESCRIPTION
-  //    Implementation of the cubit example at the servant side.
-  //    Cubes an octet, short, long, struct and union.
 public:
+  /// Constructor
   Cubit_i (CORBA::ORB_ptr orb);
-  // Constructor
 
+  /// Destructor
   ~Cubit_i (void);
-  // Destructor
 
+  /// Returns the default POA for this servant.
   virtual PortableServer::POA_ptr _default_POA (void);
-  // Returns the default POA for this servant.
 
+  /// Test a oneway call.
   virtual void cube_oneway (void);
-  // Test a oneway call.
 
+  /// Test a twoway call.
   virtual void cube_void (void);
-  // Test a twoway call.
 
+  /// Cube an octet
   virtual CORBA::Octet cube_octet (CORBA::Octet o);
-  // Cube an octet
 
+  /// Cube a short
   virtual CORBA::Short cube_short (CORBA::Short s);
-  // Cube a short
 
+  /// Cube a long
   virtual CORBA::Long cube_long (CORBA::Long l);
-  // Cube a long
 
+  /// Cube a struct.
   virtual Cubit::Many cube_struct (const Cubit::Many &values);
-  // Cube a struct.
 
+  /// Cube a union.
   virtual Cubit::oneof cube_union (const Cubit::oneof &values);
-  // Cube a union.
 
+  /// Cube a sequence.
   virtual void cube_long_sequence (const Cubit::long_seq &input,
                                    Cubit::long_seq_out output);
-  // Cube a sequence.
 
+  /// Cube an octet sequence.
   virtual void cube_octet_sequence (const Cubit::octet_seq &input,
                                     Cubit::octet_seq_out output);
-  // Cube an octet sequence.
 
+  /// Cube an Many sequence.
   virtual void cube_many_sequence (const Cubit::many_seq & input,
                                    Cubit::many_seq_out output);
-  // Cube an Many sequence.
 
+  /// Cube a sequence.
   virtual void cube_rti_data (const Cubit::RtiPacket &input,
                               Cubit::RtiPacket_out output);
-  // Cube a sequence.
 
+  /// Cube a long in an any
   virtual CORBA::Any * cube_any (const CORBA::Any & any);
-  // Cube a long in an any
 
+  /// Cube a struct in an any
   virtual CORBA::Any * cube_any_struct (const CORBA::Any & any);
-  // Cube a struct in an any
 
   /// Shutdown routine.
   virtual void shutdown (void);
@@ -91,32 +90,34 @@ public:
   virtual void ping (void);
 
 
+  /// Set default poa.
   void set_default_poa (PortableServer::POA_ptr poa);
-  // Set default poa.
 
 protected:
   PortableServer::POA_var poa_;
 
+  /// Keep a pointer to the ORB so we can shut it down.
   CORBA::ORB_var orb_;
-  // Keep a pointer to the ORB so we can shut it down.
 };
 
+/**
+ * @class Cubit_Factory_i:
+ *
+ * @brief Cubit_Factory_i
+ *
+ * Factory object returning the cubit objrefs
+ */
 class Cubit_Factory_i: public POA_Cubit_Factory
 {
-  // = TITLE
-  //   Cubit_Factory_i
-  //
-  // = DESCRIPTION
-  //   Factory object returning the cubit objrefs
 public:
+  /// Constructor.
   Cubit_Factory_i (CORBA::ORB_ptr orb);
-  // Constructor.
 
+  /// Destructor.
   ~Cubit_Factory_i (void);
-  // Destructor.
 
+  /// Make a cubit object.
   virtual Cubit_ptr make_cubit (void);
-  // Make a cubit object.
 
   void set_default_poa (PortableServer::POA_ptr poa);
 
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit_Client.java b/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit_Client.java
index eecd5e3a51d..e4d08144069 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit_Client.java
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit_Client.java
@@ -1,7 +1,7 @@
 // $Id$
 //
 // ============================================================================
-// 
+//
 // = FILENAME
 //    IDL_Cubit_Client.java
 //
@@ -19,41 +19,41 @@
 
 public class IDL_Cubit_Client
 {
-  
+
   private org.omg.CORBA.ORB orb_;
   private org.omg.CORBA.Object naming_service_object_;
 
   public void init (String[] args)
     {
-      try {      
-	
+      try {
+
 	orb_ = org.omg.CORBA.ORB.init (args, null);
-		
+
 	// Get the Naming Service initial reference
 
 	System.out.println ("Using the lookup protocol!");
 	NS_Resolve ns_resolve = new NS_Resolve ();
 	naming_service_object_ = ns_resolve.resolve_name_service (orb_);
-	
-      } 
+
+      }
       catch(org.omg.CORBA.SystemException e) {
 	System.err.println ("PushConsumerFactory constructor: ORB and Name Service initialization");
 	System.err.println(e);
-      }	
-      
+      }
+
     }
-  
-  
+
+
   public void run ()
     {
       try
 	{
-	  
+
 	  // Get the Naming Context to allow resolving the EventService and
 	  // ScheduleService
-	  CosNaming.NamingContext naming_context = 
+	  CosNaming.NamingContext naming_context =
 	    CosNaming.NamingContextHelper.narrow (naming_service_object_);
-	  
+
 	  if (naming_context == null)
 	    {
 	      System.err.println ("The Naming Context is null");
@@ -65,21 +65,21 @@ public class IDL_Cubit_Client
 	  cubit_factory_name[0] = new CosNaming.NameComponent ("IDL_Cubit","");
 	  cubit_factory_name[1] = new CosNaming.NameComponent ("cubit_factory","");
 	  org.omg.CORBA.Object factory_obj = naming_context.resolve (cubit_factory_name);
-	  
+
 	  if (factory_obj == null)
 	    {
 	      System.err.println ("Factory object is nil!");
 	      return;
 	    }
-	  
+
        	  Cubit_Factory cubit_Factory = Cubit_FactoryHelper.narrow (factory_obj);
-	  
+
 	  Cubit cubit = cubit_Factory.make_cubit ("key0");
 
 	  short x = 4;
-	  
-	  System.out.println ("The call cube_short (4) results in: " +cubit.cube_short (x));	  
-	  
+
+	  System.out.println ("The call cube_short (4) results in: " +cubit.cube_short (x));
+
 	}
       catch (CosNaming.NamingContextPackage.CannotProceed e)
 	{
@@ -94,22 +94,22 @@ public class IDL_Cubit_Client
       catch (CosNaming.NamingContextPackage.NotFound e)
 	{
 	  System.err.println ("CosNaming.NamingContextPackage.NotFound");
-	  System.err.println (e);	
+	  System.err.println (e);
 	}
-      catch(org.omg.CORBA.SystemException e) 
+      catch(org.omg.CORBA.SystemException e)
 	{
 	  System.err.println ("PushConsumerFactory.run: Failure");
 	  System.err.println(e);
-	}	
-    }    
+	}
+    }
+
+  public static void main (String[] args) {
 
-  public static void main (String[] args) {      
-    
     IDL_Cubit_Client cubit_Client = new IDL_Cubit_Client ();
     cubit_Client.init (args);
-    
+
     cubit_Client.run ();
-  }  
+  }
 
 
 } // public class IDL_Cubit_Client
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am b/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am
deleted file mode 100644
index b54f4af8bf5..00000000000
--- a/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am
+++ /dev/null
@@ -1,165 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.IDL_Cubit_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  cubitC.cpp \
-  cubitC.h \
-  cubitC.inl \
-  cubitS.cpp \
-  cubitS.h \
-  cubitS.inl
-
-CLEANFILES = \
-  cubit-stamp \
-  cubitC.cpp \
-  cubitC.h \
-  cubitC.inl \
-  cubitS.cpp \
-  cubitS.h \
-  cubitS.inl
-
-cubitC.cpp cubitC.h cubitC.inl cubitS.cpp cubitS.h cubitS.inl: cubit-stamp
-
-cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Gd $(srcdir)/cubit.idl
-	@touch $@
-
-noinst_HEADERS = \
-  cubit.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.IDL_Cubit_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Cubit_Client.cpp \
-  RTI_IO.cpp \
-  client.cpp \
-  cubitC.cpp \
-  Cubit_Client.h \
-  RTI_IO.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.IDL_Cubit_Collocation.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += collocation_test
-
-collocation_test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-collocation_test_SOURCES = \
-  Cubit_Client.cpp \
-  Cubit_Server.cpp \
-  Cubit_i.cpp \
-  RTI_IO.cpp \
-  collocation_test.cpp \
-  cubitC.cpp \
-  cubitS.cpp \
-  Cubit_Client.h \
-  Cubit_Server.h \
-  Cubit_i.h \
-  RTI_IO.h
-
-collocation_test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.IDL_Cubit_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Cubit_Client.cpp \
-  Cubit_Server.cpp \
-  Cubit_i.cpp \
-  RTI_IO.cpp \
-  cubitC.cpp \
-  cubitS.cpp \
-  server.cpp \
-  Cubit_Client.h \
-  Cubit_Server.h \
-  Cubit_i.h \
-  RTI_IO.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.h b/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.h
index 31b2ca800f0..f35a834746a 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.h
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.h
@@ -1,17 +1,14 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    RTI_IO.h
-//
-// = AUTHOR
-//    Dave Meyer <dmeyer@std.saic.com>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    RTI_IO.h
+ *
+ *  $Id$
+ *
+ *  @author Dave Meyer <dmeyer@std.saic.com>
+ */
+//=============================================================================
+
 
 #ifndef _RTIFUNCS_H
 #define _RTIFUNCS_H
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/benchmark.sh b/performance-tests/Cubit/TAO/IDL_Cubit/benchmark.sh
index 7cebd21319c..eede6124534 100755
--- a/performance-tests/Cubit/TAO/IDL_Cubit/benchmark.sh
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/benchmark.sh
@@ -10,11 +10,11 @@
 
 set -e
 
-for protocol in iiop uiop; do 
+for protocol in iiop uiop; do
    for test in void octet short long struct union \
                small_octet_seq small_long_seq small_struct_seq \
                large_octet_seq large_long_seq large_struct_seq \
-               mixin rti_data one_way; do 
+               mixin rti_data one_way; do
 	echo "Running IDL_Cubit $test test for $protocol..."
 	./server -f ior -ORBEndpoint $protocol:// \
 		> $test.$protocol.server 2>&1 &
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp b/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
index c97412958cf..63c45a894d5 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
@@ -14,8 +14,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(IDL_Cubit, client, "$Id$")
-
 // This function runs the client test.
 
 int
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf b/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
index 6e5455e2499..ec5eb31b91b 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
@@ -3,5 +3,5 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 static Advanced_Resource_Factory "-ORBReactorType select_st -ORBConnectionCacheLock null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST" 
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null"
+static Client_Strategy_Factory "-ORBClientConnectionHandler ST"
+static Server_Strategy_Factory "-ORBConcurrency reactive"
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml b/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml
index 728b156ecc0..163ec651984 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml
@@ -6,6 +6,6 @@
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler ST"/>
- <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive -ORBPOALock null"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler ST"/>
+ <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
index bef493d86f0..4b7fb83344c 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -11,8 +11,6 @@
 #include "ace/Thread_Manager.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(IDL_Cubit, collocation_test, "$Id$")
-
 #define  THE_IOR ACE_TEXT("theior")
 
 struct Barriers
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl b/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl
index 92b4d12154a..68ce2b6165b 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl
@@ -149,9 +149,9 @@ interface Cubit
 
   void cube_rti_data (in RtiPacket input,
                       out RtiPacket output);
-  
+
   // A work around for problems with SHMIOP since this test uses
-  // this. 
+  // this.
   void ping ();
 };
 
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl b/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
index 4b43bc84400..e7c0f004f10 100755
--- a/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
@@ -36,6 +36,7 @@ $client->DeleteFile($iorbase);
 $client_flags = "";
 $server_flags = "";
 $quiet_flag = " -q ";
+$shmiop = 1;
 
 ###############################################################################
 # Parse the arguments
@@ -48,6 +49,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
         print "-n num              -- client uses <num> iterations\n";
         print "-debug              -- sets the debug flag for both client and "
                                       . "server\n";
+        print "-noshmiop           -- don't run SHMIOP test\n";
         exit;
     }
     elsif ($ARGV[$i] eq "-debug") {
@@ -61,6 +63,9 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     elsif ($ARGV[$i] eq "-verbose") {
         $quiet_flag = "";
     }
+    elsif ($ARGV[$i] eq "-noshmiop") {
+        $shmiop = 0;
+    }
     else {
         print STDERR "ERROR: Unknown Option: ".$ARGV[$i]."\n";
     }
@@ -142,12 +147,14 @@ if ($OSNAME ne "MSWin32" && $OSNAME ne "VMS") {
     run_test_helper ();
 }
 
-print STDERR "============================================================\n";
-print STDERR "Running IDL_Cubit with the SHMIOP protocol.\n\n";
+if ($shmiop) {
+    print STDERR "============================================================\n";
+    print STDERR "Running IDL_Cubit with the SHMIOP protocol.\n\n";
 
-$SV->Arguments ("$server_stdarg -ORBEndpoint shmiop:// -ORBSvcconf $server_shmiop_conf ");
+    $SV->Arguments ("$server_stdarg -ORBEndpoint shmiop:// -ORBSvcconf $server_shmiop_conf ");
 
-run_test_helper ();
+    run_test_helper ();
+}
 
 # Clean up SHMIOP files
 PerlACE::check_n_cleanup_files ("server_shmiop_*");
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
index caafb40c1cb..5d753a50db8 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -19,8 +19,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(IDL_Cubit, server, "$Id$")
-
 // This runs the server test.
 
 int
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf b/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
index 2aa568bf9af..eb5b4dd1e30 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
@@ -4,6 +4,6 @@
 #
 
 static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock thread -ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"
 
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml b/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml
index 239410f8b86..60269f5dee6 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml
@@ -6,6 +6,6 @@
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
- <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBPOALock thread -ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf b/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
index 56478215e3d..f96d9a39f74 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
@@ -4,4 +4,4 @@
 #
 
 static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW" 
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml b/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml
index cfde325a4c0..e26cbd04d3d 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml
@@ -6,5 +6,5 @@
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf b/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf
index 7482152738d..e406f816f5d 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf
@@ -4,4 +4,4 @@
 #
 
 static Advanced_Resource_Factory "-ORBReactorType select_st  -ORBInputCDRAllocator null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml b/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml
index c76b951b729..32ae378187c 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml
@@ -6,5 +6,5 @@
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st  -ORBInputCDRAllocator null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf b/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
index d3d195dabce..2de29f90f01 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
@@ -8,5 +8,5 @@
 #
 
 static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"
diff --git a/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml b/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml
index b876d3df416..20e85bd18d2 100644
--- a/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml
+++ b/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml
@@ -10,6 +10,6 @@
  <!--  the only problems are on shutdown. -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
- <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h b/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
index 88ca93c90a5..60e75e00e3a 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
+++ b/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
@@ -1,18 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    Cubit_Task.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee,Sergio Flores-Gaitan and Nagarajan Surendran.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Cubit_Task.h
+ *
+ *  $Id$
+ *
+ *  @author Andy Gokhale
+ *  @author Sumedh Mungee
+ *  @author Sergio Flores-Gaitan and Nagarajan Surendran.
+ */
+//=============================================================================
+
 
 #ifndef MT_CUBIT_TASK_H
 #define MT_CUBIT_TASK_H
@@ -28,61 +27,64 @@
 #include "cubit_i.h"
 #include "Globals.h"
 
+/**
+ * @class Cubit_Task
+ *
+ * @brief Encapsulates an ORB for the Cubit application.
+ */
 class Cubit_Task : public ACE_Task<ACE_SYNCH>
 {
-  // = TITLE
-  //    Encapsulates an ORB for the Cubit application.
 public:
+  /// Constructor.
   Cubit_Task (const ACE_TCHAR *args,
               const char* orbname,
               u_int num_of_objs,
               ACE_Thread_Manager *thr_mgr,
               u_int task_id);
-  // Constructor.
 
+  /// Active Object entry point.
   virtual int svc (void);
-  // Active Object entry point.
 
+  /// Gets the ior of the cubit servant in this task.
   char* get_servant_ior (u_int index);
-  // Gets the ior of the cubit servant in this task.
 
 protected:
+  /// No-op constructor.
   Cubit_Task (void);
-  // No-op constructor.
 
 private:
+  /// Initialize the ORB, and POA.
   int initialize_orb (void);
-  // Initialize the ORB, and POA.
 
+  /// Create the servants.
   int create_servants (void);
-  // Create the servants.
 
+  /// All cubit objects will have this as prefix to its key.
   const char *key_;
-  // All cubit objects will have this as prefix to its key.
 
+  /// Name of the ORB.
   const char *orbname_;
-  // Name of the ORB.
 
+  /// ORB arguments.
   const ACE_TCHAR *orbargs_;
-  // ORB arguments.
 
+  /// Number of objects we're managing.
   u_int num_of_objs_;
-  // Number of objects we're managing.
 
+  /// Pointer to the ORB
   CORBA::ORB_var orb_;
-  // Pointer to the ORB
 
+  /// Array to hold the servants.
   Cubit_i **servants_;
-  // Array to hold the servants.
 
+  /// IOR strings of the servants.
   char **servants_iors_;
-  // IOR strings of the servants.
 
+  /// ID used for naming service object name.
   u_int task_id_;
-  // ID used for naming service object name.
 
+  /// The TAO ORB Manager.
   TAO_ORB_Manager orb_manager_;
-  // The TAO ORB Manager.
 };
 
 #endif /* MT_CUBIT_TASK_H */
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
index 63b5a7940ad..21b99dcb31e 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
+++ b/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
@@ -1,25 +1,22 @@
 // -*- C++ -*-
-// $Id$
 
 #ifndef GLOBALS_H
 #define GLOBALS_H
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    Globals.h
-//
-// = DESCRIPTION
-//    All the globally defined classes, functions, types, and #defines
-//    are centralized here.
-//
-// = AUTHOR
-//    Nagarajan Surendran <naga@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Globals.h
+ *
+ *  $Id$
+ *
+ *  All the globally defined classes, functions, types, and #defines
+ *  are centralized here.
+ *
+ *
+ *  @author Nagarajan Surendran <naga@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "ace/config-all.h"
 
@@ -62,15 +59,6 @@ ACE_Sched_Params::priority_max(ACE_SCHED_FIFO,ACE_SCOPE_THREAD)
 ACE_THR_PRI_FIFO_DEF + 25
 #endif /* ! __Lynx__ */
 
-#if defined (CHORUS_MVME)
-#define PCCTIMER_INIT {int pTime;/*Initialize the PCC timer chip */pccTimerInit ();\
-if (pccTimer (PCC2_TIMER1_START, &pTime) != K_OK)\
-ACE_DEBUG ((LM_DEBUG,"pccTimer has a pending benchmark\n"));\
-}
-#else /* !CHORUS_MVME */
-#define PCCTIMER_INIT
-#endif /* !CHORUS_MVME */
-
 #if defined (VXWORKS) && defined (FORCE_ARGS)
 static char *force_argv[]=
 {
@@ -108,112 +96,120 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class Globals
+ *
+ * @brief Globals class to be used as a singleton.
+ *
+ * This is used both by the server and client.
+ */
 class Globals
 {
-  // = TITLE
-  //     Globals class to be used as a singleton.
-  //
-  // = DESCRIPTION
-  //     This is used both by the server and client.
 public:
+  /// default constructor.
   Globals (void);
-  // default constructor.
 
+  /// parse the arguments.
   int parse_args (int argc, ACE_TCHAR **argv);
-  // parse the arguments.
 
+  /**
+   * Enables fifo scheduling eg., RT scheduling class on solaris.
+   * Returns 0 on success, 1 if insufficient permission, or -1
+   * for other failure.  As a side effect, sets thr_create_flags
+   * appropriately.
+   */
   static int sched_fifo_init (void);
-  // Enables fifo scheduling eg., RT scheduling class on solaris.
-  // Returns 0 on success, 1 if insufficient permission, or -1
-  // for other failure.  As a side effect, sets thr_create_flags
-  // appropriately.
 
+  /// Thread creation flags.  Must call sched_fifo_init () before
+  /// accessing.
   long thr_create_flags;
-  // Thread creation flags.  Must call sched_fifo_init () before
-  // accessing.
 
+  /// Default thread priority, used for the high thread priority.
+  /// Must call sched_fifo_init () before accessing.
   int default_priority;
-  // Default thread priority, used for the high thread priority.
-  // Must call sched_fifo_init () before accessing.
 
+  /// endpoint to be used for ORB_init.
   ACE_TCHAR endpoint[BUFSIZ];
-  // endpoint to be used for ORB_init.
 
+  /// file name to read/write the iors of the servants.
   ACE_TCHAR *ior_file;
-  // file name to read/write the iors of the servants.
 
+  /// number of objects per servant thread.
   u_int num_of_objs;
-  // number of objects per servant thread.
 
+  ///  thread_per_rate test flag.
   u_int thread_per_rate;
-  //  thread_per_rate test flag.
 
+  /// flag to use multiple priorities for the low priority servants
+  /// instead of one priority.
   u_int use_multiple_priority;
-  // flag to use multiple priorities for the low priority servants
-  // instead of one priority.
 
+  /// ready flag used by the high priority thread to wake up the low
+  /// priority threads after it's parsed the arguments.
   int ready_;
-  // ready flag used by the high priority thread to wake up the low
-  // priority threads after it's parsed the arguments.
 
+  /// mutex for the condition variable.
   TAO_SYNCH_MUTEX ready_mtx_;
-  // mutex for the condition variable.
 
+  /// condition variable for the low priority threads to wait
+  ///until the high priority thread is done with the arguments parsing.
   TAO_SYNCH_CONDITION ready_cnd_;
-  // condition variable for the low priority threads to wait
-  //until the high priority thread is done with the arguments parsing.
 
+  /// Barrier for the multiple servants to synchronize after binding to
+  /// the orb.
   ACE_Barrier *barrier_;
-  // Barrier for the multiple servants to synchronize after binding to
-  // the orb.
 };
 
 // Make the globals a Singleton.
 typedef ACE_Singleton<Globals,ACE_Null_Mutex> GLOBALS;
 
+/**
+ * @class MT_Priority
+ *
+ * @brief Helper class to find high and low priorities for the
+ * MT_Cubit application over multiple platforms.
+ *
+ * This class has 2 methods, one for the high priority and the
+ * other for low priority.If the flag use_multiple_priority is
+ * passed then multiple priorities are used for the low priority
+ * threads.
+ */
 class MT_Priority
 {
-  // = TITLE
-  //     Helper class to find high and low priorities for the
-  //     MT_Cubit application over multiple platforms.
-  //
-  // = DESCRIPTION
-  //     This class has 2 methods, one for the high priority and the
-  //     other for low priority.If the flag use_multiple_priority is
-  //     passed then multiple priorities are used for the low priority
-  //     threads.
 
 public:
+  /// constructor.
   MT_Priority (void);
-  // constructor.
 
   /// Destructor.
   virtual ~MT_Priority (void);
 
+  /// Sets the priority of the high priority thread.
   virtual ACE_Sched_Priority get_high_priority (void);
-  // Sets the priority of the high priority thread.
 
+  /// Sets the priority to be used for the low priority thread.
   virtual ACE_Sched_Priority get_low_priority
     (u_int num_low_priority,
      ACE_Sched_Priority prev_priority,
      u_int use_multiple_priority);
-  // Sets the priority to be used for the low priority thread.
 
+  /// Accessor for num_priorities_.
   u_int number_of_priorities (void);
-  // Accessor for num_priorities_.
 
+  /// Accessor for grain_.
   u_int grain (void);
-  // Accessor for grain_.
 
 protected:
+  /// Number of priorities used.
   u_int num_priorities_;
-  // Number of priorities used.
 
+  /**
+   * Granularity of the assignment of the priorities.  Some OSs have
+   * fewer levels of priorities than we have threads in our test, so
+   * with this mechanism we assign priorities to groups of threads
+   * when there are more threads than priorities.
+   */
   u_int grain_;
-  // Granularity of the assignment of the priorities.  Some OSs have
-  // fewer levels of priorities than we have threads in our test, so
-  // with this mechanism we assign priorities to groups of threads
-  // when there are more threads than priorities.
 };
 
 #endif /* GLOBALS_H */
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am b/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am
deleted file mode 100644
index 0823e5e9b11..00000000000
--- a/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am
+++ /dev/null
@@ -1,141 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_Cubit_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  cubitC.cpp \
-  cubitC.h \
-  cubitC.inl \
-  cubitS.cpp \
-  cubitS.h \
-  cubitS.inl
-
-CLEANFILES = \
-  cubit-stamp \
-  cubitC.cpp \
-  cubitC.h \
-  cubitC.inl \
-  cubitS.cpp \
-  cubitS.h \
-  cubitS.inl
-
-cubitC.cpp cubitC.h cubitC.inl cubitS.cpp cubitS.h cubitS.inl: cubit-stamp
-
-cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/cubit.idl
-	@touch $@
-
-noinst_HEADERS = \
-  cubit.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MT_Cubit_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Cubit_Task.cpp \
-  Globals.cpp \
-  Task_Client.cpp \
-  Timer.cpp \
-  Util_Thread.cpp \
-  client.cpp \
-  cubitC.cpp \
-  cubitS.cpp \
-  cubit_i.cpp \
-  Cubit_Task.h \
-  Globals.h \
-  Task_Client.h \
-  Timer.h \
-  Util_Thread.h \
-  client.h \
-  cubit_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.MT_Cubit_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Cubit_Task.cpp \
-  Globals.cpp \
-  Timer.cpp \
-  cubitC.cpp \
-  cubitS.cpp \
-  cubit_i.cpp \
-  server.cpp \
-  Cubit_Task.h \
-  Globals.h \
-  Timer.h \
-  cubit_i.h \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 1c210efa808..83217ea1f52 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -19,8 +19,6 @@ ACE_round (ACE_timer_t t)
   return static_cast<ACE_UINT32> (t);
 }
 
-ACE_RCSID(MT_Cubit, Task_Client, "$Id$")
-
 Task_State::Task_State (void)
   : barrier_ (0),
     key_ ("Cubit"),
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index 8efc5a79efd..0fd4f3fc865 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -1,19 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    Task_Client.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee, Sergio Flores-Gaitan, and
-//    Nagarajan Surendran.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Task_Client.h
+ *
+ *  $Id$
+ *
+ *  @author Andy Gokhale
+ *  @author Sumedh Mungee
+ *  @author Sergio Flores-Gaitan
+ *  @author and Nagarajan Surendran.
+ */
+//=============================================================================
+
 
 #ifndef TASK_CLIENT_H
 #define TASK_CLIENT_H
@@ -38,14 +37,9 @@
 #include "Globals.h"
 #include "Timer.h"
 
-#if defined (CHORUS_MVME)
-# include "pccTimer.h"
-#endif /* CHORUS_MVME */
-
 // FUZZ: disable check_for_math_include
-#if defined(ACE_HAS_EXCEPTIONS) && !defined (__KCC) && !defined (__xlC__) && \
-    (!defined __GNUG__ || !defined (DIGITAL_UNIX))
-  // Some plaforms define an exception structure in math.h...
+#if !defined (__xlC__)
+    // Some plaforms define an exception structure in math.h...
 # if defined (__GNUG__)
     // And some compilers have this workaround.  Disable it with this
     // #define, to avoid warning about multiple #defines of exception.
@@ -56,7 +50,7 @@
 # undef exception
 #else
 # include /**/ <math.h>
-#endif /* ACE_HAS_EXCEPTIONS */
+#endif
 
 #if defined (ACE_HAS_QUANTIFY)
 # define START_QUANTIFY quantify_start_recording_data ();
@@ -95,267 +89,281 @@ enum Cubit_Datatypes
 typedef ACE_Unbounded_Queue<ACE_timer_t> JITTER_ARRAY;
 typedef ACE_Unbounded_Queue_Iterator<ACE_timer_t> JITTER_ARRAY_ITERATOR;
 
+/**
+ * @class Task_State
+ *
+ * @brief Maintains state common to multiple Cubit clients.
+ *
+ * This class maintains state which is common to the potentially
+ * multiple concurrent clients.
+ */
 class Task_State
 {
-  // = TITLE
-  //     Maintains state common to multiple Cubit clients.
-  //
-  // = DESCRIPTION
-  //     This class maintains state which is common to the potentially
-  //     multiple concurrent clients.
 public:
+  /// Constructor.
   Task_State (void);
-  // Constructor.
 
+  /// parses the arguments with the provided argc and argv.
   int parse_args (int argc,ACE_TCHAR **argv);
-  // parses the arguments with the provided argc and argv.
 
+  /// Destructor
   ~Task_State (void);
-  // Destructor
 
+  /// Barrier for the multiple clients to synchronize after binding to
+  /// the servants.
   ACE_Barrier *barrier_;
-  // Barrier for the multiple clients to synchronize after binding to
-  // the servants.
 
+  /// All cubit objects will have this as prefix to its key.
   const char *key_;
-  // All cubit objects will have this as prefix to its key.
 
+  /// Number of times to loop, making calls.
   u_int loop_count_;
-  // Number of times to loop, making calls.
 
+  /// Number of concurrent clients to create.
   u_int thread_count_;
-  // Number of concurrent clients to create.
 
+  /// Array to store the latency for every client, indexed by
+  /// thread-id.
   ACE_timer_t *latency_;
-  // Array to store the latency for every client, indexed by
-  // thread-id.
 
+  /// Int array to store the latencies.
   int *ave_latency_;
-  // Int array to store the latencies.
 
+  /// Which datatype to use to make the calls.
   Cubit_Datatypes datatype_;
-  // Which datatype to use to make the calls.
 
+  /// Lock to protect access to this object.
   TAO_SYNCH_MUTEX lock_;
-  // Lock to protect access to this object.
 
+  /// Flag for the thread_per_rate test.
   u_int thread_per_rate_;
-  // Flag for the thread_per_rate test.
 
+  /// This array stores the latency seen by each client for each
+  /// request, to be used later to compute jitter.
   JITTER_ARRAY **global_jitter_array_;
-  // This array stores the latency seen by each client for each
-  // request, to be used later to compute jitter.
 
+  /// This array stores the call count of each thread.  They will not
+  /// always have the same call count.
   u_int *count_;
-  // This array stores the call count of each thread.  They will not
-  // always have the same call count.
 
+  /// Flag that indicates if we are going to call the shutdown methos
+  /// for the servant.
   u_int shutdown_;
-  // Flag that indicates if we are going to call the shutdown methos
-  // for the servant.
 
+  /// Flag that indicates if we are going to use oneway calls instead
+  /// of two-way.
   u_int oneway_;
-  // Flag that indicates if we are going to use oneway calls instead
-  // of two-way.
 
+  /// Ior array used if utilization test is run.
   char *one_ior_;
-  // Ior array used if utilization test is run.
 
+  /// indicates whether we are running the "1 to n" test, which has 1
+  /// low priority servant and n low priority clients.
   u_int one_to_n_test_;
-  // indicates whether we are running the "1 to n" test, which has 1
-  // low priority servant and n low priority clients.
 
+  /// flag to run context switch test
   u_int context_switch_test_;
-  // flag to run context switch test
 
+  /// Array of pointers used to hold the ior strings read from the ior file
+  /// that the server created.
   char **iors_;
-  // Array of pointers used to hold the ior strings read from the ior file
-  // that the server created.
 
+  /// count on the number of iors
   int iors_count_;
-  // count on the number of iors
 
+  /// Name of the filename that the server used to store the iors.
   ACE_TCHAR *ior_file_;
-  // Name of the filename that the server used to store the iors.
 
+  /**
+   * this is the granularity of the timing of the CORBA requests. A
+   * value of 5 represents that we will take time every 5 requests,
+   * instead of the default of every request (1).
+   */
   u_int granularity_;
-  // this is the granularity of the timing of the CORBA requests. A
-  // value of 5 represents that we will take time every 5 requests,
-  // instead of the default of every request (1).
 
+  /**
+   * flag to indicate we are to use the utilization test.  By default
+   * we do not use it, because it can cause starvation with real-time
+   * threads
+   */
   u_int use_utilization_test_;
-  // flag to indicate we are to use the utilization test.  By default
-  // we do not use it, because it can cause starvation with real-time
-  // threads
 
+  /**
+   * Number of times the high priority looped.  We are going to loop
+   * as long as there is low priority clients running, so as to
+   * maintain high priority traffic as long as low priority traffic is
+   * going through.
+   */
   u_int high_priority_loop_count_;
-  // Number of times the high priority looped.  We are going to loop
-  // as long as there is low priority clients running, so as to
-  // maintain high priority traffic as long as low priority traffic is
-  // going through.
 
+  /**
+   * semaphore in order for the high priority client to keep running
+   * as long as the low priority clients are running.  See explanation
+   * of "high_priority_loop_count_" member in this class.
+   */
   ACE_SYNCH_SEMAPHORE *semaphore_;
-  // semaphore in order for the high priority client to keep running
-  // as long as the low priority clients are running.  See explanation
-  // of "high_priority_loop_count_" member in this class.
 
+  /**
+   * flag to indicate we are to use multiple priorities for the low
+   * priority clients.  By default we use only one priority for all
+   * client threads.
+   */
   u_int use_multiple_priority_;
-  // flag to indicate we are to use multiple priorities for the low
-  // priority clients.  By default we use only one priority for all
-  // client threads.
 
+  /// global timer to be started by the utilization task.
   ACE_High_Res_Timer timer_;
-  // global timer to be started by the utilization task.
 
+  /// ready flag used by the high priority thread to wake up the low
+  /// priority threads after it's parsed the arguments.
   int ready_;
-  // ready flag used by the high priority thread to wake up the low
-  // priority threads after it's parsed the arguments.
 
+  /// mutex for the condition variable.
   TAO_SYNCH_MUTEX ready_mtx_;
-  // mutex for the condition variable.
 
+  /// condition variable for the low priority threads to wait
+  ///until the high priority thread is done with the arguments parsing.
   TAO_SYNCH_CONDITION ready_cnd_;
-  // condition variable for the low priority threads to wait
-  //until the high priority thread is done with the arguments parsing.
 
+  /// flag to indicate whether we make remote versus local invocations
+  /// to calculate accurately the ORB overhead.
   u_int remote_invocations_;
-  // flag to indicate whether we make remote versus local invocations
-  // to calculate accurately the ORB overhead.
 
+  /// holds the total time for the utilization test to complete.
   ACE_timer_t util_test_time_;
-  // holds the total time for the utilization test to complete.
 };
 
+/**
+ * @class Client
+ *
+ * @brief The Cubit client.
+ *
+ * This class implements the Cubit Client, which is an active object.
+ * `n' threads execute svc, and make 2way CORBA calls on the server
+ */
 class Client : public ACE_Task<ACE_SYNCH>
 {
-  // = TITLE
-  //     The Cubit client.
-  //
-  // = DESCRIPTION
-  //     This class implements the Cubit Client, which is an active object.
-  //     `n' threads execute svc, and make 2way CORBA calls on the server
 public:
+  /// Constructor, with a pointer to the common task state.
   Client (ACE_Thread_Manager *,
           Task_State *ts,
           int argc,
           ACE_TCHAR **argv,
           u_int id);
-  // Constructor, with a pointer to the common task state.
 
+  /// destructor.
   ~Client (void);
-  // destructor.
 
+  /// The thread function.
   virtual int svc (void);
-  // The thread function.
 
+  /// Returns the latency of the high priority thread in usecs.
   ACE_timer_t get_high_priority_latency (void);
-  // Returns the latency of the high priority thread in usecs.
 
+  /// Returns the average latency found for the low
+  /// priority threads in usecs.
   ACE_timer_t get_low_priority_latency (void);
-  // Returns the average latency found for the low
-  // priority threads in usecs.
 
+  /// Returns the high priority jitter in usecs.
   ACE_timer_t get_high_priority_jitter (void);
-  // Returns the high priority jitter in usecs.
 
+  /// Returns the jitter for all the low priority
+  /// thread request in usecs.
   ACE_timer_t get_low_priority_jitter (void);
-  // Returns the jitter for all the low priority
-  // thread request in usecs.
 
+  /// gets the average latency for that thread.
   ACE_timer_t get_latency (u_int thread_id);
-  // gets the average latency for that thread.
 
+  /// gets the jitter for this thread.
   ACE_timer_t get_jitter (u_int id);
-  // gets the jitter for this thread.
 
+  /// Arbitrary generator used by the client to create the numbers to be
+  /// cubed.
   static int func (u_int i);
-  // Arbitrary generator used by the client to create the numbers to be
-  // cubed.
 
 private:
+  /// initialize the ORB.
   CORBA::ORB_ptr init_orb (void);
-  // initialize the ORB.
 
+  /// reads the cubit ior from a file.
   void read_ior (void);
-  // reads the cubit ior from a file.
 
+  /// gets the cubit object.
   int get_cubit (CORBA::ORB_ptr orb);
-  // gets the cubit object.
 
+  /// Run the various tests.
   int run_tests (void);
-  // Run the various tests.
 
+  /// make a CORBA request depending on the datatype.
   int make_request (void);
-  // make a CORBA request depending on the datatype.
 
+  /// makes the corba requests.
   int do_test (void);
-  // makes the corba requests.
 
+  /// call cube_octet method on the cubit object.
   int cube_octet (void);
-  // call cube_octet method on the cubit object.
 
+  /// call cube short on the cubit object.
   int cube_short (void);
-  // call cube short on the cubit object.
 
+  /// call cube long on the cubit object.
   int cube_long (void);
-  // call cube long on the cubit object.
 
+  /// call cube struct on the cubit object.
   int cube_struct (void);
-  // call cube struct on the cubit object.
 
+  /// prints the latency stats.
   void print_stats (void);
-  // prints the latency stats.
 
+  /// Records the latencies in the <Task_State>.
   void put_latency (JITTER_ARRAY *jitter,
                     ACE_timer_t latency,
                     u_int thread_id,
                     u_int count);
-  // Records the latencies in the <Task_State>.
 
+  /// Parses the arguments.
   int parse_args (int, char **);
-  // Parses the arguments.
 
+  /// determines the frequency at which to make calls depending on the
+  /// id of the thread.
   void find_frequency (void);
-  // determines the frequency at which to make calls depending on the
-  // id of the thread.
 
+  /// calculate the delta value.
   ACE_timer_t calc_delta (ACE_timer_t real_time,
                           ACE_timer_t delta);
-  // calculate the delta value.
 
+  /// pointer to the cubit object.
   Cubit_ptr cubit_;
-  // pointer to the cubit object.
 
+  /// cubit implementation object.
   Cubit_i cubit_impl_;
-  // cubit implementation object.
 
+  /// Pointer to shared state.
   Task_State *ts_;
-  // Pointer to shared state.
 
+  /// number used for cubing.
   u_int num_;
-  // number used for cubing.
 
+  /// unique id of the task
   u_int id_;
-  // unique id of the task
 
+  /// count of the number of calls made.
   u_int call_count_;
-  // count of the number of calls made.
 
+  /// number of calls that failed.
   u_int error_count_;
-  // number of calls that failed.
 
+  /// ACE Unbounded set holding the latency values for all the
+  /// requests of this thread.
   JITTER_ARRAY *my_jitter_array_;
-  // ACE Unbounded set holding the latency values for all the
-  // requests of this thread.
 
+  /// Timer using pccTimer for chorus and ACE_Timer for other platforms.
   MT_Cubit_Timer *timer_;
-  // Timer using pccTimer for chorus and ACE_Timer for other platforms.
 
+  /// frequency of CORBA requests.
   ACE_timer_t frequency_;
-  // frequency of CORBA requests.
 
+  /// aggregate latency of the requests.
   ACE_timer_t latency_;
-  // aggregate latency of the requests.
 
   // command-line arguments.
   int argc_;
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp b/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
index 80be1bd682c..33fd84ef56d 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
+++ b/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
@@ -5,33 +5,20 @@
 
 MT_Cubit_Timer::MT_Cubit_Timer (u_int granularity)
   :granularity_ (granularity)
-#if defined (CHORUS_MVME)
-  , pstartTime_ (0)
-  , pstopTime_ (0)
-#endif /* CHORUS_MVME */
 {
 }
 
 void
 MT_Cubit_Timer::start (void)
 {
-#if defined (CHORUS_MVME)
-  this->pstartTime_ = pccTime1Get();
-#else /* CHORUS_MVME */
   this->timer_.start ();
-#endif /* !CHORUS_MVME */
 }
 
 void
 MT_Cubit_Timer::stop (void)
 {
-#if defined (CHORUS_MVME)
-  this->pstopTime_ = pccTime1Get ();
-#else /* CHORUS_MVME */
-  // If CHORUS_MVME is not defined just use plain timer_.stop ().
   this->timer_.stop ();
   this->timer_.elapsed_time (this->delta_);
-#endif /* !CHORUS_MVME */
 }
 
 ACE_timer_t
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/Timer.h b/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
index 45c22dbb567..1e3166d6f8b 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
+++ b/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
@@ -1,19 +1,17 @@
 /* -*- C++ -*- */
-/* $Id$ */
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    Timer.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee, Sergio Flores-Gaitan and Nagarajan
-//    Surendran.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Timer.h
+ *
+ *  $Id$
+ *
+ *  @author Andy Gokhale
+ *  @author Sumedh Mungee
+ *  @author Sergio Flores-Gaitan and Nagarajan Surendran.
+ */
+//=============================================================================
+
 
 #ifndef _MT_CUBIT_TIMER_H
 #define _MT_CUBIT_TIMER_H
@@ -26,11 +24,14 @@
 
 #include "ace/High_Res_Timer.h"
 
+/**
+ * @class MT_Cubit_Timer
+ *
+ * @brief A class that encapsulates the pccTimer for chorus and uses
+ * ACE Timer for other platforms.
+ */
 class MT_Cubit_Timer
 {
-  // = TITLE
-  //     A class that encapsulates the pccTimer for chorus and uses
-  //     ACE Timer for other platforms.
 public:
   MT_Cubit_Timer (u_int granularity);
 
@@ -40,22 +41,18 @@ public:
   ACE_timer_t get_elapsed (void);
 
 private:
+  /// timer.
   ACE_High_Res_Timer timer_;
-  // timer.
 
+  /// Elapsed time in microseconds.
   ACE_Time_Value delta_;
-  // Elapsed time in microseconds.
 
+  /**
+   * This is the granularity of the timing of the CORBA requests. A
+   * value of 5 represents that we will take time every 5 requests,
+   * instead of the default of every request (1).
+   */
   u_int granularity_;
-  // This is the granularity of the timing of the CORBA requests. A
-  // value of 5 represents that we will take time every 5 requests,
-  // instead of the default of every request (1).
-
-#if defined (CHORUS_MVME)
-  // Variables for the pccTimer.
-  int pstartTime_;
-  int pstopTime_;
-#endif /* CHORUS_MVME */
 };
 
 #endif /* _MT_CUBIT_TIMER_H */
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp b/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
index 1dc063802cc..948dc4af38d 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
+++ b/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
@@ -4,8 +4,6 @@
 #include "ace/ACE.h"
 #include "ace/Barrier.h"
 
-ACE_RCSID(MT_Cubit, Util_Thread, "$Id$")
-
 Util_Thread::Util_Thread (Task_State *ts,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task<ACE_NULL_SYNCH> (thr_mgr),
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h b/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
index cad2577da57..04c9faeb05a 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
+++ b/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
@@ -1,57 +1,58 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    Util_Thread.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee, Sergio Flores-Gaitan and Nagarajan
-//    Surendran.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Util_Thread.h
+ *
+ *  $Id$
+ *
+ *  @author Andy Gokhale
+ *  @author Sumedh Mungee
+ *  @author Sergio Flores-Gaitan and Nagarajan Surendran.
+ */
+//=============================================================================
+
 
 #ifndef UTIL_THREAD_H
 #define UTIL_THREAD_H
 
 #include "Task_Client.h"
 
+/**
+ * @class Util_Thread
+ *
+ * @brief The thread that computes utilization.
+ */
 class Util_Thread : public ACE_Task<ACE_NULL_SYNCH>
 {
-  // = TITLE
-  //     The thread that computes utilization.
 public:
+  /// Constructor.
   Util_Thread (Task_State *,
                ACE_Thread_Manager *thr_mgr);
-  // Constructor.
 
+  /// The thread entry point function.
   virtual int svc (void);
-  // The thread entry point function.
 
+  /// Gets the number of computations the thread was able to perform.
   u_long get_number_of_computations (void);
-  // Gets the number of computations the thread was able to perform.
 
+  /// this is the actual "computation" being performed.
   void computation (void);
-  // this is the actual "computation" being performed.
 
+  /// Indicates whether we're done.
   int done_;
-  // Indicates whether we're done.
 
 private:
+  /// Run the computations.
   int run_computations (void);
-  // Run the computations.
 
+  /// This stores the number of computations performed
+  /// by the Util_Thread so far
   u_long number_of_computations_;
-  // This stores the number of computations performed
-  // by the Util_Thread so far
 
+  /// Pointer to the Task state. Stores the state
+  /// common to the multiple client threads
   Task_State *ts_;
-  // Pointer to the Task state. Stores the state
-  // common to the multiple client threads
 };
 
 #endif /* !defined (UTIL_THREAD_H) */
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index fb0c1c74cd0..822032d3714 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -18,8 +18,6 @@
 # include "quantify.h"
 #endif /* ACE_HAS_QUANTIFY */
 
-ACE_RCSID(MT_Cubit, client, "$Id$")
-
 #if defined (ACE_HAS_VXTHREADS)
 u_int ctx = 0;
 u_int ct = 0;
@@ -130,7 +128,6 @@ Client_i::init (int argc, ACE_TCHAR *argv[])
         this->ts_->thread_count_ =
           ACE_OS::atoi (this->argv_[i+1]);
     }
-  PCCTIMER_INIT;
   return 0;
 }
 
@@ -250,11 +247,7 @@ Client_i::output_latency (void)
            i++,iterator.advance ())
         {
           ACE_OS::sprintf (buffer + ACE_OS::strlen (buffer),
-#if defined (CHORUS_MVME)
-                          "\t%u\n",
-#else
                           "\t%f\n",
-#endif /* !CHORUS_MVME */
                            *latency);
           ACE_OS::fputs (buffer,
                          latency_file_handle);
@@ -297,11 +290,6 @@ Client_i::calc_util_time (void)
 
   // Execute one computation.
   timer.start ();
-#if defined (CHORUS_MVME)
-  this->util_thread_->computation ();
-  timer.stop ();
-  this->util_task_duration_ = timer.get_elapsed ();
-#else
   for (u_int i = 0;
        i < NUM_UTIL_COMPUTATIONS;
        ++i)
@@ -309,7 +297,6 @@ Client_i::calc_util_time (void)
 
   timer.stop ();
   this->util_task_duration_ = timer.get_elapsed () / NUM_UTIL_COMPUTATIONS;
-#endif /* !CHORUS_MVME */
 }
 
 int
@@ -536,18 +523,7 @@ Client_i::print_latency_stats (void)
       // it to Excel to calculate jitter, in the mean time we come up
       // with the sqrt() function.
       output_latency ();
-#elif defined (CHORUS_MVME)
-      ACE_DEBUG ((LM_DEBUG,
-                  "Test done.\n"
-                  "High priority client latency : %u usec\n"
-                  "Low priority client latency : %u usec\n",
-                  this->high_priority_client_->get_high_priority_latency (),
-                  this->low_priority_client_[0]->get_low_priority_latency () ));
-      // Output the latency values to a file, tab separated, to import
-      // it to Excel to calculate jitter, in the mean time we come up
-      // with the sqrt() function.
-      output_latency ();
-#else /* !CHORUS_MVME */
+#else
       ACE_DEBUG ((LM_DEBUG, "Test done.\n"
                   "High priority client latency : %f usec, jitter: %f usec\n"
                   "Low priority client latency : %f usec, jitter: %f usec\n",
@@ -556,8 +532,8 @@ Client_i::print_latency_stats (void)
                   this->low_priority_client_[0]->get_low_priority_latency (),
                   this->low_priority_client_[0]->get_low_priority_jitter ()));
       // output_latency ();
-#endif /* !ACE_VXWORKS && !CHORUS_MVME */
     }
+#endif
 }
 
 void
@@ -859,12 +835,5 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   // Run the tests.
   client.run ();
 
-#if defined (CHORUS_MVME)
-  int pTime;
-  if (pccTimer (PCC2_TIMER1_STOP,
-                &pTime) != K_OK)
-    ACE_DEBUG ((LM_DEBUG,
-                "pccTimer has a pending bench mark\n"));
-#endif /* CHORUS_MVME */
   return 0;
 }
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/client.h b/performance-tests/Cubit/TAO/MT_Cubit/client.h
index 0a6b5894a19..a10b01d9ea3 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/client.h
+++ b/performance-tests/Cubit/TAO/MT_Cubit/client.h
@@ -1,19 +1,18 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    client.h
-//
-// = AUTHOR
-//    Andy Gokhale, Brian Mendel, Sumedh Mungee, Sergio Flores-Gaitan
-//    and Nagarajan Surendran.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.h
+ *
+ *  $Id$
+ *
+ *  @author Andy Gokhale
+ *  @author Brian Mendel
+ *  @author Sumedh Mungee
+ *  @author Sergio Flores-Gaitan and Nagarajan Surendran.
+ */
+//=============================================================================
+
 
 #include "ace/Task.h"
 
@@ -30,151 +29,154 @@
 #include "Util_Thread.h"
 #include "Timer.h"
 
-#if defined (CHORUS_MVME)
-#include "pccTimer.h"
-#endif /* CHORUS_MVME */
-
 #if defined (VME_DRIVER)
 #include <hostLib.h>
 extern "C" STATUS vmeDrv (void);
 extern "C" STATUS vmeDevCreate (char *);
 #endif /* defined (VME_DRIVER) */
 
+/**
+ * @class Client_i
+ *
+ * @brief Helper class implementing the Multi-Threaded Cubit client.
+ */
 class Client_i : public virtual MT_Priority
 {
-  // = TITLE
-  //     Helper class implementing the Multi-Threaded Cubit client.
 public:
+  ///constructor.
   Client_i (void);
-  //constructor.
 
+  /// destructor.
   virtual ~Client_i (void);
-  // destructor.
 
+  /// Initialize the state of <Client_i>.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initialize the state of <Client_i>.
 
+  /// Run the tests.
   void run (void);
-  // Run the tests.
 
+  /// Performs the priority inversion test.
   int do_priority_inversion_test (void);
-  // Performs the priority inversion test.
 
+  /// Performs the test with 4 threads each sending requests at rates
+  /// of 20, 10, 5, and 1Hz.
   int do_thread_per_rate_test (void);
-  // Performs the test with 4 threads each sending requests at rates
-  // of 20, 10, 5, and 1Hz.
 
+  /// Starts the client utilization thread.
   int start_servant (void);
-  // Starts the client utilization thread.
 
+  /// output the latency results for the requests.
   void output_latency (void);
-  // output the latency results for the requests.
 
 #if defined (VXWORKS)
+  /// Outputs the details of this task to a file taskinfo.txt.
   void output_taskinfo (void);
-  // Outputs the details of this task to a file taskinfo.txt.
 #endif /* VXWORKS */
 
 private:
+  /// Sets the priority to be used for the low priority clients.
   void init_low_priority (void);
-  // Sets the priority to be used for the low priority clients.
 
+  /// Calculate the time for one util computation.
   void calc_util_time (void);
-  // Calculate the time for one util computation.
 
+  /// Activates the high priority client.
   int activate_high_client (void);
-  // Activates the high priority client.
 
+  /// Activates the low priority client.
   int activate_low_client (void);
-  // Activates the low priority client.
 
+  /// Activates the utilization thread.
   int activate_util_thread (void);
-  // Activates the utilization thread.
 
+  /// Prints the results of the tests.
   void print_priority_inversion_stats (void);
-  // Prints the results of the tests.
 
+  /// Prints the context switch results.
   void print_context_stats (void);
-  // Prints the context switch results.
 
+  /// Prints the utilization test results.
   void print_util_stats (void);
-  // Prints the utilization test results.
 
+  /// Prints the latency and jitter results.
   void print_latency_stats (void);
-  // Prints the latency and jitter results.
 
+  /// gets the number of context switches.
   void get_context_switches (void);
-  // gets the number of context switches.
 
+  /// Pointer to the high priority client object.
   Client *high_priority_client_;
-  // Pointer to the high priority client object.
 
+  /// Array to hold pointers to the low priority tasks.
   Client **low_priority_client_;
-  // Array to hold pointers to the low priority tasks.
 
+  /// Timer for timing the tests.
   ACE_High_Res_Timer timer_;
-  // Timer for timing the tests.
 
+  /// Priority helper object.
   MT_Priority priority_;
-  // Priority helper object.
 
+  /// Utilization thread.
   Util_Thread *util_thread_;
-  // Utilization thread.
 
+  /// Utilization thread manager.
   ACE_Thread_Manager util_thread_manager_;
-  // Utilization thread manager.
 
+  /// Time for one computation of utilization thread.
   ACE_timer_t util_task_duration_;
-  // Time for one computation of utilization thread.
 
+  /// Pointer to task state.
   Task_State *ts_;
-  // Pointer to task state.
 
+  /// Priority used for the high priority client.
   ACE_Sched_Priority high_priority_;
-  // Priority used for the high priority client.
 
+  /// Priority used by the low priority clients.
   ACE_Sched_Priority low_priority_;
-  // Priority used by the low priority clients.
 
+  /// Number of low priority clients
   u_int num_low_priority_;
-  // Number of low priority clients
 
+  /// Number of priorities used.
   u_int num_priorities_;
-  // Number of priorities used.
 
+  /**
+   * Granularity of the assignment of the priorities.  Some OSs have
+   * fewer levels of priorities than we have threads in our test, so
+   * with this mechanism we assign priorities to groups of threads
+   * when there are more threads than priorities.
+   */
   u_int grain_;
-  // Granularity of the assignment of the priorities.  Some OSs have
-  // fewer levels of priorities than we have threads in our test, so
-  // with this mechanism we assign priorities to groups of threads
-  // when there are more threads than priorities.
 
+  /// counter of the number of priorities used within a grain.
   u_int counter_;
-  // counter of the number of priorities used within a grain.
 
   // Set a task_name string starting with "@", so we are able to
   // accurately count the number of context switches.
   char* task_name_;
 
+  /// elapsed time for the latency tests.
   ACE_Time_Value delta_;
-  // elapsed time for the latency tests.
 
+  /// number of command line arguments.
   int argc_;
-  // number of command line arguments.
 
+  /// command line argument array.
   ACE_TCHAR **argv_;
-  // command line argument array.
 
+  /**
+   * Create a separate manager for the client.  This allows the use of
+   * its wait () method on VxWorks, without interfering with the
+   * server's (global) thread manager.
+   */
   ACE_Thread_Manager client_thread_manager_;
-  // Create a separate manager for the client.  This allows the use of
-  // its wait () method on VxWorks, without interfering with the
-  // server's (global) thread manager.
 
+  /// Stores the total number of context switches incurred by the
+  /// program while making CORBA requests
   u_int context_switch_;
-  // Stores the total number of context switches incurred by the
-  // program while making CORBA requests
 
+  /// Thread manager for the servant used for utilization.
   ACE_Thread_Manager server_thread_manager_;
-  // Thread manager for the servant used for utilization.
 
 #if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32)
   ACE_Profile_Timer timer_for_context_switch;
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
index 40cb819b5a0..63973fd7c1a 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
+++ b/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
@@ -4,8 +4,6 @@
 #include "cubit_i.h"
 #include "Task_Client.h"
 
-ACE_RCSID(MT_Cubit, cubit_i, "$Id$")
-
 Cubit_i::Cubit_i (CORBA::ORB_ptr orb,
                   PortableServer::POA_ptr poa)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
index 2eb4f2fb17c..d75c929c226 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
+++ b/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
@@ -1,28 +1,30 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    cubit_i.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee, Sergio Flores-Gaitan and Nagarajan Surendran.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    cubit_i.h
+ *
+ *  $Id$
+ *
+ *  @author Andy Gokhale
+ *  @author Sumedh Mungee
+ *  @author Sergio Flores-Gaitan and Nagarajan Surendran.
+ */
+//=============================================================================
+
 
 #ifndef _CUBIT_I_H
 #define _CUBIT_I_H
 
 #include "cubitS.h"
 
+/**
+ * @class Cubit_i
+ *
+ * @brief Cubit implementation class.
+ */
 class Cubit_i : public POA_Cubit
 {
-  // = TITLE
-  //   Cubit implementation class.
 public:
   // = Initialization and termination methods.
   Cubit_i (CORBA::ORB_ptr orb,
@@ -41,16 +43,16 @@ public:
 
   virtual void shutdown (void);
 
+  /// The default POA
   virtual PortableServer::POA_ptr
       _default_POA (void);
-  // The default POA
 
 protected:
+  /// Keep a pointer to the ORB so we can shut it down.
   CORBA::ORB_var orb_;
-  // Keep a pointer to the ORB so we can shut it down.
 
+  /// The default POA..
   PortableServer::POA_var poa_;
-  // The default POA..
 };
 
 #endif /* _CUBIT_I_H */
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index 228e821ca5e..1ae4f59307d 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    server.cpp
-//
-// = AUTHOR
-//    Andy Gokhale,
-//    Sumedh Mungee,
-//    Sergio Flores-Gaitan, and
-//    Nagarajan Surendran
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  @author Andy Gokhale
+ *  @author Sumedh Mungee
+ *  @author Sergio Flores-Gaitan
+ *  @author and Nagarajan Surendran
+ */
+//=============================================================================
+
 
 #include "ace/config-all.h"
 
@@ -36,8 +33,6 @@
 # include "quantify.h"
 #endif /* ACE_HAS_QUANTIFY */
 
-ACE_RCSID(MT_Cubit, server, "$Id$")
-
 Server::Server (void)
   :argc_ (0),
    argv_ (0),
@@ -180,7 +175,7 @@ Server::activate_high_servant (void)
 
   ACE_OS::sprintf (orbendpoint,
                    "-ORBEndpoint %s ",
-                   GLOBALS::instance ()->endpoint);
+                   ACE_TEXT_ALWAYS_CHAR (GLOBALS::instance ()->endpoint));
 
   char *high_second_argv[] =
     {orbendpoint,
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/server.h b/performance-tests/Cubit/TAO/MT_Cubit/server.h
index f10030ed27f..be32928483c 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/server.h
+++ b/performance-tests/Cubit/TAO/MT_Cubit/server.h
@@ -1,19 +1,17 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    server.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee,Sergio Flores-Gaitan and Nagarajan
-//    Surendran.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.h
+ *
+ *  $Id$
+ *
+ *  @author Andy Gokhale
+ *  @author Sumedh Mungee
+ *  @author Sergio Flores-Gaitan and Nagarajan Surendran.
+ */
+//=============================================================================
+
 
 #ifndef SERVER_H
 #define SERVER_H
@@ -51,91 +49,95 @@ extern "C" STATUS vmeDrv (void);
 extern "C" STATUS vmeDevCreate (char *);
 #endif /* VME_DRIVER */
 
+/**
+ * @class Server
+ *
+ * @brief A multithreaded cubit server class.
+ *
+ * This class encapsulates the functionality of a multi-threaded
+ * cubit server. To use this, call initialize and then
+ * start_servants method.
+ */
 class Server
 {
-  // = TITLE
-  //     A multithreaded cubit server class.
-  //
-  // = DESCRIPTION
-  //     This class encapsulates the functionality of a multi-threaded
-  //     cubit server. To use this, call initialize and then
-  //     start_servants method.
 public:
+  /// Default constructor.
   Server (void);
-  // Default constructor.
 
+  /// Initialize the server state.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the server state.
 
+  /// Run method.
   int run (void);
-  // Run method.
 
 private:
+  /// Start the high and low priority servants.
   int start_servants (void);
-  // Start the high and low priority servants.
 
+  /// Preliminary argument processing code.
   void prelim_args_process (void);
-  // Preliminary argument processing code.
 
+  /// sets the priority to be used for the low priority servants.
   void init_low_priority (void);
-  // sets the priority to be used for the low priority servants.
 
+  /// Writes the iors of the servants to a file
   int write_iors (void);
-  // Writes the iors of the servants to a file
 
+  /// Activates the high priority servant.
   int activate_high_servant (void);
-  // Activates the high priority servant.
 
+  /// Activates the low priority servants.
   int activate_low_servants (void);
-  // Activates the low priority servants.
 
+  /// Number of arguments for the servant.
   int argc_;
-  // Number of arguments for the servant.
 
+  /// Arguments for the ORB.
   ACE_TCHAR **argv_;
-  // Arguments for the ORB.
 
+  /// Array to hold pointers to the Cubit objects.
   char * *cubits_;
-  // Array to hold pointers to the Cubit objects.
 
+  /// Pointer to the high priority task
   Cubit_Task *high_priority_task_;
-  // Pointer to the high priority task
 
+  /// Array to hold pointers to the low priority tasks.
   Cubit_Task **low_priority_tasks_;
-  // Array to hold pointers to the low priority tasks.
 
+  /// Priority used for the high priority servant.
   ACE_Sched_Priority high_priority_;
-  // Priority used for the high priority servant.
 
+  /// Priority used by the low priority servants.
   ACE_Sched_Priority low_priority_;
-  // Priority used by the low priority servants.
 
+  /// Number of low priority servants
   u_int num_low_priority_;
-  // Number of low priority servants
 
+  /// Number of priorities used.
   u_int num_priorities_;
-  // Number of priorities used.
 
+  /**
+   * Granularity of the assignment of the priorities.  Some OSs have
+   * fewer levels of priorities than we have threads in our test, so
+   * with this mechanism we assign priorities to groups of threads
+   * when there are more threads than priorities.
+   */
   u_int grain_;
-  // Granularity of the assignment of the priorities.  Some OSs have
-  // fewer levels of priorities than we have threads in our test, so
-  // with this mechanism we assign priorities to groups of threads
-  // when there are more threads than priorities.
 
+  /// count of the number of priorities used within a grain.
   u_int counter_;
-  // count of the number of priorities used within a grain.
 
+  /// argv passed to the high priority servant.
   ACE_ARGV *high_argv_;
-  // argv passed to the high priority servant.
 
+  /// argv passed to the low priority servants.
   ACE_ARGV *low_argv_;
-  // argv passed to the low priority servants.
 
+  /// Priority helper object.
   MT_Priority priority_;
-  // Priority helper object.
 
+  /// Thread manager for the servant threads.
   ACE_Thread_Manager servant_manager_;
-  // Thread manager for the servant threads.
 };
 
 #endif /* SERVER_H */
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/svc.conf b/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
index bb4034051b9..2bdce0c3f02 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
+++ b/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
@@ -4,5 +4,5 @@
 #
 
 static Advanced_Resource_Factory "-ORBInputCDRAllocator null -ORBConnectionCacheLock null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"
diff --git a/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml b/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
index 3d76eda6597..73ad6ac6461 100644
--- a/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
+++ b/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
@@ -6,6 +6,6 @@
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBInputCDRAllocator null -ORBConnectionCacheLock null"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
- <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/Cubit/TAO/Makefile.am b/performance-tests/Cubit/TAO/Makefile.am
deleted file mode 100644
index 7d6467be3c4..00000000000
--- a/performance-tests/Cubit/TAO/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        IDL_Cubit \
-        DII_Cubit \
-        MT_Cubit
-
diff --git a/performance-tests/Latency/AMH_Single_Threaded/Makefile.am b/performance-tests/Latency/AMH_Single_Threaded/Makefile.am
deleted file mode 100644
index f160e776e3a..00000000000
--- a/performance-tests/Latency/AMH_Single_Threaded/Makefile.am
+++ /dev/null
@@ -1,129 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Single_Threaded_AMH_Latency_Idl.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Single_Threaded_AMH_Latency_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Single_Threaded_AMH_Latency_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp b/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
index 2a1accfb4f9..c15ab375bb7 100644
--- a/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
+++ b/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
@@ -3,8 +3,6 @@
 //
 #include "Roundtrip.h"
 
-ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Latency/AMH_Single_Threaded/client.cpp b/performance-tests/Latency/AMH_Single_Threaded/client.cpp
index 4c83f7fbdea..198884597ff 100644
--- a/performance-tests/Latency/AMH_Single_Threaded/client.cpp
+++ b/performance-tests/Latency/AMH_Single_Threaded/client.cpp
@@ -11,8 +11,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Single_Threaded_Latency, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 100;
 int do_dump_history = 0;
@@ -55,7 +53,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/AMH_Single_Threaded/server.cpp b/performance-tests/Latency/AMH_Single_Threaded/server.cpp
index 0196426aab0..02c1d4c245b 100644
--- a/performance-tests/Latency/AMH_Single_Threaded/server.cpp
+++ b/performance-tests/Latency/AMH_Single_Threaded/server.cpp
@@ -7,8 +7,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/AMI/Makefile.am b/performance-tests/Latency/AMI/Makefile.am
deleted file mode 100644
index 94f9f233a95..00000000000
--- a/performance-tests/Latency/AMI/Makefile.am
+++ /dev/null
@@ -1,137 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AMI_Latency_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Latency_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Roundtrip_Handler.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Roundtrip_Handler.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Latency_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Latency/AMI/Roundtrip.cpp b/performance-tests/Latency/AMI/Roundtrip.cpp
index 070942c4482..c2d9bae5a2c 100644
--- a/performance-tests/Latency/AMI/Roundtrip.cpp
+++ b/performance-tests/Latency/AMI/Roundtrip.cpp
@@ -3,8 +3,6 @@
 //
 #include "Roundtrip.h"
 
-ACE_RCSID(AMI_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Latency/AMI/Roundtrip_Handler.cpp b/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
index b74e2bec031..f2a3662a5d8 100644
--- a/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
+++ b/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
@@ -4,8 +4,6 @@
 #include "Roundtrip_Handler.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID(AMI_Latency, Roundtrip, "$Id$")
-
 Roundtrip_Handler::Roundtrip_Handler (int expected_callbacks)
   : pending_callbacks_ (expected_callbacks)
 {
diff --git a/performance-tests/Latency/AMI/Server_Task.cpp b/performance-tests/Latency/AMI/Server_Task.cpp
index 157dbe15c4f..3ea05031cd0 100644
--- a/performance-tests/Latency/AMI/Server_Task.cpp
+++ b/performance-tests/Latency/AMI/Server_Task.cpp
@@ -3,8 +3,6 @@
 //
 #include "Server_Task.h"
 
-ACE_RCSID(AMI_Latency, Server_Task, "$Id$")
-
 Server_Task::Server_Task (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Latency/AMI/client.cpp b/performance-tests/Latency/AMI/client.cpp
index 8e894d1ede3..459a25dd27e 100644
--- a/performance-tests/Latency/AMI/client.cpp
+++ b/performance-tests/Latency/AMI/client.cpp
@@ -9,8 +9,6 @@
 #include "ace/Throughput_Stats.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(AMI_Latency, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 ACE_hrtime_t throughput_base;
@@ -46,7 +44,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/AMI/run_test.pl b/performance-tests/Latency/AMI/run_test.pl
index 535ae12c791..c267d544932 100755
--- a/performance-tests/Latency/AMI/run_test.pl
+++ b/performance-tests/Latency/AMI/run_test.pl
@@ -29,12 +29,12 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 
 $CL = $client->CreateProcess ("client",
-                              "-i $iterations " . 
+                              "-i $iterations " .
                               "-k file://$client_iorfile");
 $server_status = $SV->Spawn ();
 
diff --git a/performance-tests/Latency/AMI/server.cpp b/performance-tests/Latency/AMI/server.cpp
index 9fab151f83c..e5cebc42463 100644
--- a/performance-tests/Latency/AMI/server.cpp
+++ b/performance-tests/Latency/AMI/server.cpp
@@ -8,8 +8,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(AMI_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 int nthreads = 4;
 
@@ -40,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/Collocation/Collocated_Test.cpp b/performance-tests/Latency/Collocation/Collocated_Test.cpp
index 72527c74b41..3422eb6644b 100644
--- a/performance-tests/Latency/Collocation/Collocated_Test.cpp
+++ b/performance-tests/Latency/Collocation/Collocated_Test.cpp
@@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         // This is a hack but that is okay!
         return 0;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/Collocation/Makefile.am b/performance-tests/Latency/Collocation/Makefile.am
deleted file mode 100644
index 18ccfe18484..00000000000
--- a/performance-tests/Latency/Collocation/Makefile.am
+++ /dev/null
@@ -1,89 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Latency_Collocation.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocated_Test
-
-Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Roundtrip.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Roundtrip.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/performance-tests/Latency/Collocation/Test.idl b/performance-tests/Latency/Collocation/Test.idl
index b2d07dbf880..3f26904a3f0 100644
--- a/performance-tests/Latency/Collocation/Test.idl
+++ b/performance-tests/Latency/Collocation/Test.idl
@@ -1,5 +1,5 @@
 //
-// $Id$ 
+// $Id$
 //
 
 /// A simple module to avoid namespace pollution
@@ -21,6 +21,6 @@ module Test
     Timestamp test_method (in Timestamp send_time);
 
     /// Shutdown the ORB
-    void shutdown (); 
+    void shutdown ();
   };
-}; 
+};
diff --git a/performance-tests/Latency/Collocation/svc.conf b/performance-tests/Latency/Collocation/svc.conf
index 9e0c5ed01ed..40babaf2989 100644
--- a/performance-tests/Latency/Collocation/svc.conf
+++ b/performance-tests/Latency/Collocation/svc.conf
@@ -2,5 +2,5 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/performance-tests/Latency/DII/Makefile.am b/performance-tests/Latency/DII/Makefile.am
deleted file mode 100644
index 24dc9b7b304..00000000000
--- a/performance-tests/Latency/DII/Makefile.am
+++ /dev/null
@@ -1,124 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.DII_Latency_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.DII_Latency_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.DII_Latency_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Latency/DII/Roundtrip.cpp b/performance-tests/Latency/DII/Roundtrip.cpp
index 5c907de19ba..c2d9bae5a2c 100644
--- a/performance-tests/Latency/DII/Roundtrip.cpp
+++ b/performance-tests/Latency/DII/Roundtrip.cpp
@@ -3,8 +3,6 @@
 //
 #include "Roundtrip.h"
 
-ACE_RCSID(DII_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Latency/DII/client.cpp b/performance-tests/Latency/DII/client.cpp
index b98a49b3062..434637d67a8 100644
--- a/performance-tests/Latency/DII/client.cpp
+++ b/performance-tests/Latency/DII/client.cpp
@@ -13,10 +13,6 @@
 #include "ace/Sample_History.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (DII_Latency,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 100;
 int do_dump_history = 0;
@@ -58,7 +54,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/DII/run_test.pl b/performance-tests/Latency/DII/run_test.pl
index af7dc20c0f4..8096a73c1b7 100755
--- a/performance-tests/Latency/DII/run_test.pl
+++ b/performance-tests/Latency/DII/run_test.pl
@@ -29,12 +29,12 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 
 $CL = $client->CreateProcess ("client",
-                              "-i $iterations " . 
+                              "-i $iterations " .
                               "-k file://$client_iorfile");
 $server_status = $SV->Spawn ();
 
diff --git a/performance-tests/Latency/DII/server.cpp b/performance-tests/Latency/DII/server.cpp
index 0196426aab0..02c1d4c245b 100644
--- a/performance-tests/Latency/DII/server.cpp
+++ b/performance-tests/Latency/DII/server.cpp
@@ -7,8 +7,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/DII/svc.conf b/performance-tests/Latency/DII/svc.conf
index 557c16b5caf..1b3ec40e989 100644
--- a/performance-tests/Latency/DII/svc.conf
+++ b/performance-tests/Latency/DII/svc.conf
@@ -2,5 +2,5 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
diff --git a/performance-tests/Latency/DII/svc.conf.xml b/performance-tests/Latency/DII/svc.conf.xml
index 7188391fbb8..c10d08fced6 100644
--- a/performance-tests/Latency/DII/svc.conf.xml
+++ b/performance-tests/Latency/DII/svc.conf.xml
@@ -5,6 +5,6 @@
  <!--  $Id$ -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/Latency/DSI/Makefile.am b/performance-tests/Latency/DSI/Makefile.am
deleted file mode 100644
index 4c9ec87079a..00000000000
--- a/performance-tests/Latency/DSI/Makefile.am
+++ /dev/null
@@ -1,121 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.DSI_Latency_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.DSI_Latency_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.DSI_Latency_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Latency/DSI/Roundtrip.cpp b/performance-tests/Latency/DSI/Roundtrip.cpp
index 950ca0f7eff..e060033231b 100644
--- a/performance-tests/Latency/DSI/Roundtrip.cpp
+++ b/performance-tests/Latency/DSI/Roundtrip.cpp
@@ -7,8 +7,6 @@
 #include "tao/AnyTypeCode/SystemExceptionA.h"
 #include "tao/DynamicInterface/Server_Request.h"
 
-ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Latency/DSI/client.cpp b/performance-tests/Latency/DSI/client.cpp
index 25b08785708..ced85619c85 100644
--- a/performance-tests/Latency/DSI/client.cpp
+++ b/performance-tests/Latency/DSI/client.cpp
@@ -11,8 +11,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(DSI_Latency, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 100;
 int do_dump_history = 0;
@@ -54,7 +52,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/DSI/run_test.pl b/performance-tests/Latency/DSI/run_test.pl
index 7667dd9339c..e12ef504ca5 100755
--- a/performance-tests/Latency/DSI/run_test.pl
+++ b/performance-tests/Latency/DSI/run_test.pl
@@ -29,12 +29,12 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 
 $CL = $client->CreateProcess ("client",
-                              "-i $iterations " . 
+                              "-i $iterations " .
                               "-k file://$client_iorfile");
 $server_status = $SV->Spawn ();
 
diff --git a/performance-tests/Latency/DSI/server.cpp b/performance-tests/Latency/DSI/server.cpp
index 98413d4fb7e..db1e0e0b512 100644
--- a/performance-tests/Latency/DSI/server.cpp
+++ b/performance-tests/Latency/DSI/server.cpp
@@ -7,8 +7,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(DSI_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/DSI/svc.conf b/performance-tests/Latency/DSI/svc.conf
index 557c16b5caf..1b3ec40e989 100644
--- a/performance-tests/Latency/DSI/svc.conf
+++ b/performance-tests/Latency/DSI/svc.conf
@@ -2,5 +2,5 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
diff --git a/performance-tests/Latency/DSI/svc.conf.xml b/performance-tests/Latency/DSI/svc.conf.xml
index d35a5ac7473..24c49a25937 100644
--- a/performance-tests/Latency/DSI/svc.conf.xml
+++ b/performance-tests/Latency/DSI/svc.conf.xml
@@ -5,6 +5,6 @@
  <!--  $Id$ -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/Latency/Deferred/Makefile.am b/performance-tests/Latency/Deferred/Makefile.am
deleted file mode 100644
index b94acae1be7..00000000000
--- a/performance-tests/Latency/Deferred/Makefile.am
+++ /dev/null
@@ -1,124 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Deferred_Latency_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Deferred_Latency_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Deferred_Latency_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Latency/Deferred/Roundtrip.cpp b/performance-tests/Latency/Deferred/Roundtrip.cpp
index 0d65f210bbe..c2d9bae5a2c 100644
--- a/performance-tests/Latency/Deferred/Roundtrip.cpp
+++ b/performance-tests/Latency/Deferred/Roundtrip.cpp
@@ -3,8 +3,6 @@
 //
 #include "Roundtrip.h"
 
-ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Latency/Deferred/client.cpp b/performance-tests/Latency/Deferred/client.cpp
index 6e53127e278..c184cc042c2 100644
--- a/performance-tests/Latency/Deferred/client.cpp
+++ b/performance-tests/Latency/Deferred/client.cpp
@@ -18,10 +18,6 @@
 #include "ace/Sample_History.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (Deferred_Latency,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 1000;
 int burst = 10;
@@ -70,7 +66,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/Deferred/run_test.pl b/performance-tests/Latency/Deferred/run_test.pl
index 834bc362f68..abbead4fb14 100755
--- a/performance-tests/Latency/Deferred/run_test.pl
+++ b/performance-tests/Latency/Deferred/run_test.pl
@@ -30,12 +30,12 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile");
 
 $CL = $client->CreateProcess ("client",
-                              "-i $iterations -b $burst" . 
+                              "-i $iterations -b $burst" .
                               "-k file://$client_iorfile");
 $server_status = $SV->Spawn ();
 
diff --git a/performance-tests/Latency/Deferred/server.cpp b/performance-tests/Latency/Deferred/server.cpp
index 0196426aab0..02c1d4c245b 100644
--- a/performance-tests/Latency/Deferred/server.cpp
+++ b/performance-tests/Latency/Deferred/server.cpp
@@ -7,8 +7,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/Deferred/svc.conf b/performance-tests/Latency/Deferred/svc.conf
index c15a02cf58f..ee3d894e6d1 100644
--- a/performance-tests/Latency/Deferred/svc.conf
+++ b/performance-tests/Latency/Deferred/svc.conf
@@ -2,5 +2,4 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBProfileLock null"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
diff --git a/performance-tests/Latency/Deferred/svc.conf.xml b/performance-tests/Latency/Deferred/svc.conf.xml
index a9d9071cbd8..441a106aacf 100644
--- a/performance-tests/Latency/Deferred/svc.conf.xml
+++ b/performance-tests/Latency/Deferred/svc.conf.xml
@@ -5,6 +5,5 @@
  <!--  $Id$ -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/Latency/Makefile.am b/performance-tests/Latency/Makefile.am
deleted file mode 100644
index 5916ad0a66c..00000000000
--- a/performance-tests/Latency/Makefile.am
+++ /dev/null
@@ -1,21 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AMH_Single_Threaded \
-        AMI \
-        Collocation \
-        DII \
-        DSI \
-        Deferred \
-        Single_Threaded \
-        Thread_Per_Connection \
-        Thread_Pool
-
diff --git a/performance-tests/Latency/Single_Threaded/Makefile.am b/performance-tests/Latency/Single_Threaded/Makefile.am
deleted file mode 100644
index e3589d8fc73..00000000000
--- a/performance-tests/Latency/Single_Threaded/Makefile.am
+++ /dev/null
@@ -1,118 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Single_Threaded_Latency_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Single_Threaded_Latency_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.Single_Threaded_Latency_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Latency/Single_Threaded/Roundtrip.cpp b/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
index 0d65f210bbe..c2d9bae5a2c 100644
--- a/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
+++ b/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
@@ -3,8 +3,6 @@
 //
 #include "Roundtrip.h"
 
-ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Latency/Single_Threaded/client.cpp b/performance-tests/Latency/Single_Threaded/client.cpp
index 4c83f7fbdea..198884597ff 100644
--- a/performance-tests/Latency/Single_Threaded/client.cpp
+++ b/performance-tests/Latency/Single_Threaded/client.cpp
@@ -11,8 +11,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Single_Threaded_Latency, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 100;
 int do_dump_history = 0;
@@ -55,7 +53,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/Single_Threaded/server.cpp b/performance-tests/Latency/Single_Threaded/server.cpp
index db5bab34d33..f208e449a78 100644
--- a/performance-tests/Latency/Single_Threaded/server.cpp
+++ b/performance-tests/Latency/Single_Threaded/server.cpp
@@ -7,8 +7,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/Single_Threaded/svc.conf b/performance-tests/Latency/Single_Threaded/svc.conf
index 9e0c5ed01ed..40babaf2989 100644
--- a/performance-tests/Latency/Single_Threaded/svc.conf
+++ b/performance-tests/Latency/Single_Threaded/svc.conf
@@ -2,5 +2,5 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/performance-tests/Latency/Single_Threaded/svc.conf.xml b/performance-tests/Latency/Single_Threaded/svc.conf.xml
index 5b2a58bb6f0..51612b28d17 100644
--- a/performance-tests/Latency/Single_Threaded/svc.conf.xml
+++ b/performance-tests/Latency/Single_Threaded/svc.conf.xml
@@ -5,6 +5,6 @@
  <!--  $Id$ -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp b/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
index eb30621f5fe..99a8ca0bf35 100644
--- a/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
@@ -4,8 +4,6 @@
 #include "Client_Task.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID(Thread_Per_Connection_Latency, Client_Task, "$Id$")
-
 Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
                           int niterations)
   : roundtrip_ (Test::Roundtrip::_duplicate (roundtrip))
diff --git a/performance-tests/Latency/Thread_Per_Connection/Makefile.am b/performance-tests/Latency/Thread_Per_Connection/Makefile.am
deleted file mode 100644
index 8e8401b2eaf..00000000000
--- a/performance-tests/Latency/Thread_Per_Connection/Makefile.am
+++ /dev/null
@@ -1,117 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Thread_Per_Connection_Latency_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Thread_Per_Connection_Latency_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Thread_Per_Connection_Latency_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp b/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
index 9e4b7659718..c2d9bae5a2c 100644
--- a/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -3,8 +3,6 @@
 //
 #include "Roundtrip.h"
 
-ACE_RCSID(Single_Per_Connection_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Latency/Thread_Per_Connection/client.cpp b/performance-tests/Latency/Thread_Per_Connection/client.cpp
index 6b571b49c6a..21eda09406c 100644
--- a/performance-tests/Latency/Thread_Per_Connection/client.cpp
+++ b/performance-tests/Latency/Thread_Per_Connection/client.cpp
@@ -10,8 +10,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Thread_Per_Connection_Latency, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 1000;
 int do_shutdown = 1;
@@ -48,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/Thread_Per_Connection/run_test.pl b/performance-tests/Latency/Thread_Per_Connection/run_test.pl
index 4ce8e018317..10eda0f8a92 100755
--- a/performance-tests/Latency/Thread_Per_Connection/run_test.pl
+++ b/performance-tests/Latency/Thread_Per_Connection/run_test.pl
@@ -32,7 +32,7 @@ for ($iter = 0; $iter <= $#ARGV; $iter++) {
         $iterations = $ARGV[$iter + 1];
         $i++;
     }
-    
+
 }
 
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
diff --git a/performance-tests/Latency/Thread_Per_Connection/server.cpp b/performance-tests/Latency/Thread_Per_Connection/server.cpp
index 438afb2616f..f208e449a78 100644
--- a/performance-tests/Latency/Thread_Per_Connection/server.cpp
+++ b/performance-tests/Latency/Thread_Per_Connection/server.cpp
@@ -7,8 +7,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Thread_Per_Connection_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/Thread_Pool/Client_Task.cpp b/performance-tests/Latency/Thread_Pool/Client_Task.cpp
index 04b3f219b49..99a8ca0bf35 100644
--- a/performance-tests/Latency/Thread_Pool/Client_Task.cpp
+++ b/performance-tests/Latency/Thread_Pool/Client_Task.cpp
@@ -4,8 +4,6 @@
 #include "Client_Task.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID(Thread_Pool_Latency, Client_Task, "$Id$")
-
 Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
                           int niterations)
   : roundtrip_ (Test::Roundtrip::_duplicate (roundtrip))
diff --git a/performance-tests/Latency/Thread_Pool/Makefile.am b/performance-tests/Latency/Thread_Pool/Makefile.am
deleted file mode 100644
index 4ef47e80327..00000000000
--- a/performance-tests/Latency/Thread_Pool/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Thread_Pool_Latency_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Thread_Pool_Latency_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Thread_Pool_Latency_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Worker_Thread.cpp \
-  server.cpp \
-  Roundtrip.h \
-  Worker_Thread.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Latency/Thread_Pool/Roundtrip.cpp b/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
index 308d4d7afcd..c2d9bae5a2c 100644
--- a/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
+++ b/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
@@ -3,8 +3,6 @@
 //
 #include "Roundtrip.h"
 
-ACE_RCSID(Thread_Pool_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp b/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
index 598128ad43a..c1359a0c327 100644
--- a/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
+++ b/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
@@ -3,8 +3,6 @@
 //
 #include "Worker_Thread.h"
 
-ACE_RCSID(Thread_Pool_Latency, Worker_Thread, "$Id$")
-
 Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Latency/Thread_Pool/client.cpp b/performance-tests/Latency/Thread_Pool/client.cpp
index ec5c3f600c2..21eda09406c 100644
--- a/performance-tests/Latency/Thread_Pool/client.cpp
+++ b/performance-tests/Latency/Thread_Pool/client.cpp
@@ -10,8 +10,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Thread_Pool_Latency, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 1000;
 int do_shutdown = 1;
@@ -48,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Latency/Thread_Pool/server.cpp b/performance-tests/Latency/Thread_Pool/server.cpp
index a5fb9a0f621..2803f597e72 100644
--- a/performance-tests/Latency/Thread_Pool/server.cpp
+++ b/performance-tests/Latency/Thread_Pool/server.cpp
@@ -8,8 +8,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Thread_Pool_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -34,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Makefile.am b/performance-tests/Makefile.am
deleted file mode 100644
index 150f338298d..00000000000
--- a/performance-tests/Makefile.am
+++ /dev/null
@@ -1,24 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Anyop \
-        CSD_Strategy \
-        Callback \
-        Cubit \
-        Latency \
-        Memory \
-        POA \
-        Pluggable \
-        Protocols \
-        RTCorba \
-        Sequence_Latency \
-        Throughput
-
diff --git a/performance-tests/Memory/IORsize/Foo_i.cpp b/performance-tests/Memory/IORsize/Foo_i.cpp
index 691fd24ab34..9238769bd96 100644
--- a/performance-tests/Memory/IORsize/Foo_i.cpp
+++ b/performance-tests/Memory/IORsize/Foo_i.cpp
@@ -1,5 +1,4 @@
+// $Id$
+
 #include "Foo_i.h"
 
-ACE_RCSID(IORSize,
-          Foo_i,
-          "$Id$")
diff --git a/performance-tests/Memory/IORsize/Makefile.am b/performance-tests/Memory/IORsize/Makefile.am
deleted file mode 100644
index 7eebd04cdbf..00000000000
--- a/performance-tests/Memory/IORsize/Makefile.am
+++ /dev/null
@@ -1,109 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Memory_IORsize_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Memory_IORsize_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Foo_i.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Foo_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Memory_IORsize_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Memory_Growth.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Memory_Growth.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/performance-tests/Memory/IORsize/Memory_Growth.cpp b/performance-tests/Memory/IORsize/Memory_Growth.cpp
index bc96aa14c43..3ba056d12f1 100644
--- a/performance-tests/Memory/IORsize/Memory_Growth.cpp
+++ b/performance-tests/Memory/IORsize/Memory_Growth.cpp
@@ -4,10 +4,6 @@
 #include "Memory_Growth.h"
 #include "ace/Manual_Event.h"
 
-ACE_RCSID (IORSize,
-           Memory_Growth,
-           "$Id$")
-
 Memory_Growth::Memory_Growth (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Memory/IORsize/Memory_Growth.h b/performance-tests/Memory/IORsize/Memory_Growth.h
index b6443ab2536..dc61170a2ba 100644
--- a/performance-tests/Memory/IORsize/Memory_Growth.h
+++ b/performance-tests/Memory/IORsize/Memory_Growth.h
@@ -1,6 +1,4 @@
-//
 // $Id$
-//
 
 #ifndef MEMORY_GROWTH_H
 #define MEMORY_GROWTH_H
diff --git a/performance-tests/Memory/IORsize/Test.idl b/performance-tests/Memory/IORsize/Test.idl
index fed95b2a5ff..7b4128b8c20 100644
--- a/performance-tests/Memory/IORsize/Test.idl
+++ b/performance-tests/Memory/IORsize/Test.idl
@@ -1,6 +1,4 @@
-//
 // $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/performance-tests/Memory/IORsize/client.cpp b/performance-tests/Memory/IORsize/client.cpp
index 7c3b5876894..18eb21c4713 100644
--- a/performance-tests/Memory/IORsize/client.cpp
+++ b/performance-tests/Memory/IORsize/client.cpp
@@ -5,8 +5,6 @@
 #include "TestS.h"
 #include "Foo_i.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 static int n = 10;
 int
@@ -35,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Memory/IORsize/server.cpp b/performance-tests/Memory/IORsize/server.cpp
index ebb7bb647c6..c552df3c9cc 100644
--- a/performance-tests/Memory/IORsize/server.cpp
+++ b/performance-tests/Memory/IORsize/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Memory/Makefile.am b/performance-tests/Memory/Makefile.am
deleted file mode 100644
index b090b6edf6c..00000000000
--- a/performance-tests/Memory/Makefile.am
+++ /dev/null
@@ -1,14 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        IORsize \
-        Single_Threaded
-
diff --git a/performance-tests/Memory/Single_Threaded/Makefile.am b/performance-tests/Memory/Single_Threaded/Makefile.am
deleted file mode 100644
index 8c23ba7a8ce..00000000000
--- a/performance-tests/Memory/Single_Threaded/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Memory_Growth_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Memory_Growth_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Memory_Growth.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Memory_Growth_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Memory_Growth.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Memory_Growth.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp b/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
index f8ef0317e3e..29557d2a985 100644
--- a/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
+++ b/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
@@ -3,8 +3,6 @@
 //
 #include "Memory_Growth.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Memory_Growth::Memory_Growth (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Memory/Single_Threaded/client.cpp b/performance-tests/Memory/Single_Threaded/client.cpp
index 75fd6e55943..e0c71de9da9 100644
--- a/performance-tests/Memory/Single_Threaded/client.cpp
+++ b/performance-tests/Memory/Single_Threaded/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 static int n = 100;
 int
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Memory/Single_Threaded/server.cpp b/performance-tests/Memory/Single_Threaded/server.cpp
index ebb7bb647c6..c552df3c9cc 100644
--- a/performance-tests/Memory/Single_Threaded/server.cpp
+++ b/performance-tests/Memory/Single_Threaded/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/POA/Create_Reference/Makefile.am b/performance-tests/POA/Create_Reference/Makefile.am
deleted file mode 100644
index eac7786b3a9..00000000000
--- a/performance-tests/POA/Create_Reference/Makefile.am
+++ /dev/null
@@ -1,46 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Create_Reference.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = create_reference
-
-create_reference_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-create_reference_SOURCES = \
-  create_reference.cpp
-
-create_reference_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/performance-tests/POA/Create_Reference/create_reference.cpp b/performance-tests/POA/Create_Reference/create_reference.cpp
index 7f19b9ee5fa..82b93d6787f 100644
--- a/performance-tests/POA/Create_Reference/create_reference.cpp
+++ b/performance-tests/POA/Create_Reference/create_reference.cpp
@@ -12,8 +12,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(Activation, server, "$Id$")
-
 int niterations = 10000;
 int do_dump_history = 0;
 ACE_UINT32 gsf;
@@ -45,7 +43,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/POA/Demux/Makefile.am b/performance-tests/POA/Demux/Makefile.am
deleted file mode 100644
index 1b79d220865..00000000000
--- a/performance-tests/POA/Demux/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Demux_Poa_Idl.am
-
-BUILT_SOURCES = \
-  demux_testC.cpp \
-  demux_testC.h \
-  demux_testC.inl \
-  demux_testS.cpp \
-  demux_testS.h \
-  demux_testS.inl
-
-CLEANFILES = \
-  demux_test-stamp \
-  demux_testC.cpp \
-  demux_testC.h \
-  demux_testC.inl \
-  demux_testS.cpp \
-  demux_testS.h \
-  demux_testS.inl
-
-demux_testC.cpp demux_testC.h demux_testC.inl demux_testS.cpp demux_testS.h demux_testS.inl: demux_test-stamp
-
-demux_test-stamp: $(srcdir)/demux_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/demux_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  demux_test.idl
-
-## Makefile.Demux_Poa_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  demux_testC.cpp \
-  demux_testS.cpp \
-  demux_test_client.cpp \
-  demux_test_client.h \
-  demux_test_client.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Demux_Poa_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  demux_testC.cpp \
-  demux_testS.cpp \
-  demux_test_i.cpp \
-  demux_test_server.cpp \
-  server.cpp \
-  demux_test_client.inl \
-  demux_test_i.h \
-  demux_test_server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/performance-tests/POA/Demux/client.cpp b/performance-tests/POA/Demux/client.cpp
index 0448b9bbbb4..97276ef5e26 100644
--- a/performance-tests/POA/Demux/client.cpp
+++ b/performance-tests/POA/Demux/client.cpp
@@ -1,26 +1,18 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    client.cpp
-//
-//    client side main program
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  client side main program
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
 
 #include "demux_test_client.h"
 #include "tao/debug.h"
 
-ACE_RCSID(CodeGen, client, "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/performance-tests/POA/Demux/demux_stats.cpp b/performance-tests/POA/Demux/demux_stats.cpp
index 46816b75a80..9216900f4a2 100644
--- a/performance-tests/POA/Demux/demux_stats.cpp
+++ b/performance-tests/POA/Demux/demux_stats.cpp
@@ -1,17 +1,13 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    demux_stats.cpp
-//
-// = AUTHOR
-//
-//    Vishal Kachroo
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    demux_stats.cpp
+ *
+ *  $Id$
+ *
+ *  @author Vishal Kachroo
+ */
+//=============================================================================
+
 
 // FUZZ: disable check_for_math_include
 #include <math.h>
@@ -23,19 +19,19 @@ class Demux_Stats
 
 public:
 
+  /// Calculates the average latency and Standard deviation.
+  /// Expects the input data in my_results.dat.
   int
   calculate_avg_latency (void);
-  // Calculates the average latency and Standard deviation.
-  // Expects the input data in my_results.dat.
 
+  /// parses args.
   int
   Demux_Stats::parse_args (int argc_, char * argv_ []);
-  // parses args.
 
 private :
 
+  /// temporary results file.
   FILE *result_fp_;
-  // temporary results file.
 
   int iterations;
 };
diff --git a/performance-tests/POA/Demux/demux_test_client.cpp b/performance-tests/POA/Demux/demux_test_client.cpp
index ce0286e3e4b..cc6cb32c954 100644
--- a/performance-tests/POA/Demux/demux_test_client.cpp
+++ b/performance-tests/POA/Demux/demux_test_client.cpp
@@ -1,17 +1,13 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    demux_test_client.cpp
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    demux_test_client.cpp
+ *
+ *  $Id$
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "demux_test_client.h"
 #include "tao/debug.h"
diff --git a/performance-tests/POA/Demux/demux_test_client.h b/performance-tests/POA/Demux/demux_test_client.h
index 2999b69f53b..a736ea627c6 100644
--- a/performance-tests/POA/Demux/demux_test_client.h
+++ b/performance-tests/POA/Demux/demux_test_client.h
@@ -1,22 +1,18 @@
 #ifndef TAO_DEMUX_TEST_CLIENT_H
 #define TAO_DEMUX_TEST_CLIENT_H
 
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    demux_test_client.h
-//
-//    Definition of the client-side demux_test class
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    demux_test_client.h
+ *
+ *  $Id$
+ *
+ *  Definition of the client-side demux_test class
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 // FUZZ: disable check_for_math_include
 
@@ -46,83 +42,85 @@ public:
     OP_PTR op_;
   };
 
+  /// CTOR
   Demux_Test_Client (void);
-  // CTOR
 
+  /// DTOR
   ~Demux_Test_Client (void);
-  // DTOR
 
+  /// initialize the client test bed
   int init (int argc, ACE_TCHAR *argv []);
-  // initialize the client test bed
 
+  /// run the tests
   int run (void);
-  // run the tests
 
 private:
 
+  /// parse command line arguments
   int parse_args (void);
-  // parse command line arguments
 
+  /// initialize the operation database
   int init_operation_db (void);
-  // initialize the operation database
 
+  /// run linear strategy
   int run_linear_test (void);
-  // run linear strategy
 
+  /// run random strategy
   int run_random_test (void);
-  // run random strategy
 
+  /// run best strategy (w.r.t to linear)
   int run_best_test (void);
-  // run best strategy (w.r.t to linear)
 
+  /// run worst strategy (w.r.t to linear)
   int run_worst_test (void);
-  // run worst strategy (w.r.t to linear)
 
+  /// print results
   int print_results (void);
-  // print results
 
+  /// number of command line arguments
   int argc_;
-  // number of command line arguments
 
+  /// the actual command line arguments
   ACE_TCHAR **argv_;
-  // the actual command line arguments
 
+  /// The underlying ORB
   CORBA::ORB_var orb_;
-  // The underlying ORB
 
+  /// invocation strategy (default linear)
   INVOKE_STRATEGY is_;
-  // invocation strategy (default linear)
 
+  /// number of POAs
   CORBA::ULong num_POAs_;
-  // number of POAs
 
+  /// number of objects
   CORBA::ULong num_objs_;
-  // number of objects
 
+  /// number of operations
   CORBA::ULong num_ops_;
-  // number of operations
 
+  /// object references to the Demux_Test objects
   typedef TAO_Intrusive_Ref_Count_Handle<Demux_Test> Demux_Test_Var;
   typedef ACE_Vector<Demux_Test_Var> Demux_Test_Container;
   Demux_Test_Container demux_test_;
-  // object references to the Demux_Test objects
 
+  /// number of times to invoke the request
   CORBA::ULong loop_count_;
-  // number of times to invoke the request
 
+  /// IOR database
   FILE *ior_fp_;
-  // IOR database
 
+  /// temporary results file
   FILE *result_fp_;
-  // temporary results file
 
+  /**
+   * Step for the no. of objects to be skipped while making remote calls
+   * on the given no. of objects.
+   * If the step is 100, a call will be made to every 100th Object.
+   */
   CORBA::ULong step_;
-  // Step for the no. of objects to be skipped while making remote calls
-  // on the given no. of objects.
-  // If the step is 100, a call will be made to every 100th Object.
 
+  /// database of operations
   Operation_DB_Entry op_db_[TAO_DEMUX_TEST_MAX_OPS];
-  // database of operations
 
 };
 
diff --git a/performance-tests/POA/Demux/demux_test_macros.h b/performance-tests/POA/Demux/demux_test_macros.h
index 31bb42ebe80..2e5c678eda0 100644
--- a/performance-tests/POA/Demux/demux_test_macros.h
+++ b/performance-tests/POA/Demux/demux_test_macros.h
@@ -1,22 +1,18 @@
 #ifndef TAO_DEMUX_TEST_MACROS_H
 #define TAO_DEMUX_TEST_MACROS_H
 
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    demux_test_macros.h
-//
-//    constants used by both the server and client
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    demux_test_macros.h
+ *
+ *  $Id$
+ *
+ *  Constants used by both the server and client
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #define TAO_DEMUX_TEST_MAX_POAS  100
 #define TAO_DEMUX_TEST_MAX_OBJS  1000
diff --git a/performance-tests/POA/Demux/demux_test_server.cpp b/performance-tests/POA/Demux/demux_test_server.cpp
index 4fbf97860a0..f77a33ef55a 100644
--- a/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/performance-tests/POA/Demux/demux_test_server.cpp
@@ -1,25 +1,19 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    demux_test_server.cpp
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    demux_test_server.cpp
+ *
+ *  $Id$
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "demux_test_server.h"
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(CodeGen, demux_test_server, "$Id$")
-
 // Constructor
 Demux_Test_Server::Demux_Test_Server (void)
   : argc_ (0),
@@ -200,6 +194,7 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
 
       ACE_OS::memset (poa_name, 0, 128);
       int n_matched = fscanf (this->poa_fp_, "%s", poa_name);
+      ACE_UNUSED_ARG (n_matched);
 
       try
         {
@@ -271,6 +266,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);
+                  ACE_UNUSED_ARG (n_matched);
 
                   ACE_DEBUG ((LM_DEBUG,
                               "Activating Servant with Name : %s\n",
diff --git a/performance-tests/POA/Demux/demux_test_server.h b/performance-tests/POA/Demux/demux_test_server.h
index 6ee675d57e8..89bfd91755b 100644
--- a/performance-tests/POA/Demux/demux_test_server.h
+++ b/performance-tests/POA/Demux/demux_test_server.h
@@ -1,19 +1,15 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    demux_test_server.h
-//
-//    Server-side demux_test class
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    demux_test_server.h
+ *
+ *  $Id$
+ *
+ *  Server-side demux_test class
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef DOORS_DEMUX_TEST_SERVER_H
 #define DOORS_DEMUX_TEST_SERVER_H
@@ -33,76 +29,76 @@
 class Demux_Test_Server
 {
 public:
+  /// ctor
   Demux_Test_Server (void);
-  // ctor
 
+  /// dtor
   ~Demux_Test_Server (void);
-  // dtor
 
+  /// Execute client code.
   int run (void);
-  // Execute client code.
 
+  /// Initialize the communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the communication endpoint with server.
 
+  /// Calculates the statistics by reading different data values from results.dat.
   int calculate_avg_latency (void);
-  // Calculates the statistics by reading different data values from results.dat.
 
 private:
 
+  /// parse command line arguments (if any)
   int parse_args (void);
-  // parse command line arguments (if any)
 
+  /// initialize the naming service
   int init_naming_service (void);
-  // initialize the naming service
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// the ORB
   CORBA::ORB_var orb_;
-  // the ORB
 
+  /// the root POA (we will not have any objects registered with this)
   PortableServer::POA_var root_poa_;
-  // the root POA (we will not have any objects registerd with this)
 
+  /// The POA manager
   PortableServer::POAManager_var poa_mgr_;
-  // The POA manager
 
+  /// An array of child POAs with the next one being the child of the previous
+  /// one
   PortableServer::POA_var child_poa_ [TAO_DEMUX_TEST_MAX_POAS];
-  // An array of child POAs with the next one being the child of the previous
-  // one
 
+  /// An instance of the name client used for resolving the factory
+  /// objects.
   TAO_Naming_Client my_name_client_;
-  // An instance of the name client used for resolving the factory
-  // objects.
 
   //  Demux_Test_i demux_test_[TAO_DEMUX_TEST_MAX_POAS * TAO_DEMUX_TEST_MAX_OBJS];
   // The actual demux_test objects
 
+  /// number of POAs
   CORBA::ULong num_POAs_;
-  // number of POAs
 
+  /// number of objects
   CORBA::ULong  num_objs_;
-  // number of objects
 
+  /// file storing POA names
   FILE *poa_fp_;
-  // file storing POA names
 
+  /// file for storing IORs
   FILE *ior_fp_;
-  // file for storing IORs
 
+  /// file for storing Servant Names.
   FILE *servant_fp_;
-  // file for storing Servant Names.
 
+  /// Use the USER_ID policy for servants as opposed to System ID.
   int use_user_id_;
-  // Use the USER_ID policy for servants as opposed to System ID.
 
+  /// Use the Transient POAs for servant activation as opposed
+  /// to persistent POAs.
   int use_transient_poas_;
-  // Use the Transient POAs for servant activation as opposed
-  // to persistent POAs.
 
 };
 
diff --git a/performance-tests/POA/Demux/server.cpp b/performance-tests/POA/Demux/server.cpp
index 0b0c9a3f9c2..4f0e2c77da3 100644
--- a/performance-tests/POA/Demux/server.cpp
+++ b/performance-tests/POA/Demux/server.cpp
@@ -1,27 +1,18 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    server.cpp
-//
-//    Server-side driver program
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  Server-side driver program
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
 
 #include "demux_test_server.h"
 #include "tao/debug.h"
 
-ACE_RCSID(CodeGen, server, "$Id$")
-
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv [])
 {
   // Set TAO_debug_level to 0 to ensure silent running unless
diff --git a/performance-tests/POA/Implicit_Activation/Factory.cpp b/performance-tests/POA/Implicit_Activation/Factory.cpp
index fd1d73211ef..90025458295 100644
--- a/performance-tests/POA/Implicit_Activation/Factory.cpp
+++ b/performance-tests/POA/Implicit_Activation/Factory.cpp
@@ -4,8 +4,6 @@
 #include "Factory.h"
 #include "Simple.h"
 
-ACE_RCSID(Activation, Factory, "$Id$")
-
 Factory::Factory (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/POA/Implicit_Activation/Makefile.am b/performance-tests/POA/Implicit_Activation/Makefile.am
deleted file mode 100644
index 9349a2c8e34..00000000000
--- a/performance-tests/POA/Implicit_Activation/Makefile.am
+++ /dev/null
@@ -1,139 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Implicit_Activation_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Implicit_Activation_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Factory.h \
-  Simple.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.Implicit_Activation_Collocated.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += collocated
-
-collocated_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-collocated_SOURCES = \
-  Simple.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  collocated.cpp \
-  Simple.h
-
-collocated_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.Implicit_Activation_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Factory.cpp \
-  Simple.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Factory.h \
-  Simple.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/performance-tests/POA/Implicit_Activation/Simple.cpp b/performance-tests/POA/Implicit_Activation/Simple.cpp
index f0b417fa442..e8ab6662579 100644
--- a/performance-tests/POA/Implicit_Activation/Simple.cpp
+++ b/performance-tests/POA/Implicit_Activation/Simple.cpp
@@ -3,8 +3,6 @@
 //
 #include "Simple.h"
 
-ACE_RCSID(Activation, Simple, "$Id$")
-
 Simple::Simple (void)
 {
 }
diff --git a/performance-tests/POA/Implicit_Activation/client.cpp b/performance-tests/POA/Implicit_Activation/client.cpp
index adffd59c87d..d2df111857b 100644
--- a/performance-tests/POA/Implicit_Activation/client.cpp
+++ b/performance-tests/POA/Implicit_Activation/client.cpp
@@ -8,8 +8,6 @@
 #include "ace/Sample_History.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(Activation, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 100;
 int do_dump_history = 0;
@@ -51,7 +49,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/POA/Implicit_Activation/collocated.cpp b/performance-tests/POA/Implicit_Activation/collocated.cpp
index 86e019c4725..95964eeaf45 100644
--- a/performance-tests/POA/Implicit_Activation/collocated.cpp
+++ b/performance-tests/POA/Implicit_Activation/collocated.cpp
@@ -9,8 +9,6 @@
 #include "ace/Sample_History.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(Activation, server, "$Id$")
-
 int niterations = 10000;
 int do_dump_history = 0;
 
@@ -41,7 +39,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/POA/Implicit_Activation/server.cpp b/performance-tests/POA/Implicit_Activation/server.cpp
index 57ed66d4756..9884ddb93ee 100644
--- a/performance-tests/POA/Implicit_Activation/server.cpp
+++ b/performance-tests/POA/Implicit_Activation/server.cpp
@@ -6,8 +6,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(Activation, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/POA/Makefile.am b/performance-tests/POA/Makefile.am
deleted file mode 100644
index 1d12b4bf748..00000000000
--- a/performance-tests/POA/Makefile.am
+++ /dev/null
@@ -1,16 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Create_Reference \
-        Demux \
-        Implicit_Activation \
-        Object_Creation_And_Registration
-
diff --git a/performance-tests/POA/Object_Creation_And_Registration/Makefile.am b/performance-tests/POA/Object_Creation_And_Registration/Makefile.am
deleted file mode 100644
index e77867945e7..00000000000
--- a/performance-tests/POA/Object_Creation_And_Registration/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.registration.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = registration
-
-registration_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-registration_SOURCES = \
-  registration.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-registration_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index e723a7ad997..3e769711f33 100644
--- a/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -1,22 +1,19 @@
-// $Id$
 
-// ================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/POA/Object_Creation_And_Registration
-//
-// = FILENAME
-//    registration.cpp
-//
-// = DESCRIPTION
-//
-//    This test is used to measure the time it takes to register and
-//    activate an object in the POA.
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ================================================================
+//=============================================================================
+/**
+ *  @file    registration.cpp
+ *
+ *  $Id$
+ *
+ *
+ *  This test is used to measure the time it takes to register and
+ *  activate an object in the POA.
+ *
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
 #include "tao/Server_Strategy_Factory.h"
@@ -67,9 +64,12 @@ inline int QuantifyStopRecordingData ()
 #endif /* ACE_WIN32 */
 #endif /* USING_QUANTIFY */
 
+/**
+ * @class test_i
+ *
+ * @brief Oversimplified servant class
+ */
 class test_i : public POA_test
-  // = TITLE
-  //     Oversimplified servant class
 {
 };
 
diff --git a/performance-tests/Pluggable/Makefile.am b/performance-tests/Pluggable/Makefile.am
deleted file mode 100644
index b59759d997b..00000000000
--- a/performance-tests/Pluggable/Makefile.am
+++ /dev/null
@@ -1,112 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Pluggable_Idl.am
-
-BUILT_SOURCES = \
-  PP_TestC.cpp \
-  PP_TestC.h \
-  PP_TestC.inl \
-  PP_TestS.cpp \
-  PP_TestS.h \
-  PP_TestS.inl
-
-CLEANFILES = \
-  PP_Test-stamp \
-  PP_TestC.cpp \
-  PP_TestC.h \
-  PP_TestC.inl \
-  PP_TestS.cpp \
-  PP_TestS.h \
-  PP_TestS.inl
-
-PP_TestC.cpp PP_TestC.h PP_TestC.inl PP_TestS.cpp PP_TestS.h PP_TestS.inl: PP_Test-stamp
-
-PP_Test-stamp: $(srcdir)/PP_Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/PP_Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  PP_Test.idl
-
-## Makefile.Pluggable_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  PP_TestC.cpp \
-  PP_Test_Client.cpp \
-  client.cpp \
-  PP_Test_Client.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Pluggable_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  PP_TestC.cpp \
-  PP_TestS.cpp \
-  PP_Test_Server.cpp \
-  PP_Test_i.cpp \
-  server.cpp \
-  PP_Test_Server.h \
-  PP_Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Pluggable/PP_Test_Client.cpp b/performance-tests/Pluggable/PP_Test_Client.cpp
index 54a4f366372..ce968f029a4 100644
--- a/performance-tests/Pluggable/PP_Test_Client.cpp
+++ b/performance-tests/Pluggable/PP_Test_Client.cpp
@@ -13,8 +13,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(IDL_Cubit, Cubit_Client, "$Id$")
-
 #if defined (ACE_ENABLE_TIMEPROBES)
 
   static const char *PP_Test_Client_Timeprobe_Description[] =
diff --git a/performance-tests/Pluggable/PP_Test_Client.h b/performance-tests/Pluggable/PP_Test_Client.h
index d19bb48fc1a..30359941d3d 100644
--- a/performance-tests/Pluggable/PP_Test_Client.h
+++ b/performance-tests/Pluggable/PP_Test_Client.h
@@ -1,22 +1,18 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Pluggable
-//
-// = FILENAME
-//    PP_Test_Client.h
-//
-// = DESCRIPTION
-//      This class implements some basic no-op twoway and oneway requests
-//      to time the latency of the pluggable protocol implementation.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    PP_Test_Client.h
+ *
+ *  $Id$
+ *
+ *    This class implements some basic no-op twoway and oneway requests
+ *    to time the latency of the pluggable protocol implementation.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _PP_TEST_CLIENT_H
 #define _PP_TEST_CLIENT_H
@@ -29,94 +25,96 @@
 
 #include "PP_TestC.h"
 
+/**
+ * @class PP_Test_Client
+ *
+ * @brief Defines a class that encapsulates behaviour of the PP_Test client
+ * example.  Provides a better understanding of the logic in an
+ * object oriented way.
+ *
+ * This class declares an interface to run the example client for
+ * PP_Teset CORBA server.  All the complexity for initializing the
+ * server is hidden in the class.  Just the run() interface is needed.
+ */
 class PP_Test_Client
 {
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the PP_Test client
-  //    example.  Provides a better understanding of the logic in an
-  //    object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    PP_Teset CORBA server.  All the complexity for initializing the
-  //    server is hidden in the class.  Just the run() interface is needed.
 public:
   // = Constructor and destructor.
+  /// Use <testing_collocation> to control some client's behaviors.
   PP_Test_Client (int shutdown = 0);
-  // Use <testing_collocation> to control some client's behaviors.
 
   ~PP_Test_Client (void);
 
+  /// Execute client example code.
   int run (void);
-  // Execute client example code.
 
+  /// Initialize the client communication endpoint with server.
+  /// <collocation_test_ior> is used to pass in the ior file name.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the client communication endpoint with server.
-  // <collocation_test_ior> is used to pass in the ior file name.
 
 private:
+  /// Function to read the cubit factory ior from a file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the cubit factory ior from a file.
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// Oneway operation test.
   void send_oneway (void);
-  // Oneway operation test.
 
+  /// Twoway operation test.
   void send_void (void);
-  // Twoway operation test.
 
+  /// This method runs only the send_void() test.
   int run_void (void);
-  // This method runs only the send_void() test.
 
+  /// This method runs only the send_oneway() test.
   int run_oneway (void);
-  // This method runs only the send_oneway() test.
 
+  /// Invoke the method with <do_shutdown> != 0 to shutdown the server.
   int shutdown_server (int do_shutdown);
-  // Invoke the method with <do_shutdown> != 0 to shutdown the server.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
+  /// Key of factory obj ref.
   ACE_TCHAR *factory_key_;
-  // Key of factory obj ref.
 
+  /// Number of times to do the send operations.
   CORBA::ULong loop_count_;
-  // Number of times to do the send operations.
 
+  /// Flag to tell server to shutdown.
   int shutdown_;
-  // Flag to tell server to shutdown.
 
+  /// factory pointer for cubit.
   Pluggable_Test_Factory_var factory_;
-  // factory pointer for cubit.
 
+  /// Pluggable_Test obj ref.
   Pluggable_Test_var objref_;
-  // Pluggable_Test obj ref.
 
+  /// # of calls made to functions.
   CORBA::ULong call_count_;
-  // # of calls made to functions.
 
+  /// # of errors incurred in the lifetime of the application.
   CORBA::ULong error_count_;
-  // # of errors incurred in the lifetime of the application.
 
+  /// File from which to obtain the IOR.
   FILE *factory_ior_file_;
-  // File from which to obtain the IOR.
 
+  /// File handle to read the IOR.
   ACE_HANDLE f_handle_;
-  // File handle to read the IOR.
 
+  /// Run only the cube_void() test.
   int only_void_;
-  // Run only the cube_void() test.
 
+  /// Run only the cube_oneway() test.
   int only_oneway_;
-  // Run only the cube_oneway() test.
 };
 
 #endif /* _PP_TEST_CLIENT_H */
diff --git a/performance-tests/Pluggable/PP_Test_Server.cpp b/performance-tests/Pluggable/PP_Test_Server.cpp
index 973f2e928db..e6dc2fff394 100644
--- a/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -5,8 +5,6 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(IDL_Cubit, Cubit_Server, "$Id$")
-
 PP_Test_Server::PP_Test_Server (void)
   : ior_output_file_ (0)
 {
diff --git a/performance-tests/Pluggable/PP_Test_Server.h b/performance-tests/Pluggable/PP_Test_Server.h
index 5da32da08c2..fb3d184dabf 100644
--- a/performance-tests/Pluggable/PP_Test_Server.h
+++ b/performance-tests/Pluggable/PP_Test_Server.h
@@ -1,22 +1,18 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Pluggable
-//
-// = FILENAME
-//    PP_Test_Server.h
-//
-// = DESCRIPTION
-//      This class implements simple oneway and twoway no-op requests
-//      to time latency and overhead of the pluggable protocol functionality.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    PP_Test_Server.h
+ *
+ *  $Id$
+ *
+ *    This class implements simple oneway and twoway no-op requests
+ *    to time latency and overhead of the pluggable protocol functionality.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _PP_TEST_SERVER_H
 #define _PP_TEST_SERVER_H
@@ -30,52 +26,54 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "PP_Test_i.h"
 
+/**
+ * @class PP_Test_Server
+ *
+ * @brief Defines a server class that implements the functionality
+ * of a server process as an object.
+ *
+ * The interface is quite simple. A server program has to call
+ * init to initialize the server's state and then call run
+ * to run the orb.
+ */
 class PP_Test_Server
 {
-  // = TITLE
-  //   Defines a server class that implements the functionality
-  //   of a server process as an object.
-  //
-  // = DESCRIPTION
-  //   The interface is quite simple. A server program has to call
-  //   init to initialize the server's state and then call run
-  //   to run the orb.
 public:
   // = Initialization and termination methods.
+  /// Default constructor
   PP_Test_Server (void);
-  // Default constructor
 
+  /// Destructor
   ~PP_Test_Server (void);
-  // Destructor
 
+  /// Initialize the server state - parsing arguments, etc.
   int init (int argc,
             ACE_TCHAR **argv);
-  // Initialize the server state - parsing arguments, etc.
 
+  /// Run the orb
   int run (void);
-  // Run the orb
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// File to output the cubit factory IOR.
   FILE* ior_output_file_;
-  // File to output the cubit factory IOR.
 
+  /// The ORB manager.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
 
+  /// Implementation object of the Pluggable Test factory.
   Pluggable_Test_Factory_i *factory_impl_;
-  // Implementation object of the Pluggable Test factory.
 
+  /// ID of the factory.
   CORBA::String_var factory_id_;
-  // ID of the factory.
 
+  /// Number of commandline arguments.
   int argc_;
-  // Number of commandline arguments.
 
+  /// commandline arguments.
   ACE_TCHAR **argv_;
-  // commandline arguments.
 };
 
 #endif /* _PP_TEST_SERVER_H */
diff --git a/performance-tests/Pluggable/PP_Test_i.cpp b/performance-tests/Pluggable/PP_Test_i.cpp
index 41862c2dd6f..fb9bd0df41d 100644
--- a/performance-tests/Pluggable/PP_Test_i.cpp
+++ b/performance-tests/Pluggable/PP_Test_i.cpp
@@ -1,24 +1,19 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Pluggable
-//
-// = FILENAME
-//    PP_Test_i.cpp
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    PP_Test_i.cpp
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "tao/Timeprobe.h"
 #include "tao/ORB_Constants.h"
 #include "PP_Test_i.h"
 
-ACE_RCSID(IDL_Cubit, Cubit_Client, "$Id$")
-
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *PP_Test_i_Timeprobe_Description[] =
diff --git a/performance-tests/Pluggable/PP_Test_i.h b/performance-tests/Pluggable/PP_Test_i.h
index 51e7c8b4b4a..f964518c379 100644
--- a/performance-tests/Pluggable/PP_Test_i.h
+++ b/performance-tests/Pluggable/PP_Test_i.h
@@ -1,69 +1,70 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Pluggable
-//
-// = FILENAME
-//    PP_Test_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    PP_Test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _PP_TEST_I_H
 #define _PP_TEST_I_H
 
 #include "PP_TestS.h"
 
+/**
+ * @class PP_Test_i
+ *
+ * @brief Illustrates how to integrate a servant with the generated
+ * skeleton.
+ *
+ * Implementation of the example at the servant side.
+ * Sends a no-op oneway and twoway request.
+ */
 class PP_Test_i : public POA_Pluggable_Test
 {
-  // = TITLE
-  //    Illustrates how to integrate a servant with the generated
-  //    skeleton.
-  //
-  // = DESCRIPTION
-  //    Implementation of the example at the servant side.
-  //    Sends a no-op oneway and twoway request.
 public:
+  /// Constructor
   PP_Test_i (CORBA::ORB_ptr orb);
-  // Constructor
 
+  /// Destructor
   ~PP_Test_i (void);
-  // Destructor
 
+  /// Test a oneway call.
   virtual void send_oneway (void);
-  // Test a oneway call.
 
+  /// Test a twoway call.
   virtual void send_void (void);
-  // Test a twoway call.
 
+  /// Shutdown routine.
   virtual void shutdown (void);
-  // Shutdown routine.
 
 protected:
+  /// Keep a pointer to the ORB so we can shut it down.
   CORBA::ORB_var orb_;
-  // Keep a pointer to the ORB so we can shut it down.
 };
 
+/**
+ * @class Pluggable_Test_Factory_i:
+ *
+ * @brief Pluggable_Test_Factory_i
+ *
+ * Factory object returning the Pluggable_Test objrefs
+ */
 class Pluggable_Test_Factory_i: public POA_Pluggable_Test_Factory
 {
-  // = TITLE
-  //   Pluggable_Test_Factory_i
-  //
-  // = DESCRIPTION
-  //   Factory object returning the Pluggable_Test objrefs
 public:
+  /// Constructor.
   Pluggable_Test_Factory_i (CORBA::ORB_ptr orb);
-  // Constructor.
 
+  /// Destructor.
   ~Pluggable_Test_Factory_i (void);
-  // Destructor.
 
+  /// Make a Pluggable Test object.
   virtual Pluggable_Test_ptr make_pluggable_test (void);
-  // Make a Pluggable Test object.
 
 private:
   PP_Test_i my_pluggable_test_;
diff --git a/performance-tests/Pluggable/client.cpp b/performance-tests/Pluggable/client.cpp
index b44ed950463..1eb80035a87 100644
--- a/performance-tests/Pluggable/client.cpp
+++ b/performance-tests/Pluggable/client.cpp
@@ -3,8 +3,6 @@
 #include "PP_Test_Client.h"
 #include "tao/Timeprobe.h"
 
-ACE_RCSID(IDL_Cubit, client, "$Id$")
-
 // This function runs the client test.
 
 int
diff --git a/performance-tests/Pluggable/server.cpp b/performance-tests/Pluggable/server.cpp
index 7acfd1e6caa..ecb07808724 100644
--- a/performance-tests/Pluggable/server.cpp
+++ b/performance-tests/Pluggable/server.cpp
@@ -3,8 +3,6 @@
 #include "PP_Test_Server.h"
 #include "tao/Timeprobe.h"
 
-ACE_RCSID(IDL_Cubit, server, "$Id$")
-
 // This runs the server test.
 
 int
@@ -34,13 +32,11 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::SystemException& sysex)
     {
-      ACE_UNUSED_ARG (sysex);
       sysex._tao_print_exception ("System Exception");
       return -1;
     }
   catch (const CORBA::UserException& userex)
     {
-      ACE_UNUSED_ARG (userex);
       userex._tao_print_exception ("User Exception");
       return -1;
     }
diff --git a/performance-tests/Protocols/Makefile.am b/performance-tests/Protocols/Makefile.am
deleted file mode 100644
index 484b916a9dc..00000000000
--- a/performance-tests/Protocols/Makefile.am
+++ /dev/null
@@ -1,144 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Protocols_IDL.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Protocols_Distributor.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += distributor
-
-distributor_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-distributor_SOURCES = \
-  distributor.cpp \
-  testC.cpp \
-  testS.cpp
-
-distributor_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.Protocols_Receiver.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
-
-receiver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-receiver_SOURCES = \
-  receiver.cpp \
-  testC.cpp \
-  testS.cpp
-
-receiver_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.Protocols_Sender.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += sender
-
-sender_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../../tests/RTCORBA/Diffserv
-
-sender_SOURCES = \
-  sender.cpp \
-  testC.cpp
-
-sender_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-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/performance-tests/Protocols/altq.conf b/performance-tests/Protocols/altq.conf
index b0755750527..0926b8f58bc 100644
--- a/performance-tests/Protocols/altq.conf
+++ b/performance-tests/Protocols/altq.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 #
 # priority queue configuration for fxp2 (100Mbps ethernet)
 #     tos 80: high priority
@@ -5,6 +7,6 @@
 #
 interface fxp2 bandwidth 100M priq
 
-class priq fxp2 high_class NULL priority 15 
+class priq fxp2 high_class NULL priority 15
         filter fxp2 high_class 0 0 0 0 0 tos 80 tosmask 0xfc
 class priq fxp2 low_class NULL priority 0 default red
diff --git a/performance-tests/Protocols/lksctp_params.conf b/performance-tests/Protocols/lksctp_params.conf
index 45205a956f5..e5a5f0e0954 100644
--- a/performance-tests/Protocols/lksctp_params.conf
+++ b/performance-tests/Protocols/lksctp_params.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 PREFIX=
 association_max_retrans=25
 hb_interval=10
diff --git a/performance-tests/Protocols/receiver.cpp b/performance-tests/Protocols/receiver.cpp
index 598f93f9b1d..a17407b25c3 100644
--- a/performance-tests/Protocols/receiver.cpp
+++ b/performance-tests/Protocols/receiver.cpp
@@ -353,7 +353,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         root_poa.in ());
 
       PortableServer::ServantBase_var safe_servant (servant);
-      ACE_UNUSED_ARG (safe_servant);
 
       test_var test =
         servant->_this ();
diff --git a/performance-tests/Protocols/sctp_params.conf b/performance-tests/Protocols/sctp_params.conf
index a786b188072..096e1da08bb 100644
--- a/performance-tests/Protocols/sctp_params.conf
+++ b/performance-tests/Protocols/sctp_params.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 PREFIX=sctp_
 assoc_max_retrans=25
 heartbeat_itvl=1
diff --git a/performance-tests/Protocols/svc.conf b/performance-tests/Protocols/svc.conf
index 711df131ebc..f0dd5818cc3 100644
--- a/performance-tests/Protocols/svc.conf
+++ b/performance-tests/Protocols/svc.conf
@@ -1 +1,3 @@
+# $Id$
+
 dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory()
diff --git a/performance-tests/Protocols/test.idl b/performance-tests/Protocols/test.idl
index e2836f798ee..33f1a21606a 100644
--- a/performance-tests/Protocols/test.idl
+++ b/performance-tests/Protocols/test.idl
@@ -13,7 +13,7 @@ interface test
   oneway void oneway_sync ();
 
   void twoway_sync ();
-  
+
   void shutdown ();
 
   typedef sequence<octet> octets;
@@ -21,8 +21,8 @@ interface test
   oneway void oneway_method (in long session_id,
            in unsigned long iteration,
            in octets payload);
-  
+
   void twoway_method (inout long session_id,
           inout unsigned long iteration,
-          inout octets payload);  
+          inout octets payload);
 };
diff --git a/performance-tests/Protocols/toggle_link.pl b/performance-tests/Protocols/toggle_link.pl
index 88908ac5052..0f46435c770 100755
--- a/performance-tests/Protocols/toggle_link.pl
+++ b/performance-tests/Protocols/toggle_link.pl
@@ -25,7 +25,7 @@ $start_seconds = timelocal ($now->sec, $now->min, $now->hour, $now->mday, $now->
 print_with_time ("L1 UP");
 system ($L1_UP);
 
-print_with_time ("L2 DOWN");    
+print_with_time ("L2 DOWN");
 system ($L2_DOWN);
 
 select undef, undef, undef, $phasetime;
@@ -57,7 +57,7 @@ for (;;)
     select undef, undef, undef, $sleeptime;
 }
 
-sub print_with_time 
+sub print_with_time
 {
     $now = localtime;
     $now_seconds = timelocal ($now->sec, $now->min, $now->hour, $now->mday, $now->mon, $now->year);
diff --git a/performance-tests/RTCorba/Makefile.am b/performance-tests/RTCorba/Makefile.am
deleted file mode 100644
index 6994b010362..00000000000
--- a/performance-tests/RTCorba/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Multiple_Endpoints \
-        Oneways \
-        Thread_Pool
-
diff --git a/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am b/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am
deleted file mode 100644
index 3c919ee4ae0..00000000000
--- a/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am
+++ /dev/null
@@ -1,81 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RTCORBA_Common.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,export_macro=RTCORBA_COMMON_Export -Wb,export_include=rtcorba_common_export.h $(srcdir)/test.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libRTCORBA_Common.la
-
-libRTCORBA_Common_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DRTCORBA_COMMON_BUILD_DLL
-
-libRTCORBA_Common_la_SOURCES = \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp
-
-noinst_HEADERS = \
-  rtcorba_common_export.h \
-  test.idl \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h \
-  test_i.inl
-
-endif BUILD_RT_CORBA
-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/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp b/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
index d268634d3d4..6f511ae008a 100644
--- a/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
+++ b/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
@@ -8,8 +8,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Latency, test_i, "$Id$")
-
 void
 Test_i::test_method (CORBA::Long id)
 {
diff --git a/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h b/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
index e4cecd82b54..aa9c06f130a 100644
--- a/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
+++ b/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/TPP
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_TPP_TEST_I_H
 #define TAO_TPP_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Test_i
+ *
+ * @brief An implementation for the Test interface
+ *
+ * Implements the Test interface in test.idl
+ */
 class RTCORBA_COMMON_Export Test_i : public POA_Test
 {
-  // = TITLE
-  //   An implementation for the Test interface
-  //
-  // = DESCRIPTION
-  //   Implements the Test interface in test.idl
-  //
 public:
+  /// ctor
   Test_i (void);
-  // ctor
 
   // = The Test methods.
   void test_method (CORBA::Long id);
diff --git a/performance-tests/RTCorba/Multiple_Endpoints/Makefile.am b/performance-tests/RTCorba/Multiple_Endpoints/Makefile.am
deleted file mode 100644
index 980c96039b4..00000000000
--- a/performance-tests/RTCorba/Multiple_Endpoints/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Common \
-        Orb_Per_Priority \
-        Single_Endpoint
-
diff --git a/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am b/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am
deleted file mode 100644
index 42650063c05..00000000000
--- a/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am
+++ /dev/null
@@ -1,95 +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:
-## ../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.ORB_Per_Priority_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Common \
-  -I../Common
-
-client_SOURCES = \
-  client.cpp
-
-client_LDFLAGS = \
-  -L../Common
-
-client_LDADD = \
-  $(top_builddir)/performance-tests/RTCorba/Multiple_Endpoints/Common/libRTCORBA_Common.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.ORB_Per_Priority_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Common \
-  -I../Common
-
-server_SOURCES = \
-  server.cpp
-
-server_LDFLAGS = \
-  -L../Common
-
-server_LDADD = \
-  $(top_builddir)/performance-tests/RTCorba/Multiple_Endpoints/Common/libRTCORBA_Common.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index 949a1f5123a..a9fad64ef4f 100644
--- a/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -14,8 +14,6 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Latency, client, "$Id$")
-
 class Client : public ACE_Task_Base
 {
   // = TITLE
@@ -110,7 +108,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -253,7 +251,7 @@ Client::svc (void)
       char ior[100];
       ACE_OS::sprintf (ior,
                        "%s_%d",
-                       ior_base,
+                       ACE_TEXT_ALWAYS_CHAR (ior_base),
                        priorities[this->id_]);
 
       CORBA::Object_var object =
diff --git a/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf b/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf
index e51746649af..7d577fed52b 100644
--- a/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf
+++ b/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf
@@ -2,6 +2,6 @@
 #
 
 static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
 static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct"
 
diff --git a/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml b/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml
index 751f637a827..7fa80454210 100644
--- a/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml
+++ b/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml
@@ -4,6 +4,6 @@
  <!--  $Id$ -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
  <static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
index 029c40b208b..e6556096ce5 100644
--- a/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
+++ b/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
@@ -10,8 +10,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(TPP, server, "$Id$")
-
 class Server : public ACE_Task_Base
 {
   // = TITLE
@@ -78,7 +76,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -240,7 +238,7 @@ Server::svc (void)
       char file_name[100];
       ACE_OS::sprintf (file_name,
                        "%s_%d",
-                       ior_output_file_base,
+                       ACE_TEXT_ALWAYS_CHAR (ior_output_file_base),
                        this->priority_);
 
       // Output the ior to a file.
diff --git a/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am b/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am
deleted file mode 100644
index 55a4cc3991a..00000000000
--- a/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am
+++ /dev/null
@@ -1,95 +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:
-## ../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.Single_Endpoint_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Common \
-  -I../Common
-
-client_SOURCES = \
-  client.cpp
-
-client_LDFLAGS = \
-  -L../Common
-
-client_LDADD = \
-  $(top_builddir)/performance-tests/RTCorba/Multiple_Endpoints/Common/libRTCORBA_Common.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.Single_Endpoint_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Common \
-  -I../Common
-
-server_SOURCES = \
-  server.cpp
-
-server_LDFLAGS = \
-  -L../Common
-
-server_LDADD = \
-  $(top_builddir)/performance-tests/RTCorba/Multiple_Endpoints/Common/libRTCORBA_Common.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index b6513c6e159..02d77305250 100644
--- a/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -13,8 +13,6 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Latency, client, "$Id$")
-
 class Client : public ACE_Task_Base
 {
   // = TITLE
@@ -110,7 +108,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
index 831838a5286..cbe061ebdb9 100644
--- a/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
+++ b/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/RTCorba/Oneways/Makefile.am b/performance-tests/RTCorba/Oneways/Makefile.am
deleted file mode 100644
index bd593b38331..00000000000
--- a/performance-tests/RTCorba/Oneways/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Reliable
-
diff --git a/performance-tests/RTCorba/Oneways/Reliable/Makefile.am b/performance-tests/RTCorba/Oneways/Reliable/Makefile.am
deleted file mode 100644
index b4435428afc..00000000000
--- a/performance-tests/RTCorba/Oneways/Reliable/Makefile.am
+++ /dev/null
@@ -1,128 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Reliable_Oneways_Idl_RT.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Reliable_Oneways_Client_RT.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Reliable_Oneways_Server_RT.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index c856080250a..75f03af449f 100644
--- a/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -14,12 +14,6 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (Reliable,
-           client,
-           "$Id$")
-
-
 #define USING_TIMERS
 //#define USING_QUANTIFY
 
@@ -362,7 +356,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                        argv [0]),
                       -1);
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/RTCorba/Oneways/Reliable/client_test.pl b/performance-tests/RTCorba/Oneways/Reliable/client_test.pl
index c82766dbfcc..96394cdac44 100755
--- a/performance-tests/RTCorba/Oneways/Reliable/client_test.pl
+++ b/performance-tests/RTCorba/Oneways/Reliable/client_test.pl
@@ -91,7 +91,7 @@ if ($all == 1) {
 foreach $type (@types) {
     my $transport = "";
     my $shutdown = "";
-    
+
     if ($type == "none" || $type == "transport") {
         $transport = "-ORBNodelay 0";
     }
diff --git a/performance-tests/RTCorba/Oneways/Reliable/run_test.pl b/performance-tests/RTCorba/Oneways/Reliable/run_test.pl
index 2f5effbe44e..5a0a2cdd861 100755
--- a/performance-tests/RTCorba/Oneways/Reliable/run_test.pl
+++ b/performance-tests/RTCorba/Oneways/Reliable/run_test.pl
@@ -117,7 +117,7 @@ if ($client->PutFile ($iorbase) == -1) {
 if ($all == 1) {
     foreach $bufsize (@bufsizes) {
         print STDERR "\n***************** STARTING TEST ******************\n";
-        
+
         $CL->Arguments ("-k file://$client_iorfile -ORBNodelay 0 -l $level ".
                         "-t none -i $iterations -m $bufsize");
 
@@ -138,7 +138,7 @@ foreach $type (@types) {
     print STDERR "\n***************** STARTING TEST ******************\n";
 
     my $transport = "";
-    
+
     if ($type == "none" || $type == "transport") {
         $transport = "-ORBNodelay 0";
     }
diff --git a/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/performance-tests/RTCorba/Oneways/Reliable/server.cpp
index fd57e2baefb..944c06db6ce 100644
--- a/performance-tests/RTCorba/Oneways/Reliable/server.cpp
+++ b/performance-tests/RTCorba/Oneways/Reliable/server.cpp
@@ -6,8 +6,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(Reliable, server, "$Id$")
-
 // IOR file name
 static const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
@@ -34,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp b/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
index 68c610f8497..8abc4a2c00b 100644
--- a/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
+++ b/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
@@ -3,8 +3,6 @@
 #include "test_i.h"
 #include "ace/ACE.h"
 
-ACE_RCSID(Reliable, test_i, "$Id$")
-
 #if !defined(__ACE_INLINE__)
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/performance-tests/RTCorba/Oneways/Reliable/test_i.h b/performance-tests/RTCorba/Oneways/Reliable/test_i.h
index 2c9998d16c4..5f5a56a1a83 100644
--- a/performance-tests/RTCorba/Oneways/Reliable/test_i.h
+++ b/performance-tests/RTCorba/Oneways/Reliable/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/performance-tests/RTCorba/Oneways/Reliable
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
 
 #ifndef TAO_RELIABLE_TEST_I_H
 #define TAO_RELIABLE_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Test_i
+ *
+ * @brief An implementation for the Test interface
+ *
+ * Implements the Test interface in test.idl
+ */
 class Test_i : public POA_Test
 {
-  // = TITLE
-  //   An implementation for the Test interface
-  //
-  // = DESCRIPTION
-  //   Implements the Test interface in test.idl
-  //
 public:
+  /// ctor
   Test_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Test methods.
   void oneway_payload_test (const Test::data &d);
@@ -40,8 +38,8 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/performance-tests/RTCorba/Thread_Pool/Makefile.am b/performance-tests/RTCorba/Thread_Pool/Makefile.am
deleted file mode 100644
index cb646cef91d..00000000000
--- a/performance-tests/RTCorba/Thread_Pool/Makefile.am
+++ /dev/null
@@ -1,116 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Thread_Pool_RTCorba_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Thread_Pool_RTCorba_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.Thread_Pool_RTCorba_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/performance-tests/RTCorba/Thread_Pool/client.cpp b/performance-tests/RTCorba/Thread_Pool/client.cpp
index 9887b381519..61875507ba3 100644
--- a/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -18,8 +18,6 @@
 #include "tests/RTCORBA/check_supported_priorities.cpp"
 #include "ace/Event.h"
 
-ACE_RCSID(Thread_Pool, client, "$Id$")
-
 enum Priority_Setting
 {
   AT_THREAD_CREATION = 0,
diff --git a/performance-tests/RTCorba/Thread_Pool/native-svc.conf b/performance-tests/RTCorba/Thread_Pool/native-svc.conf
index cfda9a19500..5445ce233d8 100644
--- a/performance-tests/RTCorba/Thread_Pool/native-svc.conf
+++ b/performance-tests/RTCorba/Thread_Pool/native-svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # For testing of RT threads (with native priority)
 static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM"
 
diff --git a/performance-tests/RTCorba/Thread_Pool/server.cpp b/performance-tests/RTCorba/Thread_Pool/server.cpp
index 53bb3093a7b..a4e9993fec6 100644
--- a/performance-tests/RTCorba/Thread_Pool/server.cpp
+++ b/performance-tests/RTCorba/Thread_Pool/server.cpp
@@ -11,8 +11,6 @@
 #include "tests/RTCORBA/common_args.cpp"
 #include "tests/RTCORBA/check_supported_priorities.cpp"
 
-ACE_RCSID(Thread_Pools, server, "$Id$")
-
 class test_i :
   public POA_test
 {
diff --git a/performance-tests/RTCorba/Thread_Pool/svc.conf b/performance-tests/RTCorba/Thread_Pool/svc.conf
index dbb5dad8ef0..5669945b51d 100644
--- a/performance-tests/RTCorba/Thread_Pool/svc.conf
+++ b/performance-tests/RTCorba/Thread_Pool/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # Options for exclusive transport strategy
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE"
 
diff --git a/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am b/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
deleted file mode 100644
index 37746c4b131..00000000000
--- a/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
+++ /dev/null
@@ -1,129 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Single_Threaded_AMH_Sequence_Idl.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Single_Threaded_AMH_Sequence_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Single_Threaded_AMH_Sequence_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp b/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
index aa7bdcd9c85..914a99eaf30 100644
--- a/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
+++ b/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
@@ -3,8 +3,6 @@
 //
 #include "Roundtrip.h"
 
-ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
index 63d045051bb..eced1d79d7b 100644
--- a/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
+++ b/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
@@ -11,8 +11,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(AMH_Single_Threaded_Latency, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 100;
 int do_dump_history = 0;
@@ -76,7 +74,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp b/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
index 0196426aab0..02c1d4c245b 100644
--- a/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
+++ b/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
@@ -7,8 +7,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/AMI/Makefile.am b/performance-tests/Sequence_Latency/AMI/Makefile.am
deleted file mode 100644
index 5fb14ff1301..00000000000
--- a/performance-tests/Sequence_Latency/AMI/Makefile.am
+++ /dev/null
@@ -1,137 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.ami_sequence_idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.ami_sequence_client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Roundtrip_Handler.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Roundtrip_Handler.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.ami_sequence_server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp b/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
index 32638155971..2183a09289f 100644
--- a/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
+++ b/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
@@ -3,8 +3,6 @@
 //
 #include "Roundtrip.h"
 
-ACE_RCSID(AMI_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp b/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
index 51d7babe99e..e229b3aa0b9 100644
--- a/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
+++ b/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
@@ -4,8 +4,6 @@
 #include "Roundtrip_Handler.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID(AMI_Latency, Roundtrip, "$Id$")
-
 Roundtrip_Handler::Roundtrip_Handler (int expected_callbacks)
   : pending_callbacks_ (expected_callbacks)
 {
diff --git a/performance-tests/Sequence_Latency/AMI/Server_Task.cpp b/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
index 157dbe15c4f..3ea05031cd0 100644
--- a/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
+++ b/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
@@ -3,8 +3,6 @@
 //
 #include "Server_Task.h"
 
-ACE_RCSID(AMI_Latency, Server_Task, "$Id$")
-
 Server_Task::Server_Task (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Sequence_Latency/AMI/client.cpp b/performance-tests/Sequence_Latency/AMI/client.cpp
index a9e23b6a036..66d160cee86 100644
--- a/performance-tests/Sequence_Latency/AMI/client.cpp
+++ b/performance-tests/Sequence_Latency/AMI/client.cpp
@@ -10,12 +10,6 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (AMI,
-           client,
-           "$Id$")
-
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 ACE_hrtime_t throughput_base;
@@ -72,7 +66,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/AMI/server.cpp b/performance-tests/Sequence_Latency/AMI/server.cpp
index 9fab151f83c..e5cebc42463 100644
--- a/performance-tests/Sequence_Latency/AMI/server.cpp
+++ b/performance-tests/Sequence_Latency/AMI/server.cpp
@@ -8,8 +8,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(AMI_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 int nthreads = 4;
 
@@ -40,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/DII/Makefile.am b/performance-tests/Sequence_Latency/DII/Makefile.am
deleted file mode 100644
index 56a322af82d..00000000000
--- a/performance-tests/Sequence_Latency/DII/Makefile.am
+++ /dev/null
@@ -1,124 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.DII_Sequence_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.DII_Sequence_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.DII_Sequence_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Sequence_Latency/DII/Roundtrip.cpp b/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
index 3af55faf3a8..2183a09289f 100644
--- a/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
+++ b/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
@@ -3,8 +3,6 @@
 //
 #include "Roundtrip.h"
 
-ACE_RCSID(DII_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Sequence_Latency/DII/client.cpp b/performance-tests/Sequence_Latency/DII/client.cpp
index 102c0aac8d4..867996dda54 100644
--- a/performance-tests/Sequence_Latency/DII/client.cpp
+++ b/performance-tests/Sequence_Latency/DII/client.cpp
@@ -15,11 +15,6 @@
 #include "ace/Sample_History.h"
 #include "ace/OS_NS_errno.h"
 
-
-ACE_RCSID (DII,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 100;
 int do_dump_history = 0;
@@ -82,7 +77,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/DII/server.cpp b/performance-tests/Sequence_Latency/DII/server.cpp
index 5028fe91caa..02c1d4c245b 100644
--- a/performance-tests/Sequence_Latency/DII/server.cpp
+++ b/performance-tests/Sequence_Latency/DII/server.cpp
@@ -7,8 +7,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(DII_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/DII/svc.conf b/performance-tests/Sequence_Latency/DII/svc.conf
index 557c16b5caf..1b3ec40e989 100644
--- a/performance-tests/Sequence_Latency/DII/svc.conf
+++ b/performance-tests/Sequence_Latency/DII/svc.conf
@@ -2,5 +2,5 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
diff --git a/performance-tests/Sequence_Latency/DII/svc.conf.xml b/performance-tests/Sequence_Latency/DII/svc.conf.xml
index 7188391fbb8..c10d08fced6 100644
--- a/performance-tests/Sequence_Latency/DII/svc.conf.xml
+++ b/performance-tests/Sequence_Latency/DII/svc.conf.xml
@@ -5,6 +5,6 @@
  <!--  $Id$ -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/Sequence_Latency/DSI/Makefile.am b/performance-tests/Sequence_Latency/DSI/Makefile.am
deleted file mode 100644
index 38e86451065..00000000000
--- a/performance-tests/Sequence_Latency/DSI/Makefile.am
+++ /dev/null
@@ -1,122 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.DSI_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.DSI_Sequence_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.DSI_Sequence_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp b/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
index 8404810a854..044389579ff 100644
--- a/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
+++ b/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
@@ -9,8 +9,6 @@
 #include "Roundtrip.h"
 #include "tao/DynamicInterface/Server_Request.h"
 
-ACE_RCSID(DSI_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Sequence_Latency/DSI/client.cpp b/performance-tests/Sequence_Latency/DSI/client.cpp
index d6831c19082..4cce1f55a25 100644
--- a/performance-tests/Sequence_Latency/DSI/client.cpp
+++ b/performance-tests/Sequence_Latency/DSI/client.cpp
@@ -13,8 +13,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(DSI_Latency, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 100;
 int do_dump_history = 0;
@@ -75,7 +73,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/DSI/server.cpp b/performance-tests/Sequence_Latency/DSI/server.cpp
index 98413d4fb7e..db1e0e0b512 100644
--- a/performance-tests/Sequence_Latency/DSI/server.cpp
+++ b/performance-tests/Sequence_Latency/DSI/server.cpp
@@ -7,8 +7,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(DSI_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/DSI/svc.conf b/performance-tests/Sequence_Latency/DSI/svc.conf
index 557c16b5caf..1b3ec40e989 100644
--- a/performance-tests/Sequence_Latency/DSI/svc.conf
+++ b/performance-tests/Sequence_Latency/DSI/svc.conf
@@ -2,5 +2,5 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
diff --git a/performance-tests/Sequence_Latency/DSI/svc.conf.xml b/performance-tests/Sequence_Latency/DSI/svc.conf.xml
index d35a5ac7473..24c49a25937 100644
--- a/performance-tests/Sequence_Latency/DSI/svc.conf.xml
+++ b/performance-tests/Sequence_Latency/DSI/svc.conf.xml
@@ -5,6 +5,6 @@
  <!--  $Id$ -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/Sequence_Latency/Deferred/Makefile.am b/performance-tests/Sequence_Latency/Deferred/Makefile.am
deleted file mode 100644
index c936ef7b8d7..00000000000
--- a/performance-tests/Sequence_Latency/Deferred/Makefile.am
+++ /dev/null
@@ -1,124 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Deferred_Sequence_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Deferred_Sequence_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Deferred_Sequence_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp b/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
index 55185c7c4ba..2183a09289f 100644
--- a/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
+++ b/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
@@ -3,8 +3,6 @@
 //
 #include "Roundtrip.h"
 
-ACE_RCSID(Deferred_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Sequence_Latency/Deferred/client.cpp b/performance-tests/Sequence_Latency/Deferred/client.cpp
index a90c4f8a80b..90a40dcf4eb 100644
--- a/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ b/performance-tests/Sequence_Latency/Deferred/client.cpp
@@ -17,10 +17,6 @@
 #include "ace/Sample_History.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (Deferred,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 1000;
 int burst = 10;
@@ -90,7 +86,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/Deferred/server.cpp b/performance-tests/Sequence_Latency/Deferred/server.cpp
index 344eaf2c5af..02c1d4c245b 100644
--- a/performance-tests/Sequence_Latency/Deferred/server.cpp
+++ b/performance-tests/Sequence_Latency/Deferred/server.cpp
@@ -7,8 +7,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Deferred_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/Deferred/svc.conf b/performance-tests/Sequence_Latency/Deferred/svc.conf
index c15a02cf58f..ee3d894e6d1 100644
--- a/performance-tests/Sequence_Latency/Deferred/svc.conf
+++ b/performance-tests/Sequence_Latency/Deferred/svc.conf
@@ -2,5 +2,4 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBProfileLock null"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
diff --git a/performance-tests/Sequence_Latency/Deferred/svc.conf.xml b/performance-tests/Sequence_Latency/Deferred/svc.conf.xml
index a9d9071cbd8..441a106aacf 100644
--- a/performance-tests/Sequence_Latency/Deferred/svc.conf.xml
+++ b/performance-tests/Sequence_Latency/Deferred/svc.conf.xml
@@ -5,6 +5,5 @@
  <!--  $Id$ -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/Sequence_Latency/Makefile.am b/performance-tests/Sequence_Latency/Makefile.am
deleted file mode 100644
index f3e5d4f61bb..00000000000
--- a/performance-tests/Sequence_Latency/Makefile.am
+++ /dev/null
@@ -1,20 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AMH_Single_Threaded \
-        AMI \
-        DII \
-        DSI \
-        Deferred \
-        Single_Threaded \
-        Thread_Per_Connection \
-        Thread_Pool
-
diff --git a/performance-tests/Sequence_Latency/Sequence_Operations_Time/README.txt b/performance-tests/Sequence_Latency/Sequence_Operations_Time/README.txt
new file mode 100644
index 00000000000..6ccd9d496ab
--- /dev/null
+++ b/performance-tests/Sequence_Latency/Sequence_Operations_Time/README.txt
@@ -0,0 +1,20 @@
+// $Id$
+
+This test is used to validate the peformance of sequence copying.
+
+The motivation of this test is that a comparison between DOC & OCI's
+release of TAO versus a different ORB showed TAO had a performance
+deficit. The performance was improved by using shallow copys for some
+sequences, and this test can be used to measure the performance
+improvements.
+
+Output is written to stderr, and can be either easy to read text, or
+CSV format for import into a spreadsheet.
+
+To run the test, use the command line:
+
+./test
+
+for CSV:
+
+./test -csv
diff --git a/performance-tests/Sequence_Latency/Sequence_Operations_Time/Sequence_Ops_Time.mpc b/performance-tests/Sequence_Latency/Sequence_Operations_Time/Sequence_Ops_Time.mpc
new file mode 100644
index 00000000000..38c4e767850
--- /dev/null
+++ b/performance-tests/Sequence_Latency/Sequence_Operations_Time/Sequence_Ops_Time.mpc
@@ -0,0 +1,25 @@
+// -*- MPC -*-
+// $Id$
+
+project(*idl): taoidldefaults {
+  IDL_Files {
+    sequence.idl
+  }
+  custom_only = 1
+}
+
+
+project(*Test): taoexe {
+  after += *idl
+  exename = test
+
+  Source_Files {
+    test.cpp
+  }
+  Source_Files {
+    sequenceC.cpp
+  }
+  IDL_Files {
+  }
+}
+
diff --git a/performance-tests/Sequence_Latency/Sequence_Operations_Time/run_test.pl b/performance-tests/Sequence_Latency/Sequence_Operations_Time/run_test.pl
new file mode 100755
index 00000000000..c37d05b7a0f
--- /dev/null
+++ b/performance-tests/Sequence_Latency/Sequence_Operations_Time/run_test.pl
@@ -0,0 +1,42 @@
+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';
+    }
+}
+
+print STDERR "================ Sequence Operations Time Test\n";
+
+for ($i = 0; $i <= $#ARGV; $i++) {
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
+        print "Run_Test Perl script for Performance Test\n\n";
+        print "run_test \n";
+        print "\n";
+        exit 0;
+    }
+}
+
+my $client = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+
+$CL = $client->CreateProcess ("test", "-ORBdebuglevel $debug_level");
+
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 405);
+
+if ($test_status != 0) {
+    print STDERR "ERROR: test returned $client_status\n";
+    $status = 1;
+}
+
+exit $status;
diff --git a/performance-tests/Sequence_Latency/Sequence_Operations_Time/sequence.idl b/performance-tests/Sequence_Latency/Sequence_Operations_Time/sequence.idl
new file mode 100644
index 00000000000..671fd4f3cf6
--- /dev/null
+++ b/performance-tests/Sequence_Latency/Sequence_Operations_Time/sequence.idl
@@ -0,0 +1,34 @@
+// $Id$
+
+#include "tao/StringSeq.pidl"
+
+struct Str_Sequences
+{
+  CORBA::StringSeq first_str;
+  CORBA::StringSeq second_str;
+};
+
+typedef sequence<Str_Sequences> StrSeqSeq;
+
+struct Sequence_Str_Sequences
+{
+  StrSeqSeq seq_str_seq;
+
+};
+
+typedef sequence<Sequence_Str_Sequences> Redundant_Sequences;
+
+struct Biglist_Struct
+{
+  Str_Sequences        strs;
+  Redundant_Sequences  red_seqs;
+};
+
+typedef sequence<Biglist_Struct> BigListSeq;
+
+struct Seq_Structs
+{
+  BigListSeq seq;
+};
+
+
diff --git a/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp b/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
new file mode 100644
index 00000000000..0a0d128e0fd
--- /dev/null
+++ b/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
@@ -0,0 +1,223 @@
+// Test of raw copy performance when using different sequence allocations
+// $Id$
+
+#include "sequenceC.h"
+#include "ace/Time_Value.h"
+#include "ace/High_Res_Timer.h"
+#include "ace/OS_NS_strings.h"
+#include "ace/Log_Msg.h"
+
+
+const char * short_str = "abcdefghijklmnopqrstuvwxyz";
+const char * long_str = "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+bool use_csv = false;
+
+void stringseq_time_test (CORBA::ULong num_loops, bool use_long_str)
+{
+  ACE_High_Res_Timer timer;
+  ACE_hrtime_t time;
+
+  CORBA::ULong str_len;
+
+  Str_Sequences seqs;
+  seqs.first_str.length(0);
+  seqs.second_str.length(0);
+
+  // start timing
+  timer.start();
+
+  for (CORBA::ULong idx = 0; idx < num_loops; ++idx)
+  {
+    str_len = seqs.first_str.length();
+    seqs.first_str.length(str_len + 1);
+    seqs.first_str[str_len] = use_long_str ? long_str : short_str;
+  }
+  // end timing
+  timer.stop();
+  timer.elapsed_time(time);
+
+  if (use_csv)
+    {
+      ACE_DEBUG((LM_INFO,
+                 ACE_TEXT("1, 0, 0, %u, %s, %Q\n"),
+                 num_loops,
+                 use_long_str ? ACE_TEXT("long"): ACE_TEXT("short"),
+                 time ));
+    }
+  else
+    {
+      ACE_DEBUG((LM_INFO,
+                 ACE_TEXT("String sequence (%u, %s) = %Q ns\n"),
+                 num_loops,
+                 use_long_str ? ACE_TEXT("long"): ACE_TEXT("short"),
+                 time ));
+    }
+}
+
+
+void seqstrseq_time_test (CORBA::ULong num_seq_loops,
+                          CORBA::ULong num_string_loops,
+                          bool use_long_str)
+{
+  ACE_High_Res_Timer timer;
+  ACE_hrtime_t time;
+
+  CORBA::ULong sss_len;
+  CORBA::ULong str_len;
+
+  Sequence_Str_Sequences seqs;
+  seqs.seq_str_seq.length(0);
+
+  // start timing
+  timer.start();
+
+  for (CORBA::ULong seq_idx = 0; seq_idx < num_seq_loops; ++seq_idx)
+  {
+    sss_len = seqs.seq_str_seq.length();
+    seqs.seq_str_seq.length(sss_len + 1);
+    Str_Sequences & strs = seqs.seq_str_seq[sss_len];
+    //strs.first_str.length(0);
+    for (CORBA::ULong str_idx = 0; str_idx < num_string_loops; ++str_idx)
+    {
+      str_len = strs.second_str.length();
+      strs.second_str.length(str_len + 1);
+      strs.second_str[str_len] = use_long_str ? long_str : short_str;
+    }
+  }
+  // end timing
+  timer.stop();
+  timer.elapsed_time(time);
+
+  if (use_csv)
+    {
+      ACE_DEBUG((LM_INFO,
+                 ACE_TEXT("2, 0, %u, %u, %s, %Q\n"),
+                 num_string_loops,
+                 num_seq_loops,
+                 use_long_str ? ACE_TEXT("long"): ACE_TEXT("short"),
+                 time ));
+    }
+  else
+    {
+      ACE_DEBUG((LM_INFO,
+                 ACE_TEXT("Sequence of string seq (%u, %u, %s) = %Q ns\n"),
+                 num_string_loops,
+                 num_seq_loops,
+                 use_long_str ? ACE_TEXT("long"): ACE_TEXT("short"),
+                 time ));
+    }
+}
+
+
+void big_time_test (CORBA::ULong num_list_loops,
+                    CORBA::ULong num_seq_loops,
+                    CORBA::ULong num_string_loops,
+                    bool use_long_str)
+{
+  ACE_High_Res_Timer timer;
+  ACE_hrtime_t time;
+
+  Seq_Structs big_list;
+  big_list.seq.length(0);
+
+  CORBA::ULong big_len;
+  CORBA::ULong red_len;
+  CORBA::ULong sss_len;
+  CORBA::ULong str_len;
+
+  // start timing
+  timer.start();
+
+  for (CORBA::ULong list_idx = 0; list_idx < num_list_loops; ++list_idx)
+  {
+    big_len = big_list.seq.length();
+    big_list.seq.length(big_len + 1);
+    Biglist_Struct & list = big_list.seq[big_len];
+
+    for (CORBA::ULong seq_idx = 0; seq_idx < num_seq_loops; ++seq_idx)
+    {
+      red_len = list.red_seqs.length();
+      list.red_seqs.length(red_len + 1);
+
+      Sequence_Str_Sequences & sss = list.red_seqs[red_len];
+
+      sss_len = sss.seq_str_seq.length();
+      sss.seq_str_seq.length(sss_len + 1);
+
+      Str_Sequences & strs = sss.seq_str_seq[sss_len];
+      for (CORBA::ULong str_idx = 0; str_idx < num_string_loops; ++str_idx)
+      {
+        str_len = strs.second_str.length();
+        strs.second_str.length(str_len + 1);
+        strs.second_str[str_len] = use_long_str ? long_str : short_str;
+
+        str_len = list.strs.first_str.length();
+        list.strs.first_str.length(str_len + 1);
+        list.strs.first_str[str_len] = use_long_str ? long_str : short_str;
+
+      } // end of str loop
+    } // end of seq loop
+
+  } // end of list loop
+  // end timing
+  timer.stop();
+  timer.elapsed_time(time);
+
+  if (use_csv)
+    {
+      ACE_DEBUG((LM_INFO,
+                 ACE_TEXT("3, %u, %u, %u, %s, %Q\n"),
+                 num_list_loops,
+                 num_string_loops,
+                 num_seq_loops,
+                 use_long_str ? ACE_TEXT("long"): ACE_TEXT("short"),
+                 time ));
+    }
+  else
+    {
+      ACE_DEBUG((LM_INFO,
+                 ACE_TEXT("Big list test(%u, %u, %u, %s) = %Q ns\n"),
+                 num_list_loops,
+                 num_string_loops,
+                 num_seq_loops,
+                 use_long_str ? ACE_TEXT("long"): ACE_TEXT("short"),
+                 time ));
+    }
+}
+
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+
+  if (argc > 1 && ACE_OS::strcasecmp (argv[1],ACE_TEXT("-csv")) == 0)
+    use_csv = true;
+
+  stringseq_time_test(100, false);
+  stringseq_time_test(1000, false);
+
+  stringseq_time_test(100, true);
+  stringseq_time_test(1000, true);
+
+
+  seqstrseq_time_test(100, 1, false);
+  seqstrseq_time_test(100, 10, false);
+  seqstrseq_time_test(1000, 10, false);
+
+  seqstrseq_time_test(100, 1, true);
+  seqstrseq_time_test(100, 10, true);
+  seqstrseq_time_test(1000, 10, true);
+
+
+  big_time_test(10, 1, 10, false);
+  big_time_test(10, 1, 10, false);
+  big_time_test(10, 10, 10, false);
+  big_time_test(100, 1, 10, false);
+
+  big_time_test(10, 1, 10, true);
+  big_time_test(10, 1, 10, true);
+  big_time_test(10, 10, 10, true);
+  big_time_test(100, 1, 10, true);
+
+  return 0;
+}
diff --git a/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am b/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
deleted file mode 100644
index 882b29f952b..00000000000
--- a/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
+++ /dev/null
@@ -1,118 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Single_Threaded_Sequence_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Single_Threaded_Sequence_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.Single_Threaded_Sequence_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp b/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
index b143d959c45..2183a09289f 100644
--- a/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
+++ b/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
@@ -3,8 +3,6 @@
 //
 #include "Roundtrip.h"
 
-ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Sequence_Latency/Single_Threaded/client.cpp b/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
index ff5525a176d..dfcd12cfadd 100644
--- a/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
+++ b/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
@@ -11,8 +11,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Single_Threaded_Latency, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 100;
 int sz = 512;
@@ -74,7 +72,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
index 8a98e49f0fb..d8bce48960e 100644
--- a/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
+++ b/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
@@ -7,8 +7,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/Single_Threaded/svc.conf b/performance-tests/Sequence_Latency/Single_Threaded/svc.conf
index 9e0c5ed01ed..40babaf2989 100644
--- a/performance-tests/Sequence_Latency/Single_Threaded/svc.conf
+++ b/performance-tests/Sequence_Latency/Single_Threaded/svc.conf
@@ -2,5 +2,5 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml b/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml
index 5b2a58bb6f0..51612b28d17 100644
--- a/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml
+++ b/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml
@@ -5,6 +5,6 @@
  <!--  $Id$ -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp b/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
index 5d594020cfc..eff6272c119 100644
--- a/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
@@ -4,8 +4,6 @@
 #include "Client_Task.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID(Thread_Per_Connection_Latency, Client_Task, "$Id$")
-
 Client_Task::Client_Task (const ACE_TCHAR *data_type,
                           int size,
                           Test::Roundtrip_ptr roundtrip,
diff --git a/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am b/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
deleted file mode 100644
index 8f04b77ccef..00000000000
--- a/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
+++ /dev/null
@@ -1,117 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Thread_Per_Conn_Sequence_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Thread_Per_Conn_Sequence_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Thread_Per_Conn_Sequence_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp b/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
index 340b6d43819..4b18192938b 100644
--- a/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -3,8 +3,6 @@
 //
 #include "Roundtrip.h"
 
-ACE_RCSID(Single_Per_Connection_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp b/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
index fb0d8681beb..232915ac071 100644
--- a/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
+++ b/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
@@ -10,8 +10,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Thread_Per_Connection_Latency, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 1000;
 int do_shutdown = 1;
@@ -69,7 +67,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
index 438afb2616f..f208e449a78 100644
--- a/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
+++ b/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
@@ -7,8 +7,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Thread_Per_Connection_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp b/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
index 951f550e8cb..824f3396e04 100644
--- a/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
+++ b/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
@@ -4,8 +4,6 @@
 #include "Client_Task.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID(Thread_Pool_Latency, Client_Task, "$Id$")
-
 Client_Task::Client_Task (const ACE_TCHAR *data_type,
                           int size,
                           Test::Roundtrip_ptr roundtrip,
diff --git a/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am b/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
deleted file mode 100644
index f5d1b75abd5..00000000000
--- a/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Thread_Pool_Sequence_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Thread_Pool_Sequence_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Thread_Pool_Sequence_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Worker_Thread.cpp \
-  server.cpp \
-  Roundtrip.h \
-  Worker_Thread.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp b/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
index c8e7c26e294..4b18192938b 100644
--- a/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
+++ b/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
@@ -3,8 +3,6 @@
 //
 #include "Roundtrip.h"
 
-ACE_RCSID(Thread_Pool_Latency, Roundtrip, "$Id$")
-
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp b/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
index 598128ad43a..c1359a0c327 100644
--- a/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
+++ b/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
@@ -3,8 +3,6 @@
 //
 #include "Worker_Thread.h"
 
-ACE_RCSID(Thread_Pool_Latency, Worker_Thread, "$Id$")
-
 Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Sequence_Latency/Thread_Pool/client.cpp b/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
index d96827b194f..5c2bc391c26 100644
--- a/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
+++ b/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
@@ -10,8 +10,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Thread_Pool_Latency, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 1000;
 int do_shutdown = 1;
@@ -69,7 +67,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
index 390c1052ff0..5bdc4b137a3 100644
--- a/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
+++ b/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
@@ -8,8 +8,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Thread_Pool_Latency, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -34,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Throughput/Makefile.am b/performance-tests/Throughput/Makefile.am
deleted file mode 100644
index 9ae0c70ec40..00000000000
--- a/performance-tests/Throughput/Makefile.am
+++ /dev/null
@@ -1,115 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Throughput_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Throughput_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Receiver.h \
-  Receiver_Factory.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Throughput_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Receiver.cpp \
-  Receiver_Factory.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Receiver.h \
-  Receiver_Factory.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Throughput/Receiver.cpp b/performance-tests/Throughput/Receiver.cpp
index a30a09ae62a..73bc1293a8e 100644
--- a/performance-tests/Throughput/Receiver.cpp
+++ b/performance-tests/Throughput/Receiver.cpp
@@ -5,8 +5,6 @@
 #include "Receiver.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID(Throughput, Receiver, "$Id$")
-
 Receiver::Receiver (void)
   : start_time_ (0)
   , message_count_ (0)
diff --git a/performance-tests/Throughput/Receiver_Factory.cpp b/performance-tests/Throughput/Receiver_Factory.cpp
index 67d83c75843..ed04a345a99 100644
--- a/performance-tests/Throughput/Receiver_Factory.cpp
+++ b/performance-tests/Throughput/Receiver_Factory.cpp
@@ -4,8 +4,6 @@
 #include "Receiver_Factory.h"
 #include "Receiver.h"
 
-ACE_RCSID(Throughput, Receiver_Factory, "$Id$")
-
 Receiver_Factory::Receiver_Factory (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/performance-tests/Throughput/client.cpp b/performance-tests/Throughput/client.cpp
index 2dde2b1e38b..061f6a99b87 100644
--- a/performance-tests/Throughput/client.cpp
+++ b/performance-tests/Throughput/client.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Throughput, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int message_size  = 2048;
 int message_count = 10 * 1024;
@@ -54,7 +52,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Throughput/server.cpp b/performance-tests/Throughput/server.cpp
index e1e3bfc8c04..6bf0fccfa31 100644
--- a/performance-tests/Throughput/server.cpp
+++ b/performance-tests/Throughput/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Throughput, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/performance-tests/Throughput/svc.conf b/performance-tests/Throughput/svc.conf
index 0804ab1486e..d389aa68c95 100644
--- a/performance-tests/Throughput/svc.conf
+++ b/performance-tests/Throughput/svc.conf
@@ -4,5 +4,5 @@
 #
 
 static Advanced_Resource_Factory "-ORBInputCDRAllocator null -ORBReactorType select_st -ORBReactorMaskSignals 0 -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
diff --git a/performance-tests/Throughput/svc.conf.xml b/performance-tests/Throughput/svc.conf.xml
index 32eb197be90..e3cd786d2cc 100644
--- a/performance-tests/Throughput/svc.conf.xml
+++ b/performance-tests/Throughput/svc.conf.xml
@@ -6,6 +6,6 @@
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBInputCDRAllocator null -ORBReactorType select_st -ORBReactorMaskSignals 0 -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>
diff --git a/rules.tao.GNU b/rules.tao.GNU
index 0f8d42d7800..87eea27ec9d 100644
--- a/rules.tao.GNU
+++ b/rules.tao.GNU
@@ -134,18 +134,5 @@ TAO_MAJOR_VERSION := $(shell awk '/TAO_MAJOR_VERSION/ { print $$3}' ${TAO_ROOT}/
 TAO_MINOR_VERSION := $(shell awk '/TAO_MINOR_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h)
 TAO_BETA_VERSION := $(shell awk '/TAO_BETA_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h)
 endif
-# Version number of the libraries
-#
-ifeq ($(versioned_so),1)
-  # Only set SOVERSION for TAO if versioning is turned on and SOVERION is
-  # blank, which gives users to ability to override it.
-  ifeq ($(SOVERSION),)
-    SOVERSION = .$(TAO_MAJOR_VERSION).$(TAO_MINOR_VERSION).$(TAO_BETA_VERSION)
-  endif # SOVERSION
-
-  # Name that will be written into the dynamic library
-  #
-  ifneq ($(SONAME),)
-    SONAME = $(SHLIB).$(TAO_MAJOR_VERSION).$(TAO_MINOR_VERSION).$(TAO_BETA_VERSION)
-  endif # SONAME
-endif # versioned_so
+
+GNUACE_PROJECT_VERSION ?= $(TAO_MAJOR_VERSION).$(TAO_MINOR_VERSION).$(TAO_BETA_VERSION)
diff --git a/tao/Abstract_Servant_Base.cpp b/tao/Abstract_Servant_Base.cpp
index b63e5f09efe..a4261f4c985 100644
--- a/tao/Abstract_Servant_Base.cpp
+++ b/tao/Abstract_Servant_Base.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Abstract_Servant_Base.h"
diff --git a/tao/Acceptor_Filter.cpp b/tao/Acceptor_Filter.cpp
index 91979f2e3fc..ac35c2e3981 100644
--- a/tao/Acceptor_Filter.cpp
+++ b/tao/Acceptor_Filter.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Acceptor_Filter.h"
diff --git a/tao/Acceptor_Impl.cpp b/tao/Acceptor_Impl.cpp
index c1e4a914064..0e6902e0620 100644
--- a/tao/Acceptor_Impl.cpp
+++ b/tao/Acceptor_Impl.cpp
@@ -112,9 +112,7 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh,
 
   // Registration with cache is successful, #REFCOUNT# is two at this
   // point.
-
-  TAO_Server_Strategy_Factory *f =
-    this->orb_core_->server_factory ();
+  TAO_Server_Strategy_Factory *f = this->orb_core_->server_factory ();
 
   int result = 0;
 
@@ -193,7 +191,8 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh,
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
 TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::TAO_Accept_Strategy (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core)
+  : ACCEPT_STRATEGY_BASE (orb_core->reactor ())
+  , orb_core_ (orb_core)
 {
 }
 
diff --git a/tao/Acceptor_Impl.h b/tao/Acceptor_Impl.h
index b7ed30357dd..38a2e55f7f8 100644
--- a/tao/Acceptor_Impl.h
+++ b/tao/Acceptor_Impl.h
@@ -70,8 +70,7 @@ public:
    * TAO_Server_Strategy_Factory, it activates the Svc_Handler to run
    * in its own thread.
    */
-  int activate_svc_handler (SVC_HANDLER *svc_handler,
-                            void *arg);
+  int activate_svc_handler (SVC_HANDLER *svc_handler, void *arg);
 
 protected:
   /// Pointer to the ORB Core.
diff --git a/tao/Acceptor_Registry.h b/tao/Acceptor_Registry.h
index bb1765911b0..b621bf4caef 100644
--- a/tao/Acceptor_Registry.h
+++ b/tao/Acceptor_Registry.h
@@ -55,10 +55,10 @@ typedef TAO_Acceptor** TAO_AcceptorSetIterator;
  * All loaded ESIOP or GIOP acceptor bridges must register with
  * this object.
  *
- * This class maintains a list os acceptor factories for all loaded ORB
+ * This class maintains a list of acceptor factories for all loaded ORB
  * protocols. There is one Acceptor_Registry per ORB_Core.
  */
-class TAO_Export TAO_Acceptor_Registry
+class TAO_Export TAO_Acceptor_Registry : private ACE_Copy_Disabled
 {
 public:
   // = Initialization and termination methods.
@@ -135,12 +135,6 @@ private:
               bool ignore_address);
 
 private:
-
-  // The acceptor registry should not be copied.
-  TAO_Acceptor_Registry (const TAO_Acceptor_Registry&);
-  void operator= (const TAO_Acceptor_Registry&);
-
-private:
   /// List of acceptors that are currently open.
   TAO_Acceptor **acceptors_;
 
diff --git a/tao/Adapter_Registry.h b/tao/Adapter_Registry.h
index acdbd7fe90e..cdeca7ae57f 100644
--- a/tao/Adapter_Registry.h
+++ b/tao/Adapter_Registry.h
@@ -54,7 +54,7 @@ public:
   /**
    * Close each of of the Adapters and then cleanup the Registry.
    * It is possible that an Adapter will reject a close() call if it
-   * is invoked in an innapropriate context (think shutting down the
+   * is invoked in an inappropriate context (think shutting down the
    * POA while performing an upcall).
    */
   void close (int wait_for_completion);
diff --git a/tao/AnyTypeCode.mpc b/tao/AnyTypeCode.mpc
deleted file mode 100644
index fbf2a0cac03..00000000000
--- a/tao/AnyTypeCode.mpc
+++ /dev/null
@@ -1,197 +0,0 @@
-//$Id$
-
-project(*idl) : tao_versioning_idl_defaults, gen_ostream, install {
-  custom_only = 1
-  idlflags += -Gp -Gd -Sci -SS -GA -Gstl \
-              -Wb,export_macro=TAO_AnyTypeCode_Export \
-              -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h \
-              -o AnyTypeCode
-  idlflags -= -Sa -St
-
-  IDL_Files {
-    idlflags += -Sorb
-    AnyTypeCode/AnySeq.pidl
-    AnyTypeCode/Dynamic_Parameter.pidl
-    AnyTypeCode/ValueModifier.pidl
-    AnyTypeCode/Visibility.pidl
-    AnyTypeCode/Dynamic.pidl
-  }
-
-  IDL_Files {
-    AnyTypeCode/Bounds.pidl
-  }
-}
-
-project(AnyTypeCode) : taolib, tao_output, install, extra_anytypecode, taoidldefaults, nolink_codecfactory, gen_ostream {
-  after += *idl
-  sharedname   = TAO_AnyTypeCode
-  dynamicflags += TAO_ANYTYPECODE_BUILD_DLL
-
-  Source_Files(TAO_ANYTYPECODE_COMPONENTS) {
-    AnyTypeCode/Alias_TypeCode_Static.cpp
-    AnyTypeCode/Any.cpp
-    AnyTypeCode/AnySeqA.cpp
-    AnyTypeCode/AnySeqC.cpp
-    AnyTypeCode/Any_Basic_Impl.cpp
-    AnyTypeCode/Any_Impl.cpp
-    AnyTypeCode/Any_SystemException.cpp
-    AnyTypeCode/Any_Unknown_IDL_Type.cpp
-    AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
-    AnyTypeCode/append.cpp
-    AnyTypeCode/BasicTypeTraits.cpp
-    AnyTypeCode/BooleanSeqA.cpp
-    AnyTypeCode/BoundsA.cpp
-    AnyTypeCode/BoundsC.cpp
-    AnyTypeCode/CharSeqA.cpp
-    AnyTypeCode/CONV_FRAMEA.cpp
-    AnyTypeCode/CurrentA.cpp
-    AnyTypeCode/DoubleSeqA.cpp
-    AnyTypeCode/DynamicA.cpp
-    AnyTypeCode/DynamicC.cpp
-    AnyTypeCode/Dynamic_ParameterA.cpp
-    AnyTypeCode/Dynamic_ParameterC.cpp
-    AnyTypeCode/Empty_Param_TypeCode.cpp
-    AnyTypeCode/Enum_TypeCode_Static.cpp
-    AnyTypeCode/ExceptionA.cpp
-    AnyTypeCode/FloatSeqA.cpp
-    AnyTypeCode/GIOPA.cpp
-    AnyTypeCode/IIOPA.cpp
-    AnyTypeCode/IOPA.cpp
-    AnyTypeCode/IIOP_EndpointsA.cpp
-    AnyTypeCode/LongDoubleSeqA.cpp
-    AnyTypeCode/LongLongSeqA.cpp
-    AnyTypeCode/LongSeqA.cpp
-    AnyTypeCode/Marshal.cpp
-    AnyTypeCode/Messaging_PolicyValueA.cpp
-    AnyTypeCode/NVList.cpp
-    AnyTypeCode/NVList_Adapter_Impl.cpp
-    AnyTypeCode/ObjectIdListA.cpp
-    AnyTypeCode/Objref_TypeCode_Static.cpp
-    AnyTypeCode/OctetSeqA.cpp
-    AnyTypeCode/orb_typesA.cpp
-    AnyTypeCode/ParameterModeA.cpp
-    AnyTypeCode/PI_ForwardA.cpp
-    AnyTypeCode/PolicyA.cpp
-    AnyTypeCode/Policy_CurrentA.cpp
-    AnyTypeCode/Policy_ForwardA.cpp
-    AnyTypeCode/Policy_ManagerA.cpp
-    AnyTypeCode/PortableInterceptorA.cpp
-    AnyTypeCode/Sequence_TypeCode_Static.cpp
-    AnyTypeCode/ShortSeqA.cpp
-    AnyTypeCode/skip.cpp
-    AnyTypeCode/StringSeqA.cpp
-    AnyTypeCode/String_TypeCode_Static.cpp
-    AnyTypeCode/Struct_TypeCode_Static.cpp
-    AnyTypeCode/SystemExceptionA.cpp
-    AnyTypeCode/TAOA.cpp
-    AnyTypeCode/TimeBaseA.cpp
-    AnyTypeCode/True_RefCount_Policy.cpp
-    AnyTypeCode/TypeCode.cpp
-    AnyTypeCode/TypeCodeA.cpp
-    AnyTypeCode/TypeCode_CDR_Extraction.cpp
-    AnyTypeCode/TypeCode_Constants.cpp
-    AnyTypeCode/ULongLongSeqA.cpp
-    AnyTypeCode/ULongSeqA.cpp
-    AnyTypeCode/Union_TypeCode_Static.cpp
-    AnyTypeCode/UShortSeqA.cpp
-    AnyTypeCode/Value_TypeCode_Static.cpp
-    AnyTypeCode/ValueModifierC.cpp
-    AnyTypeCode/ValueModifierA.cpp
-    AnyTypeCode/VisibilityA.cpp
-    AnyTypeCode/VisibilityC.cpp
-    AnyTypeCode/WCharSeqA.cpp
-    AnyTypeCode/WrongTransactionA.cpp
-    AnyTypeCode/WStringSeqA.cpp
-  }
-
-  Header_Files {
-    AnyTypeCode/*.h
-    AnyTypeCode/GIOPA.h
-    AnyTypeCode/BooleanSeqA.h
-    AnyTypeCode/CONV_FRAMEA.h
-    AnyTypeCode/CharSeqA.h
-    AnyTypeCode/CurrentA.h
-    AnyTypeCode/DoubleSeqA.h
-    AnyTypeCode/FloatSeqA.h
-    AnyTypeCode/IIOPA.h
-    AnyTypeCode/IOPA.h
-    AnyTypeCode/IIOP_EndpointsA.h
-    AnyTypeCode/IOPA.h
-    AnyTypeCode/LongDoubleSeqA.h
-    AnyTypeCode/LongLongSeqA.h
-    AnyTypeCode/LongSeqA.h
-    AnyTypeCode/Messaging_PolicyValueA.h
-    AnyTypeCode/Messaging_SyncScopeA.h
-    AnyTypeCode/ObjectIdListA.h
-    AnyTypeCode/OctetSeqA.h
-    AnyTypeCode/PI_ForwardA.h
-    AnyTypeCode/ParameterModeA.h
-    AnyTypeCode/Policy_CurrentA.h
-    AnyTypeCode/Policy_ForwardA.h
-    AnyTypeCode/Policy_ManagerA.h
-    AnyTypeCode/PortableInterceptorA.h
-    AnyTypeCode/ServicesA.h
-    AnyTypeCode/ShortSeqA.h
-    AnyTypeCode/StringSeqA.h
-    AnyTypeCode/TAOA.h
-    AnyTypeCode/TimeBaseA.h
-    AnyTypeCode/ULongLongSeqA.h
-    AnyTypeCode/ULongSeqA.h
-    AnyTypeCode/UShortSeqA.h
-    AnyTypeCode/WCharSeqA.h
-    AnyTypeCode/WStringSeqA.h
-    AnyTypeCode/orb_typesA.h
-    AnyTypeCode/AnySeqA.h
-    AnyTypeCode/AnySeqC.h
-    AnyTypeCode/AnySeqS.h
-    AnyTypeCode/BoundsA.h
-    AnyTypeCode/BoundsC.h
-    AnyTypeCode/BoundsS.h
-    AnyTypeCode/DynamicA.h
-    AnyTypeCode/DynamicC.h
-    AnyTypeCode/Dynamic_ParameterA.h
-    AnyTypeCode/Dynamic_ParameterC.h
-    AnyTypeCode/Dynamic_ParameterS.h
-    AnyTypeCode/DynamicS.h
-    AnyTypeCode/ValueModifierA.h
-    AnyTypeCode/ValueModifierC.h
-    AnyTypeCode/ValueModifierS.h
-    AnyTypeCode/VisibilityA.h
-    AnyTypeCode/VisibilityC.h
-    AnyTypeCode/VisibilityS.h
-  }
-
-  Inline_Files {
-    AnyTypeCode/*.inl
-  }
-
-  Template_Files {
-    AnyTypeCode/*_T.cpp
-    AnyTypeCode/Alias_TypeCode.cpp
-    AnyTypeCode/Enum_TypeCode.cpp
-    AnyTypeCode/Fixed_TypeCode.cpp
-    AnyTypeCode/Objref_TypeCode.cpp
-    AnyTypeCode/Recursive_Type_TypeCode.cpp
-    AnyTypeCode/Sequence_TypeCode.cpp
-    AnyTypeCode/String_TypeCode.cpp
-    AnyTypeCode/Struct_TypeCode.cpp
-    AnyTypeCode/TypeCode_Base_Attributes.cpp
-    AnyTypeCode/Union_TypeCode.cpp
-    AnyTypeCode/Value_TypeCode.cpp
-  }
-
-  Resource_Files {
-    AnyTypeCode
-  }
-
-  PIDL_Files {
-    AnyTypeCode
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    AnyTypeCode/TAO_AnyTypeCode.pc.in
-  }
-}
diff --git a/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
index 7eef23226ab..931e668c137 100644
--- a/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
+++ b/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
diff --git a/tao/AnyTypeCode/Any.cpp b/tao/AnyTypeCode/Any.cpp
index be464e4ac06..279f45ff238 100644
--- a/tao/AnyTypeCode/Any.cpp
+++ b/tao/AnyTypeCode/Any.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Any.h"
diff --git a/tao/AnyTypeCode/AnySeq.pidl b/tao/AnyTypeCode/AnySeq.pidl
index 5a65b39d975..8bcfdc3c0b1 100644
--- a/tao/AnyTypeCode/AnySeq.pidl
+++ b/tao/AnyTypeCode/AnySeq.pidl
@@ -1,25 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-// ================================================================
-/**
- * This file is used to generate the code in AnySeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
- *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
- *          AnySeq.pidl
- *
- */
-// ================================================================
-
 #ifndef TAO_CORBA_ANY_SEQ_IDL
 #define TAO_CORBA_ANY_SEQ_IDL
 
diff --git a/tao/AnyTypeCode/AnyTypeCode.mpc b/tao/AnyTypeCode/AnyTypeCode.mpc
new file mode 100644
index 00000000000..e6167b6c359
--- /dev/null
+++ b/tao/AnyTypeCode/AnyTypeCode.mpc
@@ -0,0 +1,190 @@
+//$Id$
+
+project(*idl) : tao_versioning_idl_defaults, gen_ostream, install {
+  custom_only = 1
+  idlflags += -Gp -Gd -Sci -SS -GA \
+              -Wb,export_macro=TAO_AnyTypeCode_Export \
+              -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h \
+              -iC tao/AnyTypeCode
+  idlflags -= -Sa -St
+
+  IDL_Files {
+    idlflags += -Sorb
+    AnySeq.pidl
+    Dynamic_Parameter.pidl
+    ValueModifier.pidl
+    Visibility.pidl
+    Dynamic.pidl
+  }
+
+  IDL_Files {
+    Bounds.pidl
+  }
+
+  specific {
+    install_dir = tao/AnyTypeCode
+  }
+}
+
+project(AnyTypeCode) : taolib, tao_output, install, extra_anytypecode, taoidldefaults, nolink_codecfactory, gen_ostream {
+  after += *idl
+  sharedname   = TAO_AnyTypeCode
+  dynamicflags += TAO_ANYTYPECODE_BUILD_DLL
+
+  Source_Files(TAO_ANYTYPECODE_COMPONENTS) {
+    Alias_TypeCode_Static.cpp
+    Any.cpp
+    AnySeqA.cpp
+    AnySeqC.cpp
+    Any_Basic_Impl.cpp
+    Any_Impl.cpp
+    Any_SystemException.cpp
+    Any_Unknown_IDL_Type.cpp
+    AnyTypeCode_Adapter_Impl.cpp
+    append.cpp
+    BasicTypeTraits.cpp
+    BooleanSeqA.cpp
+    BoundsA.cpp
+    BoundsC.cpp
+    CharSeqA.cpp
+    CONV_FRAMEA.cpp
+    CurrentA.cpp
+    DoubleSeqA.cpp
+    DynamicA.cpp
+    DynamicC.cpp
+    Dynamic_ParameterA.cpp
+    Dynamic_ParameterC.cpp
+    Empty_Param_TypeCode.cpp
+    Enum_TypeCode_Static.cpp
+    ExceptionA.cpp
+    FloatSeqA.cpp
+    GIOPA.cpp
+    IIOPA.cpp
+    IOPA.cpp
+    IIOP_EndpointsA.cpp
+    LongDoubleSeqA.cpp
+    LongLongSeqA.cpp
+    LongSeqA.cpp
+    Marshal.cpp
+    Messaging_PolicyValueA.cpp
+    NVList.cpp
+    NVList_Adapter_Impl.cpp
+    ObjectIdListA.cpp
+    Objref_TypeCode_Static.cpp
+    OctetSeqA.cpp
+    orb_typesA.cpp
+    ParameterModeA.cpp
+    PI_ForwardA.cpp
+    PolicyA.cpp
+    Policy_CurrentA.cpp
+    Policy_ForwardA.cpp
+    Policy_ManagerA.cpp
+    PortableInterceptorA.cpp
+    Sequence_TypeCode_Static.cpp
+    ShortSeqA.cpp
+    skip.cpp
+    StringSeqA.cpp
+    String_TypeCode_Static.cpp
+    Struct_TypeCode_Static.cpp
+    SystemExceptionA.cpp
+    TAOA.cpp
+    TimeBaseA.cpp
+    True_RefCount_Policy.cpp
+    TypeCode.cpp
+    TypeCodeA.cpp
+    TypeCode_CDR_Extraction.cpp
+    TypeCode_Constants.cpp
+    ULongLongSeqA.cpp
+    ULongSeqA.cpp
+    Union_TypeCode_Static.cpp
+    UShortSeqA.cpp
+    Value_TypeCode_Static.cpp
+    ValueModifierC.cpp
+    ValueModifierA.cpp
+    VisibilityA.cpp
+    VisibilityC.cpp
+    WCharSeqA.cpp
+    WrongTransactionA.cpp
+    WStringSeqA.cpp
+  }
+
+  Header_Files {
+    *.h
+    GIOPA.h
+    BooleanSeqA.h
+    CONV_FRAMEA.h
+    CharSeqA.h
+    CurrentA.h
+    DoubleSeqA.h
+    FloatSeqA.h
+    IIOPA.h
+    IOPA.h
+    IIOP_EndpointsA.h
+    IOPA.h
+    LongDoubleSeqA.h
+    LongLongSeqA.h
+    LongSeqA.h
+    Messaging_PolicyValueA.h
+    Messaging_SyncScopeA.h
+    ObjectIdListA.h
+    OctetSeqA.h
+    PI_ForwardA.h
+    ParameterModeA.h
+    Policy_CurrentA.h
+    Policy_ForwardA.h
+    Policy_ManagerA.h
+    PortableInterceptorA.h
+    ServicesA.h
+    ShortSeqA.h
+    StringSeqA.h
+    TAOA.h
+    TimeBaseA.h
+    ULongLongSeqA.h
+    ULongSeqA.h
+    UShortSeqA.h
+    WCharSeqA.h
+    WStringSeqA.h
+    orb_typesA.h
+    AnySeqA.h
+    AnySeqC.h
+    AnySeqS.h
+    BoundsA.h
+    BoundsC.h
+    BoundsS.h
+    DynamicA.h
+    DynamicC.h
+    Dynamic_ParameterA.h
+    Dynamic_ParameterC.h
+    Dynamic_ParameterS.h
+    DynamicS.h
+    ValueModifierA.h
+    ValueModifierC.h
+    ValueModifierS.h
+    VisibilityA.h
+    VisibilityC.h
+    VisibilityS.h
+  }
+
+  Inline_Files {
+    *.inl
+  }
+
+  Template_Files {
+    *_T.cpp
+    Alias_TypeCode.cpp
+    Enum_TypeCode.cpp
+    Fixed_TypeCode.cpp
+    Objref_TypeCode.cpp
+    Recursive_Type_TypeCode.cpp
+    Sequence_TypeCode.cpp
+    String_TypeCode.cpp
+    Struct_TypeCode.cpp
+    TypeCode_Base_Attributes.cpp
+    Union_TypeCode.cpp
+    Value_TypeCode.cpp
+  }
+
+  specific {
+    install_dir = tao/AnyTypeCode
+  }
+}
diff --git a/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
index 6c15bc64a35..be009e7905e 100644
--- a/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
+++ b/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
diff --git a/tao/AnyTypeCode/Any_Basic_Impl.cpp b/tao/AnyTypeCode/Any_Basic_Impl.cpp
index 6a0f8e9e68d..197a78cc06b 100644
--- a/tao/AnyTypeCode/Any_Basic_Impl.cpp
+++ b/tao/AnyTypeCode/Any_Basic_Impl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Any_Basic_Impl.h"
@@ -282,7 +283,7 @@ namespace TAO
         break;
       case CORBA::tk_longdouble:
         {
-          CORBA::LongDouble tmp = ACE_CDR_LONG_DOUBLE_INITIALIZER;
+          CORBA::LongDouble tmp (ACE_CDR::LongDoubleAssign (0.0L));
           ACE_NEW_RETURN (retval,
                           TAO::Any_Basic_Impl (tc, &tmp),
                           0);
diff --git a/tao/AnyTypeCode/Any_Basic_Impl_T.inl b/tao/AnyTypeCode/Any_Basic_Impl_T.inl
index 3114614a725..e131b9edacb 100644
--- a/tao/AnyTypeCode/Any_Basic_Impl_T.inl
+++ b/tao/AnyTypeCode/Any_Basic_Impl_T.inl
@@ -4,8 +4,8 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template<typename T> 
-ACE_INLINE 
+template<typename T>
+ACE_INLINE
 CORBA::Boolean
 TAO::Any_Basic_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
 {
diff --git a/tao/AnyTypeCode/Any_Dual_Impl_T.inl b/tao/AnyTypeCode/Any_Dual_Impl_T.inl
index f1fa29d7a4c..2196fba3f3e 100644
--- a/tao/AnyTypeCode/Any_Dual_Impl_T.inl
+++ b/tao/AnyTypeCode/Any_Dual_Impl_T.inl
@@ -5,8 +5,8 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template<typename T> 
-ACE_INLINE 
+template<typename T>
+ACE_INLINE
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
 {
diff --git a/tao/AnyTypeCode/Any_Impl.cpp b/tao/AnyTypeCode/Any_Impl.cpp
index efac2d51297..bc5273c536b 100644
--- a/tao/AnyTypeCode/Any_Impl.cpp
+++ b/tao/AnyTypeCode/Any_Impl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Any_Impl.h"
diff --git a/tao/AnyTypeCode/Any_Impl_T.inl b/tao/AnyTypeCode/Any_Impl_T.inl
index d459bc57e67..afd8d7fac29 100644
--- a/tao/AnyTypeCode/Any_Impl_T.inl
+++ b/tao/AnyTypeCode/Any_Impl_T.inl
@@ -6,8 +6,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // These three are overridden in generated code where appropriate.
 
-template<typename T> 
-ACE_INLINE 
+template<typename T>
+ACE_INLINE
 CORBA::Boolean
 TAO::Any_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
 {
diff --git a/tao/AnyTypeCode/Any_Special_Impl_T.inl b/tao/AnyTypeCode/Any_Special_Impl_T.inl
index 257a7681bd9..c4ca231a618 100644
--- a/tao/AnyTypeCode/Any_Special_Impl_T.inl
+++ b/tao/AnyTypeCode/Any_Special_Impl_T.inl
@@ -4,8 +4,8 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template<typename T, typename from_T, typename to_T> 
-ACE_INLINE 
+template<typename T, typename from_T, typename to_T>
+ACE_INLINE
 CORBA::Boolean
 TAO::Any_Special_Impl_T<T, from_T, to_T>::demarshal_value (
     TAO_InputCDR &cdr
diff --git a/tao/AnyTypeCode/Any_SystemException.cpp b/tao/AnyTypeCode/Any_SystemException.cpp
index 000687597a0..2d6f2f7eda5 100644
--- a/tao/AnyTypeCode/Any_SystemException.cpp
+++ b/tao/AnyTypeCode/Any_SystemException.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Any_SystemException.h"
diff --git a/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
index c1370c8f3bb..00656c63098 100644
--- a/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
+++ b/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
diff --git a/tao/AnyTypeCode/Dynamic.pidl b/tao/AnyTypeCode/Dynamic.pidl
index 5632bb195fb..dce7fbd53ab 100644
--- a/tao/AnyTypeCode/Dynamic.pidl
+++ b/tao/AnyTypeCode/Dynamic.pidl
@@ -1,26 +1,10 @@
 // -*- IDL -*-
 
-// ================================================================
 /**
  *  @file   Dynamic.pidl
  *
  * $Id$
- *
- *   This file is used to generate the code in DynamicC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
- *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
- *          Dynamic.pidl
- *
  */
-// ================================================================
 
 // File: Dynamic.idl
 // Used primarily for Interceptors
diff --git a/tao/AnyTypeCode/Dynamic_Parameter.pidl b/tao/AnyTypeCode/Dynamic_Parameter.pidl
index 473aa511d3b..4409955647f 100644
--- a/tao/AnyTypeCode/Dynamic_Parameter.pidl
+++ b/tao/AnyTypeCode/Dynamic_Parameter.pidl
@@ -1,28 +1,11 @@
 // -*- IDL -*-
 
-// ================================================================
 /**
  *  @file   Dynamic_Parameter.pidl
  *
  * $Id$
- *
- *   This file is used to generate the code in Dynamic_ParameterC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -GA -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
- *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
- *          Dynamic_Parameter.pidl
- *
  */
-// ================================================================
 
-// File: Dynamic_Parameter.idl
 // Piece of module Dynamic generated separately for use by
 // template argument helper classes.
 
diff --git a/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
index d7ce265f091..649ec18e4c5 100644
--- a/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
+++ b/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Empty_Param_TypeCode.h"
diff --git a/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
index 9529f8a3cbc..2c7480958c9 100644
--- a/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
+++ b/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
diff --git a/tao/AnyTypeCode/ExceptionA.cpp b/tao/AnyTypeCode/ExceptionA.cpp
index e664c46ade1..36308a3c71f 100644
--- a/tao/AnyTypeCode/ExceptionA.cpp
+++ b/tao/AnyTypeCode/ExceptionA.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/ExceptionA.h"
diff --git a/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
index 5f300356c7e..7b598020a9a 100644
--- a/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
+++ b/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
@@ -1,7 +1,7 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/AnyTypeCode/NVList_Adapter_Impl.h"
-
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/SystemException.h"
 #include "ace/CORBA_macros.h"
diff --git a/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
index daa71511f60..d716a0d4f2e 100644
--- a/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
+++ b/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
diff --git a/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp b/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
index d7df0270792..01e56ce2e40 100644
--- a/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
+++ b/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
@@ -22,24 +22,21 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
                     false);
 
   // Top-level TypeCode case.
-  if (!(this->in_recursion_))
+  if (this->recursion_start_offset_ == 0)
     {
-      this->in_recursion_ = true;
-
       // Starting offset should point to the CORBA::TCKind value.
-
       // Note that this doesn't need to take into account alignment
       // padding since CORBA::TCKind (encoded as a CORBA::ULong) is
       // already aligned on the appropriate boundary, and since the
       // CORBA::TCKind was the last thing marshaled into the CDR
       // stream before getting here.
-      offset = sizeof (CORBA::ULong);
+      this->recursion_start_offset_ = offset - sizeof (CORBA::ULong);
 
       // Reset recursion flag to false in an exception-safe manner once
       // marshaling is done.
       //
       // Only reset the recursion flag at the top-level.
-      Reset flag (this->in_recursion_);
+      Reset flag (this->recursion_start_offset_);
 
       return this->TypeCodeBase::tao_marshal (cdr, offset);
     }
@@ -49,7 +46,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
 //   ACE_ASSERT (offset > 4
 //               && offset < static_cast<CORBA::ULong> (ACE_INT32_MAX));
 
-  return (cdr << -static_cast<CORBA::Long> (offset));
+  return (cdr << -static_cast<CORBA::Long> (offset - this->recursion_start_offset_));
 }
 
 template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
@@ -65,15 +62,17 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
                     false);
 
   // Top-level TypeCode case.
-  if (!(this->in_recursion_))
+  if (this->recursion_start_offset_ == 0)
     {
-      this->in_recursion_ = true;
+      // no need for real start offset here
+      // just set to non-zero to flag recursion
+      this->recursion_start_offset_ = 1;
 
       // Reset recursion flag to false in an exception-safe manner once
       // equality determination is done.
       //
       // Only reset the recursion flag at the top-level.
-      Reset flag (this->in_recursion_);
+      Reset flag (this->recursion_start_offset_);
 
       return this->TypeCodeBase::equal_i (tc);
     }
@@ -95,15 +94,17 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
                     false);
 
   // Top-level TypeCode case.
-  if (!(this->in_recursion_))
+  if (this->recursion_start_offset_ == 0)
     {
-      this->in_recursion_ = true;
+      // no need for real start offset here
+      // just set to non-zero to flag recursion
+      this->recursion_start_offset_ = 1;
 
       // Reset recursion flag to false in an exception-safe manner once
       // equivalence determination is done.
       //
       // Only reset the recursion flag at the top-level.
-      Reset flag (this->in_recursion_);
+      Reset flag (this->recursion_start_offset_);
 
       return this->TypeCodeBase::equivalent_i (tc);
     }
@@ -125,7 +126,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
                     false);
 
   // Top-level TypeCode case.
-  if (!(this->in_recursion_))
+  if (this->recursion_start_offset_ == 0)
     return this->::CORBA::TypeCode::tao_marshal_kind (cdr);
 
   // Recursive/indirected TypeCode case.
diff --git a/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/tao/AnyTypeCode/Recursive_Type_TypeCode.h
index f9ebdfab5ff..f09954a6344 100644
--- a/tao/AnyTypeCode/Recursive_Type_TypeCode.h
+++ b/tao/AnyTypeCode/Recursive_Type_TypeCode.h
@@ -146,10 +146,10 @@ namespace TAO
       class Reset
       {
       public:
-        Reset (bool & flag) : flag_ (flag) { }
-        ~Reset (void) { this->flag_ = false; }
+        Reset (CORBA::ULong & flag) : flag_ (flag) { }
+        ~Reset (void) { this->flag_ = 0; }
       private:
-        bool & flag_;
+        CORBA::ULong & flag_;
       };
 
     private:
@@ -163,7 +163,7 @@ namespace TAO
        * This flag is used to prevent @c TypeCode equality and
        * equivalence operations from recursing indefinitely.
        */
-      mutable bool in_recursion_;
+      mutable CORBA::ULong recursion_start_offset_;
 
       /// Track whether data has been initialized.
       bool data_initialized_;
diff --git a/tao/AnyTypeCode/Recursive_Type_TypeCode.inl b/tao/AnyTypeCode/Recursive_Type_TypeCode.inl
index 8c285e02ce8..fa836bb9319 100644
--- a/tao/AnyTypeCode/Recursive_Type_TypeCode.inl
+++ b/tao/AnyTypeCode/Recursive_Type_TypeCode.inl
@@ -16,7 +16,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
   CORBA::ULong nfields)
   : TypeCodeBase (kind, id, name, fields, nfields)
   , lock_ ()
-  , in_recursion_ (false)
+  , recursion_start_offset_ (0)
   , data_initialized_(true)
 {
   // ACE_ASSERT (kind != CORBA::tk_except);
@@ -40,7 +40,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
                   ncases,
                   default_index)
   , lock_ ()
-  , in_recursion_ (false)
+  , recursion_start_offset_ (0)
   , data_initialized_(true)
 {
 }
@@ -65,7 +65,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
                   fields,
                   nfields)
   , lock_ ()
-  , in_recursion_ (false)
+  , recursion_start_offset_ (0)
   , data_initialized_(true)
 {
 }
@@ -79,7 +79,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
   char const * id)
   : TypeCodeBase (kind, id)
   , lock_ ()
-  , in_recursion_ (false)
+  , recursion_start_offset_ (0)
   , data_initialized_(false)
 {
 //   ACE_ASSERT (kind == CORBA::tk_struct
diff --git a/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
index 1a1956b6c94..26f13c58fa0 100644
--- a/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
+++ b/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
diff --git a/tao/AnyTypeCode/String_TypeCode_Static.cpp b/tao/AnyTypeCode/String_TypeCode_Static.cpp
index 5b22568eb84..aebe8ea7129 100644
--- a/tao/AnyTypeCode/String_TypeCode_Static.cpp
+++ b/tao/AnyTypeCode/String_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
diff --git a/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
index d4efe972e6b..c9076fa66fb 100644
--- a/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
+++ b/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
diff --git a/tao/AnyTypeCode/SystemExceptionA.cpp b/tao/AnyTypeCode/SystemExceptionA.cpp
index db5918a991a..bbb59777472 100644
--- a/tao/AnyTypeCode/SystemExceptionA.cpp
+++ b/tao/AnyTypeCode/SystemExceptionA.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/SystemExceptionA.h"
@@ -162,8 +163,9 @@ STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
 #define TAO_SYSTEM_EXCEPTION(name) \
-CORBA::Boolean operator>>= (const CORBA::Any &any, \
-                            const CORBA::name *&ex) \
+CORBA::Boolean \
+CORBA::operator>>= (const CORBA::Any &any, \
+                    const CORBA::name *&ex) \
 { \
   return \
     TAO::Any_SystemException::extract ( \
diff --git a/tao/AnyTypeCode/TAO_AnyTypeCode.rc b/tao/AnyTypeCode/TAO_AnyTypeCode.rc
new file mode 100644
index 00000000000..f26f5172554
--- /dev/null
+++ b/tao/AnyTypeCode/TAO_AnyTypeCode.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "TAO AnyTypeCode\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_AnyTypeCodeDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_AnyTypeCode.DLL\0"
+            VALUE "ProductName", "TAO\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/tao/AnyTypeCode/True_RefCount_Policy.cpp b/tao/AnyTypeCode/True_RefCount_Policy.cpp
index 54b5fbdc354..3d96b379e56 100644
--- a/tao/AnyTypeCode/True_RefCount_Policy.cpp
+++ b/tao/AnyTypeCode/True_RefCount_Policy.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/True_RefCount_Policy.h"
diff --git a/tao/AnyTypeCode/TypeCode.h b/tao/AnyTypeCode/TypeCode.h
index d3a980c286c..81c213017ee 100644
--- a/tao/AnyTypeCode/TypeCode.h
+++ b/tao/AnyTypeCode/TypeCode.h
@@ -498,7 +498,7 @@ namespace CORBA
 TAO_AnyTypeCode_Export CORBA::Boolean
 operator<< (TAO_OutputCDR & cdr, const CORBA::TypeCode_ptr tc);
 
-TAO_AnyTypeCode_Export CORBA::Boolean 
+TAO_AnyTypeCode_Export CORBA::Boolean
 operator>> (TAO_InputCDR & cdr, CORBA::TypeCode_ptr & tc);
 
 #if defined (GEN_OSTREAM_OPS)
diff --git a/tao/AnyTypeCode/TypeCodeA.cpp b/tao/AnyTypeCode/TypeCodeA.cpp
index 98da5020048..eed874a1f1d 100644
--- a/tao/AnyTypeCode/TypeCodeA.cpp
+++ b/tao/AnyTypeCode/TypeCodeA.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
diff --git a/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
index 4d0e0086c15..af5b611128c 100644
--- a/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+++ b/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/TypeCode_CDR_Extraction.h"
@@ -688,7 +689,7 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */,
             CORBA::ULongLong label;
             if (!(cdr >> label))
               return false;
- 
+
             typedef TypeCode::Case_T<CORBA::ULongLong,
                                      CORBA::String_var,
                                       CORBA::TypeCode_var> case_type;
@@ -1360,7 +1361,7 @@ namespace
     TAO::TypeCodeFactory::TC_Info_List recursive_tc;
     if (find_recursive_tc (id.in (), recursive_tc, infos))
       {
-        tc = recursive_tc[0].type;
+        tc = CORBA::TypeCode::_duplicate(recursive_tc[0].type);
       }
     else switch (kind)
       {
diff --git a/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp b/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp
index 120cec2326c..21e97d61939 100644
--- a/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp
+++ b/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp
@@ -57,20 +57,20 @@ TAO::TypeCode::Case_Enum_T<StringType,
 {
   CORBA::Any_var any = tc->member_label (index);
   TAO_OutputCDR out_cdr;
-  
+
   if (! any->impl ()->marshal_value (out_cdr))
     {
       return false;
     }
-  
+
   TAO_InputCDR in_cdr (out_cdr);
   CORBA::ULong tc_label = ACE_UINT32_MAX;
-  
+
   if (! in_cdr.read_ulong (tc_label))
     {
       return false;
     }
-  
+
   return (this->label_ == tc_label);
 }
 
diff --git a/tao/AnyTypeCode/TypeCode_Constants.cpp b/tao/AnyTypeCode/TypeCode_Constants.cpp
index 0bc1fd47fd9..edbed74e78e 100644
--- a/tao/AnyTypeCode/TypeCode_Constants.cpp
+++ b/tao/AnyTypeCode/TypeCode_Constants.cpp
@@ -1,8 +1,7 @@
+// -*- C++ -*-
 // $Id$
 
-
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
-
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/Empty_Param_TypeCode.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
diff --git a/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/tao/AnyTypeCode/Union_TypeCode_Static.cpp
index 01ae9019c74..6a2c7128cf7 100644
--- a/tao/AnyTypeCode/Union_TypeCode_Static.cpp
+++ b/tao/AnyTypeCode/Union_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Union_TypeCode_Static.h"
diff --git a/tao/AnyTypeCode/ValueModifier.pidl b/tao/AnyTypeCode/ValueModifier.pidl
index 8da4757546b..5499c7e99b7 100644
--- a/tao/AnyTypeCode/ValueModifier.pidl
+++ b/tao/AnyTypeCode/ValueModifier.pidl
@@ -1,25 +1,10 @@
 // -*- IDL -*-
 
-// ================================================================
 /**
  *  @file   ValueModifier.pidl
  *
  * $Id$
- *
- *   This file is used to generate the code in ValueModifierC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -SS -Sci -St
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
- *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
- *          ValueModifier.pidl
  */
-// ================================================================
 
 #ifndef TAO_VALUEMODIFIER_PIDL
 #define TAO_VALUEMODIFIER_PIDL
diff --git a/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/tao/AnyTypeCode/Value_TypeCode_Static.cpp
index db03bf03b42..50d4ccf6c68 100644
--- a/tao/AnyTypeCode/Value_TypeCode_Static.cpp
+++ b/tao/AnyTypeCode/Value_TypeCode_Static.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Value_TypeCode_Static.h"
diff --git a/tao/AnyTypeCode/Vector_AnyOp_T.h b/tao/AnyTypeCode/Vector_AnyOp_T.h
index ab30c22d85f..64d2d93c6af 100644
--- a/tao/AnyTypeCode/Vector_AnyOp_T.h
+++ b/tao/AnyTypeCode/Vector_AnyOp_T.h
@@ -9,7 +9,7 @@
  *
  * @author Jeff Parsons
  */
- 
+
 #include <vector>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -24,8 +24,8 @@ namespace TAO
     const std::vector<T> &)
   {
   }
-    
-  /// Non-copying  
+
+  /// Non-copying
   template<typename T>
   void
   insert_value_vector (
@@ -33,7 +33,7 @@ namespace TAO
     std::vector<T> *)
   {
   }
-    
+
   template<typename T>
   bool
   extract_value_vector (
@@ -41,7 +41,7 @@ namespace TAO
     std::vector<T> &)
   {
     return true;
-  }  
+  }
 
   /// Copying
   template<typename T>
@@ -51,7 +51,7 @@ namespace TAO
     const std::vector<T> &)
   {
   }
-    
+
   /// Non-copying
   template<typename T>
   void
@@ -60,7 +60,7 @@ namespace TAO
     std::vector<T> *)
   {
   }
-    
+
   template<typename T>
   bool
   extract_objref_vector (
@@ -68,7 +68,7 @@ namespace TAO
     std::vector<T> &)
   {
     return true;
-  }  
+  }
 
   /// Copying
   template<typename T_forany>
@@ -78,7 +78,7 @@ namespace TAO
     const std::vector<typename T_forany::_slice_type *> &)
   {
   }
-    
+
   /// Non-copying
   template<typename T_forany>
   void
@@ -87,7 +87,7 @@ namespace TAO
     std::vector<typename T_forany::_slice_type *> *)
   {
   }
-    
+
   template<typename T_forany>
   bool
   extract_array_vector (
@@ -95,7 +95,7 @@ namespace TAO
     std::vector<typename T_forany::_slice_type *> &)
   {
     return true;
-  }  
+  }
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/AnyTypeCode/Visibility.pidl b/tao/AnyTypeCode/Visibility.pidl
index ae2fe70e747..8da64a8ce9a 100644
--- a/tao/AnyTypeCode/Visibility.pidl
+++ b/tao/AnyTypeCode/Visibility.pidl
@@ -1,25 +1,10 @@
 // -*- IDL -*-
 
-// ================================================================
 /**
  *  @file   Visibility.pidl
  *
  * $Id$
- *
- *   This file is used to generate the code in VisibiltyC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
- *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
- *          Visibilty.pidl
  */
-// ================================================================
 
 #ifndef TAO_VISIBILITY_PIDL
 #define TAO_VISIBILITY_PIDL
diff --git a/tao/AnyTypeCode/append.cpp b/tao/AnyTypeCode/append.cpp
index 4b990b28079..8aa760c8064 100644
--- a/tao/AnyTypeCode/append.cpp
+++ b/tao/AnyTypeCode/append.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file     append.cpp
diff --git a/tao/AnyTypeCode/extra_anytypecode.mpb b/tao/AnyTypeCode/extra_anytypecode.mpb
new file mode 100644
index 00000000000..bb8640831cf
--- /dev/null
+++ b/tao/AnyTypeCode/extra_anytypecode.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+feature(!minimum_corba) {
+  Source_Files(TAO_ANYTYPECODE_COMPONENTS) {
+    ServicesA.cpp
+  }
+}
diff --git a/tao/AnyTypeCode_Adapter.h b/tao/AnyTypeCode_Adapter.h
index 8df6b85d77c..68b756bc8d3 100644
--- a/tao/AnyTypeCode_Adapter.h
+++ b/tao/AnyTypeCode_Adapter.h
@@ -41,7 +41,6 @@ namespace CORBA
   typedef Policy *Policy_ptr;
 }
 
-
 /**
  * @class TAO_AnyTypeCode_Adapter
  */
@@ -105,7 +104,7 @@ ANYTYPECODE__EXCEPTION_LIST
   virtual void insert_into_any (CORBA::Any * any, CORBA::Char const * mychar) = 0;
 
   virtual void insert_into_any (CORBA::Any * any, CORBA::WChar const * mywchar) = 0;
-  
+
   virtual void insert_into_any (CORBA::Any * any, const std::string & value) = 0;
 
   virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr policy) = 0;
diff --git a/tao/Argument.cpp b/tao/Argument.cpp
index 3db42215ea0..b82827f1d12 100644
--- a/tao/Argument.cpp
+++ b/tao/Argument.cpp
@@ -1,4 +1,3 @@
-
 // $Id$
 
 #include "tao/Argument.h"
diff --git a/tao/Argument.h b/tao/Argument.h
index bdc06741bdb..8310884e127 100644
--- a/tao/Argument.h
+++ b/tao/Argument.h
@@ -11,7 +11,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_ARGUMENT_H
 #define TAO_ARGUMENT_H
 
diff --git a/tao/Array_Traits_T.h b/tao/Array_Traits_T.h
index 459e03c3405..4abd34b0383 100644
--- a/tao/Array_Traits_T.h
+++ b/tao/Array_Traits_T.h
@@ -70,7 +70,6 @@ struct array_traits
         begin, end, &TAO::Array_Traits<forany_type>::zero);
   }
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_range(
@@ -81,18 +80,7 @@ struct array_traits
       TAO::Array_Traits<forany_type>::copy(*dst, *i);
     }
   }
-# else
-  inline static void copy_range(
-      value_type * begin, value_type * end, value_type *dst)
-  {
-    for(value_type * i = begin; i != end; ++i, ++dst)
-    {
-      TAO::Array_Traits<forany_type>::copy(*dst, *i);
-    }
-  }
-# endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_swap_range(
@@ -100,13 +88,6 @@ struct array_traits
   {
     copy_range(begin, end, dst);
   }
-# 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 */
 };
 
 } // namespace details
diff --git a/tao/Array_VarOut_T.h b/tao/Array_VarOut_T.h
index d1b386ce72b..904c3d96a29 100644
--- a/tao/Array_VarOut_T.h
+++ b/tao/Array_VarOut_T.h
@@ -155,7 +155,7 @@ public:
     );
 
   _out_type     out (void);
-  
+
 private:
   // Some compilers don't look into the base class when parsing
   // templates unless they are force to.
@@ -188,7 +188,7 @@ public:
   _out_type     out (void);
 
   operator _slice_type *& ();
-  
+
 private:
   // Some compilers don't look into the base class when parsing
   // templates unless they are force to.
diff --git a/tao/Asynch_Queued_Message.cpp b/tao/Asynch_Queued_Message.cpp
index d80f07e23ad..8ea09608617 100644
--- a/tao/Asynch_Queued_Message.cpp
+++ b/tao/Asynch_Queued_Message.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Asynch_Queued_Message.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
diff --git a/tao/Auto_Functor.h b/tao/Auto_Functor.h
deleted file mode 100644
index 98eb6d73bec..00000000000
--- a/tao/Auto_Functor.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Auto_Functor.h
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@atdesk.com>
- */
-//=============================================================================
-#ifndef TAO_AUTO_FUNCTOR_H
-#define TAO_AUTO_FUNCTOR_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#include /**/ "tao/Versioned_Namespace.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Functor.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace Utils
-  {
-
-  using namespace ACE_Utils;
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* TAO_AUTO_FUNCTOR_H*/
diff --git a/tao/Basic_Argument_T.h b/tao/Basic_Argument_T.h
index 19b49db7713..e6a8d25cc61 100644
--- a/tao/Basic_Argument_T.h
+++ b/tao/Basic_Argument_T.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_BASIC_ARGUMENT_T_H
 #define TAO_BASIC_ARGUMENT_T_H
 
diff --git a/tao/Basic_Argument_T.inl b/tao/Basic_Argument_T.inl
index 6d163fe0703..8d1629d7e57 100644
--- a/tao/Basic_Argument_T.inl
+++ b/tao/Basic_Argument_T.inl
@@ -24,7 +24,7 @@ template<typename S,
          template <typename> class Insert_Policy>
 ACE_INLINE
 TAO::In_Basic_Clonable_Argument_T<S,Insert_Policy>::In_Basic_Clonable_Argument_T (S const & x)
-  : In_Basic_Argument_T<S,Insert_Policy> (x),                                                 
+  : In_Basic_Argument_T<S,Insert_Policy> (x),
     is_clone_ (false)
 {}
 
diff --git a/tao/Basic_Arguments.h b/tao/Basic_Arguments.h
index 0dcb6a5722a..153c977dd90 100644
--- a/tao/Basic_Arguments.h
+++ b/tao/Basic_Arguments.h
@@ -131,7 +131,7 @@ namespace TAO
           TAO::Any_Insert_Policy_AnyTypeCode_Adapter>
   {
   };
-  
+
   template<>
   class TAO_Export Arg_Traits<std::string>
     : public
diff --git a/tao/BiDir_GIOP.mpc b/tao/BiDir_GIOP.mpc
deleted file mode 100644
index edd59deb2df..00000000000
--- a/tao/BiDir_GIOP.mpc
+++ /dev/null
@@ -1,56 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \
-                -Wb,export_macro=TAO_BiDirGIOP_Export \
-                -Wb,export_include=tao/BiDir_GIOP/bidirgiop_export.h \
-                -Wb,include_guard=TAO_BIDIRGIOP_SAFE_INCLUDE \
-                -Wb,safe_include=tao/BiDir_GIOP/BiDirGIOP.h \
-                -o BiDir_GIOP
-    BiDir_GIOP/BiDirPolicy.pidl
-  }
-}
-
-project(BiDir_GIOP) : taolib, tao_output, install, pi, taoidldefaults {
-  after       += *idl
-  sharedname   = TAO_BiDirGIOP
-  dynamicflags += TAO_BIDIRGIOP_BUILD_DLL
-
-  Source_Files {
-    BiDir_GIOP
-  }
-
-  Source_Files {
-    BiDir_GIOP/BiDirPolicyC.cpp
-  }
-
-  Header_Files {
-    BiDir_GIOP
-    BiDir_GIOP/BiDirPolicyC.h
-    BiDir_GIOP/BiDirPolicyS.h
-  }
-
-  Inline_Files {
-    BiDir_GIOP
-  }
-
-  Template_Files {
-    BiDir_GIOP
-  }
-
-  Resource_Files {
-    BiDir_GIOP
-  }
-
-  PIDL_Files {
-    BiDir_GIOP
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    BiDir_GIOP/TAO_BiDirGIOP.pc.in
-  }
-}
diff --git a/tao/BiDir_GIOP/BiDirGIOP.cpp b/tao/BiDir_GIOP/BiDirGIOP.cpp
index 90c4c1fa166..c91d240c010 100644
--- a/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/BiDir_GIOP/BiDir_ORBInitializer.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/BiDir_GIOP/BiDirPolicy_Validator.h"
diff --git a/tao/BiDir_GIOP/BiDirPolicy.pidl b/tao/BiDir_GIOP/BiDirPolicy.pidl
index c308d68635a..2f7e56aa271 100644
--- a/tao/BiDir_GIOP/BiDirPolicy.pidl
+++ b/tao/BiDir_GIOP/BiDirPolicy.pidl
@@ -1,22 +1,5 @@
 // $Id$
 
-/**
- * This file is used to generate the code in
- * BiDirPolicy*.* The command used to generate code
- * is:
- *
- * tao_idl -o orig -Sa -St -Sci \
- *           -Wb,export_macro=TAO_BiDirGIOP_Export \
- *           -Wb,export_include="bidirgiop_export.h" \
- *           -Wb,pre_include="ace/pre.h" \
- *           -Wb,post_include="ace/post.h" \
- *           -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
- *           -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \
- *           BiDirPolicy.pidl
- *
- *  This is from the GIOP 1.2 spec for Bi Dir IIOP.
- */
-
 #ifndef TAO_BIDIR_POLICY_PIDL
 #define TAO_BIDIR_POLICY_PIDL
 
diff --git a/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
index 6ea3680fa3a..71e17e7cb05 100644
--- a/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
+++ b/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/BiDir_GIOP/BiDirPolicy_Validator.h"
 #include "tao/BiDir_GIOP/BiDir_Policy_i.h"
 #include "tao/Policy_Set.h"
diff --git a/tao/BiDir_GIOP/BiDir_GIOP.mpc b/tao/BiDir_GIOP/BiDir_GIOP.mpc
new file mode 100644
index 00000000000..f33fc0b431e
--- /dev/null
+++ b/tao/BiDir_GIOP/BiDir_GIOP.mpc
@@ -0,0 +1,38 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \
+                -Wb,export_macro=TAO_BiDirGIOP_Export \
+                -Wb,export_include=tao/BiDir_GIOP/bidirgiop_export.h \
+                -Wb,include_guard=TAO_BIDIRGIOP_SAFE_INCLUDE \
+                -Wb,safe_include=tao/BiDir_GIOP/BiDirGIOP.h \
+                -iC BiDir_GIOP
+    BiDirPolicy.pidl
+  }
+
+  specific {
+    install_dir = tao/BiDir_GIOP
+  }
+}
+
+project(BiDir_GIOP) : taolib, tao_output, install, pi, taoidldefaults {
+  after       += *idl
+  sharedname   = TAO_BiDirGIOP
+  dynamicflags += TAO_BIDIRGIOP_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    BiDirPolicyC.cpp
+  }
+
+  Header_Files {
+    *.h
+    BiDirPolicyC.h
+    BiDirPolicyS.h
+  }
+
+  specific {
+    install_dir = tao/BiDir_GIOP
+  }
+}
diff --git a/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
index 8c825ec56da..18dc40e0995 100644
--- a/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ b/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
@@ -1,10 +1,11 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/BiDir_GIOP/BiDir_PolicyFactory.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/BiDir_GIOP/BiDir_Policy_i.h"
-
 #include "tao/ORB_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
-
 #include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp b/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp
index 5427b3b93ef..77ebe82f96a 100644
--- a/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp
+++ b/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "tao/BiDir_GIOP/BiDir_Service_Context_Handler.h"
-
 #include "tao/CDR.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/Transport.h"
diff --git a/tao/Bind_Dispatcher_Guard.cpp b/tao/Bind_Dispatcher_Guard.cpp
index 6afdd4cd2f0..8efa32be24d 100644
--- a/tao/Bind_Dispatcher_Guard.cpp
+++ b/tao/Bind_Dispatcher_Guard.cpp
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Bind_Dispatcher_Guard.h"
diff --git a/tao/Bind_Dispatcher_Guard.h b/tao/Bind_Dispatcher_Guard.h
index 24d31689905..6f19ed9f000 100644
--- a/tao/Bind_Dispatcher_Guard.h
+++ b/tao/Bind_Dispatcher_Guard.h
@@ -33,7 +33,7 @@ public:
 
   ~TAO_Bind_Dispatcher_Guard (void);
 
-  /// Returns 0 if succesful and non-zero otherwise.
+  /// Returns 0 if successful and non-zero otherwise.
   int unbind_dispatcher (void);
 
   /// State information
diff --git a/tao/Blocked_Connect_Strategy.cpp b/tao/Blocked_Connect_Strategy.cpp
index 41ef161741a..0807f9fd681 100644
--- a/tao/Blocked_Connect_Strategy.cpp
+++ b/tao/Blocked_Connect_Strategy.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Blocked_Connect_Strategy.h"
 #include "tao/Connection_Handler.h"
 
@@ -18,14 +20,12 @@ TAO_Blocked_Connect_Strategy::synch_options (ACE_Time_Value *timeout,
   if (timeout != 0)
     {
       // Blocking with a timeout
-      options.set (ACE_Synch_Options::USE_TIMEOUT,
-                   *timeout);
+      options.set (ACE_Synch_Options::USE_TIMEOUT, *timeout);
     }
   else
     {
       // Making it sure it is blocking.
-      options.set (0,
-                   ACE_Time_Value::zero);
+      options.set (0, ACE_Time_Value::zero);
     }
 }
 
diff --git a/tao/Blocked_Connect_Strategy.h b/tao/Blocked_Connect_Strategy.h
index 9e140e316ec..4e8ef1bd350 100644
--- a/tao/Blocked_Connect_Strategy.h
+++ b/tao/Blocked_Connect_Strategy.h
@@ -39,14 +39,12 @@ public:
    * Concrete implementation for this class. Please see
    * Connect_Strategy.h for details
    */
-  virtual void synch_options (ACE_Time_Value *val,
-                              ACE_Synch_Options &opt);
+  virtual void synch_options (ACE_Time_Value *val, ACE_Synch_Options &opt);
 
 protected:
   virtual int wait_i (TAO_LF_Event *ev,
                       TAO_Transport *t,
-                     ACE_Time_Value *val);
-
+                      ACE_Time_Value *val);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/BooleanSeq.pidl b/tao/BooleanSeq.pidl
index 2d8461b7656..3a56f2a8506 100644
--- a/tao/BooleanSeq.pidl
+++ b/tao/BooleanSeq.pidl
@@ -1,13 +1,10 @@
 // -*- IDL -*-
-//
 // $Id$
 
 /**
  * @file BooleanSeq.pidl
  *
  * $Id$
- *
- * This file is used to generate the code in BooleanSeqC.*
  */
 
 #ifndef TAO_CORBA_BOOLEAN_SEQ_IDL
diff --git a/tao/Bounded_Basic_String_Sequence_T.h b/tao/Bounded_Basic_String_Sequence_T.h
index 85bbd8f53b1..c1b1c57f398 100644
--- a/tao/Bounded_Basic_String_Sequence_T.h
+++ b/tao/Bounded_Basic_String_Sequence_T.h
@@ -39,48 +39,48 @@ public:
 
   typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
 
-  /// @copydoc details::generic_sequence::generic_sequence()
+  /// @copydoc TAO::details::generic_sequence::generic_sequence()
   inline bounded_basic_string_sequence()
     : impl_()
   {}
-  /// @copydoc details::generic_sequence::generic_sequence()
+  /// @copydoc TAO::details::generic_sequence::generic_sequence()
   inline bounded_basic_string_sequence(
       CORBA::ULong length,
       value_type * data,
       CORBA::Boolean release)
     : impl_(MAX, length, data, release)
   {}
-  /// @copydoc details::generic_sequence::maximum()
+  /// @copydoc TAO::details::generic_sequence::maximum()
   inline CORBA::ULong maximum() const {
     return impl_.maximum();
   }
-  /// @copydoc details::generic_sequence::release()
+  /// @copydoc TAO::details::generic_sequence::release()
   inline CORBA::Boolean release() const {
     return impl_.release();
   }
-  /// @copydoc details::generic_sequence::length()
+  /// @copydoc TAO::details::generic_sequence::length()
   inline CORBA::ULong length() const {
     return impl_.length();
   }
 
-  /// @copydoc details::generic_sequence::length()
+  /// @copydoc TAO::details::generic_sequence::length()
   inline void length(CORBA::ULong length) {
     implementation_type::range::check_length(length, MAX);
     impl_.length(length);
   }
-  /// @copydoc details::generic_sequence::operator[]
+  /// @copydoc TAO::details::generic_sequence::operator[]
   inline const_element_type operator[](CORBA::ULong i) const {
     return const_element_type (impl_[i], release());
   }
-  /// @copydoc details::generic_sequence::operator[]
+  /// @copydoc TAO::details::generic_sequence::operator[]
   inline element_type operator[](CORBA::ULong i) {
     return element_type(impl_[i], release());
   }
-  /// @copydoc details::generic_sequence::get_buffer()
+  /// @copydoc TAO::details::generic_sequence::get_buffer()
   inline const_value_type const * get_buffer() const {
     return impl_.get_buffer();
   }
-  /// @copydoc details::generic_sequence::replace()
+  /// @copydoc TAO::details::generic_sequence::replace()
   inline void replace(
       CORBA::ULong length,
       value_type * data,
diff --git a/tao/Bounded_Object_Reference_Sequence_T.h b/tao/Bounded_Object_Reference_Sequence_T.h
index a24fece5740..ee54fdcf7d1 100644
--- a/tao/Bounded_Object_Reference_Sequence_T.h
+++ b/tao/Bounded_Object_Reference_Sequence_T.h
@@ -52,48 +52,48 @@ public:
   {}
 
   /* Use default ctor, operator= and dtor */
-  /// @copydoc details::generic_sequence::maximum()
+  /// @copydoc TAO::details::generic_sequence::maximum()
   inline CORBA::ULong maximum() const {
     return impl_.maximum();
   }
-  /// @copydoc details::generic_sequence::release()
+  /// @copydoc TAO::details::generic_sequence::release()
   inline CORBA::Boolean release() const {
     return impl_.release();
   }
-  /// @copydoc details::generic_sequence::length()
+  /// @copydoc TAO::details::generic_sequence::length()
   inline CORBA::ULong length() const {
     return impl_.length();
   }
 
-  /// @copydoc details::generic_sequence::length()
+  /// @copydoc TAO::details::generic_sequence::length()
   inline void length(CORBA::ULong length) {
     implementation_type::range::check_length(length, MAX);
     impl_.length(length);
   }
-  /// @copydoc details::generic_sequence::operator[]
+  /// @copydoc TAO::details::generic_sequence::operator[]
   inline const_element_type operator[](CORBA::ULong i) const {
     return const_element_type (impl_[i], release());
   }
-  /// @copydoc details::generic_sequence::operator[]
+  /// @copydoc TAO::details::generic_sequence::operator[]
   inline element_type operator[](CORBA::ULong i) {
     return element_type(impl_[i], release());
   }
-  /// @copydoc details::generic_sequence::get_buffer()
+  /// @copydoc TAO::details::generic_sequence::get_buffer()
   inline value_type const * get_buffer() const {
     return impl_.get_buffer();
   }
-  /// @copydoc details::generic_sequence::replace()
+  /// @copydoc TAO::details::generic_sequence::replace()
   inline void replace(
       CORBA::ULong length,
       value_type * data,
       CORBA::Boolean release = false) {
     impl_.replace(MAX, length, data, release);
   }
-  /// @copydoc details::generic_sequence::get_buffer(CORBA::Boolean)
+  /// @copydoc TAO::details::generic_sequence::get_buffer(CORBA::Boolean)
   inline value_type * get_buffer(CORBA::Boolean orphan = false) {
     return impl_.get_buffer(orphan);
   }
-  /// @copydoc details::generic_sequence::swap
+  /// @copydoc TAO::details::generic_sequence::swap
   inline void swap(bounded_object_reference_sequence & rhs) throw() {
     impl_.swap(rhs.impl_);
   }
diff --git a/tao/Bounded_Value_Sequence_T.h b/tao/Bounded_Value_Sequence_T.h
index 020f1c4b7f3..ac74f053de5 100644
--- a/tao/Bounded_Value_Sequence_T.h
+++ b/tao/Bounded_Value_Sequence_T.h
@@ -46,47 +46,47 @@ public:
   {}
   /* Use default ctor, operator= and dtor */
 
-  /// @copydoc details::generic_sequence::maximum()
+  /// @copydoc TAO::details::generic_sequence::maximum()
   inline CORBA::ULong maximum() const {
     return impl_.maximum();
   }
-  /// @copydoc details::generic_sequence::release()
+  /// @copydoc TAO::details::generic_sequence::release()
   inline CORBA::Boolean release() const {
     return impl_.release();
   }
-  /// @copydoc details::generic_sequence::length()
+  /// @copydoc TAO::details::generic_sequence::length()
   inline CORBA::ULong length() const {
     return impl_.length();
   }
-  /// @copydoc details::generic_sequence::length()
+  /// @copydoc TAO::details::generic_sequence::length()
   inline void length(CORBA::ULong length) {
     implementation_type::range::check_length(length, MAX);
     impl_.length(length);
   }
-  /// @copydoc details::generic_sequence::operator[]
+  /// @copydoc TAO::details::generic_sequence::operator[]
   inline value_type const & operator[](CORBA::ULong i) const {
     return impl_[i];
   }
-  /// @copydoc details::generic_sequence::operator[]
+  /// @copydoc TAO::details::generic_sequence::operator[]
   inline value_type & operator[](CORBA::ULong i) {
     return impl_[i];
   }
-  /// @copydoc details::generic_sequence::replace()
+  /// @copydoc TAO::details::generic_sequence::replace()
   inline void replace(
       CORBA::ULong length,
       value_type * data,
       CORBA::Boolean release = false) {
     impl_.replace(MAX, length, data, release);
   }
-  /// @copydoc details::generic_sequence::get_buffer()
+  /// @copydoc TAO::details::generic_sequence::get_buffer()
   inline value_type const * get_buffer() const {
     return impl_.get_buffer();
   }
-  /// @copydoc details::generic_sequence::get_buffer(CORBA::Boolean)
+  /// @copydoc TAO::details::generic_sequence::get_buffer(CORBA::Boolean)
   inline value_type * get_buffer(CORBA::Boolean orphan = false) {
     return impl_.get_buffer(orphan);
   }
-  /// @copydoc details::generic_sequence::swap()
+  /// @copydoc TAO::details::generic_sequence::swap()
   inline void swap(bounded_value_sequence & rhs) throw() {
     impl_.swap(rhs.impl_);
   }
diff --git a/tao/Bzip2Compressor.mpc b/tao/Bzip2Compressor.mpc
deleted file mode 100644
index 878c6828ec1..00000000000
--- a/tao/Bzip2Compressor.mpc
+++ /dev/null
@@ -1,38 +0,0 @@
-//$Id$
-project(Bzip2Compressor) : taolib, tao_output, install, compression, taoidldefaults, ace_bzip2 {
-  requires += bzip2
-  sharedname   = TAO_Bzip2Compressor
-  dynamicflags += TAO_BZIP2COMPRESSOR_BUILD_DLL
-
-  Source_Files {
-    Compression/bzip2
-  }
-
-  Header_Files {
-    Compression/bzip2
-  }
-
-  Inline_Files {
-    Compression/bzip2
-  }
-
-  Template_Files {
-    Compression/bzip2
-  }
-
-  Resource_Files {
-    Compression/bzip2
-  }
-
-  PIDL_Files {
-    Compression/bzip2
-  }
-
-  IDL_Files {
-    Compression/bzip2
-  }
-
-  Pkgconfig_Files {
-    Compression/bzip2/TAO_Bzip2Compressor.pc.in
-  }
-}
diff --git a/tao/CDR.cpp b/tao/CDR.cpp
index 1c1b24bc9f3..dc9ccc4cb57 100644
--- a/tao/CDR.cpp
+++ b/tao/CDR.cpp
@@ -252,7 +252,7 @@ TAO_OutputCDR::fragment_stream (ACE_CDR::ULong pending_alignment,
 
 
 
-int 
+int
 TAO_OutputCDR::offset (char* pos)
 {
   int offset = 0;
diff --git a/tao/CDR.h b/tao/CDR.h
index a0228ac2e03..60bb7e6eb45 100644
--- a/tao/CDR.h
+++ b/tao/CDR.h
@@ -22,7 +22,7 @@
  *   The implementation expects that buffers are aligned according
  *   to the strongest CDR alignment restriction.
  *
- *   NOTE: this does everything "CDR 1.1" does ... that is, it
+ *   @note This does everything "CDR 1.1" does ... that is, it
  *   supports the five extended OMG-IDL data types in UNO Appendix
  *   A, which provide richer arithmetic types (64 bit integers,
  *   "quad precision" FP) and UNICODE-based characters and strings.
@@ -279,7 +279,7 @@ private:
   /// Request/reply send timeout.
   ACE_Time_Value * timeout_;
   //@}
- 
+
   /// These maps are used by valuetype indirection support.
   Repo_Id_Map_Handle repo_id_map_;
 #ifdef TAO_HAS_VALUETYPE_CODEBASE
diff --git a/tao/CDR.inl b/tao/CDR.inl
index 204f247c996..13ec26dc110 100644
--- a/tao/CDR.inl
+++ b/tao/CDR.inl
@@ -80,7 +80,7 @@ TAO_OutputCDR::get_codebase_url_map ()
 }
 #endif
 
-ACE_INLINE TAO_OutputCDR::Value_Map_Handle& 
+ACE_INLINE TAO_OutputCDR::Value_Map_Handle&
 TAO_OutputCDR::get_value_map ()
 {
   return this->value_map_;
diff --git a/tao/CORBALOC_Parser.cpp b/tao/CORBALOC_Parser.cpp
index f34e314fc22..6605805c50c 100644
--- a/tao/CORBALOC_Parser.cpp
+++ b/tao/CORBALOC_Parser.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/CORBALOC_Parser.h"
 
 #if (TAO_HAS_CORBALOC_PARSER == 1)
@@ -159,8 +162,8 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb)
       {
         if (TAO_debug_level)
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ")
-                      ACE_TEXT("could not parse from %C"),
+                      ACE_TEXT("TAO (%P|%t) - TAO_CORBALOC_Parser::parse_string ")
+                      ACE_TEXT("could not parse from %C\n"),
                       ior));
         throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 10, CORBA::COMPLETED_NO);
       }
@@ -189,8 +192,8 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb)
     // anything else is a violation.
     if (TAO_debug_level)
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ")
-                  ACE_TEXT("could not parse from %C"),
+                  ACE_TEXT("TAO (%P|%t) - TAO_CORBALOC_Parser::parse_string ")
+                  ACE_TEXT("could not parse from %C\n"),
                   ior));
     throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 10, CORBA::COMPLETED_NO);
   } // end of while
@@ -221,7 +224,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb)
           // mprofile's size is 0, and give_profile fails.
           if (TAO_debug_level)
             ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ")
+                        ACE_TEXT("TAO (%P|%t) - TAO_CORBALOC_Parser::parse_string ")
                         ACE_TEXT("mprofile.give_profile failed for i = %d\n"),
                         i));
           throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 10, CORBA::COMPLETED_NO);
@@ -277,7 +280,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior,
           if (TAO_debug_level > 0)
             {
               ACE_ERROR ((LM_ERROR,
-                         ACE_TEXT ("\nTAO (%P|%t) TAO_CORBALOC_Parser: ")
+                         ACE_TEXT ("TAO (%P|%t) - TAO_CORBALOC_Parser: ")
                          ACE_TEXT ("Invalid IPv6 decimal address specified.\n")));
             }
           separator = 0;
@@ -322,8 +325,8 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior,
 
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) ")
-                        ACE_TEXT ("cannot determine hostname.\n")));
+                        ACE_TEXT ("TAO (%P|%t) - ")
+                        ACE_TEXT ("Cannot determine hostname.\n")));
 
           throw ::CORBA::INV_OBJREF
                      (CORBA::SystemException::_tao_minor_code
diff --git a/tao/CORBANAME_Parser.cpp b/tao/CORBANAME_Parser.cpp
index aacbd0264ca..4f23d796db9 100644
--- a/tao/CORBANAME_Parser.cpp
+++ b/tao/CORBANAME_Parser.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CORBANAME_Parser.h"
diff --git a/tao/CORBA_String.cpp b/tao/CORBA_String.cpp
index aaa20da44ec..cfd03acc79f 100644
--- a/tao/CORBA_String.cpp
+++ b/tao/CORBA_String.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/CORBA_String.h"
 #include "tao/String_Manager_T.h"
 
diff --git a/tao/CORBA_methods.h b/tao/CORBA_methods.h
index 63ee865db3c..a5cbd05895f 100644
--- a/tao/CORBA_methods.h
+++ b/tao/CORBA_methods.h
@@ -63,7 +63,7 @@ namespace CORBA
   {
     return x == 0;
   }
-  
+
   template<typename T> inline void release (T x)
   {
     if (x != 0)
diff --git a/tao/CSD_Framework.mpc b/tao/CSD_Framework.mpc
deleted file mode 100644
index 218b2f7e3de..00000000000
--- a/tao/CSD_Framework.mpc
+++ /dev/null
@@ -1,61 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -Sci -SS -Gp -Gd -Sorb -GA -Sal \
-                -Wb,export_macro=TAO_CSD_FW_Export \
-                -Wb,export_include=tao/CSD_Framework/CSD_FW_Export.h \
-                -o CSD_Framework
-    idlflags -= -Sa -St
-    CSD_Framework/CSD_Framework.pidl
-  }
-}
-
-project(CSD_Framework) : taolib, tao_output, portableserver, install, pi, avoids_corba_e_micro, taoidldefaults {
-  after       += *idl
-  sharedname   = TAO_CSD_Framework
-  dynamicflags += TAO_CSD_FW_BUILD_DLL
-  includes    += $(TAO_ROOT)/tao
-
-  Source_Files {
-    CSD_Framework
-  }
-
-  Source_Files {
-    CSD_Framework/CSD_FrameworkC.cpp
-  }
-
-  Header_Files {
-    CSD_Framework
-    CSD_Framework/CSD_FrameworkC.h
-    CSD_Framework/CSD_FrameworkS.h
-    CSD_Framework/CSD_FrameworkA.h
-  }
-
-  Inline_Files {
-    CSD_Framework
-  }
-
-  Template_Files {
-    CSD_Framework
-  }
-
-  Resource_Files {
-    CSD_Framework
-  }
-
-  IDL_Files {
-    CSD_Framework
-  }
-
-  PIDL_Files {
-    CSD_Framework
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    CSD_Framework/TAO_CSD_Framework.pc.in
-  }
-}
diff --git a/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
index bcb0e31e1a1..557709055d0 100644
--- a/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+++ b/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h"
@@ -5,11 +6,6 @@
 #include "tao/CSD_Framework/CSD_Strategy_Repository.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID(CSD_Framework,
-          CSD_Default_Servant_Dispatcher,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CSD_Default_Servant_Dispatcher::~TAO_CSD_Default_Servant_Dispatcher (void)
@@ -24,8 +20,7 @@ TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                                                  ACE_Lock &lock,
                                                  TAO_SYNCH_MUTEX &thread_lock,
                                                  TAO_ORB_Core &orb_core,
-                                                 TAO_Object_Adapter *object_adapter
-                                                 )
+                                                 TAO_Object_Adapter *object_adapter)
     {
   TAO_CSD_POA *poa = 0;
 
diff --git a/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
index 7d35160ec1f..df33e5462b9 100644
--- a/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
+++ b/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
@@ -1,4 +1,6 @@
+// -*- C++ -*-
 // $Id$
+
 #include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
@@ -6,11 +8,6 @@
 #include "tao/Transport.h"
 #include "tao/CDR.h"
 
-
-ACE_RCSID (CSD_Framework,
-           FW_Server_Request_Wrapper,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_Framework/CSD_Framework.mpc b/tao/CSD_Framework/CSD_Framework.mpc
new file mode 100644
index 00000000000..ab92c149e34
--- /dev/null
+++ b/tao/CSD_Framework/CSD_Framework.mpc
@@ -0,0 +1,39 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -Sci -SS -Gp -Gd -Sorb -GA -Sal \
+                -Wb,export_macro=TAO_CSD_FW_Export \
+                -Wb,export_include=tao/CSD_Framework/CSD_FW_Export.h \
+                -iC tao/CSD_Framework
+    idlflags -= -Sa -St
+    CSD_Framework.pidl
+  }
+
+  specific {
+    install_dir = tao/CSD_Framework
+  }
+}
+
+project(CSD_Framework) : taolib, tao_output, portableserver, install, pi, avoids_corba_e_micro, taoidldefaults {
+  after       += *idl
+  sharedname   = TAO_CSD_Framework
+  dynamicflags += TAO_CSD_FW_BUILD_DLL
+  includes    += $(TAO_ROOT)/tao
+
+  Source_Files {
+    *.cpp
+    CSD_FrameworkC.cpp
+  }
+
+  Header_Files {
+    *.h
+    CSD_FrameworkC.h
+    CSD_FrameworkS.h
+    CSD_FrameworkA.h
+  }
+
+  specific {
+    install_dir = tao/CSD_Framework
+  }
+}
diff --git a/tao/CSD_Framework/CSD_Framework.pidl b/tao/CSD_Framework/CSD_Framework.pidl
index 9d209da25bf..e30b32caa91 100644
--- a/tao/CSD_Framework/CSD_Framework.pidl
+++ b/tao/CSD_Framework/CSD_Framework.pidl
@@ -5,19 +5,6 @@
  * $Id$
  *
  * @brief Pre-compiled IDL source for the CSD_Framework module.
- *
- * This file is used to generate the code in
- * CSD_FrameworkC.{h,inl,cpp}, using the following command:
- *
- * $ACE_ROOT/bin/tao_idl \
- *     -o orig -Gp -Gd -Gt -GA -I$TAO_ROOT -Sci \
- *          -Wb,export_macro=TAO_CSD_FW_Export \
- *          -Wb,export_include="CSD_FW_Export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
- *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \
- *          CSD_Framework.pidl
  */
 
 #ifndef CSD_FRAMEWORK_PIDL
diff --git a/tao/CSD_Framework/CSD_Framework_Loader.cpp b/tao/CSD_Framework/CSD_Framework_Loader.cpp
index 4d2f47e09ec..62f9d46786c 100644
--- a/tao/CSD_Framework/CSD_Framework_Loader.cpp
+++ b/tao/CSD_Framework/CSD_Framework_Loader.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_Framework_Loader.h"
@@ -6,11 +7,6 @@
 #include "tao/CSD_Framework/CSD_ORBInitializer.h"
 #include "tao/PI/DLL_Resident_ORB_Initializer.h"
 #include "tao/ORBInitializer_Registry.h"
-
-ACE_RCSID (CSD_Framework,
-           CSD_Framework_Loader,
-           "$Id$")
-
 #include "tao/ORB_Core.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/CSD_Framework/CSD_ORBInitializer.cpp b/tao/CSD_Framework/CSD_ORBInitializer.cpp
index ed67d4ce592..bd92317f7ed 100644
--- a/tao/CSD_Framework/CSD_ORBInitializer.cpp
+++ b/tao/CSD_Framework/CSD_ORBInitializer.cpp
@@ -1,10 +1,7 @@
-#include "tao/CSD_Framework/CSD_ORBInitializer.h"
-
-ACE_RCSID (CSD,
-           CSD_ORBInitializer,
-           "$Id$")
-
+// -*- C++ -*-
+// $Id$
 
+#include "tao/CSD_Framework/CSD_ORBInitializer.h"
 #include "tao/Exception.h"
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfo.h"
diff --git a/tao/CSD_Framework/CSD_Object_Adapter.cpp b/tao/CSD_Framework/CSD_Object_Adapter.cpp
index b9c56ea4445..1daba9b08e5 100644
--- a/tao/CSD_Framework/CSD_Object_Adapter.cpp
+++ b/tao/CSD_Framework/CSD_Object_Adapter.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_Object_Adapter.h"
 #include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
 #include "tao/CSD_Framework/CSD_POA.h"
 
-ACE_RCSID (CSD_Framework,
-           CSD_Object_Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CSD_Object_Adapter::TAO_CSD_Object_Adapter (
diff --git a/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
index d62b5e0928f..11ff051f409 100644
--- a/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
+++ b/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h"
@@ -8,11 +9,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (CSD_Framework,
-           CSD_Object_Adapter_Factory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CSD_Object_Adapter_Factory::TAO_CSD_Object_Adapter_Factory (void)
diff --git a/tao/CSD_Framework/CSD_POA.cpp b/tao/CSD_Framework/CSD_POA.cpp
index 5f53d9bd76d..8321b598f38 100644
--- a/tao/CSD_Framework/CSD_POA.cpp
+++ b/tao/CSD_Framework/CSD_POA.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_POA.h"
@@ -6,10 +7,6 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (CSD_Framework,
-           CSD_POA,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_Framework/CSD_POA.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_Framework/CSD_POA.h b/tao/CSD_Framework/CSD_POA.h
index e6ddec124cc..9fa292250ea 100644
--- a/tao/CSD_Framework/CSD_POA.h
+++ b/tao/CSD_Framework/CSD_POA.h
@@ -38,7 +38,7 @@ class TAO_CSD_FW_Export TAO_CSD_POA
     public virtual TAO_Regular_POA
 {
 public:
-  //Constructor
+  /// Constructor
   TAO_CSD_POA (const String &name,
                PortableServer::POAManager_ptr poa_manager,
                const TAO_POA_Policy_Set &policies,
@@ -48,7 +48,7 @@ public:
                TAO_ORB_Core &orb_core,
                TAO_Object_Adapter *object_adapter);
 
-  //Destructor
+  /// Destructor
   virtual ~TAO_CSD_POA (void);
 
   /// Pass the Strategy object reference to the CSD poa.
@@ -69,7 +69,7 @@ public:
   virtual void servant_deactivated_hook (PortableServer::Servant servant,
                                 const PortableServer::ObjectId& oid);
 
-  ///Method for creating new CSD POA.
+  /// Method for creating new CSD POA.
   TAO_Root_POA * new_POA (const String &name,
                           PortableServer::POAManager_ptr poa_manager,
                           const TAO_POA_Policy_Set &policies,
diff --git a/tao/CSD_Framework/CSD_POA.inl b/tao/CSD_Framework/CSD_POA.inl
index 5e94cf5401e..6f9ad7e08f2 100644
--- a/tao/CSD_Framework/CSD_POA.inl
+++ b/tao/CSD_Framework/CSD_POA.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO::CSD::Strategy_Proxy& 
+TAO::CSD::Strategy_Proxy&
 TAO_CSD_POA::servant_dispatching_strategy_proxy (void) const
 {
   return *sds_proxy_;
diff --git a/tao/CSD_Framework/CSD_Strategy_Base.cpp b/tao/CSD_Framework/CSD_Strategy_Base.cpp
index b59ef04eef4..6edc8f51d44 100644
--- a/tao/CSD_Framework/CSD_Strategy_Base.cpp
+++ b/tao/CSD_Framework/CSD_Strategy_Base.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_Strategy_Base.h"
@@ -8,10 +9,6 @@
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/TAO_Server_Request.h"
 
-ACE_RCSID (CSD_Framework,
-           CSD_Strategy_Base,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_Framework/CSD_Strategy_Base.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_Framework/CSD_Strategy_Proxy.cpp b/tao/CSD_Framework/CSD_Strategy_Proxy.cpp
index b163134be56..cafa923b557 100644
--- a/tao/CSD_Framework/CSD_Strategy_Proxy.cpp
+++ b/tao/CSD_Framework/CSD_Strategy_Proxy.cpp
@@ -1,14 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/debug.h"
 
-ACE_RCSID (CSD_Framework,
-           CSD_Strategy_Base,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_Framework/CSD_Strategy_Proxy.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_Framework/CSD_Strategy_Repository.cpp b/tao/CSD_Framework/CSD_Strategy_Repository.cpp
index a722c13d7ad..b5159cd97f9 100644
--- a/tao/CSD_Framework/CSD_Strategy_Repository.cpp
+++ b/tao/CSD_Framework/CSD_Strategy_Repository.cpp
@@ -1,13 +1,9 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CSD_Framework/CSD_Strategy_Repository.h"
 #include "tao/debug.h"
 
-ACE_RCSID (CSD_Framework,
-           CSD_Strategy_Factory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CSD_Strategy_Repository::TAO_CSD_Strategy_Repository()
diff --git a/tao/CSD_ThreadPool.mpc b/tao/CSD_ThreadPool.mpc
deleted file mode 100644
index 468abc4c113..00000000000
--- a/tao/CSD_ThreadPool.mpc
+++ /dev/null
@@ -1,38 +0,0 @@
-//$Id$
-project(CSD_ThreadPool) : csd_framework, tao_output, install, threads {
-  sharedname   = TAO_CSD_ThreadPool
-  dynamicflags += TAO_CSD_TP_BUILD_DLL
-  includes    += $(TAO_ROOT)/tao
-
-  Source_Files {
-    CSD_ThreadPool
-  }
-
-  Header_Files {
-    CSD_ThreadPool
-  }
-
-  Inline_Files {
-    CSD_ThreadPool
-  }
-
-  Template_Files {
-    CSD_ThreadPool
-  }
-
-  Resource_Files {
-    CSD_ThreadPool
-  }
-
-  IDL_Files {
-    CSD_ThreadPool
-  }
-
-  PIDL_Files {
-    CSD_ThreadPool
-  }
-
-  Pkgconfig_Files {
-    CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in
-  }
-}
diff --git a/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp b/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp
index 35b6b316012..7ba5827077a 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp
@@ -3,10 +3,6 @@
 #include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Request.h"
 
-ACE_RCSID (CSD_TP,
-           Cancel_Visitor,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl"
 #endif /* ! __ACE_INLINE__ */
@@ -40,7 +36,7 @@ TAO::CSD::TP_Cancel_Visitor::visit_request(TP_Request* request,
       request->cancel();
     }
 
-   // Since we are either cancelling requests to any servant or a 
+   // Since we are either cancelling requests to any servant or a
    // specific servant, always continue visitation.
    return true;
 }
diff --git a/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h b/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h
index d9b2472e507..f4381bad0bd 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h
+++ b/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h
@@ -37,12 +37,12 @@ namespace TAO
      * @brief Used to extract/cancel request(s) from the queue.
      *
      * This visitor is used to cancel certain requests in the queue
-     * as they are visited.  
+     * as they are visited.
      *
      * Note that this is currently implemented to cancel *all*
      * requests in the queue, or requests that are targeted for a specific
-     * servant. This could be extended in the future to perhaps 
-     * cancel all requests that have the same operation name, or something 
+     * servant. This could be extended in the future to perhaps
+     * cancel all requests that have the same operation name, or something
      * else.
      *
      */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp b/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
index ff94e678bb3..f057b02c081 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Collocated_Asynch_Request,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h b/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h
index 6cfa149f73a..a15461f6999 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h
+++ b/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h
@@ -39,9 +39,9 @@ namespace TAO
      *
      * @brief Represents a "queue-able", collocated, asynchronous,
      *        CORBA request.
-     *        
-     * This kind request is one-way collocated request with the default  
-     * SYNC_SCOPE policy (SYNC_WITH_TRANSPORT) applied. It is cloned 
+     *
+     * This kind request is one-way collocated request with the default
+     * SYNC_SCOPE policy (SYNC_WITH_TRANSPORT) applied. It is cloned
      * before enqueuing and the "enqueuing" thread never blocks.
      */
     class TAO_CSD_TP_Export TP_Collocated_Asynch_Request
diff --git a/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp b/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
index aff5665bd2b..f843aa38fec 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Collocated_Synch_Request,
-           "$Id$")
-
 #include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp b/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
index 1da58c328c0..b9f006f86d4 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Collocated_Synch_With_Server_Request,
-           "$Id$")
-
 #include "tao/Exception.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp b/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp
index ff2aa4709c9..7c3642e1bf6 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Corba_Request,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp b/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
index 603f8eae77a..0f1b8328510 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Custom_Asynch_Request,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp b/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp
index fbe24fc0c53..6ae6061aef8 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Custom_Request,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp b/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp
index e2702b6c5a5..fff0638958b 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Custom_Request_Operation,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h b/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
index 9aa378290ac..6ff938d94cd 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
+++ b/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
@@ -43,8 +43,8 @@ namespace TAO
      *
      * @brief Base class for all custom request operations.
      *
-     * @note  The caller that creates a new TP_Custom_Request_Operation 
-     *        object needs call _add_ref () on the servant before 
+     * @note  The caller that creates a new TP_Custom_Request_Operation
+     *        object needs call _add_ref () on the servant before
      *        constructing it and the TP_Custom_Request_Operation object
      *        is responsible to decrement the reference count.
      *
diff --git a/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp b/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp
index 287e516d7b4..c2e358de401 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Custom_Synch_Request,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp b/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp
index aeb5454c252..ca87f1893ad 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h"
 
-ACE_RCSID (CSD_TP,
-           Dispatchable_Visitor,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h b/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h
index 01aea59828a..302a8507676 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h
+++ b/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h
@@ -46,7 +46,7 @@ namespace TAO
      * request that was saved off during visitation.  A nil reference
      * (ie, a NULL pointer) will be returned if no dispatchable request
      * was found.
-     * 
+     *
      */
     class TAO_CSD_TP_Export TP_Dispatchable_Visitor : public TP_Queue_Visitor
     {
diff --git a/tao/CSD_ThreadPool/CSD_TP_Queue.cpp b/tao/CSD_ThreadPool/CSD_TP_Queue.cpp
index cb7b0ecf8e1..87edf4b4c13 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Queue.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Queue.cpp
@@ -4,10 +4,6 @@
 #include "tao/CSD_ThreadPool/CSD_TP_Request.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Queue,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Queue.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp b/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp
index 3ede8818521..8ef0a64ac09 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Queue_Visitor,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h b/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h
index f86467ae64d..59bb682b89c 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h
+++ b/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h
@@ -43,7 +43,7 @@ namespace TAO
      *
      * This also provides a means to encapsulate each distinct algorithm
      * within a distinct subclass of TP_Queue_Visitor.
-     * 
+     *
      */
     class TAO_CSD_TP_Export TP_Queue_Visitor
     {
diff --git a/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp b/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
index 036a804beac..674e4441c52 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Remote_Request,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl"
 #endif /* ! __ACE_INLINE__ */
@@ -16,7 +12,6 @@ TAO::CSD::TP_Remote_Request::~TP_Remote_Request()
 {
 }
 
-
 void
 TAO::CSD::TP_Remote_Request::prepare_for_queue_i()
 {
diff --git a/tao/CSD_ThreadPool/CSD_TP_Request.cpp b/tao/CSD_ThreadPool/CSD_TP_Request.cpp
index e1926f93e8b..8613bfdac99 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Request.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Request.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Request.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Request,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Request.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Request.h b/tao/CSD_ThreadPool/CSD_TP_Request.h
index 38af35b0a2a..e9fb300a287 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Request.h
+++ b/tao/CSD_ThreadPool/CSD_TP_Request.h
@@ -48,7 +48,7 @@ namespace TAO
      * "servant requests" that can be inserted into a TP_Queue
      * object.
      */
-    class TAO_CSD_TP_Export TP_Request 
+    class TAO_CSD_TP_Export TP_Request
       : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX>
     {
     public:
diff --git a/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp b/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp
index 28fbc8da7ba..f50e3d25773 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Servant_State.h"
 
-ACE_RCSID (CSD_TP,
-           Servant_State,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Servant_State.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp b/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp
index 846f3a6e723..80c94043679 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h"
 
-ACE_RCSID (CSD_TP,
-           Servant_State_Map,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp b/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
index 93e6b1fbc33..14d8bc204af 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
@@ -10,10 +10,6 @@
 #include "ace/Trace.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Strategy,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Strategy.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp b/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
index 263b7fd0b09..a1e7be7af59 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
@@ -8,10 +8,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Strategy_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::CSD::TP_Strategy_Factory::TP_Strategy_Factory()
diff --git a/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp b/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp
index 79a0a195097..12768d5db7c 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Synch_Helper,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h b/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
index cef6fe53ec0..2d6a7413e2c 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
+++ b/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
@@ -79,9 +79,6 @@ namespace TAO
       /// Thread lock type
       typedef TAO_SYNCH_MUTEX LockType;
 
-      /// Thread guard type
-      typedef ACE_Guard<LockType> GuardType;
-
       /// Thread condition type
       typedef TAO_Condition<LockType> ConditionType;
 
diff --git a/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl b/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
index f4c5a1380c1..2f142716d5d 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
+++ b/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
@@ -1,7 +1,8 @@
 // -*- C++ -*-
-//
 // $Id$
 
+#include "ace/Guard_T.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
@@ -22,7 +23,7 @@ ACE_INLINE
 bool
 TAO::CSD::TP_Synch_Helper::wait_while_pending()
 {
-  GuardType guard(this->lock_);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, false);
 
   while (this->state_ == PENDING)
     {
@@ -37,7 +38,7 @@ ACE_INLINE
 void
 TAO::CSD::TP_Synch_Helper::dispatched()
 {
-  GuardType guard(this->lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
   this->state_ = DISPATCHED;
   this->condition_.signal();
 }
@@ -47,7 +48,7 @@ ACE_INLINE
 void
 TAO::CSD::TP_Synch_Helper::cancelled()
 {
-  GuardType guard(this->lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
   this->state_ = CANCELLED;
   this->condition_.signal();
 }
diff --git a/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/tao/CSD_ThreadPool/CSD_TP_Task.cpp
index 7ecbac2c473..c96a65eccb6 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Task.cpp
+++ b/tao/CSD_ThreadPool/CSD_TP_Task.cpp
@@ -5,10 +5,6 @@
 #include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h"
 
-ACE_RCSID (CSD_ThreadPool,
-           TP_Task,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/CSD_ThreadPool/CSD_TP_Task.inl"
 #endif /* ! __ACE_INLINE__ */
@@ -23,7 +19,7 @@ TAO::CSD::TP_Task::~TP_Task()
 bool
 TAO::CSD::TP_Task::add_request(TP_Request* request)
 {
-  GuardType guard(this->lock_);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, false);
 
   if (!this->accepting_requests_)
     {
@@ -53,23 +49,20 @@ TAO::CSD::TP_Task::open(void* num_threads_ptr)
 {
   Thread_Counter num = 1;
 
-  if (num_threads_ptr != 0)
-    {
-      Thread_Counter* tmp = static_cast<Thread_Counter*> (num_threads_ptr);
-
-      if (tmp == 0)
-        {
-          //FUZZ: disable check_for_lack_ACE_OS
-          ACE_ERROR_RETURN((LM_ERROR,
-                            ACE_TEXT ("(%P|%t) TP_Task failed to open.  ")
-                            ACE_TEXT ("Invalid argument type passed to open().\n")),
-                           -1);
-          //FUZZ: enable check_for_lack_ACE_OS
-        }
+  Thread_Counter* tmp = static_cast<Thread_Counter*> (num_threads_ptr);
 
-      num = *tmp;
+  if (tmp == 0)
+    {
+      //FUZZ: disable check_for_lack_ACE_OS
+      ACE_ERROR_RETURN((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) TP_Task failed to open.  ")
+                        ACE_TEXT ("Invalid argument type passed to open().\n")),
+                        -1);
+      //FUZZ: enable check_for_lack_ACE_OS
     }
 
+  num = *tmp;
+
   // We can't activate 0 threads.  Make sure this isn't the case.
   if (num < 1)
     {
@@ -91,7 +84,7 @@ TAO::CSD::TP_Task::open(void* num_threads_ptr)
     }
 
   // We need the lock acquired from here on out.
-  GuardType guard(this->lock_);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, -1);
 
   // We can assume that we are in the proper state to handle this open()
   // call as long as we haven't been open()'ed before.
@@ -139,7 +132,7 @@ TAO::CSD::TP_Task::svc()
   // Account for this current worker thread having started the
   // execution of this svc() method.
   {
-    GuardType guard(this->lock_);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, false);
     // Put the thread id into a collection which is used to check whether
     // the orb shutdown is called by one of the threads in the pool.
     ACE_thread_t thr_id = ACE_OS::thr_self ();
@@ -160,7 +153,7 @@ TAO::CSD::TP_Task::svc()
       // Do the "GetWork" step.
       {
         // Acquire the lock until just before we decide to "PerformWork".
-        GuardType guard(this->lock_);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
         // Start the "GetWork" loop.
         while (request.is_nil())
@@ -219,7 +212,7 @@ TAO::CSD::TP_Task::svc()
       // worker threads that there may be some dispatchable requests in the
       // queue now for this not-busy servant.  We need the lock_ to do this.
       {
-        GuardType guard(this->lock_);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
         request->mark_as_ready();
         this->work_available_.signal();
       }
@@ -239,7 +232,7 @@ TAO::CSD::TP_Task::svc()
 int
 TAO::CSD::TP_Task::close(u_long flag)
 {
-  GuardType guard(this->lock_);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
   if (flag == 0)
     {
@@ -307,7 +300,7 @@ TAO::CSD::TP_Task::close(u_long flag)
 void
 TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant)
 {
-  GuardType guard(this->lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
 
   // Cancel the requests targeted for the provided servant.
   TP_Cancel_Visitor cancel_visitor(servant);
diff --git a/tao/CSD_ThreadPool/CSD_TP_Task.h b/tao/CSD_ThreadPool/CSD_TP_Task.h
index 445ecf968b3..fea7b2ecc4e 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Task.h
+++ b/tao/CSD_ThreadPool/CSD_TP_Task.h
@@ -107,10 +107,8 @@ namespace TAO
     private:
 
       typedef TAO_SYNCH_MUTEX         LockType;
-      typedef ACE_Guard<LockType>     GuardType;
       typedef TAO_Condition<LockType> ConditionType;
 
-
       /// Lock to protect the "state" (all of the data members) of this object.
       LockType lock_;
 
diff --git a/tao/CSD_ThreadPool/CSD_ThreadPool.mpc b/tao/CSD_ThreadPool/CSD_ThreadPool.mpc
new file mode 100644
index 00000000000..cc5c7336604
--- /dev/null
+++ b/tao/CSD_ThreadPool/CSD_ThreadPool.mpc
@@ -0,0 +1,11 @@
+//$Id$
+
+project(CSD_ThreadPool) : csd_framework, tao_output, install, threads {
+  sharedname   = TAO_CSD_ThreadPool
+  dynamicflags += TAO_CSD_TP_BUILD_DLL
+  includes    += $(TAO_ROOT)/tao
+
+  specific {
+    install_dir = tao/CSD_ThreadPool
+  }
+}
diff --git a/tao/Cache_Entries_T.cpp b/tao/Cache_Entries_T.cpp
index 3c4be4ae8ed..98e058ae85a 100644
--- a/tao/Cache_Entries_T.cpp
+++ b/tao/Cache_Entries_T.cpp
@@ -1,4 +1,5 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
 
 # include "tao/Cache_Entries_T.h"
 
diff --git a/tao/CharSeq.pidl b/tao/CharSeq.pidl
index 03058f2e665..fddc2b93d7e 100644
--- a/tao/CharSeq.pidl
+++ b/tao/CharSeq.pidl
@@ -4,8 +4,6 @@
  * @file CharSeq.pidl
  *
  * $Id$
- *
- *   This file is used to generate the code in CharSeqC.*
  */
 
 #ifndef TAO_CORBA_CHAR_SEQ_IDL
diff --git a/tao/Cleanup_Func_Registry.cpp b/tao/Cleanup_Func_Registry.cpp
index 5597de7531d..714fc06be16 100644
--- a/tao/Cleanup_Func_Registry.cpp
+++ b/tao/Cleanup_Func_Registry.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Cleanup_Func_Registry.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/tao/Cleanup_Func_Registry.h b/tao/Cleanup_Func_Registry.h
index 351f9e05027..befc14c0d92 100644
--- a/tao/Cleanup_Func_Registry.h
+++ b/tao/Cleanup_Func_Registry.h
@@ -54,7 +54,7 @@ protected:
   /// Register a cleanup function.  The number of slot the cleanup
   /// function is placed is in will match the one reserved for the
   /// corresponding thread specific object in the ORB Core TSS
-  /// resources.  The slot_id is returned via the second reference
+  /// resources.  The @a slot_id is returned via the second reference
   /// argument.  This method returns 0 on failure, and -1 on failure.
   int register_cleanup_function (ACE_CLEANUP_FUNC func, size_t &slot_id);
 
diff --git a/tao/ClientRequestInterceptor_Adapter.cpp b/tao/ClientRequestInterceptor_Adapter.cpp
index c5e425c4cd8..7fca1d44e7f 100644
--- a/tao/ClientRequestInterceptor_Adapter.cpp
+++ b/tao/ClientRequestInterceptor_Adapter.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/ClientRequestInterceptor_Adapter.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/ClientRequestInterceptor_Adapter_Factory.cpp b/tao/ClientRequestInterceptor_Adapter_Factory.cpp
index 7f0347296a5..4552cb8c328 100644
--- a/tao/ClientRequestInterceptor_Adapter_Factory.cpp
+++ b/tao/ClientRequestInterceptor_Adapter_Factory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/ClientRequestInterceptor_Adapter_Factory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Client_Strategy_Factory.cpp b/tao/Client_Strategy_Factory.cpp
index 9e965da1eca..b7df038bba5 100644
--- a/tao/Client_Strategy_Factory.cpp
+++ b/tao/Client_Strategy_Factory.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Client_Strategy_Factory.h"
@@ -8,64 +9,4 @@ TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void)
 {
 }
 
-ACE_Lock *
-TAO_Client_Strategy_Factory::create_profile_lock (void)
-{
-  return 0;
-}
-
-TAO_Configurable_Refcount
-TAO_Client_Strategy_Factory::create_profile_refcount (void)
-{
-  return TAO_Configurable_Refcount (TAO_Configurable_Refcount::TAO_NULL_LOCK);
-}
-
-TAO_Transport_Mux_Strategy *
-TAO_Client_Strategy_Factory::create_transport_mux_strategy (TAO_Transport *)
-{
-  return 0;
-}
-
-ACE_Lock *
-TAO_Client_Strategy_Factory::create_transport_mux_strategy_lock (void)
-{
-  return 0;
-}
-
-int
-TAO_Client_Strategy_Factory::reply_dispatcher_table_size (void) const
-{
-  return 0;
-}
-
-TAO_Wait_Strategy *
-TAO_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *)
-{
-  return 0;
-}
-
-TAO_Client_Strategy_Factory::Connect_Strategy
-TAO_Client_Strategy_Factory::connect_strategy (void) const
-{
-  return TAO_BLOCKED_CONNECT;
-}
-
-TAO_Connect_Strategy *
-TAO_Client_Strategy_Factory::create_connect_strategy (TAO_ORB_Core *)
-{
-  return 0;
-}
-
-int
-TAO_Client_Strategy_Factory::allow_callback (void)
-{
-  return 0;
-}
-
-bool
-TAO_Client_Strategy_Factory::use_cleanup_options (void) const
-{
-  return false;
-}
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Client_Strategy_Factory.h b/tao/Client_Strategy_Factory.h
index 69ce9e9d325..ece676673ea 100644
--- a/tao/Client_Strategy_Factory.h
+++ b/tao/Client_Strategy_Factory.h
@@ -23,7 +23,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "tao/Versioned_Namespace.h"
-#include "tao/Configurable_Refcount.h"
 
 #include "ace/Service_Object.h"
 
@@ -52,28 +51,20 @@ public:
   /// Destructor
   virtual ~TAO_Client_Strategy_Factory (void);
 
-  /**
-   * Create the lock for the stub and the profile
-   */
-  virtual ACE_Lock* create_profile_lock (void);
-
-  /// Create the refcount for the profile
-  virtual TAO_Configurable_Refcount create_profile_refcount (void);
-
   /// Create the correct client request muxing strategy.
-  virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport);
+  virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport) = 0;
 
   /// Create the correct lock for request muxing strategy.
-  virtual ACE_Lock *create_transport_mux_strategy_lock (void);
+  virtual ACE_Lock *create_transport_mux_strategy_lock (void) = 0;
 
   /// Return the size of the reply dispatcher table
-  virtual int reply_dispatcher_table_size (void) const;
+  virtual int reply_dispatcher_table_size (void) const = 0;
 
-  /// Create the correct client <wait_for_reply> strategy.
-  virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport);
+  /// Create the correct client wait_for_reply strategy.
+  virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport) = 0;
 
-  /// Create the correct client <asynch_connect> strategy.
-  virtual TAO_Connect_Strategy *create_connect_strategy (TAO_ORB_Core *);
+  /// Create the correct client asynch_connect strategy.
+  virtual TAO_Connect_Strategy *create_connect_strategy (TAO_ORB_Core *) = 0;
 
   enum Connect_Strategy
   {
@@ -81,17 +72,18 @@ public:
     TAO_REACTIVE_CONNECT,
     TAO_LEADER_FOLLOWER_CONNECT
   };
+
   /// Return the selected connection strategy option.
-  virtual Connect_Strategy connect_strategy (void) const;
+  virtual Connect_Strategy connect_strategy (void) const = 0;
 
   /// Does the client allow any form of callback?
-  virtual int allow_callback (void);
+  virtual int allow_callback (void) = 0;
 
   /// Cleanup options for wait strategy.
   /**
     * Only applicable to RW wait strategy
   */
-  virtual bool use_cleanup_options (void) const;
+  virtual bool use_cleanup_options (void) const = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/CodecFactory.mpc b/tao/CodecFactory.mpc
deleted file mode 100644
index a79b7fa9c06..00000000000
--- a/tao/CodecFactory.mpc
+++ /dev/null
@@ -1,71 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults, install {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -Sal -GX -Gstl \
-                -Wb,export_macro=TAO_CodecFactory_Export \
-                -Wb,export_include=tao/CodecFactory/codecfactory_export.h \
-                -Wb,include_guard=TAO_CODECFACTORY_SAFE_INCLUDE \
-                -Wb,safe_include=tao/CodecFactory/CodecFactory.h \
-                -o CodecFactory
-    idlflags -= -Sa -St
-    CodecFactory/IOP_Codec.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Sci -SS -Sorb -Sa -GX \
-                -Wb,export_macro=TAO_CodecFactory_Export \
-                -Wb,export_include=tao/CodecFactory/codecfactory_export.h \
-                -Wb,unique_include=tao/CodecFactory/CodecFactory.h \
-                -o CodecFactory
-    CodecFactory/IOP_Codec_include.pidl
-  }
-}
-
-project(CodecFactory) : taolib, tao_output, install, anytypecode, taoidldefaults, nolink_codecfactory {
-  after        += *idl
-  sharedname    = TAO_CodecFactory
-  dynamicflags  = TAO_CODECFACTORY_BUILD_DLL
-
-  Source_Files {
-    CodecFactory
-  }
-
-  Source_Files {
-    CodecFactory/IOP_CodecC.cpp
-    CodecFactory/IOP_Codec_includeC.cpp
-  }
-
-  Header_Files {
-    CodecFactory
-    CodecFactory/IOP_CodecA.h
-    CodecFactory/IOP_CodecC.h
-    CodecFactory/IOP_Codec_includeA.h
-    CodecFactory/IOP_Codec_includeC.h
-    CodecFactory/IOP_Codec_includeS.h
-    CodecFactory/IOP_CodecS.h
-  }
-
-  Inline_Files {
-    CodecFactory
-  }
-
-  Template_Files {
-    CodecFactory
-  }
-
-  Resource_Files {
-    CodecFactory
-  }
-
-  PIDL_Files {
-    CodecFactory
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    CodecFactory/TAO_CodecFactory.pc.in
-  }
-}
diff --git a/tao/CodecFactory/CDR_Encaps_Codec.cpp b/tao/CodecFactory/CDR_Encaps_Codec.cpp
index 0a70c79e587..33c3d08503f 100644
--- a/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/CodecFactory/CDR_Encaps_Codec.h"
diff --git a/tao/CodecFactory/CodecFactory.mpc b/tao/CodecFactory/CodecFactory.mpc
new file mode 100644
index 00000000000..655dd5c29ed
--- /dev/null
+++ b/tao/CodecFactory/CodecFactory.mpc
@@ -0,0 +1,53 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -Gp -Gd -Sci -SS -Sorb -Sal -GX \
+                -Wb,export_macro=TAO_CodecFactory_Export \
+                -Wb,export_include=tao/CodecFactory/codecfactory_export.h \
+                -Wb,include_guard=TAO_CODECFACTORY_SAFE_INCLUDE \
+                -Wb,safe_include=tao/CodecFactory/CodecFactory.h \
+                -iC tao/CodecFactory
+    idlflags -= -Sa -St
+    IOP_Codec.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Sci -SS -Sorb -Sa -GX \
+                -Wb,export_macro=TAO_CodecFactory_Export \
+                -Wb,export_include=tao/CodecFactory/codecfactory_export.h \
+                -Wb,unique_include=tao/CodecFactory/CodecFactory.h \
+                -iC CodecFactory
+    IOP_Codec_include.pidl
+  }
+
+  specific {
+    install_dir = tao/CodecFactory
+  }
+}
+
+project(CodecFactory) : taolib, tao_output, install, anytypecode, taoidldefaults, nolink_codecfactory {
+  after        += *idl
+  sharedname    = TAO_CodecFactory
+  dynamicflags  = TAO_CODECFACTORY_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    IOP_CodecC.cpp
+    IOP_Codec_includeC.cpp
+  }
+
+  Header_Files {
+    *.h
+    IOP_CodecA.h
+    IOP_CodecC.h
+    IOP_Codec_includeA.h
+    IOP_Codec_includeC.h
+    IOP_Codec_includeS.h
+    IOP_CodecS.h
+  }
+
+  specific {
+    install_dir = tao/CodecFactory
+  }
+}
diff --git a/tao/CodecFactory/CodecFactory_impl.cpp b/tao/CodecFactory/CodecFactory_impl.cpp
index 4953fc4543f..657c2cdd985 100644
--- a/tao/CodecFactory/CodecFactory_impl.cpp
+++ b/tao/CodecFactory/CodecFactory_impl.cpp
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 #include "tao/CodecFactory/CodecFactory_impl.h"
diff --git a/tao/Codeset.mpc b/tao/Codeset.mpc
deleted file mode 100644
index 38c3a33775c..00000000000
--- a/tao/Codeset.mpc
+++ /dev/null
@@ -1,49 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults {
-  custom_only = 1
-  idlflags += -SS -Sci -Sorb \
-              -Wb,export_macro=TAO_Codeset_Export \
-              -Wb,export_include=tao/Codeset/codeset_export.h \
-              -o Codeset
-  IDL_Files {
-    Codeset/CodeSetContext.pidl
-  }
-}
-
-project(Codeset) : taolib, tao_output, install, taoidldefaults, nolink_codecfactory {
-  sharedname   = TAO_Codeset
-  after       += *idl
-  dynamicflags += TAO_CODESET_BUILD_DLL
-  pch_header   =
-  pch_source   =
-
-  Source_Files {
-    Codeset
-  }
-
-  Source_Files {
-    Codeset/CodeSetContextC.cpp
-  }
-
-  Header_Files {
-    Codeset
-  }
-
-  Inline_Files {
-    Codeset
-  }
-
-  Template_Files {
-    Codeset
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-    Codeset
-  }
-
-  IDL_Files {
-  }
-}
diff --git a/tao/Codeset/Codeset.mpc b/tao/Codeset/Codeset.mpc
new file mode 100644
index 00000000000..0f0936fe8fb
--- /dev/null
+++ b/tao/Codeset/Codeset.mpc
@@ -0,0 +1,40 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  idlflags += -SS -Sci -Sorb \
+              -Wb,export_macro=TAO_Codeset_Export \
+              -Wb,export_include=tao/Codeset/codeset_export.h \
+              -iC tao/Codeset
+  IDL_Files {
+    CodeSetContext.pidl
+  }
+
+  specific {
+    install_dir = tao/Codeset
+  }
+}
+
+project(Codeset) : taolib, tao_output, install, taoidldefaults, nolink_codecfactory {
+  sharedname   = TAO_Codeset
+  after        += *idl
+  dynamicflags += TAO_CODESET_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    CodeSetContextC.cpp
+  }
+
+  Header_Files {
+    *.h
+    CodeSetContextC.h
+    CodeSetContextS.h
+  }
+
+  Template_Files {
+    Codeset_Translator_Factory_T.cpp
+  }
+
+  specific {
+    install_dir = tao/Codeset
+  }
+}
diff --git a/tao/Codeset/Codeset_Manager_i.cpp b/tao/Codeset/Codeset_Manager_i.cpp
index 1c1782afb6b..11b2a62840e 100644
--- a/tao/Codeset/Codeset_Manager_i.cpp
+++ b/tao/Codeset/Codeset_Manager_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/TAO_Server_Request.h"
diff --git a/tao/Codeset/Codeset_Service_Context_Handler.cpp b/tao/Codeset/Codeset_Service_Context_Handler.cpp
index f3eb865de58..33d2f4ef789 100644
--- a/tao/Codeset/Codeset_Service_Context_Handler.cpp
+++ b/tao/Codeset/Codeset_Service_Context_Handler.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Codeset/Codeset_Service_Context_Handler.h"
diff --git a/tao/Codeset/Codeset_Translator_Factory.cpp b/tao/Codeset/Codeset_Translator_Factory.cpp
index 2efbc414373..70ebc2a10b3 100644
--- a/tao/Codeset/Codeset_Translator_Factory.cpp
+++ b/tao/Codeset/Codeset_Translator_Factory.cpp
@@ -5,7 +5,6 @@
  *  @file    Codeset_Translator_Factory.cpp
  *
  *  $Id$
-
  *
  *  The base for all the translator factories. Translator factories are
  *  responsible for supplying the proper translator on demand.
@@ -15,7 +14,6 @@
  */
 //=============================================================================
 
-
 #include "tao/Codeset/Codeset_Translator_Factory.h"
 #include "tao/CDR.h"
 
diff --git a/tao/Codeset/TAO_Codeset.rc b/tao/Codeset/TAO_Codeset.rc
new file mode 100644
index 00000000000..414dc0bcf01
--- /dev/null
+++ b/tao/Codeset/TAO_Codeset.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "Codeset\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_CodesetDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_Codeset.DLL\0"
+            VALUE "ProductName", "TAO\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/tao/Codeset/UTF16_BOM_Translator.cpp b/tao/Codeset/UTF16_BOM_Translator.cpp
index 81ddaeed56c..4c0d0c04755 100644
--- a/tao/Codeset/UTF16_BOM_Translator.cpp
+++ b/tao/Codeset/UTF16_BOM_Translator.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -19,7 +20,6 @@
 
 // ****************************************************************
 
-
 typedef ACE_CDR::UShort ACE_UTF16_T;
 static const size_t ACE_UTF16_CODEPOINT_SIZE = sizeof (ACE_UTF16_T);
 static const unsigned short ACE_UNICODE_BOM_CORRECT = 0xFEFFU;
@@ -355,7 +355,7 @@ TAO_UTF16_BOM_Translator::write_wstring (ACE_OutputCDR & cdr,
     {
       // pre GIOP 1.2:  include null terminator in length
       ACE_CDR::ULong l = len + 1;
-      
+
       if (this->write_4 (cdr, &l))
         {
           if (x != 0)
diff --git a/tao/Codeset_Descriptor_Base.h b/tao/Codeset_Descriptor_Base.h
index d140cea56df..cb3a3521bc4 100644
--- a/tao/Codeset_Descriptor_Base.h
+++ b/tao/Codeset_Descriptor_Base.h
@@ -25,7 +25,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-/*
+/**
  * TAO_Codeset_Descriptor_Base describes the necessary interface for
  * Objects within libTAO to be able to supply information to the codeset
  * subsystem, as required.
diff --git a/tao/Codeset_Manager.cpp b/tao/Codeset_Manager.cpp
index 981387415e3..d7273597983 100644
--- a/tao/Codeset_Manager.cpp
+++ b/tao/Codeset_Manager.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Codeset_Manager.h"
diff --git a/tao/Codeset_Manager_Factory_Base.cpp b/tao/Codeset_Manager_Factory_Base.cpp
index fdf38e1eac8..1e5c29e5fc7 100644
--- a/tao/Codeset_Manager_Factory_Base.cpp
+++ b/tao/Codeset_Manager_Factory_Base.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/ORB_Core.h"
diff --git a/tao/Codeset_Translator_Base.cpp b/tao/Codeset_Translator_Base.cpp
index 0cc9e86f054..d0a2cc943ff 100644
--- a/tao/Codeset_Translator_Base.cpp
+++ b/tao/Codeset_Translator_Base.cpp
@@ -5,12 +5,10 @@
  *  @file    Codeset_Translator_Base.cpp
  *
  *  $Id$
-
  *
  * factories are responsible for supplying the proper translator on
  * demand.
  *
- *
  *  @author   Phil Mesnier <mesnier_p@ociweb.com>
  */
 //=============================================================================
diff --git a/tao/Collocated_Invocation.cpp b/tao/Collocated_Invocation.cpp
index 13520b40370..657dc7e38bc 100644
--- a/tao/Collocated_Invocation.cpp
+++ b/tao/Collocated_Invocation.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Collocated_Invocation.h"
 #include "tao/Collocation_Proxy_Broker.h"
 #include "tao/ORB_Core.h"
@@ -95,7 +97,7 @@ namespace TAO
               }
           }
 
-        // Invocation completed succesfully
+        // Invocation completed successfully
         s = TAO_INVOKE_SUCCESS;
 
 #if TAO_HAS_INTERCEPTORS == 1
diff --git a/tao/Collocation_Proxy_Broker.cpp b/tao/Collocation_Proxy_Broker.cpp
index 537b1ded05c..ea46473b3ee 100644
--- a/tao/Collocation_Proxy_Broker.cpp
+++ b/tao/Collocation_Proxy_Broker.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Collocation_Proxy_Broker.h"
diff --git a/tao/Collocation_Resolver.cpp b/tao/Collocation_Resolver.cpp
index 055d88c0e65..e799cd12f20 100644
--- a/tao/Collocation_Resolver.cpp
+++ b/tao/Collocation_Resolver.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Collocation_Resolver.h"
diff --git a/tao/Collocation_Resolver.h b/tao/Collocation_Resolver.h
index f90c6fd39ac..964497217d8 100644
--- a/tao/Collocation_Resolver.h
+++ b/tao/Collocation_Resolver.h
@@ -45,7 +45,6 @@ class TAO_Export TAO_Collocation_Resolver
   : public ACE_Service_Object
 {
 public:
-
   /// Destructor.
   virtual ~TAO_Collocation_Resolver (void);
 
diff --git a/tao/Compression.mpc b/tao/Compression.mpc
deleted file mode 100644
index d7a0d8904bd..00000000000
--- a/tao/Compression.mpc
+++ /dev/null
@@ -1,74 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults, install {
-  custom_only = 1
-  idlflags += -SS -Sorb -Sci -GA \
-              -Wb,export_macro=TAO_Compression_Export \
-              -o Compression
-  IDL_Files {
-    idlflags -= -Sa -St
-    idlflags += -Gp -Gd -Sal\
-                -Wb,export_macro=TAO_Compression_Export \
-                -Wb,export_include=tao/Compression/compression_export.h \
-                -Wb,include_guard=TAO_COMPRESSION_SAFE_INCLUDE \
-                -Wb,safe_include=tao/Compression/Compression.h
-    Compression/Compression.pidl
-  }
-
-  IDL_Files {
-    idlflags += \
-                -Wb,export_include=tao/Compression/compression_export.h \
-                -Wb,unique_include=tao/Compression/Compression.h
-    Compression/Compression_include.pidl
-  }
-}
-
-project(Compression) : taolib, tao_output, install, taoidldefaults, anytypecode {
-  after       += *idl
-  sharedname   = TAO_Compression
-  dynamicflags += TAO_COMPRESSION_BUILD_DLL
-
-  Source_Files {
-    Compression
-  }
-
-  Source_Files {
-    Compression/CompressionC.cpp
-    Compression/Compression_includeC.cpp
-    Compression/CompressionA.cpp
-    Compression/Compression_includeA.cpp
-  }
-
-  Header_Files {
-    Compression
-    Compression/CompressionC.h
-    Compression/CompressionS.h
-    Compression/CompressionA.h
-    Compression/Compression_includeC.h
-    Compression/Compression_includeS.h
-    Compression/Compression_includeA.h
-  }
-
-  Inline_Files {
-    Compression
-  }
-
-  Template_Files {
-    Compression
-  }
-
-  Resource_Files {
-    Compression
-  }
-
-  PIDL_Files {
-    Compression
-  }
-
-  IDL_Files {
-    Compression
-  }
-
-  Pkgconfig_Files {
-    Compression/TAO_Compression.pc.in
-  }
-}
diff --git a/tao/Compression/Base_Compressor.cpp b/tao/Compression/Base_Compressor.cpp
index 47ea5b3a1df..5a5e1bdb6e1 100644
--- a/tao/Compression/Base_Compressor.cpp
+++ b/tao/Compression/Base_Compressor.cpp
@@ -1,8 +1,6 @@
-#include "tao/Compression/Base_Compressor.h"
+// $Id$
 
-ACE_RCSID (Compression,
-           Base_Compressor,
-           "$Id$")
+#include "tao/Compression/Base_Compressor.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/tao/Compression/Compression.cpp b/tao/Compression/Compression.cpp
index eb6a5ca34f9..d98a497c93f 100644
--- a/tao/Compression/Compression.cpp
+++ b/tao/Compression/Compression.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "tao/Compression/Compression.h"
 #include "tao/Compression/Compression_Manager.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Compression,
-           Compression,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Object_ptr
diff --git a/tao/Compression/Compression.mpc b/tao/Compression/Compression.mpc
new file mode 100644
index 00000000000..df3b9098c3f
--- /dev/null
+++ b/tao/Compression/Compression.mpc
@@ -0,0 +1,55 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  idlflags += -SS -Sorb -Sci -GA \
+              -Wb,export_macro=TAO_Compression_Export \
+              -iC tao/Compression
+  IDL_Files {
+    idlflags -= -Sa -St
+    idlflags += -Gp -Gd -Sal\
+                -Wb,export_macro=TAO_Compression_Export \
+                -Wb,export_include=tao/Compression/compression_export.h \
+                -Wb,include_guard=TAO_COMPRESSION_SAFE_INCLUDE \
+                -Wb,safe_include=tao/Compression/Compression.h
+    Compression.pidl
+  }
+
+  IDL_Files {
+    idlflags += \
+                -Wb,export_include=tao/Compression/compression_export.h \
+                -Wb,unique_include=tao/Compression/Compression.h
+    Compression_include.pidl
+  }
+
+  specific {
+    install_dir = tao/Compression
+  }
+}
+
+project(Compression) : taolib, tao_output, install, taoidldefaults, anytypecode {
+  after       += *idl
+  sharedname   = TAO_Compression
+  dynamicflags += TAO_COMPRESSION_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    CompressionC.cpp
+    Compression_includeC.cpp
+    CompressionA.cpp
+    Compression_includeA.cpp
+  }
+
+  Header_Files {
+    *.h
+    CompressionC.h
+    CompressionS.h
+    CompressionA.h
+    Compression_includeC.h
+    Compression_includeS.h
+    Compression_includeA.h
+  }
+
+  specific {
+    install_dir = tao/Compression
+  }
+}
diff --git a/tao/Compression/Compression_Manager.cpp b/tao/Compression/Compression_Manager.cpp
index 035a9c2a95e..da8d1f7d739 100644
--- a/tao/Compression/Compression_Manager.cpp
+++ b/tao/Compression/Compression_Manager.cpp
@@ -1,9 +1,6 @@
-#include "tao/Compression/Compression_Manager.h"
-
-ACE_RCSID (Compression,
-           Compression_Manager,
-           "$Id$")
+// $Id$
 
+#include "tao/Compression/Compression_Manager.h"
 #include "tao/ORB_Constants.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Compression/Compressor_Factory.cpp b/tao/Compression/Compressor_Factory.cpp
index e43aab8be09..c55434f675f 100644
--- a/tao/Compression/Compressor_Factory.cpp
+++ b/tao/Compression/Compressor_Factory.cpp
@@ -1,8 +1,6 @@
-#include "tao/Compression/Compressor_Factory.h"
+// $Id$
 
-ACE_RCSID (Compression,
-           Compressor_Factory,
-           "$Id$")
+#include "tao/Compression/Compressor_Factory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/tao/Compression/bzip2/Bzip2Compressor.cpp b/tao/Compression/bzip2/Bzip2Compressor.cpp
index 7750e6f5962..4023f9948be 100644
--- a/tao/Compression/bzip2/Bzip2Compressor.cpp
+++ b/tao/Compression/bzip2/Bzip2Compressor.cpp
@@ -1,9 +1,6 @@
-#include "Bzip2Compressor.h"
-
-ACE_RCSID (BZIP2,
-           Bzip2Compressor,
-           "$Id$")
+// $Id$
 
+#include "Bzip2Compressor.h"
 #include "bzlib.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Compression/bzip2/Bzip2Compressor.mpc b/tao/Compression/bzip2/Bzip2Compressor.mpc
new file mode 100644
index 00000000000..37d8e57d15e
--- /dev/null
+++ b/tao/Compression/bzip2/Bzip2Compressor.mpc
@@ -0,0 +1,11 @@
+//$Id$
+
+project(Bzip2Compressor) : taolib, tao_output, install, compression, taoidldefaults, ace_bzip2 {
+  requires += bzip2
+  sharedname   = TAO_Bzip2Compressor
+  dynamicflags += TAO_BZIP2COMPRESSOR_BUILD_DLL
+
+  specific {
+    install_dir = tao/Compression/bzip2
+  }
+}
diff --git a/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp b/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp
index ee57dc00310..e6db98a9bfb 100644
--- a/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp
+++ b/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "tao/Compression/bzip2/Bzip2Compressor_Factory.h"
 #include "tao/Compression/bzip2/Bzip2Compressor.h"
 
-ACE_RCSID (BZIP2,
-           Bzip2_Compressor_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/Compression/lzo/LzoCompressor.cpp b/tao/Compression/lzo/LzoCompressor.cpp
index 6a3dbd16f13..2ea8bd2b151 100644
--- a/tao/Compression/lzo/LzoCompressor.cpp
+++ b/tao/Compression/lzo/LzoCompressor.cpp
@@ -1,9 +1,6 @@
-#include "LzoCompressor.h"
-
-ACE_RCSID (LZO,
-           LzoCompressor,
-           "$Id$")
+// $Id$
 
+#include "LzoCompressor.h"
 #include <lzo1x.h>
 #include <lzoutil.h>
 
diff --git a/tao/Compression/lzo/LzoCompressor.mpc b/tao/Compression/lzo/LzoCompressor.mpc
new file mode 100644
index 00000000000..dff84ee46ff
--- /dev/null
+++ b/tao/Compression/lzo/LzoCompressor.mpc
@@ -0,0 +1,11 @@
+//$Id$
+
+project(LzoCompressor) : taolib, tao_output, install, compression, taoidldefaults, lzo1 {
+  requires += lzo1
+  sharedname   = TAO_LzoCompressor
+  dynamicflags += TAO_LZOCOMPRESSOR_BUILD_DLL
+
+  specific {
+    install_dir = tao/Compression/lzo
+  }
+}
diff --git a/tao/Compression/lzo/LzoCompressor_Factory.cpp b/tao/Compression/lzo/LzoCompressor_Factory.cpp
index 543c1064372..7d7415c9589 100644
--- a/tao/Compression/lzo/LzoCompressor_Factory.cpp
+++ b/tao/Compression/lzo/LzoCompressor_Factory.cpp
@@ -1,10 +1,7 @@
+// $Id$
+
 #include "tao/Compression/lzo/LzoCompressor_Factory.h"
 #include "tao/Compression/lzo/LzoCompressor.h"
-
-ACE_RCSID (LZO,
-           Lzo_Compressor_Factory,
-           "$Id$")
-
 #include <lzo1x.h>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Compression/zlib/ZlibCompressor.cpp b/tao/Compression/zlib/ZlibCompressor.cpp
index b2c7a558fc5..6d48a9b7186 100644
--- a/tao/Compression/zlib/ZlibCompressor.cpp
+++ b/tao/Compression/zlib/ZlibCompressor.cpp
@@ -1,9 +1,6 @@
-#include "ZlibCompressor.h"
-
-ACE_RCSID (ZLIB,
-           ZlibCompressor,
-           "$Id$")
+// $Id$
 
+#include "ZlibCompressor.h"
 #include "zlib.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Compression/zlib/ZlibCompressor.mpc b/tao/Compression/zlib/ZlibCompressor.mpc
new file mode 100644
index 00000000000..abf165babdd
--- /dev/null
+++ b/tao/Compression/zlib/ZlibCompressor.mpc
@@ -0,0 +1,11 @@
+//$Id$
+
+project(ZlibCompressor) : taolib, tao_output, install, compression, taoidldefaults, ace_zlib {
+  requires += zlib
+  sharedname   = TAO_ZlibCompressor
+  dynamicflags += TAO_ZLIBCOMPRESSOR_BUILD_DLL
+
+  specific {
+    install_dir = tao/Compression/zlib
+  }
+}
diff --git a/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/tao/Compression/zlib/ZlibCompressor_Factory.cpp
index 42cf805ad56..d34fde8a170 100644
--- a/tao/Compression/zlib/ZlibCompressor_Factory.cpp
+++ b/tao/Compression/zlib/ZlibCompressor_Factory.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "tao/Compression/zlib/ZlibCompressor_Factory.h"
 #include "tao/Compression/zlib/ZlibCompressor.h"
 
-ACE_RCSID (ZLIB,
-           ZlibCompressor_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/Configurable_Refcount.cpp b/tao/Configurable_Refcount.cpp
deleted file mode 100644
index dfd8678c08d..00000000000
--- a/tao/Configurable_Refcount.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "Configurable_Refcount.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Configurable_Refcount.inl"
-#endif /* __ACE_INLINE__ */
-
diff --git a/tao/Configurable_Refcount.h b/tao/Configurable_Refcount.h
deleted file mode 100644
index e73d1f22cc5..00000000000
--- a/tao/Configurable_Refcount.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// This may look like C, but it's really
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Configurable_Refcount.h
- *
- *  $Id$
- *
- *  Definition for a synchronised refcountable interface.
- *
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CONFIGURABLE_REFCOUNT_H
-#define TAO_CONFIGURABLE_REFCOUNT_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Atomic_Op.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Null_Mutex.h"
-#include /**/ "tao/TAO_Export.h"
-#include "tao/orbconf.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_Configurable_Refcount
- *
- * @brief Definition for a synchronised refcountable interface.
- */
-class TAO_Export TAO_Configurable_Refcount
-{
-public:
-  enum Lock_Type
-  {
-    TAO_NULL_LOCK,
-    TAO_THREAD_LOCK
-  };
-
-  TAO_Configurable_Refcount (Lock_Type type = TAO_THREAD_LOCK,
-                             unsigned long value = 1);
-
-  unsigned long increment (void);
-  unsigned long decrement (void);
-
-  unsigned long value (void) const;
-
-private:
-  Lock_Type type_;
-  ACE_Atomic_Op<ACE_SYNCH_NULL_MUTEX, unsigned long> null_refcount_;
-  ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> mutex_refcount_;
-};
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "Configurable_Refcount.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CONFIGURABLE_REFCOUNT */
diff --git a/tao/Configurable_Refcount.inl b/tao/Configurable_Refcount.inl
deleted file mode 100644
index c885976bbc6..00000000000
--- a/tao/Configurable_Refcount.inl
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-//$Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO_Configurable_Refcount::TAO_Configurable_Refcount (
-                      TAO_Configurable_Refcount::Lock_Type type,
-                      unsigned long value)
- : type_ (type),
-   null_refcount_ (value),
-   mutex_refcount_ (value)
-{
-}
-
-ACE_INLINE unsigned long
-TAO_Configurable_Refcount::increment (void)
-{
-  switch(this->type_)
-    {
-    case TAO_NULL_LOCK:
-      return this->null_refcount_++;
-    case TAO_THREAD_LOCK:
-    default:
-      return this->mutex_refcount_++;
-    }
-}
-
-ACE_INLINE unsigned long
-TAO_Configurable_Refcount::decrement (void)
-{
-  switch(this->type_)
-    {
-    case TAO_NULL_LOCK:
-      return --this->null_refcount_;
-    case TAO_THREAD_LOCK:
-    default:
-      return --this->mutex_refcount_;
-    }
-}
-
-ACE_INLINE unsigned long
-TAO_Configurable_Refcount::value (void) const
-{
-  switch(this->type_)
-    {
-    case TAO_NULL_LOCK:
-      return this->null_refcount_.value ();
-    case TAO_THREAD_LOCK:
-    default:
-      return this->mutex_refcount_.value ();
-    }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Connect_Strategy.cpp b/tao/Connect_Strategy.cpp
index eef31253fe0..bae863c9491 100644
--- a/tao/Connect_Strategy.cpp
+++ b/tao/Connect_Strategy.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Connect_Strategy.h"
 #include "tao/Transport.h"
 #include "tao/Connection_Handler.h"
diff --git a/tao/Connect_Strategy.h b/tao/Connect_Strategy.h
index 228a3304288..4f69b1a19e9 100644
--- a/tao/Connect_Strategy.h
+++ b/tao/Connect_Strategy.h
@@ -63,7 +63,8 @@ public:
   virtual ~TAO_Connect_Strategy (void);
 
   /// Obtain the synch options that can be passed to ACE_Connector
-  /* Return the synch option for the connector, based on the timeout
+  /**
+   * Return the synch option for the connector, based on the timeout
    * and the strategy in place. ACE_Connectors behavior can be altered
    * by passing the right ACE_Synch_Options to the connect () call.
    */
@@ -71,7 +72,8 @@ public:
                               ACE_Synch_Options &opt) = 0;
 
   /// Wait for the connection to be completed till a timeout occurs.
-  /* If the connection establishment fails the state within the
+  /**
+   * If the connection establishment fails the state within the
    * connection handler is set appropriately.
    */
   int wait (TAO_Connection_Handler *ch, ACE_Time_Value *val);
diff --git a/tao/Connection_Handler.cpp b/tao/Connection_Handler.cpp
index 62d6b48633b..2298cb51272 100644
--- a/tao/Connection_Handler.cpp
+++ b/tao/Connection_Handler.cpp
@@ -1,9 +1,11 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/Connection_Handler.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "tao/Resume_Handle.h"
+#include "tao/Resume_Handle_Deferred.h"
 #include "tao/Transport.h"
 #include "tao/Wait_Strategy.h"
 
@@ -115,16 +117,14 @@ TAO_Connection_Handler::svc_i (void)
       max_wait_time = &current_timeout;
     }
 
-  TAO_Resume_Handle rh (this->orb_core_,
-                        ACE_INVALID_HANDLE);
+  TAO_Resume_Handle rh (this->orb_core_, ACE_INVALID_HANDLE);
 
   // We exit of the loop if
   // - If the ORB core is shutdown by another thread
   // - Or if the transport is null. This could happen if an error
   // occured.
   // - Or if during processing a return value of -1 is received.
-  while (!this->orb_core_->has_shutdown ()
-         && result >= 0)
+  while (!this->orb_core_->has_shutdown () && result >= 0)
     {
       // Let the transport know that it is used
       (void) this->transport ()->update_transport ();
@@ -158,7 +158,7 @@ TAO_Connection_Handler::svc_i (void)
 
   if (TAO_debug_level > 0)
     ACE_DEBUG  ((LM_DEBUG,
-                 "TAO (%P|%t) - Connection_Handler::svc_i end\n"));
+                 "TAO (%P|%t) - Connection_Handler::svc_i - end\n"));
 
   return result;
 }
@@ -170,21 +170,18 @@ TAO_Connection_Handler::transport (TAO_Transport* transport)
 
   // Enable reference counting on the event handler.
   this->transport_->event_handler_i ()->reference_counting_policy ().value (
-      ACE_Event_Handler::Reference_Counting_Policy::ENABLED
-    );
+      ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
 }
 
 int
-TAO_Connection_Handler::handle_output_eh (
-    ACE_HANDLE, ACE_Event_Handler * eh)
+TAO_Connection_Handler::handle_output_eh (ACE_HANDLE, ACE_Event_Handler * eh)
 {
   // Let the transport that it is going to be used
   (void) this->transport ()->update_transport ();
 
   // Instantiate the resume handle here.. This will automatically
   // resume the handle once data is written..
-  TAO_Resume_Handle resume_handle (this->orb_core (),
-                                   eh->get_handle ());
+  TAO_Resume_Handle resume_handle (this->orb_core (), eh->get_handle ());
 
   int return_value = 0;
   this->pre_io_hook (return_value);
@@ -217,12 +214,44 @@ TAO_Connection_Handler::handle_input_eh (ACE_HANDLE h, ACE_Event_Handler *eh)
   // If we can't process upcalls just return
   if (!this->transport ()->wait_strategy ()->can_process_upcalls ())
     {
+      ACE_Time_Value suspend_delay (0, 2000);
+
       if (TAO_debug_level > 6)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO (%P|%t) - Connection_Handler[%d]::handle_input_eh, "
                     "not going to handle_input on transport "
                     "because upcalls temporarily suspended on this thread\n",
                     this->transport()->id()));
+
+      if (TAO_debug_level > 5)
+        ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - Connection_Handler[%d]::handle_input_eh, "
+                  "scheduled to resume in %#T sec\n",
+                  eh->get_handle(),
+                  &suspend_delay));
+
+      // Using the heap to create the timeout handler, since we do not know
+      // which handle we will have to try to resume.
+      TAO_Resume_Handle_Deferred* prhd = 0;
+      ACE_NEW_RETURN (prhd,
+                     TAO_Resume_Handle_Deferred (this->orb_core_, eh),
+                     -1);
+      ACE_Event_Handler_var safe_handler (prhd);
+
+      int const retval = this->orb_core_->reactor()->schedule_timer (prhd, 0, suspend_delay);
+      if (retval == -1)
+        {
+          if (TAO_debug_level > 5)
+            ACE_ERROR ((LM_ERROR,
+                      "TAO (%P|%t) - Connection_Handler[%d]::handle_input_eh, "
+                      "Error scheduling timer in %#T sec\n",
+                      eh->get_handle(),
+                      &suspend_delay));
+          return -1;
+        }
+
+      // Returning 0 causes the wait strategy to exit and the leader thread
+      // to enter the reactor's select() call.
       return 0;
     }
 
@@ -245,15 +274,15 @@ TAO_Connection_Handler::handle_input_internal (
   (void) this->transport ()->update_transport ();
 
   // Grab the transport id now and use the cached value for printing
-  // since the  transport could dissappear by the time the thread
+  // since the  transport could disappear by the time the thread
   // returns.
   size_t const t_id = this->transport ()->id ();
 
   if (TAO_debug_level > 6)
     {
-      ACE_HANDLE handle = eh->get_handle();
+      ACE_HANDLE const handle = eh->get_handle();
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Connection_Handler[%d]::handle_input, "
+                  "TAO (%P|%t) - Connection_Handler[%d]::handle_input_internal, "
                   "handle = %d/%d\n",
                   t_id, handle, h));
     }
@@ -277,21 +306,28 @@ TAO_Connection_Handler::handle_input_internal (
 
   if (TAO_debug_level > 6)
     {
-      ACE_HANDLE handle = eh->get_handle ();
+      ACE_HANDLE const handle = eh->get_handle ();
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Connection_Handler[%d]::handle_input, "
+                  "TAO (%P|%t) - Connection_Handler[%d]::handle_input_internal, "
                   "handle = %d/%d, retval = %d\n",
                   t_id, handle, h, return_value));
     }
 
   if (return_value == -1)
-    resume_handle.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED);
+    {
+      resume_handle.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED);
+    }
+
   return return_value;
 }
 
 int
 TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
 {
+  if (this->is_closed_)
+    {
+      return 1;
+    }
 
   this->is_closed_ = true;
 
@@ -429,15 +465,19 @@ TAO_Connection_Handler::pos_io_hook (int &)
 int
 TAO_Connection_Handler::close_handler (u_long)
 {
-  this->is_closed_ = true;
-  this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED,
-                       this->orb_core_->leader_follower ());
+  if (!this->is_closed_)
+    {
+      this->is_closed_ = true;
 
-  // If there was a pending connection cancel it.
-  this->cancel_pending_connection ();
+      this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED,
+                            this->orb_core_->leader_follower ());
 
-  // Purge transport from cache if it's in cache.
-  this->transport ()->purge_entry();
+      // If there was a pending connection cancel it.
+      this->cancel_pending_connection ();
+
+      // Purge transport from cache if it's in cache.
+      this->transport ()->purge_entry();
+    }
 
   return 0;
 }
diff --git a/tao/Connection_Handler.h b/tao/Connection_Handler.h
index 382bf74910c..e8c7216150c 100644
--- a/tao/Connection_Handler.h
+++ b/tao/Connection_Handler.h
@@ -27,7 +27,6 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_SOCK;
-class ACE_Lock;
 class ACE_Event_Handler;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/tao/Connection_Handler.inl b/tao/Connection_Handler.inl
index 5c584b64565..75ad2dbf6c0 100644
--- a/tao/Connection_Handler.inl
+++ b/tao/Connection_Handler.inl
@@ -43,7 +43,6 @@ TAO_Connection_Handler::is_connecting (void) const
   return this->state_ == TAO_LF_Event::LFS_CONNECTION_WAIT;
 }
 
-
 ACE_INLINE void
 TAO_Connection_Handler::connection_pending (void)
 {
@@ -72,7 +71,6 @@ TAO_Connection_Handler::handle_write_ready (const ACE_Time_Value *)
   return 0;
 }
 
-
 //@@ CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Connection_Purging_Strategy.h b/tao/Connection_Purging_Strategy.h
index 70d0b7324ff..1e3bfbc996d 100644
--- a/tao/Connection_Purging_Strategy.h
+++ b/tao/Connection_Purging_Strategy.h
@@ -51,7 +51,7 @@ public:
   virtual int cache_maximum (void) const;
 
   /// Sub-classes must implement these methods
-  virtual void update_item (TAO_Transport* transport) = 0;
+  virtual void update_item (TAO_Transport& transport) = 0;
 
 private:
   /// The maximum number of cach entries
diff --git a/tao/Connector_Impl.cpp b/tao/Connector_Impl.cpp
index b49367edb78..36db4fe83f0 100644
--- a/tao/Connector_Impl.cpp
+++ b/tao/Connector_Impl.cpp
@@ -5,6 +5,7 @@
 
 #include "tao/Connector_Impl.h"
 #include "tao/Transport.h"
+#include "tao/ORB_Core.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -16,7 +17,7 @@ template <class SVC_HANDLER>
 TAO_Connect_Creation_Strategy<SVC_HANDLER>::
     TAO_Connect_Creation_Strategy (ACE_Thread_Manager* t,
                                    TAO_ORB_Core *orb_core)
-    : ACE_Creation_Strategy <SVC_HANDLER> (t),
+    : ACE_Creation_Strategy <SVC_HANDLER> (t, orb_core->reactor ()),
       orb_core_ (orb_core)
 {
 
@@ -42,8 +43,8 @@ TAO_Connect_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
 
 template <class SVC_HANDLER>
 TAO_Connect_Concurrency_Strategy<SVC_HANDLER>::
-     TAO_Connect_Concurrency_Strategy (TAO_ORB_Core *orb_core)
-       : orb_core_ (orb_core)
+    TAO_Connect_Concurrency_Strategy (TAO_ORB_Core *orb_core)
+    : orb_core_ (orb_core)
 {
 }
 
diff --git a/tao/DLL_Parser.cpp b/tao/DLL_Parser.cpp
index 225af3a3f7d..820e82eca89 100644
--- a/tao/DLL_Parser.cpp
+++ b/tao/DLL_Parser.cpp
@@ -69,7 +69,6 @@ ACE_STATIC_SVC_DEFINE (TAO_DLL_Parser,
                                   ACE_Service_Type::DELETE_OBJ,
                        0)
 
-
 ACE_FACTORY_DEFINE (TAO, TAO_DLL_Parser)
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Default_Collocation_Resolver.cpp b/tao/Default_Collocation_Resolver.cpp
index 3a95018ada2..552d1ebf253 100644
--- a/tao/Default_Collocation_Resolver.cpp
+++ b/tao/Default_Collocation_Resolver.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "tao/Default_Collocation_Resolver.h"
-
 #include "tao/Object.h"
 #include "ace/Log_Msg.h"
 
diff --git a/tao/Default_Stub_Factory.cpp b/tao/Default_Stub_Factory.cpp
index 89a9f8d812b..4462a35b97c 100644
--- a/tao/Default_Stub_Factory.cpp
+++ b/tao/Default_Stub_Factory.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Default_Stub_Factory.h"
diff --git a/tao/Default_Thread_Lane_Resources_Manager.cpp b/tao/Default_Thread_Lane_Resources_Manager.cpp
index 591a03c3c39..ffb100c5fa6 100644
--- a/tao/Default_Thread_Lane_Resources_Manager.cpp
+++ b/tao/Default_Thread_Lane_Resources_Manager.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Default_Thread_Lane_Resources_Manager.h"
diff --git a/tao/DiffServPolicy.mpc b/tao/DiffServPolicy.mpc
deleted file mode 100644
index d7addc98872..00000000000
--- a/tao/DiffServPolicy.mpc
+++ /dev/null
@@ -1,58 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults, tao_no_iiop {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -GA -SS -Sci -Sorb \
-                -Wb,export_macro=TAO_DiffServPolicy_Export \
-                -Wb,export_include=tao/DiffServPolicy/DiffServPolicy_Export.h \
-                -Wb,include_guard=TAO_DIFFSERVPOLICY_SAFE_INCLUDE \
-                -Wb,safe_include=tao/DiffServPolicy/DiffServPolicy.h \
-                -o DiffServPolicy
-    idlflags -= -St
-    DiffServPolicy/DiffServPolicy.pidl
-  }
-}
-
-project(DiffServPolicy) : taolib, tao_output, install, portableserver, pi, taoidldefaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after       += *idl
-  sharedname   = TAO_DiffServPolicy
-  dynamicflags += TAO_DIFFSERVPOLICY_BUILD_DLL
-
-  Source_Files {
-    DiffServPolicy
-  }
-
-  Source_Files {
-    DiffServPolicy/DiffServPolicyC.cpp
-  }
-
-  Header_Files {
-    DiffServPolicy
-    DiffServPolicy/DiffServPolicyC.h
-    DiffServPolicy/DiffServPolicyS.h
-    DiffServPolicy/DiffServPolicyA.h
-  }
-
-  Inline_Files {
-    DiffServPolicy
-  }
-
-  Template_Files {
-    DiffServPolicy
-  }
-
-  Resource_Files {
-    DiffServPolicy
-  }
-
-  PIDL_Files {
-    DiffServPolicy
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    DiffServPolicy/TAO_DiffServPolicy.pc.in
-  }
-}
diff --git a/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp b/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
index 2eee3e406d8..8e5e61262b1 100644
--- a/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
+++ b/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
@@ -4,10 +4,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (DiffServPolicy,
-           Client_Network_Priority_Policy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Client_Network_Priority_Policy::TAO_Client_Network_Priority_Policy (void)
diff --git a/tao/DiffServPolicy/DiffServPolicy.cpp b/tao/DiffServPolicy/DiffServPolicy.cpp
index f83f8c80b00..86ab39e17f5 100644
--- a/tao/DiffServPolicy/DiffServPolicy.cpp
+++ b/tao/DiffServPolicy/DiffServPolicy.cpp
@@ -1,4 +1,5 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/DiffServPolicy/DiffServPolicy.h"
 #include "tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h"
@@ -7,8 +8,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/PI/PI.h"
 
-ACE_RCSID (DiffServPolicy, DiffServPolicy, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/tao/DiffServPolicy/DiffServPolicy.mpc b/tao/DiffServPolicy/DiffServPolicy.mpc
new file mode 100644
index 00000000000..27e08e239c8
--- /dev/null
+++ b/tao/DiffServPolicy/DiffServPolicy.mpc
@@ -0,0 +1,40 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, tao_no_iiop, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -GA -SS -Sci -Sorb \
+                -Wb,export_macro=TAO_DiffServPolicy_Export \
+                -Wb,export_include=tao/DiffServPolicy/DiffServPolicy_Export.h \
+                -Wb,include_guard=TAO_DIFFSERVPOLICY_SAFE_INCLUDE \
+                -Wb,safe_include=tao/DiffServPolicy/DiffServPolicy.h \
+                -iC tao/DiffServPolicy
+    idlflags -= -St
+    DiffServPolicy.pidl
+  }
+
+  specific {
+    install_dir = tao/DiffServPolicy
+  }
+}
+
+project(DiffServPolicy) : taolib, tao_output, install, portableserver, pi, taoidldefaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  after       += *idl
+  sharedname   = TAO_DiffServPolicy
+  dynamicflags += TAO_DIFFSERVPOLICY_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    DiffServPolicyC.cpp
+  }
+
+  Header_Files {
+    *.h
+    DiffServPolicyC.h
+    DiffServPolicyS.h
+    DiffServPolicyA.h
+  }
+
+  specific {
+    install_dir = tao/DiffServPolicy
+  }
+}
diff --git a/tao/DiffServPolicy/DiffServPolicy_Factory.cpp b/tao/DiffServPolicy/DiffServPolicy_Factory.cpp
index 3fed4990ac9..d0e31f1ad7f 100644
--- a/tao/DiffServPolicy/DiffServPolicy_Factory.cpp
+++ b/tao/DiffServPolicy/DiffServPolicy_Factory.cpp
@@ -1,9 +1,7 @@
-#include "tao/DiffServPolicy/DiffServPolicy_Factory.h"
-
-ACE_RCSID (DiffServPolicy,
-           DiffServPolicy_Factory,
-           "$Id$")
+// -*- C++ -*-
+// $Id$
 
+#include "tao/DiffServPolicy/DiffServPolicy_Factory.h"
 #include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
 #include "tao/DiffServPolicy/Server_Network_Priority_Policy.h"
 #include "tao/PolicyC.h"
diff --git a/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp b/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
index 100053ff8de..96a6354b72c 100644
--- a/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
+++ b/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h"
@@ -8,10 +9,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfo.h"
 
-ACE_RCSID (DiffServPolicy,
-           DiffServPolicy_ORBInitializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp b/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
index 7a6c46706c8..fa4fd7a8f73 100644
--- a/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
+++ b/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
@@ -1,4 +1,5 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h"
 #include "tao/PortableServer/Root_POA.h"
@@ -12,11 +13,6 @@
 #include "tao/Connection_Handler.h"
 #include "tao/Transport.h"
 
-ACE_RCSID(DiffServPolicy,
-          DiffServ_Network_Priority_Hook,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
diff --git a/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h b/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h
index 2da10eedf3b..614d2f8853a 100644
--- a/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h
+++ b/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h
@@ -38,7 +38,7 @@ public:
   /// priority policy, so that it can be used for sending replies with the
   /// policy-specified DiffServ codepoint.
   ///
-  void update_network_priority (TAO_Root_POA &poa, 
+  void update_network_priority (TAO_Root_POA &poa,
                                 TAO_POA_Policy_Set &poa_policy_set);
 
   /// This function is a hook, that is used by the POA's servant dispatcher
diff --git a/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp b/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
index e6157404590..4a6af6e6261 100644
--- a/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
+++ b/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/DiffServPolicy/DiffServ_Protocols_Hooks.h"
 #include "tao/Stub.h"
 #include "tao/Profile.h"
@@ -8,10 +11,6 @@
 #include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (DiffServPolicy,
-           DiffServ_Protocols_Hooks,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DS_Network_Priority_Protocols_Hooks::
diff --git a/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp b/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp
index 6bd71b8a674..a1f5e4c873e 100644
--- a/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp
+++ b/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/DiffServPolicy/DiffServ_Service_Context_Handler.h"
 
-ACE_RCSID (DiffServPolicy,
-           DiffServ_Service_Context_Handler,
-           "$Id$")
-
 #include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
 #include "tao/CDR.h"
 #include "tao/TAO_Server_Request.h"
diff --git a/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp b/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
index 6fdc297e2d8..d496ec141cc 100644
--- a/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
+++ b/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
@@ -5,10 +5,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/CDR.h"
 
-ACE_RCSID (DiffServPolicy,
-           Server_Network_Priority_Policy,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy (void)
diff --git a/tao/DoubleSeq.pidl b/tao/DoubleSeq.pidl
index edb040ad366..333fd628c20 100644
--- a/tao/DoubleSeq.pidl
+++ b/tao/DoubleSeq.pidl
@@ -1,25 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-/**
- *   This file is used to generate the code in DoubleSeqC.*
- *   The command used to generate code is:
- *
- *     tao_idl
- *          -oA AnyTypeCode
- *          -GA -SS -Sci
- *          -Wb,pre_include=ace/pre.h
- *          -Wb,post_include=ace/post.h
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=tao/TAO_Export.h
- *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
- *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
- *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
- *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
- *          DoubleSeq.pidl
- */
-
 #ifndef TAO_CORBA_DOUBLE_SEQ_IDL
 #define TAO_CORBA_DOUBLE_SEQ_IDL
 
diff --git a/tao/DynamicAny.mpc b/tao/DynamicAny.mpc
deleted file mode 100644
index 729e50c4ee8..00000000000
--- a/tao/DynamicAny.mpc
+++ /dev/null
@@ -1,68 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults, valuetype {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb \
-                -Wb,export_macro=TAO_DynamicAny_Export \
-                -Wb,export_include=tao/DynamicAny/dynamicany_export.h \
-                -Wb,include_guard=TAO_DYNAMICANY_SAFE_INCLUDE \
-                -Wb,safe_include=tao/DynamicAny/DynamicAny.h \
-                -o DynamicAny
-    DynamicAny/DynamicAny.pidl
-  }
-}
-
-project(DynamicAny) : install, tao_output, valuetype, taoidldefaults {
-  after       += *idl
-  sharedname    = TAO_DynamicAny
-  dynamicflags  = TAO_DYNAMICANY_BUILD_DLL
-
-  Source_Files {
-    DynamicAny/DynamicAny.cpp
-    DynamicAny/DynamicAnyC.cpp
-    DynamicAny/DynAny_i.cpp
-    DynamicAny/DynArray_i.cpp
-    DynamicAny/DynCommon.cpp
-    DynamicAny/DynEnum_i.cpp
-    DynamicAny/DynSequence_i.cpp
-    DynamicAny/DynStruct_i.cpp
-    DynamicAny/DynUnion_i.cpp
-    DynamicAny/DynValue_i.cpp
-    DynamicAny/DynValueBox_i.cpp
-    DynamicAny/DynValueCommon_i.cpp
-    DynamicAny/DynAnyFactory.cpp
-  }
-
-  Source_Files {
-    DynamicAny/DynamicAnyC.cpp
-  }
-
-  Header_Files {
-    DynamicAny
-    DynamicAny/DynamicAnyC.h
-    DynamicAny/DynamicAnyS.h
-  }
-
-  Inline_Files {
-    DynamicAny
-  }
-
-  Template_Files {
-    DynamicAny/DynAnyUtils_T.cpp
-  }
-
-  Resource_Files {
-    DynamicAny
-  }
-
-  PIDL_Files {
-    DynamicAny
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    DynamicAny/TAO_DynamicAny.pc.in
-  }
-}
diff --git a/tao/DynamicAny/DynAnyFactory.cpp b/tao/DynamicAny/DynAnyFactory.cpp
index 497d93b86bc..7bdbc0e9660 100644
--- a/tao/DynamicAny/DynAnyFactory.cpp
+++ b/tao/DynamicAny/DynAnyFactory.cpp
@@ -23,10 +23,6 @@
 
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (DynamicAny,
-           DynAnyFactory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor from typecode
diff --git a/tao/DynamicAny/DynAny_i.cpp b/tao/DynamicAny/DynAny_i.cpp
index bce4d6ad6f6..06f33e73a24 100644
--- a/tao/DynamicAny/DynAny_i.cpp
+++ b/tao/DynamicAny/DynAny_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/TypeCode.h"
@@ -14,10 +15,6 @@
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (DynamicAny,
-           DynAny_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynAny_i::TAO_DynAny_i (void)
@@ -316,7 +313,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs)
         rhs_n->any_ >>= rhs_v;
         CORBA::Float lhs_v;
         this->any_ >>= lhs_v;
-        return (lhs_v == rhs_v);
+        return ACE::is_equal (lhs_v, rhs_v);
       }
     case CORBA::tk_double:
       {
@@ -324,7 +321,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs)
         rhs_n->any_ >>= rhs_v;
         CORBA::Double lhs_v;
         this->any_ >>= lhs_v;
-        return (lhs_v == rhs_v);
+        return ACE::is_equal (lhs_v, rhs_v);
       }
     case CORBA::tk_longlong:
       {
diff --git a/tao/DynamicAny/DynArray_i.cpp b/tao/DynamicAny/DynArray_i.cpp
index 1c30d4a0c32..70abecc88e9 100644
--- a/tao/DynamicAny/DynArray_i.cpp
+++ b/tao/DynamicAny/DynArray_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicAny/DynArray_i.h"
@@ -10,10 +11,6 @@
 
 #include "tao/CDR.h"
 
-ACE_RCSID (DynamicAny,
-           DynArray_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynArray_i::TAO_DynArray_i (void)
diff --git a/tao/DynamicAny/DynCommon.cpp b/tao/DynamicAny/DynCommon.cpp
index 4256113aa32..60eab3cb278 100644
--- a/tao/DynamicAny/DynCommon.cpp
+++ b/tao/DynamicAny/DynCommon.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
@@ -22,11 +23,6 @@
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (DynamicAny,
-           DynCommon,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynCommon::TAO_DynCommon (void)
diff --git a/tao/DynamicAny/DynEnum_i.cpp b/tao/DynamicAny/DynEnum_i.cpp
index ac01dd4f7bd..1325a5a3053 100644
--- a/tao/DynamicAny/DynEnum_i.cpp
+++ b/tao/DynamicAny/DynEnum_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/TypeCode.h"
@@ -9,11 +10,6 @@
 
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (DynamicAny,
-           DynEnum_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynEnum_i::TAO_DynEnum_i (void)
diff --git a/tao/DynamicAny/DynSequence_i.cpp b/tao/DynamicAny/DynSequence_i.cpp
index fcc700e0427..6ef16221c4f 100644
--- a/tao/DynamicAny/DynSequence_i.cpp
+++ b/tao/DynamicAny/DynSequence_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicAny/DynSequence_i.h"
@@ -10,10 +11,6 @@
 
 #include "tao/CDR.h"
 
-ACE_RCSID (DynamicAny,
-           DynSequence_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynSequence_i::TAO_DynSequence_i (void)
diff --git a/tao/DynamicAny/DynStruct_i.cpp b/tao/DynamicAny/DynStruct_i.cpp
index ab2d743b88d..4a01641c93b 100644
--- a/tao/DynamicAny/DynStruct_i.cpp
+++ b/tao/DynamicAny/DynStruct_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicAny/DynStruct_i.h"
@@ -10,10 +11,6 @@
 
 #include "tao/CDR.h"
 
-ACE_RCSID (DynamicAny,
-           DynStruct_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynStruct_i::TAO_DynStruct_i (void)
diff --git a/tao/DynamicAny/DynUnion_i.cpp b/tao/DynamicAny/DynUnion_i.cpp
index b777fb5618d..99f50c6bf52 100644
--- a/tao/DynamicAny/DynUnion_i.cpp
+++ b/tao/DynamicAny/DynUnion_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicAny/DynUnion_i.h"
@@ -11,10 +12,6 @@
 
 #include "tao/CDR.h"
 
-ACE_RCSID (DynamicAny,
-           DynUnion_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynUnion_i::TAO_DynUnion_i (void)
diff --git a/tao/DynamicAny/DynValueBox_i.cpp b/tao/DynamicAny/DynValueBox_i.cpp
index 05ba084fdc3..de4dce9bf8c 100644
--- a/tao/DynamicAny/DynValueBox_i.cpp
+++ b/tao/DynamicAny/DynValueBox_i.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicAny/DynValueBox_i.h"
 
-ACE_RCSID (DynamicAny,
-           DynValueBox_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynValueBox_i::TAO_DynValueBox_i (void)
diff --git a/tao/DynamicAny/DynValueCommon_i.cpp b/tao/DynamicAny/DynValueCommon_i.cpp
index 40de3f745ed..5414599eb2c 100644
--- a/tao/DynamicAny/DynValueCommon_i.cpp
+++ b/tao/DynamicAny/DynValueCommon_i.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicAny/DynValueCommon_i.h"
 
-ACE_RCSID (DynamicAny,
-           DynValueCommon_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynValueCommon_i::TAO_DynValueCommon_i (void)
diff --git a/tao/DynamicAny/DynValue_i.cpp b/tao/DynamicAny/DynValue_i.cpp
index 658d45c6638..45545248f4d 100644
--- a/tao/DynamicAny/DynValue_i.cpp
+++ b/tao/DynamicAny/DynValue_i.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicAny/DynValue_i.h"
 
-ACE_RCSID (DynamicAny,
-           DynValue_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynValue_i::TAO_DynValue_i (void)
diff --git a/tao/DynamicAny/DynamicAny.cpp b/tao/DynamicAny/DynamicAny.cpp
index a1686020897..f53b177dbf4 100644
--- a/tao/DynamicAny/DynamicAny.cpp
+++ b/tao/DynamicAny/DynamicAny.cpp
@@ -12,8 +12,6 @@
 #include "tao/DynamicAny/DynamicAny.h"
 #include "tao/DynamicAny/DynAnyFactory.h"
 
-ACE_RCSID(DynamicAny, DynamicAny, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynamicAny_Loader::TAO_DynamicAny_Loader (void)
diff --git a/tao/DynamicAny/DynamicAny.mpc b/tao/DynamicAny/DynamicAny.mpc
new file mode 100644
index 00000000000..e0582ec7226
--- /dev/null
+++ b/tao/DynamicAny/DynamicAny.mpc
@@ -0,0 +1,53 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, valuetype, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -Gp -Gd -Sci -SS -Sorb \
+                -Wb,export_macro=TAO_DynamicAny_Export \
+                -Wb,export_include=tao/DynamicAny/dynamicany_export.h \
+                -Wb,include_guard=TAO_DYNAMICANY_SAFE_INCLUDE \
+                -Wb,safe_include=tao/DynamicAny/DynamicAny.h \
+                -iC tao/DynamicAny
+    DynamicAny.pidl
+  }
+
+  specific {
+    install_dir = tao/DynamicAny
+  }
+}
+
+project(DynamicAny) : install, tao_output, valuetype, taoidldefaults {
+  after       += *idl
+  sharedname    = TAO_DynamicAny
+  dynamicflags  = TAO_DYNAMICANY_BUILD_DLL
+
+  Source_Files {
+    DynamicAny.cpp
+    DynamicAnyC.cpp
+    DynAny_i.cpp
+    DynArray_i.cpp
+    DynCommon.cpp
+    DynEnum_i.cpp
+    DynSequence_i.cpp
+    DynStruct_i.cpp
+    DynUnion_i.cpp
+    DynValue_i.cpp
+    DynValueBox_i.cpp
+    DynValueCommon_i.cpp
+    DynAnyFactory.cpp
+  }
+
+  Header_Files {
+    *.h
+    DynamicAnyC.h
+    DynamicAnyS.h
+  }
+
+  Template_Files {
+    DynAnyUtils_T.cpp
+  }
+
+  specific {
+    install_dir = tao/DynamicAny
+  }
+}
diff --git a/tao/DynamicAny/DynamicAny.pidl b/tao/DynamicAny/DynamicAny.pidl
index a8d9aaaa243..18a76b5dd0d 100644
--- a/tao/DynamicAny/DynamicAny.pidl
+++ b/tao/DynamicAny/DynamicAny.pidl
@@ -7,8 +7,7 @@
  *
  * @brief IDL source for the DynamicAny module.
  *
- * This file is used to generate the code in DynamicAnyC.{h,cpp}, it
- * was obtained from the OMG website as part of the full CORBA IDL,
+ * It was obtained from the OMG website as part of the full CORBA IDL,
  * the document reference number is: formal/04-03-01, or use the
  * following URL:
  * http://www.omg.org/technology/documents/formal/corba_omg_idl_text_file.htm
@@ -50,18 +49,18 @@ module DynamicAny
 
     void assign (in DynAny dyn_any)
       raises (TypeMismatch);
-      
+
     void from_any (in any value)
       raises (TypeMismatch, InvalidValue);
-      
+
     any to_any ();
-    
+
     boolean equal (in DynAny dyn_any);
-    
+
     void destroy ();
-    
+
     DynAny copy ();
-    
+
     void insert_boolean (in boolean value)
       raises (TypeMismatch, InvalidValue);
     void insert_octet (in octet value)
@@ -145,19 +144,19 @@ module DynamicAny
       raises (TypeMismatch, InvalidValue);
 
     boolean seek (in long index);
-    
+
     void rewind ();
-    
+
     boolean next ();
-    
+
     unsigned long component_count ();
-    
+
     DynAny current_component ()
       raises (TypeMismatch);
-    
+
     void insert_abstract (in CORBA::AbstractBase value)
       raises (TypeMismatch, InvalidValue);
-      
+
     CORBA::AbstractBase get_abstract ()
       raises (TypeMismatch, InvalidValue);
 
@@ -178,7 +177,7 @@ module DynamicAny
     void insert_float_seq (in CORBA::FloatSeq value)
       raises (TypeMismatch, InvalidValue);
     void insert_double_seq (in CORBA::DoubleSeq value)
-      raises (TypeMismatch, InvalidValue);  
+      raises (TypeMismatch, InvalidValue);
     void insert_longlong_seq (in CORBA::LongLongSeq value)
       raises (TypeMismatch, InvalidValue);
     void insert_ulonglong_seq (in CORBA::ULongLongSeq value)
@@ -187,7 +186,7 @@ module DynamicAny
       raises (TypeMismatch, InvalidValue);
     void insert_wchar_seq (in CORBA::WCharSeq value)
       raises (TypeMismatch, InvalidValue);
-      
+
     CORBA::BooleanSeq get_boolean_seq ()
       raises (TypeMismatch, InvalidValue);
     CORBA::OctetSeq get_octet_seq()
@@ -219,7 +218,7 @@ module DynamicAny
   local interface DynFixed : DynAny
   {
     string get_value ();
-    
+
     boolean set_value (in string val)
       raises (TypeMismatch, InvalidValue);
   };
@@ -227,18 +226,18 @@ module DynamicAny
   local interface DynEnum : DynAny
   {
     string get_as_string ();
-    
+
     void set_as_string (in string value)
       raises (InvalidValue);
-      
+
     unsigned long get_as_ulong ();
-    
+
     void set_as_ulong (in unsigned long value)
       raises (InvalidValue);
   };
-  
+
   typedef string FieldName;
-  
+
   struct NameValuePair
   {
     FieldName id;
@@ -246,7 +245,7 @@ module DynamicAny
   };
 
   typedef sequence<NameValuePair> NameValuePairSeq;
-  
+
   struct NameDynAnyPair
   {
     FieldName id;
@@ -254,22 +253,22 @@ module DynamicAny
   };
 
   typedef sequence<NameDynAnyPair> NameDynAnyPairSeq;
-  
+
   local interface DynStruct : DynAny
   {
     FieldName current_member_name ()
       raises (TypeMismatch, InvalidValue);
-      
+
     CORBA::TCKind current_member_kind ()
       raises (TypeMismatch, InvalidValue);
-      
+
     NameValuePairSeq get_members ();
-    
+
     void set_members (in NameValuePairSeq value)
       raises (TypeMismatch, InvalidValue);
-      
+
     NameDynAnyPairSeq get_members_as_dyn_any ();
-    
+
     void set_members_as_dyn_any (in NameDynAnyPairSeq value)
       raises (TypeMismatch, InvalidValue);
   };
@@ -277,46 +276,46 @@ module DynamicAny
   local interface DynUnion : DynAny
   {
     DynAny get_discriminator ();
-    
+
     void set_discriminator (in DynAny d)
       raises (TypeMismatch);
-    
+
     void set_to_default_member ()
       raises (TypeMismatch);
-      
+
     void set_to_no_active_member ()
       raises (TypeMismatch);
-      
+
     boolean has_no_active_member ();
-    
+
     CORBA::TCKind discriminator_kind ();
-    
+
     DynAny member () raises (InvalidValue);
-    
+
     FieldName member_name ()
       raises (InvalidValue);
-      
+
     CORBA::TCKind member_kind ()
       raises (InvalidValue);
   };
 
   typedef sequence<any> AnySeq;
   typedef sequence<DynAny> DynAnySeq;
-  
+
   local interface DynSequence : DynAny
   {
     unsigned long get_length ();
-    
+
     void set_length (in unsigned long len)
       raises (InvalidValue);
-      
+
     AnySeq get_elements ();
-    
+
     void set_elements (in AnySeq value)
       raises (TypeMismatch, InvalidValue);
-      
+
     DynAnySeq get_elements_as_dyn_any ();
-    
+
     void set_elements_as_dyn_any (in DynAnySeq value)
       raises (TypeMismatch, InvalidValue);
   };
@@ -324,12 +323,12 @@ module DynamicAny
   local interface DynArray : DynAny
   {
     AnySeq get_elements ();
-    
+
     void set_elements (in AnySeq value)
       raises (TypeMismatch, InvalidValue);
-      
+
     DynAnySeq get_elements_as_dyn_any ();
-    
+
     void set_elements_as_dyn_any (in DynAnySeq value)
       raises (TypeMismatch, InvalidValue);
   };
@@ -337,9 +336,9 @@ module DynamicAny
   local interface DynValueCommon : DynAny
   {
     boolean is_null ();
-    
+
     void set_to_null ();
-    
+
     void set_to_value ();
   };
 
@@ -347,17 +346,17 @@ module DynamicAny
   {
     FieldName current_member_name ()
       raises (TypeMismatch, InvalidValue);
-      
+
     CORBA::TCKind current_member_kind ()
       raises (TypeMismatch, InvalidValue);
-      
+
     NameValuePairSeq get_members ();
-    
+
     void set_members (in NameValuePairSeq value)
       raises (TypeMismatch, InvalidValue);
-      
+
     NameDynAnyPairSeq get_members_as_dyn_any ();
-    
+
     void set_members_as_dyn_any (in NameDynAnyPairSeq value)
       raises (TypeMismatch, InvalidValue);
   };
@@ -366,35 +365,35 @@ module DynamicAny
   {
     any get_boxed_value ()
       raises (InvalidValue);
-      
+
     void set_boxed_value (in any boxed)
       raises (TypeMismatch, InvalidValue);
-      
+
     DynAny get_boxed_value_as_dyn_any ()
       raises (InvalidValue);
-      
+
     void set_boxed_value_as_dyn_any (in DynAny boxed)
       raises (TypeMismatch);
   };
-  
+
   exception MustTruncate {};
 
   local interface DynAnyFactory
   {
     exception InconsistentTypeCode {};
-    
+
     DynAny create_dyn_any (in any value)
       raises (InconsistentTypeCode);
     DynAny create_dyn_any_from_type_code (in CORBA::TypeCode type)
       raises (InconsistentTypeCode);
-      
+
     DynAny create_dyn_any_without_truncation (in any value)
       raises (InconsistentTypeCode, MustTruncate);
-      
+
     DynAnySeq create_multiple_dyn_anys (in AnySeq values,
                                         in boolean allow_truncate)
       raises (InconsistentTypeCode, MustTruncate);
-      
+
     AnySeq create_multiple_anys (in DynAnySeq values);
   };
 }; // module DynamicAny
diff --git a/tao/DynamicInterface.mpc b/tao/DynamicInterface.mpc
deleted file mode 100644
index 52b2d47fb46..00000000000
--- a/tao/DynamicInterface.mpc
+++ /dev/null
@@ -1,36 +0,0 @@
-//$Id$
-project(DynamicInterface) : taolib, tao_output, install, messaging, minimum_corba {
-  sharedname   = TAO_DynamicInterface
-  dynamicflags += TAO_DYNAMICINTERFACE_BUILD_DLL
-
-  Source_Files {
-    DynamicInterface
-  }
-
-  Header_Files {
-    DynamicInterface
-  }
-
-  Inline_Files {
-    DynamicInterface
-  }
-
-  Template_Files {
-    DynamicInterface
-  }
-
-  Resource_Files {
-    DynamicInterface
-  }
-
-  PIDL_Files {
-    DynamicInterface
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    DynamicInterface/TAO_DynamicInterface.pc.in
-  }
-}
diff --git a/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
index 1b0282bee0a..82d61a2c887 100644
--- a/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
+++ b/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
@@ -14,9 +14,6 @@
 #include "tao/Pluggable_Messaging_Utils.h"
 #include "tao/AnyTypeCode/Any_Impl.h"
 
-ACE_RCSID (DynamicInterface, AMH_DSI_Response_Handler,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "AMH_DSI_Response_Handler.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/DynamicInterface/AMH_DSI_Response_Handler.h b/tao/DynamicInterface/AMH_DSI_Response_Handler.h
index 3bfd2888893..943d42afebd 100644
--- a/tao/DynamicInterface/AMH_DSI_Response_Handler.h
+++ b/tao/DynamicInterface/AMH_DSI_Response_Handler.h
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- *  @brief Handle the Repsonse appropriately.
+ *  @brief Handle the Response appropriately.
  */
 //=====================================================================
 
diff --git a/tao/DynamicInterface/Context.cpp b/tao/DynamicInterface/Context.cpp
index b1bb9f70399..380b77a0e7a 100644
--- a/tao/DynamicInterface/Context.cpp
+++ b/tao/DynamicInterface/Context.cpp
@@ -1,13 +1,9 @@
-#include "tao/DynamicInterface/Context.h"
-
-ACE_RCSID (DynamicInterface,
-           Context,
-           "$Id$")
+// $Id$
 
+#include "tao/DynamicInterface/Context.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/CORBA_String.h"
 #include "tao/SystemException.h"
-
 #include "ace/Guard_T.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/tao/DynamicInterface/Context.h b/tao/DynamicInterface/Context.h
index e0eb9101ca7..5873eed40d3 100644
--- a/tao/DynamicInterface/Context.h
+++ b/tao/DynamicInterface/Context.h
@@ -49,10 +49,10 @@ namespace CORBA
 
   class NVList;
   typedef NVList *NVList_ptr;
-  
+
   class Context;
   typedef Context * Context_ptr;
-  
+
   class ContextList;
   typedef ContextList * ContextList_ptr;
 
diff --git a/tao/DynamicInterface/DII_Arguments.cpp b/tao/DynamicInterface/DII_Arguments.cpp
index 392390a809c..6f955615445 100644
--- a/tao/DynamicInterface/DII_Arguments.cpp
+++ b/tao/DynamicInterface/DII_Arguments.cpp
@@ -1,18 +1,12 @@
 // $Id$
 
 #include "tao/DynamicInterface/DII_Arguments.h"
-
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/AnyTypeCode/Any_Impl.h"
 #include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/Exception.h"
 #include "tao/CDR.h"
 
-
-ACE_RCSID (DynamicInterface,
-           DII_Arguments,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/DynamicInterface/DII_Arguments.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp b/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
index 846a8ae204a..12d544cc1ef 100644
--- a/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
+++ b/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
@@ -7,10 +7,6 @@
 #include "tao/SystemException.h"
 #include "tao/CDR.h"
 
-ACE_RCSID (DynamicInterface,
-           DII_Arguments_Converter_Impl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
@@ -75,7 +71,7 @@ TAO_DII_Arguments_Converter_Impl::convert_request (
   details->use_stub_args (false);
 }
 
-void 
+void
 TAO_DII_Arguments_Converter_Impl::dsi_convert_request (
     TAO_ServerRequest & server_request,
     TAO_OutputCDR & output)
@@ -109,7 +105,7 @@ TAO_DII_Arguments_Converter_Impl::convert_reply (
   this->dsi_convert_reply (server_request, input);
 }
 
-void 
+void
 TAO_DII_Arguments_Converter_Impl::dsi_convert_reply (
     TAO_ServerRequest & server_request,
     TAO_InputCDR & input)
@@ -117,14 +113,14 @@ TAO_DII_Arguments_Converter_Impl::dsi_convert_reply (
   TAO::NamedValue_Argument * _ret_val
     = static_cast<TAO::NamedValue_Argument *> (
         server_request.operation_details ()->args()[0]);
-  
+
   _ret_val->demarshal (input);
-  
+
   CORBA::NVList_ptr lst
     = static_cast<TAO::NVList_Argument *> (
         server_request.operation_details ()->args()[1])->arg ();
 
-  lst->_tao_decode (input, 
+  lst->_tao_decode (input,
                     CORBA::ARG_INOUT | CORBA::ARG_OUT);
 }
 
diff --git a/tao/DynamicInterface/DII_Arguments_Converter_Impl.h b/tao/DynamicInterface/DII_Arguments_Converter_Impl.h
index b2b7d4dae47..53ee52c0b87 100644
--- a/tao/DynamicInterface/DII_Arguments_Converter_Impl.h
+++ b/tao/DynamicInterface/DII_Arguments_Converter_Impl.h
@@ -48,7 +48,7 @@ public:
 
   virtual void dsi_convert_request (TAO_ServerRequest & server_request,
                                     TAO_OutputCDR & output);
-  
+
   virtual void convert_reply (TAO_ServerRequest & server_request,
                               TAO::Argument * const args[],
                               size_t nargs);
diff --git a/tao/DynamicInterface/DII_Invocation.cpp b/tao/DynamicInterface/DII_Invocation.cpp
index f887b414ec0..2c6a8a8c1e3 100644
--- a/tao/DynamicInterface/DII_Invocation.cpp
+++ b/tao/DynamicInterface/DII_Invocation.cpp
@@ -24,10 +24,6 @@
 # include "tao/PI/RequestInfo_Util.h"
 #endif
 
-ACE_RCSID (DynamicInterface,
-           DII_Invocation,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index efcc31ba283..8410e8eb9ea 100644
--- a/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -18,11 +18,6 @@
 
 #include "ace/os_include/os_errno.h"
 
-ACE_RCSID (DynamicInterface,
-           DII_Invocation_Adapter,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index 4d28e8f3b51..c4694a26f57 100644
--- a/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -7,11 +7,6 @@
 #include "tao/Pluggable_Messaging_Utils.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID(DynamicInterface,
-          DII_Reply_Dispatcher,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor.
diff --git a/tao/DynamicInterface/DII_Reply_Handler.cpp b/tao/DynamicInterface/DII_Reply_Handler.cpp
index 944fd405701..37d5d882cde 100644
--- a/tao/DynamicInterface/DII_Reply_Handler.cpp
+++ b/tao/DynamicInterface/DII_Reply_Handler.cpp
@@ -10,8 +10,6 @@
 #include "tao/Object.h"
 #include "tao/Pluggable_Messaging_Utils.h"
 
-ACE_RCSID(DynamicInterface, Request, "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "DII_Reply_Handler.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/tao/DynamicInterface/DynamicInterface.mpc b/tao/DynamicInterface/DynamicInterface.mpc
new file mode 100644
index 00000000000..823176ca877
--- /dev/null
+++ b/tao/DynamicInterface/DynamicInterface.mpc
@@ -0,0 +1,10 @@
+//$Id$
+
+project(DynamicInterface) : taolib, tao_output, install, messaging, minimum_corba {
+  sharedname   = TAO_DynamicInterface
+  dynamicflags += TAO_DYNAMICINTERFACE_BUILD_DLL
+
+  specific {
+    install_dir = tao/DynamicInterface
+  }
+}
diff --git a/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
index 57a453ed077..654b3caf287 100644
--- a/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ b/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "tao/DynamicInterface/Dynamic_Adapter_Impl.h"
-
-ACE_RCSID(DynamicInterface, TAO_Dynamic_Adapter_Impl, "$Id$")
-
 #include "tao/DynamicInterface/Request.h"
 #include "tao/DynamicInterface/Server_Request.h"
 #include "tao/ORB_Core.h"
diff --git a/tao/DynamicInterface/Dynamic_Implementation.cpp b/tao/DynamicInterface/Dynamic_Implementation.cpp
index b3fa6df1a91..a9495f3b888 100644
--- a/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -1,10 +1,7 @@
-#include "tao/DynamicInterface/Dynamic_Implementation.h"
-
-ACE_RCSID (DynamicInterface,
-           Dynamic_Implementation,
-           "$Id$")
-
+// -*- C++ -*-
+// $Id$
 
+#include "tao/DynamicInterface/Dynamic_Implementation.h"
 #include "tao/DynamicInterface/Server_Request.h"
 #include "tao/ORB_Core.h"
 #include "tao/TSS_Resources.h"
diff --git a/tao/DynamicInterface/ExceptionList.cpp b/tao/DynamicInterface/ExceptionList.cpp
index 74dffaef6b4..a594cf34feb 100644
--- a/tao/DynamicInterface/ExceptionList.cpp
+++ b/tao/DynamicInterface/ExceptionList.cpp
@@ -1,9 +1,6 @@
-#include "tao/DynamicInterface/ExceptionList.h"
-
-ACE_RCSID (DynamicInterface,
-           ExceptionList,
-           "$Id$")
+// $Id$
 
+#include "tao/DynamicInterface/ExceptionList.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/SystemException.h"
 
diff --git a/tao/DynamicInterface/Request.cpp b/tao/DynamicInterface/Request.cpp
index 0764f125b9c..51bc039a815 100644
--- a/tao/DynamicInterface/Request.cpp
+++ b/tao/DynamicInterface/Request.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "tao/DynamicInterface/Request.h"
-
-ACE_RCSID (DynamicInterface,
-           Request,
-           "$Id$")
-
 #include "tao/DynamicInterface/DII_Invocation_Adapter.h"
 #include "tao/DynamicInterface/DII_Arguments.h"
 #include "tao/DynamicInterface/Context.h"
@@ -156,7 +151,7 @@ CORBA::Request::invoke (void)
   // If we returned without an exception being thrown the response
   // (if any) is assumed to be received.
   this->response_received_ = true;
-  
+
   // If this request was created by a gateway, then result_
   // and/or args_ are shared by a CORBA::ServerRequest, whose
   // reply must be in the same byte order as the reply we are
diff --git a/tao/DynamicInterface/Request.inl b/tao/DynamicInterface/Request.inl
index a48debc6797..84e7880b7c0 100644
--- a/tao/DynamicInterface/Request.inl
+++ b/tao/DynamicInterface/Request.inl
@@ -62,15 +62,7 @@ CORBA::Request::contexts (void)
   return this->contexts_;
 }
 
-//// *** DEPRECATED ***  Return the <Environment> for this request.
-// ACE_INLINE CORBA::Environment *
-// CORBA::Request::env (void)
-// {
-//   return &this->env_;
-// }
-
 // The argument manipulation helper functions
-
 ACE_INLINE CORBA::Any &
 CORBA::Request::add_in_arg (void)
 {
diff --git a/tao/DynamicInterface/Server_Request.cpp b/tao/DynamicInterface/Server_Request.cpp
index 018c56c5e75..7bcc213d24d 100644
--- a/tao/DynamicInterface/Server_Request.cpp
+++ b/tao/DynamicInterface/Server_Request.cpp
@@ -3,11 +3,6 @@
 // Implementation of the Dynamic Server Skeleton Interface.
 
 #include "tao/DynamicInterface/Server_Request.h"
-
-ACE_RCSID (DynamicInterface,
-           Server_Request,
-           "$Id$")
-
 #include "tao/DynamicInterface/DII_Arguments.h"
 #include "tao/DynamicInterface/Unknown_User_Exception.h"
 #include "tao/PortableServer/Collocated_Arguments_Converter.h"
@@ -79,36 +74,41 @@ CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list)
       throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 7, CORBA::COMPLETED_NO);
     }
 
-  // In a collocated situation there will not be an incoming CDR stream 
-  // in which case we can get the arguments from the 
+  // In a collocated situation there will not be an incoming CDR stream
+  // in which case we can get the arguments from the
   // operation_details using the 'collocated argument converter'.
   if (this->orb_server_request_.collocated ())
   {
     this->params_ = list;
-    
+
     if (this->orb_server_request_.operation_details ()->cac () != 0)
       {
         TAO_OutputCDR output;
         this->orb_server_request_.operation_details ()->cac (
                 )->dsi_convert_request (this->orb_server_request_,
                                         output);
-        
+
         TAO_InputCDR input(output);
         this->params_->_tao_decode (input, CORBA::ARG_IN | CORBA::ARG_INOUT);
-      }    
+      }
   }
   else
   {
     // Save params for later use when marshaling the reply.
     this->params_ = list;
 
-    this->params_->_tao_incoming_cdr (*this->orb_server_request_.incoming (),
-                                      CORBA::ARG_IN | CORBA::ARG_INOUT,
-                                      this->lazy_evaluation_);
+    // in the case of a GIOP::LocateRequest there is no incoming CDR stream
+    // so skip any attempt to decode arguments (now or later)
+    if (this->orb_server_request_.incoming () != 0)
+    {
+      this->params_->_tao_incoming_cdr (*this->orb_server_request_.incoming (),
+                                        CORBA::ARG_IN | CORBA::ARG_INOUT,
+                                        this->lazy_evaluation_);
 
-    // Pass this alignment back to the TAO_ServerRequest.
-    this->orb_server_request_.dsi_nvlist_align (
-                                  this->params_->_tao_target_alignment ());
+      // Pass this alignment back to the TAO_ServerRequest.
+      this->orb_server_request_.dsi_nvlist_align (
+                                    this->params_->_tao_target_alignment ());
+    }
   }
 }
 
@@ -196,7 +196,7 @@ CORBA::ServerRequest::dsi_marshal (void)
                               output,
                               CORBA::ARG_INOUT | CORBA::ARG_OUT);
           }
-        
+
         TAO_InputCDR input (output);
         // set reply parameters
         this->orb_server_request_.operation_details ()->cac (
@@ -244,7 +244,12 @@ CORBA::ServerRequest::dsi_marshal (void)
       }
   }
 
-  this->orb_server_request_.tao_send_reply ();
+  // in case a deferred_reply is specified (like for GIOP::LocateRequest)
+  // do not send a reply here
+  if (!this->orb_server_request_.deferred_reply ())
+  {
+    this->orb_server_request_.tao_send_reply ();
+  }
 }
 
 void
diff --git a/tao/DynamicInterface/Unknown_User_Exception.cpp b/tao/DynamicInterface/Unknown_User_Exception.cpp
index 1208f1d64de..40baeaaed0c 100644
--- a/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -12,10 +12,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Memory.h"
 
-ACE_RCSID (DynamicInterface,
-           Unknown_User_Exception,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::UnknownUserException::UnknownUserException (void)
diff --git a/tao/ETCL/Makefile.am b/tao/ETCL/Makefile.am
deleted file mode 100644
index 71396575b51..00000000000
--- a/tao/ETCL/Makefile.am
+++ /dev/null
@@ -1,71 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-includedir = @includedir@/tao/ETCL
-pkgconfigdir = @libdir@/pkgconfig
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.TAO_ETCL.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES = libTAO_ETCL.la
-
-libTAO_ETCL_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_ETCL_BUILD_DLL
-
-libTAO_ETCL_la_SOURCES = \
-  TAO_ETCL_Constraint.cpp
-
-libTAO_ETCL_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_ETCL_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS = \
-  TAO_ETCL_Constraint.h \
-  TAO_ETCL_Constraint.inl \
-  tao_etcl_export.h
-
-pkgconfig_DATA = \
-  TAO_ETCL.pc
-
-CLEANFILES = \
-  TAO_ETCL.pc
-
-TAO_ETCL.pc: ${top_builddir}/config.status ${srcdir}/TAO_ETCL.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_ETCL.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST = \
-  TAO_ETCL.pc.in
-
-
-## 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/ETCL/TAO_ETCL.mpc b/tao/ETCL/TAO_ETCL.mpc
index c3052c206d5..754ab124bee 100644
--- a/tao/ETCL/TAO_ETCL.mpc
+++ b/tao/ETCL/TAO_ETCL.mpc
@@ -5,29 +5,6 @@ project(TAO_ETCL) : anytypecode, ace_etcl, install, tao_output {
   sharedname   = TAO_ETCL
   dynamicflags += TAO_ETCL_BUILD_DLL
 
-  IDL_Files {
-  }
-
-  Source_Files {
-    TAO_ETCL_Constraint.cpp
-  }
-
-  Header_Files {
-    TAO_ETCL_Constraint.h
-    tao_etcl_export.h
-  }
-
-  Inline_Files {
-    TAO_ETCL_Constraint.inl
-  }
-
-  Template_Files {
-  }
-
-  Pkgconfig_Files {
-    TAO_ETCL.pc.in
-  }
-
   specific {
     install_dir = tao/ETCL
   }
diff --git a/tao/ETCL/TAO_ETCL_Constraint.cpp b/tao/ETCL/TAO_ETCL_Constraint.cpp
index 59fadfe0902..46feb6fbe6c 100644
--- a/tao/ETCL/TAO_ETCL_Constraint.cpp
+++ b/tao/ETCL/TAO_ETCL_Constraint.cpp
@@ -384,9 +384,9 @@ TAO_ETCL_Literal_Constraint::operator/ (const TAO_ETCL_Literal_Constraint & rhs)
     {
     case ACE_ETCL_DOUBLE:
       {
-        if ((ACE_CDR::Double) rhs == 0.0)
+        if (ACE::is_equal ((ACE_CDR::Double) rhs, 0.0))
           return TAO_ETCL_Literal_Constraint ((ACE_CDR::Double) 0.0);
-        
+
         CORBA::Double result = (CORBA::Double) *this / (CORBA::Double) rhs;
         return TAO_ETCL_Literal_Constraint ((CORBA::Double) result);
       }
@@ -395,7 +395,7 @@ TAO_ETCL_Literal_Constraint::operator/ (const TAO_ETCL_Literal_Constraint & rhs)
       {
         if ((ACE_CDR::Long) rhs == 0)
           return TAO_ETCL_Literal_Constraint ((ACE_CDR::Long) 0);
-        
+
         CORBA::Long result = (CORBA::Long) *this / (CORBA::Long) rhs;
         return TAO_ETCL_Literal_Constraint ((CORBA::Long) result);
       }
@@ -439,12 +439,12 @@ TAO_ETCL_Literal_Constraint::widest_type (
   if (rhs_type == ACE_ETCL_COMPONENT)
     {
       const TAO_ETCL_Literal_Constraint& actual =
-        dynamic_cast<const TAO_ETCL_Literal_Constraint&> (rhs);   
+        dynamic_cast<const TAO_ETCL_Literal_Constraint&> (rhs);
       CORBA::TypeCode_var tc = actual.any_->type ();
       rhs_type = TAO_ETCL_Literal_Constraint::comparable_type (tc.in ());
       return return_value;
     }
-    
+
   return this->ETCL_Literal_Constraint::widest_type (rhs);
 }
 
diff --git a/tao/EndpointPolicy.mpc b/tao/EndpointPolicy.mpc
deleted file mode 100644
index 45b0cea0152..00000000000
--- a/tao/EndpointPolicy.mpc
+++ /dev/null
@@ -1,69 +0,0 @@
-//$Id$
-project(*core_idl) : tao_versioning_idl_defaults {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -GA -SS -Sci -Sorb \
-                -Wb,export_macro=TAO_EndpointPolicy_Export \
-                -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h \
-                -o EndpointPolicy
-    idlflags -= -Sa -St
-    EndpointPolicy/EndpointPolicy.pidl
-    EndpointPolicy/IIOPEndpointValue.pidl
-    EndpointPolicy/EndpointPolicyType.pidl
-  }
-}
-
-project(EndpointPolicy) : taolib, tao_output, install, portableserver, pi, taoidldefaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  after       += *core_idl
-  sharedname   = TAO_EndpointPolicy
-  dynamicflags += TAO_ENDPOINTPOLICY_BUILD_DLL
-
-  Source_Files {
-    EndpointPolicy
-  }
-
-  Source_Files {
-    EndpointPolicy/EndpointPolicyC.cpp
-    EndpointPolicy/IIOPEndpointValueC.cpp
-    EndpointPolicy/EndpointPolicyTypeC.cpp
-    EndpointPolicy/EndpointPolicyA.cpp
-    EndpointPolicy/EndpointPolicyTypeA.cpp
-    EndpointPolicy/IIOPEndpointValueA.cpp
-  }
-
-  Header_Files {
-    EndpointPolicy
-    EndpointPolicy/EndpointPolicyC.h
-    EndpointPolicy/EndpointPolicyS.h
-    EndpointPolicy/EndpointPolicyA.h
-    EndpointPolicy/IIOPEndpointValueC.h
-    EndpointPolicy/IIOPEndpointValueS.h
-    EndpointPolicy/IIOPEndpointValueA.h
-    EndpointPolicy/EndpointPolicyTypeC.h
-    EndpointPolicy/EndpointPolicyTypeS.h
-    EndpointPolicy/EndpointPolicyTypeA.h
-  }
-
-  Inline_Files {
-    EndpointPolicy
-  }
-
-  Template_Files {
-    EndpointPolicy
-  }
-
-  Resource_Files {
-    EndpointPolicy
-  }
-
-  PIDL_Files {
-    EndpointPolicy
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    EndpointPolicy/TAO_EndpointPolicy.pc.in
-  }
-}
diff --git a/tao/EndpointPolicy/EndpointPolicy.cpp b/tao/EndpointPolicy/EndpointPolicy.cpp
index f1b7ccbdec7..c805449278d 100644
--- a/tao/EndpointPolicy/EndpointPolicy.cpp
+++ b/tao/EndpointPolicy/EndpointPolicy.cpp
@@ -1,4 +1,5 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/EndpointPolicy/EndpointPolicy.h"
 #include "tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h"
@@ -9,8 +10,6 @@
 
 #include "tao/PI/PI.h"
 
-ACE_RCSID (EndpointPolicy, EndpointPolicy, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/tao/EndpointPolicy/EndpointPolicy.mpc b/tao/EndpointPolicy/EndpointPolicy.mpc
new file mode 100644
index 00000000000..297c2c36364
--- /dev/null
+++ b/tao/EndpointPolicy/EndpointPolicy.mpc
@@ -0,0 +1,51 @@
+//$Id$
+project(*core_idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -GA -SS -Sci -Sorb \
+                -Wb,export_macro=TAO_EndpointPolicy_Export \
+                -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h \
+                -iC tao/EndpointPolicy
+    idlflags -= -Sa -St
+    EndpointPolicy.pidl
+    IIOPEndpointValue.pidl
+    EndpointPolicyType.pidl
+  }
+
+  specific {
+    install_dir = tao/EndpointPolicy
+  }
+}
+
+project(EndpointPolicy) : taolib, tao_output, install, portableserver, pi, taoidldefaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  after       += *core_idl
+  sharedname   = TAO_EndpointPolicy
+  dynamicflags += TAO_ENDPOINTPOLICY_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    EndpointPolicyC.cpp
+    IIOPEndpointValueC.cpp
+    EndpointPolicyTypeC.cpp
+    EndpointPolicyA.cpp
+    EndpointPolicyTypeA.cpp
+    IIOPEndpointValueA.cpp
+  }
+
+  Header_Files {
+    *.h
+    EndpointPolicyC.h
+    EndpointPolicyS.h
+    EndpointPolicyA.h
+    IIOPEndpointValueC.h
+    IIOPEndpointValueS.h
+    IIOPEndpointValueA.h
+    EndpointPolicyTypeC.h
+    EndpointPolicyTypeS.h
+    EndpointPolicyTypeA.h
+  }
+
+  specific {
+    install_dir = tao/EndpointPolicy
+  }
+}
diff --git a/tao/EndpointPolicy/EndpointPolicyType.pidl b/tao/EndpointPolicy/EndpointPolicyType.pidl
index 6cd707fa432..aebccafb371 100644
--- a/tao/EndpointPolicy/EndpointPolicyType.pidl
+++ b/tao/EndpointPolicy/EndpointPolicyType.pidl
@@ -5,16 +5,6 @@
  * @file EndpointPolicyType.pidl
  *
  * This file contains idl definition for EndpointPolicy type.
- *
- * This file is used to generate the code in
- * EndpointPolicyTypeC.* The command used to generate code is:
- * tao_idl
- *          -o orig -GA \
- *          -Wb,export_macro=TAO_EndpointPolicy_Export \
- *          -Wb,export_include="tao/EndpointPolicy/TAO_EndpointPolicy_Export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          EndpointPolicyType.pidl
  */
 
 #ifndef _TAO_ENDPOINT_POLICY_TYPE_IDL_
diff --git a/tao/EndpointPolicy/EndpointPolicy_Factory.cpp b/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
index baa57006a0c..2f9a9003500 100644
--- a/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
+++ b/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
@@ -1,9 +1,7 @@
-// @(#) $Id$
-#include "tao/EndpointPolicy/EndpointPolicy_Factory.h"
+// -*- C++ -*-
+// $Id$
 
-ACE_RCSID (EndpointPolicy,
-           EndpointPolicy_Factory,
-           "$Id$")
+#include "tao/EndpointPolicy/EndpointPolicy_Factory.h"
 
 #include "tao/EndpointPolicy/EndpointPolicy_i.h"
 #include "tao/EndpointPolicy/EndpointPolicyA.h"
@@ -20,7 +18,6 @@ ACE_RCSID (EndpointPolicy,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-
 TAO_EndpointPolicy_Factory::TAO_EndpointPolicy_Factory (TAO_ORB_Core * orb_core)
   : orb_core_ (orb_core)
 {
diff --git a/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp b/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
index 3a60e15a0f0..3f77a792301 100644
--- a/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
+++ b/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
@@ -7,10 +7,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfo.h"
 
-ACE_RCSID (EndpointPolicy,
-           EndpointPolicy_ORBInitializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/tao/EndpointPolicy/EndpointPolicy_i.cpp b/tao/EndpointPolicy/EndpointPolicy_i.cpp
index 9c0b57706e8..ee5b1837fc5 100644
--- a/tao/EndpointPolicy/EndpointPolicy_i.cpp
+++ b/tao/EndpointPolicy/EndpointPolicy_i.cpp
@@ -3,10 +3,6 @@
 #include "tao/EndpointPolicy/EndpointPolicy_i.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (EndpointPolicy,
-           EndpointPolicy_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EndpointPolicy_i::TAO_EndpointPolicy_i (const EndpointPolicy::EndpointList &value)
diff --git a/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp b/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
index a28f38e0580..c90af733458 100644
--- a/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
+++ b/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
@@ -1,4 +1,5 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/EndpointPolicy/Endpoint_Acceptor_Filter.h"
 #include "tao/EndpointPolicy/EndpointPolicyC.h"
@@ -9,11 +10,6 @@
 #include "tao/Profile.h"
 #include "tao/Endpoint.h"
 
-ACE_RCSID(EndpointPolicy,
-          Endpoint_Acceptor_Filter,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Endpoint_Acceptor_Filter::TAO_Endpoint_Acceptor_Filter (const EndpointPolicy::EndpointList & eps)
diff --git a/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h b/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h
index 5eea21c1e1b..e4f27db478c 100644
--- a/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h
+++ b/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- *  Subclass of TAO_Default_Acceptor_Filter that populates mprofile and filters 
+ *  Subclass of TAO_Default_Acceptor_Filter that populates mprofile and filters
  *  mprofile with the endpoint policy in TAO_POA_Manager.
  *
  *  @author  Yan Dai <dai_y@ociweb.com>
@@ -48,7 +48,7 @@ class TAO_EndpointPolicy_Export TAO_Endpoint_Acceptor_Filter
 public:
   TAO_Endpoint_Acceptor_Filter (const EndpointPolicy::EndpointList & eps);
 
-  /// Populate @a mprofile with endpoints match the POAManager endpoint 
+  /// Populate @a mprofile with endpoints match the POAManager endpoint
   /// policy.
   int fill_profile (const TAO::ObjectKey &object_key,
                     TAO_MProfile &mprofile,
diff --git a/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp b/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
index 561b045e96f..12d8ddf9a20 100644
--- a/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
+++ b/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
@@ -1,4 +1,5 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h"
 #include "tao/EndpointPolicy/Endpoint_Acceptor_Filter.h"
@@ -6,11 +7,6 @@
 #include "tao/PortableServer/POAManager.h"
 #include "tao/EndpointPolicy/EndpointPolicyC.h"
 
-ACE_RCSID(EndpointPolicy,
-          Endpoint_Acceptor_Filter_Factory,
-          "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
@@ -33,7 +29,7 @@ TAO_Endpoint_Acceptor_Filter_Factory::~TAO_Endpoint_Acceptor_Filter_Factory(void
           EndpointPolicy::Policy_var cur_policy = EndpointPolicy::Policy::_narrow (policies[i]);
           if (CORBA::is_nil (cur_policy.in ()))
             return 0;
-          
+
           EndpointPolicy::EndpointList_var cur_endpoints = cur_policy->value ();
           CORBA::ULong cur_num_endpoints = cur_endpoints->length ();
 
diff --git a/tao/EndpointPolicy/IIOPEndpointValue_i.cpp b/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
index 40397b106c9..df661b189a8 100644
--- a/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
+++ b/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/EndpointPolicy/IIOPEndpointValue_i.h"
 
@@ -8,10 +9,6 @@
 #include "tao/IIOP_Acceptor.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (IIOPEndpointValue,
-           IIOPEndpointValue_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 IIOPEndpointValue_i::IIOPEndpointValue_i ()
diff --git a/tao/Endpoint_Selector_Factory.h b/tao/Endpoint_Selector_Factory.h
index f1ec4f0a3eb..3f86f7f97b6 100644
--- a/tao/Endpoint_Selector_Factory.h
+++ b/tao/Endpoint_Selector_Factory.h
@@ -46,7 +46,7 @@ class TAO_Invocation_Endpoint_Selector;
  * @brief Factory for initializing <Endpoint_Selection_State> and
  * obtaining appropriate <Invocation_Endpoint_Selector>.
  *
- * Used by Invocation classes to intialize its endpoint selection
+ * Used by Invocation classes to initialize its endpoint selection
  * strategy and state based on the effective policies.
  * Endpoint selection strategies are stateless objects - all the
  * state they need is contained by Invocation in
diff --git a/tao/Environment.cpp b/tao/Environment.cpp
index 421c9178ffe..347f302c616 100644
--- a/tao/Environment.cpp
+++ b/tao/Environment.cpp
@@ -56,7 +56,7 @@ CORBA::Environment::~Environment (void)
   this->clear ();
 
   // If previous is 0 then this is the first Environment, allocated
-  // with the ORB, it shouldn't try to pop because the ORB is beign
+  // with the ORB, it shouldn't try to pop because the ORB is being
   // destroyed also.
   if (this->previous_ != 0)
     TAO_ORB_Core_instance ()->default_environment (this->previous_);
@@ -100,7 +100,6 @@ CORBA::Environment::clear (void)
 CORBA::Environment&
 CORBA::Environment::default_environment ()
 {
-  //
   // If we are using native C++ exceptions the user is *not* supposed
   // to clear the environment every time she calls into TAO.  In fact
   // the user is not supposed to use the environment at all!
@@ -113,7 +112,6 @@ CORBA::Environment::default_environment ()
   // This is not an issue when using the alternative C++ mapping (with
   // the Environment argument) because then the user is supposed to
   // clear the environment before calling into the ORB.
-  //
   TAO_ORB_Core_instance ()->default_environment ()->clear ();
 
   return TAO_default_environment ();;
diff --git a/tao/Environment.h b/tao/Environment.h
index c2b51ce77b7..7e190d3fb3b 100644
--- a/tao/Environment.h
+++ b/tao/Environment.h
@@ -102,7 +102,7 @@ namespace CORBA
      */
     CORBA::Exception* exception (void) const;
 
-    /// Set the contained CORBA::Exception to <ex>
+    /// Set the contained CORBA::Exception to @a ex
     /**
      * CORBA::Environment assumes ownership of the exception, this is
      * contrary to the normal memory management rules in the C++
@@ -126,8 +126,7 @@ namespace CORBA
 
     /// Print the exception to output determined by f.  This function
     /// is not CORBA compliant.
-    void print_exception (const char *info,
-                          FILE *f=stdout) const;
+    void print_exception (const char *info, FILE *f=stdout) const;
 
     // = Obtain a default environment to use with TAO.
     static CORBA::Environment &default_environment (void);
@@ -140,7 +139,7 @@ namespace CORBA
   private:
 
     /// Initialize using a well known ORB Core; this is intended for
-    /// the bootstraping of the ORB_Core, not for general
+    /// the bootstrapping of the ORB_Core, not for general
     /// consumption.
     Environment (TAO_ORB_Core *orb_core);
 
@@ -150,7 +149,7 @@ namespace CORBA
     /// The previous environment on the "default environment stack".
     Environment *previous_;
   };
-  
+
   template<>
   inline void release (Environment_ptr env)
   {
diff --git a/tao/Exception.cpp b/tao/Exception.cpp
index ad8e979666b..99066477aa2 100644
--- a/tao/Exception.cpp
+++ b/tao/Exception.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Exception.h"
diff --git a/tao/Exception.h b/tao/Exception.h
index 2c47324aac2..1e4f6575d15 100644
--- a/tao/Exception.h
+++ b/tao/Exception.h
@@ -189,7 +189,7 @@ namespace CORBA
     /// Assignment operator.
     Exception & operator = (const Exception & src);
 
-    /// Construct from a respository id.
+    /// Construct from a repository id.
     Exception (const char *repository_id, const char *local_name);
 
   private:
diff --git a/tao/Exclusive_TMS.cpp b/tao/Exclusive_TMS.cpp
index 3d5f604cbb7..4a95529e3d1 100644
--- a/tao/Exclusive_TMS.cpp
+++ b/tao/Exclusive_TMS.cpp
@@ -116,7 +116,7 @@ TAO_Exclusive_TMS::reply_timed_out (CORBA::ULong request_id)
       // did not find the right reply handler.
       return 0;
     }
-  
+
   ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd (this->rd_.get ());
   this->request_id_ = 0; // @@ What is a good value???
   this->rd_.release ();
@@ -136,7 +136,7 @@ bool
 TAO_Exclusive_TMS::idle_after_reply (void)
 {
   // Irrespective of whether we are successful or not we need to
-  // return true. If *this* class is not successfull in idling the
+  // return true. If *this* class is not successful in idling the
   // transport no one can.
   if (this->transport_ != 0)
     (void) this->transport_->make_idle ();
diff --git a/tao/Fault_Tolerance_Service.cpp b/tao/Fault_Tolerance_Service.cpp
index cee4f82a00a..a6db441e026 100644
--- a/tao/Fault_Tolerance_Service.cpp
+++ b/tao/Fault_Tolerance_Service.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Fault_Tolerance_Service.h"
 #include "tao/Services_Activate.h"
 #include "tao/ORB_Core.h"
diff --git a/tao/Fault_Tolerance_Service.h b/tao/Fault_Tolerance_Service.h
index db12a2286a3..6ec6d6ae123 100644
--- a/tao/Fault_Tolerance_Service.h
+++ b/tao/Fault_Tolerance_Service.h
@@ -49,7 +49,7 @@ public:
   /// Dtor
   ~TAO_Fault_Tolerance_Service (void);
 
-  /// Initialise the internal data structures
+  /// Initialize the internal data structures
   void init (TAO_ORB_Core *orb_core);
 
   /// Return the underlying callback object
diff --git a/tao/FlResource.mpc b/tao/FlResource.mpc
deleted file mode 100644
index 2ea160ffee7..00000000000
--- a/tao/FlResource.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-//  -*- MPC -*- now wouldn't this be cool...
-// $Id$
-
-project(TAO_FlResource) : acelib, taolib, install, tao_output, taodefaults, ace_flreactor, taoidldefaults {
-
-  sharedname   = TAO_FlResource
-  dynamicflags += TAO_FLRESOURCE_BUILD_DLL
-
-  Source_Files {
-    FlResource
-  }
-
-  Header_Files {
-    FlResource
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-
-  IDL_Files {
-  }
-}
diff --git a/tao/FlResource/FlResource.mpc b/tao/FlResource/FlResource.mpc
new file mode 100644
index 00000000000..28b64311268
--- /dev/null
+++ b/tao/FlResource/FlResource.mpc
@@ -0,0 +1,11 @@
+//  -*- MPC -*- now wouldn't this be cool...
+// $Id$
+
+project(TAO_FlResource) : acelib, taolib, install, tao_output, taodefaults, ace_flreactor, taoidldefaults {
+  sharedname   = TAO_FlResource
+  dynamicflags += TAO_FLRESOURCE_BUILD_DLL
+
+  specific {
+    install_dir = tao/FlResource
+  }
+}
diff --git a/tao/FlResource/FlResource_Factory.cpp b/tao/FlResource/FlResource_Factory.cpp
index 7e7ade6231d..813e88cd156 100644
--- a/tao/FlResource/FlResource_Factory.cpp
+++ b/tao/FlResource/FlResource_Factory.cpp
@@ -1,13 +1,10 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/FlResource/FlResource_Factory.h"
 #include "tao/debug.h"
 #include "ace/FlReactor/FlReactor.h"
 
-ACE_RCSID( TAO_FlResource,
-           FlResource_Factory,
-           "$Id$");
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/FlResource/FlResource_Loader.cpp b/tao/FlResource/FlResource_Loader.cpp
index f004941bddb..5bd6a04bfdd 100644
--- a/tao/FlResource/FlResource_Loader.cpp
+++ b/tao/FlResource/FlResource_Loader.cpp
@@ -1,12 +1,10 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
+
 #include "tao/FlResource/FlResource_Loader.h"
 #include "tao/ORB_Core.h"
 #include "tao/FlResource/FlResource_Factory.h"
 
-ACE_RCSID( TAO_FlResource,
-           FlResource_Loader,
-           "$Id$");
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/FloatSeq.pidl b/tao/FloatSeq.pidl
index 4da2570cbd2..3a7b7b5f429 100644
--- a/tao/FloatSeq.pidl
+++ b/tao/FloatSeq.pidl
@@ -1,26 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-/**
- *   This file is used to generate the code in FloatSeqC.*
- *   The command used to generate code is:
- *
- *     tao_idl
- *          -oA AnyTypeCode
- *          -GA -SS -Sci
- *          -Wb,pre_include=ace/pre.h
- *          -Wb,post_include=ace/post.h
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=tao/TAO_Export.h
- *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
- *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
- *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
- *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
- *          FloatSeq.pidl
- */
-
-
 #ifndef TAO_CORBA_FLOAT_SEQ_IDL
 #define TAO_CORBA_FLOAT_SEQ_IDL
 
diff --git a/tao/Flushing_Strategy.h b/tao/Flushing_Strategy.h
index 4bcab3d5589..c9683cb5069 100644
--- a/tao/Flushing_Strategy.h
+++ b/tao/Flushing_Strategy.h
@@ -68,7 +68,7 @@ public:
   /// Cancel all scheduled output for the transport argument
   virtual int cancel_output (TAO_Transport *transport) = 0;
 
-  /// Wait until msg is sent out.  Potentially other messages are
+  /// Wait until @a msg is sent out.  Potentially other messages are
   /// flushed too, for example, because there are ahead in the queue.
   virtual int flush_message (TAO_Transport *transport,
                              TAO_Queued_Message *msg,
diff --git a/tao/FoxResource.mpc b/tao/FoxResource.mpc
deleted file mode 100644
index 003be73e201..00000000000
--- a/tao/FoxResource.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-//  -*- MPC -*- now wouldn't this be cool...
-// $Id$
-
-project(TAO_FoxResource) : acelib, taolib, install, tao_output, taodefaults, ace_foxreactor, taoidldefaults {
-
-  sharedname   = TAO_FoxResource
-  dynamicflags += TAO_FOCRESOURCE_BUILD_DLL
-
-  Source_Files {
-    FoxResource
-  }
-
-  Header_Files {
-    FoxResource
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-
-  IDL_Files {
-  }
-}
diff --git a/tao/FoxResource/FoxResource.mpc b/tao/FoxResource/FoxResource.mpc
new file mode 100644
index 00000000000..7c520646455
--- /dev/null
+++ b/tao/FoxResource/FoxResource.mpc
@@ -0,0 +1,11 @@
+//  -*- MPC -*- now wouldn't this be cool...
+// $Id$
+
+project(TAO_FoxResource) : acelib, taolib, install, tao_output, taodefaults, ace_foxreactor, taoidldefaults {
+  sharedname   = TAO_FoxResource
+  dynamicflags += TAO_FOCRESOURCE_BUILD_DLL
+
+  specific {
+    install_dir = tao/FoxResource
+  }
+}
diff --git a/tao/FoxResource/FoxResource_Factory.cpp b/tao/FoxResource/FoxResource_Factory.cpp
index 14a126aa169..e4bd6cb5a9d 100644
--- a/tao/FoxResource/FoxResource_Factory.cpp
+++ b/tao/FoxResource/FoxResource_Factory.cpp
@@ -4,11 +4,6 @@
 #include "tao/debug.h"
 #include "ace/FoxReactor/FoxReactor.h"
 
-ACE_RCSID( TAO_FoxResource,
-           FoxResource_Factory,
-           "$Id$");
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/FoxResource/FoxResource_Loader.cpp b/tao/FoxResource/FoxResource_Loader.cpp
index 927e3338ec5..31be07916ba 100644
--- a/tao/FoxResource/FoxResource_Loader.cpp
+++ b/tao/FoxResource/FoxResource_Loader.cpp
@@ -1,13 +1,9 @@
 //$Id$
+
 #include "tao/FoxResource/FoxResource_Loader.h"
 #include "tao/ORB_Core.h"
 #include "tao/FoxResource/FoxResource_Factory.h"
 
-ACE_RCSID( TAO_FoxResource,
-           FoxResource_Loader,
-           "$Id$");
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/GIOP_Message_Base.cpp b/tao/GIOP_Message_Base.cpp
index 1fd19e2fbef..31031796e91 100644
--- a/tao/GIOP_Message_Base.cpp
+++ b/tao/GIOP_Message_Base.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/GIOP_Message_Base.h"
@@ -684,8 +685,12 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
     }
 #endif
   if (TAO_debug_level > 9)
-    { //due to alignment data block has an offset which needs to be corrected
-      this->dump_msg ("recv",
+    {
+      char buf[48];
+      ACE_OS::sprintf (buf, "Transport[" ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "] recv",
+                       transport->id ());
+      //due to alignment data block has an offset which needs to be corrected
+      this->dump_msg (buf,
                       reinterpret_cast <u_char *> (db->base () + rd_pos - TAO_GIOP_MESSAGE_HEADER_LEN),
                       db->size ()  + rd_pos - TAO_GIOP_MESSAGE_HEADER_LEN);
     }
@@ -796,7 +801,10 @@ TAO_GIOP_Message_Base::process_reply_message (
 #endif
   if (TAO_debug_level > 9)
     {
-      this->dump_msg ("recv",
+      char buf[48];
+      ACE_OS::sprintf (buf, "Transport[" ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "] recv",
+                       params.transport_->id ());
+      this->dump_msg (buf,
                       reinterpret_cast <u_char *> (db->base () + rd_pos - TAO_GIOP_MESSAGE_HEADER_LEN),
                       db->size ()  + rd_pos - TAO_GIOP_MESSAGE_HEADER_LEN);
     }
diff --git a/tao/GIOP_Message_Base.h b/tao/GIOP_Message_Base.h
index 527be65126c..2c3973ecdcc 100644
--- a/tao/GIOP_Message_Base.h
+++ b/tao/GIOP_Message_Base.h
@@ -56,7 +56,7 @@ public:
                          TAO_Transport * transport,
                          size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE);
 
-  /// Dtor
+  /// Destructor
   ~TAO_GIOP_Message_Base (void);
 
   /// Initialize the underlying state object based on the @a major and
@@ -64,7 +64,7 @@ public:
   void init (CORBA::Octet major, CORBA::Octet minor);
 
   /// Write the RequestHeader in to the @a cdr stream. The underlying
-  /// implementation of the mesaging should do the right thing.
+  /// implementation of the messaging should do the right thing.
   int generate_request_header (TAO_Operation_Details &op,
                                TAO_Target_Specification &spec,
                                TAO_OutputCDR &cdr);
@@ -83,7 +83,7 @@ public:
   int generate_fragment_header (TAO_OutputCDR & cdr, CORBA::ULong request_id);
 
   /// Format the message. As we have not written the message length in
-  /// the header, we make use of this oppurtunity to insert and format
+  /// the header, we make use of this opportunity to insert and format
   /// the message.
   int format_message (TAO_OutputCDR &cdr, TAO_Stub* stub);
 
@@ -131,12 +131,12 @@ public:
   TAO_OutputCDR &out_stream (void);
 
   /// Consolidate fragmented message with associated fragments, being
-  /// stored withi this class.  If reliable transport is used (like
-  /// TCP) fragments are partialy ordered on stack, last fragment on
+  /// stored within this class.  If reliable transport is used (like
+  /// TCP) fragments are partially ordered on stack, last fragment on
   /// top. Otherwise If un-reliable transport is used (like UDP)
   /// fragments may be dis-ordered, and must be ordered before
   /// consolidation.  @return 0 on success and @a msg points to
-  /// consolidated message, 1 if there are still fragmens outstanding,
+  /// consolidated message, 1 if there are still fragments outstanding,
   /// in case of error -1 is being returned. In any case @a qd must be
   /// released by method implementation.
   int consolidate_fragmented_message (TAO_Queued_Data *qd,
@@ -144,7 +144,7 @@ public:
 
   /// Discard all fragments associated to request-id encoded in
   /// cancel_request.  This operation will never be called
-  /// concurrently by multiplpe threads nor concurrently to
+  /// concurrently by multiple threads nor concurrently to
   /// consolidate_fragmented_message @return -1 on failure, 0 on
   /// success, 1 no fragment on stack relating to CancelRequest.
   int discard_fragmented_message (const TAO_Queued_Data *cancel_request);
@@ -160,12 +160,11 @@ private:
 #if defined (TAO_HAS_ZIOP) && TAO_HAS_ZIOP ==1
   /// Decompresses a ZIOP message and turns it into a GIOP message
   /// When decompressed, db contains a complete new ACE_Data_Block and
-  /// therefore qd its data block is alse replaced.
+  /// therefore qd its data block is also replaced.
   bool decompress (ACE_Data_Block **db, TAO_Queued_Data& qd,
                    size_t& rd_pos, size_t& wr_pos);
 #endif
 
-
   /// Processes the GIOP_REQUEST messages
   int process_request (TAO_Transport *transport,
                        TAO_InputCDR &input,
diff --git a/tao/GIOP_Message_Generator_Parser.cpp b/tao/GIOP_Message_Generator_Parser.cpp
index 6f7e3636df4..ef455e37fc5 100644
--- a/tao/GIOP_Message_Generator_Parser.cpp
+++ b/tao/GIOP_Message_Generator_Parser.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/GIOP_Message_Generator_Parser.h"
diff --git a/tao/GIOP_Message_Generator_Parser.h b/tao/GIOP_Message_Generator_Parser.h
index e8530618860..8f49cbf728e 100644
--- a/tao/GIOP_Message_Generator_Parser.h
+++ b/tao/GIOP_Message_Generator_Parser.h
@@ -83,7 +83,7 @@ public:
   /// version specific parsing of the incoming Request header
   virtual int parse_request_header (TAO_ServerRequest &) = 0;
 
-  /// Parse the Loacte Request Header from the incoming stream. This will do a
+  /// Parse the Locate Request Header from the incoming stream. This will do a
   /// version specific parsing of the incoming Request header
   virtual int parse_locate_header (TAO_GIOP_Locate_Request_Header &) = 0;
 
diff --git a/tao/GIOP_Message_Generator_Parser_10.cpp b/tao/GIOP_Message_Generator_Parser_10.cpp
index 9734166b7e5..6af5960cfb2 100644
--- a/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/GIOP_Message_Generator_Parser_10.h"
 #include "tao/GIOP_Utils.h"
diff --git a/tao/GIOP_Message_Generator_Parser_10.h b/tao/GIOP_Message_Generator_Parser_10.h
index df932b4a9f2..b40f13b00ed 100644
--- a/tao/GIOP_Message_Generator_Parser_10.h
+++ b/tao/GIOP_Message_Generator_Parser_10.h
@@ -45,22 +45,18 @@ public:
   virtual bool write_locate_request_header (
       CORBA::ULong request_id,
       TAO_Target_Specification &spec,
-      TAO_OutputCDR &msg
-    );
+      TAO_OutputCDR &msg);
 
   /// Write the reply header in to @a output
   virtual bool write_reply_header (
       TAO_OutputCDR &output,
-      TAO_Pluggable_Reply_Params_Base &reply
-
-    );
+      TAO_Pluggable_Reply_Params_Base &reply);
 
   /// Writes the locate _reply message in to the @a output
   virtual bool write_locate_reply_mesg (
       TAO_OutputCDR &output,
       CORBA::ULong request_id,
-      TAO_GIOP_Locate_Status_Msg &status
-    );
+      TAO_GIOP_Locate_Status_Msg &status);
 
   virtual bool write_fragment_header (TAO_OutputCDR & cdr,
                                       CORBA::ULong request_id);
@@ -72,8 +68,7 @@ public:
   /// Parse the LocateRequest Header from the incoming stream. This will do a
   /// version specific parsing of the incoming Request header
   virtual int parse_locate_header (
-      TAO_GIOP_Locate_Request_Header &
-    );
+      TAO_GIOP_Locate_Request_Header &);
 
   /// Parse the reply message from the server
   virtual int parse_reply (TAO_InputCDR &input,
diff --git a/tao/GIOP_Message_Generator_Parser_11.cpp b/tao/GIOP_Message_Generator_Parser_11.cpp
index 98a3b89d501..1d5e742d0e3 100644
--- a/tao/GIOP_Message_Generator_Parser_11.cpp
+++ b/tao/GIOP_Message_Generator_Parser_11.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/GIOP_Message_Generator_Parser_11.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/GIOP_Message_Generator_Parser_11.h b/tao/GIOP_Message_Generator_Parser_11.h
index 324a23b032c..d3a708ac4e9 100644
--- a/tao/GIOP_Message_Generator_Parser_11.h
+++ b/tao/GIOP_Message_Generator_Parser_11.h
@@ -36,7 +36,6 @@ class TAO_GIOP_Message_Generator_Parser_11
   : public TAO_GIOP_Message_Generator_Parser_10
 {
 public:
-
   /// Our minor version
   virtual CORBA::Octet minor_version (void) const;
 
diff --git a/tao/GIOP_Message_Generator_Parser_12.cpp b/tao/GIOP_Message_Generator_Parser_12.cpp
index d4003bb3ca5..ac6e182fba6 100644
--- a/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/GIOP_Message_Generator_Parser_12.h"
 #include "tao/GIOPC.h"
 #include "tao/GIOP_Utils.h"
diff --git a/tao/GIOP_Message_Generator_Parser_Impl.cpp b/tao/GIOP_Message_Generator_Parser_Impl.cpp
index e267668e10b..10e59dcc1e3 100644
--- a/tao/GIOP_Message_Generator_Parser_Impl.cpp
+++ b/tao/GIOP_Message_Generator_Parser_Impl.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/GIOP_Message_Generator_Parser_Impl.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/tao/GIOP_Message_Generator_Parser_Impl.h b/tao/GIOP_Message_Generator_Parser_Impl.h
index 638139b7e6c..ab48fd4f4bc 100644
--- a/tao/GIOP_Message_Generator_Parser_Impl.h
+++ b/tao/GIOP_Message_Generator_Parser_Impl.h
@@ -34,10 +34,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  *  This class can be done away with if we want to use the svc.conf
  *  file to load the right GIOP protocol. But that would require some
- *  work as we need to make sure that we have the behaviours of lower
+ *  work as we need to make sure that we have the behavior of lower
  *  versions in the higher versions.
  */
-
 class TAO_GIOP_Message_Generator_Parser_Impl
 {
 public:
diff --git a/tao/GIOP_Message_State.h b/tao/GIOP_Message_State.h
index 5e631805c18..8d08d93d423 100644
--- a/tao/GIOP_Message_State.h
+++ b/tao/GIOP_Message_State.h
@@ -41,7 +41,7 @@ class TAO_Export TAO_GIOP_Message_State
 {
 public:
 
-  /// Ctor
+  /// Constructor
   TAO_GIOP_Message_State (void);
 
   /// Parse the message header.
@@ -79,7 +79,7 @@ private:
   /// Parse the message header.
   int parse_message_header_i (ACE_Message_Block &incoming);
 
-  /// Checks for the magic word 'GIOP' in the start of the incoing
+  /// Checks for the magic word 'GIOP' in the start of the incoming
   /// stream
   int parse_magic_bytes (char *buf);
 
diff --git a/tao/GIOP_Message_Version.cpp b/tao/GIOP_Message_Version.cpp
index ea1f82343a8..96de7723086 100644
--- a/tao/GIOP_Message_Version.cpp
+++ b/tao/GIOP_Message_Version.cpp
@@ -1,4 +1,6 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
+
 # include "tao/GIOP_Message_Version.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/tao/GIOP_Utils.h b/tao/GIOP_Utils.h
index 00e8f9c41de..c0b273a3e12 100644
--- a/tao/GIOP_Utils.h
+++ b/tao/GIOP_Utils.h
@@ -45,7 +45,7 @@ public:
   /// TAO_GIOP_OBJECT_FORWARD
   CORBA::Object_var forward_location_var;
 
-  /// Stype of Locate status message
+  /// Type of Locate status message
   GIOP::LocateStatusType status;
 };
 
diff --git a/tao/GUIResource_Factory.h b/tao/GUIResource_Factory.h
index e0f2dab0543..5e217483fd7 100644
--- a/tao/GUIResource_Factory.h
+++ b/tao/GUIResource_Factory.h
@@ -71,7 +71,7 @@ namespace TAO
     /**
      * Create or return current reactor instance.
      * Please note that this call is NOT synchronized. Left to the
-     * get_reactor to synchronize access.
+     * get_reactor() to synchronize access.
      */
     virtual ACE_Reactor_Impl *reactor_impl (void) = 0;
 
diff --git a/tao/Generic_Sequence_T.h b/tao/Generic_Sequence_T.h
index c29dcf9ee22..7b24c0e297c 100644
--- a/tao/Generic_Sequence_T.h
+++ b/tao/Generic_Sequence_T.h
@@ -1,7 +1,7 @@
 #ifndef guard_generic_sequence_hpp
 #define guard_generic_sequence_hpp
 /**
- * @file
+ * @file Generic_Sequence_T.h
  *
  * @brief Implement the generic version of CORBA sequences.
  *
diff --git a/tao/HTTP_Handler.cpp b/tao/HTTP_Handler.cpp
index f0fb1a56425..fab1fe5d253 100644
--- a/tao/HTTP_Handler.cpp
+++ b/tao/HTTP_Handler.cpp
@@ -91,7 +91,9 @@ TAO_HTTP_Reader::send_request (void)
     ACE_ERROR_RETURN((LM_ERROR,"TAO (%P|%t) - HTTP_Reader::send_request, request too large!"), -1);
 
   // Create a message to send to the server requesting retrieval of the file
-  int const len = ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_, filename_, request_suffix_);
+  int const len = ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_,
+                                   ACE_TEXT_ALWAYS_CHAR (filename_),
+                                   request_suffix_);
 
   // Send the message to server
   if (peer ().send_n (mesg, len) != len)
diff --git a/tao/IFR_Client.mpc b/tao/IFR_Client.mpc
deleted file mode 100644
index 0c782d485d8..00000000000
--- a/tao/IFR_Client.mpc
+++ /dev/null
@@ -1,75 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults, install {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -SS -GX \
-                -Wb,stub_export_macro=TAO_IFR_Client_Export \
-                -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h \
-                -o IFR_Client
-    idlflags -= -Sa -St
-    IFR_Client/IFR_Base.pidl
-    IFR_Client/IFR_Basic.pidl
-    IFR_Client/IFR_Components.pidl
-    IFR_Client/IFR_Extended.pidl
-  }
-}
-
-project(IFR_Client) : taolib, tao_output, install, anytypecode, taoidldefaults {
-  after       += *idl
-  sharedname   = TAO_IFR_Client
-  dynamicflags += TAO_IFR_CLIENT_BUILD_DLL
-
-  Source_Files {
-    IFR_Client
-  }
-
-  Source_Files {
-    IFR_Client/IFR_BaseC.cpp
-    IFR_Client/IFR_BasicC.cpp
-    IFR_Client/IFR_ComponentsC.cpp
-    IFR_Client/IFR_ExtendedC.cpp
-  }
-
-  Header_Files {
-    IFR_Client
-    IFR_Client/IFR_BaseC.h
-    IFR_Client/IFR_BaseS.h
-    IFR_Client/IFR_BaseA.h
-    IFR_Client/IFR_BasicC.h
-    IFR_Client/IFR_BasicS.h
-    IFR_Client/IFR_BasicA.h
-    IFR_Client/IFR_ComponentsC.h
-    IFR_Client/IFR_ComponentsS.h
-    IFR_Client/IFR_ComponentsA.h
-    IFR_Client/IFR_ExtendedC.h
-    IFR_Client/IFR_ExtendedS.h
-    IFR_Client/IFR_ExtendedA.h
-  }
-
-  Inline_Files {
-    IFR_Client
-    IFR_Client/IFR_BaseC.inl
-    IFR_Client/IFR_BasicC.inl
-    IFR_Client/IFR_ComponentsC.inl
-    IFR_Client/IFR_ExtendedC.inl
-  }
-
-  Template_Files {
-    IFR_Client
-  }
-
-  Resource_Files {
-    IFR_Client
-  }
-
-  PIDL_Files {
-    IFR_Client
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    IFR_Client/TAO_IFR_Client.pc.in
-  }
-}
diff --git a/tao/IFR_Client/IFR_Client.mpc b/tao/IFR_Client/IFR_Client.mpc
new file mode 100644
index 00000000000..aa5c9b0b20c
--- /dev/null
+++ b/tao/IFR_Client/IFR_Client.mpc
@@ -0,0 +1,61 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -SS -GX \
+                -Wb,stub_export_macro=TAO_IFR_Client_Export \
+                -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h \
+                -iC tao/IFR_Client
+    idlflags -= -Sa -St
+    IFR_Base.pidl
+    IFR_Basic.pidl
+    IFR_Components.pidl
+    IFR_Extended.pidl
+  }
+
+  specific {
+    install_dir = tao/IFR_Client
+  }
+}
+
+project(IFR_Client) : taolib, tao_output, install, anytypecode, taoidldefaults {
+  after       += *idl
+  sharedname   = TAO_IFR_Client
+  dynamicflags += TAO_IFR_CLIENT_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    IFR_BaseC.cpp
+    IFR_BasicC.cpp
+    IFR_ComponentsC.cpp
+    IFR_ExtendedC.cpp
+  }
+
+  Header_Files {
+    *.h
+    IFR_BaseC.h
+    IFR_BaseS.h
+    IFR_BaseA.h
+    IFR_BasicC.h
+    IFR_BasicS.h
+    IFR_BasicA.h
+    IFR_ComponentsC.h
+    IFR_ComponentsS.h
+    IFR_ComponentsA.h
+    IFR_ExtendedC.h
+    IFR_ExtendedS.h
+    IFR_ExtendedA.h
+  }
+
+  Inline_Files {
+    *.inl
+    IFR_BaseC.inl
+    IFR_BasicC.inl
+    IFR_ComponentsC.inl
+    IFR_ExtendedC.inl
+  }
+
+  specific {
+    install_dir = tao/IFR_Client
+  }
+}
diff --git a/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index 1530495fe93..8cf76e4d536 100644
--- a/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -23,7 +23,7 @@ namespace TAO
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
             TAO::Objref_Traits<CORBA::InterfaceDef>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
diff --git a/tao/IFR_Client_Adapter.cpp b/tao/IFR_Client_Adapter.cpp
index 1f4774f837b..400aa68fe42 100644
--- a/tao/IFR_Client_Adapter.cpp
+++ b/tao/IFR_Client_Adapter.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/IFR_Client_Adapter.h"
diff --git a/tao/IIOP.pidl b/tao/IIOP.pidl
index 8e5a1545da7..018272dfaae 100644
--- a/tao/IIOP.pidl
+++ b/tao/IIOP.pidl
@@ -1,27 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-/**
- *
- *   This file is used to generate the code in
- *   IIOP*.* The command used to generate code
- *   is:
- *
- *     tao_idl \
- *        -o orig -Gp -Gd -GA -Sci
- *          -Wb,export_macro=TAO_Export \
- *          -Wb,export_include="tao/TAO_Export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
- *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \
- *          IIOP.pidl
- *
- *   Remember to patch the generated files using diff/IIOP.diff
- *   This is from the GIOP 1.2 spec for Bi Dir IIOP.
- */
-
 #ifndef TAO_IIOP_PIDL
 #define TAO_IIOP_PIDL
 
diff --git a/tao/IIOP_Acceptor.cpp b/tao/IIOP_Acceptor.cpp
index a7dae19fcf1..f9e186933af 100644
--- a/tao/IIOP_Acceptor.cpp
+++ b/tao/IIOP_Acceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 /*
  * Hook to copy all include and forward declarations.
  */
diff --git a/tao/IIOP_Acceptor.h b/tao/IIOP_Acceptor.h
index 2cdceb4f300..b92f1994bf3 100644
--- a/tao/IIOP_Acceptor.h
+++ b/tao/IIOP_Acceptor.h
@@ -108,8 +108,8 @@ public:
 
   //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_START
   /**
-   * Set the host name for the given addr.
-   * A hostname may be forced by using specified_hostname.  This
+   * Set the host name for the given @a addr.
+   * A hostname may be forced by using @a specified_hostname.  This
    * is useful if the given address corresponds to more than one
    * hostname and the desired one cannot be determined in any
    * other way.
diff --git a/tao/IIOP_Connection_Handler.cpp b/tao/IIOP_Connection_Handler.cpp
index 4cbbc6a2065..c23a6616e80 100644
--- a/tao/IIOP_Connection_Handler.cpp
+++ b/tao/IIOP_Connection_Handler.cpp
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+// $Id$
 
 #include "tao/IIOP_Connection_Handler.h"
 
@@ -78,7 +80,8 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (
   if (TAO_debug_level > 9)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler[%d] ctor, ")
+                  ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler[%d]::")
+                  ACE_TEXT("IIOP_Connection_Handler, ")
                   ACE_TEXT("this=%@\n"),
                   static_cast<TAO_Transport *> (specific_transport), this));
     }
@@ -89,6 +92,17 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (
 
 TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void)
 {
+  if (TAO_debug_level > 9)
+    {
+      TAO_Transport *tport = this->transport ();
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler[%d]::")
+                  ACE_TEXT("~IIOP_Connection_Handler, ")
+                  ACE_TEXT("this=%@, transport=%@\n"),
+                  tport != 0 ? tport->id () : 0,
+                  this,
+                  tport));
+    }
   delete this->transport ();
   int const result =
     this->release_os_resources ();
diff --git a/tao/IIOP_Connection_Handler.h b/tao/IIOP_Connection_Handler.h
index 0ad5f95b65d..5d7112cbaaf 100644
--- a/tao/IIOP_Connection_Handler.h
+++ b/tao/IIOP_Connection_Handler.h
@@ -128,12 +128,11 @@ protected:
 
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
 
-  // helper function used by the set_dscp_codepoint () methods to
-  // set the TOS field in the IP packets.
+  /// helper function used by the set_dscp_codepoint () methods to
+  /// set the TOS field in the IP packets.
   int set_tos (int tos);
 
 private:
-
   /// Stores the type of service value.
   int dscp_codepoint_;
 };
diff --git a/tao/IIOP_Connector.cpp b/tao/IIOP_Connector.cpp
index 13ca96d5803..3a230134f1f 100644
--- a/tao/IIOP_Connector.cpp
+++ b/tao/IIOP_Connector.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/IIOP_Connector.h"
 
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -85,7 +88,7 @@ TAO_IIOP_Connector::~TAO_IIOP_Connector (void)
 TAO_IIOP_Connector::TAO_IIOP_Connector (void)
   : TAO_Connector (IOP::TAG_INTERNET_IOP)
   , connect_strategy_ ()
-  , base_connector_ ()
+  , base_connector_ (0)
 {
 }
 
@@ -447,6 +450,9 @@ TAO_IIOP_Connector::complete_connection (int result,
       // the winner is the last member of the list, because the
       // iterator stopped on a successful connect.
       transport = tlist[count-1];
+
+      this->cleanup_pending (transport, tlist, count);
+
       desc.reset_endpoint (ep_list[count-1]);
       TAO::Transport_Cache_Manager &tcm =
         this->orb_core ()->lane_resources ().transport_cache ();
diff --git a/tao/IIOP_Connector.h b/tao/IIOP_Connector.h
index bfc2fd3c95b..02da6c61067 100644
--- a/tao/IIOP_Connector.h
+++ b/tao/IIOP_Connector.h
@@ -82,7 +82,7 @@ public:
 
   typedef ACE_Connect_Strategy<TAO_IIOP_Connection_Handler,
                                ACE_SOCK_CONNECTOR>
-          TAO_IIOP_CONNECT_STRATEGY ;
+          TAO_IIOP_CONNECT_STRATEGY;
 
   typedef ACE_Strategy_Connector<TAO_IIOP_Connection_Handler,
                                  ACE_SOCK_CONNECTOR>
diff --git a/tao/IIOP_Endpoint.cpp b/tao/IIOP_Endpoint.cpp
index 0b12ab890fb..e5ccf6b9183 100644
--- a/tao/IIOP_Endpoint.cpp
+++ b/tao/IIOP_Endpoint.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 /*
  * Add all include files within the following
  * two markers.
diff --git a/tao/IIOP_Endpoint.h b/tao/IIOP_Endpoint.h
index 155796a60c8..e1d443aaadc 100644
--- a/tao/IIOP_Endpoint.h
+++ b/tao/IIOP_Endpoint.h
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
-    IIOP implementation of PP Framework Endpoint interface.
+ *  IIOP implementation of PP Framework Endpoint interface.
  *
  *  @author  Marina Spivak <marina@cs.wustl.edu>
  */
@@ -130,7 +130,7 @@ public:
   /// ownership of this string.
   const char *host (void) const;
 
-  /// Copy the string <h> into <host_> and return the resulting pointer.
+  /// Copy the string @a h into <host_> and return the resulting pointer.
   /// This object maintains ownership of this string.
   const char *host (const char *h);
 
diff --git a/tao/IIOP_Endpoints.pidl b/tao/IIOP_Endpoints.pidl
index 9c17648b363..732c859e65c 100644
--- a/tao/IIOP_Endpoints.pidl
+++ b/tao/IIOP_Endpoints.pidl
@@ -8,18 +8,6 @@
  * endpoints per single profile.  Data structures defined here are
  * used for transmission of IIOP endpoints.  See IIOP_Profile.*
  * for more details.
- *
- * This file is used to generate the code in
- * IIOP_EndpointsC.* The command used to generate code
- * is:
- *
- * tao_idl
- *          -o orig -GA -Sci \
- *          -Wb,export_macro=TAO_Export \
- *          -Wb,export_include="tao/TAO_Export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          IIOP_Endpoints.pidl
  */
 
 #ifndef _TAO_IIOP_ENDPOINTS_IDL_
diff --git a/tao/IIOP_Factory.cpp b/tao/IIOP_Factory.cpp
index a517ac4683b..feb5fb3f5f6 100644
--- a/tao/IIOP_Factory.cpp
+++ b/tao/IIOP_Factory.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/IIOP_Factory.h"
 
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
diff --git a/tao/IIOP_Profile.cpp b/tao/IIOP_Profile.cpp
index 1616cc8f8c2..f927a7941a8 100644
--- a/tao/IIOP_Profile.cpp
+++ b/tao/IIOP_Profile.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/IIOP_Profile.h"
 
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -7,10 +10,8 @@
 #include "tao/IIOP_EndpointsC.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
-
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdio.h"
-
 #include "ace/os_include/os_netdb.h"
 
 static const char the_prefix[] = "iiop";
diff --git a/tao/IIOP_Transport.cpp b/tao/IIOP_Transport.cpp
index b1bb367b6d9..6354d45353f 100644
--- a/tao/IIOP_Transport.cpp
+++ b/tao/IIOP_Transport.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/IIOP_Transport.h"
 
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
diff --git a/tao/IORInterceptor.mpc b/tao/IORInterceptor.mpc
deleted file mode 100644
index f774f9a8123..00000000000
--- a/tao/IORInterceptor.mpc
+++ /dev/null
@@ -1,67 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \
-                -Wb,export_macro=TAO_IORInterceptor_Export \
-                -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h \
-                -Wb,include_guard=TAO_IORINTERCEPTOR_SAFE_INCLUDE \
-                -Wb,safe_include=tao/IORInterceptor/IORInterceptor.h \
-                -o IORInterceptor
-    IORInterceptor/IORInterceptor.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \
-                -Wb,export_macro=TAO_IORInterceptor_Export \
-                -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h \
-                -o IORInterceptor
-    IORInterceptor/IORInfo.pidl
-  }
-}
-
-project(IORInterceptor) : taolib, tao_output, portableserver, objreftemplate, pi, install, taoidldefaults {
-  after       += *idl
-  sharedname   = TAO_IORInterceptor
-  dynamicflags += TAO_IORINTERCEPTOR_BUILD_DLL
-
-  Source_Files {
-    IORInterceptor
-  }
-
-  Source_Files {
-    IORInterceptor/IORInterceptorC.cpp
-    IORInterceptor/IORInfoC.cpp
-  }
-
-  Header_Files {
-    IORInterceptor
-    IORInterceptor/IORInterceptorC.h
-    IORInterceptor/IORInterceptorS.h
-    IORInterceptor/IORInfoC.h
-    IORInterceptor/IORInfoS.h
-  }
-
-  Inline_Files {
-    IORInterceptor
-  }
-
-  Template_Files {
-    IORInterceptor
-  }
-
-  Resource_Files {
-    IORInterceptor
-  }
-
-  PIDL_Files {
-    IORInterceptor
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    IORInterceptor/TAO_IORInterceptor.pc.in
-  }
-}
diff --git a/tao/IORInterceptor/IORInfo.cpp b/tao/IORInterceptor/IORInfo.cpp
index 6b4ee9765aa..74d02b94d9f 100644
--- a/tao/IORInterceptor/IORInfo.cpp
+++ b/tao/IORInterceptor/IORInfo.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/IORInterceptor/IORInfo.h"
 #include "tao/PortableServer/Root_POA.h"
 
@@ -5,11 +8,6 @@
 #include "tao/IOPC.h"
 #include "tao/ORB_Constants.h"
 
-
-ACE_RCSID (IORInterceptor,
-           IORInfo,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 # include "tao/IORInterceptor/IORInfo.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/tao/IORInterceptor/IORInfo.pidl b/tao/IORInterceptor/IORInfo.pidl
index 52a767bd5b1..4c30e1d5bde 100644
--- a/tao/IORInterceptor/IORInfo.pidl
+++ b/tao/IORInterceptor/IORInfo.pidl
@@ -16,7 +16,6 @@
  * has been created to remove the dependency from the rest of module
  * PortableInterceptor.
  *
- * This file is used to generate the code in IORInfoC.*
  */
 
 // File: IORInfo.idl
diff --git a/tao/IORInterceptor/IORInterceptor.mpc b/tao/IORInterceptor/IORInterceptor.mpc
new file mode 100644
index 00000000000..a103ae5081b
--- /dev/null
+++ b/tao/IORInterceptor/IORInterceptor.mpc
@@ -0,0 +1,49 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \
+                -Wb,export_macro=TAO_IORInterceptor_Export \
+                -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h \
+                -Wb,include_guard=TAO_IORINTERCEPTOR_SAFE_INCLUDE \
+                -Wb,safe_include=tao/IORInterceptor/IORInterceptor.h \
+                -iC tao/IORInterceptor
+    IORInterceptor.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \
+                -Wb,export_macro=TAO_IORInterceptor_Export \
+                -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h \
+                -iC IORInterceptor
+    IORInfo.pidl
+  }
+
+  specific {
+    install_dir = tao/IORInterceptor
+  }
+}
+
+project(IORInterceptor) : taolib, tao_output, portableserver, objreftemplate, pi, install, taoidldefaults {
+  after       += *idl
+  sharedname   = TAO_IORInterceptor
+  dynamicflags += TAO_IORINTERCEPTOR_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    IORInterceptorC.cpp
+    IORInfoC.cpp
+  }
+
+  Header_Files {
+    *.h
+    IORInterceptorC.h
+    IORInterceptorS.h
+    IORInfoC.h
+    IORInfoS.h
+  }
+
+  specific {
+    install_dir = tao/IORInterceptor
+  }
+}
diff --git a/tao/IORInterceptor/IORInterceptor.pidl b/tao/IORInterceptor/IORInterceptor.pidl
index f1ce8fa18fe..d1975182a02 100644
--- a/tao/IORInterceptor/IORInterceptor.pidl
+++ b/tao/IORInterceptor/IORInterceptor.pidl
@@ -15,21 +15,6 @@
  * directly or indirectly from CORBA::ValueBase. This separate file
  * has been created to remove the dependency from the rest of module
  * PortableInterceptor.
- *
- * This file is used to generate the code in IORInterceptorC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Sa -St -Sci -SS
- *          -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_IORInterceptor_Export
- *          -Wb,export_include="iorinterceptor_export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          IORInterceptor.pidl
- *
- * Please apply the patch in IORInterceptor.diff to the generated stubs and
- * skeletons.
  */
 
 // File: IORInterceptor.idl
diff --git a/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
index b0204d72240..f025537ce6d 100644
--- a/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
+++ b/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/IORInterceptor/IORInterceptor_Adapter_Impl.h"
@@ -5,10 +6,6 @@
 
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (IORInterceptor,
-           IORInterceptor_Adapter_Factory_Impl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IORInterceptor_Adapter_Factory_Impl::~
diff --git a/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index fef09da97d5..894b2536e41 100644
--- a/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/IORInterceptor/IORInterceptor_Adapter_Impl.h"
@@ -8,11 +9,6 @@
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/PortableServer/Non_Servant_Upcall.h"
 
-ACE_RCSID (IORInterceptor,
-           IORInterceptor_Adapter_Impl,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl (void)
diff --git a/tao/IORInterceptor/IORInterceptor_Details.cpp b/tao/IORInterceptor/IORInterceptor_Details.cpp
index b881e436af0..d801908f3b8 100644
--- a/tao/IORInterceptor/IORInterceptor_Details.cpp
+++ b/tao/IORInterceptor/IORInterceptor_Details.cpp
@@ -1,10 +1,9 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/IORInterceptor/IORInterceptor_Details.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (IORInterceptor,
-           IORInterceptor_Details,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/IORManipulation.mpc b/tao/IORManipulation.mpc
deleted file mode 100644
index 178f9937e21..00000000000
--- a/tao/IORManipulation.mpc
+++ /dev/null
@@ -1,58 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -GX \
-                -Wb,export_macro=TAO_IORManip_Export \
-                -Wb,export_include=tao/IORManipulation/ior_manip_export.h \
-                -Wb,include_guard=TAO_IORMANIP_SAFE_INCLUDE \
-                -Wb,safe_include=tao/IORManipulation/IORManip_Loader.h \
-                -o IORManipulation
-    idlflags -= -Sa -St
-    IORManipulation/IOR.pidl
-  }
-}
-
-project(IORManipulation) : taolib, tao_output, install, anytypecode, taoidldefaults {
-  after       += *idl
-  sharedname   = TAO_IORManip
-  dynamicflags += TAO_IORMANIP_BUILD_DLL
-
-  Source_Files {
-    IORManipulation
-  }
-
-  Source_Files {
-    IORManipulation/IORC.cpp
-  }
-
-  Header_Files {
-    IORManipulation
-    IORManipulation/IORC.h
-    IORManipulation/IORS.h
-    IORManipulation/IORA.h
-  }
-
-  Inline_Files {
-    IORManipulation
-  }
-
-  Template_Files {
-    IORManipulation
-  }
-
-  Resource_Files {
-    IORManipulation
-  }
-
-  PIDL_Files {
-    IORManipulation
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    IORManipulation/TAO_IORManip.pc.in
-  }
-}
diff --git a/tao/IORManipulation/IOR.pidl b/tao/IORManipulation/IOR.pidl
index 6484f6e5c1e..942f5262d46 100644
--- a/tao/IORManipulation/IOR.pidl
+++ b/tao/IORManipulation/IOR.pidl
@@ -4,19 +4,6 @@
  * $Id$
  *
  * @brief Pre-compiled IDL source for the TAO_IOP namespace.
- *
- * This file is used to generate the code in IORC.{h,cpp}.
- *
- * To regenerate the code use:
- *
- * tao_idl \
- *        -o orig -Gp -Gd -GA -Sci \
- *          -Wb,export_macro=TAO_IORManip_Export \
- *          -Wb,export_include="ior_manip_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *   IOR.pidl
- *
  */
 
 #ifndef TAO_IOR_PIDL
diff --git a/tao/IORManipulation/IORManip_Filter.cpp b/tao/IORManipulation/IORManip_Filter.cpp
index 3f70b119f08..2200f1b154c 100644
--- a/tao/IORManipulation/IORManip_Filter.cpp
+++ b/tao/IORManipulation/IORManip_Filter.cpp
@@ -6,8 +6,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/Stub.h"
 
-ACE_RCSID (IORManip_Filter, IORManip_Filter, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IORManip_Filter::TAO_IORManip_Filter (void)
diff --git a/tao/IORManipulation/IORManip_Filter.h b/tao/IORManipulation/IORManip_Filter.h
index 91b8e9ee163..dc7ad95d74d 100644
--- a/tao/IORManipulation/IORManip_Filter.h
+++ b/tao/IORManipulation/IORManip_Filter.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// =========================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    IORManip_Filter.h
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// =========================================================================
+
+//=============================================================================
+/**
+ *  @file    IORManip_Filter.h
+ *
+ *  $Id$
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IORMANIP_FILTER_H
 #define TAO_IORMANIP_FILTER_H
diff --git a/tao/IORManipulation/IORManip_IIOP_Filter.cpp b/tao/IORManipulation/IORManip_IIOP_Filter.cpp
index 211e85c6a6e..46d3ab2c350 100644
--- a/tao/IORManipulation/IORManip_IIOP_Filter.cpp
+++ b/tao/IORManipulation/IORManip_IIOP_Filter.cpp
@@ -9,8 +9,6 @@
 #include "tao/MProfile.h"
 #include "tao/CDR.h"
 
-ACE_RCSID (IORManip_IIOP_Filter, IORManip_IIOP_Filter, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IORManip_IIOP_Filter::TAO_IORManip_IIOP_Filter (void)
@@ -128,10 +126,10 @@ TAO_IORManip_IIOP_Filter::filter_and_add (TAO_Profile* profile,
             else
               {
                 TAO_IIOP_Endpoint *endpoint = 0;
-                ACE_NEW (endpoint,
-                         TAO_IIOP_Endpoint (endpoints[i].host,
-                                            endpoints[i].port,
-                                            endpoints[i].priority));
+                ACE_NEW_NORETURN (endpoint,
+                                   TAO_IIOP_Endpoint (endpoints[i].host,
+                                                      endpoints[i].port,
+                                                      endpoints[i].priority));
                 if (endpoint == 0)
                   {
                     new_profile->_decr_refcnt ();
diff --git a/tao/IORManipulation/IORManip_IIOP_Filter.h b/tao/IORManipulation/IORManip_IIOP_Filter.h
index 73c6b661e7c..dd1d732ec0a 100644
--- a/tao/IORManipulation/IORManip_IIOP_Filter.h
+++ b/tao/IORManipulation/IORManip_IIOP_Filter.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// =========================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    IORManip_IIOP_Filter.h
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// =========================================================================
+
+//=============================================================================
+/**
+ *  @file    IORManip_IIOP_Filter.h
+ *
+ *  $Id$
+ *
+ *  @author Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IORMANIP_IIOP_FILTER_H
 #define TAO_IORMANIP_IIOP_FILTER_H
diff --git a/tao/IORManipulation/IORManip_Loader.cpp b/tao/IORManipulation/IORManip_Loader.cpp
index 90bfb074d04..755787f13ce 100644
--- a/tao/IORManipulation/IORManip_Loader.cpp
+++ b/tao/IORManipulation/IORManip_Loader.cpp
@@ -1,14 +1,10 @@
+// $Id$
+
 #include "tao/IORManipulation/IORManip_Loader.h"
 #include "tao/IORManipulation/IORManipulation.h"
 
 #include "ace/Log_Msg.h"
 
-
-ACE_RCSID (IORManipulation,
-           IORManip_Loader,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IORManip_Loader::TAO_IORManip_Loader (void)
diff --git a/tao/IORManipulation/IORManipulation.cpp b/tao/IORManipulation/IORManipulation.cpp
index 887c8735382..b5c584a428f 100644
--- a/tao/IORManipulation/IORManipulation.cpp
+++ b/tao/IORManipulation/IORManipulation.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/IORManipulation/IORManipulation.h"
 
 #include "tao/MProfile.h"
@@ -8,11 +11,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (IORManipulation,
-           IORManipulation,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IOR_Manipulation_impl::TAO_IOR_Manipulation_impl (void)
@@ -60,9 +58,8 @@ TAO_IOR_Manipulation_impl::merge_iors (
     {
       // this gets a copy of the MProfile, hense the auto_ptr;
 
-      ACE_AUTO_PTR_RESET (tmp_pfiles,
-                          iors[i]->_stubobj ()->make_profiles (),
-                          TAO_MProfile);
+      ACE_auto_ptr_reset (tmp_pfiles,
+                          iors[i]->_stubobj ()->make_profiles ());
 
       // check to see if any of the profile in tmp_pfiles are already
       // in Merged_Profiles.  If so raise exception.
@@ -193,11 +190,10 @@ TAO_IOR_Manipulation_impl::remove_profiles (
       throw TAO_IOP::Invalid_IOR ();
     }
 
-  // Now we can remove the profiles which we want to elimitate from
+  // Now we can remove the profiles which we want to eliminate from
   // the Object.
-  ACE_AUTO_PTR_RESET (tmp_pfiles,
-                      ior2->_stubobj ()->make_profiles (),
-                      TAO_MProfile);
+  ACE_auto_ptr_reset (tmp_pfiles,
+                      ior2->_stubobj ()->make_profiles ());
 
   TAO_MProfile& mp = stub -> base_profiles();
   if (mp.remove_profiles (tmp_pfiles.get ()) < 0)
diff --git a/tao/IORManipulation/IORManipulation.mpc b/tao/IORManipulation/IORManipulation.mpc
new file mode 100644
index 00000000000..91f46408796
--- /dev/null
+++ b/tao/IORManipulation/IORManipulation.mpc
@@ -0,0 +1,40 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -Gp -Gd -Sci -SS -Sorb -GX \
+                -Wb,export_macro=TAO_IORManip_Export \
+                -Wb,export_include=tao/IORManipulation/ior_manip_export.h \
+                -Wb,include_guard=TAO_IORMANIP_SAFE_INCLUDE \
+                -Wb,safe_include=tao/IORManipulation/IORManip_Loader.h \
+                -iC tao/IORManipulation
+    idlflags -= -Sa -St
+    IOR.pidl
+  }
+
+  specific {
+    install_dir = tao/IORManipulation
+  }
+}
+
+project(IORManipulation) : taolib, tao_output, install, anytypecode, taoidldefaults {
+  after       += *idl
+  sharedname   = TAO_IORManip
+  dynamicflags += TAO_IORMANIP_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    IORC.cpp
+  }
+
+  Header_Files {
+    *.h
+    IORC.h
+    IORS.h
+    IORA.h
+  }
+
+  specific {
+    install_dir = tao/IORManipulation
+  }
+}
diff --git a/tao/IORTable.mpc b/tao/IORTable.mpc
deleted file mode 100644
index f2f9177cbfa..00000000000
--- a/tao/IORTable.mpc
+++ /dev/null
@@ -1,57 +0,0 @@
-//$Id$
-project(*core_idl) : tao_versioning_idl_defaults {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb \
-                -Wb,export_macro=TAO_IORTable_Export \
-                -Wb,export_include=tao/IORTable/iortable_export.h \
-                -Wb,include_guard=TAO_IORTABLE_SAFE_INCLUDE \
-                -Wb,safe_include=tao/IORTable/IORTable.h \
-                -o IORTable
-    IORTable/IORTable.pidl
-  }
-}
-
-project(IORTable) : taolib, tao_output, install, taoidldefaults {
-  after       += *core_idl
-  sharedname   = TAO_IORTable
-  dynamicflags += TAO_IORTABLE_BUILD_DLL
-
-  Source_Files {
-    IORTable
-  }
-
-  Source_Files {
-    IORTable/IORTableC.cpp
-  }
-
-  Header_Files {
-    IORTable
-    IORTable/IORTableC.h
-    IORTable/IORTableS.h
-  }
-
-  Inline_Files {
-    IORTable
-  }
-
-  Template_Files {
-    IORTable
-  }
-
-  Resource_Files {
-    IORTable
-  }
-
-  PIDL_Files {
-    IORTable
-  }
-
-  IDL_Files {
-    IORTable
-  }
-
-  Pkgconfig_Files {
-    IORTable/TAO_IORTable.pc.in
-  }
-}
diff --git a/tao/IORTable/IORTable.cpp b/tao/IORTable/IORTable.cpp
index e43ccf18b34..e7bd0d9445a 100644
--- a/tao/IORTable/IORTable.cpp
+++ b/tao/IORTable/IORTable.cpp
@@ -14,9 +14,6 @@
 #include "tao/IORTable/IORTable.h"
 #include "tao/IORTable/Table_Adapter.h"
 
-ACE_RCSID (IORTable, IORTable, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/tao/IORTable/IORTable.mpc b/tao/IORTable/IORTable.mpc
new file mode 100644
index 00000000000..e7229ec5e68
--- /dev/null
+++ b/tao/IORTable/IORTable.mpc
@@ -0,0 +1,38 @@
+//$Id$
+project(*core_idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -Gp -Gd -Sci -SS -Sorb \
+                -Wb,export_macro=TAO_IORTable_Export \
+                -Wb,export_include=tao/IORTable/iortable_export.h \
+                -Wb,include_guard=TAO_IORTABLE_SAFE_INCLUDE \
+                -Wb,safe_include=tao/IORTable/IORTable.h \
+                -iC tao/IORTable
+    IORTable.pidl
+  }
+
+  specific {
+    install_dir = tao/IORTable
+  }
+}
+
+project(IORTable) : taolib, tao_output, install, taoidldefaults {
+  after       += *core_idl
+  sharedname   = TAO_IORTable
+  dynamicflags += TAO_IORTABLE_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    IORTableC.cpp
+  }
+
+  Header_Files {
+    *.h
+    IORTableC.h
+    IORTableS.h
+  }
+
+  specific {
+    install_dir = tao/IORTable
+  }
+}
diff --git a/tao/IORTable/IORTable.pidl b/tao/IORTable/IORTable.pidl
index fe08dabafc0..3725767eaf7 100644
--- a/tao/IORTable/IORTable.pidl
+++ b/tao/IORTable/IORTable.pidl
@@ -1,4 +1,3 @@
-// ================================================================
 /**
  * @file IORTable.pidl
  *
@@ -7,21 +6,7 @@
  * @author Carlos O'Ryan <coryan@uci.edu>
  *
  * @brief Pre-compiled IDL source for the IORTable module.
- *
- * This file is used to generate the code in
- * IORTable{C}.{h,cpp}
- *
- *   The command used to generate code from this file is:
- *
- *     tao_idl -o orig -Sa -St -Sci \
- *          -Wb,export_macro=TAO_IORTable_Export \
- *          -Wb,export_include=iortable_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          IORTable.pidl
- *
  */
-// ================================================================
 
 #ifndef TAO_IORTABLE_IORTABLE_PIDL
 #define TAO_IORTABLE_IORTABLE_PIDL
diff --git a/tao/IORTable/IOR_Table_Impl.cpp b/tao/IORTable/IOR_Table_Impl.cpp
index 132144ddd86..64e1ead30b5 100644
--- a/tao/IORTable/IOR_Table_Impl.cpp
+++ b/tao/IORTable/IOR_Table_Impl.cpp
@@ -10,11 +10,6 @@
 #include "tao/IORTable/IOR_Table_Impl.h"
 #include "ace/Guard_T.h"
 
-ACE_RCSID (IORTable,
-           IOR_Table_Impl,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IOR_Table_Impl_ptr
diff --git a/tao/IORTable/Table_Adapter.cpp b/tao/IORTable/Table_Adapter.cpp
index f455cdd962e..34634eae681 100644
--- a/tao/IORTable/Table_Adapter.cpp
+++ b/tao/IORTable/Table_Adapter.cpp
@@ -17,20 +17,14 @@
 #include "tao/Profile.h"
 #include "tao/TAO_Server_Request.h"
 
-ACE_RCSID (IORTable,
-           Table_Adapter,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Table_Adapter::TAO_Table_Adapter (TAO_ORB_Core &orb_core)
   :  orb_core_ (orb_core),
      root_ (),
      closed_ (true),
-     enable_locking_ (orb_core_.server_factory ()->enable_poa_locking ()),
      thread_lock_ (),
-     lock_ (TAO_Table_Adapter::create_lock (enable_locking_,
-                                            thread_lock_))
+     lock_ (TAO_Table_Adapter::create_lock (thread_lock_))
 {
 }
 
@@ -41,26 +35,11 @@ TAO_Table_Adapter::~TAO_Table_Adapter (void)
 
 /* static */
 ACE_Lock *
-TAO_Table_Adapter::create_lock (bool enable_locking,
-                                TAO_SYNCH_MUTEX &thread_lock)
+TAO_Table_Adapter::create_lock (TAO_SYNCH_MUTEX &thread_lock)
 {
-#if defined (ACE_HAS_THREADS)
-  if (enable_locking)
-    {
-      ACE_Lock *the_lock = 0;
-      ACE_NEW_RETURN (the_lock,
-                      ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (thread_lock),
-                      0);
-      return the_lock;
-    }
-#else
-  ACE_UNUSED_ARG (enable_locking);
-  ACE_UNUSED_ARG (thread_lock);
-#endif /* ACE_HAS_THREADS */
-
   ACE_Lock *the_lock = 0;
   ACE_NEW_RETURN (the_lock,
-                  ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
+                  ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (thread_lock),
                   0);
   return the_lock;
 }
diff --git a/tao/IORTable/Table_Adapter.h b/tao/IORTable/Table_Adapter.h
index 371304956d0..b0bef6fc05b 100644
--- a/tao/IORTable/Table_Adapter.h
+++ b/tao/IORTable/Table_Adapter.h
@@ -59,7 +59,8 @@ public:
   virtual CORBA::Long initialize_collocated_object (TAO_Stub *stub);
 
 private:
-  static ACE_Lock * create_lock (bool enable_locking, TAO_SYNCH_MUTEX &l);
+  static ACE_Lock * create_lock (TAO_SYNCH_MUTEX &l);
+
   /// Helper method to find an object bound in the table.
   bool find_object (TAO::ObjectKey &key,
                     CORBA::Object_out forward_to);
@@ -71,7 +72,6 @@ private:
   TAO_IOR_Table_Impl_var root_;
 
   bool closed_;
-  bool enable_locking_;
   TAO_SYNCH_MUTEX thread_lock_;
   ACE_Lock *lock_;
 };
@@ -84,8 +84,8 @@ public:
   /// Constructor
   TAO_Table_Adapter_Factory (void);
 
-  // = The TAO_Adapter_Factory methods, please read tao/Adapter.h for
-  // details.
+  /// The TAO_Adapter_Factory methods, please read tao/Adapter.h for
+  /// details.
   virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
 };
 
diff --git a/tao/ImR_Client.mpc b/tao/ImR_Client.mpc
deleted file mode 100644
index 5b1e6ceef42..00000000000
--- a/tao/ImR_Client.mpc
+++ /dev/null
@@ -1,66 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -Gp -Ssi -Gd -Sorb -GA \
-                -Wb,export_macro=TAO_IMR_Client_Export \
-                -Wb,export_include=tao/ImR_Client/imr_client_export.h \
-                -o ImR_Client
-    idlflags -= -Sa -St
-    ImR_Client/ServerObject.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Gp -Ssi -Gd -Sorb -GX \
-                -Wb,export_macro=TAO_IMR_Client_Export \
-                -Wb,export_include=tao/ImR_Client/imr_client_export.h \
-                -o ImR_Client
-    idlflags -= -Sa -St
-    ImR_Client/ImplRepo.pidl
-  }
-}
-
-project(ImR_Client) : taolib, tao_output, install, portableserver, taoidldefaults {
-  after       += *idl
-  sharedname   = TAO_ImR_Client
-  dynamicflags += TAO_IMR_CLIENT_BUILD_DLL
-
-  Source_Files {
-    ImR_Client
-  }
-
-  Source_Files {
-    ImR_Client/ServerObjectC.cpp
-    ImR_Client/ServerObjectA.cpp
-    ImR_Client/ServerObjectS.cpp
-    ImR_Client/ImplRepoC.cpp
-    ImR_Client/ImplRepoS.cpp
-  }
-
-  Header_Files {
-    ImR_Client
-  }
-
-  Inline_Files {
-    ImR_Client
-  }
-
-  Template_Files {
-    ImR_Client
-  }
-
-  Resource_Files {
-    ImR_Client
-  }
-
-  PIDL_Files {
-    ImR_Client
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    ImR_Client/TAO_ImR_Client.pc.in
-  }
-}
diff --git a/tao/ImR_Client/ImR_Client.cpp b/tao/ImR_Client/ImR_Client.cpp
index 0d1335792ff..f0cd9e424de 100644
--- a/tao/ImR_Client/ImR_Client.cpp
+++ b/tao/ImR_Client/ImR_Client.cpp
@@ -11,10 +11,6 @@
 #include "tao/ImR_Client/ServerObject_i.h"
 #include "tao/ImR_Client/ImplRepoC.h"
 
-ACE_RCSID (ImR_Client,
-           ImR_Client,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -206,9 +202,9 @@ namespace TAO
 
       if (this->server_object_)
         {
-          PortableServer::POA_var poa = this->server_object_->_default_POA ();
+          PortableServer::POA_var default_poa = this->server_object_->_default_POA ();
 
-          TAO_Root_POA *root_poa = dynamic_cast <TAO_Root_POA*> (poa.in ());
+          TAO_Root_POA *root_poa = dynamic_cast <TAO_Root_POA*> (default_poa.in ());
 
           if (!root_poa)
             {
diff --git a/tao/ImR_Client/ImR_Client.mpc b/tao/ImR_Client/ImR_Client.mpc
new file mode 100644
index 00000000000..6412aa51688
--- /dev/null
+++ b/tao/ImR_Client/ImR_Client.mpc
@@ -0,0 +1,59 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -Gp -Ssi -Gd -Sorb -GA \
+                -Wb,export_macro=TAO_IMR_Client_Export \
+                -Wb,export_include=tao/ImR_Client/imr_client_export.h \
+                -iC tao/ImR_Client
+    idlflags -= -Sa -St
+    ServerObject.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Gp -Ssi -Gd -Sorb -GX \
+                -Wb,export_macro=TAO_IMR_Client_Export \
+                -Wb,export_include=tao/ImR_Client/imr_client_export.h \
+                -iC tao/ImR_Client
+    idlflags -= -Sa -St
+    ImplRepo.pidl
+  }
+
+  specific {
+    install_dir = tao/ImR_Client
+  }
+}
+
+project(ImR_Client) : taolib, tao_output, install, portableserver, taoidldefaults {
+  after       += *idl
+  sharedname   = TAO_ImR_Client
+  dynamicflags += TAO_IMR_CLIENT_BUILD_DLL
+
+  Header_Files {
+    *.h
+    ServerObjectC.h
+    ServerObjectA.h
+    ServerObjectS.h
+    ImplRepoC.h
+    ImplRepoA.h
+    ImplRepoS.h
+  }
+
+  Source_Files {
+    *.cpp
+    ServerObjectC.cpp
+    ServerObjectA.cpp
+    ServerObjectS.cpp
+    ImplRepoC.cpp
+    ImplRepoS.cpp
+  }
+
+  Inline_Files {
+    ImplRepoC.inl
+    ServerObjectC.inl
+  }
+
+  specific {
+    install_dir = tao/ImR_Client
+  }
+}
diff --git a/tao/ImR_Client/ImplRepo.pidl b/tao/ImR_Client/ImplRepo.pidl
index 2cbee7c7825..383d7dcef23 100644
--- a/tao/ImR_Client/ImplRepo.pidl
+++ b/tao/ImR_Client/ImplRepo.pidl
@@ -1,19 +1,10 @@
 // -*- IDL -*-
 
-//=============================================================================
 /**
  *  @file   ImplRepo.pidl
  *
  * $Id$
- *
- * This file is used to generate the code in ImplRepo{A,C,S}.{h,inl,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl -Ssi -Gp -Gd -I$(TAO_ROOT) -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ImplRepo.pidl
- *
  */
-//=============================================================================
 
 #ifndef TAO_IMRCLIENT_IMPLREPO_PIDL
 #define TAO_IMRCLIENT_IMPLREPO_PIDL
diff --git a/tao/ImR_Client/ServerObject.pidl b/tao/ImR_Client/ServerObject.pidl
index dff1b816359..479bc1f38dc 100644
--- a/tao/ImR_Client/ServerObject.pidl
+++ b/tao/ImR_Client/ServerObject.pidl
@@ -1,19 +1,10 @@
 // -*- IDL -*-
 
-//=============================================================================
 /**
  *  @file   ServerObject.pidl
  *
  * $Id$
- *
- * This file is used to generate the code in ServerObject{A,C,S}.{h,inl,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl -Ssi -Gp -Gd -I$(TAO_ROOT) -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ServerObject.pidl
- *
  */
-//=============================================================================
 
 #ifndef TAO_IMRCLIENT_SERVEROBJECT_PIDL
 #define TAO_IMRCLIENT_SERVEROBJECT_PIDL
diff --git a/tao/Incoming_Message_Queue.cpp b/tao/Incoming_Message_Queue.cpp
index 4b9048426ec..d1eaeedaaae 100644
--- a/tao/Incoming_Message_Queue.cpp
+++ b/tao/Incoming_Message_Queue.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Incoming_Message_Queue.h"
 #include "tao/Queued_Data.h"
 #include "tao/debug.h"
diff --git a/tao/Incoming_Message_Queue.h b/tao/Incoming_Message_Queue.h
index 91f257f823c..1226d63c2c5 100644
--- a/tao/Incoming_Message_Queue.h
+++ b/tao/Incoming_Message_Queue.h
@@ -50,7 +50,6 @@ class TAO_Transport;
  *   different.
  *
  */
-
 class TAO_Export TAO_Incoming_Message_Queue
 {
 public:
diff --git a/tao/Incoming_Message_Stack.cpp b/tao/Incoming_Message_Stack.cpp
index 85014ad8792..9e50caeb7ea 100644
--- a/tao/Incoming_Message_Stack.cpp
+++ b/tao/Incoming_Message_Stack.cpp
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+// $Id$
 
 # include "tao/Incoming_Message_Stack.h"
 
diff --git a/tao/Intrusive_Ref_Count_Object_T.h b/tao/Intrusive_Ref_Count_Object_T.h
index b4c0c44bfe4..a736378f6c4 100644
--- a/tao/Intrusive_Ref_Count_Object_T.h
+++ b/tao/Intrusive_Ref_Count_Object_T.h
@@ -31,8 +31,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * @brief Template class as wrapper of a non reference counted data type but provide
  *        intrusive reference-counting feature by inherited from TAO_Intrusive_Ref_Count_Base.
- *        This makes the parameterized type data be smart pointer by using a 
- *        TAO_Intrusive_Ref_Count_Handle<X> to an this wrapper object.  
+ *        This makes the parameterized type data be smart pointer by using a
+ *        TAO_Intrusive_Ref_Count_Handle<X> to an this wrapper object.
  */
 template <class OBJ, class ACE_LOCK>
 class TAO_Intrusive_Ref_Count_Object : public TAO_Intrusive_Ref_Count_Base <ACE_LOCK>
diff --git a/tao/Invocation_Adapter.cpp b/tao/Invocation_Adapter.cpp
index 6e59ee4f56d..0359a3efb57 100644
--- a/tao/Invocation_Adapter.cpp
+++ b/tao/Invocation_Adapter.cpp
@@ -1,4 +1,5 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/Invocation_Adapter.h"
 #include "tao/Profile_Transport_Resolver.h"
@@ -351,8 +352,7 @@ namespace TAO
       nil_forward_ref = true;
     else
       {
-        stubobj =
-          effective_target->_stubobj ();
+        stubobj = effective_target->_stubobj ();
 
         if (stubobj && stubobj->base_profiles ().size () == 0)
           nil_forward_ref = true;
diff --git a/tao/Invocation_Adapter.h b/tao/Invocation_Adapter.h
index c638b74b1b0..844c446d424 100644
--- a/tao/Invocation_Adapter.h
+++ b/tao/Invocation_Adapter.h
@@ -63,7 +63,7 @@ namespace TAO
    *
    * This adapter class serves as the base class for various types of
    * invocations like AMI, DII, DSI etc. Adapter classes for AMI, DII,
-   * DSI inherit from this class and their local behavioural
+   * DSI inherit from this class and their local behavioral
    * information before kicking off an invocation.
    *
    * @@ More info..
@@ -90,7 +90,7 @@ namespace TAO
      *
      * @param operation The name of the operation being invoked.
      *
-     * @param op_len Number of charecters in the operation name. This
+     * @param op_len Number of characters in the operation name. This
      * is an optimization which helps us to avoid calling strlen ()
      * while creating a message format.
      *
@@ -142,7 +142,7 @@ namespace TAO
      *
      * These methods useful for various types of invocations like
      * SII, AMI, DII and DSI. All the subclasses implement these
-     * methods to get the right behaviour at their level.
+     * methods to get the right behavior at their level.
      */
     //@{
 
@@ -229,7 +229,7 @@ namespace TAO
                              TAO_Operation_Details &details);
 
   private:
-    /// Dont allow default initializations
+    /// Don't allow default initializations
     Invocation_Adapter (void);
 
     // Prevent copying
diff --git a/tao/Invocation_Base.cpp b/tao/Invocation_Base.cpp
index 8571d40c0b5..5a8f80532bf 100644
--- a/tao/Invocation_Base.cpp
+++ b/tao/Invocation_Base.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Invocation_Base.h"
 #include "tao/Stub.h"
 #include "tao/operation_details.h"
diff --git a/tao/Invocation_Base.h b/tao/Invocation_Base.h
index 30994abd0ee..dda096d03bd 100644
--- a/tao/Invocation_Base.h
+++ b/tao/Invocation_Base.h
@@ -47,7 +47,7 @@ namespace TAO
    *
    * @brief The base class for the invocation object
    *
-   * This class is the base of the invocation object hiererachy. This
+   * This class is the base of the invocation object hierarchy. This
    * hierarchy is classified  based on the type of invocation and the
    * mode of invocation. One of the objects from the hierarchy is
    * created on the stack for every invocation.
diff --git a/tao/Invocation_Endpoint_Selectors.cpp b/tao/Invocation_Endpoint_Selectors.cpp
index 062a2e20430..752860ba877 100644
--- a/tao/Invocation_Endpoint_Selectors.cpp
+++ b/tao/Invocation_Endpoint_Selectors.cpp
@@ -1,4 +1,5 @@
 //$Id$
+
 #include "tao/Invocation_Endpoint_Selectors.h"
 #include "tao/Stub.h"
 #include "tao/Profile.h"
diff --git a/tao/Invocation_Utils.h b/tao/Invocation_Utils.h
index f0593cf5eb6..54e8ec6a0c5 100644
--- a/tao/Invocation_Utils.h
+++ b/tao/Invocation_Utils.h
@@ -74,10 +74,10 @@ namespace TAO
   enum Forward_Once_Exception
     {
       FOE_NON              = 0x0,
-      FOE_OBJECT_NOT_EXIST = 0x1,  
-      FOE_COMM_FAILURE     = 0x2,   
-      FOE_TRANSIENT        = 0x4,   
-      FOE_INV_OBJREF       = 0x8,   
+      FOE_OBJECT_NOT_EXIST = 0x1,
+      FOE_COMM_FAILURE     = 0x2,
+      FOE_TRANSIENT        = 0x4,
+      FOE_INV_OBJREF       = 0x8,
       FOE_ALL              = 0xFFFFFFFF
     };
 }
diff --git a/tao/LF_CH_Event.cpp b/tao/LF_CH_Event.cpp
index 56d48551d51..621f6a58946 100644
--- a/tao/LF_CH_Event.cpp
+++ b/tao/LF_CH_Event.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/LF_CH_Event.h"
 #include "tao/LF_Follower.h"
 #include "tao/debug.h"
diff --git a/tao/LF_CH_Event.h b/tao/LF_CH_Event.h
index 69166097bb7..70a853c4480 100644
--- a/tao/LF_CH_Event.h
+++ b/tao/LF_CH_Event.h
@@ -44,7 +44,7 @@ public:
   /**
    * The TAO_LF_Multi_Event class is another specialization of
    * TAO_LF_Event, used for aggregating many connection handlers into
-   * a single event object.. It requires friendship so that it can
+   * a single event object. It requires friendship so that it can
    * check the is_state_final() flag on each of its contained
    * connection handlers.
    */
diff --git a/tao/LF_Connect_Strategy.cpp b/tao/LF_Connect_Strategy.cpp
index c05735a3b5f..0c6a0db73ba 100644
--- a/tao/LF_Connect_Strategy.cpp
+++ b/tao/LF_Connect_Strategy.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/LF_Connect_Strategy.h"
 #include "tao/LF_Multi_Event.h"
 #include "tao/Connection_Handler.h"
diff --git a/tao/LF_Connect_Strategy.h b/tao/LF_Connect_Strategy.h
index 515df085157..3af293936b6 100644
--- a/tao/LF_Connect_Strategy.h
+++ b/tao/LF_Connect_Strategy.h
@@ -34,7 +34,7 @@ class TAO_LF_Event;
  * @class TAO_LF_Connect_Strategy
  *
  * @brief Concrete implementation of a connect strategy that waits on
- *  the leader-follower during asynch connects
+ *  the leader-follower during asynchronous connects
  */
 
 class TAO_Export TAO_LF_Connect_Strategy : public TAO_Connect_Strategy
@@ -46,7 +46,7 @@ public:
   /// Destructor
   ~TAO_LF_Connect_Strategy (void);
 
-  /*
+  /**
    * Concrete implementation for this class. Please see
    * Connect_Strategy.h for details
    */
diff --git a/tao/LF_Event.cpp b/tao/LF_Event.cpp
index e6735132293..ee456aa9b48 100644
--- a/tao/LF_Event.cpp
+++ b/tao/LF_Event.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Event.h"
diff --git a/tao/LF_Event.h b/tao/LF_Event.h
index 3e41fd689ee..0333ffa3ce1 100644
--- a/tao/LF_Event.h
+++ b/tao/LF_Event.h
@@ -105,7 +105,7 @@ public:
   /**
    * Virtual methods for this class hierarchy..
    */
-  /// Accessor to change the state. The state isnt changed unless
+  /// Accessor to change the state. The state isn't changed unless
   /// certain conditions are satisfied.
   void state_changed (int new_state, TAO_Leader_Follower &lf);
 
diff --git a/tao/LF_Event_Loop_Thread_Helper.cpp b/tao/LF_Event_Loop_Thread_Helper.cpp
index a59cb9a6cbc..6fc6697deb8 100644
--- a/tao/LF_Event_Loop_Thread_Helper.cpp
+++ b/tao/LF_Event_Loop_Thread_Helper.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Event_Loop_Thread_Helper.h"
diff --git a/tao/LF_Event_Loop_Thread_Helper.inl b/tao/LF_Event_Loop_Thread_Helper.inl
index 2fd8c6d98e7..a5c368dea38 100644
--- a/tao/LF_Event_Loop_Thread_Helper.inl
+++ b/tao/LF_Event_Loop_Thread_Helper.inl
@@ -19,7 +19,7 @@ TAO_LF_Event_Loop_Thread_Helper::TAO_LF_Event_Loop_Thread_Helper (
 ACE_INLINE
 TAO_LF_Event_Loop_Thread_Helper::~TAO_LF_Event_Loop_Thread_Helper (void)
 {
-  int call_reset = (this->event_loop_return_ == 0);
+  int const call_reset = (this->event_loop_return_ == 0);
   this->lf_strategy_.reset_event_loop_thread (call_reset,
                                               this->leader_follower_);
 }
diff --git a/tao/LF_Follower.cpp b/tao/LF_Follower.cpp
index 5ac84b65ca3..466986a79f1 100644
--- a/tao/LF_Follower.cpp
+++ b/tao/LF_Follower.cpp
@@ -23,7 +23,7 @@ int
 TAO_LF_Follower::signal (void)
 {
   // We *must* remove ourselves from the list of followers, otherwise
-  // we could get signalled twice: to wake up as a follower and as the
+  // we could get signaled twice: to wake up as a follower and as the
   // next leader.
   // The follower may not be there if the reply is received while
   // the consumer is not yet waiting for it (i.e. it send the
diff --git a/tao/LF_Follower_Auto_Adder.inl b/tao/LF_Follower_Auto_Adder.inl
index 0fa419366d0..17e3b69e291 100644
--- a/tao/LF_Follower_Auto_Adder.inl
+++ b/tao/LF_Follower_Auto_Adder.inl
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/LF_Follower_Auto_Ptr.cpp b/tao/LF_Follower_Auto_Ptr.cpp
index 076a5f926ad..b2ae5808061 100644
--- a/tao/LF_Follower_Auto_Ptr.cpp
+++ b/tao/LF_Follower_Auto_Ptr.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Follower_Auto_Ptr.h"
diff --git a/tao/LF_Invocation_Event.cpp b/tao/LF_Invocation_Event.cpp
index f19ede1d259..acdd9feb2d4 100644
--- a/tao/LF_Invocation_Event.cpp
+++ b/tao/LF_Invocation_Event.cpp
@@ -1,4 +1,6 @@
 // -*- C++ -*-
+// $Id$
+
 #include "tao/LF_Invocation_Event.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/LF_Invocation_Event.h b/tao/LF_Invocation_Event.h
index a3db772d40d..e7d04cc86bc 100644
--- a/tao/LF_Invocation_Event.h
+++ b/tao/LF_Invocation_Event.h
@@ -32,7 +32,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * Concrete event types and manipulation class through which the
  * invocation data path would flow. Typically state changes of
  * interest include whether a message has arrived, or timedout waiting
- * for a message or if the cionnection is closed waiting for a
+ * for a message or if the connection is closed waiting for a
  * message. Details of the states are documented within the class.
  *
  */
@@ -57,7 +57,7 @@ public:
 protected:
 
   /// Validate and perform the state change
-  /*
+  /**
    * This concrete class uses the following states declared in the
    * class TAO_LF_Event
    *
@@ -70,7 +70,6 @@ protected:
    * LFS_TIMEOUT - The event has timed out.
    * LFS_CONNECTION_CLOSED - The connection was closed when the state
    *                         was active.
-   *
    */
   virtual void state_changed_i (int new_state);
 
diff --git a/tao/LF_Multi_Event.cpp b/tao/LF_Multi_Event.cpp
index 33974c6e78c..666e1c983de 100644
--- a/tao/LF_Multi_Event.cpp
+++ b/tao/LF_Multi_Event.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/LF_Multi_Event.h"
 #include "tao/Connection_Handler.h"
 #include "ace/OS_Memory.h"
diff --git a/tao/LF_Multi_Event.h b/tao/LF_Multi_Event.h
index f61909ba518..3de189d6a36 100644
--- a/tao/LF_Multi_Event.h
+++ b/tao/LF_Multi_Event.h
@@ -45,7 +45,7 @@ public:
   /// Destructor
   virtual ~TAO_LF_Multi_Event (void);
 
-  /// propogate the follower to all the events in the collection.
+  /// Propagate the follower to all the events in the collection.
   virtual int bind (TAO_LF_Follower *follower);
 
   /// Unbind the follower from all the collected events.
@@ -69,7 +69,7 @@ public:
 
   /// Return 1 if an error was detected while waiting for the
   /// event - This iterates over the list of events and returns
-  /// 1 only if all of them return 1 from error_detected.
+  /// 1 only if all of them return 1 from error_detected().
   int error_detected (void) const;
 
   //@}
diff --git a/tao/LRU_Connection_Purging_Strategy.cpp b/tao/LRU_Connection_Purging_Strategy.cpp
index dcc9871c567..cd5502aaf49 100644
--- a/tao/LRU_Connection_Purging_Strategy.cpp
+++ b/tao/LRU_Connection_Purging_Strategy.cpp
@@ -19,9 +19,9 @@ TAO_LRU_Connection_Purging_Strategy::~TAO_LRU_Connection_Purging_Strategy (void)
 
 
 void
-TAO_LRU_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
+TAO_LRU_Connection_Purging_Strategy::update_item (TAO_Transport& transport)
 {
-  transport->purging_order (++this->order_);
+  transport.purging_order (++this->order_);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/LRU_Connection_Purging_Strategy.h b/tao/LRU_Connection_Purging_Strategy.h
index 6e34d3c7407..6fdc4ebabcf 100644
--- a/tao/LRU_Connection_Purging_Strategy.h
+++ b/tao/LRU_Connection_Purging_Strategy.h
@@ -46,7 +46,7 @@ public:
   virtual ~TAO_LRU_Connection_Purging_Strategy (void);
 
   /// Called when accessing an item from the cache
-  virtual void update_item (TAO_Transport* transport);
+  virtual void update_item (TAO_Transport& transport);
 
 private:
   /// The ordering information for each transport in the cache
diff --git a/tao/Leader_Follower.cpp b/tao/Leader_Follower.cpp
index 9f62764dc9b..9bf50ba6fa3 100644
--- a/tao/Leader_Follower.cpp
+++ b/tao/Leader_Follower.cpp
@@ -62,8 +62,8 @@ TAO_Leader_Follower::elect_new_leader_i (void)
 
 #if defined (TAO_DEBUG_LEADER_FOLLOWER)
   ACE_DEBUG ((LM_DEBUG,
-              "TAO (%P|%t) LF::elect_new_leader_i - "
-              "follower is %x\n",
+              "TAO (%P|%t) - TAO_Leader_Follower::elect_new_leader_i - "
+              "follower is %@\n",
               follower));
 #endif /* TAO_DEBUG_LEADER_FOLLOWER */
 
@@ -86,7 +86,7 @@ TAO_Leader_Follower::wait_for_client_leader_to_complete (ACE_Time_Value *max_wai
           if (this->event_loop_threads_condition_.wait () == -1)
             {
               ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("TAO (%P|%t): TAO_Leader_Follower::")
+                          ACE_TEXT ("TAO (%P|%t) - TAO_Leader_Follower::")
                           ACE_TEXT ("wait_for_client_leader_to_complete - ")
                           ACE_TEXT ("Condition variable wait failed\n")));
 
@@ -102,7 +102,7 @@ TAO_Leader_Follower::wait_for_client_leader_to_complete (ACE_Time_Value *max_wai
             {
               if (errno != ETIME)
                 ACE_ERROR ((LM_ERROR,
-                            ACE_TEXT ("TAO (%P|%t): TAO_Leader_Follower::")
+                            ACE_TEXT ("TAO (%P|%t) - TAO_Leader_Follower::")
                             ACE_TEXT ("wait_for_client_leader_to_complete - ")
                             ACE_TEXT ("Condition variable wait failed\n")));
 
@@ -194,13 +194,13 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
 
   ACE_Countdown_Time countdown (max_wait_time);
 
-  // Optmize the first iteration [no access to errno]
+  // Optimize the first iteration [no access to errno]
   int result = 1;
 
-  // For some cases the transport may dissappear like when waiting for
+  // For some cases the transport may disappear like when waiting for
   // connection to be initiated or closed. So cache the id.
   // @@ NOTE: This is not completely safe either. We will be fine for
-  // cases that dont access the id ie. when debug level is off but
+  // cases that don't access the id ie. when debug level is off but
   // with debugging level on we are on a sticky wicket. Hopefully none
   // of our users should run TAO with debugging enabled like they did
   // in PathFinder
@@ -231,7 +231,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
         if (TAO_debug_level >= 5)
           ACE_DEBUG ((LM_DEBUG,
                       "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
-                      " (follower), cond <%x>\n",
+                      " (follower), cond <%@>\n",
                       t_id, follower.get ()));
 
         // Bound the follower and the LF_Event, this is important to
@@ -265,8 +265,6 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
             //
             // but only the first one has any effect, so the leader is
             // lost.
-            //
-
             TAO_LF_Follower_Auto_Adder auto_adder (*this, follower);
 
             if (max_wait_time == 0)
@@ -391,7 +389,6 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
       reactor->owner (ACE_Thread::self ());
 
       // Run the reactor event loop.
-
       if (TAO_debug_level >= 5)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
@@ -473,7 +470,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
       /**
        * There should be no reason to reset the value of result
        * here. If there was an error in handle_events () that the
-       * leader saw, I (Bala) beleave it should be propogated to the
+       * leader saw, I (Bala) believe it should be propagated to the
        * clients.
        * result = 0;
        */
diff --git a/tao/Leader_Follower.h b/tao/Leader_Follower.h
index d1316cd0b27..1cf90a9675a 100644
--- a/tao/Leader_Follower.h
+++ b/tao/Leader_Follower.h
@@ -69,7 +69,7 @@ public:
   void set_upcall_thread (void);
 
   /// Is there any thread running as a leader?
-  int leader_available (void) const;
+  bool leader_available (void) const;
 
   /// A server thread is making a request.
   void set_client_thread (void);
@@ -80,7 +80,7 @@ public:
   /// Wait on the Leader/Followers loop until one event happens.
   /**
    * @param event The event we wait for, the loop iterates until the
-   * event is sucessful, or it fails due to timeout, and error or a
+   * event is successful, or it fails due to timeout, and error or a
    * connection closed.
    * @param transport The transport attached to the event
    * @param max_wait_time Limit the time spent on the loop
@@ -103,12 +103,12 @@ public:
   /// side leader-follower set.
   void reset_client_leader_thread (void) ;
 
-  /// sets the thread ID of the leader thread in the leader-follower
+  /// Sets the thread ID of the leader thread in the leader-follower
   /// model
   void set_client_leader_thread (ACE_thread_t thread_ID);
 
-  /// checks if we are a leader thread
-  int is_client_leader_thread (void) const;
+  /// Checks if we are a leader thread
+  bool is_client_leader_thread (void) const;
 
   /**
    * A leader thread is relinquishing its role, unless there are more
@@ -117,7 +117,7 @@ public:
    */
   int elect_new_leader (void);
 
-  /** @name Follower creation/destructions
+  /** @name Follower creation/destruction
    *
    * The Leader/Followers set acts as a factory for the Follower
    * objects.  Followers are used to represent a thread blocked
@@ -157,9 +157,9 @@ public:
 
   /// Checks if there are any followers available
   /**
-   * @return 1 if there follower set is not empty
+   * @return true if there follower set is not empty
    */
-  int follower_available (void) const;
+  bool follower_available (void) const;
 
   //@}
 
@@ -176,7 +176,7 @@ public:
   ACE_Reverse_Lock<TAO_SYNCH_MUTEX> &reverse_lock (void);
 
   /// Check if there are any client threads running
-  int has_clients (void) const;
+  bool has_clients (void) const;
 
   /// Accesor to the reactor
   ACE_Reactor *reactor (void);
@@ -205,7 +205,7 @@ private:
    *
    */
   //@{
-  /// Remote a follower from the Followers set and promote it to the
+  /// Remove a follower from the Followers set and promote it to the
   /// leader role.
   /**
    * This is a helper routine for elect_new_leader(), after verifying
diff --git a/tao/Leader_Follower.inl b/tao/Leader_Follower.inl
index 462a626cf13..95d3f89fdc1 100644
--- a/tao/Leader_Follower.inl
+++ b/tao/Leader_Follower.inl
@@ -30,7 +30,7 @@ TAO_Leader_Follower::get_tss_resources (void) const
   return this->orb_core_->get_tss_resources ();
 }
 
-ACE_INLINE int
+ACE_INLINE bool
 TAO_Leader_Follower::follower_available (void) const
 {
   return !this->follower_set_.is_empty ();
@@ -74,7 +74,7 @@ TAO_Leader_Follower::set_event_loop_thread (ACE_Time_Value *max_wait_time)
   if (this->client_thread_is_leader_ &&
       tss->client_leader_thread_ == 0)
     {
-      int result =
+      int const result =
         this->wait_for_client_leader_to_complete (max_wait_time);
 
       if (result != 0)
@@ -141,7 +141,7 @@ TAO_Leader_Follower::set_upcall_thread (void)
     }
 }
 
-ACE_INLINE int
+ACE_INLINE bool
 TAO_Leader_Follower::leader_available (void) const
 {
   return this->leaders_ != 0;
@@ -165,7 +165,7 @@ TAO_Leader_Follower::reset_client_leader_thread (void)
   --this->client_thread_is_leader_;
 }
 
-ACE_INLINE int
+ACE_INLINE bool
 TAO_Leader_Follower::is_client_leader_thread (void) const
 {
   TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
@@ -190,7 +190,7 @@ TAO_Leader_Follower::reverse_lock (void)
   return this->reverse_lock_;
 }
 
-ACE_INLINE int
+ACE_INLINE bool
 TAO_Leader_Follower::has_clients (void) const
 {
   return this->clients_;
diff --git a/tao/Load_Protocol_Factory_T.h b/tao/Load_Protocol_Factory_T.h
index 8e3556ea3de..adf73728c6e 100644
--- a/tao/Load_Protocol_Factory_T.h
+++ b/tao/Load_Protocol_Factory_T.h
@@ -60,7 +60,8 @@ namespace TAO
                           T,
                           -1);
 
-          ACE_auto_ptr_reset (safe_protocol_factory, protocol_factory);
+          ACE_auto_ptr_reset (safe_protocol_factory,
+                              protocol_factory);
 
           transfer_ownership = true;
         }
diff --git a/tao/LocateRequest_Invocation.cpp b/tao/LocateRequest_Invocation.cpp
index f0c728f33cb..b5e08d87471 100644
--- a/tao/LocateRequest_Invocation.cpp
+++ b/tao/LocateRequest_Invocation.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/LocateRequest_Invocation.h"
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/operation_details.h"
@@ -123,7 +126,7 @@ namespace TAO
     countdown.update ();
 
     // For some strategies one may want to release the transport
-    // back to  cache. If the idling is successfull let the
+    // back to  cache. If the idling is successful let the
     // resolver about that.
     if (this->resolver_.transport ()->idle_after_send ())
       this->resolver_.transport_released ();
@@ -134,7 +137,7 @@ namespace TAO
 
     // For some strategies one may want to release the transport
     // back to  cache after receiving the reply. If the idling is
-    // successfull let the resolver about that.
+    // successful let the resolver about that.
     if (this->resolver_.transport ()->idle_after_reply ())
       this->resolver_.transport_released ();
 
diff --git a/tao/LocateRequest_Invocation_Adapter.cpp b/tao/LocateRequest_Invocation_Adapter.cpp
index f0704b8035f..a68baa41187 100644
--- a/tao/LocateRequest_Invocation_Adapter.cpp
+++ b/tao/LocateRequest_Invocation_Adapter.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/LocateRequest_Invocation_Adapter.h"
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/operation_details.h"
diff --git a/tao/LongDoubleSeq.pidl b/tao/LongDoubleSeq.pidl
index 3e5b6d208e9..861adc72d7e 100644
--- a/tao/LongDoubleSeq.pidl
+++ b/tao/LongDoubleSeq.pidl
@@ -1,23 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-// ================================================================
-/**
- * This file is used to generate the code in LongDoubleSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          LongDoubleSeq.pidl
- *
- */
-// ================================================================
-
 #ifndef TAO_CORBA_LONG_DOUBLE_SEQ_IDL
 #define TAO_CORBA_LONG_DOUBLE_SEQ_IDL
 
diff --git a/tao/LongLongSeq.pidl b/tao/LongLongSeq.pidl
index 2b9eae61e45..fab4ad9d5a6 100644
--- a/tao/LongLongSeq.pidl
+++ b/tao/LongLongSeq.pidl
@@ -1,23 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-// ================================================================
-/**
- * This file is used to generate the code in LongLongSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          LongLongSeq.pidl
- *
- */
-// ================================================================
-
 #ifndef TAO_CORBA_LONGLONG_SEQ_IDL
 #define TAO_CORBA_LONGLONG_SEQ_IDL
 
diff --git a/tao/LongSeq.pidl b/tao/LongSeq.pidl
index 7414de40bbc..4300ff58fb1 100644
--- a/tao/LongSeq.pidl
+++ b/tao/LongSeq.pidl
@@ -1,23 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-// ================================================================
-/**
- * This file is used to generate the code in LongSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=TAO_Export.h
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          LongSeq.pidl
- *
- */
-// ================================================================
-
 #ifndef TAO_CORBA_LONG_SEQ_IDL
 #define TAO_CORBA_LONG_SEQ_IDL
 
diff --git a/tao/LzoCompressor.mpc b/tao/LzoCompressor.mpc
deleted file mode 100644
index 4e3c765e965..00000000000
--- a/tao/LzoCompressor.mpc
+++ /dev/null
@@ -1,38 +0,0 @@
-//$Id$
-project(LzoCompressor) : taolib, tao_output, install, compression, taoidldefaults, lzo1 {
-  requires += lzo1
-  sharedname   = TAO_LzoCompressor
-  dynamicflags += TAO_LZOCOMPRESSOR_BUILD_DLL
-
-  Source_Files {
-    Compression/lzo
-  }
-
-  Header_Files {
-    Compression/lzo
-  }
-
-  Inline_Files {
-    Compression/lzo
-  }
-
-  Template_Files {
-    Compression/lzo
-  }
-
-  Resource_Files {
-    Compression/lzo
-  }
-
-  PIDL_Files {
-    Compression/lzo
-  }
-
-  IDL_Files {
-    Compression/lzo
-  }
-
-  Pkgconfig_Files {
-    Compression/lzo/TAO_Lzo2Compressor.pc.in
-  }
-}
diff --git a/tao/MCAST_Parser.cpp b/tao/MCAST_Parser.cpp
index 90b98ad2b31..e3b12883ae7 100644
--- a/tao/MCAST_Parser.cpp
+++ b/tao/MCAST_Parser.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/MCAST_Parser.h"
 
 #if (TAO_HAS_MCAST_PARSER == 1)
diff --git a/tao/MProfile.cpp b/tao/MProfile.cpp
index 9c8a5a4008f..7c22495f7a3 100644
--- a/tao/MProfile.cpp
+++ b/tao/MProfile.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
+
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
 #include "tao/PolicyC.h"
@@ -270,7 +270,7 @@ TAO_MProfile::remove_profiles (const TAO_MProfile *pfiles)
 CORBA::Boolean
 TAO_MProfile::is_equivalent (const TAO_MProfile *rhs)
 {
-  // Two profile lists are equivalent iff at least one of the profiles
+  // Two profile lists are equivalent if at least one of the profiles
   // from the first list is_equivalent to at least one of the profiles
   // from the second list!!
   for (TAO_PHandle h1 = 0; h1 < this->last_; ++h1)
diff --git a/tao/Makefile.am b/tao/Makefile.am
deleted file mode 100644
index 1c7aa50d961..00000000000
--- a/tao/Makefile.am
+++ /dev/null
@@ -1,6558 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-includedir = @includedir@/tao
-pkgconfigdir = @libdir@/pkgconfig
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-SUBDIRS = \
-        . \
-        ETCL
-
-lib_LTLIBRARIES =
-pkgconfig_DATA =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.TAO.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  AnyTypeCode/GIOPA.cpp \
-  AnyTypeCode/GIOPA.h \
-  GIOPC.cpp \
-  GIOPC.h \
-  GIOPC.inl \
-  GIOPS.h
-
-CLEANFILES += \
-  GIOP-stamp \
-  AnyTypeCode/GIOPA.cpp \
-  AnyTypeCode/GIOPA.h \
-  GIOPC.cpp \
-  GIOPC.h \
-  GIOPC.inl \
-  GIOPS.h
-
-AnyTypeCode/GIOPA.cpp AnyTypeCode/GIOPA.h GIOPC.cpp GIOPC.h GIOPC.inl GIOPS.h: GIOP-stamp
-
-GIOP-stamp: $(srcdir)/GIOP.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/GIOP.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/CONV_FRAMEA.cpp \
-  AnyTypeCode/CONV_FRAMEA.h \
-  CONV_FRAMEC.cpp \
-  CONV_FRAMEC.h \
-  CONV_FRAMES.h
-
-CLEANFILES += \
-  CONV_FRAME-stamp \
-  AnyTypeCode/CONV_FRAMEA.cpp \
-  AnyTypeCode/CONV_FRAMEA.h \
-  CONV_FRAMEC.cpp \
-  CONV_FRAMEC.h \
-  CONV_FRAMES.h
-
-AnyTypeCode/CONV_FRAMEA.cpp AnyTypeCode/CONV_FRAMEA.h CONV_FRAMEC.cpp CONV_FRAMEC.h CONV_FRAMES.h: CONV_FRAME-stamp
-
-CONV_FRAME-stamp: $(srcdir)/CONV_FRAME.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/CONV_FRAME.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/CurrentA.cpp \
-  AnyTypeCode/CurrentA.h \
-  CurrentC.cpp \
-  CurrentC.h \
-  CurrentS.h
-
-CLEANFILES += \
-  Current-stamp \
-  AnyTypeCode/CurrentA.cpp \
-  AnyTypeCode/CurrentA.h \
-  CurrentC.cpp \
-  CurrentC.h \
-  CurrentS.h
-
-AnyTypeCode/CurrentA.cpp AnyTypeCode/CurrentA.h CurrentC.cpp CurrentC.h CurrentS.h: Current-stamp
-
-Current-stamp: $(srcdir)/Current.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Current.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/IIOPA.cpp \
-  AnyTypeCode/IIOPA.h \
-  IIOPC.cpp \
-  IIOPC.h
-
-CLEANFILES += \
-  IIOP-stamp \
-  AnyTypeCode/IIOPA.cpp \
-  AnyTypeCode/IIOPA.h \
-  IIOPC.cpp \
-  IIOPC.h
-
-AnyTypeCode/IIOPA.cpp AnyTypeCode/IIOPA.h IIOPC.cpp IIOPC.h: IIOP-stamp
-
-IIOP-stamp: $(srcdir)/IIOP.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IIOP.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/IIOP_EndpointsA.cpp \
-  AnyTypeCode/IIOP_EndpointsA.h \
-  IIOP_EndpointsC.cpp \
-  IIOP_EndpointsC.h \
-  IIOP_EndpointsS.h
-
-CLEANFILES += \
-  IIOP_Endpoints-stamp \
-  AnyTypeCode/IIOP_EndpointsA.cpp \
-  AnyTypeCode/IIOP_EndpointsA.h \
-  IIOP_EndpointsC.cpp \
-  IIOP_EndpointsC.h \
-  IIOP_EndpointsS.h
-
-AnyTypeCode/IIOP_EndpointsA.cpp AnyTypeCode/IIOP_EndpointsA.h IIOP_EndpointsC.cpp IIOP_EndpointsC.h IIOP_EndpointsS.h: IIOP_Endpoints-stamp
-
-IIOP_Endpoints-stamp: $(srcdir)/IIOP_Endpoints.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IIOP_Endpoints.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/IOPA.cpp \
-  AnyTypeCode/IOPA.h \
-  IOPC.cpp \
-  IOPC.h \
-  IOPS.h
-
-CLEANFILES += \
-  IOP-stamp \
-  AnyTypeCode/IOPA.cpp \
-  AnyTypeCode/IOPA.h \
-  IOPC.cpp \
-  IOPC.h \
-  IOPS.h
-
-AnyTypeCode/IOPA.cpp AnyTypeCode/IOPA.h IOPC.cpp IOPC.h IOPS.h: IOP-stamp
-
-IOP-stamp: $(srcdir)/IOP.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IOP.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/Messaging_PolicyValueA.cpp \
-  AnyTypeCode/Messaging_PolicyValueA.h \
-  Messaging_PolicyValueC.cpp \
-  Messaging_PolicyValueC.h
-
-CLEANFILES += \
-  Messaging_PolicyValue-stamp \
-  AnyTypeCode/Messaging_PolicyValueA.cpp \
-  AnyTypeCode/Messaging_PolicyValueA.h \
-  Messaging_PolicyValueC.cpp \
-  Messaging_PolicyValueC.h
-
-AnyTypeCode/Messaging_PolicyValueA.cpp AnyTypeCode/Messaging_PolicyValueA.h Messaging_PolicyValueC.cpp Messaging_PolicyValueC.h: Messaging_PolicyValue-stamp
-
-Messaging_PolicyValue-stamp: $(srcdir)/Messaging_PolicyValue.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Messaging_PolicyValue.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/Messaging_SyncScopeA.cpp \
-  AnyTypeCode/Messaging_SyncScopeA.h \
-  Messaging_SyncScopeC.cpp \
-  Messaging_SyncScopeC.h
-
-CLEANFILES += \
-  Messaging_SyncScope-stamp \
-  AnyTypeCode/Messaging_SyncScopeA.cpp \
-  AnyTypeCode/Messaging_SyncScopeA.h \
-  Messaging_SyncScopeC.cpp \
-  Messaging_SyncScopeC.h
-
-AnyTypeCode/Messaging_SyncScopeA.cpp AnyTypeCode/Messaging_SyncScopeA.h Messaging_SyncScopeC.cpp Messaging_SyncScopeC.h: Messaging_SyncScope-stamp
-
-Messaging_SyncScope-stamp: $(srcdir)/Messaging_SyncScope.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Messaging_SyncScope.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/ObjectIdListA.cpp \
-  AnyTypeCode/ObjectIdListA.h \
-  ObjectIdListC.cpp \
-  ObjectIdListC.h
-
-CLEANFILES += \
-  ObjectIdList-stamp \
-  AnyTypeCode/ObjectIdListA.cpp \
-  AnyTypeCode/ObjectIdListA.h \
-  ObjectIdListC.cpp \
-  ObjectIdListC.h
-
-AnyTypeCode/ObjectIdListA.cpp AnyTypeCode/ObjectIdListA.h ObjectIdListC.cpp ObjectIdListC.h: ObjectIdList-stamp
-
-ObjectIdList-stamp: $(srcdir)/ObjectIdList.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/ObjectIdList.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/orb_typesA.cpp \
-  AnyTypeCode/orb_typesA.h \
-  orb_typesC.cpp \
-  orb_typesC.h \
-  orb_typesS.h
-
-CLEANFILES += \
-  orb_types-stamp \
-  AnyTypeCode/orb_typesA.cpp \
-  AnyTypeCode/orb_typesA.h \
-  orb_typesC.cpp \
-  orb_typesC.h \
-  orb_typesS.h
-
-AnyTypeCode/orb_typesA.cpp AnyTypeCode/orb_typesA.h orb_typesC.cpp orb_typesC.h orb_typesS.h: orb_types-stamp
-
-orb_types-stamp: $(srcdir)/orb_types.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/orb_types.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/ParameterModeA.cpp \
-  AnyTypeCode/ParameterModeA.h \
-  ParameterModeC.cpp \
-  ParameterModeC.h \
-  ParameterModeS.h
-
-CLEANFILES += \
-  ParameterMode-stamp \
-  AnyTypeCode/ParameterModeA.cpp \
-  AnyTypeCode/ParameterModeA.h \
-  ParameterModeC.cpp \
-  ParameterModeC.h \
-  ParameterModeS.h
-
-AnyTypeCode/ParameterModeA.cpp AnyTypeCode/ParameterModeA.h ParameterModeC.cpp ParameterModeC.h ParameterModeS.h: ParameterMode-stamp
-
-ParameterMode-stamp: $(srcdir)/ParameterMode.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/ParameterMode.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/Policy_ForwardA.cpp \
-  AnyTypeCode/Policy_ForwardA.h \
-  Policy_ForwardC.cpp \
-  Policy_ForwardC.h \
-  Policy_ForwardS.h
-
-CLEANFILES += \
-  Policy_Forward-stamp \
-  AnyTypeCode/Policy_ForwardA.cpp \
-  AnyTypeCode/Policy_ForwardA.h \
-  Policy_ForwardC.cpp \
-  Policy_ForwardC.h \
-  Policy_ForwardS.h
-
-AnyTypeCode/Policy_ForwardA.cpp AnyTypeCode/Policy_ForwardA.h Policy_ForwardC.cpp Policy_ForwardC.h Policy_ForwardS.h: Policy_Forward-stamp
-
-Policy_Forward-stamp: $(srcdir)/Policy_Forward.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Policy_Forward.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/Policy_ManagerA.cpp \
-  AnyTypeCode/Policy_ManagerA.h \
-  Policy_ManagerC.cpp \
-  Policy_ManagerC.h \
-  Policy_ManagerS.h
-
-CLEANFILES += \
-  Policy_Manager-stamp \
-  AnyTypeCode/Policy_ManagerA.cpp \
-  AnyTypeCode/Policy_ManagerA.h \
-  Policy_ManagerC.cpp \
-  Policy_ManagerC.h \
-  Policy_ManagerS.h
-
-AnyTypeCode/Policy_ManagerA.cpp AnyTypeCode/Policy_ManagerA.h Policy_ManagerC.cpp Policy_ManagerC.h Policy_ManagerS.h: Policy_Manager-stamp
-
-Policy_Manager-stamp: $(srcdir)/Policy_Manager.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Policy_Manager.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/Policy_CurrentA.cpp \
-  AnyTypeCode/Policy_CurrentA.h \
-  Policy_CurrentC.cpp \
-  Policy_CurrentC.h \
-  Policy_CurrentS.h
-
-CLEANFILES += \
-  Policy_Current-stamp \
-  AnyTypeCode/Policy_CurrentA.cpp \
-  AnyTypeCode/Policy_CurrentA.h \
-  Policy_CurrentC.cpp \
-  Policy_CurrentC.h \
-  Policy_CurrentS.h
-
-AnyTypeCode/Policy_CurrentA.cpp AnyTypeCode/Policy_CurrentA.h Policy_CurrentC.cpp Policy_CurrentC.h Policy_CurrentS.h: Policy_Current-stamp
-
-Policy_Current-stamp: $(srcdir)/Policy_Current.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Policy_Current.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/PI_ForwardA.cpp \
-  AnyTypeCode/PI_ForwardA.h \
-  PI_ForwardC.cpp \
-  PI_ForwardC.h
-
-CLEANFILES += \
-  PI_Forward-stamp \
-  AnyTypeCode/PI_ForwardA.cpp \
-  AnyTypeCode/PI_ForwardA.h \
-  PI_ForwardC.cpp \
-  PI_ForwardC.h
-
-AnyTypeCode/PI_ForwardA.cpp AnyTypeCode/PI_ForwardA.h PI_ForwardC.cpp PI_ForwardC.h: PI_Forward-stamp
-
-PI_Forward-stamp: $(srcdir)/PI_Forward.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/PI_Forward.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/PortableInterceptorA.cpp \
-  AnyTypeCode/PortableInterceptorA.h \
-  PortableInterceptorC.cpp \
-  PortableInterceptorC.h \
-  PortableInterceptorS.h
-
-CLEANFILES += \
-  PortableInterceptor-stamp \
-  AnyTypeCode/PortableInterceptorA.cpp \
-  AnyTypeCode/PortableInterceptorA.h \
-  PortableInterceptorC.cpp \
-  PortableInterceptorC.h \
-  PortableInterceptorS.h
-
-AnyTypeCode/PortableInterceptorA.cpp AnyTypeCode/PortableInterceptorA.h PortableInterceptorC.cpp PortableInterceptorC.h PortableInterceptorS.h: PortableInterceptor-stamp
-
-PortableInterceptor-stamp: $(srcdir)/PortableInterceptor.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/PortableInterceptor.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/ServicesA.cpp \
-  AnyTypeCode/ServicesA.h \
-  ServicesC.cpp \
-  ServicesC.h \
-  ServicesS.h
-
-CLEANFILES += \
-  Services-stamp \
-  AnyTypeCode/ServicesA.cpp \
-  AnyTypeCode/ServicesA.h \
-  ServicesC.cpp \
-  ServicesC.h \
-  ServicesS.h
-
-AnyTypeCode/ServicesA.cpp AnyTypeCode/ServicesA.h ServicesC.cpp ServicesC.h ServicesS.h: Services-stamp
-
-Services-stamp: $(srcdir)/Services.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Services.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/TAOA.cpp \
-  AnyTypeCode/TAOA.h \
-  TAOC.cpp \
-  TAOC.h \
-  TAOS.h
-
-CLEANFILES += \
-  TAO-stamp \
-  AnyTypeCode/TAOA.cpp \
-  AnyTypeCode/TAOA.h \
-  TAOC.cpp \
-  TAOC.h \
-  TAOS.h
-
-AnyTypeCode/TAOA.cpp AnyTypeCode/TAOA.h TAOC.cpp TAOC.h TAOS.h: TAO-stamp
-
-TAO-stamp: $(srcdir)/TAO.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/TAO.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/TimeBaseA.cpp \
-  AnyTypeCode/TimeBaseA.h \
-  TimeBaseC.cpp \
-  TimeBaseC.h \
-  TimeBaseS.h
-
-CLEANFILES += \
-  TimeBase-stamp \
-  AnyTypeCode/TimeBaseA.cpp \
-  AnyTypeCode/TimeBaseA.h \
-  TimeBaseC.cpp \
-  TimeBaseC.h \
-  TimeBaseS.h
-
-AnyTypeCode/TimeBaseA.cpp AnyTypeCode/TimeBaseA.h TimeBaseC.cpp TimeBaseC.h TimeBaseS.h: TimeBase-stamp
-
-TimeBase-stamp: $(srcdir)/TimeBase.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/TimeBase.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/BooleanSeqA.cpp \
-  AnyTypeCode/BooleanSeqA.h \
-  BooleanSeqC.cpp \
-  BooleanSeqC.h \
-  BooleanSeqS.h
-
-CLEANFILES += \
-  BooleanSeq-stamp \
-  AnyTypeCode/BooleanSeqA.cpp \
-  AnyTypeCode/BooleanSeqA.h \
-  BooleanSeqC.cpp \
-  BooleanSeqC.h \
-  BooleanSeqS.h
-
-AnyTypeCode/BooleanSeqA.cpp AnyTypeCode/BooleanSeqA.h BooleanSeqC.cpp BooleanSeqC.h BooleanSeqS.h: BooleanSeq-stamp
-
-BooleanSeq-stamp: $(srcdir)/BooleanSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/BooleanSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/CharSeqA.cpp \
-  AnyTypeCode/CharSeqA.h \
-  CharSeqC.cpp \
-  CharSeqC.h \
-  CharSeqS.h
-
-CLEANFILES += \
-  CharSeq-stamp \
-  AnyTypeCode/CharSeqA.cpp \
-  AnyTypeCode/CharSeqA.h \
-  CharSeqC.cpp \
-  CharSeqC.h \
-  CharSeqS.h
-
-AnyTypeCode/CharSeqA.cpp AnyTypeCode/CharSeqA.h CharSeqC.cpp CharSeqC.h CharSeqS.h: CharSeq-stamp
-
-CharSeq-stamp: $(srcdir)/CharSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/CharSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/DoubleSeqA.cpp \
-  AnyTypeCode/DoubleSeqA.h \
-  DoubleSeqC.cpp \
-  DoubleSeqC.h \
-  DoubleSeqS.h
-
-CLEANFILES += \
-  DoubleSeq-stamp \
-  AnyTypeCode/DoubleSeqA.cpp \
-  AnyTypeCode/DoubleSeqA.h \
-  DoubleSeqC.cpp \
-  DoubleSeqC.h \
-  DoubleSeqS.h
-
-AnyTypeCode/DoubleSeqA.cpp AnyTypeCode/DoubleSeqA.h DoubleSeqC.cpp DoubleSeqC.h DoubleSeqS.h: DoubleSeq-stamp
-
-DoubleSeq-stamp: $(srcdir)/DoubleSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/DoubleSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/FloatSeqA.cpp \
-  AnyTypeCode/FloatSeqA.h \
-  FloatSeqC.cpp \
-  FloatSeqC.h \
-  FloatSeqS.h
-
-CLEANFILES += \
-  FloatSeq-stamp \
-  AnyTypeCode/FloatSeqA.cpp \
-  AnyTypeCode/FloatSeqA.h \
-  FloatSeqC.cpp \
-  FloatSeqC.h \
-  FloatSeqS.h
-
-AnyTypeCode/FloatSeqA.cpp AnyTypeCode/FloatSeqA.h FloatSeqC.cpp FloatSeqC.h FloatSeqS.h: FloatSeq-stamp
-
-FloatSeq-stamp: $(srcdir)/FloatSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/FloatSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/LongDoubleSeqA.cpp \
-  AnyTypeCode/LongDoubleSeqA.h \
-  LongDoubleSeqC.cpp \
-  LongDoubleSeqC.h \
-  LongDoubleSeqS.h
-
-CLEANFILES += \
-  LongDoubleSeq-stamp \
-  AnyTypeCode/LongDoubleSeqA.cpp \
-  AnyTypeCode/LongDoubleSeqA.h \
-  LongDoubleSeqC.cpp \
-  LongDoubleSeqC.h \
-  LongDoubleSeqS.h
-
-AnyTypeCode/LongDoubleSeqA.cpp AnyTypeCode/LongDoubleSeqA.h LongDoubleSeqC.cpp LongDoubleSeqC.h LongDoubleSeqS.h: LongDoubleSeq-stamp
-
-LongDoubleSeq-stamp: $(srcdir)/LongDoubleSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongDoubleSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/LongLongSeqA.cpp \
-  AnyTypeCode/LongLongSeqA.h \
-  LongLongSeqC.cpp \
-  LongLongSeqC.h \
-  LongLongSeqS.h
-
-CLEANFILES += \
-  LongLongSeq-stamp \
-  AnyTypeCode/LongLongSeqA.cpp \
-  AnyTypeCode/LongLongSeqA.h \
-  LongLongSeqC.cpp \
-  LongLongSeqC.h \
-  LongLongSeqS.h
-
-AnyTypeCode/LongLongSeqA.cpp AnyTypeCode/LongLongSeqA.h LongLongSeqC.cpp LongLongSeqC.h LongLongSeqS.h: LongLongSeq-stamp
-
-LongLongSeq-stamp: $(srcdir)/LongLongSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongLongSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/LongSeqA.cpp \
-  AnyTypeCode/LongSeqA.h \
-  LongSeqC.cpp \
-  LongSeqC.h \
-  LongSeqS.h
-
-CLEANFILES += \
-  LongSeq-stamp \
-  AnyTypeCode/LongSeqA.cpp \
-  AnyTypeCode/LongSeqA.h \
-  LongSeqC.cpp \
-  LongSeqC.h \
-  LongSeqS.h
-
-AnyTypeCode/LongSeqA.cpp AnyTypeCode/LongSeqA.h LongSeqC.cpp LongSeqC.h LongSeqS.h: LongSeq-stamp
-
-LongSeq-stamp: $(srcdir)/LongSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/OctetSeqA.cpp \
-  AnyTypeCode/OctetSeqA.h \
-  OctetSeqC.cpp \
-  OctetSeqC.h \
-  OctetSeqS.h
-
-CLEANFILES += \
-  OctetSeq-stamp \
-  AnyTypeCode/OctetSeqA.cpp \
-  AnyTypeCode/OctetSeqA.h \
-  OctetSeqC.cpp \
-  OctetSeqC.h \
-  OctetSeqS.h
-
-AnyTypeCode/OctetSeqA.cpp AnyTypeCode/OctetSeqA.h OctetSeqC.cpp OctetSeqC.h OctetSeqS.h: OctetSeq-stamp
-
-OctetSeq-stamp: $(srcdir)/OctetSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/OctetSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/ShortSeqA.cpp \
-  AnyTypeCode/ShortSeqA.h \
-  ShortSeqC.cpp \
-  ShortSeqC.h \
-  ShortSeqS.h
-
-CLEANFILES += \
-  ShortSeq-stamp \
-  AnyTypeCode/ShortSeqA.cpp \
-  AnyTypeCode/ShortSeqA.h \
-  ShortSeqC.cpp \
-  ShortSeqC.h \
-  ShortSeqS.h
-
-AnyTypeCode/ShortSeqA.cpp AnyTypeCode/ShortSeqA.h ShortSeqC.cpp ShortSeqC.h ShortSeqS.h: ShortSeq-stamp
-
-ShortSeq-stamp: $(srcdir)/ShortSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/ShortSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/StringSeqA.cpp \
-  AnyTypeCode/StringSeqA.h \
-  StringSeqC.cpp \
-  StringSeqC.h \
-  StringSeqS.h
-
-CLEANFILES += \
-  StringSeq-stamp \
-  AnyTypeCode/StringSeqA.cpp \
-  AnyTypeCode/StringSeqA.h \
-  StringSeqC.cpp \
-  StringSeqC.h \
-  StringSeqS.h
-
-AnyTypeCode/StringSeqA.cpp AnyTypeCode/StringSeqA.h StringSeqC.cpp StringSeqC.h StringSeqS.h: StringSeq-stamp
-
-StringSeq-stamp: $(srcdir)/StringSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/StringSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/ULongLongSeqA.cpp \
-  AnyTypeCode/ULongLongSeqA.h \
-  ULongLongSeqC.cpp \
-  ULongLongSeqC.h \
-  ULongLongSeqS.h
-
-CLEANFILES += \
-  ULongLongSeq-stamp \
-  AnyTypeCode/ULongLongSeqA.cpp \
-  AnyTypeCode/ULongLongSeqA.h \
-  ULongLongSeqC.cpp \
-  ULongLongSeqC.h \
-  ULongLongSeqS.h
-
-AnyTypeCode/ULongLongSeqA.cpp AnyTypeCode/ULongLongSeqA.h ULongLongSeqC.cpp ULongLongSeqC.h ULongLongSeqS.h: ULongLongSeq-stamp
-
-ULongLongSeq-stamp: $(srcdir)/ULongLongSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/ULongLongSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/ULongSeqA.cpp \
-  AnyTypeCode/ULongSeqA.h \
-  ULongSeqC.cpp \
-  ULongSeqC.h \
-  ULongSeqS.h
-
-CLEANFILES += \
-  ULongSeq-stamp \
-  AnyTypeCode/ULongSeqA.cpp \
-  AnyTypeCode/ULongSeqA.h \
-  ULongSeqC.cpp \
-  ULongSeqC.h \
-  ULongSeqS.h
-
-AnyTypeCode/ULongSeqA.cpp AnyTypeCode/ULongSeqA.h ULongSeqC.cpp ULongSeqC.h ULongSeqS.h: ULongSeq-stamp
-
-ULongSeq-stamp: $(srcdir)/ULongSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/ULongSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/UShortSeqA.cpp \
-  AnyTypeCode/UShortSeqA.h \
-  UShortSeqC.cpp \
-  UShortSeqC.h \
-  UShortSeqS.h
-
-CLEANFILES += \
-  UShortSeq-stamp \
-  AnyTypeCode/UShortSeqA.cpp \
-  AnyTypeCode/UShortSeqA.h \
-  UShortSeqC.cpp \
-  UShortSeqC.h \
-  UShortSeqS.h
-
-AnyTypeCode/UShortSeqA.cpp AnyTypeCode/UShortSeqA.h UShortSeqC.cpp UShortSeqC.h UShortSeqS.h: UShortSeq-stamp
-
-UShortSeq-stamp: $(srcdir)/UShortSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/UShortSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/WCharSeqA.cpp \
-  AnyTypeCode/WCharSeqA.h \
-  WCharSeqC.cpp \
-  WCharSeqC.h \
-  WCharSeqS.h
-
-CLEANFILES += \
-  WCharSeq-stamp \
-  AnyTypeCode/WCharSeqA.cpp \
-  AnyTypeCode/WCharSeqA.h \
-  WCharSeqC.cpp \
-  WCharSeqC.h \
-  WCharSeqS.h
-
-AnyTypeCode/WCharSeqA.cpp AnyTypeCode/WCharSeqA.h WCharSeqC.cpp WCharSeqC.h WCharSeqS.h: WCharSeq-stamp
-
-WCharSeq-stamp: $(srcdir)/WCharSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/WCharSeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/WStringSeqA.cpp \
-  AnyTypeCode/WStringSeqA.h \
-  WStringSeqC.cpp \
-  WStringSeqC.h \
-  WStringSeqS.h
-
-CLEANFILES += \
-  WStringSeq-stamp \
-  AnyTypeCode/WStringSeqA.cpp \
-  AnyTypeCode/WStringSeqA.h \
-  WStringSeqC.cpp \
-  WStringSeqC.h \
-  WStringSeqS.h
-
-AnyTypeCode/WStringSeqA.cpp AnyTypeCode/WStringSeqA.h WStringSeqC.cpp WStringSeqC.h WStringSeqS.h: WStringSeq-stamp
-
-WStringSeq-stamp: $(srcdir)/WStringSeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/WStringSeq.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO.la
-
-libTAO_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_BUILD_DLL
-
-libTAO_la_SOURCES = \
-  Abstract_Servant_Base.cpp \
-  Acceptor_Filter.cpp \
-  Acceptor_Registry.cpp \
-  Adapter.cpp \
-  Adapter_Factory.cpp \
-  Adapter_Registry.cpp \
-  AnyTypeCode_Adapter.cpp \
-  Argument.cpp \
-  Asynch_Queued_Message.cpp \
-  Asynch_Reply_Dispatcher_Base.cpp \
-  Base_Transport_Property.cpp \
-  BiDir_Adapter.cpp \
-  Bind_Dispatcher_Guard.cpp \
-  Block_Flushing_Strategy.cpp \
-  Blocked_Connect_Strategy.cpp \
-  BooleanSeqC.cpp \
-  CDR.cpp \
-  CONV_FRAMEC.cpp \
-  CORBALOC_Parser.cpp \
-  CORBANAME_Parser.cpp \
-  CORBA_String.cpp \
-  CharSeqC.cpp \
-  Cleanup_Func_Registry.cpp \
-  ClientRequestInterceptor_Adapter.cpp \
-  ClientRequestInterceptor_Adapter_Factory.cpp \
-  Client_Strategy_Factory.cpp \
-  Codeset_Manager.cpp \
-  Codeset_Manager_Factory_Base.cpp \
-  Codeset_Translator_Base.cpp \
-  Collocated_Invocation.cpp \
-  Collocation_Proxy_Broker.cpp \
-  Collocation_Resolver.cpp \
-  Configurable_Refcount.cpp \
-  Connect_Strategy.cpp \
-  Connection_Handler.cpp \
-  Connection_Purging_Strategy.cpp \
-  Connector_Registry.cpp \
-  CurrentC.cpp \
-  DLL_Parser.cpp \
-  Default_Collocation_Resolver.cpp \
-  Default_Endpoint_Selector_Factory.cpp \
-  Default_Stub_Factory.cpp \
-  Default_Thread_Lane_Resources_Manager.cpp \
-  DoubleSeqC.cpp \
-  Dynamic_Adapter.cpp \
-  Endpoint.cpp \
-  Endpoint_Selector_Factory.cpp \
-  Environment.cpp \
-  Exception.cpp \
-  Exclusive_TMS.cpp \
-  FILE_Parser.cpp \
-  Fault_Tolerance_Service.cpp \
-  FloatSeqC.cpp \
-  Flushing_Strategy.cpp \
-  GIOPC.cpp \
-  GIOP_Fragmentation_Strategy.cpp \
-  GIOP_Message_Base.cpp \
-  GIOP_Message_Generator_Parser.cpp \
-  GIOP_Message_Generator_Parser_10.cpp \
-  GIOP_Message_Generator_Parser_11.cpp \
-  GIOP_Message_Generator_Parser_12.cpp \
-  GIOP_Message_Generator_Parser_Impl.cpp \
-  GIOP_Message_Locate_Header.cpp \
-  GIOP_Message_State.cpp \
-  GIOP_Message_Version.cpp \
-  GUIResource_Factory.cpp \
-  HTTP_Client.cpp \
-  HTTP_Handler.cpp \
-  HTTP_Parser.cpp \
-  IFR_Client_Adapter.cpp \
-  IIOPC.cpp \
-  IIOP_Acceptor.cpp \
-  IIOP_Connection_Handler.cpp \
-  IIOP_Connector.cpp \
-  IIOP_Endpoint.cpp \
-  IIOP_EndpointsC.cpp \
-  IIOP_Factory.cpp \
-  IIOP_Profile.cpp \
-  IIOP_Transport.cpp \
-  IOPC.cpp \
-  IORInterceptor_Adapter.cpp \
-  IORInterceptor_Adapter_Factory.cpp \
-  IOR_Parser.cpp \
-  Incoming_Message_Queue.cpp \
-  Incoming_Message_Stack.cpp \
-  Invocation_Adapter.cpp \
-  Invocation_Base.cpp \
-  Invocation_Endpoint_Selectors.cpp \
-  LF_CH_Event.cpp \
-  LF_Connect_Strategy.cpp \
-  LF_Event.cpp \
-  LF_Event_Binder.cpp \
-  LF_Event_Loop_Thread_Helper.cpp \
-  LF_Follower.cpp \
-  LF_Follower_Auto_Adder.cpp \
-  LF_Follower_Auto_Ptr.cpp \
-  LF_Invocation_Event.cpp \
-  LF_Multi_Event.cpp \
-  LF_Strategy.cpp \
-  LF_Strategy_Complete.cpp \
-  LRU_Connection_Purging_Strategy.cpp \
-  Leader_Follower.cpp \
-  Leader_Follower_Flushing_Strategy.cpp \
-  LocalObject.cpp \
-  LocateRequest_Invocation.cpp \
-  LocateRequest_Invocation_Adapter.cpp \
-  LongDoubleSeqC.cpp \
-  LongLongSeqC.cpp \
-  LongSeqC.cpp \
-  MCAST_Parser.cpp \
-  MMAP_Allocator.cpp \
-  MProfile.cpp \
-  Messaging_PolicyValueC.cpp \
-  Messaging_SyncScopeC.cpp \
-  Muxed_TMS.cpp \
-  NVList_Adapter.cpp \
-  Network_Priority_Protocols_Hooks.cpp \
-  New_Leader_Generator.cpp \
-  Null_Fragmentation_Strategy.cpp \
-  ORB.cpp \
-  ORBInitializer_Registry.cpp \
-  ORBInitializer_Registry_Adapter.cpp \
-  ORB_Core.cpp \
-  ORB_Core_Auto_Ptr.cpp \
-  ORB_Core_TSS_Resources.cpp \
-  ORB_Table.cpp \
-  Object.cpp \
-  ObjectIdListC.cpp \
-  ObjectKey_Table.cpp \
-  Object_KeyC.cpp \
-  Object_Loader.cpp \
-  Object_Proxy_Broker.cpp \
-  Object_Ref_Table.cpp \
-  OctetSeqC.cpp \
-  On_Demand_Fragmentation_Strategy.cpp \
-  PI_ForwardC.cpp \
-  ParameterModeC.cpp \
-  Parser_Registry.cpp \
-  Pluggable_Messaging_Utils.cpp \
-  PolicyC.cpp \
-  PolicyFactory_Registry_Adapter.cpp \
-  PolicyFactory_Registry_Factory.cpp \
-  Policy_Current.cpp \
-  Policy_CurrentC.cpp \
-  Policy_Current_Impl.cpp \
-  Policy_ForwardC.cpp \
-  Policy_Manager.cpp \
-  Policy_ManagerC.cpp \
-  Policy_Set.cpp \
-  Policy_Validator.cpp \
-  PortableInterceptorC.cpp \
-  Principal.cpp \
-  Profile.cpp \
-  Profile_Transport_Resolver.cpp \
-  Protocol_Factory.cpp \
-  Protocols_Hooks.cpp \
-  Queued_Data.cpp \
-  Queued_Message.cpp \
-  Reactive_Connect_Strategy.cpp \
-  Reactive_Flushing_Strategy.cpp \
-  Refcounted_ObjectKey.cpp \
-  Remote_Invocation.cpp \
-  Remote_Object_Proxy_Broker.cpp \
-  Reply_Dispatcher.cpp \
-  Request_Dispatcher.cpp \
-  RequestInterceptor_Adapter.cpp \
-  Resource_Factory.cpp \
-  Resume_Handle.cpp \
-  ServerRequestInterceptor_Adapter.cpp \
-  ServerRequestInterceptor_Adapter_Factory.cpp \
-  Server_Strategy_Factory.cpp \
-  Service_Callbacks.cpp \
-  Service_Context.cpp \
-  Service_Context_Handler.cpp \
-  Service_Context_Handler_Registry.cpp \
-  ServicesC.cpp \
-  Services_Activate.cpp \
-  ShortSeqC.cpp \
-  StringSeqC.cpp \
-  String_Alloc.cpp \
-  Stub.cpp \
-  Stub_Factory.cpp \
-  Synch_Invocation.cpp \
-  Synch_Queued_Message.cpp \
-  Synch_Reply_Dispatcher.cpp \
-  SystemException.cpp \
-  TAOC.cpp \
-  TAO_Internal.cpp \
-  TAO_Server_Request.cpp \
-  TAO_Singleton_Manager.cpp \
-  TSS_Resources.cpp \
-  Tagged_Components.cpp \
-  Tagged_Profile.cpp \
-  Thread_Lane_Resources.cpp \
-  Thread_Lane_Resources_Manager.cpp \
-  Thread_Per_Connection_Handler.cpp \
-  TimeBaseC.cpp \
-  Transport.cpp \
-  Transport_Acceptor.cpp \
-  Transport_Connector.cpp \
-  Transport_Descriptor_Interface.cpp \
-  Transport_Mux_Strategy.cpp \
-  Transport_Queueing_Strategies.cpp \
-  Transport_Selection_Guard.cpp \
-  Transport_Timer.cpp \
-  TypeCodeFactory_Adapter.cpp \
-  Typecode_typesC.cpp \
-  ULongLongSeqC.cpp \
-  ULongSeqC.cpp \
-  UShortSeqC.cpp \
-  UserException.cpp \
-  Valuetype_Adapter.cpp \
-  Valuetype_Adapter_Factory.cpp \
-  WCharSeqC.cpp \
-  WStringSeqC.cpp \
-  Wait_On_LF_No_Upcall.cpp \
-  Wait_On_Leader_Follower.cpp \
-  Wait_On_Reactor.cpp \
-  Wait_On_Read.cpp \
-  Wait_Strategy.cpp \
-  WrongTransactionC.cpp \
-  ZIOP_Adapter.cpp \
-  debug.cpp \
-  default_client.cpp \
-  default_resource.cpp \
-  default_server.cpp \
-  operation_details.cpp \
-  orb_typesC.cpp \
-  params.cpp \
-  target_specification.cpp
-
-libTAO_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS = \
-  Abstract_Servant_Base.h \
-  Abstract_Servant_Base.inl \
-  Acceptor_Filter.h \
-  Acceptor_Impl.cpp \
-  Acceptor_Impl.h \
-  Acceptor_Registry.h \
-  Acceptor_Registry.inl \
-  Adapter.h \
-  Adapter_Factory.h \
-  Adapter_Registry.h \
-  Allocator.h \
-  AnyTypeCode_Adapter.h \
-  Any_Insert_Policy_T.h \
-  Arg_Traits_T.h \
-  Argument.h \
-  Array_Traits_T.h \
-  Array_VarOut_T.cpp \
-  Array_VarOut_T.h \
-  Array_VarOut_T.inl \
-  Asynch_Queued_Message.h \
-  Asynch_Reply_Dispatcher_Base.h \
-  Asynch_Reply_Dispatcher_Base.inl \
-  Auto_Functor.h \
-  BD_String_Argument_T.cpp \
-  BD_String_Argument_T.h \
-  BD_String_Argument_T.inl \
-  Base_Transport_Property.h \
-  Base_Transport_Property.inl \
-  Basic_Argument_T.cpp \
-  Basic_Argument_T.h \
-  Basic_Argument_T.inl \
-  Basic_Arguments.h \
-  Basic_Types.h \
-  BiDir_Adapter.h \
-  Bind_Dispatcher_Guard.h \
-  Bind_Dispatcher_Guard.inl \
-  Block_Flushing_Strategy.h \
-  Blocked_Connect_Strategy.h \
-  BooleanSeq.pidl \
-  BooleanSeqC.h \
-  BooleanSeqS.h \
-  Bounded_Array_Allocation_Traits_T.h \
-  Bounded_Array_Sequence_T.h \
-  Bounded_Basic_String_Sequence_T.h \
-  Bounded_Object_Reference_Sequence_T.h \
-  Bounded_Reference_Allocation_Traits_T.h \
-  Bounded_Sequence_CDR_T.h \
-  Bounded_Value_Allocation_Traits_T.h \
-  Bounded_Value_Sequence_T.h \
-  Buffer_Allocator_T.cpp \
-  Buffer_Allocator_T.h \
-  CDR.h \
-  CDR.inl \
-  CONV_FRAME.pidl \
-  CONV_FRAMEC.h \
-  CONV_FRAMES.h \
-  CORBALOC_Parser.h \
-  CORBALOC_Parser.inl \
-  CORBANAME_Parser.h \
-  CORBA_String.h \
-  CORBA_String.inl \
-  CORBA_methods.h \
-  Cache_Entries_T.cpp \
-  Cache_Entries_T.h \
-  Cache_Entries_T.inl \
-  CharSeq.pidl \
-  CharSeqC.h \
-  CharSeqS.h \
-  Cleanup_Func_Registry.h \
-  Cleanup_Func_Registry.inl \
-  ClientRequestInterceptor_Adapter.h \
-  ClientRequestInterceptor_Adapter_Factory.h \
-  Client_Strategy_Factory.h \
-  Codeset_Descriptor_Base.h \
-  Codeset_Manager.h \
-  Codeset_Manager_Factory_Base.h \
-  Codeset_Translator_Base.h \
-  Collocated_Invocation.h \
-  Collocation_Proxy_Broker.h \
-  Collocation_Resolver.h \
-  Collocation_Strategy.h \
-  Condition.cpp \
-  Condition.h \
-  Condition.inl \
-  Configurable_Refcount.h \
-  Configurable_Refcount.inl \
-  Connect_Strategy.h \
-  Connection_Handler.h \
-  Connection_Handler.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Connector_Impl.cpp \
-  Connector_Impl.h \
-  Connector_Registry.h \
-  Connector_Registry.inl \
-  Current.pidl \
-  CurrentC.h \
-  CurrentS.h \
-  DLL_Parser.h \
-  Default_Collocation_Resolver.h \
-  Default_Endpoint_Selector_Factory.h \
-  Default_Stub_Factory.h \
-  Default_Thread_Lane_Resources_Manager.h \
-  DoubleSeq.pidl \
-  DoubleSeqC.h \
-  DoubleSeqS.h \
-  Dynamic_Adapter.h \
-  Endpoint.h \
-  Endpoint.inl \
-  Endpoint_Selector_Factory.h \
-  Environment.h \
-  Environment.inl \
-  Exception.h \
-  Exception.inl \
-  Exception_Data.h \
-  Exclusive_TMS.h \
-  FILE_Parser.h \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.inl \
-  Fixed_Array_Argument_T.cpp \
-  Fixed_Array_Argument_T.h \
-  Fixed_Array_Argument_T.inl \
-  Fixed_Size_Argument_T.cpp \
-  Fixed_Size_Argument_T.h \
-  Fixed_Size_Argument_T.inl \
-  FloatSeq.pidl \
-  FloatSeqC.h \
-  FloatSeqS.h \
-  Flushing_Strategy.h \
-  GIOP.pidl \
-  GIOPC.h \
-  GIOPC.inl \
-  GIOPS.h \
-  GIOP_Fragmentation_Strategy.h \
-  GIOP_Message_Base.h \
-  GIOP_Message_Generator_Parser.h \
-  GIOP_Message_Generator_Parser_10.h \
-  GIOP_Message_Generator_Parser_11.h \
-  GIOP_Message_Generator_Parser_12.h \
-  GIOP_Message_Generator_Parser_Impl.h \
-  GIOP_Message_Generator_Parser_Impl.inl \
-  GIOP_Message_Locate_Header.h \
-  GIOP_Message_Locate_Header.inl \
-  GIOP_Message_State.h \
-  GIOP_Message_State.inl \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  GIOP_Utils.h \
-  GUIResource_Factory.h \
-  Generic_Sequence_T.h \
-  HTTP_Client.h \
-  HTTP_Handler.h \
-  HTTP_Parser.h \
-  IFR_Client_Adapter.h \
-  IIOP.pidl \
-  IIOPC.h \
-  IIOP_Acceptor.h \
-  IIOP_Acceptor.inl \
-  IIOP_Connection_Handler.h \
-  IIOP_Connector.h \
-  IIOP_Endpoint.h \
-  IIOP_Endpoint.inl \
-  IIOP_Endpoints.pidl \
-  IIOP_EndpointsC.h \
-  IIOP_EndpointsS.h \
-  IIOP_Factory.h \
-  IIOP_Profile.h \
-  IIOP_Transport.h \
-  IOP.pidl \
-  IOPC.h \
-  IOPS.h \
-  IORInterceptor_Adapter.h \
-  IORInterceptor_Adapter_Factory.h \
-  IOR_Parser.h \
-  Incoming_Message_Queue.h \
-  Incoming_Message_Queue.inl \
-  Incoming_Message_Stack.h \
-  Incoming_Message_Stack.inl \
-  InterfaceDef.pidl \
-  Intrusive_Ref_Count_Base_T.cpp \
-  Intrusive_Ref_Count_Base_T.h \
-  Intrusive_Ref_Count_Base_T.inl \
-  Intrusive_Ref_Count_Handle_T.cpp \
-  Intrusive_Ref_Count_Handle_T.h \
-  Intrusive_Ref_Count_Handle_T.inl \
-  Intrusive_Ref_Count_Object_T.cpp \
-  Intrusive_Ref_Count_Object_T.h \
-  Intrusive_Ref_Count_Object_T.inl \
-  InvalidName.pidl \
-  Invocation_Adapter.h \
-  Invocation_Adapter.inl \
-  Invocation_Base.h \
-  Invocation_Base.inl \
-  Invocation_Endpoint_Selectors.h \
-  Invocation_Utils.h \
-  LF_CH_Event.h \
-  LF_Connect_Strategy.h \
-  LF_Event.h \
-  LF_Event.inl \
-  LF_Event_Binder.h \
-  LF_Event_Binder.inl \
-  LF_Event_Loop_Thread_Helper.h \
-  LF_Event_Loop_Thread_Helper.inl \
-  LF_Follower.h \
-  LF_Follower.inl \
-  LF_Follower_Auto_Adder.h \
-  LF_Follower_Auto_Adder.inl \
-  LF_Follower_Auto_Ptr.h \
-  LF_Follower_Auto_Ptr.inl \
-  LF_Invocation_Event.h \
-  LF_Multi_Event.h \
-  LF_Strategy.h \
-  LF_Strategy_Complete.h \
-  LRU_Connection_Purging_Strategy.h \
-  Leader_Follower.h \
-  Leader_Follower.inl \
-  Leader_Follower_Flushing_Strategy.h \
-  Load_Protocol_Factory_T.h \
-  LocalObject.h \
-  LocalObject.inl \
-  LocateRequest_Invocation.h \
-  LocateRequest_Invocation_Adapter.h \
-  LongDoubleSeq.pidl \
-  LongDoubleSeqC.h \
-  LongDoubleSeqS.h \
-  LongLongSeq.pidl \
-  LongLongSeqC.h \
-  LongLongSeqS.h \
-  LongSeq.pidl \
-  LongSeqC.h \
-  LongSeqS.h \
-  MCAST_Parser.h \
-  MCAST_Parser.inl \
-  Message_Semantics.h \
-  MMAP_Allocator.h \
-  MM_Sequence_Iterator_T.h \
-  MProfile.h \
-  MProfile.inl \
-  Messaging_PolicyValue.pidl \
-  Messaging_PolicyValueC.h \
-  Messaging_SyncScope.pidl \
-  Messaging_SyncScopeC.h \
-  Muxed_TMS.h \
-  NVList_Adapter.h \
-  Network_Priority_Protocols_Hooks.h \
-  New_Leader_Generator.h \
-  Null_Fragmentation_Strategy.h \
-  ORB.h \
-  ORB.inl \
-  ORBInitializer_Registry.h \
-  ORBInitializer_Registry_Adapter.h \
-  ORB_Constants.h \
-  ORB_Core.h \
-  ORB_Core.inl \
-  ORB_Core_Auto_Ptr.h \
-  ORB_Core_Auto_Ptr.inl \
-  ORB_Core_TSS_Resources.h \
-  ORB_Table.h \
-  ORB_Table.inl \
-  Object.h \
-  Object.inl \
-  ObjectIdList.pidl \
-  ObjectIdListC.h \
-  ObjectKey_Table.h \
-  Object_Argument_T.cpp \
-  Object_Argument_T.h \
-  Object_Argument_T.inl \
-  Object_Key.pidl \
-  Object_KeyC.h \
-  Object_Loader.h \
-  Object_Proxy_Broker.h \
-  Object_Ref_Table.h \
-  Object_Ref_Table.inl \
-  Object_Reference_Const_Sequence_Element_T.h \
-  Object_Reference_Sequence_Element_T.h \
-  Object_Reference_Traits_Base_T.h \
-  Object_Reference_Traits_T.h \
-  Object_T.cpp \
-  Object_T.h \
-  Objref_VarOut_T.cpp \
-  Objref_VarOut_T.h \
-  Objref_VarOut_T.inl \
-  OctetSeq.pidl \
-  OctetSeqC.h \
-  OctetSeqS.h \
-  On_Demand_Fragmentation_Strategy.h \
-  PI_Forward.pidl \
-  PI_ForwardC.h \
-  ParameterMode.pidl \
-  ParameterModeC.h \
-  ParameterModeS.h \
-  Parser_Registry.h \
-  Parser_Registry.inl \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.inl \
-  Policy.pidl \
-  PolicyC.h \
-  PolicyC.inl \
-  PolicyFactory_Registry_Adapter.h \
-  PolicyFactory_Registry_Factory.h \
-  PolicyS.h \
-  Policy_Current.h \
-  Policy_Current.inl \
-  Policy_Current.pidl \
-  Policy_CurrentC.h \
-  Policy_CurrentS.h \
-  Policy_Current_Impl.h \
-  Policy_Current_Impl.inl \
-  Policy_Forward.pidl \
-  Policy_ForwardC.h \
-  Policy_ForwardS.h \
-  Policy_Manager.h \
-  Policy_Manager.inl \
-  Policy_Manager.pidl \
-  Policy_ManagerC.h \
-  Policy_ManagerS.h \
-  Policy_Set.h \
-  Policy_Set.inl \
-  Policy_Validator.h \
-  PortableInterceptor.h \
-  PortableInterceptor.pidl \
-  PortableInterceptorC.h \
-  PortableInterceptorS.h \
-  Principal.h \
-  Principal.inl \
-  Profile.h \
-  Profile.inl \
-  Profile_Transport_Resolver.h \
-  Profile_Transport_Resolver.inl \
-  Protocol_Factory.h \
-  Protocols_Hooks.h \
-  Pseudo_VarOut_T.cpp \
-  Pseudo_VarOut_T.h \
-  Pseudo_VarOut_T.inl \
-  Queued_Data.h \
-  Queued_Data.inl \
-  Queued_Message.h \
-  Queued_Message.inl \
-  Range_Checking_T.h \
-  Reactive_Connect_Strategy.h \
-  Reactive_Flushing_Strategy.h \
-  Refcounted_ObjectKey.h \
-  Refcounted_ObjectKey.inl \
-  Remote_Invocation.h \
-  Remote_Object_Proxy_Broker.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.inl \
-  Request_Dispatcher.h \
-  RequestInterceptor_Adapter.h \
-  Resource_Factory.h \
-  Resume_Handle.h \
-  Resume_Handle.inl \
-  Seq_Out_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Sequence_T.h \
-  ServerRequestInterceptor_Adapter.h \
-  ServerRequestInterceptor_Adapter_Factory.h \
-  Server_Strategy_Factory.h \
-  Service_Callbacks.h \
-  Service_Context.h \
-  Service_Context.inl \
-  Service_Context_Handler.h \
-  Service_Context_Handler_Registry.h \
-  Services.pidl \
-  ServicesC.h \
-  ServicesS.h \
-  Services_Activate.h \
-  ShortSeq.pidl \
-  ShortSeqC.h \
-  ShortSeqS.h \
-  Special_Basic_Argument_T.cpp \
-  Special_Basic_Argument_T.h \
-  Special_Basic_Argument_T.inl \
-  Special_Basic_Arguments.h \
-  StringSeq.pidl \
-  StringSeqC.h \
-  StringSeqS.h \
-  String_Alloc.h \
-  String_Const_Sequence_Element_T.h \
-  String_Manager_T.h \
-  String_Sequence_Element_T.h \
-  String_Traits_Base_T.h \
-  String_Traits_T.h \
-  Stub.h \
-  Stub.inl \
-  Stub_Factory.h \
-  Synch_Invocation.h \
-  Synch_Invocation.inl \
-  Synch_Queued_Message.h \
-  Synch_Reply_Dispatcher.h \
-  SystemException.h \
-  SystemException.inl \
-  TAO.pidl \
-  TAOC.h \
-  TAOS.h \
-  TAO_Export.h \
-  TAO_Internal.h \
-  TAO_Server_Request.h \
-  TAO_Server_Request.inl \
-  TAO_Singleton.cpp \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TSS_Resources.h \
-  Tagged_Components.h \
-  Tagged_Components.inl \
-  Tagged_Profile.h \
-  Tagged_Profile.inl \
-  Thread_Lane_Resources.h \
-  Thread_Lane_Resources_Manager.h \
-  Thread_Per_Connection_Handler.h \
-  TimeBase.pidl \
-  TimeBaseC.h \
-  TimeBaseS.h \
-  Timeprobe.h \
-  Transport.h \
-  Transport.inl \
-  Transport_Acceptor.h \
-  Transport_Acceptor.inl \
-  Transport_Cache_Manager.h \
-  Transport_Cache_Manager_T.cpp \
-  Transport_Cache_Manager_T.h \
-  Transport_Cache_Manager_T.inl \
-  Transport_Connector.h \
-  Transport_Connector.inl \
-  Transport_Descriptor_Interface.h \
-  Transport_Descriptor_Interface.inl \
-  Transport_Mux_Strategy.h \
-  Transport_Queueing_Strategies.h \
-  Transport_Selection_Guard.h \
-  Transport_Timer.h \
-  TypeCodeFactory_Adapter.h \
-  Typecode_types.pidl \
-  Typecode_typesC.h \
-  Typecode_typesS.h \
-  UB_String_Argument_T.cpp \
-  UB_String_Argument_T.h \
-  UB_String_Argument_T.inl \
-  UB_String_Arguments.h \
-  Unbounded_BD_String_Sequence_T.h \
-  Bounded_BD_String_Sequence_T.h \
-  ULongLongSeq.pidl \
-  ULongLongSeqC.h \
-  ULongLongSeqS.h \
-  ULongSeq.pidl \
-  ULongSeqC.h \
-  ULongSeqS.h \
-  UShortSeq.pidl \
-  UShortSeqC.h \
-  UShortSeqS.h \
-  Unbounded_Array_Allocation_Traits_T.h \
-  Unbounded_Array_Sequence_T.h \
-  Unbounded_Basic_String_Sequence_T.h \
-  Unbounded_Object_Reference_Sequence_T.h \
-  Unbounded_Octet_Sequence_T.h \
-  Unbounded_Reference_Allocation_Traits_T.h \
-  Unbounded_Sequence_CDR_T.h \
-  Unbounded_Value_Allocation_Traits_T.h \
-  Unbounded_Value_Sequence_T.h \
-  UserException.h \
-  UserException.inl \
-  Value_Traits_T.h \
-  Valuetype_Adapter.h \
-  Valuetype_Adapter_Factory.h \
-  VarOut_T.cpp \
-  VarOut_T.h \
-  VarOut_T.inl \
-  Var_Array_Argument_T.cpp \
-  Var_Array_Argument_T.h \
-  Var_Array_Argument_T.inl \
-  Var_Size_Argument_T.cpp \
-  Var_Size_Argument_T.h \
-  Var_Size_Argument_T.inl \
-  Version.h \
-  Versioned_Namespace.h \
-  WCharSeq.pidl \
-  WCharSeqC.h \
-  WCharSeqS.h \
-  WStringSeq.pidl \
-  WStringSeqC.h \
-  WStringSeqS.h \
-  Wait_On_LF_No_Upcall.h \
-  Wait_On_Leader_Follower.h \
-  Wait_On_Reactor.h \
-  Wait_On_Read.h \
-  Wait_Strategy.h \
-  Wait_Strategy.inl \
-  WrongTransaction.pidl \
-  WrongTransactionC.h \
-  WrongTransactionS.h \
-  ZIOP_Adapter.h \
-  corba.h \
-  corbafwd.h \
-  debug.h \
-  default_client.h \
-  default_environment.h \
-  default_ports.h \
-  default_resource.h \
-  default_server.h \
-  objectid.h \
-  operation_details.h \
-  operation_details.inl \
-  orb.idl \
-  orb_types.pidl \
-  orb_typesC.h \
-  orb_typesS.h \
-  orbconf.h \
-  params.h \
-  params.inl \
-  target_specification.h \
-  target_specification.inl \
-  varbase.h
-
-pkgconfig_DATA += \
-  TAO.pc
-
-CLEANFILES += \
-  TAO.pc
-
-TAO.pc: ${top_builddir}/config.status ${srcdir}/TAO.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST = \
-  TAO.pc.in \
-  tao.rc
-
-
-## Makefile.Codeset.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  Codeset/CodeSetContextC.cpp \
-  Codeset/CodeSetContextC.h \
-  Codeset/CodeSetContextS.h
-
-CLEANFILES += \
-  Codeset/CodeSetContext-stamp \
-  Codeset/CodeSetContextC.cpp \
-  Codeset/CodeSetContextC.h \
-  Codeset/CodeSetContextS.h
-
-Codeset/CodeSetContextC.cpp Codeset/CodeSetContextC.h Codeset/CodeSetContextS.h: Codeset/CodeSetContext-stamp
-
-Codeset/CodeSetContext-stamp: $(srcdir)/Codeset/CodeSetContext.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Sorb -Wb,export_macro=TAO_Codeset_Export -Wb,export_include=tao/Codeset/codeset_export.h -o Codeset $(srcdir)/Codeset/CodeSetContext.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_Codeset.la
-
-libTAO_Codeset_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_CODESET_BUILD_DLL
-
-libTAO_Codeset_la_SOURCES = \
-  Codeset/CodeSetContextC.cpp \
-  Codeset/Codeset.cpp \
-  Codeset/Codeset_Descriptor.cpp \
-  Codeset/Codeset_Manager_Factory.cpp \
-  Codeset/Codeset_Manager_i.cpp \
-  Codeset/Codeset_Service_Context_Handler.cpp \
-  Codeset/Codeset_Translator_Factory.cpp \
-  Codeset/UTF16_BOM_Factory.cpp \
-  Codeset/UTF16_BOM_Translator.cpp \
-  Codeset/UTF8_Latin1_Factory.cpp \
-  Codeset/UTF8_Latin1_Translator.cpp
-
-libTAO_Codeset_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Codeset_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Codeset/CodeSetContext.pidl \
-  Codeset/CodeSetContextC.h \
-  Codeset/CodeSetContextS.h \
-  Codeset/Codeset.h \
-  Codeset/Codeset_Service_Context_Handler.h \
-  Codeset/Codeset_Descriptor.h \
-  Codeset/Codeset_Manager_Factory.h \
-  Codeset/Codeset_Manager_i.h \
-  Codeset/Codeset_Translator_Factory.h \
-  Codeset/Codeset_Translator_Factory_T.cpp \
-  Codeset/Codeset_Translator_Factory_T.h \
-  Codeset/UTF16_BOM_Factory.h \
-  Codeset/UTF16_BOM_Translator.h \
-  Codeset/UTF8_Latin1_Factory.h \
-  Codeset/UTF8_Latin1_Translator.h \
-  Codeset/codeset_export.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.AnyTypeCode.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  AnyTypeCode/AnySeqA.cpp \
-  AnyTypeCode/AnySeqA.h \
-  AnyTypeCode/AnySeqC.cpp \
-  AnyTypeCode/AnySeqC.h
-
-CLEANFILES += \
-  AnyTypeCode/AnySeq-stamp \
-  AnyTypeCode/AnySeqA.cpp \
-  AnyTypeCode/AnySeqA.h \
-  AnyTypeCode/AnySeqC.cpp \
-  AnyTypeCode/AnySeqC.h
-
-AnyTypeCode/AnySeqA.cpp AnyTypeCode/AnySeqA.h AnyTypeCode/AnySeqC.cpp AnyTypeCode/AnySeqC.h: AnyTypeCode/AnySeq-stamp
-
-AnyTypeCode/AnySeq-stamp: $(srcdir)/AnyTypeCode/AnySeq.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode -Sorb $(srcdir)/AnyTypeCode/AnySeq.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/Dynamic_ParameterA.cpp \
-  AnyTypeCode/Dynamic_ParameterA.h \
-  AnyTypeCode/Dynamic_ParameterC.cpp \
-  AnyTypeCode/Dynamic_ParameterC.h
-
-CLEANFILES += \
-  AnyTypeCode/Dynamic_Parameter-stamp \
-  AnyTypeCode/Dynamic_ParameterA.cpp \
-  AnyTypeCode/Dynamic_ParameterA.h \
-  AnyTypeCode/Dynamic_ParameterC.cpp \
-  AnyTypeCode/Dynamic_ParameterC.h
-
-AnyTypeCode/Dynamic_ParameterA.cpp AnyTypeCode/Dynamic_ParameterA.h AnyTypeCode/Dynamic_ParameterC.cpp AnyTypeCode/Dynamic_ParameterC.h: AnyTypeCode/Dynamic_Parameter-stamp
-
-AnyTypeCode/Dynamic_Parameter-stamp: $(srcdir)/AnyTypeCode/Dynamic_Parameter.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode -Sorb $(srcdir)/AnyTypeCode/Dynamic_Parameter.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/ValueModifierA.cpp \
-  AnyTypeCode/ValueModifierA.h \
-  AnyTypeCode/ValueModifierC.cpp \
-  AnyTypeCode/ValueModifierC.h
-
-CLEANFILES += \
-  AnyTypeCode/ValueModifier-stamp \
-  AnyTypeCode/ValueModifierA.cpp \
-  AnyTypeCode/ValueModifierA.h \
-  AnyTypeCode/ValueModifierC.cpp \
-  AnyTypeCode/ValueModifierC.h
-
-AnyTypeCode/ValueModifierA.cpp AnyTypeCode/ValueModifierA.h AnyTypeCode/ValueModifierC.cpp AnyTypeCode/ValueModifierC.h: AnyTypeCode/ValueModifier-stamp
-
-AnyTypeCode/ValueModifier-stamp: $(srcdir)/AnyTypeCode/ValueModifier.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode -Sorb $(srcdir)/AnyTypeCode/ValueModifier.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/VisibilityA.cpp \
-  AnyTypeCode/VisibilityA.h \
-  AnyTypeCode/VisibilityC.cpp \
-  AnyTypeCode/VisibilityC.h
-
-CLEANFILES += \
-  AnyTypeCode/Visibility-stamp \
-  AnyTypeCode/VisibilityA.cpp \
-  AnyTypeCode/VisibilityA.h \
-  AnyTypeCode/VisibilityC.cpp \
-  AnyTypeCode/VisibilityC.h
-
-AnyTypeCode/VisibilityA.cpp AnyTypeCode/VisibilityA.h AnyTypeCode/VisibilityC.cpp AnyTypeCode/VisibilityC.h: AnyTypeCode/Visibility-stamp
-
-AnyTypeCode/Visibility-stamp: $(srcdir)/AnyTypeCode/Visibility.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode -Sorb $(srcdir)/AnyTypeCode/Visibility.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/DynamicA.cpp \
-  AnyTypeCode/DynamicA.h \
-  AnyTypeCode/DynamicC.cpp \
-  AnyTypeCode/DynamicC.h
-
-CLEANFILES += \
-  AnyTypeCode/Dynamic-stamp \
-  AnyTypeCode/DynamicA.cpp \
-  AnyTypeCode/DynamicA.h \
-  AnyTypeCode/DynamicC.cpp \
-  AnyTypeCode/DynamicC.h
-
-AnyTypeCode/DynamicA.cpp AnyTypeCode/DynamicA.h AnyTypeCode/DynamicC.cpp AnyTypeCode/DynamicC.h: AnyTypeCode/Dynamic-stamp
-
-AnyTypeCode/Dynamic-stamp: $(srcdir)/AnyTypeCode/Dynamic.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode -Sorb $(srcdir)/AnyTypeCode/Dynamic.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  AnyTypeCode/BoundsA.cpp \
-  AnyTypeCode/BoundsA.h \
-  AnyTypeCode/BoundsC.cpp \
-  AnyTypeCode/BoundsC.h
-
-CLEANFILES += \
-  AnyTypeCode/Bounds-stamp \
-  AnyTypeCode/BoundsA.cpp \
-  AnyTypeCode/BoundsA.h \
-  AnyTypeCode/BoundsC.cpp \
-  AnyTypeCode/BoundsC.h
-
-AnyTypeCode/BoundsA.cpp AnyTypeCode/BoundsA.h AnyTypeCode/BoundsC.cpp AnyTypeCode/BoundsC.h: AnyTypeCode/Bounds-stamp
-
-AnyTypeCode/Bounds-stamp: $(srcdir)/AnyTypeCode/Bounds.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/Bounds.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_AnyTypeCode.la
-
-libTAO_AnyTypeCode_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_ANYTYPECODE_BUILD_DLL
-
-libTAO_AnyTypeCode_la_SOURCES = \
-  AnyTypeCode/Alias_TypeCode_Static.cpp \
-  AnyTypeCode/Any.cpp \
-  AnyTypeCode/AnySeqA.cpp \
-  AnyTypeCode/AnySeqC.cpp \
-  AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp \
-  AnyTypeCode/Any_Basic_Impl.cpp \
-  AnyTypeCode/Any_Impl.cpp \
-  AnyTypeCode/Any_SystemException.cpp \
-  AnyTypeCode/Any_Unknown_IDL_Type.cpp \
-  AnyTypeCode/BasicTypeTraits.cpp \
-  AnyTypeCode/BooleanSeqA.cpp \
-  AnyTypeCode/BoundsA.cpp \
-  AnyTypeCode/BoundsC.cpp \
-  AnyTypeCode/CONV_FRAMEA.cpp \
-  AnyTypeCode/CharSeqA.cpp \
-  AnyTypeCode/CurrentA.cpp \
-  AnyTypeCode/DoubleSeqA.cpp \
-  AnyTypeCode/DynamicA.cpp \
-  AnyTypeCode/DynamicC.cpp \
-  AnyTypeCode/Dynamic_ParameterA.cpp \
-  AnyTypeCode/Dynamic_ParameterC.cpp \
-  AnyTypeCode/Empty_Param_TypeCode.cpp \
-  AnyTypeCode/Enum_TypeCode_Static.cpp \
-  AnyTypeCode/ExceptionA.cpp \
-  AnyTypeCode/FloatSeqA.cpp \
-  AnyTypeCode/GIOPA.cpp \
-  AnyTypeCode/IIOPA.cpp \
-  AnyTypeCode/IIOP_EndpointsA.cpp \
-  AnyTypeCode/IOPA.cpp \
-  AnyTypeCode/LongDoubleSeqA.cpp \
-  AnyTypeCode/LongLongSeqA.cpp \
-  AnyTypeCode/LongSeqA.cpp \
-  AnyTypeCode/Marshal.cpp \
-  AnyTypeCode/Messaging_PolicyValueA.cpp \
-  AnyTypeCode/NVList.cpp \
-  AnyTypeCode/NVList_Adapter_Impl.cpp \
-  AnyTypeCode/ObjectIdListA.cpp \
-  AnyTypeCode/Objref_TypeCode_Static.cpp \
-  AnyTypeCode/OctetSeqA.cpp \
-  AnyTypeCode/PI_ForwardA.cpp \
-  AnyTypeCode/ParameterModeA.cpp \
-  AnyTypeCode/PolicyA.cpp \
-  AnyTypeCode/Policy_CurrentA.cpp \
-  AnyTypeCode/Policy_ForwardA.cpp \
-  AnyTypeCode/Policy_ManagerA.cpp \
-  AnyTypeCode/PortableInterceptorA.cpp \
-  AnyTypeCode/Sequence_TypeCode_Static.cpp \
-  AnyTypeCode/ServicesA.cpp \
-  AnyTypeCode/ShortSeqA.cpp \
-  AnyTypeCode/StringSeqA.cpp \
-  AnyTypeCode/String_TypeCode_Static.cpp \
-  AnyTypeCode/Struct_TypeCode_Static.cpp \
-  AnyTypeCode/SystemExceptionA.cpp \
-  AnyTypeCode/TAOA.cpp \
-  AnyTypeCode/TimeBaseA.cpp \
-  AnyTypeCode/True_RefCount_Policy.cpp \
-  AnyTypeCode/TypeCode.cpp \
-  AnyTypeCode/TypeCodeA.cpp \
-  AnyTypeCode/TypeCode_CDR_Extraction.cpp \
-  AnyTypeCode/TypeCode_Constants.cpp \
-  AnyTypeCode/ULongLongSeqA.cpp \
-  AnyTypeCode/ULongSeqA.cpp \
-  AnyTypeCode/UShortSeqA.cpp \
-  AnyTypeCode/Union_TypeCode_Static.cpp \
-  AnyTypeCode/ValueModifierA.cpp \
-  AnyTypeCode/ValueModifierC.cpp \
-  AnyTypeCode/Value_TypeCode_Static.cpp \
-  AnyTypeCode/VisibilityA.cpp \
-  AnyTypeCode/VisibilityC.cpp \
-  AnyTypeCode/WCharSeqA.cpp \
-  AnyTypeCode/WStringSeqA.cpp \
-  AnyTypeCode/WrongTransactionA.cpp \
-  AnyTypeCode/append.cpp \
-  AnyTypeCode/orb_typesA.cpp \
-  AnyTypeCode/skip.cpp
-
-libTAO_AnyTypeCode_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_AnyTypeCode_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  AnyTypeCode/Alias_TypeCode.cpp \
-  AnyTypeCode/Alias_TypeCode.h \
-  AnyTypeCode/Alias_TypeCode.inl \
-  AnyTypeCode/Alias_TypeCode_Static.h \
-  AnyTypeCode/Alias_TypeCode_Static.inl \
-  AnyTypeCode/Any.h \
-  AnyTypeCode/Any.inl \
-  AnyTypeCode/AnySeq.pidl \
-  AnyTypeCode/AnySeqA.h \
-  AnyTypeCode/AnySeqC.h \
-  AnyTypeCode/AnyTypeCode_Adapter_Impl.h \
-  AnyTypeCode/AnyTypeCode_methods.h \
-  AnyTypeCode/Any_Arg_Traits.h \
-  AnyTypeCode/Any_Array_Impl_T.cpp \
-  AnyTypeCode/Any_Array_Impl_T.h \
-  AnyTypeCode/Any_Array_Impl_T.inl \
-  AnyTypeCode/Any_Basic_Impl.h \
-  AnyTypeCode/Any_Basic_Impl_T.cpp \
-  AnyTypeCode/Any_Basic_Impl_T.h \
-  AnyTypeCode/Any_Basic_Impl_T.inl \
-  AnyTypeCode/Any_Dual_Impl_T.cpp \
-  AnyTypeCode/Any_Dual_Impl_T.h \
-  AnyTypeCode/Any_Dual_Impl_T.inl \
-  AnyTypeCode/Any_Impl.h \
-  AnyTypeCode/Any_Impl_T.cpp \
-  AnyTypeCode/Any_Impl_T.h \
-  AnyTypeCode/Any_Impl_T.inl \
-  AnyTypeCode/Any_Special_Impl_T.cpp \
-  AnyTypeCode/Any_Special_Impl_T.h \
-  AnyTypeCode/Any_Special_Impl_T.inl \
-  AnyTypeCode/Any_SystemException.h \
-  AnyTypeCode/Any_Unknown_IDL_Type.h \
-  AnyTypeCode/BasicTypeTraits.h \
-  AnyTypeCode/BasicTypeTraits_T.h \
-  AnyTypeCode/BooleanSeqA.h \
-  AnyTypeCode/Bounds.pidl \
-  AnyTypeCode/BoundsA.h \
-  AnyTypeCode/BoundsC.h \
-  AnyTypeCode/CONV_FRAMEA.h \
-  AnyTypeCode/CharSeqA.h \
-  AnyTypeCode/CurrentA.h \
-  AnyTypeCode/DoubleSeqA.h \
-  AnyTypeCode/Dynamic.pidl \
-  AnyTypeCode/DynamicA.h \
-  AnyTypeCode/DynamicC.h \
-  AnyTypeCode/Dynamic_Parameter.pidl \
-  AnyTypeCode/Dynamic_ParameterA.h \
-  AnyTypeCode/Dynamic_ParameterC.h \
-  AnyTypeCode/Empty_Param_TypeCode.h \
-  AnyTypeCode/Empty_Param_TypeCode.inl \
-  AnyTypeCode/Enum_TypeCode.cpp \
-  AnyTypeCode/Enum_TypeCode.h \
-  AnyTypeCode/Enum_TypeCode.inl \
-  AnyTypeCode/Enum_TypeCode_Static.h \
-  AnyTypeCode/Enum_TypeCode_Static.inl \
-  AnyTypeCode/ExceptionA.h \
-  AnyTypeCode/Fixed_TypeCode.cpp \
-  AnyTypeCode/Fixed_TypeCode.h \
-  AnyTypeCode/Fixed_TypeCode.inl \
-  AnyTypeCode/FloatSeqA.h \
-  AnyTypeCode/GIOPA.h \
-  AnyTypeCode/IIOPA.h \
-  AnyTypeCode/IIOP_EndpointsA.h \
-  AnyTypeCode/IOPA.h \
-  AnyTypeCode/LongDoubleSeqA.h \
-  AnyTypeCode/LongLongSeqA.h \
-  AnyTypeCode/LongSeqA.h \
-  AnyTypeCode/Marshal.h \
-  AnyTypeCode/Marshal.inl \
-  AnyTypeCode/Messaging_PolicyValueA.h \
-  AnyTypeCode/Messaging_SyncScopeA.h \
-  AnyTypeCode/NVList.h \
-  AnyTypeCode/NVList.inl \
-  AnyTypeCode/NVList_Adapter_Impl.h \
-  AnyTypeCode/Null_RefCount_Policy.h \
-  AnyTypeCode/ObjectIdListA.h \
-  AnyTypeCode/Objref_TypeCode.cpp \
-  AnyTypeCode/Objref_TypeCode.h \
-  AnyTypeCode/Objref_TypeCode.inl \
-  AnyTypeCode/Objref_TypeCode_Static.h \
-  AnyTypeCode/Objref_TypeCode_Static.inl \
-  AnyTypeCode/OctetSeqA.h \
-  AnyTypeCode/PI_ForwardA.h \
-  AnyTypeCode/ParameterModeA.h \
-  AnyTypeCode/PolicyA.h \
-  AnyTypeCode/Policy_CurrentA.h \
-  AnyTypeCode/Policy_ForwardA.h \
-  AnyTypeCode/Policy_ManagerA.h \
-  AnyTypeCode/PortableInterceptorA.h \
-  AnyTypeCode/Recursive_Type_TypeCode.cpp \
-  AnyTypeCode/Recursive_Type_TypeCode.h \
-  AnyTypeCode/Recursive_Type_TypeCode.inl \
-  AnyTypeCode/RefCount_Policy_Traits.h \
-  AnyTypeCode/Sequence_TypeCode.cpp \
-  AnyTypeCode/Sequence_TypeCode.h \
-  AnyTypeCode/Sequence_TypeCode.inl \
-  AnyTypeCode/Sequence_TypeCode_Static.h \
-  AnyTypeCode/Sequence_TypeCode_Static.inl \
-  AnyTypeCode/ServicesA.h \
-  AnyTypeCode/ShortSeqA.h \
-  AnyTypeCode/StringSeqA.h \
-  AnyTypeCode/String_TypeCode.cpp \
-  AnyTypeCode/String_TypeCode.h \
-  AnyTypeCode/String_TypeCode.inl \
-  AnyTypeCode/String_TypeCode_Static.h \
-  AnyTypeCode/String_TypeCode_Static.inl \
-  AnyTypeCode/String_TypeCode_Traits.h \
-  AnyTypeCode/Struct_TypeCode.cpp \
-  AnyTypeCode/Struct_TypeCode.h \
-  AnyTypeCode/Struct_TypeCode.inl \
-  AnyTypeCode/Struct_TypeCode_Static.h \
-  AnyTypeCode/Struct_TypeCode_Static.inl \
-  AnyTypeCode/SystemExceptionA.h \
-  AnyTypeCode/TAOA.h \
-  AnyTypeCode/TAO_AnyTypeCode_Export.h \
-  AnyTypeCode/TC_Constants_Forward.h \
-  AnyTypeCode/TimeBaseA.h \
-  AnyTypeCode/True_RefCount_Policy.h \
-  AnyTypeCode/True_RefCount_Policy.inl \
-  AnyTypeCode/TypeCode.h \
-  AnyTypeCode/TypeCode.inl \
-  AnyTypeCode/TypeCode_Base_Attributes.cpp \
-  AnyTypeCode/TypeCode_Base_Attributes.h \
-  AnyTypeCode/TypeCode_Base_Attributes.inl \
-  AnyTypeCode/TypeCode_CDR_Extraction.h \
-  AnyTypeCode/TypeCode_Case_Base_T.cpp \
-  AnyTypeCode/TypeCode_Case_Base_T.h \
-  AnyTypeCode/TypeCode_Case_Base_T.inl \
-  AnyTypeCode/TypeCode_Case_Enum_T.cpp \
-  AnyTypeCode/TypeCode_Case_Enum_T.h \
-  AnyTypeCode/TypeCode_Case_Enum_T.inl \
-  AnyTypeCode/TypeCode_Case_T.cpp \
-  AnyTypeCode/TypeCode_Case_T.h \
-  AnyTypeCode/TypeCode_Case_T.inl \
-  AnyTypeCode/TypeCode_Constants.h \
-  AnyTypeCode/TypeCode_Struct_Field.h \
-  AnyTypeCode/TypeCode_Traits.h \
-  AnyTypeCode/TypeCode_Value_Field.h \
-  AnyTypeCode/Typecode_typesA.h \
-  AnyTypeCode/ULongLongSeqA.h \
-  AnyTypeCode/ULongSeqA.h \
-  AnyTypeCode/UShortSeqA.h \
-  AnyTypeCode/Union_TypeCode.cpp \
-  AnyTypeCode/Union_TypeCode.h \
-  AnyTypeCode/Union_TypeCode.inl \
-  AnyTypeCode/Union_TypeCode_Static.h \
-  AnyTypeCode/Union_TypeCode_Static.inl \
-  AnyTypeCode/ValueModifier.pidl \
-  AnyTypeCode/ValueModifierA.h \
-  AnyTypeCode/ValueModifierC.h \
-  AnyTypeCode/Value_TypeCode.cpp \
-  AnyTypeCode/Value_TypeCode.h \
-  AnyTypeCode/Value_TypeCode.inl \
-  AnyTypeCode/Value_TypeCode_Static.h \
-  AnyTypeCode/Value_TypeCode_Static.inl \
-  AnyTypeCode/Visibility.pidl \
-  AnyTypeCode/VisibilityA.h \
-  AnyTypeCode/VisibilityC.h \
-  AnyTypeCode/WCharSeqA.h \
-  AnyTypeCode/WStringSeqA.h \
-  AnyTypeCode/WrongTransactionA.h \
-  AnyTypeCode/orb_typesA.h
-
-pkgconfig_DATA += \
-  TAO_AnyTypeCode.pc
-
-CLEANFILES += \
-  TAO_AnyTypeCode.pc
-
-TAO_AnyTypeCode.pc: ${top_builddir}/config.status ${srcdir}/AnyTypeCode/TAO_AnyTypeCode.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/AnyTypeCode/TAO_AnyTypeCode.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  AnyTypeCode/TAO_AnyTypeCode.pc.in
-
-
-## Makefile.CodecFactory.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  CodecFactory/IOP_CodecA.h \
-  CodecFactory/IOP_CodecC.cpp \
-  CodecFactory/IOP_CodecC.h \
-  CodecFactory/IOP_CodecS.h
-
-CLEANFILES += \
-  CodecFactory/IOP_Codec-stamp \
-  CodecFactory/IOP_CodecA.h \
-  CodecFactory/IOP_CodecC.cpp \
-  CodecFactory/IOP_CodecC.h \
-  CodecFactory/IOP_CodecS.h
-
-CodecFactory/IOP_CodecA.h CodecFactory/IOP_CodecC.cpp CodecFactory/IOP_CodecC.h CodecFactory/IOP_CodecS.h: CodecFactory/IOP_Codec-stamp
-
-CodecFactory/IOP_Codec-stamp: $(srcdir)/CodecFactory/IOP_Codec.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Sal -GX -Wb,export_macro=TAO_CodecFactory_Export -Wb,export_include=tao/CodecFactory/codecfactory_export.h -Wb,include_guard=TAO_CODECFACTORY_SAFE_INCLUDE -Wb,safe_include=tao/CodecFactory/CodecFactory.h -o CodecFactory $(srcdir)/CodecFactory/IOP_Codec.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  CodecFactory/IOP_Codec_includeA.h \
-  CodecFactory/IOP_Codec_includeC.cpp \
-  CodecFactory/IOP_Codec_includeC.h \
-  CodecFactory/IOP_Codec_includeS.h
-
-CLEANFILES += \
-  CodecFactory/IOP_Codec_include-stamp \
-  CodecFactory/IOP_Codec_includeA.h \
-  CodecFactory/IOP_Codec_includeC.cpp \
-  CodecFactory/IOP_Codec_includeC.h \
-  CodecFactory/IOP_Codec_includeS.h
-
-CodecFactory/IOP_Codec_includeA.h CodecFactory/IOP_Codec_includeC.cpp CodecFactory/IOP_Codec_includeC.h CodecFactory/IOP_Codec_includeS.h: CodecFactory/IOP_Codec_include-stamp
-
-CodecFactory/IOP_Codec_include-stamp: $(srcdir)/CodecFactory/IOP_Codec_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_CodecFactory_Export -Wb,export_include=tao/CodecFactory/codecfactory_export.h -Wb,unique_include=tao/CodecFactory/CodecFactory.h -o CodecFactory $(srcdir)/CodecFactory/IOP_Codec_include.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_CodecFactory.la
-
-libTAO_CodecFactory_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_CODECFACTORY_BUILD_DLL
-
-libTAO_CodecFactory_la_SOURCES = \
-  CodecFactory/CDR_Encaps_Codec.cpp \
-  CodecFactory/CodecFactory.cpp \
-  CodecFactory/CodecFactory_impl.cpp \
-  CodecFactory/IOP_CodecC.cpp \
-  CodecFactory/IOP_Codec_includeC.cpp
-
-libTAO_CodecFactory_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CodecFactory_la_LIBADD = \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CodecFactory/CDR_Encaps_Codec.h \
-  CodecFactory/CodecFactory.h \
-  CodecFactory/CodecFactory_impl.h \
-  CodecFactory/IOP_Codec.pidl \
-  CodecFactory/IOP_CodecA.h \
-  CodecFactory/IOP_CodecC.h \
-  CodecFactory/IOP_CodecS.h \
-  CodecFactory/IOP_Codec_include.pidl \
-  CodecFactory/IOP_Codec_includeA.h \
-  CodecFactory/IOP_Codec_includeC.h \
-  CodecFactory/IOP_Codec_includeS.h \
-  CodecFactory/codecfactory_export.h
-
-pkgconfig_DATA += \
-  TAO_CodecFactory.pc
-
-CLEANFILES += \
-  TAO_CodecFactory.pc
-
-TAO_CodecFactory.pc: ${top_builddir}/config.status ${srcdir}/CodecFactory/TAO_CodecFactory.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/CodecFactory/TAO_CodecFactory.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CodecFactory/TAO_CodecFactory.pc.in \
-  CodecFactory/TAO_CodecFactory.rc
-
-
-## Makefile.PI.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  PI/PI_includeA.h \
-  PI/PI_includeC.cpp \
-  PI/PI_includeC.h \
-  PI/PI_includeS.h
-
-CLEANFILES += \
-  PI/PI_include-stamp \
-  PI/PI_includeA.h \
-  PI/PI_includeC.cpp \
-  PI/PI_includeC.h \
-  PI/PI_includeS.h
-
-PI/PI_includeA.h PI/PI_includeC.cpp PI/PI_includeC.h PI/PI_includeS.h: PI/PI_include-stamp
-
-PI/PI_include-stamp: $(srcdir)/PI/PI_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Gp -Gd -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI -Sorb -GX -Wb,unique_include=tao/PI/PI.h $(srcdir)/PI/PI_include.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PI/ORBInitInfoA.h \
-  PI/ORBInitInfoC.cpp \
-  PI/ORBInitInfoC.h \
-  PI/ORBInitInfoS.h
-
-CLEANFILES += \
-  PI/ORBInitInfo-stamp \
-  PI/ORBInitInfoA.h \
-  PI/ORBInitInfoC.cpp \
-  PI/ORBInitInfoC.h \
-  PI/ORBInitInfoS.h
-
-PI/ORBInitInfoA.h PI/ORBInitInfoC.cpp PI/ORBInitInfoC.h PI/ORBInitInfoS.h: PI/ORBInitInfo-stamp
-
-PI/ORBInitInfo-stamp: $(srcdir)/PI/ORBInitInfo.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Gp -Gd -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI -Sorb -Sal -GX -Wb,include_guard=TAO_PI_SAFE_INCLUDE -Wb,safe_include=tao/PI/PI.h $(srcdir)/PI/ORBInitInfo.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PI/ORBInitializerA.cpp \
-  PI/ORBInitializerA.h \
-  PI/ORBInitializerC.cpp \
-  PI/ORBInitializerC.h \
-  PI/ORBInitializerS.h
-
-CLEANFILES += \
-  PI/ORBInitializer-stamp \
-  PI/ORBInitializerA.cpp \
-  PI/ORBInitializerA.h \
-  PI/ORBInitializerC.cpp \
-  PI/ORBInitializerC.h \
-  PI/ORBInitializerS.h
-
-PI/ORBInitializerA.cpp PI/ORBInitializerA.h PI/ORBInitializerC.cpp PI/ORBInitializerC.h PI/ORBInitializerS.h: PI/ORBInitializer-stamp
-
-PI/ORBInitializer-stamp: $(srcdir)/PI/ORBInitializer.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Gp -Gd -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI -GA -Sorb -Sal -Wb,include_guard=TAO_PI_SAFE_INCLUDE -Wb,safe_include=tao/PI/PI.h $(srcdir)/PI/ORBInitializer.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PI/ClientRequestInterceptorA.cpp \
-  PI/ClientRequestInterceptorA.h \
-  PI/ClientRequestInterceptorC.cpp \
-  PI/ClientRequestInterceptorC.h \
-  PI/ClientRequestInterceptorS.h
-
-CLEANFILES += \
-  PI/ClientRequestInterceptor-stamp \
-  PI/ClientRequestInterceptorA.cpp \
-  PI/ClientRequestInterceptorA.h \
-  PI/ClientRequestInterceptorC.cpp \
-  PI/ClientRequestInterceptorC.h \
-  PI/ClientRequestInterceptorS.h
-
-PI/ClientRequestInterceptorA.cpp PI/ClientRequestInterceptorA.h PI/ClientRequestInterceptorC.cpp PI/ClientRequestInterceptorC.h PI/ClientRequestInterceptorS.h: PI/ClientRequestInterceptor-stamp
-
-PI/ClientRequestInterceptor-stamp: $(srcdir)/PI/ClientRequestInterceptor.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Gp -Gd -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI -GA -Sorb -Sal -Wb,include_guard=TAO_PI_SAFE_INCLUDE -Wb,safe_include=tao/PI/PI.h $(srcdir)/PI/ClientRequestInterceptor.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PI/ClientRequestInfoA.cpp \
-  PI/ClientRequestInfoA.h \
-  PI/ClientRequestInfoC.cpp \
-  PI/ClientRequestInfoC.h \
-  PI/ClientRequestInfoS.h
-
-CLEANFILES += \
-  PI/ClientRequestInfo-stamp \
-  PI/ClientRequestInfoA.cpp \
-  PI/ClientRequestInfoA.h \
-  PI/ClientRequestInfoC.cpp \
-  PI/ClientRequestInfoC.h \
-  PI/ClientRequestInfoS.h
-
-PI/ClientRequestInfoA.cpp PI/ClientRequestInfoA.h PI/ClientRequestInfoC.cpp PI/ClientRequestInfoC.h PI/ClientRequestInfoS.h: PI/ClientRequestInfo-stamp
-
-PI/ClientRequestInfo-stamp: $(srcdir)/PI/ClientRequestInfo.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Gp -Gd -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI -GA -Sorb -Sal -Wb,include_guard=TAO_PI_SAFE_INCLUDE -Wb,safe_include=tao/PI/PI.h $(srcdir)/PI/ClientRequestInfo.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PI/RequestInfoA.cpp \
-  PI/RequestInfoA.h \
-  PI/RequestInfoC.cpp \
-  PI/RequestInfoC.h \
-  PI/RequestInfoS.h
-
-CLEANFILES += \
-  PI/RequestInfo-stamp \
-  PI/RequestInfoA.cpp \
-  PI/RequestInfoA.h \
-  PI/RequestInfoC.cpp \
-  PI/RequestInfoC.h \
-  PI/RequestInfoS.h
-
-PI/RequestInfoA.cpp PI/RequestInfoA.h PI/RequestInfoC.cpp PI/RequestInfoC.h PI/RequestInfoS.h: PI/RequestInfo-stamp
-
-PI/RequestInfo-stamp: $(srcdir)/PI/RequestInfo.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Gp -Gd -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI -GA -Sorb -Sal -Wb,include_guard=TAO_PI_SAFE_INCLUDE -Wb,safe_include=tao/PI/PI.h $(srcdir)/PI/RequestInfo.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PI/PIForwardRequestA.cpp \
-  PI/PIForwardRequestA.h \
-  PI/PIForwardRequestC.cpp \
-  PI/PIForwardRequestC.h \
-  PI/PIForwardRequestS.h
-
-CLEANFILES += \
-  PI/PIForwardRequest-stamp \
-  PI/PIForwardRequestA.cpp \
-  PI/PIForwardRequestA.h \
-  PI/PIForwardRequestC.cpp \
-  PI/PIForwardRequestC.h \
-  PI/PIForwardRequestS.h
-
-PI/PIForwardRequestA.cpp PI/PIForwardRequestA.h PI/PIForwardRequestC.cpp PI/PIForwardRequestC.h PI/PIForwardRequestS.h: PI/PIForwardRequest-stamp
-
-PI/PIForwardRequest-stamp: $(srcdir)/PI/PIForwardRequest.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Gp -Gd -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI -GA -Sorb -Sal -Wb,include_guard=TAO_PI_SAFE_INCLUDE -Wb,safe_include=tao/PI/PI.h $(srcdir)/PI/PIForwardRequest.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PI/PICurrentA.cpp \
-  PI/PICurrentA.h \
-  PI/PICurrentC.cpp \
-  PI/PICurrentC.h \
-  PI/PICurrentS.h
-
-CLEANFILES += \
-  PI/PICurrent-stamp \
-  PI/PICurrentA.cpp \
-  PI/PICurrentA.h \
-  PI/PICurrentC.cpp \
-  PI/PICurrentC.h \
-  PI/PICurrentS.h
-
-PI/PICurrentA.cpp PI/PICurrentA.h PI/PICurrentC.cpp PI/PICurrentC.h PI/PICurrentS.h: PI/PICurrent-stamp
-
-PI/PICurrent-stamp: $(srcdir)/PI/PICurrent.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Gp -Gd -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI -GA -Sorb -Sal -Wb,include_guard=TAO_PI_SAFE_INCLUDE -Wb,safe_include=tao/PI/PI.h $(srcdir)/PI/PICurrent.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PI/ProcessingModePolicyA.cpp \
-  PI/ProcessingModePolicyA.h \
-  PI/ProcessingModePolicyC.cpp \
-  PI/ProcessingModePolicyC.h \
-  PI/ProcessingModePolicyS.h
-
-CLEANFILES += \
-  PI/ProcessingModePolicy-stamp \
-  PI/ProcessingModePolicyA.cpp \
-  PI/ProcessingModePolicyA.h \
-  PI/ProcessingModePolicyC.cpp \
-  PI/ProcessingModePolicyC.h \
-  PI/ProcessingModePolicyS.h
-
-PI/ProcessingModePolicyA.cpp PI/ProcessingModePolicyA.h PI/ProcessingModePolicyC.cpp PI/ProcessingModePolicyC.h PI/ProcessingModePolicyS.h: PI/ProcessingModePolicy-stamp
-
-PI/ProcessingModePolicy-stamp: $(srcdir)/PI/ProcessingModePolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Gp -Gd -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI -GA -Sorb -Sal -Wb,include_guard=TAO_PI_SAFE_INCLUDE -Wb,safe_include=tao/PI/PI.h $(srcdir)/PI/ProcessingModePolicy.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PI/InterceptorA.cpp \
-  PI/InterceptorA.h \
-  PI/InterceptorC.cpp \
-  PI/InterceptorC.h \
-  PI/InterceptorS.h
-
-CLEANFILES += \
-  PI/Interceptor-stamp \
-  PI/InterceptorA.cpp \
-  PI/InterceptorA.h \
-  PI/InterceptorC.cpp \
-  PI/InterceptorC.h \
-  PI/InterceptorS.h
-
-PI/InterceptorA.cpp PI/InterceptorA.h PI/InterceptorC.cpp PI/InterceptorC.h PI/InterceptorS.h: PI/Interceptor-stamp
-
-PI/Interceptor-stamp: $(srcdir)/PI/Interceptor.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Gp -Gd -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI -GA -Sorb -Sal $(srcdir)/PI/Interceptor.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PI/InvalidSlotA.cpp \
-  PI/InvalidSlotA.h \
-  PI/InvalidSlotC.cpp \
-  PI/InvalidSlotC.h \
-  PI/InvalidSlotS.h
-
-CLEANFILES += \
-  PI/InvalidSlot-stamp \
-  PI/InvalidSlotA.cpp \
-  PI/InvalidSlotA.h \
-  PI/InvalidSlotC.cpp \
-  PI/InvalidSlotC.h \
-  PI/InvalidSlotS.h
-
-PI/InvalidSlotA.cpp PI/InvalidSlotA.h PI/InvalidSlotC.cpp PI/InvalidSlotC.h PI/InvalidSlotS.h: PI/InvalidSlot-stamp
-
-PI/InvalidSlot-stamp: $(srcdir)/PI/InvalidSlot.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Gp -Gd -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI -GA -Sal -Wb,include_guard=TAO_PI_SAFE_INCLUDE -Wb,safe_include=tao/PI/PI.h $(srcdir)/PI/InvalidSlot.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_PI.la
-
-libTAO_PI_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_PI_BUILD_DLL
-
-libTAO_PI_la_SOURCES = \
-  PI/ClientRequestDetails.cpp \
-  PI/ClientRequestInfo.cpp \
-  PI/ClientRequestInfoA.cpp \
-  PI/ClientRequestInfoC.cpp \
-  PI/ClientRequestInterceptorA.cpp \
-  PI/ClientRequestInterceptorC.cpp \
-  PI/ClientRequestInterceptor_Adapter_Impl.cpp \
-  PI/ClientRequestInterceptor_Factory_Impl.cpp \
-  PI/DLL_Resident_ORB_Initializer.cpp \
-  PI/InterceptorA.cpp \
-  PI/InterceptorC.cpp \
-  PI/InvalidSlotA.cpp \
-  PI/InvalidSlotC.cpp \
-  PI/ORBInitInfo.cpp \
-  PI/ORBInitInfoC.cpp \
-  PI/ORBInitializerA.cpp \
-  PI/ORBInitializerC.cpp \
-  PI/ORBInitializer_Registry_Impl.cpp \
-  PI/PI.cpp \
-  PI/PICurrent.cpp \
-  PI/PICurrentA.cpp \
-  PI/PICurrentC.cpp \
-  PI/PICurrent_Impl.cpp \
-  PI/PICurrent_Loader.cpp \
-  PI/PIForwardRequestA.cpp \
-  PI/PIForwardRequestC.cpp \
-  PI/PI_ORBInitializer.cpp \
-  PI/PI_PolicyFactory.cpp \
-  PI/PI_includeC.cpp \
-  PI/PolicyFactoryA.cpp \
-  PI/PolicyFactoryC.cpp \
-  PI/PolicyFactory_Loader.cpp \
-  PI/PolicyFactory_Registry.cpp \
-  PI/ProcessingModePolicy.cpp \
-  PI/ProcessingModePolicyA.cpp \
-  PI/ProcessingModePolicyC.cpp \
-  PI/RequestInfoA.cpp \
-  PI/RequestInfoC.cpp \
-  PI/RequestInfo_Util.cpp \
-  PI/RequestInterceptor_Adapter_Impl.cpp
-
-libTAO_PI_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_PI_la_LIBADD = \
-  libTAO_CodecFactory.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  PI/ClientRequestDetails.h \
-  PI/ClientRequestDetails.inl \
-  PI/ClientRequestInfo.h \
-  PI/ClientRequestInfo.pidl \
-  PI/ClientRequestInfoA.h \
-  PI/ClientRequestInfoC.h \
-  PI/ClientRequestInfoS.h \
-  PI/ClientRequestInterceptor.pidl \
-  PI/ClientRequestInterceptorA.h \
-  PI/ClientRequestInterceptorC.h \
-  PI/ClientRequestInterceptorS.h \
-  PI/ClientRequestInterceptor_Adapter_Impl.h \
-  PI/ClientRequestInterceptor_Adapter_Impl.inl \
-  PI/ClientRequestInterceptor_Factory_Impl.h \
-  PI/DLL_Resident_ORB_Initializer.h \
-  PI/Interceptor.pidl \
-  PI/InterceptorA.h \
-  PI/InterceptorC.h \
-  PI/InterceptorS.h \
-  PI/Interceptor_List_T.cpp \
-  PI/Interceptor_List_T.h \
-  PI/InvalidSlot.pidl \
-  PI/InvalidSlotA.h \
-  PI/InvalidSlotC.h \
-  PI/InvalidSlotS.h \
-  PI/ORBInitInfo.h \
-  PI/ORBInitInfo.inl \
-  PI/ORBInitInfo.pidl \
-  PI/ORBInitInfoA.h \
-  PI/ORBInitInfoC.h \
-  PI/ORBInitInfoS.h \
-  PI/ORBInitializer.pidl \
-  PI/ORBInitializerA.h \
-  PI/ORBInitializerC.h \
-  PI/ORBInitializerS.h \
-  PI/ORBInitializer_Registry_Impl.h \
-  PI/PI.h \
-  PI/PICurrent.h \
-  PI/PICurrent.inl \
-  PI/PICurrent.pidl \
-  PI/PICurrentA.h \
-  PI/PICurrentC.h \
-  PI/PICurrentS.h \
-  PI/PICurrent_Impl.h \
-  PI/PICurrent_Impl.inl \
-  PI/PICurrent_Loader.h \
-  PI/PIForwardRequest.pidl \
-  PI/PIForwardRequestA.h \
-  PI/PIForwardRequestC.h \
-  PI/PIForwardRequestS.h \
-  PI/PI_ORBInitializer.h \
-  PI/PI_PolicyFactory.h \
-  PI/PI_include.pidl \
-  PI/PI_includeA.h \
-  PI/PI_includeC.h \
-  PI/PI_includeS.h \
-  PI/PolicyFactory.pidl \
-  PI/PolicyFactoryA.h \
-  PI/PolicyFactoryC.h \
-  PI/PolicyFactoryS.h \
-  PI/PolicyFactory_Loader.h \
-  PI/PolicyFactory_Registry.h \
-  PI/ProcessingModePolicy.h \
-  PI/ProcessingModePolicy.pidl \
-  PI/ProcessingModePolicyA.h \
-  PI/ProcessingModePolicyC.h \
-  PI/ProcessingModePolicyS.h \
-  PI/RequestInfo.pidl \
-  PI/RequestInfoA.h \
-  PI/RequestInfoC.h \
-  PI/RequestInfoS.h \
-  PI/RequestInfo_Util.h \
-  PI/RequestInterceptor_Adapter_Impl.h \
-  PI/pi_export.h
-
-pkgconfig_DATA += \
-  TAO_PI.pc
-
-CLEANFILES += \
-  TAO_PI.pc
-
-TAO_PI.pc: ${top_builddir}/config.status ${srcdir}/PI/TAO_PI.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/PI/TAO_PI.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  PI/TAO_PI.pc.in
-
-
-## Makefile.BiDir_GIOP.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  BiDir_GIOP/BiDirPolicyC.cpp \
-  BiDir_GIOP/BiDirPolicyC.h \
-  BiDir_GIOP/BiDirPolicyS.h
-
-CLEANFILES += \
-  BiDir_GIOP/BiDirPolicy-stamp \
-  BiDir_GIOP/BiDirPolicyC.cpp \
-  BiDir_GIOP/BiDirPolicyC.h \
-  BiDir_GIOP/BiDirPolicyS.h
-
-BiDir_GIOP/BiDirPolicyC.cpp BiDir_GIOP/BiDirPolicyC.h BiDir_GIOP/BiDirPolicyS.h: BiDir_GIOP/BiDirPolicy-stamp
-
-BiDir_GIOP/BiDirPolicy-stamp: $(srcdir)/BiDir_GIOP/BiDirPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_BiDirGIOP_Export -Wb,export_include=tao/BiDir_GIOP/bidirgiop_export.h -Wb,include_guard=TAO_BIDIRGIOP_SAFE_INCLUDE -Wb,safe_include=tao/BiDir_GIOP/BiDirGIOP.h -o BiDir_GIOP $(srcdir)/BiDir_GIOP/BiDirPolicy.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_BiDirGIOP.la
-
-libTAO_BiDirGIOP_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_BIDIRGIOP_BUILD_DLL
-
-libTAO_BiDirGIOP_la_SOURCES = \
-  BiDir_GIOP/BiDirGIOP.cpp \
-  BiDir_GIOP/BiDirPolicyC.cpp \
-  BiDir_GIOP/BiDirPolicy_Validator.cpp \
-  BiDir_GIOP/BiDir_ORBInitializer.cpp \
-  BiDir_GIOP/BiDir_PolicyFactory.cpp \
-  BiDir_GIOP/BiDir_Policy_i.cpp \
-  BiDir_GIOP/BiDir_Service_Context_Handler.cpp
-
-libTAO_BiDirGIOP_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_BiDirGIOP_la_LIBADD = \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  BiDir_GIOP/BiDirGIOP.h \
-  BiDir_GIOP/BiDirPolicy.pidl \
-  BiDir_GIOP/BiDirPolicyC.h \
-  BiDir_GIOP/BiDirPolicyS.h \
-  BiDir_GIOP/BiDirPolicy_Validator.h \
-  BiDir_GIOP/BiDir_ORBInitializer.h \
-  BiDir_GIOP/BiDir_PolicyFactory.h \
-  BiDir_GIOP/BiDir_Policy_i.h \
-  BiDir_GIOP/BiDir_Service_Context_Handler.h \
-  BiDir_GIOP/bidirgiop_export.h
-
-pkgconfig_DATA += \
-  TAO_BiDirGIOP.pc
-
-CLEANFILES += \
-  TAO_BiDirGIOP.pc
-
-TAO_BiDirGIOP.pc: ${top_builddir}/config.status ${srcdir}/BiDir_GIOP/TAO_BiDirGIOP.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/BiDir_GIOP/TAO_BiDirGIOP.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  BiDir_GIOP/TAO_BiDirGIOP.pc.in \
-  BiDir_GIOP/TAO_BiDir_GIOP.rc
-
-
-## Makefile.Compression.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  Compression/CompressionA.cpp \
-  Compression/CompressionA.h \
-  Compression/CompressionC.cpp \
-  Compression/CompressionC.h \
-  Compression/CompressionS.h
-
-CLEANFILES += \
-  Compression/Compression-stamp \
-  Compression/CompressionA.cpp \
-  Compression/CompressionA.h \
-  Compression/CompressionC.cpp \
-  Compression/CompressionC.h \
-  Compression/CompressionS.h
-
-Compression/CompressionA.cpp Compression/CompressionA.h Compression/CompressionC.cpp Compression/CompressionC.h Compression/CompressionS.h: Compression/Compression-stamp
-
-Compression/Compression-stamp: $(srcdir)/Compression/Compression.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -Sci -GA -Wb,export_macro=TAO_Compression_Export -o Compression -Gp -Gd -Sal -Wb,export_macro=TAO_Compression_Export -Wb,export_include=tao/Compression/compression_export.h -Wb,include_guard=TAO_COMPRESSION_SAFE_INCLUDE -Wb,safe_include=tao/Compression/Compression.h $(srcdir)/Compression/Compression.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  Compression/Compression_includeA.cpp \
-  Compression/Compression_includeA.h \
-  Compression/Compression_includeC.cpp \
-  Compression/Compression_includeC.h \
-  Compression/Compression_includeS.h
-
-CLEANFILES += \
-  Compression/Compression_include-stamp \
-  Compression/Compression_includeA.cpp \
-  Compression/Compression_includeA.h \
-  Compression/Compression_includeC.cpp \
-  Compression/Compression_includeC.h \
-  Compression/Compression_includeS.h
-
-Compression/Compression_includeA.cpp Compression/Compression_includeA.h Compression/Compression_includeC.cpp Compression/Compression_includeC.h Compression/Compression_includeS.h: Compression/Compression_include-stamp
-
-Compression/Compression_include-stamp: $(srcdir)/Compression/Compression_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -Sci -GA -Wb,export_macro=TAO_Compression_Export -o Compression -Wb,export_include=tao/Compression/compression_export.h -Wb,unique_include=tao/Compression/Compression.h $(srcdir)/Compression/Compression_include.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_Compression.la
-
-libTAO_Compression_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_COMPRESSION_BUILD_DLL
-
-libTAO_Compression_la_SOURCES = \
-  Compression/Base_Compressor.cpp \
-  Compression/Compression.cpp \
-  Compression/CompressionA.cpp \
-  Compression/CompressionC.cpp \
-  Compression/Compression_Manager.cpp \
-  Compression/Compression_includeA.cpp \
-  Compression/Compression_includeC.cpp \
-  Compression/Compressor_Factory.cpp
-
-libTAO_Compression_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Compression_la_LIBADD = \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Compression/Base_Compressor.h \
-  Compression/Compression.h \
-  Compression/Compression.pidl \
-  Compression/CompressionA.h \
-  Compression/CompressionC.h \
-  Compression/CompressionS.h \
-  Compression/Compression_Manager.h \
-  Compression/Compression_include.pidl \
-  Compression/Compression_includeA.h \
-  Compression/Compression_includeC.h \
-  Compression/Compression_includeS.h \
-  Compression/Compressor_Factory.h \
-  Compression/compression_export.h
-
-pkgconfig_DATA += \
-  TAO_Compression.pc
-
-CLEANFILES += \
-  TAO_Compression.pc
-
-TAO_Compression.pc: ${top_builddir}/config.status ${srcdir}/Compression/TAO_Compression.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Compression/TAO_Compression.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  Compression/TAO_Compression.pc.in \
-  Compression/TAO_Compression.rc
-
-
-## Makefile.Bzip2Compressor.am
-
-if BUILD_BZIP2
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_Bzip2Compressor.la
-
-libTAO_Bzip2Compressor_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_BZIP2_CPPFLAGS) \
-  -DTAO_BZIP2COMPRESSOR_BUILD_DLL
-
-libTAO_Bzip2Compressor_la_SOURCES = \
-  Compression/bzip2/Bzip2Compressor.cpp \
-  Compression/bzip2/Bzip2Compressor_Factory.cpp
-
-libTAO_Bzip2Compressor_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_BZIP2_LDFLAGS)
-
-libTAO_Bzip2Compressor_la_LIBADD = \
-  libTAO_Compression.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_BZIP2_LIBS)
-
-nobase_include_HEADERS += \
-  Compression/bzip2/Bzip2Compressor.h \
-  Compression/bzip2/Bzip2Compressor_Factory.h \
-  Compression/bzip2/Bzip2Compressor_export.h
-
-pkgconfig_DATA += \
-  TAO_Bzip2Compressor.pc
-
-CLEANFILES += \
-  TAO_Bzip2Compressor.pc
-
-TAO_Bzip2Compressor.pc: ${top_builddir}/config.status ${srcdir}/Compression/bzip2/TAO_Bzip2Compressor.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Compression/bzip2/TAO_Bzip2Compressor.pc.in
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BZIP2
-
-EXTRA_DIST += \
-  Compression/bzip2/TAO_Bzip2Compressor.pc.in \
-  Compression/bzip2/TAO_Bzip2Compressor.rc
-
-
-## Makefile.PortableServer.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  PortableServer/ForwardRequestA.cpp \
-  PortableServer/ForwardRequestA.h \
-  PortableServer/ForwardRequestC.cpp \
-  PortableServer/ForwardRequestC.h \
-  PortableServer/ForwardRequestS.h
-
-CLEANFILES += \
-  PortableServer/ForwardRequest-stamp \
-  PortableServer/ForwardRequestA.cpp \
-  PortableServer/ForwardRequestA.h \
-  PortableServer/ForwardRequestC.cpp \
-  PortableServer/ForwardRequestC.h \
-  PortableServer/ForwardRequestS.h
-
-PortableServer/ForwardRequestA.cpp PortableServer/ForwardRequestA.h PortableServer/ForwardRequestC.cpp PortableServer/ForwardRequestC.h PortableServer/ForwardRequestS.h: PortableServer/ForwardRequest-stamp
-
-PortableServer/ForwardRequest-stamp: $(srcdir)/PortableServer/ForwardRequest.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ForwardRequest.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/AdapterActivatorA.cpp \
-  PortableServer/AdapterActivatorA.h \
-  PortableServer/AdapterActivatorC.cpp \
-  PortableServer/AdapterActivatorC.h \
-  PortableServer/AdapterActivatorS.h
-
-CLEANFILES += \
-  PortableServer/AdapterActivator-stamp \
-  PortableServer/AdapterActivatorA.cpp \
-  PortableServer/AdapterActivatorA.h \
-  PortableServer/AdapterActivatorC.cpp \
-  PortableServer/AdapterActivatorC.h \
-  PortableServer/AdapterActivatorS.h
-
-PortableServer/AdapterActivatorA.cpp PortableServer/AdapterActivatorA.h PortableServer/AdapterActivatorC.cpp PortableServer/AdapterActivatorC.h PortableServer/AdapterActivatorS.h: PortableServer/AdapterActivator-stamp
-
-PortableServer/AdapterActivator-stamp: $(srcdir)/PortableServer/AdapterActivator.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/AdapterActivator.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/IdAssignmentPolicyA.cpp \
-  PortableServer/IdAssignmentPolicyA.h \
-  PortableServer/IdAssignmentPolicyC.cpp \
-  PortableServer/IdAssignmentPolicyC.h \
-  PortableServer/IdAssignmentPolicyS.h
-
-CLEANFILES += \
-  PortableServer/IdAssignmentPolicy-stamp \
-  PortableServer/IdAssignmentPolicyA.cpp \
-  PortableServer/IdAssignmentPolicyA.h \
-  PortableServer/IdAssignmentPolicyC.cpp \
-  PortableServer/IdAssignmentPolicyC.h \
-  PortableServer/IdAssignmentPolicyS.h
-
-PortableServer/IdAssignmentPolicyA.cpp PortableServer/IdAssignmentPolicyA.h PortableServer/IdAssignmentPolicyC.cpp PortableServer/IdAssignmentPolicyC.h PortableServer/IdAssignmentPolicyS.h: PortableServer/IdAssignmentPolicy-stamp
-
-PortableServer/IdAssignmentPolicy-stamp: $(srcdir)/PortableServer/IdAssignmentPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/IdAssignmentPolicy.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/IdUniquenessPolicyA.cpp \
-  PortableServer/IdUniquenessPolicyA.h \
-  PortableServer/IdUniquenessPolicyC.cpp \
-  PortableServer/IdUniquenessPolicyC.h \
-  PortableServer/IdUniquenessPolicyS.h
-
-CLEANFILES += \
-  PortableServer/IdUniquenessPolicy-stamp \
-  PortableServer/IdUniquenessPolicyA.cpp \
-  PortableServer/IdUniquenessPolicyA.h \
-  PortableServer/IdUniquenessPolicyC.cpp \
-  PortableServer/IdUniquenessPolicyC.h \
-  PortableServer/IdUniquenessPolicyS.h
-
-PortableServer/IdUniquenessPolicyA.cpp PortableServer/IdUniquenessPolicyA.h PortableServer/IdUniquenessPolicyC.cpp PortableServer/IdUniquenessPolicyC.h PortableServer/IdUniquenessPolicyS.h: PortableServer/IdUniquenessPolicy-stamp
-
-PortableServer/IdUniquenessPolicy-stamp: $(srcdir)/PortableServer/IdUniquenessPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/IdUniquenessPolicy.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/ImplicitActivationPolicyA.cpp \
-  PortableServer/ImplicitActivationPolicyA.h \
-  PortableServer/ImplicitActivationPolicyC.cpp \
-  PortableServer/ImplicitActivationPolicyC.h \
-  PortableServer/ImplicitActivationPolicyS.h
-
-CLEANFILES += \
-  PortableServer/ImplicitActivationPolicy-stamp \
-  PortableServer/ImplicitActivationPolicyA.cpp \
-  PortableServer/ImplicitActivationPolicyA.h \
-  PortableServer/ImplicitActivationPolicyC.cpp \
-  PortableServer/ImplicitActivationPolicyC.h \
-  PortableServer/ImplicitActivationPolicyS.h
-
-PortableServer/ImplicitActivationPolicyA.cpp PortableServer/ImplicitActivationPolicyA.h PortableServer/ImplicitActivationPolicyC.cpp PortableServer/ImplicitActivationPolicyC.h PortableServer/ImplicitActivationPolicyS.h: PortableServer/ImplicitActivationPolicy-stamp
-
-PortableServer/ImplicitActivationPolicy-stamp: $(srcdir)/PortableServer/ImplicitActivationPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ImplicitActivationPolicy.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/LifespanPolicyA.cpp \
-  PortableServer/LifespanPolicyA.h \
-  PortableServer/LifespanPolicyC.cpp \
-  PortableServer/LifespanPolicyC.h \
-  PortableServer/LifespanPolicyS.h
-
-CLEANFILES += \
-  PortableServer/LifespanPolicy-stamp \
-  PortableServer/LifespanPolicyA.cpp \
-  PortableServer/LifespanPolicyA.h \
-  PortableServer/LifespanPolicyC.cpp \
-  PortableServer/LifespanPolicyC.h \
-  PortableServer/LifespanPolicyS.h
-
-PortableServer/LifespanPolicyA.cpp PortableServer/LifespanPolicyA.h PortableServer/LifespanPolicyC.cpp PortableServer/LifespanPolicyC.h PortableServer/LifespanPolicyS.h: PortableServer/LifespanPolicy-stamp
-
-PortableServer/LifespanPolicy-stamp: $(srcdir)/PortableServer/LifespanPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/LifespanPolicy.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/RequestProcessingPolicyA.cpp \
-  PortableServer/RequestProcessingPolicyA.h \
-  PortableServer/RequestProcessingPolicyC.cpp \
-  PortableServer/RequestProcessingPolicyC.h \
-  PortableServer/RequestProcessingPolicyS.h
-
-CLEANFILES += \
-  PortableServer/RequestProcessingPolicy-stamp \
-  PortableServer/RequestProcessingPolicyA.cpp \
-  PortableServer/RequestProcessingPolicyA.h \
-  PortableServer/RequestProcessingPolicyC.cpp \
-  PortableServer/RequestProcessingPolicyC.h \
-  PortableServer/RequestProcessingPolicyS.h
-
-PortableServer/RequestProcessingPolicyA.cpp PortableServer/RequestProcessingPolicyA.h PortableServer/RequestProcessingPolicyC.cpp PortableServer/RequestProcessingPolicyC.h PortableServer/RequestProcessingPolicyS.h: PortableServer/RequestProcessingPolicy-stamp
-
-PortableServer/RequestProcessingPolicy-stamp: $(srcdir)/PortableServer/RequestProcessingPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/RequestProcessingPolicy.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/ServantActivatorA.cpp \
-  PortableServer/ServantActivatorA.h \
-  PortableServer/ServantActivatorC.cpp \
-  PortableServer/ServantActivatorC.h \
-  PortableServer/ServantActivatorS.h
-
-CLEANFILES += \
-  PortableServer/ServantActivator-stamp \
-  PortableServer/ServantActivatorA.cpp \
-  PortableServer/ServantActivatorA.h \
-  PortableServer/ServantActivatorC.cpp \
-  PortableServer/ServantActivatorC.h \
-  PortableServer/ServantActivatorS.h
-
-PortableServer/ServantActivatorA.cpp PortableServer/ServantActivatorA.h PortableServer/ServantActivatorC.cpp PortableServer/ServantActivatorC.h PortableServer/ServantActivatorS.h: PortableServer/ServantActivator-stamp
-
-PortableServer/ServantActivator-stamp: $(srcdir)/PortableServer/ServantActivator.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantActivator.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/ServantLocatorA.cpp \
-  PortableServer/ServantLocatorA.h \
-  PortableServer/ServantLocatorC.cpp \
-  PortableServer/ServantLocatorC.h \
-  PortableServer/ServantLocatorS.h
-
-CLEANFILES += \
-  PortableServer/ServantLocator-stamp \
-  PortableServer/ServantLocatorA.cpp \
-  PortableServer/ServantLocatorA.h \
-  PortableServer/ServantLocatorC.cpp \
-  PortableServer/ServantLocatorC.h \
-  PortableServer/ServantLocatorS.h
-
-PortableServer/ServantLocatorA.cpp PortableServer/ServantLocatorA.h PortableServer/ServantLocatorC.cpp PortableServer/ServantLocatorC.h PortableServer/ServantLocatorS.h: PortableServer/ServantLocator-stamp
-
-PortableServer/ServantLocator-stamp: $(srcdir)/PortableServer/ServantLocator.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantLocator.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/ServantManagerA.cpp \
-  PortableServer/ServantManagerA.h \
-  PortableServer/ServantManagerC.cpp \
-  PortableServer/ServantManagerC.h \
-  PortableServer/ServantManagerS.h
-
-CLEANFILES += \
-  PortableServer/ServantManager-stamp \
-  PortableServer/ServantManagerA.cpp \
-  PortableServer/ServantManagerA.h \
-  PortableServer/ServantManagerC.cpp \
-  PortableServer/ServantManagerC.h \
-  PortableServer/ServantManagerS.h
-
-PortableServer/ServantManagerA.cpp PortableServer/ServantManagerA.h PortableServer/ServantManagerC.cpp PortableServer/ServantManagerC.h PortableServer/ServantManagerS.h: PortableServer/ServantManager-stamp
-
-PortableServer/ServantManager-stamp: $(srcdir)/PortableServer/ServantManager.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantManager.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/ServantRetentionPolicyA.cpp \
-  PortableServer/ServantRetentionPolicyA.h \
-  PortableServer/ServantRetentionPolicyC.cpp \
-  PortableServer/ServantRetentionPolicyC.h \
-  PortableServer/ServantRetentionPolicyS.h
-
-CLEANFILES += \
-  PortableServer/ServantRetentionPolicy-stamp \
-  PortableServer/ServantRetentionPolicyA.cpp \
-  PortableServer/ServantRetentionPolicyA.h \
-  PortableServer/ServantRetentionPolicyC.cpp \
-  PortableServer/ServantRetentionPolicyC.h \
-  PortableServer/ServantRetentionPolicyS.h
-
-PortableServer/ServantRetentionPolicyA.cpp PortableServer/ServantRetentionPolicyA.h PortableServer/ServantRetentionPolicyC.cpp PortableServer/ServantRetentionPolicyC.h PortableServer/ServantRetentionPolicyS.h: PortableServer/ServantRetentionPolicy-stamp
-
-PortableServer/ServantRetentionPolicy-stamp: $(srcdir)/PortableServer/ServantRetentionPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantRetentionPolicy.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/ThreadPolicyA.cpp \
-  PortableServer/ThreadPolicyA.h \
-  PortableServer/ThreadPolicyC.cpp \
-  PortableServer/ThreadPolicyC.h \
-  PortableServer/ThreadPolicyS.h
-
-CLEANFILES += \
-  PortableServer/ThreadPolicy-stamp \
-  PortableServer/ThreadPolicyA.cpp \
-  PortableServer/ThreadPolicyA.h \
-  PortableServer/ThreadPolicyC.cpp \
-  PortableServer/ThreadPolicyC.h \
-  PortableServer/ThreadPolicyS.h
-
-PortableServer/ThreadPolicyA.cpp PortableServer/ThreadPolicyA.h PortableServer/ThreadPolicyC.cpp PortableServer/ThreadPolicyC.h PortableServer/ThreadPolicyS.h: PortableServer/ThreadPolicy-stamp
-
-PortableServer/ThreadPolicy-stamp: $(srcdir)/PortableServer/ThreadPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ThreadPolicy.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/POAManagerC.cpp \
-  PortableServer/POAManagerC.h \
-  PortableServer/POAManagerS.h
-
-CLEANFILES += \
-  PortableServer/POAManager-stamp \
-  PortableServer/POAManagerC.cpp \
-  PortableServer/POAManagerC.h \
-  PortableServer/POAManagerS.h
-
-PortableServer/POAManagerC.cpp PortableServer/POAManagerC.h PortableServer/POAManagerS.h: PortableServer/POAManager-stamp
-
-PortableServer/POAManager-stamp: $(srcdir)/PortableServer/POAManager.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POAManager.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/POAManagerFactoryC.cpp \
-  PortableServer/POAManagerFactoryC.h \
-  PortableServer/POAManagerFactoryS.h
-
-CLEANFILES += \
-  PortableServer/POAManagerFactory-stamp \
-  PortableServer/POAManagerFactoryC.cpp \
-  PortableServer/POAManagerFactoryC.h \
-  PortableServer/POAManagerFactoryS.h
-
-PortableServer/POAManagerFactoryC.cpp PortableServer/POAManagerFactoryC.h PortableServer/POAManagerFactoryS.h: PortableServer/POAManagerFactory-stamp
-
-PortableServer/POAManagerFactory-stamp: $(srcdir)/PortableServer/POAManagerFactory.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POAManagerFactory.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/POAC.cpp \
-  PortableServer/POAC.h \
-  PortableServer/POAS.h
-
-CLEANFILES += \
-  PortableServer/POA-stamp \
-  PortableServer/POAC.cpp \
-  PortableServer/POAC.h \
-  PortableServer/POAS.h
-
-PortableServer/POAC.cpp PortableServer/POAC.h PortableServer/POAS.h: PortableServer/POA-stamp
-
-PortableServer/POA-stamp: $(srcdir)/PortableServer/POA.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POA.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/PS_CurrentC.cpp \
-  PortableServer/PS_CurrentC.h \
-  PortableServer/PS_CurrentS.h
-
-CLEANFILES += \
-  PortableServer/PS_Current-stamp \
-  PortableServer/PS_CurrentC.cpp \
-  PortableServer/PS_CurrentC.h \
-  PortableServer/PS_CurrentS.h
-
-PortableServer/PS_CurrentC.cpp PortableServer/PS_CurrentC.h PortableServer/PS_CurrentS.h: PortableServer/PS_Current-stamp
-
-PortableServer/PS_Current-stamp: $(srcdir)/PortableServer/PS_Current.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/PS_Current.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/PortableServer_includeA.h \
-  PortableServer/PortableServer_includeC.cpp \
-  PortableServer/PortableServer_includeC.h \
-  PortableServer/PortableServer_includeS.h
-
-CLEANFILES += \
-  PortableServer/PortableServer_include-stamp \
-  PortableServer/PortableServer_includeA.h \
-  PortableServer/PortableServer_includeC.cpp \
-  PortableServer/PortableServer_includeC.h \
-  PortableServer/PortableServer_includeS.h
-
-PortableServer/PortableServer_includeA.h PortableServer/PortableServer_includeC.cpp PortableServer/PortableServer_includeC.h PortableServer/PortableServer_includeS.h: PortableServer/PortableServer_include-stamp
-
-PortableServer/PortableServer_include-stamp: $(srcdir)/PortableServer/PortableServer_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -Wb,unique_include=tao/PortableServer/PortableServer.h -o PortableServer $(srcdir)/PortableServer/PortableServer_include.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PortableServer/PortableServerA.h \
-  PortableServer/PortableServerC.cpp \
-  PortableServer/PortableServerC.h \
-  PortableServer/PortableServerS.h
-
-CLEANFILES += \
-  PortableServer/PortableServer-stamp \
-  PortableServer/PortableServerA.h \
-  PortableServer/PortableServerC.cpp \
-  PortableServer/PortableServerC.h \
-  PortableServer/PortableServerS.h
-
-PortableServer/PortableServerA.h PortableServer/PortableServerC.cpp PortableServer/PortableServerC.h PortableServer/PortableServerS.h: PortableServer/PortableServer-stamp
-
-PortableServer/PortableServer-stamp: $(srcdir)/PortableServer/PortableServer.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -Wb,include_guard=TAO_PORTABLESERVER_SAFE_INCLUDE -Wb,safe_include=tao/PortableServer/PortableServer.h -o PortableServer $(srcdir)/PortableServer/PortableServer.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_PortableServer.la
-
-libTAO_PortableServer_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_PORTABLESERVER_BUILD_DLL
-
-libTAO_PortableServer_la_SOURCES = \
-  PortableServer/Acceptor_Filter_Factory.cpp \
-  PortableServer/Active_Object_Map.cpp \
-  PortableServer/Active_Object_Map_Entry.cpp \
-  PortableServer/Active_Policy_Strategies.cpp \
-  PortableServer/AdapterActivatorA.cpp \
-  PortableServer/AdapterActivatorC.cpp \
-  PortableServer/Adapter_Activator.cpp \
-  PortableServer/Collocated_Arguments_Converter.cpp \
-  PortableServer/Collocated_Object_Proxy_Broker.cpp \
-  PortableServer/Creation_Time.cpp \
-  PortableServer/Default_Acceptor_Filter.cpp \
-  PortableServer/Default_Policy_Validator.cpp \
-  PortableServer/Default_Servant_Dispatcher.cpp \
-  PortableServer/Direct_Collocation_Upcall_Wrapper.cpp \
-  PortableServer/ForwardRequestA.cpp \
-  PortableServer/ForwardRequestC.cpp \
-  PortableServer/IdAssignmentPolicy.cpp \
-  PortableServer/IdAssignmentPolicyA.cpp \
-  PortableServer/IdAssignmentPolicyC.cpp \
-  PortableServer/IdAssignmentStrategy.cpp \
-  PortableServer/IdAssignmentStrategyFactoryImpl.cpp \
-  PortableServer/IdAssignmentStrategySystem.cpp \
-  PortableServer/IdAssignmentStrategyUser.cpp \
-  PortableServer/IdUniquenessPolicy.cpp \
-  PortableServer/IdUniquenessPolicyA.cpp \
-  PortableServer/IdUniquenessPolicyC.cpp \
-  PortableServer/IdUniquenessStrategyFactoryImpl.cpp \
-  PortableServer/IdUniquenessStrategyMultiple.cpp \
-  PortableServer/IdUniquenessStrategyUnique.cpp \
-  PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp \
-  PortableServer/ImR_Client_Adapter.cpp \
-  PortableServer/ImplicitActivationPolicy.cpp \
-  PortableServer/ImplicitActivationPolicyA.cpp \
-  PortableServer/ImplicitActivationPolicyC.cpp \
-  PortableServer/ImplicitActivationStrategy.cpp \
-  PortableServer/ImplicitActivationStrategyExplicit.cpp \
-  PortableServer/ImplicitActivationStrategyFactoryImpl.cpp \
-  PortableServer/ImplicitActivationStrategyImplicit.cpp \
-  PortableServer/Key_Adapters.cpp \
-  PortableServer/LifespanPolicy.cpp \
-  PortableServer/LifespanPolicyA.cpp \
-  PortableServer/LifespanPolicyC.cpp \
-  PortableServer/LifespanStrategy.cpp \
-  PortableServer/LifespanStrategyFactoryImpl.cpp \
-  PortableServer/LifespanStrategyPersistent.cpp \
-  PortableServer/LifespanStrategyPersistentFactoryImpl.cpp \
-  PortableServer/LifespanStrategyTransient.cpp \
-  PortableServer/LifespanStrategyTransientFactoryImpl.cpp \
-  PortableServer/Local_Servant_Base.cpp \
-  PortableServer/Network_Priority_Hook.cpp \
-  PortableServer/Non_Servant_Upcall.cpp \
-  PortableServer/ORT_Adapter_Factory.cpp \
-  PortableServer/Object_Adapter.cpp \
-  PortableServer/Object_Adapter_Factory.cpp \
-  PortableServer/Operation_Table.cpp \
-  PortableServer/Operation_Table_Binary_Search.cpp \
-  PortableServer/Operation_Table_Dynamic_Hash.cpp \
-  PortableServer/Operation_Table_Linear_Search.cpp \
-  PortableServer/Operation_Table_Perfect_Hash.cpp \
-  PortableServer/POAC.cpp \
-  PortableServer/POAManager.cpp \
-  PortableServer/POAManagerC.cpp \
-  PortableServer/POAManagerFactory.cpp \
-  PortableServer/POAManagerFactoryC.cpp \
-  PortableServer/POA_Cached_Policies.cpp \
-  PortableServer/POA_Current.cpp \
-  PortableServer/POA_Current_Factory.cpp \
-  PortableServer/POA_Current_Impl.cpp \
-  PortableServer/POA_Guard.cpp \
-  PortableServer/POA_Policy_Set.cpp \
-  PortableServer/PS_CurrentC.cpp \
-  PortableServer/PS_ForwardA.cpp \
-  PortableServer/PS_ForwardC.cpp \
-  PortableServer/PolicyS.cpp \
-  PortableServer/PortableServer.cpp \
-  PortableServer/PortableServerC.cpp \
-  PortableServer/PortableServer_Functions.cpp \
-  PortableServer/PortableServer_WFunctions.cpp \
-  PortableServer/PortableServer_includeC.cpp \
-  PortableServer/Regular_POA.cpp \
-  PortableServer/RequestProcessingPolicy.cpp \
-  PortableServer/RequestProcessingPolicyA.cpp \
-  PortableServer/RequestProcessingPolicyC.cpp \
-  PortableServer/RequestProcessingStrategy.cpp \
-  PortableServer/RequestProcessingStrategyAOMOnly.cpp \
-  PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp \
-  PortableServer/RequestProcessingStrategyDefaultServant.cpp \
-  PortableServer/RequestProcessingStrategyDefaultServantFI.cpp \
-  PortableServer/RequestProcessingStrategyFactoryImpl.cpp \
-  PortableServer/RequestProcessingStrategyServantActivator.cpp \
-  PortableServer/RequestProcessingStrategyServantActivatorFI.cpp \
-  PortableServer/RequestProcessingStrategyServantLocator.cpp \
-  PortableServer/RequestProcessingStrategyServantLocatorFI.cpp \
-  PortableServer/RequestProcessingStrategyServantManager.cpp \
-  PortableServer/Root_POA.cpp \
-  PortableServer/ServantActivatorA.cpp \
-  PortableServer/ServantActivatorC.cpp \
-  PortableServer/ServantLocatorA.cpp \
-  PortableServer/ServantLocatorC.cpp \
-  PortableServer/ServantManagerA.cpp \
-  PortableServer/ServantManagerC.cpp \
-  PortableServer/ServantRetentionPolicy.cpp \
-  PortableServer/ServantRetentionPolicyA.cpp \
-  PortableServer/ServantRetentionPolicyC.cpp \
-  PortableServer/ServantRetentionStrategyFactoryImpl.cpp \
-  PortableServer/ServantRetentionStrategyNonRetain.cpp \
-  PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp \
-  PortableServer/ServantRetentionStrategyRetain.cpp \
-  PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp \
-  PortableServer/Servant_Base.cpp \
-  PortableServer/Servant_Dispatcher.cpp \
-  PortableServer/Servant_Upcall.cpp \
-  PortableServer/StrategyFactory.cpp \
-  PortableServer/ThreadPolicy.cpp \
-  PortableServer/ThreadPolicyA.cpp \
-  PortableServer/ThreadPolicyC.cpp \
-  PortableServer/ThreadStrategy.cpp \
-  PortableServer/ThreadStrategyFactoryImpl.cpp \
-  PortableServer/ThreadStrategyORBControl.cpp \
-  PortableServer/ThreadStrategySingle.cpp \
-  PortableServer/ThreadStrategySingleFactoryImpl.cpp \
-  PortableServer/Upcall_Command.cpp \
-  PortableServer/Upcall_Wrapper.cpp
-
-libTAO_PortableServer_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_PortableServer_la_LIBADD = \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  PortableServer/Acceptor_Filter_Factory.h \
-  PortableServer/Active_Object_Map.h \
-  PortableServer/Active_Object_Map.inl \
-  PortableServer/Active_Object_Map_Entry.h \
-  PortableServer/Active_Policy_Strategies.h \
-  PortableServer/Active_Policy_Strategies.inl \
-  PortableServer/AdapterActivator.pidl \
-  PortableServer/AdapterActivatorA.h \
-  PortableServer/AdapterActivatorC.h \
-  PortableServer/AdapterActivatorS.h \
-  PortableServer/Adapter_Activator.h \
-  PortableServer/Any_SArg_Traits.h \
-  PortableServer/BD_String_SArgument_T.cpp \
-  PortableServer/BD_String_SArgument_T.h \
-  PortableServer/BD_String_SArgument_T.inl \
-  PortableServer/Basic_SArgument_T.cpp \
-  PortableServer/Basic_SArgument_T.h \
-  PortableServer/Basic_SArgument_T.inl \
-  PortableServer/Basic_SArguments.h \
-  PortableServer/Collocated_Arguments_Converter.h \
-  PortableServer/Collocated_Object_Proxy_Broker.h \
-  PortableServer/Creation_Time.h \
-  PortableServer/Creation_Time.inl \
-  PortableServer/Default_Acceptor_Filter.h \
-  PortableServer/Default_Policy_Validator.h \
-  PortableServer/Default_Servant_Dispatcher.h \
-  PortableServer/Direct_Collocation_Upcall_Wrapper.h \
-  PortableServer/Fixed_Array_SArgument_T.cpp \
-  PortableServer/Fixed_Array_SArgument_T.h \
-  PortableServer/Fixed_Array_SArgument_T.inl \
-  PortableServer/Fixed_Size_SArgument_T.cpp \
-  PortableServer/Fixed_Size_SArgument_T.h \
-  PortableServer/Fixed_Size_SArgument_T.inl \
-  PortableServer/ForwardRequest.pidl \
-  PortableServer/ForwardRequestA.h \
-  PortableServer/ForwardRequestC.h \
-  PortableServer/ForwardRequestS.h \
-  PortableServer/IdAssignmentPolicy.h \
-  PortableServer/IdAssignmentPolicy.pidl \
-  PortableServer/IdAssignmentPolicyA.h \
-  PortableServer/IdAssignmentPolicyC.h \
-  PortableServer/IdAssignmentPolicyS.h \
-  PortableServer/IdAssignmentStrategy.h \
-  PortableServer/IdAssignmentStrategyFactory.h \
-  PortableServer/IdAssignmentStrategyFactoryImpl.h \
-  PortableServer/IdAssignmentStrategySystem.h \
-  PortableServer/IdAssignmentStrategyUser.h \
-  PortableServer/IdUniquenessPolicy.h \
-  PortableServer/IdUniquenessPolicy.pidl \
-  PortableServer/IdUniquenessPolicyA.h \
-  PortableServer/IdUniquenessPolicyC.h \
-  PortableServer/IdUniquenessPolicyS.h \
-  PortableServer/IdUniquenessStrategy.h \
-  PortableServer/IdUniquenessStrategyFactory.h \
-  PortableServer/IdUniquenessStrategyFactoryImpl.h \
-  PortableServer/IdUniquenessStrategyMultiple.h \
-  PortableServer/IdUniquenessStrategyUnique.h \
-  PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h \
-  PortableServer/ImR_Client_Adapter.h \
-  PortableServer/ImplicitActivationPolicy.h \
-  PortableServer/ImplicitActivationPolicy.pidl \
-  PortableServer/ImplicitActivationPolicyA.h \
-  PortableServer/ImplicitActivationPolicyC.h \
-  PortableServer/ImplicitActivationPolicyS.h \
-  PortableServer/ImplicitActivationStrategy.h \
-  PortableServer/ImplicitActivationStrategyExplicit.h \
-  PortableServer/ImplicitActivationStrategyFactory.h \
-  PortableServer/ImplicitActivationStrategyFactoryImpl.h \
-  PortableServer/ImplicitActivationStrategyImplicit.h \
-  PortableServer/Key_Adapters.h \
-  PortableServer/LifespanPolicy.h \
-  PortableServer/LifespanPolicy.pidl \
-  PortableServer/LifespanPolicyA.h \
-  PortableServer/LifespanPolicyC.h \
-  PortableServer/LifespanPolicyS.h \
-  PortableServer/LifespanStrategy.h \
-  PortableServer/LifespanStrategyFactory.h \
-  PortableServer/LifespanStrategyFactoryImpl.h \
-  PortableServer/LifespanStrategyPersistent.h \
-  PortableServer/LifespanStrategyPersistentFactoryImpl.h \
-  PortableServer/LifespanStrategyTransient.h \
-  PortableServer/LifespanStrategyTransientFactoryImpl.h \
-  PortableServer/Local_Servant_Base.h \
-  PortableServer/Local_Servant_Base.inl \
-  PortableServer/Network_Priority_Hook.h \
-  PortableServer/Non_Servant_Upcall.h \
-  PortableServer/Non_Servant_Upcall.inl \
-  PortableServer/ORT_Adapter.h \
-  PortableServer/ORT_Adapter_Factory.h \
-  PortableServer/Object_Adapter.h \
-  PortableServer/Object_Adapter.inl \
-  PortableServer/Object_Adapter_Factory.h \
-  PortableServer/Object_SArg_Traits.h \
-  PortableServer/Object_SArgument_T.cpp \
-  PortableServer/Object_SArgument_T.h \
-  PortableServer/Object_SArgument_T.inl \
-  PortableServer/Operation_Table.h \
-  PortableServer/Operation_Table_Binary_Search.h \
-  PortableServer/Operation_Table_Dynamic_Hash.h \
-  PortableServer/Operation_Table_Linear_Search.h \
-  PortableServer/Operation_Table_Perfect_Hash.h \
-  PortableServer/POA.pidl \
-  PortableServer/POAC.h \
-  PortableServer/POAManager.h \
-  PortableServer/POAManager.inl \
-  PortableServer/POAManager.pidl \
-  PortableServer/POAManagerC.h \
-  PortableServer/POAManagerFactory.h \
-  PortableServer/POAManagerFactory.pidl \
-  PortableServer/POAManagerFactoryC.h \
-  PortableServer/POAManagerFactoryS.h \
-  PortableServer/POAManagerS.h \
-  PortableServer/POAS.h \
-  PortableServer/POA_Cached_Policies.h \
-  PortableServer/POA_Cached_Policies.inl \
-  PortableServer/POA_Current.h \
-  PortableServer/POA_Current_Factory.h \
-  PortableServer/POA_Current_Impl.h \
-  PortableServer/POA_Current_Impl.inl \
-  PortableServer/POA_Guard.h \
-  PortableServer/POA_Policy_Set.h \
-  PortableServer/POA_Policy_Set.inl \
-  PortableServer/PS_Current.pidl \
-  PortableServer/PS_CurrentC.h \
-  PortableServer/PS_CurrentS.h \
-  PortableServer/PS_Forward.pidl \
-  PortableServer/PS_ForwardA.h \
-  PortableServer/PS_ForwardC.h \
-  PortableServer/PolicyS.h \
-  PortableServer/PolicyS_T.cpp \
-  PortableServer/PolicyS_T.h \
-  PortableServer/PolicyS_T.inl \
-  PortableServer/Policy_Strategy.h \
-  PortableServer/PortableServer.h \
-  PortableServer/PortableServer.pidl \
-  PortableServer/PortableServerA.h \
-  PortableServer/PortableServerC.h \
-  PortableServer/PortableServerS.h \
-  PortableServer/PortableServer_Functions.h \
-  PortableServer/PortableServer_WFunctions.h \
-  PortableServer/PortableServer_include.pidl \
-  PortableServer/PortableServer_includeA.h \
-  PortableServer/PortableServer_includeC.h \
-  PortableServer/PortableServer_includeS.h \
-  PortableServer/Regular_POA.h \
-  PortableServer/Regular_POA.inl \
-  PortableServer/RequestProcessingPolicy.h \
-  PortableServer/RequestProcessingPolicy.pidl \
-  PortableServer/RequestProcessingPolicyA.h \
-  PortableServer/RequestProcessingPolicyC.h \
-  PortableServer/RequestProcessingPolicyS.h \
-  PortableServer/RequestProcessingStrategy.h \
-  PortableServer/RequestProcessingStrategyAOMOnly.h \
-  PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h \
-  PortableServer/RequestProcessingStrategyDefaultServant.h \
-  PortableServer/RequestProcessingStrategyDefaultServantFI.h \
-  PortableServer/RequestProcessingStrategyFactory.h \
-  PortableServer/RequestProcessingStrategyFactoryImpl.h \
-  PortableServer/RequestProcessingStrategyServantActivator.h \
-  PortableServer/RequestProcessingStrategyServantActivatorFI.h \
-  PortableServer/RequestProcessingStrategyServantLocator.h \
-  PortableServer/RequestProcessingStrategyServantLocatorFI.h \
-  PortableServer/RequestProcessingStrategyServantManager.h \
-  PortableServer/Root_POA.h \
-  PortableServer/Root_POA.inl \
-  PortableServer/SArg_Traits_T.h \
-  PortableServer/ServantActivator.pidl \
-  PortableServer/ServantActivatorA.h \
-  PortableServer/ServantActivatorC.h \
-  PortableServer/ServantActivatorS.h \
-  PortableServer/ServantLocator.pidl \
-  PortableServer/ServantLocatorA.h \
-  PortableServer/ServantLocatorC.h \
-  PortableServer/ServantLocatorS.h \
-  PortableServer/ServantManager.pidl \
-  PortableServer/ServantManagerA.h \
-  PortableServer/ServantManagerC.h \
-  PortableServer/ServantManagerS.h \
-  PortableServer/ServantRetentionPolicy.h \
-  PortableServer/ServantRetentionPolicy.pidl \
-  PortableServer/ServantRetentionPolicyA.h \
-  PortableServer/ServantRetentionPolicyC.h \
-  PortableServer/ServantRetentionPolicyS.h \
-  PortableServer/ServantRetentionStrategy.h \
-  PortableServer/ServantRetentionStrategyFactory.h \
-  PortableServer/ServantRetentionStrategyFactoryImpl.h \
-  PortableServer/ServantRetentionStrategyNonRetain.h \
-  PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h \
-  PortableServer/ServantRetentionStrategyRetain.h \
-  PortableServer/ServantRetentionStrategyRetainFactoryImpl.h \
-  PortableServer/Servant_Base.h \
-  PortableServer/Servant_Base.inl \
-  PortableServer/Servant_Dispatcher.h \
-  PortableServer/Servant_Location.h \
-  PortableServer/Servant_Upcall.h \
-  PortableServer/Servant_Upcall.inl \
-  PortableServer/Servant_var.cpp \
-  PortableServer/Servant_var.h \
-  PortableServer/Servant_var.inl \
-  PortableServer/Special_Basic_SArgument_T.cpp \
-  PortableServer/Special_Basic_SArgument_T.h \
-  PortableServer/Special_Basic_SArgument_T.inl \
-  PortableServer/Special_Basic_SArguments.h \
-  PortableServer/StrategyFactory.h \
-  PortableServer/ThreadPolicy.h \
-  PortableServer/ThreadPolicy.pidl \
-  PortableServer/ThreadPolicyA.h \
-  PortableServer/ThreadPolicyC.h \
-  PortableServer/ThreadPolicyS.h \
-  PortableServer/ThreadStrategy.h \
-  PortableServer/ThreadStrategyFactory.h \
-  PortableServer/ThreadStrategyFactoryImpl.h \
-  PortableServer/ThreadStrategyORBControl.h \
-  PortableServer/ThreadStrategySingle.h \
-  PortableServer/ThreadStrategySingleFactoryImpl.h \
-  PortableServer/TypeCode_SArg_Traits.h \
-  PortableServer/UB_String_SArgument_T.cpp \
-  PortableServer/UB_String_SArgument_T.h \
-  PortableServer/UB_String_SArgument_T.inl \
-  PortableServer/UB_String_SArguments.h \
-  PortableServer/Upcall_Command.h \
-  PortableServer/Upcall_Wrapper.h \
-  PortableServer/Var_Array_SArgument_T.cpp \
-  PortableServer/Var_Array_SArgument_T.h \
-  PortableServer/Var_Array_SArgument_T.inl \
-  PortableServer/Var_Size_SArgument_T.cpp \
-  PortableServer/Var_Size_SArgument_T.h \
-  PortableServer/Var_Size_SArgument_T.inl \
-  PortableServer/get_arg.h \
-  PortableServer/poa_macros.h \
-  PortableServer/portableserver_export.h
-
-pkgconfig_DATA += \
-  TAO_PortableServer.pc
-
-CLEANFILES += \
-  TAO_PortableServer.pc
-
-TAO_PortableServer.pc: ${top_builddir}/config.status ${srcdir}/PortableServer/TAO_PortableServer.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/PortableServer/TAO_PortableServer.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  PortableServer/TAO_PortableServer.pc.in \
-  PortableServer/TAO_PortableServer.rc
-
-
-## Makefile.CSD_Framework.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  CSD_Framework/CSD_FrameworkA.cpp \
-  CSD_Framework/CSD_FrameworkA.h \
-  CSD_Framework/CSD_FrameworkC.cpp \
-  CSD_Framework/CSD_FrameworkC.h \
-  CSD_Framework/CSD_FrameworkS.h
-
-CLEANFILES += \
-  CSD_Framework/CSD_Framework-stamp \
-  CSD_Framework/CSD_FrameworkA.cpp \
-  CSD_Framework/CSD_FrameworkA.h \
-  CSD_Framework/CSD_FrameworkC.cpp \
-  CSD_Framework/CSD_FrameworkC.h \
-  CSD_Framework/CSD_FrameworkS.h
-
-CSD_Framework/CSD_FrameworkA.cpp CSD_Framework/CSD_FrameworkA.h CSD_Framework/CSD_FrameworkC.cpp CSD_Framework/CSD_FrameworkC.h CSD_Framework/CSD_FrameworkS.h: CSD_Framework/CSD_Framework-stamp
-
-CSD_Framework/CSD_Framework-stamp: $(srcdir)/CSD_Framework/CSD_Framework.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -GA -Sal -Wb,export_macro=TAO_CSD_FW_Export -Wb,export_include=tao/CSD_Framework/CSD_FW_Export.h -o CSD_Framework $(srcdir)/CSD_Framework/CSD_Framework.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_CSD_Framework.la
-
-libTAO_CSD_Framework_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tao \
-  -DTAO_CSD_FW_BUILD_DLL
-
-libTAO_CSD_Framework_la_SOURCES = \
-  CSD_Framework/CSD_Default_Servant_Dispatcher.cpp \
-  CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp \
-  CSD_Framework/CSD_FrameworkA.cpp \
-  CSD_Framework/CSD_FrameworkC.cpp \
-  CSD_Framework/CSD_Framework_Loader.cpp \
-  CSD_Framework/CSD_ORBInitializer.cpp \
-  CSD_Framework/CSD_Object_Adapter.cpp \
-  CSD_Framework/CSD_Object_Adapter_Factory.cpp \
-  CSD_Framework/CSD_POA.cpp \
-  CSD_Framework/CSD_Strategy_Base.cpp \
-  CSD_Framework/CSD_Strategy_Proxy.cpp \
-  CSD_Framework/CSD_Strategy_Repository.cpp
-
-libTAO_CSD_Framework_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CSD_Framework_la_LIBADD = \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_PortableServer.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CSD_Framework/CSD_Default_Servant_Dispatcher.h \
-  CSD_Framework/CSD_FW_Export.h \
-  CSD_Framework/CSD_FW_Server_Request_Wrapper.h \
-  CSD_Framework/CSD_FW_Server_Request_Wrapper.inl \
-  CSD_Framework/CSD_Framework.pidl \
-  CSD_Framework/CSD_FrameworkA.h \
-  CSD_Framework/CSD_FrameworkC.h \
-  CSD_Framework/CSD_FrameworkS.h \
-  CSD_Framework/CSD_Framework_Loader.h \
-  CSD_Framework/CSD_ORBInitializer.h \
-  CSD_Framework/CSD_Object_Adapter.h \
-  CSD_Framework/CSD_Object_Adapter_Factory.h \
-  CSD_Framework/CSD_POA.h \
-  CSD_Framework/CSD_POA.inl \
-  CSD_Framework/CSD_Strategy_Base.h \
-  CSD_Framework/CSD_Strategy_Base.inl \
-  CSD_Framework/CSD_Strategy_Proxy.h \
-  CSD_Framework/CSD_Strategy_Proxy.inl \
-  CSD_Framework/CSD_Strategy_Repository.h
-
-pkgconfig_DATA += \
-  TAO_CSD_Framework.pc
-
-CLEANFILES += \
-  TAO_CSD_Framework.pc
-
-TAO_CSD_Framework.pc: ${top_builddir}/config.status ${srcdir}/CSD_Framework/TAO_CSD_Framework.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/CSD_Framework/TAO_CSD_Framework.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CSD_Framework/TAO_CSD_Framework.pc.in
-
-
-## Makefile.CSD_ThreadPool.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-lib_LTLIBRARIES += libTAO_CSD_ThreadPool.la
-
-libTAO_CSD_ThreadPool_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tao \
-  -DTAO_CSD_TP_BUILD_DLL
-
-libTAO_CSD_ThreadPool_la_SOURCES = \
-  CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp \
-  CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp \
-  CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp \
-  CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp \
-  CSD_ThreadPool/CSD_TP_Corba_Request.cpp \
-  CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp \
-  CSD_ThreadPool/CSD_TP_Custom_Request.cpp \
-  CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp \
-  CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp \
-  CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp \
-  CSD_ThreadPool/CSD_TP_Queue.cpp \
-  CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp \
-  CSD_ThreadPool/CSD_TP_Remote_Request.cpp \
-  CSD_ThreadPool/CSD_TP_Request.cpp \
-  CSD_ThreadPool/CSD_TP_Servant_State.cpp \
-  CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp \
-  CSD_ThreadPool/CSD_TP_Strategy.cpp \
-  CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp \
-  CSD_ThreadPool/CSD_TP_Synch_Helper.cpp \
-  CSD_ThreadPool/CSD_TP_Task.cpp \
-  CSD_ThreadPool/CSD_ThreadPool.cpp
-
-libTAO_CSD_ThreadPool_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_CSD_ThreadPool_la_LIBADD = \
-  libTAO_CSD_Framework.la \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_PortableServer.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  CSD_ThreadPool/CSD_TP_Cancel_Visitor.h \
-  CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl \
-  CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h \
-  CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl \
-  CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h \
-  CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl \
-  CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h \
-  CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl \
-  CSD_ThreadPool/CSD_TP_Corba_Request.h \
-  CSD_ThreadPool/CSD_TP_Corba_Request.inl \
-  CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h \
-  CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl \
-  CSD_ThreadPool/CSD_TP_Custom_Request.h \
-  CSD_ThreadPool/CSD_TP_Custom_Request.inl \
-  CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h \
-  CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl \
-  CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h \
-  CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl \
-  CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h \
-  CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl \
-  CSD_ThreadPool/CSD_TP_Export.h \
-  CSD_ThreadPool/CSD_TP_Queue.h \
-  CSD_ThreadPool/CSD_TP_Queue.inl \
-  CSD_ThreadPool/CSD_TP_Queue_Visitor.h \
-  CSD_ThreadPool/CSD_TP_Queue_Visitor.inl \
-  CSD_ThreadPool/CSD_TP_Remote_Request.h \
-  CSD_ThreadPool/CSD_TP_Remote_Request.inl \
-  CSD_ThreadPool/CSD_TP_Request.h \
-  CSD_ThreadPool/CSD_TP_Request.inl \
-  CSD_ThreadPool/CSD_TP_Servant_State.h \
-  CSD_ThreadPool/CSD_TP_Servant_State.inl \
-  CSD_ThreadPool/CSD_TP_Servant_State_Map.h \
-  CSD_ThreadPool/CSD_TP_Servant_State_Map.inl \
-  CSD_ThreadPool/CSD_TP_Strategy.h \
-  CSD_ThreadPool/CSD_TP_Strategy.inl \
-  CSD_ThreadPool/CSD_TP_Strategy_Factory.h \
-  CSD_ThreadPool/CSD_TP_Synch_Helper.h \
-  CSD_ThreadPool/CSD_TP_Synch_Helper.inl \
-  CSD_ThreadPool/CSD_TP_Task.h \
-  CSD_ThreadPool/CSD_TP_Task.inl \
-  CSD_ThreadPool/CSD_ThreadPool.h
-
-pkgconfig_DATA += \
-  TAO_CSD_ThreadPool.pc
-
-CLEANFILES += \
-  TAO_CSD_ThreadPool.pc
-
-TAO_CSD_ThreadPool.pc: ${top_builddir}/config.status ${srcdir}/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in
-
-
-## Makefile.DiffServPolicy.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  DiffServPolicy/DiffServPolicyA.cpp \
-  DiffServPolicy/DiffServPolicyA.h \
-  DiffServPolicy/DiffServPolicyC.cpp \
-  DiffServPolicy/DiffServPolicyC.h \
-  DiffServPolicy/DiffServPolicyS.h
-
-CLEANFILES += \
-  DiffServPolicy/DiffServPolicy-stamp \
-  DiffServPolicy/DiffServPolicyA.cpp \
-  DiffServPolicy/DiffServPolicyA.h \
-  DiffServPolicy/DiffServPolicyC.cpp \
-  DiffServPolicy/DiffServPolicyC.h \
-  DiffServPolicy/DiffServPolicyS.h
-
-DiffServPolicy/DiffServPolicyA.cpp DiffServPolicy/DiffServPolicyA.h DiffServPolicy/DiffServPolicyC.cpp DiffServPolicy/DiffServPolicyC.h DiffServPolicy/DiffServPolicyS.h: DiffServPolicy/DiffServPolicy-stamp
-
-DiffServPolicy/DiffServPolicy-stamp: $(srcdir)/DiffServPolicy/DiffServPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Sorb -Wb,export_macro=TAO_DiffServPolicy_Export -Wb,export_include=tao/DiffServPolicy/DiffServPolicy_Export.h -Wb,include_guard=TAO_DIFFSERVPOLICY_SAFE_INCLUDE -Wb,safe_include=tao/DiffServPolicy/DiffServPolicy.h -o DiffServPolicy $(srcdir)/DiffServPolicy/DiffServPolicy.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_DiffServPolicy.la
-
-libTAO_DiffServPolicy_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_DIFFSERVPOLICY_BUILD_DLL
-
-libTAO_DiffServPolicy_la_SOURCES = \
-  DiffServPolicy/Client_Network_Priority_Policy.cpp \
-  DiffServPolicy/DiffServPolicy.cpp \
-  DiffServPolicy/DiffServPolicyA.cpp \
-  DiffServPolicy/DiffServPolicyC.cpp \
-  DiffServPolicy/DiffServ_Service_Context_Handler.cpp \
-  DiffServPolicy/DiffServPolicy_Factory.cpp \
-  DiffServPolicy/DiffServPolicy_ORBInitializer.cpp \
-  DiffServPolicy/DiffServ_Network_Priority_Hook.cpp \
-  DiffServPolicy/DiffServ_Protocols_Hooks.cpp \
-  DiffServPolicy/Server_Network_Priority_Policy.cpp
-
-libTAO_DiffServPolicy_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DiffServPolicy_la_LIBADD = \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_PortableServer.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  DiffServPolicy/Client_Network_Priority_Policy.h \
-  DiffServPolicy/DiffServ_Service_Context_Handler.h \
-  DiffServPolicy/DiffServPolicy.h \
-  DiffServPolicy/DiffServPolicy.pidl \
-  DiffServPolicy/DiffServPolicyA.h \
-  DiffServPolicy/DiffServPolicyC.h \
-  DiffServPolicy/DiffServPolicyS.h \
-  DiffServPolicy/DiffServPolicy_Export.h \
-  DiffServPolicy/DiffServPolicy_Factory.h \
-  DiffServPolicy/DiffServPolicy_ORBInitializer.h \
-  DiffServPolicy/DiffServ_Network_Priority_Hook.h \
-  DiffServPolicy/DiffServ_Protocols_Hooks.h \
-  DiffServPolicy/Server_Network_Priority_Policy.h
-
-pkgconfig_DATA += \
-  TAO_DiffServPolicy.pc
-
-CLEANFILES += \
-  TAO_DiffServPolicy.pc
-
-TAO_DiffServPolicy.pc: ${top_builddir}/config.status ${srcdir}/DiffServPolicy/TAO_DiffServPolicy.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/DiffServPolicy/TAO_DiffServPolicy.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  DiffServPolicy/TAO_DiffServPolicy.pc.in
-
-
-## Makefile.Valuetype.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  Valuetype/StringValueC.cpp \
-  Valuetype/StringValueC.h \
-  Valuetype/StringValueC.inl \
-  Valuetype/StringValueS.h
-
-CLEANFILES += \
-  Valuetype/StringValue-stamp \
-  Valuetype/StringValueC.cpp \
-  Valuetype/StringValueC.h \
-  Valuetype/StringValueC.inl \
-  Valuetype/StringValueS.h
-
-Valuetype/StringValueC.cpp Valuetype/StringValueC.h Valuetype/StringValueC.inl Valuetype/StringValueS.h: Valuetype/StringValue-stamp
-
-Valuetype/StringValue-stamp: $(srcdir)/Valuetype/StringValue.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -Wb,export_macro=TAO_Valuetype_Export -Wb,export_include=tao/Valuetype/valuetype_export.h -o Valuetype $(srcdir)/Valuetype/StringValue.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_Valuetype.la
-
-libTAO_Valuetype_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_VALUETYPE_BUILD_DLL
-
-libTAO_Valuetype_la_SOURCES = \
-  Valuetype/AbstractBase.cpp \
-  Valuetype/AbstractBase_Invocation_Adapter.cpp \
-  Valuetype/StringValueC.cpp \
-  Valuetype/ValueBase.cpp \
-  Valuetype/ValueFactory.cpp \
-  Valuetype/ValueFactory_Map.cpp \
-  Valuetype/Valuetype_Adapter_Factory_Impl.cpp \
-  Valuetype/Valuetype_Adapter_Impl.cpp
-
-libTAO_Valuetype_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Valuetype_la_LIBADD = \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Valuetype/AbstractBase.h \
-  Valuetype/AbstractBase.inl \
-  Valuetype/AbstractBase_Invocation_Adapter.h \
-  Valuetype/AbstractBase_T.cpp \
-  Valuetype/AbstractBase_T.h \
-  Valuetype/Bounded_Valuetype_Allocation_Traits_T.h \
-  Valuetype/Bounded_Valuetype_Sequence_T.h \
-  Valuetype/Sequence_T.h \
-  Valuetype/StringValue.pidl \
-  Valuetype/StringValueC.h \
-  Valuetype/StringValueC.inl \
-  Valuetype/StringValueS.h \
-  Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h \
-  Valuetype/Unbounded_Valuetype_Sequence_T.h \
-  Valuetype/ValueBase.h \
-  Valuetype/ValueBase.inl \
-  Valuetype/ValueFactory.h \
-  Valuetype/ValueFactory_Map.h \
-  Valuetype/Value_CORBA_methods.h \
-  Valuetype/Value_VarOut_T.cpp \
-  Valuetype/Value_VarOut_T.h \
-  Valuetype/Valuetype_Adapter_Factory_Impl.h \
-  Valuetype/Valuetype_Adapter_Impl.h \
-  Valuetype/Valuetype_Sequence_Element_T.h \
-  Valuetype/Valuetype_Traits_Base_T.h \
-  Valuetype/Valuetype_Traits_T.h \
-  Valuetype/valuetype_export.h
-
-pkgconfig_DATA += \
-  TAO_Valuetype.pc
-
-CLEANFILES += \
-  TAO_Valuetype.pc
-
-TAO_Valuetype.pc: ${top_builddir}/config.status ${srcdir}/Valuetype/TAO_Valuetype.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Valuetype/TAO_Valuetype.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  Valuetype/TAO_Valuetype.pc.in \
-  Valuetype/TAO_Valuetype.rc
-
-
-## Makefile.DynamicAny.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  DynamicAny/DynamicAnyC.cpp \
-  DynamicAny/DynamicAnyC.h \
-  DynamicAny/DynamicAnyS.h
-
-CLEANFILES += \
-  DynamicAny/DynamicAny-stamp \
-  DynamicAny/DynamicAnyC.cpp \
-  DynamicAny/DynamicAnyC.h \
-  DynamicAny/DynamicAnyS.h
-
-DynamicAny/DynamicAnyC.cpp DynamicAny/DynamicAnyC.h DynamicAny/DynamicAnyS.h: DynamicAny/DynamicAny-stamp
-
-DynamicAny/DynamicAny-stamp: $(srcdir)/DynamicAny/DynamicAny.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_DynamicAny_Export -Wb,export_include=tao/DynamicAny/dynamicany_export.h -Wb,include_guard=TAO_DYNAMICANY_SAFE_INCLUDE -Wb,safe_include=tao/DynamicAny/DynamicAny.h -o DynamicAny $(srcdir)/DynamicAny/DynamicAny.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_DynamicAny.la
-
-libTAO_DynamicAny_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_DYNAMICANY_BUILD_DLL
-
-libTAO_DynamicAny_la_SOURCES = \
-  DynamicAny/DynAnyFactory.cpp \
-  DynamicAny/DynAny_i.cpp \
-  DynamicAny/DynArray_i.cpp \
-  DynamicAny/DynCommon.cpp \
-  DynamicAny/DynEnum_i.cpp \
-  DynamicAny/DynSequence_i.cpp \
-  DynamicAny/DynStruct_i.cpp \
-  DynamicAny/DynUnion_i.cpp \
-  DynamicAny/DynValueBox_i.cpp \
-  DynamicAny/DynValueCommon_i.cpp \
-  DynamicAny/DynValue_i.cpp \
-  DynamicAny/DynamicAny.cpp \
-  DynamicAny/DynamicAnyC.cpp
-
-libTAO_DynamicAny_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DynamicAny_la_LIBADD = \
-  libTAO_Valuetype.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  DynamicAny/DynAnyFactory.h \
-  DynamicAny/DynAnyUtils_T.cpp \
-  DynamicAny/DynAnyUtils_T.h \
-  DynamicAny/DynAny_i.h \
-  DynamicAny/DynArray_i.h \
-  DynamicAny/DynCommon.h \
-  DynamicAny/DynEnum_i.h \
-  DynamicAny/DynSequence_i.h \
-  DynamicAny/DynStruct_i.h \
-  DynamicAny/DynUnion_i.h \
-  DynamicAny/DynValueBox_i.h \
-  DynamicAny/DynValueCommon_i.h \
-  DynamicAny/DynValue_i.h \
-  DynamicAny/DynamicAny.h \
-  DynamicAny/DynamicAny.pidl \
-  DynamicAny/DynamicAnyC.h \
-  DynamicAny/DynamicAnyS.h \
-  DynamicAny/dynamicany_export.h
-
-pkgconfig_DATA += \
-  TAO_DynamicAny.pc
-
-CLEANFILES += \
-  TAO_DynamicAny.pc
-
-TAO_DynamicAny.pc: ${top_builddir}/config.status ${srcdir}/DynamicAny/TAO_DynamicAny.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/DynamicAny/TAO_DynamicAny.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  DynamicAny/TAO_DynamicAny.pc.in \
-  DynamicAny/TAO_DynamicAny.rc
-
-
-## Makefile.Messaging.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  Messaging/ExceptionHolderA.cpp \
-  Messaging/ExceptionHolderA.h \
-  Messaging/ExceptionHolderC.cpp \
-  Messaging/ExceptionHolderC.h \
-  Messaging/ExceptionHolderC.inl \
-  Messaging/ExceptionHolderS.h
-
-CLEANFILES += \
-  Messaging/ExceptionHolder-stamp \
-  Messaging/ExceptionHolderA.cpp \
-  Messaging/ExceptionHolderA.h \
-  Messaging/ExceptionHolderC.cpp \
-  Messaging/ExceptionHolderC.h \
-  Messaging/ExceptionHolderC.inl \
-  Messaging/ExceptionHolderS.h
-
-Messaging/ExceptionHolderA.cpp Messaging/ExceptionHolderA.h Messaging/ExceptionHolderC.cpp Messaging/ExceptionHolderC.h Messaging/ExceptionHolderC.inl Messaging/ExceptionHolderS.h: Messaging/ExceptionHolder-stamp
-
-Messaging/ExceptionHolder-stamp: $(srcdir)/Messaging/ExceptionHolder.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/ExceptionHolder.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  Messaging/PollableA.h \
-  Messaging/PollableC.cpp \
-  Messaging/PollableC.h \
-  Messaging/PollableS.h
-
-CLEANFILES += \
-  Messaging/Pollable-stamp \
-  Messaging/PollableA.h \
-  Messaging/PollableC.cpp \
-  Messaging/PollableC.h \
-  Messaging/PollableS.h
-
-Messaging/PollableA.h Messaging/PollableC.cpp Messaging/PollableC.h Messaging/PollableS.h: Messaging/Pollable-stamp
-
-Messaging/Pollable-stamp: $(srcdir)/Messaging/Pollable.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -Sal -GX -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Pollable.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  Messaging/Messaging_TypesA.h \
-  Messaging/Messaging_TypesC.cpp \
-  Messaging/Messaging_TypesC.h \
-  Messaging/Messaging_TypesS.h
-
-CLEANFILES += \
-  Messaging/Messaging_Types-stamp \
-  Messaging/Messaging_TypesA.h \
-  Messaging/Messaging_TypesC.cpp \
-  Messaging/Messaging_TypesC.h \
-  Messaging/Messaging_TypesS.h
-
-Messaging/Messaging_TypesA.h Messaging/Messaging_TypesC.cpp Messaging/Messaging_TypesC.h Messaging/Messaging_TypesS.h: Messaging/Messaging_Types-stamp
-
-Messaging/Messaging_Types-stamp: $(srcdir)/Messaging/Messaging_Types.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -Sal -GX -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_Types.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  Messaging/TAO_ExtA.cpp \
-  Messaging/TAO_ExtA.h \
-  Messaging/TAO_ExtC.cpp \
-  Messaging/TAO_ExtC.h \
-  Messaging/TAO_ExtS.h
-
-CLEANFILES += \
-  Messaging/TAO_Ext-stamp \
-  Messaging/TAO_ExtA.cpp \
-  Messaging/TAO_ExtA.h \
-  Messaging/TAO_ExtC.cpp \
-  Messaging/TAO_ExtC.h \
-  Messaging/TAO_ExtS.h
-
-Messaging/TAO_ExtA.cpp Messaging/TAO_ExtA.h Messaging/TAO_ExtC.cpp Messaging/TAO_ExtC.h Messaging/TAO_ExtS.h: Messaging/TAO_Ext-stamp
-
-Messaging/TAO_Ext-stamp: $(srcdir)/Messaging/TAO_Ext.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/TAO_Ext.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  Messaging/Messaging_RT_PolicyA.cpp \
-  Messaging/Messaging_RT_PolicyA.h \
-  Messaging/Messaging_RT_PolicyC.cpp \
-  Messaging/Messaging_RT_PolicyC.h \
-  Messaging/Messaging_RT_PolicyS.h
-
-CLEANFILES += \
-  Messaging/Messaging_RT_Policy-stamp \
-  Messaging/Messaging_RT_PolicyA.cpp \
-  Messaging/Messaging_RT_PolicyA.h \
-  Messaging/Messaging_RT_PolicyC.cpp \
-  Messaging/Messaging_RT_PolicyC.h \
-  Messaging/Messaging_RT_PolicyS.h
-
-Messaging/Messaging_RT_PolicyA.cpp Messaging/Messaging_RT_PolicyA.h Messaging/Messaging_RT_PolicyC.cpp Messaging/Messaging_RT_PolicyC.h Messaging/Messaging_RT_PolicyS.h: Messaging/Messaging_RT_Policy-stamp
-
-Messaging/Messaging_RT_Policy-stamp: $(srcdir)/Messaging/Messaging_RT_Policy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_RT_Policy.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  Messaging/Messaging_SyncScope_PolicyA.cpp \
-  Messaging/Messaging_SyncScope_PolicyA.h \
-  Messaging/Messaging_SyncScope_PolicyC.cpp \
-  Messaging/Messaging_SyncScope_PolicyC.h \
-  Messaging/Messaging_SyncScope_PolicyS.h
-
-CLEANFILES += \
-  Messaging/Messaging_SyncScope_Policy-stamp \
-  Messaging/Messaging_SyncScope_PolicyA.cpp \
-  Messaging/Messaging_SyncScope_PolicyA.h \
-  Messaging/Messaging_SyncScope_PolicyC.cpp \
-  Messaging/Messaging_SyncScope_PolicyC.h \
-  Messaging/Messaging_SyncScope_PolicyS.h
-
-Messaging/Messaging_SyncScope_PolicyA.cpp Messaging/Messaging_SyncScope_PolicyA.h Messaging/Messaging_SyncScope_PolicyC.cpp Messaging/Messaging_SyncScope_PolicyC.h Messaging/Messaging_SyncScope_PolicyS.h: Messaging/Messaging_SyncScope_Policy-stamp
-
-Messaging/Messaging_SyncScope_Policy-stamp: $(srcdir)/Messaging/Messaging_SyncScope_Policy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_SyncScope_Policy.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  Messaging/Messaging_No_ImplA.cpp \
-  Messaging/Messaging_No_ImplA.h \
-  Messaging/Messaging_No_ImplC.cpp \
-  Messaging/Messaging_No_ImplC.h \
-  Messaging/Messaging_No_ImplS.h
-
-CLEANFILES += \
-  Messaging/Messaging_No_Impl-stamp \
-  Messaging/Messaging_No_ImplA.cpp \
-  Messaging/Messaging_No_ImplA.h \
-  Messaging/Messaging_No_ImplC.cpp \
-  Messaging/Messaging_No_ImplC.h \
-  Messaging/Messaging_No_ImplS.h
-
-Messaging/Messaging_No_ImplA.cpp Messaging/Messaging_No_ImplA.h Messaging/Messaging_No_ImplC.cpp Messaging/Messaging_No_ImplC.h Messaging/Messaging_No_ImplS.h: Messaging/Messaging_No_Impl-stamp
-
-Messaging/Messaging_No_Impl-stamp: $(srcdir)/Messaging/Messaging_No_Impl.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE -Wb,safe_include=tao/Messaging/Messaging.h -o Messaging $(srcdir)/Messaging/Messaging_No_Impl.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  Messaging/MessagingA.cpp \
-  Messaging/MessagingA.h \
-  Messaging/MessagingC.cpp \
-  Messaging/MessagingC.h \
-  Messaging/MessagingC.inl \
-  Messaging/MessagingS.cpp \
-  Messaging/MessagingS.h
-
-CLEANFILES += \
-  Messaging/Messaging-stamp \
-  Messaging/MessagingA.cpp \
-  Messaging/MessagingA.h \
-  Messaging/MessagingC.cpp \
-  Messaging/MessagingC.h \
-  Messaging/MessagingC.inl \
-  Messaging/MessagingS.cpp \
-  Messaging/MessagingS.h
-
-Messaging/MessagingA.cpp Messaging/MessagingA.h Messaging/MessagingC.cpp Messaging/MessagingC.h Messaging/MessagingC.inl Messaging/MessagingS.cpp Messaging/MessagingS.h: Messaging/Messaging-stamp
-
-Messaging/Messaging-stamp: $(srcdir)/Messaging/Messaging.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ssi -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE -Wb,safe_include=tao/Messaging/Messaging.h -o Messaging $(srcdir)/Messaging/Messaging.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_Messaging.la
-
-libTAO_Messaging_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_MESSAGING_BUILD_DLL
-
-libTAO_Messaging_la_SOURCES = \
-  Messaging/AMH_Response_Handler.cpp \
-  Messaging/AMI_Arguments_Converter_Impl.cpp \
-  Messaging/Asynch_Invocation.cpp \
-  Messaging/Asynch_Invocation_Adapter.cpp \
-  Messaging/Asynch_Reply_Dispatcher.cpp \
-  Messaging/Asynch_Timeout_Handler.cpp \
-  Messaging/Buffering_Constraint_Policy.cpp \
-  Messaging/Connection_Timeout_Policy_i.cpp \
-  Messaging/ExceptionHolderA.cpp \
-  Messaging/ExceptionHolderC.cpp \
-  Messaging/ExceptionHolder_i.cpp \
-  Messaging/Messaging.cpp \
-  Messaging/MessagingA.cpp \
-  Messaging/MessagingC.cpp \
-  Messaging/MessagingS.cpp \
-  Messaging/Messaging_Loader.cpp \
-  Messaging/Messaging_No_ImplA.cpp \
-  Messaging/Messaging_No_ImplC.cpp \
-  Messaging/Messaging_ORBInitializer.cpp \
-  Messaging/Messaging_PolicyFactory.cpp \
-  Messaging/Messaging_Policy_i.cpp \
-  Messaging/Messaging_Queueing_Strategies.cpp \
-  Messaging/Messaging_RT_PolicyA.cpp \
-  Messaging/Messaging_RT_PolicyC.cpp \
-  Messaging/Messaging_SyncScope_PolicyA.cpp \
-  Messaging/Messaging_SyncScope_PolicyC.cpp \
-  Messaging/Messaging_TypesC.cpp \
-  Messaging/PollableC.cpp \
-  Messaging/TAO_ExtA.cpp \
-  Messaging/TAO_ExtC.cpp
-
-libTAO_Messaging_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Messaging_la_LIBADD = \
-  libTAO_Valuetype.la \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_PortableServer.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Messaging/AMH_Response_Handler.h \
-  Messaging/AMI_Arguments_Converter_Impl.h \
-  Messaging/Asynch_Invocation.h \
-  Messaging/Asynch_Invocation_Adapter.h \
-  Messaging/Asynch_Reply_Dispatcher.h \
-  Messaging/Asynch_Timeout_Handler.h \
-  Messaging/Buffering_Constraint_Policy.h \
-  Messaging/Buffering_Constraint_Policy.inl \
-  Messaging/Connection_Timeout_Policy_i.h \
-  Messaging/ExceptionHolder.pidl \
-  Messaging/ExceptionHolderA.h \
-  Messaging/ExceptionHolderC.h \
-  Messaging/ExceptionHolderC.inl \
-  Messaging/ExceptionHolderS.h \
-  Messaging/ExceptionHolder_i.h \
-  Messaging/Messaging.h \
-  Messaging/Messaging.pidl \
-  Messaging/MessagingA.h \
-  Messaging/MessagingC.h \
-  Messaging/MessagingC.inl \
-  Messaging/MessagingS.h \
-  Messaging/Messaging_Loader.h \
-  Messaging/Messaging_No_Impl.pidl \
-  Messaging/Messaging_No_ImplA.h \
-  Messaging/Messaging_No_ImplC.h \
-  Messaging/Messaging_No_ImplS.h \
-  Messaging/Messaging_ORBInitializer.h \
-  Messaging/Messaging_PolicyFactory.h \
-  Messaging/Messaging_Policy_i.h \
-  Messaging/Messaging_Policy_i.inl \
-  Messaging/Messaging_Queueing_Strategies.h \
-  Messaging/Messaging_RT_Policy.pidl \
-  Messaging/Messaging_RT_PolicyA.h \
-  Messaging/Messaging_RT_PolicyC.h \
-  Messaging/Messaging_RT_PolicyS.h \
-  Messaging/Messaging_SyncScope_Policy.pidl \
-  Messaging/Messaging_SyncScope_PolicyA.h \
-  Messaging/Messaging_SyncScope_PolicyC.h \
-  Messaging/Messaging_SyncScope_PolicyS.h \
-  Messaging/Messaging_Types.pidl \
-  Messaging/Messaging_TypesA.h \
-  Messaging/Messaging_TypesC.h \
-  Messaging/Messaging_TypesS.h \
-  Messaging/Pollable.pidl \
-  Messaging/PollableA.h \
-  Messaging/PollableC.h \
-  Messaging/PollableS.h \
-  Messaging/TAO_Ext.pidl \
-  Messaging/TAO_ExtA.h \
-  Messaging/TAO_ExtC.h \
-  Messaging/TAO_ExtS.h \
-  Messaging/messaging_export.h
-
-pkgconfig_DATA += \
-  TAO_Messaging.pc
-
-CLEANFILES += \
-  TAO_Messaging.pc
-
-TAO_Messaging.pc: ${top_builddir}/config.status ${srcdir}/Messaging/TAO_Messaging.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Messaging/TAO_Messaging.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  Messaging/TAO_Messaging.pc.in \
-  Messaging/TAO_Messaging.rc
-
-
-## Makefile.DynamicInterface.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_DynamicInterface.la
-
-libTAO_DynamicInterface_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_DYNAMICINTERFACE_BUILD_DLL
-
-libTAO_DynamicInterface_la_SOURCES = \
-  DynamicInterface/AMH_DSI_Response_Handler.cpp \
-  DynamicInterface/Context.cpp \
-  DynamicInterface/DII_Arguments.cpp \
-  DynamicInterface/DII_Arguments_Converter_Impl.cpp \
-  DynamicInterface/DII_Invocation.cpp \
-  DynamicInterface/DII_Invocation_Adapter.cpp \
-  DynamicInterface/DII_Reply_Dispatcher.cpp \
-  DynamicInterface/DII_Reply_Handler.cpp \
-  DynamicInterface/Dynamic_Adapter_Impl.cpp \
-  DynamicInterface/Dynamic_Implementation.cpp \
-  DynamicInterface/ExceptionList.cpp \
-  DynamicInterface/Request.cpp \
-  DynamicInterface/Server_Request.cpp \
-  DynamicInterface/Unknown_User_Exception.cpp
-
-libTAO_DynamicInterface_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DynamicInterface_la_LIBADD = \
-  libTAO_Messaging.la \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_PortableServer.la \
-  libTAO_Valuetype.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  DynamicInterface/AMH_DSI_Response_Handler.h \
-  DynamicInterface/AMH_DSI_Response_Handler.inl \
-  DynamicInterface/Context.h \
-  DynamicInterface/Context.inl \
-  DynamicInterface/DII_Arguments.h \
-  DynamicInterface/DII_Arguments.inl \
-  DynamicInterface/DII_Arguments_Converter_Impl.h \
-  DynamicInterface/DII_CORBA_methods.h \
-  DynamicInterface/DII_Invocation.h \
-  DynamicInterface/DII_Invocation_Adapter.h \
-  DynamicInterface/DII_Reply_Dispatcher.h \
-  DynamicInterface/DII_Reply_Handler.h \
-  DynamicInterface/DII_Reply_Handler.inl \
-  DynamicInterface/Dynamic_Adapter_Impl.h \
-  DynamicInterface/Dynamic_Implementation.h \
-  DynamicInterface/ExceptionList.h \
-  DynamicInterface/ExceptionList.inl \
-  DynamicInterface/Request.h \
-  DynamicInterface/Request.inl \
-  DynamicInterface/Server_Request.h \
-  DynamicInterface/Server_Request.inl \
-  DynamicInterface/Unknown_User_Exception.h \
-  DynamicInterface/dynamicinterface_export.h
-
-pkgconfig_DATA += \
-  TAO_DynamicInterface.pc
-
-CLEANFILES += \
-  TAO_DynamicInterface.pc
-
-TAO_DynamicInterface.pc: ${top_builddir}/config.status ${srcdir}/DynamicInterface/TAO_DynamicInterface.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/DynamicInterface/TAO_DynamicInterface.pc.in
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  DynamicInterface/TAO_DynamicInterface.pc.in \
-  DynamicInterface/TAO_DynamicInterface.rc
-
-
-## Makefile.EndpointPolicy.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  EndpointPolicy/EndpointPolicyA.cpp \
-  EndpointPolicy/EndpointPolicyA.h \
-  EndpointPolicy/EndpointPolicyC.cpp \
-  EndpointPolicy/EndpointPolicyC.h \
-  EndpointPolicy/EndpointPolicyS.h
-
-CLEANFILES += \
-  EndpointPolicy/EndpointPolicy-stamp \
-  EndpointPolicy/EndpointPolicyA.cpp \
-  EndpointPolicy/EndpointPolicyA.h \
-  EndpointPolicy/EndpointPolicyC.cpp \
-  EndpointPolicy/EndpointPolicyC.h \
-  EndpointPolicy/EndpointPolicyS.h
-
-EndpointPolicy/EndpointPolicyA.cpp EndpointPolicy/EndpointPolicyA.h EndpointPolicy/EndpointPolicyC.cpp EndpointPolicy/EndpointPolicyC.h EndpointPolicy/EndpointPolicyS.h: EndpointPolicy/EndpointPolicy-stamp
-
-EndpointPolicy/EndpointPolicy-stamp: $(srcdir)/EndpointPolicy/EndpointPolicy.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/EndpointPolicy.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  EndpointPolicy/IIOPEndpointValueA.cpp \
-  EndpointPolicy/IIOPEndpointValueA.h \
-  EndpointPolicy/IIOPEndpointValueC.cpp \
-  EndpointPolicy/IIOPEndpointValueC.h \
-  EndpointPolicy/IIOPEndpointValueS.h
-
-CLEANFILES += \
-  EndpointPolicy/IIOPEndpointValue-stamp \
-  EndpointPolicy/IIOPEndpointValueA.cpp \
-  EndpointPolicy/IIOPEndpointValueA.h \
-  EndpointPolicy/IIOPEndpointValueC.cpp \
-  EndpointPolicy/IIOPEndpointValueC.h \
-  EndpointPolicy/IIOPEndpointValueS.h
-
-EndpointPolicy/IIOPEndpointValueA.cpp EndpointPolicy/IIOPEndpointValueA.h EndpointPolicy/IIOPEndpointValueC.cpp EndpointPolicy/IIOPEndpointValueC.h EndpointPolicy/IIOPEndpointValueS.h: EndpointPolicy/IIOPEndpointValue-stamp
-
-EndpointPolicy/IIOPEndpointValue-stamp: $(srcdir)/EndpointPolicy/IIOPEndpointValue.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/IIOPEndpointValue.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  EndpointPolicy/EndpointPolicyTypeA.cpp \
-  EndpointPolicy/EndpointPolicyTypeA.h \
-  EndpointPolicy/EndpointPolicyTypeC.cpp \
-  EndpointPolicy/EndpointPolicyTypeC.h \
-  EndpointPolicy/EndpointPolicyTypeS.h
-
-CLEANFILES += \
-  EndpointPolicy/EndpointPolicyType-stamp \
-  EndpointPolicy/EndpointPolicyTypeA.cpp \
-  EndpointPolicy/EndpointPolicyTypeA.h \
-  EndpointPolicy/EndpointPolicyTypeC.cpp \
-  EndpointPolicy/EndpointPolicyTypeC.h \
-  EndpointPolicy/EndpointPolicyTypeS.h
-
-EndpointPolicy/EndpointPolicyTypeA.cpp EndpointPolicy/EndpointPolicyTypeA.h EndpointPolicy/EndpointPolicyTypeC.cpp EndpointPolicy/EndpointPolicyTypeC.h EndpointPolicy/EndpointPolicyTypeS.h: EndpointPolicy/EndpointPolicyType-stamp
-
-EndpointPolicy/EndpointPolicyType-stamp: $(srcdir)/EndpointPolicy/EndpointPolicyType.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/EndpointPolicyType.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_EndpointPolicy.la
-
-libTAO_EndpointPolicy_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_ENDPOINTPOLICY_BUILD_DLL
-
-libTAO_EndpointPolicy_la_SOURCES = \
-  EndpointPolicy/EndpointPolicy.cpp \
-  EndpointPolicy/EndpointPolicyA.cpp \
-  EndpointPolicy/EndpointPolicyC.cpp \
-  EndpointPolicy/EndpointPolicyTypeA.cpp \
-  EndpointPolicy/EndpointPolicyTypeC.cpp \
-  EndpointPolicy/EndpointPolicy_Factory.cpp \
-  EndpointPolicy/EndpointPolicy_ORBInitializer.cpp \
-  EndpointPolicy/EndpointPolicy_i.cpp \
-  EndpointPolicy/Endpoint_Acceptor_Filter.cpp \
-  EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp \
-  EndpointPolicy/Endpoint_Value_Impl.cpp \
-  EndpointPolicy/IIOPEndpointValueA.cpp \
-  EndpointPolicy/IIOPEndpointValueC.cpp \
-  EndpointPolicy/IIOPEndpointValue_i.cpp
-
-libTAO_EndpointPolicy_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_EndpointPolicy_la_LIBADD = \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_PortableServer.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  EndpointPolicy/EndpointPolicy.h \
-  EndpointPolicy/EndpointPolicy.pidl \
-  EndpointPolicy/EndpointPolicyA.h \
-  EndpointPolicy/EndpointPolicyC.h \
-  EndpointPolicy/EndpointPolicyS.h \
-  EndpointPolicy/EndpointPolicyType.pidl \
-  EndpointPolicy/EndpointPolicyTypeA.h \
-  EndpointPolicy/EndpointPolicyTypeC.h \
-  EndpointPolicy/EndpointPolicyTypeS.h \
-  EndpointPolicy/EndpointPolicy_Export.h \
-  EndpointPolicy/EndpointPolicy_Factory.h \
-  EndpointPolicy/EndpointPolicy_ORBInitializer.h \
-  EndpointPolicy/EndpointPolicy_i.h \
-  EndpointPolicy/Endpoint_Acceptor_Filter.h \
-  EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h \
-  EndpointPolicy/Endpoint_Value_Impl.h \
-  EndpointPolicy/IIOPEndpointValue.pidl \
-  EndpointPolicy/IIOPEndpointValueA.h \
-  EndpointPolicy/IIOPEndpointValueC.h \
-  EndpointPolicy/IIOPEndpointValueS.h \
-  EndpointPolicy/IIOPEndpointValue_i.h
-
-pkgconfig_DATA += \
-  TAO_EndpointPolicy.pc
-
-CLEANFILES += \
-  TAO_EndpointPolicy.pc
-
-TAO_EndpointPolicy.pc: ${top_builddir}/config.status ${srcdir}/EndpointPolicy/TAO_EndpointPolicy.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/EndpointPolicy/TAO_EndpointPolicy.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  EndpointPolicy/TAO_EndpointPolicy.pc.in
-
-
-## Makefile.IFR_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  IFR_Client/IFR_BaseA.h \
-  IFR_Client/IFR_BaseC.cpp \
-  IFR_Client/IFR_BaseC.h \
-  IFR_Client/IFR_BaseC.inl \
-  IFR_Client/IFR_BaseS.h
-
-CLEANFILES += \
-  IFR_Client/IFR_Base-stamp \
-  IFR_Client/IFR_BaseA.h \
-  IFR_Client/IFR_BaseC.cpp \
-  IFR_Client/IFR_BaseC.h \
-  IFR_Client/IFR_BaseC.inl \
-  IFR_Client/IFR_BaseS.h
-
-IFR_Client/IFR_BaseA.h IFR_Client/IFR_BaseC.cpp IFR_Client/IFR_BaseC.h IFR_Client/IFR_BaseC.inl IFR_Client/IFR_BaseS.h: IFR_Client/IFR_Base-stamp
-
-IFR_Client/IFR_Base-stamp: $(srcdir)/IFR_Client/IFR_Base.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Base.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  IFR_Client/IFR_BasicA.h \
-  IFR_Client/IFR_BasicC.cpp \
-  IFR_Client/IFR_BasicC.h \
-  IFR_Client/IFR_BasicC.inl \
-  IFR_Client/IFR_BasicS.h
-
-CLEANFILES += \
-  IFR_Client/IFR_Basic-stamp \
-  IFR_Client/IFR_BasicA.h \
-  IFR_Client/IFR_BasicC.cpp \
-  IFR_Client/IFR_BasicC.h \
-  IFR_Client/IFR_BasicC.inl \
-  IFR_Client/IFR_BasicS.h
-
-IFR_Client/IFR_BasicA.h IFR_Client/IFR_BasicC.cpp IFR_Client/IFR_BasicC.h IFR_Client/IFR_BasicC.inl IFR_Client/IFR_BasicS.h: IFR_Client/IFR_Basic-stamp
-
-IFR_Client/IFR_Basic-stamp: $(srcdir)/IFR_Client/IFR_Basic.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Basic.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  IFR_Client/IFR_ComponentsA.h \
-  IFR_Client/IFR_ComponentsC.cpp \
-  IFR_Client/IFR_ComponentsC.h \
-  IFR_Client/IFR_ComponentsC.inl \
-  IFR_Client/IFR_ComponentsS.h
-
-CLEANFILES += \
-  IFR_Client/IFR_Components-stamp \
-  IFR_Client/IFR_ComponentsA.h \
-  IFR_Client/IFR_ComponentsC.cpp \
-  IFR_Client/IFR_ComponentsC.h \
-  IFR_Client/IFR_ComponentsC.inl \
-  IFR_Client/IFR_ComponentsS.h
-
-IFR_Client/IFR_ComponentsA.h IFR_Client/IFR_ComponentsC.cpp IFR_Client/IFR_ComponentsC.h IFR_Client/IFR_ComponentsC.inl IFR_Client/IFR_ComponentsS.h: IFR_Client/IFR_Components-stamp
-
-IFR_Client/IFR_Components-stamp: $(srcdir)/IFR_Client/IFR_Components.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Components.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  IFR_Client/IFR_ExtendedA.h \
-  IFR_Client/IFR_ExtendedC.cpp \
-  IFR_Client/IFR_ExtendedC.h \
-  IFR_Client/IFR_ExtendedC.inl \
-  IFR_Client/IFR_ExtendedS.h
-
-CLEANFILES += \
-  IFR_Client/IFR_Extended-stamp \
-  IFR_Client/IFR_ExtendedA.h \
-  IFR_Client/IFR_ExtendedC.cpp \
-  IFR_Client/IFR_ExtendedC.h \
-  IFR_Client/IFR_ExtendedC.inl \
-  IFR_Client/IFR_ExtendedS.h
-
-IFR_Client/IFR_ExtendedA.h IFR_Client/IFR_ExtendedC.cpp IFR_Client/IFR_ExtendedC.h IFR_Client/IFR_ExtendedC.inl IFR_Client/IFR_ExtendedS.h: IFR_Client/IFR_Extended-stamp
-
-IFR_Client/IFR_Extended-stamp: $(srcdir)/IFR_Client/IFR_Extended.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Extended.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_IFR_Client.la
-
-libTAO_IFR_Client_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_IFR_CLIENT_BUILD_DLL
-
-libTAO_IFR_Client_la_SOURCES = \
-  IFR_Client/IFR_BaseC.cpp \
-  IFR_Client/IFR_BasicC.cpp \
-  IFR_Client/IFR_Client_Adapter_Impl.cpp \
-  IFR_Client/IFR_ComponentsC.cpp \
-  IFR_Client/IFR_ExtendedC.cpp
-
-libTAO_IFR_Client_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_IFR_Client_la_LIBADD = \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  IFR_Client/IFR_Base.pidl \
-  IFR_Client/IFR_BaseA.h \
-  IFR_Client/IFR_BaseC.h \
-  IFR_Client/IFR_BaseC.inl \
-  IFR_Client/IFR_BaseS.h \
-  IFR_Client/IFR_Basic.pidl \
-  IFR_Client/IFR_BasicA.h \
-  IFR_Client/IFR_BasicC.h \
-  IFR_Client/IFR_BasicC.inl \
-  IFR_Client/IFR_BasicS.h \
-  IFR_Client/IFR_Client_Adapter_Impl.h \
-  IFR_Client/IFR_Components.pidl \
-  IFR_Client/IFR_ComponentsA.h \
-  IFR_Client/IFR_ComponentsC.h \
-  IFR_Client/IFR_ComponentsC.inl \
-  IFR_Client/IFR_ComponentsS.h \
-  IFR_Client/IFR_Extended.pidl \
-  IFR_Client/IFR_ExtendedA.h \
-  IFR_Client/IFR_ExtendedC.h \
-  IFR_Client/IFR_ExtendedC.inl \
-  IFR_Client/IFR_ExtendedS.h \
-  IFR_Client/ifr_client_export.h
-
-pkgconfig_DATA += \
-  TAO_IFR_Client.pc
-
-CLEANFILES += \
-  TAO_IFR_Client.pc
-
-TAO_IFR_Client.pc: ${top_builddir}/config.status ${srcdir}/IFR_Client/TAO_IFR_Client.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IFR_Client/TAO_IFR_Client.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  IFR_Client/TAO_IFR_Client.pc.in \
-  IFR_Client/TAO_IFR_Client.rc
-
-
-## Makefile.ObjRefTemplate.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  ObjRefTemplate/ObjectReferenceTemplateA.h \
-  ObjRefTemplate/ObjectReferenceTemplateC.cpp \
-  ObjRefTemplate/ObjectReferenceTemplateC.h \
-  ObjRefTemplate/ObjectReferenceTemplateC.inl \
-  ObjRefTemplate/ObjectReferenceTemplateS.h
-
-CLEANFILES += \
-  ObjRefTemplate/ObjectReferenceTemplate-stamp \
-  ObjRefTemplate/ObjectReferenceTemplateA.h \
-  ObjRefTemplate/ObjectReferenceTemplateC.cpp \
-  ObjRefTemplate/ObjectReferenceTemplateC.h \
-  ObjRefTemplate/ObjectReferenceTemplateC.inl \
-  ObjRefTemplate/ObjectReferenceTemplateS.h
-
-ObjRefTemplate/ObjectReferenceTemplateA.h ObjRefTemplate/ObjectReferenceTemplateC.cpp ObjRefTemplate/ObjectReferenceTemplateC.h ObjRefTemplate/ObjectReferenceTemplateC.inl ObjRefTemplate/ObjectReferenceTemplateS.h: ObjRefTemplate/ObjectReferenceTemplate-stamp
-
-ObjRefTemplate/ObjectReferenceTemplate-stamp: $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -SS -Sorb -GX -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -Wb,include_guard=TAO_OBJREF_TEMPLATE_SAFE_INCLUDE -Wb,safe_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  ObjRefTemplate/ObjectReferenceTemplate_includeA.h \
-  ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp \
-  ObjRefTemplate/ObjectReferenceTemplate_includeC.h \
-  ObjRefTemplate/ObjectReferenceTemplate_includeS.h
-
-CLEANFILES += \
-  ObjRefTemplate/ObjectReferenceTemplate_include-stamp \
-  ObjRefTemplate/ObjectReferenceTemplate_includeA.h \
-  ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp \
-  ObjRefTemplate/ObjectReferenceTemplate_includeC.h \
-  ObjRefTemplate/ObjectReferenceTemplate_includeS.h
-
-ObjRefTemplate/ObjectReferenceTemplate_includeA.h ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp ObjRefTemplate/ObjectReferenceTemplate_includeC.h ObjRefTemplate/ObjectReferenceTemplate_includeS.h: ObjRefTemplate/ObjectReferenceTemplate_include-stamp
-
-ObjRefTemplate/ObjectReferenceTemplate_include-stamp: $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GX -Sci -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -Wb,unique_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate_include.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  ObjRefTemplate/Default_ORTA.cpp \
-  ObjRefTemplate/Default_ORTA.h \
-  ObjRefTemplate/Default_ORTC.cpp \
-  ObjRefTemplate/Default_ORTC.h \
-  ObjRefTemplate/Default_ORTC.inl \
-  ObjRefTemplate/Default_ORTS.h
-
-CLEANFILES += \
-  ObjRefTemplate/Default_ORT-stamp \
-  ObjRefTemplate/Default_ORTA.cpp \
-  ObjRefTemplate/Default_ORTA.h \
-  ObjRefTemplate/Default_ORTC.cpp \
-  ObjRefTemplate/Default_ORTC.h \
-  ObjRefTemplate/Default_ORTC.inl \
-  ObjRefTemplate/Default_ORTS.h
-
-ObjRefTemplate/Default_ORTA.cpp ObjRefTemplate/Default_ORTA.h ObjRefTemplate/Default_ORTC.cpp ObjRefTemplate/Default_ORTC.h ObjRefTemplate/Default_ORTC.inl ObjRefTemplate/Default_ORTS.h: ObjRefTemplate/Default_ORT-stamp
-
-ObjRefTemplate/Default_ORT-stamp: $(srcdir)/ObjRefTemplate/Default_ORT.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -SS -GA -Sorb -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/Default_ORT.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_ObjRefTemplate.la
-
-libTAO_ObjRefTemplate_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_ORT_BUILD_DLL
-
-libTAO_ObjRefTemplate_la_SOURCES = \
-  ObjRefTemplate/Default_ORTA.cpp \
-  ObjRefTemplate/Default_ORTC.cpp \
-  ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp \
-  ObjRefTemplate/ORT_Adapter_Impl.cpp \
-  ObjRefTemplate/ObjectReferenceTemplateC.cpp \
-  ObjRefTemplate/ObjectReferenceTemplate_i.cpp \
-  ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp
-
-libTAO_ObjRefTemplate_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_ObjRefTemplate_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO_Valuetype.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  ObjRefTemplate/Default_ORT.pidl \
-  ObjRefTemplate/Default_ORTA.h \
-  ObjRefTemplate/Default_ORTC.h \
-  ObjRefTemplate/Default_ORTC.inl \
-  ObjRefTemplate/Default_ORTS.h \
-  ObjRefTemplate/ORT_Adapter_Factory_Impl.h \
-  ObjRefTemplate/ORT_Adapter_Impl.h \
-  ObjRefTemplate/ObjectReferenceTemplate.h \
-  ObjRefTemplate/ObjectReferenceTemplate.pidl \
-  ObjRefTemplate/ObjectReferenceTemplateA.h \
-  ObjRefTemplate/ObjectReferenceTemplateC.h \
-  ObjRefTemplate/ObjectReferenceTemplateC.inl \
-  ObjRefTemplate/ObjectReferenceTemplateS.h \
-  ObjRefTemplate/ObjectReferenceTemplate_i.h \
-  ObjRefTemplate/ObjectReferenceTemplate_include.pidl \
-  ObjRefTemplate/ObjectReferenceTemplate_includeA.h \
-  ObjRefTemplate/ObjectReferenceTemplate_includeC.h \
-  ObjRefTemplate/ObjectReferenceTemplate_includeS.h \
-  ObjRefTemplate/ort_export.h
-
-pkgconfig_DATA += \
-  TAO_ObjRefTemplate.pc
-
-CLEANFILES += \
-  TAO_ObjRefTemplate.pc
-
-TAO_ObjRefTemplate.pc: ${top_builddir}/config.status ${srcdir}/ObjRefTemplate/TAO_ObjRefTemplate.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ObjRefTemplate/TAO_ObjRefTemplate.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  ObjRefTemplate/TAO_ObjRefTemplate.pc.in \
-  ObjRefTemplate/TAO_ObjRefTemplate.rc
-
-
-## Makefile.IORInterceptor.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  IORInterceptor/IORInterceptorC.cpp \
-  IORInterceptor/IORInterceptorC.h \
-  IORInterceptor/IORInterceptorS.h
-
-CLEANFILES += \
-  IORInterceptor/IORInterceptor-stamp \
-  IORInterceptor/IORInterceptorC.cpp \
-  IORInterceptor/IORInterceptorC.h \
-  IORInterceptor/IORInterceptorS.h
-
-IORInterceptor/IORInterceptorC.cpp IORInterceptor/IORInterceptorC.h IORInterceptor/IORInterceptorS.h: IORInterceptor/IORInterceptor-stamp
-
-IORInterceptor/IORInterceptor-stamp: $(srcdir)/IORInterceptor/IORInterceptor.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_IORInterceptor_Export -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h -Wb,include_guard=TAO_IORINTERCEPTOR_SAFE_INCLUDE -Wb,safe_include=tao/IORInterceptor/IORInterceptor.h -o IORInterceptor $(srcdir)/IORInterceptor/IORInterceptor.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  IORInterceptor/IORInfoC.cpp \
-  IORInterceptor/IORInfoC.h \
-  IORInterceptor/IORInfoS.h
-
-CLEANFILES += \
-  IORInterceptor/IORInfo-stamp \
-  IORInterceptor/IORInfoC.cpp \
-  IORInterceptor/IORInfoC.h \
-  IORInterceptor/IORInfoS.h
-
-IORInterceptor/IORInfoC.cpp IORInterceptor/IORInfoC.h IORInterceptor/IORInfoS.h: IORInterceptor/IORInfo-stamp
-
-IORInterceptor/IORInfo-stamp: $(srcdir)/IORInterceptor/IORInfo.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_IORInterceptor_Export -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h -o IORInterceptor $(srcdir)/IORInterceptor/IORInfo.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_IORInterceptor.la
-
-libTAO_IORInterceptor_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_IORINTERCEPTOR_BUILD_DLL
-
-libTAO_IORInterceptor_la_SOURCES = \
-  IORInterceptor/IORInfo.cpp \
-  IORInterceptor/IORInfoC.cpp \
-  IORInterceptor/IORInterceptorC.cpp \
-  IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp \
-  IORInterceptor/IORInterceptor_Adapter_Impl.cpp \
-  IORInterceptor/IORInterceptor_Details.cpp
-
-libTAO_IORInterceptor_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_IORInterceptor_la_LIBADD = \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_ObjRefTemplate.la \
-  libTAO_Valuetype.la \
-  libTAO_PortableServer.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  IORInterceptor/IORInfo.h \
-  IORInterceptor/IORInfo.inl \
-  IORInterceptor/IORInfo.pidl \
-  IORInterceptor/IORInfoC.h \
-  IORInterceptor/IORInfoS.h \
-  IORInterceptor/IORInterceptor.h \
-  IORInterceptor/IORInterceptor.pidl \
-  IORInterceptor/IORInterceptorC.h \
-  IORInterceptor/IORInterceptorS.h \
-  IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \
-  IORInterceptor/IORInterceptor_Adapter_Impl.h \
-  IORInterceptor/IORInterceptor_Details.h \
-  IORInterceptor/iorinterceptor_export.h
-
-pkgconfig_DATA += \
-  TAO_IORInterceptor.pc
-
-CLEANFILES += \
-  TAO_IORInterceptor.pc
-
-TAO_IORInterceptor.pc: ${top_builddir}/config.status ${srcdir}/IORInterceptor/TAO_IORInterceptor.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IORInterceptor/TAO_IORInterceptor.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  IORInterceptor/TAO_IORInterceptor.pc.in \
-  IORInterceptor/TAO_IORInterceptor.rc
-
-
-## Makefile.IORManipulation.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  IORManipulation/IORA.h \
-  IORManipulation/IORC.cpp \
-  IORManipulation/IORC.h \
-  IORManipulation/IORS.h
-
-CLEANFILES += \
-  IORManipulation/IOR-stamp \
-  IORManipulation/IORA.h \
-  IORManipulation/IORC.cpp \
-  IORManipulation/IORC.h \
-  IORManipulation/IORS.h
-
-IORManipulation/IORA.h IORManipulation/IORC.cpp IORManipulation/IORC.h IORManipulation/IORS.h: IORManipulation/IOR-stamp
-
-IORManipulation/IOR-stamp: $(srcdir)/IORManipulation/IOR.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GX -Wb,export_macro=TAO_IORManip_Export -Wb,export_include=tao/IORManipulation/ior_manip_export.h -Wb,include_guard=TAO_IORMANIP_SAFE_INCLUDE -Wb,safe_include=tao/IORManipulation/IORManip_Loader.h -o IORManipulation $(srcdir)/IORManipulation/IOR.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_IORManip.la
-
-libTAO_IORManip_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_IORMANIP_BUILD_DLL
-
-libTAO_IORManip_la_SOURCES = \
-  IORManipulation/IORC.cpp \
-  IORManipulation/IORManip_Filter.cpp \
-  IORManipulation/IORManip_IIOP_Filter.cpp \
-  IORManipulation/IORManip_Loader.cpp \
-  IORManipulation/IORManipulation.cpp
-
-libTAO_IORManip_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_IORManip_la_LIBADD = \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  IORManipulation/IOR.pidl \
-  IORManipulation/IORA.h \
-  IORManipulation/IORC.h \
-  IORManipulation/IORManip_Filter.h \
-  IORManipulation/IORManip_IIOP_Filter.h \
-  IORManipulation/IORManip_Loader.h \
-  IORManipulation/IORManipulation.h \
-  IORManipulation/IORS.h \
-  IORManipulation/ior_manip_export.h
-
-pkgconfig_DATA += \
-  TAO_IORManip.pc
-
-CLEANFILES += \
-  TAO_IORManip.pc
-
-TAO_IORManip.pc: ${top_builddir}/config.status ${srcdir}/IORManipulation/TAO_IORManip.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IORManipulation/TAO_IORManip.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  IORManipulation/TAO_IORManip.pc.in \
-  IORManipulation/TAO_IORManip.rc
-
-
-## Makefile.IORTable.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  IORTable/IORTableC.cpp \
-  IORTable/IORTableC.h \
-  IORTable/IORTableS.h
-
-CLEANFILES += \
-  IORTable/IORTable-stamp \
-  IORTable/IORTableC.cpp \
-  IORTable/IORTableC.h \
-  IORTable/IORTableS.h
-
-IORTable/IORTableC.cpp IORTable/IORTableC.h IORTable/IORTableS.h: IORTable/IORTable-stamp
-
-IORTable/IORTable-stamp: $(srcdir)/IORTable/IORTable.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_IORTable_Export -Wb,export_include=tao/IORTable/iortable_export.h -Wb,include_guard=TAO_IORTABLE_SAFE_INCLUDE -Wb,safe_include=tao/IORTable/IORTable.h -o IORTable $(srcdir)/IORTable/IORTable.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_IORTable.la
-
-libTAO_IORTable_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_IORTABLE_BUILD_DLL
-
-libTAO_IORTable_la_SOURCES = \
-  IORTable/IORTable.cpp \
-  IORTable/IORTableC.cpp \
-  IORTable/IOR_Table_Impl.cpp \
-  IORTable/Table_Adapter.cpp
-
-libTAO_IORTable_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_IORTable_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  IORTable/IORTable.h \
-  IORTable/IORTable.pidl \
-  IORTable/IORTableC.h \
-  IORTable/IORTableS.h \
-  IORTable/IOR_Table_Impl.h \
-  IORTable/Table_Adapter.h \
-  IORTable/iortable_export.h
-
-pkgconfig_DATA += \
-  TAO_IORTable.pc
-
-CLEANFILES += \
-  TAO_IORTable.pc
-
-TAO_IORTable.pc: ${top_builddir}/config.status ${srcdir}/IORTable/TAO_IORTable.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IORTable/TAO_IORTable.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  IORTable/TAO_IORTable.pc.in \
-  IORTable/TAO_IORTable.rc
-
-
-## Makefile.ImR_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  ImR_Client/ServerObjectA.cpp \
-  ImR_Client/ServerObjectA.h \
-  ImR_Client/ServerObjectC.cpp \
-  ImR_Client/ServerObjectC.h \
-  ImR_Client/ServerObjectC.inl \
-  ImR_Client/ServerObjectS.cpp \
-  ImR_Client/ServerObjectS.h
-
-CLEANFILES += \
-  ImR_Client/ServerObject-stamp \
-  ImR_Client/ServerObjectA.cpp \
-  ImR_Client/ServerObjectA.h \
-  ImR_Client/ServerObjectC.cpp \
-  ImR_Client/ServerObjectC.h \
-  ImR_Client/ServerObjectC.inl \
-  ImR_Client/ServerObjectS.cpp \
-  ImR_Client/ServerObjectS.h
-
-ImR_Client/ServerObjectA.cpp ImR_Client/ServerObjectA.h ImR_Client/ServerObjectC.cpp ImR_Client/ServerObjectC.h ImR_Client/ServerObjectC.inl ImR_Client/ServerObjectS.cpp ImR_Client/ServerObjectS.h: ImR_Client/ServerObject-stamp
-
-ImR_Client/ServerObject-stamp: $(srcdir)/ImR_Client/ServerObject.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Ssi -Gd -Sorb -GA -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=tao/ImR_Client/imr_client_export.h -o ImR_Client $(srcdir)/ImR_Client/ServerObject.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  ImR_Client/ImplRepoA.h \
-  ImR_Client/ImplRepoC.cpp \
-  ImR_Client/ImplRepoC.h \
-  ImR_Client/ImplRepoC.inl \
-  ImR_Client/ImplRepoS.cpp \
-  ImR_Client/ImplRepoS.h
-
-CLEANFILES += \
-  ImR_Client/ImplRepo-stamp \
-  ImR_Client/ImplRepoA.h \
-  ImR_Client/ImplRepoC.cpp \
-  ImR_Client/ImplRepoC.h \
-  ImR_Client/ImplRepoC.inl \
-  ImR_Client/ImplRepoS.cpp \
-  ImR_Client/ImplRepoS.h
-
-ImR_Client/ImplRepoA.h ImR_Client/ImplRepoC.cpp ImR_Client/ImplRepoC.h ImR_Client/ImplRepoC.inl ImR_Client/ImplRepoS.cpp ImR_Client/ImplRepoS.h: ImR_Client/ImplRepo-stamp
-
-ImR_Client/ImplRepo-stamp: $(srcdir)/ImR_Client/ImplRepo.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Ssi -Gd -Sorb -GX -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=tao/ImR_Client/imr_client_export.h -o ImR_Client $(srcdir)/ImR_Client/ImplRepo.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_ImR_Client.la
-
-libTAO_ImR_Client_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_IMR_CLIENT_BUILD_DLL
-
-libTAO_ImR_Client_la_SOURCES = \
-  ImR_Client/ImR_Client.cpp \
-  ImR_Client/ImplRepoC.cpp \
-  ImR_Client/ImplRepoS.cpp \
-  ImR_Client/ServerObjectA.cpp \
-  ImR_Client/ServerObjectC.cpp \
-  ImR_Client/ServerObjectS.cpp \
-  ImR_Client/ServerObject_i.cpp
-
-libTAO_ImR_Client_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_ImR_Client_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  ImR_Client/ImR_Client.h \
-  ImR_Client/ImplRepo.pidl \
-  ImR_Client/ImplRepoA.h \
-  ImR_Client/ImplRepoC.h \
-  ImR_Client/ImplRepoC.inl \
-  ImR_Client/ImplRepoS.h \
-  ImR_Client/ServerObject.pidl \
-  ImR_Client/ServerObjectA.h \
-  ImR_Client/ServerObjectC.h \
-  ImR_Client/ServerObjectC.inl \
-  ImR_Client/ServerObjectS.h \
-  ImR_Client/ServerObject_i.h \
-  ImR_Client/imr_client_export.h
-
-pkgconfig_DATA += \
-  TAO_ImR_Client.pc
-
-CLEANFILES += \
-  TAO_ImR_Client.pc
-
-TAO_ImR_Client.pc: ${top_builddir}/config.status ${srcdir}/ImR_Client/TAO_ImR_Client.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ImR_Client/TAO_ImR_Client.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  ImR_Client/TAO_IMR_Client.rc \
-  ImR_Client/TAO_ImR_Client.pc.in
-
-
-## Makefile.PI_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  PI_Server/ServerRequestInfoA.cpp \
-  PI_Server/ServerRequestInfoA.h \
-  PI_Server/ServerRequestInfoC.cpp \
-  PI_Server/ServerRequestInfoC.h \
-  PI_Server/ServerRequestInfoS.h
-
-CLEANFILES += \
-  PI_Server/ServerRequestInfo-stamp \
-  PI_Server/ServerRequestInfoA.cpp \
-  PI_Server/ServerRequestInfoA.h \
-  PI_Server/ServerRequestInfoC.cpp \
-  PI_Server/ServerRequestInfoC.h \
-  PI_Server/ServerRequestInfoS.h
-
-PI_Server/ServerRequestInfoA.cpp PI_Server/ServerRequestInfoA.h PI_Server/ServerRequestInfoC.cpp PI_Server/ServerRequestInfoC.h PI_Server/ServerRequestInfoS.h: PI_Server/ServerRequestInfo-stamp
-
-PI_Server/ServerRequestInfo-stamp: $(srcdir)/PI_Server/ServerRequestInfo.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PI_Server_Export -Wb,export_include=tao/PI_Server/pi_server_export.h -o PI_Server -Sci -SS -GA -Gp -Gd -Sorb -Sal $(srcdir)/PI_Server/ServerRequestInfo.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  PI_Server/PI_Server_includeA.h \
-  PI_Server/PI_Server_includeC.cpp \
-  PI_Server/PI_Server_includeC.h \
-  PI_Server/PI_Server_includeS.h
-
-CLEANFILES += \
-  PI_Server/PI_Server_include-stamp \
-  PI_Server/PI_Server_includeA.h \
-  PI_Server/PI_Server_includeC.cpp \
-  PI_Server/PI_Server_includeC.h \
-  PI_Server/PI_Server_includeS.h
-
-PI_Server/PI_Server_includeA.h PI_Server/PI_Server_includeC.cpp PI_Server/PI_Server_includeC.h PI_Server/PI_Server_includeS.h: PI_Server/PI_Server_include-stamp
-
-PI_Server/PI_Server_include-stamp: $(srcdir)/PI_Server/PI_Server_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PI_Server_Export -Wb,export_include=tao/PI_Server/pi_server_export.h -o PI_Server -SS -Sorb -GX -Sci -Wb,unique_include=tao/PI_Server/PI_Server.h $(srcdir)/PI_Server/PI_Server_include.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_PI_Server.la
-
-libTAO_PI_Server_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_PI_SERVER_BUILD_DLL
-
-libTAO_PI_Server_la_SOURCES = \
-  PI_Server/PICurrent_Guard.cpp \
-  PI_Server/PI_Server.cpp \
-  PI_Server/PI_Server_Loader.cpp \
-  PI_Server/PI_Server_includeC.cpp \
-  PI_Server/PortableServer_ORBInitializer.cpp \
-  PI_Server/PortableServer_PolicyFactory.cpp \
-  PI_Server/ServerInterceptorAdapter.cpp \
-  PI_Server/ServerRequestDetails.cpp \
-  PI_Server/ServerRequestInfo.cpp \
-  PI_Server/ServerRequestInfoA.cpp \
-  PI_Server/ServerRequestInfoC.cpp \
-  PI_Server/ServerRequestInterceptorA.cpp \
-  PI_Server/ServerRequestInterceptorC.cpp \
-  PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
-
-libTAO_PI_Server_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_PI_Server_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  PI_Server/PICurrent_Guard.h \
-  PI_Server/PI_Server.h \
-  PI_Server/PI_Server_Loader.h \
-  PI_Server/PI_Server_include.pidl \
-  PI_Server/PI_Server_includeA.h \
-  PI_Server/PI_Server_includeC.h \
-  PI_Server/PI_Server_includeS.h \
-  PI_Server/Policy_Creator_T.h \
-  PI_Server/PortableServer_ORBInitializer.h \
-  PI_Server/PortableServer_PolicyFactory.h \
-  PI_Server/ServerInterceptorAdapter.h \
-  PI_Server/ServerRequestDetails.h \
-  PI_Server/ServerRequestDetails.inl \
-  PI_Server/ServerRequestInfo.h \
-  PI_Server/ServerRequestInfo.inl \
-  PI_Server/ServerRequestInfo.pidl \
-  PI_Server/ServerRequestInfoA.h \
-  PI_Server/ServerRequestInfoC.h \
-  PI_Server/ServerRequestInfoS.h \
-  PI_Server/ServerRequestInterceptor.pidl \
-  PI_Server/ServerRequestInterceptorA.h \
-  PI_Server/ServerRequestInterceptorC.h \
-  PI_Server/ServerRequestInterceptorS.h \
-  PI_Server/ServerRequestInterceptor_Factory_Impl.h \
-  PI_Server/pi_server_export.h
-
-pkgconfig_DATA += \
-  TAO_PI_Server.pc
-
-CLEANFILES += \
-  TAO_PI_Server.pc
-
-TAO_PI_Server.pc: ${top_builddir}/config.status ${srcdir}/PI_Server/TAO_PI_Server.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/PI_Server/TAO_PI_Server.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  PI_Server/TAO_PI_Server.pc.in
-
-
-## Makefile.RTCORBA.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES += \
-  RTCORBA/RTCORBA_includeA.h \
-  RTCORBA/RTCORBA_includeC.cpp \
-  RTCORBA/RTCORBA_includeC.h \
-  RTCORBA/RTCORBA_includeS.h
-
-CLEANFILES += \
-  RTCORBA/RTCORBA_include-stamp \
-  RTCORBA/RTCORBA_includeA.h \
-  RTCORBA/RTCORBA_includeC.cpp \
-  RTCORBA/RTCORBA_includeC.h \
-  RTCORBA/RTCORBA_includeS.h
-
-RTCORBA/RTCORBA_includeA.h RTCORBA/RTCORBA_includeC.cpp RTCORBA/RTCORBA_includeC.h RTCORBA/RTCORBA_includeS.h: RTCORBA/RTCORBA_include-stamp
-
-RTCORBA/RTCORBA_include-stamp: $(srcdir)/RTCORBA/RTCORBA_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Sorb -GX -Wb,export_macro=TAO_RTCORBA_Export -Wb,export_include=tao/RTCORBA/rtcorba_export.h -o RTCORBA -Sa -Wb,unique_include=tao/RTCORBA/RTCORBA.h $(srcdir)/RTCORBA/RTCORBA_include.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  RTCORBA/RTCORBAA.h \
-  RTCORBA/RTCORBAC.cpp \
-  RTCORBA/RTCORBAC.h \
-  RTCORBA/RTCORBAS.h
-
-CLEANFILES += \
-  RTCORBA/RTCORBA-stamp \
-  RTCORBA/RTCORBAA.h \
-  RTCORBA/RTCORBAC.cpp \
-  RTCORBA/RTCORBAC.h \
-  RTCORBA/RTCORBAS.h
-
-RTCORBA/RTCORBAA.h RTCORBA/RTCORBAC.cpp RTCORBA/RTCORBAC.h RTCORBA/RTCORBAS.h: RTCORBA/RTCORBA-stamp
-
-RTCORBA/RTCORBA-stamp: $(srcdir)/RTCORBA/RTCORBA.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Sorb -GX -Wb,export_macro=TAO_RTCORBA_Export -Wb,export_include=tao/RTCORBA/rtcorba_export.h -o RTCORBA -Gp -Gd -Wb,include_guard=TAO_RTCORBA_SAFE_INCLUDE -Wb,safe_include=tao/RTCORBA/RTCORBA.h $(srcdir)/RTCORBA/RTCORBA.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_RTCORBA.la
-
-libTAO_RTCORBA_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_RTCORBA_BUILD_DLL
-
-libTAO_RTCORBA_la_SOURCES = \
-  RTCORBA/Continuous_Priority_Mapping.cpp \
-  RTCORBA/Direct_Priority_Mapping.cpp \
-  RTCORBA/Linear_Network_Priority_Mapping.cpp \
-  RTCORBA/Linear_Priority_Mapping.cpp \
-  RTCORBA/Multi_Priority_Mapping.cpp \
-  RTCORBA/Network_Priority_Mapping.cpp \
-  RTCORBA/Network_Priority_Mapping_Manager.cpp \
-  RTCORBA/Priority_Mapping.cpp \
-  RTCORBA/Priority_Mapping_Manager.cpp \
-  RTCORBA/RTCORBA.cpp \
-  RTCORBA/RTCORBAC.cpp \
-  RTCORBA/RTCORBA_includeC.cpp \
-  RTCORBA/RT_Current.cpp \
-  RTCORBA/RT_Service_Context_Handler.cpp \
-  RTCORBA/RT_Endpoint_Selector_Factory.cpp \
-  RTCORBA/RT_Endpoint_Utils.cpp \
-  RTCORBA/RT_Invocation_Endpoint_Selectors.cpp \
-  RTCORBA/RT_Mutex.cpp \
-  RTCORBA/RT_ORB.cpp \
-  RTCORBA/RT_ORBInitializer.cpp \
-  RTCORBA/RT_ORB_Loader.cpp \
-  RTCORBA/RT_PolicyFactory.cpp \
-  RTCORBA/RT_Policy_i.cpp \
-  RTCORBA/RT_ProtocolPropertiesA.cpp \
-  RTCORBA/RT_ProtocolPropertiesC.cpp \
-  RTCORBA/RT_Protocols_Hooks.cpp \
-  RTCORBA/RT_Stub.cpp \
-  RTCORBA/RT_Stub_Factory.cpp \
-  RTCORBA/RT_Thread_Lane_Resources_Manager.cpp \
-  RTCORBA/RT_Transport_Descriptor.cpp \
-  RTCORBA/RT_Transport_Descriptor_Property.cpp \
-  RTCORBA/Thread_Pool.cpp
-
-libTAO_RTCORBA_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTCORBA_la_LIBADD = \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  RTCORBA/Continuous_Priority_Mapping.h \
-  RTCORBA/Direct_Priority_Mapping.h \
-  RTCORBA/Linear_Network_Priority_Mapping.h \
-  RTCORBA/RT_Service_Context_Handler.h \
-  RTCORBA/Linear_Priority_Mapping.h \
-  RTCORBA/Multi_Priority_Mapping.h \
-  RTCORBA/Network_Priority_Mapping.h \
-  RTCORBA/Network_Priority_Mapping_Manager.h \
-  RTCORBA/Network_Priority_Mapping_Manager.inl \
-  RTCORBA/Priority_Mapping.h \
-  RTCORBA/Priority_Mapping_Manager.h \
-  RTCORBA/Priority_Mapping_Manager.inl \
-  RTCORBA/RTCORBA.h \
-  RTCORBA/RTCORBA.pidl \
-  RTCORBA/RTCORBAA.h \
-  RTCORBA/RTCORBAC.h \
-  RTCORBA/RTCORBAS.h \
-  RTCORBA/RTCORBA_include.pidl \
-  RTCORBA/RTCORBA_includeA.h \
-  RTCORBA/RTCORBA_includeC.h \
-  RTCORBA/RTCORBA_includeS.h \
-  RTCORBA/RT_Current.h \
-  RTCORBA/RT_Endpoint_Selector_Factory.h \
-  RTCORBA/RT_Endpoint_Utils.h \
-  RTCORBA/RT_Invocation_Endpoint_Selectors.h \
-  RTCORBA/RT_Mutex.h \
-  RTCORBA/RT_ORB.h \
-  RTCORBA/RT_ORBInitializer.h \
-  RTCORBA/RT_ORB_Loader.h \
-  RTCORBA/RT_PolicyFactory.h \
-  RTCORBA/RT_Policy_i.h \
-  RTCORBA/RT_ProtocolProperties.pidl \
-  RTCORBA/RT_ProtocolPropertiesA.h \
-  RTCORBA/RT_ProtocolPropertiesC.h \
-  RTCORBA/RT_ProtocolPropertiesS.h \
-  RTCORBA/RT_Protocols_Hooks.h \
-  RTCORBA/RT_Stub.h \
-  RTCORBA/RT_Stub_Factory.h \
-  RTCORBA/RT_Thread_Lane_Resources_Manager.h \
-  RTCORBA/RT_Transport_Descriptor.h \
-  RTCORBA/RT_Transport_Descriptor.inl \
-  RTCORBA/RT_Transport_Descriptor_Property.h \
-  RTCORBA/RT_Transport_Descriptor_Property.inl \
-  RTCORBA/Thread_Pool.h \
-  RTCORBA/Thread_Pool.inl \
-  RTCORBA/rtcorba_export.h \
-  RTCORBA/rtcorba_typedefs.h
-
-pkgconfig_DATA += \
-  TAO_RTCORBA.pc
-
-CLEANFILES += \
-  TAO_RTCORBA.pc
-
-TAO_RTCORBA.pc: ${top_builddir}/config.status ${srcdir}/RTCORBA/TAO_RTCORBA.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/RTCORBA/TAO_RTCORBA.pc.in
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  RTCORBA/TAO_RTCORBA.pc.in \
-  RTCORBA/TAO_RTCORBA.rc
-
-
-## Makefile.RTPortableServer.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES += \
-  RTPortableServer/RTPortableServerA.h \
-  RTPortableServer/RTPortableServerC.cpp \
-  RTPortableServer/RTPortableServerC.h \
-  RTPortableServer/RTPortableServerS.h
-
-CLEANFILES += \
-  RTPortableServer/RTPortableServer-stamp \
-  RTPortableServer/RTPortableServerA.h \
-  RTPortableServer/RTPortableServerC.cpp \
-  RTPortableServer/RTPortableServerC.h \
-  RTPortableServer/RTPortableServerS.h
-
-RTPortableServer/RTPortableServerA.h RTPortableServer/RTPortableServerC.cpp RTPortableServer/RTPortableServerC.h RTPortableServer/RTPortableServerS.h: RTPortableServer/RTPortableServer-stamp
-
-RTPortableServer/RTPortableServer-stamp: $(srcdir)/RTPortableServer/RTPortableServer.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sci -SS -Sorb -GX -Wb,export_macro=TAO_RTPortableServer_Export -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h -o RTPortableServer -Gp -Gd -Wb,include_guard=TAO_RT_PORTABLESERVER_SAFE_INCLUDE -Wb,safe_include=tao/RTPortableServer/RTPortableServer.h $(srcdir)/RTPortableServer/RTPortableServer.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  RTPortableServer/RTPortableServer_includeA.h \
-  RTPortableServer/RTPortableServer_includeC.cpp \
-  RTPortableServer/RTPortableServer_includeC.h \
-  RTPortableServer/RTPortableServer_includeS.h
-
-CLEANFILES += \
-  RTPortableServer/RTPortableServer_include-stamp \
-  RTPortableServer/RTPortableServer_includeA.h \
-  RTPortableServer/RTPortableServer_includeC.cpp \
-  RTPortableServer/RTPortableServer_includeC.h \
-  RTPortableServer/RTPortableServer_includeS.h
-
-RTPortableServer/RTPortableServer_includeA.h RTPortableServer/RTPortableServer_includeC.cpp RTPortableServer/RTPortableServer_includeC.h RTPortableServer/RTPortableServer_includeS.h: RTPortableServer/RTPortableServer_include-stamp
-
-RTPortableServer/RTPortableServer_include-stamp: $(srcdir)/RTPortableServer/RTPortableServer_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sci -SS -Sorb -GX -Wb,export_macro=TAO_RTPortableServer_Export -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h -o RTPortableServer -Sa -Wb,unique_include=tao/RTPortableServer/RTPortableServer.h $(srcdir)/RTPortableServer/RTPortableServer_include.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_RTPortableServer.la
-
-libTAO_RTPortableServer_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_RTPORTABLESERVER_BUILD_DLL
-
-libTAO_RTPortableServer_la_SOURCES = \
-  RTPortableServer/RTPortableServer.cpp \
-  RTPortableServer/RTPortableServerC.cpp \
-  RTPortableServer/RTPortableServer_includeC.cpp \
-  RTPortableServer/RT_Acceptor_Filters.cpp \
-  RTPortableServer/RT_Collocation_Resolver.cpp \
-  RTPortableServer/RT_Object_Adapter_Factory.cpp \
-  RTPortableServer/RT_POA.cpp \
-  RTPortableServer/RT_Policy_Validator.cpp \
-  RTPortableServer/RT_Servant_Dispatcher.cpp
-
-libTAO_RTPortableServer_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTPortableServer_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO_RTCORBA.la \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  RTPortableServer/RTPortableServer.h \
-  RTPortableServer/RTPortableServer.pidl \
-  RTPortableServer/RTPortableServerA.h \
-  RTPortableServer/RTPortableServerC.h \
-  RTPortableServer/RTPortableServerS.h \
-  RTPortableServer/RTPortableServer_include.pidl \
-  RTPortableServer/RTPortableServer_includeA.h \
-  RTPortableServer/RTPortableServer_includeC.h \
-  RTPortableServer/RTPortableServer_includeS.h \
-  RTPortableServer/RT_Acceptor_Filters.h \
-  RTPortableServer/RT_Collocation_Resolver.h \
-  RTPortableServer/RT_Object_Adapter_Factory.h \
-  RTPortableServer/RT_POA.h \
-  RTPortableServer/RT_POA.inl \
-  RTPortableServer/RT_Policy_Validator.h \
-  RTPortableServer/RT_Servant_Dispatcher.h \
-  RTPortableServer/rtportableserver_export.h
-
-pkgconfig_DATA += \
-  TAO_RTPortableServer.pc
-
-CLEANFILES += \
-  TAO_RTPortableServer.pc
-
-TAO_RTPortableServer.pc: ${top_builddir}/config.status ${srcdir}/RTPortableServer/TAO_RTPortableServer.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/RTPortableServer/TAO_RTPortableServer.pc.in
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  RTPortableServer/TAO_RTPortableServer.pc.in \
-  RTPortableServer/TAO_RTPortableServer.rc
-
-
-## Makefile.RTScheduler.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES += \
-  RTScheduling/RTSchedulerA.h \
-  RTScheduling/RTSchedulerC.cpp \
-  RTScheduling/RTSchedulerC.h \
-  RTScheduling/RTSchedulerS.h
-
-CLEANFILES += \
-  RTScheduling/RTScheduler-stamp \
-  RTScheduling/RTSchedulerA.h \
-  RTScheduling/RTSchedulerC.cpp \
-  RTScheduling/RTSchedulerC.h \
-  RTScheduling/RTSchedulerS.h
-
-RTScheduling/RTSchedulerA.h RTScheduling/RTSchedulerC.cpp RTScheduling/RTSchedulerC.h RTScheduling/RTSchedulerS.h: RTScheduling/RTScheduler-stamp
-
-RTScheduling/RTScheduler-stamp: $(srcdir)/RTScheduling/RTScheduler.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GX -Wb,export_macro=TAO_RTScheduler_Export -Wb,export_include=tao/RTScheduling/rtscheduler_export.h -Wb,include_guard=TAO_RTSCHEDULER_SAFE_INCLUDE -Wb,safe_include=tao/RTScheduling/RTScheduler.h -o RTScheduling $(srcdir)/RTScheduling/RTScheduler.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  RTScheduling/RTScheduler_includeA.h \
-  RTScheduling/RTScheduler_includeC.cpp \
-  RTScheduling/RTScheduler_includeC.h \
-  RTScheduling/RTScheduler_includeS.h
-
-CLEANFILES += \
-  RTScheduling/RTScheduler_include-stamp \
-  RTScheduling/RTScheduler_includeA.h \
-  RTScheduling/RTScheduler_includeC.cpp \
-  RTScheduling/RTScheduler_includeC.h \
-  RTScheduling/RTScheduler_includeS.h
-
-RTScheduling/RTScheduler_includeA.h RTScheduling/RTScheduler_includeC.cpp RTScheduling/RTScheduler_includeC.h RTScheduling/RTScheduler_includeS.h: RTScheduling/RTScheduler_include-stamp
-
-RTScheduling/RTScheduler_include-stamp: $(srcdir)/RTScheduling/RTScheduler_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GX -Sci -Wb,export_macro=TAO_RTScheduler_Export -Wb,export_include=tao/RTScheduling/rtscheduler_export.h -Wb,unique_include=tao/RTScheduling/RTScheduler.h -o RTScheduling $(srcdir)/RTScheduling/RTScheduler_include.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_RTScheduler.la
-
-libTAO_RTScheduler_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_RTSCHEDULER_BUILD_DLL
-
-libTAO_RTScheduler_la_SOURCES = \
-  RTScheduling/Current.cpp \
-  RTScheduling/Distributable_Thread.cpp \
-  RTScheduling/RTScheduler.cpp \
-  RTScheduling/RTSchedulerC.cpp \
-  RTScheduling/RTScheduler_Initializer.cpp \
-  RTScheduling/RTScheduler_Loader.cpp \
-  RTScheduling/RTScheduler_Manager.cpp \
-  RTScheduling/RTScheduler_includeC.cpp \
-  RTScheduling/Request_Interceptor.cpp
-
-libTAO_RTScheduler_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTScheduler_la_LIBADD = \
-  libTAO_PI_Server.la \
-  libTAO_PortableServer.la \
-  libTAO_RTCORBA.la \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  RTScheduling/Current.h \
-  RTScheduling/Distributable_Thread.h \
-  RTScheduling/RTScheduler.h \
-  RTScheduling/RTScheduler.pidl \
-  RTScheduling/RTSchedulerA.h \
-  RTScheduling/RTSchedulerC.h \
-  RTScheduling/RTSchedulerS.h \
-  RTScheduling/RTScheduler_Initializer.h \
-  RTScheduling/RTScheduler_Loader.h \
-  RTScheduling/RTScheduler_Manager.h \
-  RTScheduling/RTScheduler_Manager.inl \
-  RTScheduling/RTScheduler_include.pidl \
-  RTScheduling/RTScheduler_includeA.h \
-  RTScheduling/RTScheduler_includeC.h \
-  RTScheduling/RTScheduler_includeS.h \
-  RTScheduling/Request_Interceptor.h \
-  RTScheduling/ThreadAction.h \
-  RTScheduling/rtscheduler_export.h
-
-pkgconfig_DATA += \
-  TAO_RTScheduler.pc
-
-CLEANFILES += \
-  TAO_RTScheduler.pc
-
-TAO_RTScheduler.pc: ${top_builddir}/config.status ${srcdir}/RTScheduling/TAO_RTScheduler.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/RTScheduling/TAO_RTScheduler.pc.in
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  RTScheduling/TAO_RTScheduler.pc.in \
-  RTScheduling/TAO_RTScheduler.rc
-
-
-## Makefile.SmartProxies.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_SmartProxies.la
-
-libTAO_SmartProxies_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_SMARTPROXIES_BUILD_DLL
-
-libTAO_SmartProxies_la_SOURCES = \
-  SmartProxies/Smart_Proxies.cpp
-
-libTAO_SmartProxies_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_SmartProxies_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/Smart_Proxies.inl \
-  SmartProxies/smartproxies_export.h
-
-pkgconfig_DATA += \
-  TAO_SmartProxies.pc
-
-CLEANFILES += \
-  TAO_SmartProxies.pc
-
-TAO_SmartProxies.pc: ${top_builddir}/config.status ${srcdir}/SmartProxies/TAO_SmartProxies.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/SmartProxies/TAO_SmartProxies.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  SmartProxies/SmartProxies.rc \
-  SmartProxies/TAO_SmartProxies.pc.in
-
-
-## Makefile.Strategies.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  Strategies/uiop_endpointsC.cpp \
-  Strategies/uiop_endpointsC.h \
-  Strategies/uiop_endpointsS.h
-
-CLEANFILES += \
-  Strategies/uiop_endpoints-stamp \
-  Strategies/uiop_endpointsC.cpp \
-  Strategies/uiop_endpointsC.h \
-  Strategies/uiop_endpointsS.h
-
-Strategies/uiop_endpointsC.cpp Strategies/uiop_endpointsC.h Strategies/uiop_endpointsS.h: Strategies/uiop_endpoints-stamp
-
-Strategies/uiop_endpoints-stamp: $(srcdir)/Strategies/uiop_endpoints.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/uiop_endpoints.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  Strategies/sciop_endpointsC.cpp \
-  Strategies/sciop_endpointsC.h \
-  Strategies/sciop_endpointsS.h
-
-CLEANFILES += \
-  Strategies/sciop_endpoints-stamp \
-  Strategies/sciop_endpointsC.cpp \
-  Strategies/sciop_endpointsC.h \
-  Strategies/sciop_endpointsS.h
-
-Strategies/sciop_endpointsC.cpp Strategies/sciop_endpointsC.h Strategies/sciop_endpointsS.h: Strategies/sciop_endpoints-stamp
-
-Strategies/sciop_endpoints-stamp: $(srcdir)/Strategies/sciop_endpoints.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/sciop_endpoints.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  Strategies/COIOP_EndpointsC.cpp \
-  Strategies/COIOP_EndpointsC.h \
-  Strategies/COIOP_EndpointsS.h
-
-CLEANFILES += \
-  Strategies/COIOP_Endpoints-stamp \
-  Strategies/COIOP_EndpointsC.cpp \
-  Strategies/COIOP_EndpointsC.h \
-  Strategies/COIOP_EndpointsS.h
-
-Strategies/COIOP_EndpointsC.cpp Strategies/COIOP_EndpointsC.h Strategies/COIOP_EndpointsS.h: Strategies/COIOP_Endpoints-stamp
-
-Strategies/COIOP_Endpoints-stamp: $(srcdir)/Strategies/COIOP_Endpoints.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/COIOP_Endpoints.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_Strategies.la
-
-libTAO_Strategies_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_STRATEGIES_BUILD_DLL
-
-libTAO_Strategies_la_SOURCES = \
-  Strategies/COIOP_Acceptor.cpp \
-  Strategies/COIOP_Connection_Handler.cpp \
-  Strategies/COIOP_Connector.cpp \
-  Strategies/COIOP_Endpoint.cpp \
-  Strategies/COIOP_EndpointsC.cpp \
-  Strategies/COIOP_Factory.cpp \
-  Strategies/COIOP_Profile.cpp \
-  Strategies/COIOP_Transport.cpp \
-  Strategies/DIOP_Acceptor.cpp \
-  Strategies/DIOP_Connection_Handler.cpp \
-  Strategies/DIOP_Connector.cpp \
-  Strategies/DIOP_Endpoint.cpp \
-  Strategies/DIOP_Factory.cpp \
-  Strategies/DIOP_Profile.cpp \
-  Strategies/DIOP_Transport.cpp \
-  Strategies/FIFO_Connection_Purging_Strategy.cpp \
-  Strategies/LFU_Connection_Purging_Strategy.cpp \
-  Strategies/LF_Strategy_Null.cpp \
-  Strategies/NULL_Connection_Purging_Strategy.cpp \
-  Strategies/OC_Endpoint_Selector_Factory.cpp \
-  Strategies/OC_Endpoint_Selector_Loader.cpp \
-  Strategies/Optimized_Connection_Endpoint_Selector.cpp \
-  Strategies/SCIOP_Acceptor.cpp \
-  Strategies/SCIOP_Connection_Handler.cpp \
-  Strategies/SCIOP_Connector.cpp \
-  Strategies/SCIOP_Endpoint.cpp \
-  Strategies/SCIOP_Factory.cpp \
-  Strategies/SCIOP_Profile.cpp \
-  Strategies/SCIOP_Transport.cpp \
-  Strategies/SHMIOP_Acceptor.cpp \
-  Strategies/SHMIOP_Connection_Handler.cpp \
-  Strategies/SHMIOP_Connector.cpp \
-  Strategies/SHMIOP_Endpoint.cpp \
-  Strategies/SHMIOP_Factory.cpp \
-  Strategies/SHMIOP_Profile.cpp \
-  Strategies/SHMIOP_Transport.cpp \
-  Strategies/Strategies_ORBInitializer.cpp \
-  Strategies/UIOP_Acceptor.cpp \
-  Strategies/UIOP_Connection_Handler.cpp \
-  Strategies/UIOP_Connector.cpp \
-  Strategies/UIOP_Endpoint.cpp \
-  Strategies/UIOP_Factory.cpp \
-  Strategies/UIOP_Profile.cpp \
-  Strategies/UIOP_Transport.cpp \
-  Strategies/advanced_resource.cpp \
-  Strategies/sciop_endpointsC.cpp \
-  Strategies/uiop_endpointsC.cpp
-
-libTAO_Strategies_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Strategies_la_LIBADD = \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Strategies/COIOP_Acceptor.h \
-  Strategies/COIOP_Connection_Handler.h \
-  Strategies/COIOP_Connector.h \
-  Strategies/COIOP_Endpoint.h \
-  Strategies/COIOP_Endpoint.inl \
-  Strategies/COIOP_Endpoints.pidl \
-  Strategies/COIOP_EndpointsC.h \
-  Strategies/COIOP_EndpointsS.h \
-  Strategies/COIOP_Factory.h \
-  Strategies/COIOP_Profile.h \
-  Strategies/COIOP_Transport.h \
-  Strategies/DIOP_Acceptor.h \
-  Strategies/DIOP_Acceptor.inl \
-  Strategies/DIOP_Connection_Handler.h \
-  Strategies/DIOP_Connector.h \
-  Strategies/DIOP_Endpoint.h \
-  Strategies/DIOP_Endpoint.inl \
-  Strategies/DIOP_Factory.h \
-  Strategies/DIOP_Profile.h \
-  Strategies/DIOP_Transport.h \
-  Strategies/FIFO_Connection_Purging_Strategy.h \
-  Strategies/LFU_Connection_Purging_Strategy.h \
-  Strategies/LF_Strategy_Null.h \
-  Strategies/LF_Strategy_Null.inl \
-  Strategies/NULL_Connection_Purging_Strategy.h \
-  Strategies/OC_Endpoint_Selector_Factory.h \
-  Strategies/OC_Endpoint_Selector_Loader.h \
-  Strategies/Optimized_Connection_Endpoint_Selector.h \
-  Strategies/SCIOP_Acceptor.h \
-  Strategies/SCIOP_Acceptor.inl \
-  Strategies/SCIOP_Connection_Handler.h \
-  Strategies/SCIOP_Connector.h \
-  Strategies/SCIOP_Endpoint.h \
-  Strategies/SCIOP_Endpoint.inl \
-  Strategies/SCIOP_Factory.h \
-  Strategies/SCIOP_Profile.h \
-  Strategies/SCIOP_Transport.h \
-  Strategies/SHMIOP_Acceptor.h \
-  Strategies/SHMIOP_Connection_Handler.h \
-  Strategies/SHMIOP_Connector.h \
-  Strategies/SHMIOP_Endpoint.h \
-  Strategies/SHMIOP_Endpoint.inl \
-  Strategies/SHMIOP_Factory.h \
-  Strategies/SHMIOP_Profile.h \
-  Strategies/SHMIOP_Transport.h \
-  Strategies/Strategies_ORBInitializer.h \
-  Strategies/UIOP_Acceptor.h \
-  Strategies/UIOP_Connection_Handler.h \
-  Strategies/UIOP_Connector.h \
-  Strategies/UIOP_Endpoint.h \
-  Strategies/UIOP_Endpoint.inl \
-  Strategies/UIOP_Factory.h \
-  Strategies/UIOP_Profile.h \
-  Strategies/UIOP_Transport.h \
-  Strategies/advanced_resource.h \
-  Strategies/sciop_endpoints.pidl \
-  Strategies/sciop_endpointsC.h \
-  Strategies/sciop_endpointsS.h \
-  Strategies/strategies_export.h \
-  Strategies/uiop_endpoints.pidl \
-  Strategies/uiop_endpointsC.h \
-  Strategies/uiop_endpointsS.h
-
-pkgconfig_DATA += \
-  TAO_Strategies.pc
-
-CLEANFILES += \
-  TAO_Strategies.pc
-
-TAO_Strategies.pc: ${top_builddir}/config.status ${srcdir}/Strategies/TAO_Strategies.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Strategies/TAO_Strategies.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  Strategies/TAO_Strategies.pc.in \
-  Strategies/TAO_Strategies.rc
-
-
-## Makefile.TAO_FlResource.am
-
-if BUILD_ACE_FLREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_FL
-if BUILD_GL
-if BUILD_X11
-
-lib_LTLIBRARIES += libTAO_FlResource.la
-
-libTAO_FlResource_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_FLTK_CPPFLAGS) \
-  -DTAO_FLRESOURCE_BUILD_DLL
-
-libTAO_FlResource_la_SOURCES = \
-  FlResource/FlResource_Factory.cpp \
-  FlResource/FlResource_Loader.cpp
-
-libTAO_FlResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_FLTK_LDFLAGS)
-
-libTAO_FlResource_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_FLTK_LIBS)
-
-nobase_include_HEADERS += \
-  FlResource/FlResource_Factory.h \
-  FlResource/FlResource_Loader.h \
-  FlResource/TAO_FlResource_Export.h
-
-endif BUILD_X11
-endif BUILD_GL
-endif BUILD_FL
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_FLREACTOR
-
-## Makefile.TAO_Monitor.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-BUILT_SOURCES += \
-  Monitor/Monitor_includeA.cpp \
-  Monitor/Monitor_includeA.h \
-  Monitor/Monitor_includeC.cpp \
-  Monitor/Monitor_includeC.h \
-  Monitor/Monitor_includeS.h
-
-CLEANFILES += \
-  Monitor/Monitor_include-stamp \
-  Monitor/Monitor_includeA.cpp \
-  Monitor/Monitor_includeA.h \
-  Monitor/Monitor_includeC.cpp \
-  Monitor/Monitor_includeC.h \
-  Monitor/Monitor_includeS.h
-
-Monitor/Monitor_includeA.cpp Monitor/Monitor_includeA.h Monitor/Monitor_includeC.cpp Monitor/Monitor_includeC.h Monitor/Monitor_includeS.h: Monitor/Monitor_include-stamp
-
-Monitor/Monitor_include-stamp: $(srcdir)/Monitor/Monitor_include.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -GA -Wb,export_macro=TAO_Monitor_Export -Wb,export_include=tao/Monitor/Monitor_export.h -o Monitor -Wb,unique_include=tao/Monitor/Monitor.h -SS -Sci $(srcdir)/Monitor/Monitor_include.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  Monitor/MonitorA.cpp \
-  Monitor/MonitorA.h \
-  Monitor/MonitorC.cpp \
-  Monitor/MonitorC.h \
-  Monitor/MonitorC.inl \
-  Monitor/MonitorS.cpp \
-  Monitor/MonitorS.h
-
-CLEANFILES += \
-  Monitor/Monitor-stamp \
-  Monitor/MonitorA.cpp \
-  Monitor/MonitorA.h \
-  Monitor/MonitorC.cpp \
-  Monitor/MonitorC.h \
-  Monitor/MonitorC.inl \
-  Monitor/MonitorS.cpp \
-  Monitor/MonitorS.h
-
-Monitor/MonitorA.cpp Monitor/MonitorA.h Monitor/MonitorC.cpp Monitor/MonitorC.h Monitor/MonitorC.inl Monitor/MonitorS.cpp Monitor/MonitorS.h: Monitor/Monitor-stamp
-
-Monitor/Monitor-stamp: $(srcdir)/Monitor/Monitor.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -GA -Wb,export_macro=TAO_Monitor_Export -Wb,export_include=tao/Monitor/Monitor_export.h -o Monitor -Wb,include_guard=TAO_MONITOR_SAFE_INCLUDE -Wb,safe_include=tao/Monitor/Monitor.h -Ssi $(srcdir)/Monitor/Monitor.pidl
-	@touch $@
-
-BUILT_SOURCES += \
-  Monitor/Monitor_TypesA.cpp \
-  Monitor/Monitor_TypesA.h \
-  Monitor/Monitor_TypesC.cpp \
-  Monitor/Monitor_TypesC.h \
-  Monitor/Monitor_TypesC.inl \
-  Monitor/Monitor_TypesS.h
-
-CLEANFILES += \
-  Monitor/Monitor_Types-stamp \
-  Monitor/Monitor_TypesA.cpp \
-  Monitor/Monitor_TypesA.h \
-  Monitor/Monitor_TypesC.cpp \
-  Monitor/Monitor_TypesC.h \
-  Monitor/Monitor_TypesC.inl \
-  Monitor/Monitor_TypesS.h
-
-Monitor/Monitor_TypesA.cpp Monitor/Monitor_TypesA.h Monitor/Monitor_TypesC.cpp Monitor/Monitor_TypesC.h Monitor/Monitor_TypesC.inl Monitor/Monitor_TypesS.h: Monitor/Monitor_Types-stamp
-
-Monitor/Monitor_Types-stamp: $(srcdir)/Monitor/Monitor_Types.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -GA -Wb,export_macro=TAO_Monitor_Export -Wb,export_include=tao/Monitor/Monitor_export.h -o Monitor -SS -Wb,include_guard=TAO_MONITOR_SAFE_INCLUDE -Wb,safe_include=tao/Monitor/Monitor.h $(srcdir)/Monitor/Monitor_Types.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_Monitor.la
-
-libTAO_Monitor_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_MONITOR_BUILD_DLL
-
-libTAO_Monitor_la_SOURCES = \
-  Monitor/Monitor.cpp \
-  Monitor/MonitorA.cpp \
-  Monitor/MonitorC.cpp \
-  Monitor/MonitorS.cpp \
-  Monitor/Monitor_Impl.cpp \
-  Monitor/Monitor_TypesA.cpp \
-  Monitor/Monitor_TypesC.cpp \
-  Monitor/Monitor_includeA.cpp \
-  Monitor/Monitor_includeC.cpp
-
-libTAO_Monitor_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Monitor_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  libTAO_PortableServer.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Monitor/Monitor.h \
-  Monitor/Monitor.pidl \
-  Monitor/MonitorA.h \
-  Monitor/MonitorC.h \
-  Monitor/MonitorC.inl \
-  Monitor/MonitorS.h \
-  Monitor/Monitor_Impl.h \
-  Monitor/Monitor_Types.pidl \
-  Monitor/Monitor_TypesA.h \
-  Monitor/Monitor_TypesC.h \
-  Monitor/Monitor_TypesC.inl \
-  Monitor/Monitor_TypesS.h \
-  Monitor/Monitor_export.h \
-  Monitor/Monitor_include.pidl \
-  Monitor/Monitor_includeA.h \
-  Monitor/Monitor_includeC.h \
-  Monitor/Monitor_includeS.h
-
-pkgconfig_DATA += \
-  TAO_Monitor.pc
-
-CLEANFILES += \
-  TAO_Monitor.pc
-
-TAO_Monitor.pc: ${top_builddir}/config.status ${srcdir}/Monitor/TAO_Monitor.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Monitor/TAO_Monitor.pc.in
-
-endif !BUILD_WINCE
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  Monitor/TAO_Monitor.pc.in
-
-
-## Makefile.TAO_QtResource.am
-
-if BUILD_ACE_QTREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_QT
-
-lib_LTLIBRARIES += libTAO_QtResource.la
-
-libTAO_QtResource_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_QT_CPPFLAGS) \
-  -DTAO_QTRESOURCE_BUILD_DLL
-
-libTAO_QtResource_la_SOURCES = \
-  QtResource/QtResource_Factory.cpp \
-  QtResource/QtResource_Loader.cpp
-
-libTAO_QtResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_QT_LDFLAGS)
-
-libTAO_QtResource_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_QT_LIBS)
-
-nobase_include_HEADERS += \
-  QtResource/QtResource_Factory.h \
-  QtResource/QtResource_Loader.h \
-  QtResource/TAO_QtResource_Export.h
-
-endif BUILD_QT
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_QTREACTOR
-
-## Makefile.TAO_TkResource.am
-
-if BUILD_ACE_TKREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_TK
-
-lib_LTLIBRARIES += libTAO_TkResource.la
-
-libTAO_TkResource_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_TK_CPPFLAGS) \
-  $(ACE_TCL_CPPFLAGS) \
-  -DTAO_TKRESOURCE_BUILD_DLL
-
-libTAO_TkResource_la_SOURCES = \
-  TkResource/TkResource_Factory.cpp \
-  TkResource/TkResource_Loader.cpp
-
-libTAO_TkResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS)
-
-libTAO_TkResource_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace/libACE_TkReactor.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_TK_LIBS) \
-  $(ACE_TCL_LIBS)
-
-nobase_include_HEADERS += \
-  TkResource/TAO_TkResource_Export.h \
-  TkResource/TkResource_Factory.h \
-  TkResource/TkResource_Loader.h
-
-endif BUILD_TK
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_TKREACTOR
-
-## Makefile.TAO_Utils.am
-
-if BUILD_EXCEPTIONS
-
-lib_LTLIBRARIES += libTAO_Utils.la
-
-libTAO_Utils_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_UTILS_BUILD_DLL
-
-libTAO_Utils_la_SOURCES = \
-  Utils/Encodable.cpp \
-  Utils/Implicit_Deactivator.cpp \
-  Utils/ORB_Destroyer.cpp \
-  Utils/ORB_Manager.cpp \
-  Utils/PolicyList_Destroyer.cpp \
-  Utils/RIR_Narrow.cpp \
-  Utils/Servant_Var.cpp \
-  Utils/Server_Main.cpp \
-  Utils/Synch_Refcountable.cpp
-
-libTAO_Utils_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Utils_la_LIBADD = \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_PortableServer.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Utils/Auto_Functor.h \
-  Utils/Encodable.h \
-  Utils/Implicit_Deactivator.h \
-  Utils/ORB_Destroyer.h \
-  Utils/ORB_Manager.h \
-  Utils/PolicyList_Destroyer.h \
-  Utils/PolicyList_Destroyer.inl \
-  Utils/RIR_Narrow.h \
-  Utils/Servant_Var.h \
-  Utils/Servant_Var.inl \
-  Utils/Server_Main.h \
-  Utils/Synch_Refcountable.h \
-  Utils/Synch_Refcountable.inl \
-  Utils/utils_export.h
-
-pkgconfig_DATA += \
-  TAO_Utils.pc
-
-CLEANFILES += \
-  TAO_Utils.pc
-
-TAO_Utils.pc: ${top_builddir}/config.status ${srcdir}/TAO_Utils.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_Utils.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  TAO_Utils.pc.in
-
-
-## Makefile.TAO_XtResource.am
-
-if BUILD_ACE_XTREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_X11
-if BUILD_XT
-
-lib_LTLIBRARIES += libTAO_XtResource.la
-
-libTAO_XtResource_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_X11_CPPFLAGS) \
-  $(ACE_XT_CPPFLAGS) \
-  -DTAO_XTRESOURCE_BUILD_DLL
-
-libTAO_XtResource_la_SOURCES = \
-  XtResource/XtResource_Factory.cpp \
-  XtResource/XtResource_Loader.cpp
-
-libTAO_XtResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS)
-
-libTAO_XtResource_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_XT_LIBS) \
-  $(ACE_X11_LIBS)
-
-nobase_include_HEADERS += \
-  XtResource/TAO_XtResource_Export.h \
-  XtResource/XtResource_Factory.h \
-  XtResource/XtResource_Loader.h
-
-endif BUILD_XT
-endif BUILD_X11
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_XTREACTOR
-
-## Makefile.TC.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_TRANSPORT_CURRENT
-
-BUILT_SOURCES += \
-  TransportCurrent/TCC.cpp \
-  TransportCurrent/TCC.h \
-  TransportCurrent/TCC.inl \
-  TransportCurrent/TCS.cpp \
-  TransportCurrent/TCS.h \
-  TransportCurrent/TCS.inl
-
-CLEANFILES += \
-  TransportCurrent/TC-stamp \
-  TransportCurrent/TCC.cpp \
-  TransportCurrent/TCC.h \
-  TransportCurrent/TCC.inl \
-  TransportCurrent/TCS.cpp \
-  TransportCurrent/TCS.h \
-  TransportCurrent/TCS.inl
-
-TransportCurrent/TCC.cpp TransportCurrent/TCC.h TransportCurrent/TCC.inl TransportCurrent/TCS.cpp TransportCurrent/TCS.h TransportCurrent/TCS.inl: TransportCurrent/TC-stamp
-
-TransportCurrent/TC-stamp: $(srcdir)/TransportCurrent/TC.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h -Wb,export_macro=TAO_Transport_Current_Export -o TransportCurrent -I./TransportCurrent $(srcdir)/TransportCurrent/TC.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_TC.la
-
-libTAO_TC_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_TRANSPORT_CURRENT_BUILD_DLL
-
-libTAO_TC_la_SOURCES = \
-  TransportCurrent/Current_Impl.cpp \
-  TransportCurrent/Current_Loader.cpp \
-  TransportCurrent/Current_ORBInitializer_Base.cpp \
-  TransportCurrent/TCC.cpp \
-  TransportCurrent/TCS.cpp
-
-libTAO_TC_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_TC_la_LIBADD = \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  TransportCurrent/Current_Impl.h \
-  TransportCurrent/Current_Loader.h \
-  TransportCurrent/Current_ORBInitializer.cpp \
-  TransportCurrent/Current_ORBInitializer.h \
-  TransportCurrent/Current_ORBInitializer_Base.h \
-  TransportCurrent/TC.idl \
-  TransportCurrent/TCC.h \
-  TransportCurrent/TCC.inl \
-  TransportCurrent/TCS.h \
-  TransportCurrent/TCS.inl \
-  TransportCurrent/Transport_Current.h \
-  TransportCurrent/Transport_Current_Export.h
-
-endif BUILD_TRANSPORT_CURRENT
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.TC_IIOP.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_TRANSPORT_CURRENT
-
-BUILT_SOURCES += \
-  TransportCurrent/TC_IIOPC.cpp \
-  TransportCurrent/TC_IIOPC.h \
-  TransportCurrent/TC_IIOPC.inl \
-  TransportCurrent/TC_IIOPS.cpp \
-  TransportCurrent/TC_IIOPS.h \
-  TransportCurrent/TC_IIOPS.inl
-
-CLEANFILES += \
-  TransportCurrent/TC_IIOP-stamp \
-  TransportCurrent/TC_IIOPC.cpp \
-  TransportCurrent/TC_IIOPC.h \
-  TransportCurrent/TC_IIOPC.inl \
-  TransportCurrent/TC_IIOPS.cpp \
-  TransportCurrent/TC_IIOPS.h \
-  TransportCurrent/TC_IIOPS.inl
-
-TransportCurrent/TC_IIOPC.cpp TransportCurrent/TC_IIOPC.h TransportCurrent/TC_IIOPC.inl TransportCurrent/TC_IIOPS.cpp TransportCurrent/TC_IIOPS.h TransportCurrent/TC_IIOPS.inl: TransportCurrent/TC_IIOP-stamp
-
-TransportCurrent/TC_IIOP-stamp: $(srcdir)/TransportCurrent/TC_IIOP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h -Wb,export_macro=TAO_Transport_Current_Export -o TransportCurrent -I./TransportCurrent $(srcdir)/TransportCurrent/TC_IIOP.idl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_TC_IIOP.la
-
-libTAO_TC_IIOP_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_TRANSPORT_CURRENT_BUILD_DLL
-
-libTAO_TC_IIOP_la_SOURCES = \
-  TransportCurrent/IIOP_Current_Impl.cpp \
-  TransportCurrent/IIOP_Current_Loader.cpp \
-  TransportCurrent/TC_IIOPC.cpp \
-  TransportCurrent/TC_IIOPS.cpp
-
-libTAO_TC_IIOP_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_TC_IIOP_la_LIBADD = \
-  libTAO_TC.la \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  TransportCurrent/IIOP_Current_Impl.h \
-  TransportCurrent/IIOP_Current_Loader.h \
-  TransportCurrent/IIOP_Transport_Current.h \
-  TransportCurrent/TC_IIOP.idl \
-  TransportCurrent/TC_IIOPC.h \
-  TransportCurrent/TC_IIOPC.inl \
-  TransportCurrent/TC_IIOPS.h \
-  TransportCurrent/TC_IIOPS.inl
-
-endif BUILD_TRANSPORT_CURRENT
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.TypeCodeFactory.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TypeCodeFactory/TypeCodeFactoryC.cpp \
-  TypeCodeFactory/TypeCodeFactoryC.h \
-  TypeCodeFactory/TypeCodeFactoryS.h
-
-CLEANFILES += \
-  TypeCodeFactory/TypeCodeFactory-stamp \
-  TypeCodeFactory/TypeCodeFactoryC.cpp \
-  TypeCodeFactory/TypeCodeFactoryC.h \
-  TypeCodeFactory/TypeCodeFactoryS.h
-
-TypeCodeFactory/TypeCodeFactoryC.cpp TypeCodeFactory/TypeCodeFactoryC.h TypeCodeFactory/TypeCodeFactoryS.h: TypeCodeFactory/TypeCodeFactory-stamp
-
-TypeCodeFactory/TypeCodeFactory-stamp: $(srcdir)/TypeCodeFactory/TypeCodeFactory.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Sorb -Wb,export_macro=TAO_TypeCodeFactory_Export -Wb,export_include=tao/TypeCodeFactory/typecodefactory_export.h -o TypeCodeFactory $(srcdir)/TypeCodeFactory/TypeCodeFactory.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_TypeCodeFactory.la
-
-libTAO_TypeCodeFactory_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_TYPECODEFACTORY_BUILD_DLL
-
-libTAO_TypeCodeFactory_la_SOURCES = \
-  TypeCodeFactory/Recursive_TypeCode.cpp \
-  TypeCodeFactory/TypeCodeFactoryC.cpp \
-  TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp \
-  TypeCodeFactory/TypeCodeFactory_Loader.cpp \
-  TypeCodeFactory/TypeCodeFactory_i.cpp
-
-libTAO_TypeCodeFactory_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_TypeCodeFactory_la_LIBADD = \
-  libTAO_IFR_Client.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  TypeCodeFactory/Recursive_TypeCode.h \
-  TypeCodeFactory/Recursive_TypeCode.inl \
-  TypeCodeFactory/TypeCodeFactory.pidl \
-  TypeCodeFactory/TypeCodeFactoryC.h \
-  TypeCodeFactory/TypeCodeFactoryS.h \
-  TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h \
-  TypeCodeFactory/TypeCodeFactory_Loader.h \
-  TypeCodeFactory/TypeCodeFactory_i.h \
-  TypeCodeFactory/typecodefactory_export.h
-
-pkgconfig_DATA += \
-  TAO_TypeCodeFactory.pc
-
-CLEANFILES += \
-  TAO_TypeCodeFactory.pc
-
-TAO_TypeCodeFactory.pc: ${top_builddir}/config.status ${srcdir}/TypeCodeFactory/TAO_TypeCodeFactory.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TypeCodeFactory/TAO_TypeCodeFactory.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  TypeCodeFactory/TAO_TypeCodeFactory.pc.in \
-  TypeCodeFactory/TypeCodeFactory.rc
-
-
-## Makefile.ZIOP.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  ZIOP/ZIOPC.cpp \
-  ZIOP/ZIOPC.h \
-  ZIOP/ZIOPS.h
-
-CLEANFILES += \
-  ZIOP/ZIOP-stamp \
-  ZIOP/ZIOPC.cpp \
-  ZIOP/ZIOPC.h \
-  ZIOP/ZIOPS.h
-
-ZIOP/ZIOPC.cpp ZIOP/ZIOPC.h ZIOP/ZIOPS.h: ZIOP/ZIOP-stamp
-
-ZIOP/ZIOP-stamp: $(srcdir)/ZIOP/ZIOP.pidl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_ZIOP_Export -Wb,export_include=tao/ZIOP/ziop_export.h -Wb,include_guard=TAO_ZIOP_SAFE_INCLUDE -Wb,safe_include=tao/ZIOP/ZIOP.h -o ZIOP $(srcdir)/ZIOP/ZIOP.pidl
-	@touch $@
-
-lib_LTLIBRARIES += libTAO_ZIOP.la
-
-libTAO_ZIOP_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_ZIOP_BUILD_DLL
-
-libTAO_ZIOP_la_SOURCES = \
-  ZIOP/ZIOP.cpp \
-  ZIOP/ZIOPC.cpp \
-  ZIOP/ZIOP_ORBInitializer.cpp \
-  ZIOP/ZIOP_PolicyFactory.cpp \
-  ZIOP/ZIOP_Policy_Validator.cpp \
-  ZIOP/ZIOP_Service_Context_Handler.cpp \
-  ZIOP/ZIOP_Policy_i.cpp \
-  ZIOP/ZIOP_Stub.cpp \
-  ZIOP/ZIOP_Stub_Factory.cpp
-
-libTAO_ZIOP_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_ZIOP_la_LIBADD = \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_AnyTypeCode.la \
-  libTAO_Compression.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  ZIOP/ZIOP.h \
-  ZIOP/ZIOP.pidl \
-  ZIOP/ZIOPC.h \
-  ZIOP/ZIOPS.h \
-  ZIOP/ZIOP_ORBInitializer.h \
-  ZIOP/ZIOP_PolicyFactory.h \
-  ZIOP/ZIOP_Policy_Validator.h \
-  ZIOP/ZIOP_Policy_i.h \
-  ZIOP/ZIOP_Service_Context_Handler.h \
-  ZIOP/ZIOP_Stub.h \
-  ZIOP/ZIOP_Stub_Factory.h \
-  ZIOP/ziop_export.h
-
-pkgconfig_DATA += \
-  TAO_ZIOP.pc
-
-CLEANFILES += \
-  TAO_ZIOP.pc
-
-TAO_ZIOP.pc: ${top_builddir}/config.status ${srcdir}/ZIOP/TAO_ZIOP.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ZIOP/TAO_ZIOP.pc.in
-
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  ZIOP/TAO_ZIOP.pc.in
-
-
-## Makefile.ZlibCompressor.am
-
-if BUILD_EXCEPTIONS
-if BUILD_ZLIB
-
-lib_LTLIBRARIES += libTAO_ZlibCompressor.la
-
-libTAO_ZlibCompressor_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_ZLIB_CPPFLAGS) \
-  -DTAO_ZLIBCOMPRESSOR_BUILD_DLL
-
-libTAO_ZlibCompressor_la_SOURCES = \
-  Compression/zlib/ZlibCompressor.cpp \
-  Compression/zlib/ZlibCompressor_Factory.cpp
-
-libTAO_ZlibCompressor_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_ZLIB_LDFLAGS)
-
-libTAO_ZlibCompressor_la_LIBADD = \
-  libTAO_Compression.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_ZLIB_LIBS)
-
-nobase_include_HEADERS += \
-  Compression/zlib/ZlibCompressor.h \
-  Compression/zlib/ZlibCompressor_Factory.h \
-  Compression/zlib/ZlibCompressor_export.h
-
-pkgconfig_DATA += \
-  TAO_ZlibCompressor.pc
-
-CLEANFILES += \
-  TAO_ZlibCompressor.pc
-
-TAO_ZlibCompressor.pc: ${top_builddir}/config.status ${srcdir}/Compression/zlib/TAO_ZlibCompressor.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Compression/zlib/TAO_ZlibCompressor.pc.in
-
-endif BUILD_ZLIB
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST += \
-  Compression/zlib/TAO_ZlibCompressor.pc.in \
-  Compression/zlib/TAO_ZlibCompressor.rc
-
-
-## 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/Messaging.mpc b/tao/Messaging.mpc
deleted file mode 100644
index 27a44ad621c..00000000000
--- a/tao/Messaging.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults {
-  custom_only = 1
-  idlflags += -Gstl
-  
-  IDL_Files {
-    idlflags += -SS -GA -Gp -Gd -Sorb -Sal \
-                -Wb,export_macro=TAO_Messaging_Export \
-                -Wb,export_include=tao/Messaging/messaging_export.h \
-                -o Messaging
-    idlflags -= -Sa -St
-    Messaging/ExceptionHolder.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Sci -SS -Gp -Gd -Sorb -Sal -GX \
-                -Wb,export_macro=TAO_Messaging_Export \
-                -Wb,export_include=tao/Messaging/messaging_export.h \
-                -o Messaging
-    idlflags -= -Sa -St
-    Messaging/Pollable.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Sci -SS -Gp -Gd -Sorb -Sal -GX \
-                -Wb,export_macro=TAO_Messaging_Export \
-                -Wb,export_include=tao/Messaging/messaging_export.h \
-                -o Messaging
-    idlflags -= -Sa -St
-    Messaging/Messaging_Types.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal \
-                -Wb,export_macro=TAO_Messaging_Export \
-                -Wb,export_include=tao/Messaging/messaging_export.h \
-                -o Messaging
-    idlflags -= -Sa -St
-    Messaging/TAO_Ext.pidl
-    Messaging/Messaging_RT_Policy.pidl
-    Messaging/Messaging_SyncScope_Policy.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal \
-                -Wb,export_macro=TAO_Messaging_Export \
-                -Wb,export_include=tao/Messaging/messaging_export.h \
-                -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE \
-                -Wb,safe_include=tao/Messaging/Messaging.h \
-                -o Messaging
-    idlflags -= -Sa -St
-    Messaging/Messaging_No_Impl.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Ssi -GA -Gp -Gd -Sorb -Sal \
-                -Wb,export_macro=TAO_Messaging_Export \
-                -Wb,export_include=tao/Messaging/messaging_export.h \
-                -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE \
-                -Wb,safe_include=tao/Messaging/Messaging.h \
-                -o Messaging
-    idlflags -= -Sa -St
-    Messaging/Messaging.pidl
-  }
-}
-
-project(Messaging) : taolib, tao_output, install, portableserver, pi, valuetype, taoidldefaults {
-  after       += *idl
-  sharedname   = TAO_Messaging
-  dynamicflags += TAO_MESSAGING_BUILD_DLL
-
-  Source_Files {
-    Messaging
-  }
-
-  Source_Files {
-    Messaging/ExceptionHolderC.cpp
-    Messaging/PollableC.cpp
-    Messaging/Messaging_TypesC.cpp
-    Messaging/TAO_ExtC.cpp
-    Messaging/Messaging_RT_PolicyC.cpp
-    Messaging/Messaging_SyncScope_PolicyC.cpp
-    Messaging/Messaging_No_ImplC.cpp
-    Messaging/MessagingC.cpp
-    Messaging/MessagingS.cpp
-    Messaging/ExceptionHolderA.cpp
-    Messaging/MessagingA.cpp
-    Messaging/Messaging_No_ImplA.cpp
-    Messaging/Messaging_RT_PolicyA.cpp
-    Messaging/Messaging_SyncScope_PolicyA.cpp
-    Messaging/TAO_ExtA.cpp
-  }
-
-  Header_Files {
-    Messaging
-    Messaging/ExceptionHolderA.h
-    Messaging/ExceptionHolderC.h
-    Messaging/ExceptionHolderS.h
-    Messaging/MessagingA.h
-    Messaging/MessagingC.h
-    Messaging/Messaging_No_ImplA.h
-    Messaging/Messaging_No_ImplC.h
-    Messaging/Messaging_No_ImplS.h
-    Messaging/Messaging_RT_PolicyA.h
-    Messaging/Messaging_RT_PolicyC.h
-    Messaging/Messaging_RT_PolicyS.h
-    Messaging/MessagingS.h
-    Messaging/Messaging_SyncScope_PolicyA.h
-    Messaging/Messaging_SyncScope_PolicyC.h
-    Messaging/Messaging_SyncScope_PolicyS.h
-    Messaging/Messaging_TypesA.h
-    Messaging/Messaging_TypesC.h
-    Messaging/Messaging_TypesS.h
-    Messaging/PollableA.h
-    Messaging/PollableC.h
-    Messaging/PollableS.h
-    Messaging/TAO_ExtA.h
-    Messaging/TAO_ExtC.h
-    Messaging/TAO_ExtS.h
-  }
-
-  Inline_Files {
-    Messaging
-    Messaging/ExceptionHolderC.inl
-    Messaging/MessagingC.inl
-  }
-
-  Template_Files {
-    Messaging
-  }
-
-  Resource_Files {
-    Messaging
-  }
-
-  PIDL_Files {
-    Messaging
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    Messaging/TAO_Messaging.pc.in
-  }
-}
diff --git a/tao/Messaging/AMH_Response_Handler.cpp b/tao/Messaging/AMH_Response_Handler.cpp
index 83a26487e4b..738e954a184 100644
--- a/tao/Messaging/AMH_Response_Handler.cpp
+++ b/tao/Messaging/AMH_Response_Handler.cpp
@@ -296,18 +296,18 @@ TAO_AMH_Response_Handler::_tao_rh_send_location_forward (CORBA::Object_ptr fwd,
 void
 TAO_AMH_Response_Handler::_remove_ref (void)
 {
-  if (this->refcount_.decrement () > 0)
-    return;
-
-  if (this->allocator_)
+  if (--this->refcount_ == 0)
     {
-      TAO::TAO_Buffer_Allocator<TAO_AMH_Response_Handler, TAO_AMH_BUFFER_ALLOCATOR> allocator (this->allocator_);
+      if (this->allocator_)
+        {
+          TAO::TAO_Buffer_Allocator<TAO_AMH_Response_Handler, TAO_AMH_BUFFER_ALLOCATOR> allocator (this->allocator_);
 
-      allocator.release (this);
-    }
-  else
-    {
-      delete this;
+          allocator.release (this);
+        }
+      else
+        {
+          delete this;
+        }
     }
 }
 
diff --git a/tao/Messaging/AMI_Arguments_Converter_Impl.cpp b/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
index 59362352907..a191515d3da 100644
--- a/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
+++ b/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
@@ -1,4 +1,6 @@
+// -*- C++ -*-
 // $Id$
+
 #include "tao/Messaging/AMI_Arguments_Converter_Impl.h"
 #include "tao/operation_details.h"
 #include "tao/SystemException.h"
@@ -38,7 +40,7 @@ TAO_AMI_Arguments_Converter_Impl::convert_request (
   details->use_stub_args (false);
 }
 
-void 
+void
 TAO_AMI_Arguments_Converter_Impl::dsi_convert_request (
     TAO_ServerRequest & server_request,
     TAO_OutputCDR & output)
@@ -76,7 +78,7 @@ TAO_AMI_Arguments_Converter_Impl::convert_reply (
     }
 }
 
-void 
+void
 TAO_AMI_Arguments_Converter_Impl::dsi_convert_reply (
     TAO_ServerRequest & server_request,
     TAO_InputCDR & input)
diff --git a/tao/Messaging/Asynch_Invocation.cpp b/tao/Messaging/Asynch_Invocation.cpp
index 99fa8285f12..642d4a4f10c 100644
--- a/tao/Messaging/Asynch_Invocation.cpp
+++ b/tao/Messaging/Asynch_Invocation.cpp
@@ -1,4 +1,5 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/Messaging/Asynch_Invocation.h"
 #include "tao/Messaging/Asynch_Reply_Dispatcher.h"
diff --git a/tao/Messaging/Asynch_Invocation_Adapter.cpp b/tao/Messaging/Asynch_Invocation_Adapter.cpp
index 65eeec1505f..65036e25725 100644
--- a/tao/Messaging/Asynch_Invocation_Adapter.cpp
+++ b/tao/Messaging/Asynch_Invocation_Adapter.cpp
@@ -1,4 +1,6 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Messaging/Asynch_Invocation_Adapter.h"
 #include "tao/Messaging/Asynch_Reply_Dispatcher.h"
 #include "tao/Messaging/Asynch_Invocation.h"
diff --git a/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/tao/Messaging/Asynch_Reply_Dispatcher.cpp
index d531b2028b5..f8dc4532533 100644
--- a/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "tao/Messaging/Asynch_Reply_Dispatcher.h"
-
 #include "tao/Pluggable_Messaging_Utils.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
diff --git a/tao/Messaging/Asynch_Timeout_Handler.cpp b/tao/Messaging/Asynch_Timeout_Handler.cpp
index 6b347a97757..423b420b006 100644
--- a/tao/Messaging/Asynch_Timeout_Handler.cpp
+++ b/tao/Messaging/Asynch_Timeout_Handler.cpp
@@ -1,6 +1,6 @@
+// -*- C++ -*-
 // $Id$
 
-
 #include "tao/Messaging/Asynch_Timeout_Handler.h"
 
 #include "tao/Messaging/Asynch_Reply_Dispatcher.h"
diff --git a/tao/Messaging/Connection_Timeout_Policy_i.cpp b/tao/Messaging/Connection_Timeout_Policy_i.cpp
index 0b9bfe297f7..41be84ff27c 100644
--- a/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ b/tao/Messaging/Connection_Timeout_Policy_i.cpp
@@ -1,4 +1,5 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/Messaging/Connection_Timeout_Policy_i.h"
 #include "tao/ORB_Core.h"
diff --git a/tao/Messaging/Messaging.mpc b/tao/Messaging/Messaging.mpc
new file mode 100644
index 00000000000..557d5dc7327
--- /dev/null
+++ b/tao/Messaging/Messaging.mpc
@@ -0,0 +1,130 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -SS -GA -Gp -Gd -Sorb -Sal \
+                -Wb,export_macro=TAO_Messaging_Export \
+                -Wb,export_include=tao/Messaging/messaging_export.h \
+                -iC tao/Messaging
+    idlflags -= -Sa -St
+    ExceptionHolder.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Sci -SS -Gp -Gd -Sorb -Sal -GX \
+                -Wb,export_macro=TAO_Messaging_Export \
+                -Wb,export_include=tao/Messaging/messaging_export.h \
+                -iC tao/Messaging
+    idlflags -= -Sa -St
+    Pollable.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Sci -SS -Gp -Gd -Sorb -Sal -GX \
+                -Wb,export_macro=TAO_Messaging_Export \
+                -Wb,export_include=tao/Messaging/messaging_export.h \
+                -iC tao/Messaging
+    idlflags -= -Sa -St
+    Messaging_Types.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal \
+                -Wb,export_macro=TAO_Messaging_Export \
+                -Wb,export_include=tao/Messaging/messaging_export.h \
+                -iC tao/Messaging
+    idlflags -= -Sa -St
+    TAO_Ext.pidl
+    Messaging_RT_Policy.pidl
+    Messaging_SyncScope_Policy.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal \
+                -Wb,export_macro=TAO_Messaging_Export \
+                -Wb,export_include=tao/Messaging/messaging_export.h \
+                -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE \
+                -Wb,safe_include=tao/Messaging/Messaging.h \
+                -iC tao/Messaging
+    idlflags -= -Sa -St
+    Messaging_No_Impl.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Ssi -GA -Gp -Gd -Sorb -Sal \
+                -Wb,export_macro=TAO_Messaging_Export \
+                -Wb,export_include=tao/Messaging/messaging_export.h \
+                -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE \
+                -Wb,safe_include=tao/Messaging/Messaging.h \
+                -iC tao/Messaging
+    idlflags -= -Sa -St
+    Messaging.pidl
+  }
+
+  specific {
+    install_dir = tao/Messaging
+  }
+}
+
+project(Messaging) : taolib, tao_output, install, portableserver, pi, valuetype, taoidldefaults {
+  after       += *idl
+  sharedname   = TAO_Messaging
+  dynamicflags += TAO_MESSAGING_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    ExceptionHolderC.cpp
+    PollableC.cpp
+    Messaging_TypesC.cpp
+    TAO_ExtC.cpp
+    Messaging_RT_PolicyC.cpp
+    Messaging_SyncScope_PolicyC.cpp
+    Messaging_No_ImplC.cpp
+    MessagingC.cpp
+    MessagingS.cpp
+    ExceptionHolderA.cpp
+    MessagingA.cpp
+    Messaging_No_ImplA.cpp
+    Messaging_RT_PolicyA.cpp
+    Messaging_SyncScope_PolicyA.cpp
+    TAO_ExtA.cpp
+  }
+
+  Header_Files {
+    *.h
+    ExceptionHolderA.h
+    ExceptionHolderC.h
+    ExceptionHolderS.h
+    MessagingA.h
+    MessagingC.h
+    Messaging_No_ImplA.h
+    Messaging_No_ImplC.h
+    Messaging_No_ImplS.h
+    Messaging_RT_PolicyA.h
+    Messaging_RT_PolicyC.h
+    Messaging_RT_PolicyS.h
+    MessagingS.h
+    Messaging_SyncScope_PolicyA.h
+    Messaging_SyncScope_PolicyC.h
+    Messaging_SyncScope_PolicyS.h
+    Messaging_TypesA.h
+    Messaging_TypesC.h
+    Messaging_TypesS.h
+    PollableA.h
+    PollableC.h
+    PollableS.h
+    TAO_ExtA.h
+    TAO_ExtC.h
+    TAO_ExtS.h
+  }
+
+  Inline_Files {
+    *.inl
+    ExceptionHolderC.inl
+    MessagingC.inl
+  }
+
+  specific {
+    install_dir = tao/Messaging
+  }
+}
diff --git a/tao/Messaging/Messaging.pidl b/tao/Messaging/Messaging.pidl
index b2be7f2ff03..42a32df9bac 100644
--- a/tao/Messaging/Messaging.pidl
+++ b/tao/Messaging/Messaging.pidl
@@ -1,14 +1,10 @@
 // -*- IDL -*-
 
-//=============================================================================
 /**
  *  @file   Messaging.pidl
  *
  *  $Id$
- *
- * This file is used to generate the code in Messaging{C,S}.{h,cpp}
  */
-//=============================================================================
 
 #ifndef TAO_MESSAGING_PIDL
 #define TAO_MESSAGING_PIDL
diff --git a/tao/Messaging/Messaging_Loader.cpp b/tao/Messaging/Messaging_Loader.cpp
index 77a68ba9178..aa0b3323aa4 100644
--- a/tao/Messaging/Messaging_Loader.cpp
+++ b/tao/Messaging/Messaging_Loader.cpp
@@ -1,4 +1,3 @@
-
 // $Id$
 
 #include "tao/Messaging/Messaging_Loader.h"
diff --git a/tao/Messaging/Messaging_No_Impl.pidl b/tao/Messaging/Messaging_No_Impl.pidl
index 45b171441b7..0e0fa70b5c0 100644
--- a/tao/Messaging/Messaging_No_Impl.pidl
+++ b/tao/Messaging/Messaging_No_Impl.pidl
@@ -1,16 +1,10 @@
 // -*- IDL -*-
 
-//=============================================================================
 /**
  *  @file   Messaging_No_Impl.pidl
  *
  *  $Id$
- *
- * This file is used to generate the code in
- * Messaging_No_Impl{C}.{h,cpp} and as the name implies is not
- * implemented in TAO, yet.
  */
-//=============================================================================
 
 #ifndef TAO_MESSAGING_NO_IMPL_PIDL
 #define TAO_MESSAGING_NO_IMPL_PIDL
diff --git a/tao/Messaging/Messaging_ORBInitializer.cpp b/tao/Messaging/Messaging_ORBInitializer.cpp
index 147cb62fa82..11544f753b4 100644
--- a/tao/Messaging/Messaging_ORBInitializer.cpp
+++ b/tao/Messaging/Messaging_ORBInitializer.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/Messaging/Messaging_ORBInitializer.h"
-
 #include "tao/Messaging/Messaging_Policy_i.h"
 #include "tao/Messaging/Connection_Timeout_Policy_i.h"
 #include "tao/Messaging/Messaging_PolicyFactory.h"
diff --git a/tao/Messaging/Messaging_PolicyFactory.cpp b/tao/Messaging/Messaging_PolicyFactory.cpp
index 6a999b75866..fa13e41c642 100644
--- a/tao/Messaging/Messaging_PolicyFactory.cpp
+++ b/tao/Messaging/Messaging_PolicyFactory.cpp
@@ -1,5 +1,7 @@
-#include "tao/Messaging/Messaging_PolicyFactory.h"
+// -*- C++ -*-
+// $Id$
 
+#include "tao/Messaging/Messaging_PolicyFactory.h"
 #include "tao/Messaging/Messaging_Policy_i.h"
 #include "tao/Messaging/Connection_Timeout_Policy_i.h"
 #include "tao/Messaging/Buffering_Constraint_Policy.h"
diff --git a/tao/Messaging/Messaging_Policy_i.h b/tao/Messaging/Messaging_Policy_i.h
index 24870b0d814..9abc8d58a1e 100644
--- a/tao/Messaging/Messaging_Policy_i.h
+++ b/tao/Messaging/Messaging_Policy_i.h
@@ -58,7 +58,7 @@ public:
   /// CORBA::ORB::create_policy.
   static CORBA::Policy_ptr create (const CORBA::Any& val);
 
-  /// Returns a copy of <this>.
+  /// Returns a copy of @c this.
   virtual TAO_RelativeRoundtripTimeoutPolicy *clone (void) const;
 
   // = The Messaging::RelativeRoundtripTimeoutPolicy methods
@@ -73,7 +73,7 @@ public:
   /// Change the CORBA representation to the ACE representation.
   void set_time_value (ACE_Time_Value &time_value);
 
-  // Return the cached policy type for this policy.
+  /// Return the cached policy type for this policy.
   virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
 
 private:
diff --git a/tao/Messaging/Messaging_RT_Policy.pidl b/tao/Messaging/Messaging_RT_Policy.pidl
index 9ff676d7ac4..bd9275fade6 100644
--- a/tao/Messaging/Messaging_RT_Policy.pidl
+++ b/tao/Messaging/Messaging_RT_Policy.pidl
@@ -1,15 +1,10 @@
 // -*- IDL -*-
 
-//=============================================================================
 /**
  *  @file   Messaging_RT_Policy.pidl
  *
  *  $Id$
- *
- * This file is used to generate the code in
- * Messaging_RT_Policy{C}.{h,cpp}
  */
-//=============================================================================
 
 #ifndef TAO_MESSAGING_RT_POLICY_PIDL
 #define TAO_MESSAGING_RT_POLICY_PIDL
diff --git a/tao/Messaging/Messaging_SyncScope_Policy.pidl b/tao/Messaging/Messaging_SyncScope_Policy.pidl
index 39cf160f15c..6e0198f5b4e 100644
--- a/tao/Messaging/Messaging_SyncScope_Policy.pidl
+++ b/tao/Messaging/Messaging_SyncScope_Policy.pidl
@@ -1,15 +1,10 @@
 // -*- IDL -*-
 
-//=============================================================================
 /**
  *  @file   Messaging_SyncScope_Policy.pidl
  *
  *  $Id$
- *
- * This file is used to generate the code in
- * Messaging_SyncScope_Policy{C}.{h,cpp}
  */
-//=============================================================================
 
 #ifndef TAO_MESSAGING_SYNCSCOPE_POLICY_PIDL
 #define TAO_MESSAGING_SYNCSCOPE_POLICY_PIDL
diff --git a/tao/Messaging/Messaging_Types.pidl b/tao/Messaging/Messaging_Types.pidl
index 8b616b03853..ef5d2718c57 100644
--- a/tao/Messaging/Messaging_Types.pidl
+++ b/tao/Messaging/Messaging_Types.pidl
@@ -1,14 +1,10 @@
 // -*- IDL -*-
 
-//=============================================================================
 /**
  *  @file   Messaging_Types.pidl
  *
  *  $Id$
- *
- * This file is used to generate the code in Messaging__Types{C}.{h,cpp}
  */
-//=============================================================================
 
 #ifndef TAO_MESSAGING_NO_IMPL_TYPES_PIDL
 #define TAO_MESSAGING_NO_IMPL_TYPES_PIDL
diff --git a/tao/Messaging/Pollable.pidl b/tao/Messaging/Pollable.pidl
index 24217c692cd..efebe81ee6e 100644
--- a/tao/Messaging/Pollable.pidl
+++ b/tao/Messaging/Pollable.pidl
@@ -1,14 +1,10 @@
 // -*- IDL -*-
 
-//=============================================================================
 /**
  *  @file   Pollable.pidl
  *
  *  $Id$
- *
- * This file is used to generate the code in Pollable{C,S}.{h,cpp}
  */
-//=============================================================================
 
 #ifndef TAO_POLLABLE_PIDL
 #define TAO_POLLABLE_PIDL
diff --git a/tao/Messaging_PolicyValue.pidl b/tao/Messaging_PolicyValue.pidl
index 7ff01ed9c72..5a77d367335 100644
--- a/tao/Messaging_PolicyValue.pidl
+++ b/tao/Messaging_PolicyValue.pidl
@@ -3,8 +3,6 @@
  *  @file Messaging_PolicyValue.pidl
  *
  *  $Id$
- *
- * This file is used to generate the code in Messaging_PolicyValueC.{h,cpp}
  */
 
 #ifndef TAO_MESSAGING_POLICYVALUE_PIDL
diff --git a/tao/Messaging_SyncScope.pidl b/tao/Messaging_SyncScope.pidl
index 789cd58af73..d0405415de2 100644
--- a/tao/Messaging_SyncScope.pidl
+++ b/tao/Messaging_SyncScope.pidl
@@ -3,19 +3,6 @@
  *  @file Messaging_SyncScope.pidl
  *
  *  $Id$
- *
- * This file is used to generate the code in Messaging_SyncScopeC.{h,inl,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl.exe
- *        -o orig -St -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=tao/TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        Messaging_SyncScope.pidl
- *
  */
 #ifndef TAO_MESSAGING_SYNCSCOPE_PIDL
 #define TAO_MESSAGING_SYNCSCOPE_PIDL
diff --git a/tao/Monitor.mpc b/tao/Monitor.mpc
deleted file mode 100644
index 85ac0ca5198..00000000000
--- a/tao/Monitor.mpc
+++ /dev/null
@@ -1,83 +0,0 @@
-//$Id$
-project (*idl): tao_versioning_idl_defaults, install {
-  custom_only = 1
-  idlflags += -Gp -Gd -GA \
-                      -Wb,export_macro=TAO_Monitor_Export \
-                      -Wb,export_include=tao/Monitor/Monitor_export.h \
-                      -o Monitor
-  IDL_Files {
-    idlflags += -Wb,unique_include=tao/Monitor/Monitor.h -SS -Sci
-    Monitor/Monitor_include.pidl
-  }
-
-  IDL_Files {
-   idlflags += -Wb,include_guard=TAO_MONITOR_SAFE_INCLUDE \
-     -Wb,safe_include=tao/Monitor/Monitor.h -Ssi
-    Monitor/Monitor.pidl
-  }
-
-  IDL_Files {
-   idlflags -= -Sa -St
-   idlflags += -SS -Wb,include_guard=TAO_MONITOR_SAFE_INCLUDE \
-     -Wb,safe_include=tao/Monitor/Monitor.h
-    Monitor/Monitor_Types.pidl
-  }
-}
-
-project (TAO_Monitor): portableserver, install, taoidldefaults, ace_mc, tao_output {
-  after       += *idl
-  sharedname   = TAO_Monitor
-  dynamicflags += TAO_MONITOR_BUILD_DLL
-
-  Source_Files {
-    Monitor
-  }
-
-  Source_Files {
-    Monitor/Monitor_includeC.cpp
-    Monitor/MonitorC.cpp
-    Monitor/Monitor_TypesC.cpp
-    Monitor/MonitorA.cpp
-    Monitor/MonitorS.cpp
-    Monitor/Monitor_includeA.cpp
-    Monitor/Monitor_TypesA.cpp
-  }
-
-  Header_Files {
-    Monitor
-    Monitor/Monitor_includeC.h
-    Monitor/Monitor_includeS.h
-    Monitor/Monitor_includeA.h
-    Monitor/MonitorC.h
-    Monitor/MonitorS.h
-    Monitor/MonitorA.h
-    Monitor/Monitor_TypesC.h
-    Monitor/Monitor_TypesS.h
-    Monitor/Monitor_TypesA.h
-  }
-
-  Inline_Files {
-    Monitor
-    Monitor/MonitorC.inl
-    Monitor/Monitor_TypesC.inl
-  }
-
-  Template_Files {
-    Monitor
-  }
-
-  Resource_Files {
-    Monitor
-  }
-
-  PIDL_Files {
-    Monitor
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    Monitor/TAO_Monitor.pc.in
-  }
-}
diff --git a/tao/Monitor/Monitor.cpp b/tao/Monitor/Monitor.cpp
index 78109cd7f5a..6258b199287 100644
--- a/tao/Monitor/Monitor.cpp
+++ b/tao/Monitor/Monitor.cpp
@@ -1,10 +1,9 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Monitor/Monitor.h"
 #include "tao/Monitor/Monitor_Impl.h"
 
-ACE_RCSID (Monitor,
-           Monitor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
@@ -47,7 +46,7 @@ TAO_Monitor_Init::create_object (CORBA::ORB_ptr orb,
   catch (const CORBA::Exception&)
     {
     }
-  
+
   return CORBA::Object::_nil ();
 }
 
diff --git a/tao/Monitor/Monitor.h b/tao/Monitor/Monitor.h
index 3e2ad6c4055..2121871a6a0 100644
--- a/tao/Monitor/Monitor.h
+++ b/tao/Monitor/Monitor.h
@@ -37,11 +37,11 @@ class TAO_Monitor_Export TAO_Monitor_Init : public TAO_Object_Loader
 {
 public:
   TAO_Monitor_Init (void);
-  
+
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            ACE_TCHAR *argv []);
-  
+
   /// Used to force the initialization of the ORB code.
   static int Initializer (void);
 };
diff --git a/tao/Monitor/Monitor.mpc b/tao/Monitor/Monitor.mpc
new file mode 100644
index 00000000000..c4e7f7c083d
--- /dev/null
+++ b/tao/Monitor/Monitor.mpc
@@ -0,0 +1,69 @@
+//$Id$
+project (*idl): tao_versioning_idl_defaults, install {
+  custom_only = 1
+  idlflags += -Gp -Gd -GA \
+                      -Wb,export_macro=TAO_Monitor_Export \
+                      -Wb,export_include=tao/Monitor/Monitor_export.h \
+                      -iC tao/Monitor
+  IDL_Files {
+    idlflags += -Wb,unique_include=tao/Monitor/Monitor.h -SS -Sci
+    Monitor_include.pidl
+  }
+
+  IDL_Files {
+   idlflags += -Wb,include_guard=TAO_MONITOR_SAFE_INCLUDE \
+     -Wb,safe_include=tao/Monitor/Monitor.h -Ssi
+    Monitor.pidl
+  }
+
+  IDL_Files {
+   idlflags -= -Sa -St
+   idlflags += -SS -Wb,include_guard=TAO_MONITOR_SAFE_INCLUDE \
+     -Wb,safe_include=tao/Monitor/Monitor.h
+    Monitor_Types.pidl
+  }
+
+  specific {
+    install_dir = tao/Monitor
+  }
+}
+
+project (TAO_Monitor): portableserver, install, taoidldefaults, ace_mc, tao_output {
+  after       += *idl
+  sharedname   = TAO_Monitor
+  dynamicflags += TAO_MONITOR_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    Monitor_includeC.cpp
+    MonitorC.cpp
+    Monitor_TypesC.cpp
+    MonitorA.cpp
+    MonitorS.cpp
+    Monitor_includeA.cpp
+    Monitor_TypesA.cpp
+  }
+
+  Header_Files {
+    *.h
+    Monitor_includeC.h
+    Monitor_includeS.h
+    Monitor_includeA.h
+    MonitorC.h
+    MonitorS.h
+    MonitorA.h
+    Monitor_TypesC.h
+    Monitor_TypesS.h
+    Monitor_TypesA.h
+  }
+
+  Inline_Files {
+    *.inl
+    MonitorC.inl
+    Monitor_TypesC.inl
+  }
+
+  specific {
+    install_dir = tao/Monitor
+  }
+}
diff --git a/tao/Monitor/Monitor_Impl.cpp b/tao/Monitor/Monitor_Impl.cpp
index 8823bb9d33a..5854fda6f04 100644
--- a/tao/Monitor/Monitor_Impl.cpp
+++ b/tao/Monitor/Monitor_Impl.cpp
@@ -1,6 +1,5 @@
-//
 // $Id$
-//
+
 #include "tao/Monitor/Monitor_Impl.h"
 
 #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
@@ -9,10 +8,6 @@
 #include "ace/Monitor_Control_Action.h"
 #include "ace/Monitor_Control/Monitor_Control.h"
 
-ACE_RCSID (Monitor,
-           Monitor_Impl,
-           "$Id$")
-
 class TAO_Control_Action : public Control_Action
 {
 public:
diff --git a/tao/Muxed_TMS.cpp b/tao/Muxed_TMS.cpp
index 81f2fb24a94..76a5edacdd9 100644
--- a/tao/Muxed_TMS.cpp
+++ b/tao/Muxed_TMS.cpp
@@ -223,7 +223,7 @@ bool
 TAO_Muxed_TMS::idle_after_send (void)
 {
   // Irrespective of whether we are successful or not we need to
-  // return true. If *this* class is not successfull in idling the
+  // return true. If *this* class is not successful in idling the
   // transport no one can.
   if (this->transport_ != 0)
     (void) this->transport_->make_idle ();
diff --git a/tao/Network_Priority_Protocols_Hooks.cpp b/tao/Network_Priority_Protocols_Hooks.cpp
index 405e5857433..32c8cc7e6ce 100644
--- a/tao/Network_Priority_Protocols_Hooks.cpp
+++ b/tao/Network_Priority_Protocols_Hooks.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Network_Priority_Protocols_Hooks.h"
diff --git a/tao/New_Leader_Generator.cpp b/tao/New_Leader_Generator.cpp
index 48eaaf76b1d..14a0883c931 100644
--- a/tao/New_Leader_Generator.cpp
+++ b/tao/New_Leader_Generator.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/New_Leader_Generator.h"
diff --git a/tao/ORB.cpp b/tao/ORB.cpp
index a6452004b50..f9e99ba9749 100644
--- a/tao/ORB.cpp
+++ b/tao/ORB.cpp
@@ -1,7 +1,6 @@
 // "$Id$"
 
 #include "tao/ORB.h"
-
 #include "tao/ORB_Table.h"
 #include "tao/Connector_Registry.h"
 #include "tao/IOR_Parser.h"
diff --git a/tao/ORB.h b/tao/ORB.h
index 1ed894080c5..a4ab136171b 100644
--- a/tao/ORB.h
+++ b/tao/ORB.h
@@ -71,7 +71,7 @@ namespace CORBA
   class UnionMemberSeq;
   class ValueMemberSeq;
   typedef StringSeq ORB_ObjectIdList;
-  
+
   class Object;
   typedef Object * Object_ptr;
 
@@ -92,7 +92,7 @@ namespace CORBA
 
   class Policy;
   typedef Policy *Policy_ptr;
-  
+
   class OperationDef;
   typedef OperationDef * OperationDef_ptr;
 
diff --git a/tao/ORBInitializer_Registry.cpp b/tao/ORBInitializer_Registry.cpp
index 10048e23d95..de84e437005 100644
--- a/tao/ORBInitializer_Registry.cpp
+++ b/tao/ORBInitializer_Registry.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/ORBInitializer_Registry_Adapter.h"
 #include "tao/PortableInterceptorC.h"
@@ -12,8 +14,6 @@
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Log_Msg.h"
 
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
diff --git a/tao/ORB_Constants.h b/tao/ORB_Constants.h
index 6123d76829b..10bc2ffcfdb 100644
--- a/tao/ORB_Constants.h
+++ b/tao/ORB_Constants.h
@@ -108,43 +108,6 @@ namespace TAO
   const CORBA::ULong VPVID = VMCID;
 }
 
-/**
- * @name TAO-Specific System Exception Minor Code Values
- *
- * These system exception minor code values are specific to TAO.
- */
-//@{
-/// TAO VMCID assigned by the OMG.
-#if !defined (ACE_LACKS_DEPRECATED_MACROS)
-  /**
-   * @note This constant has historically been used in the wrong way.
-   *       It was often used as the @a location argument to the @c
-   *       CORBA::SystemException::_tao_minor_code() static method.  A
-   *       more appropriate default @a location argument/value would
-   *       have been zero since the location code resides in portion of
-   *       the lower order 12 bits, not the higher order 20 bits which
-   *       is where the VMCID resides, and what this value happens to
-   *       be.
-   *
-   * @deprecated Please use @c TAO::VMCID instead, or zero if being used
-   *             as default TAO exception location code argument.
-   *
-   * @see @c TAO::VMCID
-   */
-  const CORBA::ULong TAO_DEFAULT_MINOR_CODE = TAO::VMCID;
-#endif /* !ACE_LACKS_DEPRECATED_MACROS */
-
-#if !defined (ACE_LACKS_DEPRECATED_MACROS)
-  /// Maximum allowed system exception minor code.
-  /**
-   * @deprecated Please use @c TAO::MAX_MINOR_CODE instead.
-   *
-   * @see @c TAO::MAX_MINOR_CODE
-   */
-  const CORBA::ULong TAO_MAX_MINOR_CODE = TAO::MAX_MINOR_CODE;
-#endif /* !ACE_LACKS_DEPRECATED_MACROS */
-//@}
-
 /// A dummy service context that is inserted in the service context
 /// list to preserve the alignment in DSI based gateways, so no
 /// marshaling/demarshaling is required.
diff --git a/tao/ORB_Core.cpp b/tao/ORB_Core.cpp
index f8baa918fe0..0d687e0cb5c 100644
--- a/tao/ORB_Core.cpp
+++ b/tao/ORB_Core.cpp
@@ -1262,9 +1262,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
 
   ssf->open (this);
 
-  // Open the ObjectKey_Table
-  (void) this->object_key_table_.init (this);
-
   // Obtain the timeout value for the thread-per-connection model
   this->thread_per_connection_use_timeout_ =
     ssf->thread_per_connection_timeout (this->thread_per_connection_timeout_);
@@ -1279,7 +1276,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
       else
         {
           this->thread_per_connection_use_timeout_ = 1;
-          int milliseconds =
+          int const milliseconds =
             ACE_OS::atoi (TAO_DEFAULT_THREAD_PER_CONNECTION_TIMEOUT);
           // Use a temporary to obtain automatic normalization.
           this->thread_per_connection_timeout_ =
@@ -2191,7 +2188,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work)
 
   while (this->has_shutdown () == false)
     {
-      // Every time we perform an interation we have to become the
+      // Every time we perform an interaction we have to become the
       // leader again, because it is possible that a client has
       // acquired the leader role...
       TAO_Leader_Follower &leader_follower = this->leader_follower ();
@@ -2260,9 +2257,10 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work)
   // wait only in the parent thread.
   if (this->has_shutdown () == true &&
       (this->server_factory_->activate_server_connections () ||
-       (this->tm_.task() == 0 && this->tm_.count_threads() > 0) ) ) {
-    this->tm_.wait ();
-  }
+       (this->tm_.task() == 0 && this->tm_.count_threads() > 0) ) )
+    {
+      this->tm_.wait ();
+    }
 
   if (TAO_debug_level > 10)
     {
@@ -2306,7 +2304,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion)
 
   // Cleanup transports
   this->thread_lane_resources_manager ().close_all_transports ();
-  
+
   // Grab the thread manager
   ACE_Thread_Manager *tm = this->thr_mgr ();
 
@@ -2359,7 +2357,7 @@ TAO_ORB_Core::destroy (void)
   //
 
   // Shutdown the ORB and block until the shutdown is complete.
-  this->shutdown (1);
+  this->shutdown (true);
 
   // Invoke Interceptor::destroy() on all registered interceptors.
   this->destroy_interceptors ();
diff --git a/tao/ORB_Core.h b/tao/ORB_Core.h
index 40003665f32..753a2c995b5 100644
--- a/tao/ORB_Core.h
+++ b/tao/ORB_Core.h
@@ -161,7 +161,7 @@ namespace PortableInterceptor
 class TAO_Export TAO_ORB_Core
 {
   friend class TAO_ORB_Core_Auto_Ptr;
-  friend CORBA::ORB_ptr CORBA::ORB_init (int &,
+  friend TAO_Export CORBA::ORB_ptr CORBA::ORB_init (int &,
                                          ACE_TCHAR *argv[],
                                          const char *);
 public:
@@ -822,7 +822,7 @@ public:
   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)
+  /// 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);
@@ -863,7 +863,7 @@ public:
   /// gets called at initialization.
   void request_dispatcher (TAO_Request_Dispatcher *rd);
 
-  /// Call the libraries to handover the validators if they havent
+  /// Call the libraries to handover the validators if they haven't
   /// registered yet with the list of validators.
   void load_policy_validators (TAO_Policy_Validator &validator);
 
@@ -920,7 +920,7 @@ protected:
   ~TAO_ORB_Core (void);
 
   /// Initialize the guts of the ORB Core.  It is intended that this be
-  /// called by <CORBA::ORB_init>.
+  /// called by CORBA::ORB_init().
   int init (int &argc, char *argv[]);
 
   /// Final termination hook, typically called by CORBA::ORB's
diff --git a/tao/ORB_Core_Auto_Ptr.cpp b/tao/ORB_Core_Auto_Ptr.cpp
index 7b0a3ac3e68..dbfa1082fc3 100644
--- a/tao/ORB_Core_Auto_Ptr.cpp
+++ b/tao/ORB_Core_Auto_Ptr.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/ORB_Core_Auto_Ptr.h"
 #include "tao/ORB_Core.h"
 
diff --git a/tao/ORB_Table.cpp b/tao/ORB_Table.cpp
index 713f86f2818..64ab01f4cff 100644
--- a/tao/ORB_Table.cpp
+++ b/tao/ORB_Table.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core.h"
 #include "tao/TAO_Singleton.h"
@@ -9,8 +11,6 @@
 #include "ace/SString.h"
 #include "ace/OS_NS_string.h"
 
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::ORB_Table::ORB_Table (void)
diff --git a/tao/ORB_Table.h b/tao/ORB_Table.h
index d2e638ed91b..5b879c5f6ac 100644
--- a/tao/ORB_Table.h
+++ b/tao/ORB_Table.h
@@ -57,7 +57,7 @@ namespace TAO
    *       containing a template type (TAO_Singleton) with a static
    *       member to be introduced.  In turn, this potentially
    *       introduces problems in MS Windows DLL environments due to
-   *       the occurance of multiple singleton instances.  There
+   *       the occurrence of multiple singleton instances.  There
    *       should only be one!
    */
   class TAO_Export ORB_Table
diff --git a/tao/ObjRefTemplate.mpc b/tao/ObjRefTemplate.mpc
deleted file mode 100644
index 342b775ad8c..00000000000
--- a/tao/ObjRefTemplate.mpc
+++ /dev/null
@@ -1,87 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults, install {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -Gp -Gd -SS -Sorb -GX \
-                -Wb,export_macro=TAO_ORT_Export \
-                -Wb,export_include=tao/ObjRefTemplate/ort_export.h \
-                -Wb,include_guard=TAO_OBJREF_TEMPLATE_SAFE_INCLUDE \
-                -Wb,safe_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h \
-                -o ObjRefTemplate
-    idlflags -= -Sa -St
-    ObjRefTemplate/ObjectReferenceTemplate.pidl
-  }
-
-  IDL_Files {
-    idlflags += -SS -Sorb -GX -Sci \
-                -Wb,export_macro=TAO_ORT_Export \
-                -Wb,export_include=tao/ObjRefTemplate/ort_export.h \
-                -Wb,unique_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h \
-                -o ObjRefTemplate
-    ObjRefTemplate/ObjectReferenceTemplate_include.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Gp -Gd -SS -GA -Sorb  \
-                -Wb,export_macro=TAO_ORT_Export \
-                -Wb,export_include=tao/ObjRefTemplate/ort_export.h \
-                -o ObjRefTemplate
-    idlflags -= -Sa -St
-    ObjRefTemplate/Default_ORT.pidl
-  }
-}
-
-project(ObjRefTemplate) : valuetype, portableserver, install, tao_output, taoidldefaults {
-  after       += *idl
-  sharedname   = TAO_ObjRefTemplate
-  dynamicflags += TAO_ORT_BUILD_DLL
-
-  Source_Files {
-    ObjRefTemplate
-  }
-
-  Source_Files {
-    ObjRefTemplate/ObjectReferenceTemplateC.cpp
-    ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp
-    ObjRefTemplate/Default_ORTC.cpp
-    ObjRefTemplate/Default_ORTA.cpp
-  }
-
-  Header_Files {
-    ObjRefTemplate
-    ObjRefTemplate/ObjectReferenceTemplateC.h
-    ObjRefTemplate/ObjectReferenceTemplateS.h
-    ObjRefTemplate/ObjectReferenceTemplateA.h
-    ObjRefTemplate/ObjectReferenceTemplate_includeC.h
-    ObjRefTemplate/ObjectReferenceTemplate_includeS.h
-    ObjRefTemplate/ObjectReferenceTemplate_includeA.h
-    ObjRefTemplate/Default_ORTC.h
-    ObjRefTemplate/Default_ORTS.h
-    ObjRefTemplate/Default_ORTA.h
-  }
-
-  Inline_Files {
-    ObjRefTemplate
-    ObjRefTemplate/Default_ORTC.inl
-    ObjRefTemplate/ObjectReferenceTemplateC.inl
-  }
-
-  Template_Files {
-    ObjRefTemplate
-  }
-
-  Resource_Files {
-    ObjRefTemplate
-  }
-
-  PIDL_Files {
-    ObjRefTemplate
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    ObjRefTemplate/TAO_ObjRefTemplate.pc.in
-  }
-}
diff --git a/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp b/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
index d49005fa05b..3bb997409a4 100644
--- a/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
+++ b/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
@@ -4,10 +4,6 @@
 #include "tao/ObjRefTemplate/ORT_Adapter_Impl.h"
 #include "tao/PortableServer/Root_POA.h"
 
-ACE_RCSID (ORT,
-           ORT_Adapter_Factory_Impl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
index ee93e473e04..e996d16d61e 100644
--- a/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+++ b/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
@@ -6,11 +6,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/CORBA_methods.h"
 
-
-ACE_RCSID (ObjRefTemplate,
-           ORT_Adapter_Impl,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
diff --git a/tao/ObjRefTemplate/ObjRefTemplate.mpc b/tao/ObjRefTemplate/ObjRefTemplate.mpc
new file mode 100644
index 00000000000..8ac8d28a1d6
--- /dev/null
+++ b/tao/ObjRefTemplate/ObjRefTemplate.mpc
@@ -0,0 +1,73 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -Gp -Gd -SS -Sorb -GX \
+                -Wb,export_macro=TAO_ORT_Export \
+                -Wb,export_include=tao/ObjRefTemplate/ort_export.h \
+                -Wb,include_guard=TAO_OBJREF_TEMPLATE_SAFE_INCLUDE \
+                -Wb,safe_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h \
+                -iC tao/ObjRefTemplate
+    idlflags -= -Sa -St
+    ObjectReferenceTemplate.pidl
+  }
+
+  IDL_Files {
+    idlflags += -SS -Sorb -GX -Sci \
+                -Wb,export_macro=TAO_ORT_Export \
+                -Wb,export_include=tao/ObjRefTemplate/ort_export.h \
+                -Wb,unique_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h \
+                -iC tao/ObjRefTemplate
+    ObjectReferenceTemplate_include.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Gp -Gd -SS -GA -Sorb  \
+                -Wb,export_macro=TAO_ORT_Export \
+                -Wb,export_include=tao/ObjRefTemplate/ort_export.h \
+                -iC tao/ObjRefTemplate
+    idlflags -= -Sa -St
+    Default_ORT.pidl
+  }
+
+  specific {
+    install_dir = tao/ObjRefTemplate
+  }
+}
+
+project(ObjRefTemplate) : valuetype, portableserver, install, tao_output, taoidldefaults {
+  after       += *idl
+  sharedname   = TAO_ObjRefTemplate
+  dynamicflags += TAO_ORT_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    ObjectReferenceTemplateC.cpp
+    ObjectReferenceTemplate_includeC.cpp
+    Default_ORTC.cpp
+    Default_ORTA.cpp
+  }
+
+  Header_Files {
+    *.h
+    ObjectReferenceTemplateC.h
+    ObjectReferenceTemplateS.h
+    ObjectReferenceTemplateA.h
+    ObjectReferenceTemplate_includeC.h
+    ObjectReferenceTemplate_includeS.h
+    ObjectReferenceTemplate_includeA.h
+    Default_ORTC.h
+    Default_ORTS.h
+    Default_ORTA.h
+  }
+
+  Inline_Files {
+    *.inl
+    Default_ORTC.inl
+    ObjectReferenceTemplateC.inl
+  }
+
+  specific {
+    install_dir = tao/ObjRefTemplate
+  }
+}
diff --git a/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl b/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
index 8d1d4bf1c27..9582cb0c1bb 100644
--- a/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
+++ b/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
@@ -17,13 +17,13 @@ module PortableInterceptor
 {
   typeprefix PortableInterceptor "omg.org";
 
-  abstract valuetype ObjectReferenceFactory 
+  abstract valuetype ObjectReferenceFactory
   {
     Object make_object (in string repository_id,
                         in ObjectId id);
   };
 
-  abstract valuetype ObjectReferenceTemplate : ObjectReferenceFactory 
+  abstract valuetype ObjectReferenceTemplate : ObjectReferenceFactory
   {
     readonly attribute ServerId server_id;
     readonly attribute ORBId orb_id;
diff --git a/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
index 846b41478c0..66cf8a4eef4 100644
--- a/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "tao/ObjRefTemplate/ObjectReferenceTemplate_i.h"
 #include "tao/PortableServer/Root_POA.h"
 
 #include "tao/CORBA_String.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (ORT,
-           ObjectReferenceTemplate_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/Object.cpp b/tao/Object.cpp
index f08cc683390..40a7e5e1fe9 100644
--- a/tao/Object.cpp
+++ b/tao/Object.cpp
@@ -34,20 +34,18 @@ CORBA::Object::~Object (void)
 {
   if (this->protocol_proxy_)
     (void) this->protocol_proxy_->_decr_refcnt ();
-
-  delete this->object_init_lock_;
 }
 
 CORBA::Object::Object (TAO_Stub * protocol_proxy,
                        CORBA::Boolean collocated,
                        TAO_Abstract_ServantBase * servant,
                        TAO_ORB_Core *orb_core)
-  : is_local_ (false)
+  : refcount_ (1)
+    , is_local_ (false)
     , is_evaluated_ (true)
     , ior_ (0)
     , orb_core_ (orb_core)
     , protocol_proxy_ (protocol_proxy)
-    , object_init_lock_ (0)
 {
   /// This constructor should not be called when the protocol proxy is
   /// null ie. when the object is a LocalObject. Assert that
@@ -57,12 +55,6 @@ CORBA::Object::Object (TAO_Stub * protocol_proxy,
   if (this->orb_core_ == 0)
     this->orb_core_ = this->protocol_proxy_->orb_core ();
 
-  this->object_init_lock_ =
-    this->orb_core_->resource_factory ()->create_corba_object_lock ();
-
-  this->refcount_ =
-    this->orb_core_->resource_factory ()->create_corba_object_refcount ();
-
   // Set the collocation marker on the stub. This may not be news to it.
   // This may also change the stub's object proxy broker.
   this->protocol_proxy_->is_collocated (collocated);
@@ -73,18 +65,13 @@ CORBA::Object::Object (TAO_Stub * protocol_proxy,
 
 CORBA::Object::Object (IOP::IOR *ior,
                        TAO_ORB_Core *orb_core)
-  : is_local_ (false)
+  : refcount_ (1)
+    , is_local_ (false)
     , is_evaluated_ (false)
     , ior_ (ior)
     , orb_core_ (orb_core)
     , protocol_proxy_ (0)
-    , object_init_lock_ (0)
 {
-  this->object_init_lock_ =
-    this->orb_core_->resource_factory ()->create_corba_object_lock ();
-
-  this->refcount_ =
-    this->orb_core_->resource_factory ()->create_corba_object_refcount ();
 }
 
 // Too lazy to do this check in every method properly! This is useful
@@ -92,7 +79,7 @@ CORBA::Object::Object (IOP::IOR *ior,
 #define TAO_OBJECT_IOR_EVALUATE \
 if (!this->is_evaluated_) \
   { \
-    ACE_GUARD (ACE_Lock , mon, *this->object_init_lock_); \
+    ACE_GUARD (TAO_SYNCH_MUTEX , mon, this->object_init_lock_); \
       if (!this->is_evaluated_) \
         CORBA::Object::tao_object_initialize (this); \
   }
@@ -100,7 +87,7 @@ if (!this->is_evaluated_) \
 #define TAO_OBJECT_IOR_EVALUATE_RETURN(retval) \
 if (!this->is_evaluated_) \
   { \
-    ACE_GUARD_RETURN (ACE_Lock , mon, *this->object_init_lock_, retval); \
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX , mon, this->object_init_lock_, retval); \
     if (!this->is_evaluated_) \
       CORBA::Object::tao_object_initialize (this); \
   }
@@ -108,16 +95,16 @@ if (!this->is_evaluated_) \
 void
 CORBA::Object::_add_ref (void)
 {
-  this->refcount_.increment ();
+  ++this->refcount_;
 }
 
 void
 CORBA::Object::_remove_ref (void)
 {
-  if (this->refcount_.decrement () != 0)
-    return;
-
-  delete this;
+  if (--this->refcount_ == 0)
+    {
+      delete this;
+    }
 }
 
 CORBA::ULong
@@ -931,7 +918,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
         {
           return false;
         }
-        
+
       ACE_NEW_RETURN (x,
                       CORBA::Object (ior, orb_core),
                       false);
diff --git a/tao/Object.h b/tao/Object.h
index 01c224cd7d7..18c5fc7263d 100644
--- a/tao/Object.h
+++ b/tao/Object.h
@@ -32,7 +32,7 @@
 #include "tao/Object_Argument_T.h"
 #include "tao/Arg_Traits_T.h"
 #include "tao/Any_Insert_Policy_T.h"
-#include "tao/Configurable_Refcount.h"
+#include "ace/Atomic_Op.h"
 
 #if defined (HPUX) && defined (IOR)
    /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h
@@ -40,10 +40,6 @@
 # undef IOR
 #endif /* HPUX && IOR */
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Lock;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Stub;
@@ -88,10 +84,10 @@ namespace CORBA
 
   class Object;
   typedef Object *Object_ptr;
-  
+
   typedef TAO_Pseudo_Var_T<Object> Object_var;
   typedef TAO_Pseudo_Out_T<Object> Object_out;
-  
+
   template<>
   TAO_Export Boolean
   is_nil (Object_ptr);
@@ -228,7 +224,7 @@ namespace CORBA
     virtual CORBA::ORB_ptr _get_orb (void);
 
     /**
-     * @name Reference Count Managment
+     * @name Reference Count Management
      *
      * These are the standard CORBA object reference count manipulations
      * methods.
@@ -347,9 +343,9 @@ namespace CORBA
     /// implement Smart Proxies and no others.
     virtual char* convert_to_ior (bool use_omg_ior_format,
                                   const char* ior_prefix) const;
-            
+
     /// Wrapper for _remove_ref(), naming convention for
-    /// templatizing.                              
+    /// templatizing.
     void _decr_refcount (void);
 
   protected:
@@ -361,7 +357,7 @@ namespace CORBA
     TAO::Object_Proxy_Broker *proxy_broker () const;
 
     /// Number of outstanding references to this object.
-    TAO_Configurable_Refcount refcount_;
+    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
 
   private:
 
@@ -410,7 +406,7 @@ namespace CORBA
      * not require reference counting (the default) may be
      * instantiated in the critical path.
      */
-    ACE_Lock * object_init_lock_;
+    TAO_SYNCH_MUTEX object_init_lock_;
   };
 }   // End CORBA namespace.
 
diff --git a/tao/Object.inl b/tao/Object.inl
index 729c0fd0a8d..57b3c128916 100644
--- a/tao/Object.inl
+++ b/tao/Object.inl
@@ -15,7 +15,7 @@ CORBA::is_nil (CORBA::Object_ptr obj)
     {
       return true;
     }
-    
+
   return CORBA::Object::is_nil_i (obj);
 }
 
@@ -23,12 +23,12 @@ CORBA::is_nil (CORBA::Object_ptr obj)
 
 ACE_INLINE
 CORBA::Object::Object (int)
-  : is_local_ (true),
+  : refcount_ (1),
+    is_local_ (true),
     is_evaluated_ (true),
     ior_ (),
     orb_core_ (0),
-    protocol_proxy_ (0),
-    object_init_lock_ (0)
+    protocol_proxy_ (0)
 {
 }
 
diff --git a/tao/ObjectIdList.pidl b/tao/ObjectIdList.pidl
index b60933f8903..dcf5e46501e 100644
--- a/tao/ObjectIdList.pidl
+++ b/tao/ObjectIdList.pidl
@@ -5,29 +5,7 @@
  *
  * @brief Pre-compiled IDL source for the CORBA::ORB::ObjectIdList related
  * types.
- *
- * This file is used to generate the code in ObjectIdListC.{h,inl,cpp}.
- *
- *   The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the patched pidl file.  The
- *   command used for this is:
- *
- *     tao_idl.exe
- *        -o orig -Sa -GA -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ObjectIdList.pidl
- *
- * and then:
- *
- * cp orig/ObjectIdListC.{h,inl,cpp} .
- * cp orig/ObjectIdListA.cpp .
- *
- * The code is ready for use.
-  */
+ */
 
 #ifndef TAO_CORBA_ORB_OBJECTIDLIST_PIDL
 #define TAO_CORBA_ORB_OBJECTIDLIST_PIDL
diff --git a/tao/ObjectKey_Table.cpp b/tao/ObjectKey_Table.cpp
index ac313ce61fa..b7f2699bfcb 100644
--- a/tao/ObjectKey_Table.cpp
+++ b/tao/ObjectKey_Table.cpp
@@ -4,6 +4,10 @@
 #include "tao/ORB_Core.h"
 #include "tao/Refcounted_ObjectKey.h"
 
+#if !defined (__ACE_INLINE__)
+# include "tao/ObjectKey_Table.inl"
+#endif /* ! __ACE_INLINE__ */
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
@@ -30,8 +34,7 @@ TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs,
 
 /********************************************************/
 TAO::ObjectKey_Table::ObjectKey_Table (void)
-  : lock_ (0)
-  , table_ ()
+  : table_ ()
 {
 
 }
@@ -39,71 +42,6 @@ TAO::ObjectKey_Table::ObjectKey_Table (void)
 TAO::ObjectKey_Table::~ObjectKey_Table (void)
 {
   this->table_.close ();
-  delete this->lock_;
-}
-
-int
-TAO::ObjectKey_Table::init (TAO_ORB_Core *oc)
-{
-  /// Create the lock that is needed for internal usage.
-  this->lock_ =
-    oc->resource_factory ()->create_object_key_table_lock ();
-
-  return 0;
-}
-
-int
-TAO::ObjectKey_Table::bind (const TAO::ObjectKey &key,
-                            TAO::Refcounted_ObjectKey *&key_new)
-
-{
-  key_new = 0;
-
-  int retval = 0;
-
-  {
-    ACE_GUARD_RETURN (ACE_Lock,
-                      ace_mon,
-                      *this->lock_,
-                      0);
-
-    // This is a tradeoff.. We could avoid this two stage process of
-    // using a find () and then a bind () , which would make things
-    // efficient. BUT we may have to do allocation upfront and delete if
-    // bind () returns with an entry. We take one of the routes that
-    // avoids allocation.
-    retval = this->table_.find (key,
-                                key_new);
-
-    if (retval == -1)
-      {
-        return this->bind_i (key,
-                             key_new);
-      }
-
-    (void) key_new->incr_refcount ();
-  }
-
-  return retval;
-}
-
-int
-TAO::ObjectKey_Table::unbind (TAO::Refcounted_ObjectKey *&key_new)
-
-{
-  ACE_GUARD_RETURN (ACE_Lock,
-                    ace_mon,
-                    *this->lock_,
-                    0);
-
-  // If the refcount has dropped to 1, just go ahead and unbind it
-  // from the table.
-  if (key_new && key_new->decr_refcount () == 1)
-    {
-      return this->unbind_i (key_new);
-    }
-
-  return 0;
 }
 
 int
@@ -111,9 +49,9 @@ TAO::ObjectKey_Table::destroy (void)
 {
   if (this->table_.current_size ())
     {
-      ACE_GUARD_RETURN (ACE_Lock,
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                         ace_mon,
-                        *this->lock_,
+                        this->lock_,
                         0);
 
       TABLE::ITERATOR end_iter = this->table_.end ();
diff --git a/tao/ObjectKey_Table.h b/tao/ObjectKey_Table.h
index 2ea8a5d6bc6..2d204e7bfb1 100644
--- a/tao/ObjectKey_Table.h
+++ b/tao/ObjectKey_Table.h
@@ -21,6 +21,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Null_Mutex.h"
+#include "ace/Copy_Disabled.h"
 
 #include "tao/Object_KeyC.h"
 #include /**/ "tao/Versioned_Namespace.h"
@@ -61,7 +62,7 @@ namespace TAO
    * The ORB maintains one table for the whole ORB. ObjectKeys
    * generated by the ORB or the ones seen by the ORB from remote
    * ORB's are stored here. The ObjectKeys are stored through a
-   * wrapper which encapsulates the refcount on them. This class
+   * wrapper which encapsulates the reference count on them. This class
    * actually provides the synchronization mechanism for manipulating
    * the reference counts on the object keys provided by the wrapper
    * class.
@@ -73,7 +74,7 @@ namespace TAO
    * @note This class uses the ACE_RB_Tree to maintain the table of
    * ObjectKeys. The RB_Tree has good insertion and lookup
    * properties. Its Iteration properties are not that good, but we
-   * dont need to do much iteration unless we are closing down the
+   * don't need to do much iteration unless we are closing down the
    * table.
    *
    * @note The reasons to use RB_Tree are its good dynamic
@@ -83,7 +84,7 @@ namespace TAO
    * will do that if our instrumentation shows the need for it.
    *
    */
-  class TAO_Export ObjectKey_Table
+  class TAO_Export ObjectKey_Table : private ACE_Copy_Disabled
   {
   public:
     /// Default Constructor and destructor..
@@ -91,10 +92,6 @@ namespace TAO
 
     ~ObjectKey_Table (void);
 
-    /// Initialize method that sets up the underlying lock and other
-    /// related stuff.
-    int init (TAO_ORB_Core *orb);
-
     /// Iterates and unbinds the contents of the table.
     int destroy (void);
 
@@ -120,19 +117,14 @@ namespace TAO
     int unbind_i (Refcounted_ObjectKey *&key);
 
   private:
-    void operator= (const ObjectKey_Table &);
-    ObjectKey_Table (const ObjectKey_Table &);
-
-  private:
-
-    // Some useful typedefs.
+    /// Some useful typedefs.
     typedef ACE_RB_Tree<TAO::ObjectKey,
                         TAO::Refcounted_ObjectKey *,
                         TAO::Less_Than_ObjectKey,
                         ACE_Null_Mutex> TABLE;
 
     /// Lock for the table.
-    ACE_Lock *lock_;
+    TAO_SYNCH_MUTEX lock_;
 
     /// Table that contains the data
     TABLE table_;
@@ -141,6 +133,10 @@ namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
+#if defined (__ACE_INLINE__)
+# include "tao/ObjectKey_Table.inl"
+#endif /* __ACE_INLINE__ */
+
 #include /**/ "ace/post.h"
 
 #endif /*TAO_OBJECT_KEY_TABLE_H*/
diff --git a/tao/ObjectKey_Table.inl b/tao/ObjectKey_Table.inl
new file mode 100644
index 00000000000..8670aa0d8c5
--- /dev/null
+++ b/tao/ObjectKey_Table.inl
@@ -0,0 +1,61 @@
+// $Id$
+
+#include "tao/Refcounted_ObjectKey.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE
+int
+TAO::ObjectKey_Table::bind (const TAO::ObjectKey &key,
+                            TAO::Refcounted_ObjectKey *&key_new)
+
+{
+  key_new = 0;
+
+  int retval = 0;
+
+  {
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                      ace_mon,
+                      this->lock_,
+                      0);
+
+    // This is a tradeoff.. We could avoid this two stage process of
+    // using a find () and then a bind () , which would make things
+    // efficient. BUT we may have to do allocation upfront and delete if
+    // bind () returns with an entry. We take one of the routes that
+    // avoids allocation.
+    retval = this->table_.find (key, key_new);
+
+    if (retval == -1)
+      {
+        return this->bind_i (key, key_new);
+      }
+
+    (void) key_new->incr_refcount ();
+  }
+
+  return retval;
+}
+
+ACE_INLINE
+int
+TAO::ObjectKey_Table::unbind (TAO::Refcounted_ObjectKey *&key_new)
+
+{
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                    ace_mon,
+                    this->lock_,
+                    0);
+
+  // If the refcount has dropped to 1, just go ahead and unbind it
+  // from the table.
+  if (key_new && key_new->decr_refcount () == 1)
+    {
+      return this->unbind_i (key_new);
+    }
+
+  return 0;
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Object_Key.pidl b/tao/Object_Key.pidl
index 46f5aa85a6b..658605e2052 100644
--- a/tao/Object_Key.pidl
+++ b/tao/Object_Key.pidl
@@ -2,19 +2,6 @@
 
 // TAO specific IDL definition of an octet sequence that we use to represent
 // Object keys inside the POA.
-//   This file is used to generate the code in Object_KeyC.*
-//   The command used to generate code is:
-//
-//     tao_idl
-//        -o orig -St -Gp -Gd -Sci
-//          -Wb,export_macro=TAO_Export
-//          -Wb,export_macro="tao/TAO_Export"
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
-//          Object_Key.pidl
-//
-// After generation the file diffs/Object_Key.diff must be used to manually
-// patch this file
 
 #ifndef TAO_OBJECTKEY_PIDL
 #define TAO_OBJECTKEY_PIDL
diff --git a/tao/Object_KeyC.cpp b/tao/Object_KeyC.cpp
index 0572ff1a84e..dc6669b8e28 100644
--- a/tao/Object_KeyC.cpp
+++ b/tao/Object_KeyC.cpp
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.1
+ * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
  * TAO and the TAO IDL Compiler have been developed by:
  *       Center for Distributed Object Computing
  *       Washington University
@@ -26,7 +26,7 @@
  **/
 
 // TAO_IDL - Generated from
-// w:\tao\tao_idl\be\be_codegen.cpp:426
+// w:\tao\tao_idl\be\be_codegen.cpp:363
 
 
 #include "Object_KeyC.h"
diff --git a/tao/Object_KeyC.h b/tao/Object_KeyC.h
index 1da6fdf49b6..1882658ec21 100644
--- a/tao/Object_KeyC.h
+++ b/tao/Object_KeyC.h
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.1
+ * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
  * TAO and the TAO IDL Compiler have been developed by:
  *       Center for Distributed Object Computing
  *       Washington University
@@ -26,10 +26,10 @@
  **/
 
 // TAO_IDL - Generated from
-// w:\tao\tao_idl\be\be_codegen.cpp:149
+// w:\tao\tao_idl\be\be_codegen.cpp:146
 
-#ifndef _TAO_PIDL_OBJECT_KEYC_3VLM1R_H_
-#define _TAO_PIDL_OBJECT_KEYC_3VLM1R_H_
+#ifndef _TAO_PIDL_OBJECT_KEYC_GHONNS_H_
+#define _TAO_PIDL_OBJECT_KEYC_GHONNS_H_
 
 #include /**/ "ace/pre.h"
 
@@ -68,10 +68,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // w:\tao\tao_idl\be\be_visitor_typedef\typedef_ch.cpp:462
-  
+
   typedef CORBA::OctetSeq ObjectKey;
 
 // TAO_IDL - Generated from
@@ -101,7 +101,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
 // TAO_IDL - Generated from
-// w:\tao\tao_idl\be\be_codegen.cpp:1789
+// w:\tao\tao_idl\be\be_codegen.cpp:1589
 
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Object_Ref_Table.cpp b/tao/Object_Ref_Table.cpp
index 549696f49ca..27140875d7d 100644
--- a/tao/Object_Ref_Table.cpp
+++ b/tao/Object_Ref_Table.cpp
@@ -12,9 +12,6 @@
 # include "tao/Object_Ref_Table.inl"
 #endif  /* __ACE_INLINE__ */
 
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/tao/Object_Reference_Traits_T.h b/tao/Object_Reference_Traits_T.h
index 2d490ef3442..08532daa8cd 100644
--- a/tao/Object_Reference_Traits_T.h
+++ b/tao/Object_Reference_Traits_T.h
@@ -43,7 +43,6 @@ struct object_reference_traits_decorator
     std::generate(begin, end, &derived::default_initializer);
   }
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_range(
@@ -51,15 +50,7 @@ struct object_reference_traits_decorator
   {
     std::transform(begin, end, dst, &derived::duplicate);
   }
-# 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 */
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_swap_range(
@@ -67,13 +58,6 @@ struct object_reference_traits_decorator
   {
     std::swap_ranges(begin, end, dst);
   }
-# 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 */
 
   inline static void release_range(
       object_type ** begin, object_type ** end)
diff --git a/tao/Objref_VarOut_T.h b/tao/Objref_VarOut_T.h
index 5f0f2679fe1..e88a13a5347 100644
--- a/tao/Objref_VarOut_T.h
+++ b/tao/Objref_VarOut_T.h
@@ -106,7 +106,7 @@ public:
   TAO_Objref_Out_T &operator= (const TAO_Objref_Out_T<T> &p);
   TAO_Objref_Out_T &operator= (const TAO_Objref_Var_T<T> &p);
 
-  // Cast operator.
+  /// Cast operator.
   operator T *& ();
 
   T *& ptr (void);
diff --git a/tao/OctetSeq.pidl b/tao/OctetSeq.pidl
index 776b9f26846..4d96d1b55a6 100644
--- a/tao/OctetSeq.pidl
+++ b/tao/OctetSeq.pidl
@@ -1,11 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-/**
- * This file is used to generate the code in OctetSeqC.*
- */
-
 #ifndef TAO_CORBA_OCTET_SEQ_IDL
 #define TAO_CORBA_OCTET_SEQ_IDL
 
diff --git a/tao/On_Demand_Fragmentation_Strategy.h b/tao/On_Demand_Fragmentation_Strategy.h
index 8ac103f5bc7..428f45a7f9f 100644
--- a/tao/On_Demand_Fragmentation_Strategy.h
+++ b/tao/On_Demand_Fragmentation_Strategy.h
@@ -17,12 +17,12 @@
 
 #include "tao/GIOP_Fragmentation_Strategy.h"
 #include "ace/CDR_Base.h"
+#include "ace/Copy_Disabled.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_OutputCDR;
@@ -44,7 +44,6 @@ class TAO_On_Demand_Fragmentation_Strategy
   : public TAO_GIOP_Fragmentation_Strategy
 {
 public:
-
   /// Constructor.
   TAO_On_Demand_Fragmentation_Strategy (TAO_Transport * transport,
                                         ACE_CDR::ULong max_message_size);
diff --git a/tao/PI.mpc b/tao/PI.mpc
deleted file mode 100644
index 0436591053b..00000000000
--- a/tao/PI.mpc
+++ /dev/null
@@ -1,147 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults, install, pidl_install {
-  custom_only = 1
-  idlflags += -SS -Sci -Gp -Gd -Gstl \
-              -Wb,export_macro=TAO_PI_Export \
-              -Wb,export_include=tao/PI/pi_export.h \
-              -o PI
-  IDL_Files {
-    idlflags += -Sorb -GX \
-                -Wb,unique_include=tao/PI/PI.h
-    PI/PI_include.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Sorb -Sal -GX \
-                -Wb,include_guard=TAO_PI_SAFE_INCLUDE \
-                -Wb,safe_include=tao/PI/PI.h
-    idlflags -= -Sa -St
-    PI/ORBInitInfo.pidl
-  }
-
-  IDL_Files {
-    idlflags += -GA -Sorb -Sal \
-                -Wb,include_guard=TAO_PI_SAFE_INCLUDE \
-                -Wb,safe_include=tao/PI/PI.h
-    idlflags -= -Sa -St
-    PI/ORBInitializer.pidl
-    PI/ClientRequestInterceptor.pidl
-    PI/ClientRequestInfo.pidl
-    PI/RequestInfo.pidl
-    PI/PIForwardRequest.pidl
-    PI/PICurrent.pidl
-    PI/ProcessingModePolicy.pidl
-  }
-
-  IDL_Files {
-    idlflags += -GA -Sorb -Sal
-    idlflags -= -Sa -St
-    PI/Interceptor.pidl
-  }
-
-  IDL_Files {
-    idlflags += -GA -Sal \
-                -Wb,include_guard=TAO_PI_SAFE_INCLUDE \
-                -Wb,safe_include=tao/PI/PI.h
-    idlflags -= -Sa -St
-    PI/InvalidSlot.pidl
-  }
-
-  PidlInstallWithoutBuilding_Files {
-    PI/PolicyFactory.pidl
-  }
-}
-
-project(PI) : taolib, tao_output, codecfactory, install, taoidldefaults {
-  after       += *idl
-  sharedname   = TAO_PI
-  dynamicflags += TAO_PI_BUILD_DLL
-
-  Source_Files {
-    PI
-  }
-
-  Source_Files {
-    PI/PI_includeC.cpp
-    PI/ORBInitInfoC.cpp
-    PI/ORBInitializerC.cpp
-    PI/ClientRequestInterceptorC.cpp
-    PI/ClientRequestInfoC.cpp
-    PI/RequestInfoC.cpp
-    PI/PIForwardRequestC.cpp
-    PI/PICurrentC.cpp
-    PI/ProcessingModePolicyC.cpp
-    PI/InterceptorC.cpp
-    PI/InvalidSlotC.cpp
-    PI/ClientRequestInfoA.cpp
-    PI/ClientRequestInterceptorA.cpp
-    PI/InterceptorA.cpp
-    PI/InvalidSlotA.cpp
-    PI/ORBInitializerA.cpp
-    PI/PICurrentA.cpp
-    PI/PIForwardRequestA.cpp
-    PI/PolicyFactoryA.cpp
-    PI/ProcessingModePolicyA.cpp
-    PI/RequestInfoA.cpp
-  }
-
-  Header_Files {
-    PI
-    PI/ClientRequestInfoA.h
-    PI/ClientRequestInfoC.h
-    PI/ClientRequestInterceptorA.h
-    PI/ClientRequestInterceptorC.h
-    PI/InterceptorA.h
-    PI/InterceptorC.h
-    PI/InvalidSlotA.h
-    PI/InvalidSlotC.h
-    PI/ORBInitializerA.h
-    PI/ORBInitializerC.h
-    PI/ORBInitInfoA.h
-    PI/ORBInitInfoC.h
-    PI/PICurrentA.h
-    PI/PICurrentC.h
-    PI/PIForwardRequestA.h
-    PI/PIForwardRequestC.h
-    PI/PI_includeA.h
-    PI/PI_includeC.h
-    PI/ProcessingModePolicyA.h
-    PI/ProcessingModePolicyC.h
-    PI/RequestInfoA.h
-    PI/RequestInfoC.h
-    PI/ClientRequestInfoS.h
-    PI/ClientRequestInterceptorS.h
-    PI/InterceptorS.h
-    PI/InvalidSlotS.h
-    PI/ORBInitializerS.h
-    PI/ORBInitInfoS.h
-    PI/PICurrentS.h
-    PI/PIForwardRequestS.h
-    PI/PI_includeS.h
-    PI/ProcessingModePolicyS.h
-    PI/RequestInfoS.h
-  }
-
-  Inline_Files {
-    PI
-  }
-
-  Template_Files {
-    PI
-  }
-
-  Resource_Files {
-    PI
-  }
-
-  PIDL_Files {
-    PI
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    PI/TAO_PI.pc.in
-  }
-}
diff --git a/tao/PI/ClientRequestDetails.cpp b/tao/PI/ClientRequestDetails.cpp
index ce62da92000..fd8c9f062f9 100644
--- a/tao/PI/ClientRequestDetails.cpp
+++ b/tao/PI/ClientRequestDetails.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PI/ClientRequestDetails.h"
 #include "tao/SystemException.h"
 
diff --git a/tao/PI/ClientRequestInfo.pidl b/tao/PI/ClientRequestInfo.pidl
index 8f1f809d0bc..859da328f45 100644
--- a/tao/PI/ClientRequestInfo.pidl
+++ b/tao/PI/ClientRequestInfo.pidl
@@ -6,17 +6,6 @@
  * $Id$
  *
  * @brief Pre-compiled ClientRequestInfo
- *
- * This file is used to generate the code in ClientRequestInfoC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ClientRequestInfo.pidl
  */
 
 #ifndef _CLIENT_REQUESTINFO_PIDL_
diff --git a/tao/PI/ClientRequestInterceptor.pidl b/tao/PI/ClientRequestInterceptor.pidl
index f9d7e11e2df..f51d02c88c0 100644
--- a/tao/PI/ClientRequestInterceptor.pidl
+++ b/tao/PI/ClientRequestInterceptor.pidl
@@ -12,17 +12,6 @@
  * Interceptor support.
  * The following is from orbos/99-12-02 Portable Interceptors spec,
  * the full IDL is downloadable from orbos/99-12-02.
- *
- * This file is used to generate the code in ClientRequestInterceptorC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
- *          -Wb,export_include="tao/PI_Client/pi_client_export.h.h"
- *          -Wb,export_macro=TAO_PI_CLIENT_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ClientRequestInterceptor.pidl
  */
 
 #ifndef _CLIENT_REQUEST_INTERCEPTOR_IDL_
diff --git a/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index 6d746b2ea5a..1dd530b20d9 100644
--- a/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PI/ClientRequestInterceptor_Adapter_Impl.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
diff --git a/tao/PI/DLL_Resident_ORB_Initializer.cpp b/tao/PI/DLL_Resident_ORB_Initializer.cpp
index e2d115b9b92..dabc0d6836f 100644
--- a/tao/PI/DLL_Resident_ORB_Initializer.cpp
+++ b/tao/PI/DLL_Resident_ORB_Initializer.cpp
@@ -22,7 +22,7 @@ PortableInterceptor::DLL_Resident_ORB_Initializer::DLL_Resident_ORB_Initializer
   if (TAO_debug_level > 8)
     {
       ACE_DEBUG ((LM_DEBUG,
-        ACE_TEXT ("construct DLL_Resident_ORB_Initializer for @%@\n"),
+        ACE_TEXT ("TAO (%P|%t) - Construct DLL_Resident_ORB_Initializer for @%@\n"),
         initializer_.operator->()
         ));
     }
@@ -33,7 +33,7 @@ PortableInterceptor::DLL_Resident_ORB_Initializer::~DLL_Resident_ORB_Initializer
   if (TAO_debug_level > 8)
     {
       ACE_DEBUG ((LM_DEBUG,
-        ACE_TEXT ("Destruct DLL_Resident_ORB_Initializer for @%@\n"),
+        ACE_TEXT ("TAO (%P|%t) - Destruct DLL_Resident_ORB_Initializer for @%@\n"),
         initializer_.operator->()
         ));
     }
@@ -45,16 +45,14 @@ PortableInterceptor::DLL_Resident_ORB_Initializer::~DLL_Resident_ORB_Initializer
 
 void
 PortableInterceptor::DLL_Resident_ORB_Initializer::pre_init (
-    ::PortableInterceptor::ORBInitInfo_ptr info
-  )
+    ::PortableInterceptor::ORBInitInfo_ptr info)
 {
   initializer_->pre_init (info);
 }
 
 void
 PortableInterceptor::DLL_Resident_ORB_Initializer::post_init (
-    ::PortableInterceptor::ORBInitInfo_ptr info
-  )
+    ::PortableInterceptor::ORBInitInfo_ptr info)
 {
   initializer_->post_init (info);
 }
diff --git a/tao/PI/Interceptor.pidl b/tao/PI/Interceptor.pidl
index 39426e3989d..d1bfa3b5689 100644
--- a/tao/PI/Interceptor.pidl
+++ b/tao/PI/Interceptor.pidl
@@ -7,18 +7,6 @@
  *
  * @brief Pre-compiled IDL source for the Interceptor
  * components in the ORB.
- *
- * This file is used to generate the code in InterceptorC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Interceptor.pidl
- *
  */
 
 #ifndef _INTERCEPTOR_IDL_
diff --git a/tao/PI/Interceptor_List_T.cpp b/tao/PI/Interceptor_List_T.cpp
index dd2e4e3d758..2b1f29f400c 100644
--- a/tao/PI/Interceptor_List_T.cpp
+++ b/tao/PI/Interceptor_List_T.cpp
@@ -55,10 +55,8 @@ namespace TAO
           {
             /// If the Interceptor is not anonymous, make sure an
             /// Interceptor with the same isn't already registered.
-//            CORBA::String_var name =
-//              interceptor->name ();
+            std::string name = interceptor->name ();
 
-//            if (ACE_OS::strlen (name.in ()) != 0)
             if (!interceptor->name ().empty ())
               {
                 // @@ This simple search algorithm isn't the greatest
diff --git a/tao/PI/InvalidSlot.pidl b/tao/PI/InvalidSlot.pidl
index e6a48b4932c..605da7cecfc 100644
--- a/tao/PI/InvalidSlot.pidl
+++ b/tao/PI/InvalidSlot.pidl
@@ -6,17 +6,6 @@
  * $Id$
  *
  * @brief Pre-compiled InvalidSlot
- *
- * This file is used to generate the code in InvalidSlotC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          InvalidSlot.pidl
  */
 
 #ifndef _INVALID_SLOT_PIDL_
diff --git a/tao/PI/ORBInitInfo.pidl b/tao/PI/ORBInitInfo.pidl
index 6851cd48737..dfdf50453ed 100644
--- a/tao/PI/ORBInitInfo.pidl
+++ b/tao/PI/ORBInitInfo.pidl
@@ -6,17 +6,6 @@
  * $Id$
  *
  * @brief Pre-compiled IDL source for the ORBInitInfo
- *
- * This file is used to generate the code in ORBInitInfoC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ORBInitInfo.pidl
  */
 
 #ifndef _ORBINITINFO_PIDL_
diff --git a/tao/PI/ORBInitializer.pidl b/tao/PI/ORBInitializer.pidl
index c9f141c4c0e..26175a03ca9 100644
--- a/tao/PI/ORBInitializer.pidl
+++ b/tao/PI/ORBInitializer.pidl
@@ -7,18 +7,6 @@
  *
  * @brief ORBInitializer part of the PortableInterceptor part of the CORBA
  * spec
- *
- * This file is used to generate the code in ORBInitializerC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
- *          -Wb,export_include="tao/PI_Client/pi_client_export.h.h"
- *          -Wb,export_macro=TAO_PI_CLIENT_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ORBInitializer.pidl
- *
  */
 
 #ifndef _ORB_INITIALIZER_PIDL
diff --git a/tao/PI/ORBInitializer_Registry_Impl.cpp b/tao/PI/ORBInitializer_Registry_Impl.cpp
index 5c0ad5ce42c..f39d9b646ea 100644
--- a/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PI/ORBInitializer_Registry_Impl.h"
 #include "tao/PI/ORBInitInfo.h"
 #include "tao/PI/PICurrent.h"
diff --git a/tao/PI/PI.cpp b/tao/PI/PI.cpp
index 4a8dde4d7a1..ee404ae02b5 100644
--- a/tao/PI/PI.cpp
+++ b/tao/PI/PI.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PI/PI.h"
 #include "tao/PI/ORBInitializer_Registry_Impl.h"
 #include "tao/PI/PolicyFactory_Loader.h"
diff --git a/tao/PI/PI.mpc b/tao/PI/PI.mpc
new file mode 100644
index 00000000000..b32de399473
--- /dev/null
+++ b/tao/PI/PI.mpc
@@ -0,0 +1,133 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install, pidl_install {
+  custom_only = 1
+  idlflags += -SS -Sci -Gp -Gd \
+              -Wb,export_macro=TAO_PI_Export \
+              -Wb,export_include=tao/PI/pi_export.h \
+              -iC tao/PI
+  IDL_Files {
+    idlflags += -Sorb -GX \
+                -Wb,unique_include=tao/PI/PI.h
+    PI_include.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Sorb -Sal -GX \
+                -Wb,include_guard=TAO_PI_SAFE_INCLUDE \
+                -Wb,safe_include=tao/PI/PI.h
+    idlflags -= -Sa -St
+    ORBInitInfo.pidl
+  }
+
+  IDL_Files {
+    idlflags += -GA -Sorb -Sal \
+                -Wb,include_guard=TAO_PI_SAFE_INCLUDE \
+                -Wb,safe_include=tao/PI/PI.h
+    idlflags -= -Sa -St
+    ORBInitializer.pidl
+    ClientRequestInterceptor.pidl
+    ClientRequestInfo.pidl
+    RequestInfo.pidl
+    PIForwardRequest.pidl
+    PICurrent.pidl
+    ProcessingModePolicy.pidl
+  }
+
+  IDL_Files {
+    idlflags += -GA -Sorb -Sal
+    idlflags -= -Sa -St
+    Interceptor.pidl
+  }
+
+  IDL_Files {
+    idlflags += -GA -Sal \
+                -Wb,include_guard=TAO_PI_SAFE_INCLUDE \
+                -Wb,safe_include=tao/PI/PI.h
+    idlflags -= -Sa -St
+    InvalidSlot.pidl
+  }
+
+  PidlInstallWithoutBuilding_Files {
+    PolicyFactory.pidl
+  }
+
+  specific {
+    install_dir = tao/PI
+  }
+}
+
+project(PI) : taolib, tao_output, codecfactory, install, taoidldefaults {
+  after       += *idl
+  sharedname   = TAO_PI
+  dynamicflags += TAO_PI_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    PI_includeC.cpp
+    ORBInitInfoC.cpp
+    ORBInitializerC.cpp
+    ClientRequestInterceptorC.cpp
+    ClientRequestInfoC.cpp
+    RequestInfoC.cpp
+    PIForwardRequestC.cpp
+    PICurrentC.cpp
+    ProcessingModePolicyC.cpp
+    InterceptorC.cpp
+    InvalidSlotC.cpp
+    ClientRequestInfoA.cpp
+    ClientRequestInterceptorA.cpp
+    InterceptorA.cpp
+    InvalidSlotA.cpp
+    ORBInitializerA.cpp
+    PICurrentA.cpp
+    PIForwardRequestA.cpp
+    PolicyFactoryA.cpp
+    ProcessingModePolicyA.cpp
+    RequestInfoA.cpp
+  }
+
+  Header_Files {
+    *.h
+    ClientRequestInfoA.h
+    ClientRequestInfoC.h
+    ClientRequestInterceptorA.h
+    ClientRequestInterceptorC.h
+    InterceptorA.h
+    InterceptorC.h
+    InvalidSlotA.h
+    InvalidSlotC.h
+    ORBInitializerA.h
+    ORBInitializerC.h
+    ORBInitInfoA.h
+    ORBInitInfoC.h
+    PICurrentA.h
+    PICurrentC.h
+    PIForwardRequestA.h
+    PIForwardRequestC.h
+    PI_includeA.h
+    PI_includeC.h
+    ProcessingModePolicyA.h
+    ProcessingModePolicyC.h
+    RequestInfoA.h
+    RequestInfoC.h
+    ClientRequestInfoS.h
+    ClientRequestInterceptorS.h
+    InterceptorS.h
+    InvalidSlotS.h
+    ORBInitializerS.h
+    ORBInitInfoS.h
+    PICurrentS.h
+    PIForwardRequestS.h
+    PI_includeS.h
+    ProcessingModePolicyS.h
+    RequestInfoS.h
+  }
+
+  Template_Files {
+    *_T.cpp
+  }
+
+  specific {
+    install_dir = tao/PI
+  }
+}
diff --git a/tao/PI/PICurrent.cpp b/tao/PI/PICurrent.cpp
index 2a673e1eb3f..444457c3346 100644
--- a/tao/PI/PICurrent.cpp
+++ b/tao/PI/PICurrent.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PI/PICurrent.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
diff --git a/tao/PI/PICurrent_Impl.cpp b/tao/PI/PICurrent_Impl.cpp
index 5202a93ecec..cba4fc2913d 100644
--- a/tao/PI/PICurrent_Impl.cpp
+++ b/tao/PI/PICurrent_Impl.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PI/PICurrent_Impl.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
diff --git a/tao/PI/PIForwardRequest.pidl b/tao/PI/PIForwardRequest.pidl
index 7f2b9a0f847..862b430142e 100644
--- a/tao/PI/PIForwardRequest.pidl
+++ b/tao/PI/PIForwardRequest.pidl
@@ -7,18 +7,6 @@
  *
  * @brief Pre-compiled IDL source for the PortableInterceptor
  * components in the ORB.
- *
- * This file is used to generate the code in PIForwardRequestC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          PIForwardRequest.pidl
- *
  */
 
 #ifndef _PIFORWARD_REQUEST_IDL_
diff --git a/tao/PI/PI_ORBInitializer.cpp b/tao/PI/PI_ORBInitializer.cpp
index bbdc82018f6..f76fe987f3d 100644
--- a/tao/PI/PI_ORBInitializer.cpp
+++ b/tao/PI/PI_ORBInitializer.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/PI/PI_ORBInitializer.h"
 
diff --git a/tao/PI/PI_PolicyFactory.cpp b/tao/PI/PI_PolicyFactory.cpp
index a8f5ad4b9c6..cf5953d0f93 100644
--- a/tao/PI/PI_PolicyFactory.cpp
+++ b/tao/PI/PI_PolicyFactory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PI/PI_PolicyFactory.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
diff --git a/tao/PI/PolicyFactoryA.cpp b/tao/PI/PolicyFactoryA.cpp
index ba611cec358..181915cd4b8 100644
--- a/tao/PI/PolicyFactoryA.cpp
+++ b/tao/PI/PolicyFactoryA.cpp
@@ -46,7 +46,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0",
     "PolicyFactory");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_PolicyFactory =
diff --git a/tao/PI/PolicyFactory_Registry.cpp b/tao/PI/PolicyFactory_Registry.cpp
index e1658135d03..56c04f34765 100644
--- a/tao/PI/PolicyFactory_Registry.cpp
+++ b/tao/PI/PolicyFactory_Registry.cpp
@@ -1,11 +1,11 @@
+// $Id$
+
 #include "tao/PI/PolicyFactory_Registry.h"
 #include "tao/PI/PolicyFactoryC.h"
 #include "tao/ORB_Constants.h"
 #include "tao/PolicyC.h"
 #include "tao/SystemException.h"
 
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void)
diff --git a/tao/PI/RequestInfo.pidl b/tao/PI/RequestInfo.pidl
index e84c8b50adb..9e06ee55097 100644
--- a/tao/PI/RequestInfo.pidl
+++ b/tao/PI/RequestInfo.pidl
@@ -6,17 +6,6 @@
  * $Id$
  *
  * @brief Pre-compiled RequestInfo
- *
- * This file is used to generate the code in RequestInfoC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          RequestInfo.pidl
  */
 
 #ifndef _REQUESTINFO_PIDL_
diff --git a/tao/PI/RequestInfo_Util.cpp b/tao/PI/RequestInfo_Util.cpp
index f9483503443..764e6dbb873 100644
--- a/tao/PI/RequestInfo_Util.cpp
+++ b/tao/PI/RequestInfo_Util.cpp
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 #include "tao/PI/RequestInfo_Util.h"
diff --git a/tao/PI/TAO_PI.rc b/tao/PI/TAO_PI.rc
new file mode 100644
index 00000000000..3ab60738b02
--- /dev/null
+++ b/tao/PI/TAO_PI.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "PI\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_PIDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_PI.DLL\0"
+            VALUE "ProductName", "TAO\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/tao/PI_Server.mpc b/tao/PI_Server.mpc
deleted file mode 100644
index c5b7fbd11c2..00000000000
--- a/tao/PI_Server.mpc
+++ /dev/null
@@ -1,78 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults, install, pidl_install {
-  custom_only = 1
-  idlflags += \
-              -Wb,export_macro=TAO_PI_Server_Export \
-              -Wb,export_include=tao/PI_Server/pi_server_export.h \
-              -o PI_Server
-
-  IDL_Files {
-    idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal
-//                -Wb,include_guard=TAO_PI_SERVER_SAFE_INCLUDE \
-//                -Wb,safe_include=tao/PI_Server/PI_Server.h
-    idlflags -= -Sa -St
-    PI_Server/ServerRequestInfo.pidl
-  }
-
-  IDL_Files {
-    idlflags += -SS -Sorb -GX -Sci \
-                -Wb,unique_include=tao/PI_Server/PI_Server.h
-    PI_Server/PI_Server_include.pidl
-  }
-
-  PidlInstallWithoutBuilding_Files {
-    PI_Server/ServerRequestInterceptor.pidl
-  }
-}
-
-project(PI_Server) : taolib, tao_output, pi, portableserver, install, taoidldefaults {
-  after       += *idl
-  sharedname   = TAO_PI_Server
-  dynamicflags += TAO_PI_SERVER_BUILD_DLL
-
-  specific(bmake) {
-    compile_flags += -Q
-  }
-
-  Source_Files {
-    PI_Server
-  }
-
-  Source_Files {
-    PI_Server/ServerRequestInfoC.cpp
-    PI_Server/PI_Server_includeC.cpp
-  }
-
-  Header_Files {
-    PI_Server
-    PI_Server/ServerRequestInfoC.h
-    PI_Server/ServerRequestInfoS.h
-    PI_Server/ServerRequestInfoA.h
-    PI_Server/PI_Server_includeC.h
-    PI_Server/PI_Server_includeS.h
-    PI_Server/PI_Server_includeA.h
-  }
-
-  Inline_Files {
-    PI_Server
-  }
-
-  Template_Files {
-    PI_Server
-  }
-
-  Resource_Files {
-    PI_Server
-  }
-
-  PIDL_Files {
-    PI_Server
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    PI_Server/TAO_PI_Server.pc.in
-  }
-}
diff --git a/tao/PI_Server/PICurrent_Guard.cpp b/tao/PI_Server/PICurrent_Guard.cpp
index fd5fb2862b9..af46cf21f0e 100644
--- a/tao/PI_Server/PICurrent_Guard.cpp
+++ b/tao/PI_Server/PICurrent_Guard.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/PI_Server/PICurrent_Guard.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-
-ACE_RCSID (PortableServer,
-           PICurrent_Guard,
-           "$Id$")
-
-
 #include "tao/ORB_Core.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/PI/PICurrent.h"
diff --git a/tao/PI_Server/PI_Server.cpp b/tao/PI_Server/PI_Server.cpp
index 357d1cfee66..e17c2c8fad2 100644
--- a/tao/PI_Server/PI_Server.cpp
+++ b/tao/PI_Server/PI_Server.cpp
@@ -1,11 +1,10 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/PI_Server/PI_Server.h"
 #include "tao/PI_Server/PI_Server_Loader.h"
 #include "tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h"
 
-ACE_RCSID (PI_Server,
-           PI_Server,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/tao/PI_Server/PI_Server.mpc b/tao/PI_Server/PI_Server.mpc
new file mode 100644
index 00000000000..cad94e5df51
--- /dev/null
+++ b/tao/PI_Server/PI_Server.mpc
@@ -0,0 +1,56 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install, pidl_install {
+  custom_only = 1
+  idlflags += \
+              -Wb,export_macro=TAO_PI_Server_Export \
+              -Wb,export_include=tao/PI_Server/pi_server_export.h \
+              -iC tao/PI_Server
+
+  IDL_Files {
+    idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal
+//                -Wb,include_guard=TAO_PI_SERVER_SAFE_INCLUDE \
+//                -Wb,safe_include=tao/PI_Server/PI_Server.h
+    idlflags -= -Sa -St
+    ServerRequestInfo.pidl
+  }
+
+  IDL_Files {
+    idlflags += -SS -Sorb -GX -Sci \
+                -Wb,unique_include=tao/PI_Server/PI_Server.h
+    PI_Server_include.pidl
+  }
+
+  PidlInstallWithoutBuilding_Files {
+    ServerRequestInterceptor.pidl
+  }
+
+  specific {
+    install_dir = tao/PI_Server
+  }
+}
+
+project(PI_Server) : taolib, tao_output, pi, portableserver, install, taoidldefaults {
+  after       += *idl
+  sharedname   = TAO_PI_Server
+  dynamicflags += TAO_PI_SERVER_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    ServerRequestInfoC.cpp
+    PI_Server_includeC.cpp
+  }
+
+  Header_Files {
+    *.h
+    ServerRequestInfoC.h
+    ServerRequestInfoS.h
+    ServerRequestInfoA.h
+    PI_Server_includeC.h
+    PI_Server_includeS.h
+    PI_Server_includeA.h
+  }
+
+  specific {
+    install_dir = tao/PI_Server
+  }
+}
diff --git a/tao/PI_Server/PI_Server_Loader.cpp b/tao/PI_Server/PI_Server_Loader.cpp
index fbbc70400ab..11f62ea0fc0 100644
--- a/tao/PI_Server/PI_Server_Loader.cpp
+++ b/tao/PI_Server/PI_Server_Loader.cpp
@@ -1,4 +1,4 @@
-
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PI_Server/PI_Server_Loader.h"
@@ -8,10 +8,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (PI_Server,
-           PI_Server_Loader,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PI_Server_Loader::TAO_PI_Server_Loader (void)
diff --git a/tao/PI_Server/PortableServer_ORBInitializer.cpp b/tao/PI_Server/PortableServer_ORBInitializer.cpp
index 827ac975c0d..4e043d47252 100644
--- a/tao/PI_Server/PortableServer_ORBInitializer.cpp
+++ b/tao/PI_Server/PortableServer_ORBInitializer.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/PI_Server/PortableServer_ORBInitializer.h"
 #include "tao/PI_Server/PortableServer_PolicyFactory.h"
@@ -8,11 +9,6 @@
 #include "tao/PI/ORBInitInfo.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (PI_Server,
-           PortableServer_ORBInitializer,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/tao/PI_Server/PortableServer_PolicyFactory.cpp b/tao/PI_Server/PortableServer_PolicyFactory.cpp
index e2a8d8665f9..462a5749cb7 100644
--- a/tao/PI_Server/PortableServer_PolicyFactory.cpp
+++ b/tao/PI_Server/PortableServer_PolicyFactory.cpp
@@ -1,6 +1,7 @@
+// -*- C++ -*-
+// $Id$
 
 #include "tao/PI_Server/PortableServer_PolicyFactory.h"
-
 #include "tao/PortableServer/ThreadPolicy.h"
 #include "tao/PortableServer/LifespanPolicy.h"
 #include "tao/PortableServer/IdAssignmentPolicy.h"
@@ -11,10 +12,6 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PI_Server/Policy_Creator_T.h"
 
-ACE_RCSID (PI_Server,
-           PortableServer_PolicyFactory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
diff --git a/tao/PI_Server/ServerInterceptorAdapter.cpp b/tao/PI_Server/ServerInterceptorAdapter.cpp
index 3a3da8b5430..e4782a7d1ec 100644
--- a/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PI_Server/ServerInterceptorAdapter.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-ACE_RCSID (PI_Server,
-           ServerInterceptorAdapter,
-           "$Id$")
-
 #include "tao/PI_Server/ServerRequestInfo.h"
 #include "tao/PI_Server/PICurrent_Guard.h"
 
diff --git a/tao/PI_Server/ServerRequestDetails.cpp b/tao/PI_Server/ServerRequestDetails.cpp
index 2c7fcb81774..a5934d27df9 100644
--- a/tao/PI_Server/ServerRequestDetails.cpp
+++ b/tao/PI_Server/ServerRequestDetails.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/PI_Server/ServerRequestDetails.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -8,10 +11,6 @@
 
 #include "tao/SystemException.h"
 
-ACE_RCSID (PI_Server,
-           ServerRequestDetails,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/PI_Server/ServerRequestInfo.cpp b/tao/PI_Server/ServerRequestInfo.cpp
index a63e7864817..b2dfbab6edb 100644
--- a/tao/PI_Server/ServerRequestInfo.cpp
+++ b/tao/PI_Server/ServerRequestInfo.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PI_Server/ServerRequestInfo.h"
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
-ACE_RCSID (PI_Server,
-           ServerRequestInfo,
-           "$Id$")
-
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/PortableServer/Servant_Upcall.h"
 #include "tao/PortableServer/Servant_Base.h"
diff --git a/tao/PI_Server/ServerRequestInfo.pidl b/tao/PI_Server/ServerRequestInfo.pidl
index cc4520de1cb..f6e2dd5b087 100644
--- a/tao/PI_Server/ServerRequestInfo.pidl
+++ b/tao/PI_Server/ServerRequestInfo.pidl
@@ -6,17 +6,6 @@
  * $Id$
  *
  * @brief Pre-compiled RequestInfo
- *
- * This file is used to generate the code in ServerRequestInfoC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ServerRequestInfo.pidl
  */
 
 #ifndef _SERVER_REQUESTINFO_PIDL_
diff --git a/tao/PI_Server/ServerRequestInterceptor.pidl b/tao/PI_Server/ServerRequestInterceptor.pidl
index ad9a7d658fb..62e5fcef786 100644
--- a/tao/PI_Server/ServerRequestInterceptor.pidl
+++ b/tao/PI_Server/ServerRequestInterceptor.pidl
@@ -7,20 +7,6 @@
  *
  * @brief Pre-compiled IDL source for the PortableInterceptor
  * components in the ORB.
- *
- * This file is used to generate the code in ServerRequestInterceptorC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -GA -SS -Sci
- *          -Wb,export_include="tao/PI_Server/pi_server_export.h"
- *          -Wb,export_macro=TAO_PI_Server_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ServerRequestInterceptor.pidl
- *
- * Patches for changes to the generated code are available in the
- * `diffs' directory.
  */
 
 #ifndef _SERVER_REQUEST_INTERCEPTOR_IDL_
diff --git a/tao/PI_Server/ServerRequestInterceptorA.cpp b/tao/PI_Server/ServerRequestInterceptorA.cpp
index 8f5dfb63340..6f35a3004d8 100644
--- a/tao/PI_Server/ServerRequestInterceptorA.cpp
+++ b/tao/PI_Server/ServerRequestInterceptorA.cpp
@@ -47,7 +47,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0",
     "ServerRequestInterceptor");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor =
diff --git a/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp b/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
index 958da850a84..7575ee39bca 100644
--- a/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
+++ b/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
@@ -20,11 +20,6 @@
 #include "tao/ORB.h"
 #include "tao/debug.h"
 
-ACE_RCSID (PI_Server,
-           PolicyFactory_Loader,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::ServerRequestInterceptor_Adapter*
diff --git a/tao/PI_Server/TAO_PI_Server.rc b/tao/PI_Server/TAO_PI_Server.rc
new file mode 100644
index 00000000000..eeeb3f6328a
--- /dev/null
+++ b/tao/PI_Server/TAO_PI_Server.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "PI_Server\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_PI_ServerDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_PI_Server.DLL\0"
+            VALUE "ProductName", "TAO\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/tao/ParameterMode.pidl b/tao/ParameterMode.pidl
index c61e9f7819c..aaf46db0cbc 100644
--- a/tao/ParameterMode.pidl
+++ b/tao/ParameterMode.pidl
@@ -1,23 +1,10 @@
 // -*- IDL -*-
 
-// ================================================================
 /**
  *  @file   ParameterMode.pidl
  *
  * $Id$
- *
- *   This file is used to generate the code in ParameterModeC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ParameterMode.pidl
  */
-// ================================================================
 
 #ifndef TAO_PARAMETERMODE_IDL
 #define TAO_PARAMETERMODE_IDL
diff --git a/tao/Parser_Registry.cpp b/tao/Parser_Registry.cpp
index b2b85a1ae1d..156153378da 100644
--- a/tao/Parser_Registry.cpp
+++ b/tao/Parser_Registry.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Parser_Registry.h"
diff --git a/tao/Policy.pidl b/tao/Policy.pidl
index 16bcb9d0959..bb7905fbd14 100644
--- a/tao/Policy.pidl
+++ b/tao/Policy.pidl
@@ -5,40 +5,6 @@
  *
  * @brief Pre-compiled IDL source for the CORBA::Policy related
  * classes.
- *
- * This file is used to generate the code in PolicyC.{h,inl,cpp}.
- * Also, skeleton code for the only non local Policy interface is
- * generated from this pidl file and then the declaration code is
- * moved to tao/PortableServer/PolicyS.{h,inl,cpp}
- *
- *   The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the patched pidl file.  The
- *   command used for this is:
- *
- *     tao_idl.exe
- *        -o orig -Gp -Gd -GA -Ssi
- *          -Wb,stub_export_macro=TAO_Export
- *          -Wb,stub_export_include="tao/TAO_Export.h"
- *          -Wb,skel_export_macro=TAO_PortableServer_Export
- *          -Wb,skel_export_include=portableserver_export.h
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Policy.pidl
- *
- *   2. Then patch the generated code using patches in
- *      diff/Policy.diff. To patch  the generated code in
- *      PortableServer look for diffs in PortableServer/diffs
- *      directory.
- *
- *   Note: The diffs were generated with these commands:
- *
- *   for i in PolicyC.{h,i,cpp}; do
- *     diff -wBbu orig/$i $i;
- *   done > diffs/Policy.diff
- *   for i in Policy{S,S_T}.{h,i,cpp}; do
- *     diff -wBbu orig/$i PortableServer/$i;
- *   done >> diffs/Policy.diff
  */
 
 #ifndef TAO_CORBA_POLICY_PIDL
diff --git a/tao/PolicyFactory_Registry_Adapter.cpp b/tao/PolicyFactory_Registry_Adapter.cpp
index b8280ac76b0..a34d165dc31 100644
--- a/tao/PolicyFactory_Registry_Adapter.cpp
+++ b/tao/PolicyFactory_Registry_Adapter.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PolicyFactory_Registry_Adapter.h"
diff --git a/tao/Policy_Current_Impl.cpp b/tao/Policy_Current_Impl.cpp
index f89d702347a..29d91d4cadd 100644
--- a/tao/Policy_Current_Impl.cpp
+++ b/tao/Policy_Current_Impl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Policy_Current_Impl.h"
diff --git a/tao/Policy_Forward.pidl b/tao/Policy_Forward.pidl
index 803cce2ff4d..e73119f624a 100644
--- a/tao/Policy_Forward.pidl
+++ b/tao/Policy_Forward.pidl
@@ -7,21 +7,6 @@
  *
  * @brief Pre-compiled IDL source to forward declare some critical
  * Policy-related types.
- *
- * This file is used to generate the code in
- * Policy_ForwardC.{h,cpp}.
- *
- *   The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the patched pidl file.  The
- *   command used for this is:
- *
- *     tao_idl.exe
- *        -o orig -GA -SS -Sci -Sorb
- *          -Wb,export_macro="tao/TAO_Export"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Policy_Forward.pidl
  */
 
 #ifndef TAO_CORBA_POLICY_FORWARD_PIDL
diff --git a/tao/Policy_Set.cpp b/tao/Policy_Set.cpp
index 297272b99eb..d03b0c0012d 100644
--- a/tao/Policy_Set.cpp
+++ b/tao/Policy_Set.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Policy_Set.h"
diff --git a/tao/Policy_Validator.cpp b/tao/Policy_Validator.cpp
index f7e2fa4cfbc..0a3bfa57f57 100644
--- a/tao/Policy_Validator.cpp
+++ b/tao/Policy_Validator.cpp
@@ -2,7 +2,6 @@
 
 #include "tao/Policy_Validator.h"
 #include "tao/debug.h"
-
 #include "ace/Log_Msg.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -43,7 +42,7 @@ TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator)
               if (TAO_debug_level > 3)
                 {
                   ACE_DEBUG ((LM_DEBUG,
-                              ACE_TEXT ("(%P|%t) Skipping validator [0x%x] ")
+                              ACE_TEXT ("(%P|%t) Skipping validator [%@] ")
                               ACE_TEXT ("since it would create a circular list\n"),
                               validator));
                 }
diff --git a/tao/PortableInterceptor.pidl b/tao/PortableInterceptor.pidl
index 206b349dc38..181a14b6564 100644
--- a/tao/PortableInterceptor.pidl
+++ b/tao/PortableInterceptor.pidl
@@ -17,17 +17,6 @@
  * include:
  *    - addition of the Interceptor::destroy() method
  *    - move of CodecFactory and Codec interfaces to the IOP module
- *
- * This file is used to generate the code in PortableInterceptorC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          PortableInterceptor.pidl
  */
 
 // File: PortableInterceptor.idl
diff --git a/tao/PortableServer.mpc b/tao/PortableServer.mpc
deleted file mode 100644
index dc88c3a7ae7..00000000000
--- a/tao/PortableServer.mpc
+++ /dev/null
@@ -1,194 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults, install, pidl_install {
-  custom_only = 1
-  idlflags += -Gstl
-  
-  IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -GA \
-                -Wb,export_macro=TAO_PortableServer_Export \
-                -Wb,export_include=tao/PortableServer/portableserver_export.h \
-                -o PortableServer
-    idlflags -= -Sa -St
-    PortableServer/ForwardRequest.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -GA -Sal \
-                -Wb,export_macro=TAO_PortableServer_Export \
-                -Wb,export_include=tao/PortableServer/portableserver_export.h \
-                -o PortableServer
-    idlflags -= -Sa -St
-    PortableServer/AdapterActivator.pidl
-    PortableServer/IdAssignmentPolicy.pidl
-    PortableServer/IdUniquenessPolicy.pidl
-    PortableServer/ImplicitActivationPolicy.pidl
-    PortableServer/LifespanPolicy.pidl
-    PortableServer/RequestProcessingPolicy.pidl
-    PortableServer/ServantActivator.pidl
-    PortableServer/ServantLocator.pidl
-    PortableServer/ServantManager.pidl
-    PortableServer/ServantRetentionPolicy.pidl
-    PortableServer/ThreadPolicy.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb \
-                -Wb,export_macro=TAO_PortableServer_Export \
-                -Wb,export_include=tao/PortableServer/portableserver_export.h \
-                -o PortableServer
-    idlflags -= -Sa -St
-    PortableServer/POAManager.pidl
-    PortableServer/POAManagerFactory.pidl
-    PortableServer/POA.pidl
-    PortableServer/PS_Current.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Sci -SS -Sorb -Sa -GX \
-                -Wb,export_macro=TAO_PortableServer_Export \
-                -Wb,export_include=tao/PortableServer/portableserver_export.h \
-                -Wb,unique_include=tao/PortableServer/PortableServer.h \
-                -o PortableServer
-    PortableServer/PortableServer_include.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Sci -SS -Sorb -Sa -GX \
-                -Wb,export_macro=TAO_PortableServer_Export \
-                -Wb,export_include=tao/PortableServer/portableserver_export.h \
-                -Wb,include_guard=TAO_PORTABLESERVER_SAFE_INCLUDE \
-                -Wb,safe_include=tao/PortableServer/PortableServer.h \
-                -o PortableServer
-    PortableServer/PortableServer.pidl
-  }
-
-  PidlInstallWithoutBuilding_Files {
-    PortableServer/PS_Forward.pidl
-  }
-}
-
-project(PortableServer) : taolib, tao_output, install, anytypecode, taoidldefaults, valuetype_out_indirection {
-  after       += *idl
-  sharedname   = TAO_PortableServer
-  dynamicflags += TAO_PORTABLESERVER_BUILD_DLL
-
-  Source_Files {
-    PortableServer
-  }
-
-  Source_Files {
-    PortableServer/ForwardRequestC.cpp
-    PortableServer/AdapterActivatorC.cpp
-    PortableServer/IdAssignmentPolicyC.cpp
-    PortableServer/IdUniquenessPolicyC.cpp
-    PortableServer/ImplicitActivationPolicyC.cpp
-    PortableServer/LifespanPolicyC.cpp
-    PortableServer/RequestProcessingPolicyC.cpp
-    PortableServer/ServantActivatorC.cpp
-    PortableServer/ServantLocatorC.cpp
-    PortableServer/ServantManagerC.cpp
-    PortableServer/ServantRetentionPolicyC.cpp
-    PortableServer/ThreadPolicyC.cpp
-    PortableServer/POAManagerC.cpp
-    PortableServer/POAManagerFactoryC.cpp
-    PortableServer/POAC.cpp
-    PortableServer/PS_CurrentC.cpp
-    PortableServer/PortableServer_includeC.cpp
-    PortableServer/PortableServerC.cpp
-    PortableServer/AdapterActivatorA.cpp
-    PortableServer/ForwardRequestA.cpp
-    PortableServer/IdAssignmentPolicyA.cpp
-    PortableServer/IdUniquenessPolicyA.cpp
-    PortableServer/ImplicitActivationPolicyA.cpp
-    PortableServer/LifespanPolicyA.cpp
-    PortableServer/PS_ForwardA.cpp
-    PortableServer/Regular_POA.cpp
-    PortableServer/RequestProcessingPolicyA.cpp
-    PortableServer/Root_POA.cpp
-    PortableServer/ServantActivatorA.cpp
-    PortableServer/ServantLocatorA.cpp
-    PortableServer/ServantManagerA.cpp
-    PortableServer/ServantRetentionPolicyA.cpp
-    PortableServer/ThreadPolicyA.cpp
-  }
-
-  Header_Files {
-    PortableServer
-    PortableServer/AdapterActivatorC.h
-    PortableServer/ForwardRequestC.h
-    PortableServer/IdAssignmentPolicyC.h
-    PortableServer/IdUniquenessPolicyC.h
-    PortableServer/ImplicitActivationPolicyC.h
-    PortableServer/LifespanPolicyC.h
-    PortableServer/POAC.h
-    PortableServer/POAManagerC.h
-    PortableServer/POAManagerFactoryC.h
-    PortableServer/PortableServerC.h
-    PortableServer/PortableServer_includeC.h
-    PortableServer/PS_CurrentC.h
-    PortableServer/PS_ForwardC.h
-    PortableServer/RequestProcessingPolicyC.h
-    PortableServer/ServantActivatorC.h
-    PortableServer/ServantLocatorC.h
-    PortableServer/ServantManagerC.h
-    PortableServer/ServantRetentionPolicyC.h
-    PortableServer/ThreadPolicyC.h
-    PortableServer/AdapterActivatorA.h
-    PortableServer/ForwardRequestA.h
-    PortableServer/IdAssignmentPolicyA.h
-    PortableServer/IdUniquenessPolicyA.h
-    PortableServer/ImplicitActivationPolicyA.h
-    PortableServer/LifespanPolicyA.h
-    PortableServer/PortableServerA.h
-    PortableServer/PortableServer_includeA.h
-    PortableServer/Regular_POA.h
-    PortableServer/RequestProcessingPolicyA.h
-    PortableServer/ServantActivatorA.h
-    PortableServer/ServantLocatorA.h
-    PortableServer/ServantManagerA.h
-    PortableServer/ServantRetentionPolicyA.h
-    PortableServer/ThreadPolicyA.h
-    PortableServer/ForwardRequestS.h
-    PortableServer/AdapterActivatorS.h
-    PortableServer/IdAssignmentPolicyS.h
-    PortableServer/IdUniquenessPolicyS.h
-    PortableServer/ImplicitActivationPolicyS.h
-    PortableServer/LifespanPolicyS.h
-    PortableServer/RequestProcessingPolicyS.h
-    PortableServer/ServantActivatorS.h
-    PortableServer/ServantLocatorS.h
-    PortableServer/ServantManagerS.h
-    PortableServer/ServantRetentionPolicyS.h
-    PortableServer/ThreadPolicyS.h
-    PortableServer/POAManagerS.h
-    PortableServer/POAManagerFactoryS.h
-    PortableServer/POAS.h
-    PortableServer/PS_CurrentS.h
-    PortableServer/PortableServer_includeS.h
-    PortableServer/PortableServerS.h
-  }
-
-  Inline_Files {
-    PortableServer
-  }
-
-  Template_Files {
-    PortableServer/Servant_var.cpp
-    PortableServer/*_T.cpp
-  }
-
-  Resource_Files {
-    PortableServer
-  }
-
-  PIDL_Files {
-    PortableServer
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    PortableServer/TAO_PortableServer.pc.in
-  }
-}
diff --git a/tao/PortableServer/Acceptor_Filter_Factory.cpp b/tao/PortableServer/Acceptor_Filter_Factory.cpp
index d5d7dcfc452..b89a7dce30e 100644
--- a/tao/PortableServer/Acceptor_Filter_Factory.cpp
+++ b/tao/PortableServer/Acceptor_Filter_Factory.cpp
@@ -1,4 +1,5 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/Acceptor_Filter_Factory.h"
 #include "tao/PortableServer/Default_Acceptor_Filter.h"
diff --git a/tao/PortableServer/Active_Object_Map.cpp b/tao/PortableServer/Active_Object_Map.cpp
index 7e7b45f1027..ac5ab0a2ad4 100644
--- a/tao/PortableServer/Active_Object_Map.cpp
+++ b/tao/PortableServer/Active_Object_Map.cpp
@@ -11,12 +11,29 @@
 
 #include "ace/Auto_Ptr.h"
 #include "ace/CORBA_macros.h"
+#include "tao/debug.h"
+#include "PortableServer_Functions.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /* static */
 size_t TAO_Active_Object_Map::system_id_size_ = 0;
 
+static void
+hexstring (ACE_CString& hexstr, const char* s, size_t l)
+{
+  char buf[3] = {0};
+
+  hexstr.fast_resize (2 + l * 2);
+  hexstr.append ("0x", 2);
+  while (--l)
+    {
+      ACE_OS::sprintf (buf, "%02x", (unsigned int)(unsigned char)*s);
+      hexstr.append (buf, 2);
+      ++s;
+    }
+}
+
 void
 TAO_Active_Object_Map::set_system_id_size (
   const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters)
@@ -488,6 +505,22 @@ TAO_Unique_Id_Strategy::bind_using_user_id (
         }
     }
 
+  if (result == 0 && TAO_debug_level > 7)
+    {
+      std::string idstr (PortableServer::ObjectId_to_string (user_id));
+      std::string repository_id (
+          servant ? servant->_repository_id () : 0);
+      ACE_CString hex_idstr;
+      hexstring (hex_idstr, idstr.c_str (), user_id.size ());
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - TAO_Unique_Id_Strategy::"
+                  "bind_using_user_id: type=%C, id=%C\n",
+                  repository_id.c_str (),
+                  hex_idstr.c_str()
+                  ));
+    }
+
   return result;
 }
 
@@ -657,6 +690,22 @@ TAO_Multiple_Id_Strategy::bind_using_user_id (
         }
     }
 
+  if (result == 0 && TAO_debug_level > 7)
+    {
+      std::string idstr (PortableServer::ObjectId_to_string (user_id));
+      std::string repository_id (
+          servant ? servant->_repository_id () : 0);
+      ACE_CString hex_idstr;
+      hexstring (hex_idstr, idstr.c_str (), user_id.size ());
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - TAO_Multiple_Id_Strategy::"
+                  "bind_using_user_id: type=%C, id=%C\n",
+                  repository_id.c_str (),
+                  hex_idstr.c_str()
+                  ));
+    }
+
   return result;
 }
 
@@ -925,6 +974,23 @@ TAO_System_Id_With_Unique_Id_Strategy::bind_using_system_id (
       delete entry;
     }
 
+  if (result == 0 && TAO_debug_level > 7)
+    {
+      std::string idstr (
+          PortableServer::ObjectId_to_string (entry->user_id_));
+      std::string repository_id (
+          servant ? servant->_repository_id () : 0);
+      ACE_CString hex_idstr;
+      hexstring (hex_idstr, idstr.c_str (), entry->user_id_.size ());
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - TAO_System_Id_With_Unique_Id_Strategy::"
+                  "bind_using_system_id: type=%C, id=%C\n",
+                  repository_id.c_str (),
+                  hex_idstr.c_str()
+                  ));
+    }
+
   return result;
 }
 
@@ -964,6 +1030,23 @@ TAO_System_Id_With_Multiple_Id_Strategy::bind_using_system_id (
       delete entry;
     }
 
+  if (result == 0 && TAO_debug_level > 7)
+    {
+      std::string idstr (
+          PortableServer::ObjectId_to_string (entry->user_id_));
+      std::string repository_id (
+          servant ? servant->_repository_id () : 0);
+      ACE_CString hex_idstr;
+      hexstring (hex_idstr, idstr.c_str (), entry->user_id_.size ());
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - TAO_System_Id_With_Multiple_Id_Strategy::"
+                  "bind_using_system_id: type=%C, id=%C\n",
+                  repository_id.c_str (),
+                  hex_idstr.c_str()
+                  ));
+    }
+
   return result;
 }
 #endif
diff --git a/tao/PortableServer/Active_Policy_Strategies.cpp b/tao/PortableServer/Active_Policy_Strategies.cpp
index d88025c8e68..ce322b8f0e8 100644
--- a/tao/PortableServer/Active_Policy_Strategies.cpp
+++ b/tao/PortableServer/Active_Policy_Strategies.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Active_Policy_Strategies.h"
diff --git a/tao/PortableServer/Adapter_Activator.cpp b/tao/PortableServer/Adapter_Activator.cpp
index 89202f2842c..654e18b408c 100644
--- a/tao/PortableServer/Adapter_Activator.cpp
+++ b/tao/PortableServer/Adapter_Activator.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Adapter_Activator.h"
diff --git a/tao/PortableServer/Collocated_Arguments_Converter.cpp b/tao/PortableServer/Collocated_Arguments_Converter.cpp
index 0032f3dddee..2c36b1863ad 100644
--- a/tao/PortableServer/Collocated_Arguments_Converter.cpp
+++ b/tao/PortableServer/Collocated_Arguments_Converter.cpp
@@ -1,4 +1,5 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/Collocated_Arguments_Converter.h"
 
diff --git a/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
index 1dcb206274b..c045934fa59 100644
--- a/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
+++ b/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
@@ -1,12 +1,9 @@
 //$Id$
-// -- PortableServer Include --
+
 #include "tao/PortableServer/Collocated_Object_Proxy_Broker.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Servant_Upcall.h"
 #include "tao/PortableServer/Servant_Base.h"
-
-
-// -- TAO Include --
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
 #include "tao/Profile.h"
diff --git a/tao/PortableServer/Creation_Time.cpp b/tao/PortableServer/Creation_Time.cpp
index 65a764fcb0a..e9ee2dade56 100644
--- a/tao/PortableServer/Creation_Time.cpp
+++ b/tao/PortableServer/Creation_Time.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PortableServer/Creation_Time.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/tao/PortableServer/Default_Acceptor_Filter.cpp b/tao/PortableServer/Default_Acceptor_Filter.cpp
index 6bc2df993b4..a8786cbabaf 100644
--- a/tao/PortableServer/Default_Acceptor_Filter.cpp
+++ b/tao/PortableServer/Default_Acceptor_Filter.cpp
@@ -1,4 +1,5 @@
-// @(#) $Id$
+// -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/Default_Acceptor_Filter.h"
 #include "tao/Transport_Acceptor.h"
diff --git a/tao/PortableServer/Default_Servant_Dispatcher.cpp b/tao/PortableServer/Default_Servant_Dispatcher.cpp
index 64fcd20925f..adea850ed3f 100644
--- a/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -3,7 +3,6 @@
 #include "tao/PortableServer/Default_Servant_Dispatcher.h"
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/PortableServer/Network_Priority_Hook.h"
-
 #include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
index e9bdac8acb8..fea4bc90175 100644
--- a/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
+++ b/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
diff --git a/tao/PortableServer/IdAssignmentPolicy.cpp b/tao/PortableServer/IdAssignmentPolicy.cpp
index 98c35ce5006..c564ce60c39 100644
--- a/tao/PortableServer/IdAssignmentPolicy.cpp
+++ b/tao/PortableServer/IdAssignmentPolicy.cpp
@@ -1,6 +1,8 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/PortableServer/IdAssignmentPolicy.h"
 #include "tao/PortableServer/PortableServer.h"
-
 #include "ace/CORBA_macros.h"
 
 #if !defined (CORBA_E_MICRO)
diff --git a/tao/PortableServer/IdAssignmentStrategySystem.cpp b/tao/PortableServer/IdAssignmentStrategySystem.cpp
index 3313f5b0eb1..79dbb0f6e21 100644
--- a/tao/PortableServer/IdAssignmentStrategySystem.cpp
+++ b/tao/PortableServer/IdAssignmentStrategySystem.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/IdAssignmentStrategySystem.h"
diff --git a/tao/PortableServer/IdUniquenessPolicy.cpp b/tao/PortableServer/IdUniquenessPolicy.cpp
index 7c22b26aa49..d4e8360b914 100644
--- a/tao/PortableServer/IdUniquenessPolicy.cpp
+++ b/tao/PortableServer/IdUniquenessPolicy.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/PortableServer/IdUniquenessPolicy.h"
 #include "tao/PortableServer/PortableServer.h"
 
diff --git a/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
index c8de711be92..338f133ab6a 100644
--- a/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
+++ b/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/IdUniquenessStrategyMultiple.h"
diff --git a/tao/PortableServer/ImplicitActivationPolicy.cpp b/tao/PortableServer/ImplicitActivationPolicy.cpp
index 31619683d77..139dd439472 100644
--- a/tao/PortableServer/ImplicitActivationPolicy.cpp
+++ b/tao/PortableServer/ImplicitActivationPolicy.cpp
@@ -1,6 +1,7 @@
+// $Id$
+
 #include "tao/PortableServer/ImplicitActivationPolicy.h"
 #include "tao/PortableServer/PortableServer.h"
-
 #include "ace/CORBA_macros.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/tao/PortableServer/ImplicitActivationStrategy.cpp b/tao/PortableServer/ImplicitActivationStrategy.cpp
index f06efb98479..4f825caab71 100644
--- a/tao/PortableServer/ImplicitActivationStrategy.cpp
+++ b/tao/PortableServer/ImplicitActivationStrategy.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/ImplicitActivationStrategy.h"
 
diff --git a/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
index 5761ec21f54..29455fc7a9f 100644
--- a/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
+++ b/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/ImplicitActivationStrategyExplicit.h"
 
@@ -16,8 +17,6 @@ namespace TAO
   }
 }
 
-
-
 ACE_FACTORY_NAMESPACE_DEFINE (
   ACE_Local_Service,
   ImplicitActivationStrategyExplicit,
diff --git a/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
index 0a15d536afb..9a41f2b1915 100644
--- a/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
+++ b/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h"
diff --git a/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
index b7f7318e6c9..e50ad89be99 100644
--- a/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
+++ b/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/ImplicitActivationStrategyImplicit.h"
 
diff --git a/tao/PortableServer/Key_Adapters.cpp b/tao/PortableServer/Key_Adapters.cpp
index 4ad3d4bfccc..ec09ad5df9a 100644
--- a/tao/PortableServer/Key_Adapters.cpp
+++ b/tao/PortableServer/Key_Adapters.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Key_Adapters.h"
@@ -6,8 +7,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Map_T.h"
 
-///////////////////////////////////////////////////////////////////////////////
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void)
diff --git a/tao/PortableServer/LifespanPolicy.cpp b/tao/PortableServer/LifespanPolicy.cpp
index 84f4041046b..87a41ea8abb 100644
--- a/tao/PortableServer/LifespanPolicy.cpp
+++ b/tao/PortableServer/LifespanPolicy.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/PortableServer/LifespanPolicy.h"
 #include "tao/PortableServer/PortableServer.h"
 
diff --git a/tao/PortableServer/LifespanStrategyPersistent.cpp b/tao/PortableServer/LifespanStrategyPersistent.cpp
index 771245eb727..7d8eb1d7cb2 100644
--- a/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/LifespanStrategyPersistent.h"
-
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/PortableServer/POAManager.h"
 #include "tao/PortableServer/ImR_Client_Adapter.h"
diff --git a/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
index 1efe0b1674f..349374e809f 100644
--- a/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
+++ b/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h"
diff --git a/tao/PortableServer/LifespanStrategyTransient.cpp b/tao/PortableServer/LifespanStrategyTransient.cpp
index 4b02af9e2ba..eec9ca12ce0 100644
--- a/tao/PortableServer/LifespanStrategyTransient.cpp
+++ b/tao/PortableServer/LifespanStrategyTransient.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/PortableServer/LifespanStrategyTransient.h"
-
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_string.h"
 #include "tao/PortableServer/POAManager.h"
diff --git a/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
index 3cee3a56963..d51455af87d 100644
--- a/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
+++ b/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h"
diff --git a/tao/PortableServer/Network_Priority_Hook.cpp b/tao/PortableServer/Network_Priority_Hook.cpp
index 2a72b0f4441..b1965c31be2 100644
--- a/tao/PortableServer/Network_Priority_Hook.cpp
+++ b/tao/PortableServer/Network_Priority_Hook.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// $Id$
 
 #include "tao/PortableServer/Network_Priority_Hook.h"
 #include "tao/PortableServer/Root_POA.h"
diff --git a/tao/PortableServer/Non_Servant_Upcall.cpp b/tao/PortableServer/Non_Servant_Upcall.cpp
index 1702524039e..0c99cbe2881 100644
--- a/tao/PortableServer/Non_Servant_Upcall.cpp
+++ b/tao/PortableServer/Non_Servant_Upcall.cpp
@@ -78,10 +78,8 @@ namespace TAO
                 }
             }
 
-          // If locking is enabled.
-          if (this->object_adapter_.enable_locking_)
-            // Wakeup all waiting threads.
-            this->object_adapter_.non_servant_upcall_condition_.broadcast ();
+          // Wakeup all waiting threads.
+          this->object_adapter_.non_servant_upcall_condition_.broadcast ();
         }
     }
   }
diff --git a/tao/PortableServer/Object_Adapter.cpp b/tao/PortableServer/Object_Adapter.cpp
index d89a816b251..b9f3d0e07bf 100644
--- a/tao/PortableServer/Object_Adapter.cpp
+++ b/tao/PortableServer/Object_Adapter.cpp
@@ -143,10 +143,8 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
     persistent_poa_name_map_ (0),
     transient_poa_map_ (0),
     orb_core_ (orb_core),
-    enable_locking_ (orb_core_.server_factory ()->enable_poa_locking ()),
     thread_lock_ (),
-    lock_ (TAO_Object_Adapter::create_lock (enable_locking_,
-                                            thread_lock_)),
+    lock_ (TAO_Object_Adapter::create_lock (thread_lock_)),
     reverse_lock_ (*lock_),
     non_servant_upcall_condition_ (thread_lock_),
     non_servant_upcall_in_progress_ (0),
@@ -310,26 +308,11 @@ TAO_Object_Adapter::~TAO_Object_Adapter (void)
 
 /* static */
 ACE_Lock *
-TAO_Object_Adapter::create_lock (int enable_locking,
-                                 TAO_SYNCH_MUTEX &thread_lock)
+TAO_Object_Adapter::create_lock (TAO_SYNCH_MUTEX &thread_lock)
 {
-#if defined (ACE_HAS_THREADS)
-  if (enable_locking)
-    {
-      ACE_Lock *the_lock = 0;
-      ACE_NEW_RETURN (the_lock,
-                      ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (thread_lock),
-                      0);
-      return the_lock;
-    }
-#else
-  ACE_UNUSED_ARG (enable_locking);
-  ACE_UNUSED_ARG (thread_lock);
-#endif /* ACE_HAS_THREADS */
-
   ACE_Lock *the_lock = 0;
   ACE_NEW_RETURN (the_lock,
-                  ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
+                  ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (thread_lock),
                   0);
   return the_lock;
 }
@@ -896,7 +879,7 @@ TAO_Object_Adapter::initialize_collocated_object (TAO_Stub *stub)
   // proxy broker if required.
   stub->is_collocated (true);
 
-  // Return 0 (success) iff we found a servant.
+  // Return 0 (success) if we found a servant.
   return ! sb;
 }
 
@@ -1181,8 +1164,7 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void)
   // Check if a non-servant upcall is in progress.  If a non-servant
   // upcall is in progress, wait for it to complete.  Unless of
   // course, the thread making the non-servant upcall is this thread.
-  while (this->enable_locking_ &&
-         this->non_servant_upcall_in_progress_ &&
+  while (this->non_servant_upcall_in_progress_ &&
          ! ACE_OS::thr_equal (this->non_servant_upcall_thread_,
                               ACE_OS::thr_self ()))
     {
diff --git a/tao/PortableServer/Object_Adapter.h b/tao/PortableServer/Object_Adapter.h
index 63f56bcb85d..6518b7377c3 100644
--- a/tao/PortableServer/Object_Adapter.h
+++ b/tao/PortableServer/Object_Adapter.h
@@ -138,8 +138,6 @@ public:
   /// Return the validator.
   TAO_Policy_Validator &validator (void);
 
-  int enable_locking() const;
-
   /// Return the set of default policies.
   TAO_POA_Policy_Set &default_poa_policies (void);
 
@@ -149,8 +147,7 @@ public:
   void servant_dispatcher (TAO_Servant_Dispatcher *dispatcher);
 
   /// Initialize the default set of POA policies.
-  void init_default_policies (TAO_POA_Policy_Set &policies
-                             );
+  void init_default_policies (TAO_POA_Policy_Set &policies);
 
   // = The TAO_Adapter methods, please check tao/Adapter.h for the
   // documentation
@@ -201,8 +198,7 @@ protected:
   int unbind_persistent_poa (const poa_name &folded_name,
                              const poa_name &system_name);
 
-  static ACE_Lock *create_lock (int enable_locking,
-                                TAO_SYNCH_MUTEX &thread_lock);
+  static ACE_Lock *create_lock (TAO_SYNCH_MUTEX &thread_lock);
 
   virtual void do_dispatch (TAO_ServerRequest& req,
                             TAO::Portable_Server::Servant_Upcall& upcall);
@@ -379,8 +375,6 @@ protected:
 
   TAO_ORB_Core &orb_core_;
 
-  int enable_locking_;
-
   TAO_SYNCH_MUTEX thread_lock_;
 
   ACE_Lock *lock_;
diff --git a/tao/PortableServer/Object_Adapter.inl b/tao/PortableServer/Object_Adapter.inl
index a123261bfc9..0a41b1da34f 100644
--- a/tao/PortableServer/Object_Adapter.inl
+++ b/tao/PortableServer/Object_Adapter.inl
@@ -13,12 +13,6 @@ TAO_Object_Adapter::validator (void)
   return this->default_validator_;
 }
 
-ACE_INLINE int
-TAO_Object_Adapter::enable_locking (void) const
-{
-  return this->enable_locking_;
-}
-
 ACE_INLINE TAO_POA_Policy_Set &
 TAO_Object_Adapter::default_poa_policies (void)
 {
diff --git a/tao/PortableServer/Operation_Table.cpp b/tao/PortableServer/Operation_Table.cpp
index 30494b02891..13e7de29186 100644
--- a/tao/PortableServer/Operation_Table.cpp
+++ b/tao/PortableServer/Operation_Table.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Operation_Table.h"
@@ -5,7 +6,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// destructor
 TAO_Operation_Table::~TAO_Operation_Table (void)
 {
 }
diff --git a/tao/PortableServer/Operation_Table_Binary_Search.cpp b/tao/PortableServer/Operation_Table_Binary_Search.cpp
index 3d8b9872dcf..29e37c7bda2 100644
--- a/tao/PortableServer/Operation_Table_Binary_Search.cpp
+++ b/tao/PortableServer/Operation_Table_Binary_Search.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Operation_Table_Binary_Search.h"
diff --git a/tao/PortableServer/POA.pidl b/tao/PortableServer/POA.pidl
index b725528b06e..5d8b63a895a 100644
--- a/tao/PortableServer/POA.pidl
+++ b/tao/PortableServer/POA.pidl
@@ -4,41 +4,6 @@
  * $Id$
  *
  * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * This file is used to generate the code in
- * PortableServerC.{h,inl,cpp}, using the following command:
- *
- * tao_idl.exe \
- *     -o orig -Sci -Gp -Gd -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          PortableServer.pidl
- *
- * After the file is generated a patch from the diffs directory must
- * be applied.  The patch:
- *
- *   - Disables parts of the code under certain configurations.
- *
- *   - Eliminates cycles in the include dependencies.
- *
- *   - Adds non-idl components of PortableServer to the namespace.
- *     This includes (a) Servant (b) ServantBase (c) RefCountServantBase
- *     (d) Cookie (e) ObjectId_to_string (f) string_to_ObjectId (g)
- *     ObjectId_to_wstring (h) wstring_to_ObjectId (i) ServantBase_var
- *     (j) DynamicImplementation (k) LocalServantBase
- *
- * Apply patches using the following command:
- *
- *   patch < diffs/PortableServer.diff
- *
- * Note: The diffs were generated using:
- *
- *   rm diffs/PortableServer.diff
- *   for i in PortableServerC.{h,i,cpp}; do
- *     diff -wub orig/$i $i >> diffs/PortableServer.diff
- *   done
  */
 
 #ifndef _POA_SERVER_IDL_
diff --git a/tao/PortableServer/POAManagerFactory.cpp b/tao/PortableServer/POAManagerFactory.cpp
index 3371ff79981..a6057c87633 100644
--- a/tao/PortableServer/POAManagerFactory.cpp
+++ b/tao/PortableServer/POAManagerFactory.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/POAManagerFactory.h"
diff --git a/tao/PortableServer/POA_Current.cpp b/tao/PortableServer/POA_Current.cpp
index 80c11743ac7..ed51999f510 100644
--- a/tao/PortableServer/POA_Current.cpp
+++ b/tao/PortableServer/POA_Current.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 // -- PortableServer Include --
diff --git a/tao/PortableServer/POA_Current_Impl.inl b/tao/PortableServer/POA_Current_Impl.inl
index d8077bc29a8..b6f7c4810e5 100644
--- a/tao/PortableServer/POA_Current_Impl.inl
+++ b/tao/PortableServer/POA_Current_Impl.inl
@@ -31,7 +31,7 @@ namespace TAO
         {
           // Resize the current object_id_.  If it is less than the
           // length of the current buffer, no allocation will take place.
-          size_t id_size = id.size ();
+          CORBA::ULong id_size = id.size ();
           this->object_id_.resize (id_size);
           
           for (CORBA::ULong i = 0; i < id_size; ++i)
diff --git a/tao/PortableServer/POA_Guard.cpp b/tao/PortableServer/POA_Guard.cpp
index 48137972315..abbf64ef1d9 100644
--- a/tao/PortableServer/POA_Guard.cpp
+++ b/tao/PortableServer/POA_Guard.cpp
@@ -27,12 +27,14 @@ namespace TAO
       poa.object_adapter ().wait_for_non_servant_upcalls_to_complete ();
 
       if (check_for_destruction && poa.cleanup_in_progress ())
-        throw
-          CORBA::BAD_INV_ORDER (
-            CORBA::SystemException::_tao_minor_code (
-              TAO_POA_BEING_DESTROYED,
-              0),
-            CORBA::COMPLETED_NO);
+        {
+          throw
+            CORBA::BAD_INV_ORDER (
+              CORBA::SystemException::_tao_minor_code (
+                TAO_POA_BEING_DESTROYED,
+                0),
+              CORBA::COMPLETED_NO);
+        }
     }
   }
 }
diff --git a/tao/PortableServer/POA_Guard.h b/tao/PortableServer/POA_Guard.h
index 2757259f5d8..99e8bc75c66 100644
--- a/tao/PortableServer/POA_Guard.h
+++ b/tao/PortableServer/POA_Guard.h
@@ -43,7 +43,9 @@ namespace TAO
       POA_Guard (::TAO_Root_POA &poa, bool check_for_destruction = true);
 
     private:
+// FUZZ: disable check_for_ACE_Guard
       ACE_Guard<ACE_Lock> guard_;
+// FUZZ: enable check_for_ACE_Guard
     };
   } /* namespace Portable_Server */
 } /* namespace TAO */
diff --git a/tao/PortableServer/POA_Policy_Set.cpp b/tao/PortableServer/POA_Policy_Set.cpp
index e0fba5f7d52..748c9d5d6eb 100644
--- a/tao/PortableServer/POA_Policy_Set.cpp
+++ b/tao/PortableServer/POA_Policy_Set.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// $Id$
 
 #include "tao/PortableServer/POA_Policy_Set.h"
 #include "tao/PortableServer/POA_Cached_Policies.h"
diff --git a/tao/PortableServer/PS_Forward.pidl b/tao/PortableServer/PS_Forward.pidl
index eaaf75180e5..8eef49af30f 100644
--- a/tao/PortableServer/PS_Forward.pidl
+++ b/tao/PortableServer/PS_Forward.pidl
@@ -4,21 +4,6 @@
  * $Id$
  *
  * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * This file is used to generate the code in
- * PS_ForwardC.{h,inl,cpp}, using the following command:
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          PS_Forward.pidl
- *
- * Apply patches using the following command:
- *
- *   patch < diffs/PS_Forward.diff
  */
 
 #ifndef _PORTABLESERVER_PS_FORWARD_IDL_
diff --git a/tao/PortableServer/PS_ForwardA.cpp b/tao/PortableServer/PS_ForwardA.cpp
index efaca76332e..51ecf7596c6 100644
--- a/tao/PortableServer/PS_ForwardA.cpp
+++ b/tao/PortableServer/PS_ForwardA.cpp
@@ -45,7 +45,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/PortableServer/ObjectId:2.3",
     "ObjectId",
     &CORBA::_tc_OctetSeq);
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_ObjectId =
diff --git a/tao/PortableServer/PS_ForwardA.h b/tao/PortableServer/PS_ForwardA.h
index 047e66c649b..686a57ce704 100644
--- a/tao/PortableServer/PS_ForwardA.h
+++ b/tao/PortableServer/PS_ForwardA.h
@@ -45,10 +45,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableServer
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ObjectId;
 
 // TAO_IDL - Generated from
diff --git a/tao/PortableServer/PolicyS.cpp b/tao/PortableServer/PolicyS.cpp
index 1161d814c19..29c81c7860d 100644
--- a/tao/PortableServer/PolicyS.cpp
+++ b/tao/PortableServer/PolicyS.cpp
@@ -109,7 +109,7 @@ namespace TAO
             CORBA::Policy_var,
             CORBA::Policy_out,
             TAO::Objref_Traits<CORBA::Policy>,
-            TAO::Any_Insert_Policy_Stream 
+            TAO::Any_Insert_Policy_Stream
           >
   {
   };
diff --git a/tao/PortableServer/PolicyS_T.cpp b/tao/PortableServer/PolicyS_T.cpp
index dfe7cbabbdd..312a1e2f507 100644
--- a/tao/PortableServer/PolicyS_T.cpp
+++ b/tao/PortableServer/PolicyS_T.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:677
 
 #ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_
diff --git a/tao/PortableServer/PortableServer.mpc b/tao/PortableServer/PortableServer.mpc
new file mode 100644
index 00000000000..bfdcd5b0bd7
--- /dev/null
+++ b/tao/PortableServer/PortableServer.mpc
@@ -0,0 +1,178 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install, pidl_install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -Gp -Gd -Sci -SS -Sorb -GA \
+                -Wb,export_macro=TAO_PortableServer_Export \
+                -Wb,export_include=tao/PortableServer/portableserver_export.h \
+                -iC tao/PortableServer
+    idlflags -= -Sa -St
+    ForwardRequest.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Gp -Gd -Sci -SS -Sorb -GA -Sal \
+                -Wb,export_macro=TAO_PortableServer_Export \
+                -Wb,export_include=tao/PortableServer/portableserver_export.h \
+                -iC tao/PortableServer
+    idlflags -= -Sa -St
+    AdapterActivator.pidl
+    IdAssignmentPolicy.pidl
+    IdUniquenessPolicy.pidl
+    ImplicitActivationPolicy.pidl
+    LifespanPolicy.pidl
+    RequestProcessingPolicy.pidl
+    ServantActivator.pidl
+    ServantLocator.pidl
+    ServantManager.pidl
+    ServantRetentionPolicy.pidl
+    ThreadPolicy.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Gp -Gd -Sci -SS -Sorb \
+                -Wb,export_macro=TAO_PortableServer_Export \
+                -Wb,export_include=tao/PortableServer/portableserver_export.h \
+                -iC tao/PortableServer
+    idlflags -= -Sa -St
+    POAManager.pidl
+    POAManagerFactory.pidl
+    POA.pidl
+    PS_Current.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Sci -SS -Sorb -Sa -GX \
+                -Wb,export_macro=TAO_PortableServer_Export \
+                -Wb,export_include=tao/PortableServer/portableserver_export.h \
+                -Wb,unique_include=tao/PortableServer/PortableServer.h \
+                -iC tao/PortableServer
+    PortableServer_include.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Sci -SS -Sorb -Sa -GX \
+                -Wb,export_macro=TAO_PortableServer_Export \
+                -Wb,export_include=tao/PortableServer/portableserver_export.h \
+                -Wb,include_guard=TAO_PORTABLESERVER_SAFE_INCLUDE \
+                -Wb,safe_include=tao/PortableServer/PortableServer.h \
+                -iC tao/PortableServer
+    PortableServer.pidl
+  }
+
+  PidlInstallWithoutBuilding_Files {
+    PS_Forward.pidl
+  }
+
+  specific {
+    install_dir = tao/PortableServer
+  }
+}
+
+project(PortableServer) : taolib, tao_output, install, anytypecode, taoidldefaults, valuetype_out_indirection {
+  after       += *idl
+  sharedname   = TAO_PortableServer
+  dynamicflags += TAO_PORTABLESERVER_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    ForwardRequestC.cpp
+    AdapterActivatorC.cpp
+    IdAssignmentPolicyC.cpp
+    IdUniquenessPolicyC.cpp
+    ImplicitActivationPolicyC.cpp
+    LifespanPolicyC.cpp
+    RequestProcessingPolicyC.cpp
+    ServantActivatorC.cpp
+    ServantLocatorC.cpp
+    ServantManagerC.cpp
+    ServantRetentionPolicyC.cpp
+    ThreadPolicyC.cpp
+    POAManagerC.cpp
+    POAManagerFactoryC.cpp
+    POAC.cpp
+    PS_CurrentC.cpp
+    PortableServer_includeC.cpp
+    PortableServerC.cpp
+    AdapterActivatorA.cpp
+    ForwardRequestA.cpp
+    IdAssignmentPolicyA.cpp
+    IdUniquenessPolicyA.cpp
+    ImplicitActivationPolicyA.cpp
+    LifespanPolicyA.cpp
+    PS_ForwardA.cpp
+    Regular_POA.cpp
+    RequestProcessingPolicyA.cpp
+    Root_POA.cpp
+    ServantActivatorA.cpp
+    ServantLocatorA.cpp
+    ServantManagerA.cpp
+    ServantRetentionPolicyA.cpp
+    ThreadPolicyA.cpp
+  }
+
+  Header_Files {
+    *.h
+    AdapterActivatorC.h
+    ForwardRequestC.h
+    IdAssignmentPolicyC.h
+    IdUniquenessPolicyC.h
+    ImplicitActivationPolicyC.h
+    LifespanPolicyC.h
+    POAC.h
+    POAManagerC.h
+    POAManagerFactoryC.h
+    PortableServerC.h
+    PortableServer_includeC.h
+    PS_CurrentC.h
+    PS_ForwardC.h
+    RequestProcessingPolicyC.h
+    ServantActivatorC.h
+    ServantLocatorC.h
+    ServantManagerC.h
+    ServantRetentionPolicyC.h
+    ThreadPolicyC.h
+    AdapterActivatorA.h
+    ForwardRequestA.h
+    IdAssignmentPolicyA.h
+    IdUniquenessPolicyA.h
+    ImplicitActivationPolicyA.h
+    LifespanPolicyA.h
+    PortableServerA.h
+    PortableServer_includeA.h
+    Regular_POA.h
+    RequestProcessingPolicyA.h
+    ServantActivatorA.h
+    ServantLocatorA.h
+    ServantManagerA.h
+    ServantRetentionPolicyA.h
+    ThreadPolicyA.h
+    ForwardRequestS.h
+    AdapterActivatorS.h
+    IdAssignmentPolicyS.h
+    IdUniquenessPolicyS.h
+    ImplicitActivationPolicyS.h
+    LifespanPolicyS.h
+    RequestProcessingPolicyS.h
+    ServantActivatorS.h
+    ServantLocatorS.h
+    ServantManagerS.h
+    ServantRetentionPolicyS.h
+    ThreadPolicyS.h
+    POAManagerS.h
+    POAManagerFactoryS.h
+    POAS.h
+    PS_CurrentS.h
+    PortableServer_includeS.h
+    PortableServerS.h
+  }
+
+  Template_Files {
+    Servant_var.cpp
+    *_T.cpp
+  }
+
+  specific {
+    install_dir = tao/PortableServer
+  }
+}
diff --git a/tao/PortableServer/PortableServer.pidl b/tao/PortableServer/PortableServer.pidl
index ccdc8cb587d..0eae14cda58 100644
--- a/tao/PortableServer/PortableServer.pidl
+++ b/tao/PortableServer/PortableServer.pidl
@@ -4,41 +4,6 @@
  * $Id$
  *
  * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * This file is used to generate the code in
- * PortableServerC.{h,inl,cpp}, using the following command:
- *
- * tao_idl.exe \
- *     -o orig -Sci -Gp -Gd -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          PortableServer.pidl
- *
- * After the file is generated a patch from the diffs directory must
- * be applied.  The patch:
- *
- *   - Disables parts of the code under certain configurations.
- *
- *   - Eliminates cycles in the include dependencies.
- *
- *   - Adds non-idl components of PortableServer to the namespace.
- *     This includes (a) Servant (b) ServantBase (c) RefCountServantBase
- *     (d) Cookie (e) ObjectId_to_string (f) string_to_ObjectId (g)
- *     ObjectId_to_wstring (h) wstring_to_ObjectId (i) ServantBase_var
- *     (j) DynamicImplementation (k) LocalServantBase
- *
- * Apply patches using the following command:
- *
- *   patch < diffs/PortableServer.diff
- *
- * Note: The diffs were generated using:
- *
- *   rm diffs/PortableServer.diff
- *   for i in PortableServerC.{h,i,cpp}; do
- *     diff -wub orig/$i $i >> diffs/PortableServer.diff
- *   done
  */
 
 #ifndef _PORTABLE_SERVER_IDL_
diff --git a/tao/PortableServer/PortableServer_Functions.cpp b/tao/PortableServer/PortableServer_Functions.cpp
index 6a54b693016..2b7bbf2f1ad 100644
--- a/tao/PortableServer/PortableServer_Functions.cpp
+++ b/tao/PortableServer/PortableServer_Functions.cpp
@@ -1,5 +1,7 @@
-#include "tao/PortableServer/PortableServer_Functions.h"
+// -*- C++ -*-
+// $Id$
 
+#include "tao/PortableServer/PortableServer_Functions.h"
 #include "ace/OS_NS_string.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/PortableServer/PortableServer_WFunctions.cpp b/tao/PortableServer/PortableServer_WFunctions.cpp
index 600a2493399..1c9a23091a2 100644
--- a/tao/PortableServer/PortableServer_WFunctions.cpp
+++ b/tao/PortableServer/PortableServer_WFunctions.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PortableServer/PortableServer_WFunctions.h"
 
 #include "ace/OS_NS_string.h"
diff --git a/tao/PortableServer/Regular_POA.cpp b/tao/PortableServer/Regular_POA.cpp
index fad1bcc1272..b9dc40d458a 100644
--- a/tao/PortableServer/Regular_POA.cpp
+++ b/tao/PortableServer/Regular_POA.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/PortableServer/Regular_POA.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/tao/PortableServer/Regular_POA.h b/tao/PortableServer/Regular_POA.h
index 7218e6d581a..d8fe570f27d 100644
--- a/tao/PortableServer/Regular_POA.h
+++ b/tao/PortableServer/Regular_POA.h
@@ -47,8 +47,7 @@ public:
                    ACE_Lock &lock,
                    TAO_SYNCH_MUTEX &thread_lock,
                    TAO_ORB_Core &orb_core,
-                   TAO_Object_Adapter *object_adapter
-                  );
+                   TAO_Object_Adapter *object_adapter);
 
   virtual ~TAO_Regular_POA (void);
 
diff --git a/tao/PortableServer/RequestProcessingPolicy.cpp b/tao/PortableServer/RequestProcessingPolicy.cpp
index f557e735e72..033ac4356c2 100644
--- a/tao/PortableServer/RequestProcessingPolicy.cpp
+++ b/tao/PortableServer/RequestProcessingPolicy.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/orbconf.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
index 4c428062cbb..41fed708de9 100644
--- a/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+++ b/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/ORB_Constants.h"
 #include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
@@ -104,7 +105,14 @@ namespace TAO
           Non_Servant_Upcall non_servant_upcall (*this->poa_);
           ACE_UNUSED_ARG (non_servant_upcall);
 
-          servant->_remove_ref ();
+          try
+            {
+              servant->_remove_ref ();
+            }
+          catch (...)
+            {
+              // Ignore exceptions from servant cleanup.
+            }
         }
 
       // This operation causes the association of the Object Id specified
diff --git a/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
index 90228a4eb56..75be8246496 100644
--- a/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
+++ b/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h"
diff --git a/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index eafb5f7c779..67e515f2342 100644
--- a/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/orbconf.h"
 
@@ -184,7 +185,14 @@ namespace TAO
           Non_Servant_Upcall non_servant_upcall (*this->poa_);
           ACE_UNUSED_ARG (non_servant_upcall);
 
-          servant->_remove_ref ();
+          try
+            {
+              servant->_remove_ref ();
+            }
+          catch (...)
+            {
+              // Ignore exceptions from servant cleanup.
+            }
         }
 
       // This operation causes the association of the Object Id specified
diff --git a/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
index a9ba9d5033b..3e3b01db9fa 100644
--- a/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+++ b/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
@@ -88,8 +88,7 @@ namespace TAO
       const PortableServer::ObjectId &system_id,
       TAO::Portable_Server::Servant_Upcall &servant_upcall,
       TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-      bool &wait_occurred_restart_call
-      )
+      bool &wait_occurred_restart_call)
     {
       PortableServer::Servant servant = 0;
 
@@ -187,10 +186,9 @@ namespace TAO
     RequestProcessingStrategyServantActivator::etherealize_servant (
       const PortableServer::ObjectId& object_id,
       PortableServer::Servant servant,
-      CORBA::Boolean cleanup_in_progress
-      )
+      CORBA::Boolean cleanup_in_progress)
     {
-      CORBA::Boolean remaining_activations =
+      CORBA::Boolean const remaining_activations =
         this->poa_->servant_has_remaining_activations (servant);
 
       // ATTENTION: Trick locking here, see class header for details
@@ -279,7 +277,14 @@ namespace TAO
               Non_Servant_Upcall non_servant_upcall (*this->poa_);
               ACE_UNUSED_ARG (non_servant_upcall);
 
-              servant->_remove_ref ();
+              try
+                {
+                  servant->_remove_ref ();
+                }
+              catch (...)
+                {
+                  // Ignore exceptions from servant cleanup.
+                }
             }
         }
 
diff --git a/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
index c8bc26f2890..e1beec91ede 100644
--- a/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+++ b/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/orbconf.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
@@ -170,7 +172,14 @@ namespace TAO
           Non_Servant_Upcall non_servant_upcall (*this->poa_);
           ACE_UNUSED_ARG (non_servant_upcall);
 
-          servant->_remove_ref ();
+          try
+            {
+              servant->_remove_ref ();
+            }
+          catch (...)
+            {
+              // Ignore exceptions from servant cleanup.
+            }
         }
 
       // This operation causes the association of the Object Id specified
diff --git a/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
index bcb5b81ae27..f2b2c9bc23d 100644
--- a/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
+++ b/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/orbconf.h"
diff --git a/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
index e81651cc5eb..d0c7cdc4737 100644
--- a/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
+++ b/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/orbconf.h"
 
diff --git a/tao/PortableServer/Root_POA.cpp b/tao/PortableServer/Root_POA.cpp
index 1ad1cf676e5..aaaf0f772ea 100644
--- a/tao/PortableServer/Root_POA.cpp
+++ b/tao/PortableServer/Root_POA.cpp
@@ -1203,13 +1203,12 @@ TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
 void
 TAO_Root_POA::wait_for_completions (CORBA::Boolean wait_for_completion)
 {
-  while (this->object_adapter ().enable_locking_ &&
-         wait_for_completion &&
+  while (wait_for_completion &&
          this->outstanding_requests_ > 0)
     {
-      this->wait_for_completion_pending_ = 1;
+      this->wait_for_completion_pending_ = true;
 
-      int result = this->outstanding_requests_condition_.wait ();
+      int const result = this->outstanding_requests_condition_.wait ();
       if (result == -1)
         {
           throw ::CORBA::OBJ_ADAPTER ();
@@ -2103,6 +2102,9 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
 
       obj = this->orb_core_.orb ()->string_to_object (ior.c_str ());
 
+      // type_id info is not in the corbaloc, so set it here
+      obj->_stubobj()->type_id = type_id;
+
       return obj;
     }
 
diff --git a/tao/PortableServer/Root_POA.h b/tao/PortableServer/Root_POA.h
index ba78c82f4b5..e2f6f677885 100644
--- a/tao/PortableServer/Root_POA.h
+++ b/tao/PortableServer/Root_POA.h
@@ -670,8 +670,6 @@ protected:
 
   static CORBA::ULong root_key_type_length (void);
 
-  void outstanding_requests (CORBA::ULong new_outstanding_requests);
-
   CORBA::ULong increment_outstanding_requests (void);
 
   CORBA::ULong decrement_outstanding_requests (void);
diff --git a/tao/PortableServer/Root_POA.inl b/tao/PortableServer/Root_POA.inl
index 3425c04e5f3..253d23a2d72 100644
--- a/tao/PortableServer/Root_POA.inl
+++ b/tao/PortableServer/Root_POA.inl
@@ -185,12 +185,6 @@ TAO_Root_POA::outstanding_requests (void) const
   return this->outstanding_requests_;
 }
 
-ACE_INLINE void
-TAO_Root_POA::outstanding_requests (CORBA::ULong new_outstanding_requests)
-{
-  this->outstanding_requests_ = new_outstanding_requests;
-}
-
 ACE_INLINE CORBA::ULong
 TAO_Root_POA::increment_outstanding_requests (void)
 {
diff --git a/tao/PortableServer/ServantActivator.pidl b/tao/PortableServer/ServantActivator.pidl
index 6874b5694cd..ac70f847748 100644
--- a/tao/PortableServer/ServantActivator.pidl
+++ b/tao/PortableServer/ServantActivator.pidl
@@ -4,17 +4,6 @@
  * $Id$
  *
  * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * This file is used to generate the code in
- * ServantActivatorC.{h,inl,cpp}, using the following command:
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          ServantActivator.pidl
  */
 
 #ifndef _PORTABLESERVER_SERVANT_ACTIVATOR_IDL_
diff --git a/tao/PortableServer/ServantLocator.pidl b/tao/PortableServer/ServantLocator.pidl
index 676fa68feff..7680288a8f7 100644
--- a/tao/PortableServer/ServantLocator.pidl
+++ b/tao/PortableServer/ServantLocator.pidl
@@ -4,21 +4,6 @@
  * $Id$
  *
  * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * This file is used to generate the code in
- * ServantLocatorC.{h,inl,cpp}, using the following command:
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          ServantLocator.pidl
- *
- * Apply patches using the following command:
- *
- *   patch < diffs/PS_Forward.diff
  */
 
 #ifndef _PORTABLESERVER_SERVANTLOCATOR_IDL_
diff --git a/tao/PortableServer/ServantManager.pidl b/tao/PortableServer/ServantManager.pidl
index 6eace36b098..435a33fd56a 100644
--- a/tao/PortableServer/ServantManager.pidl
+++ b/tao/PortableServer/ServantManager.pidl
@@ -4,17 +4,6 @@
  * $Id$
  *
  * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * This file is used to generate the code in
- * ServantManagerC.{h,inl,cpp}, using the following command:
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          ServantManager.pidl
  */
 
 #ifndef _PORTABLESERVER_SERVANT_MANAGER_IDL_
diff --git a/tao/PortableServer/ServantRetentionPolicy.cpp b/tao/PortableServer/ServantRetentionPolicy.cpp
index a2a1d35cf0f..fcf4cd21f7e 100644
--- a/tao/PortableServer/ServantRetentionPolicy.cpp
+++ b/tao/PortableServer/ServantRetentionPolicy.cpp
@@ -1,3 +1,4 @@
+// $Id$
 
 #include "tao/orbconf.h"
 
diff --git a/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
index 2d12888f667..e203b22a0fa 100644
--- a/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
+++ b/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/ServantRetentionStrategyFactoryImpl.h"
diff --git a/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index 0286633d60f..c3daf6a7692 100644
--- a/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -375,8 +375,7 @@ namespace TAO
 
               ++this->waiting_servant_deactivation_;
 
-              if (this->poa_->object_adapter ().enable_locking ())
-                this->poa_->servant_deactivation_condition ().wait ();
+              this->poa_->servant_deactivation_condition ().wait ();
 
               --this->waiting_servant_deactivation_;
 
@@ -423,8 +422,7 @@ namespace TAO
 
               ++this->waiting_servant_deactivation_;
 
-              if (this->poa_->object_adapter ().enable_locking ())
-                this->poa_->servant_deactivation_condition ().wait ();
+              this->poa_->servant_deactivation_condition ().wait ();
 
               --this->waiting_servant_deactivation_;
 
diff --git a/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
index 799638826bc..a453de132ef 100644
--- a/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
+++ b/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h"
diff --git a/tao/PortableServer/Servant_Base.cpp b/tao/PortableServer/Servant_Base.cpp
index 467a278347d..96e284963ef 100644
--- a/tao/PortableServer/Servant_Base.cpp
+++ b/tao/PortableServer/Servant_Base.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Servant_Base.h"
diff --git a/tao/PortableServer/Servant_Dispatcher.cpp b/tao/PortableServer/Servant_Dispatcher.cpp
index 2ef0aec3052..d61fb7e36a7 100644
--- a/tao/PortableServer/Servant_Dispatcher.cpp
+++ b/tao/PortableServer/Servant_Dispatcher.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/Servant_Dispatcher.h"
diff --git a/tao/PortableServer/Servant_Dispatcher.h b/tao/PortableServer/Servant_Dispatcher.h
index 4f10b36d2f6..11b61a5e463 100644
--- a/tao/PortableServer/Servant_Dispatcher.h
+++ b/tao/PortableServer/Servant_Dispatcher.h
@@ -57,15 +57,13 @@ public:
       TAO_Root_POA &poa,
       CORBA::Short servant_priority,
       TAO_ServerRequest &req,
-      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-    ) = 0;
+      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state) = 0;
 
   /// Pre_invoke collocated request.
   virtual void pre_invoke_collocated_request (
       TAO_Root_POA &poa,
       CORBA::Short servant_priority,
-      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-      ) = 0;
+      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state) = 0;
 
   /// Post_invoke request.
   virtual void post_invoke (
diff --git a/tao/PortableServer/Servant_Upcall.cpp b/tao/PortableServer/Servant_Upcall.cpp
index c48fbe8f687..f2b3c33b957 100644
--- a/tao/PortableServer/Servant_Upcall.cpp
+++ b/tao/PortableServer/Servant_Upcall.cpp
@@ -361,8 +361,7 @@ namespace TAO
                   // Ignore errors from servant cleanup ....
                 }
 
-              if (this->poa_->waiting_servant_deactivation() > 0 &&
-                  this->object_adapter_->enable_locking_)
+              if (this->poa_->waiting_servant_deactivation() > 0)
                 {
                   // Wakeup all waiting threads.
                   this->poa_->servant_deactivation_condition_.broadcast ();
@@ -386,8 +385,7 @@ namespace TAO
       if (outstanding_requests == 0)
         {
           // If locking is enabled and some thread is waiting in POA::destroy.
-          if (this->object_adapter_->enable_locking_ &&
-              this->poa_->wait_for_completion_pending_)
+          if (this->poa_->wait_for_completion_pending_)
             {
               // Wakeup all waiting threads.
               this->poa_->outstanding_requests_condition_.broadcast ();
diff --git a/tao/PortableServer/Servant_var.h b/tao/PortableServer/Servant_var.h
index 2750adde4a6..75bd5a97fc6 100644
--- a/tao/PortableServer/Servant_var.h
+++ b/tao/PortableServer/Servant_var.h
@@ -62,43 +62,6 @@ namespace PortableServer
     /// Assignment operator.  Assumes ownership of @c p.
     Servant_var<T> & operator= (T * p);
 
-    /**
-       @@ Ciju:
-       The below member templates was commented out because:
-       1. gcc 2.95 doesn't support them.
-       2. Sun cc 5.8 member templates support is buggy (Bug Id: 6463114).
-
-       Once these have been fixed a decision can be made regards
-       uncommenting them. My own openion is that they shouldn't be used
-       since making implicit constructors, member templates, you could
-       potentially get an unwanted conversion where one was unwarranted.
-     */
-    /*
-      # if !defined(ACE_LACKS_MEMBER_TEMPLATES)
-      /// Template member constructor from a pointer that will implicitly
-      /// cast to type T.  Assumes ownership of @c p.
-      /// This constructor allows constructs such as:
-      /// Servant_Base<Base> p(new Derived);
-      template <class Y>
-      Servant_var (Y * p);
-
-      /// Template member copy constructor from a Servant_var<Y>, where
-      /// Y can be implicitly cast to type T.
-      template <class Y>
-      Servant_var (Servant_var<Y> const & rhs);
-
-      /// Template member assignment operator from a Servant_var<Y>, where
-      /// Y can be implicitly cast to type T.
-      template <class Y>
-      Servant_var<T> & operator= (Servant_var<Y> const & rhs);
-
-      /// Template member assignment operator from a pointer to Y, where Y
-      /// can be implicitly cast to type T.
-      template <class Y>
-      Servant_var<T> & operator= (Y * p);
-      # endif / * ACE_LACKS_MEMBER_TEMPLATES * /
-    */
-
     /// Smart pointer operator-> provides access to the underlying object.
     T * operator->() const;
 
@@ -152,13 +115,11 @@ namespace PortableServer
 
   /// Compare two Servant_vars for equivalence.
   template <class X, class Y>
-  bool operator==(Servant_var<X> const & x,
-                  Servant_var<Y> const & y);
+  bool operator==(Servant_var<X> const & x, Servant_var<Y> const & y);
 
   /// Compare two Servant_vars for non-equivalence.
   template <class X, class Y>
-  bool operator!=(Servant_var<X> const & x,
-                  Servant_var<Y> const & y);
+  bool operator!=(Servant_var<X> const & x, Servant_var<Y> const & y);
 
 } // namespace PortableServer
 
diff --git a/tao/PortableServer/Servant_var.inl b/tao/PortableServer/Servant_var.inl
index e1fd8abe2cc..397c35c8f8b 100644
--- a/tao/PortableServer/Servant_var.inl
+++ b/tao/PortableServer/Servant_var.inl
@@ -55,50 +55,6 @@ PortableServer::Servant_var<T>::operator= (T * p)
   return *this;
 }
 
-/*
-  #if !defined(ACE_LACKS_MEMBER_TEMPLATES)
-  template <class T> template <class Y>
-  ACE_INLINE
-  PortableServer::Servant_var<T>::Servant_var (Y * p)
-  : ptr_ (p)
-  {
-  }
-
-  template <class T> template <class Y>
-  ACE_INLINE
-  PortableServer::Servant_var<T>::Servant_var (Servant_var<Y> const & rhs)
-  : ptr_ (Servant_var<T>::_duplicate (rhs.in ()))
-  {
-  }
-
-  template <class T> template <class Y>
-  ACE_INLINE typename PortableServer::Servant_var<T> &
-  PortableServer::Servant_var<T>::operator=(Servant_var<Y> const & rhs)
-  {
-  PortableServer::Servant_var<T> tmp (rhs);
-  this->swap (tmp);
-  return *this;
-  }
-
-  template <class T> template <class Y>
-  ACE_INLINE typename PortableServer::Servant_var<T> &
-  PortableServer::Servant_var<T>::operator= (Y * p)
-  {
-  if (this->ptr_ != p)
-  {
-  // This constructor doesn't increase the reference count, nor is
-  // it a copy constructor, so we must check for self-assignment.
-  // Otherwise the reference count would be prematurely
-  // decremented upon exiting this scope.
-  PortableServer::Servant_var<T> tmp (p);
-  this->swap (tmp);
-  }
-
-  return *this;
-  }
-  #endif / * ACE_LACKS_MEMBER_TEMPLATES * /
-*/
-
 template <class T>
 ACE_INLINE T *
 PortableServer::Servant_var<T>::operator->() const
diff --git a/tao/PortableServer/StrategyFactory.cpp b/tao/PortableServer/StrategyFactory.cpp
index 31b2c286ae9..e6277bf7292 100644
--- a/tao/PortableServer/StrategyFactory.cpp
+++ b/tao/PortableServer/StrategyFactory.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/StrategyFactory.h"
diff --git a/tao/PortableServer/ThreadPolicy.cpp b/tao/PortableServer/ThreadPolicy.cpp
index 254e4b89ca5..a2174748b65 100644
--- a/tao/PortableServer/ThreadPolicy.cpp
+++ b/tao/PortableServer/ThreadPolicy.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/orbconf.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/tao/PortableServer/ThreadStrategyORBControl.cpp b/tao/PortableServer/ThreadStrategyORBControl.cpp
index d64e82f35dd..4b638689160 100644
--- a/tao/PortableServer/ThreadStrategyORBControl.cpp
+++ b/tao/PortableServer/ThreadStrategyORBControl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/PortableServer/ThreadStrategyORBControl.h"
diff --git a/tao/Profile.cpp b/tao/Profile.cpp
index a61391d569e..b79e3265c95 100644
--- a/tao/Profile.cpp
+++ b/tao/Profile.cpp
@@ -21,8 +21,6 @@
 #include "tao/Profile.inl"
 #endif /* __ACE_INLINE__ */
 
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Profile::TAO_Profile (CORBA::ULong tag,
@@ -37,8 +35,7 @@ TAO_Profile::TAO_Profile (CORBA::ULong tag,
     , tag_ (tag)
     , orb_core_ (orb_core)
     , forward_to_ (0)
-    , refcount_ (this->orb_core_->
-                   client_factory ()->create_profile_refcount ())
+    , refcount_ (1)
     , tagged_profile_lock_ ()
     , tagged_profile_created_ (false)
 {
@@ -57,8 +54,7 @@ TAO_Profile::TAO_Profile (CORBA::ULong tag,
     , tag_ (tag)
     , orb_core_ (orb_core)
     , forward_to_ (0)
-    , refcount_ (this->orb_core_->
-                   client_factory ()->create_profile_refcount ())
+    , refcount_ (1)
     , tagged_profile_lock_ ()
     , tagged_profile_created_ (false)
 {
diff --git a/tao/Profile.h b/tao/Profile.h
index e8f101fb636..a9d9770a711 100644
--- a/tao/Profile.h
+++ b/tao/Profile.h
@@ -24,7 +24,7 @@
 #include "tao/GIOP_Message_Version.h"
 #include "tao/Refcounted_ObjectKey.h"
 #include "tao/Service_Callbacks.h"
-#include "tao/Configurable_Refcount.h"
+#include "ace/Atomic_Op.h"
 #include "tao/Object_KeyC.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -56,7 +56,6 @@ namespace CORBA
 class TAO_Export TAO_Profile
 {
 public:
-
   /// Constructor
   TAO_Profile (CORBA::ULong tag,
                TAO_ORB_Core *orb_core,
@@ -402,7 +401,7 @@ private:
   TAO_MProfile* forward_to_;
 
   /// Number of outstanding references to this object.
-  TAO_Configurable_Refcount refcount_;
+  ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
 
   /// A lock that protects creation of the tagged profile
   TAO_SYNCH_MUTEX tagged_profile_lock_;
diff --git a/tao/Profile.inl b/tao/Profile.inl
index 676b90e438b..00f4089d984 100644
--- a/tao/Profile.inl
+++ b/tao/Profile.inl
@@ -67,20 +67,20 @@ TAO_Profile::object_key (void) const
 ACE_INLINE unsigned long
 TAO_Profile::_incr_refcnt (void)
 {
-  return this->refcount_.increment ();
+  return ++this->refcount_;
 }
 
 ACE_INLINE unsigned long
 TAO_Profile::_decr_refcnt (void)
 {
-  unsigned long count = this->refcount_.decrement ();
-  if (count != 0)
-    return count;
-
-  // refcount is 0, so delete us!
-  // delete will call our ~ destructor which in turn deletes stuff.
-  delete this;
-  return 0;
+  unsigned long count = --this->refcount_;
+  if (count == 0)
+    {
+      // refcount is 0, so delete us!
+      // delete will call our ~ destructor which in turn deletes stuff.
+      delete this;
+    }
+  return count;
 }
 
 
diff --git a/tao/Profile_Transport_Resolver.cpp b/tao/Profile_Transport_Resolver.cpp
index 15ce4ccd8d8..df7097a323f 100644
--- a/tao/Profile_Transport_Resolver.cpp
+++ b/tao/Profile_Transport_Resolver.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Profile_Transport_Resolver.h"
diff --git a/tao/Protocol_Factory.h b/tao/Protocol_Factory.h
index 0bb0f258dc5..d282c286cb9 100644
--- a/tao/Protocol_Factory.h
+++ b/tao/Protocol_Factory.h
@@ -64,7 +64,7 @@ public:
   /**
    * Some protocols should not create a default endpoint unless the
    * user specifies a -ORBEndpoint option. For example, local IPC
-   * (aka UNIX domain sockets) is unable to remove the rendesvouz
+   * (aka UNIX domain sockets) is unable to remove the rendezvous
    * point if the server crashes.  For those protocols it is better to
    * create the endpoint only if the user requests one.
    */
diff --git a/tao/Protocols_Hooks.h b/tao/Protocols_Hooks.h
index 0dd3aca17f7..a69dc713be6 100644
--- a/tao/Protocols_Hooks.h
+++ b/tao/Protocols_Hooks.h
@@ -110,7 +110,7 @@ public:
 class TAO_Export TAO_Protocols_Hooks : public ACE_Service_Object
 {
 public:
-  /// destructor
+  /// Destructor
   virtual ~TAO_Protocols_Hooks (void);
 
   /// Initialize the protocols hooks instance.
diff --git a/tao/QtResource.mpc b/tao/QtResource.mpc
deleted file mode 100644
index 230d7263787..00000000000
--- a/tao/QtResource.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-//  -*- MPC -*- now wouldn't this be cool...
-// $Id$
-
-project(TAO_QtResource) : acelib, taolib, install, tao_output, taodefaults, ace_qt4reactor, taoidldefaults {
-
-  sharedname   = TAO_QtResource
-  dynamicflags += TAO_QTRESOURCE_BUILD_DLL
-
-  Source_Files {
-    QtResource
-  }
-
-  Header_Files {
-    QtResource
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-
-  IDL_Files {
-  }
-}
diff --git a/tao/QtResource/QtResource.mpc b/tao/QtResource/QtResource.mpc
new file mode 100644
index 00000000000..1055dbe4f22
--- /dev/null
+++ b/tao/QtResource/QtResource.mpc
@@ -0,0 +1,11 @@
+//  -*- MPC -*- now wouldn't this be cool...
+// $Id$
+
+project(TAO_QtResource) : acelib, taolib, install, tao_output, taodefaults, ace_qt4reactor, taoidldefaults {
+  sharedname   = TAO_QtResource
+  dynamicflags += TAO_QTRESOURCE_BUILD_DLL
+
+  specific {
+    install_dir = tao/QtResource
+  }
+}
diff --git a/tao/QtResource/QtResource_Factory.cpp b/tao/QtResource/QtResource_Factory.cpp
index a6c50dcc910..8d84d34d8f1 100644
--- a/tao/QtResource/QtResource_Factory.cpp
+++ b/tao/QtResource/QtResource_Factory.cpp
@@ -4,10 +4,6 @@
 #include "tao/debug.h"
 #include "ace/QtReactor/QtReactor.h"
 
-ACE_RCSID (TAO_QtResource,
-           QtResource_Factory,
-           "$Id$");
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/QtResource/QtResource_Loader.cpp b/tao/QtResource/QtResource_Loader.cpp
index c63dd54e4dc..a42e670a821 100644
--- a/tao/QtResource/QtResource_Loader.cpp
+++ b/tao/QtResource/QtResource_Loader.cpp
@@ -1,12 +1,9 @@
 //$Id$
+
 #include "tao/QtResource/QtResource_Loader.h"
 #include "tao/ORB_Core.h"
 #include "tao/QtResource/QtResource_Factory.h"
 
-ACE_RCSID( TAO_QtResource,
-           QtResource_Loader,
-           "$Id$");
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/QtResource/QtResource_Loader.h b/tao/QtResource/QtResource_Loader.h
index 1ae1191f104..9f830e440db 100644
--- a/tao/QtResource/QtResource_Loader.h
+++ b/tao/QtResource/QtResource_Loader.h
@@ -24,7 +24,7 @@
 #include "tao/Versioned_Namespace.h"
 
 #if defined (ACE_HAS_QT4)
-#include <Qt/qapplication.h>
+#include <QtGui/qapplication.h>
 #else
 #include <qapplication.h>
 #endif
diff --git a/tao/Queued_Data.cpp b/tao/Queued_Data.cpp
index e4a827a6305..32b929cdb8f 100644
--- a/tao/Queued_Data.cpp
+++ b/tao/Queued_Data.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Queued_Data.h"
 #include "tao/debug.h"
 
diff --git a/tao/Queued_Message.h b/tao/Queued_Message.h
index 02924c5687f..51a73ab67e0 100644
--- a/tao/Queued_Message.h
+++ b/tao/Queued_Message.h
@@ -167,7 +167,7 @@ public:
    * message to update its state and determine if all the data has
    * been sent already.
    *
-   * @param byte_count The number of bytes succesfully sent.  The
+   * @param byte_count The number of bytes successfully sent.  The
    *                   TAO_Queued_Message should decrement this value
    *                   by the number of bytes that must still be sent.
    * @return Returns 1 if the TAO_Queued_Message has any more data to
diff --git a/tao/RTCORBA.mpc b/tao/RTCORBA.mpc
deleted file mode 100644
index 1a341c92bc8..00000000000
--- a/tao/RTCORBA.mpc
+++ /dev/null
@@ -1,74 +0,0 @@
-//$Id$
-project(*core_idl) : tao_versioning_idl_defaults, install, pidl_install {
-  custom_only = 1
-  idlflags    += -Sci -SS -Sorb -GX \
-                 -Wb,export_macro=TAO_RTCORBA_Export \
-                 -Wb,export_include=tao/RTCORBA/rtcorba_export.h \
-                 -o RTCORBA
-  IDL_Files {
-    idlflags += -Sa \
-                -Wb,unique_include=tao/RTCORBA/RTCORBA.h
-    RTCORBA/RTCORBA_include.pidl
-  }
-
-  IDL_Files {
-    idlflags -= -Sa -St
-    idlflags += -Gp -Gd \
-                -Wb,include_guard=TAO_RTCORBA_SAFE_INCLUDE \
-                -Wb,safe_include=tao/RTCORBA/RTCORBA.h
-    RTCORBA/RTCORBA.pidl
-  }
-
-  PidlInstallWithoutBuilding_Files {
-    RTCORBA/RT_ProtocolProperties.pidl
-  }
-}
-
-project(RTCORBA) : taolib, tao_output, install, pi, taoidldefaults {
-  after       += *core_idl
-  sharedname   = TAO_RTCORBA
-  dynamicflags += TAO_RTCORBA_BUILD_DLL
-  requires    += rt_corba
-
-  Source_Files {
-    RTCORBA
-  }
-
-  Source_Files {
-    RTCORBA/RTCORBA_includeC.cpp
-    RTCORBA/RTCORBAC.cpp
-  }
-
-  Header_Files {
-    RTCORBA
-    RTCORBA/RTCORBA_includeC.h
-    RTCORBA/RTCORBA_includeS.h
-    RTCORBA/RTCORBA_includeA.h
-    RTCORBA/RTCORBAC.h
-    RTCORBA/RTCORBAS.h
-    RTCORBA/RTCORBAA.h
-  }
-
-  Inline_Files {
-    RTCORBA
-  }
-
-  Template_Files {
-    RTCORBA
-  }
-
-  Resource_Files {
-    RTCORBA
-  }
-
-  PIDL_Files {
-    RTCORBA
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    RTCORBA/TAO_RTCORBA.pc.in
-  }
-}
diff --git a/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/tao/RTCORBA/Continuous_Priority_Mapping.cpp
index 4d9cf34cc84..517747bee39 100644
--- a/tao/RTCORBA/Continuous_Priority_Mapping.cpp
+++ b/tao/RTCORBA/Continuous_Priority_Mapping.cpp
@@ -6,8 +6,6 @@
 
 #include "ace/Sched_Params.h"
 
-ACE_RCSID(RTCORBA, Continuous_Priority_Mapping, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Continuous_Priority_Mapping::TAO_Continuous_Priority_Mapping (int policy)
diff --git a/tao/RTCORBA/Direct_Priority_Mapping.cpp b/tao/RTCORBA/Direct_Priority_Mapping.cpp
index c57b9a85397..7b2b722bcb5 100644
--- a/tao/RTCORBA/Direct_Priority_Mapping.cpp
+++ b/tao/RTCORBA/Direct_Priority_Mapping.cpp
@@ -7,10 +7,6 @@
 #include "tao/RTCORBA/Direct_Priority_Mapping.h"
 #include "ace/Sched_Params.h"
 
-ACE_RCSID(RTCORBA,
-          Direct_Priority_Mapping,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (long)
diff --git a/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp b/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
index 0f56c3838c2..45bacc3d3f2 100644
--- a/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
+++ b/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
@@ -1,4 +1,3 @@
-
 // $Id$
 
 #include "tao/orbconf.h"
@@ -11,10 +10,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (RTCORBA,
-           Linear_Network_Priority_Mapping,
-           "$Id$")
-
 #define IPDSFIELD_DSCP_DEFAULT  0x00
 #define IPDSFIELD_DSCP_CS1      0x08
 #define IPDSFIELD_DSCP_CS2      0x10
diff --git a/tao/RTCORBA/Linear_Priority_Mapping.cpp b/tao/RTCORBA/Linear_Priority_Mapping.cpp
index c400b5677ad..6ddfc80ec2b 100644
--- a/tao/RTCORBA/Linear_Priority_Mapping.cpp
+++ b/tao/RTCORBA/Linear_Priority_Mapping.cpp
@@ -9,11 +9,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (RTCORBA,
-           Linear_Priority_Mapping,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Linear_Priority_Mapping::TAO_Linear_Priority_Mapping (long policy)
diff --git a/tao/RTCORBA/Multi_Priority_Mapping.cpp b/tao/RTCORBA/Multi_Priority_Mapping.cpp
index f2ccd5b42bb..717acb9244a 100644
--- a/tao/RTCORBA/Multi_Priority_Mapping.cpp
+++ b/tao/RTCORBA/Multi_Priority_Mapping.cpp
@@ -9,10 +9,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/Sched_Params.h"
 
-ACE_RCSID (RTCORBA,
-           Multi_Priority_Mapping,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping (
@@ -100,12 +96,12 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
      {
         if ( this->min_ < this->max_ )
         {
-           native_priority = static_cast<RTCORBA::NativePriority> 
+           native_priority = static_cast<RTCORBA::NativePriority>
              (((corba_priority - base_corba_priority_) / priority_spacing_) + base_native_priority_);
         }
         else
         {
-           native_priority = static_cast<RTCORBA::NativePriority> 
+           native_priority = static_cast<RTCORBA::NativePriority>
              (((base_corba_priority_ - corba_priority) / priority_spacing_) + base_native_priority_);
         }
      }
@@ -131,7 +127,7 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
         last_priority = this->base_native_priority_;
         for (int current_ndx = 0; current_ndx < priority_ndx; current_ndx++)
         {
-           native_priority = static_cast<RTCORBA::NativePriority> 
+           native_priority = static_cast<RTCORBA::NativePriority>
              (ACE_Sched_Params::previous_priority (this->policy_,
                                                    last_priority,
                                                    ACE_SCOPE_THREAD));
@@ -171,12 +167,12 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
      {
         if ( this->min_ < this->max_ )
         {
-           corba_priority = static_cast<RTCORBA::Priority> 
+           corba_priority = static_cast<RTCORBA::Priority>
              (((native_priority - base_native_priority_) * priority_spacing_) + base_corba_priority_);
         }
         else
         {
-           corba_priority = static_cast<RTCORBA::Priority> 
+           corba_priority = static_cast<RTCORBA::Priority>
              (((base_native_priority_ - native_priority) * priority_spacing_) + base_corba_priority_);
         }
      }
@@ -230,7 +226,7 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
            priority_ndx++;
         }
 
-        corba_priority = static_cast<RTCORBA::Priority> 
+        corba_priority = static_cast<RTCORBA::Priority>
           (base_corba_priority_ - priority_ndx);
      }
   }
diff --git a/tao/RTCORBA/Network_Priority_Mapping.cpp b/tao/RTCORBA/Network_Priority_Mapping.cpp
index b896b6c61d2..f56d6466603 100644
--- a/tao/RTCORBA/Network_Priority_Mapping.cpp
+++ b/tao/RTCORBA/Network_Priority_Mapping.cpp
@@ -4,10 +4,6 @@
 
 #include "tao/RTCORBA/Network_Priority_Mapping.h"
 
-ACE_RCSID(RTCORBA,
-          Network_Priority_Mapping,
-          "$Id$")
-
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp b/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
index 682f18f3ec9..96bbdfa763a 100644
--- a/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
+++ b/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
@@ -8,10 +8,6 @@
 #include "tao/RTCORBA/Network_Priority_Mapping_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (RTCORBA,
-           Network_Priority_Mapping_Manager,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Network_Priority_Mapping_Manager::~TAO_Network_Priority_Mapping_Manager (
diff --git a/tao/RTCORBA/Priority_Mapping.cpp b/tao/RTCORBA/Priority_Mapping.cpp
index ae4f6ebcf3f..2405f987196 100644
--- a/tao/RTCORBA/Priority_Mapping.cpp
+++ b/tao/RTCORBA/Priority_Mapping.cpp
@@ -6,10 +6,6 @@
 
 #include "tao/RTCORBA/Priority_Mapping.h"
 
-ACE_RCSID(RTCORBA,
-          Priority_Mapping,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Priority_Mapping::~TAO_Priority_Mapping (void)
diff --git a/tao/RTCORBA/Priority_Mapping_Manager.cpp b/tao/RTCORBA/Priority_Mapping_Manager.cpp
index 60c1aab2796..93ad7929f60 100644
--- a/tao/RTCORBA/Priority_Mapping_Manager.cpp
+++ b/tao/RTCORBA/Priority_Mapping_Manager.cpp
@@ -8,10 +8,6 @@
 #include "tao/RTCORBA/Priority_Mapping_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (RTCORBA,
-           Priority_Mapping_Manager,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager (void)
diff --git a/tao/RTCORBA/RTCORBA.cpp b/tao/RTCORBA/RTCORBA.cpp
index 3f29493da22..479959a4c2b 100644
--- a/tao/RTCORBA/RTCORBA.cpp
+++ b/tao/RTCORBA/RTCORBA.cpp
@@ -6,8 +6,6 @@
 
 #include "tao/RTCORBA/RT_ORB_Loader.h"
 
-ACE_RCSID (RTCORBA, RTCORBA, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTCORBA_Initializer::TAO_RTCORBA_Initializer (void)
diff --git a/tao/RTCORBA/RTCORBA.mpc b/tao/RTCORBA/RTCORBA.mpc
new file mode 100644
index 00000000000..b466e85f9c3
--- /dev/null
+++ b/tao/RTCORBA/RTCORBA.mpc
@@ -0,0 +1,56 @@
+//$Id$
+project(*core_idl) : tao_versioning_idl_defaults, install, pidl_install {
+  custom_only = 1
+  idlflags    += -Sci -SS -Sorb -GX \
+                 -Wb,export_macro=TAO_RTCORBA_Export \
+                 -Wb,export_include=tao/RTCORBA/rtcorba_export.h \
+                 -iC tao/RTCORBA
+  IDL_Files {
+    idlflags += -Sa \
+                -Wb,unique_include=tao/RTCORBA/RTCORBA.h
+    RTCORBA_include.pidl
+  }
+
+  IDL_Files {
+    idlflags -= -Sa -St
+    idlflags += -Gp -Gd \
+                -Wb,include_guard=TAO_RTCORBA_SAFE_INCLUDE \
+                -Wb,safe_include=tao/RTCORBA/RTCORBA.h
+    RTCORBA.pidl
+  }
+
+  PidlInstallWithoutBuilding_Files {
+    RT_ProtocolProperties.pidl
+  }
+
+  specific {
+    install_dir = tao/RTCORBA
+  }
+}
+
+project(RTCORBA) : taolib, tao_output, install, pi, taoidldefaults {
+  after       += *core_idl
+  sharedname   = TAO_RTCORBA
+  dynamicflags += TAO_RTCORBA_BUILD_DLL
+  requires    += rt_corba
+
+  Source_Files {
+    *.cpp
+    RTCORBA_includeC.cpp
+    RTCORBAC.cpp
+  }
+
+  Header_Files {
+    *.h
+    RTCORBA_includeC.h
+    RTCORBA_includeS.h
+    RTCORBA_includeA.h
+    RTCORBAC.h
+    RTCORBAS.h
+    RTCORBAA.h
+  }
+
+  specific {
+    install_dir = tao/RTCORBA
+  }
+}
diff --git a/tao/RTCORBA/RTCORBA.pidl b/tao/RTCORBA/RTCORBA.pidl
index e6fdfad7650..8e2c14b14bc 100644
--- a/tao/RTCORBA/RTCORBA.pidl
+++ b/tao/RTCORBA/RTCORBA.pidl
@@ -17,36 +17,6 @@
  *     2.  TAO-specific support for named mutexes has been added.
  *     3.  Added RT_ORB::create_tcp_protocol_properties which seems
  *         to come and go from the formal specification, but is needed.
- *
- *   This file is used to generate the code in RTCORBAC.{h,inl,cpp}.
- *   The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the pidl file.  The command used for
- *   this is:
- *
- *     tao_idl -o orig -Gp -Gd -Sci -I../..
- *          -Wb,export_macro=TAO_RTCORBA_Export
- *          -Wb,export_include="rtcorba_export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          RTCORBA.pidl
- *
- *   2. Then apply the patches in tao/RTCORBA/diffs to the generated code.
- *   The patches provide the following fixes: 1) remove several unnecessary
- *   includes, e.g., corba.h, stream.h, Policy.h, 3) add anything else we
- *   need into the namespace, i.e., TAO_Priority_Mapping, and 4) fix
- *   "nested_class" occurrences in the .cpp.
- *
- * Apply patches using the following commands:
- *
- *   patch < diffs/RTCORBA.diff
- *
- * Note: The diffs were generated with these commands:
- *
- *   for i in RTCORBAC.{h,inl,cpp}; do
- *     diff -wBbu orig/$i $i
- *   done > diffs/RTCORBA.diff
- *
  */
 
 #ifndef _RT_CORBA_IDL_
diff --git a/tao/RTCORBA/RT_Current.cpp b/tao/RTCORBA/RT_Current.cpp
index c742d79fc3f..c2b4652406b 100644
--- a/tao/RTCORBA/RT_Current.cpp
+++ b/tao/RTCORBA/RT_Current.cpp
@@ -1,6 +1,4 @@
-//
 // $Id$
-//
 
 #include "tao/RTCORBA/RT_Current.h"
 
@@ -15,10 +13,6 @@
 
 #include "ace/Thread.h"
 
-ACE_RCSID (RTCORBA,
-           RT_Current,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Current::TAO_RT_Current (TAO_ORB_Core *orb_core)
diff --git a/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
index dea1f603248..49bb29b57e2 100644
--- a/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
+++ b/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -10,14 +12,6 @@
 
 #include "ace/Log_Msg.h"
 
-
-ACE_RCSID (RTCORBA,
-           RT_Endpoint_Selector_Factory,
-           "$Id$")
-
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 RT_Endpoint_Selector_Factory::RT_Endpoint_Selector_Factory (void)
diff --git a/tao/RTCORBA/RT_Endpoint_Utils.cpp b/tao/RTCORBA/RT_Endpoint_Utils.cpp
index 611a7cc3ea7..aefc780495f 100644
--- a/tao/RTCORBA/RT_Endpoint_Utils.cpp
+++ b/tao/RTCORBA/RT_Endpoint_Utils.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/RTCORBA/RT_Endpoint_Utils.h"
 #include "tao/Profile_Transport_Resolver.h"
 
@@ -10,12 +12,6 @@
 
 #include "tao/SystemException.h"
 
-ACE_RCSID (RTCORBA,
-           RT_Endpoint_Utils,
-           "$Id$")
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
diff --git a/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index 2225739355d..b45f07889b3 100644
--- a/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -19,10 +21,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (RTCORBA,
-           RT_Invocation_Endpoint_Selectors,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/tao/RTCORBA/RT_Mutex.cpp b/tao/RTCORBA/RT_Mutex.cpp
index d0c7b4c22ff..85bbfc70d10 100644
--- a/tao/RTCORBA/RT_Mutex.cpp
+++ b/tao/RTCORBA/RT_Mutex.cpp
@@ -7,10 +7,6 @@
 #include "tao/SystemException.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID(RTCORBA,
-          RT_Mutex,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Mutex::~TAO_RT_Mutex (void)
diff --git a/tao/RTCORBA/RT_Mutex.h b/tao/RTCORBA/RT_Mutex.h
index 7520fb6386f..ae79bdf1be4 100644
--- a/tao/RTCORBA/RT_Mutex.h
+++ b/tao/RTCORBA/RT_Mutex.h
@@ -66,8 +66,7 @@ public:
    * if you're interested in writing maximally portable programs avoid
    * using this operation in your program designs.
    */
-  virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait
-                                   );
+  virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait);
 
   /// Returns the name of the mutex.
   virtual const char *name (void) const;
diff --git a/tao/RTCORBA/RT_ORB.cpp b/tao/RTCORBA/RT_ORB.cpp
index 625035b99b5..0dbdbb1ac68 100644
--- a/tao/RTCORBA/RT_ORB.cpp
+++ b/tao/RTCORBA/RT_ORB.cpp
@@ -14,10 +14,6 @@
 #include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h"
 #include "ace/Sched_Params.h"
 
-ACE_RCSID(RTCORBA,
-          RT_ORB,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core,
@@ -212,8 +208,7 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size,
                                             CORBA::Boolean keep_alive,
                                             CORBA::Boolean dont_route,
                                             CORBA::Boolean no_delay,
-                                            CORBA::Boolean enable_network_priority
-                                            )
+                                            CORBA::Boolean enable_network_priority)
 {
   TAO_TCP_Protocol_Properties *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -297,8 +292,7 @@ TAO_RT_ORB::create_stream_control_protocol_properties (
                                                        CORBA::Boolean keep_alive,
                                                        CORBA::Boolean dont_route,
                                                        CORBA::Boolean no_delay,
-                                                       CORBA::Boolean enable_network_priority
-                                                       )
+                                                       CORBA::Boolean enable_network_priority)
 {
   TAO_StreamControl_Protocol_Properties *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -322,8 +316,7 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
                                RTCORBA::Priority default_priority,
                                CORBA::Boolean allow_request_buffering,
                                CORBA::ULong max_buffered_requests,
-                               CORBA::ULong max_request_buffer_size
-                               )
+                               CORBA::ULong max_request_buffer_size)
 {
   return this->tp_manager_->create_threadpool (stacksize,
                                                static_threads,
@@ -450,7 +443,6 @@ TAO_RT_ORB::orb_core (void) const
 int
 TAO_RT_ORB::modify_thread_scheduling_policy (CORBA::ORB_ptr orb)
 {
-  //
   // This method changes the scheduling policy of the calling thread
   // to match the scheduling policy specified in the svc.conf file.
   // The priority of the calling thread will be set to the minimum
@@ -464,7 +456,6 @@ TAO_RT_ORB::modify_thread_scheduling_policy (CORBA::ORB_ptr orb)
   // created.  On such platforms, one can set the correct scheduling
   // scope and policy when creating the thread, thus not needing to
   // use this method.
-  //
 
 #if defined (linux)
 
diff --git a/tao/RTCORBA/RT_ORBInitializer.cpp b/tao/RTCORBA/RT_ORBInitializer.cpp
index 6d70c55f9b2..0fb917121dc 100644
--- a/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -1,12 +1,9 @@
+// $Id$
+
 #include "tao/RTCORBA/RT_ORBInitializer.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID (RTCORBA,
-           RT_ORBInitializer,
-           "$Id$")
-
-
 #define TAO_RTCORBA_SAFE_INCLUDE
 #include "tao/RTCORBA/RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
diff --git a/tao/RTCORBA/RT_ORBInitializer.h b/tao/RTCORBA/RT_ORBInitializer.h
index 4ed80a2ec75..105be957f82 100644
--- a/tao/RTCORBA/RT_ORBInitializer.h
+++ b/tao/RTCORBA/RT_ORBInitializer.h
@@ -57,7 +57,7 @@ public:
       TAO_NETWORK_PRIORITY_MAPPING_LINEAR
     };
 
-  /*
+  /**
    * Lifespan of the dynamic threads
    * TAO_RTCORBA_DT_INFINITIVE When the Dynamic Thread is created it will run
    * forever
diff --git a/tao/RTCORBA/RT_ORB_Loader.cpp b/tao/RTCORBA/RT_ORB_Loader.cpp
index d9c0abbc250..2b6012e33be 100644
--- a/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/RTCORBA/RT_ORB_Loader.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -11,10 +13,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/Arg_Shifter.h"
 
-ACE_RCSID (RTCORBA,
-           RT_ORB_Loader,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_ORB_Loader::TAO_RT_ORB_Loader (void)
diff --git a/tao/RTCORBA/RT_PolicyFactory.cpp b/tao/RTCORBA/RT_PolicyFactory.cpp
index 9539b13cf22..28649a37e37 100644
--- a/tao/RTCORBA/RT_PolicyFactory.cpp
+++ b/tao/RTCORBA/RT_PolicyFactory.cpp
@@ -1,13 +1,10 @@
+// $Id$
+
 #include "tao/RTCORBA/RT_PolicyFactory.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID (RTCORBA,
-           RT_PolicyFactory,
-           "$Id$")
-
 #include "tao/RTCORBA/RT_Policy_i.h"
-
 #include "tao/PolicyC.h"
 #include "tao/ORB_Constants.h"
 
diff --git a/tao/RTCORBA/RT_Policy_i.cpp b/tao/RTCORBA/RT_Policy_i.cpp
index 6da88e48a9c..df708a40ba4 100644
--- a/tao/RTCORBA/RT_Policy_i.cpp
+++ b/tao/RTCORBA/RT_Policy_i.cpp
@@ -13,12 +13,6 @@
 
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (RTCORBA,
-           RT_Policy_i,
-           "$Id$")
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (
diff --git a/tao/RTCORBA/RT_Policy_i.h b/tao/RTCORBA/RT_Policy_i.h
index dd3c59b0b4a..4a47be72b9e 100644
--- a/tao/RTCORBA/RT_Policy_i.h
+++ b/tao/RTCORBA/RT_Policy_i.h
@@ -34,7 +34,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
diff --git a/tao/RTCORBA/RT_ProtocolPropertiesA.cpp b/tao/RTCORBA/RT_ProtocolPropertiesA.cpp
index 4411903d74b..4e0105c6e0e 100644
--- a/tao/RTCORBA/RT_ProtocolPropertiesA.cpp
+++ b/tao/RTCORBA/RT_ProtocolPropertiesA.cpp
@@ -47,7 +47,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/ProtocolProperties:1.0",
     "ProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ProtocolProperties =
@@ -87,7 +87,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   ::CORBA::Boolean
   Any_Impl_T<RTCORBA::ProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -107,8 +107,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace RTCORBA
 {
-  
-  
+
+
   /// Copying insertion.
   void
   operator<<= (
@@ -119,7 +119,7 @@ namespace RTCORBA
       ProtocolProperties::_duplicate (_tao_elem);
     _tao_any <<= &_tao_objptr;
   }
-  
+
   /// Non-copying insertion.
   void
   operator<<= (
@@ -132,7 +132,7 @@ namespace RTCORBA
         _tc_ProtocolProperties,
         *_tao_elem);
   }
-  
+
   ::CORBA::Boolean
   operator>>= (
       const ::CORBA::Any &_tao_any,
diff --git a/tao/RTCORBA/RT_ProtocolPropertiesC.cpp b/tao/RTCORBA/RT_ProtocolPropertiesC.cpp
index ab48b2c8adc..28975f801e2 100644
--- a/tao/RTCORBA/RT_ProtocolPropertiesC.cpp
+++ b/tao/RTCORBA/RT_ProtocolPropertiesC.cpp
@@ -99,7 +99,7 @@ RTCORBA::ProtocolProperties::ProtocolProperties (void)
 RTCORBA::ProtocolProperties::~ProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::ProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   ProtocolProperties *_tao_tmp_pointer =
@@ -134,7 +134,7 @@ RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
diff --git a/tao/RTCORBA/RT_ProtocolPropertiesC.h b/tao/RTCORBA/RT_ProtocolPropertiesC.h
index e1778a0198b..82277225334 100644
--- a/tao/RTCORBA/RT_ProtocolPropertiesC.h
+++ b/tao/RTCORBA/RT_ProtocolPropertiesC.h
@@ -63,22 +63,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace RTCORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:638
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_
-  
+
   class ProtocolProperties;
   typedef ProtocolProperties *ProtocolProperties_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ProtocolProperties
       >
     ProtocolProperties_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ProtocolProperties
@@ -86,13 +86,13 @@ namespace RTCORBA
     ProtocolProperties_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES_CH_
-  
+
   class TAO_RTCORBA_Export ProtocolProperties
     : public virtual ::CORBA::Object
   {
@@ -100,24 +100,24 @@ namespace RTCORBA
     typedef ProtocolProperties_ptr _ptr_type;
     typedef ProtocolProperties_var _var_type;
     typedef ProtocolProperties_out _out_type;
-    
+
     // The static operations.
     static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj);
-    
+
     static void _tao_release (ProtocolProperties_ptr obj);
-    
+
     static ProtocolProperties_ptr _narrow (::CORBA::Object_ptr obj);
     static ProtocolProperties_ptr _unchecked_narrow (::CORBA::Object_ptr obj);
     static ProtocolProperties_ptr _nil (void)
     {
       return static_cast<ProtocolProperties_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:216
-    
+
     virtual ::CORBA::Boolean _is_a (const char *type_id);
     virtual const char* _interface_repository_id (void) const;
     virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
@@ -129,13 +129,13 @@ namespace RTCORBA
   protected:
     // Abstract or local interface only.
     ProtocolProperties (void);
-    
+
     virtual ~ProtocolProperties (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ProtocolProperties (const ProtocolProperties &);
-    
+
     void operator= (const ProtocolProperties &);
   };
 
@@ -161,7 +161,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES__TRAITS_)
 #define _RTCORBA_PROTOCOLPROPERTIES__TRAITS_
-  
+
   template<>
   struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ProtocolProperties>
   {
diff --git a/tao/RTCORBA/RT_Protocols_Hooks.cpp b/tao/RTCORBA/RT_Protocols_Hooks.cpp
index 5f66cc836d3..8d5e4119720 100644
--- a/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/RTCORBA/RT_Protocols_Hooks.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -24,10 +26,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (RTCORBA,
-           RT_Protocols_Hooks,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Protocols_Hooks::TAO_RT_Protocols_Hooks (void)
diff --git a/tao/RTCORBA/RT_Protocols_Hooks.h b/tao/RTCORBA/RT_Protocols_Hooks.h
index 4cae8d8aab1..5ff1cc3d669 100644
--- a/tao/RTCORBA/RT_Protocols_Hooks.h
+++ b/tao/RTCORBA/RT_Protocols_Hooks.h
@@ -44,8 +44,7 @@ public:
   virtual ~TAO_RT_Protocols_Hooks (void);
 
   /// Initialize the protocols hooks instance.
-  void init_hooks (TAO_ORB_Core *orb_core
-                  );
+  void init_hooks (TAO_ORB_Core *orb_core);
 
   CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag,
                                               TAO_Stub *stub);
@@ -53,23 +52,17 @@ public:
   CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag,
                                               CORBA::Policy *policy);
 
-  void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                               );
+  void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties);
 
-  void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                               );
+  void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties);
 
-  void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                               );
+  void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties);
 
-  void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                               );
+  void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties);
 
-  void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                               );
+  void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties);
 
-  void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                               );
+  void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties);
 
   void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties);
 
@@ -108,17 +101,14 @@ public:
 
   int set_thread_CORBA_priority (CORBA::Short);
 
-  int restore_thread_CORBA_and_native_priority (CORBA::Short,
-                                                CORBA::Short);
-
+  int restore_thread_CORBA_and_native_priority (CORBA::Short, CORBA::Short);
   //@}
 
 protected:
   int set_thread_native_priority (CORBA::Short);
 
   RTCORBA::ProtocolProperties_ptr server_protocol_properties (IOP::ProfileId protocol_tag,
-                                                              CORBA::Policy_ptr policy
-                                                             );
+                                                              CORBA::Policy_ptr policy);
 
   RTCORBA::ProtocolProperties_ptr client_protocol_properties (IOP::ProfileId protocol_tag,
                                                               CORBA::Policy_ptr policy);
diff --git a/tao/RTCORBA/RT_Service_Context_Handler.cpp b/tao/RTCORBA/RT_Service_Context_Handler.cpp
index d6cc3e03b57..a16075793e1 100644
--- a/tao/RTCORBA/RT_Service_Context_Handler.cpp
+++ b/tao/RTCORBA/RT_Service_Context_Handler.cpp
@@ -2,10 +2,6 @@
 
 #include "tao/RTCORBA/RT_Service_Context_Handler.h"
 
-ACE_RCSID (RTCORBA,
-           RT_Service_Context_Handler,
-           "$Id$")
-
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #include "tao/RTCORBA/RT_Policy_i.h"
@@ -68,7 +64,7 @@ TAO_RT_Service_Context_Handler::generate_service_context (
               else
                 {
                   if (TAO_debug_level > 0)
-                    ACE_DEBUG ((LM_DEBUG, "ERROR: TAO_RT_Protocols_Hooks::rt_service_context. "
+                    ACE_ERROR ((LM_ERROR, "ERROR: TAO_RT_Protocols_Hooks::rt_service_context. "
                                 "Unable to access RT CORBA Priority in client thread "
                                 "accessing object with CLIENT_PROPAGATED priority model.\n"));
                   throw CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
diff --git a/tao/RTCORBA/RT_Stub.cpp b/tao/RTCORBA/RT_Stub.cpp
index 0a2a694a416..20788468ad5 100644
--- a/tao/RTCORBA/RT_Stub.cpp
+++ b/tao/RTCORBA/RT_Stub.cpp
@@ -10,11 +10,6 @@
 #include "tao/Policy_Manager.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (RTCORBA,
-           RT_Stub,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Stub::TAO_RT_Stub (const char *repository_id,
@@ -57,7 +52,8 @@ TAO_RT_Stub::parse_policies (void)
         {
           case RTCORBA::PRIORITY_MODEL_POLICY_TYPE:
             {
-              this->exposed_priority_model (policy_list[i]);            }
+              this->exposed_priority_model (policy_list[i]);
+            }
             break;
           case RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE :
             {
diff --git a/tao/RTCORBA/RT_Stub_Factory.cpp b/tao/RTCORBA/RT_Stub_Factory.cpp
index 9cd059f682d..ddcb74c4169 100644
--- a/tao/RTCORBA/RT_Stub_Factory.cpp
+++ b/tao/RTCORBA/RT_Stub_Factory.cpp
@@ -10,12 +10,6 @@
 
 #include "ace/Log_Msg.h"
 
-
-ACE_RCSID (RTCORBA,
-           RT_TAO_Stub_Factory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Stub_Factory::~TAO_RT_Stub_Factory (void)
diff --git a/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
index c2798081cab..c0c408ccfd8 100644
--- a/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -4,10 +4,6 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID (RTCORBA,
-           RT_Thread_Lane_Resources_Manager,
-           "$Id$")
-
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "tao/Acceptor_Registry.h"
diff --git a/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
index 8e5ae0fe5ff..8f7359407f6 100644
--- a/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
+++ b/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
@@ -58,7 +58,7 @@ public:
   /// Shutdown reactor.
   void shutdown_reactor (void);
 
-  /// Certain ORB policies such as dropping replies on shutdown 
+  /// Certain ORB policies such as dropping replies on shutdown
   /// would need cleanup of transports to wake threads up.
   void close_all_transports (void);
 
diff --git a/tao/RTCORBA/RT_Transport_Descriptor.cpp b/tao/RTCORBA/RT_Transport_Descriptor.cpp
index 886314dd2f0..a71f3540b27 100644
--- a/tao/RTCORBA/RT_Transport_Descriptor.cpp
+++ b/tao/RTCORBA/RT_Transport_Descriptor.cpp
@@ -7,8 +7,6 @@
 #include "tao/RTCORBA/RT_Transport_Descriptor.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RTCORBA, TAO_RT_Transport_Descriptor, "$Id$")
-
 #include "tao/RTCORBA/RT_Transport_Descriptor_Property.h"
 #include "tao/Endpoint.h"
 
diff --git a/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp b/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
index 020fe70267a..7b592e0a1f7 100644
--- a/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
+++ b/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
@@ -8,10 +8,6 @@
 #include "tao/RTCORBA/RT_Transport_Descriptor_Property.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (RTCORBA,
-           TAO_RT_Transport_Descriptor_Property,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Transport_Descriptor_Property::~TAO_RT_Transport_Descriptor_Property (void)
diff --git a/tao/RTCORBA/Thread_Pool.cpp b/tao/RTCORBA/Thread_Pool.cpp
index 79bfe3a8028..248fc203aa4 100644
--- a/tao/RTCORBA/Thread_Pool.cpp
+++ b/tao/RTCORBA/Thread_Pool.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "tao/RTCORBA/Thread_Pool.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID (RTCORBA,
-           Thread_Pool,
-           "$Id$")
-
 #if ! defined (__ACE_INLINE__)
 #include "tao/RTCORBA/Thread_Pool.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/tao/RTPortableServer.mpc b/tao/RTPortableServer.mpc
deleted file mode 100644
index 312997b60a9..00000000000
--- a/tao/RTPortableServer.mpc
+++ /dev/null
@@ -1,70 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults, avoids_corba_e_micro, install {
-  custom_only = 1
-  idlflags += -Sci -SS -Sorb -GX \
-          -Wb,export_macro=TAO_RTPortableServer_Export \
-          -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h \
-          -o RTPortableServer
-
-  IDL_Files {
-    idlflags += -Gp -Gd \
-                -Wb,include_guard=TAO_RT_PORTABLESERVER_SAFE_INCLUDE \
-                -Wb,safe_include=tao/RTPortableServer/RTPortableServer.h
-    RTPortableServer/RTPortableServer.pidl
-  }
-
-  IDL_Files {
-    idlflags += -Sa \
-                -Wb,unique_include=tao/RTPortableServer/RTPortableServer.h
-    RTPortableServer/RTPortableServer_include.pidl
-  }
-}
-
-project(RTPortableServer) : taolib, tao_output, install, rtcorba, portableserver, avoids_corba_e_micro {
-  after       += *idl
-  sharedname   = TAO_RTPortableServer
-  dynamicflags += TAO_RTPORTABLESERVER_BUILD_DLL
-
-  Source_Files {
-    RTPortableServer
-  }
-
-  Source_Files {
-    RTPortableServer/RTPortableServerC.cpp
-    RTPortableServer/RTPortableServer_includeC.cpp
-  }
-
-  Header_Files {
-    RTPortableServer
-    RTPortableServer/RTPortableServerC.h
-    RTPortableServer/RTPortableServerS.h
-    RTPortableServer/RTPortableServerA.h
-    RTPortableServer/RTPortableServer_includeC.h
-    RTPortableServer/RTPortableServer_includeS.h
-    RTPortableServer/RTPortableServer_includeA.h
-  }
-
-  Inline_Files {
-    RTPortableServer
-  }
-
-  Template_Files {
-    RTPortableServer
-  }
-
-  Resource_Files {
-    RTPortableServer
-  }
-
-  PIDL_Files {
-    RTPortableServer
-  }
-
-  IDL_Files {
-    RTPortableServer
-  }
-
-  Pkgconfig_Files {
-    RTPortableServer/TAO_RTPortableServer.pc.in
-  }
-}
diff --git a/tao/RTPortableServer/RTPortableServer.cpp b/tao/RTPortableServer/RTPortableServer.cpp
index 0a1a167af7a..b8851a79c71 100644
--- a/tao/RTPortableServer/RTPortableServer.cpp
+++ b/tao/RTPortableServer/RTPortableServer.cpp
@@ -14,16 +14,13 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID (RTPortableServer, 
-           RTPortableServer, 
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTPortableServer_Initializer::TAO_RTPortableServer_Initializer (void)
 {
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Object_Adapter_Factory);
 }
+
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/tao/RTPortableServer/RTPortableServer.mpc b/tao/RTPortableServer/RTPortableServer.mpc
new file mode 100644
index 00000000000..0fed8f40069
--- /dev/null
+++ b/tao/RTPortableServer/RTPortableServer.mpc
@@ -0,0 +1,51 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, avoids_corba_e_micro, install {
+  custom_only = 1
+  idlflags += -Sci -SS -Sorb -GX \
+          -Wb,export_macro=TAO_RTPortableServer_Export \
+          -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h \
+          -iC RTPortableServer
+
+  IDL_Files {
+    idlflags += -Gp -Gd \
+                -Wb,include_guard=TAO_RT_PORTABLESERVER_SAFE_INCLUDE \
+                -Wb,safe_include=tao/RTPortableServer/RTPortableServer.h
+    RTPortableServer.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Sa \
+                -Wb,unique_include=tao/RTPortableServer/RTPortableServer.h
+    RTPortableServer_include.pidl
+  }
+
+  specific {
+    install_dir = tao/RTPortableServer
+  }
+}
+
+project(RTPortableServer) : taolib, tao_output, install, rtcorba, portableserver, avoids_corba_e_micro {
+  after       += *idl
+  sharedname   = TAO_RTPortableServer
+  dynamicflags += TAO_RTPORTABLESERVER_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    RTPortableServerC.cpp
+    RTPortableServer_includeC.cpp
+  }
+
+  Header_Files {
+    *.h
+    RTPortableServerC.h
+    RTPortableServerS.h
+    RTPortableServerA.h
+    RTPortableServer_includeC.h
+    RTPortableServer_includeS.h
+    RTPortableServer_includeA.h
+  }
+
+  specific {
+    install_dir = tao/RTPortableServer
+  }
+}
diff --git a/tao/RTPortableServer/RTPortableServer.pidl b/tao/RTPortableServer/RTPortableServer.pidl
index 0eb40328919..6b9e11309cc 100644
--- a/tao/RTPortableServer/RTPortableServer.pidl
+++ b/tao/RTPortableServer/RTPortableServer.pidl
@@ -4,22 +4,6 @@
  * $Id$
  *
  * @brief Pre-compiled IDL source for the RTPortableServer module.
- *
- * This file is used to generate the code in RTPortableServerC.{h,cpp}
- * The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the pidl file.  The command used for
- *   this is:
- *
- *     tao_idl
- *          -o orig -GA -Sci
- *          -Wb,export_macro=TAO_RTPortableServer_Export
- *          -Wb,export_include="rtportableserver_export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          RTPortableServer.pidl
- *
- *   2. The generated files are ready to use
  */
 
 #ifndef _RT_PORTABLE_SERVER_IDL_
diff --git a/tao/RTPortableServer/RT_Acceptor_Filters.cpp b/tao/RTPortableServer/RT_Acceptor_Filters.cpp
index c746b30a1e3..dd1684d77a3 100644
--- a/tao/RTPortableServer/RT_Acceptor_Filters.cpp
+++ b/tao/RTPortableServer/RT_Acceptor_Filters.cpp
@@ -8,11 +8,6 @@
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
 
-ACE_RCSID (RTPortableServer,
-           RT_Acceptor_Filter,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Server_Protocol_Acceptor_Filter::TAO_Server_Protocol_Acceptor_Filter (
diff --git a/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/tao/RTPortableServer/RT_Collocation_Resolver.cpp
index 2757f4bdbca..f13f5769020 100644
--- a/tao/RTPortableServer/RT_Collocation_Resolver.cpp
+++ b/tao/RTPortableServer/RT_Collocation_Resolver.cpp
@@ -4,10 +4,6 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID(RTPortableServer,
-          RT_Collocation_Resolver,
-          "$Id$")
-
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "tao/Object.h"
diff --git a/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
index c501056af06..7117827b810 100644
--- a/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
+++ b/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
@@ -10,11 +10,6 @@
 #include "tao/RTPortableServer/RT_Policy_Validator.h"
 #include "tao/RTPortableServer/RT_Collocation_Resolver.h"
 
-ACE_RCSID (RTPortableServer,
-           RT_Object_Adapter_Factory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Adapter*
diff --git a/tao/RTPortableServer/RT_POA.cpp b/tao/RTPortableServer/RT_POA.cpp
index ab2898b9111..73162b0032b 100644
--- a/tao/RTPortableServer/RT_POA.cpp
+++ b/tao/RTPortableServer/RT_POA.cpp
@@ -30,10 +30,6 @@
 # include "tao/RTPortableServer/RT_POA.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (RTPortableServer,
-           RT_POA,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name,
diff --git a/tao/RTPortableServer/RT_Policy_Validator.cpp b/tao/RTPortableServer/RT_Policy_Validator.cpp
index 8c0d5dde7ac..a5345dc9426 100644
--- a/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ b/tao/RTPortableServer/RT_Policy_Validator.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/RTPortableServer/RT_Policy_Validator.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -14,11 +17,6 @@
 #include "tao/Policy_Set.h"
 #include "tao/Transport_Acceptor.h"
 
-ACE_RCSID (RTPortableServer,
-           RT_Policy_Validator,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_POA_RT_Policy_Validator::TAO_POA_RT_Policy_Validator (TAO_ORB_Core &orb_core)
diff --git a/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index 06a9054a1f9..49d2f50c077 100644
--- a/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+// $Id$
 
 #include "tao/RTPortableServer/RT_Servant_Dispatcher.h"
 
@@ -22,11 +24,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (RTPortableServer,
-           RT_Servant_Dispatcher,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher (void)
diff --git a/tao/RTScheduler.mpc b/tao/RTScheduler.mpc
deleted file mode 100644
index 5bb62e75e2c..00000000000
--- a/tao/RTScheduler.mpc
+++ /dev/null
@@ -1,70 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults, avoids_corba_e_micro, install {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -GX \
-                -Wb,export_macro=TAO_RTScheduler_Export \
-                -Wb,export_include=tao/RTScheduling/rtscheduler_export.h \
-                -Wb,include_guard=TAO_RTSCHEDULER_SAFE_INCLUDE \
-                -Wb,safe_include=tao/RTScheduling/RTScheduler.h \
-                -o RTScheduling
-    RTScheduling/RTScheduler.pidl
-  }
-
-  IDL_Files {
-    idlflags += -SS -Sorb -GX -Sci \
-                -Wb,export_macro=TAO_RTScheduler_Export \
-                -Wb,export_include=tao/RTScheduling/rtscheduler_export.h \
-                -Wb,unique_include=tao/RTScheduling/RTScheduler.h \
-                -o RTScheduling
-    RTScheduling/RTScheduler_include.pidl
-  }
-}
-
-project(RTScheduler) : taolib, tao_output, rtcorba, pi, pi_server, portableserver, install, corba_messaging, taoidldefaults, avoids_corba_e_micro {
-  after       += *idl
-  sharedname   = TAO_RTScheduler
-  dynamicflags += TAO_RTSCHEDULER_BUILD_DLL
-
-  Source_Files {
-    RTScheduling
-  }
-
-  Source_Files {
-    RTScheduling/RTSchedulerC.cpp
-    RTScheduling/RTScheduler_includeC.cpp
-  }
-
-  Header_Files {
-    RTScheduling
-    RTScheduling/RTSchedulerC.h
-    RTScheduling/RTSchedulerS.h
-    RTScheduling/RTSchedulerA.h
-    RTScheduling/RTScheduler_includeC.h
-    RTScheduling/RTScheduler_includeS.h
-    RTScheduling/RTScheduler_includeA.h
-  }
-
-  Inline_Files {
-    RTScheduling
-  }
-
-  Template_Files {
-    RTScheduling
-  }
-
-  Resource_Files {
-    RTScheduling
-  }
-
-  PIDL_Files {
-    RTScheduling
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    RTScheduling/TAO_RTScheduler.pc.in
-  }
-}
diff --git a/tao/RTScheduling/Current.cpp b/tao/RTScheduling/Current.cpp
index dff0f807e5a..1853c2e62d7 100644
--- a/tao/RTScheduling/Current.cpp
+++ b/tao/RTScheduling/Current.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/RTScheduling/Current.h"
 #include "tao/RTScheduling/Distributable_Thread.h"
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
@@ -8,11 +11,6 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (RTScheduling,
-           Current,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> TAO_RTScheduler_Current::guid_counter;
diff --git a/tao/RTScheduling/RTScheduler.cpp b/tao/RTScheduling/RTScheduler.cpp
index 15eebbb61fe..27b5382c077 100644
--- a/tao/RTScheduling/RTScheduler.cpp
+++ b/tao/RTScheduling/RTScheduler.cpp
@@ -3,8 +3,6 @@
 #include "tao/RTScheduling/RTScheduler.h"
 #include "tao/RTScheduling/RTScheduler_Loader.h"
 
-ACE_RCSID (RTScheduler, RTScheduler, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTScheduler_Initializer::TAO_RTScheduler_Initializer (void)
diff --git a/tao/RTScheduling/RTScheduler.mpc b/tao/RTScheduling/RTScheduler.mpc
new file mode 100644
index 00000000000..530cd6fefa3
--- /dev/null
+++ b/tao/RTScheduling/RTScheduler.mpc
@@ -0,0 +1,52 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, avoids_corba_e_micro, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -Gp -Gd -Sci -SS -Sorb -GX \
+                -Wb,export_macro=TAO_RTScheduler_Export \
+                -Wb,export_include=tao/RTScheduling/rtscheduler_export.h \
+                -Wb,include_guard=TAO_RTSCHEDULER_SAFE_INCLUDE \
+                -Wb,safe_include=tao/RTScheduling/RTScheduler.h \
+                -iC RTScheduling
+    RTScheduler.pidl
+  }
+
+  IDL_Files {
+    idlflags += -SS -Sorb -GX -Sci \
+                -Wb,export_macro=TAO_RTScheduler_Export \
+                -Wb,export_include=tao/RTScheduling/rtscheduler_export.h \
+                -Wb,unique_include=tao/RTScheduling/RTScheduler.h \
+                -iC RTScheduling
+    RTScheduler_include.pidl
+  }
+
+  specific {
+    install_dir = tao/RTScheduling
+  }
+}
+
+project(RTScheduler) : taolib, tao_output, rtcorba, pi, pi_server, portableserver, install, corba_messaging, taoidldefaults, avoids_corba_e_micro {
+  after       += *idl
+  sharedname   = TAO_RTScheduler
+  dynamicflags += TAO_RTSCHEDULER_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    RTSchedulerC.cpp
+    RTScheduler_includeC.cpp
+  }
+
+  Header_Files {
+    *.h
+    RTSchedulerC.h
+    RTSchedulerS.h
+    RTSchedulerA.h
+    RTScheduler_includeC.h
+    RTScheduler_includeS.h
+    RTScheduler_includeA.h
+  }
+
+  specific {
+    install_dir = tao/RTScheduling
+  }
+}
diff --git a/tao/RTScheduling/RTScheduler.pidl b/tao/RTScheduling/RTScheduler.pidl
index 2badcdfaa07..76bdac8d8bd 100644
--- a/tao/RTScheduling/RTScheduler.pidl
+++ b/tao/RTScheduling/RTScheduler.pidl
@@ -9,19 +9,6 @@
 //
 // = DESCRIPTION
 //   Some new data types included for GIOP 1.2
-//   This file is used to generate the code in
-//   RTScheduler*.* The command used to generate code
-//   is:
-//
-//     tao_idl
-//        -o orig -GA -Sa -Gp -Gd -Sci
-//          -Wb,export_macro=TAO_RTScheduler_Export
-//          -Wb,export_include="rtscheduler_export.h"
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
-//          -I$(TAO_ROOT)
-//          RTScheduler.pidl
-//
 // ================================================================
 #ifndef TAO_RTSCHEDULER_PIDL
 #define TAO_RTSCHEDULER_PIDL
diff --git a/tao/RTScheduling/RTScheduler_Initializer.cpp b/tao/RTScheduling/RTScheduler_Initializer.cpp
index 561faff2d0b..79d870c7042 100644
--- a/tao/RTScheduling/RTScheduler_Initializer.cpp
+++ b/tao/RTScheduling/RTScheduler_Initializer.cpp
@@ -1,12 +1,9 @@
 // -*- C++ -*-
-//
 // $Id$
 
 #include "tao/RTScheduling/RTScheduler_Initializer.h"
 #include "tao/RTScheduling/Request_Interceptor.h"
 
-ACE_RCSID (TAO, RTScheduler_Initializer, "$Id$")
-
 #include "tao/RTScheduling/RTScheduler.h"
 #include "tao/RTScheduling/Current.h"
 #include "tao/RTScheduling/RTScheduler_Manager.h"
diff --git a/tao/RTScheduling/RTScheduler_Loader.cpp b/tao/RTScheduling/RTScheduler_Loader.cpp
index 853674ac95a..c4d3092bdec 100644
--- a/tao/RTScheduling/RTScheduler_Loader.cpp
+++ b/tao/RTScheduling/RTScheduler_Loader.cpp
@@ -1,4 +1,3 @@
-
 // $Id$
 
 #include "tao/RTScheduling/RTScheduler_Loader.h"
@@ -8,9 +7,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (TAO, RTScheduler_Loader, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTScheduler_Loader::TAO_RTScheduler_Loader (void)
diff --git a/tao/RTScheduling/RTScheduler_Manager.cpp b/tao/RTScheduling/RTScheduler_Manager.cpp
index 773ab9cdc02..624ac7fc27a 100644
--- a/tao/RTScheduling/RTScheduler_Manager.cpp
+++ b/tao/RTScheduling/RTScheduler_Manager.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/RTScheduling/RTScheduler_Manager.h"
@@ -6,8 +7,6 @@
 #include "tao/RTScheduling/RTScheduler_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(TAO, RT_ORB, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTScheduler_Manager::TAO_RTScheduler_Manager (void)
diff --git a/tao/RTScheduling/Request_Interceptor.cpp b/tao/RTScheduling/Request_Interceptor.cpp
index 0d3a2e8f6f3..f33bd1a2241 100644
--- a/tao/RTScheduling/Request_Interceptor.cpp
+++ b/tao/RTScheduling/Request_Interceptor.cpp
@@ -12,10 +12,6 @@
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (RTScheduling,
-           Request_Interceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const IOP::ServiceId
diff --git a/tao/Reactive_Connect_Strategy.cpp b/tao/Reactive_Connect_Strategy.cpp
index c5bcbe3c6b2..2b8e814914c 100644
--- a/tao/Reactive_Connect_Strategy.cpp
+++ b/tao/Reactive_Connect_Strategy.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Reactive_Connect_Strategy.h"
 #include "tao/Connection_Handler.h"
 #include "tao/ORB_Core.h"
diff --git a/tao/Refcounted_ObjectKey.cpp b/tao/Refcounted_ObjectKey.cpp
index c226cd4c769..053be83afcb 100644
--- a/tao/Refcounted_ObjectKey.cpp
+++ b/tao/Refcounted_ObjectKey.cpp
@@ -1,4 +1,6 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Refcounted_ObjectKey.h"
 #include "ace/Log_Msg.h"
 
@@ -18,19 +20,4 @@ TAO::Refcounted_ObjectKey::~Refcounted_ObjectKey (void)
 {
 }
 
-CORBA::ULong
-TAO::Refcounted_ObjectKey::decr_refcount (void)
-{
-  if (--this->ref_count_ > 0)
-    {
-      return this->ref_count_;
-    }
-
-  ACE_ASSERT (this->ref_count_ == 0);
-
-  delete this;
-
-  return 0;
-}
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Refcounted_ObjectKey.inl b/tao/Refcounted_ObjectKey.inl
index 117f9db4ee9..444ea27d38f 100644
--- a/tao/Refcounted_ObjectKey.inl
+++ b/tao/Refcounted_ObjectKey.inl
@@ -1,8 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
@@ -17,4 +15,20 @@ TAO::Refcounted_ObjectKey::object_key (void) const
   return this->object_key_;
 }
 
+ACE_INLINE CORBA::ULong
+TAO::Refcounted_ObjectKey::decr_refcount (void)
+{
+  if (--this->ref_count_ > 0)
+    {
+      return this->ref_count_;
+    }
+
+  ACE_ASSERT (this->ref_count_ == 0);
+
+  delete this;
+
+  return 0;
+}
+
+
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Remote_Invocation.cpp b/tao/Remote_Invocation.cpp
index c18604038d6..38b1346fc52 100644
--- a/tao/Remote_Invocation.cpp
+++ b/tao/Remote_Invocation.cpp
@@ -110,12 +110,12 @@ namespace TAO
 
   void
   Remote_Invocation::marshal_data (TAO_OutputCDR &out_stream)
-    {
-      // Marshal application data
-      if (this->details_.marshal_args (out_stream) == false)
-        {
-          throw ::CORBA::MARSHAL ();
-        }
+  {
+    // Marshal application data
+    if (this->details_.marshal_args (out_stream) == false)
+      {
+        throw ::CORBA::MARSHAL ();
+      }
   }
 
   Invocation_Status
diff --git a/tao/Remote_Invocation.h b/tao/Remote_Invocation.h
index 9af15d3ac29..a73647f9bb6 100644
--- a/tao/Remote_Invocation.h
+++ b/tao/Remote_Invocation.h
@@ -39,7 +39,7 @@ namespace TAO
    *
    * @brief Base class for remote invocations.
    *
-   * This class encapulates some of the common functionalities used by
+   * This class encapsulates some of the common functionalities used by
    * synchronous, asynchronous, DII and DSI invocations.
    *
    */
diff --git a/tao/Remote_Object_Proxy_Broker.cpp b/tao/Remote_Object_Proxy_Broker.cpp
index 77ef8c422f7..8dbf58e2a23 100644
--- a/tao/Remote_Object_Proxy_Broker.cpp
+++ b/tao/Remote_Object_Proxy_Broker.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Remote_Object_Proxy_Broker.h"
 #include "tao/CORBA_String.h"
 #include "tao/UB_String_Arguments.h"
diff --git a/tao/Reply_Dispatcher.cpp b/tao/Reply_Dispatcher.cpp
index 700d3f5c8e7..09d87b13dfc 100644
--- a/tao/Reply_Dispatcher.cpp
+++ b/tao/Reply_Dispatcher.cpp
@@ -39,7 +39,7 @@ TAO_Reply_Dispatcher::intrusive_remove_ref (TAO_Reply_Dispatcher* rd)
   if (rd != 0)
     {
       long tmp = --rd->refcnt_;
-      if (tmp <= 0)  
+      if (tmp <= 0)
         {
           if (rd->allocator_)
             {
@@ -51,7 +51,7 @@ TAO_Reply_Dispatcher::intrusive_remove_ref (TAO_Reply_Dispatcher* rd)
             {
               delete rd;
             }
-        }        
+        }
     }
 }
 
diff --git a/tao/Resource_Factory.cpp b/tao/Resource_Factory.cpp
index 103b78825af..6b050ea23c3 100644
--- a/tao/Resource_Factory.cpp
+++ b/tao/Resource_Factory.cpp
@@ -3,11 +3,8 @@
 #include "tao/Resource_Factory.h"
 #include "tao/Protocol_Factory.h"
 #include "tao/orbconf.h"
-
 #include "ace/ACE.h"
 
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Protocol_Item::TAO_Protocol_Item (const ACE_CString &name)
@@ -199,25 +196,6 @@ TAO_Resource_Factory::locked_transport_cache (void)
   return 0;
 }
 
-ACE_Lock *
-TAO_Resource_Factory::create_object_key_table_lock (void)
-{
-  return 0;
-}
-
-ACE_Lock *
-TAO_Resource_Factory::create_corba_object_lock (void)
-{
-  return 0;
-}
-
-TAO_Configurable_Refcount
-TAO_Resource_Factory::create_corba_object_refcount (void)
-{
-  return TAO_Configurable_Refcount (
-                    TAO_Configurable_Refcount::TAO_NULL_LOCK);
-}
-
 int
 TAO_Resource_Factory::load_default_protocols (void)
 {
diff --git a/tao/Resource_Factory.h b/tao/Resource_Factory.h
index d77c18d1241..19f8d28b24f 100644
--- a/tao/Resource_Factory.h
+++ b/tao/Resource_Factory.h
@@ -24,7 +24,6 @@
 
 #include /**/ "tao/Versioned_Namespace.h"
 #include "tao/Basic_Types.h"
-#include "tao/Configurable_Refcount.h"
 
 #include "ace/Service_Object.h"
 #include "ace/Unbounded_Set.h"
@@ -226,15 +225,6 @@ public:
   /// transport cache needs to be locked  else return 0
   virtual int locked_transport_cache (void);
 
-  /// Creates a lock needed for the table that stores the object keys.
-  virtual ACE_Lock *create_object_key_table_lock (void);
-
-  /// Creates the lock for the CORBA Object
-  virtual ACE_Lock *create_corba_object_lock (void);
-
-  /// Creates the configurable refcount for the CORBA Object
-  virtual TAO_Configurable_Refcount create_corba_object_refcount (void);
-
   /// Creates the flushing strategy.  The new instance is owned by the
   /// caller.
   virtual TAO_Flushing_Strategy *create_flushing_strategy (void) = 0;
diff --git a/tao/Resume_Handle.cpp b/tao/Resume_Handle.cpp
index 5b6915f5fc4..06ecdc7f706 100644
--- a/tao/Resume_Handle.cpp
+++ b/tao/Resume_Handle.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Resume_Handle.h"
 #include "tao/ORB_Core.h"
 #include "debug.h"
@@ -23,7 +26,7 @@ TAO_Resume_Handle::resume_handle (void)
       this->orb_core_->reactor ()->resume_handler (this->handle_);
     }
 
-  // Set the flag, so that we dont resume again..
+  // Set the flag, so that we don't resume again..
   this->flag_ = TAO_HANDLE_ALREADY_RESUMED;
 }
 
diff --git a/tao/Resume_Handle.h b/tao/Resume_Handle.h
index fb12f1dd1d0..759cdca09af 100644
--- a/tao/Resume_Handle.h
+++ b/tao/Resume_Handle.h
@@ -48,7 +48,6 @@ class TAO_Export TAO_Resume_Handle
 {
 
 public:
-
   /// Constructor.
   TAO_Resume_Handle (TAO_ORB_Core *orb_core = 0,
                      ACE_HANDLE h = ACE_INVALID_HANDLE);
diff --git a/tao/Resume_Handle_Deferred.cpp b/tao/Resume_Handle_Deferred.cpp
new file mode 100644
index 00000000000..c668f515a2d
--- /dev/null
+++ b/tao/Resume_Handle_Deferred.cpp
@@ -0,0 +1,46 @@
+// $Id$
+
+#include "tao/Resume_Handle_Deferred.h"
+#include "tao/Resume_Handle.h"
+#include "tao/ORB_Core.h"
+#include "ace/Reactor.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Resume_Handle_Deferred::TAO_Resume_Handle_Deferred  (
+  TAO_ORB_Core* orbc,
+  ACE_Event_Handler* h) :
+    ACE_Event_Handler (orbc->reactor())
+    , h_ (h)
+    , orbc_ (orbc)
+{
+  h->add_reference ();
+  this->reference_counting_policy ().value
+    (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
+}
+
+TAO_Resume_Handle_Deferred::~TAO_Resume_Handle_Deferred  (void)
+{
+}
+
+int
+TAO_Resume_Handle_Deferred:: handle_timeout (const ACE_Time_Value &, const void *)
+{
+  // Send a notification to the reactor to cause the awakening of a new
+  // follower, if there is one already available.
+  ACE_Reactor *reactor = this->orbc_->reactor ();
+  int const retval = reactor->notify (this->h_.handler (), ACE_Event_Handler::READ_MASK);
+  if (TAO_debug_level > 2)
+    {
+      // @@todo: need to think about what is the action that
+      // we can take when we get here with an error?!
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("TAO (%P|%t) - TAO_Resume_Handle_Deferred[%d]::handle_timeout, ")
+                  ACE_TEXT ("a connection_handler has been resumed, ")
+                  ACE_TEXT ("notified the reactor, retval=%d.\n"), h_->get_handle (), retval));
+    }
+  return -1; // -1 will cause the reactor to call handle_close() and dispose of the instance
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/tao/Resume_Handle_Deferred.h b/tao/Resume_Handle_Deferred.h
new file mode 100644
index 00000000000..ce1c00bc977
--- /dev/null
+++ b/tao/Resume_Handle_Deferred.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file Resume_Handle_Deferred.h
+ *
+ *  $Id$
+ *
+ *  @author Iliyan Jeliazkov <jeliazkov_i@ociweb.com>
+ */
+//=============================================================================
+
+#ifndef TAO_RESUME_HANDLE_DEFERRED_H
+#define TAO_RESUME_HANDLE_DEFERRED_H
+
+#include /**/ "ace/pre.h"
+
+#include "TAO_Export.h"
+#include "ace/Event_Handler.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_ORB_Core;
+
+/**
+ * @class TAO_Resume_Handle_Deferred
+ *
+ * @brief A utility class that helps in resuming handlers if TAO uses
+ *  a TP Reactor from ACE. In contrast with the Resume_Handle class
+ *  however, the resumption is performed at the expiration of a timer,
+ *  previously registered with the reactor. TAO_Resume_Handle_Deferred
+ *  will also notify the reactor (reactor->notify())
+ */
+class TAO_Export TAO_Resume_Handle_Deferred : public ACE_Event_Handler
+{
+public:
+  /// Ctor
+  TAO_Resume_Handle_Deferred (TAO_ORB_Core* orbc, ACE_Event_Handler* h);
+
+  /// Destructor
+  ~TAO_Resume_Handle_Deferred (void);
+
+  /// Handles the timeout event by resuming the handle and
+  /// calling the reactor->notify()
+  virtual int handle_timeout (const ACE_Time_Value &, const void * = 0);
+
+private:
+  ACE_Event_Handler_var h_;
+  TAO_ORB_Core * orbc_;
+};
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include /**/ "ace/post.h"
+#endif /*TAO_RESUME_HANDLE_DEFERRED_H*/
diff --git a/tao/ServerRequestInterceptor_Adapter.cpp b/tao/ServerRequestInterceptor_Adapter.cpp
index ff032bbdb59..b681460417c 100644
--- a/tao/ServerRequestInterceptor_Adapter.cpp
+++ b/tao/ServerRequestInterceptor_Adapter.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/ServerRequestInterceptor_Adapter.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/ServerRequestInterceptor_Adapter_Factory.cpp b/tao/ServerRequestInterceptor_Adapter_Factory.cpp
index 8847b4c82a3..6bc92e719ff 100644
--- a/tao/ServerRequestInterceptor_Adapter_Factory.cpp
+++ b/tao/ServerRequestInterceptor_Adapter_Factory.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/ServerRequestInterceptor_Adapter_Factory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Server_Strategy_Factory.cpp b/tao/Server_Strategy_Factory.cpp
index 079b96605db..d918685946f 100644
--- a/tao/Server_Strategy_Factory.cpp
+++ b/tao/Server_Strategy_Factory.cpp
@@ -14,42 +14,6 @@ TAO_Server_Strategy_Factory::~TAO_Server_Strategy_Factory(void)
 {
 }
 
-int
-TAO_Server_Strategy_Factory::open (TAO_ORB_Core*)
-{
-  return 0;
-}
-
-int
-TAO_Server_Strategy_Factory::enable_poa_locking (void)
-{
-  return -1;
-}
-
-int
-TAO_Server_Strategy_Factory::activate_server_connections (void)
-{
-  return 0;
-}
-
-int
-TAO_Server_Strategy_Factory::thread_per_connection_timeout (ACE_Time_Value &)
-{
-  return -1;
-}
-
-int
-TAO_Server_Strategy_Factory::server_connection_thread_flags (void)
-{
-  return 0;
-}
-
-int
-TAO_Server_Strategy_Factory::server_connection_thread_count (void)
-{
-  return 0;
-}
-
 const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &
 TAO_Server_Strategy_Factory::active_object_map_creation_parameters (void) const
 {
diff --git a/tao/Server_Strategy_Factory.h b/tao/Server_Strategy_Factory.h
index db38f2b0034..76620027477 100644
--- a/tao/Server_Strategy_Factory.h
+++ b/tao/Server_Strategy_Factory.h
@@ -96,16 +96,13 @@ public:
   /**
    * Call <open> on various strategies.  This is not performed in
    * <init> so that the other portions of the ORB have a chance to
-   * "settle" in their initialization since the streategies herein
+   * "settle" in their initialization since the strategies herein
    * might need some of that information.
    */
-  virtual int open (TAO_ORB_Core* orb_core);
-
-  /// Enable POA locking?
-  virtual int enable_poa_locking (void);
+  virtual int open (TAO_ORB_Core* orb_core) = 0;
 
   /// Are server connections active (i.e. run in their own thread)
-  virtual int activate_server_connections (void);
+  virtual int activate_server_connections (void) = 0;
 
   /**
    * Obtain the timeout value used by the thread-per-connection server
@@ -114,11 +111,11 @@ public:
    * If the return value is zero then the threads block without
    * timeouts.
    */
-  virtual int thread_per_connection_timeout (ACE_Time_Value &timeout);
+  virtual int thread_per_connection_timeout (ACE_Time_Value &timeout) = 0;
 
   /// The thread activation parameters
-  virtual int server_connection_thread_flags (void);
-  virtual int server_connection_thread_count (void);
+  virtual int server_connection_thread_flags (void) = 0;
+  virtual int server_connection_thread_count (void) = 0;
 
   /// Return the active object map creation parameters.
   virtual
diff --git a/tao/Service_Callbacks.cpp b/tao/Service_Callbacks.cpp
index c0e3d4a7991..a299d79d1be 100644
--- a/tao/Service_Callbacks.cpp
+++ b/tao/Service_Callbacks.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Service_Callbacks.h"
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
diff --git a/tao/Service_Context.cpp b/tao/Service_Context.cpp
index a766a132b8c..057a80ac53e 100644
--- a/tao/Service_Context.cpp
+++ b/tao/Service_Context.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Service_Context.h"
diff --git a/tao/Service_Context_Handler.cpp b/tao/Service_Context_Handler.cpp
index 3ad1f06af10..700b73c9d0b 100644
--- a/tao/Service_Context_Handler.cpp
+++ b/tao/Service_Context_Handler.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Service_Context_Handler.h"
diff --git a/tao/Service_Context_Handler.h b/tao/Service_Context_Handler.h
index 6c6430ef7d5..ea0399a5ced 100644
--- a/tao/Service_Context_Handler.h
+++ b/tao/Service_Context_Handler.h
@@ -41,9 +41,9 @@ class TAO_Export TAO_Service_Context_Handler
     virtual int process_service_context (
       TAO_Transport& transport,
       const IOP::ServiceContext& context) = 0;
-      
+
     virtual int generate_service_context (
-      TAO_Stub *stub, 
+      TAO_Stub *stub,
       TAO_Transport& transport,
       TAO_Operation_Details &opdetails,
       TAO_Target_Specification &spec,
diff --git a/tao/Service_Context_Handler_Registry.cpp b/tao/Service_Context_Handler_Registry.cpp
index fe18a5084f8..27e4d30acf9 100644
--- a/tao/Service_Context_Handler_Registry.cpp
+++ b/tao/Service_Context_Handler_Registry.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "tao/Service_Context_Handler_Registry.h"
-
 #include "tao/TAO_Server_Request.h"
 #include "tao/Service_Context_Handler.h"
 
diff --git a/tao/Services.pidl b/tao/Services.pidl
index 26d37adf618..395892cc3da 100644
--- a/tao/Services.pidl
+++ b/tao/Services.pidl
@@ -1,24 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-// ================================================================
-//
-//   This file is used to generate the code in ServicesC.*
-//   The command used to generate code is:
-//
-//     tao_idl
-//        -o orig -GA -SS -Sci
-//          -Wb,export_macro="tao/TAO_Export"
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
-//          Services.pidl
-//
-//   Patches for changes to the generated code are available in the
-//   `diffs' directory.
-// ================================================================
-
-
 #ifndef TAO_CORBA_SERVICES_IDL
 #define TAO_CORBA_SERVICES_IDL
 
diff --git a/tao/Services_Activate.cpp b/tao/Services_Activate.cpp
index 23ee61121bb..1e03a3fb4a0 100644
--- a/tao/Services_Activate.cpp
+++ b/tao/Services_Activate.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Services_Activate.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/ShortSeq.pidl b/tao/ShortSeq.pidl
index 4418ccabb62..e2a59a3ddec 100644
--- a/tao/ShortSeq.pidl
+++ b/tao/ShortSeq.pidl
@@ -1,24 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-// ================================================================
-/**
- * This file is used to generate the code in ShortSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ShortSeq.pidl
- *
- * Patches for changes to the generated code are available in the
- * `diffs' directory.
- */
-// ================================================================
-
 #ifndef TAO_CORBA_SHORT_SEQ_IDL
 #define TAO_CORBA_SHORT_SEQ_IDL
 
diff --git a/tao/SmartProxies.mpc b/tao/SmartProxies.mpc
deleted file mode 100644
index 00d8ef72eab..00000000000
--- a/tao/SmartProxies.mpc
+++ /dev/null
@@ -1,36 +0,0 @@
-//$Id$
-project(SmartProxies) : taolib, tao_output, install, tao_versioning_idl_defaults {
-  sharedname   = TAO_SmartProxies
-  dynamicflags += TAO_SMARTPROXIES_BUILD_DLL
-
-  Source_Files {
-    SmartProxies
-  }
-
-  Header_Files {
-    SmartProxies
-  }
-
-  Inline_Files {
-    SmartProxies
-  }
-
-  Template_Files {
-    SmartProxies
-  }
-
-  Resource_Files {
-    SmartProxies
-  }
-
-  PIDL_Files {
-    SmartProxies
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    SmartProxies/TAO_SmartProxies.pc.in
-  }
-}
diff --git a/tao/SmartProxies/SmartProxies.mpc b/tao/SmartProxies/SmartProxies.mpc
new file mode 100644
index 00000000000..6951bf47f2a
--- /dev/null
+++ b/tao/SmartProxies/SmartProxies.mpc
@@ -0,0 +1,10 @@
+//$Id$
+
+project(SmartProxies) : taolib, tao_output, install, tao_versioning_idl_defaults {
+  sharedname   = TAO_SmartProxies
+  dynamicflags += TAO_SMARTPROXIES_BUILD_DLL
+
+  specific {
+    install_dir = tao/SmartProxies
+  }
+}
diff --git a/tao/SmartProxies/Smart_Proxies.cpp b/tao/SmartProxies/Smart_Proxies.cpp
index af6f5edb1fa..0d3c65def83 100644
--- a/tao/SmartProxies/Smart_Proxies.cpp
+++ b/tao/SmartProxies/Smart_Proxies.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/SmartProxies/Smart_Proxies.h"
 
-ACE_RCSID(SmartProxies,
-          Smart_Proxies,
-          "$Id$")
-
 #if !defined (__ACE_INLINE__)
 #include "tao/SmartProxies/Smart_Proxies.inl"
 #endif /* defined INLINE */
diff --git a/tao/Strategies.mpc b/tao/Strategies.mpc
deleted file mode 100644
index 8f70999a42d..00000000000
--- a/tao/Strategies.mpc
+++ /dev/null
@@ -1,58 +0,0 @@
-//$Id$
-project(*core_idl) : tao_versioning_idl_defaults {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -Sci -SS -Gp -Gd -Sorb -DCORBA3 \
-                -Wb,export_macro=TAO_Strategies_Export \
-                -Wb,export_include=tao/Strategies/strategies_export.h \
-                -o Strategies
-    idlflags -= -St
-    Strategies/uiop_endpoints.pidl
-    Strategies/sciop_endpoints.pidl
-    Strategies/COIOP_Endpoints.pidl
-  }
-
-}
-
-project(Strategies) : taolib, tao_output, install, pi, anytypecode, core_strategies, taoidldefaults {
-  after       += *core_idl
-  sharedname   = TAO_Strategies
-  dynamicflags += TAO_STRATEGIES_BUILD_DLL
-
-  Source_Files {
-    Strategies
-  }
-
-  Source_Files {
-    Strategies/uiop_endpointsC.cpp
-    Strategies/sciop_endpointsC.cpp
-    Strategies/COIOP_EndpointsC.cpp
-  }
-
-  Header_Files {
-    Strategies
-  }
-
-  Inline_Files {
-    Strategies
-  }
-
-  Template_Files {
-    Strategies
-  }
-
-  Resource_Files {
-    Strategies
-  }
-
-  PIDL_Files {
-    Strategies
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    Strategies/TAO_Strategies.pc.in
-  }
-}
diff --git a/tao/Strategies/COIOP_Acceptor.cpp b/tao/Strategies/COIOP_Acceptor.cpp
index cc80b67b038..d2daaafcd66 100644
--- a/tao/Strategies/COIOP_Acceptor.cpp
+++ b/tao/Strategies/COIOP_Acceptor.cpp
@@ -16,10 +16,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Strategies,
-           COIOP_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_COIOP_Acceptor::TAO_COIOP_Acceptor (void)
@@ -99,7 +95,6 @@ TAO_COIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
                                            TAO_MProfile &mprofile,
                                            CORBA::Short priority)
 {
-  size_t index = 0;
   TAO_Profile *pfile = 0;
   TAO_COIOP_Profile *coiop_profile = 0;
 
@@ -141,8 +136,6 @@ TAO_COIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
           if (csm)
             csm->set_codeset(pfile->tagged_components());
         }
-
-      index = 1;
     }
 
   TAO_COIOP_Endpoint *endpoint = 0;
diff --git a/tao/Strategies/COIOP_Acceptor.h b/tao/Strategies/COIOP_Acceptor.h
index 1f1756037ca..d3196e08785 100644
--- a/tao/Strategies/COIOP_Acceptor.h
+++ b/tao/Strategies/COIOP_Acceptor.h
@@ -33,7 +33,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// TAO COIOP_Acceptor concrete call defination
+// TAO COIOP_Acceptor concrete call definition
 
 /**
  * @class TAO_COIOP_Acceptor
diff --git a/tao/Strategies/COIOP_Connection_Handler.cpp b/tao/Strategies/COIOP_Connection_Handler.cpp
index 10f0fdfdf9e..e14bd8e9794 100644
--- a/tao/Strategies/COIOP_Connection_Handler.cpp
+++ b/tao/Strategies/COIOP_Connection_Handler.cpp
@@ -19,9 +19,6 @@
 #include "tao/Strategies/COIOP_Transport.h"
 #include "tao/Strategies/COIOP_Endpoint.h"
 
-ACE_RCSID(tao, COIOP_Connect, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_COIOP_Connection_Handler::TAO_COIOP_Connection_Handler (ACE_Thread_Manager *t)
diff --git a/tao/Strategies/COIOP_Connector.cpp b/tao/Strategies/COIOP_Connector.cpp
index d73aaa6544f..25ddaccc61c 100644
--- a/tao/Strategies/COIOP_Connector.cpp
+++ b/tao/Strategies/COIOP_Connector.cpp
@@ -11,15 +11,8 @@
 #include "tao/SystemException.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
-
 #include "tao/Strategies/COIOP_Profile.h"
 
-
-ACE_RCSID (Strategies,
-           COIOP_Connector,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_COIOP_Connector::TAO_COIOP_Connector (void)
diff --git a/tao/Strategies/COIOP_Endpoint.cpp b/tao/Strategies/COIOP_Endpoint.cpp
index 9f383b98a8d..103c924601e 100644
--- a/tao/Strategies/COIOP_Endpoint.cpp
+++ b/tao/Strategies/COIOP_Endpoint.cpp
@@ -1,7 +1,6 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-
 #include "tao/Strategies/COIOP_Endpoint.h"
 
 #if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0)
@@ -13,11 +12,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Strategies,
-           COIOP_Endpoint,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Strategies/COIOP_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/tao/Strategies/COIOP_Endpoint.h b/tao/Strategies/COIOP_Endpoint.h
index 9828c1fd510..0d1cf2abb35 100644
--- a/tao/Strategies/COIOP_Endpoint.h
+++ b/tao/Strategies/COIOP_Endpoint.h
@@ -69,8 +69,8 @@ public:
   virtual int addr_to_string (char *buffer, size_t length);
   virtual TAO_Endpoint *duplicate (void);
 
-  /// Return true if this endpoint is equivalent to <other_endpoint>.  Two
-  /// endpoints are equivalent iff their port and host are the same.
+  /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
+  /// endpoints are equivalent if their port and host are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
diff --git a/tao/Strategies/COIOP_Endpoints.pidl b/tao/Strategies/COIOP_Endpoints.pidl
index 8b6d0ddd3ab..3031390439e 100644
--- a/tao/Strategies/COIOP_Endpoints.pidl
+++ b/tao/Strategies/COIOP_Endpoints.pidl
@@ -8,18 +8,6 @@
  * endpoints per single profile.  Data structures defined here are
  * used for transmission of COIOP endpoints.  See COIOP_Profile.*
  * for more details.
- *
- * This file is used to generate the code in
- * COIOP_EndpointsC.* The command used to generate code
- * is:
- *
- * tao_idl
- *          -o orig -GA -Sci \
- *          -Wb,export_macro=TAO_Export \
- *          -Wb,export_include="tao/TAO_Export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          COIOP_Endpoints.pidl
  */
 
 #ifndef _TAO_COIOP_ENDPOINTS_IDL_
diff --git a/tao/Strategies/COIOP_Factory.cpp b/tao/Strategies/COIOP_Factory.cpp
index 3edd438776a..6e2dfa0d3b7 100644
--- a/tao/Strategies/COIOP_Factory.cpp
+++ b/tao/Strategies/COIOP_Factory.cpp
@@ -11,10 +11,6 @@
 
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (Strategies,
-           COIOP_Factory,
-           "$Id$")
-
 static const char the_prefix[] = "COIOP";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Strategies/COIOP_Profile.cpp b/tao/Strategies/COIOP_Profile.cpp
index 93ced77619a..d281d93e391 100644
--- a/tao/Strategies/COIOP_Profile.cpp
+++ b/tao/Strategies/COIOP_Profile.cpp
@@ -14,10 +14,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Strategies,
-           COIOP_Profile,
-           "$Id$")
-
 static const char the_prefix[] = "niop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Strategies/COIOP_Transport.cpp b/tao/Strategies/COIOP_Transport.cpp
index 98558936eb5..650c8da71bb 100644
--- a/tao/Strategies/COIOP_Transport.cpp
+++ b/tao/Strategies/COIOP_Transport.cpp
@@ -19,8 +19,6 @@
 #include "tao/Resume_Handle.h"
 #include "tao/GIOP_Message_Base.h"
 
-ACE_RCSID (tao, COIOP_Transport, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_COIOP_Transport::TAO_COIOP_Transport (TAO_COIOP_Connection_Handler *handler,
diff --git a/tao/Strategies/DIOP_Acceptor.cpp b/tao/Strategies/DIOP_Acceptor.cpp
index 1756e7f01b3..fbcd50fe5df 100644
--- a/tao/Strategies/DIOP_Acceptor.cpp
+++ b/tao/Strategies/DIOP_Acceptor.cpp
@@ -22,10 +22,6 @@
 
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (Strategies,
-           DIOP_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (void)
diff --git a/tao/Strategies/DIOP_Acceptor.h b/tao/Strategies/DIOP_Acceptor.h
index d69693f9820..5346aac5d4d 100644
--- a/tao/Strategies/DIOP_Acceptor.h
+++ b/tao/Strategies/DIOP_Acceptor.h
@@ -34,7 +34,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// TAO DIOP_Acceptor concrete call defination
+// TAO DIOP_Acceptor concrete call definition
 
 /**
  * @class TAO_DIOP_Acceptor
diff --git a/tao/Strategies/DIOP_Connection_Handler.cpp b/tao/Strategies/DIOP_Connection_Handler.cpp
index 193d4521af6..6421ec82b35 100644
--- a/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -22,9 +22,6 @@
 #include "ace/os_include/netinet/os_tcp.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID(tao, DIOP_Connect, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (ACE_Thread_Manager *t)
diff --git a/tao/Strategies/DIOP_Connector.cpp b/tao/Strategies/DIOP_Connector.cpp
index ed6c16ceb6c..612cbe8da62 100644
--- a/tao/Strategies/DIOP_Connector.cpp
+++ b/tao/Strategies/DIOP_Connector.cpp
@@ -19,12 +19,6 @@
 
 #include "tao/Strategies/DIOP_Profile.h"
 
-
-ACE_RCSID (Strategies,
-           DIOP_Connector,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DIOP_Connector::TAO_DIOP_Connector (void)
diff --git a/tao/Strategies/DIOP_Endpoint.cpp b/tao/Strategies/DIOP_Endpoint.cpp
index ace8929ad97..f72a0d6f009 100644
--- a/tao/Strategies/DIOP_Endpoint.cpp
+++ b/tao/Strategies/DIOP_Endpoint.cpp
@@ -1,7 +1,6 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-
 #include "tao/Strategies/DIOP_Endpoint.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
@@ -13,12 +12,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (Strategies,
-           DIOP_Endpoint,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Strategies/DIOP_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/tao/Strategies/DIOP_Endpoint.h b/tao/Strategies/DIOP_Endpoint.h
index 0a54dec186e..0a28d175002 100644
--- a/tao/Strategies/DIOP_Endpoint.h
+++ b/tao/Strategies/DIOP_Endpoint.h
@@ -82,8 +82,8 @@ public:
   virtual int addr_to_string (char *buffer, size_t length);
   virtual TAO_Endpoint *duplicate (void);
 
-  /// Return true if this endpoint is equivalent to <other_endpoint>.  Two
-  /// endpoints are equivalent iff their port and host are the same.
+  /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
+  /// endpoints are equivalent if their port and host are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
@@ -101,7 +101,7 @@ public:
   /// ownership of this string.
   const char *host (void) const;
 
-  /// Copy the string <h> into <host_> and return the resulting pointer.
+  /// Copy the string @a h into <host_> and return the resulting pointer.
   /// This object maintains ownership of this string.
   const char *host (const char *h);
 
diff --git a/tao/Strategies/DIOP_Factory.cpp b/tao/Strategies/DIOP_Factory.cpp
index 53722ace578..40b455412ac 100644
--- a/tao/Strategies/DIOP_Factory.cpp
+++ b/tao/Strategies/DIOP_Factory.cpp
@@ -11,10 +11,6 @@
 
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (Strategies,
-           DIOP_Factory,
-           "$Id$")
-
 static const char the_prefix[] = "diop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Strategies/DIOP_Profile.cpp b/tao/Strategies/DIOP_Profile.cpp
index 8954268eb25..3a425fe9128 100644
--- a/tao/Strategies/DIOP_Profile.cpp
+++ b/tao/Strategies/DIOP_Profile.cpp
@@ -15,10 +15,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (Strategies,
-           DIOP_Profile,
-           "$Id$")
-
 static const char the_prefix[] = "diop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Strategies/DIOP_Transport.cpp b/tao/Strategies/DIOP_Transport.cpp
index 2af168556aa..8a4d8df144c 100644
--- a/tao/Strategies/DIOP_Transport.cpp
+++ b/tao/Strategies/DIOP_Transport.cpp
@@ -19,8 +19,6 @@
 #include "tao/Resume_Handle.h"
 #include "tao/GIOP_Message_Base.h"
 
-ACE_RCSID (tao, DIOP_Transport, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
diff --git a/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp b/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
index c973cee3a80..45c2db6e2fb 100644
--- a/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
+++ b/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
@@ -3,9 +3,6 @@
 #include "tao/Strategies/FIFO_Connection_Purging_Strategy.h"
 #include "tao/Transport.h"
 
-ACE_RCSID(tao, FIFO_Connection_Purging_Strategy, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy (
@@ -18,13 +15,13 @@ TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy (
 }
 
 void
-TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
+TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Transport& transport)
 {
   // FIFO, so only update the purging order if this
   // item has not been cached yet.
-  if (transport->purging_order () == 0)
+  if (transport.purging_order () == 0)
     {
-      transport->purging_order (this->order_++);
+      transport.purging_order (this->order_++);
     }
 }
 
diff --git a/tao/Strategies/FIFO_Connection_Purging_Strategy.h b/tao/Strategies/FIFO_Connection_Purging_Strategy.h
index 5deda35a567..6d489e696e2 100644
--- a/tao/Strategies/FIFO_Connection_Purging_Strategy.h
+++ b/tao/Strategies/FIFO_Connection_Purging_Strategy.h
@@ -44,7 +44,7 @@ public:
   TAO_FIFO_Connection_Purging_Strategy (int cache_maximum);
 
   /// Called when accessing an item from the cache
-  virtual void update_item (TAO_Transport* transport);
+  virtual void update_item (TAO_Transport& transport);
 
 private:
   /// The ordering information for each transport in the cache
diff --git a/tao/Strategies/LFU_Connection_Purging_Strategy.cpp b/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
index c254f148637..e0e6449b77d 100644
--- a/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
+++ b/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
@@ -3,9 +3,6 @@
 #include "tao/Strategies/LFU_Connection_Purging_Strategy.h"
 #include "tao/Transport.h"
 
-ACE_RCSID(tao, LFU_Connection_Purging_Strategy, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LFU_Connection_Purging_Strategy::TAO_LFU_Connection_Purging_Strategy (
@@ -15,9 +12,9 @@ TAO_LFU_Connection_Purging_Strategy::TAO_LFU_Connection_Purging_Strategy (
 }
 
 void
-TAO_LFU_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
+TAO_LFU_Connection_Purging_Strategy::update_item (TAO_Transport& transport)
 {
-  transport->purging_order (transport->purging_order () + 1);
+  transport.purging_order (transport.purging_order () + 1);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Strategies/LFU_Connection_Purging_Strategy.h b/tao/Strategies/LFU_Connection_Purging_Strategy.h
index a0a6afbccaf..66a01fca65f 100644
--- a/tao/Strategies/LFU_Connection_Purging_Strategy.h
+++ b/tao/Strategies/LFU_Connection_Purging_Strategy.h
@@ -43,7 +43,7 @@ public:
   TAO_LFU_Connection_Purging_Strategy (int cache_maximum);
 
   /// Called when accessing an item from the cache
-  virtual void update_item (TAO_Transport* transport);
+  virtual void update_item (TAO_Transport& transport);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Strategies/LF_Strategy_Null.cpp b/tao/Strategies/LF_Strategy_Null.cpp
index 67c5f5e0871..70c76057700 100644
--- a/tao/Strategies/LF_Strategy_Null.cpp
+++ b/tao/Strategies/LF_Strategy_Null.cpp
@@ -6,9 +6,6 @@
 # include "tao/Strategies/LF_Strategy_Null.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(tao, LF_Strategy_Null, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LF_Strategy_Null::~TAO_LF_Strategy_Null (void)
diff --git a/tao/Strategies/NULL_Connection_Purging_Strategy.cpp b/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
index 4c49b8ee312..554ff460898 100644
--- a/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
+++ b/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
@@ -3,8 +3,6 @@
 #include "tao/Strategies/NULL_Connection_Purging_Strategy.h"
 #include "tao/Transport.h"
 
-ACE_RCSID(tao, NULL_Connection_Purging_Strategy, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_NULL_Connection_Purging_Strategy::TAO_NULL_Connection_Purging_Strategy (
@@ -14,7 +12,7 @@ TAO_NULL_Connection_Purging_Strategy::TAO_NULL_Connection_Purging_Strategy (
 }
 
 void
-TAO_NULL_Connection_Purging_Strategy::update_item (TAO_Transport*)
+TAO_NULL_Connection_Purging_Strategy::update_item (TAO_Transport&)
 {
 }
 
diff --git a/tao/Strategies/NULL_Connection_Purging_Strategy.h b/tao/Strategies/NULL_Connection_Purging_Strategy.h
index 2da2ceb6e0e..577024e1d42 100644
--- a/tao/Strategies/NULL_Connection_Purging_Strategy.h
+++ b/tao/Strategies/NULL_Connection_Purging_Strategy.h
@@ -40,7 +40,7 @@ public:
   TAO_NULL_Connection_Purging_Strategy (int cache_maximum);
 
   /// Does nothing.
-  virtual void update_item (TAO_Transport* transport);
+  virtual void update_item (TAO_Transport& transport);
 
   /// Returns -1 to signify no maximum
   virtual int cache_maximum (void) const;
diff --git a/tao/Strategies/OC_Endpoint_Selector_Factory.cpp b/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
index 69b63f857bf..785ce512c8e 100644
--- a/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
+++ b/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
@@ -7,11 +7,7 @@
 #include "tao/PI/ORBInitInfo.h"
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Core.h"
-#include "ace/OS.h"
-
-ACE_RCSID (tao,
-           OC_Endpoint_Selector_Factory,
-           "$Id$")
+#include "ace/OS_NS_strings.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/tao/Strategies/OC_Endpoint_Selector_Loader.cpp b/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
index 314ec97354b..d72d7840658 100644
--- a/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
+++ b/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
@@ -13,10 +13,6 @@
 #include "tao/Strategies/OC_Endpoint_Selector_Loader.h"
 #include "tao/Strategies/OC_Endpoint_Selector_Factory.h"
 
-ACE_RCSID (tao,
-           OC_Endpoint_Selector_Loader,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
index de79c013571..d2ddba7e29c 100644
--- a/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
+++ b/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/Strategies/Optimized_Connection_Endpoint_Selector.h"
 
@@ -12,10 +13,6 @@
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (tao,
-           Optimized_Connection_Endpoint_Selector,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // ****************************************************************
diff --git a/tao/Strategies/SCIOP_Acceptor.cpp b/tao/Strategies/SCIOP_Acceptor.cpp
index b30ebd33316..9d3b6ea28ed 100644
--- a/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/tao/Strategies/SCIOP_Acceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/SCIOP_Acceptor.h"
 #include "tao/Strategies/SCIOP_Profile.h"
 
@@ -15,10 +17,6 @@
 #include "tao/Strategies/SCIOP_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(tao,
-          SCIOP_Acceptor,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (void)
diff --git a/tao/Strategies/SCIOP_Acceptor.h b/tao/Strategies/SCIOP_Acceptor.h
index b3110867917..9b6428d3a18 100644
--- a/tao/Strategies/SCIOP_Acceptor.h
+++ b/tao/Strategies/SCIOP_Acceptor.h
@@ -35,7 +35,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// TAO SCIOP_Acceptor concrete call defination
+// TAO SCIOP_Acceptor concrete call definition
 
 /**
  * @class TAO_SCIOP_Acceptor
diff --git a/tao/Strategies/SCIOP_Connection_Handler.cpp b/tao/Strategies/SCIOP_Connection_Handler.cpp
index c81e4783c9d..c79fc982932 100644
--- a/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/SCIOP_Connection_Handler.h"
 
 #if TAO_HAS_SCIOP == 1
@@ -29,10 +31,6 @@
 #include "tao/Wait_Strategy.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (tao,
-           SCIOP_Connection_Handler,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (ACE_Thread_Manager *t)
diff --git a/tao/Strategies/SCIOP_Connector.cpp b/tao/Strategies/SCIOP_Connector.cpp
index 0d37ec2c6a9..8ae059b136f 100644
--- a/tao/Strategies/SCIOP_Connector.cpp
+++ b/tao/Strategies/SCIOP_Connector.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/SCIOP_Connector.h"
 #include "tao/Strategies/SCIOP_Profile.h"
 
@@ -19,18 +21,12 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/Strategies_T.h"
 
-
-ACE_RCSID (TAO,
-           SCIOP_Connector,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SCIOP_Connector::TAO_SCIOP_Connector (void)
   : TAO_Connector (TAO_TAG_SCIOP_PROFILE),
     connect_strategy_ (),
-    base_connector_ ()
+    base_connector_ (0)
 {
 }
 
diff --git a/tao/Strategies/SCIOP_Connector.h b/tao/Strategies/SCIOP_Connector.h
index f6a61b52bd9..ce9da4a1318 100644
--- a/tao/Strategies/SCIOP_Connector.h
+++ b/tao/Strategies/SCIOP_Connector.h
@@ -75,7 +75,7 @@ public:
 
   typedef ACE_Connect_Strategy<TAO_SCIOP_Connection_Handler,
                                ACE_SOCK_SEQPACK_CONNECTOR>
-          TAO_SCIOP_CONNECT_STRATEGY ;
+          TAO_SCIOP_CONNECT_STRATEGY;
 
   typedef ACE_Strategy_Connector<TAO_SCIOP_Connection_Handler,
                                  ACE_SOCK_SEQPACK_CONNECTOR>
diff --git a/tao/Strategies/SCIOP_Endpoint.cpp b/tao/Strategies/SCIOP_Endpoint.cpp
index 6bf21e7fcff..072c3f27aa2 100644
--- a/tao/Strategies/SCIOP_Endpoint.cpp
+++ b/tao/Strategies/SCIOP_Endpoint.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/SCIOP_Endpoint.h"
 
 #if TAO_HAS_SCIOP == 1
@@ -14,11 +16,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (Strategies,
-           SCIOP_Endpoint,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Strategies/SCIOP_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/tao/Strategies/SCIOP_Endpoint.h b/tao/Strategies/SCIOP_Endpoint.h
index b945845634b..2de5c4db140 100644
--- a/tao/Strategies/SCIOP_Endpoint.h
+++ b/tao/Strategies/SCIOP_Endpoint.h
@@ -82,8 +82,8 @@ public:
   virtual int addr_to_string (char *buffer, size_t length);
   virtual TAO_Endpoint *duplicate (void);
 
-  /// Return true if this endpoint is equivalent to <other_endpoint>.  Two
-  /// endpoints are equivalent iff their port and host are the same.
+  /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
+  /// endpoints are equivalent if their port and host are the same.
   virtual CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
@@ -98,7 +98,7 @@ public:
   /// ownership of this string.
   const char *host (void) const;
 
-  /// Copy the string <h> into <host_> and return the resulting pointer.
+  /// Copy the string @a h into <host_> and return the resulting pointer.
   /// This object maintains ownership of this string.
   const char *host (const char *h);
 
@@ -130,7 +130,7 @@ private:
   /// Canonical copy constructor
   /**
    * In private section to prevent clients from invoking this
-   * accidentally. Clients should only use duplicate () to make a depp
+   * accidentally. Clients should only use duplicate () to make a deep
    * copy
    */
   TAO_SCIOP_Endpoint (const TAO_SCIOP_Endpoint &);
diff --git a/tao/Strategies/SCIOP_Factory.cpp b/tao/Strategies/SCIOP_Factory.cpp
index a80c8f7e0b3..5976cefa1ca 100644
--- a/tao/Strategies/SCIOP_Factory.cpp
+++ b/tao/Strategies/SCIOP_Factory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/SCIOP_Factory.h"
 #include "tao/Strategies/SCIOP_Acceptor.h"
 #include "tao/Strategies/SCIOP_Connector.h"
@@ -7,10 +9,6 @@
 
 #include "tao/IOPC.h"
 
-ACE_RCSID (tao,
-           SCIOP_Factory,
-           "$Id$")
-
 static const char prefix_[] = "sciop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Strategies/SCIOP_Profile.cpp b/tao/Strategies/SCIOP_Profile.cpp
index 016f5b32aec..6aceab001eb 100644
--- a/tao/Strategies/SCIOP_Profile.cpp
+++ b/tao/Strategies/SCIOP_Profile.cpp
@@ -1,5 +1,5 @@
 // This may look like C, but it's really -*- C++ -*-
-// SCIOP_Profile.cpp
+// $Id$
 
 #include "tao/Strategies/SCIOP_Profile.h"
 
@@ -14,10 +14,6 @@
 #include "tao/Strategies/sciop_endpointsC.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID(Strategies,
-          SCIOP_Profile,
-          "$Id$")
-
 static const char prefix_[] = "sciop";
 
 const char TAO_SCIOP_Profile::object_key_delimiter_ = '/';
diff --git a/tao/Strategies/SCIOP_Transport.cpp b/tao/Strategies/SCIOP_Transport.cpp
index 777c8e08b3c..b58775f64ba 100644
--- a/tao/Strategies/SCIOP_Transport.cpp
+++ b/tao/Strategies/SCIOP_Transport.cpp
@@ -21,10 +21,6 @@
 #include "tao/Protocols_Hooks.h"
 #include "tao/Adapter.h"
 
-ACE_RCSID (tao,
-           SCIOP_Transport,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler,
diff --git a/tao/Strategies/SHMIOP_Acceptor.cpp b/tao/Strategies/SHMIOP_Acceptor.cpp
index 6a117d233a3..4e5071e5371 100644
--- a/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -15,10 +15,6 @@
 #include "ace/os_include/os_netdb.h"
 #include "ace/OS_NS_ctype.h"
 
-ACE_RCSID (Strategies,
-           SHMIOP_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (void)
@@ -195,11 +191,13 @@ TAO_SHMIOP_Acceptor::open (TAO_ORB_Core *orb_core,
   if (this->parse_options (options) == -1)
     return -1;
 
-  if (ACE_OS::ace_isdigit (*port) == 0)
-    return -1;                  // Port number must consist of digits
-
   if (port)
-    this->address_.set (ACE_TEXT_CHAR_TO_TCHAR(port));
+    {
+      if (ACE_OS::ace_isdigit (*port) == 0)
+        return -1;                  // Port number must consist of digits
+
+      this->address_.set (ACE_TEXT_CHAR_TO_TCHAR(port));
+    }
 
   return this->open_i (orb_core, reactor);
 }
diff --git a/tao/Strategies/SHMIOP_Connection_Handler.cpp b/tao/Strategies/SHMIOP_Connection_Handler.cpp
index 2f5a6b4c0d6..51ea5dd0095 100644
--- a/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -20,10 +20,6 @@
 #include "ace/os_include/netinet/os_tcp.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (Strategies,
-           SHMIOP_Connection_Handler,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager *t)
diff --git a/tao/Strategies/SHMIOP_Connector.cpp b/tao/Strategies/SHMIOP_Connector.cpp
index aa4a0e7acd8..f8f79841c20 100644
--- a/tao/Strategies/SHMIOP_Connector.cpp
+++ b/tao/Strategies/SHMIOP_Connector.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "tao/Strategies/SHMIOP_Connector.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
@@ -17,16 +16,12 @@
 #include "tao/Blocked_Connect_Strategy.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (Strategies,
-           SHMIOP_Connector,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (void)
   : TAO_Connector (TAO_TAG_SHMEM_PROFILE),
     connect_strategy_ (),
-    base_connector_ ()
+    base_connector_ (0)
 {
 }
 
diff --git a/tao/Strategies/SHMIOP_Connector.h b/tao/Strategies/SHMIOP_Connector.h
index cf56fd06bee..e34794cec4f 100644
--- a/tao/Strategies/SHMIOP_Connector.h
+++ b/tao/Strategies/SHMIOP_Connector.h
@@ -83,7 +83,7 @@ public:
 
   typedef ACE_Connect_Strategy<TAO_SHMIOP_Connection_Handler,
                                ACE_MEM_CONNECTOR>
-          TAO_SHMIOP_CONNECT_STRATEGY ;
+          TAO_SHMIOP_CONNECT_STRATEGY;
 
   typedef ACE_Strategy_Connector<TAO_SHMIOP_Connection_Handler,
                                  ACE_MEM_CONNECTOR>
diff --git a/tao/Strategies/SHMIOP_Endpoint.cpp b/tao/Strategies/SHMIOP_Endpoint.cpp
index 3304db3ecf6..2e7fbb565db 100644
--- a/tao/Strategies/SHMIOP_Endpoint.cpp
+++ b/tao/Strategies/SHMIOP_Endpoint.cpp
@@ -10,12 +10,6 @@
 
 #include "ace/OS_NS_stdio.h"
 
-
-ACE_RCSID (Strategies,
-           SHMIOP_Endpoint,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Strategies/SHMIOP_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/tao/Strategies/SHMIOP_Endpoint.h b/tao/Strategies/SHMIOP_Endpoint.h
index d36a906b79c..829e57929d9 100644
--- a/tao/Strategies/SHMIOP_Endpoint.h
+++ b/tao/Strategies/SHMIOP_Endpoint.h
@@ -87,7 +87,7 @@ public:
   virtual TAO_Endpoint *duplicate (void);
 
   /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
-  /// endpoints are equivalent iff their port and host are the same.
+  /// endpoints are equivalent if their port and host are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
@@ -103,7 +103,7 @@ public:
   /// ownership of this string.
   const char *host (void) const;
 
-  /// Copy the string <h> into <host_> and return the resulting pointer.
+  /// Copy the string @a h into <host_> and return the resulting pointer.
   /// This object maintains ownership of this string.
   const char *host (const char *h);
 
diff --git a/tao/Strategies/SHMIOP_Factory.cpp b/tao/Strategies/SHMIOP_Factory.cpp
index 959e03d9bac..a1d055cf22b 100644
--- a/tao/Strategies/SHMIOP_Factory.cpp
+++ b/tao/Strategies/SHMIOP_Factory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/SHMIOP_Factory.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
@@ -11,12 +13,6 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_strings.h"
 
-
-ACE_RCSID (Strategies,
-           SHMIOP_Factory,
-           "$Id$")
-
-
 static const char prefix_[] = "shmiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Strategies/SHMIOP_Profile.cpp b/tao/Strategies/SHMIOP_Profile.cpp
index f67610c2ed4..7c153c6ad8d 100644
--- a/tao/Strategies/SHMIOP_Profile.cpp
+++ b/tao/Strategies/SHMIOP_Profile.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/SHMIOP_Profile.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
@@ -12,11 +14,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_netdb.h"
-
-ACE_RCSID (Strategies,
-           SHMIOP_Profile,
-           "$Id$")
-
 #include "ace/os_include/os_netdb.h"
 
 static const char prefix_[] = "shmiop";
diff --git a/tao/Strategies/SHMIOP_Transport.cpp b/tao/Strategies/SHMIOP_Transport.cpp
index c7bcf6ba2f7..ae41d111420 100644
--- a/tao/Strategies/SHMIOP_Transport.cpp
+++ b/tao/Strategies/SHMIOP_Transport.cpp
@@ -16,9 +16,6 @@
 #include "tao/Resume_Handle.h"
 #include "tao/GIOP_Message_Base.h"
 
-ACE_RCSID (Strategies, SHMIOP_Transport, "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler,
diff --git a/tao/Strategies/Strategies.mpc b/tao/Strategies/Strategies.mpc
new file mode 100644
index 00000000000..6940d823875
--- /dev/null
+++ b/tao/Strategies/Strategies.mpc
@@ -0,0 +1,45 @@
+//$Id$
+project(*core_idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -Sci -SS -Gp -Gd -Sorb -DCORBA3 \
+                -Wb,export_macro=TAO_Strategies_Export \
+                -Wb,export_include=tao/Strategies/strategies_export.h \
+                -iC tao/Strategies
+    idlflags -= -St
+    uiop_endpoints.pidl
+    sciop_endpoints.pidl
+    COIOP_Endpoints.pidl
+  }
+
+  specific {
+    install_dir = tao/Strategies
+  }
+}
+
+project(Strategies) : taolib, tao_output, install, pi, anytypecode, core_strategies, taoidldefaults {
+  after       += *core_idl
+  sharedname   = TAO_Strategies
+  dynamicflags += TAO_STRATEGIES_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    uiop_endpointsC.cpp
+    sciop_endpointsC.cpp
+    COIOP_EndpointsC.cpp
+  }
+
+  Header_Files {
+    *.h
+    uiop_endpointsC.h
+    sciop_endpointsC.h
+    COIOP_EndpointsC.h
+    uiop_endpointsS.h
+    sciop_endpointsS.h
+    COIOP_EndpointsS.h
+  }
+
+  specific {
+    install_dir = tao/Strategies
+  }
+}
diff --git a/tao/Strategies/Strategies_ORBInitializer.cpp b/tao/Strategies/Strategies_ORBInitializer.cpp
index 6aa63c6b810..05913f2a6ac 100644
--- a/tao/Strategies/Strategies_ORBInitializer.cpp
+++ b/tao/Strategies/Strategies_ORBInitializer.cpp
@@ -1,9 +1,6 @@
-#include "tao/Strategies/Strategies_ORBInitializer.h"
-
-ACE_RCSID (Strategies,
-           Strategies_ORBInitializer,
-           "$Id$")
+// $Id$
 
+#include "tao/Strategies/Strategies_ORBInitializer.h"
 #include "tao/Exception.h"
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfo.h"
diff --git a/tao/Strategies/UIOP_Acceptor.cpp b/tao/Strategies/UIOP_Acceptor.cpp
index 96c87fbea5c..b6c0aecd997 100644
--- a/tao/Strategies/UIOP_Acceptor.cpp
+++ b/tao/Strategies/UIOP_Acceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/UIOP_Acceptor.h"
 
 #if TAO_HAS_UIOP == 1
@@ -15,10 +17,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (Strategies,
-           UIOP_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (void)
diff --git a/tao/Strategies/UIOP_Connection_Handler.cpp b/tao/Strategies/UIOP_Connection_Handler.cpp
index a52abb6c64b..2b46582703c 100644
--- a/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -18,10 +18,6 @@
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Protocols_Hooks.h"
 
-ACE_RCSID (Strategies,
-           UIOP_Connection_Handler,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (ACE_Thread_Manager *t)
diff --git a/tao/Strategies/UIOP_Connector.cpp b/tao/Strategies/UIOP_Connector.cpp
index 23e2520efc9..ed02a463ef0 100644
--- a/tao/Strategies/UIOP_Connector.cpp
+++ b/tao/Strategies/UIOP_Connector.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/UIOP_Connector.h"
 
 #if TAO_HAS_UIOP == 1
@@ -16,17 +18,12 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID(Strategies,
-          UIOP_Connector,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIOP_Connector::TAO_UIOP_Connector (void)
   : TAO_Connector (TAO_TAG_UIOP_PROFILE),
     connect_strategy_ (),
-    base_connector_ ()
+    base_connector_ (0)
 {
 }
 
diff --git a/tao/Strategies/UIOP_Connector.h b/tao/Strategies/UIOP_Connector.h
index a12dd13fb2b..64b6c36b556 100644
--- a/tao/Strategies/UIOP_Connector.h
+++ b/tao/Strategies/UIOP_Connector.h
@@ -92,7 +92,7 @@ public:
 
   typedef ACE_Connect_Strategy<TAO_UIOP_Connection_Handler,
                                ACE_LSOCK_CONNECTOR>
-          TAO_UIOP_CONNECT_STRATEGY ;
+          TAO_UIOP_CONNECT_STRATEGY;
 
   typedef ACE_Strategy_Connector<TAO_UIOP_Connection_Handler,
                                  ACE_LSOCK_CONNECTOR>
diff --git a/tao/Strategies/UIOP_Endpoint.cpp b/tao/Strategies/UIOP_Endpoint.cpp
index c49495ffb46..57060d5421d 100644
--- a/tao/Strategies/UIOP_Endpoint.cpp
+++ b/tao/Strategies/UIOP_Endpoint.cpp
@@ -1,19 +1,12 @@
+// $Id$
+
 #include "tao/Strategies/UIOP_Endpoint.h"
 #include "tao/Strategies/UIOP_Connection_Handler.h"
-
 #include "tao/ORB_Constants.h"
-
 #include "ace/OS_NS_string.h"
 
-
 #if TAO_HAS_UIOP == 1
 
-
-ACE_RCSID (Strategies,
-           UIOP_Endpoint,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Strategies/UIOP_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/tao/Strategies/UIOP_Endpoint.h b/tao/Strategies/UIOP_Endpoint.h
index 5b82b92ad95..45fc4413601 100644
--- a/tao/Strategies/UIOP_Endpoint.h
+++ b/tao/Strategies/UIOP_Endpoint.h
@@ -65,8 +65,8 @@ public:
   virtual int addr_to_string (char *buffer, size_t length);
   virtual TAO_Endpoint *duplicate (void);
 
-  /// Return true if this endpoint is equivalent to <other_endpoint>.  Two
-  /// endpoints are equivalent iff their rendezvous points are the same.
+  /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
+  /// endpoints are equivalent if their rendezvous points are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
   /// Return a hash value for this object.
diff --git a/tao/Strategies/UIOP_Factory.cpp b/tao/Strategies/UIOP_Factory.cpp
index b679a682428..c99d2f29191 100644
--- a/tao/Strategies/UIOP_Factory.cpp
+++ b/tao/Strategies/UIOP_Factory.cpp
@@ -7,17 +7,9 @@
 
 #include "tao/Strategies/UIOP_Acceptor.h"
 #include "tao/Strategies/UIOP_Connector.h"
-
 #include "tao/ORB_Constants.h"
-
 #include "ace/OS_NS_strings.h"
 
-
-ACE_RCSID (Strategies,
-           UIOP_Factory,
-           "$Id$")
-
-
 static const char prefix_[] = "uiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Strategies/UIOP_Profile.cpp b/tao/Strategies/UIOP_Profile.cpp
index 6cf91b2f28d..a88cc8a522c 100644
--- a/tao/Strategies/UIOP_Profile.cpp
+++ b/tao/Strategies/UIOP_Profile.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Strategies/UIOP_Profile.h"
 
 #if TAO_HAS_UIOP == 1
@@ -14,10 +16,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_ctype.h"
 
-ACE_RCSID (Strategies,
-           UIOP_Profile,
-           "$Id$")
-
 static const char prefix_[] = "uiop";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Strategies/UIOP_Transport.cpp b/tao/Strategies/UIOP_Transport.cpp
index c2d540c4a9e..c632dc5515c 100644
--- a/tao/Strategies/UIOP_Transport.cpp
+++ b/tao/Strategies/UIOP_Transport.cpp
@@ -15,11 +15,6 @@
 #include "tao/debug.h"
 #include "tao/GIOP_Message_Base.h"
 
-ACE_RCSID (Strategies,
-           UIOP_Transport,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler,
diff --git a/tao/Strategies/advanced_resource.cpp b/tao/Strategies/advanced_resource.cpp
index 70a1fd881da..735321d25ed 100644
--- a/tao/Strategies/advanced_resource.cpp
+++ b/tao/Strategies/advanced_resource.cpp
@@ -35,8 +35,6 @@
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID(Strategies, advanced_resource, "$Id$")
-
 #if !defined (TAO_DEFAULT_REACTOR_TYPE)
 #define TAO_DEFAULT_REACTOR_TYPE TAO_REACTOR_TP
 #endif /* !TAO_DEFAULT_REACTOR_TYPE */
diff --git a/tao/Strategies/sciop_endpoints.pidl b/tao/Strategies/sciop_endpoints.pidl
index 0f1d33fce25..8922d861aee 100644
--- a/tao/Strategies/sciop_endpoints.pidl
+++ b/tao/Strategies/sciop_endpoints.pidl
@@ -8,18 +8,6 @@
  * endpoints per single profile.  Data structures defined here are
  * used for transmission of SCIOP Endpoints.  See SCIOP_Profile.*
  * for more details.
- *
- * This file is used to generate the code in
- * sciop_endpoints.* The command used to generate code
- * is:
- *
- * tao_idl
- *          -o orig -Gp -Gd -Sa -DCORBA3 -Sci
- *           -Wb,export_macro=TAO_Strategies_Export \
- *           -Wb,export_include="strategies_export.h" \
- *           -Wb,pre_include="ace/pre.h" \
- *           -Wb,post_include="ace/post.h" \
- *           sciop_endpoints.pidl
  */
 
 #ifndef _SCIOP_ENDPOINTS_IDL_
diff --git a/tao/Strategies/uiop_endpoints.pidl b/tao/Strategies/uiop_endpoints.pidl
index c53508edd92..8d886f88382 100644
--- a/tao/Strategies/uiop_endpoints.pidl
+++ b/tao/Strategies/uiop_endpoints.pidl
@@ -7,18 +7,6 @@
  * endpoints per single profile.  Data structures defined here are
  * used for transmission of UIOP Endpoints.  See UIOP_Profile.* for
  * more details.
- *
- * This file is used to generate the code in
- * uiop_endpoints.* The command used to generate code
- * is:
- *
- * tao_idl
- *          -o orig -Gp -Gd -Sa -DCORBA3 -Sci
- *           -Wb,export_macro=TAO_Strategies_Export \
- *           -Wb,export_include="strategies_export.h" \
- *           -Wb,pre_include="ace/pre.h" \
- *           -Wb,post_include="ace/post.h" \
- *           uiop_endpoints.pidl
  */
 
 #ifndef _UIOP_ENDPOINTS_IDL_
diff --git a/tao/StringSeq.pidl b/tao/StringSeq.pidl
index 34fc64e515b..536f54692a5 100644
--- a/tao/StringSeq.pidl
+++ b/tao/StringSeq.pidl
@@ -1,22 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-// ================================================================
-//
-//   This file is used to generate the code in StringSeqC.*
-//   The command used to generate code is:
-//
-//     tao_idl
-//       -o orig -GA -SS -Sci
-//          -Wb,export_macro=TAO_Export
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
-//          StringSeq.pidl
-//
-// ================================================================
-
-
 #ifndef TAO_CORBA_STRING_SEQ_IDL
 #define TAO_CORBA_STRING_SEQ_IDL
 
diff --git a/tao/String_Alloc.cpp b/tao/String_Alloc.cpp
index 25817ce889d..3b337fbf9ed 100644
--- a/tao/String_Alloc.cpp
+++ b/tao/String_Alloc.cpp
@@ -1,5 +1,7 @@
-#include "String_Alloc.h"
+// -*- C++ -*-
+// $Id$
 
+#include "tao/String_Alloc.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_Memory.h"
diff --git a/tao/String_Traits_T.h b/tao/String_Traits_T.h
index 3c5c6424ff8..ca1b05d990f 100644
--- a/tao/String_Traits_T.h
+++ b/tao/String_Traits_T.h
@@ -41,7 +41,6 @@ struct string_traits_decorator
     std::generate(begin, end, &derived::default_initializer);
   }
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_range(
@@ -49,15 +48,7 @@ struct string_traits_decorator
   {
     std::transform(begin, end, dst, &derived::duplicate);
   }
-# else
-  inline static void copy_range(
-      char_type ** begin, char_type ** end, char_type ** dst)
-  {
-    std::transform(begin, end, dst, &derived::duplicate);
-  }
-# endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_swap_range(
@@ -65,13 +56,6 @@ struct string_traits_decorator
   {
     std::swap_ranges(begin, end, dst);
   }
-# 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 */
 
   inline static void release_range(
       char_type ** begin, char_type ** end)
diff --git a/tao/Stub.cpp b/tao/Stub.cpp
index 94095ac0cbe..1b8d239a191 100644
--- a/tao/Stub.cpp
+++ b/tao/Stub.cpp
@@ -43,7 +43,6 @@ TAO_Stub::TAO_Stub (const char *repository_id,
   , forward_profiles_ (0)
   , forward_profiles_perm_ (0)
   , profile_in_use_ (0)
-  , profile_lock_ptr_ (0)
   , profile_success_ (false)
   , refcount_ (1)
 #if (TAO_HAS_CORBA_MESSAGING == 1)
@@ -74,8 +73,10 @@ TAO_Stub::TAO_Stub (const char *repository_id,
   // Cache the ORB pointer to respond faster to certain queries.
   this->orb_ = CORBA::ORB::_duplicate (this->orb_core_->orb ());
 
-  this->profile_lock_ptr_ =
-    this->orb_core_->client_factory ()->create_profile_lock ();
+  // Explicit trigger the loading of the client strategy factory at this moment.
+  // Not doing it here could lead to a problem loading it later on during
+  // an upcall
+  (void) this->orb_core_->client_factory ();
 
   this->base_profiles (profiles);
 }
@@ -97,8 +98,6 @@ TAO_Stub::~TAO_Stub (void)
       this->profile_in_use_ = 0;
     }
 
-  delete this->profile_lock_ptr_;
-
 #if (TAO_HAS_CORBA_MESSAGING == 1)
   delete this->policies_;
 #endif
@@ -114,9 +113,9 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles,
 {
   // we assume that the profile_in_use_ is being
   // forwarded!  Grab the lock so things don't change.
-  ACE_MT (ACE_GUARD (ACE_Lock,
+  ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
                      guard,
-                     *this->profile_lock_ptr_));
+                     this->profile_lock_));
 
   if (permanent_forward)
     {
@@ -156,9 +155,9 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index)
 {
   // We are creating the IOR info. Let us not be disturbed. So grab a
   // lock.
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
+  ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                             guard,
-                            *this->profile_lock_ptr_,
+                            this->profile_lock_,
                             -1));
 
   IOP::IOR *tmp_info = 0;
@@ -223,7 +222,9 @@ TAO_Stub::object_key (void) const
   if (this->forward_profiles_)
     {
       // Double-checked
-      ACE_Guard<ACE_Lock> obj (*this->profile_lock_ptr_);
+      // FUZZ: disable check_for_ACE_Guard
+      ACE_Guard<TAO_SYNCH_MUTEX> obj (const_cast <TAO_SYNCH_MUTEX&>(this->profile_lock_));
+      // FUZZ: enable check_for_ACE_Guard
 
       if (obj.locked () != 0 &&  this->forward_profiles_ != 0)
         return this->forward_profiles_->get_profile (0)->object_key ();
@@ -518,9 +519,9 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr)
     }
   else
     {
-      ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
+      ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                                 guard,
-                                *this->profile_lock_ptr_,
+                                this->profile_lock_,
                                 0));
 
       ACE_ASSERT(this->forward_profiles_ !=0);
@@ -551,17 +552,4 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr)
   return (CORBA::Boolean) cdr.good_bit ();
 }
 
-void
-TAO_Stub::_incr_refcnt (void)
-{
-  ++this->refcount_;
-}
-
-void
-TAO_Stub::_decr_refcnt (void)
-{
-  if (--this->refcount_ == 0)
-    delete this;
-}
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Stub.h b/tao/Stub.h
index d43426f40a9..9234ad40e1b 100644
--- a/tao/Stub.h
+++ b/tao/Stub.h
@@ -118,7 +118,7 @@ public:
 
   /// Return the Profile lock. This lock can be used at places where
   /// profiles need to be edited.
-  ACE_Lock *profile_lock (void) const;
+  const TAO_SYNCH_MUTEX& profile_lock (void) const;
 
   /// Manage the base (non-forwarded) profiles.
   /// Returns a pointer to the profile_in_use object.  This object
@@ -361,15 +361,15 @@ protected:
   /// linked list of TAO_MProfile objects.
   TAO_MProfile *forward_profiles_;
 
-  // The bookmark indicating permanent forward occured,
-  // the pointer is used to indentify bottom of stack forward_profiles_
+  /// The bookmark indicating permanent forward occurred,
+  /// the pointer is used to identify bottom of stack forward_profiles_
   TAO_MProfile *forward_profiles_perm_;
 
   /// This is the profile that we are currently sending/receiving with.
   TAO_Profile *profile_in_use_;
 
   /// Mutex to protect access to the forwarding profile.
-  ACE_Lock* profile_lock_ptr_;
+  TAO_SYNCH_MUTEX profile_lock_;
 
   /// Have we successfully talked to the forward profile yet?
   CORBA::Boolean profile_success_;
@@ -399,13 +399,12 @@ protected:
   /**
    * This should be the same value as cached in the ORB_Core. The
    * reason for caching this helps our generated code, notably the
-   * stubs to be decoubled from ORB_Core. Please do not move it away.
+   * stubs to be decoupled from ORB_Core. Please do not move it away.
    */
   CORBA::Boolean const collocation_opt_;
 
-
-  // True if forwarding request upon some specific exceptions
-  // (e.g. OBJECT_NOT_EXIST) already happened.
+  /// True if forwarding request upon some specific exceptions
+  /// (e.g. OBJECT_NOT_EXIST) already happened.
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, bool> forwarded_on_exception_;
 };
 
@@ -434,7 +433,6 @@ public:
 
 protected:
   TAO_Stub *p_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Stub.inl b/tao/Stub.inl
index a0ecaed898c..d4b0ae3d8c7 100644
--- a/tao/Stub.inl
+++ b/tao/Stub.inl
@@ -16,10 +16,10 @@ TAO_Stub::reset_base (void)
 }
 
 
-ACE_INLINE ACE_Lock*
+ACE_INLINE const TAO_SYNCH_MUTEX&
 TAO_Stub::profile_lock (void) const
 {
-  return this->profile_lock_ptr_;
+  return this->profile_lock_;
 }
 
 ACE_INLINE void
@@ -53,9 +53,9 @@ TAO_Stub::reset_profiles_i (void)
 ACE_INLINE void
 TAO_Stub::reset_profiles (void)
 {
-  ACE_MT (ACE_GUARD (ACE_Lock,
+  ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
                      guard,
-                     *this->profile_lock_ptr_));
+                     this->profile_lock_));
   this->reset_profiles_i ();
 }
 
@@ -156,9 +156,9 @@ TAO_Stub::next_profile_i (void)
 ACE_INLINE TAO_Profile *
 TAO_Stub::next_profile (void)
 {
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
+  ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                             guard,
-                            *this->profile_lock_ptr_,
+                            this->profile_lock_,
                             0));
   return this->next_profile_i ();
 }
@@ -184,9 +184,9 @@ TAO_Stub::valid_profile (void) const
 ACE_INLINE TAO_Profile *
 TAO_Stub::base_profiles (const TAO_MProfile &mprofiles)
 {
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
+  ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                             guard,
-                            *this->profile_lock_ptr_,
+                            this->profile_lock_,
                             0));
 
   // first reset things so we start from scratch!
@@ -204,9 +204,9 @@ TAO_Stub::base_profiles (const TAO_MProfile &mprofiles)
 ACE_INLINE CORBA::Boolean
 TAO_Stub::next_profile_retry (void)
 {
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
+  ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                             guard,
-                            *this->profile_lock_ptr_,
+                            this->profile_lock_,
                             0));
 
   if (this->profile_success_ && this->forward_profiles_)
@@ -347,6 +347,20 @@ bool TAO_Stub::forwarded_on_exception () const
   return forwarded_on_exception_.value ();
 }
 
+ACE_INLINE
+void
+TAO_Stub::_incr_refcnt (void)
+{
+  ++this->refcount_;
+}
+
+ACE_INLINE
+void
+TAO_Stub::_decr_refcnt (void)
+{
+  if (--this->refcount_ == 0)
+    delete this;
+}
 
 // ---------------------------------------------------------------
 
diff --git a/tao/Stub_Factory.cpp b/tao/Stub_Factory.cpp
index 1a5ff920cb9..4709929cbf6 100644
--- a/tao/Stub_Factory.cpp
+++ b/tao/Stub_Factory.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Stub_Factory.h"
diff --git a/tao/Synch_Invocation.cpp b/tao/Synch_Invocation.cpp
index 9d6b1f22721..de7f3e18ad4 100644
--- a/tao/Synch_Invocation.cpp
+++ b/tao/Synch_Invocation.cpp
@@ -143,7 +143,7 @@ namespace TAO
         countdown.update ();
 
         // For some strategies one may want to release the transport
-        // back to  cache. If the idling is successfull let the
+        // back to  cache. If the idling is successful let the
         // resolver about that.
         if (transport->idle_after_send ())
           this->resolver_.transport_released ();
@@ -249,9 +249,9 @@ namespace TAO
      */
 
     bool const
-      expired= (max_wait_time && ACE_Time_Value::zero == *max_wait_time);
+      expired = (max_wait_time && ACE_Time_Value::zero == *max_wait_time);
     if (expired)
-      errno= ETIME;
+      errno = ETIME;
     int const
       reply_error = expired ? -1 :
         this->resolver_.transport ()->wait_strategy ()->wait (max_wait_time, rd);
@@ -498,7 +498,7 @@ namespace TAO
     mon.set_status (TAO_INVOKE_USER_EXCEPTION);
 
     // We must manage the memory allocated
-    // by the call above to alloc(). 
+    // by the call above to alloc().
     auto_ptr<CORBA::Exception> safety (exception);
 
     exception->_raise ();
@@ -564,6 +564,9 @@ namespace TAO
                         && (ACE_OS_String::strcmp (type_id.in (),
                                 "IDL:omg.org/CORBA/INV_OBJREF:1.0") == 0))))))
       {
+        // If we are here then possibly we'll need a restart.
+        mon.set_status (TAO_INVOKE_RESTART);
+
         if (do_forward)
           this->stub ()->forwarded_on_exception (true);
 
@@ -597,6 +600,7 @@ namespace TAO
           }
 
         // Fall through and raise an exception.
+        mon.set_status (TAO_INVOKE_FAILURE);
       }
 
     CORBA::SystemException *ex = TAO::create_system_exception (type_id.in ());
diff --git a/tao/Synch_Queued_Message.cpp b/tao/Synch_Queued_Message.cpp
index 7cae04d7a61..02da7a136f7 100644
--- a/tao/Synch_Queued_Message.cpp
+++ b/tao/Synch_Queued_Message.cpp
@@ -1,4 +1,5 @@
-// "$Id$"
+// -*- C++ -*-
+// $Id$
 
 #include "tao/Synch_Queued_Message.h"
 #include "tao/debug.h"
@@ -23,7 +24,10 @@ TAO_Synch_Queued_Message::TAO_Synch_Queued_Message (
 
 TAO_Synch_Queued_Message::~TAO_Synch_Queued_Message (void)
 {
-
+  if (this->own_contents_ && this->contents_ != 0)
+    {
+      ACE_Message_Block::release (this->contents_);
+    }
 }
 
 const ACE_Message_Block *
diff --git a/tao/SystemException.cpp b/tao/SystemException.cpp
index cbd8b77202a..4969bcc967d 100644
--- a/tao/SystemException.cpp
+++ b/tao/SystemException.cpp
@@ -608,7 +608,6 @@ CORBA::SystemException::_tao_get_omg_exception_description (
       "Registration of TaggedComponentFactory failed because a factory already exists for the given id.", // 24
        "Iteration has no more elements.", // 25
        "Invocation of this operation not allowed in post_init." // 26
-
     };
 
   static const char *TRANSIENT_TABLE[] =
diff --git a/tao/TAO_Internal.cpp b/tao/TAO_Internal.cpp
index 2283eb1a270..ca1d1fc3c01 100644
--- a/tao/TAO_Internal.cpp
+++ b/tao/TAO_Internal.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/TAO_Internal.h"
@@ -272,7 +273,7 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv)
   ACE_ARGV copyargv (argc, argv, true, true);
 
   // Adjust to proper type
-  int tmpargc = argc;
+  int tmpargc = copyargv.argc (); // use copied count, not original
   ACE_Argv_Type_Converter cvtargv (tmpargc, copyargv.argv());
 
   tmpargc = cvtargv.get_argc ();
@@ -353,7 +354,7 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv)
                       ACE_TEXT ("TAO (%P|%t) - process-wide service ")
                       ACE_TEXT ("configuration context had %d failed ")
                       ACE_TEXT ("directives\n"), status));
-        }          
+        }
     }
 
   if (TAO_debug_level > 2)
@@ -515,7 +516,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg,
                       ACE_TEXT ("TAO (%P|%t) - ORB-specific service ")
                       ACE_TEXT ("configuration context had %d failed ")
                       ACE_TEXT ("directives\n"), status));
-        }          
+        }
     }
 
 
@@ -959,12 +960,8 @@ namespace
       {
         TAO_debug_level = ACE_Env_Value<u_int> ("TAO_ORB_DEBUG", 0);
 
-        char * const value = ACE_OS::getenv ("TAO_ORB_DEBUG");
-
-        if (value != 0)
+        if (TAO_debug_level != 0)
           {
-            TAO_debug_level = ACE_OS::atoi (value);
-
             if (TAO_debug_level <= 0)
               {
                 TAO_debug_level = 1;
diff --git a/tao/TAO_Server_Request.cpp b/tao/TAO_Server_Request.cpp
index 8c72e760807..f2156f06974 100644
--- a/tao/TAO_Server_Request.cpp
+++ b/tao/TAO_Server_Request.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/TAO_Server_Request.h"
diff --git a/tao/TAO_Singleton.cpp b/tao/TAO_Singleton.cpp
index 53a926922d4..700087892bd 100644
--- a/tao/TAO_Singleton.cpp
+++ b/tao/TAO_Singleton.cpp
@@ -31,7 +31,7 @@ TAO_Singleton<TYPE, ACE_LOCK>::dump (void)
   ACE_TRACE ("TAO_Singleton<TYPE, ACE_LOCK>::dump");
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %x"),
+  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %@"),
               TAO_Singleton<TYPE, ACE_LOCK>::instance_i ()));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
@@ -128,7 +128,7 @@ TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
   ACE_TRACE ("TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump");
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %x"),
+  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %@"),
               TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ()));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
diff --git a/tao/TC.mpc b/tao/TC.mpc
deleted file mode 100644
index 6c26e281a41..00000000000
--- a/tao/TC.mpc
+++ /dev/null
@@ -1,60 +0,0 @@
-//$Id$
-project(*idl) : taolib_with_idl, tao_versioning_idl_defaults {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h \
-                -Wb,export_macro=TAO_Transport_Current_Export \
-                -o TransportCurrent -I./TransportCurrent
-    idlflags -= -Sa -St -Sci -SS
-
-    TransportCurrent/TC.idl
-  }
-}
-
-project(TC) : taolib_with_idl, tao_output, taoidldefaults, install, interceptors, pi {
-  after += *idl
-  requires    += transport_current
-  sharedname   = TAO_TC
-  dynamicflags += TAO_TRANSPORT_CURRENT_BUILD_DLL
-
-  Source_Files {
-    TransportCurrent/Current_Impl.cpp
-    TransportCurrent/Current_Loader.cpp
-    TransportCurrent/Current_ORBInitializer_Base.cpp
-  }
-
-  Source_Files {
-    TransportCurrent/TCC.cpp
-  }
-
-  Header_Files {
-    TransportCurrent/Current_Impl.h
-    TransportCurrent/Current_Loader.h
-    TransportCurrent/Current_ORBInitializer.h
-    TransportCurrent/Current_ORBInitializer_Base.h
-    TransportCurrent/Transport_Current.h
-    TransportCurrent/Transport_Current_Export.h
-    TransportCurrent/TCC.h
-    TransportCurrent/TCS.h
-  }
-
-  Inline_Files {
-    TransportCurrent/TCC.inl
-    TransportCurrent/TCS.inl
-  }
-
-  Template_Files {
-    TransportCurrent/Current_ORBInitializer.cpp
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-    TransportCurrent
-  }
-
-  IDL_Files {
-  }
-}
-
diff --git a/tao/TC_IIOP.mpc b/tao/TC_IIOP.mpc
deleted file mode 100644
index 4a7be3d93c1..00000000000
--- a/tao/TC_IIOP.mpc
+++ /dev/null
@@ -1,55 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h \
-                -Wb,export_macro=TAO_Transport_Current_Export \
-                -o TransportCurrent -I./TransportCurrent
-    idlflags -= -Sa -St
-
-    TransportCurrent/TC_IIOP.idl
-  }
-}
-
-project(TC_IIOP) : taolib_with_idl, tao_output, taoidldefaults, install, tc, interceptors, pi {
-  after += *idl
-  requires    += transport_current
-  sharedname   = TAO_TC_IIOP
-
-  dynamicflags += TAO_TRANSPORT_CURRENT_BUILD_DLL
-
-  Source_Files {
-    TransportCurrent/IIOP_Current_Impl.cpp
-    TransportCurrent/IIOP_Current_Loader.cpp
-  }
-
-  Source_Files {
-    TransportCurrent/TC_IIOPC.cpp
-  }
-
-  Header_Files {
-    TransportCurrent/IIOP_Current_Impl.h
-    TransportCurrent/IIOP_Current_Loader.h
-    TransportCurrent/IIOP_Transport_Current.h
-    TransportCurrent/TC_IIOPC.h
-    TransportCurrent/TC_IIOPS.h
-  }
-
-  Inline_Files {
-    TransportCurrent/TC_IIOPC.inl
-    TransportCurrent/TC_IIOPS.inl
-  }
-
-  Template_Files {
-  }
-
-  IDL_Files {
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-    TransportCurrent
-  }
-}
diff --git a/tao/Thread_Lane_Resources.cpp b/tao/Thread_Lane_Resources.cpp
index 8c0da1f6e1d..84a41931737 100644
--- a/tao/Thread_Lane_Resources.cpp
+++ b/tao/Thread_Lane_Resources.cpp
@@ -502,12 +502,13 @@ TAO_Thread_Lane_Resources::shutdown_reactor (void)
       leader_follower.has_clients ())
     {
       reactor->wakeup_all_threads ();
-      return;
     }
-
-  // End the reactor if we want shutdown dropping replies along the
-  // way.
-  reactor->end_reactor_event_loop ();
+  else
+    {
+      // End the reactor if we want shutdown dropping replies along the
+      // way.
+      reactor->end_reactor_event_loop ();
+    }
 }
 
 void
diff --git a/tao/Thread_Lane_Resources.h b/tao/Thread_Lane_Resources.h
index f7c16239377..57a61f5d2fc 100644
--- a/tao/Thread_Lane_Resources.h
+++ b/tao/Thread_Lane_Resources.h
@@ -59,7 +59,7 @@ public:
   /// Destructor.
   ~TAO_Thread_Lane_Resources (void);
 
-  // Does @a mprofile belong to us?
+  /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// Open the acceptor registry.
@@ -81,7 +81,7 @@ public:
 
   TAO_Acceptor_Registry &acceptor_registry (void);
 
-  /*
+  /**
    * @note Returning a pointer helps to return 0 in case of
    * exceptions.
    */
@@ -92,48 +92,57 @@ public:
 
   TAO_Leader_Follower &leader_follower (void);
 
-  /* Allocator is intended for allocating the ACE_Data_Blocks used in
+  /**
+   * Allocator is intended for allocating the ACE_Data_Blocks used in
    * incoming CDR streams.  This allocator has locks.
    */
   ACE_Allocator *input_cdr_dblock_allocator (void);
 
-  /* Allocator is intended for allocating the buffers in the incoming
+  /**
+   * Allocator is intended for allocating the buffers in the incoming
    * CDR streams.  This allocator has locks.
    */
   ACE_Allocator *input_cdr_buffer_allocator (void);
 
-  /* Allocator is intended for allocating the ACE_Message_Blocks used
+  /**
+   * Allocator is intended for allocating the ACE_Message_Blocks used
    * in incoming CDR streams.  This allocator is global, and has locks.
    */
   ACE_Allocator *input_cdr_msgblock_allocator (void);
 
-  /* Allocator is intended for allocating the buffers used in the
+  /**
+   * Allocator is intended for allocating the buffers used in the
    * Transport object. This allocator has locks.
    */
   ACE_Allocator *transport_message_buffer_allocator (void);
 
-  /* Allocator is intended for allocating the ACE_Data_Blocks used in
+  /**
+   * Allocator is intended for allocating the ACE_Data_Blocks used in
    * outgoing CDR streams.  This allocator has locks.
    */
   ACE_Allocator *output_cdr_dblock_allocator (void);
 
-  /* Allocator is intended for allocating the buffers in the outgoing
+  /**
+   * Allocator is intended for allocating the buffers in the outgoing
    * CDR streams.  This allocator has locks.
    */
   ACE_Allocator *output_cdr_buffer_allocator (void);
 
-  /* Allocator is intended for allocating the ACE_Message_Blocks used
+  /**
+   * Allocator is intended for allocating the ACE_Message_Blocks used
    * in the outgoing CDR streams.  This allocator is global, and has
    * locks.
    */
   ACE_Allocator *output_cdr_msgblock_allocator (void);
 
-  /* Allocator is intended for allocating the AMH response handlers
+  /**
+   * Allocator is intended for allocating the AMH response handlers
    * This allocator is global.
    */
   ACE_Allocator *amh_response_handler_allocator (void);
 
-  /* Allocator is intended for allocating the AMI response handlers
+  /**
+   * Allocator is intended for allocating the AMI response handlers
    * This allocator is global.
    */
   ACE_Allocator *ami_response_handler_allocator (void);
diff --git a/tao/Thread_Lane_Resources_Manager.cpp b/tao/Thread_Lane_Resources_Manager.cpp
index 545bd93ca4f..76b2ed45db3 100644
--- a/tao/Thread_Lane_Resources_Manager.cpp
+++ b/tao/Thread_Lane_Resources_Manager.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Thread_Lane_Resources_Manager.h"
diff --git a/tao/Thread_Lane_Resources_Manager.h b/tao/Thread_Lane_Resources_Manager.h
index 152a4cd8774..4ef600836bf 100644
--- a/tao/Thread_Lane_Resources_Manager.h
+++ b/tao/Thread_Lane_Resources_Manager.h
@@ -95,7 +95,6 @@ class TAO_Export TAO_Thread_Lane_Resources_Manager_Factory
   : public ACE_Service_Object
 {
 public:
-
   /// Virtual destructor.
   virtual ~TAO_Thread_Lane_Resources_Manager_Factory (void);
 
diff --git a/tao/Thread_Per_Connection_Handler.h b/tao/Thread_Per_Connection_Handler.h
index 7e7f667062b..1947a111da8 100644
--- a/tao/Thread_Per_Connection_Handler.h
+++ b/tao/Thread_Per_Connection_Handler.h
@@ -58,7 +58,7 @@ public:
   virtual int close (u_long);
 
 private:
-  /// Pointer to protocsol specific code that does the bunch of the
+  /// Pointer to protocol specific code that does the bunch of the
   /// job.
   TAO_Connection_Handler *ch_;
 };
diff --git a/tao/TimeBase.pidl b/tao/TimeBase.pidl
index 57542a333b4..bc79238db15 100644
--- a/tao/TimeBase.pidl
+++ b/tao/TimeBase.pidl
@@ -1,26 +1,10 @@
 // -*- IDL -*-
 
-//=============================================================================
 /**
  *  @file TimeBase.pidl
  *
  *  $Id$
- *
- * This file is used to generate the code in TimeBase{C,S,S_T}.{h,i,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl.exe
- *        -o orig -GA -SS -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=tao/TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        TimeBase.pidl
- *
- * After that the files are ready for use
  */
-//=============================================================================
 
 #ifndef TIME_BASE_PIDL
 #define TIME_BASE_PIDL
diff --git a/tao/TkResource.mpc b/tao/TkResource.mpc
deleted file mode 100644
index e55608ccc7a..00000000000
--- a/tao/TkResource.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-//  -*- MPC -*- now wouldn't this be cool...
-// $Id$
-
-project(TAO_TkResource) : acelib, taolib, install, tao_output, taodefaults, ace_tkreactor, taoidldefaults {
-
-  sharedname   = TAO_TkResource
-  dynamicflags += TAO_TKRESOURCE_BUILD_DLL
-
-  Source_Files {
-    TkResource
-  }
-
-  Header_Files {
-    TkResource
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-
-  IDL_Files {
-  }
-}
diff --git a/tao/TkResource/TkResource.mpc b/tao/TkResource/TkResource.mpc
new file mode 100644
index 00000000000..e0c3026f067
--- /dev/null
+++ b/tao/TkResource/TkResource.mpc
@@ -0,0 +1,11 @@
+//  -*- MPC -*- now wouldn't this be cool...
+// $Id$
+
+project(TAO_TkResource) : acelib, taolib, install, tao_output, taodefaults, ace_tkreactor, taoidldefaults {
+  sharedname   = TAO_TkResource
+  dynamicflags += TAO_TKRESOURCE_BUILD_DLL
+
+  specific {
+    install_dir = tao/TkResource
+  }
+}
diff --git a/tao/TkResource/TkResource_Factory.cpp b/tao/TkResource/TkResource_Factory.cpp
index 70b51a2a9da..1a9d0161a60 100644
--- a/tao/TkResource/TkResource_Factory.cpp
+++ b/tao/TkResource/TkResource_Factory.cpp
@@ -4,11 +4,6 @@
 #include "tao/debug.h"
 #include "ace/TkReactor/TkReactor.h"
 
-ACE_RCSID( TAO_TkResource,
-           TkResource_Factory,
-           "$Id$");
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/TkResource/TkResource_Loader.cpp b/tao/TkResource/TkResource_Loader.cpp
index c598ef76c87..53b2a4739fa 100644
--- a/tao/TkResource/TkResource_Loader.cpp
+++ b/tao/TkResource/TkResource_Loader.cpp
@@ -1,13 +1,9 @@
-//$Id$
+// $Id$
+
 #include "tao/TkResource/TkResource_Loader.h"
 #include "tao/ORB_Core.h"
 #include "tao/TkResource/TkResource_Factory.h"
 
-ACE_RCSID( TAO_TkResource,
-           TkResource_Loader,
-           "$Id$");
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/Transport.cpp b/tao/Transport.cpp
index ecf3d86e9ad..a952e9ab455 100644
--- a/tao/Transport.cpp
+++ b/tao/Transport.cpp
@@ -52,7 +52,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
           size_t current_transfer,
           const ACE_TCHAR *location)
 {
-  ACE_Guard <ACE_Log_Msg> log_guard (*ACE_Log_Msg::instance ());
+  ACE_GUARD (ACE_Log_Msg, ace_mon, *ACE_Log_Msg::instance ());
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ")
@@ -196,6 +196,13 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
 
 TAO_Transport::~TAO_Transport (void)
 {
+  if (TAO_debug_level > 9)
+    {
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::~Transport\n"),
+                  this->id_
+                  ));
+    }
+
   delete this->messaging_object_;
 
   delete this->ws_;
@@ -473,17 +480,15 @@ TAO_Transport::recache_transport (TAO_Transport_Descriptor_Interface *desc)
 int
 TAO_Transport::purge_entry (void)
 {
-  // We must store our entry in a temporary and zero out the data member.
-  // If there is only one reference count on us, we will end up causing
-  // our own destruction.  And we can not be holding a cache map entry if
-  // that happens.
-  TAO::Transport_Cache_Manager::HASH_MAP_ENTRY* entry = 0;
-  {
-    ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
-    entry = this->cache_map_entry_;
-    this->cache_map_entry_ = 0;
-  }
-  return this->transport_cache_manager ().purge_entry (entry);
+  if (TAO_debug_level > 3)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::purge_entry, ")
+                  ACE_TEXT ("entry is %@\n"),
+                  this->id (), this->cache_map_entry_));
+    }
+
+  return this->transport_cache_manager ().purge_entry (this->cache_map_entry_);
 }
 
 bool
@@ -511,10 +516,8 @@ TAO_Transport::update_transport (void)
   return this->transport_cache_manager ().update_entry (this->cache_map_entry_);
 }
 
-/*
- *
+/**
  *  Methods called and used in the output path of the ORB.
- *
  */
 TAO_Transport::Drain_Result
 TAO_Transport::handle_output (TAO::Transport::Drain_Constraints const & dc)
@@ -525,9 +528,9 @@ TAO_Transport::handle_output (TAO::Transport::Drain_Constraints const & dc)
                   ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_output")
                   ACE_TEXT (" - block_on_io=%d, timeout=%d.%06d\n"),
                   this->id (),
-              dc.block_on_io(),
-              dc.timeout() ? dc.timeout()->sec() : -1,
-              dc.timeout() ? dc.timeout()->usec() : -1 ));
+                  dc.block_on_io(),
+                  dc.timeout() ? dc.timeout()->sec() : static_cast<time_t> (-1),
+                  dc.timeout() ? dc.timeout()->usec() : -1 ));
     }
 
   // The flushing strategy (potentially via the Reactor) wants to send
@@ -703,12 +706,11 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb,
   return 1;
 }
 
-
 int
 TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb,
                                      ACE_Time_Value *max_wait_time)
 {
-  // Dont clone now.. We could be sent in one shot!
+  // Don't clone now.. We could be sent in one shot!
   TAO_Synch_Queued_Message synch_message (mb, this->orb_core_);
 
   synch_message.push_back (this->head_, this->tail_);
@@ -1614,11 +1616,9 @@ TAO_Transport::queue_message_i (const ACE_Message_Block *message_block,
   return 0;
 }
 
-/*
- *
+/**
  * All the methods relevant to the incoming data path of the ORB are
  * defined below
- *
  */
 int
 TAO_Transport::handle_input (TAO_Resume_Handle &rh,
@@ -1871,7 +1871,7 @@ TAO_Transport::handle_input_missing_data (TAO_Resume_Handle &rh,
     }
 
   // Saving the size of the received buffer in case any one needs to
-  // get the size of the message thats received in the
+  // get the size of the message that is received in the
   // context. Obviously the value will be changed for each recv call
   // and the user is supposed to invoke the accessor only in the
   // invocation context to get meaningful information.
@@ -2798,7 +2798,7 @@ TAO_Transport::io_timeout(
 }
 
 bool
-TAO_Transport::using_blocking_io_for_synch_messages() const
+TAO_Transport::using_blocking_io_for_synch_messages (void) const
 {
   if (this->wait_strategy()->can_process_upcalls())
   {
@@ -2808,7 +2808,7 @@ TAO_Transport::using_blocking_io_for_synch_messages() const
 }
 
 bool
-TAO_Transport::using_blocking_io_for_asynch_messages() const
+TAO_Transport::using_blocking_io_for_asynch_messages (void) const
 {
   return false;
 }
diff --git a/tao/Transport.h b/tao/Transport.h
index 0c8d325d82c..5a768714b81 100644
--- a/tao/Transport.h
+++ b/tao/Transport.h
@@ -81,9 +81,9 @@ namespace TAO
    * application level policies in effect.
    *
    * Some examples:
-   * 
+   *
    * # When idle, the ORB will want to send data on any socket that has
-   *   space available.  In this case, the queue must be drained on 
+   *   space available.  In this case, the queue must be drained on
    *   a best-effort basis, without any blocking.
    * # If the ORB is configured to handle nested upcalls, any two-way
    *   request should block and push data to the underlying socket as fast
@@ -159,7 +159,7 @@ namespace TAO
  * The transport object is created in the Service handler
  * constructor and deleted in the Service Handler's destructor!!
  *
- * The main responsability of a Transport object is to encapsulate a
+ * The main responsibility of a Transport object is to encapsulate a
  * connection, and provide a transport independent way to send and
  * receive data.  Since TAO is heavily based on the Reactor for all if
  * not all its I/O the Transport class is usually implemented with a
@@ -223,7 +223,7 @@ namespace TAO
  * - A queue of pending messages
  * - A message currently being transmitted
  * - A per-transport 'send strategy' to choose between blocking on
- *   write, blocking on the reactor or blockin on leader/follower.
+ *   write, blocking on the reactor or blocking on leader/follower.
  * - A per-message 'waiting object'
  * - A per-message timeout
  *
@@ -241,7 +241,7 @@ namespace TAO
  *    same time ie. the handle should not be shared between threads at
  *    any instant.
  *  - Reads on the handle could give one or more messages.
- *  - Minimise locking and copying overhead when trying to attack the
+ *  - Minimize locking and copying overhead when trying to attack the
  *    above.
  *
  * <H3> Parsing messages (GIOP) & processing the message:</H3>
@@ -254,7 +254,7 @@ namespace TAO
  * <H3> Design forces and Challenges </H3>
  *
  * To keep things as efficient as possible for medium sized requests,
- * it would be good to minimise data copying and locking along the
+ * it would be good to minimize data copying and locking along the
  * incoming path ie. from the time of reading the data from the handle
  * to the application. We achieve this by creating a buffer on stack
  * and reading the data from the handle into the buffer. We then pass
@@ -449,7 +449,7 @@ public:
   /// Add event handlers corresponding to transports that have RW wait
   /// strategy to the handlers set.
   /**
-   * Called by the cache when the ORB is shuting down.
+   * Called by the cache when the ORB is shutting down.
    *
    * @param handlers The TAO_Connection_Handler_Set into which the
    *        transport should place its handler if the transport has RW
@@ -577,7 +577,7 @@ public:
    * following methods with the semantics documented below.
    */
   /**
-   * Initialising the messaging object. This would be used by the
+   * Initializing the messaging object. This would be used by the
    * connector side. On the acceptor side the connection handler
    * would take care of the messaging objects.
    */
@@ -603,7 +603,7 @@ public:
   virtual bool post_connect_hook (void);
 
   /// Memory management routines.
-  /*
+  /**
    * Forwards to event handler.
    */
   ACE_Event_Handler::Reference_Count add_reference (void);
@@ -1057,14 +1057,14 @@ private:
    * on the current flushing and waiting strategies.
    */
   bool using_blocking_io_for_synch_messages() const;
-  
+
   /**
    * Return true if blocking I/O should be used for sending asynchronous
    * (AMI calls, non-blocking oneways, responses to operations, etc.)
    * messages.  This is determined based on the current flushing strategy.
    */
   bool using_blocking_io_for_asynch_messages() const;
-  
+
   /*
    * Specialization hook to add concrete private methods from
    * TAO's protocol implementation onto the base Transport class
diff --git a/tao/TransportCurrent/Current_Impl.cpp b/tao/TransportCurrent/Current_Impl.cpp
index 3a824224b9e..35ffd085246 100644
--- a/tao/TransportCurrent/Current_Impl.cpp
+++ b/tao/TransportCurrent/Current_Impl.cpp
@@ -19,7 +19,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-
 namespace TAO
 {
   namespace Transport
diff --git a/tao/TransportCurrent/Current_Loader.cpp b/tao/TransportCurrent/Current_Loader.cpp
index 40b6dbba38f..270b4b5f75e 100644
--- a/tao/TransportCurrent/Current_Loader.cpp
+++ b/tao/TransportCurrent/Current_Loader.cpp
@@ -17,10 +17,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (TC,
-           Current_Loader,
-           "$Id$")
-
 #if TAO_HAS_TRANSPORT_CURRENT == 1
 
 #include "tao/TransportCurrent/Current_ORBInitializer.h"
diff --git a/tao/TransportCurrent/IIOP_Current_Loader.cpp b/tao/TransportCurrent/IIOP_Current_Loader.cpp
index 0d3805fe791..be4b11446e1 100644
--- a/tao/TransportCurrent/IIOP_Current_Loader.cpp
+++ b/tao/TransportCurrent/IIOP_Current_Loader.cpp
@@ -17,10 +17,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/PI/PI.h"
 
-ACE_RCSID (Transport_Current,
-           IIOP_Current_Loader,
-           "$Id$")
-
 #if TAO_HAS_TRANSPORT_CURRENT == 1
 
 #include "tao/TransportCurrent/Current_ORBInitializer.h"
diff --git a/tao/TransportCurrent/TC.mpc b/tao/TransportCurrent/TC.mpc
new file mode 100644
index 00000000000..46bacb2cf03
--- /dev/null
+++ b/tao/TransportCurrent/TC.mpc
@@ -0,0 +1,53 @@
+//$Id$
+project(*idl) : taolib_with_idl, tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h \
+                -Wb,export_macro=TAO_Transport_Current_Export \
+                -iC tao/TransportCurrent -I./TransportCurrent -SS -Sci
+    idlflags -= -Sa -St
+
+    TC.idl
+  }
+
+  specific {
+    install_dir = tao/TransportCurrent
+  }
+}
+
+project(TC) : taolib_with_idl, tao_output, taoidldefaults, install, interceptors, pi {
+  after += *idl
+  requires    += transport_current
+  sharedname   = TAO_TC
+  dynamicflags += TAO_TRANSPORT_CURRENT_BUILD_DLL
+
+  Source_Files {
+    Current_Impl.cpp
+    Current_Loader.cpp
+    Current_ORBInitializer_Base.cpp
+    TCC.cpp
+  }
+
+  Header_Files {
+    Current_Impl.h
+    Current_Loader.h
+    Current_ORBInitializer.h
+    Current_ORBInitializer_Base.h
+    Transport_Current.h
+    Transport_Current_Export.h
+    TCC.h
+    TCS.h
+  }
+
+  IDL_Files {
+  }
+
+  Template_Files {
+    Current_ORBInitializer.cpp
+  }
+
+  specific {
+    install_dir = tao/TransportCurrent
+  }
+}
+
diff --git a/tao/TransportCurrent/TC_IIOP.mpc b/tao/TransportCurrent/TC_IIOP.mpc
new file mode 100644
index 00000000000..2f8acb6e99e
--- /dev/null
+++ b/tao/TransportCurrent/TC_IIOP.mpc
@@ -0,0 +1,48 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h \
+                -Wb,export_macro=TAO_Transport_Current_Export \
+                -iC tao/TransportCurrent -I./TransportCurrent -SS -Sci
+    idlflags -= -Sa -St
+
+    TC_IIOP.idl
+  }
+
+  specific {
+    install_dir = tao/TransportCurrent
+  }
+}
+
+project(TC_IIOP) : taolib_with_idl, tao_output, taoidldefaults, install, tc, interceptors, pi {
+  after += *idl
+  requires    += transport_current
+  sharedname   = TAO_TC_IIOP
+
+  dynamicflags += TAO_TRANSPORT_CURRENT_BUILD_DLL
+
+  Source_Files {
+    IIOP_Current_Impl.cpp
+    IIOP_Current_Loader.cpp
+  }
+
+  Source_Files {
+    TC_IIOPC.cpp
+  }
+
+  Header_Files {
+    IIOP_Current_Impl.h
+    IIOP_Current_Loader.h
+    IIOP_Transport_Current.h
+    TC_IIOPC.h
+    TC_IIOPS.h
+  }
+
+  IDL_Files {
+  }
+
+  specific {
+    install_dir = tao/TransportCurrent
+  }
+}
diff --git a/tao/TransportCurrent/Transport_Current_Export.h b/tao/TransportCurrent/Transport_Current_Export.h
index 8a80e0992f8..44c2f497a71 100644
--- a/tao/TransportCurrent/Transport_Current_Export.h
+++ b/tao/TransportCurrent/Transport_Current_Export.h
@@ -1,6 +1,6 @@
 
 // -*- C++ -*-
-// $Id:$
+// $Id$
 // Definition for Win32 Export directives.
 // This file is generated automatically by generate_export_file.pl -d TAO_Transport_Current
 // ------------------------------
diff --git a/tao/Transport_Acceptor.cpp b/tao/Transport_Acceptor.cpp
index 20a7f749040..5b19d7419aa 100644
--- a/tao/Transport_Acceptor.cpp
+++ b/tao/Transport_Acceptor.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Transport_Acceptor.h"
diff --git a/tao/Transport_Cache_Manager_T.cpp b/tao/Transport_Cache_Manager_T.cpp
index 2e49d7e1399..60f064f9241 100644
--- a/tao/Transport_Cache_Manager_T.cpp
+++ b/tao/Transport_Cache_Manager_T.cpp
@@ -93,7 +93,7 @@ namespace TAO
 
   template <typename TT, typename TRDT, typename PSTRAT>
   void
-  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::set_entry_state (HASH_MAP_ENTRY *entry,
+  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::set_entry_state (HASH_MAP_ENTRY *&entry,
                                             TAO::Cache_Entries_State state)
   {
     ACE_MT (ACE_GUARD (ACE_Lock, guard, *this->cache_lock_));
@@ -120,8 +120,7 @@ namespace TAO
             ACE_TEXT ("Transport[%d] @ hash:index{%d:%d}\n"),
             int_id.transport ()->id (),
             ext_id.hash (),
-            ext_id.index ()
-            ));
+            ext_id.index ()));
        }
 
     // Get the entry too
@@ -129,7 +128,7 @@ namespace TAO
 
     // Update the purging strategy information while we
     // are holding our lock
-    this->purging_strategy_->update_item (int_id.transport ());
+    this->purging_strategy_->update_item (*(int_id.transport ()));
     int retval = 0;
     bool more_to_do = true;
     while (more_to_do)
@@ -150,7 +149,7 @@ namespace TAO
             retval = this->cache_map_.bind (ext_id, int_id, entry);
             if (retval == 0)
               {
-                // The entry has been added to cache succesfully
+                // The entry has been added to cache successfully
                 // Add the cache_map_entry to the transport
                 int_id.transport ()->cache_map_entry (entry);
                 more_to_do = false;
@@ -369,7 +368,7 @@ namespace TAO
         {
           // Update the purging strategy information while we
           // are holding our lock
-          this->purging_strategy_->update_item (transport);
+          this->purging_strategy_->update_item (*transport);
         }
     }
     return found;
@@ -379,9 +378,6 @@ namespace TAO
   int
   Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::make_idle_i (HASH_MAP_ENTRY *entry)
   {
-    if (entry == 0)
-      return -1;
-
     entry->item ().recycle_state (ENTRY_IDLE_AND_PURGABLE);
 
     return 0;
@@ -399,7 +395,7 @@ namespace TAO
       return -1;
 
     purging_strategy *st = this->purging_strategy_;
-    (void) st->update_item (entry->item ().transport ());
+    (void) st->update_item (*(entry->item ().transport ()));
 
     return 0;
   }
@@ -457,38 +453,21 @@ namespace TAO
 
   template <typename TT, typename TRDT, typename PSTRAT>
   int
-  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::purge_entry_i (HASH_MAP_ENTRY *&entry)
+  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::purge_entry_i (HASH_MAP_ENTRY *entry)
   {
-    int retval = 0;
-
-    if (entry != 0)
-      {
-        // Remove the entry from the Map
-        retval = this->cache_map_.unbind (entry);
+    int retval = this->cache_map_.unbind (entry);//0;
 
         // Set the entry pointer to zero
-        entry = 0;
+    //    entry = 0;
 
 #if defined (TAO_HAS_MONITOR_POINTS) && (TAO_HAS_MONITOR_POINTS == 1)
         this->size_monitor_->receive (this->current_size ());
 #endif /* TAO_HAS_MONITOR_POINTS==1 */
-      }
 
     return retval;
   }
 
   template <typename TT, typename TRDT, typename PSTRAT>
-  void
-  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::mark_invalid_i (HASH_MAP_ENTRY *entry)
-  {
-    if (entry != 0)
-      {
-        // Mark the entry as not usable
-        entry->item ().recycle_state (ENTRY_PURGABLE_BUT_NOT_IDLE);
-      }
-  }
-
-  template <typename TT, typename TRDT, typename PSTRAT>
   bool
   Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::is_entry_available_i (const HASH_MAP_ENTRY &entry)
   {
@@ -505,7 +484,7 @@ namespace TAO
       {
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::")
-                    ACE_TEXT ("is_entry_available_i[%d], %C state is %C\n"),
+                    ACE_TEXT ("is_entry_available_i[%d], %C, state is %C\n"),
                     entry.int_id_.transport () ? entry.int_id_.transport ()->id () : 0,
                     (result ? "true" : "false"),
                     Cache_IntId::state_name (entry_state)));
@@ -528,7 +507,7 @@ namespace TAO
       {
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::")
-                    ACE_TEXT ("is_entry_purgable_i[%d], %C state is %C\n"),
+                    ACE_TEXT ("is_entry_purgable_i[%d], %C, state is %C\n"),
                     entry.int_id_.transport ()->id (),
                     (result ? "true" : "false"),
                     Cache_IntId::state_name (entry_state)));
diff --git a/tao/Transport_Cache_Manager_T.h b/tao/Transport_Cache_Manager_T.h
index 871f0a65d80..e6cf9b8709b 100644
--- a/tao/Transport_Cache_Manager_T.h
+++ b/tao/Transport_Cache_Manager_T.h
@@ -130,17 +130,14 @@ namespace TAO
     /// Purge the entry from the Cache Map
     int purge_entry (HASH_MAP_ENTRY *& entry);
 
-    /// Mark the entry as invalid for use but keep it in cache.
-    void mark_invalid (HASH_MAP_ENTRY * entry);
-
     /// Mark the entry as connected.
-    void mark_connected (HASH_MAP_ENTRY * entry, bool state);
+    void mark_connected (HASH_MAP_ENTRY *& entry, bool state);
 
     /// Make the entry idle and ready for use.
-    int make_idle (HASH_MAP_ENTRY *entry);
+    int make_idle (HASH_MAP_ENTRY *&entry);
 
     /// Modify the state setting on the provided entry.
-    void set_entry_state (HASH_MAP_ENTRY *entry,
+    void set_entry_state (HASH_MAP_ENTRY *&entry,
                           TAO::Cache_Entries_State state);
 
     /// Mark the entry as touched. This call updates the purging
@@ -206,10 +203,7 @@ namespace TAO
     int close_i (Connection_Handler_Set &handlers);
 
     /// Purge the entry from the Cache Map
-    int purge_entry_i (HASH_MAP_ENTRY *&entry);
-
-    /// Mark the entry as invalid for use but keep it in cache.
-    void mark_invalid_i (HASH_MAP_ENTRY *entry);
+    int purge_entry_i (HASH_MAP_ENTRY *entry);
 
   private:
     /**
diff --git a/tao/Transport_Cache_Manager_T.inl b/tao/Transport_Cache_Manager_T.inl
index f0889bed24c..0fecfabf643 100644
--- a/tao/Transport_Cache_Manager_T.inl
+++ b/tao/Transport_Cache_Manager_T.inl
@@ -39,21 +39,32 @@ namespace TAO
   ACE_INLINE int
   Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::purge_entry (HASH_MAP_ENTRY *&entry)
   {
-    ACE_MT (ACE_GUARD_RETURN (ACE_Lock, guard, *this->cache_lock_, -1));
-    return this->purge_entry_i (entry);
-  }
+    int retval = 0;
 
-  template <typename TT, typename TRDT, typename PSTRAT>
-  ACE_INLINE void
-  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::mark_invalid (HASH_MAP_ENTRY *entry)
-  {
-    ACE_MT (ACE_GUARD (ACE_Lock, guard, *this->cache_lock_));
-    this->mark_invalid_i (entry);
+    if (entry != 0)
+    {
+      HASH_MAP_ENTRY* cached_entry = 0;
+      ACE_MT (ACE_GUARD_RETURN (ACE_Lock, guard, *this->cache_lock_, -1));
+      if (entry != 0) // in case someone beat us to it (entry is reference to transport member)
+      {
+        // Store the entry in a temporary and zero out the reference.
+        // If there is only one reference count for the transport, we will end up causing
+        // it's destruction.  And the transport can not be holding a cache map entry if
+        // that happens.
+        cached_entry = entry;
+        entry = 0;
+
+        // now it's save to really purge the entry
+        retval = this->purge_entry_i (cached_entry);
+      }
+    }
+
+    return retval;
   }
 
   template <typename TT, typename TRDT, typename PSTRAT>
   ACE_INLINE void
-  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::mark_connected (HASH_MAP_ENTRY *entry, bool state)
+  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::mark_connected (HASH_MAP_ENTRY *&entry, bool state)
   {
     ACE_MT (ACE_GUARD (ACE_Lock, guard, *this->cache_lock_));
     if (entry == 0)
@@ -70,9 +81,12 @@ namespace TAO
 
   template <typename TT, typename TRDT, typename PSTRAT>
   ACE_INLINE int
-  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::make_idle (HASH_MAP_ENTRY *entry)
+  Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::make_idle (HASH_MAP_ENTRY *&entry)
   {
     ACE_MT (ACE_GUARD_RETURN (ACE_Lock, guard, *this->cache_lock_, -1));
+    if (entry == 0) // in case someone beat us to it (entry is reference to transport member)
+      return -1;
+
     return this->make_idle_i (entry);
   }
 
diff --git a/tao/Transport_Connector.cpp b/tao/Transport_Connector.cpp
index f71504ba0b7..fc6463a776a 100644
--- a/tao/Transport_Connector.cpp
+++ b/tao/Transport_Connector.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Transport_Connector.h"
 #include "tao/Transport.h"
 #include "tao/ORB_Core.h"
@@ -878,6 +881,23 @@ TAO_Connector::wait_for_connection_completion (
   return true;
 }
 
+void
+TAO_Connector::cleanup_pending (TAO_Transport *&the_winner,
+                                TAO_Transport **transport,
+                                unsigned int count)
+{
+  // It is possible that we have more than one connection that happened
+  // to complete, or that none completed. Therefore we need to traverse
+  // the list and ensure that all of the losers are closed.
+  for (unsigned int i = 0; i < count; i++)
+    {
+      if (transport[i] != the_winner)
+        this->check_connection_closure (transport[i]->connection_handler());
+      // since we are doing this on may connections, the result isn't
+      // particularly important.
+    }
+}
+
 bool
 TAO_Connector::wait_for_connection_completion (
     TAO::Profile_Transport_Resolver *r,
@@ -939,16 +959,7 @@ TAO_Connector::wait_for_connection_completion (
           }
     }
 
-  // It is possible that we have more than one connection that happened
-  // to complete, or that none completed. Therefore we need to traverse
-  // the list and ensure that all of the losers are closed.
-  for (unsigned int i = 0; i < count; i++)
-    {
-      if (transport[i] != the_winner)
-        this->check_connection_closure (transport[i]->connection_handler());
-      // since we are doing this on may connections, the result isn't
-      // particularly important.
-    }
+  this->cleanup_pending (the_winner, transport, count);
 
   // In case of errors.
   if (the_winner == 0)
diff --git a/tao/Transport_Connector.h b/tao/Transport_Connector.h
index 74d37326f82..135ff7da51d 100644
--- a/tao/Transport_Connector.h
+++ b/tao/Transport_Connector.h
@@ -86,7 +86,7 @@ public:
   int make_mprofile (const char *ior, TAO_MProfile &mprofile);
 
   /// Helper function to assist corbaloc parsing. The default simply validates
-  /// the protocol identifyier and scans up to the next comma or slash.
+  /// the protocol identifier and scans up to the next comma or slash.
   /// Any protocol that has a specific need, such as uiop, can override this
   /// method to  provide a custom scanner.
   /// The profile returned is either null if this the ior does not match or an
@@ -108,7 +108,7 @@ public:
                                   TAO_Transport_Descriptor_Interface *desc,
                                   ACE_Time_Value *timeout);
 
-  /// A variation on connect that will try simultanious connections
+  /// A variation on connect that will try simultaneous connections
   /// on all endpoints listed in the desc.
   virtual TAO_Transport *parallel_connect (TAO::Profile_Transport_Resolver *r,
                                            TAO_Transport_Descriptor_Interface
@@ -129,7 +129,7 @@ public:
 
 protected:
   /// A flag indicating the actual connector supports parallel connection
-  /// attempts. The base implementation alwayse returns 0. Override to return
+  /// attempts. The base implementation always returns 0. Override to return
   /// non-zero if parallel connection attempts may be tried.
   virtual int supports_parallel_connects (void) const;
 
@@ -152,7 +152,7 @@ protected:
       TAO_Transport_Descriptor_Interface &desc,
       ACE_Time_Value *timeout);
 
-  /// Cancel the passed cvs handler from the connector
+  /// Cancel the passed @a svc_handler from the connector
   virtual int cancel_svc_handler (TAO_Connection_Handler *svc_handler) = 0;
 
   /// Check whether the connection is not closed
@@ -187,13 +187,22 @@ protected:
       TAO_LF_Multi_Event *mev,
       ACE_Time_Value *timeout);
 
+  /// For a parallel connection attempt, any pending connection attempts
+  /// present when the connection completes needs to be cleaned up. In
+  /// some cases this happens before wait_for_connection_completion needs
+  /// to be called, so the clean up logic is separated out here.
+  void cleanup_pending (
+      TAO_Transport *&the_winner,
+      TAO_Transport **transport,
+      unsigned int count);
+
   /// See if a new connection is allowed
   bool new_connection_is_ok (size_t busy_count);
 
   /// Wait for a transport to be connected
   /// Note: no longer changes transport reference count
-  /// @ returns true if wait was uneventful
-  /// @         false if error occurred during wait
+  /// @retval true if wait was uneventful
+  /// @retval false if error occurred during wait
   bool wait_for_transport (TAO::Profile_Transport_Resolver *r,
                            TAO_Transport *base_transport,
                            ACE_Time_Value * timeout,
diff --git a/tao/Transport_Descriptor_Interface.cpp b/tao/Transport_Descriptor_Interface.cpp
index fe038e33c63..23c04a89277 100644
--- a/tao/Transport_Descriptor_Interface.cpp
+++ b/tao/Transport_Descriptor_Interface.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Transport_Descriptor_Interface.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/tao/Transport_Mux_Strategy.h b/tao/Transport_Mux_Strategy.h
index cd2b6fac2cd..94eeef24060 100644
--- a/tao/Transport_Mux_Strategy.h
+++ b/tao/Transport_Mux_Strategy.h
@@ -24,10 +24,6 @@
 #include "tao/Basic_Types.h"
 #include "tao/Reply_Dispatcher.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Lock;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Transport;
diff --git a/tao/Transport_Queueing_Strategies.cpp b/tao/Transport_Queueing_Strategies.cpp
index eae686dc161..b5428c505a3 100644
--- a/tao/Transport_Queueing_Strategies.cpp
+++ b/tao/Transport_Queueing_Strategies.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Transport_Queueing_Strategies.h"
diff --git a/tao/Transport_Selection_Guard.cpp b/tao/Transport_Selection_Guard.cpp
index 6af7a75ac9b..ab2b91905e6 100644
--- a/tao/Transport_Selection_Guard.cpp
+++ b/tao/Transport_Selection_Guard.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Transport_Selection_Guard.h"
diff --git a/tao/Transport_Timer.cpp b/tao/Transport_Timer.cpp
index d92c07ee68f..5ce8bca080b 100644
--- a/tao/Transport_Timer.cpp
+++ b/tao/Transport_Timer.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Transport_Timer.h"
diff --git a/tao/TypeCodeFactory.mpc b/tao/TypeCodeFactory.mpc
deleted file mode 100644
index 5c6204ee077..00000000000
--- a/tao/TypeCodeFactory.mpc
+++ /dev/null
@@ -1,55 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -SS -Sci -Sorb \
-                -Wb,export_macro=TAO_TypeCodeFactory_Export \
-                -Wb,export_include=tao/TypeCodeFactory/typecodefactory_export.h \
-                -o TypeCodeFactory
-    idlflags -= -Sa -St
-    TypeCodeFactory/TypeCodeFactory.pidl
-  }
-}
-
-project(TypeCodeFactory) : taolib, tao_output, install, ifr_client, taoidldefaults {
-  after += *idl
-  sharedname   = TAO_TypeCodeFactory
-  dynamicflags += TAO_TYPECODEFACTORY_BUILD_DLL
-
-  Source_Files {
-    TypeCodeFactory
-  }
-
-  Source_Files {
-    TypeCodeFactory/TypeCodeFactoryC.cpp
-  }
-
-  Header_Files {
-    TypeCodeFactory
-    TypeCodeFactory/TypeCodeFactoryC.h
-    TypeCodeFactory/TypeCodeFactoryS.h
-  }
-
-  Inline_Files {
-    TypeCodeFactory
-  }
-
-  Template_Files {
-    TypeCodeFactory
-  }
-
-  Resource_Files {
-    TypeCodeFactory
-  }
-
-  PIDL_Files {
-    TypeCodeFactory
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    TypeCodeFactory/TAO_TypeCodeFactory.pc.in
-  }
-}
diff --git a/tao/TypeCodeFactory/Recursive_TypeCode.cpp b/tao/TypeCodeFactory/Recursive_TypeCode.cpp
index 21aca45f74c..be42402d42e 100644
--- a/tao/TypeCodeFactory/Recursive_TypeCode.cpp
+++ b/tao/TypeCodeFactory/Recursive_TypeCode.cpp
@@ -9,11 +9,6 @@
 #include "tao/SystemException.h"
 #include "tao/ORB_Constants.h"
 
-
-ACE_RCSID (TypeCodeFactory,
-           Recursive_TypeCode,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/tao/TypeCodeFactory/TypeCodeFactory.mpc b/tao/TypeCodeFactory/TypeCodeFactory.mpc
new file mode 100644
index 00000000000..328cef556ad
--- /dev/null
+++ b/tao/TypeCodeFactory/TypeCodeFactory.mpc
@@ -0,0 +1,37 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -SS -Sci -Sorb \
+                -Wb,export_macro=TAO_TypeCodeFactory_Export \
+                -Wb,export_include=tao/TypeCodeFactory/typecodefactory_export.h \
+                -iC tao/TypeCodeFactory
+    idlflags -= -Sa -St
+    TypeCodeFactory.pidl
+  }
+
+  specific {
+    install_dir = tao/TypeCodeFactory
+  }
+}
+
+project(TypeCodeFactory) : taolib, tao_output, install, ifr_client, taoidldefaults {
+  after += *idl
+  sharedname   = TAO_TypeCodeFactory
+  dynamicflags += TAO_TYPECODEFACTORY_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    TypeCodeFactoryC.cpp
+  }
+
+  Header_Files {
+    *.h
+    TypeCodeFactoryC.h
+    TypeCodeFactoryS.h
+  }
+
+  specific {
+    install_dir = tao/TypeCodeFactory
+  }
+}
diff --git a/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
index 2453262a6f6..38aa0363b30 100644
--- a/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ b/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
@@ -3,15 +3,8 @@
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
 #include "tao/TypeCodeFactory/TypeCodeFactory_i.h"
-
 #include "tao/ORB_Core.h"
 
-
-ACE_RCSID (TypeCodeFactory,
-           TypeCodeFactory_Adapter_Impl,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_TypeCodeFactory_Adapter_Impl::~TAO_TypeCodeFactory_Adapter_Impl (void)
diff --git a/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
index e451b4c28a2..361f67485c2 100644
--- a/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+++ b/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
@@ -1,6 +1,5 @@
 // -*- C++ -*-
 
-
 //=============================================================================
 /**
  *  @file    TypeCodeFactory_Loader.cpp
@@ -11,15 +10,10 @@
  */
 //=============================================================================
 
-
 #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
 #include "tao/TypeCodeFactory/TypeCodeFactory_i.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(TypeCodeFactory,
-          TypeCodeFactory_Loader,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader (void)
diff --git a/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index f8204186c0b..ac81a7a31ce 100644
--- a/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -34,10 +34,6 @@
 #include "ace/Value_Ptr.h"
 #include "ace/OS_NS_ctype.h"
 
-ACE_RCSID (TypeCodeFactory,
-           TypeCodeFactory_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TCF
diff --git a/tao/TypeCodeFactory_Adapter.cpp b/tao/TypeCodeFactory_Adapter.cpp
index 354ffcc9308..54fc4f61728 100644
--- a/tao/TypeCodeFactory_Adapter.cpp
+++ b/tao/TypeCodeFactory_Adapter.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// $Id$
 
 #include "tao/TypeCodeFactory_Adapter.h"
 
diff --git a/tao/TypeCodeFactory_Adapter.h b/tao/TypeCodeFactory_Adapter.h
index f356cc304a3..032e074dd65 100644
--- a/tao/TypeCodeFactory_Adapter.h
+++ b/tao/TypeCodeFactory_Adapter.h
@@ -157,8 +157,6 @@ public:
       CORBA::TypeCode_ptr concrete_base,
       const CORBA::ValueMemberSeq &members) = 0;
 
-  // --
-
   /**
    * @name TAO-specific TypeCode factory methods.
    *
diff --git a/tao/ULongLongSeq.pidl b/tao/ULongLongSeq.pidl
index 17418dbae75..a82662d9f85 100644
--- a/tao/ULongLongSeq.pidl
+++ b/tao/ULongLongSeq.pidl
@@ -1,11 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-/**
- *   This file is used to generate the code in ULongLongSeqC.*
- */
-
 #ifndef TAO_CORBA_ULONGLONG_SEQ_IDL
 #define TAO_CORBA_ULONGLONG_SEQ_IDL
 
diff --git a/tao/ULongSeq.pidl b/tao/ULongSeq.pidl
index 4f08ef8c62a..fa7112554a3 100644
--- a/tao/ULongSeq.pidl
+++ b/tao/ULongSeq.pidl
@@ -2,14 +2,6 @@
 //
 // $Id$
 
-// ================================================================
-/**
- *
- * This file is used to generate the code in ULongSeq*.*
- */
-// ================================================================
-
-
 #ifndef TAO_CORBA_ULONG_SEQ_IDL
 #define TAO_CORBA_ULONG_SEQ_IDL
 
diff --git a/tao/UShortSeq.pidl b/tao/UShortSeq.pidl
index 1dbfd99aa37..0d192a5e9ae 100644
--- a/tao/UShortSeq.pidl
+++ b/tao/UShortSeq.pidl
@@ -1,22 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-// ================================================================
-/**
- * This file is used to generate the code in UShortSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=tao/TAO_Export.h
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          UShortSeq.pidl
- */
-// ================================================================
-
 #ifndef TAO_CORBA_USHORT_SEQ_IDL
 #define TAO_CORBA_USHORT_SEQ_IDL
 
diff --git a/tao/Unbounded_Basic_String_Sequence_T.h b/tao/Unbounded_Basic_String_Sequence_T.h
index 5bf6b2be84e..ea1b4ecc114 100644
--- a/tao/Unbounded_Basic_String_Sequence_T.h
+++ b/tao/Unbounded_Basic_String_Sequence_T.h
@@ -41,7 +41,7 @@ public:
   typedef const_value_type const_subscript_type;
 
 
-  /// @copydoc details::generic_sequence::generic_sequence()
+  /// @copydoc TAO::details::generic_sequence::generic_sequence()
   inline unbounded_basic_string_sequence()
     : impl_()
   {}
@@ -60,35 +60,35 @@ public:
 
   /* Use default ctor, operator= and dtor */
 
-  /// @copydoc details::generic_sequence::maximum()
+  /// @copydoc TAO::details::generic_sequence::maximum()
   inline CORBA::ULong maximum() const {
     return impl_.maximum();
   }
-  /// @copydoc details::generic_sequence::release()
+  /// @copydoc TAO::details::generic_sequence::release()
   inline CORBA::Boolean release() const {
     return impl_.release();
   }
-  /// @copydoc details::generic_sequence::length()
+  /// @copydoc TAO::details::generic_sequence::length()
   inline CORBA::ULong length() const {
     return impl_.length();
   }
-  /// @copydoc details::generic_sequence::length()
+  /// @copydoc TAO::details::generic_sequence::length()
   inline void length(CORBA::ULong length) {
     impl_.length(length);
   }
-  /// @copydoc details::generic_sequence::operator[]
+  /// @copydoc TAO::details::generic_sequence::operator[]
   inline const_element_type operator[](CORBA::ULong i) const {
     return const_element_type (impl_[i], release());
   }
-  /// @copydoc details::generic_sequence::operator[]
+  /// @copydoc TAO::details::generic_sequence::operator[]
   inline element_type operator[](CORBA::ULong i) {
     return element_type(impl_[i], release());
   }
-  /// @copydoc details::generic_sequence::get_buffer()
+  /// @copydoc TAO::details::generic_sequence::get_buffer()
   inline const_value_type const * get_buffer() const {
     return impl_.get_buffer();
   }
-  /// @copydoc details::generic_sequence::replace()
+  /// @copydoc TAO::details::generic_sequence::replace()
   inline void replace(
       CORBA::ULong maximum,
       CORBA::ULong length,
@@ -96,11 +96,11 @@ public:
       CORBA::Boolean release = false) {
     impl_.replace(maximum, length, data, release);
   }
-  /// @copydoc details::generic_sequence::get_buffer(CORBA::Boolean)
+  /// @copydoc TAO::details::generic_sequence::get_buffer(CORBA::Boolean)
   inline value_type * get_buffer(CORBA::Boolean orphan = false) {
     return impl_.get_buffer(orphan);
   }
-  /// @copydoc details::generic_sequence::swap
+  /// @copydoc TAO::details::generic_sequence::swap
   inline void swap(unbounded_basic_string_sequence & rhs) throw() {
     impl_.swap(rhs.impl_);
   }
diff --git a/tao/Unbounded_Object_Reference_Sequence_T.h b/tao/Unbounded_Object_Reference_Sequence_T.h
index e84dbd203a7..fb5e63a428f 100644
--- a/tao/Unbounded_Object_Reference_Sequence_T.h
+++ b/tao/Unbounded_Object_Reference_Sequence_T.h
@@ -54,28 +54,28 @@ public:
     : impl_(maximum, length, data, release)
   {}
 
-  /// @copydoc details::generic_sequence::maximum()
+  /// @copydoc TAO::details::generic_sequence::maximum()
   inline CORBA::ULong maximum() const {
     return impl_.maximum();
   }
-  /// @copydoc details::generic_sequence::release()
+  /// @copydoc TAO::details::generic_sequence::release()
   inline CORBA::Boolean release() const {
     return impl_.release();
   }
-  /// @copydoc details::generic_sequence::length()
+  /// @copydoc TAO::details::generic_sequence::length()
   inline CORBA::ULong length() const {
     return impl_.length();
   }
 
-  /// @copydoc details::generic_sequence::length()
+  /// @copydoc TAO::details::generic_sequence::length()
   inline void length(CORBA::ULong length) {
     impl_.length(length);
   }
-  /// @copydoc details::generic_sequence::operator[]
+  /// @copydoc TAO::details::generic_sequence::operator[]
   inline const_element_type operator[](CORBA::ULong i) const {
     return const_element_type (impl_[i], release());
   }
-  /// @copydoc details::generic_sequence::operator[]
+  /// @copydoc TAO::details::generic_sequence::operator[]
   inline element_type operator[](CORBA::ULong i) {
     return element_type(impl_[i], release());
   }
@@ -83,7 +83,7 @@ public:
   inline value_type const * get_buffer() const {
     return impl_.get_buffer();
   }
-  /// @copydoc details::generic_sequence::replace()
+  /// @copydoc TAO::details::generic_sequence::replace()
   inline void replace(
       CORBA::ULong maximum,
       CORBA::ULong length,
@@ -91,11 +91,11 @@ public:
       CORBA::Boolean release = false) {
     impl_.replace(maximum, length, data, release);
   }
-  /// @copydoc details::generic_sequence::get_buffer(CORBA::Boolean)
+  /// @copydoc TAO::details::generic_sequence::get_buffer(CORBA::Boolean)
   inline value_type * get_buffer(CORBA::Boolean orphan = false) {
     return impl_.get_buffer(orphan);
   }
-  /// @copydoc details::generic_sequence::swap()
+  /// @copydoc TAO::details::generic_sequence::swap()
   inline void swap(unbounded_object_reference_sequence & rhs) throw() {
     impl_.swap(rhs.impl_);
   }
diff --git a/tao/Utils.mpc b/tao/Utils.mpc
deleted file mode 100644
index ff0f8564863..00000000000
--- a/tao/Utils.mpc
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-project (TAO_Utils) : taolib, tao_output, install, portableserver, pi {
-  sharedname    = TAO_Utils
-  dynamicflags  = TAO_UTILS_BUILD_DLL
-
-  Source_Files {
-    Utils
-  }
-
-  Header_Files {
-    Utils
-  }
-
-  Inline_Files {
-    Utils
-  }
-
-  Template_Files {
-    Utils/RIR_Narrow.cpp
-    Utils/Servant_Var.cpp
-    Utils/Server_Main.cpp
-  }
-
-  Resource_Files {
-    Utils
-  }
-
-  PIDL_Files {
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    TAO_Utils.pc.in
-  }
-}
diff --git a/tao/Utils/Auto_Functor.h b/tao/Utils/Auto_Functor.h
deleted file mode 100644
index b26ecdb0699..00000000000
--- a/tao/Utils/Auto_Functor.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- * @file Auto_Functor.h
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@atdesk.com>
- *
- * @deprecated This file is deprecated
- */
-//=============================================================================
-#ifndef TAO_UTILS_AUTO_FUNCTOR_H
-#define TAO_UTILS_AUTO_FUNCTOR_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Functor.h"
-
-namespace TAO
-{
-  namespace Utils
-  {
-
-  using namespace ACE_Utils;
-
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_UTILS_AUTO_FUNCTOR_H */
diff --git a/tao/Utils/Implicit_Deactivator.cpp b/tao/Utils/Implicit_Deactivator.cpp
index 1cdb4fc3087..f681c20b7de 100644
--- a/tao/Utils/Implicit_Deactivator.cpp
+++ b/tao/Utils/Implicit_Deactivator.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "tao/Utils/Implicit_Deactivator.h"
 #include "tao/PortableServer/Servant_Base.h"
 
-ACE_RCSID (Utils,
-           Implicit_Deactivator,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
diff --git a/tao/Utils/ORB_Destroyer.cpp b/tao/Utils/ORB_Destroyer.cpp
index 53b9e90a757..593f50b40f4 100644
--- a/tao/Utils/ORB_Destroyer.cpp
+++ b/tao/Utils/ORB_Destroyer.cpp
@@ -1,9 +1,6 @@
-#include "tao/Utils/ORB_Destroyer.h"
-
+// $Id$
 
-ACE_RCSID (Utils,
-           ORB_Destroyer,
-           "$Id$")
+#include "tao/Utils/ORB_Destroyer.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/tao/Utils/ORB_Manager.cpp b/tao/Utils/ORB_Manager.cpp
index cb44d3f9b1f..8df6312c348 100644
--- a/tao/Utils/ORB_Manager.cpp
+++ b/tao/Utils/ORB_Manager.cpp
@@ -1,14 +1,7 @@
 // $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    tao
-//
 // = AUTHOR
 //    Sumedh Mungee <sumedh@cs.wustl.edu>
-//
-// ============================================================================
 
 #include "tao/Utils/ORB_Manager.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
@@ -22,11 +15,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (PortableServer,
-           ORB_Manager,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // constructor
diff --git a/tao/Utils/PolicyList_Destroyer.cpp b/tao/Utils/PolicyList_Destroyer.cpp
index c0d4882492f..adc8436e240 100644
--- a/tao/Utils/PolicyList_Destroyer.cpp
+++ b/tao/Utils/PolicyList_Destroyer.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "tao/Utils/PolicyList_Destroyer.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Utils/PolicyList_Destroyer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Utils,
-           PolicyList_Deactivator,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer() throw ()
diff --git a/tao/Utils/Servant_Var.cpp b/tao/Utils/Servant_Var.cpp
deleted file mode 100644
index 1506ae356bc..00000000000
--- a/tao/Utils/Servant_Var.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef TAO_UTILS_SERVANT_VAR_CPP
-#define TAO_UTILS_SERVANT_VAR_CPP
-
-#include "tao/Utils/Servant_Var.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Utils/Servant_Var.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Utils,
-           Servant_Var,
-           "$Id$")
-
-#endif /*TAO_UTILS_SERVANT_VAR_CPP*/
diff --git a/tao/Utils/Servant_Var.h b/tao/Utils/Servant_Var.h
deleted file mode 100644
index 3c5d6362e6e..00000000000
--- a/tao/Utils/Servant_Var.h
+++ /dev/null
@@ -1,174 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Servant_Var.h
- *
- * $Id$
- *
- * @author Jody Hagins <jody@atdesk.com>
- * @author Carlos O'Ryan <coryan@atdesk.com>
- *
- * @deprecated Use PortableServer::Servant_var instead.
- */
-//=============================================================================
-
-#ifndef TAO_UTILS_SERVANT_VAR_H
-#define TAO_UTILS_SERVANT_VAR_H
-#include /**/ "ace/pre.h"
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace Utils
-  {
-
-    /**
-     * @class Servant_Var
-     *
-     * @brief Provides a type safe counted reference to servants.
-     *
-     * @author Jody Hagins
-     *
-     * @todo Life would be much easier if _add_ref() and _remove_ref() had
-     *       throw specs of "throw ()", that can be hidden in static
-     *       methods though.
-     */
-    template<class T>
-    class Servant_Var
-    {
-    public:
-      typedef T Servant_Type;
-
-      /// Constructor.  Assumes ownership of @c p.
-      Servant_Var(T * p = 0);
-
-      /// Copy constructor.  Adds reference to @c rhs.
-      Servant_Var(Servant_Var<T> const & rhs);
-
-      /// Assignment operator.  Adds reference to @c rhs.
-      Servant_Var<T> & operator=(Servant_Var<T> const & rhs);
-
-      /// Destructor.  Removes a reference from the underlying object,
-      /// possibly destroying it.
-      ~Servant_Var() throw ();
-
-      /// Assignment operator.  Assumes ownership of @c p.
-      Servant_Var<T> & operator=(T * p);
-
-# if !defined(ACE_LACKS_MEMBER_TEMPLATES)
-      /// Template member constructor from a pointer that will implicitly
-      /// cast to type T.  Assumes ownership of @c p.
-      /// This constructor allows constructs such as:
-      /// Servant_Base<Base> p(new Derived);
-      template <class Y>
-      Servant_Var(Y * p);
-
-      /// Template member copy constructor from a Servant_Var<Y>, where
-      /// Y can be implicitly cast to type T.
-      template <class Y>
-      Servant_Var(Servant_Var<Y> const & rhs);
-
-      /// Template member assignment operator from a Servant_Var<Y>, where
-      /// Y can be implicitly cast to type T.
-      template <class Y>
-      Servant_Var<T> & operator=(Servant_Var<Y> const & rhs);
-
-      /// Template member assignment operator from a pointer to Y, where Y
-      /// can be implicitly cast to type T.
-      template <class Y>
-      Servant_Var<T> & operator=(Y * p);
-# endif /* ACE_LACKS_MEMBER_TEMPLATES */
-
-      /// Smart pointer operator-> provides access to the underlying object.
-      T const * operator->() const;
-
-      /// Smart pointer operator-> provides access to the underlying object.
-      T * operator->();
-
-      /// Dereference the underlying object.
-      T const & operator*() const;
-
-      /// Dereference the underlying object.
-      T & operator*();
-
-      /// Return a void pointer to the underlying object.  This allows
-      /// it to be used in conditional code and tested against 0.
-      operator void const * () const;
-
-      /// As an IN parameter.
-      T * in() const;
-
-      /// As an INOUT parameter.
-      T *& inout();
-
-      /// As an OUT parameter.
-      T *& out();
-
-      // Return a pointer to the underlying object, and this counted
-      // reference will no longer own the object.
-      T * _retn();
-
-      /// Increment the reference count and return the servant.
-      /**
-       * It is safe to pass in a null pointer, the pointer is simply
-       * returned in that case.
-       *
-       * @todo We might want to add a throw spec and catch all (potential)
-       *       exceptions in _add_ref()
-       *
-       * @todo It might be useful to add an _release() method that handles
-       *       any potential exceptions...
-       */
-      static T * _duplicate (T *);
-
-      /// Swap the contents of a Servant_Var<T> with another
-      /// Servant_Var<T>
-      /**
-       * Often used to implement strong exception safety.
-       */
-      void swap(Servant_Var<T> & rhs) throw ();
-
-    private:
-      T * ptr_;
-    };
-
-#ifndef ACE_LACKS_MEMBER_TEMPLATES
-    /// Compare two Servant_Vars for equivalence.
-    template <class X, class Y>
-    bool operator==(Servant_Var<X> const & x,
-                    Servant_Var<Y> const & y);
-
-    /// Compare two Servant_Vars for non-equivalence.
-    template <class X, class Y>
-    bool operator!=(Servant_Var<X> const & x,
-                    Servant_Var<Y> const & y);
-#endif /* ! ACE_LACKS_MEMBER_TEMPLATES */
-
-  } // namespace Utils
-} // namespace TAO
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/Utils/Servant_Var.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Utils/Servant_Var.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Servant_Var.cpp")
-#endif
-
-#include /**/ "ace/post.h"
-#endif /*TAO_UTILS_SERVANT_VAR_H*/
diff --git a/tao/Utils/Servant_Var.inl b/tao/Utils/Servant_Var.inl
deleted file mode 100644
index 8c7c03374be..00000000000
--- a/tao/Utils/Servant_Var.inl
+++ /dev/null
@@ -1,200 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include <algorithm>
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-template <class T>
-ACE_INLINE T *
-TAO::Utils::Servant_Var<T>::_duplicate (T * p)
-{
-  if (p != 0)
-    {
-      p->_add_ref ();
-    }
-
-  return p;
-}
-
-template <class T>
-ACE_INLINE void
-TAO::Utils::Servant_Var<T>::swap (Servant_Var<T> & rhs) throw ()
-{
-  std::swap (this->ptr_, rhs.ptr_);
-}
-
-template <class T>
-ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (T * p)
-  : ptr_ (p)
-{
-}
-
-// If _add_ref throws, this object will not be completely constructed
-// so the destructor will not be called.
-template <class T>
-ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (Servant_Var<T> const & rhs)
-  : ptr_ (Servant_Var<T>::_duplicate(rhs.ptr_))
-{
-}
-
-template <class T>
-ACE_INLINE TAO::Utils::Servant_Var<T> &
-TAO::Utils::Servant_Var<T>::operator= (Servant_Var<T> const & rhs)
-{
-  TAO::Utils::Servant_Var<T> tmp (rhs);
-  this->swap (tmp);
-  return *this;
-}
-
-template <class T>
-ACE_INLINE typename TAO::Utils::Servant_Var<T> &
-TAO::Utils::Servant_Var<T>::operator= (T * p)
-{
-  if (this->ptr_ != p)
-    {
-      // This constructor doesn't increase the reference count so we
-      // we must check for self-assignment.  Otherwise the reference
-      // count would be prematurely decremented upon exiting this
-      // scope.
-      TAO::Utils::Servant_Var<T> tmp (p);
-      this->swap (tmp);
-    }
-
-  return *this;
-}
-
-template <class T> ACE_INLINE
-TAO::Utils::Servant_Var<T>::~Servant_Var (void) throw ()
-{
-  if (ptr_ != 0)
-    {
-      ptr_->_remove_ref ();
-    }
-}
-
-#if !defined(ACE_LACKS_MEMBER_TEMPLATES)
-template <class T> template <class Y>
-ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (Y * p)
-  : ptr_ (p)
-{
-}
-
-template <class T> template <class Y>
-ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (Servant_Var<Y> const & rhs)
-  : ptr_ (Servant_Var<T>::_duplicate (rhs.in ()))
-{
-}
-
-template <class T> template <class Y>
-ACE_INLINE typename TAO::Utils::Servant_Var<T> &
-TAO::Utils::Servant_Var<T>::
-operator=(Servant_Var<Y> const & rhs)
-{
-  TAO::Utils::Servant_Var<T> tmp (rhs);
-  this->swap (tmp);
-  return *this;
-}
-
-template <class T> template <class Y>
-ACE_INLINE typename TAO::Utils::Servant_Var<T> &
-TAO::Utils::Servant_Var<T>::operator= (Y * p)
-{
-  if (this->ptr_ != p)
-    {
-      // This constructor doesn't increase the reference count so we
-      // we must check for self-assignment.  Otherwise the reference
-      // count would be prematurely decremented upon exiting this
-      // scope.
-      TAO::Utils::Servant_Var<T> tmp (p);
-      this->swap (tmp);
-    }
-
-  return *this;
-}
-#endif /* ACE_LACKS_MEMBER_TEMPLATES */
-
-template <class T>
-ACE_INLINE T const *
-TAO::Utils::Servant_Var<T>::operator->() const
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T *
-TAO::Utils::Servant_Var<T>::operator->()
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T const & TAO::Utils::Servant_Var<T>::operator*() const
-{
-  return *ptr_;
-}
-
-template <class T>
-ACE_INLINE T & TAO::Utils::Servant_Var<T>::operator*()
-{
-  return *ptr_;
-}
-
-template <class T>
-ACE_INLINE TAO::Utils::Servant_Var<T>::operator void const * () const
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T *
-TAO::Utils::Servant_Var<T>::in (void) const
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T *&
-TAO::Utils::Servant_Var<T>::inout (void)
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T *&
-TAO::Utils::Servant_Var<T>::out (void)
-{
-  TAO::Utils::Servant_Var<T> tmp;
-  this->swap (tmp);
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T *
-TAO::Utils::Servant_Var<T>::_retn (void)
-{
-  T * rval = ptr_;
-  ptr_ = 0;
-  return rval;
-}
-
-#if !defined (ACE_LACKS_MEMBER_TEMPLATES)
-template <class X, class Y>
-ACE_INLINE bool
-operator== (typename TAO::Utils::Servant_Var<X> const & x,
-            typename TAO::Utils::Servant_Var<Y> const & y)
-{
-  return x.in () == y.in ();
-}
-
-template <class X, class Y>
-ACE_INLINE bool
-operator!= (typename TAO::Utils::Servant_Var<X> const & x,
-            typename TAO::Utils::Servant_Var<Y> const & y)
-{
-  return x.in () != y.in ();
-}
-#endif /* ! ACE_LACKS_MEMBER_TEMPLATES */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Utils/Server_Main.cpp b/tao/Utils/Server_Main.cpp
index cdba47cbfc6..aa7e4890288 100644
--- a/tao/Utils/Server_Main.cpp
+++ b/tao/Utils/Server_Main.cpp
@@ -42,24 +42,20 @@ int
 TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
 {
   int result = 0;
-  // hide unicode if necessary.
-  ACE_Argv_Type_Converter command_line (argc, argv);
-
-  ACE_TCHAR ** asciiArgv = command_line.get_TCHAR_argv ();
 
   try
   {
     // Initialize the orb
 
     CORBA::ORB_var orb =
-      CORBA::ORB_init (argc, asciiArgv, name_);
+      CORBA::ORB_init (argc, argv, name_);
 
     if (! ::CORBA::is_nil(orb.in ()))
     {
       // create an instance of the servant object and give it a
       // chance at the arguments.
       SERVANT servant;
-      result = servant.parse_args (argc, asciiArgv);
+      result = servant.parse_args (argc, argv);
       if (result == 0)
       {
         //////////////////////////////////
@@ -69,7 +65,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
         if (result == 0)
         {
           ACE_ERROR ((LM_INFO,
-            "%T %s (%P|%t) Ready %s\n", name_, servant.identity ()
+            "%T %C (%P|%t) Ready %C\n", name_, servant.identity ()
             ));
 
           //////////////////////////////////
@@ -91,7 +87,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
           orb->shutdown (1);
 
           ACE_ERROR ((LM_INFO,
-                      "%T %s (%P|%t) Terminated normally. %s\n",
+                      "%T %C (%P|%t) Terminated normally. %C\n",
                       name_,
                       servant.identity ()
             ));
@@ -99,7 +95,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
         else
         {
           ACE_ERROR ((LM_ERROR,
-            "%T %s (%P|%t) Registration failed: %m\n", name_
+            "%T %C (%P|%t) Registration failed: %m\n", name_
             ));
           result = -1;
         }
@@ -107,7 +103,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
       else
       {
         ACE_ERROR ((LM_ERROR,
-          "%T %s (%P|%t) ORB manager init failed\n", name_
+          "%T %C (%P|%t) ORB manager init failed\n", name_
         ));
         result = -1;
       }
diff --git a/tao/Utils/Server_Main.h b/tao/Utils/Server_Main.h
index 8054c5cd5f9..9edfd7904a0 100644
--- a/tao/Utils/Server_Main.h
+++ b/tao/Utils/Server_Main.h
@@ -34,7 +34,7 @@
  *  the following methods:
  *      Xyzzy_i (); // null constructor
  *      ~Xyzzy_i (); // destructor
- *      int parse_args (int argc, char * argv[]);
+ *      int parse_args (int argc, ACE_TCHAR * argv[]);
  *      int init (CORBA::ORB_ptr orb );
  *      int idle(int &result);
  *      int fini (void);
@@ -59,6 +59,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/orbconf.h"
+#include "ace/Copy_Disabled.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -67,7 +68,7 @@ namespace TAO
   namespace Utils
   {
     template <typename SERVANT>
-    class Server_Main
+    class Server_Main : private ACE_Copy_Disabled
     {
     public:
       Server_Main(const char * name);
@@ -76,10 +77,6 @@ namespace TAO
       int run (int argc, ACE_TCHAR *argv[]);
 
     private:
-      Server_Main( const Server_Main &);
-      Server_Main & operator = (const Server_Main &);
-
-    private:
       const char * name_;
     };
   } // namespace UTILS
diff --git a/tao/Utils/Synch_Refcountable.cpp b/tao/Utils/Synch_Refcountable.cpp
deleted file mode 100644
index 44f0b01c19d..00000000000
--- a/tao/Utils/Synch_Refcountable.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "tao/Utils/Synch_Refcountable.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Utils/Synch_Refcountable.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (Utils,
-           Synch_Refcountable,
-           "$Id$")
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_Synch_Refcountable::TAO_Synch_Refcountable (ACE_Lock *lock, int refcount)
-  : ACE_Refcountable (refcount)
-  , refcount_lock_ (lock)
-{
-}
-
-TAO_Synch_Refcountable::~TAO_Synch_Refcountable (void)
-{
-  ACE_ASSERT (this->refcount_ == 0);
-  delete this->refcount_lock_;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Utils/Synch_Refcountable.h b/tao/Utils/Synch_Refcountable.h
deleted file mode 100644
index 3e77a70c4c3..00000000000
--- a/tao/Utils/Synch_Refcountable.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Synch_Refcountable.h
- *
- *  $Id$
- *
- *  Definition for a synchronised refcountable interface.
- *
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SYNCH_REFCOUNTABLE_H
-#define TAO_SYNCH_REFCOUNTABLE_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Refcountable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Utils/utils_export.h"
-#include "tao/Versioned_Namespace.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Lock;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_Synch_Refcountable
- *
- * @brief Definition for a synchronised refcountable interface.
- */
-class TAO_UTILS_Export TAO_Synch_Refcountable : private ACE_Refcountable
-{
-public:
-  virtual ~TAO_Synch_Refcountable (void);
-
-  int increment (void);
-  int decrement (void);
-
-  int refcount (void) const;
-
-protected:
-  TAO_Synch_Refcountable (ACE_Lock *lock, int refcount);
-
-  ACE_Lock *refcount_lock_;
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/Utils/Synch_Refcountable.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_SYNCH_REFCOUNTABLE*/
diff --git a/tao/Utils/Synch_Refcountable.inl b/tao/Utils/Synch_Refcountable.inl
deleted file mode 100644
index 2139918ab50..00000000000
--- a/tao/Utils/Synch_Refcountable.inl
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//
-//$Id$
-
-#include "ace/Guard_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE int
-TAO_Synch_Refcountable::increment (void)
-{
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->refcount_lock_, 0);
-  return ACE_Refcountable::increment ();
-}
-
-ACE_INLINE int
-TAO_Synch_Refcountable::decrement (void)
-{
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->refcount_lock_, 0);
-  return ACE_Refcountable::decrement ();
-}
-
-ACE_INLINE int
-TAO_Synch_Refcountable::refcount (void) const
-{
-  return ACE_Refcountable::refcount ();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/TAO_Utils.pc.in b/tao/Utils/TAO_Utils.pc.in
index 5682422a2b6..5682422a2b6 100644
--- a/tao/TAO_Utils.pc.in
+++ b/tao/Utils/TAO_Utils.pc.in
diff --git a/tao/Utils/TAO_Utils.rc b/tao/Utils/TAO_Utils.rc
new file mode 100644
index 00000000000..822fe015410
--- /dev/null
+++ b/tao/Utils/TAO_Utils.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "Utils\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_UtilsDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_Utils.DLL\0"
+            VALUE "ProductName", "TAO\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/tao/Utils/Utils.mpc b/tao/Utils/Utils.mpc
new file mode 100644
index 00000000000..70a2631a5dc
--- /dev/null
+++ b/tao/Utils/Utils.mpc
@@ -0,0 +1,14 @@
+// $Id$
+project (TAO_Utils) : taolib, tao_output, install, portableserver, pi {
+  sharedname    = TAO_Utils
+  dynamicflags  = TAO_UTILS_BUILD_DLL
+
+  Template_Files {
+    RIR_Narrow.cpp
+    Server_Main.cpp
+  }
+
+  specific {
+    install_dir = tao/Utils
+  }
+}
diff --git a/tao/Value_Traits_T.h b/tao/Value_Traits_T.h
index b68acfd7b63..a36338f2b41 100644
--- a/tao/Value_Traits_T.h
+++ b/tao/Value_Traits_T.h
@@ -46,7 +46,6 @@ struct value_traits
     // Noop for value sequences
   }
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_range(
@@ -54,15 +53,7 @@ struct value_traits
   {
     std::copy(begin, end, dst);
   }
-# else
-  inline static void copy_range(
-      value_type * begin, value_type * end, value_type * dst)
-  {
-    std::copy(begin, end, dst);
-  }
-# endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_swap_range(
@@ -70,13 +61,6 @@ struct value_traits
   {
     copy_range(begin, end, dst);
   }
-# 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 */
 };
 
 } // namespace details
diff --git a/tao/Valuetype.mpc b/tao/Valuetype.mpc
deleted file mode 100644
index 2f973f8dc4a..00000000000
--- a/tao/Valuetype.mpc
+++ /dev/null
@@ -1,53 +0,0 @@
-//$Id$
-project(*idl) : tao_versioning_idl_defaults, gen_ostream {
-  custom_only = 1
-  IDL_Files {
-    idlflags += -SS -Sorb \
-                -Wb,export_macro=TAO_Valuetype_Export \
-                -Wb,export_include=tao/Valuetype/valuetype_export.h \
-                -o Valuetype
-    idlflags -= -St
-    Valuetype/StringValue.pidl
-  }
-}
-
-project(Valuetype) : taolib, tao_output, install, anytypecode, avoids_corba_e_micro, taoidldefaults, gen_ostream, valuetype_out_indirection {
-  after += *idl
-  sharedname    = TAO_Valuetype
-  dynamicflags  = TAO_VALUETYPE_BUILD_DLL
-
-  Source_Files {
-    Valuetype
-  }
-
-  Source_Files {
-    Valuetype/StringValueC.cpp
-  }
-
-  Header_Files {
-    Valuetype
-  }
-
-  Inline_Files {
-    Valuetype
-  }
-
-  Template_Files {
-    Valuetype
-  }
-
-  Resource_Files {
-    Valuetype
-  }
-
-  PIDL_Files {
-    Valuetype
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    Valuetype/TAO_Valuetype.pc.in
-  }
-}
diff --git a/tao/Valuetype/AbstractBase.cpp b/tao/Valuetype/AbstractBase.cpp
index 147eb54a1f3..ece68afe9ea 100644
--- a/tao/Valuetype/AbstractBase.cpp
+++ b/tao/Valuetype/AbstractBase.cpp
@@ -18,31 +18,25 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::AbstractBase::AbstractBase (void)
   : is_objref_ (false)
-  , concrete_stubobj_ (0)
+  , refcount_ (1)
   , is_collocated_ (false)
   , servant_ (0)
-  , is_local_ (false)
-  , equivalent_obj_ (0)
+  , equivalent_obj_ (CORBA::Object::_nil ())
 {
 }
 
 CORBA::AbstractBase::AbstractBase (const CORBA::AbstractBase &rhs)
   : is_objref_ (rhs.is_objref_)
-  , concrete_stubobj_ (rhs.concrete_stubobj_)
+  , refcount_ (1)
   , is_collocated_ (rhs.is_collocated_)
   , servant_ (rhs.servant_)
-  , is_local_ (rhs.is_local_)
-  , equivalent_obj_ (0)
+  , equivalent_obj_ (CORBA::Object::_nil ())
 {
-  if (rhs.concrete_stubobj_ != 0)
-    {
-      rhs.concrete_stubobj_->_incr_refcnt ();
-    }
-
-  if (!CORBA::is_nil (rhs.equivalent_obj_.in ()))
+  if (this->is_objref_)
     {
+      // Need to duplicate equivalent obj only if it's objref.
       this->equivalent_obj_ =
-        CORBA::Object::_duplicate (rhs.equivalent_obj_);
+        CORBA::Object::_duplicate (rhs.equivalent_obj_.in ());
     }
 }
 
@@ -50,59 +44,47 @@ CORBA::AbstractBase::AbstractBase (TAO_Stub * protocol_proxy,
                                    CORBA::Boolean collocated,
                                    TAO_Abstract_ServantBase * servant)
   : is_objref_ (true)
-  , concrete_stubobj_ (protocol_proxy)
+  , refcount_ (1)
   , is_collocated_ (collocated)
   , servant_ (servant)
-  , is_local_ (protocol_proxy == 0 ? true : false)
-  , equivalent_obj_ (0)
+  , equivalent_obj_ (this->create_object (protocol_proxy))
 {
-  if (this->concrete_stubobj_ != 0)
-    {
-      TAO_Stub *stub = this->concrete_stubobj_;
-
-      stub->_incr_refcnt ();
-
-      this->equivalent_obj_ =
-        stub->orb_core ()->create_object (stub);
-    }
-
 }
 
 CORBA::AbstractBase::~AbstractBase (void)
 {
-  if (this->concrete_stubobj_ != 0)
-    {
-      this->concrete_stubobj_->_decr_refcnt ();
-    }
 }
 
-CORBA::AbstractBase_ptr
-CORBA::AbstractBase::_duplicate (CORBA::AbstractBase_ptr obj)
+void
+CORBA::AbstractBase::_add_ref (void)
 {
-  if (obj)
-    {
-      obj->_add_ref ();
-    }
+  ++this->refcount_;
 
-  if (!CORBA::is_nil (obj->equivalent_obj_.in ()))
+  // This is required by the C++ Mapping 1.2.
+  if (this->is_objref_)
     {
-      obj->equivalent_obj_->_add_ref ();
+      this->equivalent_obj_ =
+        CORBA::Object::_duplicate (this->equivalent_obj_.in ());
     }
-
-  return obj;
-}
-
-// These are non-pure virtual no-ops so we can instantiate the
-// class in the CDR extraction operator. The actual management
-// of the refcount will always be done in the derived class.
-void
-CORBA::AbstractBase::_add_ref (void)
-{
 }
 
 void
 CORBA::AbstractBase::_remove_ref (void)
 {
+  // This is required by the C++ Mapping 1.2.
+  if (this->is_objref_)
+    {
+      CORBA::release (this->equivalent_obj_.in ());
+    }
+
+  if (--this->refcount_ == 0)
+    {
+      // If this object is going to be deleted here then the reference to
+      // equivalent_obj_ that it owned is already released a few lines above.
+      this->equivalent_obj_._retn ();
+
+      delete this;
+    }
 }
 
 void
@@ -115,18 +97,12 @@ CORBA::AbstractBase::_tao_any_destructor (void *x)
 CORBA::Object_ptr
 CORBA::AbstractBase::_to_object (void)
 {
-  if (!CORBA::is_nil (this->equivalent_obj_.in ()))
-    return CORBA::Object::_duplicate (this->equivalent_obj_.in ());
-
-  if (this->concrete_stubobj_ == 0)
+  if (!this->is_objref_)
     {
       return CORBA::Object::_nil ();
     }
 
-  TAO_ORB_Core *orb_core = this->concrete_stubobj_->orb_core ();
-  this->concrete_stubobj_->_incr_refcnt ();
-
-  return orb_core->create_object (this->concrete_stubobj_);
+  return CORBA::Object::_duplicate (this->equivalent_obj_.in ());
 }
 
 CORBA::ValueBase *
@@ -150,9 +126,12 @@ CORBA::AbstractBase::_to_value (void)
 CORBA::Boolean
 CORBA::AbstractBase::_is_a (const char *type_id)
 {
-  if (! CORBA::is_nil (this->equivalent_obj_.in ()))
+  if (this->is_objref_)
     {
-      return this->equivalent_obj_->_is_a (type_id);
+      if (!CORBA::is_nil (this->equivalent_obj_.in ()))
+        {
+          return this->equivalent_obj_->_is_a (type_id);
+        }
     }
 
   return (ACE_OS::strcmp (type_id, "IDL:omg.org/CORBA/AbstractBase:1.0") == 0);
@@ -182,10 +161,7 @@ operator<< (TAO_OutputCDR &strm, const CORBA::AbstractBase_ptr abs)
     {
       // Marshal discriminator, then empty type hint.
       strm << ACE_OutputCDR::from_boolean (discriminator);
-      strm.write_ulong (1);
-      strm.write_char ('\0');
-      strm.write_ulong (0);
-      return (CORBA::Boolean) strm.good_bit ();
+      return strm << CORBA::Object::_nil ();
     }
 
   if (abs->_is_objref ())
@@ -235,23 +211,17 @@ operator<< (TAO_OutputCDR &strm, const CORBA::AbstractBase_ptr abs)
 
       if (strm << ACE_OutputCDR::from_boolean (discriminator))
         {
-          CORBA::Boolean retval = true;
-
           CORBA::ULong value_tag = TAO_OBV_GIOP_Flags::Value_tag_base
                                    | TAO_OBV_GIOP_Flags::Type_info_single;
 
-          retval = strm.write_ulong (value_tag);
-
-          if (retval == 0)
+          if ((strm.write_ulong (value_tag)) == 0)
             {
-              return retval;
+              return false;
             }
 
-          retval = strm << abs->_tao_obv_repository_id ();
-
-          if (retval == 0)
+          if ((strm << abs->_tao_obv_repository_id ()) == 0)
             {
-              return retval;
+              return false;
             }
 
           return abs->_tao_marshal_v (strm);
@@ -338,20 +308,16 @@ operator>> (TAO_InputCDR &strm, CORBA::AbstractBase_ptr &abs)
 
           if (strm >> generic_objref.inout ())
             {
-              TAO_Stub *concrete_stubobj = generic_objref->_stubobj ();
-
-              CORBA::Boolean const stores_orb =
-                ! CORBA::is_nil (concrete_stubobj->servant_orb_var ().in ());
-
-              if (stores_orb)
+              if (CORBA::is_nil (generic_objref.in ()))
                 {
-                  orb_core =
-                    concrete_stubobj->servant_orb_var ()->orb_core ();
+                  return true;
                 }
 
-              CORBA::Boolean const collocated =
-                orb_core != 0
-                && orb_core->optimize_collocation_objects ()
+              TAO_Stub *concrete_stubobj = generic_objref->_stubobj ();
+
+              bool const collocated =
+                !CORBA::is_nil (concrete_stubobj->servant_orb_var ().in ())
+                && concrete_stubobj->optimize_collocation_objects ()
                 && generic_objref->_is_collocated ();
 
               ACE_NEW_RETURN (abs,
@@ -421,23 +387,23 @@ CORBA::AbstractBase::_tao_to_value (void)
 }
 
 CORBA::Object_ptr
-CORBA::AbstractBase::equivalent_objref (void)
+CORBA::AbstractBase::create_object (TAO_Stub *stub)
 {
-  if (CORBA::is_nil (this->equivalent_obj_.in ()))
+  if (stub)
     {
-      if (this->concrete_stubobj_ != 0)
-        {
-          TAO_ORB_Core *orb_core =
-            this->concrete_stubobj_->orb_core ();
+      stub->_incr_refcnt ();
 
-          this->concrete_stubobj_->_incr_refcnt ();
+      TAO_Stub_Auto_Ptr safe_stub (stub);
 
-          this->equivalent_obj_ =
-            orb_core->create_object (this->concrete_stubobj_);
-        }
+      CORBA::Object_ptr obj =
+        stub->orb_core ()->create_object (stub);
+
+      safe_stub.release ();
+
+      return obj;
     }
 
-  return this->equivalent_obj_.in ();
+  return CORBA::Object::_nil ();
 }
 
 // ================== Typecode initializations ==================
diff --git a/tao/Valuetype/AbstractBase.h b/tao/Valuetype/AbstractBase.h
index 9dabff20d5e..c03a2061f3f 100644
--- a/tao/Valuetype/AbstractBase.h
+++ b/tao/Valuetype/AbstractBase.h
@@ -61,19 +61,18 @@ namespace CORBA
     /// Constructor.
     /**
      * This constructor is only meant to be called by the
-     * corresponding CDR stream extraction operator.
+     * corresponding CDR stream extraction operator or during
+     * narrowing. Refcount of stub p is increased here.
      */
     AbstractBase (TAO_Stub *p,
-                  CORBA::Boolean collocated,
-                  TAO_Abstract_ServantBase *servant);
+                  CORBA::Boolean,
+                  TAO_Abstract_ServantBase *);
 
     typedef CORBA::AbstractBase_ptr _ptr_type;
     typedef CORBA::AbstractBase_var _var_type;
     typedef CORBA::AbstractBase_out _out_type;
 
-    static CORBA::AbstractBase_ptr _narrow (CORBA::AbstractBase_ptr obj
-                                            );
-
+    static CORBA::AbstractBase_ptr _narrow (CORBA::AbstractBase_ptr obj);
     static CORBA::AbstractBase_ptr _duplicate (CORBA::AbstractBase_ptr obj);
     static CORBA::AbstractBase_ptr _nil (void);
 
@@ -84,28 +83,27 @@ namespace CORBA
     CORBA::Object_ptr _to_object (void);
     CORBA::ValueBase *_to_value (void);
 
-    virtual CORBA::Boolean _is_a (const char *type_id
-                                  );
+    virtual CORBA::Boolean _is_a (const char *type_id);
     virtual const char* _interface_repository_id (void) const;
 
     /// TAO specific operations
-    
+
     virtual const char* _tao_obv_repository_id (void) const;
-    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &strm) const;
-    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &strm);
+    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
+    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
     virtual CORBA::Boolean _tao_match_formal_type (ptrdiff_t) const;
 
 #if defined (GEN_OSTREAM_OPS)
 
     /// Used by optionally generated ostream operators for interface
-    /// to output the actual repo id for debugging.  
+    /// to output the actual repo id for debugging.
     static std::ostream& _tao_stream (std::ostream &strm,
                                       const AbstractBase_ptr _tao_objref);
     virtual std::ostream& _tao_stream_v (std::ostream &strm) const;
-    
+
 #endif /* GEN_OSTREAM_OPS */
 
-    /// Memmory management operations
+    /// Memory management operations
     virtual void _add_ref (void);
     virtual void _remove_ref (void);
 
@@ -117,7 +115,6 @@ namespace CORBA
     /// Acessors
     CORBA::Boolean _is_collocated (void) const;
     TAO_Abstract_ServantBase *_servant (void) const;
-    CORBA::Boolean _is_local (void) const;
 
     /// Return the equivalent object reference.
     /**
@@ -128,7 +125,7 @@ namespace CORBA
     CORBA::Object_ptr equivalent_objref (void);
 
     /// Wrapper for _remove_ref(), naming convention for
-    /// templatizing.                              
+    /// templatizing.
     void _decr_refcount (void);
 
   protected:
@@ -148,12 +145,15 @@ namespace CORBA
 
     virtual CORBA::ValueBase *_tao_to_value (void);
 
+    CORBA::Object_ptr create_object (TAO_Stub *stub);
+
   private:
 
-    TAO_Stub *concrete_stubobj_;
+    /// Number of outstanding references to this object.
+    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
+
     CORBA::Boolean is_collocated_;
     TAO_Abstract_ServantBase *servant_;
-    CORBA::Boolean is_local_;
 
     /// Our equivalent CORBA::Object version
     /// @todo We may at some point of time should probably cache a
diff --git a/tao/Valuetype/AbstractBase.inl b/tao/Valuetype/AbstractBase.inl
index fd1a25ee008..32164d5b662 100644
--- a/tao/Valuetype/AbstractBase.inl
+++ b/tao/Valuetype/AbstractBase.inl
@@ -8,14 +8,25 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 CORBA::AbstractBase_ptr
+CORBA::AbstractBase::_duplicate (CORBA::AbstractBase_ptr obj)
+{
+  if (obj)
+    {
+      obj->_add_ref ();
+    }
+
+  return obj;
+}
+
+ACE_INLINE
+CORBA::AbstractBase_ptr
 CORBA::AbstractBase::_nil (void)
 {
   return static_cast <CORBA::AbstractBase_ptr> (0);
 }
 
 ACE_INLINE CORBA::AbstractBase_ptr
-CORBA::AbstractBase::_narrow (CORBA::AbstractBase_ptr obj
-                              )
+CORBA::AbstractBase::_narrow (CORBA::AbstractBase_ptr obj)
 {
   return CORBA::AbstractBase::_duplicate (obj);
 }
@@ -31,7 +42,14 @@ ACE_INLINE
 TAO_Stub *
 CORBA::AbstractBase::_stubobj (void) const
 {
-  return this->concrete_stubobj_;
+  if (this->is_objref_)
+    {
+      if (!CORBA::is_nil (this->equivalent_obj_.in ()))
+        {
+          return this->equivalent_obj_->_stubobj ();
+        }
+    }
+  return 0;
 }
 
 ACE_INLINE
@@ -49,10 +67,10 @@ CORBA::AbstractBase::_servant (void) const
 }
 
 ACE_INLINE
-CORBA::Boolean
-CORBA::AbstractBase::_is_local (void) const
+CORBA::Object_ptr
+CORBA::AbstractBase::equivalent_objref (void)
 {
-  return this->is_local_;
+  return this->equivalent_obj_.in ();
 }
 
 ACE_INLINE void
diff --git a/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp b/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
index 545f4c813d7..bcb3e3c3849 100644
--- a/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
+++ b/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
@@ -1,4 +1,6 @@
-//$Id$
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Valuetype/AbstractBase_Invocation_Adapter.h"
 #include "tao/Valuetype/AbstractBase.h"
 
diff --git a/tao/Valuetype/AbstractBase_T.cpp b/tao/Valuetype/AbstractBase_T.cpp
index 42acdb56e79..01f4e0ab83f 100644
--- a/tao/Valuetype/AbstractBase_T.cpp
+++ b/tao/Valuetype/AbstractBase_T.cpp
@@ -15,30 +15,20 @@ namespace TAO
   AbstractBase_Narrow_Utils<T>::narrow (
       CORBA::AbstractBase_ptr obj,
       const char *repo_id,
-      Proxy_Broker_Factory pbf
-      )
+      Proxy_Broker_Factory pbf)
   {
     if (CORBA::is_nil (obj))
       {
         return T::_nil ();
       }
 
-    CORBA::Boolean const is_it =
-      obj->_is_a (
-          repo_id
-
-        );
-
-    if (is_it == false)
+    if (obj->_is_a (repo_id) == false)
       {
         return T::_nil ();
       }
 
     return
-      AbstractBase_Narrow_Utils<T>::unchecked_narrow (obj,
-                                                      repo_id,
-                                                      pbf
-                                                     );
+      AbstractBase_Narrow_Utils<T>::unchecked_narrow (obj, repo_id, pbf);
   }
 
   template<typename T>  T *
@@ -48,21 +38,13 @@ namespace TAO
   {
     T *proxy = 0;
 
-
     try
       {
         proxy =
-          AbstractBase_Narrow_Utils<T>::unchecked_narrow (
-              obj,
-              0,
-              pbf
-             );
-
+          AbstractBase_Narrow_Utils<T>::unchecked_narrow (obj, 0, pbf);
       }
     catch (const ::CORBA::Exception&)
       {
-        // Consume and return proxy
-        return proxy;
       }
 
     return proxy;
@@ -72,8 +54,7 @@ namespace TAO
   AbstractBase_Narrow_Utils<T>::unchecked_narrow (
       CORBA::AbstractBase_ptr obj,
       const char *,
-      Proxy_Broker_Factory pbf
-      )
+      Proxy_Broker_Factory pbf)
   {
     if (CORBA::is_nil (obj))
       {
@@ -94,7 +75,7 @@ namespace TAO
 
         ACE_NEW_THROW_EX (proxy,
                           T (obj->_stubobj (),
-                             collocated ? 1 : 0,
+                             collocated,
                              obj->_servant ()),
                           CORBA::NO_MEMORY ());
       }
diff --git a/tao/Valuetype/AbstractBase_T.h b/tao/Valuetype/AbstractBase_T.h
index 79c85ae0d87..3d088a6645b 100644
--- a/tao/Valuetype/AbstractBase_T.h
+++ b/tao/Valuetype/AbstractBase_T.h
@@ -38,16 +38,14 @@ namespace TAO
 
     static T_ptr narrow (CORBA::AbstractBase_ptr,
                          const char *repo_id,
-                         Proxy_Broker_Factory
-                        );
+                         Proxy_Broker_Factory);
 
     static T_ptr unchecked_narrow (CORBA::AbstractBase_ptr,
                                    Proxy_Broker_Factory);
 
     static T_ptr unchecked_narrow (CORBA::AbstractBase_ptr,
                                    const char *repo_id,
-                                   Proxy_Broker_Factory
-                                  );
+                                   Proxy_Broker_Factory);
   };
 }
 
diff --git a/tao/Valuetype/ValueBase.cpp b/tao/Valuetype/ValueBase.cpp
index edb794c76c1..0df0c235745 100644
--- a/tao/Valuetype/ValueBase.cpp
+++ b/tao/Valuetype/ValueBase.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
diff --git a/tao/Valuetype/ValueBase.h b/tao/Valuetype/ValueBase.h
index 65647ffda94..01f74b564cb 100644
--- a/tao/Valuetype/ValueBase.h
+++ b/tao/Valuetype/ValueBase.h
@@ -46,8 +46,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Valuetype_Export TAO_ChunkInfo
 {
 public:
-  TAO_ChunkInfo (CORBA::Boolean do_chunking = 0,
-                 CORBA::Long init_level = 0);
+  TAO_ChunkInfo (CORBA::Boolean do_chunking = false,
+                 CORBA::Long init_level = false);
 
   /// Methods to support chunking.
   /// Note: These methods are called for both chunking and non-chunking
@@ -131,7 +131,7 @@ namespace CORBA
     typedef ValueBase_out _out_type;
 
     typedef ACE_Vector < ACE_CString > Repository_Id_List;
-    
+
     // Reference counting.
     /// %! virtual CORBA::ValueBase* _copy_value (void) = 0;
 
@@ -286,14 +286,6 @@ namespace CORBA
 
   private:
     ValueBase & operator= (const ValueBase &);
-
-#ifdef SUN_CC_HAS_PVFC_BUG
-    // Need ugly fix for sun cc "pure virtual function called" bug.
-  private:
-    unsigned long tao_sun_cc_pvfc_bug_fix_;
-
-#endif /* SUN_CC_HAS_PVFC_BUG */
-
   }; // ValueBase
 
   /// Valuetype-related type codes.
diff --git a/tao/Valuetype/ValueFactory.cpp b/tao/Valuetype/ValueFactory.cpp
index 03d27870ebf..b3c3d24d936 100644
--- a/tao/Valuetype/ValueFactory.cpp
+++ b/tao/Valuetype/ValueFactory.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Valuetype/ValueFactory.h"
 #include "ace/Guard_T.h"
 
diff --git a/tao/Valuetype/ValueFactory.h b/tao/Valuetype/ValueFactory.h
index 859a011e331..8a395d2aaf2 100644
--- a/tao/Valuetype/ValueFactory.h
+++ b/tao/Valuetype/ValueFactory.h
@@ -62,11 +62,10 @@ namespace CORBA
     // private: %!
     /// In a derived class T use return type TAO_OBV_CREATE_RETURN_TYPE (T)
     /// (see at definition below)
-    virtual CORBA::ValueBase * create_for_unmarshal (
-      void) = 0;
+    virtual CORBA::ValueBase * create_for_unmarshal (void) = 0;
 
-    // Not pure virtual because this will be overridden only by valuetypes
-    // that support an abstract interface.
+    /// Not pure virtual because this will be overridden only by valuetypes
+    /// that support an abstract interface.
     virtual CORBA::AbstractBase_ptr create_for_unmarshal_abstract (void);
 
   private:
diff --git a/tao/Valuetype/ValueFactory_Map.cpp b/tao/Valuetype/ValueFactory_Map.cpp
index 782b2ce8d0c..51b1995a2d4 100644
--- a/tao/Valuetype/ValueFactory_Map.cpp
+++ b/tao/Valuetype/ValueFactory_Map.cpp
@@ -1,3 +1,6 @@
+// -*- C++ -*-
+// $Id$
+
 #include "tao/Valuetype/ValueFactory_Map.h"
 #include "tao/Valuetype/ValueFactory.h"
 #include "tao/CORBA_String.h"
diff --git a/tao/Valuetype/Valuetype.mpc b/tao/Valuetype/Valuetype.mpc
new file mode 100644
index 00000000000..e8414c2477e
--- /dev/null
+++ b/tao/Valuetype/Valuetype.mpc
@@ -0,0 +1,46 @@
+//$Id$
+project(*idl) : tao_versioning_idl_defaults, gen_ostream, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags += -SS -Sorb \
+                -Wb,export_macro=TAO_Valuetype_Export \
+                -Wb,export_include=tao/Valuetype/valuetype_export.h \
+                -iC tao/Valuetype
+    idlflags -= -St
+    StringValue.pidl
+  }
+
+  specific {
+    install_dir = tao/Valuetype
+  }
+}
+
+project(Valuetype) : taolib, tao_output, install, anytypecode, avoids_corba_e_micro, taoidldefaults, gen_ostream, valuetype_out_indirection {
+  after += *idl
+  sharedname    = TAO_Valuetype
+  dynamicflags  = TAO_VALUETYPE_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    StringValueC.cpp
+  }
+
+  Header_Files {
+    *.h
+    StringValueC.h
+    StringValueS.h
+  }
+
+  Inline_Files {
+    *.inl
+    StringValueC.inl
+  }
+
+  Template_Files {
+    *_T.cpp
+  }
+
+  specific {
+    install_dir = tao/Valuetype
+  }
+}
diff --git a/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp b/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
index 9b9be8cc550..60f7bc81b2f 100644
--- a/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
+++ b/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
diff --git a/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/tao/Valuetype/Valuetype_Adapter_Impl.cpp
index dbc75a06b9d..74002deaf23 100644
--- a/tao/Valuetype/Valuetype_Adapter_Impl.cpp
+++ b/tao/Valuetype/Valuetype_Adapter_Impl.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
@@ -16,8 +17,7 @@ TAO_Valuetype_Adapter_Impl::~TAO_Valuetype_Adapter_Impl (void)
 
 CORBA::Object_ptr
 TAO_Valuetype_Adapter_Impl::abstractbase_to_object (
-    CORBA::AbstractBase_ptr p
-  )
+    CORBA::AbstractBase_ptr p)
 {
   return p->_to_object ();
 }
@@ -32,8 +32,7 @@ TAO_Valuetype_Adapter_Impl::stream_to_value (TAO_InputCDR &cdr,
 CORBA::Boolean
 TAO_Valuetype_Adapter_Impl::stream_to_abstract_base (
     TAO_InputCDR &cdr,
-    CORBA::AbstractBase_ptr & obj
-  )
+    CORBA::AbstractBase_ptr & obj)
 {
   return cdr >> obj;
 }
@@ -81,8 +80,8 @@ TAO_Valuetype_Adapter_Impl::vf_map_unbind (const char *repo_id)
 
 {
   CORBA::ValueFactory factory = 0;
-  int result = map_.unbind (repo_id, factory);
-  if (! result)
+  int const result = map_.unbind (repo_id, factory);
+  if (!result)
     {
       factory->_remove_ref ();
     }
diff --git a/tao/Valuetype/Valuetype_Adapter_Impl.h b/tao/Valuetype/Valuetype_Adapter_Impl.h
index abf4b8a6313..d9f83443214 100644
--- a/tao/Valuetype/Valuetype_Adapter_Impl.h
+++ b/tao/Valuetype/Valuetype_Adapter_Impl.h
@@ -47,8 +47,7 @@ public:
   virtual CORBA::Object_ptr abstractbase_to_object (
       CORBA::AbstractBase_ptr);
 
-  virtual CORBA::Boolean stream_to_value (TAO_InputCDR &,
-                                          CORBA::ValueBase *&);
+  virtual CORBA::Boolean stream_to_value (TAO_InputCDR &, CORBA::ValueBase *&);
 
   virtual CORBA::Boolean stream_to_abstract_base (
       TAO_InputCDR &,
diff --git a/tao/Valuetype/Valuetype_Traits_T.h b/tao/Valuetype/Valuetype_Traits_T.h
index 74b93e3065c..460ccc946ff 100644
--- a/tao/Valuetype/Valuetype_Traits_T.h
+++ b/tao/Valuetype/Valuetype_Traits_T.h
@@ -42,7 +42,6 @@ struct valuetype_traits_decorator
     std::generate(begin, end, &derived::default_initializer);
   }
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_range(
@@ -50,15 +49,7 @@ struct valuetype_traits_decorator
   {
     std::transform(begin, end, dst, &derived::duplicate);
   }
-# 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 */
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_swap_range(
@@ -66,13 +57,6 @@ struct valuetype_traits_decorator
   {
     std::swap_ranges(begin, end, dst);
   }
-# 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 */
 
   inline static void release_range(
       object_type ** begin, object_type ** end)
diff --git a/tao/Vector_CDR_T.h b/tao/Vector_CDR_T.h
index e9a49b9bbe1..c956e9c91ae 100644
--- a/tao/Vector_CDR_T.h
+++ b/tao/Vector_CDR_T.h
@@ -61,7 +61,7 @@ namespace TAO
         return false;
       }
 
-    std::vector<T> tmp;  
+    std::vector<T> tmp;
     tmp.reserve (new_length);
     T tmp_elem;
 
@@ -163,7 +163,7 @@ namespace TAO
          i != source.end ();
          ++i)
       {
-        var_type tmp_array = 
+        var_type tmp_array =
           TAO::Array_Traits<T_forany>::dup (*i);
         T_forany const tmp (tmp_array.inout ());
 
diff --git a/tao/Version.h b/tao/Version.h
index 38372b178c1..64acc60c5e9 100644
--- a/tao/Version.h
+++ b/tao/Version.h
@@ -1,9 +1,9 @@
 
 // -*- C++ -*-
 // $Id$
-// This is file was automatically generated by \$ACE_ROOT/bin/make_release.
+// This is file was automatically generated by \$ACE_ROOT/bin/make_release.py
 
-#define TAO_MAJOR_VERSION 1
-#define TAO_MINOR_VERSION 8
-#define TAO_BETA_VERSION 1
-#define TAO_VERSION "1.8.1"
+#define TAO_MAJOR_VERSION 2
+#define TAO_MINOR_VERSION 0
+#define TAO_BETA_VERSION 2
+#define TAO_VERSION "2.0.2"
diff --git a/tao/WCharSeq.pidl b/tao/WCharSeq.pidl
index 1407d0dee94..50dbdd99ac6 100644
--- a/tao/WCharSeq.pidl
+++ b/tao/WCharSeq.pidl
@@ -1,23 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-/**
- *   This file is used to generate the code in WCharSeqC.*
- *   The command used to generate code is:
- *
- *     tao_idl
- *          -oA AnyTypeCode
- *          -GA -SS -Sci
- *          -Wb,pre_include=ace/pre.h
- *          -Wb,post_include=ace/post.h
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=tao/TAO_Export.h
- *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
- *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
- *          WCharSeq.pidl
- */
-
 #ifndef TAO_CORBA_WCHAR_SEQ_IDL
 #define TAO_CORBA_WCHAR_SEQ_IDL
 
diff --git a/tao/WStringSeq.pidl b/tao/WStringSeq.pidl
index 2af1d0d14f3..998c8c33430 100644
--- a/tao/WStringSeq.pidl
+++ b/tao/WStringSeq.pidl
@@ -1,23 +1,6 @@
 // -*- IDL -*-
-//
 // $Id$
 
-/**
- *   This file is used to generate the code in WStringSeqC.*
- *   The command used to generate code is:
- *
- *     tao_idl
- *          -oA AnyTypeCode
- *          -GA -SS -Sci
- *          -Wb,pre_include=ace/pre.h
- *          -Wb,post_include=ace/post.h
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=tao/TAO_Export.h
- *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
- *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
- *          WStringSeq.pidl
- */
-
 #ifndef TAO_CORBA_WSTRING_SEQ_IDL
 #define TAO_CORBA_WSTRING_SEQ_IDL
 
diff --git a/tao/Wait_On_LF_No_Upcall.cpp b/tao/Wait_On_LF_No_Upcall.cpp
index f97d32ae5ae..7396c2d1e7a 100644
--- a/tao/Wait_On_LF_No_Upcall.cpp
+++ b/tao/Wait_On_LF_No_Upcall.cpp
@@ -10,6 +10,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Transport;
+
 namespace TAO
 {
   /**
@@ -24,7 +25,7 @@ namespace TAO
   public:
     // Maybe we should instead just take in a ptr to
     // TAO_ORB_Core_TSS_Resources?  Or at least ORB_Core*?
-    Nested_Upcall_Guard (TAO_Transport *t)
+    explicit Nested_Upcall_Guard (TAO_Transport *t)
       : t_ (t)
     {
       TAO_ORB_Core_TSS_Resources *tss =
@@ -34,45 +35,41 @@ namespace TAO
 
       if (TAO_debug_level > 6)
         ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Wait_On_LF_No_Upcall::wait "
-                    "disabling upcalls on thread %t\n"));
+                    "TAO (%P|%t) - Wait_On_LF_No_Upcall[%d]::wait, "
+                    "disabling upcalls\n", t->id ()));
     }
 
     ~Nested_Upcall_Guard (void)
     {
-      TAO_ORB_Core_TSS_Resources *tss = t_->orb_core ()->get_tss_resources ();
+      TAO_ORB_Core_TSS_Resources *tss =
+        this->t_->orb_core ()->get_tss_resources ();
 
       tss->upcalls_temporarily_suspended_on_this_thread_ = false;
 
       if (TAO_debug_level > 6)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Wait_On_LF_No_Upcall::wait "
-                      "re-enabling upcalls on thread %t\n"));
+                      "TAO (%P|%t) - Wait_On_LF_No_Upcall[%d]::wait, "
+                      "re-enabling upcalls\n", this->t_->id ()));
         }
     }
 
   private:
-
-    Nested_Upcall_Guard (void)
-    {
-    }
+    Nested_Upcall_Guard (void);
 
     /// Disallow copying and assignment.
     Nested_Upcall_Guard (const Nested_Upcall_Guard&);
     Nested_Upcall_Guard &operator= (const Nested_Upcall_Guard&);
 
   private:
-
     /// Pointer to the transport that we plan to use.
     TAO_Transport *t_;
   };
 
-
   //=================================================================
 
   Wait_On_LF_No_Upcall::Wait_On_LF_No_Upcall (TAO_Transport *t)
-    : base (t)
+    : TAO_Wait_On_Leader_Follower (t)
   {
   }
 
@@ -86,19 +83,23 @@ namespace TAO
   {
     Nested_Upcall_Guard upcall_guard (this->transport_);
 
-    return base::wait (max_wait_time, rd);
+    return TAO_Wait_On_Leader_Follower::wait (max_wait_time, rd);
   }
 
   bool
   Wait_On_LF_No_Upcall::can_process_upcalls (void) const
   {
-    TAO_ORB_Core_TSS_Resources *tss =
-      this->transport_->orb_core ()->get_tss_resources ();
-
-    if ((this->transport_->opened_as () == TAO::TAO_CLIENT_ROLE) &&
-        (this->transport_->bidirectional_flag () == 0) &&
-        (tss->upcalls_temporarily_suspended_on_this_thread_))
-      return false;
+    if ((this->transport_->opened_as () == TAO::TAO_SERVER_ROLE) &&
+        (this->transport_->bidirectional_flag () == -1))
+      {
+        TAO_ORB_Core_TSS_Resources *tss =
+          this->transport_->orb_core ()->get_tss_resources ();
+
+        if (tss->upcalls_temporarily_suspended_on_this_thread_)
+          {
+            return false;
+          }
+      }
 
     return true;
   }
diff --git a/tao/Wait_On_LF_No_Upcall.h b/tao/Wait_On_LF_No_Upcall.h
index 8c839eba3bc..b058132529d 100644
--- a/tao/Wait_On_LF_No_Upcall.h
+++ b/tao/Wait_On_LF_No_Upcall.h
@@ -36,23 +36,23 @@ namespace TAO
    * that indicates that the thread is unavailable to service upcalls.
    * Connection handler that are acting in a server role cooperate by
    * checking this flag in their handle_input, and returning if they're
-   * in a thread that is currently suspending upcalls.  The flag gets
+   * in a thread that is currently suspending upcalls. The flag gets
    * reset once the reply is received.
    */
-
   class Wait_On_LF_No_Upcall : public TAO_Wait_On_Leader_Follower
   {
   public:
+     /// Constructor.
+    explicit Wait_On_LF_No_Upcall (TAO_Transport *t);
 
-    typedef TAO_Wait_On_Leader_Follower base;
-
-    Wait_On_LF_No_Upcall (TAO_Transport *t);
-
+    /// Destructor.
     virtual ~Wait_On_LF_No_Upcall (void);
 
+    /*! @copydoc TAO_Wait_Strategy::wait() */
     virtual int wait (ACE_Time_Value *max_wait_time,
                       TAO_Synch_Reply_Dispatcher &rd);
 
+    /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */
     virtual bool can_process_upcalls (void) const;
   };
 }
diff --git a/tao/Wait_On_Leader_Follower.h b/tao/Wait_On_Leader_Follower.h
index 45d26369336..b34255be862 100644
--- a/tao/Wait_On_Leader_Follower.h
+++ b/tao/Wait_On_Leader_Follower.h
@@ -47,12 +47,20 @@ public:
   /// Destructor.
   virtual ~TAO_Wait_On_Leader_Follower (void);
 
-  // = Documented in TAO_Wait_Strategy.
+   /*! @copydoc TAO_Wait_Strategy::sending_request() */
   virtual int sending_request (TAO_ORB_Core *orb_core, int two_way);
+
+   /*! @copydoc TAO_Wait_Strategy::wait() */
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
+
+   /*! @copydoc TAO_Wait_Strategy::register_handler() */
   virtual int register_handler (void);
+
+   /*! @copydoc TAO_Wait_Strategy::non_blocking() */
   virtual bool non_blocking (void) const;
+
+   /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */
   virtual bool can_process_upcalls (void) const;
 };
 
diff --git a/tao/Wait_On_Reactor.h b/tao/Wait_On_Reactor.h
index 212590b4d56..4fb8a40b936 100644
--- a/tao/Wait_On_Reactor.h
+++ b/tao/Wait_On_Reactor.h
@@ -26,8 +26,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /**
  * @class TAO_Wait_On_Reactor
  *
- * @brief Wait on the Reactor. Happens in s Single Threaded client
- * environment.
+ * Wait on the Reactor. Happens in a single threaded client environment.
  *
  */
 class TAO_Wait_On_Reactor : public TAO_Wait_Strategy
@@ -35,17 +34,22 @@ class TAO_Wait_On_Reactor : public TAO_Wait_Strategy
 
 public:
   /// Constructor.
-  TAO_Wait_On_Reactor (TAO_Transport *transport);
+  explicit TAO_Wait_On_Reactor (TAO_Transport *transport);
 
   /// Destructor.
   virtual ~TAO_Wait_On_Reactor (void);
 
-  // = Documented in TAO_Wait_Strategy.
-
+  /*! @copydoc TAO_Wait_Strategy::wait() */
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
+
+  /*! @copydoc TAO_Wait_Strategy::register_handler() */
   virtual int register_handler (void);
+
+  /*! @copydoc TAO_Wait_Strategy::non_blocking() */
   virtual bool non_blocking (void) const;
+
+  /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */
   virtual bool can_process_upcalls (void) const;
 };
 
diff --git a/tao/Wait_On_Read.cpp b/tao/Wait_On_Read.cpp
index d38d0232a81..4127b6b8c5f 100644
--- a/tao/Wait_On_Read.cpp
+++ b/tao/Wait_On_Read.cpp
@@ -77,7 +77,7 @@ TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time,
 
        if (TAO_debug_level > 0)
          ACE_DEBUG ((LM_DEBUG,
-                     ACE_TEXT ("TAO (%P|%t) - TAO_Wait_On_Read[%d]::wait (), ")
+                     ACE_TEXT ("TAO (%P|%t) - Wait_On_Read[%d]::wait (), ")
                      ACE_TEXT ("registering handle for cleanup\n"),
                      this->transport_->id ()));
 
@@ -92,8 +92,8 @@ TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time,
          {
            if (TAO_debug_level > 0)
              ACE_ERROR ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) - TAO_Wait_On_Read[%d]::wait (), ")
-                        ACE_TEXT ("registration with reactor returned an error\n"),
+                         ACE_TEXT ("TAO (%P|%t) - Wait_On_Read[%d]::wait (), ")
+                         ACE_TEXT ("registration with reactor returned an error\n"),
                          this->transport_->id ()));
         }
        else
diff --git a/tao/Wait_On_Read.h b/tao/Wait_On_Read.h
index c691a668200..f5cd69e2652 100644
--- a/tao/Wait_On_Read.h
+++ b/tao/Wait_On_Read.h
@@ -26,7 +26,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /**
  * @class TAO_Wait_On_Read
  *
- *
  * Simply block on read() to wait for the reply.
  */
 class TAO_Wait_On_Read :  public TAO_Wait_Strategy
@@ -34,17 +33,22 @@ class TAO_Wait_On_Read :  public TAO_Wait_Strategy
 
 public:
   /// Constructor.
-  TAO_Wait_On_Read (TAO_Transport *transport);
+  explicit TAO_Wait_On_Read (TAO_Transport *transport);
 
   /// Destructor.
   virtual ~TAO_Wait_On_Read (void);
 
-  // = Documented in TAO_Wait_Strategy.
-
+  /*! @copydoc TAO_Wait_Strategy::wait() */
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
+
+  /*! @copydoc TAO_Wait_Strategy::register_handler() */
   virtual int register_handler (void);
+
+  /*! @copydoc TAO_Wait_Strategy::non_blocking() */
   virtual bool non_blocking (void) const;
+
+  /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */
   virtual bool can_process_upcalls (void) const;
 };
 
diff --git a/tao/Wait_Strategy.h b/tao/Wait_Strategy.h
index cbc3811dda4..4efc22ccaa6 100644
--- a/tao/Wait_Strategy.h
+++ b/tao/Wait_Strategy.h
@@ -44,7 +44,7 @@ class TAO_Export TAO_Wait_Strategy
 
 public:
   /// Constructor.
-  TAO_Wait_Strategy (TAO_Transport *transport);
+  explicit TAO_Wait_Strategy (TAO_Transport *transport);
 
   /// Destructor.
   virtual ~TAO_Wait_Strategy (void);
diff --git a/tao/XtResource.mpc b/tao/XtResource.mpc
deleted file mode 100644
index 838f502b7b3..00000000000
--- a/tao/XtResource.mpc
+++ /dev/null
@@ -1,30 +0,0 @@
-//  -*- MPC -*- now wouldn't this be cool...
-// $Id$
-
-project(TAO_XtResource) : acelib, taolib, install, tao_output, taodefaults, ace_xtreactor, taoidldefaults {
-  sharedname   = TAO_XtResource
-  dynamicflags += TAO_XTRESOURCE_BUILD_DLL
-
-  Source_Files {
-    XtResource
-  }
-
-  Header_Files {
-    XtResource
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-
-  IDL_Files {
-  }
-}
diff --git a/tao/XtResource/XtResource.mpc b/tao/XtResource/XtResource.mpc
new file mode 100644
index 00000000000..b925c83e056
--- /dev/null
+++ b/tao/XtResource/XtResource.mpc
@@ -0,0 +1,11 @@
+//  -*- MPC -*- now wouldn't this be cool...
+// $Id$
+
+project(TAO_XtResource) : acelib, taolib, install, tao_output, taodefaults, ace_xtreactor, taoidldefaults {
+  sharedname   = TAO_XtResource
+  dynamicflags += TAO_XTRESOURCE_BUILD_DLL
+
+  specific {
+    install_dir = tao/XtResource
+  }
+}
diff --git a/tao/XtResource/XtResource_Factory.cpp b/tao/XtResource/XtResource_Factory.cpp
index 1b192ab401a..81191df1ebc 100644
--- a/tao/XtResource/XtResource_Factory.cpp
+++ b/tao/XtResource/XtResource_Factory.cpp
@@ -4,10 +4,6 @@
 #include "tao/debug.h"
 #include "ace/XtReactor/XtReactor.h"
 
-ACE_RCSID( TAO_XtResource,
-           XtResource_Factory,
-           "$Id$");
-
 namespace TAO
 {
 
diff --git a/tao/XtResource/XtResource_Loader.cpp b/tao/XtResource/XtResource_Loader.cpp
index fb24c916b04..50b60654fa4 100644
--- a/tao/XtResource/XtResource_Loader.cpp
+++ b/tao/XtResource/XtResource_Loader.cpp
@@ -3,10 +3,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/XtResource/XtResource_Factory.h"
 
-ACE_RCSID( TAO_XtResource,
-           XtResource_Loader,
-           "$Id$");
-
 namespace TAO
 {
 
diff --git a/tao/ZIOP.mpc b/tao/ZIOP.mpc
deleted file mode 100644
index 6f0a409f957..00000000000
--- a/tao/ZIOP.mpc
+++ /dev/null
@@ -1,57 +0,0 @@
-//$Id$
-project(*core_idl) : tao_versioning_idl_defaults {
-  custom_only = 1
-  IDL_Files {
-    idlflags -= -Sa -St
-    idlflags += -Gp -Gd -Sci -SS -Sorb \
-                -Wb,export_macro=TAO_ZIOP_Export \
-                -Wb,export_include=tao/ZIOP/ziop_export.h \
-                -Wb,include_guard=TAO_ZIOP_SAFE_INCLUDE \
-                -Wb,safe_include=tao/ZIOP/ZIOP.h \
-                -o ZIOP
-    ZIOP/ZIOP.pidl
-  }
-}
-
-project(ZIOP) : tao_output, install, taolib, compression, pi, taoidldefaults {
-  after += *core_idl
-  sharedname   = TAO_ZIOP
-  dynamicflags += TAO_ZIOP_BUILD_DLL
-
-  Source_Files {
-    ZIOP
-  }
-
-  Source_Files {
-    ZIOP/ZIOPC.cpp
-  }
-
-  Header_Files {
-    ZIOP
-    ZIOP/ZIOPC.h
-    ZIOP/ZIOPS.h
-  }
-
-  Inline_Files {
-    ZIOP
-  }
-
-  Template_Files {
-    ZIOP
-  }
-
-  Resource_Files {
-    ZIOP
-  }
-
-  PIDL_Files {
-    ZIOP
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    ZIOP/TAO_ZIOP.pc.in
-  }
-}
diff --git a/tao/ZIOP/TAO_ZIOP.rc b/tao/ZIOP/TAO_ZIOP.rc
new file mode 100644
index 00000000000..2c3a29707bb
--- /dev/null
+++ b/tao/ZIOP/TAO_ZIOP.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "ZIOP\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_ZIOPDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_ZIOP.DLL\0"
+            VALUE "ProductName", "TAO\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/tao/ZIOP/ZIOP.cpp b/tao/ZIOP/ZIOP.cpp
index 11c5ce52f3e..1d6ddcfc867 100644
--- a/tao/ZIOP/ZIOP.cpp
+++ b/tao/ZIOP/ZIOP.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/ZIOP/ZIOP_ORBInitializer.h"
 #include "tao/ZIOP/ZIOP_Policy_Validator.h"
 #include "tao/ZIOP/ZIOP.h"
@@ -8,10 +10,6 @@
 #include "tao/Stub.h"
 #include "tao/Transport.h"
 
-ACE_RCSID (ZIOP,
-           ZIOP,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ZIOP_Loader::TAO_ZIOP_Loader (void)
@@ -264,7 +262,7 @@ TAO_ZIOP_Loader::decompress (ACE_Data_Block **db, TAO_Queued_Data& qd,
 }
 
 CORBA::ULong
-TAO_ZIOP_Loader::compression_policy_value (CORBA::Policy_ptr policy) const
+TAO_ZIOP_Loader::compression_low_value (CORBA::Policy_ptr policy) const
 {
   CORBA::ULong result = 0;
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -285,6 +283,28 @@ TAO_ZIOP_Loader::compression_policy_value (CORBA::Policy_ptr policy) const
   return result;
 }
 
+Compression::CompressionRatio
+TAO_ZIOP_Loader::compression_minratio_value (CORBA::Policy_ptr policy) const
+{
+  Compression::CompressionRatio result = 0;
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
+
+  if (!CORBA::is_nil (policy))
+    {
+      ZIOP::CompressionMinRatioPolicy_var srp =
+        ZIOP::CompressionMinRatioPolicy::_narrow (policy);
+
+      if (!CORBA::is_nil (srp.in ()))
+        {
+          result = srp->ratio ();
+        }
+    }
+#else
+  ACE_UNUSED_ARG (policy);
+#endif
+  return result;
+}
+
 bool
 TAO_ZIOP_Loader::compress (Compression::Compressor_ptr compressor,
                            const ::Compression::Buffer &source,
@@ -317,7 +337,7 @@ TAO_ZIOP_Loader::check_min_ratio (const ::Compression::CompressionRatio& this_ra
                                   ::Compression::CompressionRatio overall_ratio,
                                   ::Compression::CompressionRatio min_ratio) const
 {
-  bool accepted = min_ratio == 0 || (this_ratio * 10000) > (min_ratio * 10000);
+  bool accepted = ACE::is_equal (min_ratio, 0.0f) || (this_ratio * 10000) > (min_ratio * 10000);
   if (TAO_debug_level > 8)
     {
       ACE_ERROR ((LM_ERROR,
@@ -565,9 +585,9 @@ TAO_ZIOP_Loader::marshal_data (TAO_OutputCDR &cdr, TAO_Stub& stub)
         stub.get_cached_policy (TAO_CACHED_MIN_COMPRESSION_RATIO_POLICY);
 
       CORBA::ULong low_value =
-        this->compression_policy_value (policy_low_value.in ());
+        this->compression_low_value (policy_low_value.in ());
       Compression::CompressionRatio min_ratio =
-        this->compression_policy_value (policy_min_ratio.in ());
+        this->compression_minratio_value (policy_min_ratio.in ());
 
       return compress_data(cdr, compression_manager.in (),
                             low_value, min_ratio,
@@ -615,9 +635,9 @@ TAO_ZIOP_Loader::marshal_data (TAO_OutputCDR& cdr, TAO_ORB_Core& orb_core)
           (TAO_CACHED_MIN_COMPRESSION_RATIO_POLICY);
 
       CORBA::ULong low_value =
-        this->compression_policy_value (policy_low_value.in ());
+        this->compression_low_value (policy_low_value.in ());
       Compression::CompressionRatio min_ratio =
-        this->compression_policy_value (policy_min_ratio.in ());
+        this->compression_minratio_value (policy_min_ratio.in ());
 
       return compress_data(cdr, compression_manager.in (),
                            low_value, min_ratio,
diff --git a/tao/ZIOP/ZIOP.h b/tao/ZIOP/ZIOP.h
index 63de0911460..7230f11651d 100644
--- a/tao/ZIOP/ZIOP.h
+++ b/tao/ZIOP/ZIOP.h
@@ -75,8 +75,12 @@ private:
                 ::Compression::CompressorId  compressor_id,
                 ::Compression::CompressionLevel compression_level);
 
-/// Get the compression low value, returns 0 when it is not set
-  CORBA::ULong compression_policy_value (CORBA::Policy_ptr policy) const;
+  /// Get the compression low value, returns 0 when it is not set
+  CORBA::ULong compression_low_value (CORBA::Policy_ptr policy) const;
+
+    /// Get the compression min ratio value, returns 0 when it is not set
+  Compression::CompressionRatio compression_minratio_value (
+    CORBA::Policy_ptr policy) const;
 
   bool get_compressor_details (
                         ::Compression::CompressorIdLevelList *list,
diff --git a/tao/ZIOP/ZIOP.mpc b/tao/ZIOP/ZIOP.mpc
new file mode 100644
index 00000000000..8670b1f52a6
--- /dev/null
+++ b/tao/ZIOP/ZIOP.mpc
@@ -0,0 +1,39 @@
+//$Id$
+project(*core_idl) : tao_versioning_idl_defaults, install {
+  custom_only = 1
+  IDL_Files {
+    idlflags -= -Sa -St
+    idlflags += -Gp -Gd -Sci -SS -Sorb \
+                -Wb,export_macro=TAO_ZIOP_Export \
+                -Wb,export_include=tao/ZIOP/ziop_export.h \
+                -Wb,include_guard=TAO_ZIOP_SAFE_INCLUDE \
+                -Wb,safe_include=tao/ZIOP/ZIOP.h \
+                -iC tao/ZIOP
+    ZIOP.pidl
+  }
+
+  specific {
+    install_dir = tao/ZIOP
+  }
+}
+
+project(ZIOP) : tao_output, install, taolib, compression, pi, taoidldefaults {
+  after += *core_idl
+  sharedname   = TAO_ZIOP
+  dynamicflags += TAO_ZIOP_BUILD_DLL
+
+  Source_Files {
+    *.cpp
+    ZIOPC.cpp
+  }
+
+  Header_Files {
+    *.h
+    ZIOPC.h
+    ZIOPS.h
+  }
+
+  specific {
+    install_dir = tao/ZIOP
+  }
+}
diff --git a/tao/ZIOP/ZIOP.pidl b/tao/ZIOP/ZIOP.pidl
index 4c7ef2648bd..a52c91fc898 100644
--- a/tao/ZIOP/ZIOP.pidl
+++ b/tao/ZIOP/ZIOP.pidl
@@ -56,7 +56,7 @@ module ZIOP
     };
 
     /**
-     * The ZIOP CompressionMinRatioPolicy. If the compression ratio is smaller 
+     * The ZIOP CompressionMinRatioPolicy. If the compression ratio is smaller
      * than this setting, a message is send uncompressed.
      */
     const CORBA::PolicyType COMPRESSION_MIN_RATIO_POLICY_ID = 67;
diff --git a/tao/ZIOP/ZIOP_ORBInitializer.cpp b/tao/ZIOP/ZIOP_ORBInitializer.cpp
index 9d9309925f3..a1493b3b724 100644
--- a/tao/ZIOP/ZIOP_ORBInitializer.cpp
+++ b/tao/ZIOP/ZIOP_ORBInitializer.cpp
@@ -11,10 +11,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfo.h"
 
-ACE_RCSID (ZIOP,
-           ZIOP_ORBInitializer,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ZIOP_ORBInitializer::TAO_ZIOP_ORBInitializer (TAO_ZIOP_Loader* loader) : loader_ (loader)
diff --git a/tao/ZIOP/ZIOP_PolicyFactory.cpp b/tao/ZIOP/ZIOP_PolicyFactory.cpp
index dcf763a285b..c0ac5660d0d 100644
--- a/tao/ZIOP/ZIOP_PolicyFactory.cpp
+++ b/tao/ZIOP/ZIOP_PolicyFactory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/ZIOP/ZIOP_PolicyFactory.h"
 #include "tao/ZIOP/ZIOP.h"
 #include "tao/ZIOP/ZIOP_Policy_i.h"
@@ -5,10 +7,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID (ZIOP_GIOP,
-           ZIOP_PolicyFactory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
diff --git a/tao/ZIOP/ZIOP_Policy_Validator.cpp b/tao/ZIOP/ZIOP_Policy_Validator.cpp
index 9d079b1fe2d..e22be74c97d 100644
--- a/tao/ZIOP/ZIOP_Policy_Validator.cpp
+++ b/tao/ZIOP/ZIOP_Policy_Validator.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/ZIOP/ZIOP_Policy_Validator.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -6,10 +8,6 @@
 #include "tao/Policy_Set.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (ZIOP_GIOP,
-           ZIOPPolicy_Validator,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ZIOPPolicy_Validator::TAO_ZIOPPolicy_Validator (TAO_ORB_Core &orb_core)
diff --git a/tao/ZIOP/ZIOP_Policy_i.cpp b/tao/ZIOP/ZIOP_Policy_i.cpp
index 8a25e5b902c..1a31b1a54e5 100644
--- a/tao/ZIOP/ZIOP_Policy_i.cpp
+++ b/tao/ZIOP/ZIOP_Policy_i.cpp
@@ -1,16 +1,11 @@
 // $Id$
 
 #include "tao/ZIOP/ZIOP_Policy_i.h"
-
 #include "tao/CDR.h"
 #include "tao/Stub.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (ZIOP,
-           ZIOP_Policy_i,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tao/ZIOP/ZIOP_Service_Context_Handler.cpp b/tao/ZIOP/ZIOP_Service_Context_Handler.cpp
index 7e0ad04cfec..b8f4614192c 100644
--- a/tao/ZIOP/ZIOP_Service_Context_Handler.cpp
+++ b/tao/ZIOP/ZIOP_Service_Context_Handler.cpp
@@ -4,10 +4,6 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID (ZIOP,
-           ZIOP_Service_Context_Handler,
-           "$Id$")
-
 #include "tao/CDR.h"
 #include "tao/Transport.h"
 #include "tao/ORB_Core.h"
diff --git a/tao/ZIOP/ZIOP_Stub.cpp b/tao/ZIOP/ZIOP_Stub.cpp
index fb245ff9cfe..73422d1c081 100644
--- a/tao/ZIOP/ZIOP_Stub.cpp
+++ b/tao/ZIOP/ZIOP_Stub.cpp
@@ -11,10 +11,6 @@
 #include "tao/Policy_Manager.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (ZIOP,
-           ZIOP_Stub,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ZIOP_Stub::TAO_ZIOP_Stub (const char *repository_id,
@@ -202,57 +198,57 @@ TAO_ZIOP_Stub::effective_compression_id_list_policy (void)
     return exposed._retn ();
 
   // Check which compressor id we should use and which level
-  for (CORBA::ULong nr_exposed = 0; 
-        nr_exposed < exposed_policy_var->compressor_ids ()->length (); 
+  for (CORBA::ULong nr_exposed = 0;
+        nr_exposed < exposed_policy_var->compressor_ids ()->length ();
         ++nr_exposed)
     {
-      ::Compression::CompressorIdLevel_var exposed_compressor = 
+      ::Compression::CompressorIdLevel_var exposed_compressor =
         exposed_policy_var->compressor_ids ()->operator [](nr_exposed);
 
       if (TAO_debug_level > 9)
         {
-          ACE_DEBUG ((LM_DEBUG, 
+          ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("TAO (%P|%t) - ")
                       ACE_TEXT ("TAO_ZIOP_Stub::effective_compression_id_list_policy, ")
                       ACE_TEXT ("exposed_policy = %d, compressor_id = %C, ")
-                      ACE_TEXT ("compression_level = %d\n"), 
-                      nr_exposed, 
+                      ACE_TEXT ("compression_level = %d\n"),
+                      nr_exposed,
                       TAO_ZIOP_Loader::ziop_compressorid_name (
                             exposed_compressor.ptr ()->compressor_id),
                       exposed_compressor.ptr ()->compression_level));
         }
       // check if a local policy matches this exposed policy
-      for (CORBA::ULong nr_override = 0; 
-            nr_override < override_policy_var->compressor_ids ()->length (); 
+      for (CORBA::ULong nr_override = 0;
+            nr_override < override_policy_var->compressor_ids ()->length ();
             ++nr_override)
         {
-          ::Compression::CompressorIdLevel_var override_compressor = 
+          ::Compression::CompressorIdLevel_var override_compressor =
             override_policy_var->compressor_ids ()->operator [] (nr_override);
           if (TAO_debug_level > 9)
             {
-              ACE_DEBUG ((LM_DEBUG, 
+              ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("TAO (%P|%t) - ")
                           ACE_TEXT ("TAO_ZIOP_Stub::effective_compression_id_list_policy, ")
                           ACE_TEXT ("checking override_policy = %d, compressor_id = %C, ")
-                          ACE_TEXT ("compression_level = %d\n"), 
-                          nr_override, 
+                          ACE_TEXT ("compression_level = %d\n"),
+                          nr_override,
                           TAO_ZIOP_Loader::ziop_compressorid_name (
                                 override_compressor->compressor_id),
                           override_compressor->compression_level));
             }
-          if (override_compressor->compressor_id == 
+          if (override_compressor->compressor_id ==
               exposed_compressor->compressor_id)
-            {  
+            {
               CORBA::Policy_var tmp_policy = override_policy_var->copy ();
               ZIOP::CompressorIdLevelListPolicy_var idlevellist_policy_var =
                     ZIOP::CompressorIdLevelListPolicy::_narrow (tmp_policy.in ());
               if (CORBA::is_nil (idlevellist_policy_var.in ()))
                 return override._retn ();
 
-              idlevellist_policy_var->compressor_ids ()->operator [] (0).compressor_id = 
+              idlevellist_policy_var->compressor_ids ()->operator [] (0).compressor_id =
                     override_compressor->compressor_id;
-              //according to ZIOP spec, return the compressor with the lowest compression level.  
-              idlevellist_policy_var.ptr ()->compressor_ids ()->operator [] (0).compression_level = 
+              //according to ZIOP spec, return the compressor with the lowest compression level.
+              idlevellist_policy_var.ptr ()->compressor_ids ()->operator [] (0).compression_level =
                 ACE_MIN (override_compressor->compression_level,
                         exposed_compressor->compression_level);
 
diff --git a/tao/ZIOP/ZIOP_Stub_Factory.cpp b/tao/ZIOP/ZIOP_Stub_Factory.cpp
index e9c55ca7507..8f5080d82e4 100644
--- a/tao/ZIOP/ZIOP_Stub_Factory.cpp
+++ b/tao/ZIOP/ZIOP_Stub_Factory.cpp
@@ -10,10 +10,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ZIOP,
-           ZIOP_Stub_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ZIOP_Stub_Factory::~TAO_ZIOP_Stub_Factory (void)
diff --git a/tao/ZlibCompressor.mpc b/tao/ZlibCompressor.mpc
deleted file mode 100644
index a00f873ecba..00000000000
--- a/tao/ZlibCompressor.mpc
+++ /dev/null
@@ -1,38 +0,0 @@
-//$Id$
-project(ZlibCompressor) : taolib, tao_output, install, compression, taoidldefaults, ace_zlib {
-  requires += zlib
-  sharedname   = TAO_ZlibCompressor
-  dynamicflags += TAO_ZLIBCOMPRESSOR_BUILD_DLL
-
-  Source_Files {
-    Compression/zlib
-  }
-
-  Header_Files {
-    Compression/zlib
-  }
-
-  Inline_Files {
-    Compression/zlib
-  }
-
-  Template_Files {
-    Compression/zlib
-  }
-
-  Resource_Files {
-    Compression/zlib
-  }
-
-  PIDL_Files {
-    Compression/zlib
-  }
-
-  IDL_Files {
-    Compression/zlib
-  }
-
-  Pkgconfig_Files {
-    Compression/zlib/TAO_ZlibCompressor.pc.in
-  }
-}
diff --git a/tao/debug.cpp b/tao/debug.cpp
index 7b21f0d625c..45275055613 100644
--- a/tao/debug.cpp
+++ b/tao/debug.cpp
@@ -1,3 +1,4 @@
+// $Id$
 // THREADING NOTE: the global values here  (debug_{level,filter,stream)
 // are assumed to be modified "safely", e.g. in the main thread as
 // part of process initialization.  They are treated as immutable
diff --git a/tao/default_client.cpp b/tao/default_client.cpp
index 76931bb7fda..785d5909c98 100644
--- a/tao/default_client.cpp
+++ b/tao/default_client.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/default_client.h"
@@ -21,8 +22,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
-  : profile_lock_type_ (TAO_THREAD_LOCK)
-  , transport_mux_strategy_ (TAO_MUXED_TMS)
+  : transport_mux_strategy_ (TAO_MUXED_TMS)
   , wait_strategy_ (TAO_WAIT_ON_LEADER_FOLLOWER)
   , connect_strategy_ (TAO_LEADER_FOLLOWER_CONNECT)
   , rd_table_size_ (TAO_RD_TABLE_SIZE)
@@ -68,51 +68,10 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
   for (curarg = 0; curarg < argc && argv[curarg]; ++curarg)
     {
       if (ACE_OS::strcasecmp (argv[curarg],
-                              ACE_TEXT("-ORBProfileLock")) == 0)
-        {
-        curarg++;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("thread")) == 0)
-              this->profile_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("null")) == 0)
-              this->profile_lock_type_ = TAO_NULL_LOCK;
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBProfileLock"), name);
-          }
-        }
-      else if (ACE_OS::strcasecmp (argv[curarg],
-                                   ACE_TEXT("-ORBIIOPProfileLock")) == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("WARNING: The -ORBIIOPProfileLock option")
-                      ACE_TEXT (" is deprecated and will be removed.\n")
-                      ACE_TEXT ("         Please use -ORBProfileLock instead\n")));
-          curarg++;
-          if (curarg < argc)
-            {
-              ACE_TCHAR* name = argv[curarg];
-
-              if (ACE_OS::strcasecmp (name,
-                                      ACE_TEXT("thread")) == 0)
-                this->profile_lock_type_ = TAO_THREAD_LOCK;
-              else if (ACE_OS::strcasecmp (name,
-                                           ACE_TEXT("null")) == 0)
-                this->profile_lock_type_ = TAO_NULL_LOCK;
-              else
-                this->report_option_value_error (ACE_TEXT("-ORBIIOPProfileLock"), name);
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (argv[curarg],
-                                   ACE_TEXT("-ORBClientConnectionHandler")) == 0
-               ||
-               ACE_OS::strcasecmp (argv[curarg],
-                                   ACE_TEXT("-ORBWaitStrategy")) == 0)
+                              ACE_TEXT("-ORBClientConnectionHandler")) == 0
+          ||
+          ACE_OS::strcasecmp (argv[curarg],
+                              ACE_TEXT("-ORBWaitStrategy")) == 0)
         {
           curarg++;
           if (curarg < argc)
@@ -235,53 +194,10 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
                       "ignoring option <%s>\n",
                       argv[curarg]));
         }
-
-
     }
   return 0;
 }
 
-ACE_Lock *
-TAO_Default_Client_Strategy_Factory::create_profile_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  switch (this->profile_lock_type_)
-    {
-      case TAO_NULL_LOCK:
-        {
-          ACE_NEW_RETURN (the_lock,
-                          ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
-                          0);
-          break;
-        }
-      case TAO_THREAD_LOCK:
-        {
-          ACE_NEW_RETURN (the_lock,
-                          ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (),
-                          0);
-          break;
-        }
-    }
-
-  return the_lock;
-}
-
-TAO_Configurable_Refcount
-TAO_Default_Client_Strategy_Factory::create_profile_refcount (void)
-{
-  switch (this->profile_lock_type_)
-    {
-    case TAO_NULL_LOCK:
-      return TAO_Configurable_Refcount (
-                     TAO_Configurable_Refcount::TAO_NULL_LOCK);
-    case TAO_THREAD_LOCK:
-    default:
-      return TAO_Configurable_Refcount (
-                     TAO_Configurable_Refcount::TAO_THREAD_LOCK);
-    }
-}
-
 /// Create the correct client transport muxing strategy.
 TAO_Transport_Mux_Strategy *
 TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy (TAO_Transport *transport)
diff --git a/tao/default_client.h b/tao/default_client.h
index 45b13292db3..3d7ea54f599 100644
--- a/tao/default_client.h
+++ b/tao/default_client.h
@@ -53,8 +53,6 @@ public:
 
   // = Check Client_Strategy_Factory.h for the documentation of the
   //   following methods.
-  virtual ACE_Lock* create_profile_lock (void);
-  virtual TAO_Configurable_Refcount create_profile_refcount (void);
   virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport);
   virtual ACE_Lock *create_transport_mux_strategy_lock (void);
   virtual int reply_dispatcher_table_size (void) const;
@@ -75,9 +73,6 @@ private:
     TAO_THREAD_LOCK
   };
 
-  /// the lock type for forwarding IIOP Profile
-  Lock_Type profile_lock_type_;
-
   enum Transport_Mux_Strategy
   {
     TAO_MUXED_TMS,
diff --git a/tao/default_resource.cpp b/tao/default_resource.cpp
index cf218ad78d7..ed57244617e 100644
--- a/tao/default_resource.cpp
+++ b/tao/default_resource.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/default_resource.h"
@@ -118,8 +119,6 @@ TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
   , use_local_memory_pool_ (false)
 #endif
   , cached_connection_lock_type_ (TAO_THREAD_LOCK)
-  , object_key_table_lock_type_ (TAO_THREAD_LOCK)
-  , corba_object_lock_type_ (TAO_THREAD_LOCK)
   , flushing_strategy_type_ (TAO_LEADER_FOLLOWER_FLUSHING)
   , char_codeset_parameters_ ()
   , wchar_codeset_parameters_ ()
@@ -163,13 +162,14 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
   // If this factory has already been disabled then
   // print a warning and exit because any options
   // are useless
-  if (this->factory_disabled_) {
-    ACE_DEBUG ((LM_WARNING,
-                ACE_TEXT ("TAO (%P|%t) - Warning: Resource_Factory options ")
-                ACE_TEXT ("ignored\n")
-                ACE_TEXT ("Default Resource Factory is disabled\n")));
-    return 0;
-  }
+  if (this->factory_disabled_)
+    {
+      ACE_DEBUG ((LM_WARNING,
+                  ACE_TEXT ("TAO (%P|%t) - Warning: Resource_Factory options ")
+                  ACE_TEXT ("ignored. ")
+                  ACE_TEXT ("Default Resource Factory is disabled\n")));
+      return 0;
+    }
   this->options_processed_ = 1;
 
   this->parser_names_count_ = 0;
@@ -272,43 +272,6 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
         if (curarg < argc)
             this->wchar_codeset_parameters_.add_translator (argv[curarg]);
       }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBConnectionCachingStrategy")) == 0)
-      {
-        ++curarg;
-
-        // @todo: This needs to be removed after a few betas. The
-        // note is being written during 1.2.3 timeframe.
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%P|%t) This option would be deprecated\n")
-                    ACE_TEXT ("(%P|%t) Please use -ORBConnectionPurgingStrategy ")
-                    ACE_TEXT ("instead\n")));
-
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT ("lru")) == 0)
-              this->connection_purging_type_ =
-                TAO_Resource_Factory::LRU;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT ("lfu")) == 0)
-              this->connection_purging_type_ =
-                TAO_Resource_Factory::LFU;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT ("fifo")) == 0)
-              this->connection_purging_type_ =
-                TAO_Resource_Factory::FIFO;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT ("null")) == 0)
-              this->connection_purging_type_ =
-                  TAO_Resource_Factory::NOOP;
-            else
-              this->report_option_value_error (ACE_TEXT ("-ORBConnectionCachingStrategy"), name);
-          }
-      }
     else if (ACE_OS::strcasecmp (argv[curarg],
                                  ACE_TEXT("-ORBConnectionPurgingStrategy")) == 0)
       {
@@ -394,52 +357,6 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
           }
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBObjectKeyTableLock")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("thread")) == 0)
-              this->object_key_table_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("null")) == 0)
-              {
-                // @@ Bug 940 :This is a sort of hack now. We need to put
-                // this in a common place once we get the common
-                // switch that is documented in bug 940...
-                this->object_key_table_lock_type_ = TAO_NULL_LOCK;
-              }
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBObjectKeyTableLock"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBCorbaObjectLock")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("thread")) == 0)
-              this->corba_object_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("null")) == 0)
-              {
-                // @@ Bug 940 :This is a sort of hack now. We need to put
-                // this in a common place once we get the common
-                // switch that is documented in bug 940...
-                this->corba_object_lock_type_ = TAO_NULL_LOCK;
-              }
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBCorbaObjectLock"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
                                  ACE_TEXT("-ORBResourceUsage")) == 0)
       {
         ++curarg;
@@ -1068,56 +985,6 @@ TAO_Default_Resource_Factory::locked_transport_cache (void)
   return 1;
 }
 
-
-ACE_Lock *
-TAO_Default_Resource_Factory::create_object_key_table_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  if (this->object_key_table_lock_type_ == TAO_NULL_LOCK)
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>,
-                    0);
-  else
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<TAO_SYNCH_MUTEX>,
-                    0);
-
-  return the_lock;
-}
-
-ACE_Lock *
-TAO_Default_Resource_Factory::create_corba_object_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  if (this->corba_object_lock_type_ == TAO_NULL_LOCK)
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>,
-                    0);
-  else
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<TAO_SYNCH_MUTEX>,
-                    0);
-
-  return the_lock;
-}
-
-TAO_Configurable_Refcount
-TAO_Default_Resource_Factory::create_corba_object_refcount (void)
-{
-  switch (this->corba_object_lock_type_)
-    {
-      case TAO_NULL_LOCK:
-        return TAO_Configurable_Refcount (
-                       TAO_Configurable_Refcount::TAO_NULL_LOCK);
-      case TAO_THREAD_LOCK:
-      default:
-        return TAO_Configurable_Refcount (
-                       TAO_Configurable_Refcount::TAO_THREAD_LOCK);
-    }
-}
-
 TAO_Flushing_Strategy *
 TAO_Default_Resource_Factory::create_flushing_strategy (void)
 {
diff --git a/tao/default_resource.h b/tao/default_resource.h
index 4c7d67f6194..9b5e7907d98 100644
--- a/tao/default_resource.h
+++ b/tao/default_resource.h
@@ -176,9 +176,6 @@ public:
   virtual int purge_percentage (void) const;
   virtual int max_muxed_connections (void) const;
   virtual ACE_Lock *create_cached_connection_lock (void);
-  virtual ACE_Lock *create_object_key_table_lock (void);
-  virtual TAO_Configurable_Refcount create_corba_object_refcount (void);
-  virtual ACE_Lock *create_corba_object_lock (void);
   virtual int locked_transport_cache (void);
   virtual TAO_Flushing_Strategy *create_flushing_strategy (void);
   virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void);
@@ -236,7 +233,7 @@ protected:
   /// limit
   int max_muxed_connections_;
 
-  /// If <0> then we create reactors with signal handling disabled.
+  /// If 0 then we create reactors with signal handling disabled.
   int reactor_mask_signals_;
 
   /**
@@ -290,12 +287,6 @@ private:
   /// Type of lock used by the cached connector.
   Lock_Type cached_connection_lock_type_;
 
-  /// Type of lock used by the corba object.
-  Lock_Type object_key_table_lock_type_;
-
-  /// Type of lock used by the corba object.
-  Lock_Type corba_object_lock_type_;
-
   enum Flushing_Strategy_Type
   {
     TAO_LEADER_FOLLOWER_FLUSHING,
@@ -306,8 +297,8 @@ private:
   /// Type of flushing strategy configured
   Flushing_Strategy_Type flushing_strategy_type_;
 
-  // Initialization options. To be used later when creating a codeset
-  // manager instance (s)
+  /// Initialization options. To be used later when creating a codeset
+  /// manager instance (s)
   TAO_Codeset_Parameters char_codeset_parameters_;
   TAO_Codeset_Parameters wchar_codeset_parameters_;
 
diff --git a/tao/default_server.cpp b/tao/default_server.cpp
index a9a07a7181e..424b43e5806 100644
--- a/tao/default_server.cpp
+++ b/tao/default_server.cpp
@@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
   : activate_server_connections_ (0),
     thread_flags_ (THR_BOUND | THR_DETACHED),
-    poa_lock_type_ (TAO_THREAD_LOCK),
     thread_per_connection_use_timeout_ (-1)
 {
 }
@@ -21,19 +20,6 @@ TAO_Default_Server_Strategy_Factory::~TAO_Default_Server_Strategy_Factory (void)
 }
 
 int
-TAO_Default_Server_Strategy_Factory::enable_poa_locking (void)
-{
-  switch (this->poa_lock_type_)
-    {
-    case TAO_NULL_LOCK:
-      return 0;
-    case TAO_THREAD_LOCK:
-    default:
-      return 1;
-    }
-}
-
-int
 TAO_Default_Server_Strategy_Factory::activate_server_connections (void)
 {
   return this->activate_server_connections_;
@@ -321,24 +307,6 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
           }
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBPOALock")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("thread")) == 0)
-              this->poa_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("null")) == 0)
-              this->poa_lock_type_ = TAO_NULL_LOCK;
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBPOALock"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
                                  ACE_TEXT("-ORBThreadFlags")) == 0)
       {
         ++curarg;
diff --git a/tao/default_server.h b/tao/default_server.h
index e37cf95a468..1e6516c7d47 100644
--- a/tao/default_server.h
+++ b/tao/default_server.h
@@ -49,7 +49,6 @@ public:
   // = The TAO_Server_Strategy_Factory methods, please read the
   //   documentation in "tao/Server_Strategy_Factory.h"
   virtual int open (TAO_ORB_Core*);
-  virtual int enable_poa_locking (void);
   virtual int activate_server_connections (void);
   virtual int thread_per_connection_timeout (ACE_Time_Value &timeout);
   virtual int server_connection_thread_flags (void);
@@ -72,15 +71,6 @@ protected:
   /// Default thread flags passed to thr_create().
   int thread_flags_;
 
-  enum Lock_Type
-  {
-    TAO_NULL_LOCK,
-    TAO_THREAD_LOCK
-  };
-
-  /// The type of lock to be returned by <create_poa_lock()>.
-  Lock_Type poa_lock_type_;
-
   /// The timeout flag and value for the thread-per-connection model
   int thread_per_connection_use_timeout_;
   ACE_Time_Value thread_per_connection_timeout_;
diff --git a/tao/extra_anytypecode.mpb b/tao/extra_anytypecode.mpb
deleted file mode 100644
index ece5169967e..00000000000
--- a/tao/extra_anytypecode.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(!minimum_corba) {
-  Source_Files(TAO_ANYTYPECODE_COMPONENTS) {
-    AnyTypeCode/ServicesA.cpp
-  }
-}
diff --git a/tao/operation_details.h b/tao/operation_details.h
index c56d57f746e..69c14c15044 100644
--- a/tao/operation_details.h
+++ b/tao/operation_details.h
@@ -143,10 +143,10 @@ public:
    */
   //@{
 
-  /// Marshals the list of <this->arg_> into the \a cdr.
+  /// Marshals the list of @c this->arg_ into the \a cdr.
   bool marshal_args (TAO_OutputCDR &cdr);
 
-  /// Demarshals the list of <this->arg_> into the \a cdr.
+  /// Demarshals the list of @c this->arg_ into the \a cdr.
   bool demarshal_args (TAO_InputCDR &cdr);
 
   /// Accessors for the argument list
@@ -198,7 +198,7 @@ private:
   /// valid when sending a request.
   TAO_Service_Context reply_service_info_;
 
-  /// Addressing  mode for this request.
+  /// Addressing mode for this request.
   TAO_Target_Specification::TAO_Target_Address addressing_mode_;
 
   /**
diff --git a/tao/orb_types.pidl b/tao/orb_types.pidl
index d64d938a863..b1d0058d9ab 100644
--- a/tao/orb_types.pidl
+++ b/tao/orb_types.pidl
@@ -1,24 +1,10 @@
 // -*- IDL -*-
 
-// ================================================================
 /**
  *  @file   orb_types.pidl
  *
  * $Id$
- *
- *   This file is used to generate the code in orb_typesC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          orb_types.pidl
  */
-// ================================================================
-// -*- IDL -*-
 
 // Basic types
 
diff --git a/tao/orbconf.h b/tao/orbconf.h
index fdea9c361e8..4d14a5af3a1 100644
--- a/tao/orbconf.h
+++ b/tao/orbconf.h
@@ -72,7 +72,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // it exports.  This is useful for platforms or environments that
 // cannot depend on a DNS being available.  This macro only affects
 // the server side of a TAO-based CORBA application. If we are on Win32
-// the DNS is perenially broken. Set it to 1 regardless.
+// the DNS is general broken. Set it to 1 regardless.
 #if !defined (TAO_USE_DOTTED_DECIMAL_ADDRESSES) && defined (ACE_WIN32)
 # define TAO_USE_DOTTED_DECIMAL_ADDRESSES 1
 #endif /*TAO_USE_DOTTED_DECIMAL_ADDRESSES*/
@@ -143,18 +143,9 @@ const size_t TAO_DEFAULT_OBJECT_REF_TABLE_SIZE = 256;
 const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 #endif  /* !TAO_DEFAULT_ORB_TABLE_SIZE */
 
-
 // The default size of TAO's server active object map.
 #if !defined (TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE)
-# if defined (TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE)
-//
-// TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE is deprecated. Please use
-// TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE.
-//
-#  define TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE
-# else
-#  define TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE 64
-# endif /* TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE */
+# define TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE 64
 #endif /* ! TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE */
 
 // The default size of TAO's server poa map.
@@ -608,7 +599,7 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 // To explicitly disable QUEUE_ORDER_POLICY support uncomment the following
 // #define TAO_HAS_QUEUE_ORDER_POLICY 0
 
-// Default QUEUE_ORDER_POLICY settings
+/// Default QUEUE_ORDER_POLICY settings
 #if !defined (TAO_HAS_QUEUE_ORDER_POLICY)
 #  if (TAO_HAS_CORBA_MESSAGING == 1) && \
       (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
@@ -656,25 +647,8 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
             TAO_HAS_CORBA_MESSAGING == 0 */
 #endif  /* !TAO_HAS_AMI */
 
-// We dont have AMI_POLLER support in TAO. Just prevent anyone from
-// using it.
-
-/***********************************************************/
-// All these are for future use. Commenting it..
-
-// #if !defined (TAO_HAS_AMI_POLLER)
-// #  if (TAO_HAS_AMI == 1)
-// #    define TAO_HAS_AMI_POLLER 1
-// #  else
-// #    define TAO_HAS_AMI_POLLER 0
-// #  endif  /* TAO_HAS_AMI == 1 */
-// #else
-// #  if (TAO_HAS_AMI_POLLER == 1) && (TAO_HAS_CORBA_MESSAGING == 0)
-// #  error "tao/orbconf.h: You need CORBA_MESSAGING for AMI support"
-// #  endif /* TAO_HAS_AMI_POLLER == 1 &&
-//             TAO_HAS_CORBA_MESSAGING == 0 */
-// #endif  /* !TAO_HAS_AMI_POLLER */
-/***********************************************************/
+/// We dont have AMI_POLLER support in TAO. Just prevent anyone from
+/// using it.
 
 // AMI_CALLBACK support is disabled by default if TAO is not
 // configured for AMI.  If TAO is configured for AMI, then
@@ -685,7 +659,7 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 // To explicitly disable AMI_CALLBACK support uncomment the following
 // #define TAO_HAS_AMI_CALLBACK 0
 
-// Default AMI_CALLBACK settings
+/// Default AMI_CALLBACK settings
 #if !defined (TAO_HAS_AMI_CALLBACK)
 #  if (TAO_HAS_AMI == 1)
 #    define TAO_HAS_AMI_CALLBACK 1
@@ -700,8 +674,8 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
             TAO_HAS_CORBA_MESSAGING == 0 */
 #endif  /* !TAO_HAS_AMI_CALLBACK */
 
-// Interceptors is supported by default if we are not building for
-// MinimumCORBA.
+/// Interceptors is supported by default if we are not building for
+/// MinimumCORBA.
 #if !defined (TAO_HAS_INTERCEPTORS)
 # if (TAO_HAS_MINIMUM_CORBA == 1) || defined (CORBA_E_COMPACT) || defined (CORBA_E_MICRO)
 #   define TAO_HAS_INTERCEPTORS 0
@@ -710,9 +684,9 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 # endif /* TAO_HAS_MINIMUM_CORBA */
 #endif
 
-// At the moment we have sendfile support in ACE we enabled this also by
-// default for TAO, but we can suppress it also explicitly by set
-// TAO_HAS_SENDFILE to 0.
+/// At the moment we have sendfile support in ACE we enabled this also by
+/// default for TAO, but we can suppress it also explicitly by set
+/// TAO_HAS_SENDFILE to 0.
 #if !defined (TAO_HAS_SENDFILE)
 # if defined ACE_HAS_SENDFILE && ACE_HAS_SENDFILE == 1
 #  define TAO_HAS_SENDFILE 1
@@ -721,14 +695,14 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 # endif /* ACE_HAS_SENDFILE */
 #endif /* !TAO_HAS_SENDFILE */
 
-// Proprietary FT interception-point support is disabled by default.
+/// Proprietary FT interception-point support is disabled by default.
 #ifndef TAO_HAS_EXTENDED_FT_INTERCEPTORS
 # define TAO_HAS_EXTENDED_FT_INTERCEPTORS 0
 #endif  /* !TAO_HAS_EXTENEDED_FT_INTERCEPTORS */
 
-// This is needed for a check in the Policy Set; Should really not be
-// here though; We should find a different way to handle the check in
-// the Policy Set.
+/// This is needed for a check in the Policy Set; Should really not be
+/// here though; We should find a different way to handle the check in
+/// the Policy Set.
 #define TAO_RT_SERVER_PROTOCOL_POLICY_TYPE 42
 
 /// Policies that are accessed on the critical path and need to be
@@ -795,8 +769,8 @@ enum TAO_Cached_Policy_Type
   TAO_CACHED_POLICY_MAX_CACHED
 };
 
-// This enum provides a mask that represent the scope at which a given
-// policy can be applied
+/// This enum provides a mask that represent the scope at which a given
+/// policy can be applied
 enum TAO_Policy_Scope
 {
   TAO_POLICY_OBJECT_SCOPE   = 0x01,
@@ -813,12 +787,12 @@ enum TAO_Policy_Scope
                    TAO_POLICY_ORB_SCOPE | \
                    TAO_POLICY_POA_SCOPE))
 
-// Control the default version of GIOP used by TAO.
-// The ORB is always able to communicate with 1.0, 1.1 and 1.2
-// servers, and it creates 1.2 endpoints (and profiles).  If you need
-// to talk to old clients that only understand 1.0 or 1.1 (and do not
-// attempt to use 1.0 or 1.1 with 1.2 servers), then change the values
-// below.
+/// Control the default version of GIOP used by TAO.
+/// The ORB is always able to communicate with 1.0, 1.1 and 1.2
+/// servers, and it creates 1.2 endpoints (and profiles).  If you need
+/// to talk to old clients that only understand 1.0 or 1.1 (and do not
+/// attempt to use 1.0 or 1.1 with 1.2 servers), then change the values
+/// below.
 #if !defined (TAO_DEF_GIOP_MAJOR)
 #define TAO_DEF_GIOP_MAJOR 1
 #endif /* TAO_DEF_GIOP_MAJOR */
@@ -826,7 +800,7 @@ enum TAO_Policy_Scope
 #define TAO_DEF_GIOP_MINOR 2
 #endif /* TAO_DEF_GIOP_MINOR */
 
-// Control the minimum required IIOP version for IPv6 support
+/// Control the minimum required IIOP version for IPv6 support
 #if defined (ACE_HAS_IPV6)
 # if !defined (TAO_MIN_IPV6_IIOP_MAJOR)
 #   define TAO_MIN_IPV6_IIOP_MAJOR 1
@@ -836,17 +810,12 @@ enum TAO_Policy_Scope
 # endif /* TAO_MIN_IPV6_IIOP_MINOR */
 #endif /* ACE_HAS_IPV6 */
 
-// @todo this needs to be deprecated. Use TAO_MAXBUFSIZE instead.
-#if !defined (TAO_CONNECTION_HANDLER_STACK_BUF_SIZE)
-#   define TAO_CONNECTION_HANDLER_STACK_BUF_SIZE 1024
-#endif /*TAO_CONNECTION_HANDLER_STACK_BUF_SIZE */
-
-// By default TAO generate the OMG standard profile components
-// (ORB_TYPE and CODE_SETS)
+/// By default TAO generate the OMG standard profile components
+/// (ORB_TYPE and CODE_SETS)
 #define TAO_STD_PROFILE_COMPONENTS
 
 #if !defined (TAO_DEFAULT_IOR_SIZE)
-// This is the default size of the buffer used for processing IORs.
+/// This is the default size of the buffer used for processing IORs.
 #define TAO_DEFAULT_IOR_SIZE 1024
 #endif /* TAO_DEFAULT_IOR_SIZE */
 
@@ -879,7 +848,7 @@ enum TAO_Policy_Scope
 #  define TAO_USE_OUTPUT_CDR_MMAP_MEMORY_POOL 0
 #endif /* TAO_USE_LOCAL_MEMORY_POOL */
 
-// Enable TransportCurrent by default
+/// Enable TransportCurrent by default
 #if !defined (TAO_HAS_TRANSPORT_CURRENT)
 #    define TAO_HAS_TRANSPORT_CURRENT 1
 #endif  /* ! TAO_HAS_TRANSPORT_CURRENT */
diff --git a/tao/params.h b/tao/params.h
index e7af1a651e0..e604e76814a 100644
--- a/tao/params.h
+++ b/tao/params.h
@@ -259,22 +259,22 @@ public:
   int forward_once_exception () const;
 
 private:
-  // Each "endpoint" is of the form:
-  //
-  //   protocol://V.v@addr1,...,W.w@addrN/
-  //
-  // or:
-  //
-  //   protocol://addr1,addr2,...,addrN/
-  //
-  // where "V.v" and "W.w" are optional versions.
-  //
-  // Multiple sets of endpoints may be seperated by a semi-colon `;'.
-  // For example:
-  //
-  //   iiop://space:2001,odyssey:2010;uiop://foo,bar
-  //
-  // All preconnect or endpoint strings should be of the above form(s).
+  /// Each "endpoint" is of the form:
+  ///
+  ///   protocol://V.v@addr1,...,W.w@addrN/
+  ///
+  /// or:
+  ///
+  ///   protocol://addr1,addr2,...,addrN/
+  ///
+  /// where "V.v" and "W.w" are optional versions.
+  ///
+  /// Multiple sets of endpoints may be separated by a semi-colon `;'.
+  /// For example:
+  ///
+  ///   iiop://space:2001,odyssey:2010;uiop://foo,bar
+  ///
+  /// All preconnect or endpoint strings should be of the above form(s).
   int parse_and_add_endpoints (const ACE_CString &endpoints,
                                TAO_EndpointSet &endpoint_set);
 
@@ -312,7 +312,7 @@ private:
   /// 1 if we're using IP_MULTICAST_LOOP and 0 otherwise.
   bool ip_multicastloop_;
 
-  /// Control the strategy for copying vs. appeding octet sequences in
+  /// Control the strategy for copying vs. appending octet sequences in
   /// CDR streams.
   int cdr_memcpy_tradeoff_;
 
diff --git a/tao/tao.mpc b/tao/tao.mpc
index b107b37198c..4fa6c5de278 100644
--- a/tao/tao.mpc
+++ b/tao/tao.mpc
@@ -101,7 +101,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, taoid
     Collocated_Invocation.cpp
     Collocation_Proxy_Broker.cpp
     Collocation_Resolver.cpp
-    Configurable_Refcount.cpp
     Connect_Strategy.cpp
     Connection_Handler.cpp
     Connection_Purging_Strategy.cpp
@@ -247,6 +246,7 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, taoid
     RequestInterceptor_Adapter.cpp
     Resource_Factory.cpp
     Resume_Handle.cpp
+    Resume_handle_Deferred.cpp
     Server_Strategy_Factory.cpp
     ServerRequestInterceptor_Adapter.cpp
     ServerRequestInterceptor_Adapter_Factory.cpp
diff --git a/tao/target_specification.cpp b/tao/target_specification.cpp
index 00e0bc3564d..9efae876cf8 100644
--- a/tao/target_specification.cpp
+++ b/tao/target_specification.cpp
@@ -1,4 +1,3 @@
-
 //$Id$
 
 #include "tao/target_specification.h"
diff --git a/tests/AMH_Exceptions/Makefile.am b/tests/AMH_Exceptions/Makefile.am
deleted file mode 100644
index 6d8e0abad38..00000000000
--- a/tests/AMH_Exceptions/Makefile.am
+++ /dev/null
@@ -1,125 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AMH_Exceptions_Idl.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.AMH_Exceptions_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.AMH_Exceptions_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/AMH_Exceptions/Test.idl b/tests/AMH_Exceptions/Test.idl
index 6a9ae77044b..6f4030410f4 100644
--- a/tests/AMH_Exceptions/Test.idl
+++ b/tests/AMH_Exceptions/Test.idl
@@ -8,7 +8,7 @@ module Test
 
   exception InvalidTimestamp {};
   exception ServerOverload {};
-  
+
   /// Use a timestamp to measure the roundtrip delay
   typedef unsigned long long Timestamp;
 
diff --git a/tests/AMH_Exceptions/client.cpp b/tests/AMH_Exceptions/client.cpp
index 403234a50d0..4145de92f4b 100644
--- a/tests/AMH_Exceptions/client.cpp
+++ b/tests/AMH_Exceptions/client.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "TestC.h"
@@ -27,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/AMH_Exceptions/server.cpp b/tests/AMH_Exceptions/server.cpp
index 2a948434c95..f8132bca70e 100644
--- a/tests/AMH_Exceptions/server.cpp
+++ b/tests/AMH_Exceptions/server.cpp
@@ -1,4 +1,4 @@
-
+// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_stdio.h"
@@ -24,7 +24,7 @@ public:
   //FUZZ: disable check_for_lack_ACE_OS
 
 protected:
-  CORBA::ORB_ptr orb_;
+  CORBA::ORB_var orb_;
 };
 
 
diff --git a/tests/AMH_Oneway/Makefile.am b/tests/AMH_Oneway/Makefile.am
deleted file mode 100644
index fe45f3b457c..00000000000
--- a/tests/AMH_Oneway/Makefile.am
+++ /dev/null
@@ -1,124 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AMH_Oneway_Idl.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.AMH_Oneway_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.AMH_Oneway_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/AMI/Makefile.am b/tests/AMI/Makefile.am
deleted file mode 100644
index 56fad7dc3e7..00000000000
--- a/tests/AMI/Makefile.am
+++ /dev/null
@@ -1,166 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AMI_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-CLEANFILES = \
-  ami_test-stamp \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp
-
-ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ami_test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  client.cpp \
-  ami_test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  ami_test_i.cpp \
-  server.cpp \
-  ami_test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Simple_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += simple_client
-
-simple_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-simple_client_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  simple_client.cpp \
-  ami_test_i.h
-
-simple_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/AMI/ami_test.idl b/tests/AMI/ami_test.idl
index 04005e9531f..44853a82706 100644
--- a/tests/AMI/ami_test.idl
+++ b/tests/AMI/ami_test.idl
@@ -33,7 +33,7 @@ module A
 
         void inout_arg_test (inout string str);
       };
-      
+
     interface Test_Child : AMI_Test
     {
       void child_op ();
diff --git a/tests/AMI/ami_test_i.cpp b/tests/AMI/ami_test_i.cpp
index f0b9de7ebfa..398914b6099 100644
--- a/tests/AMI/ami_test_i.cpp
+++ b/tests/AMI/ami_test_i.cpp
@@ -16,8 +16,6 @@
 #include "ami_test_i.h"
 #include "tao/debug.h"
 
-ACE_RCSID(AMI, ami_test_i, "$Id$")
-
 AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb,
                         CORBA::Long in_l,
                         const char * in_str,
diff --git a/tests/AMI/client.cpp b/tests/AMI/client.cpp
index 5f5ab8fba03..f1855318f91 100644
--- a/tests/AMI/client.cpp
+++ b/tests/AMI/client.cpp
@@ -18,10 +18,6 @@
 #include "ace/Task.h"
 #include "ami_test_i.h"
 
-ACE_RCSID (AMI,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
 int niterations = 5;
@@ -65,7 +61,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/AMI/exclusive.conf b/tests/AMI/exclusive.conf
index b269154099f..e03ea06380b 100644
--- a/tests/AMI/exclusive.conf
+++ b/tests/AMI/exclusive.conf
@@ -1,2 +1,3 @@
+# $Id$
 
-static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBclientconnectionhandler ST"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST"
diff --git a/tests/AMI/exclusive.conf.xml b/tests/AMI/exclusive.conf.xml
index 6724ae56996..33db7f50d83 100644
--- a/tests/AMI/exclusive.conf.xml
+++ b/tests/AMI/exclusive.conf.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
 <!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBclientconnectionhandler ST"/>
+ <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST"/>
 </ACE_Svc_Conf>
diff --git a/tests/AMI/mt_noupcall.conf b/tests/AMI/mt_noupcall.conf
new file mode 100644
index 00000000000..1878e4a33c5
--- /dev/null
+++ b/tests/AMI/mt_noupcall.conf
@@ -0,0 +1,3 @@
+# $Id$
+
+static Client_Strategy_Factory '-ORBWaitStrategy mt_noupcall'
diff --git a/tests/AMI/muxed.conf b/tests/AMI/muxed.conf
index a7f2f5f608a..117767bce28 100644
--- a/tests/AMI/muxed.conf
+++ b/tests/AMI/muxed.conf
@@ -1,2 +1,3 @@
+# $Id$
 
-static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBProfileLock null -ORBClientConnectionHandler ST"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST"
diff --git a/tests/AMI/muxed.conf.xml b/tests/AMI/muxed.conf.xml
index 812cb7376db..cf063034ce0 100644
--- a/tests/AMI/muxed.conf.xml
+++ b/tests/AMI/muxed.conf.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
 <!-- Converted from ./tests/AMI/muxed.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED -ORBProfileLock null -ORBClientConnectionHandler ST"/>
+ <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST"/>
 </ACE_Svc_Conf>
diff --git a/tests/AMI/run_mt_noupcall.pl b/tests/AMI/run_mt_noupcall.pl
new file mode 100755
index 00000000000..76ce949dbdd
--- /dev/null
+++ b/tests/AMI/run_mt_noupcall.pl
@@ -0,0 +1,82 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+$client_conf = $client->LocalFile ("mt_noupcall$PerlACE::svcconf_ext");
+
+$server_debug_level = '0';
+$client_debug_level = '0';
+$iterations = '1';
+
+foreach $i (@ARGV) {
+    if ($i eq '-debug') {
+        $server_debug_level = '1';
+        $client_debug_level = '1';
+    }
+}
+
+my $iorbase = "server.ior";
+my $server_iorfile = $server->LocalFile ($iorbase);
+my $client_iorfile = $client->LocalFile ($iorbase);
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+$SV = $server->CreateProcess ("server", "-ORBdebuglevel $server_debug_level -o $server_iorfile");
+
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($server->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot get file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$CL = $client->CreateProcess ("simple_client",
+                              "-ORBsvcconf $client_conf "
+                              . "-ORBdebuglevel $client_debug_level"
+                              . " -k file://$client_iorfile "
+                              . " -i $iterations -d -x");
+
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+exit $status;
diff --git a/tests/AMI/run_test.pl b/tests/AMI/run_test.pl
index 392e6e68498..29fe59a71aa 100755
--- a/tests/AMI/run_test.pl
+++ b/tests/AMI/run_test.pl
@@ -13,7 +13,8 @@ my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 fail
 
 $client_conf = $client->LocalFile ("muxed$PerlACE::svcconf_ext");
 
-$debug_level = '0';
+$server_debug_level = '0';
+$client_debug_level = '0';
 $iterations = '1';
 
 foreach $i (@ARGV) {
@@ -21,7 +22,8 @@ foreach $i (@ARGV) {
         $client_conf = $client->LocalFile ("muxed$PerlACE::svcconf_ext");
     }
     elsif ($i eq '-debug') {
-        $debug_level = '1';
+        $server_debug_level = '1';
+        $client_debug_level = '1';
     }
     elsif ($i eq '-exclusive') {
         $client_conf = $client->LocalFile ("exclusive$PerlACE::svcconf_ext");
@@ -34,7 +36,7 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile");
+$SV = $server->CreateProcess ("server", "-ORBdebuglevel $server_debug_level -o $server_iorfile");
 
 $server_status = $SV->Spawn ();
 
@@ -62,7 +64,7 @@ if ($client->PutFile ($iorbase) == -1) {
 
 $CL = $client->CreateProcess ("simple_client",
                               "-ORBsvcconf $client_conf "
-                              . "-ORBdebuglevel $debug_level"
+                              . "-ORBdebuglevel $client_debug_level"
                               . " -k file://$client_iorfile "
                               . " -i $iterations -d");
 
@@ -77,7 +79,7 @@ if ($client_status != 0) {
 $CL2 = $client->CreateProcess ("simple_client",
                                "-ORBsvcconf $client_conf"
                                . " -ORBCollocation no"
-                               . " -ORBdebuglevel $debug_level"
+                               . " -ORBdebuglevel $client_debug_level"
                                . " -k file://$client_iorfile "
                                . " -i $iterations -x -d");
 
diff --git a/tests/AMI/server.conf b/tests/AMI/server.conf
index faf9c6c874b..0ce1881ed1c 100644
--- a/tests/AMI/server.conf
+++ b/tests/AMI/server.conf
@@ -1,3 +1,3 @@
 # $Id$
-#
+
 static Server_Strategy_Factory "-ORBconcurrency thread-per-connection"
diff --git a/tests/AMI/server.cpp b/tests/AMI/server.cpp
index 456eceb946e..18d23928d5c 100644
--- a/tests/AMI/server.cpp
+++ b/tests/AMI/server.cpp
@@ -19,8 +19,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(AMI, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -47,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/AMI/simple_client.cpp b/tests/AMI/simple_client.cpp
index 7a5dbfd0ccc..0f1ec108585 100644
--- a/tests/AMI/simple_client.cpp
+++ b/tests/AMI/simple_client.cpp
@@ -16,13 +16,8 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
-
 #include "ami_testS.h"
 
-ACE_RCSID (AMI,
-           simple_client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int shutdown_flag = 0;
@@ -61,7 +56,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -289,8 +284,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       poa_var->destroy (1,  // ethernalize objects
-                        0  // wait for completion
-                       );
+                        0); // wait for completion
 
       orb->destroy ();
     }
diff --git a/tests/AMI_Buffering/AMI_Buffering.cpp b/tests/AMI_Buffering/AMI_Buffering.cpp
index 6fe9b1a0db7..1856c608088 100644
--- a/tests/AMI_Buffering/AMI_Buffering.cpp
+++ b/tests/AMI_Buffering/AMI_Buffering.cpp
@@ -3,8 +3,6 @@
 //
 #include "AMI_Buffering.h"
 
-ACE_RCSID(AMI_Buffering, AMI_Buffering, "$Id$")
-
 AMI_Buffering::AMI_Buffering (CORBA::ORB_ptr orb,
                               Test::AMI_Buffering_Admin_ptr admin)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
index 22ed84d2379..221d36fac3a 100644
--- a/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
+++ b/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
@@ -3,8 +3,6 @@
 //
 #include "AMI_Buffering_Admin.h"
 
-ACE_RCSID(AMI_Buffering, AMI_Buffering_Admin, "$Id$")
-
 AMI_Buffering_Admin::AMI_Buffering_Admin (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
   , request_count_ (0)
diff --git a/tests/AMI_Buffering/Client_Task.cpp b/tests/AMI_Buffering/Client_Task.cpp
index 70a7d6d3414..560ac417b3b 100644
--- a/tests/AMI_Buffering/Client_Task.cpp
+++ b/tests/AMI_Buffering/Client_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(AMI_Buffering, Client_Task, "$Id$")
-
 Client_Task::Client_Task (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
   , terminate_loop_ (0)
diff --git a/tests/AMI_Buffering/Makefile.am b/tests/AMI_Buffering/Makefile.am
deleted file mode 100644
index 1b6a636d73a..00000000000
--- a/tests/AMI_Buffering/Makefile.am
+++ /dev/null
@@ -1,170 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AMI_Buffering_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Buffering_Admin.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += admin
-
-admin_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-admin_SOURCES = \
-  AMI_Buffering_Admin.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  admin.cpp \
-  AMI_Buffering_Admin.h
-
-admin_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Buffering_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Reply_Handler.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Reply_Handler.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Buffering_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  AMI_Buffering.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  AMI_Buffering.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/AMI_Buffering/Reply_Handler.cpp b/tests/AMI_Buffering/Reply_Handler.cpp
index 8742d78f98c..e83851109bc 100644
--- a/tests/AMI_Buffering/Reply_Handler.cpp
+++ b/tests/AMI_Buffering/Reply_Handler.cpp
@@ -3,8 +3,6 @@
 //
 #include "Reply_Handler.h"
 
-ACE_RCSID(AMI_Buffering, Reply_Handler, "$Id$")
-
 Reply_Handler::Reply_Handler (void)
 {
 }
diff --git a/tests/AMI_Buffering/admin.cpp b/tests/AMI_Buffering/admin.cpp
index ca116476ba1..18b21e61445 100644
--- a/tests/AMI_Buffering/admin.cpp
+++ b/tests/AMI_Buffering/admin.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(AMI_Buffering, admin, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("admin.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/AMI_Buffering/client.cpp b/tests/AMI_Buffering/client.cpp
index 795fad7a48b..3e722e6dbb0 100644
--- a/tests/AMI_Buffering/client.cpp
+++ b/tests/AMI_Buffering/client.cpp
@@ -8,8 +8,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(AMI_Buffering, client, "$Id$")
-
 const ACE_TCHAR *server_ior = ACE_TEXT("file://server.ior");
 const ACE_TCHAR *admin_ior = ACE_TEXT("file://admin.ior");
 int iterations = 20;
@@ -86,7 +84,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/AMI_Buffering/server.cpp b/tests/AMI_Buffering/server.cpp
index 8c0968041f2..ca15e6184ec 100644
--- a/tests/AMI_Buffering/server.cpp
+++ b/tests/AMI_Buffering/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(AMI_Buffering, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 const ACE_TCHAR *ior = ACE_TEXT("file://admin.ior");
 
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/AMI_Timeouts/Makefile.am b/tests/AMI_Timeouts/Makefile.am
deleted file mode 100644
index 4d635e2ac31..00000000000
--- a/tests/AMI_Timeouts/Makefile.am
+++ /dev/null
@@ -1,137 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AMI_Timeouts_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  timeoutC.cpp \
-  timeoutC.h \
-  timeoutC.inl \
-  timeoutS.cpp \
-  timeoutS.h \
-  timeoutS.inl
-
-CLEANFILES = \
-  timeout-stamp \
-  timeoutC.cpp \
-  timeoutC.h \
-  timeoutC.inl \
-  timeoutS.cpp \
-  timeoutS.h \
-  timeoutS.inl
-
-timeoutC.cpp timeoutC.h timeoutC.inl timeoutS.cpp timeoutS.h timeoutS.inl: timeout-stamp
-
-timeout-stamp: $(srcdir)/timeout.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/timeout.idl
-	@touch $@
-
-noinst_HEADERS = \
-  timeout.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Timeouts_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  timeoutC.cpp \
-  timeoutS.cpp \
-  timeout_client.cpp \
-  timeout_i.cpp \
-  timeout_client.h \
-  timeout_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Timeouts_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  timeoutC.cpp \
-  timeoutS.cpp \
-  timeout_client.cpp \
-  timeout_i.cpp \
-  timeout_client.h \
-  timeout_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/AMI_Timeouts/client.cpp b/tests/AMI_Timeouts/client.cpp
index 64b2aa35e9b..ef9f5991edc 100644
--- a/tests/AMI_Timeouts/client.cpp
+++ b/tests/AMI_Timeouts/client.cpp
@@ -19,10 +19,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (AMI,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 unsigned int msec = 50;
 
@@ -55,7 +51,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/AMI_Timeouts/server.cpp b/tests/AMI_Timeouts/server.cpp
index 4605335adc1..467f3e5cde5 100644
--- a/tests/AMI_Timeouts/server.cpp
+++ b/tests/AMI_Timeouts/server.cpp
@@ -16,10 +16,6 @@
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (AMI,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -46,7 +42,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/AMI_Timeouts/svc.conf b/tests/AMI_Timeouts/svc.conf
index 644bce82202..8bcf51d9450 100644
--- a/tests/AMI_Timeouts/svc.conf
+++ b/tests/AMI_Timeouts/svc.conf
@@ -1,2 +1,3 @@
+# $Id$
 
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler MT"
diff --git a/tests/AMI_Timeouts/timeout.idl b/tests/AMI_Timeouts/timeout.idl
index 64aa8c189c5..e6c70e478e6 100644
--- a/tests/AMI_Timeouts/timeout.idl
+++ b/tests/AMI_Timeouts/timeout.idl
@@ -1,22 +1,17 @@
-//
-// $Id$
-// 
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/AMI_Timeouts
-//
-// = FILENAME
-//    timeout.idl
-//
-// = DESCRIPTION
-//    Interface of the test CORBA object.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    timeout.idl
+ *
+ *  $Id$
+ *
+ *  Interface of the test CORBA object.
+ *
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 
 interface TimeoutObj {
diff --git a/tests/AMI_Timeouts/timeout_client.h b/tests/AMI_Timeouts/timeout_client.h
index 126be343504..e554b62ff80 100644
--- a/tests/AMI_Timeouts/timeout_client.h
+++ b/tests/AMI_Timeouts/timeout_client.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/AMI_Timeouts
-//
-// = FILENAME
-//    timeout_client.h
-//
-// = DESCRIPTION
-//    Tests timeouts with AMI.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    timeout_client.h
+ *
+ *  $Id$
+ *
+ *  Tests timeouts with AMI.
+ *
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 
 #include "ace/Task.h"
diff --git a/tests/AMI_Timeouts/timeout_i.cpp b/tests/AMI_Timeouts/timeout_i.cpp
index fc67d8d8f09..9064b6ca9f0 100644
--- a/tests/AMI_Timeouts/timeout_i.cpp
+++ b/tests/AMI_Timeouts/timeout_i.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/AMI_Timeouts
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    Implements the timeout CORBA Object and its reply handler.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    timeout_i.cpp
+ *
+ *  $Id$
+ *
+ *  Implements the timeout CORBA Object and its reply handler.
+ *
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #include "timeout_i.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/tests/AMI_Timeouts/timeout_i.h b/tests/AMI_Timeouts/timeout_i.h
index cde9fbcea71..3b7c7996303 100644
--- a/tests/AMI_Timeouts/timeout_i.h
+++ b/tests/AMI_Timeouts/timeout_i.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/AMI_Timeouts
-//
-// = FILENAME
-//    timeout_i.h
-//
-// = DESCRIPTION
-//    Implements the CORBA object.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    timeout_i.h
+ *
+ *  $Id$
+ *
+ *  Implements the CORBA object.
+ *
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #ifndef TIMEOUT_I_H
 #define TIMEOUT_I_H
diff --git a/tests/Abstract_Interface/Makefile.am b/tests/Abstract_Interface/Makefile.am
deleted file mode 100644
index d6dd9c6d02d..00000000000
--- a/tests/Abstract_Interface/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Abstract_Interface_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Abstract_Interface_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testC.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Abstract_Interface_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  testC.h \
-  testS.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Abstract_Interface/client.cpp b/tests/Abstract_Interface/client.cpp
index c4a678fc71a..f9ce8e86e83 100644
--- a/tests/Abstract_Interface/client.cpp
+++ b/tests/Abstract_Interface/client.cpp
@@ -1,12 +1,9 @@
+// -*- C++ -*-
 // $Id$
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Abstract_Interface,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior_input_file = ACE_TEXT ("file://test.ior");
 int debug = 0;
 
@@ -53,7 +50,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -65,14 +62,14 @@ dump_node (BaseNode* bn, int indent)
       return;
     }
 
-  // This is ugly I know
-  int i = indent;
-  for (; i != 0; --i) ACE_DEBUG ((LM_DEBUG, "  "));
-
   StringNode* sn = StringNode::_downcast (bn);
 
   if (debug)
     {
+      // This is ugly I know
+      int i = indent;
+      for (; i != 0; --i) ACE_DEBUG ((LM_DEBUG, "  "));
+
       if (sn != 0)
         {
           ACE_DEBUG ((LM_DEBUG, "%x <StringNode> %C\n",
@@ -280,10 +277,21 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       if (which_test == TEST_EXCEPTION || which_test == TEST_ALL)
         {
-          which_test = TEST_EXCEPTION;
           test_exception (package.in ());
         }
 
+      if (which_test == TEST_ALL)
+        {
+          objref->pass_nil (package.out ());
+
+          if (!CORBA::is_nil (package.in ()))
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "pass_nil() did NOT return null OUT arg\n"),
+                                -1);
+            }
+        }
+
       objref->shutdown ();
 
       orb->destroy ();
diff --git a/tests/Abstract_Interface/server.cpp b/tests/Abstract_Interface/server.cpp
index f9d003d7fda..5a825efcfce 100644
--- a/tests/Abstract_Interface/server.cpp
+++ b/tests/Abstract_Interface/server.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Abstract_Interface,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Abstract_Interface/test.idl b/tests/Abstract_Interface/test.idl
index c5b5643405a..6a5d9ec4a1c 100644
--- a/tests/Abstract_Interface/test.idl
+++ b/tests/Abstract_Interface/test.idl
@@ -21,6 +21,7 @@ interface passer
 {
   void pass_ops (out base outarg);
   void pass_state (out base outarg);
+  void pass_nil (out base outarg);
   oneway void shutdown ();
 };
 
diff --git a/tests/Abstract_Interface/test_i.cpp b/tests/Abstract_Interface/test_i.cpp
index 7e9c8163f92..57480795547 100644
--- a/tests/Abstract_Interface/test_i.cpp
+++ b/tests/Abstract_Interface/test_i.cpp
@@ -1,13 +1,9 @@
+// -*- C++ -*-
 // $Id$
 
 #include "test_i.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (Abstract_Interface,
-           test_i,
-           "$Id$")
-
 char *
 foo_i::foo_op (const char * inarg)
 {
@@ -100,3 +96,9 @@ passer_i::pass_state (base_out outarg)
 
   outarg = tc._retn ();
 }
+
+void
+passer_i::pass_nil (base_out outarg)
+{
+  outarg = foo::_nil ();
+}
diff --git a/tests/Abstract_Interface/test_i.h b/tests/Abstract_Interface/test_i.h
index 855edd98712..90fae856475 100644
--- a/tests/Abstract_Interface/test_i.h
+++ b/tests/Abstract_Interface/test_i.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #ifndef TAO_TEST_I_H
@@ -21,6 +22,8 @@ public:
 
   virtual void pass_state (base_out outarg);
 
+  virtual void pass_nil (base_out outarg);
+
   virtual void shutdown (void);
 private:
   CORBA::ORB_var orb_;
diff --git a/tests/Alt_Mapping/alt_mapping.mpc b/tests/Alt_Mapping/alt_mapping.mpc
index 8451f327917..5e572ff5a05 100644
--- a/tests/Alt_Mapping/alt_mapping.mpc
+++ b/tests/Alt_Mapping/alt_mapping.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults {
                 -Wb,stub_export_include=alt_mapping_stub_export.h \
                 -Wb,skel_export_macro=ALT_MAPPING_SKEL_Export \
                 -Wb,skel_export_include=alt_mapping_skel_export.h \
-                -Gxhst -Gxhsk -Gstl
+                -Gxhst -Gxhsk
     alt_mapping.idl
   }
   custom_only = 1
diff --git a/tests/Alt_Mapping/alt_mapping_i.cpp b/tests/Alt_Mapping/alt_mapping_i.cpp
index 0d14e960a4c..908096ebc93 100644
--- a/tests/Alt_Mapping/alt_mapping_i.cpp
+++ b/tests/Alt_Mapping/alt_mapping_i.cpp
@@ -1,14 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    alt_mapping_i.cpp
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    alt_mapping_i.cpp
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
 
 #include "alt_mapping_i.h"
 
diff --git a/tests/Alt_Mapping/alt_mapping_i.h b/tests/Alt_Mapping/alt_mapping_i.h
index 6c96dbe120f..2ac152c9ccb 100644
--- a/tests/Alt_Mapping/alt_mapping_i.h
+++ b/tests/Alt_Mapping/alt_mapping_i.h
@@ -1,14 +1,14 @@
-// $Id$
 
-// ============================================================================
-//
-// = FILENAME
-//    alt_mapping_i.h
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    alt_mapping_i.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
 
 #ifndef ALT_MAPPING_I_H
 #define ALT_MAPPING_I_H
@@ -17,10 +17,6 @@
 
 class ALT_MAPPING_SKEL_Export Alt_Mapping_i : public POA_Alt_Mapping
 {
-  // = TITLE
-  //    Alt_Mapping_i
-  // = DESCRIPTION
-  //    Implementation of the Alt_Mapping_i test suite.
 public:
   Alt_Mapping_i (CORBA::ORB_ptr orb);
 
diff --git a/tests/Alt_Mapping/client.cpp b/tests/Alt_Mapping/client.cpp
index b5e936b6e3c..5f8672c0382 100644
--- a/tests/Alt_Mapping/client.cpp
+++ b/tests/Alt_Mapping/client.cpp
@@ -1,18 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//    This file contains the implementation of the client-side of the
-//    Alt_Mapping application.
-//
-// = AUTHORS
-//      Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  This file contains the implementation of the client-side of the
+ *  Alt_Mapping application.
+ *
+ *
+ *  @author   Jeff Parsons
+ */
+//=============================================================================
+
 
 #ifndef CLIENT_CPP
 #define CLIENT_CPP
@@ -145,7 +145,7 @@ Alt_Mapping_Client<T>::run_sii_test (void)
                   "********** Finished running %s SII *********\n",
                   opname));
     }
-    
+
   return this->results_.error_count () ? -1 : 0;
 }
 
diff --git a/tests/Alt_Mapping/client.h b/tests/Alt_Mapping/client.h
index acdb2a18612..fe39af905ca 100644
--- a/tests/Alt_Mapping/client.h
+++ b/tests/Alt_Mapping/client.h
@@ -1,21 +1,17 @@
-// -*- c++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Alt_Mapping_Test
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION
-//    Header file for the Alt_Mapping_Test client application.
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    client.h
+ *
+ *  $Id$
+ *
+ *  Header file for the Alt_Mapping_Test client application.
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef ALT_MAPPING_CLIENT_H
 #define ALT_MAPPING_CLIENT_H
@@ -24,18 +20,20 @@
 #include "alt_mappingC.h"
 #include "results.h"
 
+/**
+ * @class Alt_Mapping_Client
+ *
+ * @brief Alt_Mapping_Client
+ *
+ * This class declares an interface to run the example client for
+ * Alt_Mapping CORBA server.  All the complexity for initializing
+ * the client is hidden in the class.  Just the run () interface
+ * is needed. The template class does the specific work of making
+ * the request of the desired data type
+ */
 template <class T>
 class Alt_Mapping_Client
 {
-  // = TITLE
-  //    Alt_Mapping_Client
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    Alt_Mapping CORBA server.  All the complexity for initializing
-  //    the client is hidden in the class.  Just the run () interface
-  //    is needed. The template class does the specific work of making
-  //    the request of the desired data type
 public:
   typedef T TEST_OBJECT;
 
@@ -46,21 +44,21 @@ public:
 
   ~Alt_Mapping_Client (void);
 
+  /// run the SII test
   int run_sii_test (void);
-  // run the SII test
 
 private:
+  /// underlying ORB
   CORBA::ORB_ptr orb_;
-  // underlying ORB
 
+  /// alt mapping object reference
   Alt_Mapping_ptr alt_mapping_test_;
-  // alt mapping object reference
 
+  /// object doing the actual work
   TEST_OBJECT *test_object_;
-  // object doing the actual work
 
+  /// results
   Results results_;
-  // results
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/tests/Alt_Mapping/driver.cpp b/tests/Alt_Mapping/driver.cpp
index 65a399de294..5632196412c 100644
--- a/tests/Alt_Mapping/driver.cpp
+++ b/tests/Alt_Mapping/driver.cpp
@@ -1,17 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    driver.cpp
-//
-// = DESCRIPTION
-//    Driver program
-//
-// = AUTHORS
-//      Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    driver.cpp
+ *
+ *  $Id$
+ *
+ *  Driver program
+ *
+ *
+ *  @author   Jeff Parsons
+ */
+//=============================================================================
+
 
 #include "client.h"
 #include "driver.h"
@@ -130,7 +130,7 @@ Driver::run (void)
               new Test_Unbounded_String);
               
         retstatus = client->run_sii_test ();
-        
+
         delete client;
       }
       break;
@@ -142,9 +142,9 @@ Driver::run (void)
               this->orb_.in (),
               this->objref_.in (),
               new Test_Unbounded_Struct_Sequence);
-                                                   
+
         retstatus = client->run_sii_test ();
-        
+
         delete client;
       }
       break;
diff --git a/tests/Alt_Mapping/driver.h b/tests/Alt_Mapping/driver.h
index 0b670df7541..e20e146ca7d 100644
--- a/tests/Alt_Mapping/driver.h
+++ b/tests/Alt_Mapping/driver.h
@@ -1,21 +1,17 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    driver.h
-//
-// = DESCRIPTION
-//    Header file for the driver program. The driver is a singleton.
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    driver.h
+ *
+ *  $Id$
+ *
+ *  Header file for the driver program. The driver is a singleton.
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef DRIVER_H
 #define DRIVER_H
@@ -23,30 +19,32 @@
 #include "options.h"
 #include "alt_mappingC.h"
 
+/**
+ * @class Driver
+ *
+ * @brief Driver
+ *
+ * Driver program for the client
+ */
 class Driver
 {
-  // = TITLE
-  //    Driver
-  //
-  // = DESCRIPTION
-  //    Driver program for the client
 public:
   // = Constructor and destructor.
   Driver (void);
   ~Driver (void);
 
+  /// Initialize the driver object
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the driver object
 
+  /// Execute client example code.
   int run (void);
-  // Execute client example code.
 
 private:
+  /// underlying ORB (we do not own it)
   CORBA::ORB_var orb_;
-  // underlying ORB (we do not own it)
 
+  /// object reference (we do not own it)
   Alt_Mapping_var objref_;
-  // object reference (we do not own it)
 };
 
 #endif /* !defined */
diff --git a/tests/Alt_Mapping/helper.cpp b/tests/Alt_Mapping/helper.cpp
index b6484a8e860..e66b489e915 100644
--- a/tests/Alt_Mapping/helper.cpp
+++ b/tests/Alt_Mapping/helper.cpp
@@ -1,18 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    helper.cpp
-//
-// = DESCRIPTION
-//    Defines a helper class that can generate values for the parameters used
-//    for the Alt_Mapping example
-//
-// = AUTHORS
-//    Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    helper.cpp
+ *
+ *  $Id$
+ *
+ *  Defines a helper class that can generate values for the parameters used
+ *  for the Alt_Mapping example
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "ace/OS_NS_ctype.h"
diff --git a/tests/Alt_Mapping/helper.h b/tests/Alt_Mapping/helper.h
index 8ef8cc3bf99..62730d343e6 100644
--- a/tests/Alt_Mapping/helper.h
+++ b/tests/Alt_Mapping/helper.h
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    helper.h
-//
-// = DESCRIPTION
-//    Defines a helper class that can generate values for the parameters used
-//    for the Param_Test example
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    helper.h
+ *
+ *  $Id$
+ *
+ *  Defines a helper class that can generate values for the parameters used
+ *  for the Param_Test example
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef HELPER_H
 #define HELPER_H
@@ -38,7 +35,7 @@ public:
   CORBA::WChar* gen_wstring (void);
   CORBA::WChar* gen_wstring (int maxlength);
   const Alt_Mapping::Fixed_Struct gen_fixed_struct (void);
-  
+
  private:
   Alt_Mapping::Fixed_Struct fixed_struct_;
 };
diff --git a/tests/Alt_Mapping/options.cpp b/tests/Alt_Mapping/options.cpp
index a596d929555..ea92667f54e 100644
--- a/tests/Alt_Mapping/options.cpp
+++ b/tests/Alt_Mapping/options.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// -*- C++ -*-
 
 // ============================================================================
 //
@@ -16,6 +16,7 @@
 //
 // ============================================================================
 
+
 #include "options.h"
 #include "tao/debug.h"
 #include "ace/Read_Buffer.h"
diff --git a/tests/Alt_Mapping/options.h b/tests/Alt_Mapping/options.h
index 8002cafc481..30c882358bc 100644
--- a/tests/Alt_Mapping/options.h
+++ b/tests/Alt_Mapping/options.h
@@ -1,21 +1,17 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    options.h
-//
-// = DESCRIPTION
-//    Options for the Param_Test application
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    options.h
+ *
+ *  $Id$
+ *
+ *  Options for the Param_Test application
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef OPTIONS_H
 #define OPTIONS_H
@@ -51,54 +47,54 @@ public:
     DII
   };
 
+  /// constructor
   Options (void);
-  // constructor
 
+  /// destructor
   ~Options (void);
-  // destructor
 
+  /// Parses the arguments passed on the command line.
   int parse_args (int argc, ACE_TCHAR **argv);
-  // Parses the arguments passed on the command line.
 
+  /// return the IOR for the servant
   char const * param_test_ior (void) const;
-  // return the IOR for the servant
 
+  /// what test to run
   TEST_TYPE test_type (void);
-  // what test to run
 
+  /// whether to use SII or DII
   INVOKE_TYPE invoke_type (void);
-  // whether to use SII or DII
 
+  /// number of times to run the test
   CORBA::ULong loop_count (void);
-  // number of times to run the test
 
+  /// whether debug option is on or not
   CORBA::Boolean debug (void) const;
-  // whether debug option is on or not
 
+  /// If we should request the server to shutdown.
   CORBA::Boolean shutdown (void) const;
-  // If we should request the server to shutdown.
 
 private:
+  /// Function to read the servant IOR from a file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the servant IOR from a file.
 
+  /// IOR for the servant
   CORBA::String_var ior_;
-  // IOR for the servant
 
+  /// what test to run
   TEST_TYPE test_type_;
-  // what test to run
 
+  /// whether SII or DII
   INVOKE_TYPE invoke_type_;
-  // whether SII or DII
 
+  /// Number of times to do the "test_*" operations.
   CORBA::ULong loop_count_;
-  // Number of times to do the "test_*" operations.
 
+  /// debugging output values
   CORBA::Boolean debug_;
-  // debugging output values
 
+  /// server shutdown flag.
   CORBA::Boolean shutdown_;
-  // server shutdown flag.
 };
 
 typedef ACE_Singleton<Options, TAO_SYNCH_RECURSIVE_MUTEX> OPTIONS;
diff --git a/tests/Alt_Mapping/results.cpp b/tests/Alt_Mapping/results.cpp
index 56d38e2a92e..d196920829c 100644
--- a/tests/Alt_Mapping/results.cpp
+++ b/tests/Alt_Mapping/results.cpp
@@ -1,17 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    results.cpp
-//
-// = DESCRIPTION
-//    Printing the results
-//
-// = AUTHORS
-//    Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    results.cpp
+ *
+ *  $Id$
+ *
+ *  Printing the results
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
 
 #include "results.h"
 #include "tao/debug.h"
diff --git a/tests/Alt_Mapping/results.h b/tests/Alt_Mapping/results.h
index e04e26e5f3c..65c490debd4 100644
--- a/tests/Alt_Mapping/results.h
+++ b/tests/Alt_Mapping/results.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    results.h
-//
-// = DESCRIPTION
-//    Printing the results
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    results.h
+ *
+ *  $Id$
+ *
+ *  Printing the results
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef RESULTS_H
 #define RESULTS_H
@@ -38,51 +35,51 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 class Results
 {
 public:
+  /// ctor
   Results (void);
-  // ctor
 
+  /// destructor
   ~Results (void);
-  // destructor
 
+  /// prints the time stats
   void print_stats (void);
-  // prints the time stats
 
+  /// print the exception
   void print_exception (const char *call_name);
-  // print the exception
 
+  /// start timing
   void start_timer (void);
-  // start timing
 
+  /// stop timing
   void stop_timer (void);
-  // stop timing
 
+  /// return call count
   CORBA::ULong call_count (void);
-  // return call count
 
+  /// set the call count
   void call_count (CORBA::ULong);
-  // set the call count
 
+  /// return the error count
   CORBA::ULong error_count (void);
-  // return the error count
 
+  /// set error count
   void error_count (CORBA::ULong);
-  // set error count
 
+  /// set the number of times the test will be run
   void iterations (CORBA::ULong iters);
-  // set the number of times the test will be run
 
 private:
+  /// # of calls made to functions
   CORBA::ULong call_count_;
-  // # of calls made to functions
 
+  /// # of errors incurred in the lifetime of the application.
   CORBA::ULong error_count_;
-  // # of errors incurred in the lifetime of the application.
 
+  /// for timing the test
   ACE_Profile_Timer timer_;
-  // for timing the test
 
+  /// holds the elapsed time for each iteration
   ACE_Profile_Timer::ACE_Elapsed_Time *elapsed_time_;
-  // holds the elapsed time for each iteration
 };
 
 #endif /* RESULTS_H */
diff --git a/tests/Alt_Mapping/server.cpp b/tests/Alt_Mapping/server.cpp
index 4532a55a5cf..25135306105 100644
--- a/tests/Alt_Mapping/server.cpp
+++ b/tests/Alt_Mapping/server.cpp
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    server.cpp
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
 
 #include "alt_mapping_i.h"
 #include "tao/Codeset/Codeset.h"
@@ -146,7 +143,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       userex._tao_print_exception ("User Exception");
       return -1;
     }
-    
+
   /// Free resources.
   delete svnt;
 
diff --git a/tests/Alt_Mapping/tests.h b/tests/Alt_Mapping/tests.h
index 24df56f20bb..f240a50a308 100644
--- a/tests/Alt_Mapping/tests.h
+++ b/tests/Alt_Mapping/tests.h
@@ -1,17 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = FILENAME
-//    tests.h
-//
-// = DESCRIPTION
-//    All the test objects header files included here
-//
-// = AUTHORS
-//      Jeff Parsons
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    tests.h
+ *
+ *  $Id$
+ *
+ *  All the test objects header files included here
+ *
+ *
+ *  @author   Jeff Parsons
+ */
+//=============================================================================
+
 
 #ifndef TESTS_H
 #define TESTS_H
diff --git a/tests/Alt_Mapping/ub_string.cpp b/tests/Alt_Mapping/ub_string.cpp
index f37a20423fb..155114be13c 100644
--- a/tests/Alt_Mapping/ub_string.cpp
+++ b/tests/Alt_Mapping/ub_string.cpp
@@ -1,4 +1,3 @@
-// $Id$
 
 // ============================================================================
 //
@@ -16,6 +15,7 @@
 //
 // ============================================================================
 
+
 #include "helper.h"
 #include "ub_string.h"
 
@@ -47,7 +47,7 @@ Test_Unbounded_String::init_parameters (Alt_Mapping_ptr)
 
   this->in_ = gen->gen_string ();
   this->inout_ = this->in_.c_str ();
-  
+
   return 0;
 }
 
@@ -57,7 +57,7 @@ Test_Unbounded_String::reset_parameters (void)
   this->inout_ = this->in_.c_str ();
   this->out_.clear ();
   this->ret_.clear ();
-  
+
   return 0;
 }
 
@@ -76,7 +76,7 @@ Test_Unbounded_String::run_sii_test (Alt_Mapping_ptr objref)
     {
       ex._tao_print_exception ("Test_Unbounded_String::run_sii_test\n");
     }
-    
+
   return -1;
 }
 
@@ -87,7 +87,7 @@ Test_Unbounded_String::check_validity (void)
 
   std::string first_half = this->inout_.substr (0, len);
   std::string second_half = this->inout_.substr (len, len);
-  
+
   return (this->in_ == this->out_
           && this->in_ == this->ret_
           && this->inout_.length () == 2 * len
diff --git a/tests/Alt_Mapping/ub_string.h b/tests/Alt_Mapping/ub_string.h
index d61e2337155..274b434e70a 100644
--- a/tests/Alt_Mapping/ub_string.h
+++ b/tests/Alt_Mapping/ub_string.h
@@ -1,9 +1,8 @@
-// $Id$
 
 // ============================================================================
 //
 // = LIBRARY
-//    TAO/tests/Param_Test
+//    TAO/tests/Alt_Mapping
 //
 // = FILENAME
 //    unbounded_string.h
@@ -28,37 +27,37 @@
 class Test_Unbounded_String
 {
 public:
+  /// ctor
   Test_Unbounded_String (void);
-  // ctor
 
+  /// dtor
   ~Test_Unbounded_String (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Alt_Mapping_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Alt_Mapping_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
-  
+
   std::string in_;
   std::string inout_;
   std::string out_;
diff --git a/tests/Alt_Mapping/ub_struct_seq.cpp b/tests/Alt_Mapping/ub_struct_seq.cpp
index 946f29bbed3..87b1dcb498b 100644
--- a/tests/Alt_Mapping/ub_struct_seq.cpp
+++ b/tests/Alt_Mapping/ub_struct_seq.cpp
@@ -1,4 +1,3 @@
-// $Id$
 
 // ============================================================================
 //
@@ -17,6 +16,7 @@
 //
 // ============================================================================
 
+
 #include "helper.h"
 #include "ub_struct_seq.h"
 
@@ -54,7 +54,7 @@ Test_Unbounded_Struct_Sequence::init_parameters (Alt_Mapping_ptr)
   // set the length of the sequence
   this->in_.resize (len);
   this->inout_.resize (len);
-  
+
   // Now set each individual element.
   for (CORBA::ULong i = 0; i < this->in_.size (); i++)
     {
@@ -63,7 +63,7 @@ Test_Unbounded_Struct_Sequence::init_parameters (Alt_Mapping_ptr)
       this->in_[i] = gen->gen_fixed_struct ();
       this->inout_[i] = gen->gen_fixed_struct ();
     }
-    
+
   return 0;
 }
 
@@ -73,7 +73,7 @@ Test_Unbounded_Struct_Sequence::reset_parameters (void)
   this->inout_.clear ();
   this->out_.clear ();
   this->ret_.clear ();
-  
+
   return 0;
 }
 
@@ -134,15 +134,15 @@ Test_Unbounded_Struct_Sequence::compare (
 {
   ACE_CDR::ULong s1v = s1.capacity ();
   ACE_CDR::ULong s2v = s2.capacity ();
-  
+
   if (s1v != s2v)
     {
       return false;
     }
-     
+
   s1v = s1.size ();
-  s2v = s2.size ();   
-      
+  s2v = s2.size ();
+
   if (s1v != s2v)
     {
       return false;
@@ -157,9 +157,9 @@ Test_Unbounded_Struct_Sequence::compare (
           || vs1.c != vs2.c
           || vs1.s != vs2.s
           || vs1.o != vs2.o
-          || vs1.f != vs2.f
+          || !ACE::is_equal (vs1.f, vs2.f)
           || vs1.b != vs2.b
-          || vs1.d != vs2.d )
+          || !ACE::is_equal (vs1.d, vs2.d))
         return false;
     }
 
@@ -176,7 +176,7 @@ Test_Unbounded_Struct_Sequence::print_sequence (
               s.capacity (),
               s.size ()));
   ACE_DEBUG ((LM_DEBUG, "Elements -\n"));
-  
+
   for (CORBA::ULong i = 0; i < s.size (); i++)
     {
       const Alt_Mapping::Fixed_Struct& vs = s[i];
diff --git a/tests/Alt_Mapping/ub_struct_seq.h b/tests/Alt_Mapping/ub_struct_seq.h
index a85f78c7d5b..5d388e1fe66 100644
--- a/tests/Alt_Mapping/ub_struct_seq.h
+++ b/tests/Alt_Mapping/ub_struct_seq.h
@@ -1,4 +1,3 @@
-// $Id$
 
 // ============================================================================
 //
@@ -17,6 +16,7 @@
 //
 // ============================================================================
 
+
 #ifndef ALT_MAPPING_TEST_UNBOUNED_STRUCT_SEQUENCE_H
 #define ALT_MAPPING_TEST_UNBOUNED_STRUCT_SEQUENCE_H
 
@@ -29,37 +29,37 @@
 class Test_Unbounded_Struct_Sequence
 {
 public:
+  /// ctor
   Test_Unbounded_Struct_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_Unbounded_Struct_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Alt_Mapping_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Alt_Mapping_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
 protected:
+  /// compare
   CORBA::Boolean compare (const Alt_Mapping::StructSeq &s1,
                           const Alt_Mapping::StructSeq &s2);
-  // compare
 
+  /// print individual sequence
   void print_sequence (const Alt_Mapping::StructSeq &s);
-  // print individual sequence
 
 private:
   char *opname_;
diff --git a/tests/Any/Makefile.am b/tests/Any/Makefile.am
deleted file mode 100644
index 3f2d34af807..00000000000
--- a/tests/Any/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Recursive
-
diff --git a/tests/Any/Recursive/Hello.cpp b/tests/Any/Recursive/Hello.cpp
index eb2603dd591..46043d0d3ee 100644
--- a/tests/Any/Recursive/Hello.cpp
+++ b/tests/Any/Recursive/Hello.cpp
@@ -2,12 +2,6 @@
 
 #include "Hello.h"
 
-
-ACE_RCSID (Recursive,
-           Hello,
-           "$Id$")
-
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Any/Recursive/Makefile.am b/tests/Any/Recursive/Makefile.am
deleted file mode 100644
index 7621c59fd2d..00000000000
--- a/tests/Any/Recursive/Makefile.am
+++ /dev/null
@@ -1,143 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.RecursiveHello_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  NonRecursiveC.cpp \
-  NonRecursiveC.h \
-  NonRecursiveC.inl \
-  NonRecursiveS.cpp \
-  NonRecursiveS.h \
-  NonRecursiveS.inl
-
-CLEANFILES += \
-  NonRecursive-stamp \
-  NonRecursiveC.cpp \
-  NonRecursiveC.h \
-  NonRecursiveC.inl \
-  NonRecursiveS.cpp \
-  NonRecursiveS.h \
-  NonRecursiveS.inl
-
-NonRecursiveC.cpp NonRecursiveC.h NonRecursiveC.inl NonRecursiveS.cpp NonRecursiveS.h NonRecursiveS.inl: NonRecursive-stamp
-
-NonRecursive-stamp: $(srcdir)/NonRecursive.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/NonRecursive.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  NonRecursive.idl \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.RecursiveHello_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  NonRecursiveC.cpp \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.RecursiveHello_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  NonRecursiveC.cpp \
-  NonRecursiveS.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Any/Recursive/client.cpp b/tests/Any/Recursive/client.cpp
index 2f966550e93..24e41ef04df 100644
--- a/tests/Any/Recursive/client.cpp
+++ b/tests/Any/Recursive/client.cpp
@@ -9,12 +9,6 @@
 #include <algorithm>
 #include <functional>
 
-
-ACE_RCSID (Recursive,
-           client,
-           "$Id$")
-
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/tests/Any/Recursive/server.cpp b/tests/Any/Recursive/server.cpp
index c1d8bd1bb30..ab19d0fb0a7 100644
--- a/tests/Any/Recursive/server.cpp
+++ b/tests/Any/Recursive/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/BiDirectional/Makefile.am b/tests/BiDirectional/Makefile.am
deleted file mode 100644
index 2113bfae39e..00000000000
--- a/tests/BiDirectional/Makefile.am
+++ /dev/null
@@ -1,117 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.BiDirectional_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.BiDirectional_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.BiDirectional_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/BiDirectional/client.cpp b/tests/BiDirectional/client.cpp
index 96d755b73fe..b950587ff83 100644
--- a/tests/BiDirectional/client.cpp
+++ b/tests/BiDirectional/client.cpp
@@ -5,8 +5,6 @@
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(BiDirectional, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 void do_nothing (void)
@@ -35,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/BiDirectional/server.cpp b/tests/BiDirectional/server.cpp
index f573b1c6084..73dc9849790 100644
--- a/tests/BiDirectional/server.cpp
+++ b/tests/BiDirectional/server.cpp
@@ -6,8 +6,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(BiDirectional, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 int no_iterations = 10;
 
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/BiDirectional/test_i.cpp b/tests/BiDirectional/test_i.cpp
index 1759a635cfc..7f25ec3f471 100644
--- a/tests/BiDirectional/test_i.cpp
+++ b/tests/BiDirectional/test_i.cpp
@@ -11,8 +11,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(BiDirectional, test_i, "$Id$")
-
 void
 Callback_i::shutdown (void)
 {
diff --git a/tests/BiDirectional/test_i.h b/tests/BiDirectional/test_i.h
index cc4725dc141..3914ef78a3e 100644
--- a/tests/BiDirectional/test_i.h
+++ b/tests/BiDirectional/test_i.h
@@ -1,59 +1,58 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/BiDirectional
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_BIDIRECTIONAL_TEST_I_H
 #define TAO_BIDIRECTIONAL_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Callback_i
+ *
+ * @brief A callback object to the "client"
+ *
+ * To test that the server can call the client on the same
+ * connection that was established by the client
+ */
 class Callback_i : public POA_Callback
 {
-  // = TITLE
-  //   A callback object to the "client"
-  //
-  // = DESCRIPTION
-  //   To test that the server can call the client on the same
-  //   connection that was established by the client
-  //
 public:
+  /// ctor
   Callback_i (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// Safe way to shutdown
   void shutdown (void);
-  // Safe way to shutdown
 
+  /// The callback method
   void callback_method (void);
-  // The callback method
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 
 };
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback);
@@ -65,17 +64,17 @@ public:
   int call_client (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
+  /// Flag to indicate, whether we are ready for a remote call.
   int flag_;
-  // Flag to indicate, whether we are ready for a remote call.
 
+  /// Callback Object
   Callback_var callback_;
-  // Callback Object
 
+  /// Number of times the callback needs to be called
   int no_iterations_;
-  // Number of times the callback needs to be called
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/tests/BiDirectional_DelayedUpcall/Makefile.am b/tests/BiDirectional_DelayedUpcall/Makefile.am
deleted file mode 100644
index 4666df50125..00000000000
--- a/tests/BiDirectional_DelayedUpcall/Makefile.am
+++ /dev/null
@@ -1,117 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.BiDir_DelayedUpcall_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.BiDir_DelayedUpcall_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.BiDir_DelayedUpcall_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/BiDirectional_DelayedUpcall/client.cpp b/tests/BiDirectional_DelayedUpcall/client.cpp
index b93c837c726..63e24ba38f8 100644
--- a/tests/BiDirectional_DelayedUpcall/client.cpp
+++ b/tests/BiDirectional_DelayedUpcall/client.cpp
@@ -6,8 +6,6 @@
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(BiDirectional, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 void do_nothing (void)
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/BiDirectional_DelayedUpcall/server.cpp b/tests/BiDirectional_DelayedUpcall/server.cpp
index 08ee5eb5188..1bea3072543 100644
--- a/tests/BiDirectional_DelayedUpcall/server.cpp
+++ b/tests/BiDirectional_DelayedUpcall/server.cpp
@@ -6,8 +6,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(BiDirectional, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 int no_iterations = 10;
 
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/BiDirectional_DelayedUpcall/test_i.cpp b/tests/BiDirectional_DelayedUpcall/test_i.cpp
index c591ab2b419..df7de9fe6bd 100644
--- a/tests/BiDirectional_DelayedUpcall/test_i.cpp
+++ b/tests/BiDirectional_DelayedUpcall/test_i.cpp
@@ -11,8 +11,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$")
-
 void
 Callback_i::shutdown (void)
 {
diff --git a/tests/BiDirectional_DelayedUpcall/test_i.h b/tests/BiDirectional_DelayedUpcall/test_i.h
index ba1f46f4764..3a4bc82f063 100644
--- a/tests/BiDirectional_DelayedUpcall/test_i.h
+++ b/tests/BiDirectional_DelayedUpcall/test_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/BiDirectional
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_BIDIRECTIONAL_TEST_I_H
 #define TAO_BIDIRECTIONAL_TEST_I_H
@@ -19,43 +16,45 @@
 #include "testS.h"
 #include "ace/Event_Handler.h"
 
+/**
+ * @class Callback_i
+ *
+ * @brief A callback object to the "client"
+ *
+ * To test that the server can call the client on the same
+ * connection that was established by the client
+ */
 class Callback_i : public virtual POA_Callback
 {
-  // = TITLE
-  //   A callback object to the "client"
-  //
-  // = DESCRIPTION
-  //   To test that the server can call the client on the same
-  //   connection that was established by the client
-  //
 public:
+  /// ctor
   Callback_i (CORBA::ORB_ptr orb, Simple_Server_ptr srv);
-  // ctor
 
+  /// Safe way to shutdown
   void shutdown (void);
-  // Safe way to shutdown
 
+  /// The callback method
   void callback_method (void);
-  // The callback method
 
 private:
+  /// The orb
+  /// The server
   CORBA::ORB_var orb_;
-  // The orb
   Simple_Server_var server_;
-  // The server
 };
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public virtual POA_Simple_Server, public virtual ACE_Event_Handler
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback);
@@ -68,17 +67,17 @@ public:
                               const void *act = 0);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
+  /// Flag to indicate, whether we are ready for a remote call.
   int flag_;
-  // Flag to indicate, whether we are ready for a remote call.
 
+  /// Callback Object
   Callback_var callback_;
-  // Callback Object
 
+  /// Number of times the callback needs to be called
   int no_iterations_;
-  // Number of times the callback needs to be called
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/tests/BiDirectional_MultipleORB/Makefile.am b/tests/BiDirectional_MultipleORB/Makefile.am
deleted file mode 100644
index 99a47f9ef1d..00000000000
--- a/tests/BiDirectional_MultipleORB/Makefile.am
+++ /dev/null
@@ -1,49 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.destroy.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = destroy
-
-destroy_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-destroy_SOURCES = \
-  destroy.cpp
-
-destroy_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/BiDirectional_MultipleORB/destroy.cpp b/tests/BiDirectional_MultipleORB/destroy.cpp
index ed26ffa83ff..718576ac8a1 100644
--- a/tests/BiDirectional_MultipleORB/destroy.cpp
+++ b/tests/BiDirectional_MultipleORB/destroy.cpp
@@ -1,28 +1,24 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/BiDir_Multiple_ORB
-//
-// = FILENAME
-//     destroy.cpp
-//
-// = DESCRIPTION
-//     Modified ORB destruction test.
-//
-// = AUTHOR
-//     Andrew Schnable <Andrew.Schnable@veritas.com>
-//     Iliyan Jeliazkov <jeliazkov_i@ociweb.com>
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     destroy.cpp
+ *
+ *  $Id$
+ *
+ *   Modified ORB destruction test.
+ *
+ *
+ *  @author  Andrew Schnable <Andrew.Schnable@veritas.com>  Iliyan Jeliazkov <jeliazkov_i@ociweb.com>
+ */
+//=============================================================================
+
 
 #include "tao/corba.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 
-ACE_RCSID(BiDir_Multiple_ORB, destroy, "$Id$")
+
 
 int
 test_with_bidir_poa (int argc,
diff --git a/tests/BiDirectional_NestedUpcall/Makefile.am b/tests/BiDirectional_NestedUpcall/Makefile.am
deleted file mode 100644
index 7f77bb0bd2f..00000000000
--- a/tests/BiDirectional_NestedUpcall/Makefile.am
+++ /dev/null
@@ -1,117 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.BiDir_NestedUpcall_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.BiDir_NestedUpcall_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.BiDir_NestedUpcall_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/BiDirectional_NestedUpcall/client.cpp b/tests/BiDirectional_NestedUpcall/client.cpp
index 54f68876b18..3e74cbe5dc4 100644
--- a/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/tests/BiDirectional_NestedUpcall/client.cpp
@@ -6,8 +6,6 @@
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(BiDirectional, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 void do_nothing (void)
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/BiDirectional_NestedUpcall/server.cpp b/tests/BiDirectional_NestedUpcall/server.cpp
index 08ee5eb5188..1bea3072543 100644
--- a/tests/BiDirectional_NestedUpcall/server.cpp
+++ b/tests/BiDirectional_NestedUpcall/server.cpp
@@ -6,8 +6,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(BiDirectional, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 int no_iterations = 10;
 
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/BiDirectional_NestedUpcall/test_i.cpp b/tests/BiDirectional_NestedUpcall/test_i.cpp
index 776ec609487..91c174281c6 100644
--- a/tests/BiDirectional_NestedUpcall/test_i.cpp
+++ b/tests/BiDirectional_NestedUpcall/test_i.cpp
@@ -10,8 +10,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$")
-
 void
 Callback_i::shutdown (void)
 {
diff --git a/tests/BiDirectional_NestedUpcall/test_i.h b/tests/BiDirectional_NestedUpcall/test_i.h
index 41c91c52b59..7ae2ce17af0 100644
--- a/tests/BiDirectional_NestedUpcall/test_i.h
+++ b/tests/BiDirectional_NestedUpcall/test_i.h
@@ -1,58 +1,57 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/BiDirectional
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_BIDIRECTIONAL_TEST_I_H
 #define TAO_BIDIRECTIONAL_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Callback_i
+ *
+ * @brief A callback object to the "client"
+ *
+ * To test that the server can call the client on the same
+ * connection that was established by the client
+ */
 class Callback_i : public virtual POA_Callback
 {
-  // = TITLE
-  //   A callback object to the "client"
-  //
-  // = DESCRIPTION
-  //   To test that the server can call the client on the same
-  //   connection that was established by the client
-  //
 public:
+  /// ctor
   Callback_i (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// Safe way to shutdown
   void shutdown (void);
-  // Safe way to shutdown
 
+  /// The callback method
   void callback_method (void);
-  // The callback method
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 };
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public virtual POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback);
@@ -62,17 +61,17 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
+  /// Flag to indicate, whether we are ready for a remote call.
   int flag_;
-  // Flag to indicate, whether we are ready for a remote call.
 
+  /// Callback Object
   Callback_var callback_;
-  // Callback Object
 
+  /// Number of times the callback needs to be called
   int no_iterations_;
-  // Number of times the callback needs to be called
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/tests/Big_AMI/Makefile.am b/tests/Big_AMI/Makefile.am
deleted file mode 100644
index 3cee3c22109..00000000000
--- a/tests/Big_AMI/Makefile.am
+++ /dev/null
@@ -1,132 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Big_AMI_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-CLEANFILES = \
-  ami_test-stamp \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp
-
-ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ami_test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Big_AMI_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  client.cpp \
-  ami_test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Big_AMI_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  ami_test_i.cpp \
-  server.cpp \
-  ami_test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Big_AMI/ami_test_i.cpp b/tests/Big_AMI/ami_test_i.cpp
index 064960d0458..586617ba886 100644
--- a/tests/Big_AMI/ami_test_i.cpp
+++ b/tests/Big_AMI/ami_test_i.cpp
@@ -17,8 +17,6 @@
 #include "ami_test_i.h"
 #include "tao/debug.h"
 
-ACE_RCSID(AMI, ami_test_i, "$Id$")
-
 AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Big_AMI/client.cpp b/tests/Big_AMI/client.cpp
index 3bcdad99a27..7c26af0223d 100644
--- a/tests/Big_AMI/client.cpp
+++ b/tests/Big_AMI/client.cpp
@@ -17,10 +17,6 @@
 
 #include "ami_testS.h"
 
-ACE_RCSID (AMI,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int shutdown_flag = 0;
@@ -63,7 +59,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Big_AMI/server.cpp b/tests/Big_AMI/server.cpp
index 456eceb946e..18d23928d5c 100644
--- a/tests/Big_AMI/server.cpp
+++ b/tests/Big_AMI/server.cpp
@@ -19,8 +19,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(AMI, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -47,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Big_Oneways/Coordinator.cpp b/tests/Big_Oneways/Coordinator.cpp
index fcfcb5239d2..7447f0b25a5 100644
--- a/tests/Big_Oneways/Coordinator.cpp
+++ b/tests/Big_Oneways/Coordinator.cpp
@@ -3,8 +3,6 @@
 //
 #include "Coordinator.h"
 
-ACE_RCSID(Big_Oneways, Coordinator, "$Id$")
-
 Coordinator::Coordinator (CORBA::ULong peer_count)
   : peers_ (0)
   , peer_count_ (0)
@@ -56,6 +54,7 @@ Coordinator::shutdown_all_peers (void)
       try
         {
           (*i)->shutdown ();
+          (*i) = Test::Peer::_nil ();
         }
       catch (const CORBA::Exception& ex)
         {
diff --git a/tests/Big_Oneways/Makefile.am b/tests/Big_Oneways/Makefile.am
deleted file mode 100644
index 9340bd4596a..00000000000
--- a/tests/Big_Oneways/Makefile.am
+++ /dev/null
@@ -1,115 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Big_Oneways_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Big_Oneways_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Peer.cpp \
-  Session.cpp \
-  Session_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Peer.h \
-  Session.h \
-  Session_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Big_Oneways_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Coordinator.cpp \
-  Session_Control.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Coordinator.h \
-  Session_Control.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Big_Oneways/Peer.cpp b/tests/Big_Oneways/Peer.cpp
index 7a5db7a496d..b5bdeb94a7b 100644
--- a/tests/Big_Oneways/Peer.cpp
+++ b/tests/Big_Oneways/Peer.cpp
@@ -4,8 +4,6 @@
 #include "Peer.h"
 #include "Session.h"
 
-ACE_RCSID(Big_Oneways, Peer, "$Id$")
-
 Peer::Peer (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Big_Oneways/Session.cpp b/tests/Big_Oneways/Session.cpp
index 217a6415ea0..b4780b4bd54 100644
--- a/tests/Big_Oneways/Session.cpp
+++ b/tests/Big_Oneways/Session.cpp
@@ -4,8 +4,6 @@
 #include "Session.h"
 #include "tao/debug.h"
 
-ACE_RCSID(Big_Oneways, Session, "$Id$")
-
 Session::Session (Test::Session_Control_ptr control,
                   CORBA::ULong payload_size,
                   CORBA::ULong thread_count,
@@ -87,8 +85,6 @@ Session::svc (void)
       return -1;
     }
 
-  this->_remove_ref ();
-
   return 0;
 }
 
@@ -127,18 +123,9 @@ Session::start (const Test::Session_List &other_sessions)
 
     for (CORBA::ULong i = 0; i != this->thread_count_; ++i)
       {
-        // Increase the reference count because the new thread will have
-        // access to this object....
         try
           {
-            this->_add_ref ();
-
-            if (this->task_.activate (
-                    THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1)
-              {
-                this->_remove_ref ();
-              }
-            else
+            if (this->task_.activate (THR_NEW_LWP | THR_JOINABLE, 1, 1) != -1)
               {
                 this->running_ = 1;
                 this->active_thread_count_++;
@@ -247,5 +234,4 @@ Session::terminate (CORBA::Boolean success)
     {
       ex._tao_print_exception ("Session::terminate, ignored");
     }
-
 }
diff --git a/tests/Big_Oneways/Session_Control.cpp b/tests/Big_Oneways/Session_Control.cpp
index d0fab0de5fa..0ed54fbf36b 100644
--- a/tests/Big_Oneways/Session_Control.cpp
+++ b/tests/Big_Oneways/Session_Control.cpp
@@ -3,8 +3,6 @@
 //
 #include "Session_Control.h"
 
-ACE_RCSID(Big_Oneways, Session_Control, "$Id$")
-
 Session_Control::Session_Control (CORBA::ULong session_count)
   : session_count_ (session_count)
   , success_ (1)
diff --git a/tests/Big_Oneways/Session_Task.cpp b/tests/Big_Oneways/Session_Task.cpp
index bd992a66e5d..8c4a1efcb43 100644
--- a/tests/Big_Oneways/Session_Task.cpp
+++ b/tests/Big_Oneways/Session_Task.cpp
@@ -5,8 +5,6 @@
 #include "Session_Task.h"
 #include "Session.h"
 
-ACE_RCSID(Big_Oneways, Session_Task, "$Id$")
-
 Session_Task::Session_Task (Session *session)
   : session_ (session)
 {
diff --git a/tests/Big_Oneways/client.cpp b/tests/Big_Oneways/client.cpp
index 144048ee7c8..5902682fe98 100644
--- a/tests/Big_Oneways/client.cpp
+++ b/tests/Big_Oneways/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Thread_Manager.h"
 
-ACE_RCSID(Big_Oneways, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Big_Oneways/server.cpp b/tests/Big_Oneways/server.cpp
index e9c9f4d4c88..3d484feaa1a 100644
--- a/tests/Big_Oneways/server.cpp
+++ b/tests/Big_Oneways/server.cpp
@@ -6,8 +6,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Big_Oneways, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 CORBA::ULong peer_count    = 4;
 CORBA::ULong payload_size  = 1024;
@@ -56,7 +54,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -89,6 +87,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_NEW_RETURN (coordinator_impl,
                       Coordinator (peer_count),
                       1);
+      PortableServer::ServantBase_var coordinator_owner (coordinator_impl);
 
       PortableServer::ObjectId_var id =
         root_poa->activate_object (coordinator_impl);
@@ -136,6 +135,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_NEW_RETURN (session_control_impl,
                       Session_Control (peer_count),
                       1);
+      PortableServer::ServantBase_var session_control_owner (session_control_impl);
 
       PortableServer::ObjectId_var idu =
         root_poa->activate_object (session_control_impl);
diff --git a/tests/Big_Reply/Client_Task.cpp b/tests/Big_Reply/Client_Task.cpp
index 1cff6fff879..db9fda0680e 100644
--- a/tests/Big_Reply/Client_Task.cpp
+++ b/tests/Big_Reply/Client_Task.cpp
@@ -4,7 +4,7 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
+
 
 Client_Task::Client_Task (Test::Big_Reply_ptr reply_gen,
                           int event_count,
diff --git a/tests/Big_Reply/Makefile.am b/tests/Big_Reply/Makefile.am
deleted file mode 100644
index 1369b5ab7f4..00000000000
--- a/tests/Big_Reply/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Big_Reply_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Big_Reply_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Big_Reply_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Big_Reply_i.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Big_Reply_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Big_Reply/client.cpp b/tests/Big_Reply/client.cpp
index ff401da2ed4..f8e4d32b6d4 100644
--- a/tests/Big_Reply/client.cpp
+++ b/tests/Big_Reply/client.cpp
@@ -3,7 +3,7 @@
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Big_Reply, client, "$Id$")
+
 
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 bool server_shutdown = false;
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Big_Reply/server.cpp b/tests/Big_Reply/server.cpp
index f09af6d6c14..4db6e458dd1 100644
--- a/tests/Big_Reply/server.cpp
+++ b/tests/Big_Reply/server.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Task.h"
 
-ACE_RCSID(Big_Reply, server, "$Id$")
+
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
@@ -63,7 +63,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Big_Request_Muxing/Client_Task.cpp b/tests/Big_Request_Muxing/Client_Task.cpp
index 42c8f6df8dd..b1ace35723d 100644
--- a/tests/Big_Request_Muxing/Client_Task.cpp
+++ b/tests/Big_Request_Muxing/Client_Task.cpp
@@ -5,8 +5,6 @@
 #include "Client_Task.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(Big_Request_Muxing, Client_Task, "$Id$")
-
 namespace
 {
   const ACE_Time_Value TRANSIENT_HOLDOFF (0, 2000); // 2ms delay
diff --git a/tests/Big_Request_Muxing/Makefile.am b/tests/Big_Request_Muxing/Makefile.am
deleted file mode 100644
index 3872d7e0b86..00000000000
--- a/tests/Big_Request_Muxing/Makefile.am
+++ /dev/null
@@ -1,120 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Big_Request_Muxing_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Big_Request_Muxing_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Big_Request_Muxing_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Payload_Receiver.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Payload_Receiver.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Big_Request_Muxing/Payload_Receiver.cpp b/tests/Big_Request_Muxing/Payload_Receiver.cpp
index aebfcb2b16e..8b1de41178d 100644
--- a/tests/Big_Request_Muxing/Payload_Receiver.cpp
+++ b/tests/Big_Request_Muxing/Payload_Receiver.cpp
@@ -3,8 +3,6 @@
 //
 #include "Payload_Receiver.h"
 
-ACE_RCSID(Big_Request_Muxing, Payload_Receiver, "$Id$")
-
 Payload_Receiver::Payload_Receiver (void)
   : message_count_ (0)
   , maybe_lost_count_ (0)
diff --git a/tests/Big_Request_Muxing/client.cpp b/tests/Big_Request_Muxing/client.cpp
index 3056acf2311..cfc0343c2d4 100644
--- a/tests/Big_Request_Muxing/client.cpp
+++ b/tests/Big_Request_Muxing/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "tao/Messaging/Messaging.h"
 
-ACE_RCSID(Muxing, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 namespace
@@ -39,7 +37,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         argv [0]),
         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Big_Request_Muxing/server.cpp b/tests/Big_Request_Muxing/server.cpp
index 1385daa30ad..073a01cec6e 100644
--- a/tests/Big_Request_Muxing/server.cpp
+++ b/tests/Big_Request_Muxing/server.cpp
@@ -5,8 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID(Big_Request_Muxing, server, "$Id$")
-
 namespace
 {
   // defaults only
@@ -41,7 +39,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Big_Twoways/Coordinator.cpp b/tests/Big_Twoways/Coordinator.cpp
index fcfcb5239d2..2d258c15f71 100644
--- a/tests/Big_Twoways/Coordinator.cpp
+++ b/tests/Big_Twoways/Coordinator.cpp
@@ -3,8 +3,6 @@
 //
 #include "Coordinator.h"
 
-ACE_RCSID(Big_Oneways, Coordinator, "$Id$")
-
 Coordinator::Coordinator (CORBA::ULong peer_count)
   : peers_ (0)
   , peer_count_ (0)
diff --git a/tests/Big_Twoways/Makefile.am b/tests/Big_Twoways/Makefile.am
deleted file mode 100644
index 3b7ea85979e..00000000000
--- a/tests/Big_Twoways/Makefile.am
+++ /dev/null
@@ -1,115 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Big_Twoways_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Big_Twoways_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Peer.cpp \
-  Session.cpp \
-  Session_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Peer.h \
-  Session.h \
-  Session_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Big_Twoways_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Coordinator.cpp \
-  Session_Control.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Coordinator.h \
-  Session_Control.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Big_Twoways/Peer.cpp b/tests/Big_Twoways/Peer.cpp
index 77c338bdb63..d866b0dd7dc 100644
--- a/tests/Big_Twoways/Peer.cpp
+++ b/tests/Big_Twoways/Peer.cpp
@@ -4,8 +4,6 @@
 #include "Peer.h"
 #include "Session.h"
 
-ACE_RCSID(Big_Oneways, Peer, "$Id$")
-
 Peer::Peer (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Big_Twoways/Session.cpp b/tests/Big_Twoways/Session.cpp
index 9c90a5e0554..691d792eb70 100644
--- a/tests/Big_Twoways/Session.cpp
+++ b/tests/Big_Twoways/Session.cpp
@@ -4,8 +4,6 @@
 #include "Session.h"
 #include "tao/debug.h"
 
-ACE_RCSID(Big_Oneways, Session, "$Id$")
-
 Session::Session (Test::Session_Control_ptr control,
                   CORBA::ULong payload_size,
                   CORBA::ULong thread_count,
diff --git a/tests/Big_Twoways/Session_Control.cpp b/tests/Big_Twoways/Session_Control.cpp
index bd51595b39d..0f47ee16245 100644
--- a/tests/Big_Twoways/Session_Control.cpp
+++ b/tests/Big_Twoways/Session_Control.cpp
@@ -3,8 +3,6 @@
 //
 #include "Session_Control.h"
 
-ACE_RCSID(Big_Oneways, Session_Control, "$Id$")
-
 Session_Control::Session_Control (CORBA::ULong session_count)
   : session_count_ (session_count)
   , success_ (1)
diff --git a/tests/Big_Twoways/Session_Task.cpp b/tests/Big_Twoways/Session_Task.cpp
index bd992a66e5d..8c4a1efcb43 100644
--- a/tests/Big_Twoways/Session_Task.cpp
+++ b/tests/Big_Twoways/Session_Task.cpp
@@ -5,8 +5,6 @@
 #include "Session_Task.h"
 #include "Session.h"
 
-ACE_RCSID(Big_Oneways, Session_Task, "$Id$")
-
 Session_Task::Session_Task (Session *session)
   : session_ (session)
 {
diff --git a/tests/Big_Twoways/client.cpp b/tests/Big_Twoways/client.cpp
index 144048ee7c8..5902682fe98 100644
--- a/tests/Big_Twoways/client.cpp
+++ b/tests/Big_Twoways/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Thread_Manager.h"
 
-ACE_RCSID(Big_Oneways, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Big_Twoways/server.cpp b/tests/Big_Twoways/server.cpp
index a65ee6f0295..bad96d106f0 100644
--- a/tests/Big_Twoways/server.cpp
+++ b/tests/Big_Twoways/server.cpp
@@ -6,8 +6,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Big_Oneways, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 CORBA::ULong peer_count    = 4;
 CORBA::ULong payload_size  = 1024;
@@ -56,7 +54,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Blocking_Sync_None/Blocking_Sync_None.cpp b/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
index c6e032fb953..bd0704de43f 100644
--- a/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
+++ b/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
@@ -4,8 +4,6 @@
 #include "Blocking_Sync_None.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Blocking_Sync_None, Blocking_Sync_None, "$Id$")
-
 Blocking_Sync_None::Blocking_Sync_None (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Blocking_Sync_None/Makefile.am b/tests/Blocking_Sync_None/Makefile.am
deleted file mode 100644
index e46865fb4ac..00000000000
--- a/tests/Blocking_Sync_None/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Blocking_Sync_None_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Blocking_Sync_None_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Blocking_Sync_None.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Blocking_Sync_None_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Blocking_Sync_None.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Blocking_Sync_None.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Blocking_Sync_None/client.cpp b/tests/Blocking_Sync_None/client.cpp
index 1074d45fd53..0936113493e 100644
--- a/tests/Blocking_Sync_None/client.cpp
+++ b/tests/Blocking_Sync_None/client.cpp
@@ -6,8 +6,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID(Blocking_Sync_None, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int iterations = 1000;
 
@@ -38,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Blocking_Sync_None/server.cpp b/tests/Blocking_Sync_None/server.cpp
index 0ecb13b82fa..cc426f78414 100644
--- a/tests/Blocking_Sync_None/server.cpp
+++ b/tests/Blocking_Sync_None/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Blocking_Sync_None, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1020_Basic_Regression/Client_Task.cpp b/tests/Bug_1020_Basic_Regression/Client_Task.cpp
index f01893bc102..f2adcb00f22 100644
--- a/tests/Bug_1020_Basic_Regression/Client_Task.cpp
+++ b/tests/Bug_1020_Basic_Regression/Client_Task.cpp
@@ -1,11 +1,7 @@
-//
 // $Id$
-//
 
 #include "Client_Task.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_1020_Basic_Regression/Echo.cpp b/tests/Bug_1020_Basic_Regression/Echo.cpp
index 05cf417b3a0..038a43fa0e9 100644
--- a/tests/Bug_1020_Basic_Regression/Echo.cpp
+++ b/tests/Bug_1020_Basic_Regression/Echo.cpp
@@ -1,8 +1,8 @@
+// $Id$
+
 #include "Echo.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Bug_1269_Regression, Echo, "$Id$")
-
 Echo::Echo(CORBA::ORB_ptr orb,
            int abort_counter)
   : orb_(CORBA::ORB::_duplicate(orb))
diff --git a/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp b/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
index dc26aa8804e..00225da7ceb 100644
--- a/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
+++ b/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "Echo_Caller.h"
 #include "Server_Task.h"
 
-ACE_RCSID (Bug_1020_Basic_Regression,
-           Echo_Caller,
-           "$Id$")
-
 Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate(orb))
 {
diff --git a/tests/Bug_1020_Basic_Regression/Makefile.am b/tests/Bug_1020_Basic_Regression/Makefile.am
deleted file mode 100644
index b4bc15e4b3a..00000000000
--- a/tests/Bug_1020_Basic_Regression/Makefile.am
+++ /dev/null
@@ -1,125 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1020_Basic_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1020_Basic_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Echo.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Echo.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1020_Basic_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Echo_Caller.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Echo_Caller.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1020_Basic_Regression/Server_Task.cpp b/tests/Bug_1020_Basic_Regression/Server_Task.cpp
index e90fc608a61..c1b36af884d 100644
--- a/tests/Bug_1020_Basic_Regression/Server_Task.cpp
+++ b/tests/Bug_1020_Basic_Regression/Server_Task.cpp
@@ -1,10 +1,6 @@
-#include "Server_Task.h"
-
-
-ACE_RCSID (Bug_1020_Basic_Regression,
-           Server_Task,
-           "$Id$")
+// $Id$
 
+#include "Server_Task.h"
 
 Server_Task::Server_Task (Test::Echo_ptr echo,
                           size_t sz)
diff --git a/tests/Bug_1020_Basic_Regression/client.cpp b/tests/Bug_1020_Basic_Regression/client.cpp
index 0aa79ea4446..a681243525b 100644
--- a/tests/Bug_1020_Basic_Regression/client.cpp
+++ b/tests/Bug_1020_Basic_Regression/client.cpp
@@ -2,15 +2,10 @@
 
 #include "Echo.h"
 #include "Client_Task.h"
-#include "tao/Utils/Servant_Var.h"
 #include "ace/Get_Opt.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID (Bug_1020_Basic_Regression,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -35,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -91,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      TAO::Utils::Servant_Var<Echo> impl;
+      PortableServer::Servant_var<Echo> impl;
       {
         Echo * tmp;
         // ACE_NEW_RETURN is the worst possible way to handle
diff --git a/tests/Bug_1020_Basic_Regression/run_test.pl b/tests/Bug_1020_Basic_Regression/run_test.pl
index d5aa1704cab..47b125f6733 100755
--- a/tests/Bug_1020_Basic_Regression/run_test.pl
+++ b/tests/Bug_1020_Basic_Regression/run_test.pl
@@ -22,7 +22,7 @@ foreach $i (@ARGV) {
     if ($i eq '-quick') {
         $elapsed = 0;
         $max_running_time = 1;
-    } 
+    }
 }
 
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
diff --git a/tests/Bug_1020_Basic_Regression/server.cpp b/tests/Bug_1020_Basic_Regression/server.cpp
index 393cc836e81..5d2ccad9a2b 100644
--- a/tests/Bug_1020_Basic_Regression/server.cpp
+++ b/tests/Bug_1020_Basic_Regression/server.cpp
@@ -2,13 +2,8 @@
 
 #include "Echo_Caller.h"
 #include "tao/ORB_Core.h"
-#include "tao/Utils/Servant_Var.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_1020_Basic_Regression,
-          server,
-          "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -63,7 +58,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      TAO::Utils::Servant_Var<Echo_Caller> impl;
+      PortableServer::Servant_var<Echo_Caller> impl;
       {
         Echo_Caller * tmp;
         // ACE_NEW_RETURN is the worst possible way to handle
diff --git a/tests/Bug_1020_Regression/Echo.cpp b/tests/Bug_1020_Regression/Echo.cpp
index 17ffaf51fbf..ea5dd5ed121 100644
--- a/tests/Bug_1020_Regression/Echo.cpp
+++ b/tests/Bug_1020_Regression/Echo.cpp
@@ -8,7 +8,7 @@
  */
 #include "Echo.h"
 
-ACE_RCSID(Notify_Crash, Echo, "$Id$")
+
 
 Echo::Echo(CORBA::ORB_ptr orb)
   : orb_(CORBA::ORB::_duplicate(orb))
diff --git a/tests/Bug_1020_Regression/Echo_Callback.cpp b/tests/Bug_1020_Regression/Echo_Callback.cpp
index ef35acd35b9..e9de3d4e830 100644
--- a/tests/Bug_1020_Regression/Echo_Callback.cpp
+++ b/tests/Bug_1020_Regression/Echo_Callback.cpp
@@ -8,7 +8,7 @@
  */
 #include "Echo_Callback.h"
 
-ACE_RCSID(Notify_Crash, Echo_Callback, "$Id$")
+
 
 Echo_Callback::Echo_Callback()
 {
diff --git a/tests/Bug_1020_Regression/Makefile.am b/tests/Bug_1020_Regression/Makefile.am
deleted file mode 100644
index 73d3e961b8f..00000000000
--- a/tests/Bug_1020_Regression/Makefile.am
+++ /dev/null
@@ -1,127 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1020_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1020_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Echo.cpp \
-  ORB_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Echo.h \
-  ORB_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1020_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ORB_Task.cpp \
-  Server_Task.cpp \
-  Server_i.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  ORB_Task.h \
-  Server_Task.h \
-  Server_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1020_Regression/ORB_Task.cpp b/tests/Bug_1020_Regression/ORB_Task.cpp
index c2645f8354e..0c26681b550 100644
--- a/tests/Bug_1020_Regression/ORB_Task.cpp
+++ b/tests/Bug_1020_Regression/ORB_Task.cpp
@@ -9,7 +9,7 @@
 #include "ORB_Task.h"
 #include "tao/Environment.h"
 
-ACE_RCSID(Bug_1230_Regression, ORB_Task, "$Id$")
+
 
 ORB_Task::ORB_Task(CORBA::ORB_ptr orb)
   : orb_(CORBA::ORB::_duplicate(orb))
diff --git a/tests/Bug_1020_Regression/Server_Task.cpp b/tests/Bug_1020_Regression/Server_Task.cpp
index a89ac08487a..51e4a5ad48d 100644
--- a/tests/Bug_1020_Regression/Server_Task.cpp
+++ b/tests/Bug_1020_Regression/Server_Task.cpp
@@ -8,7 +8,7 @@
  */
 #include "Server_Task.h"
 
-ACE_RCSID(Bug_1230_Regression, Server_Task, "$Id$")
+
 
 Server_Task::Server_Task(Test::Echo_ptr echo)
   : echo_(Test::Echo::_duplicate(echo))
diff --git a/tests/Bug_1020_Regression/Server_i.cpp b/tests/Bug_1020_Regression/Server_i.cpp
index b8d26e2843a..7ba4adf2e3e 100644
--- a/tests/Bug_1020_Regression/Server_i.cpp
+++ b/tests/Bug_1020_Regression/Server_i.cpp
@@ -1,9 +1,8 @@
+// $Id$
+
 #include "Server_i.h"
 #include "Server_Task.h"
 
-ACE_RCSID (Bug_1230_Regression,
-           Server, "$Id$")
-
 Server::Server(CORBA::ORB_ptr orb)
   : orb_(CORBA::ORB::_duplicate(orb))
 {
diff --git a/tests/Bug_1020_Regression/client.cpp b/tests/Bug_1020_Regression/client.cpp
index e3096eb4c3b..770c576efd9 100644
--- a/tests/Bug_1020_Regression/client.cpp
+++ b/tests/Bug_1020_Regression/client.cpp
@@ -4,13 +4,10 @@
 #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"
 #include "ace/Reactor.h"
 
-ACE_RCSID(Bug_1230_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -73,7 +70,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      TAO::Utils::Servant_Var<Echo> impl;
+      PortableServer::Servant_var<Echo> impl;
       {
         Echo * tmp = 0;
         // ACE_NEW_RETURN is the worst possible way to handle
@@ -165,7 +162,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1020_Regression/server.cpp b/tests/Bug_1020_Regression/server.cpp
index c668c137df4..98c44f068bb 100644
--- a/tests/Bug_1020_Regression/server.cpp
+++ b/tests/Bug_1020_Regression/server.cpp
@@ -3,14 +3,9 @@
 #include "Server_i.h"
 #include "ORB_Task.h"
 #include "tao/Messaging/Messaging.h"
-#include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Bug_1230_Regression,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 #if defined (ACE_OPENVMS)
@@ -53,7 +48,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      TAO::Utils::Servant_Var<Server> impl;
+      PortableServer::Servant_var<Server> impl;
       {
         Server * tmp;
         // ACE_NEW_RETURN is the worst possible way to handle
@@ -131,6 +126,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/tests/Bug_1254_Regression/BlobServer.cpp b/tests/Bug_1254_Regression/BlobServer.cpp
index 419ad646a44..c2c1d06aea0 100644
--- a/tests/Bug_1254_Regression/BlobServer.cpp
+++ b/tests/Bug_1254_Regression/BlobServer.cpp
@@ -3,8 +3,6 @@
 //
 #include "BlobServer.h"
 
-ACE_RCSID(BlobServerImpl, BlobServerImpl, "$Id$")
-
 BlobServerImpl::BlobServerImpl (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_1254_Regression/Bug_1254_Regression.mpc b/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
index 2847b187410..1a629aa8dcf 100644
--- a/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
+++ b/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project(*idl): taoidldefaults {
-  idlflags += -Sa -St
   IDL_Files {
     test.idl
   }
diff --git a/tests/Bug_1254_Regression/Makefile.am b/tests/Bug_1254_Regression/Makefile.am
deleted file mode 100644
index f1a03337c11..00000000000
--- a/tests/Bug_1254_Regression/Makefile.am
+++ /dev/null
@@ -1,108 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1254_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_1254_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  BlobServer.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1254_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  BlobServer.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  BlobServer.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_1254_Regression/client.cpp b/tests/Bug_1254_Regression/client.cpp
index 0da8e0bf326..d658ef4b1ce 100644
--- a/tests/Bug_1254_Regression/client.cpp
+++ b/tests/Bug_1254_Regression/client.cpp
@@ -1,8 +1,8 @@
+// $Id$
+
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
@@ -27,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1254_Regression/server.cpp b/tests/Bug_1254_Regression/server.cpp
index e69ea65aaa5..6b8406adf8d 100644
--- a/tests/Bug_1254_Regression/server.cpp
+++ b/tests/Bug_1254_Regression/server.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "BlobServer.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (BlobServer,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1269_Regression/Echo.cpp b/tests/Bug_1269_Regression/Echo.cpp
index d64dae69dce..364d723fd8e 100644
--- a/tests/Bug_1269_Regression/Echo.cpp
+++ b/tests/Bug_1269_Regression/Echo.cpp
@@ -9,8 +9,6 @@
 #include "Echo.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Bug_1269_Regression, Echo, "$Id$")
-
 Echo::Echo(CORBA::ORB_ptr orb,
            int abort_counter)
   : orb_(CORBA::ORB::_duplicate(orb))
diff --git a/tests/Bug_1269_Regression/Echo_Caller.cpp b/tests/Bug_1269_Regression/Echo_Caller.cpp
index 1bc987dda57..1520b6d40a7 100644
--- a/tests/Bug_1269_Regression/Echo_Caller.cpp
+++ b/tests/Bug_1269_Regression/Echo_Caller.cpp
@@ -10,8 +10,6 @@
 #include "Server_Timer.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Bug_1269_Regression, Echo_Caller, "$Id$")
-
 Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb)
   : orb_(CORBA::ORB::_duplicate(orb))
 {
diff --git a/tests/Bug_1269_Regression/Makefile.am b/tests/Bug_1269_Regression/Makefile.am
deleted file mode 100644
index 84cdea41184..00000000000
--- a/tests/Bug_1269_Regression/Makefile.am
+++ /dev/null
@@ -1,123 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1269_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1269_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Echo.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Echo.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1269_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Echo_Caller.cpp \
-  Server_Timer.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Echo_Caller.h \
-  Server_Timer.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1269_Regression/Server_Timer.cpp b/tests/Bug_1269_Regression/Server_Timer.cpp
index 7804f97eb1e..7d8d82cb28d 100644
--- a/tests/Bug_1269_Regression/Server_Timer.cpp
+++ b/tests/Bug_1269_Regression/Server_Timer.cpp
@@ -10,8 +10,6 @@
 #include "ace/Reactor.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Bug_1269_Regression, Server_Timer, "$Id$")
-
 Server_Timer::Server_Timer(Test::Echo_ptr echo,
                            ACE_Reactor * reactor)
   : ACE_Event_Handler (reactor)
diff --git a/tests/Bug_1269_Regression/client.cpp b/tests/Bug_1269_Regression/client.cpp
index c74d1ffc44c..56ff66d4927 100644
--- a/tests/Bug_1269_Regression/client.cpp
+++ b/tests/Bug_1269_Regression/client.cpp
@@ -3,12 +3,9 @@
 #include "Echo.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"
 
-ACE_RCSID(Bug_1269_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 bool do_shutdown = false;
 
@@ -63,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      TAO::Utils::Servant_Var<Echo> impl;
+      PortableServer::Servant_var<Echo> impl;
       {
         Echo * tmp;
         // ACE_NEW_RETURN is the worst possible way to handle
@@ -152,6 +149,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/tests/Bug_1269_Regression/server.cpp b/tests/Bug_1269_Regression/server.cpp
index f1b41aeb66f..01bf0aa1ebe 100644
--- a/tests/Bug_1269_Regression/server.cpp
+++ b/tests/Bug_1269_Regression/server.cpp
@@ -2,12 +2,9 @@
 
 #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"
 
-ACE_RCSID(Bug_1269_Regression, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -41,7 +38,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      TAO::Utils::Servant_Var<Echo_Caller> impl;
+      PortableServer::Servant_var<Echo_Caller> impl;
       {
         Echo_Caller * tmp;
         // ACE_NEW_RETURN is the worst possible way to handle
@@ -116,6 +113,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/tests/Bug_1269_Regression/shutdown.cpp b/tests/Bug_1269_Regression/shutdown.cpp
index 7c1a549bec8..cf65eed282f 100644
--- a/tests/Bug_1269_Regression/shutdown.cpp
+++ b/tests/Bug_1269_Regression/shutdown.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_1269_Regression, shutdown, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -70,6 +68,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/tests/Bug_1270_Regression/Echo.cpp b/tests/Bug_1270_Regression/Echo.cpp
index 15a7a4c57b2..75c94693e1a 100644
--- a/tests/Bug_1270_Regression/Echo.cpp
+++ b/tests/Bug_1270_Regression/Echo.cpp
@@ -9,8 +9,6 @@
 #include "Echo.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Bug_1270_Regression, Echo, "$Id$")
-
 Echo::Echo(CORBA::ORB_ptr orb,
            int abort_counter)
   : orb_(CORBA::ORB::_duplicate(orb))
diff --git a/tests/Bug_1270_Regression/Echo_Caller.cpp b/tests/Bug_1270_Regression/Echo_Caller.cpp
index 1763f53b57d..4759fa55393 100644
--- a/tests/Bug_1270_Regression/Echo_Caller.cpp
+++ b/tests/Bug_1270_Regression/Echo_Caller.cpp
@@ -10,8 +10,6 @@
 #include "Server_Timer.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Bug_1270_Regression, Echo_Caller, "$Id$")
-
 Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb)
   : orb_(CORBA::ORB::_duplicate(orb))
 {
diff --git a/tests/Bug_1270_Regression/Makefile.am b/tests/Bug_1270_Regression/Makefile.am
deleted file mode 100644
index 39dae818999..00000000000
--- a/tests/Bug_1270_Regression/Makefile.am
+++ /dev/null
@@ -1,157 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1270_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1270_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Echo.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Echo.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1270_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Echo_Caller.cpp \
-  Server_Timer.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Echo_Caller.h \
-  Server_Timer.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1270_Regression_Shutdown.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += shutdown
-
-shutdown_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-shutdown_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  shutdown.cpp \
-  Echo.h \
-  Echo_Caller.h \
-  Server_Timer.h
-
-shutdown_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1270_Regression/Server_Timer.cpp b/tests/Bug_1270_Regression/Server_Timer.cpp
index 9890d7961e5..e75d5f6a2cd 100644
--- a/tests/Bug_1270_Regression/Server_Timer.cpp
+++ b/tests/Bug_1270_Regression/Server_Timer.cpp
@@ -10,8 +10,6 @@
 #include "ace/Reactor.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Bug_1270_Regression, Server_Timer, "$Id$")
-
 Server_Timer::Server_Timer(Test::Echo_ptr echo,
                            ACE_Reactor * reactor)
   : ACE_Event_Handler (reactor)
diff --git a/tests/Bug_1270_Regression/client.cpp b/tests/Bug_1270_Regression/client.cpp
index 00ebb73a9b0..3dda8c71a5a 100644
--- a/tests/Bug_1270_Regression/client.cpp
+++ b/tests/Bug_1270_Regression/client.cpp
@@ -3,13 +3,10 @@
 #include "Echo.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"
 #include "ace/Reactor.h"
 
-ACE_RCSID(Bug_1270_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -63,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      TAO::Utils::Servant_Var<Echo> impl;
+      PortableServer::ServantBase_var impl;
       {
         Echo * tmp;
         // ACE_NEW_RETURN is the worst possible way to handle
@@ -142,6 +139,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/tests/Bug_1270_Regression/server.cpp b/tests/Bug_1270_Regression/server.cpp
index 36b26f22b52..e2641efd61d 100644
--- a/tests/Bug_1270_Regression/server.cpp
+++ b/tests/Bug_1270_Regression/server.cpp
@@ -2,12 +2,9 @@
 
 #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"
 
-ACE_RCSID(Bug_1270_Regression, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -61,7 +58,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      TAO::Utils::Servant_Var<Echo_Caller> impl;
+      PortableServer::Servant_var<Echo_Caller> impl;
       {
         Echo_Caller * tmp;
         // ACE_NEW_RETURN is the worst possible way to handle
@@ -136,6 +133,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/tests/Bug_1270_Regression/shutdown.cpp b/tests/Bug_1270_Regression/shutdown.cpp
index 893d0e85ba4..f8b1987b6d0 100644
--- a/tests/Bug_1270_Regression/shutdown.cpp
+++ b/tests/Bug_1270_Regression/shutdown.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_1270_Regression, shutdown, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -70,6 +68,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/tests/Bug_1330_Regression/Makefile.am b/tests/Bug_1330_Regression/Makefile.am
deleted file mode 100644
index 50c3153c264..00000000000
--- a/tests/Bug_1330_Regression/Makefile.am
+++ /dev/null
@@ -1,107 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1330_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1330_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1330_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  server.cpp \
-  Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1330_Regression/client.cpp b/tests/Bug_1330_Regression/client.cpp
index d29f072a754..4a0ab7db26d 100644
--- a/tests/Bug_1330_Regression/client.cpp
+++ b/tests/Bug_1330_Regression/client.cpp
@@ -31,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1330_Regression/server.cpp b/tests/Bug_1330_Regression/server.cpp
index c9e54969898..1d586aa6046 100644
--- a/tests/Bug_1330_Regression/server.cpp
+++ b/tests/Bug_1330_Regression/server.cpp
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1361_Regression/Echo.cpp b/tests/Bug_1361_Regression/Echo.cpp
index bdfc3b0d967..b8035e33bf7 100644
--- a/tests/Bug_1361_Regression/Echo.cpp
+++ b/tests/Bug_1361_Regression/Echo.cpp
@@ -11,8 +11,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_signal.h"
 
-ACE_RCSID(Bug_1270_Regression, Echo, "$Id$")
-
 Echo::Echo(CORBA::ORB_ptr orb,
            int abort_counter)
   : orb_(CORBA::ORB::_duplicate(orb))
diff --git a/tests/Bug_1361_Regression/Echo_Caller.cpp b/tests/Bug_1361_Regression/Echo_Caller.cpp
index 452334f778a..fdde9dc70e6 100644
--- a/tests/Bug_1361_Regression/Echo_Caller.cpp
+++ b/tests/Bug_1361_Regression/Echo_Caller.cpp
@@ -10,8 +10,6 @@
 #include "tao/ORB_Core.h"
 #include "Server_Thread_Pool.h"
 
-ACE_RCSID(Bug_1270_Regression, Echo_Caller, "$Id$")
-
 Echo_Caller::Echo_Caller(Thread_Pool *pool)
   : pool_(pool)
 {
diff --git a/tests/Bug_1361_Regression/Makefile.am b/tests/Bug_1361_Regression/Makefile.am
deleted file mode 100644
index ce933e9571a..00000000000
--- a/tests/Bug_1361_Regression/Makefile.am
+++ /dev/null
@@ -1,163 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1361_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1361_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Echo.cpp \
-  ORB_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Echo.h \
-  ORB_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1361_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Echo_Caller.cpp \
-  ORB_Task.cpp \
-  Server_Thread_Pool.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Echo_Caller.h \
-  ORB_Task.h \
-  Server_Thread_Pool.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1361_Regression_Shutdown.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += shutdown
-
-shutdown_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-shutdown_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  shutdown.cpp \
-  Echo.h \
-  Echo_Caller.h \
-  ORB_Task.h \
-  Server_Thread_Pool.h \
-  Server_Timer.h
-
-shutdown_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1361_Regression/ORB_Task.cpp b/tests/Bug_1361_Regression/ORB_Task.cpp
index e916f9b08f4..b54d49e1e3d 100644
--- a/tests/Bug_1361_Regression/ORB_Task.cpp
+++ b/tests/Bug_1361_Regression/ORB_Task.cpp
@@ -9,9 +9,6 @@
 #include "ORB_Task.h"
 #include "tao/Environment.h"
 
-ACE_RCSID (Bug_1361_Regression,
-           ORB_Task, "$Id$")
-
 ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
index 57cf2b62aa1..083131a18b4 100644
--- a/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
+++ b/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
@@ -45,7 +45,7 @@ Thread_Pool::shutdown (void)
                   i + 1));
       ACE_Message_Block *mb1;
       ACE_NEW_RETURN (mb1,
-                      ACE_Message_Block ((char*)0),
+                      ACE_Message_Block ((char*) Test::Echo::_nil ()),
                       -1);
       mb1->length (0);
 
@@ -67,7 +67,7 @@ Thread_Pool::put (Test::Echo_ptr echoptr)
 {
   char * charData = (char *) Test::Echo::_duplicate (echoptr);
 
-  ACE_Message_Block *mb;
+  ACE_Message_Block *mb = 0;
   ACE_NEW_RETURN(mb, ACE_Message_Block(charData), -1);
   return this->put (mb);
 }
@@ -95,7 +95,7 @@ Thread_Pool::svc (void)
 
   for (;; count++)
     {
-      ACE_Message_Block *mb;
+      ACE_Message_Block *mb = 0;
 
 #if 0
       ACE_DEBUG ((LM_DEBUG,
@@ -125,8 +125,7 @@ Thread_Pool::svc (void)
 
       Test::Echo_var echo = (Test::Echo_ptr)mb->base();
 
-      // Echo_var is responsible for deallocating this.
-      // mb->release ();
+      mb->release ();
 
       if (CORBA::is_nil(echo.in()))
         {
diff --git a/tests/Bug_1361_Regression/client.cpp b/tests/Bug_1361_Regression/client.cpp
index 57ae006f44f..bd9b8da4374 100644
--- a/tests/Bug_1361_Regression/client.cpp
+++ b/tests/Bug_1361_Regression/client.cpp
@@ -2,14 +2,11 @@
 
 #include "Echo.h"
 #include "ORB_Task.h"
-#include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
 #include "ace/OS_NS_signal.h"
 
-ACE_RCSID(Bug_1270_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int serverthreads = 4;
 
@@ -68,9 +65,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      TAO::Utils::Servant_Var<Echo> impl;
+      PortableServer::ServantBase_var impl;
       {
-        Echo * tmp;
+        Echo * tmp = 0;
         // ACE_NEW_RETURN is the worst possible way to handle
         // exceptions (think: what if the constructor allocates memory
         // and fails?), but I'm not in the mood to fight for a more
@@ -171,6 +168,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/tests/Bug_1361_Regression/run_test.pl b/tests/Bug_1361_Regression/run_test.pl
index 8c91f3676f5..8f9467135a1 100755
--- a/tests/Bug_1361_Regression/run_test.pl
+++ b/tests/Bug_1361_Regression/run_test.pl
@@ -18,7 +18,7 @@ foreach $i (@ARGV) {
         $debug_opts = '-ORBDebugLevel 10 -ORBVerboseLogging 1 '
                     . '-ORBLogFile client';
         $srv_debug  = '-ORBDebugLevel 5';
-    } 
+    }
 }
 
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
diff --git a/tests/Bug_1361_Regression/server.cpp b/tests/Bug_1361_Regression/server.cpp
index ae617a640da..7ca77b344f3 100644
--- a/tests/Bug_1361_Regression/server.cpp
+++ b/tests/Bug_1361_Regression/server.cpp
@@ -1,14 +1,11 @@
 // $Id$
 
 #include "Echo_Caller.h"
-#include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "Server_Thread_Pool.h"
 #include "ORB_Task.h"
 
-ACE_RCSID(Bug_1270_Regression, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -42,9 +39,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_Thread_Manager mymanager;
       Thread_Pool callback_pool (orb.in (), &mymanager, 10);
 
-      TAO::Utils::Servant_Var<Echo_Caller> impl;
+      PortableServer::ServantBase_var impl;
       {
-        Echo_Caller * tmp;
+        Echo_Caller * tmp = 0;
         // ACE_NEW_RETURN is the worst possible way to handle
         // exceptions (think: what if the constructor allocates memory
         // and fails?), but I'm not in the mood to fight for a more
@@ -125,6 +122,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/tests/Bug_1361_Regression/shutdown.cpp b/tests/Bug_1361_Regression/shutdown.cpp
index cdf5316cc59..a128eec709f 100644
--- a/tests/Bug_1361_Regression/shutdown.cpp
+++ b/tests/Bug_1361_Regression/shutdown.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_1361_Regression, shutdown, "$Id$")
-
 #if defined (ACE_OPENVMS)
 // need this to circumvent link error on OpenVMS
 // has to do with interference in template instantiations
@@ -80,6 +78,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/tests/Bug_1383_Regression/Makefile.am b/tests/Bug_1383_Regression/Makefile.am
deleted file mode 100644
index 9c5e7b846ea..00000000000
--- a/tests/Bug_1383_Regression/Makefile.am
+++ /dev/null
@@ -1,138 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1383_Regression_Idl.am
-
-BUILT_SOURCES = \
-  calleeC.cpp \
-  calleeC.h \
-  calleeC.inl \
-  calleeS.cpp \
-  calleeS.h \
-  calleeS.inl
-
-CLEANFILES = \
-  callee-stamp \
-  calleeC.cpp \
-  calleeC.h \
-  calleeC.inl \
-  calleeS.cpp \
-  calleeS.h \
-  calleeS.inl
-
-calleeC.cpp calleeC.h calleeC.inl calleeS.cpp calleeS.h calleeS.inl: callee-stamp
-
-callee-stamp: $(srcdir)/callee.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/callee.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  simpleC.cpp \
-  simpleC.h \
-  simpleC.inl \
-  simpleS.cpp \
-  simpleS.h \
-  simpleS.inl
-
-CLEANFILES += \
-  simple-stamp \
-  simpleC.cpp \
-  simpleC.h \
-  simpleC.inl \
-  simpleS.cpp \
-  simpleS.h \
-  simpleS.inl
-
-simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl: simple-stamp
-
-simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple.idl
-	@touch $@
-
-noinst_HEADERS = \
-  callee.idl \
-  simple.idl
-
-## Makefile.Bug_1383_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Callee_i.cpp \
-  SimpleClient.cpp \
-  calleeC.cpp \
-  calleeS.cpp \
-  simpleC.cpp \
-  Callee_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1383_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  SimpleServer.cpp \
-  calleeC.cpp \
-  simpleC.cpp \
-  simpleS.cpp \
-  simple_i.cpp \
-  simple_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1476_Regression/Client_Task.cpp b/tests/Bug_1476_Regression/Client_Task.cpp
index 12e18871ff5..48e0f8666bf 100644
--- a/tests/Bug_1476_Regression/Client_Task.cpp
+++ b/tests/Bug_1476_Regression/Client_Task.cpp
@@ -7,8 +7,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Bug_1476_Regression, Client_Task, "$Id$")
-
 Client_Task::Client_Task (CORBA::ORB_ptr orb,
                           Test::Sender_ptr reply_gen,
                           ACE_Thread_Manager *thr_mgr,
diff --git a/tests/Bug_1476_Regression/Makefile.am b/tests/Bug_1476_Regression/Makefile.am
deleted file mode 100644
index f911655e87a..00000000000
--- a/tests/Bug_1476_Regression/Makefile.am
+++ /dev/null
@@ -1,125 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1476_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1476_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Server_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1476_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Sender_i.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Sender_i.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1476_Regression/Sender_i.cpp b/tests/Bug_1476_Regression/Sender_i.cpp
index 142e4e6e2c5..ae31215c43d 100644
--- a/tests/Bug_1476_Regression/Sender_i.cpp
+++ b/tests/Bug_1476_Regression/Sender_i.cpp
@@ -1,6 +1,6 @@
-#include "Sender_i.h"
+// $Id$
 
-ACE_RCSID(Bug_1476_Regression, Sender_i, "$Id$")
+#include "Sender_i.h"
 
 Sender_i::Sender_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/tests/Bug_1476_Regression/Sender_i.h b/tests/Bug_1476_Regression/Sender_i.h
index d600e7a32e0..773e07812e1 100644
--- a/tests/Bug_1476_Regression/Sender_i.h
+++ b/tests/Bug_1476_Regression/Sender_i.h
@@ -42,7 +42,7 @@ public:
 
 private:
   /// Our local ORB ptr
-  CORBA::ORB_ptr orb_;
+  CORBA::ORB_var orb_;
 
   /// Number of active objects who are trying to connect
   CORBA::ULong active_objects_;
diff --git a/tests/Bug_1476_Regression/Server_Task.cpp b/tests/Bug_1476_Regression/Server_Task.cpp
index d52edc68000..3b8532d941d 100644
--- a/tests/Bug_1476_Regression/Server_Task.cpp
+++ b/tests/Bug_1476_Regression/Server_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Server_Task.h"
 
-ACE_RCSID(Bug_1476_Regression, Server_Task, "$Id$")
-
 Server_Task::Server_Task (CORBA::ORB_ptr orb,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr)
diff --git a/tests/Bug_1476_Regression/client.cpp b/tests/Bug_1476_Regression/client.cpp
index e285a9b0ebf..eb78e7d3824 100644
--- a/tests/Bug_1476_Regression/client.cpp
+++ b/tests/Bug_1476_Regression/client.cpp
@@ -11,8 +11,6 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(Bug_1476_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int number_of_oneways = 10;
 int number_of_client_tasks = 2;
@@ -46,7 +44,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1476_Regression/server.cpp b/tests/Bug_1476_Regression/server.cpp
index 5045536c573..0b24119f46e 100644
--- a/tests/Bug_1476_Regression/server.cpp
+++ b/tests/Bug_1476_Regression/server.cpp
@@ -5,8 +5,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Oneways_Invoking_Twoways, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 int number_of_oneways = 10;
 
@@ -34,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1476_Test/Makefile.am b/tests/Bug_1476_Test/Makefile.am
deleted file mode 100644
index 3a639e48146..00000000000
--- a/tests/Bug_1476_Test/Makefile.am
+++ /dev/null
@@ -1,81 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1476_Test_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.h \
-  HelloS.inl
-
-CLEANFILES = \
-  Hello-stamp \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.h \
-  HelloS.inl
-
-HelloC.cpp HelloC.h HelloC.inl HelloS.h HelloS.inl: Hello-stamp
-
-Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Hello.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  HelloC.cpp \
-  client.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.h \
-  HelloS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1476_Test/client.cpp b/tests/Bug_1476_Test/client.cpp
index 97d07727d6e..f803832567c 100644
--- a/tests/Bug_1476_Test/client.cpp
+++ b/tests/Bug_1476_Test/client.cpp
@@ -14,8 +14,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 bool level_obj = false;
 bool level_thread = false;
@@ -79,7 +77,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -96,61 +94,68 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       CORBA::Object_var tmp = orb->string_to_object(ior);
 
-      if (CORBA::is_nil (tmp.in ())) {
-        ACE_ERROR_RETURN ((LM_ERROR, "Invalid IOR.\n")
-        ,1);
-      }
+      if (CORBA::is_nil (tmp.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR, "Invalid IOR.\n")
+                            ,1);
+        }
 
       {
-  // Set the Synch Scopes
+        // Set the Synch Scopes
 
-  CORBA::Any scope_as_any;
+        CORBA::Any scope_as_any;
 
-  if (synch_none == true)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Applying SYNC_NONE.\n"));
-      scope_as_any <<= Messaging::SYNC_NONE;
-    }
-  else if (synch_delayed == true)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Applying SYNC_DELAYED_BUFFERING.\n"));
-      scope_as_any <<= TAO::SYNC_DELAYED_BUFFERING;
-    }
+        if (synch_none == true)
+          {
+            ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Applying SYNC_NONE.\n"));
+            scope_as_any <<= Messaging::SYNC_NONE;
+          }
+        else if (synch_delayed == true)
+          {
+            ACE_DEBUG ((LM_DEBUG,
+                        "(%P|%t) - Applying SYNC_DELAYED_BUFFERING.\n"));
+            scope_as_any <<= TAO::SYNC_DELAYED_BUFFERING;
+          }
 
-  CORBA::PolicyList policies (1);
-  policies.length (1);
-  policies[0] =
-    orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-            scope_as_any);
+        CORBA::PolicyList policies (1);
+        policies.length (1);
+        policies[0] =
+          orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
+                              scope_as_any);
 
-  if (level_thread == true)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Applying Synch Scope at thread level.\n"));
+        if (level_thread == true)
+          {
+            ACE_DEBUG ((LM_DEBUG,
+                        "(%P|%t) - Applying Synch Scope at thread level.\n"));
 
-      CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent");
-      CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in ());
+            CORBA::Object_var object =
+              orb->resolve_initial_references ("PolicyCurrent");
+            CORBA::PolicyCurrent_var policy_current =
+              CORBA::PolicyCurrent::_narrow (object.in ());
 
-      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
-    }
-  else if (level_orb == true)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Applying Synch Scope at orb level.\n"));
+            policy_current->set_policy_overrides (policies,
+                                                  CORBA::ADD_OVERRIDE);
+          }
+        else if (level_orb == true)
+          {
+            ACE_DEBUG ((LM_DEBUG,
+                        "(%P|%t) - Applying Synch Scope at orb level.\n"));
 
-      CORBA::Object_var obj =
-        orb->resolve_initial_references("ORBPolicyManager");
-      CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow(obj.in());
+            CORBA::Object_var obj =
+              orb->resolve_initial_references("ORBPolicyManager");
+            CORBA::PolicyManager_var policy_manager =
+              CORBA::PolicyManager::_narrow(obj.in());
 
-      policy_manager->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
-    }
-  else if (level_obj == true)
-  {
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Applying Synch Scope at Object level.\n"));
+            policy_manager->set_policy_overrides (policies,
+                                                  CORBA::ADD_OVERRIDE);
+          }
+        else if (level_obj == true)
+          {
+            ACE_DEBUG ((LM_DEBUG,
+                        "(%P|%t) - Applying Synch Scope at Object level.\n"));
 
-    tmp = tmp->_set_policy_overrides (policies, CORBA::SET_OVERRIDE);
-  }
+            tmp = tmp->_set_policy_overrides (policies, CORBA::SET_OVERRIDE);
+          }
 
         policies[0]->destroy ();
       }
@@ -158,12 +163,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       Test::Hello_var hello =
         Test::Hello::_narrow(tmp.in ());
 
-      if (CORBA::is_nil (hello.in ())) {
-        ACE_ERROR_RETURN ((LM_ERROR,
-         "Nil Test::Hello reference <%s>\n",
-         ior),
-        1);
-      }
+      if (CORBA::is_nil (hello.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Nil Test::Hello reference <%s>\n",
+                             ior),
+                            1);
+        }
 
       // If a blocking connection is initiated in the next step
       // the test will get an exception indicating test failure.
@@ -174,18 +180,21 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       TAO::Transport_Cache_Manager &tcm =
         hello->orb_core ()->lane_resources ().transport_cache ();
 
-      TAO_Transport *transport = 0;
-      TAO_Base_Transport_Property desc (hello->_stubobj ()->profile_in_use()->endpoint ());
+      TAO_Base_Transport_Property desc (hello->_stubobj ()->profile_in_use ()->endpoint ());
 
-      if (tcm.current_size() == 0) {
-        ACE_ERROR_RETURN ((LM_ERROR,
-         "The Transport Cache shouldn't be empty here.\n"),
-        1);
-      }
+      if (tcm.current_size() == 0)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+           "The Transport Cache shouldn't be empty here.\n"),
+          1);
+        }
 
       size_t busy_count = 0;
+      TAO_Transport *transport = 0;
       TAO::Transport_Cache_Manager::Find_Result find_result =
         tcm.find_transport (&desc, transport, busy_count);
+      // We don't need this transport any more. Release the ownership.
+      transport->remove_reference ();
 
       switch (find_result){
         case TAO::Transport_Cache_Manager::CACHE_FOUND_NONE:
@@ -221,7 +230,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           }
       }
 
-
       orb->destroy ();
     }
   catch (const CORBA::Exception &ex)
diff --git a/tests/Bug_1476_Test/run_test.pl b/tests/Bug_1476_Test/run_test.pl
index c3694f44c0f..fcf92cadd2e 100755
--- a/tests/Bug_1476_Test/run_test.pl
+++ b/tests/Bug_1476_Test/run_test.pl
@@ -29,7 +29,7 @@ my @levels = ("obj", "orb", "thread");
 
 foreach $synch (@synchs) {
     foreach $level (@levels) {
-        $CL->Arguments ("-ORBDebuglevel $debug_level -k file://$client_iorfile -s$synch -l$level");        
+        $CL->Arguments ("-ORBDebuglevel $debug_level -k file://$client_iorfile -s$synch -l$level");
 
         $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 285);
 
diff --git a/tests/Bug_1482_Regression/Client_Task.cpp b/tests/Bug_1482_Regression/Client_Task.cpp
index 822d5322d78..123a01f9dbb 100644
--- a/tests/Bug_1482_Regression/Client_Task.cpp
+++ b/tests/Bug_1482_Regression/Client_Task.cpp
@@ -5,8 +5,6 @@
 #include "Client_Task.h"
 #include "tao/Stub.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (Test::Hello_ptr receiver,
                           CORBA::ORB_ptr o,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/tests/Bug_1482_Regression/Hello.cpp b/tests/Bug_1482_Regression/Hello.cpp
index c08ad59c653..2d3482160b2 100644
--- a/tests/Bug_1482_Regression/Hello.cpp
+++ b/tests/Bug_1482_Regression/Hello.cpp
@@ -4,12 +4,6 @@
 #include "Hello.h"
 #include "ace/ACE.h"
 
-
-ACE_RCSID (Bug_1482_Regression,
-           Hello,
-           "$Id$")
-
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
     , mutex_ ()
@@ -36,9 +30,10 @@ Hello::next_prime (void)
 
       while (bc == 0)
         {
-          if (ACE::is_prime (++this->latest_prime_,
+          ++this->latest_prime_;
+          if (ACE::is_prime (this->latest_prime_,
                              2,
-                             this->latest_prime_/2) == 0)
+                             this->latest_prime_ / 2) == 0)
             bc = 1;
         }
     }
diff --git a/tests/Bug_1482_Regression/Makefile.am b/tests/Bug_1482_Regression/Makefile.am
deleted file mode 100644
index 612da503c32..00000000000
--- a/tests/Bug_1482_Regression/Makefile.am
+++ /dev/null
@@ -1,138 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1482_Regression_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_1482_Regression_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Reply_Handler.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Reply_Handler.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_1482_Regression_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1482_Regression/Server_Task.cpp b/tests/Bug_1482_Regression/Server_Task.cpp
index f3a3cfadc65..9447621cd73 100644
--- a/tests/Bug_1482_Regression/Server_Task.cpp
+++ b/tests/Bug_1482_Regression/Server_Task.cpp
@@ -3,8 +3,6 @@
 //
 #include "Server_Task.h"
 
-ACE_RCSID(Muxing, Server_Task, "$Id$")
-
 Server_Task::Server_Task (CORBA::ORB_ptr orb,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr)
diff --git a/tests/Bug_1482_Regression/client.cpp b/tests/Bug_1482_Regression/client.cpp
index bfec4f1e8e9..771eb400b34 100644
--- a/tests/Bug_1482_Regression/client.cpp
+++ b/tests/Bug_1482_Regression/client.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -31,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -71,7 +69,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       poa_manager->activate ();
 
-
       CORBA::Object_var object =
         orb->resolve_initial_references ("PolicyCurrent");
       CORBA::PolicyCurrent_var policy_current =
diff --git a/tests/Bug_1482_Regression/server.cpp b/tests/Bug_1482_Regression/server.cpp
index 87d6842dbd1..83582b0ecaa 100644
--- a/tests/Bug_1482_Regression/server.cpp
+++ b/tests/Bug_1482_Regression/server.cpp
@@ -3,10 +3,6 @@
 #include "Hello.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (LongUpcall_Crash_Test,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -31,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1495_Regression/Client_ORBInitializer.cpp b/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
index 9c1054f4ec9..fc0a4beaa9b 100644
--- a/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
+++ b/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
@@ -6,8 +6,6 @@
 #include "Client_ORBInitializer.h"
 #include "interceptors.h"
 
-ACE_RCSID (Service_Context_Manipulation, Client_ORBInitializer, "$Id$")
-
 Client_ORBInitializer::Client_ORBInitializer (void)
 {
 }
diff --git a/tests/Bug_1495_Regression/Makefile.am b/tests/Bug_1495_Regression/Makefile.am
deleted file mode 100644
index 05080588db5..00000000000
--- a/tests/Bug_1495_Regression/Makefile.am
+++ /dev/null
@@ -1,128 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1495_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_1495_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Server_Task.cpp \
-  Threaded_Client.cpp \
-  client_interceptor.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Client_Task.h \
-  Server_Task.h \
-  client_interceptor.h \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1495_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  Threaded_Server.cpp \
-  server_interceptor.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  server_interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Bug_1495_Regression/Server_ORBInitializer.cpp b/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
index 5c484b8b253..c49d26cc388 100644
--- a/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
+++ b/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
@@ -6,8 +6,6 @@
 #include "Server_ORBInitializer.h"
 #include "server_interceptor.h"
 
-ACE_RCSID (Service_Context_Manipulation, Server_ORBInitializer, "$Id$")
-
 Server_ORBInitializer::Server_ORBInitializer (void)
 {
 }
diff --git a/tests/Bug_1495_Regression/Threaded_Server.cpp b/tests/Bug_1495_Regression/Threaded_Server.cpp
index 3cc9f9e1099..d1546f48035 100644
--- a/tests/Bug_1495_Regression/Threaded_Server.cpp
+++ b/tests/Bug_1495_Regression/Threaded_Server.cpp
@@ -7,10 +7,6 @@
 #include "Server_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Service_Context_Manipulation,
-           server,
-           "$Id$" )
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 const ACE_TCHAR *ior_input_file = ACE_TEXT("file://thr_server.ior");
 
@@ -40,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1495_Regression/client_interceptor.cpp b/tests/Bug_1495_Regression/client_interceptor.cpp
index d3c8aee2c01..059bfe983b0 100644
--- a/tests/Bug_1495_Regression/client_interceptor.cpp
+++ b/tests/Bug_1495_Regression/client_interceptor.cpp
@@ -7,11 +7,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Thread.h"
 
-ACE_RCSID (Bug_1495_Regression_Test,
-           client_interceptor,
-           "$Id$")
-
-
 Echo_Client_Request_Interceptor::
 Echo_Client_Request_Interceptor (const char *id)
   : myname_ ("Echo_Client_Interceptor"),
diff --git a/tests/Bug_1495_Regression/run_test.pl b/tests/Bug_1495_Regression/run_test.pl
index bb82da99587..9c3ceb458d1 100755
--- a/tests/Bug_1495_Regression/run_test.pl
+++ b/tests/Bug_1495_Regression/run_test.pl
@@ -35,12 +35,12 @@ my $client_thrserverfile = $client->LocalFile ($thrserverfile);
 $server->DeleteFile($thrserverfile);
 $client->DeleteFile($thrserverfile);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorbase " .
                               "-i file://$server_thrserverfile");
 
-$CL = $client->CreateProcess ("client", 
+$CL = $client->CreateProcess ("client",
                               "-ORBdebuglevel $debug_level " .
                               "-o $client_thrserverfile " .
                               "-i $client_iorbase");
diff --git a/tests/Bug_1495_Regression/run_test_complex.pl b/tests/Bug_1495_Regression/run_test_complex.pl
index 006225e2c8a..a4edc3de408 100755
--- a/tests/Bug_1495_Regression/run_test_complex.pl
+++ b/tests/Bug_1495_Regression/run_test_complex.pl
@@ -46,17 +46,17 @@ my $middle_middleserverfile = $middle->LocalFile ($middleserverfile);
 $middle->DeleteFile($middleserverfile);
 $middle->DeleteFile($thrserverfile);
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_inputfile " .
                               "-i file://$server_middleserverfile");
 
-$CL = $client->CreateProcess ("client", 
+$CL = $client->CreateProcess ("client",
                               "-ORBdebuglevel $debug_level " .
                               "-i file://$client_inputfile " .
                               "-o $client_thrserverfile");
 
-$ML = $middle->CreateProcess ("server", 
+$ML = $middle->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-i file://$middle_thrserverfile " .
                               "-o $middle_middleserverfile");
diff --git a/tests/Bug_1495_Regression/server_interceptor.cpp b/tests/Bug_1495_Regression/server_interceptor.cpp
index 7d784a15fb6..7e3683a231e 100644
--- a/tests/Bug_1495_Regression/server_interceptor.cpp
+++ b/tests/Bug_1495_Regression/server_interceptor.cpp
@@ -7,11 +7,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Thread.h"
 
-ACE_RCSID (Bug_1495_Regression_Test,
-           server_interceptor,
-           "$Id$")
-
-
 Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
   : myname_ ("Echo_Server_Interceptor")
 {
diff --git a/tests/Bug_1495_Regression/test.idl b/tests/Bug_1495_Regression/test.idl
index 1f070aa6633..2c2673dac6d 100644
--- a/tests/Bug_1495_Regression/test.idl
+++ b/tests/Bug_1495_Regression/test.idl
@@ -1,20 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Bug_1495_Regression
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//   Simple IDL file to test regression of bug 1495
-//
-// = AUTHORS
-//   Will Otte <wotte@dre.vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    test.idl
+ *
+ *  $Id$
+ *
+ * Simple IDL file to test regression of bug 1495
+ *
+ *
+ *  @author Will Otte <wotte@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 module Bug1495_Regression
 {
diff --git a/tests/Bug_1495_Regression/tid_to_int.h b/tests/Bug_1495_Regression/tid_to_int.h
index 4b374663c38..9a1010188a4 100755
--- a/tests/Bug_1495_Regression/tid_to_int.h
+++ b/tests/Bug_1495_Regression/tid_to_int.h
@@ -38,7 +38,7 @@ namespace
 
       // We assume sizeof(thread_id_type) >= sizeof(ace_thread_id_type).
       return (thread_id_type) tmp;
-    }    
+    }
   };
 
   template<typename thread_id_type>
diff --git a/tests/Bug_1535_Regression/Makefile.am b/tests/Bug_1535_Regression/Makefile.am
deleted file mode 100644
index f5b78061ffe..00000000000
--- a/tests/Bug_1535_Regression/Makefile.am
+++ /dev/null
@@ -1,83 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.bug_1535_regression.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = bug_1535_regression
-
-bug_1535_regression_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-bug_1535_regression_SOURCES = \
-  Test.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  bug_1535_regression.cpp \
-  Test.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-bug_1535_regression_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1535_Regression/Test.cpp b/tests/Bug_1535_Regression/Test.cpp
index 00399f096ea..8ecec19473b 100644
--- a/tests/Bug_1535_Regression/Test.cpp
+++ b/tests/Bug_1535_Regression/Test.cpp
@@ -3,8 +3,6 @@
 //
 #include "Test.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (PortableServer::POA_ptr poa) :
   poa_ (PortableServer::POA::_duplicate (poa))
 {
diff --git a/tests/Bug_1535_Regression/bug_1535_regression.cpp b/tests/Bug_1535_Regression/bug_1535_regression.cpp
index d5147c7eb47..9b31706698f 100644
--- a/tests/Bug_1535_Regression/bug_1535_regression.cpp
+++ b/tests/Bug_1535_Regression/bug_1535_regression.cpp
@@ -4,11 +4,6 @@
 #include "tao/Utils/ORB_Destroyer.h"
 #include "tao/Utils/RIR_Narrow.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
-#include "tao/Utils/Servant_Var.h"
-
-ACE_RCSID (Bug_1535_Regression,
-           bug_1535_regression,
-           "$Id$")
 
 PortableServer::POA_ptr
 create_persistent_POA (PortableServer::POA_ptr parent,
diff --git a/tests/Bug_1551_Regression/Client_Task.cpp b/tests/Bug_1551_Regression/Client_Task.cpp
index a2eda92853d..9582472460d 100644
--- a/tests/Bug_1551_Regression/Client_Task.cpp
+++ b/tests/Bug_1551_Regression/Client_Task.cpp
@@ -1,11 +1,7 @@
-//
 // $Id$
-//
 
 #include "Client_Task.h"
 
-ACE_RCSID(Bug_1XXX_Regression, Client_Task, "$Id$")
-
 Client_Task::Client_Task (Test::Hello_ptr receiver,
                           CORBA::ORB_ptr orb,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/tests/Bug_1551_Regression/Client_Task.h b/tests/Bug_1551_Regression/Client_Task.h
index ff66a0e51a0..1027324cfce 100644
--- a/tests/Bug_1551_Regression/Client_Task.h
+++ b/tests/Bug_1551_Regression/Client_Task.h
@@ -9,7 +9,6 @@
 
 #include "TestC.h"
 #include "Reply_Handler.h"
-#include "tao/Utils/Servant_Var.h"
 #include "ace/Task.h"
 
 /// Implement a Task to run the experiments using multiple threads.
@@ -30,7 +29,7 @@ private:
   /// Reference to the test interface
   Test::Hello_var receiver_;
 
-  TAO::Utils::Servant_Var<Reply_Handler> handler_;
+  PortableServer::Servant_var <Reply_Handler> handler_;
 
   Test::AMI_HelloHandler_var handler_var_;
 
diff --git a/tests/Bug_1551_Regression/Hello.cpp b/tests/Bug_1551_Regression/Hello.cpp
index 7dc579f2fbc..55866f53bad 100644
--- a/tests/Bug_1551_Regression/Hello.cpp
+++ b/tests/Bug_1551_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 #include "Hello.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Bug_1XXX_Regression, Hello, "$Id$")
-
 Hello::Hello(
     CORBA::ORB_ptr orb,
     bool simulate_crashes)
diff --git a/tests/Bug_1551_Regression/Makefile.am b/tests/Bug_1551_Regression/Makefile.am
deleted file mode 100644
index 4c35fecaa96..00000000000
--- a/tests/Bug_1551_Regression/Makefile.am
+++ /dev/null
@@ -1,138 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1551_Regression_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_1551_Regression_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Reply_Handler.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Reply_Handler.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_1551_Regression_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1551_Regression/Reply_Handler.cpp b/tests/Bug_1551_Regression/Reply_Handler.cpp
index 88e34505a96..fb626dd6af9 100644
--- a/tests/Bug_1551_Regression/Reply_Handler.cpp
+++ b/tests/Bug_1551_Regression/Reply_Handler.cpp
@@ -1,11 +1,7 @@
-//
 // $Id$
-//
 
 #include "Reply_Handler.h"
 
-ACE_RCSID(Bug_1XXX_Regression, Reply_Handler, "$Id$")
-
 Reply_Handler::Reply_Handler (
     Test::Hello_ptr hello, CORBA::ORB_ptr orb)
   : counter_(1000)
diff --git a/tests/Bug_1551_Regression/Server_Task.cpp b/tests/Bug_1551_Regression/Server_Task.cpp
index 9f6f0783b85..246a93ce865 100644
--- a/tests/Bug_1551_Regression/Server_Task.cpp
+++ b/tests/Bug_1551_Regression/Server_Task.cpp
@@ -3,8 +3,6 @@
 //
 #include "Server_Task.h"
 
-ACE_RCSID(Bug_1XXX_Regression, Server_Task, "$Id$")
-
 Server_Task::Server_Task (CORBA::ORB_ptr orb,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr)
diff --git a/tests/Bug_1551_Regression/client.cpp b/tests/Bug_1551_Regression/client.cpp
index d604a62dd60..5e45e51c4aa 100644
--- a/tests/Bug_1551_Regression/client.cpp
+++ b/tests/Bug_1551_Regression/client.cpp
@@ -7,8 +7,6 @@
 #include "ace/Get_Opt.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int nthreads = 1;
@@ -39,7 +37,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1551_Regression/server.cpp b/tests/Bug_1551_Regression/server.cpp
index bafab201b6b..40e406e3ece 100644
--- a/tests/Bug_1551_Regression/server.cpp
+++ b/tests/Bug_1551_Regression/server.cpp
@@ -2,12 +2,9 @@
 
 #include "Hello.h"
 #include "Server_Task.h"
-#include "tao/Utils/Servant_Var.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID (Bug_1XXX_Regression, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 bool simulate_crashes = true;
@@ -46,7 +43,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                               argv [0]),
             -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -83,7 +80,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return -1;
 
-      TAO::Utils::Servant_Var<Hello> hello_impl(
+      PortableServer::ServantBase_var hello_impl(
           new Hello(orb.in(), simulate_crashes));
 
       PortableServer::ObjectId_var id =
diff --git a/tests/Bug_1568_Regression/Makefile.am b/tests/Bug_1568_Regression/Makefile.am
deleted file mode 100644
index f2426d03dd1..00000000000
--- a/tests/Bug_1568_Regression/Makefile.am
+++ /dev/null
@@ -1,123 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1568_Regression_Idl.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1568_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1568_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1568_Regression/client.cpp b/tests/Bug_1568_Regression/client.cpp
index 7aa1287510a..2f1d89ac396 100644
--- a/tests/Bug_1568_Regression/client.cpp
+++ b/tests/Bug_1568_Regression/client.cpp
@@ -10,8 +10,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_1568_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1568_Regression/run_test.pl b/tests/Bug_1568_Regression/run_test.pl
index 7eee3624c54..e20d93f2b50 100755
--- a/tests/Bug_1568_Regression/run_test.pl
+++ b/tests/Bug_1568_Regression/run_test.pl
@@ -14,7 +14,7 @@ $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";
diff --git a/tests/Bug_1568_Regression/server.cpp b/tests/Bug_1568_Regression/server.cpp
index 24bbf4fc48f..9e2a7e30078 100644
--- a/tests/Bug_1568_Regression/server.cpp
+++ b/tests/Bug_1568_Regression/server.cpp
@@ -7,14 +7,11 @@
  */
 #include "TestS.h"
 
-#include "tao/Utils/Servant_Var.h"
 #include "tao/corba.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
 
-ACE_RCSID(Bug_1568_Regression, server, "$Id$")
-
 /**
  * @class Simple_C
  *
@@ -101,7 +98,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -130,7 +127,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      TAO::Utils::Servant_Var<Simple_C> simple_c_impl(
+      PortableServer::Servant_var<Simple_C> simple_c_impl(
           new Simple_C(orb.in()));
 
       PortableServer::ObjectId_var id =
diff --git a/tests/Bug_1627_Regression/Makefile.am b/tests/Bug_1627_Regression/Makefile.am
deleted file mode 100644
index 0d96cf2adf9..00000000000
--- a/tests/Bug_1627_Regression/Makefile.am
+++ /dev/null
@@ -1,107 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1627_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1627_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1627_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  server.cpp \
-  Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1627_Regression/client.cpp b/tests/Bug_1627_Regression/client.cpp
index d29f072a754..4a0ab7db26d 100644
--- a/tests/Bug_1627_Regression/client.cpp
+++ b/tests/Bug_1627_Regression/client.cpp
@@ -31,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1627_Regression/server.cpp b/tests/Bug_1627_Regression/server.cpp
index 8acd5f2e037..08715c08c59 100644
--- a/tests/Bug_1627_Regression/server.cpp
+++ b/tests/Bug_1627_Regression/server.cpp
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1635_Regression/Makefile.am b/tests/Bug_1635_Regression/Makefile.am
deleted file mode 100644
index 3ba24415721..00000000000
--- a/tests/Bug_1635_Regression/Makefile.am
+++ /dev/null
@@ -1,44 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1635_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp
-
-client_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/tests/Bug_1636_Regression/Makefile.am b/tests/Bug_1636_Regression/Makefile.am
deleted file mode 100644
index 88d3c6e526f..00000000000
--- a/tests/Bug_1636_Regression/Makefile.am
+++ /dev/null
@@ -1,86 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.bug_1636_testclient.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1639_Regression/Makefile.am b/tests/Bug_1639_Regression/Makefile.am
deleted file mode 100644
index c708c64b3ba..00000000000
--- a/tests/Bug_1639_Regression/Makefile.am
+++ /dev/null
@@ -1,80 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1639_testclient.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  structC.cpp \
-  structC.h \
-  structC.inl \
-  structS.cpp \
-  structS.h \
-  structS.inl
-
-CLEANFILES = \
-  struct-stamp \
-  structC.cpp \
-  structC.h \
-  structC.inl \
-  structS.cpp \
-  structS.h \
-  structS.inl
-
-structC.cpp structC.h structC.inl structS.cpp structS.h structS.inl: struct-stamp
-
-struct-stamp: $(srcdir)/struct.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/struct.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  structC.cpp \
-  structS.cpp \
-  struct_client.cpp \
-  structC.h \
-  structC.inl \
-  structS.h \
-  structS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1670_Regression/Makefile.am b/tests/Bug_1670_Regression/Makefile.am
deleted file mode 100644
index b69b8887c6f..00000000000
--- a/tests/Bug_1670_Regression/Makefile.am
+++ /dev/null
@@ -1,123 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1670_Regression_Idl.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1670_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_1670_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1670_Regression/Test.idl b/tests/Bug_1670_Regression/Test.idl
index 2b43053cca3..de8c78c10db 100644
--- a/tests/Bug_1670_Regression/Test.idl
+++ b/tests/Bug_1670_Regression/Test.idl
@@ -14,7 +14,7 @@ module Foo
       long op1();
       long op2();
     };
-    
+
     interface B
     {
       long op3();
diff --git a/tests/Bug_1670_Regression/client.cpp b/tests/Bug_1670_Regression/client.cpp
index d4e7029ae21..42810d581f0 100644
--- a/tests/Bug_1670_Regression/client.cpp
+++ b/tests/Bug_1670_Regression/client.cpp
@@ -10,8 +10,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_1670_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1670_Regression/server.cpp b/tests/Bug_1670_Regression/server.cpp
index 6062d01fc6f..b8738e8c0ef 100644
--- a/tests/Bug_1670_Regression/server.cpp
+++ b/tests/Bug_1670_Regression/server.cpp
@@ -7,14 +7,11 @@
  */
 #include "TestS.h"
 
-#include "tao/Utils/Servant_Var.h"
 #include "tao/corba.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
 
-ACE_RCSID(Bug_1670_Regression, server, "$Id$")
-
 /**
  * @class Simple_C
  *
@@ -103,7 +100,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -132,7 +129,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      TAO::Utils::Servant_Var<Simple_C> simple_c_impl(
+      PortableServer::Servant_var<Simple_C> simple_c_impl(
           new Simple_C(orb.in()));
 
       PortableServer::ObjectId_var id =
diff --git a/tests/Bug_1676_Regression/Hello.cpp b/tests/Bug_1676_Regression/Hello.cpp
index d1c31b7ac8d..c0f0a801fd8 100644
--- a/tests/Bug_1676_Regression/Hello.cpp
+++ b/tests/Bug_1676_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_1676_Regression/Makefile.am b/tests/Bug_1676_Regression/Makefile.am
deleted file mode 100644
index a9af38597c4..00000000000
--- a/tests/Bug_1676_Regression/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1676_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_1676_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1676_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_1676_Regression/client.cpp b/tests/Bug_1676_Regression/client.cpp
index 12a6a238c74..9aafb92d591 100644
--- a/tests/Bug_1676_Regression/client.cpp
+++ b/tests/Bug_1676_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1676_Regression/server.cpp b/tests/Bug_1676_Regression/server.cpp
index c1d8bd1bb30..ab19d0fb0a7 100644
--- a/tests/Bug_1676_Regression/server.cpp
+++ b/tests/Bug_1676_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_1693_Test/Makefile.am b/tests/Bug_1693_Test/Makefile.am
deleted file mode 100644
index 808a07f09cc..00000000000
--- a/tests/Bug_1693_Test/Makefile.am
+++ /dev/null
@@ -1,75 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1693_Test_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1693_Test/client.cpp b/tests/Bug_1693_Test/client.cpp
index 6415ed9e0be..9a44fb1bbee 100644
--- a/tests/Bug_1693_Test/client.cpp
+++ b/tests/Bug_1693_Test/client.cpp
@@ -1,13 +1,10 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/CodecFactory/CodecFactory.h"
 #include "testC.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Codec,
-           client,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/Bug_1812_Regression/Makefile.am b/tests/Bug_1812_Regression/Makefile.am
deleted file mode 100644
index 5543c31438a..00000000000
--- a/tests/Bug_1812_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1812_Regession_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  test.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_1813_Regression/Makefile.am b/tests/Bug_1813_Regression/Makefile.am
deleted file mode 100644
index 129033377b7..00000000000
--- a/tests/Bug_1813_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1813_Regession_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  test.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_1869_Regression/Makefile.am b/tests/Bug_1869_Regression/Makefile.am
deleted file mode 100644
index 77ee0b67a4f..00000000000
--- a/tests/Bug_1869_Regression/Makefile.am
+++ /dev/null
@@ -1,130 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1869_Regression_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  AMIC.cpp \
-  AMIC.h \
-  AMIC.inl \
-  AMIS.cpp \
-  AMIS.h \
-  AMIS.inl
-
-CLEANFILES = \
-  AMI-stamp \
-  AMIC.cpp \
-  AMIC.h \
-  AMIC.inl \
-  AMIS.cpp \
-  AMIS.h \
-  AMIS.inl
-
-AMIC.cpp AMIC.h AMIC.inl AMIS.cpp AMIS.h AMIS.inl: AMI-stamp
-
-AMI-stamp: $(srcdir)/AMI.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/AMI.idl
-	@touch $@
-
-noinst_HEADERS = \
-  AMI.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_1869_Regression_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  AMIC.cpp \
-  AMIS.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_1869_Regression_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  AMIC.cpp \
-  AMIS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_1904_Regression/Makefile.am b/tests/Bug_1904_Regression/Makefile.am
deleted file mode 100644
index d36e536396c..00000000000
--- a/tests/Bug_1904_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  test.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2084_Regression/Client_Task.cpp b/tests/Bug_2084_Regression/Client_Task.cpp
index 6f909cab23f..8eaf4fdd0a6 100644
--- a/tests/Bug_2084_Regression/Client_Task.cpp
+++ b/tests/Bug_2084_Regression/Client_Task.cpp
@@ -8,10 +8,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/PortableServer/PortableServer.h"
 
-ACE_RCSID(Bug_2084_Regression,
-          Client_Task,
-          "$Id$")
-
 Client_Task::Client_Task (const ACE_TCHAR *ior,
                           CORBA::ORB_ptr corb,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/tests/Bug_2084_Regression/Collocated_Test.cpp b/tests/Bug_2084_Regression/Collocated_Test.cpp
index 1af0460353f..a08bd75a215 100644
--- a/tests/Bug_2084_Regression/Collocated_Test.cpp
+++ b/tests/Bug_2084_Regression/Collocated_Test.cpp
@@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         // This is a hack but that is okay!
         return 0;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2084_Regression/EventNode.cpp b/tests/Bug_2084_Regression/EventNode.cpp
index 8490764d777..518367b85cd 100644
--- a/tests/Bug_2084_Regression/EventNode.cpp
+++ b/tests/Bug_2084_Regression/EventNode.cpp
@@ -7,8 +7,6 @@
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
 
-ACE_RCSID(EventNode, EventNode, "$Id$")
-
 EventNode::EventNode (CORBA::ORB_ptr orb, ACE_thread_t thrid)
   : orb_ (CORBA::ORB::_duplicate (orb))
   , thr_id_ (thrid)
diff --git a/tests/Bug_2084_Regression/Hello.cpp b/tests/Bug_2084_Regression/Hello.cpp
index a374609b63a..c88af27ed68 100644
--- a/tests/Bug_2084_Regression/Hello.cpp
+++ b/tests/Bug_2084_Regression/Hello.cpp
@@ -7,8 +7,6 @@
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb,
               ACE_thread_t thrid)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/tests/Bug_2084_Regression/Makefile.am b/tests/Bug_2084_Regression/Makefile.am
deleted file mode 100644
index 7248a088a11..00000000000
--- a/tests/Bug_2084_Regression/Makefile.am
+++ /dev/null
@@ -1,87 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2084_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  EventNode.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  EventNode.h \
-  Hello.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl \
-  tid_to_int.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2084_Regression/Server_Task.cpp b/tests/Bug_2084_Regression/Server_Task.cpp
index a34c5c366e6..ed7fc335f0f 100644
--- a/tests/Bug_2084_Regression/Server_Task.cpp
+++ b/tests/Bug_2084_Regression/Server_Task.cpp
@@ -8,11 +8,6 @@
 #include "ace/Manual_Event.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Collocated_Test,
-          Server_Task,
-          "$Id$")
-
-
 Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
diff --git a/tests/Bug_2085_Regression/Makefile.am b/tests/Bug_2085_Regression/Makefile.am
deleted file mode 100644
index 41b8aa70983..00000000000
--- a/tests/Bug_2085_Regression/Makefile.am
+++ /dev/null
@@ -1,44 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2085_Regression.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Bug_2085_Regression.cpp
-
-client_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/tests/Bug_2119_Regression/Makefile.am b/tests/Bug_2119_Regression/Makefile.am
deleted file mode 100644
index 1c0f01c32de..00000000000
--- a/tests/Bug_2119_Regression/Makefile.am
+++ /dev/null
@@ -1,74 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.tao67_test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libtao67_test.la
-
-libtao67_test_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-libtao67_test_la_SOURCES = \
-  testC.cpp \
-  testS.cpp
-
-noinst_HEADERS = \
-  test.idl \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-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/tests/Bug_2122_Regression/Makefile.am b/tests/Bug_2122_Regression/Makefile.am
deleted file mode 100644
index ae3dcd0a80b..00000000000
--- a/tests/Bug_2122_Regression/Makefile.am
+++ /dev/null
@@ -1,76 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2122_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2122_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  test.cpp
-
-client_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/tests/Bug_2124_Regression/Makefile.am b/tests/Bug_2124_Regression/Makefile.am
deleted file mode 100644
index cf8e551344d..00000000000
--- a/tests/Bug_2124_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2124_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  test.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2124_Regression/Test.idl b/tests/Bug_2124_Regression/Test.idl
index 641ad61bb7b..4725a402aff 100644
--- a/tests/Bug_2124_Regression/Test.idl
+++ b/tests/Bug_2124_Regression/Test.idl
@@ -6,7 +6,7 @@
  */
 
 module Test
-{   
+{
    typedef string<10> MyString;
    typedef MyString OtherString;
 
diff --git a/tests/Bug_2126_Regression/Makefile.am b/tests/Bug_2126_Regression/Makefile.am
deleted file mode 100644
index 43339530507..00000000000
--- a/tests/Bug_2126_Regression/Makefile.am
+++ /dev/null
@@ -1,76 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2126_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  test.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-client_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/tests/Bug_2134_Regression/Makefile.am b/tests/Bug_2134_Regression/Makefile.am
deleted file mode 100644
index c2311c083ea..00000000000
--- a/tests/Bug_2134_Regression/Makefile.am
+++ /dev/null
@@ -1,85 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2134_Regression_Test.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-CLEANFILES = \
-  Hello-stamp \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp
-
-Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Hello.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  HelloC.cpp \
-  HelloS.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.h \
-  HelloS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2144_Regression/Makefile.am b/tests/Bug_2144_Regression/Makefile.am
deleted file mode 100644
index 9eec492db11..00000000000
--- a/tests/Bug_2144_Regression/Makefile.am
+++ /dev/null
@@ -1,75 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2144_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  test.cpp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2174_Regression/Makefile.am b/tests/Bug_2174_Regression/Makefile.am
deleted file mode 100644
index 33e3cccba47..00000000000
--- a/tests/Bug_2174_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2174_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_2174_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2174_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2174_Regression/client.cpp b/tests/Bug_2174_Regression/client.cpp
index b3162c7a9ef..803612e4698 100644
--- a/tests/Bug_2174_Regression/client.cpp
+++ b/tests/Bug_2174_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_2174_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 int min_timeout = 0;
 int max_timeout = 20;
@@ -31,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2174_Regression/server.cpp b/tests/Bug_2174_Regression/server.cpp
index 1dc791080b3..a3187bb35a1 100644
--- a/tests/Bug_2174_Regression/server.cpp
+++ b/tests/Bug_2174_Regression/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Bug_2174_Regression, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 bool remove_object = false;
 
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2174_Regression/test_i.cpp b/tests/Bug_2174_Regression/test_i.cpp
index ee0a7d02adc..99e084474fb 100644
--- a/tests/Bug_2174_Regression/test_i.cpp
+++ b/tests/Bug_2174_Regression/test_i.cpp
@@ -1,11 +1,8 @@
 // $Id$
 
 #include "test_i.h"
-
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Timeout, test_i, "$Id$")
-
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_2174_Regression/test_i.h b/tests/Bug_2174_Regression/test_i.h
index 8c102e3a1b7..eb3d07084a5 100644
--- a/tests/Bug_2174_Regression/test_i.h
+++ b/tests/Bug_2174_Regression/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Timeout
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_TIMEOUT_TEST_I_H
 #define TAO_TIMEOUT_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
@@ -36,8 +34,8 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #endif /* TAO_TIMEOUT_TEST_I_H */
diff --git a/tests/Bug_2183_Regression/Hello.cpp b/tests/Bug_2183_Regression/Hello.cpp
index ee93d6507bb..0f62f20b906 100644
--- a/tests/Bug_2183_Regression/Hello.cpp
+++ b/tests/Bug_2183_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "Hello.cpp,v 1.3 2002/01/29 20:21:07 okellogg Exp")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_2183_Regression/Makefile.am b/tests/Bug_2183_Regression/Makefile.am
deleted file mode 100644
index 7d777519a1a..00000000000
--- a/tests/Bug_2183_Regression/Makefile.am
+++ /dev/null
@@ -1,109 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2183_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2183_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2183_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2183_Regression/client.cpp b/tests/Bug_2183_Regression/client.cpp
index 55dae0a50f3..ff81b60ec4f 100644
--- a/tests/Bug_2183_Regression/client.cpp
+++ b/tests/Bug_2183_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2183_Regression/server.cpp b/tests/Bug_2183_Regression/server.cpp
index a2c3e497ce9..c0439be73f2 100644
--- a/tests/Bug_2183_Regression/server.cpp
+++ b/tests/Bug_2183_Regression/server.cpp
@@ -5,10 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID (Hello,
-           server,
-           "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2186_Regression/Hello.cpp b/tests/Bug_2186_Regression/Hello.cpp
index 1795e201f6a..0335cf3e142 100644
--- a/tests/Bug_2186_Regression/Hello.cpp
+++ b/tests/Bug_2186_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_2186_Regression/Makefile.am b/tests/Bug_2186_Regression/Makefile.am
deleted file mode 100644
index 9b0b4c7a58b..00000000000
--- a/tests/Bug_2186_Regression/Makefile.am
+++ /dev/null
@@ -1,115 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2186_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2186_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2186_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2186_Regression/Test.idl b/tests/Bug_2186_Regression/Test.idl
index 0f5412c0210..c1a23e8d785 100644
--- a/tests/Bug_2186_Regression/Test.idl
+++ b/tests/Bug_2186_Regression/Test.idl
@@ -16,7 +16,7 @@ module Test
      * This method is used to simplify the test shutdown process
      */
     oneway void shutdown ();
-    
+
     void request_callback (in Hello call_me);
   };
 };
diff --git a/tests/Bug_2186_Regression/client.cpp b/tests/Bug_2186_Regression/client.cpp
index cd5ad4edf9e..8fcb5bc5025 100644
--- a/tests/Bug_2186_Regression/client.cpp
+++ b/tests/Bug_2186_Regression/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *server_ior = ACE_TEXT("file://server.ior");
 const ACE_TCHAR *ior_output_file = ACE_TEXT("client.ior");
 
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2186_Regression/server.conf b/tests/Bug_2186_Regression/server.conf
index cbb2962f41d..df91e079996 100644
--- a/tests/Bug_2186_Regression/server.conf
+++ b/tests/Bug_2186_Regression/server.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 static Client_Strategy_Factory "-ORBClientConnectionHandler RW -ORBConnectionHandlerCleanup 1"
 
diff --git a/tests/Bug_2186_Regression/server.cpp b/tests/Bug_2186_Regression/server.cpp
index 8d8913374e1..9fa6d7173b3 100644
--- a/tests/Bug_2186_Regression/server.cpp
+++ b/tests/Bug_2186_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2188_Regression/Makefile.am b/tests/Bug_2188_Regression/Makefile.am
deleted file mode 100644
index 8cf93f4d44f..00000000000
--- a/tests/Bug_2188_Regression/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.broken_idl.am
-
-BUILT_SOURCES = \
-  brokenC.cpp \
-  brokenC.h \
-  brokenC.inl \
-  brokenS.cpp \
-  brokenS.h \
-  brokenS.inl
-
-CLEANFILES = \
-  broken-stamp \
-  brokenC.cpp \
-  brokenC.h \
-  brokenC.inl \
-  brokenS.cpp \
-  brokenS.h \
-  brokenS.inl
-
-brokenC.cpp brokenC.h brokenC.inl brokenS.cpp brokenS.h brokenS.inl: broken-stamp
-
-broken-stamp: $(srcdir)/broken.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/broken.idl
-	@touch $@
-
-noinst_HEADERS = \
-  broken.idl
-
-## Makefile.Broken_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  brokenC.cpp \
-  client.cpp \
-  broken_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Broken_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  brokenC.cpp \
-  brokenS.cpp \
-  broken_i.cpp \
-  server.cpp \
-  broken_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2188_Regression/client.cpp b/tests/Bug_2188_Regression/client.cpp
index f6ff28cc076..69d6e0d8854 100644
--- a/tests/Bug_2188_Regression/client.cpp
+++ b/tests/Bug_2188_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "brokenC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://broken.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2188_Regression/server.cpp b/tests/Bug_2188_Regression/server.cpp
index 28f7154e1d8..63ff34345e6 100644
--- a/tests/Bug_2188_Regression/server.cpp
+++ b/tests/Bug_2188_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("broken.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2201_Regression/Makefile.am b/tests/Bug_2201_Regression/Makefile.am
deleted file mode 100644
index fee96692f13..00000000000
--- a/tests/Bug_2201_Regression/Makefile.am
+++ /dev/null
@@ -1,76 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2201_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestDataC.cpp \
-  TestDataC.h \
-  TestDataC.inl \
-  TestDataS.cpp \
-  TestDataS.h \
-  TestDataS.inl
-
-CLEANFILES = \
-  TestData-stamp \
-  TestDataC.cpp \
-  TestDataC.h \
-  TestDataC.inl \
-  TestDataS.cpp \
-  TestDataS.h \
-  TestDataS.inl
-
-TestDataC.cpp TestDataC.h TestDataC.inl TestDataS.cpp TestDataS.h TestDataS.inl: TestData-stamp
-
-TestData-stamp: $(srcdir)/TestData.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestData.idl
-	@touch $@
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  TestDataC.cpp \
-  TestDataS.cpp \
-  test.cpp \
-  TestDataC.h \
-  TestDataC.inl \
-  TestDataS.h \
-  TestDataS.inl
-
-test_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/tests/Bug_2222_Regression/Makefile.am b/tests/Bug_2222_Regression/Makefile.am
deleted file mode 100644
index a85ab2f7a03..00000000000
--- a/tests/Bug_2222_Regression/Makefile.am
+++ /dev/null
@@ -1,101 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Bug_2222_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TestCaseC.cpp \
-  TestCaseC.h \
-  TestCaseC.inl \
-  TestCaseS.h \
-  TestCaseS.inl
-
-CLEANFILES += \
-  TestCase-stamp \
-  TestCaseC.cpp \
-  TestCaseC.h \
-  TestCaseC.inl \
-  TestCaseS.h \
-  TestCaseS.inl
-
-TestCaseC.cpp TestCaseC.h TestCaseC.inl TestCaseS.h TestCaseS.inl: TestCase-stamp
-
-TestCase-stamp: $(srcdir)/TestCase.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestCase.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TestTypeC.cpp \
-  TestTypeC.h \
-  TestTypeC.inl \
-  TestTypeS.h \
-  TestTypeS.inl
-
-CLEANFILES += \
-  TestType-stamp \
-  TestTypeC.cpp \
-  TestTypeC.h \
-  TestTypeC.inl \
-  TestTypeS.h \
-  TestTypeS.inl
-
-TestTypeC.cpp TestTypeC.h TestTypeC.inl TestTypeS.h TestTypeS.inl: TestType-stamp
-
-TestType-stamp: $(srcdir)/TestType.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestType.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestCaseC.cpp \
-  TestTypeC.cpp \
-  test.cpp \
-  TestCaseC.h \
-  TestCaseC.inl \
-  TestCaseS.h \
-  TestCaseS.inl \
-  TestTypeC.h \
-  TestTypeC.inl \
-  TestTypeS.h \
-  TestTypeS.inl
-
-client_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/tests/Bug_2234_Regression/Makefile.am b/tests/Bug_2234_Regression/Makefile.am
deleted file mode 100644
index 7b4e2ea4cd9..00000000000
--- a/tests/Bug_2234_Regression/Makefile.am
+++ /dev/null
@@ -1,110 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2234_Regression_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2234_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2234_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2234_Regression/server.cpp b/tests/Bug_2234_Regression/server.cpp
index f6a66d01ae4..3261825bb3a 100644
--- a/tests/Bug_2234_Regression/server.cpp
+++ b/tests/Bug_2234_Regression/server.cpp
@@ -45,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                            -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2243_Regression/Makefile.am b/tests/Bug_2243_Regression/Makefile.am
deleted file mode 100644
index 4399f966bc5..00000000000
--- a/tests/Bug_2243_Regression/Makefile.am
+++ /dev/null
@@ -1,44 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2243_Regression.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = ORB_object_to_string
-
-ORB_object_to_string_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ORB_object_to_string_SOURCES = \
-  ORB_object_to_string.cpp
-
-ORB_object_to_string_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/tests/Bug_2243_Regression/ORB_object_to_string.cpp b/tests/Bug_2243_Regression/ORB_object_to_string.cpp
index c0ab3ab8f45..c4276c8283b 100644
--- a/tests/Bug_2243_Regression/ORB_object_to_string.cpp
+++ b/tests/Bug_2243_Regression/ORB_object_to_string.cpp
@@ -8,10 +8,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ORB_object_to_string,
-           ORB_object_to_string,
-           "$Id$")
-
 // Valid test IOR.
 // Do not attempt to narrow the object represented by this IOR, nor
 // should you modify the IOR unless you replace it with another
diff --git a/tests/Bug_2289_Regression/Makefile.am b/tests/Bug_2289_Regression/Makefile.am
deleted file mode 100644
index c8d59fa7908..00000000000
--- a/tests/Bug_2289_Regression/Makefile.am
+++ /dev/null
@@ -1,111 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2289_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gp -Gd -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2289_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  MyInterfaceImpl.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  MyInterfaceImpl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2289_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  MyInterfaceImpl.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  MyInterfaceImpl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2289_Regression/client.cpp b/tests/Bug_2289_Regression/client.cpp
index b8f0884d1ee..91e62e7e286 100644
--- a/tests/Bug_2289_Regression/client.cpp
+++ b/tests/Bug_2289_Regression/client.cpp
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2289_Regression/server.cpp b/tests/Bug_2289_Regression/server.cpp
index 86e7b583e64..dd4739827b9 100644
--- a/tests/Bug_2289_Regression/server.cpp
+++ b/tests/Bug_2289_Regression/server.cpp
@@ -8,10 +8,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/IORTable/IORTable.h"
 
-ACE_RCSID (Hello,
-           server,
-           "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 const ACE_TCHAR *client_ior = ACE_TEXT("file://client.ior");
 
@@ -40,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2319_Regression/Makefile.am b/tests/Bug_2319_Regression/Makefile.am
deleted file mode 100644
index 9b8c8ff3fdf..00000000000
--- a/tests/Bug_2319_Regression/Makefile.am
+++ /dev/null
@@ -1,84 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2319_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2328_Regression/Hello.cpp b/tests/Bug_2328_Regression/Hello.cpp
index 1f138ad1942..f506069d9db 100644
--- a/tests/Bug_2328_Regression/Hello.cpp
+++ b/tests/Bug_2328_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_2328_Regression/Makefile.am b/tests/Bug_2328_Regression/Makefile.am
deleted file mode 100644
index 437e4cbf91c..00000000000
--- a/tests/Bug_2328_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2328_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2328_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2328_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2328_Regression/client.cpp b/tests/Bug_2328_Regression/client.cpp
index 5a9ae4335f7..b27a1720817 100644
--- a/tests/Bug_2328_Regression/client.cpp
+++ b/tests/Bug_2328_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2328_Regression/server.cpp b/tests/Bug_2328_Regression/server.cpp
index aa9d398a0f0..4aba483d812 100644
--- a/tests/Bug_2328_Regression/server.cpp
+++ b/tests/Bug_2328_Regression/server.cpp
@@ -5,10 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/Codeset/Codeset.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2345_Regression/Makefile.am b/tests/Bug_2345_Regression/Makefile.am
deleted file mode 100644
index 0d7fa56e753..00000000000
--- a/tests/Bug_2345_Regression/Makefile.am
+++ /dev/null
@@ -1,47 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2345_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2349_Regression/Makefile.am b/tests/Bug_2349_Regression/Makefile.am
deleted file mode 100644
index 6183ba5d660..00000000000
--- a/tests/Bug_2349_Regression/Makefile.am
+++ /dev/null
@@ -1,102 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2349_Regression_Idl.am
-
-BUILT_SOURCES = \
-  fooC.cpp \
-  fooC.h \
-  fooC.inl \
-  fooS.cpp \
-  fooS.h \
-  fooS.inl
-
-CLEANFILES = \
-  foo-stamp \
-  fooC.cpp \
-  fooC.h \
-  fooC.inl \
-  fooS.cpp \
-  fooS.h \
-  fooS.inl
-
-fooC.cpp fooC.h fooC.inl fooS.cpp fooS.h fooS.inl: foo-stamp
-
-foo-stamp: $(srcdir)/foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/foo.idl
-	@touch $@
-
-noinst_HEADERS = \
-  foo.idl
-
-## Makefile.Bug_2349_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  fooC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2349_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  fooC.cpp \
-  fooS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2349_Regression/client.cpp b/tests/Bug_2349_Regression/client.cpp
index a0b17710535..90635aa9cbe 100644
--- a/tests/Bug_2349_Regression/client.cpp
+++ b/tests/Bug_2349_Regression/client.cpp
@@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2349_Regression/server.cpp b/tests/Bug_2349_Regression/server.cpp
index 55cf12daf2d..c55accbf497 100644
--- a/tests/Bug_2349_Regression/server.cpp
+++ b/tests/Bug_2349_Regression/server.cpp
@@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2356_Regression/Makefile.am b/tests/Bug_2356_Regression/Makefile.am
deleted file mode 100644
index ade0aa4d5a2..00000000000
--- a/tests/Bug_2356_Regression/Makefile.am
+++ /dev/null
@@ -1,134 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2356_Regression_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-CLEANFILES = \
-  ami_test-stamp \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp
-
-ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ami_test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_2356_Regression_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  ami_test_i.cpp \
-  server.cpp \
-  ami_test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_2356_Regression_Simple_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  client.cpp \
-  ami_test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2356_Regression/ami_test_i.cpp b/tests/Bug_2356_Regression/ami_test_i.cpp
index 3062427213a..f40a59b3835 100644
--- a/tests/Bug_2356_Regression/ami_test_i.cpp
+++ b/tests/Bug_2356_Regression/ami_test_i.cpp
@@ -16,8 +16,6 @@
 #include "ami_test_i.h"
 #include "tao/debug.h"
 
-ACE_RCSID(AMI, ami_test_i, "$Id$")
-
 AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_2356_Regression/client.cpp b/tests/Bug_2356_Regression/client.cpp
index b57ce1c0573..776495d4669 100644
--- a/tests/Bug_2356_Regression/client.cpp
+++ b/tests/Bug_2356_Regression/client.cpp
@@ -19,10 +19,6 @@
 #include "ami_testS.h"
 #include "tao/Codeset/Codeset.h"
 
-ACE_RCSID (AMI,
-           simple_client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int shutdown_flag = 1;
@@ -53,7 +49,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2356_Regression/server.cpp b/tests/Bug_2356_Regression/server.cpp
index 14da91b1afc..2a53b746a50 100644
--- a/tests/Bug_2356_Regression/server.cpp
+++ b/tests/Bug_2356_Regression/server.cpp
@@ -19,8 +19,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(AMI, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -47,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2375_Regression/Makefile.am b/tests/Bug_2375_Regression/Makefile.am
deleted file mode 100644
index 6ad9ccdc27d..00000000000
--- a/tests/Bug_2375_Regression/Makefile.am
+++ /dev/null
@@ -1,79 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2375_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  test.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2399_Regression/Makefile.am b/tests/Bug_2399_Regression/Makefile.am
deleted file mode 100644
index 96a5c0074a9..00000000000
--- a/tests/Bug_2399_Regression/Makefile.am
+++ /dev/null
@@ -1,109 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Bug_2399_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -t ./mytmp $(srcdir)/test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  includedC.cpp \
-  includedC.h \
-  includedC.inl \
-  includedS.cpp \
-  includedS.h \
-  includedS.inl
-
-CLEANFILES += \
-  included-stamp \
-  includedC.cpp \
-  includedC.h \
-  includedC.inl \
-  includedS.cpp \
-  includedS.h \
-  includedS.inl
-
-includedC.cpp includedC.h includedC.inl includedS.cpp includedS.h includedS.inl: included-stamp
-
-included-stamp: $(srcdir)/included.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -t ./mytmp $(srcdir)/included.idl
-	@touch $@
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  includedC.cpp \
-  includedS.cpp \
-  test.cpp \
-  testC.cpp \
-  testS.cpp \
-  includedC.h \
-  includedC.inl \
-  includedS.h \
-  includedS.inl \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2417_Regression/Makefile.am b/tests/Bug_2417_Regression/Makefile.am
deleted file mode 100644
index a4a12721c8f..00000000000
--- a/tests/Bug_2417_Regression/Makefile.am
+++ /dev/null
@@ -1,151 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Bug_2417_Regression_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  publisherC.cpp \
-  publisherC.h \
-  publisherC.inl \
-  publisherS.cpp \
-  publisherS.h \
-  publisherS.inl
-
-CLEANFILES += \
-  publisher-stamp \
-  publisherC.cpp \
-  publisherC.h \
-  publisherC.inl \
-  publisherS.cpp \
-  publisherS.h \
-  publisherS.inl
-
-publisherC.cpp publisherC.h publisherC.inl publisherS.cpp publisherS.h publisherS.inl: publisher-stamp
-
-publisher-stamp: $(srcdir)/publisher.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/publisher.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  subscriberC.cpp \
-  subscriberC.h \
-  subscriberC.inl \
-  subscriberS.cpp \
-  subscriberS.h \
-  subscriberS.inl
-
-CLEANFILES += \
-  subscriber-stamp \
-  subscriberC.cpp \
-  subscriberC.h \
-  subscriberC.inl \
-  subscriberS.cpp \
-  subscriberS.h \
-  subscriberS.inl
-
-subscriberC.cpp subscriberC.h subscriberC.inl subscriberS.cpp subscriberS.h subscriberS.inl: subscriber-stamp
-
-subscriber-stamp: $(srcdir)/subscriber.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/subscriber.idl
-	@touch $@
-
-noinst_HEADERS = \
-  publisher.idl \
-  subscriber.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2417_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  publisherC.cpp \
-  subscriberC.cpp \
-  subscriberS.cpp \
-  subscriber_impl.cpp \
-  subscriber_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2417_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  publisherC.cpp \
-  publisherS.cpp \
-  publisher_impl.cpp \
-  server.cpp \
-  subscriberC.cpp \
-  publisher_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2417_Regression/client.cpp b/tests/Bug_2417_Regression/client.cpp
index c937030ef47..03297e9cbb5 100644
--- a/tests/Bug_2417_Regression/client.cpp
+++ b/tests/Bug_2417_Regression/client.cpp
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2417_Regression/publisher_impl.cpp b/tests/Bug_2417_Regression/publisher_impl.cpp
index 87e84cd8eda..add59e02a0f 100644
--- a/tests/Bug_2417_Regression/publisher_impl.cpp
+++ b/tests/Bug_2417_Regression/publisher_impl.cpp
@@ -44,7 +44,7 @@ Publisher_impl::Worker::~Worker()
 
 void Publisher_impl::Worker::addSubscriber(Subscriber_ptr subscriber)
 {
-  ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex);
   subscribers.push_back(_Subscriber());
   _Subscriber& s = subscribers.back();
   s.unsubscribed = false;
@@ -64,7 +64,7 @@ int Publisher_impl::Worker::svc (void)
       data += 0.01;
       ++iteration;
       {
-        ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex, 0);
         doShutdown = subscribers.size() > 0;
         for (vector<_Subscriber>::iterator iter = subscribers.begin();
              iter != subscribers.end(); ++iter)
@@ -89,7 +89,7 @@ int Publisher_impl::Worker::svc (void)
       }
       if (iteration % 200 == 0)
         {
-          ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex);
+          ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex, 0);
           for (vector<_Subscriber>::iterator iter = subscribers.begin();
                iter != subscribers.end(); ++iter)
             {
diff --git a/tests/Bug_2417_Regression/server.cpp b/tests/Bug_2417_Regression/server.cpp
index eab72252371..2bd02da8c78 100644
--- a/tests/Bug_2417_Regression/server.cpp
+++ b/tests/Bug_2417_Regression/server.cpp
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2419_Regression/Makefile.am b/tests/Bug_2419_Regression/Makefile.am
deleted file mode 100644
index c0bbe56410f..00000000000
--- a/tests/Bug_2419_Regression/Makefile.am
+++ /dev/null
@@ -1,115 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Bug_2419_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  abstract_parentC.cpp \
-  abstract_parentC.h \
-  abstract_parentC.inl \
-  abstract_parentS.cpp \
-  abstract_parentS.h \
-  abstract_parentS.inl
-
-CLEANFILES += \
-  abstract_parent-stamp \
-  abstract_parentC.cpp \
-  abstract_parentC.h \
-  abstract_parentC.inl \
-  abstract_parentS.cpp \
-  abstract_parentS.h \
-  abstract_parentS.inl
-
-abstract_parentC.cpp abstract_parentC.h abstract_parentC.inl abstract_parentS.cpp abstract_parentS.h abstract_parentS.inl: abstract_parent-stamp
-
-abstract_parent-stamp: $(srcdir)/abstract_parent.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/abstract_parent.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  local_childC.cpp \
-  local_childC.h \
-  local_childC.inl \
-  local_childS.cpp \
-  local_childS.h \
-  local_childS.inl
-
-CLEANFILES += \
-  local_child-stamp \
-  local_childC.cpp \
-  local_childC.h \
-  local_childC.inl \
-  local_childS.cpp \
-  local_childS.h \
-  local_childS.inl
-
-local_childC.cpp local_childC.h local_childC.inl local_childS.cpp local_childS.h local_childS.inl: local_child-stamp
-
-local_child-stamp: $(srcdir)/local_child.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/local_child.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  abstract_parentC.cpp \
-  abstract_parentS.cpp \
-  client.cpp \
-  local_childC.cpp \
-  local_childS.cpp \
-  abstract_parentC.h \
-  abstract_parentC.inl \
-  abstract_parentS.h \
-  abstract_parentS.inl \
-  local_childC.h \
-  local_childC.inl \
-  local_childS.h \
-  local_childS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2424_Regression/Makefile.am b/tests/Bug_2424_Regression/Makefile.am
deleted file mode 100644
index db1a2de2180..00000000000
--- a/tests/Bug_2424_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2424_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  OneLineCosNamingC.cpp \
-  OneLineCosNamingC.h \
-  OneLineCosNamingC.inl \
-  OneLineCosNamingS.cpp \
-  OneLineCosNamingS.h \
-  OneLineCosNamingS.inl
-
-CLEANFILES = \
-  OneLineCosNaming-stamp \
-  OneLineCosNamingC.cpp \
-  OneLineCosNamingC.h \
-  OneLineCosNamingC.inl \
-  OneLineCosNamingS.cpp \
-  OneLineCosNamingS.h \
-  OneLineCosNamingS.inl
-
-OneLineCosNamingC.cpp OneLineCosNamingC.h OneLineCosNamingC.inl OneLineCosNamingS.cpp OneLineCosNamingS.h OneLineCosNamingS.inl: OneLineCosNaming-stamp
-
-OneLineCosNaming-stamp: $(srcdir)/OneLineCosNaming.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/OneLineCosNaming.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  OneLineCosNamingC.cpp \
-  OneLineCosNamingS.cpp \
-  client.cpp \
-  OneLineCosNamingC.h \
-  OneLineCosNamingC.inl \
-  OneLineCosNamingS.h \
-  OneLineCosNamingS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-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/tests/Bug_2429_Regression/Makefile.am b/tests/Bug_2429_Regression/Makefile.am
deleted file mode 100644
index 8d5c1d26c50..00000000000
--- a/tests/Bug_2429_Regression/Makefile.am
+++ /dev/null
@@ -1,148 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2429_Regression_Idl.am
-
-BUILT_SOURCES = \
-  ChildC.cpp \
-  ChildC.h \
-  ChildC.inl \
-  ChildS.cpp \
-  ChildS.h \
-  ChildS.inl
-
-CLEANFILES = \
-  Child-stamp \
-  ChildC.cpp \
-  ChildC.h \
-  ChildC.inl \
-  ChildS.cpp \
-  ChildS.h \
-  ChildS.inl
-
-ChildC.cpp ChildC.h ChildC.inl ChildS.cpp ChildS.h ChildS.inl: Child-stamp
-
-Child-stamp: $(srcdir)/Child.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GC $(srcdir)/Child.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  ParentC.cpp \
-  ParentC.h \
-  ParentC.inl \
-  ParentS.cpp \
-  ParentS.h \
-  ParentS.inl
-
-CLEANFILES += \
-  Parent-stamp \
-  ParentC.cpp \
-  ParentC.h \
-  ParentC.inl \
-  ParentS.cpp \
-  ParentS.h \
-  ParentS.inl
-
-ParentC.cpp ParentC.h ParentC.inl ParentS.cpp ParentS.h ParentS.inl: Parent-stamp
-
-Parent-stamp: $(srcdir)/Parent.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GC $(srcdir)/Parent.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Child.idl \
-  Parent.idl
-
-## Makefile.Bug_2429_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ChildC.cpp \
-  ChildS.cpp \
-  ParentC.cpp \
-  ParentS.cpp \
-  client.cpp \
-  ChildServant.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2429_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ChildC.cpp \
-  ChildS.cpp \
-  ChildServant.cpp \
-  ParentC.cpp \
-  ParentS.cpp \
-  server.cpp \
-  ChildServant.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2429_Regression/client.cpp b/tests/Bug_2429_Regression/client.cpp
index b60aa67f26c..7f321c20ad3 100644
--- a/tests/Bug_2429_Regression/client.cpp
+++ b/tests/Bug_2429_Regression/client.cpp
@@ -94,7 +94,7 @@ client_parse_args(int argc, ACE_TCHAR *argv[])
       }
    }
 
-   // Indicates sucessful parsing of the command line
+   // Indicates successful parsing of the command line
    return 0;
 }
 
diff --git a/tests/Bug_2429_Regression/server.cpp b/tests/Bug_2429_Regression/server.cpp
index ee2d5584aa3..458a4d71d89 100644
--- a/tests/Bug_2429_Regression/server.cpp
+++ b/tests/Bug_2429_Regression/server.cpp
@@ -27,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2494_Regression/Makefile.am b/tests/Bug_2494_Regression/Makefile.am
deleted file mode 100644
index 3ecff9d58a1..00000000000
--- a/tests/Bug_2494_Regression/Makefile.am
+++ /dev/null
@@ -1,107 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2494_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_2494_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2494_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2494_Regression/client.cpp b/tests/Bug_2494_Regression/client.cpp
index 9552bd3e8ed..35e50784cd8 100644
--- a/tests/Bug_2494_Regression/client.cpp
+++ b/tests/Bug_2494_Regression/client.cpp
@@ -5,8 +5,6 @@
 #include "ace/OS_NS_string.h"
 #include "testC.h"
 
-ACE_RCSID(Bug_2494_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
 int do_shutdown = 0;
@@ -42,7 +40,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2494_Regression/server.cpp b/tests/Bug_2494_Regression/server.cpp
index d692eef743e..05ddb4f4dbb 100644
--- a/tests/Bug_2494_Regression/server.cpp
+++ b/tests/Bug_2494_Regression/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(Bug_2494_Regression, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 int nthreads = 4;
 
@@ -35,18 +33,17 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   Worker (CORBA::ORB_ptr orb);
   // ctor
diff --git a/tests/Bug_2494_Regression/test_i.cpp b/tests/Bug_2494_Regression/test_i.cpp
index 4a23db96ac0..c370bf97cf4 100644
--- a/tests/Bug_2494_Regression/test_i.cpp
+++ b/tests/Bug_2494_Regression/test_i.cpp
@@ -8,8 +8,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Bug_2494_Regression, test_i, "$Id$")
-
 char *
 Simple_Server_i::test_method (const char *x)
 {
diff --git a/tests/Bug_2503_Regression/Makefile.am b/tests/Bug_2503_Regression/Makefile.am
deleted file mode 100644
index 3fc88e4036c..00000000000
--- a/tests/Bug_2503_Regression/Makefile.am
+++ /dev/null
@@ -1,137 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2503_Regression_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_2503_Regression_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  common.cpp \
-  test_i.cpp \
-  common.h \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_2503_Regression_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  common.cpp \
-  server.cpp \
-  test_i.cpp \
-  common.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2503_Regression/test_i.cpp b/tests/Bug_2503_Regression/test_i.cpp
index af9c6b79500..945fd5c627d 100644
--- a/tests/Bug_2503_Regression/test_i.cpp
+++ b/tests/Bug_2503_Regression/test_i.cpp
@@ -2,8 +2,6 @@
 
 #include "test_i.h"
 
-#include "tao/Utils/Servant_Var.h"
-
 test_i::
 test_i(CORBA::ORB_ptr orb)
 {
@@ -20,7 +18,7 @@ char *
 test_i::
 create_and_activate_server()
 {
-  TAO::Utils::Servant_Var<test_i> impl(
+  PortableServer::Servant_var<test_i> impl(
       new test_i (this->orb_.in ()));
 
   CORBA::Object_var poa_object =
diff --git a/tests/Bug_2542_Regression/Makefile.am b/tests/Bug_2542_Regression/Makefile.am
deleted file mode 100644
index b5d1b16b38e..00000000000
--- a/tests/Bug_2542_Regression/Makefile.am
+++ /dev/null
@@ -1,79 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2542_Regression.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  bug_2542_regression.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/tests/Bug_2542_Regression/bug_2542_regression.cpp b/tests/Bug_2542_Regression/bug_2542_regression.cpp
index 7485773f3ef..d2fcbfe587b 100644
--- a/tests/Bug_2542_Regression/bug_2542_regression.cpp
+++ b/tests/Bug_2542_Regression/bug_2542_regression.cpp
@@ -3,10 +3,6 @@
 #include "TestC.h"
 #include "tao/CodecFactory/CodecFactory.h"
 
-ACE_RCSID (Bug_2542_Regression,
-           bug_2542_regression,
-           "$Id$")
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
diff --git a/tests/Bug_2543_Regression/Makefile.am b/tests/Bug_2543_Regression/Makefile.am
deleted file mode 100644
index f6b26041197..00000000000
--- a/tests/Bug_2543_Regression/Makefile.am
+++ /dev/null
@@ -1,79 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2543_Regression.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  bug_2543_regression.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/tests/Bug_2543_Regression/bug_2543_regression.cpp b/tests/Bug_2543_Regression/bug_2543_regression.cpp
index ba1e926aa44..d72aecd3ac8 100644
--- a/tests/Bug_2543_Regression/bug_2543_regression.cpp
+++ b/tests/Bug_2543_Regression/bug_2543_regression.cpp
@@ -3,10 +3,6 @@
 #include "TestC.h"
 #include "tao/CodecFactory/CodecFactory.h"
 
-ACE_RCSID (Bug_2543_Regression,
-           bug_2543_regression,
-           "$Id$")
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
diff --git a/tests/Bug_2549_Regression/Makefile.am b/tests/Bug_2549_Regression/Makefile.am
deleted file mode 100644
index 6a805739580..00000000000
--- a/tests/Bug_2549_Regression/Makefile.am
+++ /dev/null
@@ -1,91 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2549_Regression_Test.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  test.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2560_Regression/Makefile.am b/tests/Bug_2560_Regression/Makefile.am
deleted file mode 100644
index c4649dea9e2..00000000000
--- a/tests/Bug_2560_Regression/Makefile.am
+++ /dev/null
@@ -1,108 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2560_Regression_Idl.am
-
-BUILT_SOURCES = \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl
-
-CLEANFILES = \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Quoter.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Quoter.idl
-
-## Makefile.Bug_2560_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  QuoterC.cpp \
-  client.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2560_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  QuoterC.cpp \
-  QuoterS.cpp \
-  Stock_Factory_i.cpp \
-  Stock_i.cpp \
-  server.cpp \
-  Stock_Factory_i.h \
-  Stock_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2560_Regression/Stock_Factory_i.cpp b/tests/Bug_2560_Regression/Stock_Factory_i.cpp
index d6ab8a1d16b..56792072cee 100644
--- a/tests/Bug_2560_Regression/Stock_Factory_i.cpp
+++ b/tests/Bug_2560_Regression/Stock_Factory_i.cpp
@@ -3,15 +3,14 @@
 //
 
 #include "Stock_Factory_i.h"
-#include "tao/Utils/Servant_Var.h"
 
 #include <iostream>
 
 Quoter_Stock_Factory_i::Quoter_Stock_Factory_i ()
 {
-  TAO::Utils::Servant_Var<Quoter_Stock_i> servant1 =
+  PortableServer::Servant_var<Quoter_Stock_i> servant1 =
     new Quoter_Stock_i ("RHAT", "RedHat, Inc.", 210);
-  TAO::Utils::Servant_Var<Quoter_Stock_i> servant2 =
+  PortableServer::Servant_var<Quoter_Stock_i> servant2 =
     new Quoter_Stock_i ("MSFT", "Microsoft, Inc.", 91);
 
   PortableServer::POA_var poa1 = servant1->_default_POA ();
diff --git a/tests/Bug_2560_Regression/server.cpp b/tests/Bug_2560_Regression/server.cpp
index 593f5f05167..328c7fe8eb8 100644
--- a/tests/Bug_2560_Regression/server.cpp
+++ b/tests/Bug_2560_Regression/server.cpp
@@ -31,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2593_Regression/Hello.cpp b/tests/Bug_2593_Regression/Hello.cpp
index df5dc90d3d9..0f62f20b906 100644
--- a/tests/Bug_2593_Regression/Hello.cpp
+++ b/tests/Bug_2593_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_2593_Regression/Makefile.am b/tests/Bug_2593_Regression/Makefile.am
deleted file mode 100644
index 528b58934d0..00000000000
--- a/tests/Bug_2593_Regression/Makefile.am
+++ /dev/null
@@ -1,108 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2593_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2593_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2593_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2593_Regression/client.cpp b/tests/Bug_2593_Regression/client.cpp
index cbd78a6f0d6..abaed430dc8 100644
--- a/tests/Bug_2593_Regression/client.cpp
+++ b/tests/Bug_2593_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2593_Regression/server.cpp b/tests/Bug_2593_Regression/server.cpp
index 70d1438f4d3..f2dc09ae2f2 100644
--- a/tests/Bug_2593_Regression/server.cpp
+++ b/tests/Bug_2593_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2595_Regression/Hello.cpp b/tests/Bug_2595_Regression/Hello.cpp
index f95f30bdc85..df2a18536d2 100644
--- a/tests/Bug_2595_Regression/Hello.cpp
+++ b/tests/Bug_2595_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_2595_Regression/Makefile.am b/tests/Bug_2595_Regression/Makefile.am
deleted file mode 100644
index cf4976918e1..00000000000
--- a/tests/Bug_2595_Regression/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2595_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2595_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2595_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2595_Regression/client.cpp b/tests/Bug_2595_Regression/client.cpp
index f75ce5ac238..0d2a3e9e825 100644
--- a/tests/Bug_2595_Regression/client.cpp
+++ b/tests/Bug_2595_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2595_Regression/server.cpp b/tests/Bug_2595_Regression/server.cpp
index c1d8bd1bb30..ab19d0fb0a7 100644
--- a/tests/Bug_2595_Regression/server.cpp
+++ b/tests/Bug_2595_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2654_Regression/Bug_2654_Regression.mpc b/tests/Bug_2654_Regression/Bug_2654_Regression.mpc
index 5350e88e5a1..a5f7eea18ad 100644
--- a/tests/Bug_2654_Regression/Bug_2654_Regression.mpc
+++ b/tests/Bug_2654_Regression/Bug_2654_Regression.mpc
@@ -2,8 +2,6 @@
 // $Id$
 
 project(*idl): taoidldefaults {
-  idlflags += -Sa -St
-
   IDL_Files {
     Hello.idl
   }
diff --git a/tests/Bug_2654_Regression/Hello.cpp b/tests/Bug_2654_Regression/Hello.cpp
index 6130ba94f14..8416cdb76c7 100644
--- a/tests/Bug_2654_Regression/Hello.cpp
+++ b/tests/Bug_2654_Regression/Hello.cpp
@@ -1,6 +1,5 @@
-//
 // $Id$
-//
+
 #include "Hello.h"
 #include "ace/Task.h"
 
diff --git a/tests/Bug_2654_Regression/Hello.h b/tests/Bug_2654_Regression/Hello.h
index 7171680d945..5ac669ccd98 100644
--- a/tests/Bug_2654_Regression/Hello.h
+++ b/tests/Bug_2654_Regression/Hello.h
@@ -1,6 +1,4 @@
-//
 // $Id$
-//
 
 #ifndef HELLO_H
 #define HELLO_H
diff --git a/tests/Bug_2654_Regression/Hello.idl b/tests/Bug_2654_Regression/Hello.idl
index 1cd21f1773e..6bd78c2cf25 100644
--- a/tests/Bug_2654_Regression/Hello.idl
+++ b/tests/Bug_2654_Regression/Hello.idl
@@ -1,6 +1,4 @@
-//
 // $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/tests/Bug_2654_Regression/Makefile.am b/tests/Bug_2654_Regression/Makefile.am
deleted file mode 100644
index 6df8edf9440..00000000000
--- a/tests/Bug_2654_Regression/Makefile.am
+++ /dev/null
@@ -1,118 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2654_Regression_Idl.am
-
-BUILT_SOURCES = \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-CLEANFILES = \
-  Hello-stamp \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp
-
-Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Hello.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Hello.idl
-
-## Makefile.Bug_2654_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  HelloC.cpp \
-  HelloS.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2654_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  HelloC.cpp \
-  HelloS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2654_Regression/client.cpp b/tests/Bug_2654_Regression/client.cpp
index 9e640c86246..aa6efe616bd 100644
--- a/tests/Bug_2654_Regression/client.cpp
+++ b/tests/Bug_2654_Regression/client.cpp
@@ -20,8 +20,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 class Callback_i : public POA_Test::CallBack
@@ -71,12 +69,12 @@ int
 Worker::svc()
 {
   {
-    ACE_Guard<ACE_Mutex> g(this->lock_);
+    ACE_GUARD_RETURN (ACE_Mutex, ace_mon, this->lock_, 0);
     if (this->orb_threads_ > 0)
       {
         --this->orb_threads_;
         hello_->set_callback(this->callback_.in());
-        g.release();
+        ace_mon.release();
         this->orb_->run();
         return 0;
       }
@@ -91,7 +89,7 @@ Worker::svc()
         {
           CORBA::Short n = 0;
           {
-            ACE_Guard<ACE_Mutex> g(this->lock_);
+            ACE_GUARD_RETURN (ACE_Mutex, ace_mon, this->lock_, 0);
             n = ++this->message_counter_;
           }
           this->asynch_hello_->method (n);
@@ -114,7 +112,7 @@ Worker::svc()
     ACE_DEBUG ((LM_DEBUG, "(%t) Did all iterations\n"));
 
   {
-    ACE_Guard<ACE_Mutex> g(this->lock_);
+    ACE_GUARD_RETURN (ACE_Mutex, ace_mon, this->lock_, 0);
     --this->busy_threads_;
     if (this->busy_threads_)
       return 0;
@@ -210,7 +208,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2654_Regression/server.cpp b/tests/Bug_2654_Regression/server.cpp
index c53dd9b14f0..8f6f117b63a 100644
--- a/tests/Bug_2654_Regression/server.cpp
+++ b/tests/Bug_2654_Regression/server.cpp
@@ -6,10 +6,6 @@
 #include "ace/Thread_Manager.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -34,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2669_Regression/Makefile.am b/tests/Bug_2669_Regression/Makefile.am
deleted file mode 100644
index 62c7a56edd5..00000000000
--- a/tests/Bug_2669_Regression/Makefile.am
+++ /dev/null
@@ -1,117 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Bug_2669_Regression_Test.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  ParentC.cpp \
-  ParentC.h \
-  ParentC.inl \
-  ParentS.cpp \
-  ParentS.h \
-  ParentS.inl
-
-CLEANFILES += \
-  Parent-stamp \
-  ParentC.cpp \
-  ParentC.h \
-  ParentC.inl \
-  ParentS.cpp \
-  ParentS.h \
-  ParentS.inl
-
-ParentC.cpp ParentC.h ParentC.inl ParentS.cpp ParentS.h ParentS.inl: Parent-stamp
-
-Parent-stamp: $(srcdir)/Parent.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Parent.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  ChildC.cpp \
-  ChildC.h \
-  ChildC.inl \
-  ChildS.cpp \
-  ChildS.h \
-  ChildS.inl
-
-CLEANFILES += \
-  Child-stamp \
-  ChildC.cpp \
-  ChildC.h \
-  ChildC.inl \
-  ChildS.cpp \
-  ChildS.h \
-  ChildS.inl
-
-ChildC.cpp ChildC.h ChildC.inl ChildS.cpp ChildS.h ChildS.inl: Child-stamp
-
-Child-stamp: $(srcdir)/Child.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Child.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ChildC.cpp \
-  ChildS.cpp \
-  ParentC.cpp \
-  ParentS.cpp \
-  client.cpp \
-  ChildC.h \
-  ChildC.inl \
-  ChildS.h \
-  ChildS.inl \
-  ParentC.h \
-  ParentC.inl \
-  ParentS.h \
-  ParentS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2669_Regression/client.cpp b/tests/Bug_2669_Regression/client.cpp
index c70c9815b5f..f31dbbd56ca 100644
--- a/tests/Bug_2669_Regression/client.cpp
+++ b/tests/Bug_2669_Regression/client.cpp
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2677_Regression/DllORB.cpp b/tests/Bug_2677_Regression/DllORB.cpp
index 543eb993938..776222e727c 100644
--- a/tests/Bug_2677_Regression/DllORB.cpp
+++ b/tests/Bug_2677_Regression/DllORB.cpp
@@ -5,7 +5,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/TAO_Singleton_Manager.h"
 
-
 DllORB::DllORB (void)
  : failPrePostInit_ (3),
    mv_orb_ (),
@@ -13,34 +12,15 @@ DllORB::DllORB (void)
 {
 }
 
-
 DllORB::~DllORB (void)
 {
 }
 
-
 int
 DllORB::init (int argc, ACE_TCHAR *argv[])
 {
-  int threadCnt = 1;
-
   try
     {
-      ACE_Arg_Shifter as (argc, argv);
-      const ACE_TCHAR *currentArg = 0;
-      while (as.is_anything_left ())
-        {
-          if (0 != (currentArg = as.get_the_parameter (ACE_TEXT ("-NumThreads"))))
-            {
-              int num = ACE_OS::atoi (currentArg);
-              if (num >= 1)
-                threadCnt = num;
-              as.consume_arg ();
-            }
-        else
-          as.ignore_arg ();
-        }
-
       if (failPrePostInit_ < 3)
         {
           ACE_DEBUG ((LM_INFO,
@@ -87,8 +67,7 @@ DllORB::init (int argc, ACE_TCHAR *argv[])
         }
 
       // Initialize the ORB
-      ACE_Argv_Type_Converter argcon (argc, argv);
-      mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ());
+      mv_orb_ = CORBA::ORB_init (argc, argv);
       if (CORBA::is_nil (mv_orb_.in ()))
         {
           ACE_DEBUG ((LM_ERROR, ACE_TEXT ("nil ORB\n")));
diff --git a/tests/Bug_2677_Regression/Makefile.am b/tests/Bug_2677_Regression/Makefile.am
deleted file mode 100644
index b4c1cb12834..00000000000
--- a/tests/Bug_2677_Regression/Makefile.am
+++ /dev/null
@@ -1,69 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2677_Regression.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libBug_2677_Regression.la
-
-libBug_2677_Regression_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DBUG_2677_REGRESSION_BUILD_DLL
-
-libBug_2677_Regression_la_SOURCES = \
-  DllORB.cpp
-
-noinst_HEADERS = \
-  DllORB.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2677_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  DllORB.h \
-  bug_2677_regression_export.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2677_Regression/server.cpp b/tests/Bug_2677_Regression/server.cpp
index bcfdd64fc62..b2554023954 100644
--- a/tests/Bug_2677_Regression/server.cpp
+++ b/tests/Bug_2677_Regression/server.cpp
@@ -1,5 +1,5 @@
 // $Id$
-#include "ace/OS.h"
+
 #include "ace/Service_Config.h"
 #include "ace/Log_Msg.h"
 
diff --git a/tests/Bug_2678_Regression/Makefile.am b/tests/Bug_2678_Regression/Makefile.am
deleted file mode 100644
index d29c5a75c10..00000000000
--- a/tests/Bug_2678_Regression/Makefile.am
+++ /dev/null
@@ -1,103 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2678_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_2678_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2678_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2678_Regression/client.cpp b/tests/Bug_2678_Regression/client.cpp
index c0cc27d346e..679f5bf277b 100644
--- a/tests/Bug_2678_Regression/client.cpp
+++ b/tests/Bug_2678_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2678_Regression/dribble.pl b/tests/Bug_2678_Regression/dribble.pl
index 26a561aa58b..3e10a136d4d 100755
--- a/tests/Bug_2678_Regression/dribble.pl
+++ b/tests/Bug_2678_Regression/dribble.pl
@@ -53,7 +53,7 @@ if (!$result) {
   my($initial) = length($str);
   my($length)  = $initial;
   my($maxLine) = 78;
- 
+
   print $str;
 
   foreach my $key (sort keys %options) {
diff --git a/tests/Bug_2683_Regression/Makefile.am b/tests/Bug_2683_Regression/Makefile.am
deleted file mode 100644
index ca384d98cd4..00000000000
--- a/tests/Bug_2683_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.IORTable_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.IORTable_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.IORTable_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2683_Regression/client.cpp b/tests/Bug_2683_Regression/client.cpp
index 7a0f53f3394..4dbf005651f 100644
--- a/tests/Bug_2683_Regression/client.cpp
+++ b/tests/Bug_2683_Regression/client.cpp
@@ -95,7 +95,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2683_Regression/server.cpp b/tests/Bug_2683_Regression/server.cpp
index c8d8ed347ff..2be474414ce 100644
--- a/tests/Bug_2683_Regression/server.cpp
+++ b/tests/Bug_2683_Regression/server.cpp
@@ -32,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -68,23 +68,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      int nthreads = 10;
       bool endpoint_found = false;
       for (int i = 0; i < argc; i++)
         {
           if ((ACE_OS::strcasecmp (argv[i],ACE_TEXT("-ORBEndpoint")) == 0) ||
               (ACE_OS::strcasecmp (argv[i],ACE_TEXT("-ORBListenEndpoints")) == 0))
             endpoint_found = 1;
-          else if (ACE_OS::strcasecmp (argv[i],ACE_TEXT("-threads")) == 0)
-            {
-              ++i;
-              nthreads = ACE_OS::atoi (argv[i]);
-            }
-          else if (ACE_OS::strcasecmp (argv[i],ACE_TEXT("-o")) == 0)
-            {
-              ++i;
-//              ior_output_file = argv[i];
-            }
         }
 
       if (!endpoint_found)
diff --git a/tests/Bug_2702_Regression/Makefile.am b/tests/Bug_2702_Regression/Makefile.am
deleted file mode 100644
index 088301dc92e..00000000000
--- a/tests/Bug_2702_Regression/Makefile.am
+++ /dev/null
@@ -1,80 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CloseConnection_Idl.am
-
-BUILT_SOURCES = \
-  TestA.cpp \
-  TestA.h \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestA.cpp \
-  TestA.h \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestA.cpp TestA.h TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GA $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.CloseConnection_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp
-
-client_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/tests/Bug_2702_Regression/client.cpp b/tests/Bug_2702_Regression/client.cpp
index a874800e5a5..fc2e03c93f0 100644
--- a/tests/Bug_2702_Regression/client.cpp
+++ b/tests/Bug_2702_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2734_Regression/Makefile.am b/tests/Bug_2734_Regression/Makefile.am
deleted file mode 100644
index 4023322b448..00000000000
--- a/tests/Bug_2734_Regression/Makefile.am
+++ /dev/null
@@ -1,113 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2734_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_2734_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2734_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2734_Regression/client.cpp b/tests/Bug_2734_Regression/client.cpp
index 755d3da6daf..a5b94214917 100644
--- a/tests/Bug_2734_Regression/client.cpp
+++ b/tests/Bug_2734_Regression/client.cpp
@@ -6,8 +6,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Timeout, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 int min_timeout = 0;
 int max_timeout = 20;
diff --git a/tests/Bug_2734_Regression/server.cpp b/tests/Bug_2734_Regression/server.cpp
index 7812e2261e4..1e66973cff6 100644
--- a/tests/Bug_2734_Regression/server.cpp
+++ b/tests/Bug_2734_Regression/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Timeout, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -31,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2734_Regression/test_i.cpp b/tests/Bug_2734_Regression/test_i.cpp
index e75b0e611ce..4dec77755fe 100644
--- a/tests/Bug_2734_Regression/test_i.cpp
+++ b/tests/Bug_2734_Regression/test_i.cpp
@@ -4,8 +4,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID(Timeout, test_i, "$Id$")
-
 ACE_High_Res_Timer sleep_duration;
 
 
diff --git a/tests/Bug_2734_Regression/test_i.h b/tests/Bug_2734_Regression/test_i.h
index 8c102e3a1b7..eb3d07084a5 100644
--- a/tests/Bug_2734_Regression/test_i.h
+++ b/tests/Bug_2734_Regression/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Timeout
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_TIMEOUT_TEST_I_H
 #define TAO_TIMEOUT_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
@@ -36,8 +34,8 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #endif /* TAO_TIMEOUT_TEST_I_H */
diff --git a/tests/Bug_2735_Regression/Makefile.am b/tests/Bug_2735_Regression/Makefile.am
deleted file mode 100644
index 0ea1856ec3f..00000000000
--- a/tests/Bug_2735_Regression/Makefile.am
+++ /dev/null
@@ -1,46 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2735_Regression.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2735_Regression/server.cpp b/tests/Bug_2735_Regression/server.cpp
index d2d35fa897a..4aa36e4d73c 100644
--- a/tests/Bug_2735_Regression/server.cpp
+++ b/tests/Bug_2735_Regression/server.cpp
@@ -5,10 +5,6 @@
 #include "ace/Service_Config.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Bug_2735_Regression,
-           server,
-           "$Id$")
-
 static const ACE_TCHAR* server_strat =
   ACE_STATIC_SERVICE_DIRECTIVE ("Server_Strategy_Factory",
                                 "-ORBConcurrency thread-per-connection");
diff --git a/tests/Bug_2768_Regression/Makefile.am b/tests/Bug_2768_Regression/Makefile.am
deleted file mode 100644
index 293f1d7f91c..00000000000
--- a/tests/Bug_2768_Regression/Makefile.am
+++ /dev/null
@@ -1,108 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2768_Regression_Idl.am
-
-BUILT_SOURCES = \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-CLEANFILES = \
-  Messenger-stamp \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl: Messenger-stamp
-
-Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Messenger.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Messenger.idl
-
-## Makefile.Bug_2768_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  MessengerC.cpp \
-  client.cpp \
-  Messenger_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2768_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  MessengerC.cpp \
-  MessengerS.cpp \
-  Messenger_i.cpp \
-  server.cpp \
-  Messenger_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2768_Regression/client.cpp b/tests/Bug_2768_Regression/client.cpp
index 707b9119343..759923e4f4b 100644
--- a/tests/Bug_2768_Regression/client.cpp
+++ b/tests/Bug_2768_Regression/client.cpp
@@ -27,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2768_Regression/server.cpp b/tests/Bug_2768_Regression/server.cpp
index 76086da54e8..eaed5c2e0f1 100644
--- a/tests/Bug_2768_Regression/server.cpp
+++ b/tests/Bug_2768_Regression/server.cpp
@@ -28,10 +28,10 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
-                                                                                           
+
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
diff --git a/tests/Bug_2791_Regression/Makefile.am b/tests/Bug_2791_Regression/Makefile.am
deleted file mode 100644
index 34330f760d5..00000000000
--- a/tests/Bug_2791_Regression/Makefile.am
+++ /dev/null
@@ -1,79 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2791_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  MessageC.cpp \
-  MessageC.h \
-  MessageC.inl \
-  MessageS.h \
-  MessageS.inl
-
-CLEANFILES = \
-  Message-stamp \
-  MessageC.cpp \
-  MessageC.h \
-  MessageC.inl \
-  MessageS.h \
-  MessageS.inl
-
-MessageC.cpp MessageC.h MessageC.inl MessageS.h MessageS.inl: Message-stamp
-
-Message-stamp: $(srcdir)/Message.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Message.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  MessageC.cpp \
-  MessageFactory.cpp \
-  Message_i.cpp \
-  client.cpp \
-  MessageC.h \
-  MessageC.inl \
-  MessageFactory.h \
-  MessageS.h \
-  MessageS.inl \
-  Message_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2791_Regression/Message.idl b/tests/Bug_2791_Regression/Message.idl
index 728fed86e73..0afd8fb1f25 100755
--- a/tests/Bug_2791_Regression/Message.idl
+++ b/tests/Bug_2791_Regression/Message.idl
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 
 valuetype Message
 {
diff --git a/tests/Bug_2791_Regression/MessageFactory.cpp b/tests/Bug_2791_Regression/MessageFactory.cpp
index 82ad8a649bb..742028a19f9 100755
--- a/tests/Bug_2791_Regression/MessageFactory.cpp
+++ b/tests/Bug_2791_Regression/MessageFactory.cpp
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 
 #include "MessageFactory.h"
 
diff --git a/tests/Bug_2791_Regression/Message_i.cpp b/tests/Bug_2791_Regression/Message_i.cpp
index d4b5ab0b38a..c66bffc6d72 100755
--- a/tests/Bug_2791_Regression/Message_i.cpp
+++ b/tests/Bug_2791_Regression/Message_i.cpp
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 
 #include "Message_i.h"
 
diff --git a/tests/Bug_2791_Regression/Message_i.h b/tests/Bug_2791_Regression/Message_i.h
index abaf59570fb..fd5c3c4d61a 100755
--- a/tests/Bug_2791_Regression/Message_i.h
+++ b/tests/Bug_2791_Regression/Message_i.h
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 
 #include "MessageC.h"
 #include "tao/corba.h"
diff --git a/tests/Bug_2791_Regression/README b/tests/Bug_2791_Regression/README
index 62d67c6dc92..fa4c08553c1 100755
--- a/tests/Bug_2791_Regression/README
+++ b/tests/Bug_2791_Regression/README
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 
 This test confirms that the reference count for a valuetype factory is decremented when the
 valuetype factory is unregistered via ORB::unregister_value_factory().  Before, the reference
diff --git a/tests/Bug_2792_Regression/Makefile.am b/tests/Bug_2792_Regression/Makefile.am
deleted file mode 100644
index c7dd49276b4..00000000000
--- a/tests/Bug_2792_Regression/Makefile.am
+++ /dev/null
@@ -1,44 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2792_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp
-
-client_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/tests/Bug_2792_Regression/client.cpp b/tests/Bug_2792_Regression/client.cpp
index 139fc1df7c9..087c31ecc6d 100644
--- a/tests/Bug_2792_Regression/client.cpp
+++ b/tests/Bug_2792_Regression/client.cpp
@@ -3,10 +3,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/StringSeqC.h"
 
-ACE_RCSID(Bug_2792_Regression,
-          client,
-          "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/Bug_2795_Regression/Makefile.am b/tests/Bug_2795_Regression/Makefile.am
deleted file mode 100644
index 81cf3d839af..00000000000
--- a/tests/Bug_2795_Regression/Makefile.am
+++ /dev/null
@@ -1,44 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2795_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp
-
-client_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/tests/Bug_2795_Regression/client.cpp b/tests/Bug_2795_Regression/client.cpp
index 449843bb5e9..3a76a108054 100644
--- a/tests/Bug_2795_Regression/client.cpp
+++ b/tests/Bug_2795_Regression/client.cpp
@@ -3,10 +3,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/StringSeqC.h"
 
-ACE_RCSID(Bug_2795_Regression,
-          client,
-          "$Id$")
-
 void
 StringOutTest (CORBA::String_out so)
 {
diff --git a/tests/Bug_2804_Regression/Hello.cpp b/tests/Bug_2804_Regression/Hello.cpp
index eb2603dd591..46043d0d3ee 100644
--- a/tests/Bug_2804_Regression/Hello.cpp
+++ b/tests/Bug_2804_Regression/Hello.cpp
@@ -2,12 +2,6 @@
 
 #include "Hello.h"
 
-
-ACE_RCSID (Recursive,
-           Hello,
-           "$Id$")
-
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_2804_Regression/Makefile.am b/tests/Bug_2804_Regression/Makefile.am
deleted file mode 100644
index d7287754ca1..00000000000
--- a/tests/Bug_2804_Regression/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2804_Regression_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2804_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2804_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2804_Regression/client.cpp b/tests/Bug_2804_Regression/client.cpp
index 547618b0e34..1fbc7867687 100644
--- a/tests/Bug_2804_Regression/client.cpp
+++ b/tests/Bug_2804_Regression/client.cpp
@@ -9,12 +9,6 @@
 #include <algorithm>
 #include <functional>
 
-
-ACE_RCSID (Recursive,
-           client,
-           "$Id$")
-
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/tests/Bug_2804_Regression/server.cpp b/tests/Bug_2804_Regression/server.cpp
index c1d8bd1bb30..ab19d0fb0a7 100644
--- a/tests/Bug_2804_Regression/server.cpp
+++ b/tests/Bug_2804_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2805_Regression/Makefile.am b/tests/Bug_2805_Regression/Makefile.am
deleted file mode 100644
index 89c057b9d85..00000000000
--- a/tests/Bug_2805_Regression/Makefile.am
+++ /dev/null
@@ -1,97 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2805_Regression_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-CLEANFILES = \
-  ami_test-stamp \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp
-
-ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ami_test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_2805_Regression_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  ami_test_i.cpp \
-  client.cpp \
-  ami_test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2805_Regression/ami_test_i.cpp b/tests/Bug_2805_Regression/ami_test_i.cpp
index c019047248b..1c6fc7253b7 100644
--- a/tests/Bug_2805_Regression/ami_test_i.cpp
+++ b/tests/Bug_2805_Regression/ami_test_i.cpp
@@ -17,8 +17,6 @@
 #include "ami_test_i.h"
 #include "tao/debug.h"
 
-ACE_RCSID(AMI, ami_test_i, "$Id$")
-
 AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb,
                         CORBA::Long in_l,
                         const char * in_str,
diff --git a/tests/Bug_2805_Regression/client.cpp b/tests/Bug_2805_Regression/client.cpp
index fde5ffcc212..28b5c3d04b8 100644
--- a/tests/Bug_2805_Regression/client.cpp
+++ b/tests/Bug_2805_Regression/client.cpp
@@ -21,10 +21,6 @@
 #include "ace/OS_NS_Thread.h"
 #include "ami_test_i.h"
 
-ACE_RCSID (AMI,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
 int niterations = 5;
@@ -68,7 +64,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2809_Regression/Makefile.am b/tests/Bug_2809_Regression/Makefile.am
deleted file mode 100644
index 4e061fa3beb..00000000000
--- a/tests/Bug_2809_Regression/Makefile.am
+++ /dev/null
@@ -1,46 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2809_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2826_Regression/Makefile.am b/tests/Bug_2826_Regression/Makefile.am
deleted file mode 100644
index 56a2faac25f..00000000000
--- a/tests/Bug_2826_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2826_Regression.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  fooC.cpp \
-  fooC.h \
-  fooC.inl \
-  fooS.cpp \
-  fooS.h \
-  fooS.inl
-
-CLEANFILES = \
-  foo-stamp \
-  fooC.cpp \
-  fooC.h \
-  fooC.inl \
-  fooS.cpp \
-  fooS.h \
-  fooS.inl
-
-fooC.cpp fooC.h fooC.inl fooS.cpp fooS.h fooS.inl: foo-stamp
-
-foo-stamp: $(srcdir)/foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/foo.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  bug_2826_regression.cpp \
-  fooC.cpp \
-  fooS.cpp \
-  fooC.h \
-  fooC.inl \
-  fooS.h \
-  fooS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_2826_Regression/bug_2826_regression.cpp b/tests/Bug_2826_Regression/bug_2826_regression.cpp
index 955ef36251f..05d902509df 100644
--- a/tests/Bug_2826_Regression/bug_2826_regression.cpp
+++ b/tests/Bug_2826_Regression/bug_2826_regression.cpp
@@ -4,9 +4,6 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "fooS.h"
 
-ACE_RCSID (Bug_2826_Regression,
-           bug_2826_regression,
-           "$Id$")
 namespace
 {
 class Foo_i : public virtual POA_foo
diff --git a/tests/Bug_2844_Regression/Hello.cpp b/tests/Bug_2844_Regression/Hello.cpp
index eb2603dd591..46043d0d3ee 100644
--- a/tests/Bug_2844_Regression/Hello.cpp
+++ b/tests/Bug_2844_Regression/Hello.cpp
@@ -2,12 +2,6 @@
 
 #include "Hello.h"
 
-
-ACE_RCSID (Recursive,
-           Hello,
-           "$Id$")
-
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_2844_Regression/Makefile.am b/tests/Bug_2844_Regression/Makefile.am
deleted file mode 100644
index 0a6c8f80489..00000000000
--- a/tests/Bug_2844_Regression/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2844_Regression_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2844_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2844_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2844_Regression/client.cpp b/tests/Bug_2844_Regression/client.cpp
index f89dd4ed4a1..a3e741e3c9e 100644
--- a/tests/Bug_2844_Regression/client.cpp
+++ b/tests/Bug_2844_Regression/client.cpp
@@ -9,11 +9,6 @@
 #include <algorithm>
 #include <functional>
 
-
-ACE_RCSID (Recursive,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/tests/Bug_2844_Regression/server.cpp b/tests/Bug_2844_Regression/server.cpp
index c1d8bd1bb30..ab19d0fb0a7 100644
--- a/tests/Bug_2844_Regression/server.cpp
+++ b/tests/Bug_2844_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2869_Regression/Makefile.am b/tests/Bug_2869_Regression/Makefile.am
deleted file mode 100644
index 1a44e10a09c..00000000000
--- a/tests/Bug_2869_Regression/Makefile.am
+++ /dev/null
@@ -1,44 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2869_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp
-
-client_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/tests/Bug_2869_Regression/client.cpp b/tests/Bug_2869_Regression/client.cpp
index c0a27c7331d..290592ff2d7 100644
--- a/tests/Bug_2869_Regression/client.cpp
+++ b/tests/Bug_2869_Regression/client.cpp
@@ -5,8 +5,6 @@
 #include "tao/SystemException.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_2869_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/tests/Bug_2909_Regression/Makefile.am b/tests/Bug_2909_Regression/Makefile.am
deleted file mode 100644
index 3caf1b598ad..00000000000
--- a/tests/Bug_2909_Regression/Makefile.am
+++ /dev/null
@@ -1,97 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2909_Regression_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-CLEANFILES = \
-  ami_test-stamp \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp
-
-ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ami_test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.Bug_2909_Regression_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  ami_test_i.cpp \
-  client.cpp \
-  ami_test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2909_Regression/ami_test_i.cpp b/tests/Bug_2909_Regression/ami_test_i.cpp
index 9036fb90cbc..7b31c795f47 100644
--- a/tests/Bug_2909_Regression/ami_test_i.cpp
+++ b/tests/Bug_2909_Regression/ami_test_i.cpp
@@ -15,8 +15,6 @@
 #include "ami_test_i.h"
 #include "tao/debug.h"
 
-ACE_RCSID(AMI, ami_test_i, "$Id$")
-
 AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_2909_Regression/client.cpp b/tests/Bug_2909_Regression/client.cpp
index 3986f708f0b..0c00328eb04 100644
--- a/tests/Bug_2909_Regression/client.cpp
+++ b/tests/Bug_2909_Regression/client.cpp
@@ -19,10 +19,6 @@
 #include "ace/Synch_Traits.h"
 #include "ami_test_i.h"
 
-ACE_RCSID (AMI,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 1;
 int niterations = 2;
@@ -64,7 +60,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2918_Regression/Hello.cpp b/tests/Bug_2918_Regression/Hello.cpp
index eb2603dd591..46043d0d3ee 100644
--- a/tests/Bug_2918_Regression/Hello.cpp
+++ b/tests/Bug_2918_Regression/Hello.cpp
@@ -2,12 +2,6 @@
 
 #include "Hello.h"
 
-
-ACE_RCSID (Recursive,
-           Hello,
-           "$Id$")
-
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_2918_Regression/Makefile.am b/tests/Bug_2918_Regression/Makefile.am
deleted file mode 100644
index 86311025853..00000000000
--- a/tests/Bug_2918_Regression/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2918_Regression_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2918_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2918_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2918_Regression/client.cpp b/tests/Bug_2918_Regression/client.cpp
index 803970452ba..cc5dc2a72dd 100644
--- a/tests/Bug_2918_Regression/client.cpp
+++ b/tests/Bug_2918_Regression/client.cpp
@@ -3,18 +3,11 @@
 #include "TestC.h"
 #include "tao/IFR_Client/IFR_BaseC.h"
 #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
-
 #include "ace/Get_Opt.h"
 
 #include <algorithm>
 #include <functional>
 
-
-ACE_RCSID (Recursive,
-           client,
-           "$Id$")
-
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/tests/Bug_2918_Regression/server.cpp b/tests/Bug_2918_Regression/server.cpp
index c1d8bd1bb30..ab19d0fb0a7 100644
--- a/tests/Bug_2918_Regression/server.cpp
+++ b/tests/Bug_2918_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2935_Regression/Makefile.am b/tests/Bug_2935_Regression/Makefile.am
deleted file mode 100644
index 8c999ce38f1..00000000000
--- a/tests/Bug_2935_Regression/Makefile.am
+++ /dev/null
@@ -1,133 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2935_Regression_IDL.am
-
-BUILT_SOURCES = \
-  ThreeTierC.cpp \
-  ThreeTierC.h \
-  ThreeTierC.inl \
-  ThreeTierS.cpp \
-  ThreeTierS.h \
-  ThreeTierS.inl
-
-CLEANFILES = \
-  ThreeTier-stamp \
-  ThreeTierC.cpp \
-  ThreeTierC.h \
-  ThreeTierC.inl \
-  ThreeTierS.cpp \
-  ThreeTierS.h \
-  ThreeTierS.inl
-
-ThreeTierC.cpp ThreeTierC.h ThreeTierC.inl ThreeTierS.cpp ThreeTierS.h ThreeTierS.inl: ThreeTier-stamp
-
-ThreeTier-stamp: $(srcdir)/ThreeTier.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ThreeTier.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ThreeTier.idl
-
-## Makefile.Bug_2935_Regression_Middle.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += middle
-
-middle_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-middle_SOURCES = \
-  ThreeTierC.cpp \
-  ThreeTierS.cpp \
-  middle.cpp \
-  middle_i.cpp \
-  middle_i.h
-
-middle_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2935_Regression_Sink.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += sink
-
-sink_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-sink_SOURCES = \
-  ThreeTierC.cpp \
-  ThreeTierS.cpp \
-  sink.cpp \
-  sink_i.cpp \
-  sink_i.h
-
-sink_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2935_Regression_Source.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += source
-
-source_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-source_SOURCES = \
-  ThreeTierC.cpp \
-  source.cpp \
-  source_i.cpp \
-  source_i.h
-
-source_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/tests/Bug_2935_Regression/README.txt b/tests/Bug_2935_Regression/README.txt
index d90fcb5a624..141af0bd2d9 100644
--- a/tests/Bug_2935_Regression/README.txt
+++ b/tests/Bug_2935_Regression/README.txt
@@ -1,11 +1,11 @@
 ThreeTier Test.
 
-This test was added in response to the bugs reported in bugzilla entries 
-  2934: -ORBMuxedConnectionMax didn't work correctly, and 
-  2935: too many connections to a server are opened in nested-upcall or 
-        multithreaed situations. 
-        
-        
+This test was added in response to the bugs reported in bugzilla entries
+  2934: -ORBMuxedConnectionMax didn't work correctly, and
+  2935: too many connections to a server are opened in nested-upcall or
+        multithreaed situations.
+
+
 The test consists of three processes, source sends requests,
 middle passes the requests on, and sink actually processes the requests.
 Because source operates as fast as possible and sink has a delay, the
@@ -19,7 +19,7 @@ peer connections that were logged.   There should be exactly one.
 
 As an aside, these three processes have been very useful in testing various
 middle tier issues.  Of course the best way to address this middle tier type
-of application is thru a mixture of AMH and AMI, but that's a topic for a 
+of application is thru a mixture of AMH and AMI, but that's a topic for a
 different test.
 
 Dale Wilson <wilsond@ociweb.com>
\ No newline at end of file
diff --git a/tests/Bug_2935_Regression/middle.conf b/tests/Bug_2935_Regression/middle.conf
index b8a982933f3..0d02a4d9eea 100644
--- a/tests/Bug_2935_Regression/middle.conf
+++ b/tests/Bug_2935_Regression/middle.conf
@@ -1 +1,3 @@
+# $Id$
+
 static Resource_Factory "-ORBMuxedConnectionMax 1"
diff --git a/tests/Bug_2935_Regression/middle_i.cpp b/tests/Bug_2935_Regression/middle_i.cpp
index ef8c2b2cfd6..64e42e26d61 100644
--- a/tests/Bug_2935_Regression/middle_i.cpp
+++ b/tests/Bug_2935_Regression/middle_i.cpp
@@ -4,8 +4,6 @@
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Time, Middle_i, "$Id$")
-
 Middle_i::Middle_i (CORBA::ORB_ptr orb, ThreeTier_ptr target)
   : orb_(CORBA::ORB::_duplicate (orb))
   , target_(ThreeTier::_duplicate (target))
diff --git a/tests/Bug_2935_Regression/middle_i.h b/tests/Bug_2935_Regression/middle_i.h
index 74de26395d4..08ef48d788f 100644
--- a/tests/Bug_2935_Regression/middle_i.h
+++ b/tests/Bug_2935_Regression/middle_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/time
-//
-// = FILENAME
-//    middle_i.h
-//
-// = DESCRIPTION
-//    This class implements the Time IDL interface.
-//
-// = AUTHOR
-//    Darrell Brunsch <brunsch@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    middle_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Time IDL interface.
+ *
+ *
+ *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef MIDDLE_I_H
 #define MIDDLE_I_H
@@ -23,15 +20,16 @@
 #include "ThreeTierC.h"
 #include "ThreeTierS.h"
 
+/**
+ * @class Middle_i:
+ *
+ * @brief ThreeTier Object Implementation as middle
+ *
+ * The middle implementaiton of the ThreeTier interface simply
+ * forwards requests to
+ */
 class Middle_i: public POA_ThreeTier
 {
-  // = TITLE
-  //    ThreeTier Object Implementation as middle
-  //
-  // = DESCRIPTION
-  //    The middle implementaiton of the ThreeTier interface simply
-  //    forwards requests to
-  //
 public:
   Middle_i (CORBA::ORB_ptr orb, ThreeTier_ptr target);
   ~Middle_i ();
diff --git a/tests/Bug_2935_Regression/run_test.pl b/tests/Bug_2935_Regression/run_test.pl
index 46c636eea08..64a4acd9aa6 100755
--- a/tests/Bug_2935_Regression/run_test.pl
+++ b/tests/Bug_2935_Regression/run_test.pl
@@ -18,7 +18,7 @@ sub count_matching_lines {
    }
    close FILE;
    return $count;
-} 
+}
 
 $status = 0;
 
diff --git a/tests/Bug_2935_Regression/sink_i.cpp b/tests/Bug_2935_Regression/sink_i.cpp
index fc65bbcfe97..02411772fb6 100644
--- a/tests/Bug_2935_Regression/sink_i.cpp
+++ b/tests/Bug_2935_Regression/sink_i.cpp
@@ -2,7 +2,6 @@
 
 #include "sink_i.h"
 #include "ace/OS_NS_unistd.h"
-ACE_RCSID(Sink, Sink_i, "$Id$")
 
 // Constructor
 Sink_i::Sink_i (CORBA::ORB_ptr orb)
diff --git a/tests/Bug_2935_Regression/sink_i.h b/tests/Bug_2935_Regression/sink_i.h
index 4b184c09e8f..5d986e5084d 100644
--- a/tests/Bug_2935_Regression/sink_i.h
+++ b/tests/Bug_2935_Regression/sink_i.h
@@ -1,23 +1,19 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/ThreeTier
-//
-// = FILENAME
-//    Sink_i.h
-//
-// = DESCRIPTION
-//    This class implements the ThreeTier IDL interface.
-//    It acts as the "end of the line" for tick and tock
-//    requests.
-//
-// = AUTHOR
-//    Dale Wilson <wilsond@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sink_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the ThreeTier IDL interface.
+ *  It acts as the "end of the line" for tick and tock
+ *  requests.
+ *
+ *  @author Dale Wilson <wilsond@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef SINK_I_H
 #define SINK_I_H
@@ -31,8 +27,8 @@ public:
   /// @param an initialized ORB
   Sink_i (CORBA::ORB_ptr orb);
 
+  /// Destructor
   ~Sink_i ();
-  // Destructor
 
   bool parse_args (int & argc, ACE_TCHAR * argv[]);
 
diff --git a/tests/Bug_2935_Regression/source_i.h b/tests/Bug_2935_Regression/source_i.h
index add472917c2..7c1e423ff82 100644
--- a/tests/Bug_2935_Regression/source_i.h
+++ b/tests/Bug_2935_Regression/source_i.h
@@ -1,35 +1,34 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/ThreeTier
-//
-// = FILENAME
-//    source_i.h
-//
-// = DESCRIPTION
-//    This class implements the source for a three tier system
-//    Adapted from TAO/examples/Simple/time
-//
-// = AUTHOR
-//   Dale Wilson <wilsond@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    source_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the source for a three tier system
+ *  Adapted from TAO/examples/Simple/time
+ *
+ *
+ *  @author Dale Wilson <wilsond@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef SOURCE_I_H
 #define SOURCE_I_H
 
 #include "ThreeTierC.h"
 
+/**
+ * @class Source_i
+ *
+ * @brief Source interface subclass.
+ *
+ * a source of data for the three tier test
+ */
 class Source_i
 {
-  // = TITLE
-  //   Source interface subclass.
-  //
-  // = DESCRIPTION
-  // a source of data for the three tier test
 public:
   Source_i (ThreeTier_ptr target);
 
@@ -37,8 +36,8 @@ public:
 
   bool parse_args(int argc, ACE_TCHAR *argv[]);
 
+  /// Execute the methods
   int run ();
-  // Execute the methods
 
 private:
   ThreeTier_var target_;
diff --git a/tests/Bug_2936_Regression/DllORB.cpp b/tests/Bug_2936_Regression/DllORB.cpp
index 77e0d78b0a8..4abd4b6e9ca 100644
--- a/tests/Bug_2936_Regression/DllORB.cpp
+++ b/tests/Bug_2936_Regression/DllORB.cpp
@@ -90,8 +90,7 @@ DllORB::init (int argc, ACE_TCHAR *argv[])
         }
 
       // Initialize the ORB
-      ACE_Argv_Type_Converter argcon (argc, argv);
-      mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ());
+      mv_orb_ = CORBA::ORB_init (argc, argv);
       if (CORBA::is_nil (mv_orb_.in ()))
         {
           ACE_DEBUG ((LM_ERROR, ACE_TEXT ("nil ORB\n")));
diff --git a/tests/Bug_2936_Regression/Makefile.am b/tests/Bug_2936_Regression/Makefile.am
deleted file mode 100644
index 5b5ebca513e..00000000000
--- a/tests/Bug_2936_Regression/Makefile.am
+++ /dev/null
@@ -1,65 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.bug2936_exe.am
-
-noinst_PROGRAMS = bug2936
-
-bug2936_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
-
-bug2936_SOURCES = \
-  bug2936.cpp \
-  DllORB.h \
-  PersistentPOA.h \
-  bug2936_export.h
-
-bug2936_LDADD = \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Makefile.bug2936_lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_LTLIBRARIES = libbug2936.la
-
-libbug2936_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DBUG2936_BUILD_DLL
-
-libbug2936_la_SOURCES = \
-  DllORB.cpp \
-  PersistentPOA.cpp
-
-noinst_HEADERS = \
-  DllORB.h \
-  PersistentPOA.h
-
-endif BUILD_THREADS
-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/tests/Bug_2936_Regression/bug2936.cpp b/tests/Bug_2936_Regression/bug2936.cpp
index dd7c7a4790d..bd982c6a498 100644
--- a/tests/Bug_2936_Regression/bug2936.cpp
+++ b/tests/Bug_2936_Regression/bug2936.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "ace/OS.h"
 #include "ace/Service_Config.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_unistd.h"
 
 char const * const scpc_orbId = "testDllOrb";
 
@@ -43,7 +43,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_loadPersistentPoa);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - loading PersistentPoa done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - loading PersistentPoa done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -60,7 +61,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadPersistentPoa);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading PersistentPoa done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading PersistentPoa done. Result: <%d>\n"),
+    result
   ));
 
   ACE_DEBUG((
@@ -70,7 +72,8 @@ void loadunloadcycle()
   result = ACE_Service_Config::process_directive(scpc_unloadOrb);
   ACE_DEBUG((
     LM_DEBUG,
-    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n")
+    ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"),
+    result
   ));
 }
 
diff --git a/tests/Bug_2953_Regression/Client_Task.cpp b/tests/Bug_2953_Regression/Client_Task.cpp
index 70a7d6d3414..560ac417b3b 100644
--- a/tests/Bug_2953_Regression/Client_Task.cpp
+++ b/tests/Bug_2953_Regression/Client_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(AMI_Buffering, Client_Task, "$Id$")
-
 Client_Task::Client_Task (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
   , terminate_loop_ (0)
diff --git a/tests/Bug_2953_Regression/Makefile.am b/tests/Bug_2953_Regression/Makefile.am
deleted file mode 100644
index 077200589b3..00000000000
--- a/tests/Bug_2953_Regression/Makefile.am
+++ /dev/null
@@ -1,118 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2953_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2953_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2953_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Client_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/Bug_2953_Regression/client.cpp b/tests/Bug_2953_Regression/client.cpp
index bf0b141c13f..191196967d4 100644
--- a/tests/Bug_2953_Regression/client.cpp
+++ b/tests/Bug_2953_Regression/client.cpp
@@ -52,7 +52,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2953_Regression/run_test.pl b/tests/Bug_2953_Regression/run_test.pl
index e05cbec53be..817025c6911 100755
--- a/tests/Bug_2953_Regression/run_test.pl
+++ b/tests/Bug_2953_Regression/run_test.pl
@@ -14,7 +14,7 @@ $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";
@@ -49,7 +49,7 @@ if ($server->WaitForFileTimed ($iorbaseA,
     print STDERR "ERROR: cannot find file <$server_iorfileA>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
-} 
+}
 
 $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval ());
 
diff --git a/tests/Bug_2953_Regression/server.cpp b/tests/Bug_2953_Regression/server.cpp
index 0e6d4e2e311..92e3b2d1ee7 100644
--- a/tests/Bug_2953_Regression/server.cpp
+++ b/tests/Bug_2953_Regression/server.cpp
@@ -75,7 +75,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2966_Regression/Hello.cpp b/tests/Bug_2966_Regression/Hello.cpp
index df5dc90d3d9..ec53524c2f8 100644
--- a/tests/Bug_2966_Regression/Hello.cpp
+++ b/tests/Bug_2966_Regression/Hello.cpp
@@ -1,9 +1,7 @@
-//
+// -*- C++ -*-
 // $Id$
-//
-#include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+#include "Hello.h"
 
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/tests/Bug_2966_Regression/Makefile.am b/tests/Bug_2966_Regression/Makefile.am
deleted file mode 100644
index 0f5809752b2..00000000000
--- a/tests/Bug_2966_Regression/Makefile.am
+++ /dev/null
@@ -1,127 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2966_Regression_Idl.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2966_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2966_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_2966_Regression/client.cpp b/tests/Bug_2966_Regression/client.cpp
index 5991a418b53..4327c459b67 100644
--- a/tests/Bug_2966_Regression/client.cpp
+++ b/tests/Bug_2966_Regression/client.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/DynamicInterface/Request.h"
@@ -6,8 +7,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -32,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_2966_Regression/server.cpp b/tests/Bug_2966_Regression/server.cpp
index 8dc401a83ab..4f70fadd052 100644
--- a/tests/Bug_2966_Regression/server.cpp
+++ b/tests/Bug_2966_Regression/server.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "Hello.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3000_Regression/Callback.cpp b/tests/Bug_3000_Regression/Callback.cpp
index 5e34adf0b2a..aea07d5c0da 100644
--- a/tests/Bug_3000_Regression/Callback.cpp
+++ b/tests/Bug_3000_Regression/Callback.cpp
@@ -3,8 +3,6 @@
 //
 #include "Callback.h"
 
-ACE_RCSID(Callback, Callback, "$Id$")
-
 Callback::Callback (void)
   : received_callback_ (false)
 {
diff --git a/tests/Bug_3000_Regression/Makefile.am b/tests/Bug_3000_Regression/Makefile.am
deleted file mode 100644
index b27da96b46f..00000000000
--- a/tests/Bug_3000_Regression/Makefile.am
+++ /dev/null
@@ -1,121 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_3000_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_3000_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Callback.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Callback.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_3000_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Service.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Service.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_3000_Regression/Service.cpp b/tests/Bug_3000_Regression/Service.cpp
index 41c538898bb..c9c3e0241dc 100644
--- a/tests/Bug_3000_Regression/Service.cpp
+++ b/tests/Bug_3000_Regression/Service.cpp
@@ -3,8 +3,6 @@
 //
 #include "Service.h"
 
-ACE_RCSID(Callback, Service, "$Id$")
-
 Service::Service (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3000_Regression/client.cpp b/tests/Bug_3000_Regression/client.cpp
index 66df617c9e5..1ae58f54545 100644
--- a/tests/Bug_3000_Regression/client.cpp
+++ b/tests/Bug_3000_Regression/client.cpp
@@ -6,8 +6,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Crashed_Callback, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 bool shutdown_server = false;
 
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3000_Regression/rw.conf b/tests/Bug_3000_Regression/rw.conf
index 0117a350fdd..7bf9e4b052e 100644
--- a/tests/Bug_3000_Regression/rw.conf
+++ b/tests/Bug_3000_Regression/rw.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked"
 static Resource_Factory "-ORBFlushingStrategy blocking"
diff --git a/tests/Bug_3000_Regression/server.cpp b/tests/Bug_3000_Regression/server.cpp
index 45342dcb539..173ceb780e0 100644
--- a/tests/Bug_3000_Regression/server.cpp
+++ b/tests/Bug_3000_Regression/server.cpp
@@ -7,8 +7,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Crashed_Callback, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3042_Regression/Makefile.am b/tests/Bug_3042_Regression/Makefile.am
deleted file mode 100644
index 2d6226140bd..00000000000
--- a/tests/Bug_3042_Regression/Makefile.am
+++ /dev/null
@@ -1,76 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_3042_Test_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_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/tests/Bug_3042_Regression/client.cpp b/tests/Bug_3042_Regression/client.cpp
index 568574dec1d..857ee60a427 100644
--- a/tests/Bug_3042_Regression/client.cpp
+++ b/tests/Bug_3042_Regression/client.cpp
@@ -1,12 +1,9 @@
 // -*- C++ -*-
+// $Id$
 
 #include "testC.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (BoundedSeq,
-           client,
-           "$Id$")
-
 int
 ACE_TMAIN(int, ACE_TCHAR *[])
 {
diff --git a/tests/Bug_3042_Regression/test.idl b/tests/Bug_3042_Regression/test.idl
index 87dcf77a171..219ef29ed7c 100644
--- a/tests/Bug_3042_Regression/test.idl
+++ b/tests/Bug_3042_Regression/test.idl
@@ -14,8 +14,12 @@
 
 module Foo
 {
+  struct Node;
+
+  typedef sequence <Node,5> nodesequence;
+
   struct Node {
-    sequence <Node,5> nodes;
+    nodesequence nodes;
   };
 
 };
diff --git a/tests/Bug_3068_Regression/Bug_3068_Regression.mpc b/tests/Bug_3068_Regression/Bug_3068_Regression.mpc
index 91440ec2c96..98bf591d37f 100644
--- a/tests/Bug_3068_Regression/Bug_3068_Regression.mpc
+++ b/tests/Bug_3068_Regression/Bug_3068_Regression.mpc
@@ -9,6 +9,8 @@ project(*Server): taoserver, messaging, bidir_giop, threads {
 
 project(*Client): taoserver, bidir_giop, threads {
   exename = client
+  after  += *Server
+
   Source_Files {
     test_i.cpp
     client.cpp
diff --git a/tests/Bug_3068_Regression/client.conf b/tests/Bug_3068_Regression/client.conf
index 57a8c2df132..0b274e1b02d 100644
--- a/tests/Bug_3068_Regression/client.conf
+++ b/tests/Bug_3068_Regression/client.conf
@@ -1 +1,3 @@
+# $Id$
+
 static Client_Strategy_Factory "-ORBConnectStrategy blocked"
diff --git a/tests/Bug_3068_Regression/client.cpp b/tests/Bug_3068_Regression/client.cpp
index c61101acf34..61e0b2755ea 100644
--- a/tests/Bug_3068_Regression/client.cpp
+++ b/tests/Bug_3068_Regression/client.cpp
@@ -8,8 +8,6 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 
-ACE_RCSID (Bug_3068_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("usage: %s -k <ior>\n"),
                            argv [0]), -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3068_Regression/run_test.pl b/tests/Bug_3068_Regression/run_test.pl
index 2ec2e3aa918..74ef14252e6 100755
--- a/tests/Bug_3068_Regression/run_test.pl
+++ b/tests/Bug_3068_Regression/run_test.pl
@@ -38,7 +38,7 @@ $SV = $server->CreateProcess ("server",
 $CL = $client->CreateProcess ("client",
                               "-ORBSvcConf $client_conf " .
                               "-k file://$client_iorfile");
-                              
+
 $server_status = $SV->Spawn ();
 
 if ($server_status != 0) {
diff --git a/tests/Bug_3068_Regression/server.conf b/tests/Bug_3068_Regression/server.conf
index f39d729f6d4..d85c5c22234 100644
--- a/tests/Bug_3068_Regression/server.conf
+++ b/tests/Bug_3068_Regression/server.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static Resource_Factory "-ORBMuxedConnectionMax 1"
 
 static Client_Strategy_Factory "-ORBTransportMuxStrategy muxed -ORBConnectStrategy blocked"
diff --git a/tests/Bug_3068_Regression/server.cpp b/tests/Bug_3068_Regression/server.cpp
index 3708cb7eabe..6b7f44cde8a 100644
--- a/tests/Bug_3068_Regression/server.cpp
+++ b/tests/Bug_3068_Regression/server.cpp
@@ -8,8 +8,6 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 
-ACE_RCSID (Bug_3068_Regression, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 int iterations = 10;
 
@@ -34,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            ACE_TEXT ("-i <iterations>\n"), argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3068_Regression/test_i.cpp b/tests/Bug_3068_Regression/test_i.cpp
index 0aed21b49f2..863770e0ec1 100644
--- a/tests/Bug_3068_Regression/test_i.cpp
+++ b/tests/Bug_3068_Regression/test_i.cpp
@@ -12,8 +12,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Bug_3068_Regression, test_i, "$Id$")
-
 void
 Callback_i::shutdown ()
 {
diff --git a/tests/Bug_3068_Regression/test_i.h b/tests/Bug_3068_Regression/test_i.h
index c45883f3268..461312294b9 100644
--- a/tests/Bug_3068_Regression/test_i.h
+++ b/tests/Bug_3068_Regression/test_i.h
@@ -1,18 +1,15 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/BiDirectional
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_BIDIRECTIONAL_TEST_I_H
 #define TAO_BIDIRECTIONAL_TEST_I_H
@@ -20,6 +17,7 @@
 #include "testS.h"
 #include "ace/Task.h"
 #include "ace/Synch.h"
+#include "ace/Condition_T.h"
 
 class Caller : public ACE_Task_Base
 {
@@ -39,43 +37,46 @@ private:
 };
 
 
+/**
+ * @class Callback_i
+ *
+ * @brief A callback object to the "client"
+ *
+ * To test that the server can call the client on the same
+ * connection that was established by the client
+ */
 class Callback_i : public POA_Callback
 {
-  // = TITLE
-  //   A callback object to the "client"
-  //
-  // = DESCRIPTION
-  //   To test that the server can call the client on the same
-  //   connection that was established by the client
-  //
 public:
+  /// ctor
   Callback_i (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// Safe way to shutdown
   void shutdown ();
-  // Safe way to shutdown
 
+  /// The callback method
   void callback_method (const CORBA::OctetSeq& payload);
-  // The callback method
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 
 };
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ * for (int loop = 0; loop < 10; loop++)
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //      for (int loop = 0; loop < 10; loop++)
 
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations);
-  // ctor
 
   // = The Simple_Server methods.
   void ow_test ();
@@ -87,17 +88,17 @@ public:
   void shutdown ();
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
+  /// Flag to indicate, whether we are ready for a remote call.
   int flag_;
-  // Flag to indicate, whether we are ready for a remote call.
 
+  /// Callback Object
   Caller *caller_;
-  // Callback Object
 
+  /// Number of times the callback needs to be called
   int iterations_;
-  // Number of times the callback needs to be called
   int ow_count_;
 };
 
diff --git a/tests/Bug_3108_Regression/Makefile.am b/tests/Bug_3108_Regression/Makefile.am
deleted file mode 100644
index 80b6c1b461b..00000000000
--- a/tests/Bug_3108_Regression/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_3108_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_3108_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_3108_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_3108_Regression/client.cpp b/tests/Bug_3108_Regression/client.cpp
index d1ef852bb60..51c34104576 100644
--- a/tests/Bug_3108_Regression/client.cpp
+++ b/tests/Bug_3108_Regression/client.cpp
@@ -39,7 +39,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3108_Regression/server.cpp b/tests/Bug_3108_Regression/server.cpp
index dd6f368ff78..05b6a2fd0bb 100644
--- a/tests/Bug_3108_Regression/server.cpp
+++ b/tests/Bug_3108_Regression/server.cpp
@@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3154_Regression/test.idl b/tests/Bug_3154_Regression/test.idl
index e4ec773839e..6534517b2cd 100644
--- a/tests/Bug_3154_Regression/test.idl
+++ b/tests/Bug_3154_Regression/test.idl
@@ -147,7 +147,7 @@ module FT
       * creation of a member of an object group, and to determine where the member
       * is created.
       *
-      * @param object_group Reference for the object group to which the member is 
+      * @param object_group Reference for the object group to which the member is
       * to be added.
       * @param the_location The physical location.
       * @param type_id The repository identifier for the type of the object.
@@ -167,10 +167,10 @@ module FT
              CannotMeetCriteria);
 
      /**
-      * This operation allows an application to add an existing object to an object 
+      * This operation allows an application to add an existing object to an object
       * group at a particular location.
       *
-      * @param object_group Reference for the object group to which the existing object 
+      * @param object_group Reference for the object group to which the existing object
       * is to be added.
       * @param the_location The physical location of the object to be added.
       * @param member The reference of the object to be added.
@@ -184,10 +184,10 @@ module FT
              ObjectNotAdded);
 
      /**
-      * This operation allows an application to remove a member from an object 
+      * This operation allows an application to remove a member from an object
       * group at a particular location.
       *
-      * @param object_group Reference for the object group to which the member 
+      * @param object_group Reference for the object group to which the member
       * is to be removed.
       * @param the_location The physical location of the member to be removed.
       *
@@ -196,17 +196,17 @@ module FT
     ObjectGroup remove_member(in ObjectGroup object_group)
       raises(ObjectGroupNotFound,
              MemberNotFound);
-     
+
      /**
-      * This operation allows the application to select the member of the object group 
+      * This operation allows the application to select the member of the object group
       * that is to be the primary.
       *
-      * @param object_group Reference for the object group whose primary is to be 
+      * @param object_group Reference for the object group whose primary is to be
       * determined.
-      * @param the_location The physical location of the member that is to become 
+      * @param the_location The physical location of the member that is to become
       * the primary.
       *
-      * @return The object group reference with the primary member at the given 
+      * @return The object group reference with the primary member at the given
       * location.
       */
     ObjectGroup set_primary_member(in ObjectGroup object_group)
@@ -235,18 +235,18 @@ module FT
     typedef any FactoryCreationId;
 
      /**
-      * This operation creates an object or an object group, using the type_id 
+      * This operation creates an object or an object group, using the type_id
       * parameter to determine which type of object to create and the_criteria
-      * parameter to determine restrictions on how and where to create the object. 
+      * parameter to determine restrictions on how and where to create the object.
       *
-      * @param type_id The repository identifier of the object to be created by 
+      * @param type_id The repository identifier of the object to be created by
       * the factory.
-      * 
+      *
       * @param the_criteria Information passed to the factory, which the factory
       * evaluates before creating the object. Examples of criteria are initialization
       * values, constraints on the object, preferred location of the object, fault
       * tolerance properties for an object group, etc.
-      * 
+      *
       * @param factory_creation_id An identifier that allows the factory to delete
       * the object subsequently.
       *
diff --git a/tests/Bug_3163_Regression/Makefile.am b/tests/Bug_3163_Regression/Makefile.am
deleted file mode 100644
index 920e6c3c164..00000000000
--- a/tests/Bug_3163_Regression/Makefile.am
+++ /dev/null
@@ -1,102 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_3163_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_3163_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_3163_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_3163_Regression/client.cpp b/tests/Bug_3163_Regression/client.cpp
index 1517d590490..86471b52f52 100644
--- a/tests/Bug_3163_Regression/client.cpp
+++ b/tests/Bug_3163_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int message_size = 0;
 
@@ -32,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3163_Regression/server.conf b/tests/Bug_3163_Regression/server.conf
index 14378c72309..3246ec311c9 100644
--- a/tests/Bug_3163_Regression/server.conf
+++ b/tests/Bug_3163_Regression/server.conf
@@ -1,3 +1,5 @@
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock thread -ORBAllowReactivationOfSystemids 0"
+# $Id$
+
+static Server_Strategy_Factory "-ORBConcurrency reactive -ORBAllowReactivationOfSystemids 0"
 static Resource_Factory "-ORBConnectionCacheMax 10 -ORBNativeWcharCodeSet 0x00010109 -ORBFlushingStrategy blocking"
 static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1"
diff --git a/tests/Bug_3163_Regression/server.cpp b/tests/Bug_3163_Regression/server.cpp
index 02832ccdd8d..e3f2f63cbbb 100644
--- a/tests/Bug_3163_Regression/server.cpp
+++ b/tests/Bug_3163_Regression/server.cpp
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3171_Regression/Makefile.am b/tests/Bug_3171_Regression/Makefile.am
deleted file mode 100644
index 46b9bd57450..00000000000
--- a/tests/Bug_3171_Regression/Makefile.am
+++ /dev/null
@@ -1,55 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_3171_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_3171_Regression/server.cpp b/tests/Bug_3171_Regression/server.cpp
index 79c4b0c4ac8..39bbbf250ac 100644
--- a/tests/Bug_3171_Regression/server.cpp
+++ b/tests/Bug_3171_Regression/server.cpp
@@ -51,7 +51,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3198_Regression/Makefile.am b/tests/Bug_3198_Regression/Makefile.am
deleted file mode 100644
index 5be85cc8c4e..00000000000
--- a/tests/Bug_3198_Regression/Makefile.am
+++ /dev/null
@@ -1,44 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_3198_Regression.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  bug_3198_regression.cpp
-
-client_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/tests/Bug_3198_Regression/bug_3198_regression.cpp b/tests/Bug_3198_Regression/bug_3198_regression.cpp
index ac31228b5e0..5579022048c 100644
--- a/tests/Bug_3198_Regression/bug_3198_regression.cpp
+++ b/tests/Bug_3198_Regression/bug_3198_regression.cpp
@@ -5,10 +5,6 @@
 #include "tao/PolicyC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Bug_3198_Regression,
-           bug_3198_regression,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("corbaloc:iiop:localhost:12345/MyObjectKey");
 
 int
@@ -33,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3251_Regression/Bug_3251.conf b/tests/Bug_3251_Regression/Bug_3251.conf
index b79947bdd3c..8a3ada294ba 100644
--- a/tests/Bug_3251_Regression/Bug_3251.conf
+++ b/tests/Bug_3251_Regression/Bug_3251.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic DllOrb Service_Object * Bug_3251:_make_DllOrb() "DllOrb -NumThreads 12 -ORBDottedDecimalAddresses 1 -ORBCollocationStrategy thru_poa"
 dynamic PersistentPOA Service_Object * Bug_3251:_make_PersistentPoa() "PersistentPOA DllOrb"
 
diff --git a/tests/Bug_3251_Regression/DllOrb.cpp b/tests/Bug_3251_Regression/DllOrb.cpp
index 83708d86fde..b21f30a9b7b 100644
--- a/tests/Bug_3251_Regression/DllOrb.cpp
+++ b/tests/Bug_3251_Regression/DllOrb.cpp
@@ -44,8 +44,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
     }
 
     // Initialize the ORB
-    ACE_Argv_Type_Converter argcon (argc, argv);
-    mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ());
+    mv_orb_ = CORBA::ORB_init (argc, argv);
     if (CORBA::is_nil (mv_orb_.in ()))
     {
       ACE_DEBUG ((LM_ERROR, ACE_TEXT ("nil ORB\n")));
diff --git a/tests/Bug_3251_Regression/Makefile.am b/tests/Bug_3251_Regression/Makefile.am
deleted file mode 100644
index 1b3f337f1a4..00000000000
--- a/tests/Bug_3251_Regression/Makefile.am
+++ /dev/null
@@ -1,76 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_3251_Regression_Lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_LTLIBRARIES = libBug_3251.la
-
-libBug_3251_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DBUG_3251_REGRESSION_BUILD_DLL
-
-libBug_3251_la_SOURCES = \
-  DllOrb.cpp \
-  PersistentPoa.cpp
-
-noinst_HEADERS = \
-  DllOrb.h \
-  PersistentPoa.h
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_3251_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  DllOrb.h \
-  PersistentPoa.h \
-  bug_3251_export.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/tests/Bug_3251_Regression/server.cpp b/tests/Bug_3251_Regression/server.cpp
index 776e96c30b1..42e582784a2 100644
--- a/tests/Bug_3251_Regression/server.cpp
+++ b/tests/Bug_3251_Regression/server.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "ace/ARGV.h"
-#include "ace/OS.h"
 #include "ace/Reactor.h"
 #include "ace/Signal.h"
 #include "ace/Service_Config.h"
diff --git a/tests/Bug_3276_Regression/Makefile.am b/tests/Bug_3276_Regression/Makefile.am
deleted file mode 100644
index 7b4c12a9360..00000000000
--- a/tests/Bug_3276_Regression/Makefile.am
+++ /dev/null
@@ -1,110 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_3276_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_3276_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  Manager.h \
-  Servant_Locator.h \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_3276_Regression_Manager.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += manager
-
-manager_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-manager_SOURCES = \
-  Manager.cpp \
-  Servant_Locator.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Manager.h \
-  Servant_Locator.h \
-  test_i.h
-
-manager_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_3276_Regression/Manager.cpp b/tests/Bug_3276_Regression/Manager.cpp
index 0e9d95e5df4..22350fbb485 100644
--- a/tests/Bug_3276_Regression/Manager.cpp
+++ b/tests/Bug_3276_Regression/Manager.cpp
@@ -26,7 +26,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         proxy_ior = get_opts.opt_arg ();
         break;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3276_Regression/Manager.h b/tests/Bug_3276_Regression/Manager.h
index 7531e48955f..f9c7188b6aa 100644
--- a/tests/Bug_3276_Regression/Manager.h
+++ b/tests/Bug_3276_Regression/Manager.h
@@ -39,7 +39,7 @@ private:
   // Our servant locator
 
   CORBA::Object_var server_;
-  // 
+  //
 };
 
 #endif /*_MANAGER_H_ */
diff --git a/tests/Bug_3276_Regression/client.cpp b/tests/Bug_3276_Regression/client.cpp
index 883b625ab08..0558ff6b9b8 100644
--- a/tests/Bug_3276_Regression/client.cpp
+++ b/tests/Bug_3276_Regression/client.cpp
@@ -34,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                            -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3299_Regression/Hello.cpp b/tests/Bug_3299_Regression/Hello.cpp
index 24d5cc316f9..737e84edc88 100644
--- a/tests/Bug_3299_Regression/Hello.cpp
+++ b/tests/Bug_3299_Regression/Hello.cpp
@@ -1,10 +1,6 @@
-//
 // $Id$
-//
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3299_Regression/Makefile.am b/tests/Bug_3299_Regression/Makefile.am
deleted file mode 100644
index cc493f5d845..00000000000
--- a/tests/Bug_3299_Regression/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_3299_Regression_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_3299_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_3299_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_3299_Regression/README b/tests/Bug_3299_Regression/README
index f769a679628..4bb3faf68a0 100644
--- a/tests/Bug_3299_Regression/README
+++ b/tests/Bug_3299_Regression/README
@@ -1,4 +1,4 @@
-# $Id:$
+# $Id$
 
 This test checks that the client side ORB *doesn't* transparently reinvoke COMPLETED_MAYBE exceptions.
 
diff --git a/tests/Bug_3299_Regression/client.cpp b/tests/Bug_3299_Regression/client.cpp
index e331e588f63..3ddc90434e9 100644
--- a/tests/Bug_3299_Regression/client.cpp
+++ b/tests/Bug_3299_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3299_Regression/server.cpp b/tests/Bug_3299_Regression/server.cpp
index b16847d909e..5ff6ccea575 100644
--- a/tests/Bug_3299_Regression/server.cpp
+++ b/tests/Bug_3299_Regression/server.cpp
@@ -5,10 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/IORTable/IORTable.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3311_Regression/Makefile.am b/tests/Bug_3311_Regression/Makefile.am
deleted file mode 100644
index 16935417e2f..00000000000
--- a/tests/Bug_3311_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_3311_Regression_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-test_SOURCES = \
-  test.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_3315_Regression/Makefile.am b/tests/Bug_3315_Regression/Makefile.am
deleted file mode 100644
index 8319643ae0a..00000000000
--- a/tests/Bug_3315_Regression/Makefile.am
+++ /dev/null
@@ -1,48 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_3315_Regression.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  main.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/tests/Bug_3321_Regression/Makefile.am b/tests/Bug_3321_Regression/Makefile.am
deleted file mode 100644
index e540e000dd3..00000000000
--- a/tests/Bug_3321_Regression/Makefile.am
+++ /dev/null
@@ -1,48 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_3321_Regression.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  main.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/tests/Bug_3333_Regression/Hello.cpp b/tests/Bug_3333_Regression/Hello.cpp
index f6566bfcb23..41a73fd5427 100644
--- a/tests/Bug_3333_Regression/Hello.cpp
+++ b/tests/Bug_3333_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3333_Regression/client.cpp b/tests/Bug_3333_Regression/client.cpp
index f9b39e80227..3e93f3fa15e 100644
--- a/tests/Bug_3333_Regression/client.cpp
+++ b/tests/Bug_3333_Regression/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "tao/Messaging/Messaging.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 const ACE_TCHAR *loop_forever_ior = ACE_TEXT ("file://forward_forever.ior");
 bool shutdown_only = false;
@@ -38,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3333_Regression/server.cpp b/tests/Bug_3333_Regression/server.cpp
index c77bbdddc64..dd7521c191d 100644
--- a/tests/Bug_3333_Regression/server.cpp
+++ b/tests/Bug_3333_Regression/server.cpp
@@ -6,10 +6,6 @@
 #include "ace/SString.h"
 #include "tao/IORTable/IORTable.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 const ACE_TCHAR *ior_output_file2 = ACE_TEXT ("forward_forever.ior");
 
@@ -37,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3430_Regression/Hello.cpp b/tests/Bug_3430_Regression/Hello.cpp
index ff5ed29321b..b9f417703c9 100644
--- a/tests/Bug_3430_Regression/Hello.cpp
+++ b/tests/Bug_3430_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3430_Regression/client.cpp b/tests/Bug_3430_Regression/client.cpp
index 7536ee26f67..de34e78578e 100644
--- a/tests/Bug_3430_Regression/client.cpp
+++ b/tests/Bug_3430_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3430_Regression/server.cpp b/tests/Bug_3430_Regression/server.cpp
index cacd790a6ff..205a7c179e0 100644
--- a/tests/Bug_3430_Regression/server.cpp
+++ b/tests/Bug_3430_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3471_Regression/Hello.cpp b/tests/Bug_3471_Regression/Hello.cpp
index 3e1e492a5c1..6426b2f3d4e 100644
--- a/tests/Bug_3471_Regression/Hello.cpp
+++ b/tests/Bug_3471_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3471_Regression/client.cpp b/tests/Bug_3471_Regression/client.cpp
index bc9b948ec74..a5e47f38199 100644
--- a/tests/Bug_3471_Regression/client.cpp
+++ b/tests/Bug_3471_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3471_Regression/server.cpp b/tests/Bug_3471_Regression/server.cpp
index cacd790a6ff..205a7c179e0 100644
--- a/tests/Bug_3471_Regression/server.cpp
+++ b/tests/Bug_3471_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3479_Regression/Hello.cpp b/tests/Bug_3479_Regression/Hello.cpp
index 1e272c82af2..88ef46a2a51 100644
--- a/tests/Bug_3479_Regression/Hello.cpp
+++ b/tests/Bug_3479_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3479_Regression/README b/tests/Bug_3479_Regression/README
index bccd449a6f0..1e796087d76 100644
--- a/tests/Bug_3479_Regression/README
+++ b/tests/Bug_3479_Regression/README
@@ -1,5 +1,5 @@
 /**
-$Id:$
+$Id$
 
 This is a clone of the Hello World test. The differences are that an out string
 argument is used rather than having ::get_string return string.
diff --git a/tests/Bug_3479_Regression/client.cpp b/tests/Bug_3479_Regression/client.cpp
index 25bfbefe03a..7ca9221946d 100644
--- a/tests/Bug_3479_Regression/client.cpp
+++ b/tests/Bug_3479_Regression/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "tao/StringSeqC.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3479_Regression/server.cpp b/tests/Bug_3479_Regression/server.cpp
index cacd790a6ff..205a7c179e0 100644
--- a/tests/Bug_3479_Regression/server.cpp
+++ b/tests/Bug_3479_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3506_Regression/client.cpp b/tests/Bug_3506_Regression/client.cpp
index 138f8067da0..34f24b89e24 100644
--- a/tests/Bug_3506_Regression/client.cpp
+++ b/tests/Bug_3506_Regression/client.cpp
@@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                                      argv [0]),
                                     -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3506_Regression/server.cpp b/tests/Bug_3506_Regression/server.cpp
index 3e419b1e466..fe0f9a657e3 100644
--- a/tests/Bug_3506_Regression/server.cpp
+++ b/tests/Bug_3506_Regression/server.cpp
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                             argv [0]),
                             -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3513_Regression/test.idl b/tests/Bug_3513_Regression/test.idl
index a358eda8ab2..ae55732a3e3 100644
--- a/tests/Bug_3513_Regression/test.idl
+++ b/tests/Bug_3513_Regression/test.idl
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 
 /*
 We've added a comment to the effect that this file does not contain the following
diff --git a/tests/Bug_3524_Regression/client.cpp b/tests/Bug_3524_Regression/client.cpp
index 725b57503bd..3b511be26f8 100644
--- a/tests/Bug_3524_Regression/client.cpp
+++ b/tests/Bug_3524_Regression/client.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/Synch.h"
 #include "testC.h"
 
-ACE_RCSID(Bug_3524_Regression,
-          client,
-          "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
diff --git a/tests/Bug_3524_Regression/server.cpp b/tests/Bug_3524_Regression/server.cpp
index 9052d258e5f..97ae58abd85 100644
--- a/tests/Bug_3524_Regression/server.cpp
+++ b/tests/Bug_3524_Regression/server.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "test_i.h"
 
-ACE_RCSID (Bug_3524_Regression,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
@@ -31,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3524_Regression/test_i.cpp b/tests/Bug_3524_Regression/test_i.cpp
index 9e8b93eea9d..9b781340732 100644
--- a/tests/Bug_3524_Regression/test_i.cpp
+++ b/tests/Bug_3524_Regression/test_i.cpp
@@ -1,12 +1,9 @@
-// $Id: test_i.cpp,v 1.1 2003/08/27 22:43:35 vz Exp
+// -*- C++ -*-
+// $Id$
 
 #include "test_i.h"
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (Bug_3524_Regression,
-           test_i,
-           "$Id$")
-
 A_i::A_i (CORBA::ORB_ptr orb,
           CORBA::ValueFactoryBase *vtp_factory)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/tests/Bug_3531_Regression/client.cpp b/tests/Bug_3531_Regression/client.cpp
index 43fcdd5c5b4..90a02ce55f8 100644
--- a/tests/Bug_3531_Regression/client.cpp
+++ b/tests/Bug_3531_Regression/client.cpp
@@ -2,22 +2,19 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
-#include "ace/OS.h"
 #include "testS.h"
-
-ACE_RCSID(Bug_2494_Regression, client, "$Id$")
+#include "ace/OS_NS_unistd.h"
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int do_shutdown = 0;
 
+/**
+ * Simpler Server Client implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server Client implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
   Simple_Server_i (CORBA::ORB_ptr orb)
     : orb_ (CORBA::ORB::_duplicate (orb))
@@ -80,18 +77,17 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   Worker (CORBA::ORB_ptr orb);
   // ctor
diff --git a/tests/Bug_3531_Regression/run_test.pl b/tests/Bug_3531_Regression/run_test.pl
index c6929f8976c..4abf90d2143 100755
--- a/tests/Bug_3531_Regression/run_test.pl
+++ b/tests/Bug_3531_Regression/run_test.pl
@@ -52,7 +52,7 @@ my @CLS = ();
 for($i = 0; $i < $num_clients - 1; $i++) {
     $CLS[$i] = $clients[$i]->CreateProcess ("client", "-k file://$clients_iorfile[$i]");
 }
-$CLS[$num_clients - 1] = $clients[$i]->CreateProcess ("client", 
+$CLS[$num_clients - 1] = $clients[$i]->CreateProcess ("client",
                                     "-k file://$clients_iorfile[$num_clients - 1] -x");
 
 # start server and wait for file
diff --git a/tests/Bug_3531_Regression/server.cpp b/tests/Bug_3531_Regression/server.cpp
index cee5c9ae87d..da635e1b7f2 100644
--- a/tests/Bug_3531_Regression/server.cpp
+++ b/tests/Bug_3531_Regression/server.cpp
@@ -5,8 +5,6 @@
 #include "ace/Task.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Bug_2494_Regression, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("file://test.ior");
 const ACE_TCHAR *srv_shutdown_file = ACE_TEXT("server_terminated");
 
@@ -42,18 +40,17 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   Worker (CORBA::ORB_ptr orb);
   // ctor
diff --git a/tests/Bug_3531_Regression/test_i.cpp b/tests/Bug_3531_Regression/test_i.cpp
index 6485df08911..fba6b1837aa 100644
--- a/tests/Bug_3531_Regression/test_i.cpp
+++ b/tests/Bug_3531_Regression/test_i.cpp
@@ -2,7 +2,6 @@
 
 #include "test_i.h"
 #include "tao/debug.h"
-#include "ace/OS.h"
 #include "tao/ORB_Core.h"
 #include "tao/LF_Strategy.h"
 #include "ace/Reactor.h"
@@ -11,8 +10,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Bug_2494_Regression, test_i, "$Id$")
-
 char *
 Simple_Server_i::test_method (Simple_Server_ptr objref)
 {
@@ -26,7 +23,7 @@ Simple_Server_i::test_method (Simple_Server_ptr objref)
       try
         {
           {
-            ACE_Guard<TAO_SYNCH_MUTEX> guard (this->lock_);
+            ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
             if (!this->timer_registed_)
               {
                 ACE_DEBUG ((LM_DEBUG, "(%P|%t) Scheduling timeout...\n"));
@@ -54,7 +51,7 @@ Simple_Server_i::test_method (Simple_Server_ptr objref)
 void
 Simple_Server_i::client_done ()
 {
-  ACE_Guard<TAO_SYNCH_MUTEX> guard (this->lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Simple_Server_i::client_done () called\n"));
   this->cond_.signal ();
 }
@@ -63,7 +60,7 @@ int
 Simple_Server_i::handle_timeout (const ACE_Time_Value &,
                                  const void *)
 {
-  ACE_Guard<TAO_SYNCH_MUTEX> guard (this->lock_);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
   // We are the (client) leader.  Signal the leader-follower pattern to
   // elect a new leader
   TAO_ORB_Core *oc = orb_->orb_core();
diff --git a/tests/Bug_3531_Regression/test_i.h b/tests/Bug_3531_Regression/test_i.h
index b89d5e7bdbf..b4900377b9e 100644
--- a/tests/Bug_3531_Regression/test_i.h
+++ b/tests/Bug_3531_Regression/test_i.h
@@ -6,14 +6,13 @@
 #include "testS.h"
 #include "ace/Synch.h"
 
+/**
+ * Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server, public ACE_Event_Handler
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
   Simple_Server_i (CORBA::ORB_ptr orb);
   // ctor
diff --git a/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc b/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc
new file mode 100644
index 00000000000..d974e26d6c5
--- /dev/null
+++ b/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc
@@ -0,0 +1,10 @@
+// $Id$
+
+project(*Server): taoserver {
+  requires += dummy_label
+  after += *idl
+  Source_Files {
+    server.cpp
+  }
+}
+
diff --git a/tests/Bug_3531b_Regression/run_test.pl b/tests/Bug_3531b_Regression/run_test.pl
new file mode 100755
index 00000000000..d1d85802727
--- /dev/null
+++ b/tests/Bug_3531b_Regression/run_test.pl
@@ -0,0 +1,22 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+
+$SV = $server->CreateProcess ("server");
+
+$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
+
+if ($test != 0) {
+    print STDERR "ERROR: test returned $test\n";
+    exit 1;
+}
+
+exit 0;
diff --git a/tests/Bug_3531b_Regression/server.cpp b/tests/Bug_3531b_Regression/server.cpp
new file mode 100644
index 00000000000..5d5876a6be0
--- /dev/null
+++ b/tests/Bug_3531b_Regression/server.cpp
@@ -0,0 +1,1069 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/Global_Macros.h"
+#include "ace/Task.h"
+#include "tao/ORB_Core.h"
+#include "tao/default_resource.h"
+#include "tao/Leader_Follower.h"
+#include "tao/LF_Event_Loop_Thread_Helper.h"
+#include "tao/LF_Event.h"
+#include "tao/Transport.h"
+#include "ace/Task_T.h"
+#include "tao/TAO_Export.h"
+
+int nthreads = 4;
+bool debug = false;
+
+// TEST_ASSERT is exactly the same as ACE_ASSERT except it is active
+// for both debug and *release* builds.
+#define TEST_ASSERT(X)                        \
+  do { if(!(X)) { \
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("TEST_ASSERT: (%P|%t) file %N, line %l assertion failed for '%C'.%a\n"), \
+                  #X, -1));                       \
+    } } while (0)
+
+#define TSS_ASSERT(TSS, LF, ELT, CLT, LA) \
+    TEST_ASSERT ((TSS->event_loop_thread_ == ELT)); \
+    TEST_ASSERT ((TSS->client_leader_thread_ == CLT)); \
+    TEST_ASSERT ((LF.leader_available () == LA));
+
+class Worker;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "d");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'd':
+        debug = true;
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-d"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+class Command: public ACE_Message_Block
+{
+public:
+  virtual int execute (Worker*) = 0;
+};
+
+
+//////////////////////////////////////////////////////////////////////
+// NOTE: Do *NOT* put the same msg into the msg queue more than once.
+// This will confuse the msg queue and result it in dropping messages
+//////////////////////////////////////////////////////////////////////
+class Worker: public ACE_Task<ACE_MT_SYNCH>
+{
+public:
+  Worker (void)
+    : shutdown_ (false)
+  {}
+
+  virtual int svc (void);
+  virtual int close (u_long = 0);
+  virtual int put (ACE_Message_Block * mblk, ACE_Time_Value * tv = 0);
+  int process_cmd (void);
+  void shutdown (bool do_shutdown);
+  bool shutdown (void);
+
+private:
+  bool shutdown_;
+};
+
+ACE_TSS<Worker> workers;
+
+int Worker::svc (void)
+{
+  if (debug)
+    ACE_DEBUG ((LM_DEBUG, "(%P|%t) Worker thread starting up.\n"));
+  // Register this worker
+  workers.ts_object (const_cast<Worker*> (this));
+  int retval = 0;
+  while (!shutdown_ && retval != -1)
+    {
+      retval = this->process_cmd ();
+    }
+  if (debug)
+    ACE_DEBUG ((LM_DEBUG, "(%P|%t) Worker thread shutting down.\n"));
+  return retval;
+}
+
+int Worker::close (u_long)
+{
+  // de-register this worker, otherwise the ACE_TSS will try to destroy it
+  workers.ts_object (0);
+  return 0;
+}
+
+int Worker::put (ACE_Message_Block * mblk, ACE_Time_Value * tv)
+{
+  return this->putq (mblk, tv);
+}
+
+int Worker::process_cmd (void)
+{
+  ACE_Message_Block *mb = 0;
+  if (this->getq (mb, 0) == -1)
+    {
+      ACE_ERROR ((LM_ERROR, "Error calling getq: $!\n"));
+      // Strangely, message queues return this instead of ETIME
+      if (errno == EWOULDBLOCK || errno == ESHUTDOWN)
+        return 0;
+      return -1;
+    }
+  Command* cmd = dynamic_cast <Command*> (mb);
+  ACE_ASSERT (cmd != 0);
+  cmd->execute (this);
+  cmd->release ();
+  return 0;
+}
+
+void Worker::shutdown (bool do_shutdown)
+{
+  shutdown_ = do_shutdown;
+}
+
+bool Worker::shutdown (void)
+{
+  return shutdown_;
+}
+
+class Test_Reactor: public ACE_Reactor
+{
+public:
+  // This is the method that the Leader_Follower object calls.
+  virtual int handle_events (ACE_Time_Value * = 0)
+  {
+    // This is called by client leader threads.  Note, the loop here
+    // glosses over the fact that the Leader_Follower code does not
+    // work quite the way we want it to.  Namely, this logic:
+    //  1 - client leader thread detects when there are event loop
+    //  threads waiting
+    //  2 - client leader wakes up event loop threads via broadcast
+    //  3 - client leader temporarily gives up lock to allow event loop
+    //  threads to take over leadership
+    //  4 - client leader thread takes lock again and loops around to
+    //  become follower
+    // The problem is that the gap between 3 & 4 is often not long
+    // enough for the event loop threads to get switched in and take
+    // ovwnership of the lock, even though the client leader thread
+    // does a thr_yield!
+    // Thus this code, once shutdown, will continuely return and thus
+    // give the leader follower multiple chances to hand off to an
+    // event loop thread.  This is not ideal but it will have to do
+    // until the leader follower code is fixed (if possible)
+    while (!workers->shutdown())
+      // call this thread's (worker's) process_cmd method
+      workers->process_cmd ();
+    return 0;
+  };
+};
+
+// Our own Resource_Factory for testing purposes.  This just returns
+// our Test_Reactor to the Leader_Follower object via the ORB_Core.
+class Test_Resource_Factory: public TAO_Default_Resource_Factory
+{
+public:
+  Test_Resource_Factory ()
+    : test_reactor_ (new Test_Reactor)
+  {}
+
+  virtual ACE_Reactor *get_reactor (void)
+  {
+    return test_reactor_;
+  }
+private:
+  // This is allocated in the constructor and deallocated by the ORB_Core.
+  Test_Reactor* test_reactor_;
+};
+
+ACE_FACTORY_DEFINE (TAO, Test_Resource_Factory)
+ACE_STATIC_SVC_DEFINE (Test_Resource_Factory,
+                       ACE_TEXT ("Resource_Factory"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (Test_Resource_Factory),
+                       ACE_Service_Type::DELETE_THIS
+                       | ACE_Service_Type::DELETE_OBJ,
+                       0)
+ACE_STATIC_SVC_REQUIRE (Test_Resource_Factory);
+
+class Test_LF_Event: public TAO_LF_Event
+{
+public:
+  Test_LF_Event()
+  {}
+
+  void complete_event (TAO_Leader_Follower &lf)
+  {
+    if (debug)
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Completing event\n"));
+    this->state_changed (TAO_LF_Event::LFS_SUCCESS, lf);
+  }
+
+  virtual int successful (void) const
+  {
+    return this->state_ == TAO_LF_Event::LFS_SUCCESS;
+  }
+
+  virtual int error_detected (void) const
+  {
+    return (this->state_ == TAO_LF_Event::LFS_FAILURE
+            || this->state_ == TAO_LF_Event::LFS_TIMEOUT
+            || this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED);
+  }
+protected:
+  virtual void state_changed_i (int new_state)
+  {
+    this->state_ = new_state;
+    return;
+  }
+
+  virtual int is_state_final (void)
+  {
+    if (this->state_ == TAO_LF_Event::LFS_TIMEOUT ||
+        this->state_ == TAO_LF_Event::LFS_FAILURE)
+      return 1;
+    return 0;
+  }
+};
+
+class Test_Transport : public TAO_Transport
+{
+public:
+  Test_Transport (CORBA::ULong tag,
+                  TAO_ORB_Core *orb_core)
+    : TAO_Transport (tag, orb_core)
+  {}
+
+  virtual int send_message (TAO_OutputCDR &,
+                            TAO_Stub * = 0,
+                            TAO_Message_Semantics  = TAO_TWOWAY_REQUEST,
+                            ACE_Time_Value * = 0)
+  {
+    return 0;
+  }
+
+  virtual ssize_t send (iovec *, int ,
+                        size_t &,
+                        const ACE_Time_Value * = 0)
+  {
+    return 0;
+  }
+
+  virtual ssize_t recv (char *,
+                        size_t,
+                        const ACE_Time_Value * = 0)
+  {
+    return 0;
+  }
+
+  virtual int messaging_init (CORBA::Octet,
+                              CORBA::Octet)
+  {
+    return 0;
+  }
+
+  virtual ACE_Event_Handler * event_handler_i (void)
+  {
+    return 0;
+  }
+
+protected:
+  virtual TAO_Connection_Handler * connection_handler_i (void)
+  {
+    return 0;
+  }
+
+  virtual int send_request (TAO_Stub *,
+                            TAO_ORB_Core *,
+                            TAO_OutputCDR &,
+                            TAO_Message_Semantics,
+                            ACE_Time_Value *)
+  {
+    return 0;
+  }
+
+};
+
+class Shutdown: public Command
+{
+public:
+  virtual int execute (Worker* worker)
+  {
+    if (debug)
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Shutdown cmd\n"));
+    worker->shutdown (true);
+    return 0;
+  }
+
+};
+
+class TSS_Assert: public Command
+{
+public:
+  TSS_Assert (TAO_ORB_Core* orb_core,
+              int elt_count,
+              int clt_count,
+              bool leader_available)
+    : orb_core_ (orb_core),
+      elt_count_ (elt_count),
+      clt_count_ (clt_count),
+      leader_available_ (leader_available)
+  {}
+
+  virtual int execute (Worker*)
+  {
+    if (debug)
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing TSS_Assert(%d,%d,%d) cmd\n",
+                  elt_count_, clt_count_, leader_available_));
+    TAO_Leader_Follower &leader_follower = orb_core_->leader_follower ();
+    TAO_ORB_Core_TSS_Resources* tss = orb_core_->get_tss_resources ();
+    TSS_ASSERT (tss, leader_follower,
+                elt_count_, clt_count_, leader_available_);
+    return 0;
+  }
+private:
+  TAO_ORB_Core*        orb_core_;
+  const int            elt_count_;
+  const int            clt_count_;
+  const bool           leader_available_;
+};
+
+class Wait_For_Event: public Command
+{
+public:
+  Wait_For_Event (Test_LF_Event& event,
+                  Test_Transport& transport,
+                  TAO_Leader_Follower& lf)
+    : event_ (event),
+      transport_ (transport),
+      lf_ (lf)
+  {}
+  virtual int execute (Worker*)
+  {
+    if (debug)
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Wait_For_Event cmd\n"));
+    int retval = lf_.wait_for_event (&event_, &transport_, 0);
+    // The worker has probably been shutdown in order for the client
+    // leader event loop to exit - reactivate the worker so it from
+    // process msgs once we return
+    workers->shutdown (false);
+    return retval;
+  }
+private:
+  Test_LF_Event&       event_;
+  Test_Transport&      transport_;
+  TAO_Leader_Follower& lf_;
+};
+
+class Cond_Signal: public Command
+{
+public:
+  Cond_Signal ()
+    : lock_ (),
+      cond_ (lock_),
+      ref_count_ (2)
+  {}
+
+  virtual int execute (Worker*)
+  {
+    if (debug)
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Cond_Signal cmd\n"));
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard ,this->cond_.mutex (), 0);
+    return this->cond_.signal ();
+  }
+  TAO_SYNCH_MUTEX& lock ()
+  {
+    return lock_;
+  }
+  ACE_Condition_Thread_Mutex& cond ()
+  {
+    return cond_;
+  }
+  virtual ACE_Message_Block *release (void)
+  {
+    // we need to only release once both the main and worker thread
+    // are done with this object - each signals this by calling this
+    // method
+    --this->ref_count_;
+    if (this->ref_count_ == 0)
+      return ACE_Message_Block::release ();
+    return this;
+  }
+
+private:
+  TAO_SYNCH_MUTEX lock_;
+  ACE_Condition_Thread_Mutex cond_;
+  int ref_count_;
+};
+
+class Event_Loop_Thread: public Command
+{
+public:
+  Event_Loop_Thread(TAO_Leader_Follower& lf,
+                    TAO_LF_Strategy& lf_strategy)
+    : lf_ (lf), lf_strategy_ (lf_strategy)
+  {}
+
+  virtual int execute (Worker* worker)
+  {
+    if (debug)
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Event_Loop_Thread cmd\n"));
+    TAO_LF_Event_Loop_Thread_Helper elt (lf_, lf_strategy_, 0);
+    while (!worker->shutdown())
+      worker->process_cmd ();
+    // The worker has been shutdown in order for this event loop
+    // thread to exit - reactivate the worker so it from process msgs
+    // once we return
+    worker->shutdown (false);
+    return 0;
+  }
+private:
+  TAO_Leader_Follower& lf_;
+  TAO_LF_Strategy&     lf_strategy_;
+};
+
+class Set_Upcall_Thread: public Command
+{
+public:
+  Set_Upcall_Thread (TAO_Leader_Follower& lf)
+    : lf_ (lf)
+  {}
+
+  virtual int execute (Worker*)
+  {
+    if (debug)
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Set_Upcall_Thread cmd\n"));
+    lf_.set_upcall_thread ();
+    return 0;
+  }
+
+private:
+  TAO_Leader_Follower& lf_;
+};
+
+void synch_with_worker (Worker& worker)
+{
+  // This object is released by the worker thread after it has
+  // executed the cmd
+  Cond_Signal* cond = new Cond_Signal;
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, guard, cond->lock ());
+    worker.put (cond);
+    ACE_Time_Value tv (1, 0);
+    tv += ACE_OS::gettimeofday ();
+    TEST_ASSERT ((cond->cond ().wait (&tv) == 0));
+  }
+}
+
+// 1 - Simple event loop thread test
+void Test_1 (TAO_ORB_Core* orb_core)
+{
+  TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy ();
+  TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
+  TAO_ORB_Core_TSS_Resources* tss = orb_core->get_tss_resources ();
+
+  ACE_DEBUG ((LM_DEBUG, "==========\n"));
+  ACE_DEBUG ((LM_DEBUG, "TEST #1 - Simple Event Loop call\n"));
+
+  TSS_ASSERT (tss, leader_follower, 0, 0, false);
+
+  std::auto_ptr<TAO_LF_Event_Loop_Thread_Helper>
+    elt (new TAO_LF_Event_Loop_Thread_Helper(leader_follower,
+                                             lf_strategy,
+                                             0));
+  TSS_ASSERT (tss, leader_follower, 1, 0, true);
+
+  elt.reset (0);
+  TSS_ASSERT (tss, leader_follower, 0, 0, false);
+}
+
+// 2 - Nested event loop threads - no set_upcall_thread call
+void Test_2 (TAO_ORB_Core* orb_core)
+{
+  TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy ();
+  TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
+  TAO_ORB_Core_TSS_Resources* tss = orb_core->get_tss_resources ();
+  ACE_DEBUG ((LM_DEBUG, "==========\n"));
+  ACE_DEBUG ((LM_DEBUG, "TEST #2 - 2 nested Event Loop calls\n"));
+
+  TSS_ASSERT (tss, leader_follower, 0, 0, false);
+
+  std::auto_ptr<TAO_LF_Event_Loop_Thread_Helper>
+    elt1 (new TAO_LF_Event_Loop_Thread_Helper(leader_follower,
+                                              lf_strategy, 0));
+  TSS_ASSERT (tss, leader_follower, 1, 0, true);
+
+  std::auto_ptr<TAO_LF_Event_Loop_Thread_Helper>
+    elt2 (new TAO_LF_Event_Loop_Thread_Helper(leader_follower,
+                                              lf_strategy, 0));
+  TSS_ASSERT (tss, leader_follower, 2, 0, true);
+
+  elt2.reset (0);
+  TSS_ASSERT (tss, leader_follower, 1, 0, true);
+
+  elt1.reset (0);
+  TSS_ASSERT (tss, leader_follower, 0, 0, false);
+}
+
+// 3 - Nested event loop threads - with set_upcall_thread call
+void Test_3 (TAO_ORB_Core* orb_core)
+{
+  TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy ();
+  TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
+  TAO_ORB_Core_TSS_Resources* tss = orb_core->get_tss_resources ();
+  ACE_DEBUG ((LM_DEBUG, "==========\n"));
+  ACE_DEBUG ((LM_DEBUG, "TEST #3 - 2 nested Event Loop calls with set_upcall_thread\n"));
+
+  TSS_ASSERT (tss, leader_follower, 0, 0, false);
+
+  std::auto_ptr<TAO_LF_Event_Loop_Thread_Helper>
+    elt1 (new TAO_LF_Event_Loop_Thread_Helper(leader_follower,
+                                              lf_strategy, 0));
+  TSS_ASSERT (tss, leader_follower, 1, 0, true);
+
+  leader_follower.set_upcall_thread ();
+  TSS_ASSERT (tss, leader_follower, 0, 0, false);
+
+  std::auto_ptr<TAO_LF_Event_Loop_Thread_Helper>
+    elt2 (new TAO_LF_Event_Loop_Thread_Helper(leader_follower,
+                                              lf_strategy, 0));
+  TSS_ASSERT (tss, leader_follower, 1, 0, true);
+
+  elt2.reset (0);
+  TSS_ASSERT (tss, leader_follower, 0, 0, false);
+
+  elt1.reset (0);
+  TSS_ASSERT (tss, leader_follower, 0, 0, false);
+}
+
+// 4 - client leader thread
+void Test_4 (TAO_ORB_Core* orb_core)
+{
+  TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
+  ACE_DEBUG ((LM_DEBUG, "==========\n"));
+  ACE_DEBUG ((LM_DEBUG, "TEST #4 - Simple Client Leader thread\n"));
+
+  // Activate a thread
+  Worker wrk1;
+  wrk1.activate ();
+
+  // Test initial conditions
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  // Have the thread wait on an event
+  Test_LF_Event event;
+  Test_Transport transport (0, orb_core);
+  wrk1.put (new Wait_For_Event(event, transport, leader_follower));
+
+  // The thread is still waiting on the event and thus should
+  // now be a client-leader thread
+  wrk1.put (new TSS_Assert(orb_core, 0, 1, true));
+
+  // Synchronise with the thread before we complete its event
+  synch_with_worker (wrk1);
+  // Complete the event
+  event.complete_event (leader_follower);
+
+  // The thread is still inside handle_events - shutdown the
+  // event processing
+  wrk1.put (new Shutdown);
+
+  // The thread should now return from being a client leader
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  wrk1.put (new Shutdown);
+  wrk1.wait ();
+}
+
+// 5 - nested client leader thread
+void Test_5 (TAO_ORB_Core* orb_core)
+{
+  TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
+  ACE_DEBUG ((LM_DEBUG, "==========\n"));
+  ACE_DEBUG ((LM_DEBUG, "TEST #5 - 2 nested Client Leader calls\n"));
+
+  // Activate a thread
+  Worker wrk1;
+  wrk1.activate ();
+
+  // Test initial conditions
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  // Have the thread wait on an event
+  Test_LF_Event event;
+  Test_Transport transport (0, orb_core);
+  wrk1.put (new Wait_For_Event(event, transport, leader_follower));
+
+  // The thread is still waiting on the event and thus should
+  // now be a client-leader thread
+  wrk1.put (new TSS_Assert(orb_core, 0, 1, true));
+
+  // Wait for another event
+  Test_LF_Event event2;
+  wrk1.put (new Wait_For_Event(event2, transport, leader_follower));
+
+  // The thread is still waiting on the event and thus should
+  // now be a client-leader thread
+  wrk1.put (new TSS_Assert(orb_core, 0, 2, true));
+
+  // Synchronise with the thread before we complete its event
+  synch_with_worker (wrk1);
+
+  // Complete the first event - nothing should happen
+  event.complete_event (leader_follower);
+
+  wrk1.put (new TSS_Assert(orb_core, 0, 2, true));
+
+  // Complete the second event - everything should unwind
+  synch_with_worker (wrk1);
+  event2.complete_event (leader_follower);
+
+  // The thread is still inside handle_events - shutdown the
+  // event processing for the inner client leader
+  wrk1.put (new Shutdown);
+
+  wrk1.put (new TSS_Assert(orb_core, 0, 1, true));
+
+  // The thread is now in the handle_events for the outter
+  // client-leader - the event is already complete so just
+  // shutdown the cmd processing.
+  wrk1.put (new Shutdown);
+
+  // We should now we back at our initial state.
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  wrk1.put (new Shutdown);
+  wrk1.wait ();
+}
+
+// 6 - nested client leader thread with set_upcall_thread
+void Test_6 (TAO_ORB_Core* orb_core)
+{
+  TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
+  ACE_DEBUG ((LM_DEBUG, "==========\n"));
+  ACE_DEBUG ((LM_DEBUG, "TEST #6 - 2 nested Client Leader calls with set_upcall_thread\n"));
+
+  // Activate a thread
+  Worker wrk1;
+  wrk1.activate ();
+
+  // Test initial conditions
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  // Have the thread wait on an event
+  Test_LF_Event event;
+  Test_Transport transport (0, orb_core);
+  wrk1.put (new Wait_For_Event(event, transport, leader_follower));
+
+  // The thread is still waiting on the event and thus should
+  // now be a client-leader thread
+  wrk1.put (new TSS_Assert(orb_core, 0, 1, true));
+
+  // Call set_upcall_thread
+  wrk1.put (new Set_Upcall_Thread (leader_follower));
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  // Wait for another event
+  Test_LF_Event event2;
+  wrk1.put (new Wait_For_Event(event2, transport, leader_follower));
+
+  // The thread is still waiting on the event and thus should
+  // now be a client-leader thread
+  wrk1.put (new TSS_Assert(orb_core, 0, 1, true));
+
+  // Synchronise with the thread before we complete its event
+  synch_with_worker (wrk1);
+
+  // Complete the first event - nothing should happen
+  event.complete_event (leader_follower);
+
+  wrk1.put (new TSS_Assert(orb_core, 0, 1, true));
+
+  // Complete the second event - everything should unwind
+  synch_with_worker (wrk1);
+  event2.complete_event (leader_follower);
+
+  // The thread is still inside handle_events - shutdown the
+  // event processing for the inner client leader
+  wrk1.put (new Shutdown);
+
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  // The thread is now in the handle_events for the outter
+  // client-leader - the event is already complete so just
+  // shutdown the cmd processing.
+  wrk1.put (new Shutdown);
+
+  // We should now we back at our initial state.
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  wrk1.put (new Shutdown);
+  wrk1.wait ();
+}
+
+// 7 - 2 client leader threads with set_upcall_thread
+void Test_7 (TAO_ORB_Core* orb_core)
+{
+  TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
+  ACE_DEBUG ((LM_DEBUG, "==========\n"));
+  ACE_DEBUG ((LM_DEBUG, "TEST #7 - Client Leader yields to another client thread\n"));
+
+  // Activate a thread
+  Worker wrk1;
+  wrk1.activate ();
+
+  // Test initial conditions
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  // Have the thread wait on an event
+  Test_LF_Event event;
+  Test_Transport transport (0, orb_core);
+  wrk1.put (new Wait_For_Event(event, transport, leader_follower));
+
+  // The thread is still waiting on the event and thus should
+  // now be a client-leader thread
+  wrk1.put (new TSS_Assert(orb_core, 0, 1, true));
+  // Wait for the firs thread to be the client leader before we start
+  // the second thread
+  synch_with_worker (wrk1);
+
+  // Create another worker and have it do the same
+  Worker wrk2;
+  wrk2.activate ();
+  wrk2.put (new TSS_Assert(orb_core, 0, 0, true));
+  // Make sure this test is complete before the Set_Upcall_Thread below
+  synch_with_worker (wrk2);
+  Test_LF_Event event2;
+  wrk2.put (new Wait_For_Event(event2, transport, leader_follower));
+  // Note, we can't test the new thread here - it is block waiting on
+  // the follower cond var
+  // wrk2.put (new TSS_Assert(orb_core, 0, 1, true));
+
+  // Call set_upcall_thread on the first thread
+  wrk1.put (new Set_Upcall_Thread (leader_follower));
+  // Our second thread should now be the client leader and the first
+  // thread should not.  Note, we need to first synchronise with
+  // thread 2 (to make sure it is in handle_events) to avoid race
+  // conditions.
+  synch_with_worker (wrk2);
+  wrk2.put (new TSS_Assert(orb_core, 0, 1, true));
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, true));
+
+  // We should now be able to shutdown the first thread - have it
+  // return from handle_events and complete its event.  If it has to
+  // wait it will just go back to being a follower
+  wrk1.put (new Shutdown);
+  event.complete_event (leader_follower);
+  synch_with_worker (wrk1);
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, true));
+  // We can now shut-down the thread
+  wrk1.put (new Shutdown);
+  wrk1.wait ();
+
+  // Now shut-down the second thread
+  event2.complete_event (leader_follower);
+  wrk2.put (new Shutdown);
+  synch_with_worker (wrk2);
+  wrk2.put (new TSS_Assert(orb_core, 0, 0, false));
+  wrk2.put (new Shutdown);
+  wrk2.wait ();
+}
+
+// 8 - client becomes leader when event loop thread dispatched
+void Test_8 (TAO_ORB_Core* orb_core)
+{
+  TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy ();
+  TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
+  ACE_DEBUG ((LM_DEBUG, "==========\n"));
+  ACE_DEBUG ((LM_DEBUG, "TEST #8 - client becomes leader when event thread dispatched\n"));
+
+  // Activate a thread
+  Worker wrk1;
+  wrk1.activate ();
+
+  // Test initial conditions
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  // Have the thread become an event loop thread
+  wrk1.put (new Event_Loop_Thread (leader_follower,
+                                   lf_strategy));
+  wrk1.put (new TSS_Assert(orb_core, 1, 0, true));
+
+  // Before we start the next thread synchronise with the first
+  synch_with_worker (wrk1);
+
+  // Start another thread and have it wait on an event
+  Worker wrk2;
+  wrk2.activate ();
+  wrk2.put (new TSS_Assert(orb_core, 0, 0, true));
+  Test_LF_Event event;
+  Test_Transport transport (0, orb_core);
+  synch_with_worker (wrk2);
+  wrk2.put (new Wait_For_Event(event, transport, leader_follower));
+
+  // The new thread is a follower and thus is waiting on the follower
+  // cond var - we can't test this other than to check if the leader
+  // follower has clients, however, because we can't synchronise with
+  // that thread such a test would contain a race condition.
+
+  // Now dispatch the event loop thread by having it call set_upcall_thread
+  wrk1.put (new Set_Upcall_Thread (leader_follower));
+
+  // the first worker should have given up leadership and the second
+  // thread should have assumed leadership.  We have to synchronise
+  // with both threads before we can test anything, otherwise we could
+  // catch the window where there is no leader.
+  synch_with_worker (wrk1);
+  synch_with_worker (wrk2);
+  wrk1.put (new TSS_Assert (orb_core, 0, 0, true));
+  wrk2.put (new TSS_Assert (orb_core, 0, 1, true));
+
+  // OK, now shut everything down - first the event loop thread
+  wrk1.put (new Shutdown);
+  wrk1.put (new TSS_Assert (orb_core, 0, 0, true));
+  wrk1.put (new Shutdown);
+  wrk1.wait ();
+
+  // Now the client thread
+  wrk2.put (new TSS_Assert (orb_core, 0, 1, true));
+  synch_with_worker (wrk2);
+  event.complete_event (leader_follower);
+  wrk2.put (new Shutdown);
+  wrk2.put (new TSS_Assert (orb_core, 0, 0, false));
+  wrk2.put (new Shutdown);
+  wrk2.wait ();
+}
+
+// 9 - client leader thread then event loop thread
+void Test_9 (TAO_ORB_Core* orb_core)
+{
+  TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy ();
+  TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
+  ACE_DEBUG ((LM_DEBUG, "==========\n"));
+  ACE_DEBUG ((LM_DEBUG, "TEST #9 - Client Leader thread yields to Event Loop thread\n"));
+
+  // Activate a thread
+  Worker wrk1;
+  wrk1.activate ();
+
+  // Test initial conditions
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  // Have the thread wait on an event
+  Test_LF_Event event;
+  Test_Transport transport (0, orb_core);
+  wrk1.put (new Wait_For_Event(event, transport, leader_follower));
+
+  // The thread is still waiting on the event and thus should
+  // now be a client-leader thread
+  wrk1.put (new TSS_Assert(orb_core, 0, 1, true));
+  // We now need to synchronise with the worker, to make sure it
+  // has processed all the cmds we have sent it
+  synch_with_worker (wrk1);
+
+  // create an event loop thread - this means a new worker
+  Worker wrk2;
+  wrk2.activate ();
+  wrk2.put (new Event_Loop_Thread (leader_follower,
+                                   lf_strategy));
+
+  // Unfortunately there is no way to test if the event loop thread is
+  // where we expect it to be (the
+  // wait_for_client_leader_to_complete() method).  The only thing we
+  // could check is the event_loop_threads_waiting_ count, however,
+  // that is private to the TAO_Leader_Follower class.
+
+  // We need to get the client leader thread to return from
+  // process_cmd() and allow it to surrender leadership to the waiting
+  // event loop thread - send it a shutdown.  The TAO_Leader_Follower
+  // code may call handle_events a few more times, however, since the
+  // cmd processing is shutdown (and won't be reactivated until the
+  // event is complete) handle_events will just return.
+  wrk1.put (new Shutdown);
+
+  // Now test the new event loop thread
+  wrk2.put (new TSS_Assert(orb_core, 1, 0, true));
+  // Wait until the event loop thread is running before we test
+  // the client thread
+  synch_with_worker (wrk2);
+
+  // We can't test the client thread either - it is blocked in a call
+  // to the event's cond var's wait() method.  All we can do is
+  // complete the event, which will signal the cond var
+  event.complete_event (leader_follower);
+
+  // The client thread should return from wait_for_event
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, true));
+  // And the event loop thread should still be 'running'
+  wrk2.put (new TSS_Assert(orb_core, 1, 0, true));
+
+  // Some other misc checks
+  synch_with_worker (wrk1);
+  TEST_ASSERT ((leader_follower.has_clients () == 0));
+
+  // OK, lets shut everything down now - the event loop thread
+  // requires two shutdown cmds, one to exit the event loop thread cmd
+  // and the second to exit the main cmd processor
+  wrk2.put (new Shutdown);
+  // Incidently there is now no leader
+  wrk2.put (new TSS_Assert(orb_core, 0, 0, false));
+  wrk2.put (new Shutdown);
+  wrk2.wait ();
+
+  // Shutdown the other worker
+  wrk1.put (new Shutdown);
+  wrk1.wait ();
+}
+
+// 10 - ET1437460 (second problem)
+void Test_10 (TAO_ORB_Core* orb_core )
+{
+  TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy ();
+  TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
+  ACE_DEBUG ((LM_DEBUG, "==========\n"));
+  ACE_DEBUG ((LM_DEBUG, "TEST #10 - ET1437460\n"));
+
+  // This scenario involves:
+  //  - an event loop thread
+  //  - which calls set_upcall_thread
+  //  - then becomes a client leader
+  //  - is dispatched and then becomes a client leader again
+  //  (without calling set_upcall_thread)
+  //  - calls set_upcall_thread
+  //  - unwinds
+
+  // Originally this caused the leaders_ member to get set to -1
+  // (the inner client leader still decremented leaders_ even
+  // though set_upcall_thread was called)
+
+  // Activate a thread
+  Worker wrk1;
+  wrk1.activate ();
+
+  // Test initial conditions
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  // Have the thread become an event loop thread
+  wrk1.put (new Event_Loop_Thread (leader_follower,
+                                   lf_strategy));
+
+  // The thread should be an event loop thread
+  wrk1.put (new TSS_Assert(orb_core, 1, 0, true));
+
+  // call set_upcall_thread
+  wrk1.put (new Set_Upcall_Thread (leader_follower));
+
+  // The thread should no longer be an event loop thread
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  // Have the thread wait on an event
+  Test_LF_Event event;
+  Test_Transport transport (0, orb_core);
+  wrk1.put (new Wait_For_Event(event, transport, leader_follower));
+
+  // The thread is still waiting on the event and thus should
+  // now be a client-leader thread
+  wrk1.put (new TSS_Assert(orb_core, 0, 1, true));
+
+  // Have the thread wait on another event
+  Test_LF_Event event2;
+  wrk1.put (new Wait_For_Event(event2, transport, leader_follower));
+
+  // The thread is still waiting on the event and thus should now be a
+  // client-leader thread (again)
+  wrk1.put (new TSS_Assert(orb_core, 0, 2, true));
+
+  // Call set_upcall_thread
+  wrk1.put (new Set_Upcall_Thread(leader_follower));
+
+  // We now need to synchronise with the worker, to make sure it
+  // has processed all the cmds we have sent it
+  synch_with_worker (wrk1);
+
+  // Now, complete the events, and then shutdown the cmd event loop
+  event.complete_event (leader_follower);
+  event2.complete_event (leader_follower);
+  wrk1.put (new Shutdown);
+
+  // The inner client has returned
+  wrk1.put (new TSS_Assert(orb_core, 0, 1, true));
+
+  // Shutdown the outter client thread
+  wrk1.put (new Shutdown);
+
+  // We should be back to the initial state
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  // Now shutdown the event loop thread
+  wrk1.put (new Shutdown);
+  wrk1.put (new TSS_Assert(orb_core, 0, 0, false));
+
+  // Shutdown the other worker
+  wrk1.put (new Shutdown);
+  wrk1.wait ();
+}
+
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      // First we need to replace the resource factory in the ORB_Core
+      // to our test version, which will return our special test
+      // reactor to the Leader_Follower object.
+      ACE_STATIC_SVC_REGISTER (Test_Resource_Factory);
+
+      orb->orb_core ()->set_resource_factory ("Test_Resource_Factory");
+
+      // Make sure the reactor is initialised in the leader_follower
+      ACE_Reactor* reactor = orb->orb_core ()->leader_follower ().reactor ();
+      TEST_ASSERT ((reactor != 0));
+
+      // Ready to go
+      Test_1 (orb->orb_core ());
+      Test_2 (orb->orb_core ());
+      Test_3 (orb->orb_core ());
+      Test_4 (orb->orb_core ());
+      Test_5 (orb->orb_core ());
+      Test_6 (orb->orb_core ());
+      Test_7 (orb->orb_core ());
+      Test_8 (orb->orb_core ());
+      Test_9 (orb->orb_core ());
+      Test_10 (orb->orb_core ());
+
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing complete.\n")));
+
+      // cleanup
+      orb->destroy ();
+    }
+  catch (CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
+
+// ****************************************************************
diff --git a/tests/Bug_3542_Regression/DllOrb.cpp b/tests/Bug_3542_Regression/DllOrb.cpp
index 016ce3747b3..3db4aeac4d4 100644
--- a/tests/Bug_3542_Regression/DllOrb.cpp
+++ b/tests/Bug_3542_Regression/DllOrb.cpp
@@ -6,7 +6,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/TAO_Singleton_Manager.h"
 
-
 DllOrb::DllOrb (void)
  :
    ma_barrier_(),
@@ -15,12 +14,10 @@ DllOrb::DllOrb (void)
 {
 }
 
-
 DllOrb::~DllOrb (void)
 {
 }
 
-
 int
 DllOrb::init (int argc, ACE_TCHAR *argv[])
 {
@@ -44,8 +41,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
     }
 
     // Initialize the ORB
-    ACE_Argv_Type_Converter argcon (argc, argv);
-    mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ());
+    mv_orb_ = CORBA::ORB_init (argc, argv);
     if (CORBA::is_nil (mv_orb_.in ()))
     {
       ACE_DEBUG ((LM_ERROR, ACE_TEXT ("nil ORB\n")));
diff --git a/tests/Bug_3542_Regression/server.cpp b/tests/Bug_3542_Regression/server.cpp
index f660feaf1f3..88ec7288fe0 100644
--- a/tests/Bug_3542_Regression/server.cpp
+++ b/tests/Bug_3542_Regression/server.cpp
@@ -1,13 +1,11 @@
 // $Id$
 
 #include "ace/ARGV.h"
-#include "ace/OS.h"
 #include "ace/Reactor.h"
 #include "ace/Signal.h"
 #include "ace/Service_Config.h"
 #include "ace/Log_Msg.h"
 
-
 ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
   "testDllOrb",
   "Bug_3542",
diff --git a/tests/Bug_3543_Regression/README.txt b/tests/Bug_3543_Regression/README.txt
index 15da44fb5b0..0f6c6b7bc78 100644
--- a/tests/Bug_3543_Regression/README.txt
+++ b/tests/Bug_3543_Regression/README.txt
@@ -1,7 +1,7 @@
 $Id$
 
 This test is a reproducer for bug 3543. The master starts and waits until all servers
-have registered. Then master starts pinging all the servers with 10 threads. At that 
+have registered. Then master starts pinging all the servers with 10 threads. At that
 moment multiple threads are waiting for the same connection to a specific server. We
 observed at that moment that in TAO_Transport::register_if_necessary the check for
 is_registered returns false, then we get a thread switch and another thread then
diff --git a/tests/Bug_3543_Regression/master.cpp b/tests/Bug_3543_Regression/master.cpp
index 05b6c3da3b6..41fbd1e74ce 100644
--- a/tests/Bug_3543_Regression/master.cpp
+++ b/tests/Bug_3543_Regression/master.cpp
@@ -46,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3543_Regression/server.cpp b/tests/Bug_3543_Regression/server.cpp
index 499a924da35..48407d00ea6 100644
--- a/tests/Bug_3543_Regression/server.cpp
+++ b/tests/Bug_3543_Regression/server.cpp
@@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3552_Regression/check.cpp b/tests/Bug_3552_Regression/check.cpp
index f1b4496375a..457f54f2b52 100644
--- a/tests/Bug_3552_Regression/check.cpp
+++ b/tests/Bug_3552_Regression/check.cpp
@@ -3,10 +3,6 @@
 #include "tao/CodecFactory/CodecFactory.h"
 #include "structC.h"
 
-ACE_RCSID (Recursive,
-           client,
-           "$Id$")
-
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp b/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp
index 4e8556742ed..1067653093e 100644
--- a/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp
+++ b/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp
@@ -6,8 +6,6 @@
 #include "tao/Policy_Current.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(TransportCache, client, "$Id$")
-
 int cache_size = 512;
 int port_nr = 27530;
 
@@ -37,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp b/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp
index 4341198321e..29f7a7e345f 100644
--- a/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp
+++ b/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "tao/IORTable/IORTable.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 int cache_size = 512;
 
 int
diff --git a/tests/Bug_3553_Regression/Hello.cpp b/tests/Bug_3553_Regression/Hello.cpp
index df5dc90d3d9..0f62f20b906 100644
--- a/tests/Bug_3553_Regression/Hello.cpp
+++ b/tests/Bug_3553_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3553_Regression/run_test.pl b/tests/Bug_3553_Regression/run_test.pl
index 1a8599748b6..fb3f7a003bd 100755
--- a/tests/Bug_3553_Regression/run_test.pl
+++ b/tests/Bug_3553_Regression/run_test.pl
@@ -32,9 +32,9 @@ my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 fail
 my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
 
 
-$SV = $server->CreateProcess ("server", 
+$SV = $server->CreateProcess ("server",
         "-c $cache_size -ORBdebuglevel $debug_level -ORBListenEndpoints iiop://localhost:$port");
-$CL = $client->CreateProcess ("client", 
+$CL = $client->CreateProcess ("client",
         "-c $cache_size -p $port -ORBdebuglevel $debug_level");
 
 $server_status = $SV->Spawn ();
diff --git a/tests/Bug_3558_Regression/Hello.cpp b/tests/Bug_3558_Regression/Hello.cpp
index ec8f6d2e485..54b23b5d560 100644
--- a/tests/Bug_3558_Regression/Hello.cpp
+++ b/tests/Bug_3558_Regression/Hello.cpp
@@ -4,8 +4,6 @@
 #include "Hello.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3558_Regression/Makefile.am b/tests/Bug_3558_Regression/Makefile.am
deleted file mode 100644
index a0e2286e095..00000000000
--- a/tests/Bug_3558_Regression/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Hello_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Hello_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Hello_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_3558_Regression/client.cpp b/tests/Bug_3558_Regression/client.cpp
index 42c66a099f6..5ab6c0afd0c 100644
--- a/tests/Bug_3558_Regression/client.cpp
+++ b/tests/Bug_3558_Regression/client.cpp
@@ -11,10 +11,6 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 
-
-
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior1 = ACE_TEXT ("file://server1.ior");
 const ACE_TCHAR *ior2 = ACE_TEXT ("file://server2.ior");
 
@@ -53,7 +49,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3558_Regression/server.cpp b/tests/Bug_3558_Regression/server.cpp
index 97455f4ef9b..77c03392be7 100644
--- a/tests/Bug_3558_Regression/server.cpp
+++ b/tests/Bug_3558_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id: ")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp b/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp
index 4d1cd6b3688..039c71fbbbf 100644
--- a/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp
+++ b/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp
@@ -6,13 +6,8 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/ACE.h"
 
-ACE_RCSID (Bug_3559_Regression,
-           server,
-           "$Id$")
-
 const ACE_TCHAR* log_file_;
 
-
 int
 parse_args (int argc, ACE_TCHAR* argv[])
 {
@@ -203,15 +198,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  
+
   result += check_logging ();
-  
+
   if (result == 0)
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("Test passed!")));
   else
-    ACE_ERROR ((LM_ERROR, 
-                ACE_TEXT ("Test failed. Result: %d\n"), 
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("Test failed. Result: %d\n"),
                 result));
   return result;
 }
diff --git a/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp b/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp
index 87e751f9887..377812a55bc 100644
--- a/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp
+++ b/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp
@@ -8,10 +8,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/ACE.h"
 
-ACE_RCSID (Bug_3559_Regression,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp b/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp
index 183e2ac7132..dec2418d9c2 100644
--- a/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp
+++ b/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp
@@ -8,10 +8,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/ACE.h"
 
-ACE_RCSID (Bug_3566_Regression,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/Bug_3567_Regression/ami_test_i.cpp b/tests/Bug_3567_Regression/ami_test_i.cpp
index 212a4a819b3..c2f5f3bf243 100644
--- a/tests/Bug_3567_Regression/ami_test_i.cpp
+++ b/tests/Bug_3567_Regression/ami_test_i.cpp
@@ -18,8 +18,6 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(AMI, ami_test_i, "$Id$")
-
 AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb,
                         CORBA::Long in_l,
                         const char * in_str,
diff --git a/tests/Bug_3567_Regression/client.cpp b/tests/Bug_3567_Regression/client.cpp
index 188a2de3914..a3e7f9b8d02 100644
--- a/tests/Bug_3567_Regression/client.cpp
+++ b/tests/Bug_3567_Regression/client.cpp
@@ -15,10 +15,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ami_test_i.h"
 
-ACE_RCSID (AMI,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
 int niterations = 10;
@@ -62,18 +58,17 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   Worker (CORBA::ORB_ptr orb);
   // ctor
diff --git a/tests/Bug_3567_Regression/server.cpp b/tests/Bug_3567_Regression/server.cpp
index 50e1fa3ac85..cdcc3991947 100644
--- a/tests/Bug_3567_Regression/server.cpp
+++ b/tests/Bug_3567_Regression/server.cpp
@@ -20,19 +20,16 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(AMI, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 int nthreads = 5;
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   Worker (CORBA::ORB_ptr orb);
   // ctor
@@ -69,7 +66,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3598a_Regression/Hello.cpp b/tests/Bug_3598a_Regression/Hello.cpp
index 7b9497529ec..4c72b17a7c6 100644
--- a/tests/Bug_3598a_Regression/Hello.cpp
+++ b/tests/Bug_3598a_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "Hello.cpp,v 1.3 2002/01/29 20:21:07 okellogg Exp")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3598a_Regression/client.cpp b/tests/Bug_3598a_Regression/client.cpp
index 1eb9ffec04b..741c038e94f 100644
--- a/tests/Bug_3598a_Regression/client.cpp
+++ b/tests/Bug_3598a_Regression/client.cpp
@@ -8,8 +8,6 @@
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/Strategies/OC_Endpoint_Selector_Loader.h"
 
-ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
@@ -34,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3598a_Regression/server.cpp b/tests/Bug_3598a_Regression/server.cpp
index 95d61429e99..2017e62d471 100644
--- a/tests/Bug_3598a_Regression/server.cpp
+++ b/tests/Bug_3598a_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3598a_Regression/svc.conf b/tests/Bug_3598a_Regression/svc.conf
index 75b92f3c589..320c5e26391 100644
--- a/tests/Bug_3598a_Regression/svc.conf
+++ b/tests/Bug_3598a_Regression/svc.conf
@@ -1 +1,3 @@
+# $Id$
+
 static OC_Endpoint_Selector_Factory "-connect_timeout 1300"
diff --git a/tests/Bug_3630_Regression/TAO Conf File.conf b/tests/Bug_3630_Regression/TAO Conf File.conf
index d02ffc26c2b..62ed5a70626 100644
--- a/tests/Bug_3630_Regression/TAO Conf File.conf
+++ b/tests/Bug_3630_Regression/TAO Conf File.conf
@@ -1 +1,3 @@
+# $Id$
+
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection"
diff --git a/tests/Bug_3630_Regression/TAO_Conf_File.conf b/tests/Bug_3630_Regression/TAO_Conf_File.conf
index d02ffc26c2b..62ed5a70626 100644
--- a/tests/Bug_3630_Regression/TAO_Conf_File.conf
+++ b/tests/Bug_3630_Regression/TAO_Conf_File.conf
@@ -1 +1,3 @@
+# $Id$
+
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection"
diff --git a/tests/Bug_3632_Regression/Bug_3632_Regression.mpc b/tests/Bug_3632_Regression/Bug_3632_Regression.mpc
index fb8d07ee600..9729ceb7f7d 100644
--- a/tests/Bug_3632_Regression/Bug_3632_Regression.mpc
+++ b/tests/Bug_3632_Regression/Bug_3632_Regression.mpc
@@ -9,6 +9,7 @@ project(*idl): taoidldefaults {
 }
 
 project(*test): taoclient {
+  after += *idl
   Source_Files {
     test.cpp
     testC.cpp
diff --git a/tests/Bug_3636_Regression/Hello.cpp b/tests/Bug_3636_Regression/Hello.cpp
index df5dc90d3d9..0f62f20b906 100644
--- a/tests/Bug_3636_Regression/Hello.cpp
+++ b/tests/Bug_3636_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3636_Regression/client.cpp b/tests/Bug_3636_Regression/client.cpp
index d1f53d7502e..07255c9e341 100644
--- a/tests/Bug_3636_Regression/client.cpp
+++ b/tests/Bug_3636_Regression/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
diff --git a/tests/Bug_3636_Regression/server.cpp b/tests/Bug_3636_Regression/server.cpp
index 601e72a15ea..1b45c1db07a 100644
--- a/tests/Bug_3636_Regression/server.cpp
+++ b/tests/Bug_3636_Regression/server.cpp
@@ -5,10 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
@@ -33,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3647_Regression/Backend_Impl.cpp b/tests/Bug_3647_Regression/Backend_Impl.cpp
index d3752c32b41..9bbd6a5fc6d 100644
--- a/tests/Bug_3647_Regression/Backend_Impl.cpp
+++ b/tests/Bug_3647_Regression/Backend_Impl.cpp
@@ -1,7 +1,8 @@
-#include "Backend_Impl.h"
-#include "ace/OS.h"
+// -*- C++ -*-
+// $Id$
 
-ACE_RCSID(Bug_3647_Regression, Backend_Impl, "$Id$")
+#include "Backend_Impl.h"
+#include "ace/OS_NS_unistd.h"
 
 Bug_3647_Regression::Backend_Impl::
 Backend_Impl(CORBA::ORB_ptr orb, bool verbose)
diff --git a/tests/Bug_3647_Regression/Middle_Impl.cpp b/tests/Bug_3647_Regression/Middle_Impl.cpp
index 4a5fa30195d..1caa26c9e72 100644
--- a/tests/Bug_3647_Regression/Middle_Impl.cpp
+++ b/tests/Bug_3647_Regression/Middle_Impl.cpp
@@ -1,6 +1,7 @@
-#include "Middle_Impl.h"
+// -*- C++ -*-
+// $Id$
 
-ACE_RCSID(Bug_3647_Regression, Middle_Impl, "$Id$")
+#include "Middle_Impl.h"
 
 Bug_3647_Regression::Middle_Impl::
 Middle_Impl(
@@ -34,14 +35,14 @@ startup_test()
   {
     ACE_DEBUG ((LM_INFO,
             "Middle_Impl::startup_test(%P|%t) - backend "
-            "startup call sucessful\n"));
+            "startup call successful\n"));
   }
   backend_->freeze(10);
   if (verbose_)
   {
     ACE_DEBUG ((LM_INFO,
             "Middle_Impl::startup_test(%P|%t) - backend "
-            "freeze call sucessful\n"));
+            "freeze call successful\n"));
   }
 }
 
diff --git a/tests/Bug_3647_Regression/Test.idl b/tests/Bug_3647_Regression/Test.idl
index e8fc5efdfdf..3aeaab4f7fb 100644
--- a/tests/Bug_3647_Regression/Test.idl
+++ b/tests/Bug_3647_Regression/Test.idl
@@ -14,7 +14,7 @@
 module Bug_3647_Regression
 {
   typedef sequence<octet> Payload;
-  
+
   interface Backend
   {
     /// This operation is called during the startup, to make sure all
diff --git a/tests/Bug_3647_Regression/backend_server.cpp b/tests/Bug_3647_Regression/backend_server.cpp
index 974686b3025..fa06b75a0a3 100644
--- a/tests/Bug_3647_Regression/backend_server.cpp
+++ b/tests/Bug_3647_Regression/backend_server.cpp
@@ -1,17 +1,11 @@
+// -*- C++ -*-
 // $Id$
 
 #include "Backend_Impl.h"
-
 #include "tao/Strategies/advanced_resource.h"
-
-#include "tao/Utils/Servant_Var.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Bug_3647_Regression,
-           backend_server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("backend.ior");
 bool verbose = false;
 
@@ -41,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -72,7 +66,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         return 1;
 
       using namespace Bug_3647_Regression;
-      TAO::Utils::Servant_Var<Backend_Impl> impl(
+      PortableServer::ServantBase_var impl(
           new Backend_Impl(orb.in(), verbose));
 
       PortableServer::ObjectId_var id =
diff --git a/tests/Bug_3647_Regression/client.cpp b/tests/Bug_3647_Regression/client.cpp
index 993a1a76ec6..373bd1f36d7 100644
--- a/tests/Bug_3647_Regression/client.cpp
+++ b/tests/Bug_3647_Regression/client.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "TestC.h"
@@ -7,10 +8,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_3647_Regression,
-          client,
-          "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://middle.ior");
 bool verbose = true;
 long timeout = 2;
@@ -69,7 +66,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
     timeout = tmp;
   }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3647_Regression/middle_server.cpp b/tests/Bug_3647_Regression/middle_server.cpp
index 23a03de8eeb..23f29e825db 100644
--- a/tests/Bug_3647_Regression/middle_server.cpp
+++ b/tests/Bug_3647_Regression/middle_server.cpp
@@ -1,9 +1,9 @@
+// -*- C++ -*-
 // $Id$
 
 #include "Middle_Impl.h"
 
 #include "tao/Utils/PolicyList_Destroyer.h"
-#include "tao/Utils/Servant_Var.h"
 #include "tao/Utils/RIR_Narrow.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/Messaging/Messaging.h"
@@ -11,10 +11,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Bug_3647_Regression,
-           middle_server,
-           "$Id$")
-
 bool verbose = false;
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("middle.ior");
 const ACE_TCHAR *ior = ACE_TEXT ("file://backend.ior");
@@ -101,7 +97,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       timeout = tmp;
     }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -172,7 +168,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       using namespace Bug_3647_Regression;
-      TAO::Utils::Servant_Var<Middle_Impl> impl(
+      PortableServer::ServantBase_var impl(
           new Middle_Impl(backend.in(), orb.in(), verbose,
                           timeout));
 
diff --git a/tests/Bug_3647_Regression/svc.conf b/tests/Bug_3647_Regression/svc.conf
index b3efd649ff2..38a55ae3039 100644
--- a/tests/Bug_3647_Regression/svc.conf
+++ b/tests/Bug_3647_Regression/svc.conf
@@ -2,5 +2,3 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null"
-static Client_Strategy_Factory "-ORBProfileLock null"
diff --git a/tests/Bug_3672_Regression/ami_test_i.cpp b/tests/Bug_3672_Regression/ami_test_i.cpp
index 156756b90a9..9b77796e863 100644
--- a/tests/Bug_3672_Regression/ami_test_i.cpp
+++ b/tests/Bug_3672_Regression/ami_test_i.cpp
@@ -18,8 +18,6 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(AMI, ami_test_i, "$Id$")
-
 AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3672_Regression/client.cpp b/tests/Bug_3672_Regression/client.cpp
index bb3b4ff2bb5..8a530fef2f8 100644
--- a/tests/Bug_3672_Regression/client.cpp
+++ b/tests/Bug_3672_Regression/client.cpp
@@ -16,7 +16,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 #include "ami_test_i.h"
-#include "tao/ORB_Core.h" 
+#include "tao/ORB_Core.h"
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 1;
@@ -61,7 +61,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -81,7 +81,7 @@ public:
 
   /// The thread entry point.
   virtual int svc (void);
-  
+
   /// Set all members to nil
   void clear ();
 
@@ -102,7 +102,7 @@ public:
   Handler (void)
   {
   };
-  
+
   void foo (CORBA::Long result,
             CORBA::Long out_l)
     {
@@ -253,7 +253,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       orb->destroy ();
 
       CORBA::ULong ref_count  = orb->_refcount();
-      
+
       if (ref_count > 1)
         {
           ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Refcount orb %d\n"), ref_count));
@@ -274,7 +274,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       ex._tao_print_exception ("Caught exception:");
       return 1;
-      
+
     }
 
   return parameter_corruption;
diff --git a/tests/Bug_3672_Regression/server.cpp b/tests/Bug_3672_Regression/server.cpp
index 456eceb946e..18d23928d5c 100644
--- a/tests/Bug_3672_Regression/server.cpp
+++ b/tests/Bug_3672_Regression/server.cpp
@@ -19,8 +19,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(AMI, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -47,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3674_Regression/test.cpp b/tests/Bug_3674_Regression/test.cpp
index d506290225f..20d27ee5858 100644
--- a/tests/Bug_3674_Regression/test.cpp
+++ b/tests/Bug_3674_Regression/test.cpp
@@ -8,10 +8,6 @@
 
 #include "testS.h"
 
-ACE_RCSID (PICurrent,
-           test,
-           "test.cpp,v 1.7 2003/11/01 11:15:11 dhinton Exp")
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
diff --git a/tests/Bug_3676_Regression/Hello.cpp b/tests/Bug_3676_Regression/Hello.cpp
index df5dc90d3d9..0f62f20b906 100644
--- a/tests/Bug_3676_Regression/Hello.cpp
+++ b/tests/Bug_3676_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3676_Regression/client.cpp b/tests/Bug_3676_Regression/client.cpp
index 4009d9b2e13..cb20eaaf8d4 100644
--- a/tests/Bug_3676_Regression/client.cpp
+++ b/tests/Bug_3676_Regression/client.cpp
@@ -6,8 +6,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
@@ -32,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3676_Regression/server.cpp b/tests/Bug_3676_Regression/server.cpp
index cacd790a6ff..205a7c179e0 100644
--- a/tests/Bug_3676_Regression/server.cpp
+++ b/tests/Bug_3676_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3683_Regression/Echo_Client_i.h b/tests/Bug_3683_Regression/Echo_Client_i.h
index 2ca50272169..df2d4496a5d 100644
--- a/tests/Bug_3683_Regression/Echo_Client_i.h
+++ b/tests/Bug_3683_Regression/Echo_Client_i.h
@@ -1,22 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/echo
-//
-// = FILENAME
-//    Echo_Client_i.h
-//
-// = DESCRIPTION
-//    This class implements the  interface calls for RMI.
-//
-// = AUTHOR
-//
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Echo_Client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the  interface calls for RMI.
+ *
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ECHO_CLIENT_I_H
 #define ECHO_CLIENT_I_H
@@ -24,30 +20,32 @@
 #include "Simple_util.h"
 #include "EchoC.h"
 
+/**
+ * @class Echo_Client_i
+ *
+ * @brief Echo_Client interface subclass.
+ *
+ * This class implements the interface between the interface
+ * objects and the client .
+ */
 class Echo_Client_i
 {
-  // = TITLE
-  //   Echo_Client interface subclass.
-  //
-  // = DESCRIPTION
-  //   This class implements the interface between the interface
-  //   objects and the client .
 public:
   // = Initialization and termination methods.
+  /// Constructor
   Echo_Client_i (void);
-  // Constructor
 
+  /// Destructor
   ~Echo_Client_i (void);
-  // Destructor
 
+  /// Execute the methods
   int run (const char *, int, ACE_TCHAR **);
-  // Execute the methods
 
 private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
+  /// Instantiate the client object.
   Client<Echo> client_;
-  // Instantiate the client object.
 
   size_t payload_length_;
 };
diff --git a/tests/Bug_3683_Regression/Echo_i.cpp b/tests/Bug_3683_Regression/Echo_i.cpp
index 9bb628c8707..f3e45069e40 100644
--- a/tests/Bug_3683_Regression/Echo_i.cpp
+++ b/tests/Bug_3683_Regression/Echo_i.cpp
@@ -2,8 +2,6 @@
 
 #include "Echo_i.h"
 
-ACE_RCSID(Echo, Echo_i, "$Id$")
-
 // Constructor.
 
 Echo_i::Echo_i (void)
diff --git a/tests/Bug_3683_Regression/Echo_i.h b/tests/Bug_3683_Regression/Echo_i.h
index b048eeb8357..5afd29de0b1 100644
--- a/tests/Bug_3683_Regression/Echo_i.h
+++ b/tests/Bug_3683_Regression/Echo_i.h
@@ -1,63 +1,62 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/echo
-//
-// = FILENAME
-//    Echo_i.h
-//
-// = DESCRIPTION
-//    This class implements the Echo IDL interface.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Echo_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Echo IDL interface.
+ *
+ *
+ *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ECHO_I_H
 #define ECHO_I_H
 
 #include "EchoS.h"
 
+/**
+ * @class Echo_i
+ *
+ * @brief Echo Object Implementation
+ *
+ * The object implementation  performs teh following functions:
+ * -- To return the string which needs to be displayed
+ * from the server.
+ * -- shuts down the server
+ */
 class Echo_i : public POA_Echo
 {
-  // = TITLE
-  //    Echo Object Implementation
-  //
-  // = DESCRIPTION
-  //    The object implementation  performs teh following functions:
-  //   -- To return the string which needs to be displayed
-  //      from the server.
-  //   -- shuts down the server
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Echo_i (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Echo_i (void);
-  // Destructor.
 
+  /// Return the mesg string back from the server.
   virtual Echo::List *echo_list (const char *mesg);
-  // Return the mesg string back from the server.
 
+  /// Return the mesg string back from the server.
   virtual char *echo_string (const char *mesg);
-  // Return the mesg string back from the server.
 
+  /// Shutdown the server.
   virtual void shutdown (void);
-  // Shutdown the server.
 
+  /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
 
 private:
+  /// ORB pointer.
   CORBA::ORB_var orb_;
-  // ORB pointer.
 
+  /// Keeping g++ 2.7.2 happy..
   ACE_UNIMPLEMENTED_FUNC (void operator= (const Echo_i&))
-  // Keeping g++ 2.7.2 happy..
 };
 
 #endif /* ECHO_I_H */
diff --git a/tests/Bug_3683_Regression/Simple_util.h b/tests/Bug_3683_Regression/Simple_util.h
index a5b2bd8304f..ccee51b7aa6 100644
--- a/tests/Bug_3683_Regression/Simple_util.h
+++ b/tests/Bug_3683_Regression/Simple_util.h
@@ -1,20 +1,16 @@
-//$Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple
-//
-// = FILENAME
-//    Simple_Util.h
-//
-// = DESCRIPTION
-//    The classe define the templates for the client and server.
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Simple_util.h
+ *
+ *  $Id$
+ *
+ *  The classe define the templates for the client and server.
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_UTIL_H
 #define TAO_UTIL_H
@@ -24,101 +20,105 @@
 #include "ace/Read_Buffer.h"
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
 
+/**
+ * @class Server
+ *
+ * @brief A set of useful class Templates for using the TAO CORBA
+ * implementation.
+ *
+ * A template server definition. This template can be used by
+ * single server/client projects for defintion of their
+ * server/clients.  See the directories time, bank, echo for
+ * further details of implemenatation.
+ */
 template <class Servant>
 class Server
 {
-  // = TITLE
-  //   A set of useful class Templates for using the TAO CORBA
-  //   implementation.
-  //
-  // = DESCRIPTION
-  //   A template server definition. This template can be used by
-  //   single server/client projects for defintion of their
-  //   server/clients.  See the directories time, bank, echo for
-  //   further details of implemenatation.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.
   Server (void);
-  // Constructor.
 
+  /// Destructor.
   ~Server (void);
-  // Destructor.
 
+  /// Initialize the Server state - parsing arguments and waiting.
+  /// interface_name is the name used to register the Servant.
   int init (const char *servant_name,
             int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the Server state - parsing arguments and waiting.
-  // interface_name is the name used to register the Servant.
 
+  /// Run the orb.
   int run (void);
-  // Run the orb.
 
+  /// Ignore this method if you are not testing the InterOperable
+  /// Naming Service.
   int test_for_ins (const char *ior);
-  // Ignore this method if you are not testing the InterOperable
-  // Naming Service.
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// A holder of the servant that does ref counting for him.
   typedef TAO_Intrusive_Ref_Count_Handle<Servant> Servant_var;
   Servant_var servant_;
-  // A holder of the servant that does ref counting for him.
 
+  /// The ORB manager - a helper class for accessing the POA and
+  /// registering objects.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager - a helper class for accessing the POA and
-  // registering objects.
 
+  /// File where the IOR of the server object is stored.
   ACE_TCHAR *ior_output_file_;
-  // File where the IOR of the server object is stored.
 
+  /// Flag to indicate whether naming service could be used
   int naming_;
-  // Flag to indicate whether naming service could be used
 
+  /// Used test the INS.
   ACE_TCHAR *ins_;
-  // Used test the INS.
 
+  /// Number of command line arguments.
   int argc_;
-  // Number of command line arguments.
 
+  /// The command line arguments.
   ACE_TCHAR **argv_;
-  // The command line arguments.
 };
 
+/**
+ * @class Client
+ *
+ * @brief Template Client class
+ *
+ * A template client implementation for a single server/client
+ * model. The example usage of these usage can be found in the
+ * sub-directories below
+ */
 template <class ServerInterface>
 class Client
 {
-  // = TITLE
-  //   Template Client class
-  //
-  // = DESCRIPTION
-  //   A template client implementation for a single server/client
-  //   model. The example usage of these usage can be found in the
-  //   sub-directories below
 public:
 
   // = Initialization and termination methods.
+  /// Constructor.
   Client (void);
-  // Constructor.
 
+  /// Destructor.
   ~Client (void);
-  // Destructor.
 
+  /// Initialize the client communication endpoint with server.
   int init (const char *name, int argc, ACE_TCHAR *argv[]);
-  // Initialize the client communication endpoint with server.
 
+  /// Return the interface object pointer.
   ServerInterface *operator-> () { return server_.in (); }
-  // Return the interface object pointer.
 
+  /// Returns the shutdown flag.
   int do_shutdown (void);
-  // Returns the shutdown flag.
 
+  /// Fills in the shutdwon flag.
   void do_shutdown (int);
-  // Fills in the shutdwon flag.
 
+  /// Initialize naming service
   int obtain_initial_references (const char *name);
-  // Initialize naming service
 
   CORBA::ORB_ptr orb (void)
     {
@@ -126,33 +126,33 @@ public:
     }
 
 private:
+  /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the server IOR from a file.
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// IOR of the obj ref of the server.
   ACE_CString ior_;
-  // IOR of the obj ref of the server.
 
+  /// Server object
   typedef TAO_Intrusive_Ref_Count_Handle<ServerInterface> ServerInterface_var;
   ServerInterface_var server_;
-  // Server object
 
+  /// Flag to use the naming service
   int naming_;
-  // Flag to use the naming service
 
+  /// Flag for shutting down the server
   int do_shutdown_;
-  // Flag for shutting down the server
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/tests/Bug_3683_Regression/svc.conf b/tests/Bug_3683_Regression/svc.conf
index def545d4845..50836f1ec51 100644
--- a/tests/Bug_3683_Regression/svc.conf
+++ b/tests/Bug_3683_Regression/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static Resource_Factory "-ORBFlushingStrategy blocking"
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
 
diff --git a/tests/Bug_3695_Regression/Bug_3695.cpp b/tests/Bug_3695_Regression/Bug_3695.cpp
index 2d6e49eb0af..3d1ee4218f5 100644
--- a/tests/Bug_3695_Regression/Bug_3695.cpp
+++ b/tests/Bug_3695_Regression/Bug_3695.cpp
@@ -18,7 +18,7 @@ struct IIOP_Profile_var
   explicit IIOP_Profile_var (TAO_IIOP_Profile *pro)
     : pro_ (pro)
   {}
-  
+
   ~IIOP_Profile_var ()
   {
     this->pro_->_decr_refcnt ();
diff --git a/tests/Bug_3701_Regression/client.cpp b/tests/Bug_3701_Regression/client.cpp
index bcaafc79f4a..a3cea619961 100644
--- a/tests/Bug_3701_Regression/client.cpp
+++ b/tests/Bug_3701_Regression/client.cpp
@@ -2,8 +2,6 @@
 
 #include "tao/SystemException.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 int
 ACE_TMAIN(int, ACE_TCHAR *[])
 {
diff --git a/tests/Bug_3746_Regression/Test.idl b/tests/Bug_3746_Regression/Test.idl
index df0af811264..c566d5e04e0 100644
--- a/tests/Bug_3746_Regression/Test.idl
+++ b/tests/Bug_3746_Regression/Test.idl
@@ -9,7 +9,7 @@ module Test
   interface BoundSequences
   {
     typedef sequence<long, 10> SequenceOf10Long;
-    unsigned long SendSequenceOf10Long (in unsigned long LengthSent, in SequenceOf10Long inSeq); 
+    unsigned long SendSequenceOf10Long (in unsigned long LengthSent, in SequenceOf10Long inSeq);
 
     /// A method to shutdown the ORB
     /**
diff --git a/tests/Bug_3746_Regression/Test_i.cpp b/tests/Bug_3746_Regression/Test_i.cpp
index 684b38099e8..35280a77139 100644
--- a/tests/Bug_3746_Regression/Test_i.cpp
+++ b/tests/Bug_3746_Regression/Test_i.cpp
@@ -3,10 +3,6 @@
 //
 #include "Test_i.h"
 
-ACE_RCSID(TestLargeSequence,
-          TestLargeSequence,
-          "$Id$")
-
 BoundSequences::BoundSequences (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3746_Regression/client.cpp b/tests/Bug_3746_Regression/client.cpp
index 9093c0fa7bb..75df0ef04eb 100644
--- a/tests/Bug_3746_Regression/client.cpp
+++ b/tests/Bug_3746_Regression/client.cpp
@@ -3,10 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_3746_Regression,
-          client,
-          "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
@@ -29,7 +25,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3746_Regression/server.cpp b/tests/Bug_3746_Regression/server.cpp
index c6f2435e88e..3d1d8ef00f8 100644
--- a/tests/Bug_3746_Regression/server.cpp
+++ b/tests/Bug_3746_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Bug_3746_Regression,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
@@ -34,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                             -1);
         }
     }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3748_Regression/Hello.cpp b/tests/Bug_3748_Regression/Hello.cpp
index df5dc90d3d9..0f62f20b906 100644
--- a/tests/Bug_3748_Regression/Hello.cpp
+++ b/tests/Bug_3748_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3748_Regression/Makefile.am b/tests/Bug_3748_Regression/Makefile.am
deleted file mode 100644
index b75b16b2db8..00000000000
--- a/tests/Bug_3748_Regression/Makefile.am
+++ /dev/null
@@ -1,107 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Hello_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Hello_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Hello_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Server_ORBInitializer.cpp \
-  Test_Protocols_Hooks.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Bug_3748_Regression/Server_ORBInitializer.cpp b/tests/Bug_3748_Regression/Server_ORBInitializer.cpp
index 1b36e3681df..78f25fc1357 100644
--- a/tests/Bug_3748_Regression/Server_ORBInitializer.cpp
+++ b/tests/Bug_3748_Regression/Server_ORBInitializer.cpp
@@ -8,10 +8,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/PI/ORBInitInfo.h"
 
-ACE_RCSID (Bug_3748_Regression,
-           Server_ORBInitializer,
-           "$Id$")
-
 Server_ORBInitializer::Server_ORBInitializer (void)
 {
 }
diff --git a/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp b/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp
index 549f696ee66..61a1e53f32d 100644
--- a/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp
+++ b/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp
@@ -6,10 +6,6 @@
 #include "Test_Protocols_Hooks.h"
 #include "TestC.h"
 
-ACE_RCSID (Test,
-           Test_Protocols_Hooks,
-           "$Id$")
-
 Test_Protocols_Hooks::Test_Protocols_Hooks (void)
   : failure_count_ (0)
 {
diff --git a/tests/Bug_3748_Regression/client.cpp b/tests/Bug_3748_Regression/client.cpp
index ae5452bb14a..1742dd08168 100644
--- a/tests/Bug_3748_Regression/client.cpp
+++ b/tests/Bug_3748_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
diff --git a/tests/Bug_3748_Regression/server.cpp b/tests/Bug_3748_Regression/server.cpp
index d52ccb88b43..45229e6a070 100644
--- a/tests/Bug_3748_Regression/server.cpp
+++ b/tests/Bug_3748_Regression/server.cpp
@@ -6,10 +6,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
@@ -33,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3755_Ext_Regression/common.cpp b/tests/Bug_3755_Ext_Regression/common.cpp
index 91241f3934d..b02ac88377b 100644
--- a/tests/Bug_3755_Ext_Regression/common.cpp
+++ b/tests/Bug_3755_Ext_Regression/common.cpp
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3755_Ext_Regression/dp_svc.conf b/tests/Bug_3755_Ext_Regression/dp_svc.conf
index 00dd44148e4..aefa8cd4b83 100644
--- a/tests/Bug_3755_Ext_Regression/dp_svc.conf
+++ b/tests/Bug_3755_Ext_Regression/dp_svc.conf
@@ -1,3 +1,3 @@
 # $Id$
 
-dynamic My_Loader Service_Object *TAO_DiffservPolicy:_make_TAO_DiffServPolicy_Initializer() ""
+dynamic My_Loader Service_Object *TAO_DiffServPolicy:_make_TAO_DiffServPolicy_Initializer() ""
diff --git a/tests/Bug_3755_Ext_Regression/run_test.pl b/tests/Bug_3755_Ext_Regression/run_test.pl
index db6aa704d5c..2533c1d054a 100755
--- a/tests/Bug_3755_Ext_Regression/run_test.pl
+++ b/tests/Bug_3755_Ext_Regression/run_test.pl
@@ -10,6 +10,10 @@ use PerlACE::TestTarget;
 
 $status = 0;
 $debug_level = '0';
+$rt = 0;
+$rtsched = 0;
+$endpoint = 0;
+$diffserv = 0;
 $bidir = 0;
 $messaging = 0;
 $csd = 0;
@@ -18,6 +22,14 @@ $ziop = 0;
 foreach $i (@ARGV) {
     if ($i eq '-debug') {
         $debug_level = '10';
+    } elsif ($i eq '-rt') {
+        $rt = 1;
+    } elsif ($i eq '-rtsched') {
+        $rtsched = 1;
+    } elsif ($i eq '-endpoint') {
+        $endpoint = 1;
+    } elsif ($i eq '-diffserv') {
+        $diffserv = 1;
     } elsif ($i eq '-bidir') {
         $bidir = 1;
     } elsif ($i eq '-messaging') {
@@ -59,13 +71,25 @@ sub run_one_test {
 # Common tests.
 my @svcs = (
     ["PI_Server", "pi_server_svc.conf", "pi_server_svc.conf"],
-    ["RTCORBA", "rt_svc.conf", "rt_svc.conf"],
-    ["RTScheduler", "rt_scheduler_svc.conf", "rt_scheduler_svc.conf"],
-    ["EndpointPolicy", "ep_svc.conf", "ep_svc.conf"],
-    ["DiffservPolicy", "dp_svc.conf", "dp_svc.conf"]
 );
 
-if ($bidir) {
+if ($rt) {
+    @svcs = (
+        ["RTCORBA", "rt_svc.conf", "rt_svc.conf"],
+    );
+} elsif ($rtsched) {
+    @svcs = (
+        ["RTScheduler", "rt_scheduler_svc.conf", "rt_scheduler_svc.conf"],
+    );
+} elsif ($endpoint) {
+    @svcs = (
+        ["EndpointPolicy", "ep_svc.conf", "ep_svc.conf"],
+    );
+} elsif ($diffserv) {
+    @svcs = (
+        ["DiffServPolicy", "dp_svc.conf", "dp_svc.conf"]
+    );
+} elsif ($bidir) {
     @svcs = (
         ["BiDir_GIOP", "bidir_svc.conf", "bidir_svc.conf"],
     );
diff --git a/tests/Bug_3755_Regression/server.cpp b/tests/Bug_3755_Regression/server.cpp
index e884078b3bf..692792be9b5 100644
--- a/tests/Bug_3755_Regression/server.cpp
+++ b/tests/Bug_3755_Regression/server.cpp
@@ -45,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3766_Regression/TestI.cpp b/tests/Bug_3766_Regression/TestI.cpp
index 918bf39de15..9042e5fc0ed 100644
--- a/tests/Bug_3766_Regression/TestI.cpp
+++ b/tests/Bug_3766_Regression/TestI.cpp
@@ -27,7 +27,7 @@
  *     http://www.cs.wustl.edu/~schmidt/TAO.html
  **/
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // .\be\be_codegen.cpp:1422
 
 #include "TestI.h"
diff --git a/tests/Bug_3766_Regression/TestI.h b/tests/Bug_3766_Regression/TestI.h
index 67e1a28be35..e3a4e5bf79c 100644
--- a/tests/Bug_3766_Regression/TestI.h
+++ b/tests/Bug_3766_Regression/TestI.h
@@ -27,7 +27,7 @@
  *     http://www.cs.wustl.edu/~schmidt/TAO.html
  **/
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // .\be\be_codegen.cpp:1364
 
 #ifndef TESTI_H_
@@ -43,16 +43,16 @@ class  Test_i
   : public virtual POA_Test
 {
 public:
-  // Constructor 
+  // Constructor
   Test_i (CORBA::ORB_ptr o);
-  
-  // Destructor 
+
+  // Destructor
   virtual ~Test_i (void);
-  
+
   virtual
   void do_something_FixedLength (
     ::FixedLengthInfo_out my_info);
-  
+
   virtual
   void do_something_VariableLength (
     ::VariableLengthInfo_out my_info);
diff --git a/tests/Bug_3766_Regression/client.cpp b/tests/Bug_3766_Regression/client.cpp
index c1690c24f22..0999ff151a5 100644
--- a/tests/Bug_3766_Regression/client.cpp
+++ b/tests/Bug_3766_Regression/client.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "TestC.h"
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
diff --git a/tests/Bug_3766_Regression/server.cpp b/tests/Bug_3766_Regression/server.cpp
index f724fa9bcf3..aaeece0c1f0 100644
--- a/tests/Bug_3766_Regression/server.cpp
+++ b/tests/Bug_3766_Regression/server.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "TestI.h"
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
@@ -28,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3790_Regression/server.cpp b/tests/Bug_3790_Regression/server.cpp
index 763e91666fa..321f89d50de 100644
--- a/tests/Bug_3790_Regression/server.cpp
+++ b/tests/Bug_3790_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3790_Regression/server2.cpp b/tests/Bug_3790_Regression/server2.cpp
index 1920024f0bc..c5aa3b8fd39 100644
--- a/tests/Bug_3790_Regression/server2.cpp
+++ b/tests/Bug_3790_Regression/server2.cpp
@@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3801_Regression/Makefile.am b/tests/Bug_3801_Regression/Makefile.am
deleted file mode 100644
index 56fad7dc3e7..00000000000
--- a/tests/Bug_3801_Regression/Makefile.am
+++ /dev/null
@@ -1,166 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AMI_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-CLEANFILES = \
-  ami_test-stamp \
-  ami_testC.cpp \
-  ami_testC.h \
-  ami_testC.inl \
-  ami_testS.cpp \
-  ami_testS.h \
-  ami_testS.inl
-
-ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp
-
-ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ami_test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  client.cpp \
-  ami_test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  ami_test_i.cpp \
-  server.cpp \
-  ami_test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.AMI_Simple_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += simple_client
-
-simple_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-simple_client_SOURCES = \
-  ami_testC.cpp \
-  ami_testS.cpp \
-  simple_client.cpp \
-  ami_test_i.h
-
-simple_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_3801_Regression/ami_test.idl b/tests/Bug_3801_Regression/ami_test.idl
index be446bc290b..9b24ec68d59 100644
--- a/tests/Bug_3801_Regression/ami_test.idl
+++ b/tests/Bug_3801_Regression/ami_test.idl
@@ -36,7 +36,7 @@ module A
           raises (DidTheRightThing);
 
         oneway void shutdown ();
-        
+
         void inout_arg_test (inout string str);
       };
   };
diff --git a/tests/Bug_3801_Regression/ami_test_i.cpp b/tests/Bug_3801_Regression/ami_test_i.cpp
index d03bec106b8..d58451eb346 100644
--- a/tests/Bug_3801_Regression/ami_test_i.cpp
+++ b/tests/Bug_3801_Regression/ami_test_i.cpp
@@ -17,8 +17,6 @@
 #include "ami_test_i.h"
 #include "tao/debug.h"
 
-ACE_RCSID(AMI, ami_test_i, "$Id$")
-
 AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3801_Regression/exclusive.conf b/tests/Bug_3801_Regression/exclusive.conf
index b269154099f..e03ea06380b 100644
--- a/tests/Bug_3801_Regression/exclusive.conf
+++ b/tests/Bug_3801_Regression/exclusive.conf
@@ -1,2 +1,3 @@
+# $Id$
 
-static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBclientconnectionhandler ST"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST"
diff --git a/tests/Bug_3801_Regression/exclusive.conf.xml b/tests/Bug_3801_Regression/exclusive.conf.xml
index 6724ae56996..33db7f50d83 100644
--- a/tests/Bug_3801_Regression/exclusive.conf.xml
+++ b/tests/Bug_3801_Regression/exclusive.conf.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
 <!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBclientconnectionhandler ST"/>
+ <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST"/>
 </ACE_Svc_Conf>
diff --git a/tests/Bug_3801_Regression/muxed.conf b/tests/Bug_3801_Regression/muxed.conf
index a7f2f5f608a..117767bce28 100644
--- a/tests/Bug_3801_Regression/muxed.conf
+++ b/tests/Bug_3801_Regression/muxed.conf
@@ -1,2 +1,3 @@
+# $Id$
 
-static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBProfileLock null -ORBClientConnectionHandler ST"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST"
diff --git a/tests/Bug_3801_Regression/muxed.conf.xml b/tests/Bug_3801_Regression/muxed.conf.xml
index 812cb7376db..cf063034ce0 100644
--- a/tests/Bug_3801_Regression/muxed.conf.xml
+++ b/tests/Bug_3801_Regression/muxed.conf.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
 <!-- Converted from ./tests/AMI/muxed.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED -ORBProfileLock null -ORBClientConnectionHandler ST"/>
+ <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST"/>
 </ACE_Svc_Conf>
diff --git a/tests/Bug_3801_Regression/server.cpp b/tests/Bug_3801_Regression/server.cpp
index 456eceb946e..18d23928d5c 100644
--- a/tests/Bug_3801_Regression/server.cpp
+++ b/tests/Bug_3801_Regression/server.cpp
@@ -19,8 +19,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(AMI, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -47,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3801_Regression/simple_client.cpp b/tests/Bug_3801_Regression/simple_client.cpp
index ba7b75e8634..b91b1602926 100644
--- a/tests/Bug_3801_Regression/simple_client.cpp
+++ b/tests/Bug_3801_Regression/simple_client.cpp
@@ -19,10 +19,6 @@
 
 #include "ami_testS.h"
 
-ACE_RCSID (AMI,
-           simple_client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int shutdown_flag = 0;
 int debug = 0;
@@ -56,7 +52,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -74,7 +70,7 @@ public:
       ACE_ERROR ((LM_ERROR,
                   "Error: Callback method <get_yadda> called: result <%d>\n",
                   result));
-      result = 1;                  
+      result = 1;
     };
 
   void get_yadda_excep (::Messaging::ExceptionHolder *excep_holder)
@@ -116,7 +112,7 @@ public:
     {
       ACE_ERROR ((LM_ERROR,
                   "Error: Callback method <set_yadda> called:\n"));
-      result = 1;                  
+      result = 1;
     };
 
   void set_yadda_excep (::Messaging::ExceptionHolder *excep_holder)
@@ -159,7 +155,7 @@ public:
       ACE_ERROR ((LM_ERROR,
                   "Error: Callback method <get_dadda> called: result <%d>\n",
                   result));
-      result = 1;                  
+      result = 1;
     };
 
   void get_dadda_excep (::Messaging::ExceptionHolder *excep_holder)
@@ -271,7 +267,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       CORBA::String_var mystring = CORBA::string_dup ("Hello");
-     
+
       ami_test_var->inout_arg_test (mystring.inout ());
 
       if (shutdown_flag)
diff --git a/tests/Bug_3812_Regression/Bug_3812_Regression.cpp b/tests/Bug_3812_Regression/Bug_3812_Regression.cpp
deleted file mode 100644
index e485f7447a6..00000000000
--- a/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/tests/Bug_3812_Regression/Makefile.am b/tests/Bug_3812_Regression/Makefile.am
deleted file mode 100755
index ec325af2e83..00000000000
--- a/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/tests/Bug_3812_Regression/mock_ps.h b/tests/Bug_3812_Regression/mock_ps.h
deleted file mode 100644
index 6c6631d8c07..00000000000
--- a/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/tests/Bug_3812_Regression/mock_tdi.h b/tests/Bug_3812_Regression/mock_tdi.h
deleted file mode 100644
index 341b9b31626..00000000000
--- a/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/tests/Bug_3812_Regression/mock_transport.h b/tests/Bug_3812_Regression/mock_transport.h
deleted file mode 100644
index 5101d883f2b..00000000000
--- a/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/tests/Bug_3812_Regression/run_test.pl b/tests/Bug_3812_Regression/run_test.pl
deleted file mode 100755
index 231ddcd7576..00000000000
--- a/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/tests/Bug_3821_Regression/test.cpp b/tests/Bug_3821_Regression/test.cpp
index bd24defe508..fb63782b2cc 100644
--- a/tests/Bug_3821_Regression/test.cpp
+++ b/tests/Bug_3821_Regression/test.cpp
@@ -3,10 +3,6 @@
 #include "testC.h"
 #include "tao/CDR.h"
 
-ACE_RCSID(Test,
-          test,
-          "$Id$")
-
 namespace
 {
   template<typename T>
diff --git a/tests/Bug_3826_Regression/server.cpp b/tests/Bug_3826_Regression/server.cpp
index 2c0a1c33360..012ab8304cf 100644
--- a/tests/Bug_3826_Regression/server.cpp
+++ b/tests/Bug_3826_Regression/server.cpp
@@ -41,7 +41,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3837_Regression/Hello.cpp b/tests/Bug_3837_Regression/Hello.cpp
index df5dc90d3d9..0f62f20b906 100644
--- a/tests/Bug_3837_Regression/Hello.cpp
+++ b/tests/Bug_3837_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Bug_3837_Regression/client.cpp b/tests/Bug_3837_Regression/client.cpp
index 106d1e5a879..21984fb845a 100644
--- a/tests/Bug_3837_Regression/client.cpp
+++ b/tests/Bug_3837_Regression/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3837_Regression/logger.conf b/tests/Bug_3837_Regression/logger.conf
index acf197284a0..f5b9a410471 100644
--- a/tests/Bug_3837_Regression/logger.conf
+++ b/tests/Bug_3837_Regression/logger.conf
@@ -1 +1,3 @@
+# $Id$
+
 dynamic Logger Service_Object * ACE:_make_ACE_Logging_Strategy() "-s log.out -f STDERR|OSTREAM -m 1 -i 1 -N 4 -w"
diff --git a/tests/Bug_3837_Regression/server.cpp b/tests/Bug_3837_Regression/server.cpp
index bf7ae83a9c4..beb88556a6c 100644
--- a/tests/Bug_3837_Regression/server.cpp
+++ b/tests/Bug_3837_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3853_Regression/Client_ORBInitializer.cpp b/tests/Bug_3853_Regression/Client_ORBInitializer.cpp
index db0e3fc7cf0..3d6c5915bd6 100644
--- a/tests/Bug_3853_Regression/Client_ORBInitializer.cpp
+++ b/tests/Bug_3853_Regression/Client_ORBInitializer.cpp
@@ -3,9 +3,6 @@
 #include "Client_ORBInitializer.h"
 #include "client_interceptor.h"
 
-
-ACE_RCSID (Service_Context_Manipulation, Client_ORBInitializer, "$Id$")
-
 Client_ORBInitializer::Client_ORBInitializer ()
 {
 
diff --git a/tests/Bug_3853_Regression/Hello.idl b/tests/Bug_3853_Regression/Hello.idl
index 13926dd3d61..b707d501a1a 100644
--- a/tests/Bug_3853_Regression/Hello.idl
+++ b/tests/Bug_3853_Regression/Hello.idl
@@ -3,7 +3,7 @@
 //
 module Demo
 {
-  interface HelloWorld 
+  interface HelloWorld
   {
     void sayHello(in string msg);
     oneway void shutdown();
diff --git a/tests/Bug_3853_Regression/Hello_i.cpp b/tests/Bug_3853_Regression/Hello_i.cpp
index b354ffa12c0..478a4fc6902 100644
--- a/tests/Bug_3853_Regression/Hello_i.cpp
+++ b/tests/Bug_3853_Regression/Hello_i.cpp
@@ -1,12 +1,7 @@
-//
 // $Id$
-//
 
 #include "Hello_i.h"
-#include "ace/OS.h"
-
-#include <iostream>
-using namespace std;
+#include "ace/OS_NS_unistd.h"
 
 // Implementation skeleton constructor
 Demo_HelloWorld_i::Demo_HelloWorld_i (CORBA::ORB_ptr orb)
@@ -25,16 +20,16 @@ void Demo_HelloWorld_i::sayHello (
 {
   ACE_OS::sleep(1);
   // Add your implementation here
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%P|%t)Demo_HelloWorld_i::sayHello %s \n"), msg));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%P|%t)Demo_HelloWorld_i::sayHello %C\n"), msg));
 }
 
 
 
-void 
+void
 Demo_HelloWorld_i::shutdown()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)Demo_HelloWorld_i::shutdown \n"));
   this->orb_->shutdown (0);
 }
-    
+
 
diff --git a/tests/Bug_3853_Regression/Hello_i.h b/tests/Bug_3853_Regression/Hello_i.h
index 4713d8d771c..2f7fc11e8f1 100644
--- a/tests/Bug_3853_Regression/Hello_i.h
+++ b/tests/Bug_3853_Regression/Hello_i.h
@@ -15,18 +15,18 @@ class  Demo_HelloWorld_i
   : public virtual POA_Demo::HelloWorld
 {
 public:
-  // Constructor 
+  // Constructor
   Demo_HelloWorld_i (CORBA::ORB_ptr orb);
-  
-  // Destructor 
+
+  // Destructor
   virtual ~Demo_HelloWorld_i (void);
-  
+
   virtual void sayHello (
       const char * msg
     );
-    
+
   virtual void shutdown();
-    
+
 private:
 
   CORBA::ORB_var orb_;
diff --git a/tests/Bug_3853_Regression/client.cpp b/tests/Bug_3853_Regression/client.cpp
index cf192bcfad5..765f8677cfd 100644
--- a/tests/Bug_3853_Regression/client.cpp
+++ b/tests/Bug_3853_Regression/client.cpp
@@ -7,8 +7,8 @@
 #include "tao/PI_Server/PI_Server.h"
 #include "tao/debug.h"
 #include "ace/Task.h"
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_unistd.h"
 #include <iostream>
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("client.ior");
@@ -103,7 +103,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                               argv [0]),
             -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3853_Regression/client_interceptor.cpp b/tests/Bug_3853_Regression/client_interceptor.cpp
index 0e5ee8f3bdc..1f93f524181 100644
--- a/tests/Bug_3853_Regression/client_interceptor.cpp
+++ b/tests/Bug_3853_Regression/client_interceptor.cpp
@@ -7,10 +7,6 @@
 extern const ACE_TCHAR *server2_ior;
 extern CORBA::ORB_var orb;
 
-ACE_RCSID (Service_Context_Manipulation,
-           interceptors,
-           "$Id$")
-
 const IOP::ServiceId service_id = 0xdeadbeef;
 
 int isRecursive = 0;
diff --git a/tests/Bug_3853_Regression/run_test.pl b/tests/Bug_3853_Regression/run_test.pl
index 6616f62667f..332df733501 100755
--- a/tests/Bug_3853_Regression/run_test.pl
+++ b/tests/Bug_3853_Regression/run_test.pl
@@ -105,7 +105,7 @@ if ($server_status != 0) {
   $CL->Kill (); $CL->TimedWait (1);
   exit 1;
 }
- 
+
 $server_status = $SV1->Spawn ();
 
 if ($server_status != 0) {
diff --git a/tests/Bug_3853_Regression/server.cpp b/tests/Bug_3853_Regression/server.cpp
index d5f9e0b93b2..8f258f5656c 100644
--- a/tests/Bug_3853_Regression/server.cpp
+++ b/tests/Bug_3853_Regression/server.cpp
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_3896_Regression/Bug_3896_Regression.mpc b/tests/Bug_3896_Regression/Bug_3896_Regression.mpc
new file mode 100644
index 00000000000..75e2eb600fa
--- /dev/null
+++ b/tests/Bug_3896_Regression/Bug_3896_Regression.mpc
@@ -0,0 +1,37 @@
+// -*- MPC -*-
+// $Id$
+
+project(*idl): taoidldefaults {
+  idlflags += -Sp
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver {
+  after += *idl
+  Source_Files {
+    Hello.cpp
+    server.cpp
+  }
+  Source_Files {
+    TestC.cpp
+    TestS.cpp
+  }
+  IDL_Files {
+  }
+}
+
+project(*Client): taoclient, messaging {
+  after += *idl
+  Source_Files {
+    client.cpp
+  }
+  Source_Files {
+    TestC.cpp
+  }
+  IDL_Files {
+  }
+}
+
diff --git a/tests/Bug_3896_Regression/Hello.cpp b/tests/Bug_3896_Regression/Hello.cpp
new file mode 100644
index 00000000000..a43d2445314
--- /dev/null
+++ b/tests/Bug_3896_Regression/Hello.cpp
@@ -0,0 +1,22 @@
+// $Id$
+#include "Hello.h"
+#include "ace/OS_NS_unistd.h"
+
+Hello::Hello (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+char *
+Hello::get_string (void)
+{
+  ACE_OS::sleep (10);
+
+  return CORBA::string_dup ("Hello there!");
+}
+
+void
+Hello::shutdown (void)
+{
+  this->orb_->shutdown (0);
+}
diff --git a/tests/Bug_3896_Regression/Hello.h b/tests/Bug_3896_Regression/Hello.h
new file mode 100644
index 00000000000..f87205c3011
--- /dev/null
+++ b/tests/Bug_3896_Regression/Hello.h
@@ -0,0 +1,31 @@
+//
+// $Id$
+//
+
+#ifndef HELLO_H
+#define HELLO_H
+#include /**/ "ace/pre.h"
+
+#include "TestS.h"
+
+/// Implement the Test::Hello interface
+class Hello
+  : public virtual POA_Test::Hello
+{
+public:
+  /// Constructor
+  Hello (CORBA::ORB_ptr orb);
+
+  // = The skeleton methods
+  virtual char * get_string (void);
+
+  virtual void shutdown (void);
+
+private:
+  /// Use an ORB reference to conver strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#include /**/ "ace/post.h"
+#endif /* HELLO_H */
diff --git a/tests/Bug_3896_Regression/Test.idl b/tests/Bug_3896_Regression/Test.idl
new file mode 100644
index 00000000000..3c0976e106d
--- /dev/null
+++ b/tests/Bug_3896_Regression/Test.idl
@@ -0,0 +1,20 @@
+//
+// $Id$
+//
+
+/// Put the interfaces in a module, to avoid global namespace pollution
+module Test
+{
+  /// A very simple interface
+  interface Hello
+  {
+    /// Return a simple string
+    string get_string ();
+
+    /// A method to shutdown the ORB
+    /**
+     * This method is used to simplify the test shutdown process
+     */
+    oneway void shutdown ();
+  };
+};
diff --git a/tests/Bug_3896_Regression/client.cpp b/tests/Bug_3896_Regression/client.cpp
new file mode 100644
index 00000000000..9187ddc46eb
--- /dev/null
+++ b/tests/Bug_3896_Regression/client.cpp
@@ -0,0 +1,159 @@
+// $Id$
+
+#include "TestC.h"
+#include "ace/Get_Opt.h"
+#include "ace/Task_T.h"
+#include "ace/OS_NS_unistd.h"
+#include "tao/TimeBaseC.h"
+#include "tao/Messaging/Messaging.h"
+
+const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
+bool shutdown_server = false;
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:x"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+      case 'x':
+        shutdown_server = true;
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+class Client : public ACE_Task_Base
+{
+public:
+  Client (CORBA::ORB_ptr server);
+
+  virtual int svc (void);
+
+private:
+  CORBA::ORB_var orb_;
+};
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      // Set round-trip timeout
+      const int timeout_secs = 5;
+
+      CORBA::Object_var obj = orb->resolve_initial_references ("ORBPolicyManager");
+      CORBA::PolicyManager_var policy_manager =
+        CORBA::PolicyManager::_narrow (obj.in());
+
+      CORBA::PolicyList policy_list;
+      policy_list.length(0);
+      policy_manager->set_policy_overrides(policy_list, CORBA::SET_OVERRIDE);
+
+      TimeBase::TimeT timeout = timeout_secs * 10000000;
+      CORBA::Any orb_timeout;
+      orb_timeout <<= timeout;
+      policy_list.length(1);
+      policy_list[0] = orb->create_policy(
+        Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, orb_timeout);
+
+      policy_manager->set_policy_overrides(policy_list, CORBA::SET_OVERRIDE);
+
+      CORBA::Object_var tmp = orb->string_to_object(ior);
+
+      Test::Hello_var hello = Test::Hello::_narrow(tmp.in ());
+
+      if (CORBA::is_nil (hello.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "Nil Test::Hello reference <%s>\n",
+                             ior),
+                            1);
+        }
+
+      if (shutdown_server)
+        {
+          hello->shutdown ();
+        }
+      else
+        {
+          Client client (orb.in ());
+          if (client.activate (THR_NEW_LWP | THR_JOINABLE, 1) != 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                              "Cannot activate client threads\n"),
+                              1);
+
+          CORBA::String_var the_string;
+          try
+            {
+              the_string = hello->get_string ();
+            }
+          catch (const CORBA::TIMEOUT&)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "(%P|%t) Error: got timeout\n"));
+            }
+          catch (const CORBA::COMM_FAILURE&)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "(%P|%t) Ok: got comm exception\n"));
+            }
+
+          ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%C>\n",
+                      the_string.in ()));
+
+          client.thr_mgr ()->wait ();
+        }
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
+
+Client::Client (CORBA::ORB_ptr orb)
+  :  orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+int
+Client::svc (void)
+{
+  try
+    {
+      ACE_OS::sleep (2);
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%P|%t) Shutting down ORB\n"));
+      orb_->shutdown (true);
+    }
+  catch (const CORBA::Exception&)
+    {
+    }
+  return 0;
+}
diff --git a/tests/Bug_3896_Regression/run_test.pl b/tests/Bug_3896_Regression/run_test.pl
new file mode 100755
index 00000000000..af90f7751c8
--- /dev/null
+++ b/tests/Bug_3896_Regression/run_test.pl
@@ -0,0 +1,82 @@
+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 $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+my $iorbase = "server.ior";
+my $server_iorfile = $server->LocalFile ($iorbase);
+my $client_iorfile = $client->LocalFile ($iorbase);
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile");
+$CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level -k file://$client_iorfile");
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+if ($server->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$CL->Arguments ("-x -ORBdebuglevel $debug_level -k file://$client_iorfile");
+
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+exit $status;
diff --git a/tests/Bug_3896_Regression/server.cpp b/tests/Bug_3896_Regression/server.cpp
new file mode 100644
index 00000000000..205a7c179e0
--- /dev/null
+++ b/tests/Bug_3896_Regression/server.cpp
@@ -0,0 +1,101 @@
+// $Id$
+
+#include "Hello.h"
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
+
+const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      if (CORBA::is_nil (root_poa.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Panic: nil RootPOA\n"),
+                          1);
+
+      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      Hello *hello_impl = 0;
+      ACE_NEW_RETURN (hello_impl,
+                      Hello (orb.in ()),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(hello_impl);
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Test::Hello_var hello = Test::Hello::_narrow (object.in ());
+
+      CORBA::String_var ior = orb->object_to_string (hello.in ());
+
+      // Output the IOR to the <ior_output_file>
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s\n",
+                           ior_output_file),
+                           1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      poa_manager->activate ();
+
+      orb->run ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+
+      root_poa->destroy (1, 1);
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/tests/Bug_3919_Regression/Bug_3919_Regression.mpc b/tests/Bug_3919_Regression/Bug_3919_Regression.mpc
new file mode 100644
index 00000000000..25f0f8e8f5f
--- /dev/null
+++ b/tests/Bug_3919_Regression/Bug_3919_Regression.mpc
@@ -0,0 +1,41 @@
+// -*- MPC -*-
+//
+// $Id$
+
+project(*idl): taoidldefaults, valuetype {
+  idlflags += -Sp
+  idlflags -= -ae
+  idlflags += -as
+  IDL_Files {
+    Test.idl
+    Test2.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, valuetype {
+  after += *idl
+
+  Source_Files {
+    Hello.cpp
+    server.cpp
+    TestC.cpp
+    TestS.cpp
+    Test2C.cpp
+    Test2S.cpp
+  }
+  IDL_Files {
+  }
+}
+
+project(*Client): taoclient, valuetype, typecodefactory {
+  after += *idl
+
+  Source_Files {
+    TestC.cpp
+    Test2C.cpp
+    client.cpp
+  }
+  IDL_Files {
+  }
+}
diff --git a/tests/Bug_3919_Regression/Hello.cpp b/tests/Bug_3919_Regression/Hello.cpp
new file mode 100644
index 00000000000..46043d0d3ee
--- /dev/null
+++ b/tests/Bug_3919_Regression/Hello.cpp
@@ -0,0 +1,27 @@
+// $Id$
+
+#include "Hello.h"
+
+Hello::Hello (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+CORBA::Any *
+Hello::get_any (CORBA::Any const & the_any)
+{
+  CORBA::Any * retval = 0;
+
+  ACE_NEW_THROW_EX (retval,
+                    CORBA::Any (the_any),
+                    CORBA::NO_MEMORY ());
+
+  return retval;
+}
+
+
+void
+Hello::shutdown (void)
+{
+  this->orb_->shutdown (0);
+}
diff --git a/tests/Bug_3919_Regression/Hello.h b/tests/Bug_3919_Regression/Hello.h
new file mode 100644
index 00000000000..64c39d87300
--- /dev/null
+++ b/tests/Bug_3919_Regression/Hello.h
@@ -0,0 +1,41 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Hello.h
+ *
+ *  $Id$
+ *
+ *  Header file for recursive type Any insertion and extraction test.
+ *
+ *  @author Ossama Othman
+ */
+//=============================================================================
+
+
+#ifndef HELLO_H
+#define HELLO_H
+
+#include "TestS.h"
+
+class Hello
+  : public virtual POA_Test::Hello
+{
+public:
+
+  /// Constructor
+  Hello (CORBA::ORB_ptr orb);
+
+  // Return the any provide as an "in" argument.
+  virtual CORBA::Any * get_any (CORBA::Any const & the_any);
+
+  virtual void shutdown (void);
+
+private:
+
+  /// The ORB which will be shutdown by Hello::shutdown().
+  CORBA::ORB_var orb_;
+
+};
+
+#endif /* HELLO_H */
diff --git a/tests/Bug_3919_Regression/Test.idl b/tests/Bug_3919_Regression/Test.idl
new file mode 100644
index 00000000000..f15c0dd0e0e
--- /dev/null
+++ b/tests/Bug_3919_Regression/Test.idl
@@ -0,0 +1,44 @@
+//
+// $Id$
+//
+
+#include "tao/OctetSeq.pidl"
+#include "tao/StringSeq.pidl"
+
+/// Put the interfaces in a module, to avoid global namespace pollution
+module Test
+{
+  exception Recursive_Type_In_Any_Test_Failed {};
+  exception Demarshaling_From_Any_Failed {};
+
+  enum MyAttRefValEnum {
+    ArvAttribute,
+    ArvInteger,
+    ArvComposition
+  };
+
+  // NOTE: the (deprecated) anonymous sequence type in the union
+  //       is intentional; the IDL compiler generated different
+  //       code for this case as compared to using a proper
+  //       forward and typedef.
+  struct MyAttRef {
+    string attRefName;
+    string attRefQualifier;
+    union MyAttRefValue switch(MyAttRefValEnum) {
+      case ArvAttribute:    string attrValue; //value of a simple attribute
+      case ArvInteger:      long intValue; // just for testing
+      case ArvComposition:  sequence <MyAttRef> compValue; //a composition by specifying a sequence of MyAttRef elements.
+    } attRefValue;
+  };
+  typedef sequence <MyAttRef> MyAttRefSequence;
+
+  /// Simple test interface.
+  interface Hello
+  {
+    /// Return the any provided as the "in" argument.
+    any get_any (in any the_any);
+
+    /// Shutdown the server ORB.
+    oneway void shutdown ();
+  };
+};
diff --git a/tests/Bug_3919_Regression/Test2.idl b/tests/Bug_3919_Regression/Test2.idl
new file mode 100644
index 00000000000..d66a82bc32c
--- /dev/null
+++ b/tests/Bug_3919_Regression/Test2.idl
@@ -0,0 +1,10 @@
+// $Id$
+
+#include "Test.idl"
+
+module Test2
+{
+  struct MyAttRefSeqStruct {
+    Test::MyAttRefSequence attRefSeq;
+  };
+};
diff --git a/tests/Bug_3919_Regression/client.cpp b/tests/Bug_3919_Regression/client.cpp
new file mode 100644
index 00000000000..a1aa68d5292
--- /dev/null
+++ b/tests/Bug_3919_Regression/client.cpp
@@ -0,0 +1,263 @@
+// $Id$
+
+#include "Test2C.h"
+#include "tao/IFR_Client/IFR_BaseC.h"
+#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
+
+#include "ace/Get_Opt.h"
+
+#include <algorithm>
+#include <functional>
+
+const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      case 'h':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+
+  // Successful command line parsing.
+  return 0;
+}
+
+template<typename T> void dump (T *); // Forward declaration.
+
+template<typename T>
+void
+perform_invocation (Test::Hello_ptr hello,
+                    CORBA::Any const & the_any)
+{
+  // Execute more than once to help verify that mutable recursive
+  // TypeCode state is managed correctly.
+  for (unsigned int n = 0; n < 2; ++n)
+    {
+      CORBA::Any_var my_any =
+        hello->get_any (the_any);
+
+      T * my_foo = 0;
+      if (!(my_any.in () >>= my_foo))
+        throw Test::Demarshaling_From_Any_Failed ();
+
+      CORBA::TypeCode_var the_tc = the_any.type ();
+      CORBA::TypeCode_var my_tc  = my_any->type ();
+
+      CORBA::Boolean const equal_tc =
+        the_tc->equal (my_tc.in ());
+
+      if (!equal_tc)
+        throw Test::Recursive_Type_In_Any_Test_Failed ();
+
+      CORBA::Boolean const equiv_tc =
+        the_tc->equivalent (my_tc.in ());
+
+      if (!equiv_tc)
+        throw Test::Recursive_Type_In_Any_Test_Failed ();
+    }
+}
+
+void
+recursive_typecode_test (CORBA::ORB_ptr /* orb */,
+                              Test::Hello_ptr hello)
+{
+  ACE_DEBUG ((LM_INFO,
+              "Executing recursive typecode test\n"));
+
+  CORBA::Any the_any;
+
+  Test::MyAttRefSequence test;
+
+  Test::MyAttRef attr;
+  attr.attRefName="attr";
+  attr.attRefValue.attrValue("value");
+  attr.attRefQualifier="atrQ1";
+
+  Test::MyAttRef attr2;
+  attr2.attRefName="attr2";
+  attr2.attRefValue.attrValue("value2");
+  attr2.attRefQualifier="atrQ2";
+
+  Test::MyAttRef comp;
+  comp.attRefName="comp1";
+  comp.attRefQualifier="compQ";
+
+  Test::MyAttRef::MyAttRefValue::_compValue_seq compSeq(1);
+  compSeq.length(1);
+  compSeq[0]=attr2;
+  comp.attRefValue.compValue(compSeq);
+
+  Test::MyAttRef inti;
+  inti.attRefName="intval";
+  inti.attRefValue.intValue(0xAFFEAFFE);
+
+  test.length(3);
+  test[0] = comp;
+  test[1] = inti;
+  test[2] = attr;
+
+  the_any <<= test;
+
+  ::perform_invocation<Test::MyAttRefSequence> (hello, the_any);
+
+}
+
+void
+nested_recursive_typecode_test (CORBA::ORB_ptr /* orb */,
+                              Test::Hello_ptr hello)
+{
+  ACE_DEBUG ((LM_INFO,
+              "Executing nested recursive typecode test\n"));
+
+  CORBA::Any the_any;
+
+  Test2::MyAttRefSeqStruct test;
+
+  Test::MyAttRef attr;
+  attr.attRefName="attr";
+  attr.attRefValue.attrValue("value");
+  attr.attRefQualifier="atrQ1";
+
+  Test::MyAttRef attr2;
+  attr2.attRefName="attr2";
+  attr2.attRefValue.attrValue("value2");
+  attr2.attRefQualifier="atrQ2";
+
+  Test::MyAttRef comp;
+  comp.attRefName="comp1";
+  comp.attRefQualifier="compQ";
+
+  Test::MyAttRef::MyAttRefValue::_compValue_seq compSeq(1);
+  compSeq.length(1);
+  compSeq[0]=attr2;
+  comp.attRefValue.compValue(compSeq);
+
+  Test::MyAttRef inti;
+  inti.attRefName="intval";
+  inti.attRefValue.intValue(0xAFFEAFFE);
+
+  test.attRefSeq.length(3);
+  test.attRefSeq[0] = comp;
+  test.attRefSeq[1] = inti;
+  test.attRefSeq[2] = attr;
+
+  the_any <<= test;
+
+  ::perform_invocation<Test2::MyAttRefSeqStruct> (hello, the_any);
+
+}
+
+/**
+ * @struct Caller
+ *
+ * @brief Test method invocation functor.
+ *
+ * Test method invocation functor.
+ */
+template <typename T>
+struct Caller : public std::unary_function<T, void>
+{
+  /// Constructor.
+  Caller (CORBA::ORB_ptr o, Test::Hello_ptr h)
+    : orb (CORBA::ORB::_duplicate (o))
+    , hello (Test::Hello::_duplicate (h))
+    , success (true)
+  {
+  }
+
+  /// Function call operator overload.
+  void operator() (T f)
+  {
+    try
+      {
+        f (orb.in (),
+           hello.in ());
+      }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception thrown:");
+
+        success = false;
+      }
+  }
+
+  CORBA::ORB_var orb;
+  Test::Hello_var hello;
+  bool success;
+};
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var tmp =
+        orb->string_to_object(ior);
+
+      Test::Hello_var hello =
+        Test::Hello::_narrow(tmp.in ());
+
+      if (CORBA::is_nil (hello.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "Nil Test::Hello reference <%s>\n",
+                             ior),
+                            1);
+        }
+
+      typedef void (*test_func) (CORBA::ORB_ptr,
+                                 Test::Hello_ptr);
+
+      static test_func const tests[] =
+        {
+          recursive_typecode_test,
+          nested_recursive_typecode_test
+        };
+
+      static size_t const test_count = sizeof (tests) / sizeof (test_func);
+
+      // Have some fun with the STL.  :-)
+      Caller<test_func> c =
+        std::for_each (tests,
+                       tests + test_count,
+                       Caller<test_func> (orb.in (),
+                                          hello.in ()));
+
+      if (!c.success)
+        throw Test::Recursive_Type_In_Any_Test_Failed ();
+
+      hello->shutdown ();
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/tests/Bug_3919_Regression/run_test.pl b/tests/Bug_3919_Regression/run_test.pl
new file mode 100755
index 00000000000..719974e5c50
--- /dev/null
+++ b/tests/Bug_3919_Regression/run_test.pl
@@ -0,0 +1,73 @@
+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 $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+my $iorbase = "server.ior";
+my $server_iorfile = $server->LocalFile ($iorbase);
+my $client_iorfile = $client->LocalFile ($iorbase);
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile");
+$CL = $client->CreateProcess ("client", "-k file://$client_iorfile");
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+if ($server->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+exit $status;
diff --git a/tests/Bug_3919_Regression/server.cpp b/tests/Bug_3919_Regression/server.cpp
new file mode 100644
index 00000000000..ab19d0fb0a7
--- /dev/null
+++ b/tests/Bug_3919_Regression/server.cpp
@@ -0,0 +1,104 @@
+// $Id$
+
+#include "Hello.h"
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
+
+const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      if (CORBA::is_nil (root_poa.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Panic: nil RootPOA\n"),
+                          1);
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      Hello *hello_impl;
+      ACE_NEW_RETURN (hello_impl,
+                      Hello (orb.in ()),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(hello_impl);
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Test::Hello_var hello =
+        Test::Hello::_narrow (object.in ());
+
+      CORBA::String_var ior =
+        orb->object_to_string (hello.in ());
+
+      // Output the IOR to the <ior_output_file>
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           ior_output_file),
+                              1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      poa_manager->activate ();
+
+      orb->run ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+
+      root_poa->destroy (1, 1);
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/tests/Bug_3926_Regression/Bug_3926_Regression.mpc b/tests/Bug_3926_Regression/Bug_3926_Regression.mpc
new file mode 100644
index 00000000000..342e78b964b
--- /dev/null
+++ b/tests/Bug_3926_Regression/Bug_3926_Regression.mpc
@@ -0,0 +1,39 @@
+// -*- MPC -*-
+// $Id$
+
+project(*idl): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver {
+  after += *idl
+
+  Source_Files {
+    test_i.cpp
+    server.cpp
+  }
+  Source_Files {
+    testC.cpp
+    testS.cpp
+  }
+  IDL_Files {
+  }
+}
+
+project(*Client): taoclient, pi, interceptors {
+  after += *idl
+
+  Source_Files {
+    Client_ORBInitializer.cpp
+    Client_Request_Interceptor.cpp
+    client.cpp
+  }
+  Source_Files {
+    testC.cpp
+  }
+  IDL_Files {
+  }
+}
diff --git a/tests/Bug_3926_Regression/Client_ORBInitializer.cpp b/tests/Bug_3926_Regression/Client_ORBInitializer.cpp
new file mode 100644
index 00000000000..bc817f79d96
--- /dev/null
+++ b/tests/Bug_3926_Regression/Client_ORBInitializer.cpp
@@ -0,0 +1,54 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Client_ORBInitializer.h"
+
+#if TAO_HAS_INTERCEPTORS == 1
+
+#include "Client_Request_Interceptor.h"
+
+#include "ace/OS_NS_string.h"
+
+void
+Client_ORBInitializer::pre_init (
+    PortableInterceptor::ORBInitInfo_ptr)
+{
+}
+
+void
+Client_ORBInitializer::post_init (
+    PortableInterceptor::ORBInitInfo_ptr info)
+{
+  CORBA::String_var orb_id = info->orb_id ();
+
+  CORBA::StringSeq_var args = info->arguments ();
+
+  CORBA::String_var forward_str;
+
+  // Extract the last forward reference from the argument list.
+  CORBA::ULong args_len = args->length ();
+  for (CORBA::ULong i = 0; i < args_len; ++i)
+    if (ACE_OS::strcmp ("-k", args[i]) == 0
+        && i < (args_len - 1))
+      forward_str = args[i + 1];
+
+  PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
+    PortableInterceptor::ClientRequestInterceptor::_nil ();
+
+  // Install the client request interceptor.
+  ACE_NEW_THROW_EX (interceptor,
+                    Client_Request_Interceptor (orb_id.in (),
+                                                forward_str.in ()),
+                    CORBA::NO_MEMORY (
+                      CORBA::SystemException::_tao_minor_code (
+                        TAO::VMCID,
+                        ENOMEM),
+                      CORBA::COMPLETED_NO));
+
+  PortableInterceptor::ClientRequestInterceptor_var
+    client_interceptor = interceptor;
+
+  info->add_client_request_interceptor (client_interceptor.in ());
+}
+
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/tests/Bug_3926_Regression/Client_ORBInitializer.h b/tests/Bug_3926_Regression/Client_ORBInitializer.h
new file mode 100644
index 00000000000..65f0a38924b
--- /dev/null
+++ b/tests/Bug_3926_Regression/Client_ORBInitializer.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef TAO_CLIENT_ORB_INITIALIZER_H
+#define TAO_CLIENT_ORB_INITIALIZER_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/PI/PI.h"
+
+#if TAO_HAS_INTERCEPTORS == 1
+
+#include "tao/LocalObject.h"
+
+/// Client side ORB initializer.
+class Client_ORBInitializer :
+  public virtual PortableInterceptor::ORBInitializer,
+  public virtual CORBA::LocalObject
+{
+public:
+
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
+
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
+};
+
+#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_CLIENT_ORB_INITIALIZER_H */
diff --git a/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp b/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp
new file mode 100644
index 00000000000..86e2837dc17
--- /dev/null
+++ b/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp
@@ -0,0 +1,130 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Client_Request_Interceptor.h"
+#include "testC.h"
+
+#include "ace/Log_Msg.h"
+
+Client_Request_Interceptor::Client_Request_Interceptor (
+  const char *orb_id,
+  const char *forward_str)
+  : orb_id_ (CORBA::string_dup (orb_id)),
+    orb_ (),
+    request_count_ (0),
+    forward_str_ (CORBA::string_dup (forward_str))
+{
+}
+
+char *
+Client_Request_Interceptor::name ()
+{
+  return CORBA::string_dup ("Client_Request_Interceptor");
+}
+
+void
+Client_Request_Interceptor::destroy (void)
+{
+}
+
+void
+Client_Request_Interceptor::send_request (
+    PortableInterceptor::ClientRequestInfo_ptr ri)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("CRI: in send_request\n")));
+
+  ++this->request_count_;
+
+  CORBA::Boolean response_expected =
+    ri->response_expected ();
+
+  if (!response_expected)   // A one-way request.
+    return;
+
+  // Request 1 -- non-forwarded
+  // Request 2 -- forwarded by this interception point.
+  // Request 3 -- non-forwarded
+
+  if (this->request_count_ == 2)
+    {
+      if (CORBA::is_nil (this->orb_.in ()))
+        {
+          int argc = 0;
+          char **const argv= 0;
+          this->orb_ = CORBA::ORB_init (argc,
+                                        argv,
+                                        this->orb_id_.in ());
+        }
+
+      CORBA::Object_var forward =
+        this->orb_->string_to_object (this->forward_str_.in ());
+
+      CORBA::String_var forward_str =
+        this->orb_->object_to_string (forward.in ());
+
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("CRI: request %d will be forwarded via send_request()\n"),
+                  this->request_count_));
+
+      // Notice that this is not a permanent forward.
+      throw PortableInterceptor::ForwardRequest (forward.in ());
+    }
+}
+
+void
+Client_Request_Interceptor::send_poll (
+    PortableInterceptor::ClientRequestInfo_ptr)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("CRI: in send_poll\n")));
+}
+
+void
+Client_Request_Interceptor::receive_reply (
+    PortableInterceptor::ClientRequestInfo_ptr)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("CRI: in receive_reply\n")));
+}
+
+void
+Client_Request_Interceptor::receive_exception (
+    PortableInterceptor::ClientRequestInfo_ptr)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("CRI: in receive_exception\n")));
+}
+
+void
+Client_Request_Interceptor::receive_other (
+    PortableInterceptor::ClientRequestInfo_ptr ri)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("CRI: in receive_other\n")));
+
+  CORBA::Boolean response_expected =
+    ri->response_expected ();
+
+  // Oneway
+  if (!response_expected)
+    return;
+
+  PortableInterceptor::ReplyStatus reply_status;
+
+  try
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("CRI: in receive_other, before reply_status\n")));
+
+      reply_status = ri->reply_status ();
+      ACE_UNUSED_ARG (reply_status);
+    }
+  catch(CORBA::BAD_INV_ORDER const &e)
+    {
+      e._tao_print_exception ("CRI: exception");
+    }
+
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("CRI: in receive_other, after reply_status\n")));
+}
diff --git a/tests/Bug_3926_Regression/Client_Request_Interceptor.h b/tests/Bug_3926_Regression/Client_Request_Interceptor.h
new file mode 100644
index 00000000000..0328ecbeb55
--- /dev/null
+++ b/tests/Bug_3926_Regression/Client_Request_Interceptor.h
@@ -0,0 +1,77 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CLIENT_REQUEST_INTERCEPTOR_H
+#define CLIENT_REQUEST_INTERCEPTOR_H
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PI/PI.h"
+#include "tao/PortableInterceptorC.h"
+#include "tao/LocalObject.h"
+#include "tao/ORB.h"
+#include "tao/CORBA_String.h"
+
+class Client_Request_Interceptor
+  : public virtual PortableInterceptor::ClientRequestInterceptor,
+    public virtual CORBA::LocalObject
+{
+public:
+
+  /// Constructor.
+  Client_Request_Interceptor (const char *orb_id,
+                              const char *forward_str);
+
+  /**
+   * @name Methods Required by the Client Request Interceptor
+   * Interface
+   *
+   * These are methods that must be implemented since they are pure
+   * virtual in the abstract base class.  They are the canonical
+   * methods required for all client request interceptors.
+   */
+  //@{
+  /// Return the name of this ClientRequestinterceptor.
+  virtual char * name (void);
+
+  virtual void destroy (void);
+
+  virtual void send_request (
+      PortableInterceptor::ClientRequestInfo_ptr ri);
+
+  virtual void send_poll (
+      PortableInterceptor::ClientRequestInfo_ptr ri);
+
+  virtual void receive_reply (
+      PortableInterceptor::ClientRequestInfo_ptr ri);
+
+  virtual void receive_exception (
+      PortableInterceptor::ClientRequestInfo_ptr ri);
+
+  virtual void receive_other (
+      PortableInterceptor::ClientRequestInfo_ptr ri);
+  //@}
+
+private:
+
+  ///The ID of the ORB this interceptor is registered with.
+  CORBA::String_var orb_id_;
+
+  /// Pseudo-reference to the ORB this interceptor is registered
+  /// with.
+  CORBA::ORB_var orb_;
+
+  /// The number of requests intercepted by this interceptor.
+  CORBA::ULong request_count_;
+
+  /// Stringified reference to the object the initial request will be
+  /// forwarded to by this interceptor.
+  CORBA::String_var forward_str_;
+
+};
+
+#endif  /* CLIENT_REQUEST_INTERCEPTOR_H */
diff --git a/tests/Bug_3926_Regression/README b/tests/Bug_3926_Regression/README
new file mode 100644
index 00000000000..00be79aab75
--- /dev/null
+++ b/tests/Bug_3926_Regression/README
@@ -0,0 +1,85 @@
+// $Id$
+
+The scenario for this test is the following.
+
+The client:
+
+- makes a first request to the server, the send_request interception point does nothing
+- receives a reply, receive_reply interception point called -> *OK*
+- makes another request, the send_request interception point forwards it to the server IOR
+- receives a reply, receive_reply interception point called -> *OK*
+- makes a third request, the send_request interception does nothing
+
+At this point server is instructed to throw an exception.
+
+If the server throws one exception in the following set
+*COMM_FAILURE*
+*TRANSIENT*
+*NO_RESPONSE*
+*OBJ_ADAPTER*
+with completion status *COMPLETED_NO* the client's *receive_other* interception point is
+called *with an invalid ClientRequestInfo object*. Reading this object will result in a
+BAD_INV_ORDER exception to be raised with minor code of 1330446350.
+
+If the server throws any other exception, the receive_exception interception point is
+called as expected.
+
+
+__Successful Output__
+
+$> ./run_test.pl
+SERVER: test_i servant: <IOR:....>
+CLIENT: Issuing request 1.
+CRI: in send_request
+CRI: in receive_reply
+CLIENT: Request 1 returns 1.
+CLIENT: Issuing request 2.
+CRI: in send_request
+CRI: request 2 will be forwarded via send_request()
+CRI: in send_request
+CRI: in receive_reply
+CLIENT: Request 2 returns 2.
+CLIENT: Issuing request 3.
+CRI: in send_request
+CRI: in receive_other
+CRI: in receive_other, before reply_status
+CRI: in receive_other, after reply_status
+CRI: in send_request
+CRI: in receive_reply
+CLIENT: Request 3 returns 4.
+CRI: in send_request
+SERVER: Server is shutting down at 4.
+SERVER: Event loop finished.
+CRI: in receive_other
+
+
+__Regression Output__
+
+$> ./run_test.pl
+SERVER: test_i servant: <IOR:....>
+CLIENT: Issuing request 1.
+CRI: in send_request
+CRI: in receive_reply
+CLIENT: Request 1 returns 1.
+CLIENT: Issuing request 2.
+CRI: in send_request
+CRI: request 2 will be forwarded via send_request()
+CRI: in send_request
+CRI: in receive_reply
+CLIENT: Request 2 returns 2.
+CLIENT: Issuing request 3.
+CRI: in send_request
+CRI: in receive_other
+CRI: in receive_other, before reply_status
+(15042|46912532998624) EXCEPTION, CRI: exception
+system exception, ID 'IDL:omg.org/CORBA/BAD_INV_ORDER:1.0'
+OMG minor code (14), described as 'Invalid portable interceptor call', completed = NO
+
+CRI: in receive_other, after reply_status
+CRI: in send_request
+CRI: in receive_reply
+CLIENT: Request 3 returns 4.
+CRI: in send_request
+SERVER: Server is shutting down at 4.
+SERVER: Event loop finished.
+CRI: in receive_other
diff --git a/tests/Bug_3926_Regression/client.cpp b/tests/Bug_3926_Regression/client.cpp
new file mode 100644
index 00000000000..e56deca7d19
--- /dev/null
+++ b/tests/Bug_3926_Regression/client.cpp
@@ -0,0 +1,104 @@
+// -*- C++ -*-
+// $Id$
+
+#include "testC.h"
+#include "Client_ORBInitializer.h"
+
+#include "tao/ORBInitializer_Registry.h"
+
+#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
+
+const ACE_TCHAR *ior = 0;
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("k:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("Usage:  %s ")
+                           ACE_TEXT ("-k IOR\n"),
+                           argv[0]),
+                          -1);
+      }
+
+  return 0;
+}
+
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+  int status = 0;
+
+  try
+    {
+#if TAO_HAS_INTERCEPTORS == 1
+      PortableInterceptor::ORBInitializer_ptr temp_initializer =
+        PortableInterceptor::ORBInitializer::_nil ();
+
+      ACE_NEW_RETURN (temp_initializer,
+                      Client_ORBInitializer,
+                      -1);  // No exceptions yet!
+      PortableInterceptor::ORBInitializer_var orb_initializer =
+        temp_initializer;
+
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
+      ACE_Argv_Type_Converter narrow (argc, argv);
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (narrow.get_argc (), narrow.get_ASCII_argv (), "ClientORB");
+
+      ACE_Argv_Type_Converter wide (narrow.get_argc (), narrow.get_ASCII_argv ());
+      if (::parse_args (wide.get_argc (), wide.get_TCHAR_argv ()) != 0)
+        return -1;
+
+      CORBA::Object_var object =
+        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+
+      hello::GoodDay_var server =
+        hello::GoodDay::_narrow (object.in ());
+
+      if (CORBA::is_nil (server.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("Object reference <%s> is nil\n"),
+                             ior),
+                            1);
+        }
+
+      for (int i = 1; i <= 3; ++i)
+        {
+          ACE_DEBUG ((LM_INFO,
+                      ACE_TEXT ("CLIENT: Issuing request %d.\n"),
+                      i));
+
+          CORBA::Short number = server->number ();
+
+          ACE_DEBUG ((LM_INFO,
+                      ACE_TEXT ("CLIENT: Request %d returns %d.\n"),
+                      i,
+                      number));
+        }
+
+      server->shutdown ();
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Caught exception:");
+      return -1;
+    }
+
+  return status;
+}
diff --git a/tests/Bug_3926_Regression/run_test.pl b/tests/Bug_3926_Regression/run_test.pl
new file mode 100755
index 00000000000..effdc975fb0
--- /dev/null
+++ b/tests/Bug_3926_Regression/run_test.pl
@@ -0,0 +1,74 @@
+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 $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+my $iorbase = "server.ior";
+my $server_iorfile = $server->LocalFile ($iorbase);
+my $client_iorfile = $client->LocalFile ($iorbase);
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile");
+$CL = $client->CreateProcess ("client", "-k file://$client_iorfile");
+
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+if ($server->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+exit $status;
diff --git a/tests/Bug_3926_Regression/server.cpp b/tests/Bug_3926_Regression/server.cpp
new file mode 100644
index 00000000000..99a2277b57c
--- /dev/null
+++ b/tests/Bug_3926_Regression/server.cpp
@@ -0,0 +1,109 @@
+// -*- C++ -*-
+// $Id$
+
+#include "test_i.h"
+
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
+
+const ACE_TCHAR *ior_file = 0;
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_file = get_opts.opt_arg ();
+        break;
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("Usage:  %s ")
+                           ACE_TEXT ("-o IOR\n"),
+                           argv[0]),
+                          -1);
+      }
+
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references ("RootPOA");
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("SERVER: Unable to initialize the POA.\n")),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
+
+      if (::parse_args (argc, argv) != 0)
+        return -1;
+
+      // Servant
+      test_i *servant = 0;
+      ACE_NEW_RETURN (servant,
+                      test_i (0, orb.in ()),
+                      -1);
+      PortableServer::ServantBase_var safe (servant);
+
+      PortableServer::ObjectId_var oid =
+        root_poa->activate_object (servant);
+
+      CORBA::Object_var obj =
+        root_poa->servant_to_reference (servant);
+
+      CORBA::String_var ior =
+        orb->object_to_string (obj.in ());
+
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("SERVER: test_i servant: <%C>\n"),
+                  ior.in ()));
+
+      poa_manager->activate ();
+
+      // IOR
+      FILE *output_file= ACE_OS::fopen (ior_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("SERVER: Cannot open output file <%s> ")
+                           ACE_TEXT ("for writting IOR: %C"),
+                           ior_file,
+                           ior.in ()),
+                          1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      // Run the ORB event loop.
+      orb->run ();
+
+      root_poa->destroy (1, 1);
+
+      orb->destroy ();
+
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SERVER: Event loop finished.\n")));
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Caught exception:");
+      return -1;
+    }
+
+  return 0;
+}
diff --git a/tests/Bug_3926_Regression/test.idl b/tests/Bug_3926_Regression/test.idl
new file mode 100644
index 00000000000..3c60aba7dd8
--- /dev/null
+++ b/tests/Bug_3926_Regression/test.idl
@@ -0,0 +1,8 @@
+// $Id$
+
+module hello {
+    interface GoodDay {
+        short number ();
+        oneway void shutdown ();
+    };
+};
diff --git a/tests/Bug_3926_Regression/test_i.cpp b/tests/Bug_3926_Regression/test_i.cpp
new file mode 100644
index 00000000000..bbaee56dd3e
--- /dev/null
+++ b/tests/Bug_3926_Regression/test_i.cpp
@@ -0,0 +1,46 @@
+// -*- C++ -*-
+// $Id$
+
+#include "test_i.h"
+
+test_i::test_i (CORBA::Short num,
+                CORBA::ORB_ptr orb)
+  : number_ (num),
+    orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+test_i::~test_i (void)
+{
+}
+
+CORBA::Short
+test_i::number (void)
+{
+  ++this->number_;
+  if (this->number_ == 3)
+    {
+#if 1
+      // Either throw any of these 4 exceptions with completion status
+      // COMPLETED_NO and see how it's handled in receive_other() point.
+      throw ::CORBA::TRANSIENT (0, CORBA::COMPLETED_NO);
+      // throw ::CORBA::NO_RESPONSE (0, CORBA::COMPLETED_NO);
+      // throw ::CORBA::COMM_FAILURE (0, CORBA::COMPLETED_NO);
+      // throw ::CORBA::OBJ_ADAPTER (0, CORBA::COMPLETED_NO);
+#else
+      // Or throw any other exception and see how it's handled in
+      // receive_exception() point on the client side.
+      throw ::CORBA::INTERNAL (0, CORBA::COMPLETED_NO);
+#endif
+    }
+  return this->number_;
+}
+
+void
+test_i::shutdown (void)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "SERVER: Server is shutting down at %d.\n",
+              this->number_));
+  this->orb_->shutdown (0);
+}
diff --git a/tests/Bug_3926_Regression/test_i.h b/tests/Bug_3926_Regression/test_i.h
new file mode 100644
index 00000000000..81f75665a8d
--- /dev/null
+++ b/tests/Bug_3926_Regression/test_i.h
@@ -0,0 +1,55 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ * @file test_i.h
+ *
+ * $Id$
+ *
+ * Implementation header for the "test" IDL interface for the
+ * PortableInterceptor::ForwardRequest test.
+ *
+ * @author Ossama Othman <ossama@uci.edu>
+ */
+//=============================================================================
+
+#ifndef TEST_I_H
+#define TEST_I_H
+
+#include "testS.h"
+
+/**
+ * @class test_i
+ *
+ * @brief Simple test class.
+ *
+ * This class implements the "test" interface used in this test.
+ */
+class test_i : public virtual POA_hello::GoodDay
+{
+public:
+
+  /// Constructor.
+  test_i (CORBA::Short num,
+          CORBA::ORB_ptr orb);
+
+  /// Destructor.
+  ~test_i (void);
+
+  /// Return the number assigned to this object.
+  virtual CORBA::Short number (void);
+
+  /// Shutdown the ORB.
+  virtual void shutdown (void);
+
+private:
+
+  /// The number assigned to this object.
+  CORBA::Short number_;
+
+  /// Pseudo-reference to the ORB.
+  CORBA::ORB_var orb_;
+
+};
+
+#endif  /* TEST_I_H */
diff --git a/tests/Bug_3941_Regression/Bug_3941_Regression.mpc b/tests/Bug_3941_Regression/Bug_3941_Regression.mpc
new file mode 100644
index 00000000000..da3efeb647e
--- /dev/null
+++ b/tests/Bug_3941_Regression/Bug_3941_Regression.mpc
@@ -0,0 +1,23 @@
+// -*- MPC -*-
+// $Id$
+
+project(*idl): taoidldefaults, anytypecode {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
+project(*Test): taoclient, anytypecode, valuetype {
+  after += *idl
+  exename = test3941
+
+  Source_Files {
+    test.cpp
+  }
+  Source_Files {
+    testC.cpp
+  }
+  IDL_Files {
+  }
+}
diff --git a/tests/Bug_3941_Regression/README b/tests/Bug_3941_Regression/README
new file mode 100644
index 00000000000..e8cd4738f6d
--- /dev/null
+++ b/tests/Bug_3941_Regression/README
@@ -0,0 +1,20 @@
+// $Id$
+
+The problem is described in the corresponding issue. In short tao_idl
+incorrectly generated _tao_unmarshal() function for valuetypes so that
+it returned true even when the types stored in CDR and attempted to
+extract were completely different.
+
+
+__Successful Output__
+
+$> ./run_test.pl
+Test passed.
+
+
+__Regression Output__
+
+$> ./run_test.pl
+ERROR: unmarshal shouldn't work
+ERROR: <test3941> failed:
+ERROR: test returned 255
diff --git a/tests/Bug_3941_Regression/run_test.pl b/tests/Bug_3941_Regression/run_test.pl
new file mode 100755
index 00000000000..bb0a2aaa5b6
--- /dev/null
+++ b/tests/Bug_3941_Regression/run_test.pl
@@ -0,0 +1,22 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+
+$SV = $server->CreateProcess ("test3941");
+
+$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
+
+if ($test != 0) {
+    print STDERR "ERROR: test returned $test\n";
+    exit 1;
+}
+
+exit 0;
diff --git a/tests/Bug_3941_Regression/test.cpp b/tests/Bug_3941_Regression/test.cpp
new file mode 100644
index 00000000000..7cc3784843d
--- /dev/null
+++ b/tests/Bug_3941_Regression/test.cpp
@@ -0,0 +1,99 @@
+// $Id$
+
+#include "testC.h"
+
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      test::event0_init *ev0_fac = 0;
+      ACE_NEW_RETURN (ev0_fac,
+                      test::event0_init,
+                      -1);
+      CORBA::ValueFactoryBase_var ev0_fac_owner (ev0_fac);
+
+      test::event1_init *ev1_fac = 0;
+      ACE_NEW_RETURN (ev1_fac,
+                      test::event1_init,
+                      -1);
+      CORBA::ValueFactoryBase_var ev1_fac_owner (ev1_fac);
+
+      orb->register_value_factory (ev0_fac->tao_repository_id (), ev0_fac);
+      orb->register_value_factory (ev1_fac->tao_repository_id (), ev1_fac);
+
+      test::event0_var ev0;
+      ACE_NEW_RETURN (ev0,
+                      OBV_test::event0,
+                      -1);
+      ev0->message ("one");
+
+      // write ev0 to CDR
+      TAO_OutputCDR cdr ((size_t) 0,            // size
+                         (int) ACE_CDR_BYTE_ORDER,
+                         (ACE_Allocator *) 0,   // buffer_allocator
+                         (ACE_Allocator *) 0,   // data_block_allocator
+                         (ACE_Allocator *) 0,   // message_block_allocator
+                         0,                     // memcpy_tradeoff
+                         1,
+                         1);
+      cdr.reset ();
+
+      if (!(cdr << ev0))
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "ERROR: cdr << ev1\n"),
+                            -1);
+        }
+
+      // convert cdr into safe_octet_seq
+      CORBA::OctetSeq safe_octet_seq (cdr.total_length ());
+      safe_octet_seq.length (cdr.total_length ());
+
+      CORBA::Octet *buffer = safe_octet_seq.get_buffer ();
+      for (ACE_Message_Block const *i = cdr.begin ();
+           i != 0;
+           i = i->cont ())
+        {
+          CORBA::ULong len = i->length ();
+          ACE_OS_String::memcpy (buffer, i->rd_ptr (), (size_t) len);
+          buffer += len;
+        }
+
+      // Use TAO_InputCDR for unmarshalling
+      buffer = safe_octet_seq.get_buffer ();
+      size_t char_len = safe_octet_seq.length () * sizeof (CORBA::Octet);
+      TAO_InputCDR input ((char const*) buffer,
+                          char_len,
+                          ACE_CDR_BYTE_ORDER,
+                          TAO_DEF_GIOP_MAJOR,
+                          TAO_DEF_GIOP_MINOR,
+                          orb->orb_core ());
+
+      // Read ev1 from CDR, this should fail (we actually encoded a ev0),
+      // but *NOT* leak memory.
+      test::event1_var ev1;
+      if (input >> ev1.out ())
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "ERROR: unmarshal shouldn't work\n"),
+                            -1);
+        }
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "Test passed.\n"));
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception (
+                           "Caught exception in server:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/tests/Bug_3941_Regression/test.idl b/tests/Bug_3941_Regression/test.idl
new file mode 100644
index 00000000000..6bb4c5056be
--- /dev/null
+++ b/tests/Bug_3941_Regression/test.idl
@@ -0,0 +1,15 @@
+// $Id$
+
+module test {
+    abstract valuetype EventBase { };
+
+    valuetype event0 : EventBase
+    {
+        public string message;
+    };
+
+    valuetype event1 : EventBase
+    {
+        public long l;
+    };
+};
diff --git a/tests/Bug_3942_Regression/Bug_3942_Regression.cpp b/tests/Bug_3942_Regression/Bug_3942_Regression.cpp
new file mode 100644
index 00000000000..2efbc1589ae
--- /dev/null
+++ b/tests/Bug_3942_Regression/Bug_3942_Regression.cpp
@@ -0,0 +1,85 @@
+// $Id$
+#include "FooS.h"
+#include "tao/LocalObject.h"
+#include "tao/Version.h"
+
+#if TAO_MAJOR_VERSION < 2 && TAO_MINOR_VERSION < 6
+# define RV refcount_.value
+#else
+# define RV _refcount_value
+#endif
+
+#define ASSERT_REFCOUNT(count, message)                                       \
+  if (ximpl->RV () != count)                                                  \
+    {                                                                         \
+      ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%l %C: expected %d actual %d\n"), \
+                        message, count, ximpl->RV ()), -1);                   \
+    }
+
+struct XImpl
+#ifdef LOCAL
+  : X
+# if TAO_MAJOR_VERSION < 2 && TAO_MINOR_VERSION < 6
+// FUZZ: disable check_for_TAO_Local_RefCounted_Object
+  , TAO_Local_RefCounted_Object
+# endif
+#else
+  : POA_X
+#endif
+{
+#if defined LOCAL && (TAO_MAJOR_VERSION < 2 && TAO_MINOR_VERSION < 6)
+  unsigned long _refcount_value () const { return refcount_.value (); }
+#endif
+
+  void op () {}
+};
+
+int ACE_TMAIN (int, ACE_TCHAR *[])
+{
+#ifdef LOCAL
+  XImpl* ximpl = new XImpl;
+  X_var x = ximpl;
+#else
+  int zero_args = 0;
+  CORBA::ORB_var orb = CORBA::ORB_init (zero_args,
+                                        static_cast<ACE_TCHAR **> (0));
+  CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
+  PortableServer::POA_var poa = PortableServer::POA::_narrow (obj);
+  XImpl* x_servant = new XImpl;
+  PortableServer::ServantBase_var sbv (x_servant);
+  X_var x = x_servant->_this ();
+  X* ximpl = x;
+#endif
+
+  ASSERT_REFCOUNT (1, "baseline");
+
+  {
+    Y y;
+    y.theX = x;
+    ASSERT_REFCOUNT (2, "in struct");
+    X_var x2 = y.theX;
+    ASSERT_REFCOUNT (3, "from struct");
+  }
+
+  ASSERT_REFCOUNT (1, "baseline reestablished");
+
+  {
+    XSeq xseq (1);
+    xseq.length (1);
+    xseq[0] = x;
+    ASSERT_REFCOUNT (2, "in sequence");
+#ifdef _MSC_VER
+    // For now, only attempt to compile this on MSVC -- it doesn't compile
+    // on GCC (and possibly others) due to:
+    // error: conversion from 'TAO::details::object_reference_sequence_element<TAO::details::object_reference_traits<X, TAO_Objref_Var_T<X>, true> >' to non-scalar type 'X_var' requested
+    // When the bug is fixed, the #ifdef should be removed.  Until then, the
+    // test will appear to pass on other compilers, but the MSVC failures should
+    // be enough to notice that the bug needs fixing.
+    X_var x2 = xseq[0];
+    if (ximpl->RV () < 3) x2._retn (); // avoid a crash
+    ASSERT_REFCOUNT (3, "from sequence");
+#endif
+  }
+
+  return 0;
+}
diff --git a/tests/Bug_3942_Regression/Bug_3942_Regression.mpc b/tests/Bug_3942_Regression/Bug_3942_Regression.mpc
new file mode 100644
index 00000000000..2d2ba812208
--- /dev/null
+++ b/tests/Bug_3942_Regression/Bug_3942_Regression.mpc
@@ -0,0 +1,5 @@
+// $Id$
+project: taoexe {
+  macros += LOCAL
+  idlflags += -DLOCAL
+}
diff --git a/tests/Bug_3942_Regression/Foo.idl b/tests/Bug_3942_Regression/Foo.idl
new file mode 100644
index 00000000000..a3d1a343e9b
--- /dev/null
+++ b/tests/Bug_3942_Regression/Foo.idl
@@ -0,0 +1,12 @@
+// $Id$
+
+#ifdef LOCAL
+local
+#endif
+interface X {
+  void op();
+};
+struct Y {
+  X theX;
+};
+typedef sequence<X> XSeq;
diff --git a/tests/Bug_3942_Regression/run_test.pl b/tests/Bug_3942_Regression/run_test.pl
new file mode 100755
index 00000000000..10298b7d280
--- /dev/null
+++ b/tests/Bug_3942_Regression/run_test.pl
@@ -0,0 +1,20 @@
+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;
+
+my $target = PerlACE::TestTarget::create_target(1)
+    or die "Create target failed\n";
+my $test = $target->CreateProcess("Bug_3942_Regression");
+my $result = $test->SpawnWaitKill($target->ProcessStartWaitInterval());
+if ($result != 0) {
+    print STDERR "ERROR: test returned $result\n";
+    exit 1;
+}
+exit 0;
diff --git a/tests/Bug_3953_Regression/Bug_3953_Regression.mpc b/tests/Bug_3953_Regression/Bug_3953_Regression.mpc
new file mode 100644
index 00000000000..ad221b73797
--- /dev/null
+++ b/tests/Bug_3953_Regression/Bug_3953_Regression.mpc
@@ -0,0 +1,34 @@
+// -*- MPC -*-
+// $Id$
+
+project(*_Idl): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
+project(*_Server): taoserver, messaging {
+  after += *_Idl
+  Source_Files {
+    testC.cpp
+    testS.cpp
+    server_i.cpp
+    server.cpp
+  }
+  IDL_Files {
+  }
+}
+
+project(*_Client): taoserver {
+  exename = client
+  after += *_Idl
+  Source_Files {
+    testC.cpp
+    testS.cpp
+    client_i.cpp
+    client.cpp
+  }
+  IDL_Files {
+  }
+}
diff --git a/tests/Bug_3953_Regression/README b/tests/Bug_3953_Regression/README
new file mode 100644
index 00000000000..ab058d902f6
--- /dev/null
+++ b/tests/Bug_3953_Regression/README
@@ -0,0 +1,9 @@
+This is a test of the nested upcall feature in TAO using mt_noupcall. 
+start off by calling the server and providing a callback object and a
+time-to-live number.  The server will callback the client (using the
+callback object) and decrement the time-to-live number.
+
+With mt_noupcall enabled the client should drop the nested upcall from the
+server and which leads to a timeout exception in the server and than in the
+client.
+
diff --git a/tests/Bug_3953_Regression/client.cpp b/tests/Bug_3953_Regression/client.cpp
new file mode 100644
index 00000000000..38dd592717e
--- /dev/null
+++ b/tests/Bug_3953_Regression/client.cpp
@@ -0,0 +1,167 @@
+// $Id$
+
+#include "client_i.h"
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+
+static const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
+// Server IOR.
+
+static int shutdown_server = 0;
+// Flag to tell server to shutdown.
+
+static CORBA::UShort call_count = 2;
+// # of nested calls to be made.
+
+static int quiet = 0;
+// The test is quiet...
+
+class Client_Task
+{
+public:
+  Client_Task (client_ptr c,
+               server_ptr s);
+  int svc (void);
+
+  bool exception (void) const;
+
+private:
+  client_var client_;
+  server_var server_;
+};
+
+Client_Task::Client_Task (client_ptr c,
+                          server_ptr s)
+  : client_ (client::_duplicate (c)),
+    server_ (server::_duplicate (s))
+{
+}
+
+int
+Client_Task::svc (void)
+{
+  try
+    {
+      if (!quiet)
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%t) Client_Task::svc calling start -> time to live = %d\n",
+                    call_count));
+
+      // Now, we can invoke an operation on the remote side.
+      this->server_->start (this->client_.in (),
+                            call_count);
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Client_Task::svc");
+      return -1;
+    }
+  return 0;
+}
+
+static int
+parse_args (int argc,
+            ACE_TCHAR **argv)
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("qxn:k:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'q':
+        quiet = 1;
+        break;
+
+      case 'x':
+        shutdown_server = 1;
+        break;
+
+      case 'n':
+        call_count = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " [-n number of nested calls]"
+                           " [-k ior]"
+                           " [-q (quite)]"
+                           " [-x (shutdown server)]"
+                           "\n",
+                           argv[0]),
+                          -1);
+      }
+
+  if (ior == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%s: no nested up calls server ior specified\n",
+                       argv[0]),
+                      -1);
+
+  // Indicates successful parsing of command line.
+  return 0;
+}
+
+int
+ACE_TMAIN (int argc,
+      ACE_TCHAR **argv)
+{
+  int result = 0;
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+      result = parse_args (argc, argv);
+      if (result != 0)
+        return result;
+
+      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (object.in ());
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
+
+      poa_manager->activate ();
+
+      object = orb->string_to_object (ior);
+
+      server_var server = server::_narrow (object.in ());
+
+      // Create an client object to hand to the other side...
+      client_i client_servant (quiet,
+                               server.in ());
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&client_servant);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
+      client_var client_object = client::_narrow (object_act.in ());
+
+      Client_Task client_tasks (client_object.in (),
+                                server.in ());
+
+      client_tasks.svc ();
+
+      if (shutdown_server)
+        {
+          server->shutdown ();
+        }
+
+      root_poa->destroy (1, 1);
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("client::main");
+      return -1;
+    }
+  return result;
+}
diff --git a/tests/Bug_3953_Regression/client_i.cpp b/tests/Bug_3953_Regression/client_i.cpp
new file mode 100644
index 00000000000..7525ef2160c
--- /dev/null
+++ b/tests/Bug_3953_Regression/client_i.cpp
@@ -0,0 +1,26 @@
+// $Id$
+
+#include "client_i.h"
+
+client_i::client_i (int quiet,
+                    server_ptr s)
+  : quiet_ (quiet),
+    server_ (server::_duplicate (s))
+{
+}
+
+void
+client_i::ping (CORBA::UShort time_to_live)
+{
+  if (!this->quiet_)
+    ACE_DEBUG ((LM_DEBUG,
+                "(%t) client_i::ping -> time to live = %d\n",
+                time_to_live));
+
+  --time_to_live;
+
+  if (time_to_live > 0)
+    {
+      this->server_->ping (time_to_live);
+    }
+}
diff --git a/tests/Bug_3953_Regression/client_i.h b/tests/Bug_3953_Regression/client_i.h
new file mode 100644
index 00000000000..b0d308f04b8
--- /dev/null
+++ b/tests/Bug_3953_Regression/client_i.h
@@ -0,0 +1,20 @@
+// $Id$
+
+#include "testS.h"
+
+class client_i : public POA_client
+{
+public:
+  client_i (int quiet,
+            server_ptr s);
+  // Constructor.
+
+  void ping (CORBA::UShort time_to_live);
+
+private:
+  int quiet_;
+  // Be quiet.
+
+  server_var server_;
+  // Pointer to server.
+};
diff --git a/tests/Bug_3953_Regression/run_test.pl b/tests/Bug_3953_Regression/run_test.pl
new file mode 100755
index 00000000000..5d3abb11162
--- /dev/null
+++ b/tests/Bug_3953_Regression/run_test.pl
@@ -0,0 +1,76 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+     & eval 'exec perl -S $0 $argv:q'
+     if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+$status = 0;
+$debug_level = '0';
+
+foreach $i (@ARGV) {
+    if ($i eq '-debug') {
+        $debug_level = '10';
+    }
+}
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+my $iorbase = "server.ior";
+my $server_iorfile = $server->LocalFile ($iorbase);
+my $client_iorfile = $client->LocalFile ($iorbase);
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -f $server_iorfile");
+$CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level -k file://$client_iorfile -x");
+
+print STDERR "\nrunning ST version of the client and the server\n\n";
+
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+if ($server->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45);
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+exit $status;
diff --git a/tests/Bug_3953_Regression/server.cpp b/tests/Bug_3953_Regression/server.cpp
new file mode 100644
index 00000000000..64f35567258
--- /dev/null
+++ b/tests/Bug_3953_Regression/server.cpp
@@ -0,0 +1,198 @@
+// $Id$
+
+#include "server_i.h"
+
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+#include "tao/Messaging/Messaging.h"
+
+static int quiet = 0;
+// The test is quiet...
+
+static const ACE_TCHAR *ior_file = ACE_TEXT ("test.ior");
+// File of file to which the ior is written
+
+static int number_of_threads = 1;
+// Number of server threads.
+
+class Server_Task : public ACE_Task_Base
+{
+public:
+  Server_Task (CORBA::ORB_ptr orb);
+  int svc (void);
+
+private:
+  CORBA::ORB_var orb_;
+};
+
+Server_Task::Server_Task (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+int
+Server_Task::svc (void)
+{
+  try
+    {
+      CORBA::Object_var object =
+        this->orb_->resolve_initial_references ("PolicyCurrent");
+
+      CORBA::PolicyCurrent_var policy_current =
+        CORBA::PolicyCurrent::_narrow (object.in ());
+
+      TimeBase::TimeT timeout_period = 100 * 100000;
+
+      CORBA::Any timeout_as_any;
+      timeout_as_any <<= timeout_period;
+
+      CORBA::PolicyList policy_list (1);
+      policy_list.length (1);
+      policy_list[0] =
+        this->orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
+                                   timeout_as_any);
+
+      policy_current->set_policy_overrides (policy_list,
+                                            CORBA::ADD_OVERRIDE);
+
+      policy_list[0]->destroy();
+
+      this->orb_->run ();
+    }
+  catch (const CORBA::Exception&)
+    {
+      return -1;
+    }
+  return 0;
+}
+
+static int
+write_ior_to_file (const char *ior)
+{
+  FILE *output_file = ACE_OS::fopen (ior_file, "w");
+
+  if (output_file == 0)
+    ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IOR: %s\n",
+                       ior_file),
+                      -1);
+
+  int result = 0;
+
+  result = ACE_OS::fprintf (output_file,
+                            "%s",
+                            ior);
+  if (result < 0 ||
+      static_cast<size_t> (result) != ACE_OS::strlen (ior))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "ACE_OS::fprintf failed while writing %C to %s\n",
+                       ior,
+                       ior_file),
+                      -1);
+
+  ACE_OS::fclose (output_file);
+
+  return 0;
+}
+
+static int
+parse_args (int argc,
+            ACE_TCHAR **argv)
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("q:f:t:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'q':
+        quiet = 1;
+        break;
+
+      case 't':
+        number_of_threads = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case 'f':
+        ior_file = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " [-t number of threads]"
+                           " [-f ior file]"
+                           " [-q (quite)]"
+                           "\n",
+                           argv[0]),
+                          -1);
+      }
+
+  return 0;
+}
+
+int
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
+{
+  int result = 0;
+
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+      result = parse_args (argc, argv);
+      if (result != 0)
+        return result;
+
+      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (object.in ());
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
+
+      poa_manager->activate ();
+
+      server_i server_servant (quiet,
+                               orb.in ());
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&server_servant);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
+      server_var server_object = server::_narrow (object_act.in ());
+
+      CORBA::String_var ior = orb->object_to_string (server_object.in ());
+
+      result = write_ior_to_file (ior.in ());
+      if (result != 0)
+        return result;
+
+      Server_Task server_tasks (orb.in ());
+
+      result = server_tasks.activate (THR_BOUND,
+                                      number_of_threads);
+
+      if (result != 0)
+        return result;
+
+      result = ACE_Thread_Manager::instance ()->wait ();
+
+      if (result != 0)
+        return result;
+
+      root_poa->destroy (1, 1);
+
+      if (!server_servant.exception ())
+        ++result;
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("server::main");
+      return -1;
+    }
+
+  return result;
+}
diff --git a/tests/Bug_3953_Regression/server_i.cpp b/tests/Bug_3953_Regression/server_i.cpp
new file mode 100644
index 00000000000..d0a374dc038
--- /dev/null
+++ b/tests/Bug_3953_Regression/server_i.cpp
@@ -0,0 +1,56 @@
+// $Id$
+
+#include "server_i.h"
+
+server_i::server_i (int quiet,
+                    CORBA::ORB_ptr orb)
+  : quiet_ (quiet),
+    orb_ (CORBA::ORB::_duplicate (orb)),
+    exception_ (false)
+{
+}
+
+void
+server_i::start (client_ptr c,
+                 CORBA::UShort time_to_live)
+{
+  this->client_ = client::_duplicate (c);
+  this->ping (time_to_live);
+}
+
+bool
+server_i::exception (void) const
+{
+  return this->exception_;
+}
+
+void
+server_i::ping (CORBA::UShort time_to_live)
+{
+  if (!this->quiet_)
+    ACE_DEBUG ((LM_DEBUG,
+                "(%t) server_i::ping -> time to live = %d\n",
+                time_to_live));
+
+  try
+    {
+      --time_to_live;
+
+      if (time_to_live > 0)
+        {
+          this->client_->ping (time_to_live);
+        }
+    }
+  catch (const CORBA::TIMEOUT&)
+    {
+      this->exception_ = true;
+      ACE_DEBUG ((LM_DEBUG,
+                  "server ping received an expected except.\n"));
+    }
+}
+
+void
+server_i::shutdown (void)
+{
+  this->orb_->shutdown (0);
+}
diff --git a/tests/Bug_3953_Regression/server_i.h b/tests/Bug_3953_Regression/server_i.h
new file mode 100644
index 00000000000..a60c9f8876d
--- /dev/null
+++ b/tests/Bug_3953_Regression/server_i.h
@@ -0,0 +1,30 @@
+// $Id$
+
+#include "testS.h"
+
+class server_i : public POA_server
+{
+public:
+  server_i (int quiet,
+            CORBA::ORB_ptr orb);
+
+  void ping (CORBA::UShort time_to_live);
+
+  void start (client_ptr c,
+              CORBA::UShort time_to_live);
+
+  void shutdown (void);
+
+  bool exception (void) const;
+private:
+  int quiet_;
+  // Be quiet.
+
+  client_var client_;
+  // Pointer to server.
+
+  CORBA::ORB_var orb_;
+  // Pointer to orb.
+
+  bool exception_;
+};
diff --git a/tests/Bug_3953_Regression/svc.conf b/tests/Bug_3953_Regression/svc.conf
new file mode 100644
index 00000000000..1878e4a33c5
--- /dev/null
+++ b/tests/Bug_3953_Regression/svc.conf
@@ -0,0 +1,3 @@
+# $Id$
+
+static Client_Strategy_Factory '-ORBWaitStrategy mt_noupcall'
diff --git a/tests/Bug_3953_Regression/svc.conf.xml b/tests/Bug_3953_Regression/svc.conf.xml
new file mode 100644
index 00000000000..91c9afd3b3e
--- /dev/null
+++ b/tests/Bug_3953_Regression/svc.conf.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0'?>
+<ACE_Svc_Conf>
+ <!--  $Id$ -->
+ <static Client_Strategy_Factory '-ORBWaitStrategy mt_noupcall'">
+</ACE_Svc_Conf>
diff --git a/tests/Bug_3953_Regression/test.idl b/tests/Bug_3953_Regression/test.idl
new file mode 100644
index 00000000000..45664cfb035
--- /dev/null
+++ b/tests/Bug_3953_Regression/test.idl
@@ -0,0 +1,38 @@
+// $Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/NestedUpcall
+//
+// = FILENAME
+//    test.idl
+//
+// = DESCRIPTION
+//    A simple test of nested upcalls.
+//
+// = AUTHOR
+//    Irfan Pyarali
+//
+// ============================================================================
+
+interface client
+{
+  void ping (in unsigned short time_to_live);
+  // Decrements <time_to_live>.  If <time_to_live> becomes zero, it
+  // stops. Otherwise, it pings the server.
+};
+
+interface server
+{
+  void start (in client c,
+              in unsigned short time_to_live);
+  // Turns around and starts pinging the client.
+
+  void ping (in unsigned short time_to_live);
+  // Decrements <time_to_live>.  If <time_to_live> becomes zero, it
+  // stops. Otherwise, it pings the client.
+
+  oneway void shutdown ();
+  // Shutdown the server.
+};
diff --git a/tests/Bug_3954_Regression/Bug_3954_Regression.mpc b/tests/Bug_3954_Regression/Bug_3954_Regression.mpc
new file mode 100644
index 00000000000..fbab84719e4
--- /dev/null
+++ b/tests/Bug_3954_Regression/Bug_3954_Regression.mpc
@@ -0,0 +1,37 @@
+// -*- MPC -*-
+// $Id$
+
+project(*idl): taoidldefaults {
+  idlflags += -Sp
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver {
+  after += *idl
+  Source_Files {
+    Hello.cpp
+    server.cpp
+  }
+  Source_Files {
+    TestC.cpp
+    TestS.cpp
+  }
+  IDL_Files {
+  }
+}
+
+project(*Client): taoclient {
+  after += *idl
+  Source_Files {
+    client.cpp
+  }
+  Source_Files {
+    TestC.cpp
+  }
+  IDL_Files {
+  }
+}
+
diff --git a/tests/Bug_3954_Regression/Hello.cpp b/tests/Bug_3954_Regression/Hello.cpp
new file mode 100644
index 00000000000..df49d37a507
--- /dev/null
+++ b/tests/Bug_3954_Regression/Hello.cpp
@@ -0,0 +1,19 @@
+// $Id$
+#include "Hello.h"
+
+Hello::Hello (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+char *
+Hello::get_string (void)
+{
+  return CORBA::string_dup ("Hello there!");
+}
+
+void
+Hello::shutdown (void)
+{
+  this->orb_->shutdown (0);
+}
diff --git a/tests/Bug_3954_Regression/Hello.h b/tests/Bug_3954_Regression/Hello.h
new file mode 100644
index 00000000000..f87205c3011
--- /dev/null
+++ b/tests/Bug_3954_Regression/Hello.h
@@ -0,0 +1,31 @@
+//
+// $Id$
+//
+
+#ifndef HELLO_H
+#define HELLO_H
+#include /**/ "ace/pre.h"
+
+#include "TestS.h"
+
+/// Implement the Test::Hello interface
+class Hello
+  : public virtual POA_Test::Hello
+{
+public:
+  /// Constructor
+  Hello (CORBA::ORB_ptr orb);
+
+  // = The skeleton methods
+  virtual char * get_string (void);
+
+  virtual void shutdown (void);
+
+private:
+  /// Use an ORB reference to conver strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#include /**/ "ace/post.h"
+#endif /* HELLO_H */
diff --git a/tests/Bug_3954_Regression/README b/tests/Bug_3954_Regression/README
new file mode 100644
index 00000000000..7960a9143e0
--- /dev/null
+++ b/tests/Bug_3954_Regression/README
@@ -0,0 +1,11 @@
+/**
+
+@page Hello Test README File
+
+Test whether wait strategy mt_noupcall works with just basic hello server
+
+$ ./run_test.pl
+
+	the script returns 0 if the test was successful.
+
+*/
diff --git a/tests/Bug_3954_Regression/Test.idl b/tests/Bug_3954_Regression/Test.idl
new file mode 100644
index 00000000000..3c0976e106d
--- /dev/null
+++ b/tests/Bug_3954_Regression/Test.idl
@@ -0,0 +1,20 @@
+//
+// $Id$
+//
+
+/// Put the interfaces in a module, to avoid global namespace pollution
+module Test
+{
+  /// A very simple interface
+  interface Hello
+  {
+    /// Return a simple string
+    string get_string ();
+
+    /// A method to shutdown the ORB
+    /**
+     * This method is used to simplify the test shutdown process
+     */
+    oneway void shutdown ();
+  };
+};
diff --git a/tests/Bug_3954_Regression/client.cpp b/tests/Bug_3954_Regression/client.cpp
new file mode 100644
index 00000000000..1bb3e718137
--- /dev/null
+++ b/tests/Bug_3954_Regression/client.cpp
@@ -0,0 +1,72 @@
+// $Id$
+
+#include "TestC.h"
+#include "ace/Get_Opt.h"
+
+const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var tmp = orb->string_to_object(ior);
+
+      Test::Hello_var hello = Test::Hello::_narrow(tmp.in ());
+
+      if (CORBA::is_nil (hello.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "Nil Test::Hello reference <%s>\n",
+                             ior),
+                            1);
+        }
+
+      CORBA::String_var the_string = hello->get_string ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%C>\n",
+                  the_string.in ()));
+
+      hello->shutdown ();
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/tests/Bug_3954_Regression/run_test.pl b/tests/Bug_3954_Regression/run_test.pl
new file mode 100755
index 00000000000..f2566947eaf
--- /dev/null
+++ b/tests/Bug_3954_Regression/run_test.pl
@@ -0,0 +1,73 @@
+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 $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+my $iorbase = "server.ior";
+my $server_iorfile = $server->LocalFile ($iorbase);
+my $client_iorfile = $client->LocalFile ($iorbase);
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile");
+$CL = $client->CreateProcess ("client", "-ORBDebuglevel $debug_level -k file://$client_iorfile");
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+if ($server->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+exit $status;
diff --git a/tests/Bug_3954_Regression/server.cpp b/tests/Bug_3954_Regression/server.cpp
new file mode 100644
index 00000000000..205a7c179e0
--- /dev/null
+++ b/tests/Bug_3954_Regression/server.cpp
@@ -0,0 +1,101 @@
+// $Id$
+
+#include "Hello.h"
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
+
+const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      if (CORBA::is_nil (root_poa.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Panic: nil RootPOA\n"),
+                          1);
+
+      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      Hello *hello_impl = 0;
+      ACE_NEW_RETURN (hello_impl,
+                      Hello (orb.in ()),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(hello_impl);
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Test::Hello_var hello = Test::Hello::_narrow (object.in ());
+
+      CORBA::String_var ior = orb->object_to_string (hello.in ());
+
+      // Output the IOR to the <ior_output_file>
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s\n",
+                           ior_output_file),
+                           1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      poa_manager->activate ();
+
+      orb->run ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+
+      root_poa->destroy (1, 1);
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/tests/Bug_3954_Regression/svc.conf b/tests/Bug_3954_Regression/svc.conf
new file mode 100644
index 00000000000..1878e4a33c5
--- /dev/null
+++ b/tests/Bug_3954_Regression/svc.conf
@@ -0,0 +1,3 @@
+# $Id$
+
+static Client_Strategy_Factory '-ORBWaitStrategy mt_noupcall'
diff --git a/tests/Bug_3954_Regression/test.pl b/tests/Bug_3954_Regression/test.pl
new file mode 100755
index 00000000000..cd1181052d6
--- /dev/null
+++ b/tests/Bug_3954_Regression/test.pl
@@ -0,0 +1,73 @@
+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 $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+my $iorbase = "server.ior";
+my $server_iorfile = $server->LocalFile ($iorbase);
+my $client_iorfile = $client->LocalFile ($iorbase);
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+$SV = $server->CreateProcess ("server", "-o $server_iorfile");
+$CL = $client->CreateProcess ("client", "-k file://$client_iorfile");
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+if ($server->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+exit $status;
diff --git a/tests/Bug_933_Regression/Makefile.am b/tests/Bug_933_Regression/Makefile.am
deleted file mode 100644
index 92cce8158c8..00000000000
--- a/tests/Bug_933_Regression/Makefile.am
+++ /dev/null
@@ -1,108 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_933_Regression_Idl.am
-
-BUILT_SOURCES = \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-CLEANFILES = \
-  Messenger-stamp \
-  MessengerC.cpp \
-  MessengerC.h \
-  MessengerC.inl \
-  MessengerS.cpp \
-  MessengerS.h \
-  MessengerS.inl
-
-MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl: Messenger-stamp
-
-Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Messenger.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Messenger.idl
-
-## Makefile.Bug_933_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  MessengerC.cpp \
-  MessengerClient.cpp \
-  Messenger_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_933_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  MessengerC.cpp \
-  MessengerS.cpp \
-  MessengerServer.cpp \
-  Messenger_i.cpp \
-  Messenger_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Bug_933_Regression/MessengerClient.cpp b/tests/Bug_933_Regression/MessengerClient.cpp
index 4eedb67f458..d21be49dd53 100644
--- a/tests/Bug_933_Regression/MessengerClient.cpp
+++ b/tests/Bug_933_Regression/MessengerClient.cpp
@@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Bug_933_Regression/MessengerServer.cpp b/tests/Bug_933_Regression/MessengerServer.cpp
index 7f348ed2f6e..37959ffa361 100644
--- a/tests/Bug_933_Regression/MessengerServer.cpp
+++ b/tests/Bug_933_Regression/MessengerServer.cpp
@@ -27,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/CDR/Makefile.am b/tests/CDR/Makefile.am
deleted file mode 100644
index 35c44b161a1..00000000000
--- a/tests/CDR/Makefile.am
+++ /dev/null
@@ -1,152 +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:
-## ../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.CDR_Alignment.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += alignment
-
-alignment_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-alignment_SOURCES = \
-  alignment.cpp
-
-alignment_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CDR_Allocator.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += allocator
-
-allocator_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-allocator_SOURCES = \
-  allocator.cpp
-
-allocator_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CDR_Basic_Types.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += basic_types
-
-basic_types_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-basic_types_SOURCES = \
-  basic_types.cpp
-
-basic_types_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CDR_Growth.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += growth
-
-growth_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-growth_SOURCES = \
-  growth.cpp
-
-growth_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CDR_Octet_Sequence.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += octet_sequence
-
-octet_sequence_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-octet_sequence_SOURCES = \
-  octet_sequence.cpp
-
-octet_sequence_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CDR_Tc.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += tc
-
-tc_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-tc_SOURCES = \
-  tc.cpp
-
-tc_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/CDR/alignment.cpp b/tests/CDR/alignment.cpp
index 4f77c1cf601..bd4b8574737 100644
--- a/tests/CDR/alignment.cpp
+++ b/tests/CDR/alignment.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/CDR
-//
-// = FILENAME
-//   alignment.cpp
-//
-// = DESCRIPTION
-//   Verifies that octet sequence marshaling does not affect
-//   marshaling.
-//
-// = AUTHORS
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   alignment.cpp
+ *
+ *  $Id$
+ *
+ * Verifies that octet sequence marshaling does not affect
+ * marshaling.
+ *
+ *
+ *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "tao/CDR.h"
 
@@ -62,7 +59,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
       if (input.read_double (read_dbl) == 0)
         ACE_DEBUG ((LM_DEBUG, "Failure reading double...\n"));
 
-      if (read_dbl != dbl)
+      if (!ACE::is_equal (read_dbl, dbl))
         {
           status = 1;
           ACE_DEBUG ((LM_DEBUG,
diff --git a/tests/CDR/allocator.cpp b/tests/CDR/allocator.cpp
index 9a81adb0688..59feefc454c 100644
--- a/tests/CDR/allocator.cpp
+++ b/tests/CDR/allocator.cpp
@@ -1,25 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CDR
-//
-// = FILENAME
-//    allocator.cpp
-//
-// = DESCRIPTION
-//   Compares the performance of a TSS allocator, with no locks, to
-//   the global allocator (with locks) even in the abscence of
-//   contention.
-//   The idea behind this test is to measure the predictability of
-//   each allocator, specially under the light of potential
-//   fragmentation in the main allocator.
-//
-// = AUTHORS
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    allocator.cpp
+ *
+ *  $Id$
+ *
+ * Compares the performance of a TSS allocator, with no locks, to
+ * the global allocator (with locks) even in the abscence of
+ * contention.
+ * The idea behind this test is to measure the predictability of
+ * each allocator, specially under the light of potential
+ * fragmentation in the main allocator.
+ *
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
@@ -27,41 +24,44 @@
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID(CDR, allocator, "$Id$")
-
 #define DEFAULT_BUFFER_SIZE 512
 
+/**
+ * @class Application_Simulator
+ *
+ * Tries to simulate the behavior of an application: it randomly
+ * acquires and releases memory, of variable sizes.
+ * The intention is to produce some level of fragmentation in main
+ * memory.
+ */
 class Application_Simulator
 {
-  // = DESCRIPTION
-  //   Tries to simulate the behavior of an application: it randomly
-  //   acquires and releases memory, of variable sizes.
-  //   The intention is to produce some level of fragmentation in main
-  //   memory.
 
 public:
+  /// Constructor, limits the amount of fragmentation and memory this
+  /// class takes.
   Application_Simulator (int max_fragments,
                     int max_fragment_size);
-  // Constructor, limits the amount of fragmentation and memory this
-  // class takes.
 
+  /// Destructor, releases any memory left behind.
   ~Application_Simulator (void);
-  // Destructor, releases any memory left behind.
 
-  void upcall (ACE_RANDR_TYPE& seed);
-  // Simulate an upcall. The class allocates some memory and then
-  // releases some memory too, the amount of memory allocated and the
-  // number of allocations is random.
+  /**
+   * Simulate an upcall. The class allocates some memory and then
+   * releases some memory too, the amount of memory allocated and the
+   * number of allocations is random.
+   */
+  void upcall (unsigned int* seed);
 
 private:
+  /// The allocated buffers.
   char** buffers_;
-  // The allocated buffers.
 
+  /// The size of the <buffers_> array.
   int max_fragments_;
-  // The size of the <buffers_> array.
 
+  /// The maximum size of any element of <buffers_>
   int max_fragment_size_;
-  // The maximum size of any element of <buffers_>
 };
 
 int
@@ -78,7 +78,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   int max_arguments = 16;
   int max_argument_size = 1024;
   int quiet = 0;
-  ACE_RANDR_TYPE seed = static_cast<ACE_RANDR_TYPE> (ACE_OS::time(0));
+  unsigned int seed = static_cast<unsigned int> (ACE_OS::time(0));
 
   ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("tn:f:m:s:a:b:r:q"));
   int opt;
@@ -153,13 +153,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   int* argument_sizes;
   ACE_NEW_RETURN (argument_sizes, int[max_arguments], 1);
 
-  int n = ACE_OS::rand_r (seed) % max_arguments + 1;
+  int n = ACE_OS::rand_r (&seed) % max_arguments + 1;
   for (int k = 0; k < n; ++k)
-    argument_sizes[k] = ACE_OS::rand_r (seed) % max_argument_size + 1;
+    argument_sizes[k] = ACE_OS::rand_r (&seed) % max_argument_size + 1;
 
   for (int i = 0; i < iterations; ++i)
     {
-      simulator.upcall (seed);
+      simulator.upcall (&seed);
 
       // @@ TODO this is the place to put the other allocators.
       ACE_High_Res_Timer cdr_encoding;
@@ -227,7 +227,7 @@ Application_Simulator::~Application_Simulator (void)
 }
 
 void
-Application_Simulator::upcall (ACE_RANDR_TYPE& seed)
+Application_Simulator::upcall (unsigned int* seed)
 {
   for (char** i = this->buffers_;
        i != this->buffers_ + this->max_fragments_;
diff --git a/tests/CDR/basic_types.cpp b/tests/CDR/basic_types.cpp
index 6064e05ece0..b4341bddaf0 100644
--- a/tests/CDR/basic_types.cpp
+++ b/tests/CDR/basic_types.cpp
@@ -1,21 +1,18 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CDR
-//
-// = FILENAME
-//    basic_types.cpp
-//
-// = DESCRIPTION
-//   Test the basic funcionality of a CDR stream by encoding some
-//   basic types and then decoding them again.
-//
-// = AUTHORS
-//    Carlos O'Ryan
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    basic_types.cpp
+ *
+ *  $Id$
+ *
+ * Test the basic funcionality of a CDR stream by encoding some
+ * basic types and then decoding them again.
+ *
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #include "tao/ORB.h"
 #include "tao/debug.h"
@@ -25,10 +22,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (CDR,
-           basic_types,
-           "$Id$")
-
 static int n = 4096;
 static int nloops = 100;
 
diff --git a/tests/CDR/growth.cpp b/tests/CDR/growth.cpp
index 5997edbe1c2..270aff91fb4 100644
--- a/tests/CDR/growth.cpp
+++ b/tests/CDR/growth.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CDR
-//
-// = FILENAME
-//    growth.cpp
-//
-// = DESCRIPTION
-//   Helps in measuring how the growth strategy affects the
-//   performance of CDR streams.
-//
-// = AUTHORS
-//    Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    growth.cpp
+ *
+ *  $Id$
+ *
+ * Helps in measuring how the growth strategy affects the
+ * performance of CDR streams.
+ *
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
@@ -26,8 +23,6 @@
 #include "tao/CDR.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(CDR, growth, "$Id$")
-
 static int
 test_write (TAO_OutputCDR &cdr, int n)
 {
diff --git a/tests/CDR/octet_sequence.cpp b/tests/CDR/octet_sequence.cpp
index 8518aec1aec..22888c58360 100644
--- a/tests/CDR/octet_sequence.cpp
+++ b/tests/CDR/octet_sequence.cpp
@@ -1,22 +1,18 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CDR
-//
-// = FILENAME
-//   octet_sequence.cpp
-//
-// = DESCRIPTION
-//   Verifies that reference counting is performed correctly for octet
-//   sequence marshaling.
-//
-// = AUTHORS
-//   Dave Meyer (dmeyer@std.saic.com)
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   octet_sequence.cpp
+ *
+ *  $Id$
+ *
+ * Verifies that reference counting is performed correctly for octet
+ * sequence marshaling.
+ *
+ *
+ *  @author Dave Meyer (dmeyer@std.saic.com)Carlos O'Ryan (coryan@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #include "ace/Log_Msg.h"
 
diff --git a/tests/CDR/tc.cpp b/tests/CDR/tc.cpp
index 5d54012c4af..f15126eceb2 100644
--- a/tests/CDR/tc.cpp
+++ b/tests/CDR/tc.cpp
@@ -1,21 +1,18 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CDR
-//
-// = FILENAME
-//    tc.cpp
-//
-// = DESCRIPTION
-//   Verify that the basic typecodes are able to interpret their CDR
-//   buffers.
-//
-// = AUTHORS
-//    Carlos O'Ryan
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    tc.cpp
+ *
+ *  $Id$
+ *
+ * Verify that the basic typecodes are able to interpret their CDR
+ * buffers.
+ *
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
@@ -25,14 +22,8 @@
 
 #include "ace/Log_Msg.h"
 
-
-ACE_RCSID (CDR,
-           tc,
-           "$Id$")
-
 // In this version of TAO typecodes are based on CDR, we have to
 // verify that CDR offers the services needed for Typecode...
-
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/COIOP/COIOP_Test.cpp b/tests/COIOP/COIOP_Test.cpp
index 6d20ffbb864..3307a10c1fc 100644
--- a/tests/COIOP/COIOP_Test.cpp
+++ b/tests/COIOP/COIOP_Test.cpp
@@ -40,7 +40,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         // This is a hack but that is okay!
         return 0;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/COIOP/Client_Task.cpp b/tests/COIOP/Client_Task.cpp
index 802bb456e7b..4618639b2b0 100644
--- a/tests/COIOP/Client_Task.cpp
+++ b/tests/COIOP/Client_Task.cpp
@@ -1,13 +1,10 @@
-//
+// -*- C++ -*-
 // $Id$
-//
 
 #include "Client_Task.h"
 #include "tao/ORB_Core.h"
 #include "TestC.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (const ACE_TCHAR *ior,
                           CORBA::ORB_ptr corb,
                           ACE_Thread_Manager *thr_mgr,
diff --git a/tests/COIOP/Hello.cpp b/tests/COIOP/Hello.cpp
index 5d2383f3a68..71272b4add1 100644
--- a/tests/COIOP/Hello.cpp
+++ b/tests/COIOP/Hello.cpp
@@ -1,18 +1,16 @@
-//
+// -*- C++ -*-
 // $Id$
-//
+
 #include "Hello.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
-  Hello::Hello (CORBA::ORB_ptr orb,
-              ACE_thread_t thrid)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-    , thr_id_ (thrid)
+Hello::Hello (CORBA::ORB_ptr orb,
+            ACE_thread_t thrid)
+: orb_ (CORBA::ORB::_duplicate (orb))
+  , thr_id_ (thrid)
 {
 }
 
diff --git a/tests/COIOP/Hello.h b/tests/COIOP/Hello.h
index 556409e5d00..1d5e27d075f 100644
--- a/tests/COIOP/Hello.h
+++ b/tests/COIOP/Hello.h
@@ -8,8 +8,6 @@
 
 #include "TestS.h"
 
-#include "ace/OS.h"
-
 /// Implement the Test::Hello interface
 class Hello
   : public virtual POA_Test::Hello
diff --git a/tests/COIOP/Makefile.am b/tests/COIOP/Makefile.am
deleted file mode 100644
index 02a21c418f1..00000000000
--- a/tests/COIOP/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.COIOP_Tests_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.COIOP_Simple_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += COIOP_Simple_Test
-
-COIOP_Simple_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-COIOP_Simple_Test_SOURCES = \
-  COIOP_Simple_Test.cpp \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Hello.h
-
-COIOP_Simple_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.COIOP_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += COIOP_Test
-
-COIOP_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-COIOP_Test_SOURCES = \
-  COIOP_Test.cpp \
-  Client_Task.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  Server_Task.h
-
-COIOP_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/COIOP/Server_Task.cpp b/tests/COIOP/Server_Task.cpp
index f2f09819674..f7bf8b30613 100644
--- a/tests/COIOP/Server_Task.cpp
+++ b/tests/COIOP/Server_Task.cpp
@@ -1,17 +1,12 @@
-//
+// -*- C++ -*-
 // $Id$
-//
+
 #include "Server_Task.h"
 #include "TestS.h"
 #include "Hello.h"
 
 #include "ace/Manual_Event.h"
 
-ACE_RCSID(Collocated_Test,
-          Server_Task,
-          "$Id$")
-
-
 Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
diff --git a/tests/CORBA_e_Implicit_Activation/Hello.cpp b/tests/CORBA_e_Implicit_Activation/Hello.cpp
index bd54904034f..8f65ca11062 100644
--- a/tests/CORBA_e_Implicit_Activation/Hello.cpp
+++ b/tests/CORBA_e_Implicit_Activation/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (void)
 {
 }
diff --git a/tests/CORBA_e_Implicit_Activation/Makefile.am b/tests/CORBA_e_Implicit_Activation/Makefile.am
deleted file mode 100644
index fd36f2a9a95..00000000000
--- a/tests/CORBA_e_Implicit_Activation/Makefile.am
+++ /dev/null
@@ -1,80 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CORBA_e_Implicit_Activation.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/CORBA_e_Implicit_Activation/server.cpp b/tests/CORBA_e_Implicit_Activation/server.cpp
index 73fd48d4d35..9062a8c7220 100644
--- a/tests/CORBA_e_Implicit_Activation/server.cpp
+++ b/tests/CORBA_e_Implicit_Activation/server.cpp
@@ -3,10 +3,6 @@
 #include "Hello.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/CSD_Collocation/Collocation.cpp b/tests/CSD_Collocation/Collocation.cpp
index 22932237fef..1daaff56119 100644
--- a/tests/CSD_Collocation/Collocation.cpp
+++ b/tests/CSD_Collocation/Collocation.cpp
@@ -7,8 +7,6 @@
 #include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 #include "ace/Thread_Manager.h"
 
-ACE_RCSID(Collocation, main, "$Id$")
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
diff --git a/tests/CSD_Collocation/Collocation_Tester.h b/tests/CSD_Collocation/Collocation_Tester.h
index 8756a731843..025f0398008 100644
--- a/tests/CSD_Collocation/Collocation_Tester.h
+++ b/tests/CSD_Collocation/Collocation_Tester.h
@@ -1,18 +1,17 @@
-// $Id$
-
-//============================================================================
-//
-//  = FILENAME
-//     Collocation_Test.h
-//
-//  = DESCRIPTION
-//     Server class to perform testing of TAO's collocation mechanism.
-//
-//  = AUTHOR
-//     Nanbor Wang
-//
+
+//=============================================================================
+/**
+ *  @file     Collocation_Tester.h
+ *
+ *  $Id$
+ *
+ *   Server class to perform testing of TAO's collocation mechanism.
+ *
+ *  @author  Nanbor Wang
+ */
 //=============================================================================
 
+
 #if !defined (TAO_COLLOCATION_TEST_H)
 #define TAO_COLLOCATION_TEST_H
 
@@ -29,18 +28,18 @@ public:
 
   void shutdown (void);
 
+  /// Initializing the Collocation_Test object.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initializing the Collocation_Test object.
 
+  /// Parse the test specific arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parse the test specific arguments.
 
+  /// This test narrow an object reference to its base class and see
+  /// if it works correctly.
   int test_narrow (void);
-  // This test narrow an object reference to its base class and see
-  // if it works correctly.
 
+  /// Run the test.
   int run (void);
-  // Run the test.
 
 private:
   CORBA::ORB_var orb_;
@@ -49,14 +48,14 @@ private:
 
   PortableServer::POAManager_var poa_manager_;
 
+  /// Our basic test object.
   CORBA::Object_var diamond_obj_;
-  // Our basic test object.
 
+  /// A collection of servant for basic narrowing test.
   Top_i top_servant_;
   Left_i left_servant_;
   Right_i right_servant_;
   Buttom_i diamond_servant_;
-  // A collection of servant for basic narrowing test.
 };
 
 #endif /* TAO_COLLOCATION_TEST_H */
diff --git a/tests/CSD_Collocation/Makefile.am b/tests/CSD_Collocation/Makefile.am
deleted file mode 100644
index b43b1e71de0..00000000000
--- a/tests/CSD_Collocation/Makefile.am
+++ /dev/null
@@ -1,89 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CSD_Collocation.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES = \
-  DiamondC.cpp \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.cpp \
-  DiamondS.h \
-  DiamondS.inl
-
-CLEANFILES = \
-  Diamond-stamp \
-  DiamondC.cpp \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.cpp \
-  DiamondS.h \
-  DiamondS.inl
-
-DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp
-
-Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Gd -St -Sa $(srcdir)/Diamond.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocation
-
-Collocation_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocation_SOURCES = \
-  Collocation.cpp \
-  Collocation_Tester.cpp \
-  DiamondC.cpp \
-  DiamondS.cpp \
-  Diamond_i.cpp \
-  Collocation_Tester.h \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.h \
-  DiamondS.inl \
-  Diamond_i.h
-
-Collocation_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/tests/CSD_Collocation/svc.conf b/tests/CSD_Collocation/svc.conf
index 285b1297bd4..826ce10d8f7 100644
--- a/tests/CSD_Collocation/svc.conf
+++ b/tests/CSD_Collocation/svc.conf
@@ -8,7 +8,7 @@ static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocato
 
 # Make sure we use RW client handler so if something goes wrong, the program will bloc,
 # i.e., won't work.
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
 
 # Not absolutely necessary for this test, but we add it for fun.
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null"
+static Server_Strategy_Factory "-ORBConcurrency reactive"
diff --git a/tests/CSD_Collocation/svc.conf.xml b/tests/CSD_Collocation/svc.conf.xml
index 36246c69725..f5c0a307879 100644
--- a/tests/CSD_Collocation/svc.conf.xml
+++ b/tests/CSD_Collocation/svc.conf.xml
@@ -9,7 +9,7 @@
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"/>
  <!--  Make sure we use RW client handler so if something goes wrong, the program will bloc, -->
  <!--  i.e., won't work. -->
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
  <!--  Not absolutely necessary for this test, but we add it for fun. -->
- <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive -ORBPOALock null"/>
+ <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive"/>
 </ACE_Svc_Conf>
diff --git a/tests/CSD_Strategy_Tests/Broken/Makefile.am b/tests/CSD_Strategy_Tests/Broken/Makefile.am
deleted file mode 100644
index e3676875549..00000000000
--- a/tests/CSD_Strategy_Tests/Broken/Makefile.am
+++ /dev/null
@@ -1,104 +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:
-## ../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.CSD_TP_Broken_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-client_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_TP_Broken_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-server_main_SOURCES = \
-  ServerApp.cpp \
-  server_main.cpp \
-  ServerApp.h
-
-server_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-server_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
index 5e37ac5617e..4ca2dc82800 100644
--- a/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
+++ b/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
@@ -6,7 +6,6 @@
 #include "TestAppExceptionC.h"
 #include "Foo_B_SimpleClientEngine.h"
 #include "Callback_i.h"
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 // To force static load the service.
 #include "tao/PI/PI.h"
diff --git a/tests/CSD_Strategy_Tests/Makefile.am b/tests/CSD_Strategy_Tests/Makefile.am
deleted file mode 100644
index a8ba990b33b..00000000000
--- a/tests/CSD_Strategy_Tests/Makefile.am
+++ /dev/null
@@ -1,23 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        TP_Common \
-        TP_Foo_A \
-        TP_Foo_B \
-        Broken \
-        TP_Foo_C \
-        TP_Test_1 \
-        TP_Test_2 \
-        TP_Test_3 \
-        TP_Test_4 \
-        TP_Test_Dynamic \
-        TP_Test_Static
-
diff --git a/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
index e3b8a8a84eb..1799f1032f3 100644
--- a/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
+++ b/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
@@ -6,7 +6,6 @@
 #include "TestAppExceptionC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
 
diff --git a/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp b/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
index c290dc54c5b..cfb13da0cd9 100644
--- a/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
+++ b/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
@@ -53,12 +53,7 @@ AppShutdown::client_done()
       return;
     }
 
-  unsigned cur_shutdown;
-
-  {
-    GuardType guard(this->lock_);
-    cur_shutdown = ++this->num_clients_shutdown_;
-  }
+  unsigned cur_shutdown = ++this->num_clients_shutdown_;
 
   if (cur_shutdown == this->num_clients_)
     {
diff --git a/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h b/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
index 50aa093f9a6..097249686ee 100644
--- a/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
+++ b/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
@@ -23,14 +23,9 @@ class CSD_TP_Test_Export AppShutdown
     static AppShutdown* instance ();
 
   private:
-
-    typedef TAO_SYNCH_MUTEX LockType;
-    typedef ACE_Guard<LockType> GuardType;
-
-    LockType lock_;
     CORBA::ORB_var orb_;
     unsigned num_clients_;
-    unsigned num_clients_shutdown_;
+    ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> num_clients_shutdown_;
 
     OrbShutdownTask orb_shutdown_task_;
 };
diff --git a/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp b/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
index 388a559c8c1..dbc71737f99 100644
--- a/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
+++ b/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
@@ -58,7 +58,7 @@ ClientTask::svc()
   ClientEngine_Handle engine;
 
   {
-    GuardType guard(this->lock_);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
     this->engines_.get(engine, this->engines_.size() - 1);
     this->engines_.pop_back();
   }
@@ -68,7 +68,7 @@ ClientTask::svc()
     bool exec_ret = engine->execute();
     if (exec_ret == false)
       {
-        GuardType guard(this->lock_);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
         this->failure_count_ ++;
       }
   }
@@ -77,7 +77,7 @@ ClientTask::svc()
     ex._tao_print_exception (
       "ClientTask::svc Caught exception from execute():");
 
-    GuardType guard(this->lock_);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
     this->failure_count_ ++;
   }
   catch (...)
@@ -85,7 +85,7 @@ ClientTask::svc()
     ACE_ERROR((LM_ERROR,
                "(%P|%t) ClientTask::svc caught unknown (...) exception "\
                "in execute() " ));
-    GuardType guard(this->lock_);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
     this->failure_count_ ++;
   }
 
@@ -99,14 +99,12 @@ ClientTask::svc()
   return 0;
 }
 
-
 int
 ClientTask::close(u_long)
 {
   return 0;
 }
 
-
 unsigned
 ClientTask::failure_count () const
 {
diff --git a/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h b/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h
index 006035f2347..2279b3a90e3 100644
--- a/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h
+++ b/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h
@@ -37,12 +37,9 @@ class CSD_TP_Test_Export ClientTask : public ACE_Task_Base
 
   private:
 
-     typedef TAO_SYNCH_MUTEX     LockType;
-     typedef ACE_Guard<LockType> GuardType;
-
      typedef ACE_Vector<ClientEngine_Handle> EngineVector;
 
-     LockType lock_;
+     TAO_SYNCH_MUTEX lock_;
      EngineVector engines_;
      bool         shutdown_after_done_;
      unsigned     failure_count_;
diff --git a/tests/CSD_Strategy_Tests/TP_Common/Makefile.am b/tests/CSD_Strategy_Tests/TP_Common/Makefile.am
deleted file mode 100644
index 82a2d815bb7..00000000000
--- a/tests/CSD_Strategy_Tests/TP_Common/Makefile.am
+++ /dev/null
@@ -1,190 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.CSD_TP_Test_Lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES += \
-  FooExceptionC.cpp \
-  FooExceptionC.h \
-  FooExceptionC.inl \
-  FooExceptionS.cpp \
-  FooExceptionS.h \
-  FooExceptionS.inl
-
-CLEANFILES += \
-  FooException-stamp \
-  FooExceptionC.cpp \
-  FooExceptionC.h \
-  FooExceptionC.inl \
-  FooExceptionS.cpp \
-  FooExceptionS.h \
-  FooExceptionS.inl
-
-FooExceptionC.cpp FooExceptionC.h FooExceptionC.inl FooExceptionS.cpp FooExceptionS.h FooExceptionS.inl: FooException-stamp
-
-FooException-stamp: $(srcdir)/FooException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/FooException.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TestAppExceptionC.cpp \
-  TestAppExceptionC.h \
-  TestAppExceptionC.inl \
-  TestAppExceptionS.cpp \
-  TestAppExceptionS.h \
-  TestAppExceptionS.inl
-
-CLEANFILES += \
-  TestAppException-stamp \
-  TestAppExceptionC.cpp \
-  TestAppExceptionC.h \
-  TestAppExceptionC.inl \
-  TestAppExceptionS.cpp \
-  TestAppExceptionS.h \
-  TestAppExceptionS.inl
-
-TestAppExceptionC.cpp TestAppExceptionC.h TestAppExceptionC.inl TestAppExceptionS.cpp TestAppExceptionS.h TestAppExceptionS.inl: TestAppException-stamp
-
-TestAppException-stamp: $(srcdir)/TestAppException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/TestAppException.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CancelledExceptionC.cpp \
-  CancelledExceptionC.h \
-  CancelledExceptionC.inl \
-  CancelledExceptionS.cpp \
-  CancelledExceptionS.h \
-  CancelledExceptionS.inl
-
-CLEANFILES += \
-  CancelledException-stamp \
-  CancelledExceptionC.cpp \
-  CancelledExceptionC.h \
-  CancelledExceptionC.inl \
-  CancelledExceptionS.cpp \
-  CancelledExceptionS.h \
-  CancelledExceptionS.inl
-
-CancelledExceptionC.cpp CancelledExceptionC.h CancelledExceptionC.inl CancelledExceptionS.cpp CancelledExceptionS.h CancelledExceptionS.inl: CancelledException-stamp
-
-CancelledException-stamp: $(srcdir)/CancelledException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/CancelledException.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CustomExceptionC.cpp \
-  CustomExceptionC.h \
-  CustomExceptionC.inl \
-  CustomExceptionS.cpp \
-  CustomExceptionS.h \
-  CustomExceptionS.inl
-
-CLEANFILES += \
-  CustomException-stamp \
-  CustomExceptionC.cpp \
-  CustomExceptionC.h \
-  CustomExceptionC.inl \
-  CustomExceptionS.cpp \
-  CustomExceptionS.h \
-  CustomExceptionS.inl
-
-CustomExceptionC.cpp CustomExceptionC.h CustomExceptionC.inl CustomExceptionS.cpp CustomExceptionS.h CustomExceptionS.inl: CustomException-stamp
-
-CustomException-stamp: $(srcdir)/CustomException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/CustomException.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libCSD_TP_Test.la
-
-libCSD_TP_Test_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tao \
-  -DCSD_TP_TEST_BUILD_DLL
-
-libCSD_TP_Test_la_SOURCES = \
-  AppHelper.cpp \
-  AppShutdown.cpp \
-  CancelledExceptionC.cpp \
-  CancelledExceptionS.cpp \
-  ClientEngine.cpp \
-  ClientTask.cpp \
-  CustomExceptionC.cpp \
-  CustomExceptionS.cpp \
-  FooExceptionC.cpp \
-  FooExceptionS.cpp \
-  OrbRunner.cpp \
-  OrbShutdownTask.cpp \
-  OrbTask.cpp \
-  StatisticsHelper.cpp \
-  TestAppBase.cpp \
-  TestAppExceptionC.cpp \
-  TestAppExceptionS.cpp
-
-noinst_HEADERS = \
-  AppHelper.h \
-  AppShutdown.h \
-  CancelledException.idl \
-  CancelledExceptionC.h \
-  CancelledExceptionC.inl \
-  CancelledExceptionS.h \
-  CancelledExceptionS.inl \
-  ClientEngine.h \
-  ClientTask.h \
-  CustomException.idl \
-  CustomExceptionC.h \
-  CustomExceptionC.inl \
-  CustomExceptionS.h \
-  CustomExceptionS.inl \
-  FooException.idl \
-  FooExceptionC.h \
-  FooExceptionC.inl \
-  FooExceptionS.h \
-  FooExceptionS.inl \
-  OrbRunner.h \
-  OrbShutdownTask.h \
-  OrbTask.h \
-  ServantList_T.cpp \
-  ServantList_T.h \
-  StatisticsHelper.h \
-  TestAppBase.h \
-  TestAppException.idl \
-  TestAppExceptionC.h \
-  TestAppExceptionC.inl \
-  TestAppExceptionS.h \
-  TestAppExceptionS.inl
-
-endif BUILD_THREADS
-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/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp b/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
index 456d7025478..8e39e223b45 100644
--- a/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
+++ b/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
@@ -8,7 +8,7 @@ void swap ( CORBA::Long& x, CORBA::Long& y )
   temp = x;
   x = y;
   y = temp;
-} 
+}
 
 
 void sort ( LongVector & vector )
diff --git a/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h b/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
index 7f26a4ae165..16ed9c88eef 100644
--- a/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
+++ b/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
@@ -4,7 +4,7 @@
 
 #include "CSD_TP_Test_Export.h"
 #include "tao/Basic_Types.h"
-#include "ace/Array.h"
+#include "ace/Containers_T.h"
 #include "ace/Vector_T.h"
 #include "ace/SString.h"
 
@@ -17,7 +17,7 @@ typedef ACE_Array< CORBA::Long > LongArray;
 extern CSD_TP_Test_Export
 void swap ( CORBA::Long& x, CORBA::Long& y );
 
-extern CSD_TP_Test_Export 
+extern CSD_TP_Test_Export
 void sort ( LongVector & vector );
 
 
diff --git a/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp b/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
index 1ef8ce83cd7..82cb6b65221 100644
--- a/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
+++ b/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
@@ -63,9 +63,9 @@ Foo_A_Statistics::actual_vs_expected()
           continue;
         }
 
-      unsigned actual_size 
+      unsigned actual_size
         = this->actual_in_values_[i].size ();
-      unsigned expected_size 
+      unsigned expected_size
         = this->num_clients_ * stats.expected_[i];
       if (actual_size != expected_size)
         {
@@ -80,7 +80,7 @@ Foo_A_Statistics::actual_vs_expected()
               return false;
             }
         }
-    }   
+    }
   return true;
 }
 
diff --git a/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h b/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
index d5bf9ea2c71..b9301b915bf 100644
--- a/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
+++ b/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
@@ -6,7 +6,7 @@
 #include "StatisticsHelper.h"
 
 
-class CSD_TP_Foo_A_Export Foo_A_Statistics 
+class CSD_TP_Foo_A_Export Foo_A_Statistics
 {
   public:
 
diff --git a/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am b/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am
deleted file mode 100644
index 8787a60a8d8..00000000000
--- a/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am
+++ /dev/null
@@ -1,89 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.csd_tp_foo_a_lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES = \
-  Foo_AC.cpp \
-  Foo_AC.h \
-  Foo_AC.inl \
-  Foo_AS.cpp \
-  Foo_AS.h \
-  Foo_AS.inl
-
-CLEANFILES = \
-  Foo_A-stamp \
-  Foo_AC.cpp \
-  Foo_AC.h \
-  Foo_AC.inl \
-  Foo_AS.cpp \
-  Foo_AS.h \
-  Foo_AS.inl
-
-Foo_AC.cpp Foo_AC.h Foo_AC.inl Foo_AS.cpp Foo_AS.h Foo_AS.inl: Foo_A-stamp
-
-Foo_A-stamp: $(srcdir)/Foo_A.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -Wb,export_macro=CSD_TP_Foo_A_Export -Wb,export_include=CSD_TP_Foo_A_Export.h $(srcdir)/Foo_A.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libCSD_TP_Foo_A.la
-
-libCSD_TP_Foo_A_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tao \
-  -DCSD_TP_FOO_A_BUILD_DLL
-
-libCSD_TP_Foo_A_la_SOURCES = \
-  Foo_AC.cpp \
-  Foo_AS.cpp \
-  Foo_A_ClientEngine.cpp \
-  Foo_A_Statistics.cpp \
-  Foo_A_i.cpp
-
-libCSD_TP_Foo_A_la_LDFLAGS = \
- -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common
-
-noinst_HEADERS = \
-  Foo_A.idl \
-  Foo_AC.h \
-  Foo_AC.inl \
-  Foo_AS.h \
-  Foo_AS.inl \
-  Foo_A_ClientEngine.h \
-  Foo_A_Statistics.h \
-  Foo_A_i.h
-
-endif BUILD_THREADS
-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/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl b/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl
index 49be42260cb..717d74adea5 100644
--- a/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl
+++ b/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl
@@ -2,7 +2,7 @@
 #ifndef CALLBACK_IDL
 #define CALLBACK_IDL
 
-interface Callback 
+interface Callback
 {
   void test_method();
 };
diff --git a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
index 01e5ddb5179..949f08397ad 100644
--- a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
+++ b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
@@ -4,7 +4,7 @@
 
 #include "FooException.idl"
 #include "Callback.idl"
- 
+
 
 typedef sequence<char, 32> Bounded_Var_Size;
 typedef sequence<char> Unbounded_Var_Size;
@@ -17,7 +17,7 @@ struct TimeOfDay {
     short   minute;     // 0 - 59
     short   second;     // 0 - 59
 };
-interface Foo_B 
+interface Foo_B
 {
   /// void return-type, no arguments
   void op1();
@@ -39,7 +39,7 @@ interface Foo_B
               inout string message);
 
   /// Callback test.
-  
+
   /// Pass the callback object and the server invoke operation on
   /// the callback object reference.
   void op7 (in Callback cb) raises (FooException);
@@ -51,7 +51,7 @@ interface Foo_B
   oneway void test_fixed_array_arg(in Fixed_Array message);
 
   oneway void test_var_array_arg(in Var_Array messages);
-    
+
   oneway void test_bounded_var_size_arg(in Bounded_Var_Size message);
 
   oneway void test_unbounded_var_size_arg(in Unbounded_Var_Size message);
diff --git a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
index f857655fb0c..9d497df00c9 100644
--- a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
+++ b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
@@ -5,7 +5,6 @@
 #include "TestAppExceptionC.h"
 #include "AppHelper.h"
 #include "ace/Log_Msg.h"
-#include "ace/OS.h"
 
 const char* ONEWAY_ARG_TEST_STR = "TEST";
 
diff --git a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
index e6075f9cec6..0c41b14b0bc 100644
--- a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
+++ b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
@@ -5,7 +5,6 @@
 #include "TestAppExceptionC.h"
 #include "AppHelper.h"
 #include "ace/Log_Msg.h"
-#include "ace/OS.h"
 
 extern const char* ONEWAY_ARG_TEST_STR;
 
diff --git a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
index cf21382c549..e8d9569a2d5 100644
--- a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
+++ b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
@@ -6,14 +6,14 @@
 #include "StatisticsHelper.h"
 
 
-class CSD_TP_Foo_B_Export Foo_B_Statistics 
+class CSD_TP_Foo_B_Export Foo_B_Statistics
 {
   public:
 
-    enum In_Value_Type 
+    enum In_Value_Type
     {
-      FOO_B_STAT_NONE, 
-      FOO_B_STAT_STRING, 
+      FOO_B_STAT_NONE,
+      FOO_B_STAT_STRING,
       FOO_B_STAT_LONG
     };
 
diff --git a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
index 6cd944f8473..5e90582eff3 100644
--- a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
+++ b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
@@ -1,11 +1,10 @@
 // $Id$
+
 #include "Foo_B_i.h"
 #include "AppShutdown.h"
 #include "TestAppExceptionC.h"
-#include "ace/OS.h"
 #include "ace/SString.h"
 
-
 Foo_B_i::Foo_B_i()
 : error_count_ (0)
 {
diff --git a/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am b/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am
deleted file mode 100644
index 4e7d80fb3b7..00000000000
--- a/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am
+++ /dev/null
@@ -1,125 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.csd_tp_foo_b_lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES += \
-  Foo_BC.cpp \
-  Foo_BC.h \
-  Foo_BC.inl \
-  Foo_BS.cpp \
-  Foo_BS.h \
-  Foo_BS.inl
-
-CLEANFILES += \
-  Foo_B-stamp \
-  Foo_BC.cpp \
-  Foo_BC.h \
-  Foo_BC.inl \
-  Foo_BS.cpp \
-  Foo_BS.h \
-  Foo_BS.inl
-
-Foo_BC.cpp Foo_BC.h Foo_BC.inl Foo_BS.cpp Foo_BS.h Foo_BS.inl: Foo_B-stamp
-
-Foo_B-stamp: $(srcdir)/Foo_B.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -b -Wb,export_macro=CSD_TP_Foo_B_Export -Wb,export_include=CSD_TP_Foo_B_Export.h $(srcdir)/Foo_B.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CallbackC.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.cpp \
-  CallbackS.h \
-  CallbackS.inl
-
-CLEANFILES += \
-  Callback-stamp \
-  CallbackC.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.cpp \
-  CallbackS.h \
-  CallbackS.inl
-
-CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl: Callback-stamp
-
-Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -b -Wb,export_macro=CSD_TP_Foo_B_Export -Wb,export_include=CSD_TP_Foo_B_Export.h $(srcdir)/Callback.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libCSD_TP_Foo_B.la
-
-libCSD_TP_Foo_B_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tao \
-  -DCSD_TP_FOO_B_BUILD_DLL
-
-libCSD_TP_Foo_B_la_SOURCES = \
-  CallbackC.cpp \
-  CallbackS.cpp \
-  Callback_i.cpp \
-  Foo_BC.cpp \
-  Foo_BS.cpp \
-  Foo_B_ClientEngine.cpp \
-  Foo_B_SimpleClientEngine.cpp \
-  Foo_B_Statistics.cpp \
-  Foo_B_i.cpp
-
-libCSD_TP_Foo_B_la_LDFLAGS = \
- -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common
-
-noinst_HEADERS = \
-  Callback.idl \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.h \
-  CallbackS.inl \
-  Callback_i.h \
-  Foo_B.idl \
-  Foo_BC.h \
-  Foo_BC.inl \
-  Foo_BS.h \
-  Foo_BS.inl \
-  Foo_B_ClientEngine.h \
-  Foo_B_SimpleClientEngine.h \
-  Foo_B_Statistics.h \
-  Foo_B_i.h
-
-endif BUILD_THREADS
-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/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp b/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
index b832e29d9a1..b6155743e3b 100644
--- a/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
+++ b/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
@@ -3,7 +3,7 @@
 #include "Foo_C_ClientEngine.h"
 #include "Foo_C_Custom_ClientEngine.h"
 
-Foo_C_Statistics::Foo_C_Statistics(unsigned num_remote_clients, 
+Foo_C_Statistics::Foo_C_Statistics(unsigned num_remote_clients,
                                    unsigned num_collocated_clients)
 : num_remote_clients_ (num_remote_clients),
   num_collocated_clients_ (num_collocated_clients)
@@ -71,21 +71,21 @@ Foo_C_Statistics::actual_vs_expected()
         }
 
       // Verify the "in" values.
-      // Skip op1/op5 and cust_op1/cust_op5 since they do not have 
+      // Skip op1/op5 and cust_op1/cust_op5 since they do not have
       // any "in" values.
       if (i % 5 == 0 || i % 5 == 4)
         {
           continue;
         }
 
-      unsigned actual_size 
+      unsigned actual_size
         = this->actual_in_values_[i].size ();
-      unsigned expected_size 
+      unsigned expected_size
         =  this->num_remote_clients_ * remote_client_stats.expected_[i]
            + this->num_collocated_clients_ * collocated_client_stats.expected_[i];
-          
+
       if (actual_size == 0 && expected_size == 0)
-        { 
+        {
           continue;
         }
 
@@ -103,7 +103,7 @@ Foo_C_Statistics::actual_vs_expected()
               return false;
             }
         }
-    }   
+    }
   return true;
 }
 
diff --git a/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h b/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
index 4d7dcff1df9..f115ddc2b1f 100644
--- a/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
+++ b/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
@@ -6,11 +6,11 @@
 #include "StatisticsHelper.h"
 
 
-class CSD_TP_Foo_C_Export Foo_C_Statistics 
+class CSD_TP_Foo_C_Export Foo_C_Statistics
 {
   public:
 
-    Foo_C_Statistics(unsigned num_remote_clients, 
+    Foo_C_Statistics(unsigned num_remote_clients,
                      unsigned num_collocated_clients);
 
     virtual ~Foo_C_Statistics();
@@ -24,7 +24,7 @@ class CSD_TP_Foo_C_Export Foo_C_Statistics
 
   private:
 
-    unsigned num_remote_clients_; 
+    unsigned num_remote_clients_;
     unsigned num_collocated_clients_;
     unsigned expected_[10];
     unsigned actual_[10];
diff --git a/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am b/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am
deleted file mode 100644
index ea662ab6b42..00000000000
--- a/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am
+++ /dev/null
@@ -1,103 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.csd_tp_foo_c_lib.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES = \
-  Foo_CC.cpp \
-  Foo_CC.h \
-  Foo_CC.inl \
-  Foo_CS.cpp \
-  Foo_CS.h \
-  Foo_CS.inl
-
-CLEANFILES = \
-  Foo_C-stamp \
-  Foo_CC.cpp \
-  Foo_CC.h \
-  Foo_CC.inl \
-  Foo_CS.cpp \
-  Foo_CS.h \
-  Foo_CS.inl
-
-Foo_CC.cpp Foo_CC.h Foo_CC.inl Foo_CS.cpp Foo_CS.h Foo_CS.inl: Foo_C-stamp
-
-Foo_C-stamp: $(srcdir)/Foo_C.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -b -Wb,export_macro=CSD_TP_Foo_C_Export -Wb,export_include=CSD_TP_Foo_C_Export.h $(srcdir)/Foo_C.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libCSD_TP_Foo_C.la
-
-libCSD_TP_Foo_C_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tao \
-  -DCSD_TP_FOO_C_BUILD_DLL
-
-libCSD_TP_Foo_C_la_SOURCES = \
-  Foo_CC.cpp \
-  Foo_CS.cpp \
-  Foo_C_ClientEngine.cpp \
-  Foo_C_Custom_ClientEngine.cpp \
-  Foo_C_Custom_Proxy.cpp \
-  Foo_C_Statistics.cpp \
-  Foo_C_cust_op1.cpp \
-  Foo_C_cust_op2.cpp \
-  Foo_C_cust_op3.cpp \
-  Foo_C_cust_op4.cpp \
-  Foo_C_cust_op5.cpp \
-  Foo_C_i.cpp
-
-libCSD_TP_Foo_C_la_LDFLAGS = \
- -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common
-
-noinst_HEADERS = \
-  Foo_C.idl \
-  Foo_CC.h \
-  Foo_CC.inl \
-  Foo_CS.h \
-  Foo_CS.inl \
-  Foo_C_ClientEngine.h \
-  Foo_C_Custom_ClientEngine.h \
-  Foo_C_Custom_Proxy.h \
-  Foo_C_Statistics.h \
-  Foo_C_cust_op1.h \
-  Foo_C_cust_op2.h \
-  Foo_C_cust_op3.h \
-  Foo_C_cust_op4.h \
-  Foo_C_cust_op5.h \
-  Foo_C_i.h
-
-endif BUILD_THREADS
-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/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am b/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am
deleted file mode 100644
index 1d6832a1557..00000000000
--- a/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am
+++ /dev/null
@@ -1,104 +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:
-## ../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.CSD_TP_Test_1_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-client_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_TP_Test_1_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-server_main_SOURCES = \
-  ServerApp.cpp \
-  server_main.cpp \
-  ServerApp.h
-
-server_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-server_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am b/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am
deleted file mode 100644
index 7a6269ed5ab..00000000000
--- a/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am
+++ /dev/null
@@ -1,104 +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:
-## ../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.CSD_TP_Test_2_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-client_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_TP_Test_2_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-server_main_SOURCES = \
-  ServerApp.cpp \
-  server_main.cpp \
-  ServerApp.h
-
-server_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-server_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
index 285c20bb698..1cd428ddf23 100644
--- a/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+++ b/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
@@ -5,7 +5,6 @@
 #include "AppShutdown.h"
 #include "TestAppExceptionC.h"
 #include "Foo_A_ClientEngine.h"
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 // To force static load the service.
 #include "tao/PI/PI.h"
diff --git a/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am b/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am
deleted file mode 100644
index fc48b77f81c..00000000000
--- a/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am
+++ /dev/null
@@ -1,104 +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:
-## ../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.CSD_TP_Test_3_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-client_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_TP_Test_3_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-server_main_SOURCES = \
-  ServerApp.cpp \
-  server_main.cpp \
-  ServerApp.h
-
-server_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-
-server_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
index 83795c6e49c..87d51f92e3b 100644
--- a/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
+++ b/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
@@ -7,7 +7,6 @@
 #include "Foo_B_ClientEngine.h"
 #include "Foo_B_ClientEngine.h"
 #include "Callback_i.h"
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 // To force static load the service.
 #include "tao/PI/PI.h"
diff --git a/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am b/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am
deleted file mode 100644
index 825bcfdd37c..00000000000
--- a/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am
+++ /dev/null
@@ -1,104 +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:
-## ../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.CSD_TP_Test_4_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_C
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C
-
-client_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_C/libCSD_TP_Foo_C.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_TP_Test_4_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_C
-
-server_main_SOURCES = \
-  ServerApp.cpp \
-  server_main.cpp \
-  ServerApp.h
-
-server_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C
-
-server_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_C/libCSD_TP_Foo_C.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
index 3614fd0350c..93b84ad02dd 100644
--- a/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
+++ b/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
@@ -7,7 +7,6 @@
 #include "Foo_C_Custom_ClientEngine.h"
 #include "Foo_C_ClientEngine.h"
 #include "Foo_C_Statistics.h"
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 // To force static load the service.
 #include "tao/PI/PI.h"
diff --git a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc
index 2d3a8d5221c..116a9142daa 100644
--- a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc
+++ b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project(*idl): taoidldefaults {
-  idlflags += -Sa -St
   IDL_Files {
     Test.idl
   }
diff --git a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
index df5dc90d3d9..0f62f20b906 100644
--- a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
+++ b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am
deleted file mode 100644
index f281fa2a773..00000000000
--- a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CSD_TP_Test_Dynamic_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.CSD_TP_Test_Dynamic_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_TP_Test_Dynamic_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_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/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
index cbd78a6f0d6..abaed430dc8 100644
--- a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
+++ b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
index 394c63527f5..5d2ca8262dc 100644
--- a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
+++ b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
@@ -5,10 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Thread_Manager.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
@@ -33,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf
index e59fb4ac94c..4eccadbc649 100644
--- a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf
+++ b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf
@@ -1 +1,3 @@
+# $Id$
+
 dynamic TAO_CSD_TP_Strategy_Factory Service_Object * TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2"
diff --git a/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am b/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am
deleted file mode 100644
index a038670f34d..00000000000
--- a/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am
+++ /dev/null
@@ -1,104 +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:
-## ../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.CSD_TP_Test_Static_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-server_main_SOURCES = \
-  ServerApp.cpp \
-  server_main.cpp \
-  ServerApp.h
-
-server_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-server_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.CSD_TP_Test_Static_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \
-  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \
-  -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDFLAGS = \
-  -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-
-client_main_LDADD = \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \
-  $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_THREADS
-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/tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf b/tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf
index a274350e4ac..85fb363977d 100644
--- a/tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf
+++ b/tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf
@@ -1 +1,3 @@
+# $Id$
+
 static TAO_CSD_TP_Strategy_Factory "-CSDtp ChildPoa:2"
diff --git a/tests/Cache_Growth_Test/Hello.cpp b/tests/Cache_Growth_Test/Hello.cpp
index 535e7632c0d..b566ba935ed 100644
--- a/tests/Cache_Growth_Test/Hello.cpp
+++ b/tests/Cache_Growth_Test/Hello.cpp
@@ -6,8 +6,6 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Cache_Growth_Test/Makefile.am b/tests/Cache_Growth_Test/Makefile.am
deleted file mode 100644
index fc3c8ea9ebd..00000000000
--- a/tests/Cache_Growth_Test/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Cache_Growth_Test_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Cache_Growth_Test_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Cache_Growth_Test_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Cache_Growth_Test/client.cpp b/tests/Cache_Growth_Test/client.cpp
index 022cf6c0f47..f441e3de509 100644
--- a/tests/Cache_Growth_Test/client.cpp
+++ b/tests/Cache_Growth_Test/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int do_shutdown = 0;
 
@@ -35,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Cache_Growth_Test/server.cpp b/tests/Cache_Growth_Test/server.cpp
index ae19465711c..428a7c13ff9 100644
--- a/tests/Cache_Growth_Test/server.cpp
+++ b/tests/Cache_Growth_Test/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Hello, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/CallbackTest/Callback.cpp b/tests/CallbackTest/Callback.cpp
index f233dd2b229..73b3593b606 100644
--- a/tests/CallbackTest/Callback.cpp
+++ b/tests/CallbackTest/Callback.cpp
@@ -3,8 +3,6 @@
 //
 #include "Callback.h"
 
-ACE_RCSID(Callback, Callback, "$Id$")
-
 Callback::Callback (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/CallbackTest/Makefile.am b/tests/CallbackTest/Makefile.am
deleted file mode 100644
index e5d029355c5..00000000000
--- a/tests/CallbackTest/Makefile.am
+++ /dev/null
@@ -1,121 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CallbackTest_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.CallbackTest_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Callback.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Callback.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.CallbackTest_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Service.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Service.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/CallbackTest/Service.cpp b/tests/CallbackTest/Service.cpp
index 8d9143dc487..307a4a83a80 100644
--- a/tests/CallbackTest/Service.cpp
+++ b/tests/CallbackTest/Service.cpp
@@ -3,8 +3,6 @@
 //
 #include "Service.h"
 
-ACE_RCSID(Callback, Service, "$Id$")
-
 Service::Service (CORBA::ORB_ptr orb)
   : test_count_ (0),
     orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/tests/CallbackTest/client.cpp b/tests/CallbackTest/client.cpp
index c04ed420cfc..8a291889707 100644
--- a/tests/CallbackTest/client.cpp
+++ b/tests/CallbackTest/client.cpp
@@ -6,8 +6,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Crashed_Callback, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -31,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/CallbackTest/server.cpp b/tests/CallbackTest/server.cpp
index c96cf1c553c..001a9741513 100644
--- a/tests/CallbackTest/server.cpp
+++ b/tests/CallbackTest/server.cpp
@@ -7,8 +7,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Crashed_Callback, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Client_Leaks/Client_Task.cpp b/tests/Client_Leaks/Client_Task.cpp
index 1628e3d48d5..8bd8670713c 100644
--- a/tests/Client_Leaks/Client_Task.cpp
+++ b/tests/Client_Leaks/Client_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(Client_Leaks, Client_Task, "$Id$")
-
 Client_Task::Client_Task (Test::Process_Factory_ptr process_factory,
                           int iterations)
   : process_factory_ (Test::Process_Factory::_duplicate (process_factory))
diff --git a/tests/Client_Leaks/Client_Task.h b/tests/Client_Leaks/Client_Task.h
index b6df65e973e..12a45e7aac2 100644
--- a/tests/Client_Leaks/Client_Task.h
+++ b/tests/Client_Leaks/Client_Task.h
@@ -21,7 +21,7 @@ public:
   Client_Task (Test::Process_Factory_ptr process_Factory,
                int iterations);
 
-  /// Return the total number of sucessful calls
+  /// Return the total number of successful calls
   int successful_calls (void) const;
 
   /// Thread entry point
diff --git a/tests/Client_Leaks/Makefile.am b/tests/Client_Leaks/Makefile.am
deleted file mode 100644
index ff78a867d78..00000000000
--- a/tests/Client_Leaks/Makefile.am
+++ /dev/null
@@ -1,138 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Client_Leaks_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Client_Leaks_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Client_Leaks_Child.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += child
-
-child_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-child_SOURCES = \
-  Process.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  child.cpp \
-  Process.h
-
-child_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Client_Leaks_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Process_Factory.cpp \
-  Server_Task.cpp \
-  Startup_Callback.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Process_Factory.h \
-  Server_Task.h \
-  Startup_Callback.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Client_Leaks/Process.cpp b/tests/Client_Leaks/Process.cpp
index 8b6d7257784..6bf3cb78eac 100644
--- a/tests/Client_Leaks/Process.cpp
+++ b/tests/Client_Leaks/Process.cpp
@@ -4,8 +4,6 @@
 #include "Process.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Client_Leaks, Process, "$Id$")
-
 Process::Process (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Client_Leaks/Process_Factory.cpp b/tests/Client_Leaks/Process_Factory.cpp
index c58a665dec6..708265f5215 100644
--- a/tests/Client_Leaks/Process_Factory.cpp
+++ b/tests/Client_Leaks/Process_Factory.cpp
@@ -5,8 +5,6 @@
 #include "Startup_Callback.h"
 #include "ace/Process.h"
 
-ACE_RCSID(Client_Leaks, Process_Factory, "$Id$")
-
 Process_Factory::Process_Factory (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
   , shutdown_received_ (0)
diff --git a/tests/Client_Leaks/README b/tests/Client_Leaks/README
index 5e17aa080f6..1dbcc88e52b 100644
--- a/tests/Client_Leaks/README
+++ b/tests/Client_Leaks/README
@@ -2,14 +2,14 @@
 
 @page Client Leaks Test README File
 
-	On TAO-1.1.12 the ORB was leaking handles on the client-side.
+On TAO-1.1.12 the ORB was leaking handles on the client-side.
 This test creates multiple servers trying to force a fault or
 exception if the resources are still leaked.
 
-	To run the test use the run_test.pl script:
+To run the test use the run_test.pl script:
 
 $ ./run_test.pl
 
-	the script returns 0 if the test was successful.
+the script returns 0 if the test was successful.
 
 */
diff --git a/tests/Client_Leaks/Server_Task.cpp b/tests/Client_Leaks/Server_Task.cpp
index 0dd3295e11f..d37db8a5690 100644
--- a/tests/Client_Leaks/Server_Task.cpp
+++ b/tests/Client_Leaks/Server_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Server_Task.h"
 
-ACE_RCSID(Client_Leaks, Server_Task, "$Id$")
-
 Server_Task::Server_Task (CORBA::ORB_ptr orb,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr)
diff --git a/tests/Client_Leaks/Startup_Callback.cpp b/tests/Client_Leaks/Startup_Callback.cpp
index 341c89ead6e..15eefd990eb 100644
--- a/tests/Client_Leaks/Startup_Callback.cpp
+++ b/tests/Client_Leaks/Startup_Callback.cpp
@@ -3,8 +3,6 @@
 //
 #include "Startup_Callback.h"
 
-ACE_RCSID(Client_Leaks, Startup_Callback, "$Id$")
-
 Startup_Callback::Startup_Callback (void)
 {
 }
diff --git a/tests/Client_Leaks/child.cpp b/tests/Client_Leaks/child.cpp
index 01379f1c35d..e2585d5704e 100644
--- a/tests/Client_Leaks/child.cpp
+++ b/tests/Client_Leaks/child.cpp
@@ -3,8 +3,6 @@
 #include "Process.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Client_Leaks, server, "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
@@ -49,7 +47,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
 
-      Process *process_impl;
+      Process *process_impl = 0;
       ACE_NEW_RETURN (process_impl,
                       Process (orb.in ()),
                       1);
diff --git a/tests/Client_Leaks/client.cpp b/tests/Client_Leaks/client.cpp
index 01e917895f6..c968b21002a 100644
--- a/tests/Client_Leaks/client.cpp
+++ b/tests/Client_Leaks/client.cpp
@@ -3,8 +3,6 @@
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Client_Leaks, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 int iterations = 100;
 int threads = 12;
@@ -41,7 +39,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Client_Leaks/server.cpp b/tests/Client_Leaks/server.cpp
index d2bd06b7e79..b748d79f4bb 100644
--- a/tests/Client_Leaks/server.cpp
+++ b/tests/Client_Leaks/server.cpp
@@ -4,8 +4,6 @@
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Client_Leaks, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -58,7 +56,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      Process_Factory *process_factory_impl;
+      Process_Factory *process_factory_impl = 0;
       ACE_NEW_RETURN (process_factory_impl,
                       Process_Factory (orb.in ()),
                       1);
diff --git a/tests/CodeSets/Makefile.am b/tests/CodeSets/Makefile.am
deleted file mode 100644
index 2ba3df85b6f..00000000000
--- a/tests/CodeSets/Makefile.am
+++ /dev/null
@@ -1,14 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        libs \
-        simple
-
diff --git a/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp b/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp
index d5dfd92b64d..88e1e62aa20 100644
--- a/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp
+++ b/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp
@@ -1,23 +1,20 @@
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CodeSets/libs/IBM1047_ISO8859
-//
-// = FILENAME
-//    Char_IBM1047_ISO8859_Factory.cpp
-//
-// = DESCRIPTION
-//    A tempate instantiation of the codeset translator factory from TAO. This
-//    one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII)
-//    translator.
-//
-// = AUTHORS
-//      Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Char_IBM1047_ISO8859_Factory.cpp
+ *
+ *  $Id$
+ *
+ *  A tempate instantiation of the codeset translator factory from TAO. This
+ *  one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII)
+ *  translator.
+ *
+ *
+ *  @author   Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 
 #include "Char_IBM1047_ISO8859_Factory.h"
 #include "ace/Log_Msg.h"
diff --git a/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h b/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h
index 9cf65339c52..16668f9d0cb 100644
--- a/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h
+++ b/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CodeSets/libs/IBM1047_ISO8859
-//
-// = FILENAME
-//    Char_IBM1047_ISO8859_Factory.h
-//
-// = DESCRIPTION
-//    A tempate instantiation of the codeset translator factory from TAO. This
-//    one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII)
-//    translator.
-//
-// = AUTHORS
-//      Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Char_IBM1047_ISO8859_Factory.h
+ *
+ *  $Id$
+ *
+ *  A tempate instantiation of the codeset translator factory from TAO. This
+ *  one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII)
+ *  translator.
+ *
+ *
+ *  @author   Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef CHAR_IBM1047_ISO8859_FACTORY_H
 #define CHAR_IBM1047_ISO8859_FACTORY_H
diff --git a/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp b/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
index 4c9d5479957..4c9b150d5b9 100644
--- a/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
+++ b/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
@@ -1,31 +1,24 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Char_IBM1047_ISO8859_Translator.cpp
-//
-// = DESCRIPTION
-//    Defines the arrays required to convert between ISO8859 (aka
-//    Latin/1) and IBM1047 (aka EBCDIC).
-//
-// = AUTHOR
-//    Jim Rogers (jrogers@viasoft.com)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Char_IBM1047_ISO8859_Translator.cpp
+ *
+ *  $Id$
+ *
+ *  Defines the arrays required to convert between ISO8859 (aka
+ *  Latin/1) and IBM1047 (aka EBCDIC).
+ *
+ *
+ *  @author Jim Rogers (jrogers@viasoft.com)
+ */
+//=============================================================================
+
 
 #include "Char_IBM1047_ISO8859_Translator.h"
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (IBM1047_ISO8859, 
-           Char_IBM1047_ISO8859_Translator, 
-           "$Id$")
-
 // ****************************************************************
 
 IBM1047_ISO8859::IBM1047_ISO8859 (void)
@@ -84,7 +77,7 @@ IBM1047_ISO8859::read_char_array (ACE_InputCDR& in,
                         ACE_CDR::OCTET_ALIGN,
                         len))
     {
-      for (ACE_CDR::ULong i = 0; i != len; ++i) 
+      for (ACE_CDR::ULong i = 0; i != len; ++i)
         {
           x[i] = (unsigned char)to_IBM1047[(unsigned char)x[i]];
         }
@@ -127,7 +120,7 @@ IBM1047_ISO8859::write_char_array (ACE_OutputCDR& out,
     {
       ACE_OS::memcpy (buf, x, len);
 
-      for (ACE_CDR::ULong i = 0; i != len; ++i) 
+      for (ACE_CDR::ULong i = 0; i != len; ++i)
         {
           buf[i] = (unsigned char)from_IBM1047[(unsigned char)buf[i]];
         }
diff --git a/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am b/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am
deleted file mode 100644
index 8ad94bd2def..00000000000
--- a/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am
+++ /dev/null
@@ -1,51 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CodeSets_libs_IMB1047_ISO8859.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libIBM1047_ISO8859.la
-
-libIBM1047_ISO8859_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DIBM1047_ISO8859_BUILD_DLL
-
-libIBM1047_ISO8859_la_SOURCES = \
-  Char_IBM1047_ISO8859_Factory.cpp \
-  Char_IBM1047_ISO8859_Translator.cpp \
-  Wchar_IBM1047_ISO8859_Factory.cpp \
-  Wchar_IBM1047_ISO8859_Translator.cpp
-
-noinst_HEADERS = \
-  Char_IBM1047_ISO8859_Factory.h \
-  Char_IBM1047_ISO8859_Translator.h \
-  IBM1047_ISO8859_export.h \
-  Wchar_IBM1047_ISO8859_Factory.h \
-  Wchar_IBM1047_ISO8859_Translator.h
-
-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/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp b/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp
index c395b202966..3f9a95a769d 100644
--- a/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp
+++ b/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp
@@ -1,24 +1,21 @@
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CodeSets/libs/IBM1047_ISO8859
-//
-// = FILENAME
-//    Wchar_IBM1047_ISO8859_Factory.cpp
-//
-// = DESCRIPTION
-//    A tempate instantiation of the codeset translator factory from TAO. This
-//    one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII)
-//    translator. In this case, wchars and wstrings are translated rather than
-//    strings and chars.
-//
-// = AUTHORS
-//      Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Wchar_IBM1047_ISO8859_Factory.cpp
+ *
+ *  $Id$
+ *
+ *  A tempate instantiation of the codeset translator factory from TAO. This
+ *  one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII)
+ *  translator. In this case, wchars and wstrings are translated rather than
+ *  strings and chars.
+ *
+ *
+ *  @author   Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 
 #include "Wchar_IBM1047_ISO8859_Factory.h"
 #include "ace/Log_Msg.h"
diff --git a/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h b/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h
index 520933dba9d..403aa8132ff 100644
--- a/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h
+++ b/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h
@@ -1,24 +1,21 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CodeSets/libs/IBM1047_ISO8859
-//
-// = FILENAME
-//    Wchar_IBM1047_ISO8859_Factory.cpp
-//
-// = DESCRIPTION
-//    A tempate instantiation of the codeset translator factory from TAO. This
-//    one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII)
-//    translator. In this case, wchars and wstrings are translated rather than
-//    strings and chars.
-//
-// = AUTHORS
-//      Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Wchar_IBM1047_ISO8859_Factory.h
+ *
+ *  $Id$
+ *
+ *  A tempate instantiation of the codeset translator factory from TAO. This
+ *  one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII)
+ *  translator. In this case, wchars and wstrings are translated rather than
+ *  strings and chars.
+ *
+ *
+ *  @author   Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 
 #ifndef WCHAR_IBM1047_ISO8859_FACTORY_H
 #define WCHAR_IBM1047_ISO8859_FACTORY_H
diff --git a/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp b/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp
index 7958ddbfa58..0a30896062e 100644
--- a/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp
+++ b/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp
@@ -1,26 +1,21 @@
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Wchar_IBM1047_ISO8859_Translator.cpp
-//
-// = DESCRIPTION
-//    Defines the arrays required to convert between ISO8859 (aka
-//    Latin/1) and IBM1047 (aka EBCDIC).
-//
-// = AUTHOR
-//    Mahesh Vedantam (mahesh@ociweb.com)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Wchar_IBM1047_ISO8859_Translator.cpp
+ *
+ *  $Id$
+ *
+ *  Defines the arrays required to convert between ISO8859 (aka
+ *  Latin/1) and IBM1047 (aka EBCDIC).
+ *
+ *
+ *  @author Mahesh Vedantam (mahesh@ociweb.com)
+ */
+//=============================================================================
 
-#include "Wchar_IBM1047_ISO8859_Translator.h"
 
-ACE_RCSID(IBM1047_ISO8859, Wchar_IBM1047_ISO8859_Translator, "$Id$")
+#include "Wchar_IBM1047_ISO8859_Translator.h"
 
 // ****************************************************************
 
diff --git a/tests/CodeSets/libs/Makefile.am b/tests/CodeSets/libs/Makefile.am
deleted file mode 100644
index 2afaafe47a3..00000000000
--- a/tests/CodeSets/libs/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        IBM1047_ISO8859 \
-        UCS4_UTF16 \
-        UTF16_UCS2
-
diff --git a/tests/CodeSets/libs/UCS4_UTF16/Makefile.am b/tests/CodeSets/libs/UCS4_UTF16/Makefile.am
deleted file mode 100644
index 5875d3dd899..00000000000
--- a/tests/CodeSets/libs/UCS4_UTF16/Makefile.am
+++ /dev/null
@@ -1,47 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.CodeSets_Libs_UCS4_UTF16.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libUCS4_UTF16.la
-
-libUCS4_UTF16_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DUCS4_UTF16_BUILD_DLL
-
-libUCS4_UTF16_la_SOURCES = \
-  WUCS4_UTF16.cpp \
-  WUCS4_UTF16_Factory.cpp
-
-noinst_HEADERS = \
-  WUCS4_UTF16.h \
-  WUCS4_UTF16_Factory.h \
-  WUCS4_UTF16_export.h
-
-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/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp b/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
index f63c6e541d3..c9eb43d47c2 100644
--- a/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
+++ b/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
@@ -1,27 +1,22 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    WUCS4_UTF16.cpp
-//
-// = DESCRIPTION
-//    Defines the arrays required to convert between UCS-4 a 4 byte wide char
-//    codeset, and UCS-16, aka unicode, a 2-byte codeset.
-//
-// = AUTHOR
-//    Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
 
-#include "WUCS4_UTF16.h"
-#include "ace/OS.h"
+//=============================================================================
+/**
+ *  @file    WUCS4_UTF16.cpp
+ *
+ *  $Id$
+ *
+ *  Defines the arrays required to convert between UCS-4 a 4 byte wide char
+ *  codeset, and UCS-16, aka unicode, a 2-byte codeset.
+ *
+ *
+ *  @author Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 
-ACE_RCSID(UCS4_UTF16, WUCS4_UTF16, "$Id$")
+#include "WUCS4_UTF16.h"
+#include "ace/OS_Memory.h"
 
 // ****************************************************************
 
@@ -500,7 +495,7 @@ WUCS4_UTF16::write_wstring (ACE_OutputCDR & cdr,
       ACE_UTF16_T bom = ACE_UNICODE_BOM_CORRECT;
       ACE_CDR::ULong length = len + count_potential_surrogates (x, len);
       ACE_CDR::ULong l = length * ACE_UTF16_CODEPOINT_SIZE;
-      
+
       if (this->write_4 (cdr, &l) && x != 0)
         {
           this->write_2 (cdr, &bom);
@@ -510,21 +505,21 @@ WUCS4_UTF16::write_wstring (ACE_OutputCDR & cdr,
   else
     {
       ACE_CDR::ULong l = len + 1;
-      
+
       if (this->write_4 (cdr, &l))
         {
           if (x != 0)
             {
               return this->write_wchar_array (cdr, x, len + 1);
             }
-          else 
+          else
             {
               ACE_UTF16_T s = 0;
               return this->write_2 (cdr, &s);
             }
         }
     }
-    
+
   return 0;
 }
 
@@ -582,7 +577,7 @@ WUCS4_UTF16::write_measured_wchar_array (ACE_OutputCDR & cdr,
       sbpos += encode_utf16 (& sb[sbpos], x[i]);
     }
 #if defined (ACE_ENABLE_SWAP_ON_WRITE)
-  // NOTE this will rarely be enabled.  See the comments in ace/OS.h
+  // @note this will rarely be enabled.
   if (cdr.do_byte_swap())
     {
       // note can't use swap_2_array because in-place swaps are not safe :-<
diff --git a/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp b/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp
index 17c3de41513..fa625d9c229 100644
--- a/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp
+++ b/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp
@@ -1,9 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "WUCS4_UTF16_Factory.h"
 
-ACE_RCSID(UCS4_UTF16, WUCS4_UTF16_Factory, "$Id$")
-
 ACE_STATIC_SVC_DEFINE (WUCS4_UTF16_Factory,
                        ACE_TEXT ("WUCS4_UTF16_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/tests/CodeSets/libs/UTF16_UCS2/Makefile.am b/tests/CodeSets/libs/UTF16_UCS2/Makefile.am
deleted file mode 100644
index 5f5c18e5ca4..00000000000
--- a/tests/CodeSets/libs/UTF16_UCS2/Makefile.am
+++ /dev/null
@@ -1,47 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.UTF16_UCS2_Translator.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libUTF16_UCS2.la
-
-libUTF16_UCS2_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DUTF16_UCS2_BUILD_DLL
-
-libUTF16_UCS2_la_SOURCES = \
-  UTF16_UCS2_Factory.cpp \
-  UTF16_UCS2_Translator.cpp
-
-noinst_HEADERS = \
-  UTF16_UCS2_Factory.h \
-  UTF16_UCS2_Translator.h \
-  UTF16_UCS2_export.h
-
-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/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.cpp b/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.cpp
index b532491333f..498630aa68c 100644
--- a/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.cpp
+++ b/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.cpp
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tao/Codesets/translators/UTF16_UCS2/
-//
-// = FILENAME
-//    UTF16_UCS2_Factory.cpp
-//
-// = DESCRIPTION
-//    A tempate instantiation of the codeset translator factory from TAO.
-//
-// = AUTHORS
-//      Byron Harris <harrisb@ociweb.com>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    UTF16_UCS2_Factory.cpp
+ *
+ *  $Id$
+ *
+ *  A tempate instantiation of the codeset translator factory from TAO.
+ *
+ *
+ *  @author   Byron Harris <harrisb@ociweb.com>
+ */
+//=============================================================================
+
 
 #include "UTF16_UCS2_Factory.h"
 
diff --git a/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.h b/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.h
index 3cc382fd3f7..84751e78266 100644
--- a/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.h
+++ b/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.h
@@ -1,22 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CodeSets/translators/UTF16_UCS2
-//
-// = FILENAME
-//    UTF16_UCS2_Factory.cpp
-//
-// = DESCRIPTION
-//    A tempate instantiation of a codeset translator factory from TAO. This
-//    loads the UTF16_UCS2_Translator.
-//
-// = AUTHORS
-//      Byron Harris <harrisb@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    UTF16_UCS2_Factory.h
+ *
+ *  $Id$
+ *
+ *  A tempate instantiation of a codeset translator factory from TAO. This
+ *  loads the UTF16_UCS2_Translator.
+ *
+ *
+ *  @author   Byron Harris <harrisb@ociweb.com>
+ */
+//=============================================================================
 
 #ifndef UTF16_UCS2_FACTORY_H
 #define UTF16_UCS2_FACTORY_H
diff --git a/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp b/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp
index 63fd91f1acb..0c01c8d314d 100644
--- a/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp
+++ b/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp
@@ -1,35 +1,31 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    UTF16_UCS2
-//
-// = FILENAME
-//    UTF16_UCS2_Translator.cpp
-//
-// = DESCRIPTION
-//    Defines the arrays required to convert between UCS-2, a 2 byte wide char
-//    codeset, and UCS-16, aka unicode, a 2-byte codeset. As a bit-pattern
-//    these two should be identical, with the exception that UCS-2 cannot
-//    certain characters that UTF16 can, using escape codepoints.
-//
-//    This translator can be dynamically loaded into TAO at run-time using
-//    a service configurator file with the following contents:
-//
-//    dynamic UTF16_UCS2_Factory Service_Object * UTF16_UCS2:_make_UTF16_UCS2_Factory ()
-//
-//    static Resource_Factory
-//      "-ORBWCharCodesetTranslator UTF16_UCS2_Factory"
-//
-//    This code used UTF16_BOM_Translator as a starting point.
-//
-// = AUTHOR
-//    Iliyan Jeliazkov <jeliazkov_i@ociweb.com>
-//    Byron Harris <harrisb@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    UTF16_UCS2_Translator.cpp
+ *
+ *  $Id$
+ *
+ *  Defines the arrays required to convert between UCS-2, a 2 byte wide char
+ *  codeset, and UCS-16, aka unicode, a 2-byte codeset. As a bit-pattern
+ *  these two should be identical, with the exception that UCS-2 cannot
+ *  certain characters that UTF16 can, using escape codepoints.
+ *
+ *  This translator can be dynamically loaded into TAO at run-time using
+ *  a service configurator file with the following contents:
+ *
+ *  dynamic UTF16_UCS2_Factory Service_Object * UTF16_UCS2:_make_UTF16_UCS2_Factory ()
+ *
+ *  static Resource_Factory
+ *    "-ORBWCharCodesetTranslator UTF16_UCS2_Factory"
+ *
+ *  This code used UTF16_BOM_Translator as a starting point.
+ *
+ *
+ *  @author Iliyan Jeliazkov <jeliazkov_i@ociweb.com> Byron Harris <harrisb@ociweb.com>
+ */
+//=============================================================================
+
 #include "UTF16_UCS2_Translator.h"
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
@@ -276,7 +272,7 @@ UTF16_UCS2_Translator::write_wstring (ACE_OutputCDR & cdr,
     {
       // pre GIOP 1.2:  include null terminator in length
       ACE_CDR::ULong l = len + 1;
-      
+
       if (this->write_4 (cdr, &l))
         {
           if (x != 0)
diff --git a/tests/CodeSets/simple/Makefile.am b/tests/CodeSets/simple/Makefile.am
deleted file mode 100644
index 90ea5ee967f..00000000000
--- a/tests/CodeSets/simple/Makefile.am
+++ /dev/null
@@ -1,103 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CodeSets_Simple_Idl.am
-
-BUILT_SOURCES = \
-  simpleC.cpp \
-  simpleC.h \
-  simpleC.inl \
-  simpleS.cpp \
-  simpleS.h \
-  simpleS.inl
-
-CLEANFILES = \
-  simple-stamp \
-  simpleC.cpp \
-  simpleC.h \
-  simpleC.inl \
-  simpleS.cpp \
-  simpleS.h \
-  simpleS.inl
-
-simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl: simple-stamp
-
-simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple.idl
-	@touch $@
-
-noinst_HEADERS = \
-  simple.idl
-
-## Makefile.CodeSets_Simple_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  simpleC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CodeSets_Simple_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  simpleC.cpp \
-  simpleS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/CodeSets/simple/client.cpp b/tests/CodeSets/simple/client.cpp
index 217c0237b86..e3c2e1479cc 100644
--- a/tests/CodeSets/simple/client.cpp
+++ b/tests/CodeSets/simple/client.cpp
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CodeSets/simple
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//   A simple client to demonstrate the use of codeset translation
-//
-// = AUTHORS
-//      Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ * A simple client to demonstrate the use of codeset translation
+ *
+ *
+ *  @author   Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
+
 // IDL generated headers
 #include "simpleC.h"
 #include "ace/ace_wchar.h"
diff --git a/tests/CodeSets/simple/cs_test.conf b/tests/CodeSets/simple/cs_test.conf
index 23ef7b518ca..5fa6f6677f5 100644
--- a/tests/CodeSets/simple/cs_test.conf
+++ b/tests/CodeSets/simple/cs_test.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 #First, load the appropriate codeset translator factories
 dynamic Char_IBM1047_ISO8859_Factory Service_Object * IBM1047_ISO8859:_make_Char_IBM1047_ISO8859_Factory ()
 
diff --git a/tests/CodeSets/simple/server.cpp b/tests/CodeSets/simple/server.cpp
index 538f5ac20bd..47e9ed03870 100644
--- a/tests/CodeSets/simple/server.cpp
+++ b/tests/CodeSets/simple/server.cpp
@@ -1,21 +1,17 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CodeSets/simple
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//    A simple client to demonstrate the use of codeset translation
-//
-// = AUTHORS
-//    Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  A simple server to demonstrate the use of codeset translation
+ *
+ *
+ *  @author Phil Mesnier <mesnier_p@ociweb.com>
+ */
+//=============================================================================
 
 // IDL generated header
 #include "simpleS.h"
@@ -50,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/CodeSets/simple/svc.conf b/tests/CodeSets/simple/svc.conf
index 6c80b23f6c6..431138a0b25 100644
--- a/tests/CodeSets/simple/svc.conf
+++ b/tests/CodeSets/simple/svc.conf
@@ -1 +1,3 @@
+# $Id$
+
 static Resource_Factory "-ORBNativeWcharCodeSet 0x00010001"
diff --git a/tests/CodeSets/simple/wcs_test.conf b/tests/CodeSets/simple/wcs_test.conf
index e2b83033d3e..68de1f76e8f 100644
--- a/tests/CodeSets/simple/wcs_test.conf
+++ b/tests/CodeSets/simple/wcs_test.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 #First, load the appropriate codeset translator factories
 dynamic Char_IBM1047_ISO8859_Factory Service_Object * IBM1047_ISO8859:_make_Char_IBM1047_ISO8859_Factory () ""
 
diff --git a/tests/Codec/Makefile.am b/tests/Codec/Makefile.am
deleted file mode 100644
index 07994d5bc42..00000000000
--- a/tests/Codec/Makefile.am
+++ /dev/null
@@ -1,76 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Codec_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/tests/Codec/client.cpp b/tests/Codec/client.cpp
index f4f33f4fd41..a884ba63952 100644
--- a/tests/Codec/client.cpp
+++ b/tests/Codec/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/CodecFactory/CodecFactory.h"
 #include "tao/Codeset/Codeset.h"
@@ -7,10 +8,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Codec,
-           client,
-           "$Id$")
-
 CORBA::WChar *
 gen_wstring (CORBA::ULong max_length)
 {
@@ -81,7 +78,7 @@ test_codec (IOP::Codec_ptr codec)
   const CORBA::Long B = -3427;
   const CORBA::ULongLong C = ACE_UINT64_LITERAL (2001);
   const CORBA::Char D[] = "I'm Batman.";
-  const CORBA::WChar* E = gen_wstring (25);
+  CORBA::WChar* E = gen_wstring (25);
 
   // Create the structure to be encoded.
   Foo::Bar value;
@@ -91,6 +88,8 @@ test_codec (IOP::Codec_ptr codec)
   value.D = CORBA::string_dup (D);
   value.E = CORBA::wstring_dup (E);
 
+  CORBA::wstring_free (E);
+
   CORBA::Any data;
   data <<= value;
 
diff --git a/tests/Collocated_Forwarding/Makefile.am b/tests/Collocated_Forwarding/Makefile.am
deleted file mode 100644
index 5e140475483..00000000000
--- a/tests/Collocated_Forwarding/Makefile.am
+++ /dev/null
@@ -1,93 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Collocated_Forwarding_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gd -Sorb $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Collocated_Forwarding_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Collocated_Forwarding/Server_ORBInitializer.cpp b/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
index 76548d1dc1f..ea9486a45f6 100644
--- a/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
+++ b/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
@@ -1,12 +1,9 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_ORBInitializer.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (Collocated_Forwarding,
-           Server_ORBInitializer,
-           "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "Server_Request_Interceptor.h"
diff --git a/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp b/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
index 409984578b0..784f8b14f8b 100644
--- a/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
+++ b/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_Request_Interceptor.h"
 #include "tao/PI_Server/PI_Server.h"
@@ -6,12 +7,6 @@
 #include "tao/CDR.h"
 #include "testS.h"
 
-ACE_RCSID (Collocated_Forwarding,
-           Server_Request_Interceptor,
-           "$Id$")
-
-//static const CORBA::ULong expected_version = 5;
-
 Server_Request_Interceptor::Server_Request_Interceptor (CORBA::ULong request_pass_count)
   : request_pass_count_ (request_pass_count)
   , request_count_ (0)
diff --git a/tests/Collocated_Forwarding/server.cpp b/tests/Collocated_Forwarding/server.cpp
index 00b58854c2d..0fbf6222830 100644
--- a/tests/Collocated_Forwarding/server.cpp
+++ b/tests/Collocated_Forwarding/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
@@ -11,10 +12,6 @@
 #include "tao/IORManipulation/IORManipulation.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Collocated_Forwarding,
-           server,
-           "$Id$")
-
 const CORBA::ULong passes_before_forward = 6;
 
 bool direct_collocation = false;
diff --git a/tests/Collocated_Forwarding/test_i.cpp b/tests/Collocated_Forwarding/test_i.cpp
index a76b0fb8cff..fb70256f103 100644
--- a/tests/Collocated_Forwarding/test_i.cpp
+++ b/tests/Collocated_Forwarding/test_i.cpp
@@ -1,12 +1,9 @@
+// $Id$
 // -*- C++ -*-
 
 #include "test_i.h"
 #include "tao/PortableServer/ForwardRequestC.h"
 
-ACE_RCSID (Collocated_Forwarding,
-           test_i,
-           "$Id$")
-
 test_i::test_i (CORBA::Short id,
                 bool direct,
                 CORBA::ORB_ptr orb)
diff --git a/tests/Collocation/Collocation.cpp b/tests/Collocation/Collocation.cpp
index 2f59a551dfb..8c5a05ae53f 100644
--- a/tests/Collocation/Collocation.cpp
+++ b/tests/Collocation/Collocation.cpp
@@ -3,8 +3,6 @@
 #include "Collocation_Tester.h"
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Collocation, main, "$Id$")
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
diff --git a/tests/Collocation/Collocation_Tester.h b/tests/Collocation/Collocation_Tester.h
index 180dbf6958d..025f0398008 100644
--- a/tests/Collocation/Collocation_Tester.h
+++ b/tests/Collocation/Collocation_Tester.h
@@ -1,18 +1,17 @@
-// $Id$
-
-//============================================================================
-//
-//  = FILENAME
-//     Collocation_Test.h
-//
-//  = DESCRIPTION
-//     Server class to perform testing of TAO's collocation mechanism.
-//
-//  = AUTHOR
-//     Nanbor Wang
-//
+
+//=============================================================================
+/**
+ *  @file     Collocation_Tester.h
+ *
+ *  $Id$
+ *
+ *   Server class to perform testing of TAO's collocation mechanism.
+ *
+ *  @author  Nanbor Wang
+ */
 //=============================================================================
 
+
 #if !defined (TAO_COLLOCATION_TEST_H)
 #define TAO_COLLOCATION_TEST_H
 
@@ -22,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-
 class Collocation_Test
 {
 public:
@@ -31,18 +28,18 @@ public:
 
   void shutdown (void);
 
+  /// Initializing the Collocation_Test object.
   int init (int argc, ACE_TCHAR *argv[]);
-  // Initializing the Collocation_Test object.
 
+  /// Parse the test specific arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
-  // Parse the test specific arguments.
 
+  /// This test narrow an object reference to its base class and see
+  /// if it works correctly.
   int test_narrow (void);
-  // This test narrow an object reference to its base class and see
-  // if it works correctly.
 
+  /// Run the test.
   int run (void);
-  // Run the test.
 
 private:
   CORBA::ORB_var orb_;
@@ -51,14 +48,14 @@ private:
 
   PortableServer::POAManager_var poa_manager_;
 
+  /// Our basic test object.
   CORBA::Object_var diamond_obj_;
-  // Our basic test object.
 
+  /// A collection of servant for basic narrowing test.
   Top_i top_servant_;
   Left_i left_servant_;
   Right_i right_servant_;
   Buttom_i diamond_servant_;
-  // A collection of servant for basic narrowing test.
 };
 
 #endif /* TAO_COLLOCATION_TEST_H */
diff --git a/tests/Collocation/Makefile.am b/tests/Collocation/Makefile.am
deleted file mode 100644
index ca58242f820..00000000000
--- a/tests/Collocation/Makefile.am
+++ /dev/null
@@ -1,131 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_LTLIBRARIES =
-
-## Makefile.Collocation_Idl.am
-
-BUILT_SOURCES = \
-  DiamondC.cpp \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.cpp \
-  DiamondS.h \
-  DiamondS.inl
-
-CLEANFILES = \
-  Diamond-stamp \
-  DiamondC.cpp \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.cpp \
-  DiamondS.h \
-  DiamondS.inl
-
-DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp
-
-Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd -St -Sa $(srcdir)/Diamond.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Diamond.idl
-
-## Makefile.Collocation_Test_Stub.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES += libCollocation_Test_Stub.la
-
-libCollocation_Test_Stub_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DMY_STUB_BUILD_DLL
-
-libCollocation_Test_Stub_la_SOURCES = \
-  DiamondC.cpp
-
-noinst_HEADERS += \
-  Collocation_Tester.h \
-  Diamond_i.h \
-  diamond_export.h \
-  stub_export.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Collocation_Diamond.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES += libCollocation_Diamond.la
-
-libCollocation_Diamond_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DDIAMOND_BUILD_DLL
-
-libCollocation_Diamond_la_SOURCES = \
-  DiamondS.cpp \
-  Diamond_i.cpp
-
-noinst_HEADERS += \
-  Diamond_i.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Collocation_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Collocation
-
-Collocation_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocation_SOURCES = \
-  Collocation.cpp \
-  Collocation_Tester.cpp \
-  Collocation_Tester.h
-
-Collocation_LDADD = \
-  libCollocation_Test_Stub.la \
-  libCollocation_Diamond.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Collocation/svc.conf b/tests/Collocation/svc.conf
index 285b1297bd4..826ce10d8f7 100644
--- a/tests/Collocation/svc.conf
+++ b/tests/Collocation/svc.conf
@@ -8,7 +8,7 @@ static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocato
 
 # Make sure we use RW client handler so if something goes wrong, the program will bloc,
 # i.e., won't work.
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
 
 # Not absolutely necessary for this test, but we add it for fun.
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null"
+static Server_Strategy_Factory "-ORBConcurrency reactive"
diff --git a/tests/Collocation/svc.conf.xml b/tests/Collocation/svc.conf.xml
index 36246c69725..f5c0a307879 100644
--- a/tests/Collocation/svc.conf.xml
+++ b/tests/Collocation/svc.conf.xml
@@ -9,7 +9,7 @@
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"/>
  <!--  Make sure we use RW client handler so if something goes wrong, the program will bloc, -->
  <!--  i.e., won't work. -->
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
  <!--  Not absolutely necessary for this test, but we add it for fun. -->
- <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive -ORBPOALock null"/>
+ <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive"/>
 </ACE_Svc_Conf>
diff --git a/tests/CollocationLockup/Makefile.am b/tests/CollocationLockup/Makefile.am
deleted file mode 100644
index 2c825426ada..00000000000
--- a/tests/CollocationLockup/Makefile.am
+++ /dev/null
@@ -1,130 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.CollocationLockup_Idl.am
-
-BUILT_SOURCES = \
-  ABC.cpp \
-  ABC.h \
-  ABC.inl \
-  ABS.cpp \
-  ABS.h \
-  ABS.inl
-
-CLEANFILES = \
-  AB-stamp \
-  ABC.cpp \
-  ABC.h \
-  ABC.inl \
-  ABS.cpp \
-  ABS.h \
-  ABS.inl
-
-ABC.cpp ABC.h ABC.inl ABS.cpp ABS.h ABS.inl: AB-stamp
-
-AB-stamp: $(srcdir)/AB.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/AB.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  SimpleNamingServiceC.cpp \
-  SimpleNamingServiceC.h \
-  SimpleNamingServiceC.inl \
-  SimpleNamingServiceS.cpp \
-  SimpleNamingServiceS.h \
-  SimpleNamingServiceS.inl
-
-CLEANFILES += \
-  SimpleNamingService-stamp \
-  SimpleNamingServiceC.cpp \
-  SimpleNamingServiceC.h \
-  SimpleNamingServiceC.inl \
-  SimpleNamingServiceS.cpp \
-  SimpleNamingServiceS.h \
-  SimpleNamingServiceS.inl
-
-SimpleNamingServiceC.cpp SimpleNamingServiceC.h SimpleNamingServiceC.inl SimpleNamingServiceS.cpp SimpleNamingServiceS.h SimpleNamingServiceS.inl: SimpleNamingService-stamp
-
-SimpleNamingService-stamp: $(srcdir)/SimpleNamingService.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/SimpleNamingService.idl
-	@touch $@
-
-noinst_HEADERS = \
-  AB.idl \
-  SimpleNamingService.idl
-
-## Makefile.CollocationLockup.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += CollocationLockup
-
-CollocationLockup_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-CollocationLockup_SOURCES = \
-  ABC.cpp \
-  ABS.cpp \
-  CollocationLockup.cpp \
-  SimpleNamingServiceC.cpp
-
-CollocationLockup_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.CollocationLockup_SimpleNamingService.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += SimpleNamingService
-
-SimpleNamingService_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-SimpleNamingService_SOURCES = \
-  SimpleNamingService.cpp \
-  SimpleNamingServiceC.cpp \
-  SimpleNamingServiceS.cpp
-
-SimpleNamingService_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/CollocationLockup/SimpleNamingService.cpp b/tests/CollocationLockup/SimpleNamingService.cpp
index 8cf3656ab17..828b3f6082b 100644
--- a/tests/CollocationLockup/SimpleNamingService.cpp
+++ b/tests/CollocationLockup/SimpleNamingService.cpp
@@ -101,7 +101,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Collocation_Exception_Test/Client_Task.cpp b/tests/Collocation_Exception_Test/Client_Task.cpp
index 5ce1ca97e70..49606c9134d 100644
--- a/tests/Collocation_Exception_Test/Client_Task.cpp
+++ b/tests/Collocation_Exception_Test/Client_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(Collocation_Oneway_Tests, Client_Task, "$Id$")
-
 Client_Task::Client_Task (const ACE_TCHAR *ior,
                           CORBA::ORB_ptr corb,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/tests/Collocation_Exception_Test/Collocated_Test.cpp b/tests/Collocation_Exception_Test/Collocated_Test.cpp
index 5cb8e4450f3..b04daa281e7 100644
--- a/tests/Collocation_Exception_Test/Collocated_Test.cpp
+++ b/tests/Collocation_Exception_Test/Collocated_Test.cpp
@@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         // This is a hack but that is okay!
         return 0;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Collocation_Exception_Test/Hello.cpp b/tests/Collocation_Exception_Test/Hello.cpp
index 53b174e7c1e..36b16d486c8 100644
--- a/tests/Collocation_Exception_Test/Hello.cpp
+++ b/tests/Collocation_Exception_Test/Hello.cpp
@@ -6,8 +6,6 @@
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
 
-ACE_RCSID(Collocation_Oneway_Tests, Hello, "$Id$")
-
   Hello::Hello (CORBA::ORB_ptr orb,
               ACE_thread_t thrid)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/tests/Collocation_Exception_Test/Hello.h b/tests/Collocation_Exception_Test/Hello.h
index 3fef01855b0..4f4b64b9646 100644
--- a/tests/Collocation_Exception_Test/Hello.h
+++ b/tests/Collocation_Exception_Test/Hello.h
@@ -13,8 +13,6 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-#include "ace/OS.h"
-
 /// Implement the Test::Hello interface
 class Hello
   : public virtual POA_Test::Hello
diff --git a/tests/Collocation_Exception_Test/Makefile.am b/tests/Collocation_Exception_Test/Makefile.am
deleted file mode 100644
index 7273e7f0ff4..00000000000
--- a/tests/Collocation_Exception_Test/Makefile.am
+++ /dev/null
@@ -1,84 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Collocation_Excep_Test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocated_Test
-
-Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Collocation_Exception_Test/Server_Task.cpp b/tests/Collocation_Exception_Test/Server_Task.cpp
index ea5496296a4..d1192e1964c 100644
--- a/tests/Collocation_Exception_Test/Server_Task.cpp
+++ b/tests/Collocation_Exception_Test/Server_Task.cpp
@@ -1,17 +1,10 @@
-//
 // $Id$
-//
 #include "Server_Task.h"
 #include "TestS.h"
 #include "Hello.h"
 
 #include "ace/Manual_Event.h"
 
-ACE_RCSID(Collocation_Oneway_Tests,
-          Server_Task,
-          "$Id$")
-
-
 Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
diff --git a/tests/Collocation_Oneway_Tests/Client_Task.cpp b/tests/Collocation_Oneway_Tests/Client_Task.cpp
index 8d4f66f76ca..60def11ca92 100644
--- a/tests/Collocation_Oneway_Tests/Client_Task.cpp
+++ b/tests/Collocation_Oneway_Tests/Client_Task.cpp
@@ -7,8 +7,6 @@
 #include "Client_Task.h"
 #include "TestC.h"
 
-ACE_RCSID(Collocation_Oneway_Tests, Client_Task, "$Id$")
-
 Client_Task::Client_Task (const ACE_TCHAR *ior,
                           CORBA::ORB_ptr corb,
                           Client_Task::ClientSyncModeEnum syncMode,
diff --git a/tests/Collocation_Oneway_Tests/Collocated_Test.cpp b/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
index 4de9593aa3c..ee2e5374ba8 100644
--- a/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
+++ b/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
@@ -63,7 +63,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         // This is a hack but that is okay!
         return 0;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Collocation_Oneway_Tests/Hello.cpp b/tests/Collocation_Oneway_Tests/Hello.cpp
index 41679d5a852..921f90448bc 100644
--- a/tests/Collocation_Oneway_Tests/Hello.cpp
+++ b/tests/Collocation_Oneway_Tests/Hello.cpp
@@ -6,9 +6,7 @@
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
 
-ACE_RCSID(Collocation_Oneway_Tests, Hello, "$Id$")
-
-  Hello::Hello (CORBA::ORB_ptr orb,
+Hello::Hello (CORBA::ORB_ptr orb,
               ACE_thread_t thrid)
   : orb_ (CORBA::ORB::_duplicate (orb))
     , thr_id_ (thrid)
diff --git a/tests/Collocation_Oneway_Tests/Hello.h b/tests/Collocation_Oneway_Tests/Hello.h
index 8bc4edf7d76..afd234e120e 100644
--- a/tests/Collocation_Oneway_Tests/Hello.h
+++ b/tests/Collocation_Oneway_Tests/Hello.h
@@ -13,8 +13,6 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-#include "ace/OS.h"
-
 /// Implement the Test::Hello interface
 class Hello
   : public virtual POA_Test::Hello
diff --git a/tests/Collocation_Oneway_Tests/Makefile.am b/tests/Collocation_Oneway_Tests/Makefile.am
deleted file mode 100644
index bce8b83c0a1..00000000000
--- a/tests/Collocation_Oneway_Tests/Makefile.am
+++ /dev/null
@@ -1,90 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Collocation_Oneway_Tests.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocated_Test
-
-Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Collocation_Oneway_Tests/Server_Task.cpp b/tests/Collocation_Oneway_Tests/Server_Task.cpp
index 94c63039df9..d2a0bdaecb4 100644
--- a/tests/Collocation_Oneway_Tests/Server_Task.cpp
+++ b/tests/Collocation_Oneway_Tests/Server_Task.cpp
@@ -7,11 +7,6 @@
 
 #include "ace/Manual_Event.h"
 
-ACE_RCSID(Collocation_Oneway_Tests,
-          Server_Task,
-          "$Id$")
-
-
 Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
diff --git a/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
index df34a81f5cb..eec18639103 100644
--- a/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
+++ b/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
@@ -6,8 +6,6 @@
 #include "tao/PortableServer/POA_Current.h"
 #include "tao/PortableServer/POA_Current_Impl.h"
 
-ACE_RCSID(Collocation_Opportunities, Collocation_Opportunities, "$Id$")
-
 class test_i :
   public POA_test
 {
diff --git a/tests/Collocation_Opportunities/Makefile.am b/tests/Collocation_Opportunities/Makefile.am
deleted file mode 100644
index ce280245b4a..00000000000
--- a/tests/Collocation_Opportunities/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Collocation_Opportunities.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocation_Opportunities
-
-Collocation_Opportunities_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocation_Opportunities_SOURCES = \
-  Collocation_Opportunities.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Collocation_Opportunities_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Collocation_Opportunities/svc.conf b/tests/Collocation_Opportunities/svc.conf
index 6e589381660..73d9e3ccee4 100644
--- a/tests/Collocation_Opportunities/svc.conf
+++ b/tests/Collocation_Opportunities/svc.conf
@@ -1 +1,3 @@
+# $Id$
+
 static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
diff --git a/tests/Collocation_Tests/Client_Task.cpp b/tests/Collocation_Tests/Client_Task.cpp
index ea7315e7d77..e39e0d96191 100644
--- a/tests/Collocation_Tests/Client_Task.cpp
+++ b/tests/Collocation_Tests/Client_Task.cpp
@@ -5,8 +5,6 @@
 #include "Client_Task.h"
 #include "TestC.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (const ACE_TCHAR *ior,
                           CORBA::ORB_ptr corb,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/tests/Collocation_Tests/Collocated_Test.cpp b/tests/Collocation_Tests/Collocated_Test.cpp
index 3e3b278ebed..282295ad5e3 100644
--- a/tests/Collocation_Tests/Collocated_Test.cpp
+++ b/tests/Collocation_Tests/Collocated_Test.cpp
@@ -36,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         // This is a hack but that is okay!
         return 0;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Collocation_Tests/Hello.cpp b/tests/Collocation_Tests/Hello.cpp
index a0740830551..cabcd9145d9 100644
--- a/tests/Collocation_Tests/Hello.cpp
+++ b/tests/Collocation_Tests/Hello.cpp
@@ -6,8 +6,6 @@
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
   Hello::Hello (CORBA::ORB_ptr orb,
               ACE_thread_t thrid)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/tests/Collocation_Tests/Hello.h b/tests/Collocation_Tests/Hello.h
index 556409e5d00..1d5e27d075f 100644
--- a/tests/Collocation_Tests/Hello.h
+++ b/tests/Collocation_Tests/Hello.h
@@ -8,8 +8,6 @@
 
 #include "TestS.h"
 
-#include "ace/OS.h"
-
 /// Implement the Test::Hello interface
 class Hello
   : public virtual POA_Test::Hello
diff --git a/tests/Collocation_Tests/Makefile.am b/tests/Collocation_Tests/Makefile.am
deleted file mode 100644
index c79c256f1fe..00000000000
--- a/tests/Collocation_Tests/Makefile.am
+++ /dev/null
@@ -1,84 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Collocation_Tests.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocated_Test
-
-Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Collocation_Tests/Server_Task.cpp b/tests/Collocation_Tests/Server_Task.cpp
index 03f568c7472..98f37e052e3 100644
--- a/tests/Collocation_Tests/Server_Task.cpp
+++ b/tests/Collocation_Tests/Server_Task.cpp
@@ -7,11 +7,6 @@
 
 #include "ace/Manual_Event.h"
 
-ACE_RCSID(Collocated_Test,
-          Server_Task,
-          "$Id$")
-
-
 Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
diff --git a/tests/Compression/Makefile.am b/tests/Compression/Makefile.am
deleted file mode 100644
index 91112abd666..00000000000
--- a/tests/Compression/Makefile.am
+++ /dev/null
@@ -1,55 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Compression_Test_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_ZLIB
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_ZLIB_CPPFLAGS)
-
-server_SOURCES = \
-  server.cpp
-
-server_LDFLAGS = \
- $(ACE_ZLIB_LDFLAGS)
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ZlibCompressor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Compression.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_ZLIB_LIBS)
-
-endif BUILD_ZLIB
-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/tests/Compression/bzip2server.cpp b/tests/Compression/bzip2server.cpp
index 79cf5feb27c..2fefc02091e 100644
--- a/tests/Compression/bzip2server.cpp
+++ b/tests/Compression/bzip2server.cpp
@@ -6,10 +6,6 @@
 #include "tao/Compression/Compression.h"
 #include "tao/Compression/bzip2/Bzip2Compressor_Factory.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 bool
 test_invalid_compression_factory (Compression::CompressionManager_ptr cm)
 {
diff --git a/tests/Compression/lzoserver.cpp b/tests/Compression/lzoserver.cpp
index 735e14d7c30..767aa44933d 100644
--- a/tests/Compression/lzoserver.cpp
+++ b/tests/Compression/lzoserver.cpp
@@ -6,10 +6,6 @@
 #include "tao/Compression/Compression.h"
 #include "tao/Compression/lzo/LzoCompressor_Factory.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 bool
 test_invalid_compression_factory (Compression::CompressionManager_ptr cm)
 {
diff --git a/tests/Compression/zlibserver.cpp b/tests/Compression/zlibserver.cpp
index bdd9c164380..e6f69de9958 100644
--- a/tests/Compression/zlibserver.cpp
+++ b/tests/Compression/zlibserver.cpp
@@ -6,10 +6,6 @@
 #include "tao/Compression/Compression.h"
 #include "tao/Compression/zlib/ZlibCompressor_Factory.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 bool
 test_invalid_compression_factory (Compression::CompressionManager_ptr cm)
 {
@@ -175,7 +171,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (!test_compression (5, manager.in ()))
         retval = 1;
-      
+
 
       if (!test_invalid_compression_factory (manager.in ()))
         retval = 1;
diff --git a/tests/Connect_Strategy_Test/Hello.cpp b/tests/Connect_Strategy_Test/Hello.cpp
index eabcfbe8db7..0f62f20b906 100644
--- a/tests/Connect_Strategy_Test/Hello.cpp
+++ b/tests/Connect_Strategy_Test/Hello.cpp
@@ -3,9 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Connect_Strategy_Test,
-          Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Connect_Strategy_Test/Makefile.am b/tests/Connect_Strategy_Test/Makefile.am
deleted file mode 100644
index 9ed011a782d..00000000000
--- a/tests/Connect_Strategy_Test/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Connect_Strategy_Test_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Connect_Strategy_Test_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Connect_Strategy_Test_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Connect_Strategy_Test/client.cpp b/tests/Connect_Strategy_Test/client.cpp
index cf593a590bc..ca86ad002ba 100644
--- a/tests/Connect_Strategy_Test/client.cpp
+++ b/tests/Connect_Strategy_Test/client.cpp
@@ -3,10 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Connect_Strategy_Test,
-          client,
-          "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int do_shutdown = 0;
 int
@@ -34,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Connect_Strategy_Test/server.cpp b/tests/Connect_Strategy_Test/server.cpp
index 701f036d466..ab19d0fb0a7 100644
--- a/tests/Connect_Strategy_Test/server.cpp
+++ b/tests/Connect_Strategy_Test/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Connect_Strategy_Test,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Connection_Failure/Makefile.am b/tests/Connection_Failure/Makefile.am
deleted file mode 100644
index a2a6971f68f..00000000000
--- a/tests/Connection_Failure/Makefile.am
+++ /dev/null
@@ -1,73 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Connection_Failure_Client.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_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/tests/Connection_Failure/client.cpp b/tests/Connection_Failure/client.cpp
index 41012833ee6..0f33ce2fa4e 100644
--- a/tests/Connection_Failure/client.cpp
+++ b/tests/Connection_Failure/client.cpp
@@ -5,10 +5,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Connection_Failure,
-           client,
-           "$Id$")
-
 const char *ior =
   "corbaloc:iiop:192.3.47/10007/RandomObject";
 
diff --git a/tests/Connection_Purging/Makefile.am b/tests/Connection_Purging/Makefile.am
deleted file mode 100644
index a2b1c6208b2..00000000000
--- a/tests/Connection_Purging/Makefile.am
+++ /dev/null
@@ -1,112 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Connection_Purging_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Connection_Purging_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Connection_Purging_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/tests/Connection_Purging/client.cpp b/tests/Connection_Purging/client.cpp
index a4657c52a7a..a9e2ea6951b 100644
--- a/tests/Connection_Purging/client.cpp
+++ b/tests/Connection_Purging/client.cpp
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Connection_Purging/server.cpp b/tests/Connection_Purging/server.cpp
index 37e1db87cb3..dbc357a6378 100644
--- a/tests/Connection_Purging/server.cpp
+++ b/tests/Connection_Purging/server.cpp
@@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                            -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Connection_Timeout/Makefile.am b/tests/Connection_Timeout/Makefile.am
deleted file mode 100644
index b053424045e..00000000000
--- a/tests/Connection_Timeout/Makefile.am
+++ /dev/null
@@ -1,83 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Connection_Timeout_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Connection_Timeout/client.cpp b/tests/Connection_Timeout/client.cpp
index 81e0bae0828..23465cdc223 100644
--- a/tests/Connection_Timeout/client.cpp
+++ b/tests/Connection_Timeout/client.cpp
@@ -6,8 +6,6 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(Connection_Timeout, client, "$Id$")
-
 const ACE_TCHAR *ior =
   ACE_TEXT("corbaloc:iiop:192.3.47/10007/RandomObject");
 
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Crash_On_Write/Crash_Task.cpp b/tests/Crash_On_Write/Crash_Task.cpp
index 1c3528b7a99..98bfa8fc189 100644
--- a/tests/Crash_On_Write/Crash_Task.cpp
+++ b/tests/Crash_On_Write/Crash_Task.cpp
@@ -5,8 +5,6 @@
 #include "Crash_Task.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Crash_On_Write, Crash_Task, "$Id$")
-
 Crash_Task::Crash_Task (ACE_Thread_Manager *thr_mgr,
                         const ACE_Time_Value &running_time)
   : ACE_Task_Base (thr_mgr)
diff --git a/tests/Crash_On_Write/Makefile.am b/tests/Crash_On_Write/Makefile.am
deleted file mode 100644
index e8964571017..00000000000
--- a/tests/Crash_On_Write/Makefile.am
+++ /dev/null
@@ -1,108 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Crash_On_Write_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Crash_On_Write_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Crash_Task.h \
-  Oneway_Receiver.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Crash_On_Write_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Crash_Task.cpp \
-  Oneway_Receiver.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Crash_Task.h \
-  Oneway_Receiver.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Crash_On_Write/Oneway_Receiver.cpp b/tests/Crash_On_Write/Oneway_Receiver.cpp
index 8b7f4f4119a..fba9d40f60d 100644
--- a/tests/Crash_On_Write/Oneway_Receiver.cpp
+++ b/tests/Crash_On_Write/Oneway_Receiver.cpp
@@ -3,8 +3,6 @@
 //
 #include "Oneway_Receiver.h"
 
-ACE_RCSID(Crash_On_Write, Oneway_Receiver, "$Id$")
-
 Oneway_Receiver::Oneway_Receiver (void)
 {
 }
diff --git a/tests/Crash_On_Write/client.cpp b/tests/Crash_On_Write/client.cpp
index 3e8c2690e68..6ffabbd27a2 100644
--- a/tests/Crash_On_Write/client.cpp
+++ b/tests/Crash_On_Write/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Crash_On_Write, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int iterations = 2000;
 
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Crash_On_Write/server.cpp b/tests/Crash_On_Write/server.cpp
index 5aa34a88ae3..8863e07603f 100644
--- a/tests/Crash_On_Write/server.cpp
+++ b/tests/Crash_On_Write/server.cpp
@@ -4,8 +4,6 @@
 #include "Crash_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Crash_On_Write, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Crashed_Callback/Crashed_Callback.cpp b/tests/Crashed_Callback/Crashed_Callback.cpp
index 511d85e87d2..c23bfc16932 100644
--- a/tests/Crashed_Callback/Crashed_Callback.cpp
+++ b/tests/Crashed_Callback/Crashed_Callback.cpp
@@ -3,8 +3,6 @@
 //
 #include "Crashed_Callback.h"
 
-ACE_RCSID(Crashed_Callback, Crashed_Callback, "$Id$")
-
 Crashed_Callback::Crashed_Callback (void)
 {
 }
@@ -20,10 +18,9 @@ Crashed_Callback::crash_now_please (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Crashed_Callback - crashing application\n"));
-// Tru64 seems to hang and not abort and dump core when abort() is called
-// here. This needs further investigation. This fix is a temporary one.
-// Likewise for OpenVMS.
-#if defined (DIGITAL_UNIX) || defined (DEC_CXX) || defined (ACE_OPENVMS)
+// OpenVMS seems to hang and not abort and dump core when abort() is called
+// here. This needs further
+#if defined (DEC_CXX) || defined (ACE_OPENVMS)
   ACE_OS::_exit();
 #else
   ACE_OS::abort();
diff --git a/tests/Crashed_Callback/Makefile.am b/tests/Crashed_Callback/Makefile.am
deleted file mode 100644
index cdfbd0587d9..00000000000
--- a/tests/Crashed_Callback/Makefile.am
+++ /dev/null
@@ -1,121 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Crashed_Callback_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Crashed_Callback_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Crashed_Callback.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Crashed_Callback.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Crashed_Callback_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Service.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Service.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Crashed_Callback/Service.cpp b/tests/Crashed_Callback/Service.cpp
index 60de5a6d5d6..0f0a6f17474 100644
--- a/tests/Crashed_Callback/Service.cpp
+++ b/tests/Crashed_Callback/Service.cpp
@@ -3,8 +3,6 @@
 //
 #include "Service.h"
 
-ACE_RCSID(Crashed_Callback, Service, "$Id$")
-
 Service::Service (void)
   : orb_ (CORBA::ORB::_nil ()),
     test_count_ (0)
diff --git a/tests/Crashed_Callback/client.cpp b/tests/Crashed_Callback/client.cpp
index 3530be3caba..33b5e775ea0 100644
--- a/tests/Crashed_Callback/client.cpp
+++ b/tests/Crashed_Callback/client.cpp
@@ -6,8 +6,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Crashed_Callback, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -31,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Crashed_Callback/server.cpp b/tests/Crashed_Callback/server.cpp
index 107e83b1b12..2c74b294c77 100644
--- a/tests/Crashed_Callback/server.cpp
+++ b/tests/Crashed_Callback/server.cpp
@@ -7,8 +7,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Crashed_Callback, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DII_AMI_Forward/Makefile.am b/tests/DII_AMI_Forward/Makefile.am
deleted file mode 100644
index 81d0271bee6..00000000000
--- a/tests/DII_AMI_Forward/Makefile.am
+++ /dev/null
@@ -1,126 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.DII_AMI_Forward_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.DII_AMI_Forward_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  DII_ReplyHandler.cpp \
-  client.cpp \
-  testC.cpp \
-  DII_ReplyHandler.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.DII_AMI_Forward_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  orb_initializer.cpp \
-  server.cpp \
-  server_interceptor.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  orb_initializer.h \
-  server_interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/DII_AMI_Forward/README b/tests/DII_AMI_Forward/README
index 4ec6a7896b8..2c493a3c740 100644
--- a/tests/DII_AMI_Forward/README
+++ b/tests/DII_AMI_Forward/README
@@ -1,5 +1,5 @@
 /**
-$Id:$
+$Id$
 
 @page DII_AMI_Forward Test README File
 
diff --git a/tests/DII_AMI_Forward/client.cpp b/tests/DII_AMI_Forward/client.cpp
index 44aa03178cc..93db338da7d 100644
--- a/tests/DII_AMI_Forward/client.cpp
+++ b/tests/DII_AMI_Forward/client.cpp
@@ -47,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DII_AMI_Forward/server.cpp b/tests/DII_AMI_Forward/server.cpp
index dbdb20255ad..f9b0ef97a4b 100644
--- a/tests/DII_AMI_Forward/server.cpp
+++ b/tests/DII_AMI_Forward/server.cpp
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                              argv [0]),
                             -1);
       }
-    // Indicates sucessful parsing of the command line
+    // Indicates successful parsing of the command line
     return 0;
 }
 
diff --git a/tests/DII_AMI_Forward/server_interceptor.cpp b/tests/DII_AMI_Forward/server_interceptor.cpp
index 4ac94e07c1a..82d60fb0298 100644
--- a/tests/DII_AMI_Forward/server_interceptor.cpp
+++ b/tests/DII_AMI_Forward/server_interceptor.cpp
@@ -8,7 +8,9 @@
 #include "ace/Thread.h"
 
 ForwardTest_Request_Interceptor::ForwardTest_Request_Interceptor (void)
-  : myname_ ("ForwardTest_Interceptor")
+  : myname_ ("ForwardTest_Interceptor"),
+    forward_location_ (CORBA::Object::_nil ()),
+    forward_location_done_ (false)
 {
 }
 
diff --git a/tests/DII_Collocation_Tests/Makefile.am b/tests/DII_Collocation_Tests/Makefile.am
deleted file mode 100644
index 2ceb2638651..00000000000
--- a/tests/DII_Collocation_Tests/Makefile.am
+++ /dev/null
@@ -1,14 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        oneway \
-        twoway
-
diff --git a/tests/DII_Collocation_Tests/oneway/Client_Task.cpp b/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
index f202d38bda6..38f5464a7dd 100644
--- a/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
+++ b/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
@@ -8,8 +8,6 @@
 #include "TestC.h"
 #include "tao/Object.h"
 
-ACE_RCSID(DII_Collocation_Tests, Client_Task, "$Id$")
-
 char TEST_STR[] = "This is a DII collocation test.";
 CORBA::Long TEST_BASIC_VALUE = 12345;
 CORBA::Char TEST_SPECIAL_VALUE = 'x';
diff --git a/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp b/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
index 419a268a3e1..c62f0414f05 100644
--- a/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
+++ b/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
@@ -45,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         // This is a hack but that is okay!
         return 0;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DII_Collocation_Tests/oneway/Hello.cpp b/tests/DII_Collocation_Tests/oneway/Hello.cpp
index 4ce5dd499d6..976993601f0 100644
--- a/tests/DII_Collocation_Tests/oneway/Hello.cpp
+++ b/tests/DII_Collocation_Tests/oneway/Hello.cpp
@@ -8,8 +8,6 @@
 // Force static build to load the DII_Arguments_Converter service.
 #include "tao/DynamicInterface/DII_Arguments_Converter_Impl.h"
 
-ACE_RCSID(DII_Collocation_Tests, Hello, "$Id$")
-
 extern CORBA::Boolean debug;
 extern char TEST_STR[];
 extern CORBA::Long TEST_BASIC_VALUE;
diff --git a/tests/DII_Collocation_Tests/oneway/Hello.h b/tests/DII_Collocation_Tests/oneway/Hello.h
index 70d46f4813a..e2f9c1c9a8c 100644
--- a/tests/DII_Collocation_Tests/oneway/Hello.h
+++ b/tests/DII_Collocation_Tests/oneway/Hello.h
@@ -8,8 +8,6 @@
 
 #include "TestS.h"
 
-#include "ace/OS.h"
-
 class  Test_Simple_Test_i
   : public virtual POA_Test::Simple_Test
 {
diff --git a/tests/DII_Collocation_Tests/oneway/Makefile.am b/tests/DII_Collocation_Tests/oneway/Makefile.am
deleted file mode 100644
index a974149784d..00000000000
--- a/tests/DII_Collocation_Tests/oneway/Makefile.am
+++ /dev/null
@@ -1,91 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.DII_Collocation_Tests_Oneway.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocated_Test
-
-Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/DII_Collocation_Tests/oneway/Server_Task.cpp b/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
index 21b76077e47..792a5a89711 100644
--- a/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
+++ b/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
@@ -7,11 +7,6 @@
 
 #include "ace/Manual_Event.h"
 
-ACE_RCSID(DII_Collocation_Tests,
-          Server_Task,
-          "$Id$")
-
-
 Server_Task::Server_Task (const ACE_TCHAR *output,
                           const ACE_TCHAR *simple_test_output,
                           CORBA::ORB_ptr sorb,
diff --git a/tests/DII_Collocation_Tests/oneway/Test.idl b/tests/DII_Collocation_Tests/oneway/Test.idl
index a38d373dfbe..e3e8a70dc4d 100644
--- a/tests/DII_Collocation_Tests/oneway/Test.idl
+++ b/tests/DII_Collocation_Tests/oneway/Test.idl
@@ -53,16 +53,16 @@ module Test
 
     oneway void test_object_arg (in Object o);
 
-    oneway void test_args_1 (in Object arg1, 
-                             in char arg2, 
+    oneway void test_args_1 (in Object arg1,
+                             in char arg2,
                              in Simple_Test arg3);
 
-    oneway void test_args_2 (in string arg1, 
-                             in Fixed_Array arg2, 
+    oneway void test_args_2 (in string arg1,
+                             in Fixed_Array arg2,
                              in TimeOfDay arg3);
 
     oneway void test_args_3 (in Bounded_String arg1,
-                             in Bounded_Var_Size_Arg arg2, 
+                             in Bounded_Var_Size_Arg arg2,
                              in Unbounded_Var_Size_Arg arg3,
                              in Var_Array arg4);
 
diff --git a/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
index fa640489fbb..5a5c8ad8d83 100644
--- a/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
+++ b/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
@@ -8,8 +8,6 @@
 #include "TestC.h"
 #include "tao/Object.h"
 
-ACE_RCSID(DII_Collocation_Tests, Client_Task, "$Id$")
-
 char TEST_STR[] = "This is a DII collocation test.";
 char NULL_STR[] = "";
 CORBA::Long TEST_BASIC_VALUE = 12345;
diff --git a/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp b/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp
index 99145711150..a166851db35 100644
--- a/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp
+++ b/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp
@@ -49,7 +49,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         // This is a hack but that is okay!
         return 0;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DII_Collocation_Tests/twoway/Hello.cpp b/tests/DII_Collocation_Tests/twoway/Hello.cpp
index a38a7d163a2..61eeb7e06e0 100644
--- a/tests/DII_Collocation_Tests/twoway/Hello.cpp
+++ b/tests/DII_Collocation_Tests/twoway/Hello.cpp
@@ -8,8 +8,6 @@
 // Force static build to load the DII_Arguments_Converter service.
 #include "tao/DynamicInterface/DII_Arguments_Converter_Impl.h"
 
-ACE_RCSID(DII_Collocation_Tests, Hello, "$Id$")
-
 extern CORBA::Boolean debug;
 extern char TEST_STR[];
 extern CORBA::Long TEST_BASIC_VALUE;
diff --git a/tests/DII_Collocation_Tests/twoway/Hello.h b/tests/DII_Collocation_Tests/twoway/Hello.h
index 4dae7429cb1..059d4f52de8 100644
--- a/tests/DII_Collocation_Tests/twoway/Hello.h
+++ b/tests/DII_Collocation_Tests/twoway/Hello.h
@@ -8,8 +8,6 @@
 
 #include "TestS.h"
 
-#include "ace/OS.h"
-
 class  Test_Simple_Test_i
   : public virtual POA_Test::Simple_Test
 {
diff --git a/tests/DII_Collocation_Tests/twoway/Makefile.am b/tests/DII_Collocation_Tests/twoway/Makefile.am
deleted file mode 100644
index 492b5f08186..00000000000
--- a/tests/DII_Collocation_Tests/twoway/Makefile.am
+++ /dev/null
@@ -1,91 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.DII_Collocation_Tests_Twoway.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocated_Test
-
-Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Hello.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Client_Task.h \
-  Hello.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/DII_Collocation_Tests/twoway/Server_Task.cpp b/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
index f7984939597..7729e61fac4 100644
--- a/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
+++ b/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
@@ -5,11 +5,6 @@
 #include "TestS.h"
 #include "Hello.h"
 
-ACE_RCSID(DII_Collocation_Tests,
-          Server_Task,
-          "$Id$")
-
-
 Server_Task::Server_Task (const ACE_TCHAR *output,
                           const ACE_TCHAR *simple_test_output,
                           CORBA::ORB_ptr sorb,
diff --git a/tests/DII_Collocation_Tests/twoway/Test.idl b/tests/DII_Collocation_Tests/twoway/Test.idl
index 8fa814b4920..f60690dee31 100644
--- a/tests/DII_Collocation_Tests/twoway/Test.idl
+++ b/tests/DII_Collocation_Tests/twoway/Test.idl
@@ -14,6 +14,7 @@ module Test
   typedef sequence<char> Unbounded_Var_Size_Arg;
   typedef long Fixed_Array[FIX_ARRAY_SIZE];
   typedef string Var_Array [VAR_ARRAY_SIZE];
+  typedef string<BOUNDED_STRING_SIZE> Bounded_String;
 
   struct TimeOfDay {
     short   hour;       // 0 - 23
@@ -35,7 +36,7 @@ module Test
 
      void test_unbounded_string_arg_out(in string message, out string out_message);
 
-     void test_bounded_string_arg(in string<BOUNDED_STRING_SIZE> message);
+     void test_bounded_string_arg(in Bounded_String message);
 
      void test_fixed_array_arg(in Fixed_Array message);
 
@@ -61,7 +62,7 @@ module Test
                        in Fixed_Array arg2,
                        in TimeOfDay arg3);
 
-     void test_args_3 (in string<BOUNDED_STRING_SIZE> arg1,
+     void test_args_3 (in Bounded_String arg1,
                              in Bounded_Var_Size_Arg arg2,
                              in Unbounded_Var_Size_Arg arg3,
                              in Var_Array arg4);
diff --git a/tests/DIOP/Makefile.am b/tests/DIOP/Makefile.am
deleted file mode 100644
index 4fafabdfc8a..00000000000
--- a/tests/DIOP/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Basic_IDL.am
-
-BUILT_SOURCES = \
-  UDPC.cpp \
-  UDPC.h \
-  UDPC.inl \
-  UDPS.cpp \
-  UDPS.h \
-  UDPS.inl
-
-CLEANFILES = \
-  UDP-stamp \
-  UDPC.cpp \
-  UDPC.h \
-  UDPC.inl \
-  UDPS.cpp \
-  UDPS.h \
-  UDPS.inl
-
-UDPC.cpp UDPC.h UDPC.inl UDPS.cpp UDPS.h UDPS.inl: UDP-stamp
-
-UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp -Sd $(srcdir)/UDP.idl
-	@touch $@
-
-noinst_HEADERS = \
-  UDP.idl
-
-## Makefile.Basic_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  UDPC.cpp \
-  UDPS.cpp \
-  UDP_Client_i.cpp \
-  UDP_i.cpp \
-  client.cpp \
-  UDP_Client_i.h \
-  UDP_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Basic_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  UDPC.cpp \
-  UDPS.cpp \
-  UDP_Client_i.cpp \
-  UDP_i.cpp \
-  server.cpp \
-  UDP_Client_i.h \
-  UDP_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/DIOP/UDP_Client_i.h b/tests/DIOP/UDP_Client_i.h
index f1b18efe785..bc6d2580966 100644
--- a/tests/DIOP/UDP_Client_i.h
+++ b/tests/DIOP/UDP_Client_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/UDP
-//
-// = FILENAME
-//    UDP_Client_i.h
-//
-// = DESCRIPTION
-//    This class implements the client functionality of the UDP test.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    UDP_Client_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the client functionality of the UDP test.
+ *
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #ifndef UDP_CLIENT_I_H
 #define UDP_CLIENT_I_H
@@ -36,15 +33,15 @@ class UDP_Client_i
   //
 public:
   // = Initialization and termination methods.
+  /// Constructor
   UDP_Client_i (CORBA::ORB_ptr orb,
                 UDP_ptr udp,
                 UDP_ptr udpHandler,
                 ACE_UINT32 msec,
                 ACE_UINT32 iterations);
-  // Constructor
 
+  /// Destructor
   virtual ~UDP_Client_i (void);
-  // Destructor
 
 private:
   // Runs in a separate thread.
diff --git a/tests/DIOP/UDP_i.cpp b/tests/DIOP/UDP_i.cpp
index 25eb782e1c9..4c33ad2c521 100644
--- a/tests/DIOP/UDP_i.cpp
+++ b/tests/DIOP/UDP_i.cpp
@@ -2,8 +2,6 @@
 
 #include "UDP_i.h"
 
-ACE_RCSID(UDP, UDP_i, "")
-
 // Constructor
 UDP_i::UDP_i (CORBA::ORB_ptr o) :
   orb_(CORBA::ORB::_duplicate (o))
diff --git a/tests/DIOP/UDP_i.h b/tests/DIOP/UDP_i.h
index fc58a7bea4e..23a7b3da3e2 100644
--- a/tests/DIOP/UDP_i.h
+++ b/tests/DIOP/UDP_i.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/UDP
-//
-// = FILENAME
-//    UDP_i.h
-//
-// = DESCRIPTION
-//    This class implements the server functionality of the UDP test.
-//    We support only single threaded servers, as we have a null mutex
-//    for locking our state.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    UDP_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the server functionality of the UDP test.
+ *  We support only single threaded servers, as we have a null mutex
+ *  for locking our state.
+ *
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #ifndef UDP_I_H
 #define UDP_I_H
@@ -26,34 +23,36 @@
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Null_Mutex.h"
 
+/**
+ * @class UDP_i:
+ *
+ * @brief UDP Object Implementation
+ *
+ * This class implements the UDP object, which accepts two methods.
+ * The first, <invoke> accepts a string identifying the client
+ * and a request_id so that the server can verify if the requests
+ * arrived in order.
+ */
 class UDP_i: public POA_UDP
 {
-  // = TITLE
-  //    UDP Object Implementation
-  //
-  // = DESCRIPTION
-  //    This class implements the UDP object, which accepts two methods.
-  //    The first, <invoke> accepts a string identifying the client
-  //    and a request_id so that the server can verify if the requests
-  //    arrived in order.
 public:
   // = Initialization and termination methods.
+  /// Constructor
   UDP_i (CORBA::ORB_ptr o);
-  // Constructor
 
+  /// Destructor
   ~UDP_i (void);
-  // Destructor
 
   virtual void invoke (const char *client_name,
                        UDP_ptr udpHandler,
                        CORBA::Long request_id);
 
+  /// Shutdown the server.
   virtual void shutdown (void);
-  // Shutdown the server.
 
 private:
+  /// ORB pointer.
   CORBA::ORB_var orb_;
-  // ORB pointer.
 
   ACE_Hash_Map_Manager_Ex < CORBA::String_var,
                             CORBA::Long,
diff --git a/tests/DIOP/client.cpp b/tests/DIOP/client.cpp
index dbb73d07644..8fd43270900 100644
--- a/tests/DIOP/client.cpp
+++ b/tests/DIOP/client.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/PluggableUDP/tests/Basic
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//    This is the client for the UDP test.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  This is the client for the UDP test.
+ *
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 #include "UDPC.h"
 
@@ -30,8 +27,6 @@
 // executable and initialized for static builds.
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(AMI, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 unsigned int msec = 500;
 unsigned int iterations = 1;
@@ -69,7 +64,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DIOP/server.cpp b/tests/DIOP/server.cpp
index 01fdf921945..a7372010e30 100644
--- a/tests/DIOP/server.cpp
+++ b/tests/DIOP/server.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/PluggableUDP/tests/Basic
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    Implementation of the server running the UDP object.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the server running the UDP object.
+ *
+ *
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
 
 
 #include "UDP_i.h"
@@ -27,8 +24,6 @@
 // executable and initialized for static builds.
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(AMI, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -55,7 +50,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DLL_ORB/Makefile.am b/tests/DLL_ORB/Makefile.am
deleted file mode 100644
index be927581d65..00000000000
--- a/tests/DLL_ORB/Makefile.am
+++ /dev/null
@@ -1,155 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_LTLIBRARIES =
-noinst_PROGRAMS =
-
-## Makefile.DLL_ORB_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.DLL_ORB_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  Test_Client_Module.h \
-  Test_Client_Module_Export.h \
-  Test_Server_Module.h \
-  Test_Server_Module_Export.h \
-  Test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.DLL_ORB_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  Test_Client_Module.h \
-  Test_Client_Module_Export.h \
-  Test_Server_Module.h \
-  Test_Server_Module_Export.h \
-  Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.DLL_ORB_Test_Client_Module.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES += libTest_Client_Module.la
-
-libTest_Client_Module_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTEST_CLIENT_MODULE_BUILD_DLL
-
-libTest_Client_Module_la_SOURCES = \
-  TestC.cpp \
-  Test_Client_Module.cpp
-
-noinst_HEADERS += \
-  Test_Client_Module.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.DLL_ORB_Test_Server_Module.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES += libTest_Server_Module.la
-
-libTest_Server_Module_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTEST_SERVER_MODULE_BUILD_DLL
-
-libTest_Server_Module_la_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_Server_Module.cpp \
-  Test_i.cpp
-
-noinst_HEADERS += \
-  Test_Server_Module.h \
-  Test_i.h
-
-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/tests/DLL_ORB/Test_Client_Module.cpp b/tests/DLL_ORB/Test_Client_Module.cpp
index ed58e647d20..83f4d56e852 100644
--- a/tests/DLL_ORB/Test_Client_Module.cpp
+++ b/tests/DLL_ORB/Test_Client_Module.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Test_Client_Module.h"
 #include "tao/TAO_Singleton_Manager.h"
@@ -7,11 +8,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
 
-ACE_RCSID (DLL_ORB,
-           Test_Client_Module,
-           "$Id$")
-
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -34,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DLL_ORB/Test_Server_Module.cpp b/tests/DLL_ORB/Test_Server_Module.cpp
index b972ede5455..6f6702697e3 100644
--- a/tests/DLL_ORB/Test_Server_Module.cpp
+++ b/tests/DLL_ORB/Test_Server_Module.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Test_Server_Module.h"
 #include "tao/TAO_Singleton_Manager.h"
@@ -6,11 +7,6 @@
 
 #include "ace/Service_Config.h"
 #include "ace/Argv_Type_Converter.h"
-
-ACE_RCSID (DLL_ORB,
-           Test_Server_Module,
-           "$Id$")
-
 #include "ace/Get_Opt.h"
 
 
diff --git a/tests/DLL_ORB/Test_i.cpp b/tests/DLL_ORB/Test_i.cpp
index 9a3414ab41e..be88b80cb16 100644
--- a/tests/DLL_ORB/Test_i.cpp
+++ b/tests/DLL_ORB/Test_i.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Test_i.h"
 
-ACE_RCSID (DLL_ORB,
-           Test_i,
-           "$Id$")
-
 Test_i::Test_i (void)
   : orb_ ()
 {
diff --git a/tests/DSI_AMH/Makefile.am b/tests/DSI_AMH/Makefile.am
deleted file mode 100644
index f1878cc76e5..00000000000
--- a/tests/DSI_AMH/Makefile.am
+++ /dev/null
@@ -1,112 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.DSI_AMH_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.DSI_AMH_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.DSI_AMH_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/DSI_AMH/Test.idl b/tests/DSI_AMH/Test.idl
index fb38537f0b7..057177a145b 100644
--- a/tests/DSI_AMH/Test.idl
+++ b/tests/DSI_AMH/Test.idl
@@ -9,7 +9,7 @@ module Test
 
   interface Roundtrip
   {
-    /// The operation simply returns its argument. 
+    /// The operation simply returns its argument.
     Timestamp test_method (in Timestamp send_time);
 
     /// Shutdown the ORB
diff --git a/tests/DSI_AMH/client.cpp b/tests/DSI_AMH/client.cpp
index 77a0d4f54cd..ef0384b966d 100644
--- a/tests/DSI_AMH/client.cpp
+++ b/tests/DSI_AMH/client.cpp
@@ -41,7 +41,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DSI_AMH/server.cpp b/tests/DSI_AMH/server.cpp
index 562fb7485b6..85caa9c72c1 100644
--- a/tests/DSI_AMH/server.cpp
+++ b/tests/DSI_AMH/server.cpp
@@ -27,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DSI_AMI_Gateway/Makefile.am b/tests/DSI_AMI_Gateway/Makefile.am
deleted file mode 100644
index 8051e6a1654..00000000000
--- a/tests/DSI_AMI_Gateway/Makefile.am
+++ /dev/null
@@ -1,161 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.DSI_AMI_Gateway_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.DSI_AMI_Gateway_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  My_DII_Reply_Handler.h \
-  test_dsi.h \
-  test_dsi.inl \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.DSI_AMI_Gateway_Gateway.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += gateway
-
-gateway_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-gateway_SOURCES = \
-  My_DII_Reply_Handler.cpp \
-  gateway.cpp \
-  test_dsi.cpp \
-  My_DII_Reply_Handler.h \
-  test_dsi.h \
-  test_dsi.inl
-
-gateway_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.DSI_AMI_Gateway_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/DSI_AMI_Gateway/client.cpp b/tests/DSI_AMI_Gateway/client.cpp
index 93f9893fe24..2b6331ab8e5 100644
--- a/tests/DSI_AMI_Gateway/client.cpp
+++ b/tests/DSI_AMI_Gateway/client.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(DSI_Gateway, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://gateway.ior");
 int niterations = 5;
 int do_shutdown = 0;
@@ -56,7 +54,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DSI_AMI_Gateway/gateway.cpp b/tests/DSI_AMI_Gateway/gateway.cpp
index 7a21ca92299..0bd127fc870 100644
--- a/tests/DSI_AMI_Gateway/gateway.cpp
+++ b/tests/DSI_AMI_Gateway/gateway.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(DSI_Gateway, server, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int do_shutdown = 0;
@@ -49,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DSI_AMI_Gateway/server.cpp b/tests/DSI_AMI_Gateway/server.cpp
index 9ca30d840a2..1e520c7ff9a 100644
--- a/tests/DSI_AMI_Gateway/server.cpp
+++ b/tests/DSI_AMI_Gateway/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(DSI_Gateway, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 
 int nthreads = 4;
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DSI_AMI_Gateway/test_dsi.cpp b/tests/DSI_AMI_Gateway/test_dsi.cpp
index 7afaf5d2873..5f7fecd6224 100644
--- a/tests/DSI_AMI_Gateway/test_dsi.cpp
+++ b/tests/DSI_AMI_Gateway/test_dsi.cpp
@@ -13,12 +13,8 @@
 #include "test_dsi.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(DSI_AMI_Gateway, test_dsi, "$Id$")
-
 void
-DSI_Simple_Server::_dispatch (TAO_ServerRequest &request,
-                         void * //context
-                     )
+DSI_Simple_Server::_dispatch (TAO_ServerRequest &request, void *)
 {
   // No need to do any of this if the client isn't waiting.
   if (request.response_expected ())
diff --git a/tests/DSI_AMI_Gateway/test_dsi.h b/tests/DSI_AMI_Gateway/test_dsi.h
index 46a0b4aa99d..4f33fc644f8 100644
--- a/tests/DSI_AMI_Gateway/test_dsi.h
+++ b/tests/DSI_AMI_Gateway/test_dsi.h
@@ -1,17 +1,14 @@
-// $Id$
 
-// ===================================================
-//
-// = LIBRARY
-//   TAO/tests/DSI_Gateway
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ===================================================
+//=============================================================================
+/**
+ *  @file   test_dsi.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_DSI_GATEWAY_TEST_DSI_H
 #define TAO_DSI_GATEWAY_TEST_DSI_H
@@ -22,25 +19,28 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB.h"
 
+/**
+ * @class DSI_Simple_Server
+ *
+ * @brief DSI Simpler Server implementation
+ *
+ * Implements the DSI/DII gateway.
+ */
 class DSI_Simple_Server : public TAO_DynamicImplementation
 {
-  // = TITLE
-  //   DSI Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the DSI/DII gateway.
-  //
 public:
+  /// ctor
   DSI_Simple_Server (CORBA::ORB_ptr orb,
                      CORBA::Object_ptr target,
                      PortableServer::POA_ptr poa);
-  // ctor
 
+  /**
+   * Turns around and calls invoke, but using AMH style handler
+   * = The DynamicImplementation methods.
+   *
+   */
   virtual void _dispatch (TAO_ServerRequest &request,
                           void *context);
-  // Turns around and calls invoke, but using AMH style handler
-  // = The DynamicImplementation methods.
-  //
 
   // we need this because it is a pure virtual method in
   // its parent class
@@ -57,14 +57,14 @@ public:
     );
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
+  /// Target object, forward requests to it...
   CORBA::Object_var target_;
-  // Target object, forward requests to it...
 
+  /// The POA
   PortableServer::POA_var poa_;
-  // The POA
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/tests/DSI_AMI_Gateway/test_i.cpp b/tests/DSI_AMI_Gateway/test_i.cpp
index 550fc830999..34ec0538137 100644
--- a/tests/DSI_AMI_Gateway/test_i.cpp
+++ b/tests/DSI_AMI_Gateway/test_i.cpp
@@ -7,8 +7,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(DSI_Gateway, test_i, "$Id$")
-
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x,
                               const Structure& the_in_structure,
diff --git a/tests/DSI_AMI_Gateway/test_i.h b/tests/DSI_AMI_Gateway/test_i.h
index 89e1c70d9f6..0810aac6c63 100644
--- a/tests/DSI_AMI_Gateway/test_i.h
+++ b/tests/DSI_AMI_Gateway/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/DSI_Gateway
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_DSI_GATEWAY_TEST_I_H
 #define TAO_DSI_GATEWAY_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x,
diff --git a/tests/DSI_Gateway/Makefile.am b/tests/DSI_Gateway/Makefile.am
deleted file mode 100644
index 8b3af31f0d8..00000000000
--- a/tests/DSI_Gateway/Makefile.am
+++ /dev/null
@@ -1,160 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.DSI_Gateway_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.DSI_Gateway_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_dsi.h \
-  test_dsi.inl \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.DSI_Gateway_Gateway.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += gateway
-
-gateway_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-gateway_SOURCES = \
-  gateway.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_dsi.cpp \
-  test_dsi.h \
-  test_dsi.inl
-
-gateway_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.DSI_Gateway_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/DSI_Gateway/client.cpp b/tests/DSI_Gateway/client.cpp
index 066fe3dd849..e579139a181 100644
--- a/tests/DSI_Gateway/client.cpp
+++ b/tests/DSI_Gateway/client.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(DSI_Gateway, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://gateway.ior");
 int niterations = 5;
 int do_shutdown = 0;
@@ -56,7 +54,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DSI_Gateway/gateway.cpp b/tests/DSI_Gateway/gateway.cpp
index 59f599ff015..7f64bfc18b3 100644
--- a/tests/DSI_Gateway/gateway.cpp
+++ b/tests/DSI_Gateway/gateway.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(DSI_Gateway, server, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int do_shutdown = 0;
@@ -49,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DSI_Gateway/server.cpp b/tests/DSI_Gateway/server.cpp
index 9ca30d840a2..1e520c7ff9a 100644
--- a/tests/DSI_Gateway/server.cpp
+++ b/tests/DSI_Gateway/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(DSI_Gateway, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 
 int nthreads = 4;
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DSI_Gateway/test_dsi.cpp b/tests/DSI_Gateway/test_dsi.cpp
index 39c6e6ded6e..59b695330f6 100644
--- a/tests/DSI_Gateway/test_dsi.cpp
+++ b/tests/DSI_Gateway/test_dsi.cpp
@@ -8,8 +8,6 @@
 #include "test_dsi.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(DSI_Gateway, test_dsi, "$Id$")
-
 void
 DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request)
 {
diff --git a/tests/DSI_Gateway/test_dsi.h b/tests/DSI_Gateway/test_dsi.h
index 5c5ea947a47..8b1e958e2b9 100644
--- a/tests/DSI_Gateway/test_dsi.h
+++ b/tests/DSI_Gateway/test_dsi.h
@@ -1,17 +1,14 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/DSI_Gateway
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   test_dsi.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_DSI_GATEWAY_TEST_DSI_H
 #define TAO_DSI_GATEWAY_TEST_DSI_H
@@ -21,19 +18,20 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB.h"
 
+/**
+ * @class DSI_Simple_Server
+ *
+ * @brief DSI Simpler Server implementation
+ *
+ * Implements the DSI/DII gateway.
+ */
 class DSI_Simple_Server : public TAO_DynamicImplementation
 {
-  // = TITLE
-  //   DSI Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the DSI/DII gateway.
-  //
 public:
+  /// ctor
   DSI_Simple_Server (CORBA::ORB_ptr orb,
                      CORBA::Object_ptr target,
                      PortableServer::POA_ptr poa);
-  // ctor
 
   // = The DynamicImplementation methods.
   virtual void invoke (CORBA::ServerRequest_ptr request);
@@ -47,14 +45,14 @@ public:
     );
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
+  /// Target object, forward requests to it...
   CORBA::Object_var target_;
-  // Target object, forward requests to it...
 
+  /// The POA
   PortableServer::POA_var poa_;
-  // The POA
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/tests/DSI_Gateway/test_i.cpp b/tests/DSI_Gateway/test_i.cpp
index 550fc830999..34ec0538137 100644
--- a/tests/DSI_Gateway/test_i.cpp
+++ b/tests/DSI_Gateway/test_i.cpp
@@ -7,8 +7,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(DSI_Gateway, test_i, "$Id$")
-
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x,
                               const Structure& the_in_structure,
diff --git a/tests/DSI_Gateway/test_i.h b/tests/DSI_Gateway/test_i.h
index 89e1c70d9f6..0810aac6c63 100644
--- a/tests/DSI_Gateway/test_i.h
+++ b/tests/DSI_Gateway/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/DSI_Gateway
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_DSI_GATEWAY_TEST_I_H
 #define TAO_DSI_GATEWAY_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x,
diff --git a/tests/DiffServ/Makefile.am b/tests/DiffServ/Makefile.am
deleted file mode 100644
index 99da8e0eff2..00000000000
--- a/tests/DiffServ/Makefile.am
+++ /dev/null
@@ -1,110 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.diffserv_idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.diffserv_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DiffServPolicy.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.diffserv_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DiffServPolicy.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/DiffServ/server.cpp b/tests/DiffServ/server.cpp
index 5e159633bcf..181543d020b 100644
--- a/tests/DiffServ/server.cpp
+++ b/tests/DiffServ/server.cpp
@@ -106,7 +106,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         simple_servant_ior_file = get_opts.opt_arg ();
         break;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/DynAny_Test/Makefile.am b/tests/DynAny_Test/Makefile.am
deleted file mode 100644
index 80782d7a26c..00000000000
--- a/tests/DynAny_Test/Makefile.am
+++ /dev/null
@@ -1,99 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.DynAny_Test_Basic.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  da_testsC.cpp \
-  da_testsC.h \
-  da_testsC.inl \
-  da_testsS.cpp \
-  da_testsS.h \
-  da_testsS.inl
-
-CLEANFILES = \
-  da_tests-stamp \
-  da_testsC.cpp \
-  da_testsC.h \
-  da_testsC.inl \
-  da_testsS.cpp \
-  da_testsS.h \
-  da_testsS.inl
-
-da_testsC.cpp da_testsC.h da_testsC.inl da_testsS.cpp da_testsS.h da_testsS.inl: da_tests-stamp
-
-da_tests-stamp: $(srcdir)/da_tests.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/da_tests.idl
-	@touch $@
-
-noinst_PROGRAMS = basic_test
-
-basic_test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-basic_test_SOURCES = \
-  analyzer.cpp \
-  da_testsC.cpp \
-  da_testsS.cpp \
-  data.cpp \
-  driver.cpp \
-  test_dynany.cpp \
-  test_dynarray.cpp \
-  test_dynenum.cpp \
-  test_dynsequence.cpp \
-  test_dynstruct.cpp \
-  test_dynunion.cpp \
-  test_wrapper.cpp \
-  analyzer.h \
-  da_testsC.h \
-  da_testsC.inl \
-  da_testsS.h \
-  da_testsS.inl \
-  data.h \
-  driver.h \
-  test_dynany.h \
-  test_dynarray.h \
-  test_dynenum.h \
-  test_dynsequence.h \
-  test_dynstruct.h \
-  test_dynunion.h \
-  test_wrapper.h
-
-basic_test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/DynAny_Test/data.cpp b/tests/DynAny_Test/data.cpp
index 321efcf4f22..e54d076e045 100644
--- a/tests/DynAny_Test/data.cpp
+++ b/tests/DynAny_Test/data.cpp
@@ -36,8 +36,8 @@ Data::Data (CORBA::ORB_var orb)
     m_wchar1 (666),                             m_wchar2 (0),
     orb_ (orb)
 {
-    ACE_CDR_LONG_DOUBLE_ASSIGNMENT (m_longdouble1, 88888888888.8888); 
-    ACE_CDR_LONG_DOUBLE_ASSIGNMENT (m_longdouble2, 99999999999.9999); 
+    ACE_CDR_LONG_DOUBLE_ASSIGNMENT (m_longdouble1, 88888888888.8888);
+    ACE_CDR_LONG_DOUBLE_ASSIGNMENT (m_longdouble2, 99999999999.9999);
 
   try
     {
diff --git a/tests/DynAny_Test/data.h b/tests/DynAny_Test/data.h
index 05133d6de65..e25a35da1ad 100644
--- a/tests/DynAny_Test/data.h
+++ b/tests/DynAny_Test/data.h
@@ -40,7 +40,7 @@ public:
   CORBA::Object_var     m_objref1,    m_objref2;
   CORBA::ShortSeq       m_shortseq1;
   CORBA::ShortSeq_var   m_shortseq2;
-  CORBA::LongDouble     m_longdouble1, m_longdouble2; 
+  CORBA::LongDouble     m_longdouble1, m_longdouble2;
 
 const char* labels[20];
 
diff --git a/tests/DynAny_Test/test_dynany.cpp b/tests/DynAny_Test/test_dynany.cpp
index 344d2542c63..baa4bb70a10 100644
--- a/tests/DynAny_Test/test_dynany.cpp
+++ b/tests/DynAny_Test/test_dynany.cpp
@@ -79,7 +79,7 @@ Test_DynAny::run_test (void)
         CORBA::Double d_out =
           fa1->get_double ();
 
-        if (d_out == data.m_double1)
+        if (ACE::is_equal (d_out, data.m_double1))
           {
             ACE_DEBUG ((LM_DEBUG,
                       "++ OK ++\n"));
@@ -102,7 +102,7 @@ Test_DynAny::run_test (void)
         CORBA::Any_var out_any1 = ftc1->to_any ();
         out_any1 >>= d_out;
 
-        if (d_out == data.m_double1)
+        if (ACE::is_equal (d_out, data.m_double1))
           {
             ACE_DEBUG ((LM_DEBUG,
                       "++ OK ++\n"));
@@ -133,7 +133,7 @@ Test_DynAny::run_test (void)
 
         CORBA::LongDouble d_out = fa1->get_longdouble ();
 
-        if (d_out == data.m_longdouble1)
+        if (ACE::is_equal (d_out, data.m_longdouble1))
           {
             ACE_DEBUG ((LM_DEBUG,
               "++ OK ++\n"));
@@ -160,7 +160,7 @@ Test_DynAny::run_test (void)
 
         out_any1.in() >>= d_out;
 
-        if (d_out == data.m_longdouble1)
+        if (ACE::is_equal (d_out, data.m_longdouble1))
         {
           ACE_DEBUG ((LM_DEBUG,
             "++ OK ++\n"));
@@ -174,7 +174,6 @@ Test_DynAny::run_test (void)
         ftc1->destroy ();
       }
 
-
       ACE_DEBUG ((LM_DEBUG,
                  "\t*=*=*=*= %C =*=*=*=*\n",
                  data.labels[12]));
diff --git a/tests/DynAny_Test/test_dynstruct.cpp b/tests/DynAny_Test/test_dynstruct.cpp
index dfbe9bbcf9f..548e6847c0e 100644
--- a/tests/DynAny_Test/test_dynstruct.cpp
+++ b/tests/DynAny_Test/test_dynstruct.cpp
@@ -364,7 +364,7 @@ Test_DynStruct::run_test (void)
       corba_long_double <<= l_long_double_in_struct;
 
       DynamicAny::DynAny_var l_dynany = dynany_factory->create_dyn_any (corba_long_double);
-      try 
+      try
       {
         l_dynany->destroy ();
         ACE_DEBUG ((LM_DEBUG,
diff --git a/tests/DynAny_Test/test_wrapper.cpp b/tests/DynAny_Test/test_wrapper.cpp
index e51088848d8..e2e846a0a76 100644
--- a/tests/DynAny_Test/test_wrapper.cpp
+++ b/tests/DynAny_Test/test_wrapper.cpp
@@ -16,7 +16,6 @@
 #define TEST_WRAPPER_CPP
 
 #include "test_wrapper.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
 // Constructor
diff --git a/tests/DynUnion_Test/Makefile.am b/tests/DynUnion_Test/Makefile.am
deleted file mode 100644
index 2cc91a69d5b..00000000000
--- a/tests/DynUnion_Test/Makefile.am
+++ /dev/null
@@ -1,85 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.dynunion_test_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  dynanyC.cpp \
-  dynanyC.h \
-  dynanyC.inl \
-  dynanyS.cpp \
-  dynanyS.h \
-  dynanyS.inl
-
-CLEANFILES = \
-  dynany-stamp \
-  dynanyC.cpp \
-  dynanyC.h \
-  dynanyC.inl \
-  dynanyS.cpp \
-  dynanyS.h \
-  dynanyS.inl
-
-dynanyC.cpp dynanyC.h dynanyC.inl dynanyS.cpp dynanyS.h dynanyS.inl: dynany-stamp
-
-dynany-stamp: $(srcdir)/dynany.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/dynany.idl
-	@touch $@
-
-noinst_HEADERS = \
-  dynany.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.dynuniontest.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = dynuniontest
-
-dynuniontest_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-dynuniontest_SOURCES = \
-  DynUnionTest.cpp \
-  dynanyC.cpp
-
-dynuniontest_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/tests/Explicit_Event_Loop/Makefile.am b/tests/Explicit_Event_Loop/Makefile.am
deleted file mode 100644
index 87b19edbdf7..00000000000
--- a/tests/Explicit_Event_Loop/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Explicit_Event_Loop_Idl.am
-
-BUILT_SOURCES = \
-  timeC.cpp \
-  timeC.h \
-  timeC.inl \
-  timeS.cpp \
-  timeS.h \
-  timeS.inl
-
-CLEANFILES = \
-  time-stamp \
-  timeC.cpp \
-  timeC.h \
-  timeC.inl \
-  timeS.cpp \
-  timeS.h \
-  timeS.inl
-
-timeC.cpp timeC.h timeC.inl timeS.cpp timeS.h timeS.inl: time-stamp
-
-time-stamp: $(srcdir)/time.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/time.idl
-	@touch $@
-
-noinst_HEADERS = \
-  time.idl
-
-## Makefile.Explicit_Event_Loop_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  timeC.cpp \
-  server.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Explicit_Event_Loop_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  timeC.cpp \
-  timeS.cpp \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Explicit_Event_Loop/client.cpp b/tests/Explicit_Event_Loop/client.cpp
index 79309f3e6ad..ccf9be6b357 100644
--- a/tests/Explicit_Event_Loop/client.cpp
+++ b/tests/Explicit_Event_Loop/client.cpp
@@ -1,23 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Explicit_Event_Loop
-//
-// = FILENAME
-//    client.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the
-//   code provided in the book, "Advanced CORBA Programming with C++"
-//   by Michi Henning and Steve Vinoski. Copyright
-//   1999. Addison-Wesley, Reading, MA.  Used with permission of
-//   Addison-Wesley.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from thecode provided in the book
+ *  @author "Advanced CORBA Programming with C++"by Michi Henning and Steve Vinoski. Copyright1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.  Used with permission ofAddison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "timeC.h"
 
diff --git a/tests/Explicit_Event_Loop/server.cpp b/tests/Explicit_Event_Loop/server.cpp
index 01184bdb811..8da642317de 100644
--- a/tests/Explicit_Event_Loop/server.cpp
+++ b/tests/Explicit_Event_Loop/server.cpp
@@ -1,23 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Explicit_Event_Loop
-//
-// = FILENAME
-//    server.cpp
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the
-//   code provided in the book, "Advanced CORBA Programming with C++"
-//   by Michi Henning and Steve Vinoski. Copyright
-//   1999. Addison-Wesley, Reading, MA.  Used with permission of
-//   Addison-Wesley.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from thecode provided in the book
+ *  @author "Advanced CORBA Programming with C++"by Michi Henning and Steve Vinoski. Copyright1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.  Used with permission ofAddison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "server.h"
 #include "tao/debug.h"
@@ -53,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Explicit_Event_Loop/server.h b/tests/Explicit_Event_Loop/server.h
index 63a80d2c89f..207cc33c69d 100644
--- a/tests/Explicit_Event_Loop/server.h
+++ b/tests/Explicit_Event_Loop/server.h
@@ -1,22 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Explicit_Event_Loop
-//
-// = FILENAME
-//    server.h
-//
-// = AUTHORS
-//   Source code used in TAO has been modified and adapted from the code
-//   provided in the book, "Advanced CORBA Programming with C++" by Michi
-//   Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading,
-//   MA.  Used with permission of Addison-Wesley.
-//
-//   Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    server.h
+ *
+ *  $Id$
+ *
+ *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
+ *  @author Reading
+ *  @author MA.  Used with permission of Addison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef server_HH_
 #define server_HH_
diff --git a/tests/Exposed_Policies/Counter_i.cpp b/tests/Exposed_Policies/Counter_i.cpp
index fc0b34451e7..9ec2282ccda 100644
--- a/tests/Exposed_Policies/Counter_i.cpp
+++ b/tests/Exposed_Policies/Counter_i.cpp
@@ -2,8 +2,6 @@
 
 #include "Counter_i.h"
 
-ACE_RCSID(tao, Counter_Servant, "$Id$")
-
 // Dtor-Ctor Implementation.
 
 Counter_Servant::Counter_Servant (Policy_Tester *policy_tester)
diff --git a/tests/Exposed_Policies/Counter_i.h b/tests/Exposed_Policies/Counter_i.h
index 8703a2d95a9..18e32d1c90b 100644
--- a/tests/Exposed_Policies/Counter_i.h
+++ b/tests/Exposed_Policies/Counter_i.h
@@ -1,20 +1,17 @@
-//$Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Exposed_Policies
-//
-// = FILENAME
-//    Counter_i.h
-//
-// = DESCRIPTION
-//     This class implements the Counter IDL interface.
-//
-// = AUTHOR
-//     Angelo Corsaro <corsaro@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Counter_i.h
+ *
+ *  $Id$
+ *
+ *   This class implements the Counter IDL interface.
+ *
+ *
+ *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef COUNTER_I_H_
 #define COUNTER_I_H_
diff --git a/tests/Exposed_Policies/Makefile.am b/tests/Exposed_Policies/Makefile.am
deleted file mode 100644
index a87f6d18d2b..00000000000
--- a/tests/Exposed_Policies/Makefile.am
+++ /dev/null
@@ -1,130 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Exposed_Policies_Idl.am
-
-BUILT_SOURCES = \
-  CounterC.cpp \
-  CounterC.h \
-  CounterC.inl \
-  CounterS.cpp \
-  CounterS.h \
-  CounterS.inl
-
-CLEANFILES = \
-  Counter-stamp \
-  CounterC.cpp \
-  CounterC.h \
-  CounterC.inl \
-  CounterS.cpp \
-  CounterS.h \
-  CounterS.inl
-
-CounterC.cpp CounterC.h CounterC.inl CounterS.cpp CounterS.h CounterS.inl: Counter-stamp
-
-Counter-stamp: $(srcdir)/Counter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Counter.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Counter.idl
-
-## Makefile.Exposed_Policies_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  CounterC.cpp \
-  Policy_Tester.cpp \
-  Policy_Verifier.cpp \
-  RT_Properties.cpp \
-  client.cpp \
-  Policy_Tester.h \
-  Policy_Verifier.h \
-  RT_Properties.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.Exposed_Policies_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  CounterC.cpp \
-  CounterS.cpp \
-  Policy_Tester.cpp \
-  Policy_Verifier.cpp \
-  RT_Properties.cpp \
-  server.cpp \
-  Policy_Tester.h \
-  Policy_Verifier.h \
-  RT_Properties.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/Exposed_Policies/Policy_Tester.cpp b/tests/Exposed_Policies/Policy_Tester.cpp
index 83d40afff39..f49887a77b8 100644
--- a/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/tests/Exposed_Policies/Policy_Tester.cpp
@@ -18,8 +18,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (tao, Policy_Tester, "$Id$")
-
 Policy_Tester::Policy_Tester (void)
   : rt_object_properties_ (0),
     rt_poa_properties_ (0)
diff --git a/tests/Exposed_Policies/Policy_Tester.h b/tests/Exposed_Policies/Policy_Tester.h
index 1a659c8c01c..8ca8eed1c75 100644
--- a/tests/Exposed_Policies/Policy_Tester.h
+++ b/tests/Exposed_Policies/Policy_Tester.h
@@ -1,21 +1,16 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Exposed_Policies
-//
-// = FILENAME
-//    Policy_Verifier.h
-//
-// = DESCRIPTION
-//     This class verifies that the policy are correctly embedded
-//     in the IOR.
-//
-// = AUTHOR
-//     Angelo Corsaro <corsaro@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Policy_Tester.h
+ *
+ *  $Id$
+ *
+ *   This class verifies that the policy are correctly embedded
+ *   in the IOR.
+ *
+ *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef POLICY_TESTER_H_
 #define POLICY_TESTER_H_
@@ -35,8 +30,8 @@ public:
   Policy_Tester (void);
   ~Policy_Tester (void);
 
+  /// Runs the test.
   void run (void);
-  // Runs the test.
 
   int init (int argc,
             ACE_TCHAR *argv[]);
diff --git a/tests/Exposed_Policies/Policy_Verifier.cpp b/tests/Exposed_Policies/Policy_Verifier.cpp
index 3215c2ef7b8..0fdb414c1c1 100644
--- a/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -1,8 +1,7 @@
+// $Id$
 #include "Policy_Verifier.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (tao, Policy_Verifier, "$Id$")
-
 Policy_Verifier::Policy_Verifier (void)
   : rt_object_properties_ (0)
   , rt_poa_properties_ (0)
diff --git a/tests/Exposed_Policies/Policy_Verifier.h b/tests/Exposed_Policies/Policy_Verifier.h
index 52d06f1cdcb..ba7a03d7180 100644
--- a/tests/Exposed_Policies/Policy_Verifier.h
+++ b/tests/Exposed_Policies/Policy_Verifier.h
@@ -1,21 +1,17 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Exposed_Policies
-//
-// = FILENAME
-//    Policy_Verifier.h
-//
-// = DESCRIPTION
-//     This class verifies that the policy are correctly embedded
-//     in the IOR.
-//
-// = AUTHOR
-//     Angelo Corsaro <corsaro@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Policy_Verifier.h
+ *
+ *  $Id$
+ *
+ *   This class verifies that the policy are correctly embedded
+ *   in the IOR.
+ *
+ *
+ *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef POLICY_VERIFIER_H_
 #define POLICY_VERIFIER_H_
diff --git a/tests/Exposed_Policies/RT_Properties.cpp b/tests/Exposed_Policies/RT_Properties.cpp
index e50ee9913a3..e943914b047 100644
--- a/tests/Exposed_Policies/RT_Properties.cpp
+++ b/tests/Exposed_Policies/RT_Properties.cpp
@@ -7,8 +7,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (ExposedPolicies, RT_Properties, "$Id$")
-
 RT_Properties::RT_Properties (void)
   : priority_ (10)
 {
@@ -43,20 +41,28 @@ RT_Properties::read_from (const ACE_TCHAR *file_name)
       if (ACE_OS::strcmp (string_field, "Priority") == 0)
         {
           n_matched = fscanf (fp, "%d", &int_field);
+          ACE_UNUSED_ARG (n_matched);
+
           rt_properties->priority (int_field);
         }
       else if (ACE_OS::strcmp (string_field, "Priority_Bands") == 0)
         {
           n_matched = fscanf (fp, "%d", &int_field);
+          ACE_UNUSED_ARG (n_matched);
+
           rt_properties->priority_bands_.length (int_field);
 
         }
       else if (ACE_OS::strcmp (string_field, "Priority_Range") == 0)
         {
           n_matched = fscanf (fp, "%d", &int_field);
+          ACE_UNUSED_ARG (n_matched);
+
           rt_properties->priority_bands_[i].low = int_field;
 
           n_matched = fscanf (fp, "%d", &int_field);
+          ACE_UNUSED_ARG (n_matched);
+
           rt_properties->priority_bands_[i].high = int_field;
 
           ++i;
diff --git a/tests/Exposed_Policies/RT_Properties.h b/tests/Exposed_Policies/RT_Properties.h
index 5184952e4cd..e37728ae291 100644
--- a/tests/Exposed_Policies/RT_Properties.h
+++ b/tests/Exposed_Policies/RT_Properties.h
@@ -1,21 +1,17 @@
-//$Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    RT_Properties.h
-//
-// = DESCRIPTION
-//     Defines a series of "real time" property that an Object
-//     or a POA created on a RT-ORB can have.
-//
-// = AUTHOR
-//     Angelo Corsaro <corsaro@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    RT_Properties.h
+ *
+ *  $Id$
+ *
+ *   Defines a series of "real time" property that an Object
+ *   or a POA created on a RT-ORB can have.
+ *
+ *
+ *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef RT_PROPERTIES_H_
 #define RT_PROPERTIES_H_
diff --git a/tests/Exposed_Policies/client.cpp b/tests/Exposed_Policies/client.cpp
index 92ef57a48c3..dddf5c131c4 100644
--- a/tests/Exposed_Policies/client.cpp
+++ b/tests/Exposed_Policies/client.cpp
@@ -9,8 +9,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(tao, client, "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/Exposed_Policies/server.cpp b/tests/Exposed_Policies/server.cpp
index 80dd35351b3..370dde2c27a 100644
--- a/tests/Exposed_Policies/server.cpp
+++ b/tests/Exposed_Policies/server.cpp
@@ -15,9 +15,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(tao, server, "$Id$")
-
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/Exposed_Policies/svc.conf b/tests/Exposed_Policies/svc.conf
index 37973382e2c..c72881a107c 100644
--- a/tests/Exposed_Policies/svc.conf
+++ b/tests/Exposed_Policies/svc.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 # Regular test
 static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO"
diff --git a/tests/FL_Cube/Makefile.am b/tests/FL_Cube/Makefile.am
deleted file mode 100644
index 8606fc77cde..00000000000
--- a/tests/FL_Cube/Makefile.am
+++ /dev/null
@@ -1,169 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.FL_Cube_Client.am
-
-if BUILD_ACE_FLREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_FL
-if BUILD_GL
-if BUILD_TAO_FLRESOURCE
-if BUILD_X11
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_FLTK_CPPFLAGS)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_LDFLAGS = \
- $(ACE_FLTK_LDFLAGS)
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_FlResource.la \
-  $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_FLTK_LIBS)
-
-endif BUILD_X11
-endif BUILD_TAO_FLRESOURCE
-endif BUILD_GL
-endif BUILD_FL
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_FLREACTOR
-
-## Makefile.FL_Cube_Server.am
-
-if BUILD_ACE_FLREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_FL
-if BUILD_GL
-if BUILD_TAO_FLRESOURCE
-if BUILD_X11
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_FLTK_CPPFLAGS)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-server_LDFLAGS = \
- $(ACE_FLTK_LDFLAGS)
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_FlResource.la \
-  $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_FLTK_LIBS)
-
-endif BUILD_X11
-endif BUILD_TAO_FLRESOURCE
-endif BUILD_GL
-endif BUILD_FL
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_FLREACTOR
-
-## 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/tests/FL_Cube/client.cpp b/tests/FL_Cube/client.cpp
index 49152351bee..4c3c82b1eda 100644
--- a/tests/FL_Cube/client.cpp
+++ b/tests/FL_Cube/client.cpp
@@ -3,8 +3,6 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(FL_Cube, client, "$Id$")
-
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Roller.H>
diff --git a/tests/FL_Cube/server.cpp b/tests/FL_Cube/server.cpp
index a1fa8259e32..06ab83c9456 100644
--- a/tests/FL_Cube/server.cpp
+++ b/tests/FL_Cube/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "tao/FlResource/FlResource_Loader.h"
 
-ACE_RCSID(FL_Cube, server, "$Id$")
-
 #include <FL/Fl.H>
 
 const ACE_TCHAR *ior_output_file = 0;
@@ -32,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/FL_Cube/test_i.cpp b/tests/FL_Cube/test_i.cpp
index 467b010daa7..2a9e6954f04 100644
--- a/tests/FL_Cube/test_i.cpp
+++ b/tests/FL_Cube/test_i.cpp
@@ -3,8 +3,6 @@
 #include "test_i.h"
 #include <GL/gl.h>
 
-ACE_RCSID(FL_Cube, test_i, "$Id$")
-
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
                                   Simple_Window *window)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/tests/FL_Cube/test_i.h b/tests/FL_Cube/test_i.h
index df7b3e46e23..0e44cef3353 100644
--- a/tests/FL_Cube/test_i.h
+++ b/tests/FL_Cube/test_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/FL_Server
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_FL_SERVER_TEST_I_H
 #define TAO_FL_SERVER_TEST_I_H
@@ -24,42 +21,43 @@
 class Simple_Window : public Fl_Gl_Window
 {
 public:
+  /// Constructor
   Simple_Window (int x, int y, int w, int h,
                  const char * l = 0);
-  // Constructor
 
   void set_x_angle (CORBA::Long x);
   void set_y_angle (CORBA::Long y);
 
 private:
+  /// from the Fl_Gl_Window...
   virtual void draw (void);
-  // from the Fl_Gl_Window...
 
   virtual void draw_cube (void);
 
+  /// The angles...
   CORBA::Long x_angle_;
   CORBA::Long y_angle_;
-  // The angles...
 
+  /// The vertices of the cube
   float boxv0[3]; float boxv1[3];
   float boxv2[3]; float boxv3[3];
   float boxv4[3]; float boxv5[3];
   float boxv6[3]; float boxv7[3];
-  // The vertices of the cube
 };
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb,
                    Simple_Window* window);
-  // ctor
 
   // = The Simple_Server methods.
   void set_x_angle (CORBA::Long x);
@@ -67,11 +65,11 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
+  /// Display the graphics...
   Simple_Window* window_;
-  // Display the graphics...
 };
 
 #endif /* TAO_FL_SERVER_TEST_I_H */
diff --git a/tests/Faults/Makefile.am b/tests/Faults/Makefile.am
deleted file mode 100644
index 8e1faf037bd..00000000000
--- a/tests/Faults/Makefile.am
+++ /dev/null
@@ -1,219 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Faults_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  pingC.cpp \
-  pingC.h \
-  pingC.inl \
-  pingS.cpp \
-  pingS.h \
-  pingS.inl
-
-CLEANFILES += \
-  ping-stamp \
-  pingC.cpp \
-  pingC.h \
-  pingC.inl \
-  pingS.cpp \
-  pingS.h \
-  pingS.inl
-
-pingC.cpp pingC.h pingC.inl pingS.cpp pingS.h pingS.inl: ping-stamp
-
-ping-stamp: $(srcdir)/ping.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ping.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ping.idl \
-  test.idl
-
-## Makefile.Faults_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Faults_Middle.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += middle
-
-middle_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-middle_SOURCES = \
-  middle.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-middle_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Faults_Ping.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += ping
-
-ping_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ping_SOURCES = \
-  ping.cpp \
-  pingC.cpp \
-  pingS.cpp \
-  ping_i.cpp \
-  ping_i.h \
-  ping_i.inl
-
-ping_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Faults_Pong.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += pong
-
-pong_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-pong_SOURCES = \
-  pingC.cpp \
-  pingS.cpp \
-  ping_i.cpp \
-  pong.cpp \
-  ping_i.h \
-  ping_i.inl
-
-pong_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Faults_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Faults/client.cpp b/tests/Faults/client.cpp
index 6b75438f351..d8d2d54cc08 100644
--- a/tests/Faults/client.cpp
+++ b/tests/Faults/client.cpp
@@ -5,8 +5,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID(Failure, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 10;
 int do_shutdown = 0;
@@ -63,7 +61,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -137,9 +135,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
             {
               server->shutdown_now (0);
             }
-          catch (const CORBA::COMM_FAILURE& comm_failure)
+          catch (const CORBA::COMM_FAILURE&)
             {
-              ACE_UNUSED_ARG (comm_failure);
               // Expected exception, continue....
             }
         }
@@ -149,9 +146,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
             {
               server->shutdown_now (1);
             }
-          catch (const CORBA::COMM_FAILURE& comm_failure)
+          catch (const CORBA::COMM_FAILURE&)
             {
-              ACE_UNUSED_ARG (comm_failure);
               // Expected exception, continue....
             }
         }
@@ -187,7 +183,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Exception caught in client:");
-      return 1;
+      return -1;
     }
 
   return 0;
diff --git a/tests/Faults/middle.cpp b/tests/Faults/middle.cpp
index 94cac6ee205..7f1aa5fd6d9 100644
--- a/tests/Faults/middle.cpp
+++ b/tests/Faults/middle.cpp
@@ -4,8 +4,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Failure, middle, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("middle.ior");
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 10;
@@ -42,7 +40,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Faults/ping.cpp b/tests/Faults/ping.cpp
index e3148bfe27b..14219aae5fb 100644
--- a/tests/Faults/ping.cpp
+++ b/tests/Faults/ping.cpp
@@ -4,8 +4,6 @@
 #include "ping_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Faults, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ping.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Faults/ping_i.cpp b/tests/Faults/ping_i.cpp
index 44c4ff825aa..17462fd4fc4 100644
--- a/tests/Faults/ping_i.cpp
+++ b/tests/Faults/ping_i.cpp
@@ -6,8 +6,6 @@
 #include "ping_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Faults, test_i, "$Id$")
-
 void
 PingObject_i::ping (PingObject_ptr callback)
 {
diff --git a/tests/Faults/ping_i.h b/tests/Faults/ping_i.h
index 79ec976b05c..6031f7e400f 100644
--- a/tests/Faults/ping_i.h
+++ b/tests/Faults/ping_i.h
@@ -1,37 +1,35 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Faults
-//
-// = FILENAME
-//   ping_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   ping_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_PING_I_H
 #define TAO_PING_I_H
 
 #include "pingS.h"
 
+/**
+ * @class PingObject_i
+ *
+ * @brief A simple implementation of the <ping> interface
+ *
+ * Used to verify that the client can tolerate server crashes with
+ * oneway invocations and that there are no problems with
+ * persistent object references after the crash.
+ */
 class PingObject_i : public POA_PingObject
 {
-  // = TITLE
-  //   A simple implementation of the <ping> interface
-  //
-  // = DESCRIPTION
-  //   Used to verify that the client can tolerate server crashes with
-  //   oneway invocations and that there are no problems with
-  //   persistent object references after the crash.
-  //
 public:
+  /// ctor
   PingObject_i (CORBA::ORB_ptr orb,
                 PortableServer::POA_ptr the_poa);
-  // ctor
 
   // = The PingObject interface methods
   void ping (PingObject_ptr callback);
@@ -41,11 +39,11 @@ public:
   PortableServer::POA_ptr _default_POA (void);
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 
+  /// The poa
   PortableServer::POA_var poa_;
-  // The poa
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/tests/Faults/pong.cpp b/tests/Faults/pong.cpp
index 322c2cefc01..580fa5b624f 100644
--- a/tests/Faults/pong.cpp
+++ b/tests/Faults/pong.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Faults, server, "$Id$")
-
 int iterations = 60;
 int period = 10;
 int kill_on = 30;
@@ -49,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Faults/server.cpp b/tests/Faults/server.cpp
index 7825120bda4..03c87f5762a 100644
--- a/tests/Faults/server.cpp
+++ b/tests/Faults/server.cpp
@@ -4,8 +4,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Failure, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Faults/test_i.cpp b/tests/Faults/test_i.cpp
index e8582c9ddeb..c7046eac7a7 100644
--- a/tests/Faults/test_i.cpp
+++ b/tests/Faults/test_i.cpp
@@ -8,8 +8,6 @@
 
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Failure, test_i, "$Id$")
-
 void
 Callback_i::shutdown (CORBA::Boolean is_clean)
 {
@@ -17,10 +15,9 @@ Callback_i::shutdown (CORBA::Boolean is_clean)
     {
       ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n"));
 
-// Tru64 seems to hang and not abort and dump core when abort() is called
-// here. This needs further investigation. This fix is a temporary one.
-// Likewise for OpenVMS.
-#if defined (DIGITAL_UNIX) || defined (DEC_CXX) || defined (ACE_OPENVMS)
+// OpenVMS seems to hang and not abort and dump core when abort() is called
+// here. This needs further investigation.
+#if defined (DEC_CXX) || defined (ACE_OPENVMS)
       ACE_OS::_exit();
 #else
       ACE_OS::abort();
@@ -56,7 +53,7 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean)
   if (is_clean == 0)
     {
       ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n"));
-#if defined (DIGITAL_UNIX) || defined (DEC_CXX) || defined (ACE_OPENVMS)
+#if defined (DEC_CXX) || defined (ACE_OPENVMS)
       ACE_OS::_exit();
 #else
       ACE_OS::abort();
diff --git a/tests/Faults/test_i.h b/tests/Faults/test_i.h
index 33cb36484d3..68d5f80cd05 100644
--- a/tests/Faults/test_i.h
+++ b/tests/Faults/test_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Server
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_FAILURE_TEST_I_H
 #define TAO_FAILURE_TEST_I_H
@@ -29,28 +26,29 @@ class Callback_i
   //   receives a callback object.
   //
 public:
+  /// ctor
   Callback_i (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// The callback method
   void shutdown (CORBA::Boolean is_clean);
-  // The callback method
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 };
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback,
@@ -62,22 +60,23 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
+/**
+ * @class Middle_i
+ *
+ * @brief Another implementation of the simple server...
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Middle_i : public virtual POA_Simple_Server
 {
-  // = TITLE
-  //   Another implementation of the simple server...
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Middle_i (CORBA::ORB_ptr orb,
             Simple_Server_ptr server);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback,
@@ -89,11 +88,11 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
+  /// The real server
   Simple_Server_var server_;
-  // The real server
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/tests/File_IO/File.idl b/tests/File_IO/File.idl
index 2d5070bfdbb..f8c0f49183f 100644
--- a/tests/File_IO/File.idl
+++ b/tests/File_IO/File.idl
@@ -1,17 +1,17 @@
-// $Id$
-
-//=================================================================
-//
-// = FILENAME
-//     File.idl
-//
-// = DESCRIPTION
-//     A simple File Descriptor and File System IDL interface.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//==================================================================
+
+//=============================================================================
+/**
+ *  @file     File.idl
+ *
+ *  $Id$
+ *
+ *   A simple File Descriptor and File System IDL interface.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 // IDL
 
diff --git a/tests/File_IO/File_i.cpp b/tests/File_IO/File_i.cpp
index 106ae0b6573..1776c7394c0 100644
--- a/tests/File_IO/File_i.cpp
+++ b/tests/File_IO/File_i.cpp
@@ -1,26 +1,24 @@
-// $Id$
-
-//===================================================================
-//
-// = FILENAME
-//     File_i.cpp
-//
-// = DESCRIPTION
-//      Implementation of the File IDL module and the interfaces
-//      Descriptor and System in it.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
+
+//=============================================================================
+/**
+ *  @file     File_i.cpp
+ *
+ *  $Id$
+ *
+ *    Implementation of the File IDL module and the interfaces
+ *    Descriptor and System in it.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "File_i.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Default_Servant, File_i, "File_i.cpp,v 1.14 2001/03/04 19:27:53 irfan Exp")
-
 // IDL File::System constructor
 FileImpl::System::System (PortableServer::POA_ptr poa)
   : poa_ (PortableServer::POA::_duplicate (poa)),
diff --git a/tests/File_IO/File_i.h b/tests/File_IO/File_i.h
index 3b4858c1c18..37d90074392 100644
--- a/tests/File_IO/File_i.h
+++ b/tests/File_IO/File_i.h
@@ -1,87 +1,96 @@
-// $Id$
-
-//===================================================================
-//
-// = FILENAME
-//     File_i.h
-//
-// = DESCRIPTION
-//      Defines the implementation classes for the File IDL
-//     module
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
+
+//=============================================================================
+/**
+ *  @file     File_i.h
+ *
+ *  $Id$
+ *
+ *    Defines the implementation classes for the File IDL
+ *   module
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "FileS.h"
 
+/**
+ * @class FileImpl
+ *
+ * @brief FileImpl class provides the namespace for the File IDL module .
+ */
 class FileImpl
 {
-  // = TITLE
-  //   FileImpl class provides the namespace for the File IDL module .
 public:
+  /**
+   * @class Descriptor
+   *
+   * @brief Descriptor implements the Descriptor interface in the File
+   * Module A single Descriptor servant can serve multiple object
+   * references
+   */
   class Descriptor : public POA_File::Descriptor
   {
-    // = TITLE
-    //   Descriptor implements the Descriptor interface in the File
-    //   Module A single Descriptor servant can serve multiple object
-    //   references
   public:
+    /// Constructor
     Descriptor (PortableServer::POA_ptr poa);
-    // Constructor
 
+    /// Destructor
     ~Descriptor (void);
-    // Destructor
 
+    /// Returns the default POA of this object
     PortableServer::POA_ptr _default_POA (void);
-    // Returns the default POA of this object
 
+    /// write buffer to File corresponding to this Descriptor
     virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer);
-    // write buffer to File corresponding to this Descriptor
 
     virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes);
 
+    /// seek to the offset in file from whence
     virtual CORBA::ULong lseek (CORBA::ULong offset,
                                 CORBA::Long whence);
-    // seek to the offset in file from whence
 
+    /// closes the file corresponding to the requested ObjectID
     virtual void destroy (void);
-    // closes the file corresponding to the requested ObjectID
 
   private:
 
+    /// Extracts the ACE_HANDLE from the objectID
     ACE_HANDLE fd (void);
-    // Extracts the ACE_HANDLE from the objectID
 
     PortableServer::POA_var poa_;
   };
 
+  /**
+   * @class System
+   *
+   * @brief File System implementation class.
+   */
   class System : public POA_File::System
   {
-    // = TITLE
-    //   File System implementation class.
   public:
+    /// Constructor, Creates a single File Descriptor Servant and
+    /// registers it with the POA as the Default Servant
     System (PortableServer::POA_ptr poa);
-    // Constructor, Creates a single File Descriptor Servant and
-    // registers it with the POA as the Default Servant
 
+    ///Destructor
     ~System (void);
-    //Destructor
 
+    ///Returns the default POA of this object
     PortableServer::POA_ptr _default_POA (void);
-    //Returns the default POA of this object
 
+    /// Opens a file ,creates a Descriptor reference with the
+    /// ACE_HANDLE and returns that reference
     File::Descriptor_ptr open (const char *file_name,
                                CORBA::Long flags);
-    // Opens a file ,creates a Descriptor reference with the
-    // ACE_HANDLE and returns that reference
 
   private:
     PortableServer::POA_var poa_;
 
+    /// The single File Descriptor servant which serves requests for
+    /// any Descriptor object under poa_.
     Descriptor fd_servant_;
-    // The single File Descriptor servant which serves requests for
-    // any Descriptor object under poa_.
   };
 };
diff --git a/tests/File_IO/Makefile.am b/tests/File_IO/Makefile.am
deleted file mode 100644
index a6bb85be07e..00000000000
--- a/tests/File_IO/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.File_IO_Idl.am
-
-BUILT_SOURCES = \
-  FileC.cpp \
-  FileC.h \
-  FileC.inl \
-  FileS.cpp \
-  FileS.h \
-  FileS.inl
-
-CLEANFILES = \
-  File-stamp \
-  FileC.cpp \
-  FileC.h \
-  FileC.inl \
-  FileS.cpp \
-  FileS.h \
-  FileS.inl
-
-FileC.cpp FileC.h FileC.inl FileS.cpp FileS.h FileS.inl: File-stamp
-
-File-stamp: $(srcdir)/File.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/File.idl
-	@touch $@
-
-noinst_HEADERS = \
-  File.idl
-
-## Makefile.File_IO_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  FileC.cpp \
-  client.cpp \
-  File_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.File_IO_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  FileC.cpp \
-  FileS.cpp \
-  File_i.cpp \
-  server.cpp \
-  File_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/File_IO/client.cpp b/tests/File_IO/client.cpp
index e5bc56086c0..fa43de2625b 100644
--- a/tests/File_IO/client.cpp
+++ b/tests/File_IO/client.cpp
@@ -1,31 +1,28 @@
-// $Id$
-
-//===================================================================
-//  = LIBRARY
-//      TAO/tests/POA/Default_Servant/client
-//
-//  = FILENAME
-//     client.cpp
-//
-//  = DESCRIPTION
-//      A client program for the File IDL module
-//
-//  = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *    A client program for the File IDL module
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "FileC.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
-#include "ace/OS.h"
 #include "ace/SString.h"
 #include "ace/Thread_Manager.h"
+#include "ace/OS_NS_fcntl.h"
+#include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Default_Servant, client, "client.cpp,v 1.8 2001/03/26 21:16:52 coryan Exp")
-
-  static const ACE_TCHAR *iorfile = ACE_TEXT("ior");
+static const ACE_TCHAR *iorfile = ACE_TEXT("ior");
 static const ACE_TCHAR *filename = ACE_TEXT("big.txt");
 
 static int NUM_THREADS = 4;
diff --git a/tests/File_IO/run_test.pl b/tests/File_IO/run_test.pl
index 7f03bd227fa..61749665a3f 100755
--- a/tests/File_IO/run_test.pl
+++ b/tests/File_IO/run_test.pl
@@ -15,10 +15,10 @@ $client_debug_level = '0';
 foreach $i (@ARGV) {
     if ($i eq '-sdebug') {
         $server_debug_level = '10';
-    } 
+    }
     if ($i eq '-cdebug') {
         $client_debug_level = '10';
-    } 
+    }
 }
 
 
diff --git a/tests/File_IO/server.cpp b/tests/File_IO/server.cpp
index c02ab0419a1..d358a3ffbc4 100644
--- a/tests/File_IO/server.cpp
+++ b/tests/File_IO/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "File_i.h"
 #include "tao/debug.h"
@@ -8,22 +9,17 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
 
-ACE_RCSID (File_IO,
-           server,
-           "$Id$")
-
 static const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 static const int nthreads = 2;
 
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   Worker (CORBA::ORB_ptr orb);
   // ctor
diff --git a/tests/ForwardOnceUponException/client.cpp b/tests/ForwardOnceUponException/client.cpp
index 75910c8096d..5d3e11e6777 100755
--- a/tests/ForwardOnceUponException/client.cpp
+++ b/tests/ForwardOnceUponException/client.cpp
@@ -3,11 +3,9 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
-#include "ace/OS.h"
 #include "ace/streams.h"
 #include "tao/Invocation_Utils.h"
-
-ACE_RCSID(ForwardOnceUponException, client, "$Id$")
+#include "ace/OS_NS_unistd.h"
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 1;
@@ -64,7 +62,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           ACE_OS::strlen(corbaloc_prefix)) != 0)
       return 1;
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -83,7 +81,7 @@ public:
   // Return number of received exceptions.
   int num_received_ex () const;
 
-  // Is test done ? 
+  // Is test done ?
   void done ();
 
 private:
@@ -120,9 +118,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       int timeout = 30;
       int now = 0;
-      while (now < timeout 
-        && ((expect_ex_kind != TAO::FOE_NON 
-             && worker.received_ex_kind () != expect_ex_kind 
+      while (now < timeout
+        && ((expect_ex_kind != TAO::FOE_NON
+             && worker.received_ex_kind () != expect_ex_kind
              && worker.num_received_ex () != expect_num_ex)
             || expect_ex_kind == TAO::FOE_NON))
       {
@@ -152,16 +150,16 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       worker.thr_mgr ()->wait ();
 
-      if (worker.received_ex_kind () != expect_ex_kind 
+      if (worker.received_ex_kind () != expect_ex_kind
         || worker.num_received_ex () != expect_num_ex)
       {
         ACE_ERROR_RETURN ((LM_ERROR,
           ("(%P|%t)client: test failed - expected is different from received. "
-          "expected %d/%d received %d/%d.\n"), 
+          "expected %d/%d received %d/%d.\n"),
           expect_ex_kind, expect_num_ex, worker.received_ex_kind (), worker.num_received_ex()),
                           1);
       }
-            
+
       ACE_DEBUG ((LM_DEBUG, "(%P|%t)client: test passed.\n"));
     }
   catch (const CORBA::Exception& ex)
@@ -212,7 +210,7 @@ Worker::svc (void)
             ACE_DEBUG ((LM_DEBUG,
                         "(%P|%t) unexpected result = %d\n",
                         r));
-  
+
         }
         catch (const CORBA::OBJECT_NOT_EXIST &)
           {
@@ -257,25 +255,25 @@ Worker::svc (void)
       ex._tao_print_exception (
         "Unexpected exception caught");
     }
-   
+
   return 0;
 }
 
 
-int 
+int
 Worker::received_ex_kind () const
 {
   return received_ex_kind_;
 }
 
-int 
+int
 Worker::num_received_ex () const
 {
   return num_received_ex_;
 }
 
-void 
-Worker::done () 
+void
+Worker::done ()
 {
   done_ = true;
 }
diff --git a/tests/ForwardOnceUponException/run_test.pl b/tests/ForwardOnceUponException/run_test.pl
index 0271ba7cbaf..cf934765749 100755
--- a/tests/ForwardOnceUponException/run_test.pl
+++ b/tests/ForwardOnceUponException/run_test.pl
@@ -18,74 +18,74 @@ foreach $i (@ARGV) {
 }
 
 # Current supported forward once exceptions:
-#      EF_OBJECT_NOT_EXIST = 0x1,  
-#      EF_COMM_FAILURE     = 0x2,   
-#      EF_TRANSIENT        = 0x4,   
-#      EF_INV_OBJREF       = 0x8,   
+#      EF_OBJECT_NOT_EXIST = 0x1,
+#      EF_COMM_FAILURE     = 0x2,
+#      EF_TRANSIENT        = 0x4,
+#      EF_INV_OBJREF       = 0x8,
 @configurations = ({
-         description => "case 1: not forward upon OBJECT_NOT_EXIST exception", 
+         description => "case 1: not forward upon OBJECT_NOT_EXIST exception",
          orb_exception_forward_opt => "-ORBForwardOnceOnObjectNotExist 0",
          num_requests => "1",
          client_expect_num_ex => "1",
-         client_expect_ex_kind => "1", 
-         server_raise_ex_kind => "1", 
+         client_expect_ex_kind => "1",
+         server_raise_ex_kind => "1",
          servant_calls => "1",
      },{
-         description => "case 2: default Fault Tolerant always forward upon COMM_FAILURE exception", 
+         description => "case 2: default Fault Tolerant always forward upon COMM_FAILURE exception",
          orb_exception_forward_opt => "-ORBForwardOnceOnCommFailure 0",
          num_requests => "1",
          client_expect_num_ex => "0",
-         client_expect_ex_kind => "0", 
-         server_raise_ex_kind => "2", 
+         client_expect_ex_kind => "0",
+         server_raise_ex_kind => "2",
          servant_calls => "0",  # use 0 to indicate request looping case
      },{
-         description => "case 3: default Fault Tolerant always forward upon TRANSIENT exception", 
+         description => "case 3: default Fault Tolerant always forward upon TRANSIENT exception",
          orb_exception_forward_opt => "-ORBForwardOnceOnTransient 0",
          num_requests => "1",
          client_expect_num_ex => "0",
-         client_expect_ex_kind => "0", 
-         server_raise_ex_kind => "4", 
+         client_expect_ex_kind => "0",
+         server_raise_ex_kind => "4",
          servant_calls => "0",  # use 0 to indicate request looping case
      },{
-         description => "case 4: not forward upon INV_OBJREF exception", 
+         description => "case 4: not forward upon INV_OBJREF exception",
          orb_exception_forward_opt => "-ORBForwardOnceOnInvObjref 0",
          num_requests => "1",
-         client_expect_num_ex => "1", 
-         client_expect_ex_kind => "8", 
-         server_raise_ex_kind => "8", 
+         client_expect_num_ex => "1",
+         client_expect_ex_kind => "8",
+         server_raise_ex_kind => "8",
          servant_calls => "1",
      },{
-         description => "case 5: forward once upon OBJECT_NOT_EXIST exception", 
+         description => "case 5: forward once upon OBJECT_NOT_EXIST exception",
          orb_exception_forward_opt => "-ORBForwardOnceOnObjectNotExist 1",
          num_requests => "4",
-         client_expect_num_ex => "4", 
-         client_expect_ex_kind => "1", 
-         server_raise_ex_kind => "1", 
-         servant_calls => "5", # 4 requests + 1 forward 
+         client_expect_num_ex => "4",
+         client_expect_ex_kind => "1",
+         server_raise_ex_kind => "1",
+         servant_calls => "5", # 4 requests + 1 forward
      },{
-         description => "case 6: forward once upon COMM_FAILURE exception", 
+         description => "case 6: forward once upon COMM_FAILURE exception",
          orb_exception_forward_opt => "-ORBForwardOnceOnCommFailure 1",
-         num_requests => "4", 
-         client_expect_num_ex => "4", 
-         client_expect_ex_kind => "2", 
-         server_raise_ex_kind => "2", 
-         servant_calls => "5", # 4 requests + 1 forward 
+         num_requests => "4",
+         client_expect_num_ex => "4",
+         client_expect_ex_kind => "2",
+         server_raise_ex_kind => "2",
+         servant_calls => "5", # 4 requests + 1 forward
      },{
-         description => "case 7: forward once upon TRANSIENT exception", 
+         description => "case 7: forward once upon TRANSIENT exception",
          orb_exception_forward_opt => "-ORBForwardOnceOnTransient 1",
          num_requests => "4",
-         client_expect_num_ex => "4", 
-         client_expect_ex_kind => "4", 
-         server_raise_ex_kind => "4", 
-         servant_calls => "5", # 4 requests + 1 forward 
+         client_expect_num_ex => "4",
+         client_expect_ex_kind => "4",
+         server_raise_ex_kind => "4",
+         servant_calls => "5", # 4 requests + 1 forward
      },{
-         description => "case 8: forward once upon INV_OBJREF exception", 
+         description => "case 8: forward once upon INV_OBJREF exception",
          orb_exception_forward_opt => "-ORBForwardOnceOnInvObjref 1",
          num_requests => "4",
-         client_expect_num_ex => "4", 
-         client_expect_ex_kind => "8", 
-         server_raise_ex_kind => "8", 
-         servant_calls => "5", # 4 requests + 1 forward 
+         client_expect_num_ex => "4",
+         client_expect_ex_kind => "8",
+         server_raise_ex_kind => "8",
+         servant_calls => "5", # 4 requests + 1 forward
      },
     );
 
@@ -114,7 +114,7 @@ for $test (@configurations) {
                                             "-e $test->{client_expect_ex_kind} " .
                                             "-n $test->{client_expect_num_ex} ".
                                             "-i $test->{num_requests} $test->{orb_exception_forward_opt}");
-                               
+
     print STDERR $SV->CommandLine () . "\n";
     print STDERR $CL->CommandLine () . "\n";
 
diff --git a/tests/ForwardOnceUponException/server.cpp b/tests/ForwardOnceUponException/server.cpp
index 915615adbee..cde9adfca59 100755
--- a/tests/ForwardOnceUponException/server.cpp
+++ b/tests/ForwardOnceUponException/server.cpp
@@ -6,8 +6,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/Invocation_Utils.h"
 
-ACE_RCSID(ForwardOnceUponException, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 int expect_servant_calls = 1;
 int raise_exception = TAO::FOE_NON;
@@ -43,7 +41,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -112,7 +110,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t)server: event loop finished\n"));
 
-      // If expect_servant_calls is 0, it means it's the request forward looping case so the 
+      // If expect_servant_calls is 0, it means it's the request forward looping case so the
       // servant continue receiving calls from a single request. We can not determine how many
       // servant calls but it should be more than the number of requests.
       if ((expect_servant_calls == 0 && (server_impl.ncalls () > num_requests))
diff --git a/tests/ForwardOnceUponException/test_i.cpp b/tests/ForwardOnceUponException/test_i.cpp
index e899da4f4b4..e139a027d6c 100755
--- a/tests/ForwardOnceUponException/test_i.cpp
+++ b/tests/ForwardOnceUponException/test_i.cpp
@@ -6,7 +6,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ForwardOnceUponException, test_i, "$Id$")
 extern int raise_exception;
 
 CORBA::Boolean
@@ -19,19 +18,19 @@ Simple_Server_i::test_is_a (const char * /* type */)
     //ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a called %d and raise OBJECT_NOT_EXIST\n", ncalls_));
     throw ::CORBA::OBJECT_NOT_EXIST ();
   }
-  
+
   if ((raise_exception & TAO::FOE_COMM_FAILURE) == TAO::FOE_COMM_FAILURE)
   {
     //ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a called %d and raise COMM_FAILURE\n", ncalls_));
     throw ::CORBA::COMM_FAILURE ();
   }
-  
+
   if ((raise_exception & TAO::FOE_TRANSIENT) == TAO::FOE_TRANSIENT)
   {
     //ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a called %d and raise TRANSIENT\n", ncalls_));
     throw ::CORBA::TRANSIENT ();
   }
-  
+
   if ((raise_exception & TAO::FOE_INV_OBJREF) == TAO::FOE_INV_OBJREF)
   {
     //ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a called %d and raise INV_OBJREF\n", ncalls_));
diff --git a/tests/ForwardOnceUponException/test_i.h b/tests/ForwardOnceUponException/test_i.h
index ce17954e580..169a6a7823f 100755
--- a/tests/ForwardOnceUponException/test_i.h
+++ b/tests/ForwardOnceUponException/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Forwarding
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_FORWARDING_TEST_I_H
 #define TAO_FORWARDING_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Boolean test_is_a (const char * type);
@@ -38,8 +36,8 @@ public:
   int ncalls () const;
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
   int ncalls_;
 
   int raise_exception_;
diff --git a/tests/ForwardUponObjectNotExist/client.cpp b/tests/ForwardUponObjectNotExist/client.cpp
index 4243ec5ee13..783d187e115 100755
--- a/tests/ForwardUponObjectNotExist/client.cpp
+++ b/tests/ForwardUponObjectNotExist/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(Forwarding, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 1;
 int do_shutdown = 0;
@@ -49,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           ACE_OS::strlen (corbaloc_prefix)) != 0)
       return 1;
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -190,7 +188,7 @@ Worker::run_test (void)
                 r));
 }
 
-int 
+int
 Worker::got_object_not_exist () const
 {
   return got_object_not_exist_;
diff --git a/tests/ForwardUponObjectNotExist/server.cpp b/tests/ForwardUponObjectNotExist/server.cpp
index 94f63160aeb..eb95494366b 100755
--- a/tests/ForwardUponObjectNotExist/server.cpp
+++ b/tests/ForwardUponObjectNotExist/server.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Forwarding, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -31,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/ForwardUponObjectNotExist/test_i.cpp b/tests/ForwardUponObjectNotExist/test_i.cpp
index fbb43910dbb..bc33c618f74 100755
--- a/tests/ForwardUponObjectNotExist/test_i.cpp
+++ b/tests/ForwardUponObjectNotExist/test_i.cpp
@@ -6,8 +6,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Forwarding, test_i, "$Id$")
-
 CORBA::Boolean
 Simple_Server_i::test_is_a (const char * /* type */)
 {
diff --git a/tests/ForwardUponObjectNotExist/test_i.h b/tests/ForwardUponObjectNotExist/test_i.h
index 60670e13d54..abf27c63925 100755
--- a/tests/ForwardUponObjectNotExist/test_i.h
+++ b/tests/ForwardUponObjectNotExist/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Forwarding
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_FORWARDING_TEST_I_H
 #define TAO_FORWARDING_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Boolean test_is_a (const char * type);
@@ -36,8 +34,8 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/tests/Forwarding/Makefile.am b/tests/Forwarding/Makefile.am
deleted file mode 100644
index f2d088fb389..00000000000
--- a/tests/Forwarding/Makefile.am
+++ /dev/null
@@ -1,109 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Forwarding_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Forwarding_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Forwarding_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Forwarding/client.cpp b/tests/Forwarding/client.cpp
index c92a7dcf9b6..bfd91f357d5 100644
--- a/tests/Forwarding/client.cpp
+++ b/tests/Forwarding/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(Forwarding, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 10;
 int nthreads = 1;
@@ -42,7 +40,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Forwarding/server.cpp b/tests/Forwarding/server.cpp
index 3f969e20acc..7abc09e549a 100644
--- a/tests/Forwarding/server.cpp
+++ b/tests/Forwarding/server.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Forwarding, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -31,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Forwarding/test_i.cpp b/tests/Forwarding/test_i.cpp
index 120c6f7b96b..4c2a71f0302 100644
--- a/tests/Forwarding/test_i.cpp
+++ b/tests/Forwarding/test_i.cpp
@@ -6,8 +6,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Forwarding, test_i, "$Id$")
-
 CORBA::Boolean
 Simple_Server_i::test_is_a (const char * /* type */)
 {
diff --git a/tests/Forwarding/test_i.h b/tests/Forwarding/test_i.h
index 60670e13d54..abf27c63925 100644
--- a/tests/Forwarding/test_i.h
+++ b/tests/Forwarding/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Forwarding
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_FORWARDING_TEST_I_H
 #define TAO_FORWARDING_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Boolean test_is_a (const char * type);
@@ -36,8 +34,8 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp b/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
index b7af4d6d5b2..56c489c9f5a 100644
--- a/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
+++ b/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (Test::Big_Reply_ptr reply_gen,
                           int event_count,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am b/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am
deleted file mode 100644
index 42a0e234115..00000000000
--- a/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am
+++ /dev/null
@@ -1,109 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Java_Big_Reply_IDL.am
-
-if BUILD_JAVA
-
-BUILT_SOURCES += \
-  Test/
-
-CLEANFILES += \
-  Test/
-
-Test/: $(srcdir)/Test.idl
-	mkdir -p Test
-	idlj -fall $(srcdir)/Test.idl
-
-endif BUILD_JAVA
-
-## Makefile.Java_Big_Reply.am
-
-if BUILD_EXCEPTIONS
-if BUILD_JAVA
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  server.class
-
-CLEANFILES += \
-  server.class
-
-server.class: $(srcdir)/server.java
-	javac -d . $(srcdir)/server.java
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_JAVA
-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/tests/GIOP_Fragments/Java_Big_Reply/client.cpp b/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
index a8c008992f5..2edab1ba7d7 100644
--- a/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
+++ b/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
@@ -3,8 +3,6 @@
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Muxing, client, "$Id$")
-
 static const ACE_TCHAR *ior = ACE_TEXT("file://server.ior");
 static size_t nthreads = 1;
 
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/GIOP_Fragments/Java_Big_Reply/server.java b/tests/GIOP_Fragments/Java_Big_Reply/server.java
index f23d552c542..c89b7595e7f 100644
--- a/tests/GIOP_Fragments/Java_Big_Reply/server.java
+++ b/tests/GIOP_Fragments/Java_Big_Reply/server.java
@@ -59,4 +59,4 @@ public class server
       e.printStackTrace (System.out);
     }
   }
-} 
+}
diff --git a/tests/GIOP_Fragments/Java_Big_Request/Makefile.am b/tests/GIOP_Fragments/Java_Big_Request/Makefile.am
deleted file mode 100644
index 581f28beb4e..00000000000
--- a/tests/GIOP_Fragments/Java_Big_Request/Makefile.am
+++ /dev/null
@@ -1,109 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Java_Big_Request_IDL.am
-
-if BUILD_JAVA
-
-BUILT_SOURCES += \
-  Test/
-
-CLEANFILES += \
-  Test/
-
-Test/: $(srcdir)/Test.idl
-	mkdir -p Test
-	idlj  $(srcdir)/Test.idl
-
-endif BUILD_JAVA
-
-## Makefile.Java_Big_Request.am
-
-if BUILD_EXCEPTIONS
-if BUILD_JAVA
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  client.class
-
-CLEANFILES += \
-  client.class
-
-client.class: $(srcdir)/client.java
-	javac -d . $(srcdir)/client.java
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Payload_Receiver.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Payload_Receiver.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_JAVA
-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/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp b/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
index 81ee459c199..df4950cf28c 100644
--- a/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
+++ b/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
@@ -3,8 +3,6 @@
 //
 #include "Payload_Receiver.h"
 
-ACE_RCSID(Big_Request_Muxing, Payload_Receiver, "$Id$")
-
 Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb)
  : count_ (0),
    orb_(CORBA::ORB::_duplicate (orb))
diff --git a/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/tests/GIOP_Fragments/Java_Big_Request/server.cpp
index 8be5ca51ce4..127a41292a1 100644
--- a/tests/GIOP_Fragments/Java_Big_Request/server.cpp
+++ b/tests/GIOP_Fragments/Java_Big_Request/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Big_Request_Muxing, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/GIOP_Fragments/Makefile.am b/tests/GIOP_Fragments/Makefile.am
deleted file mode 100644
index a3b8104e475..00000000000
--- a/tests/GIOP_Fragments/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Java_Big_Reply \
-        Java_Big_Request \
-        PMB_With_Fragments
-
diff --git a/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am b/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am
deleted file mode 100644
index 1f6a5ba4b6b..00000000000
--- a/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am
+++ /dev/null
@@ -1,80 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.PMB_With_Fragments.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Payload_Receiver.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Payload_Receiver.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp b/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
index 1da64d18952..df4950cf28c 100644
--- a/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
+++ b/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
@@ -3,8 +3,6 @@
 //
 #include "Payload_Receiver.h"
 
-ACE_RCSID(PMB_With_Fragments, Payload_Receiver, "$Id$")
-
 Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb)
  : count_ (0),
    orb_(CORBA::ORB::_duplicate (orb))
diff --git a/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl b/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl
index 26a561aa58b..3e10a136d4d 100755
--- a/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl
+++ b/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl
@@ -53,7 +53,7 @@ if (!$result) {
   my($initial) = length($str);
   my($length)  = $initial;
   my($maxLine) = 78;
- 
+
   print $str;
 
   foreach my $key (sort keys %options) {
diff --git a/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
index b3a64237d4a..8c5e4caddff 100644
--- a/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
+++ b/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Big_Request_Muxing, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/HandleExhaustion/Makefile.am b/tests/HandleExhaustion/Makefile.am
deleted file mode 100644
index f096aa29bea..00000000000
--- a/tests/HandleExhaustion/Makefile.am
+++ /dev/null
@@ -1,102 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.HandleExhaustion_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.HandleExhaustion_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.HandleExhaustion_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp
-
-client_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/tests/HandleExhaustion/client.cpp b/tests/HandleExhaustion/client.cpp
index dd2e4af7a87..7a9d40c66d6 100644
--- a/tests/HandleExhaustion/client.cpp
+++ b/tests/HandleExhaustion/client.cpp
@@ -4,9 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(ConnectionSpinning,
-          client, "$Id$")
-
 static const ACE_TCHAR *ior = ACE_TEXT ("file://server.ior");
 
 int
@@ -31,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/HandleExhaustion/server.cpp b/tests/HandleExhaustion/server.cpp
index 38eced40b06..8b09a8fddd0 100644
--- a/tests/HandleExhaustion/server.cpp
+++ b/tests/HandleExhaustion/server.cpp
@@ -8,9 +8,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_resource.h"
 
-ACE_RCSID (ConnectionSpinning,
-           server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior");
 
 class Test_i: public virtual POA_Test
@@ -102,7 +99,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Hang_Shutdown/Makefile.am b/tests/Hang_Shutdown/Makefile.am
deleted file mode 100644
index 467eea862ac..00000000000
--- a/tests/Hang_Shutdown/Makefile.am
+++ /dev/null
@@ -1,107 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Hang_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Hang_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Hang_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/tests/Hang_Shutdown/client.cpp b/tests/Hang_Shutdown/client.cpp
index 2763c058f75..b9a6d27a1fb 100644
--- a/tests/Hang_Shutdown/client.cpp
+++ b/tests/Hang_Shutdown/client.cpp
@@ -2,11 +2,9 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS.h"
 #include "ace/Task.h"
 #include "ace/Profile_Timer.h"
-
-ACE_RCSID(Hello, client, "$Id$")
+#include "ace/OS_NS_unistd.h"
 
 namespace Test
 {
@@ -50,7 +48,7 @@ namespace Test
                             false);
         }
 
-    // Indicates sucessful parsing of the command line
+    // Indicates successful parsing of the command line
     return true;
   }
 
diff --git a/tests/Hang_Shutdown/server.cpp b/tests/Hang_Shutdown/server.cpp
index 1b4a98d57b3..aed5b6d77dc 100644
--- a/tests/Hang_Shutdown/server.cpp
+++ b/tests/Hang_Shutdown/server.cpp
@@ -30,7 +30,7 @@ namespace Test
                              argv [0]),
                             -1);
         }
-    // Indicates sucessful parsing of the command line
+    // Indicates successful parsing of the command line
     return 0;
   }
 
diff --git a/tests/Hello/Hello.cpp b/tests/Hello/Hello.cpp
index df5dc90d3d9..df49d37a507 100644
--- a/tests/Hello/Hello.cpp
+++ b/tests/Hello/Hello.cpp
@@ -1,10 +1,6 @@
-//
 // $Id$
-//
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Hello/Makefile.am b/tests/Hello/Makefile.am
deleted file mode 100644
index a0e2286e095..00000000000
--- a/tests/Hello/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Hello_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Hello_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Hello_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Hello/client.cpp b/tests/Hello/client.cpp
index 940e5439939..1bb3e718137 100644
--- a/tests/Hello/client.cpp
+++ b/tests/Hello/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
diff --git a/tests/Hello/server.cpp b/tests/Hello/server.cpp
index cacd790a6ff..205a7c179e0 100644
--- a/tests/Hello/server.cpp
+++ b/tests/Hello/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/ICMG_Any_Bug/Hello.cpp b/tests/ICMG_Any_Bug/Hello.cpp
index 785ca17bae2..4242c5294a4 100644
--- a/tests/ICMG_Any_Bug/Hello.cpp
+++ b/tests/ICMG_Any_Bug/Hello.cpp
@@ -4,8 +4,6 @@
 #include "Hello.h"
 #include "HelloWorld.h"
 
-ACE_RCSID(ICMG_Any_Bug, Hello, "$Id")
-
 Hello::Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
   : poa_ (PortableServer::POA::_duplicate (poa)),
     orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/tests/ICMG_Any_Bug/HelloWorld.cpp b/tests/ICMG_Any_Bug/HelloWorld.cpp
index a3811dfb3d9..9fe083d79ed 100644
--- a/tests/ICMG_Any_Bug/HelloWorld.cpp
+++ b/tests/ICMG_Any_Bug/HelloWorld.cpp
@@ -4,10 +4,6 @@
 
 #include "HelloWorld.h"
 
-
-ACE_RCSID (ICMG_Any_Bug, HelloWorld, "$Id$")
-
-
 HelloWorld::HelloWorld (void)
 {
 }
diff --git a/tests/ICMG_Any_Bug/Makefile.am b/tests/ICMG_Any_Bug/Makefile.am
deleted file mode 100644
index 28b42bb7108..00000000000
--- a/tests/ICMG_Any_Bug/Makefile.am
+++ /dev/null
@@ -1,118 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.ICMG_Any_Bug_Hello_IDL.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.ICMG_Any_Bug_Hello_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h \
-  HelloWorld.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.ICMG_Any_Bug_Hello_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  HelloWorld.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  HelloWorld.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/ICMG_Any_Bug/client.cpp b/tests/ICMG_Any_Bug/client.cpp
index 8638de85caa..04ee037423f 100644
--- a/tests/ICMG_Any_Bug/client.cpp
+++ b/tests/ICMG_Any_Bug/client.cpp
@@ -6,10 +6,6 @@
 #include "ace/Get_Opt.h"
 #include <string>
 
-ACE_RCSID (ICMG_Any_Bug,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -34,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/ICMG_Any_Bug/server.cpp b/tests/ICMG_Any_Bug/server.cpp
index f0e69cd322c..aea9277fb44 100644
--- a/tests/ICMG_Any_Bug/server.cpp
+++ b/tests/ICMG_Any_Bug/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (ICMG_Any_Bug,
-           server,
-           "$Id$ ")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/IDL_Inherited_Operation/InheritedOp.idl b/tests/IDL_Inherited_Operation/InheritedOp.idl
index b8d54bafcb2..b24866358c6 100644
--- a/tests/IDL_Inherited_Operation/InheritedOp.idl
+++ b/tests/IDL_Inherited_Operation/InheritedOp.idl
@@ -13,9 +13,9 @@ module Outer
     };
   };
 };
-   
+
 module Outer
-{    
+{
   module Inner
   {
     interface Base;
diff --git a/tests/IDL_Inherited_Operation/InheritedOp_i.cpp b/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
index d7727558b6a..1fdf64ad83d 100644
--- a/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
+++ b/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 
 #include "InheritedOp_i.h"
 
diff --git a/tests/IDL_Inherited_Operation/InheritedOp_i.h b/tests/IDL_Inherited_Operation/InheritedOp_i.h
index 2248ee1d872..efc430f3851 100644
--- a/tests/IDL_Inherited_Operation/InheritedOp_i.h
+++ b/tests/IDL_Inherited_Operation/InheritedOp_i.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id:$
+// $Id$
 
 #ifndef INHERITED_OP_I_H
 #define INHERITED_OP_I_H
@@ -11,10 +11,10 @@ class Derived_i : public virtual POA_Outer::Derived
 {
 public:
   Derived_i (CORBA::ORB_ptr orb);
-  
+
   virtual void BaseOp (void);
   virtual void shutdown (void);
-  
+
 private:
   CORBA::ORB_ptr orb_;
 };
diff --git a/tests/IDL_Inherited_Operation/server.cpp b/tests/IDL_Inherited_Operation/server.cpp
index dfaf09025f6..ae20f1251a1 100644
--- a/tests/IDL_Inherited_Operation/server.cpp
+++ b/tests/IDL_Inherited_Operation/server.cpp
@@ -27,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/IDL_Test/Bug_3312_Regression.idl b/tests/IDL_Test/Bug_3312_Regression.idl
new file mode 100644
index 00000000000..25c96b4ac7e
--- /dev/null
+++ b/tests/IDL_Test/Bug_3312_Regression.idl
@@ -0,0 +1,18 @@
+// $Id$
+
+module CallMe
+  {
+    enum Colors { Red, Green, Blue };
+
+    union YourColorBaby switch (enum ColorMe { Red, Blue })
+      {
+        case Red: enum Val { one, two } c_1;
+        case Blue: long c_2;
+      };
+
+    union YourCar switch (enum ColorMe { Green, Pink })
+      {
+        case Green: short c_1;
+        case Pink: short c_2;
+      };
+  };
diff --git a/tests/IDL_Test/IDL_Test.mpc b/tests/IDL_Test/IDL_Test.mpc
index 4b865bc15ab..8c58bdf1d55 100644
--- a/tests/IDL_Test/IDL_Test.mpc
+++ b/tests/IDL_Test/IDL_Test.mpc
@@ -1,5 +1,6 @@
 // -*- MPC -*-
 // $Id$
+
 project(*IDL): taoserver, messaging, gen_ostream {
   custom_only=1
   idlflags += -GC -GH -Gd -GT
@@ -15,7 +16,6 @@ project(*IDL): taoserver, messaging, gen_ostream {
   }
 
   IDL_Files {
-    array.idl
     Bug_2350_Regression.idl
     Bug_2577_Regression.idl
     Bug_2582_Regression.idl
@@ -23,14 +23,12 @@ project(*IDL): taoserver, messaging, gen_ostream {
     Bug_2616_Regression.idl
     Bug_2619_Regression.idl
     Bug_3243_Regression.idl
+    Bug_3312_Regression.idl
     Bug_3819_Regression.idl
     Bug_3821_Regression.idl
-    enum_in_struct.idl
     full.idl
     fwd.idl
     gperf.idl
-    included.idl
-    including.idl
     interface.idl
     nested_scope.idl
 
@@ -48,17 +46,32 @@ project(*IDL): taoserver, messaging, gen_ostream {
     struct.idl
     reopen_include1.idl
     reopen_include2.idl
-    sequence.idl
     typeprefix.idl
+  }
+
+  IDL_Files {
+    idlflags += -as
+    enum_in_struct.idl
+    array.idl
+    array_anon_nested.idl
+    included.idl
+    including.idl
+    sequence.idl
     union.idl
+    anyunion.idl
   }
 
   IDL_Files {
-    idlflags += -GA
+    idlflags += -GA -as
     anonymous.idl
+    dif2.idl
+    valuetype.idl
+  }
+
+  IDL_Files {
+    idlflags += -GA
     array_only.idl
     constants.idl
-    dif2.idl
     generic_object.idl
     keywords.idl
 
@@ -70,7 +83,6 @@ project(*IDL): taoserver, messaging, gen_ostream {
     repo_id_mod.idl
     typedef.idl
     typecode.idl
-    valuetype.idl
   }
 }
 
@@ -88,8 +100,12 @@ project(*DLL): taoidldefaults, taolib, messaging {
     anonymousA.cpp
     anonymousC.cpp
     anonymousS.cpp
+    anyunionC.cpp
+    anyunionS.cpp
     arrayC.cpp
     arrayS.cpp
+    array_anon_nestedC.cpp
+    array_anon_nestedS.cpp
     array_onlyA.cpp
     array_onlyC.cpp
     array_onlyS.cpp
@@ -107,6 +123,8 @@ project(*DLL): taoidldefaults, taolib, messaging {
     Bug_2619_RegressionS.cpp
     Bug_3243_RegressionC.cpp
     Bug_3243_RegressionS.cpp
+    Bug_3312_RegressionC.cpp
+    Bug_3312_RegressionS.cpp
     Bug_3819_RegressionC.cpp
     Bug_3819_RegressionS.cpp
     Bug_3821_RegressionC.cpp
@@ -218,10 +236,10 @@ project(*Main): taoserver, messaging, gen_ostream {
   Source_Files {
     main.cpp
   }
-  
+
   Header_Files {
   }
-  
+
   Inline_Files {
   }
 
@@ -229,7 +247,7 @@ project(*Main): taoserver, messaging, gen_ostream {
   }
 }
 
-project(*NDDS_IDL): ndds_ts_defaults {
+project(*NDDS_IDL): ndds_cck_ts_defaults {
   custom_only=1
 
   NDDSTypeSupport_Files {
@@ -244,6 +262,64 @@ project(*NDDS_IDL): ndds_ts_defaults {
     Bug_2616_Regression.idl
     Bug_2619_Regression.idl
     Bug_3243_Regression.idl
+    Bug_3312_Regression.idl
+    Bug_3819_Regression.idl
+    Bug_3821_Regression.idl
+    constants.idl
+    dif2.idl
+    enum_in_struct.idl
+    full.idl
+    fwd.idl
+    generic_object.idl
+    gperf.idl
+    included.idl
+    including.idl
+    inherit.idl
+    interface.idl
+    keywords.idl
+    module.idl
+    nested_scope.idl
+    old_array.idl
+    old_constants.idl
+    old_sequence.idl
+    old_struct.idl
+    old_union.idl
+//    old_union2.idl
+    params.idl
+    pragma.idl
+    primtypes.idl
+    reopened_modules.idl
+    reopen_include1.idl
+    reopen_include2.idl
+    repo_id_mod.idl
+    sequence.idl
+    simple.idl
+    simple2.idl
+    struct.idl
+    typecode.idl
+    typedef.idl
+    typeprefix.idl
+    union.idl
+    valuetype.idl
+  }
+}
+
+project(*CoreDX_IDL): coredx_ts_defaults {
+  custom_only=1
+
+  CoreDXTypeSupport_Files {
+    anonymous.idl
+    array.idl
+    array_only.idl
+    attribute.idl
+    Bug_2350_Regression.idl
+    Bug_2577_Regression.idl
+    Bug_2582_Regression.idl
+    Bug_2583_Regression.idl
+    Bug_2616_Regression.idl
+    Bug_2619_Regression.idl
+    Bug_3243_Regression.idl
+    Bug_3312_Regression.idl
     Bug_3819_Regression.idl
     Bug_3821_Regression.idl
     constants.idl
@@ -333,6 +409,8 @@ project(*NDDS_Lib): taolib, messaging, gen_ostream, nddslib {
     Bug_3243_Regression.cxx
     Bug_3243_RegressionPlugin.cxx
     Bug_3243_RegressionSupport.cxx
+//    Bug_3312_RegressionPlugin.cxx
+//    Bug_3312_RegressionSupport.cxx
     Bug_3819_Regression.cxx
     Bug_3819_RegressionPlugin.cxx
     Bug_3819_RegressionSupport.cxx
diff --git a/tests/IDL_Test/Makefile.am b/tests/IDL_Test/Makefile.am
deleted file mode 100644
index 6745c1b473b..00000000000
--- a/tests/IDL_Test/Makefile.am
+++ /dev/null
@@ -1,1671 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.IDL_Test_Main.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  arrayC.cpp \
-  arrayC.h \
-  arrayC.inl \
-  arrayS.cpp \
-  arrayS.h \
-  arrayS.inl \
-  arrayS_T.cpp \
-  arrayS_T.h
-
-CLEANFILES += \
-  array-stamp \
-  arrayC.cpp \
-  arrayC.h \
-  arrayC.inl \
-  arrayS.cpp \
-  arrayS.h \
-  arrayS.inl \
-  arrayS_T.cpp \
-  arrayS_T.h
-
-arrayC.cpp arrayC.h arrayC.inl arrayS.cpp arrayS.h arrayS.inl arrayS_T.cpp arrayS_T.h: array-stamp
-
-array-stamp: $(srcdir)/array.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/array.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Bug_2350_RegressionC.cpp \
-  Bug_2350_RegressionC.h \
-  Bug_2350_RegressionC.inl \
-  Bug_2350_RegressionS.cpp \
-  Bug_2350_RegressionS.h \
-  Bug_2350_RegressionS.inl \
-  Bug_2350_RegressionS_T.cpp \
-  Bug_2350_RegressionS_T.h
-
-CLEANFILES += \
-  Bug_2350_Regression-stamp \
-  Bug_2350_RegressionC.cpp \
-  Bug_2350_RegressionC.h \
-  Bug_2350_RegressionC.inl \
-  Bug_2350_RegressionS.cpp \
-  Bug_2350_RegressionS.h \
-  Bug_2350_RegressionS.inl \
-  Bug_2350_RegressionS_T.cpp \
-  Bug_2350_RegressionS_T.h
-
-Bug_2350_RegressionC.cpp Bug_2350_RegressionC.h Bug_2350_RegressionC.inl Bug_2350_RegressionS.cpp Bug_2350_RegressionS.h Bug_2350_RegressionS.inl Bug_2350_RegressionS_T.cpp Bug_2350_RegressionS_T.h: Bug_2350_Regression-stamp
-
-Bug_2350_Regression-stamp: $(srcdir)/Bug_2350_Regression.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2350_Regression.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Bug_2577_RegressionC.cpp \
-  Bug_2577_RegressionC.h \
-  Bug_2577_RegressionC.inl \
-  Bug_2577_RegressionS.cpp \
-  Bug_2577_RegressionS.h \
-  Bug_2577_RegressionS.inl \
-  Bug_2577_RegressionS_T.cpp \
-  Bug_2577_RegressionS_T.h
-
-CLEANFILES += \
-  Bug_2577_Regression-stamp \
-  Bug_2577_RegressionC.cpp \
-  Bug_2577_RegressionC.h \
-  Bug_2577_RegressionC.inl \
-  Bug_2577_RegressionS.cpp \
-  Bug_2577_RegressionS.h \
-  Bug_2577_RegressionS.inl \
-  Bug_2577_RegressionS_T.cpp \
-  Bug_2577_RegressionS_T.h
-
-Bug_2577_RegressionC.cpp Bug_2577_RegressionC.h Bug_2577_RegressionC.inl Bug_2577_RegressionS.cpp Bug_2577_RegressionS.h Bug_2577_RegressionS.inl Bug_2577_RegressionS_T.cpp Bug_2577_RegressionS_T.h: Bug_2577_Regression-stamp
-
-Bug_2577_Regression-stamp: $(srcdir)/Bug_2577_Regression.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2577_Regression.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Bug_2582_RegressionC.cpp \
-  Bug_2582_RegressionC.h \
-  Bug_2582_RegressionC.inl \
-  Bug_2582_RegressionS.cpp \
-  Bug_2582_RegressionS.h \
-  Bug_2582_RegressionS.inl \
-  Bug_2582_RegressionS_T.cpp \
-  Bug_2582_RegressionS_T.h
-
-CLEANFILES += \
-  Bug_2582_Regression-stamp \
-  Bug_2582_RegressionC.cpp \
-  Bug_2582_RegressionC.h \
-  Bug_2582_RegressionC.inl \
-  Bug_2582_RegressionS.cpp \
-  Bug_2582_RegressionS.h \
-  Bug_2582_RegressionS.inl \
-  Bug_2582_RegressionS_T.cpp \
-  Bug_2582_RegressionS_T.h
-
-Bug_2582_RegressionC.cpp Bug_2582_RegressionC.h Bug_2582_RegressionC.inl Bug_2582_RegressionS.cpp Bug_2582_RegressionS.h Bug_2582_RegressionS.inl Bug_2582_RegressionS_T.cpp Bug_2582_RegressionS_T.h: Bug_2582_Regression-stamp
-
-Bug_2582_Regression-stamp: $(srcdir)/Bug_2582_Regression.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2582_Regression.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Bug_2583_RegressionC.cpp \
-  Bug_2583_RegressionC.h \
-  Bug_2583_RegressionC.inl \
-  Bug_2583_RegressionS.cpp \
-  Bug_2583_RegressionS.h \
-  Bug_2583_RegressionS.inl \
-  Bug_2583_RegressionS_T.cpp \
-  Bug_2583_RegressionS_T.h
-
-CLEANFILES += \
-  Bug_2583_Regression-stamp \
-  Bug_2583_RegressionC.cpp \
-  Bug_2583_RegressionC.h \
-  Bug_2583_RegressionC.inl \
-  Bug_2583_RegressionS.cpp \
-  Bug_2583_RegressionS.h \
-  Bug_2583_RegressionS.inl \
-  Bug_2583_RegressionS_T.cpp \
-  Bug_2583_RegressionS_T.h
-
-Bug_2583_RegressionC.cpp Bug_2583_RegressionC.h Bug_2583_RegressionC.inl Bug_2583_RegressionS.cpp Bug_2583_RegressionS.h Bug_2583_RegressionS.inl Bug_2583_RegressionS_T.cpp Bug_2583_RegressionS_T.h: Bug_2583_Regression-stamp
-
-Bug_2583_Regression-stamp: $(srcdir)/Bug_2583_Regression.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2583_Regression.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Bug_2616_RegressionC.cpp \
-  Bug_2616_RegressionC.h \
-  Bug_2616_RegressionC.inl \
-  Bug_2616_RegressionS.cpp \
-  Bug_2616_RegressionS.h \
-  Bug_2616_RegressionS.inl \
-  Bug_2616_RegressionS_T.cpp \
-  Bug_2616_RegressionS_T.h
-
-CLEANFILES += \
-  Bug_2616_Regression-stamp \
-  Bug_2616_RegressionC.cpp \
-  Bug_2616_RegressionC.h \
-  Bug_2616_RegressionC.inl \
-  Bug_2616_RegressionS.cpp \
-  Bug_2616_RegressionS.h \
-  Bug_2616_RegressionS.inl \
-  Bug_2616_RegressionS_T.cpp \
-  Bug_2616_RegressionS_T.h
-
-Bug_2616_RegressionC.cpp Bug_2616_RegressionC.h Bug_2616_RegressionC.inl Bug_2616_RegressionS.cpp Bug_2616_RegressionS.h Bug_2616_RegressionS.inl Bug_2616_RegressionS_T.cpp Bug_2616_RegressionS_T.h: Bug_2616_Regression-stamp
-
-Bug_2616_Regression-stamp: $(srcdir)/Bug_2616_Regression.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2616_Regression.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Bug_2619_RegressionC.cpp \
-  Bug_2619_RegressionC.h \
-  Bug_2619_RegressionC.inl \
-  Bug_2619_RegressionS.cpp \
-  Bug_2619_RegressionS.h \
-  Bug_2619_RegressionS.inl \
-  Bug_2619_RegressionS_T.cpp \
-  Bug_2619_RegressionS_T.h
-
-CLEANFILES += \
-  Bug_2619_Regression-stamp \
-  Bug_2619_RegressionC.cpp \
-  Bug_2619_RegressionC.h \
-  Bug_2619_RegressionC.inl \
-  Bug_2619_RegressionS.cpp \
-  Bug_2619_RegressionS.h \
-  Bug_2619_RegressionS.inl \
-  Bug_2619_RegressionS_T.cpp \
-  Bug_2619_RegressionS_T.h
-
-Bug_2619_RegressionC.cpp Bug_2619_RegressionC.h Bug_2619_RegressionC.inl Bug_2619_RegressionS.cpp Bug_2619_RegressionS.h Bug_2619_RegressionS.inl Bug_2619_RegressionS_T.cpp Bug_2619_RegressionS_T.h: Bug_2619_Regression-stamp
-
-Bug_2619_Regression-stamp: $(srcdir)/Bug_2619_Regression.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2619_Regression.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  enum_in_structC.cpp \
-  enum_in_structC.h \
-  enum_in_structC.inl \
-  enum_in_structS.cpp \
-  enum_in_structS.h \
-  enum_in_structS.inl \
-  enum_in_structS_T.cpp \
-  enum_in_structS_T.h
-
-CLEANFILES += \
-  enum_in_struct-stamp \
-  enum_in_structC.cpp \
-  enum_in_structC.h \
-  enum_in_structC.inl \
-  enum_in_structS.cpp \
-  enum_in_structS.h \
-  enum_in_structS.inl \
-  enum_in_structS_T.cpp \
-  enum_in_structS_T.h
-
-enum_in_structC.cpp enum_in_structC.h enum_in_structC.inl enum_in_structS.cpp enum_in_structS.h enum_in_structS.inl enum_in_structS_T.cpp enum_in_structS_T.h: enum_in_struct-stamp
-
-enum_in_struct-stamp: $(srcdir)/enum_in_struct.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/enum_in_struct.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  fullC.cpp \
-  fullC.h \
-  fullC.inl \
-  fullS.cpp \
-  fullS.h \
-  fullS.inl \
-  fullS_T.cpp \
-  fullS_T.h
-
-CLEANFILES += \
-  full-stamp \
-  fullC.cpp \
-  fullC.h \
-  fullC.inl \
-  fullS.cpp \
-  fullS.h \
-  fullS.inl \
-  fullS_T.cpp \
-  fullS_T.h
-
-fullC.cpp fullC.h fullC.inl fullS.cpp fullS.h fullS.inl fullS_T.cpp fullS_T.h: full-stamp
-
-full-stamp: $(srcdir)/full.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/full.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  fwdC.cpp \
-  fwdC.h \
-  fwdC.inl \
-  fwdS.cpp \
-  fwdS.h \
-  fwdS.inl \
-  fwdS_T.cpp \
-  fwdS_T.h
-
-CLEANFILES += \
-  fwd-stamp \
-  fwdC.cpp \
-  fwdC.h \
-  fwdC.inl \
-  fwdS.cpp \
-  fwdS.h \
-  fwdS.inl \
-  fwdS_T.cpp \
-  fwdS_T.h
-
-fwdC.cpp fwdC.h fwdC.inl fwdS.cpp fwdS.h fwdS.inl fwdS_T.cpp fwdS_T.h: fwd-stamp
-
-fwd-stamp: $(srcdir)/fwd.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/fwd.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  gperfC.cpp \
-  gperfC.h \
-  gperfC.inl \
-  gperfS.cpp \
-  gperfS.h \
-  gperfS.inl \
-  gperfS_T.cpp \
-  gperfS_T.h
-
-CLEANFILES += \
-  gperf-stamp \
-  gperfC.cpp \
-  gperfC.h \
-  gperfC.inl \
-  gperfS.cpp \
-  gperfS.h \
-  gperfS.inl \
-  gperfS_T.cpp \
-  gperfS_T.h
-
-gperfC.cpp gperfC.h gperfC.inl gperfS.cpp gperfS.h gperfS.inl gperfS_T.cpp gperfS_T.h: gperf-stamp
-
-gperf-stamp: $(srcdir)/gperf.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/gperf.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  includingC.cpp \
-  includingC.h \
-  includingC.inl \
-  includingS.cpp \
-  includingS.h \
-  includingS.inl \
-  includingS_T.cpp \
-  includingS_T.h
-
-CLEANFILES += \
-  including-stamp \
-  includingC.cpp \
-  includingC.h \
-  includingC.inl \
-  includingS.cpp \
-  includingS.h \
-  includingS.inl \
-  includingS_T.cpp \
-  includingS_T.h
-
-includingC.cpp includingC.h includingC.inl includingS.cpp includingS.h includingS.inl includingS_T.cpp includingS_T.h: including-stamp
-
-including-stamp: $(srcdir)/including.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/including.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  interfaceC.cpp \
-  interfaceC.h \
-  interfaceC.inl \
-  interfaceS.cpp \
-  interfaceS.h \
-  interfaceS.inl \
-  interfaceS_T.cpp \
-  interfaceS_T.h
-
-CLEANFILES += \
-  interface-stamp \
-  interfaceC.cpp \
-  interfaceC.h \
-  interfaceC.inl \
-  interfaceS.cpp \
-  interfaceS.h \
-  interfaceS.inl \
-  interfaceS_T.cpp \
-  interfaceS_T.h
-
-interfaceC.cpp interfaceC.h interfaceC.inl interfaceS.cpp interfaceS.h interfaceS.inl interfaceS_T.cpp interfaceS_T.h: interface-stamp
-
-interface-stamp: $(srcdir)/interface.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/interface.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  includedC.cpp \
-  includedC.h \
-  includedC.inl \
-  includedS.cpp \
-  includedS.h \
-  includedS.inl \
-  includedS_T.cpp \
-  includedS_T.h
-
-CLEANFILES += \
-  included-stamp \
-  includedC.cpp \
-  includedC.h \
-  includedC.inl \
-  includedS.cpp \
-  includedS.h \
-  includedS.inl \
-  includedS_T.cpp \
-  includedS_T.h
-
-includedC.cpp includedC.h includedC.inl includedS.cpp includedS.h includedS.inl includedS_T.cpp includedS_T.h: included-stamp
-
-included-stamp: $(srcdir)/included.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/included.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  nested_scopeC.cpp \
-  nested_scopeC.h \
-  nested_scopeC.inl \
-  nested_scopeS.cpp \
-  nested_scopeS.h \
-  nested_scopeS.inl \
-  nested_scopeS_T.cpp \
-  nested_scopeS_T.h
-
-CLEANFILES += \
-  nested_scope-stamp \
-  nested_scopeC.cpp \
-  nested_scopeC.h \
-  nested_scopeC.inl \
-  nested_scopeS.cpp \
-  nested_scopeS.h \
-  nested_scopeS.inl \
-  nested_scopeS_T.cpp \
-  nested_scopeS_T.h
-
-nested_scopeC.cpp nested_scopeC.h nested_scopeC.inl nested_scopeS.cpp nested_scopeS.h nested_scopeS.inl nested_scopeS_T.cpp nested_scopeS_T.h: nested_scope-stamp
-
-nested_scope-stamp: $(srcdir)/nested_scope.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/nested_scope.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  old_arrayC.cpp \
-  old_arrayC.h \
-  old_arrayC.inl \
-  old_arrayS.cpp \
-  old_arrayS.h \
-  old_arrayS.inl \
-  old_arrayS_T.cpp \
-  old_arrayS_T.h
-
-CLEANFILES += \
-  old_array-stamp \
-  old_arrayC.cpp \
-  old_arrayC.h \
-  old_arrayC.inl \
-  old_arrayS.cpp \
-  old_arrayS.h \
-  old_arrayS.inl \
-  old_arrayS_T.cpp \
-  old_arrayS_T.h
-
-old_arrayC.cpp old_arrayC.h old_arrayC.inl old_arrayS.cpp old_arrayS.h old_arrayS.inl old_arrayS_T.cpp old_arrayS_T.h: old_array-stamp
-
-old_array-stamp: $(srcdir)/old_array.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_array.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  old_constantsC.cpp \
-  old_constantsC.h \
-  old_constantsC.inl \
-  old_constantsS.cpp \
-  old_constantsS.h \
-  old_constantsS.inl \
-  old_constantsS_T.cpp \
-  old_constantsS_T.h
-
-CLEANFILES += \
-  old_constants-stamp \
-  old_constantsC.cpp \
-  old_constantsC.h \
-  old_constantsC.inl \
-  old_constantsS.cpp \
-  old_constantsS.h \
-  old_constantsS.inl \
-  old_constantsS_T.cpp \
-  old_constantsS_T.h
-
-old_constantsC.cpp old_constantsC.h old_constantsC.inl old_constantsS.cpp old_constantsS.h old_constantsS.inl old_constantsS_T.cpp old_constantsS_T.h: old_constants-stamp
-
-old_constants-stamp: $(srcdir)/old_constants.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_constants.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  old_sequenceC.cpp \
-  old_sequenceC.h \
-  old_sequenceC.inl \
-  old_sequenceS.cpp \
-  old_sequenceS.h \
-  old_sequenceS.inl \
-  old_sequenceS_T.cpp \
-  old_sequenceS_T.h
-
-CLEANFILES += \
-  old_sequence-stamp \
-  old_sequenceC.cpp \
-  old_sequenceC.h \
-  old_sequenceC.inl \
-  old_sequenceS.cpp \
-  old_sequenceS.h \
-  old_sequenceS.inl \
-  old_sequenceS_T.cpp \
-  old_sequenceS_T.h
-
-old_sequenceC.cpp old_sequenceC.h old_sequenceC.inl old_sequenceS.cpp old_sequenceS.h old_sequenceS.inl old_sequenceS_T.cpp old_sequenceS_T.h: old_sequence-stamp
-
-old_sequence-stamp: $(srcdir)/old_sequence.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_sequence.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  simpleC.cpp \
-  simpleC.h \
-  simpleC.inl \
-  simpleS.cpp \
-  simpleS.h \
-  simpleS.inl \
-  simpleS_T.cpp \
-  simpleS_T.h
-
-CLEANFILES += \
-  simple-stamp \
-  simpleC.cpp \
-  simpleC.h \
-  simpleC.inl \
-  simpleS.cpp \
-  simpleS.h \
-  simpleS.inl \
-  simpleS_T.cpp \
-  simpleS_T.h
-
-simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl simpleS_T.cpp simpleS_T.h: simple-stamp
-
-simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/simple.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  simple2C.cpp \
-  simple2C.h \
-  simple2C.inl \
-  simple2S.cpp \
-  simple2S.h \
-  simple2S.inl \
-  simple2S_T.cpp \
-  simple2S_T.h
-
-CLEANFILES += \
-  simple2-stamp \
-  simple2C.cpp \
-  simple2C.h \
-  simple2C.inl \
-  simple2S.cpp \
-  simple2S.h \
-  simple2S.inl \
-  simple2S_T.cpp \
-  simple2S_T.h
-
-simple2C.cpp simple2C.h simple2C.inl simple2S.cpp simple2S.h simple2S.inl simple2S_T.cpp simple2S_T.h: simple2-stamp
-
-simple2-stamp: $(srcdir)/simple2.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/simple2.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  old_structC.cpp \
-  old_structC.h \
-  old_structC.inl \
-  old_structS.cpp \
-  old_structS.h \
-  old_structS.inl \
-  old_structS_T.cpp \
-  old_structS_T.h
-
-CLEANFILES += \
-  old_struct-stamp \
-  old_structC.cpp \
-  old_structC.h \
-  old_structC.inl \
-  old_structS.cpp \
-  old_structS.h \
-  old_structS.inl \
-  old_structS_T.cpp \
-  old_structS_T.h
-
-old_structC.cpp old_structC.h old_structC.inl old_structS.cpp old_structS.h old_structS.inl old_structS_T.cpp old_structS_T.h: old_struct-stamp
-
-old_struct-stamp: $(srcdir)/old_struct.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_struct.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  old_unionC.cpp \
-  old_unionC.h \
-  old_unionC.inl \
-  old_unionS.cpp \
-  old_unionS.h \
-  old_unionS.inl \
-  old_unionS_T.cpp \
-  old_unionS_T.h
-
-CLEANFILES += \
-  old_union-stamp \
-  old_unionC.cpp \
-  old_unionC.h \
-  old_unionC.inl \
-  old_unionS.cpp \
-  old_unionS.h \
-  old_unionS.inl \
-  old_unionS_T.cpp \
-  old_unionS_T.h
-
-old_unionC.cpp old_unionC.h old_unionC.inl old_unionS.cpp old_unionS.h old_unionS.inl old_unionS_T.cpp old_unionS_T.h: old_union-stamp
-
-old_union-stamp: $(srcdir)/old_union.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_union.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  old_union2C.cpp \
-  old_union2C.h \
-  old_union2C.inl \
-  old_union2S.cpp \
-  old_union2S.h \
-  old_union2S.inl \
-  old_union2S_T.cpp \
-  old_union2S_T.h
-
-CLEANFILES += \
-  old_union2-stamp \
-  old_union2C.cpp \
-  old_union2C.h \
-  old_union2C.inl \
-  old_union2S.cpp \
-  old_union2S.h \
-  old_union2S.inl \
-  old_union2S_T.cpp \
-  old_union2S_T.h
-
-old_union2C.cpp old_union2C.h old_union2C.inl old_union2S.cpp old_union2S.h old_union2S.inl old_union2S_T.cpp old_union2S_T.h: old_union2-stamp
-
-old_union2-stamp: $(srcdir)/old_union2.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_union2.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  paramsC.cpp \
-  paramsC.h \
-  paramsC.inl \
-  paramsS.cpp \
-  paramsS.h \
-  paramsS.inl \
-  paramsS_T.cpp \
-  paramsS_T.h
-
-CLEANFILES += \
-  params-stamp \
-  paramsC.cpp \
-  paramsC.h \
-  paramsC.inl \
-  paramsS.cpp \
-  paramsS.h \
-  paramsS.inl \
-  paramsS_T.cpp \
-  paramsS_T.h
-
-paramsC.cpp paramsC.h paramsC.inl paramsS.cpp paramsS.h paramsS.inl paramsS_T.cpp paramsS_T.h: params-stamp
-
-params-stamp: $(srcdir)/params.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/params.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  reopened_modulesC.cpp \
-  reopened_modulesC.h \
-  reopened_modulesC.inl \
-  reopened_modulesS.cpp \
-  reopened_modulesS.h \
-  reopened_modulesS.inl \
-  reopened_modulesS_T.cpp \
-  reopened_modulesS_T.h
-
-CLEANFILES += \
-  reopened_modules-stamp \
-  reopened_modulesC.cpp \
-  reopened_modulesC.h \
-  reopened_modulesC.inl \
-  reopened_modulesS.cpp \
-  reopened_modulesS.h \
-  reopened_modulesS.inl \
-  reopened_modulesS_T.cpp \
-  reopened_modulesS_T.h
-
-reopened_modulesC.cpp reopened_modulesC.h reopened_modulesC.inl reopened_modulesS.cpp reopened_modulesS.h reopened_modulesS.inl reopened_modulesS_T.cpp reopened_modulesS_T.h: reopened_modules-stamp
-
-reopened_modules-stamp: $(srcdir)/reopened_modules.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopened_modules.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  sequenceC.cpp \
-  sequenceC.h \
-  sequenceC.inl \
-  sequenceS.cpp \
-  sequenceS.h \
-  sequenceS.inl \
-  sequenceS_T.cpp \
-  sequenceS_T.h
-
-CLEANFILES += \
-  sequence-stamp \
-  sequenceC.cpp \
-  sequenceC.h \
-  sequenceC.inl \
-  sequenceS.cpp \
-  sequenceS.h \
-  sequenceS.inl \
-  sequenceS_T.cpp \
-  sequenceS_T.h
-
-sequenceC.cpp sequenceC.h sequenceC.inl sequenceS.cpp sequenceS.h sequenceS.inl sequenceS_T.cpp sequenceS_T.h: sequence-stamp
-
-sequence-stamp: $(srcdir)/sequence.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/sequence.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  structC.cpp \
-  structC.h \
-  structC.inl \
-  structS.cpp \
-  structS.h \
-  structS.inl \
-  structS_T.cpp \
-  structS_T.h
-
-CLEANFILES += \
-  struct-stamp \
-  structC.cpp \
-  structC.h \
-  structC.inl \
-  structS.cpp \
-  structS.h \
-  structS.inl \
-  structS_T.cpp \
-  structS_T.h
-
-structC.cpp structC.h structC.inl structS.cpp structS.h structS.inl structS_T.cpp structS_T.h: struct-stamp
-
-struct-stamp: $(srcdir)/struct.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/struct.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  reopen_include1C.cpp \
-  reopen_include1C.h \
-  reopen_include1C.inl \
-  reopen_include1S.cpp \
-  reopen_include1S.h \
-  reopen_include1S.inl \
-  reopen_include1S_T.cpp \
-  reopen_include1S_T.h
-
-CLEANFILES += \
-  reopen_include1-stamp \
-  reopen_include1C.cpp \
-  reopen_include1C.h \
-  reopen_include1C.inl \
-  reopen_include1S.cpp \
-  reopen_include1S.h \
-  reopen_include1S.inl \
-  reopen_include1S_T.cpp \
-  reopen_include1S_T.h
-
-reopen_include1C.cpp reopen_include1C.h reopen_include1C.inl reopen_include1S.cpp reopen_include1S.h reopen_include1S.inl reopen_include1S_T.cpp reopen_include1S_T.h: reopen_include1-stamp
-
-reopen_include1-stamp: $(srcdir)/reopen_include1.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopen_include1.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  reopen_include2C.cpp \
-  reopen_include2C.h \
-  reopen_include2C.inl \
-  reopen_include2S.cpp \
-  reopen_include2S.h \
-  reopen_include2S.inl \
-  reopen_include2S_T.cpp \
-  reopen_include2S_T.h
-
-CLEANFILES += \
-  reopen_include2-stamp \
-  reopen_include2C.cpp \
-  reopen_include2C.h \
-  reopen_include2C.inl \
-  reopen_include2S.cpp \
-  reopen_include2S.h \
-  reopen_include2S.inl \
-  reopen_include2S_T.cpp \
-  reopen_include2S_T.h
-
-reopen_include2C.cpp reopen_include2C.h reopen_include2C.inl reopen_include2S.cpp reopen_include2S.h reopen_include2S.inl reopen_include2S_T.cpp reopen_include2S_T.h: reopen_include2-stamp
-
-reopen_include2-stamp: $(srcdir)/reopen_include2.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopen_include2.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  typeprefixC.cpp \
-  typeprefixC.h \
-  typeprefixC.inl \
-  typeprefixS.cpp \
-  typeprefixS.h \
-  typeprefixS.inl \
-  typeprefixS_T.cpp \
-  typeprefixS_T.h
-
-CLEANFILES += \
-  typeprefix-stamp \
-  typeprefixC.cpp \
-  typeprefixC.h \
-  typeprefixC.inl \
-  typeprefixS.cpp \
-  typeprefixS.h \
-  typeprefixS.inl \
-  typeprefixS_T.cpp \
-  typeprefixS_T.h
-
-typeprefixC.cpp typeprefixC.h typeprefixC.inl typeprefixS.cpp typeprefixS.h typeprefixS.inl typeprefixS_T.cpp typeprefixS_T.h: typeprefix-stamp
-
-typeprefix-stamp: $(srcdir)/typeprefix.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/typeprefix.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  unionC.cpp \
-  unionC.h \
-  unionC.inl \
-  unionS.cpp \
-  unionS.h \
-  unionS.inl \
-  unionS_T.cpp \
-  unionS_T.h
-
-CLEANFILES += \
-  union-stamp \
-  unionC.cpp \
-  unionC.h \
-  unionC.inl \
-  unionS.cpp \
-  unionS.h \
-  unionS.inl \
-  unionS_T.cpp \
-  unionS_T.h
-
-unionC.cpp unionC.h unionC.inl unionS.cpp unionS.h unionS.inl unionS_T.cpp unionS_T.h: union-stamp
-
-union-stamp: $(srcdir)/union.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/union.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  anonymousA.cpp \
-  anonymousA.h \
-  anonymousC.cpp \
-  anonymousC.h \
-  anonymousC.inl \
-  anonymousS.cpp \
-  anonymousS.h \
-  anonymousS.inl \
-  anonymousS_T.cpp \
-  anonymousS_T.h
-
-CLEANFILES += \
-  anonymous-stamp \
-  anonymousA.cpp \
-  anonymousA.h \
-  anonymousC.cpp \
-  anonymousC.h \
-  anonymousC.inl \
-  anonymousS.cpp \
-  anonymousS.h \
-  anonymousS.inl \
-  anonymousS_T.cpp \
-  anonymousS_T.h
-
-anonymousA.cpp anonymousA.h anonymousC.cpp anonymousC.h anonymousC.inl anonymousS.cpp anonymousS.h anonymousS.inl anonymousS_T.cpp anonymousS_T.h: anonymous-stamp
-
-anonymous-stamp: $(srcdir)/anonymous.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/anonymous.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  array_onlyA.cpp \
-  array_onlyA.h \
-  array_onlyC.cpp \
-  array_onlyC.h \
-  array_onlyC.inl \
-  array_onlyS.cpp \
-  array_onlyS.h \
-  array_onlyS.inl \
-  array_onlyS_T.cpp \
-  array_onlyS_T.h
-
-CLEANFILES += \
-  array_only-stamp \
-  array_onlyA.cpp \
-  array_onlyA.h \
-  array_onlyC.cpp \
-  array_onlyC.h \
-  array_onlyC.inl \
-  array_onlyS.cpp \
-  array_onlyS.h \
-  array_onlyS.inl \
-  array_onlyS_T.cpp \
-  array_onlyS_T.h
-
-array_onlyA.cpp array_onlyA.h array_onlyC.cpp array_onlyC.h array_onlyC.inl array_onlyS.cpp array_onlyS.h array_onlyS.inl array_onlyS_T.cpp array_onlyS_T.h: array_only-stamp
-
-array_only-stamp: $(srcdir)/array_only.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/array_only.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  constantsA.cpp \
-  constantsA.h \
-  constantsC.cpp \
-  constantsC.h \
-  constantsC.inl \
-  constantsS.cpp \
-  constantsS.h \
-  constantsS.inl \
-  constantsS_T.cpp \
-  constantsS_T.h
-
-CLEANFILES += \
-  constants-stamp \
-  constantsA.cpp \
-  constantsA.h \
-  constantsC.cpp \
-  constantsC.h \
-  constantsC.inl \
-  constantsS.cpp \
-  constantsS.h \
-  constantsS.inl \
-  constantsS_T.cpp \
-  constantsS_T.h
-
-constantsA.cpp constantsA.h constantsC.cpp constantsC.h constantsC.inl constantsS.cpp constantsS.h constantsS.inl constantsS_T.cpp constantsS_T.h: constants-stamp
-
-constants-stamp: $(srcdir)/constants.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/constants.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  generic_objectA.cpp \
-  generic_objectA.h \
-  generic_objectC.cpp \
-  generic_objectC.h \
-  generic_objectC.inl \
-  generic_objectS.cpp \
-  generic_objectS.h \
-  generic_objectS.inl \
-  generic_objectS_T.cpp \
-  generic_objectS_T.h
-
-CLEANFILES += \
-  generic_object-stamp \
-  generic_objectA.cpp \
-  generic_objectA.h \
-  generic_objectC.cpp \
-  generic_objectC.h \
-  generic_objectC.inl \
-  generic_objectS.cpp \
-  generic_objectS.h \
-  generic_objectS.inl \
-  generic_objectS_T.cpp \
-  generic_objectS_T.h
-
-generic_objectA.cpp generic_objectA.h generic_objectC.cpp generic_objectC.h generic_objectC.inl generic_objectS.cpp generic_objectS.h generic_objectS.inl generic_objectS_T.cpp generic_objectS_T.h: generic_object-stamp
-
-generic_object-stamp: $(srcdir)/generic_object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/generic_object.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  keywordsA.cpp \
-  keywordsA.h \
-  keywordsC.cpp \
-  keywordsC.h \
-  keywordsC.inl \
-  keywordsS.cpp \
-  keywordsS.h \
-  keywordsS.inl \
-  keywordsS_T.cpp \
-  keywordsS_T.h
-
-CLEANFILES += \
-  keywords-stamp \
-  keywordsA.cpp \
-  keywordsA.h \
-  keywordsC.cpp \
-  keywordsC.h \
-  keywordsC.inl \
-  keywordsS.cpp \
-  keywordsS.h \
-  keywordsS.inl \
-  keywordsS_T.cpp \
-  keywordsS_T.h
-
-keywordsA.cpp keywordsA.h keywordsC.cpp keywordsC.h keywordsC.inl keywordsS.cpp keywordsS.h keywordsS.inl keywordsS_T.cpp keywordsS_T.h: keywords-stamp
-
-keywords-stamp: $(srcdir)/keywords.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/keywords.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  dif2A.cpp \
-  dif2A.h \
-  dif2C.cpp \
-  dif2C.h \
-  dif2C.inl \
-  dif2S.cpp \
-  dif2S.h \
-  dif2S.inl \
-  dif2S_T.cpp \
-  dif2S_T.h
-
-CLEANFILES += \
-  dif2-stamp \
-  dif2A.cpp \
-  dif2A.h \
-  dif2C.cpp \
-  dif2C.h \
-  dif2C.inl \
-  dif2S.cpp \
-  dif2S.h \
-  dif2S.inl \
-  dif2S_T.cpp \
-  dif2S_T.h
-
-dif2A.cpp dif2A.h dif2C.cpp dif2C.h dif2C.inl dif2S.cpp dif2S.h dif2S.inl dif2S_T.cpp dif2S_T.h: dif2-stamp
-
-dif2-stamp: $(srcdir)/dif2.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/dif2.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  inheritA.cpp \
-  inheritA.h \
-  inheritC.cpp \
-  inheritC.h \
-  inheritC.inl \
-  inheritS.cpp \
-  inheritS.h \
-  inheritS.inl \
-  inheritS_T.cpp \
-  inheritS_T.h
-
-CLEANFILES += \
-  inherit-stamp \
-  inheritA.cpp \
-  inheritA.h \
-  inheritC.cpp \
-  inheritC.h \
-  inheritC.inl \
-  inheritS.cpp \
-  inheritS.h \
-  inheritS.inl \
-  inheritS_T.cpp \
-  inheritS_T.h
-
-inheritA.cpp inheritA.h inheritC.cpp inheritC.h inheritC.inl inheritS.cpp inheritS.h inheritS.inl inheritS_T.cpp inheritS_T.h: inherit-stamp
-
-inherit-stamp: $(srcdir)/inherit.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/inherit.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  moduleA.cpp \
-  moduleA.h \
-  moduleC.cpp \
-  moduleC.h \
-  moduleC.inl \
-  moduleS.cpp \
-  moduleS.h \
-  moduleS.inl \
-  moduleS_T.cpp \
-  moduleS_T.h
-
-CLEANFILES += \
-  module-stamp \
-  moduleA.cpp \
-  moduleA.h \
-  moduleC.cpp \
-  moduleC.h \
-  moduleC.inl \
-  moduleS.cpp \
-  moduleS.h \
-  moduleS.inl \
-  moduleS_T.cpp \
-  moduleS_T.h
-
-moduleA.cpp moduleA.h moduleC.cpp moduleC.h moduleC.inl moduleS.cpp moduleS.h moduleS.inl moduleS_T.cpp moduleS_T.h: module-stamp
-
-module-stamp: $(srcdir)/module.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/module.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  primtypesA.cpp \
-  primtypesA.h \
-  primtypesC.cpp \
-  primtypesC.h \
-  primtypesC.inl \
-  primtypesS.cpp \
-  primtypesS.h \
-  primtypesS.inl \
-  primtypesS_T.cpp \
-  primtypesS_T.h
-
-CLEANFILES += \
-  primtypes-stamp \
-  primtypesA.cpp \
-  primtypesA.h \
-  primtypesC.cpp \
-  primtypesC.h \
-  primtypesC.inl \
-  primtypesS.cpp \
-  primtypesS.h \
-  primtypesS.inl \
-  primtypesS_T.cpp \
-  primtypesS_T.h
-
-primtypesA.cpp primtypesA.h primtypesC.cpp primtypesC.h primtypesC.inl primtypesS.cpp primtypesS.h primtypesS.inl primtypesS_T.cpp primtypesS_T.h: primtypes-stamp
-
-primtypes-stamp: $(srcdir)/primtypes.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/primtypes.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  pragmaA.cpp \
-  pragmaA.h \
-  pragmaC.cpp \
-  pragmaC.h \
-  pragmaC.inl \
-  pragmaS.cpp \
-  pragmaS.h \
-  pragmaS.inl \
-  pragmaS_T.cpp \
-  pragmaS_T.h
-
-CLEANFILES += \
-  pragma-stamp \
-  pragmaA.cpp \
-  pragmaA.h \
-  pragmaC.cpp \
-  pragmaC.h \
-  pragmaC.inl \
-  pragmaS.cpp \
-  pragmaS.h \
-  pragmaS.inl \
-  pragmaS_T.cpp \
-  pragmaS_T.h
-
-pragmaA.cpp pragmaA.h pragmaC.cpp pragmaC.h pragmaC.inl pragmaS.cpp pragmaS.h pragmaS.inl pragmaS_T.cpp pragmaS_T.h: pragma-stamp
-
-pragma-stamp: $(srcdir)/pragma.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/pragma.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  repo_id_modA.cpp \
-  repo_id_modA.h \
-  repo_id_modC.cpp \
-  repo_id_modC.h \
-  repo_id_modC.inl \
-  repo_id_modS.cpp \
-  repo_id_modS.h \
-  repo_id_modS.inl \
-  repo_id_modS_T.cpp \
-  repo_id_modS_T.h
-
-CLEANFILES += \
-  repo_id_mod-stamp \
-  repo_id_modA.cpp \
-  repo_id_modA.h \
-  repo_id_modC.cpp \
-  repo_id_modC.h \
-  repo_id_modC.inl \
-  repo_id_modS.cpp \
-  repo_id_modS.h \
-  repo_id_modS.inl \
-  repo_id_modS_T.cpp \
-  repo_id_modS_T.h
-
-repo_id_modA.cpp repo_id_modA.h repo_id_modC.cpp repo_id_modC.h repo_id_modC.inl repo_id_modS.cpp repo_id_modS.h repo_id_modS.inl repo_id_modS_T.cpp repo_id_modS_T.h: repo_id_mod-stamp
-
-repo_id_mod-stamp: $(srcdir)/repo_id_mod.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/repo_id_mod.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  typedefA.cpp \
-  typedefA.h \
-  typedefC.cpp \
-  typedefC.h \
-  typedefC.inl \
-  typedefS.cpp \
-  typedefS.h \
-  typedefS.inl \
-  typedefS_T.cpp \
-  typedefS_T.h
-
-CLEANFILES += \
-  typedef-stamp \
-  typedefA.cpp \
-  typedefA.h \
-  typedefC.cpp \
-  typedefC.h \
-  typedefC.inl \
-  typedefS.cpp \
-  typedefS.h \
-  typedefS.inl \
-  typedefS_T.cpp \
-  typedefS_T.h
-
-typedefA.cpp typedefA.h typedefC.cpp typedefC.h typedefC.inl typedefS.cpp typedefS.h typedefS.inl typedefS_T.cpp typedefS_T.h: typedef-stamp
-
-typedef-stamp: $(srcdir)/typedef.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/typedef.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  typecodeA.cpp \
-  typecodeA.h \
-  typecodeC.cpp \
-  typecodeC.h \
-  typecodeC.inl \
-  typecodeS.cpp \
-  typecodeS.h \
-  typecodeS.inl \
-  typecodeS_T.cpp \
-  typecodeS_T.h
-
-CLEANFILES += \
-  typecode-stamp \
-  typecodeA.cpp \
-  typecodeA.h \
-  typecodeC.cpp \
-  typecodeC.h \
-  typecodeC.inl \
-  typecodeS.cpp \
-  typecodeS.h \
-  typecodeS.inl \
-  typecodeS_T.cpp \
-  typecodeS_T.h
-
-typecodeA.cpp typecodeA.h typecodeC.cpp typecodeC.h typecodeC.inl typecodeS.cpp typecodeS.h typecodeS.inl typecodeS_T.cpp typecodeS_T.h: typecode-stamp
-
-typecode-stamp: $(srcdir)/typecode.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/typecode.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  valuetypeA.cpp \
-  valuetypeA.h \
-  valuetypeC.cpp \
-  valuetypeC.h \
-  valuetypeC.inl \
-  valuetypeS.cpp \
-  valuetypeS.h \
-  valuetypeS.inl \
-  valuetypeS_T.cpp \
-  valuetypeS_T.h
-
-CLEANFILES += \
-  valuetype-stamp \
-  valuetypeA.cpp \
-  valuetypeA.h \
-  valuetypeC.cpp \
-  valuetypeC.h \
-  valuetypeC.inl \
-  valuetypeS.cpp \
-  valuetypeS.h \
-  valuetypeS.inl \
-  valuetypeS_T.cpp \
-  valuetypeS_T.h
-
-valuetypeA.cpp valuetypeA.h valuetypeC.cpp valuetypeC.h valuetypeC.inl valuetypeS.cpp valuetypeS.h valuetypeS.inl valuetypeS_T.cpp valuetypeS_T.h: valuetype-stamp
-
-valuetype-stamp: $(srcdir)/valuetype.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/valuetype.idl
-	@touch $@
-
-noinst_PROGRAMS = main
-
-main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-main_SOURCES = \
-  Bug_2350_RegressionC.cpp \
-  Bug_2350_RegressionS.cpp \
-  Bug_2577_RegressionC.cpp \
-  Bug_2577_RegressionS.cpp \
-  Bug_2582_RegressionC.cpp \
-  Bug_2582_RegressionS.cpp \
-  Bug_2583_RegressionC.cpp \
-  Bug_2583_RegressionS.cpp \
-  Bug_2616_RegressionC.cpp \
-  Bug_2616_RegressionS.cpp \
-  Bug_2619_RegressionC.cpp \
-  Bug_2619_RegressionS.cpp \
-  anonymousA.cpp \
-  anonymousC.cpp \
-  anonymousS.cpp \
-  arrayC.cpp \
-  arrayS.cpp \
-  array_onlyA.cpp \
-  array_onlyC.cpp \
-  array_onlyS.cpp \
-  constantsA.cpp \
-  constantsC.cpp \
-  constantsS.cpp \
-  dif2A.cpp \
-  dif2C.cpp \
-  dif2S.cpp \
-  enum_in_structC.cpp \
-  enum_in_structS.cpp \
-  fullC.cpp \
-  fullS.cpp \
-  fwdC.cpp \
-  fwdS.cpp \
-  generic_objectA.cpp \
-  generic_objectC.cpp \
-  generic_objectS.cpp \
-  gperfC.cpp \
-  gperfS.cpp \
-  includedC.cpp \
-  includedS.cpp \
-  includingC.cpp \
-  includingS.cpp \
-  inheritA.cpp \
-  inheritC.cpp \
-  inheritS.cpp \
-  interfaceC.cpp \
-  interfaceS.cpp \
-  keywordsA.cpp \
-  keywordsC.cpp \
-  keywordsS.cpp \
-  main.cpp \
-  moduleA.cpp \
-  moduleC.cpp \
-  moduleS.cpp \
-  nested_scopeC.cpp \
-  nested_scopeS.cpp \
-  old_arrayC.cpp \
-  old_arrayS.cpp \
-  old_constantsC.cpp \
-  old_constantsS.cpp \
-  old_sequenceC.cpp \
-  old_sequenceS.cpp \
-  old_structC.cpp \
-  old_structS.cpp \
-  old_union2C.cpp \
-  old_union2S.cpp \
-  old_unionC.cpp \
-  old_unionS.cpp \
-  paramsC.cpp \
-  paramsS.cpp \
-  pragmaA.cpp \
-  pragmaC.cpp \
-  pragmaS.cpp \
-  primtypesA.cpp \
-  primtypesC.cpp \
-  primtypesS.cpp \
-  reopen_include1C.cpp \
-  reopen_include1S.cpp \
-  reopen_include2C.cpp \
-  reopen_include2S.cpp \
-  reopened_modulesC.cpp \
-  reopened_modulesS.cpp \
-  repo_id_modA.cpp \
-  repo_id_modC.cpp \
-  repo_id_modS.cpp \
-  sequenceC.cpp \
-  sequenceS.cpp \
-  simple2C.cpp \
-  simple2S.cpp \
-  simpleC.cpp \
-  simpleS.cpp \
-  structC.cpp \
-  structS.cpp \
-  typecodeA.cpp \
-  typecodeC.cpp \
-  typecodeS.cpp \
-  typedefA.cpp \
-  typedefC.cpp \
-  typedefS.cpp \
-  typeprefixC.cpp \
-  typeprefixS.cpp \
-  unionC.cpp \
-  unionS.cpp \
-  valuetypeA.cpp \
-  valuetypeC.cpp \
-  valuetypeS.cpp \
-  Bug_2350_RegressionC.h \
-  Bug_2350_RegressionC.inl \
-  Bug_2350_RegressionS.h \
-  Bug_2350_RegressionS.inl \
-  Bug_2350_RegressionS_T.h \
-  Bug_2577_RegressionC.h \
-  Bug_2577_RegressionC.inl \
-  Bug_2577_RegressionS.h \
-  Bug_2577_RegressionS.inl \
-  Bug_2577_RegressionS_T.h \
-  Bug_2582_RegressionC.h \
-  Bug_2582_RegressionC.inl \
-  Bug_2582_RegressionS.h \
-  Bug_2582_RegressionS.inl \
-  Bug_2582_RegressionS_T.h \
-  Bug_2583_RegressionC.h \
-  Bug_2583_RegressionC.inl \
-  Bug_2583_RegressionS.h \
-  Bug_2583_RegressionS.inl \
-  Bug_2583_RegressionS_T.h \
-  Bug_2616_RegressionC.h \
-  Bug_2616_RegressionC.inl \
-  Bug_2616_RegressionS.h \
-  Bug_2616_RegressionS.inl \
-  Bug_2616_RegressionS_T.h \
-  Bug_2619_RegressionC.h \
-  Bug_2619_RegressionC.inl \
-  Bug_2619_RegressionS.h \
-  Bug_2619_RegressionS.inl \
-  Bug_2619_RegressionS_T.h \
-  anonymousA.h \
-  anonymousC.h \
-  anonymousC.inl \
-  anonymousS.h \
-  anonymousS.inl \
-  anonymousS_T.h \
-  arrayC.h \
-  arrayC.inl \
-  arrayS.h \
-  arrayS.inl \
-  arrayS_T.h \
-  array_onlyA.h \
-  array_onlyC.h \
-  array_onlyC.inl \
-  array_onlyS.h \
-  array_onlyS.inl \
-  array_onlyS_T.h \
-  constantsA.h \
-  constantsC.h \
-  constantsC.inl \
-  constantsS.h \
-  constantsS.inl \
-  constantsS_T.h \
-  dif2A.h \
-  dif2C.h \
-  dif2C.inl \
-  dif2S.h \
-  dif2S.inl \
-  dif2S_T.h \
-  enum_in_structC.h \
-  enum_in_structC.inl \
-  enum_in_structS.h \
-  enum_in_structS.inl \
-  enum_in_structS_T.h \
-  fullC.h \
-  fullC.inl \
-  fullS.h \
-  fullS.inl \
-  fullS_T.h \
-  fwdC.h \
-  fwdC.inl \
-  fwdS.h \
-  fwdS.inl \
-  fwdS_T.h \
-  generic_objectA.h \
-  generic_objectC.h \
-  generic_objectC.inl \
-  generic_objectS.h \
-  generic_objectS.inl \
-  generic_objectS_T.h \
-  gperfC.h \
-  gperfC.inl \
-  gperfS.h \
-  gperfS.inl \
-  gperfS_T.h \
-  includedC.h \
-  includedC.inl \
-  includedS.h \
-  includedS.inl \
-  includedS_T.h \
-  includingC.h \
-  includingC.inl \
-  includingS.h \
-  includingS.inl \
-  includingS_T.h \
-  inheritA.h \
-  inheritC.h \
-  inheritC.inl \
-  inheritS.h \
-  inheritS.inl \
-  inheritS_T.h \
-  interfaceC.h \
-  interfaceC.inl \
-  interfaceS.h \
-  interfaceS.inl \
-  interfaceS_T.h \
-  keywordsA.h \
-  keywordsC.h \
-  keywordsC.inl \
-  keywordsS.h \
-  keywordsS.inl \
-  keywordsS_T.h \
-  moduleA.h \
-  moduleC.h \
-  moduleC.inl \
-  moduleS.h \
-  moduleS.inl \
-  moduleS_T.h \
-  nested_scopeC.h \
-  nested_scopeC.inl \
-  nested_scopeS.h \
-  nested_scopeS.inl \
-  nested_scopeS_T.h \
-  old_arrayC.h \
-  old_arrayC.inl \
-  old_arrayS.h \
-  old_arrayS.inl \
-  old_arrayS_T.h \
-  old_constantsC.h \
-  old_constantsC.inl \
-  old_constantsS.h \
-  old_constantsS.inl \
-  old_constantsS_T.h \
-  old_sequenceC.h \
-  old_sequenceC.inl \
-  old_sequenceS.h \
-  old_sequenceS.inl \
-  old_sequenceS_T.h \
-  old_structC.h \
-  old_structC.inl \
-  old_structS.h \
-  old_structS.inl \
-  old_structS_T.h \
-  old_union2C.h \
-  old_union2C.inl \
-  old_union2S.h \
-  old_union2S.inl \
-  old_union2S_T.h \
-  old_unionC.h \
-  old_unionC.inl \
-  old_unionS.h \
-  old_unionS.inl \
-  old_unionS_T.h \
-  paramsC.h \
-  paramsC.inl \
-  paramsS.h \
-  paramsS.inl \
-  paramsS_T.h \
-  pragmaA.h \
-  pragmaC.h \
-  pragmaC.inl \
-  pragmaS.h \
-  pragmaS.inl \
-  pragmaS_T.h \
-  primtypesA.h \
-  primtypesC.h \
-  primtypesC.inl \
-  primtypesS.h \
-  primtypesS.inl \
-  primtypesS_T.h \
-  reopen_include1C.h \
-  reopen_include1C.inl \
-  reopen_include1S.h \
-  reopen_include1S.inl \
-  reopen_include1S_T.h \
-  reopen_include2C.h \
-  reopen_include2C.inl \
-  reopen_include2S.h \
-  reopen_include2S.inl \
-  reopen_include2S_T.h \
-  reopened_modulesC.h \
-  reopened_modulesC.inl \
-  reopened_modulesS.h \
-  reopened_modulesS.inl \
-  reopened_modulesS_T.h \
-  repo_id_modA.h \
-  repo_id_modC.h \
-  repo_id_modC.inl \
-  repo_id_modS.h \
-  repo_id_modS.inl \
-  repo_id_modS_T.h \
-  sequenceC.h \
-  sequenceC.inl \
-  sequenceS.h \
-  sequenceS.inl \
-  sequenceS_T.h \
-  simple2C.h \
-  simple2C.inl \
-  simple2S.h \
-  simple2S.inl \
-  simple2S_T.h \
-  simpleC.h \
-  simpleC.inl \
-  simpleS.h \
-  simpleS.inl \
-  simpleS_T.h \
-  structC.h \
-  structC.inl \
-  structS.h \
-  structS.inl \
-  structS_T.h \
-  typecodeA.h \
-  typecodeC.h \
-  typecodeC.inl \
-  typecodeS.h \
-  typecodeS.inl \
-  typecodeS_T.h \
-  typedefA.h \
-  typedefC.h \
-  typedefC.inl \
-  typedefS.h \
-  typedefS.inl \
-  typedefS_T.h \
-  typeprefixC.h \
-  typeprefixC.inl \
-  typeprefixS.h \
-  typeprefixS.inl \
-  typeprefixS_T.h \
-  unionC.h \
-  unionC.inl \
-  unionS.h \
-  unionS.inl \
-  unionS_T.h \
-  valuetypeA.h \
-  valuetypeC.h \
-  valuetypeC.inl \
-  valuetypeS.h \
-  valuetypeS.inl \
-  valuetypeS_T.h
-
-main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/IDL_Test/anonymous.idl b/tests/IDL_Test/anonymous.idl
index f3eeb99b731..98f0ccf5c19 100644
--- a/tests/IDL_Test/anonymous.idl
+++ b/tests/IDL_Test/anonymous.idl
@@ -1,23 +1,20 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    anonymous.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    anonymous.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 // Normal typedef'd sequence
 module Not_Anon
@@ -55,7 +52,7 @@ module All_Anon
   };
 
   // Neither array nor sequence are typedef'd.
-  exception Nested_Anon 
+  exception Nested_Anon
   {
     sequence<float> float_seq_array[6];
     sequence<float> another_fsa[6];
@@ -72,3 +69,4 @@ module Second
 {
   typedef string<32> SecondString;
 };
+
diff --git a/tests/IDL_Test/anyunion.idl b/tests/IDL_Test/anyunion.idl
new file mode 100644
index 00000000000..adb185425b0
--- /dev/null
+++ b/tests/IDL_Test/anyunion.idl
@@ -0,0 +1,27 @@
+
+//=============================================================================
+/**
+ *  @file    anyunion.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
+
+// AnyUnion
+enum AnyUnionEnum {
+  ANYUNIONENUM2
+};
+
+union MyAnyUnion switch (AnyUnionEnum) {
+  case ANYUNIONENUM2:
+    any my_any;
+};
diff --git a/tests/IDL_Test/array.idl b/tests/IDL_Test/array.idl
index ff24c1b7c74..1b0b9d3c12e 100644
--- a/tests/IDL_Test/array.idl
+++ b/tests/IDL_Test/array.idl
@@ -1,23 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    array.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    array.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 // Multidimensional arrays - constant vigilance.
 typedef short TwoDArray[64][63];
@@ -164,3 +161,4 @@ module bug_2126
     case FALSE: long wibble;
   };
 };
+
diff --git a/tests/IDL_Test/array_anon_nested.idl b/tests/IDL_Test/array_anon_nested.idl
new file mode 100644
index 00000000000..d10972445c6
--- /dev/null
+++ b/tests/IDL_Test/array_anon_nested.idl
@@ -0,0 +1,35 @@
+
+//=============================================================================
+/**
+ *  @file    array_anon_nested.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
+
+/// There was a problem generating the *_Forany
+/// for the inner array. This construct is in a separate
+/// IDL file for two reasons - (1) to avoid the -GA
+/// option, which does not work when there are constructs
+/// that result in nested C++ classes, and (2) to avoid
+/// the RTI DDS processor, which chokes on this unusual
+/// IDL.
+typedef struct teststruct
+{
+  char b[4];
+
+  struct embeddedstruct
+  {
+    char a[4];
+  } estruct;
+
+} tstruct;
diff --git a/tests/IDL_Test/array_only.idl b/tests/IDL_Test/array_only.idl
index bb791128223..705d7c56319 100644
--- a/tests/IDL_Test/array_only.idl
+++ b/tests/IDL_Test/array_only.idl
@@ -1,23 +1,20 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    array_only.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    array_only.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 // The IDL compiler used to generated code that would not compile if
 // an IDL file contained nothing but an array definition, but only if
diff --git a/tests/IDL_Test/constants.idl b/tests/IDL_Test/constants.idl
index a5ba3bc4f4d..b93e5d3a385 100644
--- a/tests/IDL_Test/constants.idl
+++ b/tests/IDL_Test/constants.idl
@@ -1,23 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    constants.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    constants.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 const string all_escape = "\n\t\v\b\r\f\a\\\?\'\"";
 
@@ -72,6 +69,15 @@ const double take = 2e3;
 const double dip = 1.797693134862315E+308;
 const double trouble = 2.2250738585072014E-308;
 
+// A few long double cases. No test for values outside
+// the range of 8-byte doubles, since some supported
+// platforms have 8-byte long doubles.
+
+const long double dbl_easy = 698.91148263188057;
+const long double dbl_dip = 1.797693134862315E+308;
+const long double dbl_trouble = 2.2250738585072014E-308;
+const long double dbl_int = 7.;
+
 // const values created through mathematic operations
 const long neg = -8;
 const long sub1 = 0x10 - 0x01;
diff --git a/tests/IDL_Test/dif2.idl b/tests/IDL_Test/dif2.idl
index 5f605c3b16d..107fb7994c2 100644
--- a/tests/IDL_Test/dif2.idl
+++ b/tests/IDL_Test/dif2.idl
@@ -1,103 +1,100 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    dif2.idl
-//
-// = DESCRIPTION
-//    Tests of interface operations and attributes in IDL constructs
-//
-// = AUTHORS
-//    Andy Gokhale <gokhale@dre.vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    dif2.idl
+ *
+ *  $Id$
+ *
+ *  Tests of interface operations and attributes in IDL constructs
+ *
+ *
+ *  @author Andy Gokhale <gokhale@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 module OldDif2
 {
   interface ex1
   {
     void op0 ();
-    
+
     float op1 (in float f,
                out double d,
                inout long l);
-               
+
     double op2 (in double d,
                 out long l,
                 inout short s);
-                
+
     long op3 (in long l,
               out short s,
               inout unsigned long ul);
-              
+
     short op4 (in short s,
                out unsigned long ul,
                inout unsigned short us);
-               
+
     unsigned long op5 (inout unsigned long ul,
                        in unsigned short us,
                        out char c,
                        in boolean b);
-                       
+
     unsigned short op6 (out unsigned short us,
                         inout char c);
   };
 
-  interface ex2 : ex1 
+  interface ex2 : ex1
   {
     // Operations continued from ex1.
     char op7 (in char c,
               out boolean b,
               inout octet o);
-              
+
     boolean op8 (out boolean b,
                  in octet o);
-                 
+
     octet op9 (inout octet o,
                out string s,
                in string <10> ls,
                inout long l);
-               
+
     string op10 (in string s,
                  out string <10> ls);
-                 
+
     string <10> op11 (inout string <10> ls,
                       out long l);
-                      
+
     long op12 (in long l);
   };
 
   interface ex3 : ex1
   {
     readonly attribute float float_attribute;
-    
+
     attribute double double_attribute;
-    
+
     readonly attribute long long_attribute;
-    
+
     attribute short short_attribute;
-    
+
     readonly attribute unsigned long unsigned_long_attribute;
   };
 
   interface ex4 : ex2, ex3
   {
     attribute unsigned short unsigned_short_attribute;
-    
+
     readonly attribute char char_attribute;
-    
+
     attribute boolean boolean_attribute;
-    
+
     readonly attribute octet octet_attribute;
-    
+
     attribute string string_attribute;
-    
+
     readonly attribute string <10> limited_string_attribute;
-    
+
     readonly attribute ex4 an_object_attribute;
   };
 };
diff --git a/tests/IDL_Test/enum_in_struct.idl b/tests/IDL_Test/enum_in_struct.idl
index d3c41ce7781..d71e766fa19 100644
--- a/tests/IDL_Test/enum_in_struct.idl
+++ b/tests/IDL_Test/enum_in_struct.idl
@@ -1,23 +1,20 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    enum_in_struct.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    enum_in_struct.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 // Tests for correct parsing and code generation for
 // both named and anonymous enums in a struct.
@@ -31,11 +28,11 @@ enum UnNamed
 
 struct HoldsEnum
 {
-  enum Named 
-    { 
-      NAMED_FIRST, 
-      NAMED_SECOND, 
-      NAMED_THIRD 
+  enum Named
+    {
+      NAMED_FIRST,
+      NAMED_SECOND,
+      NAMED_THIRD
     } named_enum;
 
   UnNamed unnamed_enum;
@@ -45,22 +42,22 @@ struct HoldsEnum
 
 struct decl_heavy_struct
 {
-  enum str_en 
+  enum str_en
   {
-    a, 
-    b, 
+    a,
+    b,
     c
   } m_en[10];
 
-  struct st 
+  struct st
   {
-    long a; 
+    long a;
     char b;
   } m_st[10];
 
-  union un switch (long) 
+  union un switch (long)
   {
-    case 1: long a; 
+    case 1: long a;
     case 2: char b;
   } m_un[10];
 };
diff --git a/tests/IDL_Test/full.idl b/tests/IDL_Test/full.idl
index 6df0fdc4383..95b8eae7591 100644
--- a/tests/IDL_Test/full.idl
+++ b/tests/IDL_Test/full.idl
@@ -1,29 +1,26 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    full.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    full.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 // This file, along with its companion fwd.idl, test the
 // handling of forward interface declarations that are
 // not defined in the same IDL file. The two files have
 // mutually dependent interfaces. It is no longer necessary
-// for such ILD files to include each other, as long as 
+// for such ILD files to include each other, as long as
 // they are part of the same build.
 
 module scope_test
@@ -36,7 +33,7 @@ module mod2
   interface fwd;
   interface full;
 
-  interface fwd 
+  interface fwd
   {
     attribute string attr;
 
diff --git a/tests/IDL_Test/fwd.idl b/tests/IDL_Test/fwd.idl
index ddfb13adde0..888679f83e4 100644
--- a/tests/IDL_Test/fwd.idl
+++ b/tests/IDL_Test/fwd.idl
@@ -1,29 +1,26 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    fwd.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    fwd.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 // This file, along with its companion full.idl, test the
 // handling of forward interface declarations that are
 // not defined in the same IDL file. The two files have
 // mutually dependent interfaces. It is no longer necessary
-// for such ILD files to include each other, as long as 
+// for such ILD files to include each other, as long as
 // they are part of the same build.
 
 module scope_test
@@ -47,14 +44,14 @@ module mod2
   };
 
   interface fwd;
-  
+
   exception exp
   {
     fwd fwd_mem;
   };
-  
+
   typedef fwd td_fwd;
-  
+
   interface full
   {
     fwd op (in fwd inarg,
@@ -74,11 +71,11 @@ module mod2
 module fwd_mixed_intf
 {
   interface mixed_parents;
-  
+
   interface concrete_parent {};
-  
+
   abstract interface abstract_parent {};
-  
+
   interface mixed_abs_first : abstract_parent, concrete_parent {};
   interface mixed_conc_first : concrete_parent, abstract_parent {};
 };
diff --git a/tests/IDL_Test/generic_object.idl b/tests/IDL_Test/generic_object.idl
index d0a21cdec0e..e2c4e2ff570 100644
--- a/tests/IDL_Test/generic_object.idl
+++ b/tests/IDL_Test/generic_object.idl
@@ -1,34 +1,31 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    generic_object.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    generic_object.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 // The IDL compiler deals with these in a completely different way
 // that it deals with a derived object, i.e., an interface.
 
-enum ObjectType 
+enum ObjectType
 {
-  OT_THIS, 
+  OT_THIS,
   OT_THAT
 };
 
-union Selecter switch (ObjectType) 
+union Selecter switch (ObjectType)
 {
   case OT_THIS: Object this_object;
   case OT_THAT: Object that_object;
@@ -37,8 +34,8 @@ union Selecter switch (ObjectType)
 // Test stub code for generic object parameters.
 interface generic
 {
-  Object op (in Object inarg, 
-             inout Object inoutarg, 
+  Object op (in Object inarg,
+             inout Object inoutarg,
              out Object outarg);
 };
 
diff --git a/tests/IDL_Test/gperf.idl b/tests/IDL_Test/gperf.idl
index a26cb9f9f33..37bbb075483 100644
--- a/tests/IDL_Test/gperf.idl
+++ b/tests/IDL_Test/gperf.idl
@@ -1,23 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    gperf.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    gperf.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 // The examples below uncovered some bugs in gperf,
 // in the form of runtime errors when clients made
@@ -67,7 +64,7 @@ interface test
   attribute testlistitem tltest;
 
   testlistitem new_testlistitem (in string name);
-}; 
+};
 
 interface Simple_Server
 {
@@ -94,5 +91,5 @@ interface Simple_Server
  oneway void transferTriggerDb ();
  oneway void transferTriggerTdc ();
 };
- 
+
 
diff --git a/tests/IDL_Test/included.idl b/tests/IDL_Test/included.idl
index dc97512a1f6..bc528c63396 100644
--- a/tests/IDL_Test/included.idl
+++ b/tests/IDL_Test/included.idl
@@ -1,23 +1,20 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    included.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    included.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 #ifndef IDL_TEST_INCLUDED_IDL
 #define IDL_TEST_INCLUDED_IDL
diff --git a/tests/IDL_Test/including.idl b/tests/IDL_Test/including.idl
index 589054410a8..482aebfd071 100644
--- a/tests/IDL_Test/including.idl
+++ b/tests/IDL_Test/including.idl
@@ -1,23 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    including.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    including.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 #ifndef IDL_TEST_INCLUDING_IDL
 #define IDL_TEST_INCLUDING_IDL
diff --git a/tests/IDL_Test/inherit.idl b/tests/IDL_Test/inherit.idl
index ea6d952f47a..26ac5916d49 100644
--- a/tests/IDL_Test/inherit.idl
+++ b/tests/IDL_Test/inherit.idl
@@ -1,20 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    inherit.idl
-//
-// = DESCRIPTION
-//    Tests of interface inheritance in IDL constructs
-//
-// = AUTHORS
-//    Andy Gokhale <gokhale@dre.vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    inherit.idl
+ *
+ *  $Id$
+ *
+ *  Tests of interface inheritance in IDL constructs
+ *
+ *
+ *  @author Andy Gokhale <gokhale@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 module OldInherit
 {
diff --git a/tests/IDL_Test/interface.idl b/tests/IDL_Test/interface.idl
index d5e713d6e44..b536067de78 100644
--- a/tests/IDL_Test/interface.idl
+++ b/tests/IDL_Test/interface.idl
@@ -1,23 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    interface.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    interface.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 // Used to be a problem in the get() and set()
 // generated code.
@@ -126,8 +123,10 @@ interface Client
 // attributes.
 interface AttributeTester
 {
+  typedef string string_1[1];
+
   attribute string a_su;
-  attribute string<1> a_sb;
+  attribute string_1 a_sb;
 };
 
 // All of the 'recursion' below is legal.
@@ -218,12 +217,12 @@ module redefs
   interface base
   {
     const long lconst = -5;
-    
+
     exception ex
     {
       string info;
     };
-    
+
     struct foo
     {
       short index;
@@ -233,12 +232,12 @@ module redefs
   interface derived : base
   {
     const long lconst = 44;
-    
+
     exception ex
     {
       long serial;
     };
-    
+
     struct foo
     {
       string str;
diff --git a/tests/IDL_Test/invalid_scoping.idl b/tests/IDL_Test/invalid_scoping.idl
deleted file mode 100644
index 37708f6c647..00000000000
--- a/tests/IDL_Test/invalid_scoping.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    invalid_scoping.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// ============================================================================
-
-module A {
-  typedef long mylong;
-  module B {
-    module A { // This is supposed to HIDE outer scope A
-      typedef short myshort;
-    };
-    typedef A::myshort CORRECT;
-    typedef A::mylong  INVALID; // Required to use ::A::mylong
-    // Recursive search is not allowable above as the module A
-    // being referenced is NOT the same as the local module A
-    // that is hiding the outer scoped name, they just happen
-    // to share the same short name.
-  };
-};
diff --git a/tests/IDL_Test/invalid_scoping1.idl b/tests/IDL_Test/invalid_scoping1.idl
new file mode 100644
index 00000000000..bb3db137549
--- /dev/null
+++ b/tests/IDL_Test/invalid_scoping1.idl
@@ -0,0 +1,31 @@
+
+//=============================================================================
+/**
+ *  @file    invalid_scoping1.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ */
+//=============================================================================
+
+
+module A {
+  typedef long mylong;
+  module B {
+    module A { // This is supposed to HIDE outer scope A
+      typedef short myshort;
+    };
+    typedef A::myshort CORRECT;
+    typedef A::mylong  INVALID; // Required to use ::A::mylong
+    // Recursive search is not allowable above as the module A
+    // being referenced is NOT the same as the local module A
+    // that is hiding the outer scoped name, they just happen
+    // to share the same short name.
+  };
+};
diff --git a/tests/IDL_Test/invalid_scoping2.idl b/tests/IDL_Test/invalid_scoping2.idl
new file mode 100644
index 00000000000..8d4a0299fc2
--- /dev/null
+++ b/tests/IDL_Test/invalid_scoping2.idl
@@ -0,0 +1,54 @@
+
+//=============================================================================
+/**
+ *  @file    invalid_scoping2.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ */
+//=============================================================================
+
+
+// Ensure that scope ::A::B::target exists
+// but doesn't contain enum numbers2.
+// ::A::B::target should hide the ::A::target
+// defined later when inside scope ::A::B.
+module A {
+  module B {
+    module target {
+      enum numbers1 {
+        ONE
+      };
+    };
+  };
+};
+
+// Ensure that enum ::A::target::numbers2 exists
+// which should not be found inside scope B due
+// to the internal "target" module above.
+module A {
+  module target {
+    enum numbers2 {
+      TWO
+    };
+  };
+};
+
+// Attempt to access global scope ::A::target::numbers2
+// with a local (non-fully pathed) name target::numbers2
+// from within ::A::B which DOES contain it's own target
+// module that does NOT contain numbers2. THIS SHOULD NOT
+// COMPILE OR LOCK-UP tao_idl. The two target modules are NOT
+// the same module and thus the outer one is hidden by the
+// closer local one.
+module A {
+  module B {
+    typedef target::numbers2 myType;
+  };
+};
diff --git a/tests/IDL_Test/keywords.idl b/tests/IDL_Test/keywords.idl
index f09b93ed87b..97ad967b2a7 100644
--- a/tests/IDL_Test/keywords.idl
+++ b/tests/IDL_Test/keywords.idl
@@ -1,23 +1,20 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    keywords.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    keywords.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 // All these identifiers should be accepted, but
 // prepended with _cxx_.
diff --git a/tests/IDL_Test/main.cpp b/tests/IDL_Test/main.cpp
index 91bebd23bd6..01508dd0dd1 100644
--- a/tests/IDL_Test/main.cpp
+++ b/tests/IDL_Test/main.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    main.cpp
-//
-// = DESCRIPTION
-//    We test the pragma prefixes generated in pragma.idl, and
-//    the values of some generated constants in constants.idl.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    main.cpp
+ *
+ *  $Id$
+ *
+ *  We test the pragma prefixes generated in pragma.idl, and
+ *  the values of some generated constants in constants.idl.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "pragmaS.h"
 #include "unionC.h"
@@ -88,10 +85,10 @@ int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   int error_count = 0;
-  
+
   const ACE_CDR::ULongLong test_ull =
     ACE_UINT64_LITERAL (122192928000000000);
-    
+
   if (test_ull != AAA)
     {
       ++error_count;
@@ -100,7 +97,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                   ACE_TEXT (" long long AAA in constants.idl")
                   ACE_TEXT (" is incorrect\n")));
     }
-    
+
   const CORBA::LongLong test_nll = ACE_INT64_LITERAL (-122192928000000000);
 
   if (test_nll != NAAA)
@@ -111,7 +108,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                   ACE_TEXT (" long long NAAA in constants.idl")
                   ACE_TEXT (" is incorrect\n")));
     }
-    
+
   const CORBA::LongLong test_pll = ACE_INT64_LITERAL (122192928000000000);
 
   if (test_pll != PAAA)
@@ -122,7 +119,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                   ACE_TEXT (" long long PAAA in constants.idl")
                   ACE_TEXT (" is incorrect\n")));
     }
-    
+
   try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
diff --git a/tests/IDL_Test/module.idl b/tests/IDL_Test/module.idl
index bf4d84b5185..95d7efe1566 100644
--- a/tests/IDL_Test/module.idl
+++ b/tests/IDL_Test/module.idl
@@ -1,20 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    module.idl
-//
-// = DESCRIPTION
-//    Tests of module IDL constructs
-//
-// = AUTHORS
-//    Andy Gokhale <gokhale@dre.vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    module.idl
+ *
+ *  $Id$
+ *
+ *  Tests of module IDL constructs
+ *
+ *
+ *  @author Andy Gokhale <gokhale@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 module mod1
 {
diff --git a/tests/IDL_Test/nested_scope.idl b/tests/IDL_Test/nested_scope.idl
index 1793bbc1e34..723d444cce3 100644
--- a/tests/IDL_Test/nested_scope.idl
+++ b/tests/IDL_Test/nested_scope.idl
@@ -1,23 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    nested_scope.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    nested_scope.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 // Tests all the problem datatypes for repeating a scope
 // name after skipping one nesting level.
diff --git a/tests/IDL_Test/old_array.idl b/tests/IDL_Test/old_array.idl
index fdd9b264bf7..a8f3d5f3c21 100644
--- a/tests/IDL_Test/old_array.idl
+++ b/tests/IDL_Test/old_array.idl
@@ -1,20 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    old_array.idl
-//
-// = DESCRIPTION
-//    Tests of array IDL constructs
-//
-// = AUTHORS
-//    Andy Gokhale <gokhale@dre.vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    old_array.idl
+ *
+ *  $Id$
+ *
+ *  Tests of array IDL constructs
+ *
+ *
+ *  @author Andy Gokhale <gokhale@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #include "simple.idl"
 
@@ -23,12 +20,14 @@ module OldArray
   typedef char str22[22][2];
   typedef boolean boolarray[3][40];
 
+  typedef char char_17[17];
+  typedef char char_10_2[10][2];
 
   struct A
   {
     long a1;
-    char a2[17];
-    char a3[10][2];
+    char_17 a2;
+    char_10_2 a3;
   };
 
   struct B
@@ -54,15 +53,15 @@ module OldArray
     A op (in A a1,
           inout A a2,
           out A a3);
-          
+
     str22 op2 (in str22 a1,
                inout str22 a2,
                out str22 a3);
-               
+
     A_matrix op4 (in A a1,
                   inout A a2,
                   out A a3);
-    
+
     attribute str22 attribute_array;
   };
 };
diff --git a/tests/IDL_Test/old_constants.idl b/tests/IDL_Test/old_constants.idl
index 6c8a8cc8301..f04cf8cf5d4 100644
--- a/tests/IDL_Test/old_constants.idl
+++ b/tests/IDL_Test/old_constants.idl
@@ -1,20 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    old_constants.idl
-//
-// = DESCRIPTION
-//    Tests of const IDL constructs
-//
-// = AUTHORS
-//    Andy Gokhale <gokhale@dre.vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    old_constants.idl
+ *
+ *  $Id$
+ *
+ *  Tests of const IDL constructs
+ *
+ *
+ *  @author Andy Gokhale <gokhale@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 module OldConstants
 {
@@ -35,7 +32,7 @@ module OldConstants
 
   module M
   {
-    const short l = 4; 
+    const short l = 4;
 
     enum N
     {
@@ -52,8 +49,8 @@ module OldConstants
 
     interface A
     {
-      const short l = 4; 
-   
+      const short l = 4;
+
       enum N
       {
         zero,
@@ -61,7 +58,7 @@ module OldConstants
         deux,
         trois
       };
-   
+
       exception E
       {
         short cause ;
diff --git a/tests/IDL_Test/old_sequence.idl b/tests/IDL_Test/old_sequence.idl
index a1380a49249..cf357e3e86a 100644
--- a/tests/IDL_Test/old_sequence.idl
+++ b/tests/IDL_Test/old_sequence.idl
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    old_struct.idl
-//
-// = DESCRIPTION
-//    Tests of sequence IDL constructs
-//
-// = AUTHORS
-//    Andy Gokhale <gokhale@dre.vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    old_sequence.idl
+ *
+ *  $Id$
+ *
+ *  Tests of sequence IDL constructs
+ *
+ *
+ *  @author Andy Gokhale <gokhale@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #include "simple.idl"
 
@@ -23,11 +20,12 @@ typedef sequence<c20,23> cc23;
 typedef sequence<char,24> c24;
 typedef sequence< sequence<long,10>, 10> c30;
 
+typedef sequence<string> cstring;
 struct TProgram
 {
-  string           path;
-  sequence<string> argv;
-  sequence<string> envp;
+  string  path;
+  cstring argv;
+  cstring envp;
 };
 
 struct sfoo
diff --git a/tests/IDL_Test/old_struct.idl b/tests/IDL_Test/old_struct.idl
index 424c5e5b958..d8076def0fe 100644
--- a/tests/IDL_Test/old_struct.idl
+++ b/tests/IDL_Test/old_struct.idl
@@ -1,26 +1,25 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    old_struct.idl
-//
-// = DESCRIPTION
-//    Tests of struct IDL constructs
-//
-// = AUTHORS
-//    Andy Gokhale <gokhale@dre.vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    old_struct.idl
+ *
+ *  $Id$
+ *
+ *  Tests of struct IDL constructs
+ *
+ *
+ *  @author Andy Gokhale <gokhale@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
+
+typedef string string_20[20];
 
 struct bar1
 {
   long b1;
   long b2;
-  string<20> b3;
+  string_20 b3;
 };
 
 struct bar2
@@ -54,7 +53,7 @@ interface foo1
 interface foo2 : foo1
 {
   bar1  op2 (in bar2 a);
-  
+
   long op3 (in long a, out char b);
 };
 
diff --git a/tests/IDL_Test/old_union.idl b/tests/IDL_Test/old_union.idl
index 163d3db67ee..e0f74ebca13 100644
--- a/tests/IDL_Test/old_union.idl
+++ b/tests/IDL_Test/old_union.idl
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    old_union.idl
-//
-// = DESCRIPTION
-//    Tests of union IDL constructs
-//
-// = AUTHORS
-//    Andy Gokhale <gokhale@dre.vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    old_union.idl
+ *
+ *  $Id$
+ *
+ *  Tests of union IDL constructs
+ *
+ *
+ *  @author Andy Gokhale <gokhale@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 module OldUnion
 {
diff --git a/tests/IDL_Test/old_union2.idl b/tests/IDL_Test/old_union2.idl
index 9fd2dd2c645..b5054c22961 100644
--- a/tests/IDL_Test/old_union2.idl
+++ b/tests/IDL_Test/old_union2.idl
@@ -1,20 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    old_union2.idl
-//
-// = DESCRIPTION
-//    Further tests of union IDL constructs
-//
-// = AUTHORS
-//    Andy Gokhale <gokhale@dre.vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    old_union2.idl
+ *
+ *  $Id$
+ *
+ *  Further tests of union IDL constructs
+ *
+ *
+ *  @author Andy Gokhale <gokhale@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 module OldUnion2
 {
diff --git a/tests/IDL_Test/params.idl b/tests/IDL_Test/params.idl
index 950c5472060..04604bc561f 100644
--- a/tests/IDL_Test/params.idl
+++ b/tests/IDL_Test/params.idl
@@ -1,46 +1,43 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    params.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    params.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 // Compiling the generated code for the parameters of
 // getDate taught us to use the ACE_NESTED_CLASS macro
 // more judiciously in the header file. This file was
 // also initially a problem for lookups as well.
 
-module foo 
+module foo
 {
-  struct theDate 
+  struct theDate
     {
       short year;
       short month;
       short day;
     };
-  
-  module bar 
+
+  module bar
     {
-      struct theDate 
+      struct theDate
         {
           short x;
         };
-              
-      interface fooBar 
+
+      interface fooBar
         {
           foo::theDate getDate (in foo::theDate a,
                                 inout foo::theDate b,
diff --git a/tests/IDL_Test/pragma.idl b/tests/IDL_Test/pragma.idl
index 561575695e1..118742c5fc4 100644
--- a/tests/IDL_Test/pragma.idl
+++ b/tests/IDL_Test/pragma.idl
@@ -1,23 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    pragma.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    pragma.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 #pragma prefix "anvil.com"
 
diff --git a/tests/IDL_Test/primtypes.idl b/tests/IDL_Test/primtypes.idl
index 12b2a2c2324..c47f44bf3da 100644
--- a/tests/IDL_Test/primtypes.idl
+++ b/tests/IDL_Test/primtypes.idl
@@ -1,29 +1,26 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    primtypes.idl
-//
-// = DESCRIPTION
-//    Tests of primitive types in IDL
-//
-// = AUTHORS
-//    Andy Gokhale <gokhale@dre.vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    primtypes.idl
+ *
+ *  $Id$
+ *
+ *  Tests of primitive types in IDL
+ *
+ *
+ *  @author Andy Gokhale <gokhale@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 module OldPrimTypes
 {
   interface ex1
   {
     attribute long l1;
-    
+
     long m1 (in long a);
-    
+
     ex1 mtypes (in long a1,
                 inout long a2,
                 out long a3,
@@ -47,7 +44,7 @@ module OldPrimTypes
                 out char g3);
   };
 
-  interface ex2 : ex1 
+  interface ex2 : ex1
   {
     readonly attribute long l2;
 
diff --git a/tests/IDL_Test/reopen_include1.idl b/tests/IDL_Test/reopen_include1.idl
index a0770bcc4de..6944d33fa04 100644
--- a/tests/IDL_Test/reopen_include1.idl
+++ b/tests/IDL_Test/reopen_include1.idl
@@ -1,30 +1,27 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    reopen_include1.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    reopen_include1.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 #ifndef IDL_TEST_REOPEN_INCLUDE1_IDL
 #define IDL_TEST_REOPEN_INCLUDE1_IDL
 
 // First opening of a module included by a chain of
 // inclusions into reopened_modules.idl
-module frag 
+module frag
 {
   typedef sequence<double> dub_seq;
 };
diff --git a/tests/IDL_Test/reopen_include2.idl b/tests/IDL_Test/reopen_include2.idl
index 19db6d6ff3a..56562adb264 100644
--- a/tests/IDL_Test/reopen_include2.idl
+++ b/tests/IDL_Test/reopen_include2.idl
@@ -1,23 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    reopen_include2.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    reopen_include2.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 #ifndef IDL_TEST_REOPEN_INCLUDE2_IDL
 #define IDL_TEST_REOPEN_INCLUDE2_IDL
@@ -32,7 +29,7 @@ module frag
 };
 
 // These three are reopened in reopened_modules.idl.
-module XX 
+module XX
 {
   typedef long whah;
 };
diff --git a/tests/IDL_Test/reopened_modules.idl b/tests/IDL_Test/reopened_modules.idl
index b92d6e8a131..431d2b309f5 100644
--- a/tests/IDL_Test/reopened_modules.idl
+++ b/tests/IDL_Test/reopened_modules.idl
@@ -1,23 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    reopened_modules.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    reopened_modules.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 // These examples test the lookup abilities of the
 // TAO IDL compiler, with reopened modules.
@@ -40,7 +37,7 @@ module AA
   {
     module CC
     {
-      interface x2 
+      interface x2
       {
         // 'AA::BB::' should be implicit
         void op1 (in x1 obj);
@@ -57,19 +54,19 @@ module AA
 // recognized as being in the same scope as the
 // previous occurrence(s).
 
-module dot 
-{ 
+module dot
+{
   interface Party;
 
-  interface Person 
+  interface Person
     {
       attribute Party someParty;
     };
 };
 
-module dot 
-{ 
-  interface Party 
+module dot
+{
+  interface Party
     {
       attribute Person somePerson;
     };
@@ -102,18 +99,18 @@ interface OpHolder
 
 // This particular combination used to cause IDL compiler
 // to go into an infinite loop looking for return type to
-// getInfo(). Partial solution got rid of infinite loop, 
+// getInfo(). Partial solution got rid of infinite loop,
 // but erroneously returned ::com from lookup.
 
-module com 
+module com
 {
-  module mr 
+  module mr
     {
       typedef short info;
     };
 };
 
-module com 
+module com
 {
   interface IFace
     {
@@ -124,7 +121,7 @@ module com
 // Modules X and Y are also included from reopene_include2.idl.
 // There were problems with the lookup of Y::Z and X::Ex.
 
-module Y 
+module Y
 {
    interface Z {};
 };
@@ -133,7 +130,7 @@ module X
 {
    exception Ex {};
 
-   interface BI : Y::Z 
+   interface BI : Y::Z
    {
      void method () raises (X::Ex);
    };
@@ -142,16 +139,16 @@ module X
 // Reopened from reopen_include2.idl inclusion. There
 // was a problem with the inheritance lookup.
 
-module XX 
+module XX
 {
   interface blah_intfc;
 
-  interface blah_intfc 
+  interface blah_intfc
   {
     void op1 ();
   };
 
-  interface blah0 : blah_intfc 
+  interface blah0 : blah_intfc
   {
     void op0 ();
   };
@@ -249,7 +246,7 @@ module mC
 };
 
 // The example below uncovered errors in the logic of
-// AST_Module::fe_add_interface_fwd() and 
+// AST_Module::fe_add_interface_fwd() and
 // AST_Module::add_to_previous() that were causing
 // AST_Module::look_in_previous() (and thus lookup_by_name)
 // to fail on the last line.
@@ -284,7 +281,7 @@ module Schmoik
 module Thwoik
 {
   interface TestType;
-};  
+};
 
 module Thwoik
 {
@@ -298,7 +295,7 @@ module Thwoik
 };
 
 // We had a problem with the inheritance list
-// in the declaration of A_mod::B_mod::Foo, in 
+// in the declaration of A_mod::B_mod::Foo, in
 // both stub and skeleton files.
 module A_mod
 {
@@ -307,12 +304,12 @@ module A_mod
   module B_mod
   {
     interface Foo : A_mod::Foo {};
-  };  
+  };
 };
 
 /// Similar to example at the top of this file,
 /// but with more openings and deeper nesting.
-module m1 
+module m1
 {
   module m2
   {
diff --git a/tests/IDL_Test/repo_id_mod.idl b/tests/IDL_Test/repo_id_mod.idl
index 51f50178384..60620865125 100644
--- a/tests/IDL_Test/repo_id_mod.idl
+++ b/tests/IDL_Test/repo_id_mod.idl
@@ -1,23 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    repo_id_mod.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has 
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    repo_id_mod.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 module gleep
 {
@@ -59,7 +56,7 @@ module gleep
     // This will override the prefix directive for module floop at the end
     // of the file.
       typeprefix floop::verklempt "verklempt_prefix";
-    }; 
+    };
   };
 
   local interface schmegegging {};
diff --git a/tests/IDL_Test/run_test.pl b/tests/IDL_Test/run_test.pl
index a74a5079aea..78ea7ea2106 100755
--- a/tests/IDL_Test/run_test.pl
+++ b/tests/IDL_Test/run_test.pl
@@ -32,18 +32,29 @@ else{
    $tao_idl = "../../TAO_IDL/tao_idl";
 }
 
-my $server2 = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-my $input_file1 = $server2->LocalFile ("invalid_scoping.idl");
+my $server2 = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+my $input_file2 = $server2->LocalFile ("invalid_scoping1.idl");
 
 # Compile the IDL
-$SV = $server2->CreateProcess ("$tao_idl", "$input_file1");
-$test = $SV->SpawnWaitKill ($server2->ProcessStartWaitInterval());
+$SV = $server2->CreateProcess ("$tao_idl", "$input_file2");
+$test2 = $SV->SpawnWaitKill ($server2->ProcessStartWaitInterval());
+
+my $server3 = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n";
+my $input_file3 = $server3->LocalFile ("invalid_scoping2.idl");
+
+# Compile the IDL
+$SV = $server3->CreateProcess ("$tao_idl", "$input_file3");
+$test3 = $SV->SpawnWaitKill ($server2->ProcessStartWaitInterval());
 
 #Redirect the null device output back to the screen
 open (STDOUT, ">&OLDOUT");
 open (STDERR, ">&OLDERR");
-if ($test== 0) {
-    print STDERR "ERROR: tao_idl returned $test for $input_file1, should have failed!\n";
+if ($test2== 0) {
+    print STDERR "ERROR: tao_idl returned $test2 for $input_file2, should have failed!\n";
+    $status = 1;
+}
+if ($test3== 0) {
+    print STDERR "ERROR: tao_idl returned $test3 for $input_file3, should have failed!\n";
     $status = 1;
 }
 
diff --git a/tests/IDL_Test/sequence.idl b/tests/IDL_Test/sequence.idl
index 3e5b9415ed9..f8bb18541b6 100644
--- a/tests/IDL_Test/sequence.idl
+++ b/tests/IDL_Test/sequence.idl
@@ -1,23 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    sequence.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    sequence.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 #include "tao/OctetSeq.pidl"
 
diff --git a/tests/IDL_Test/simple.idl b/tests/IDL_Test/simple.idl
index f12b4c92458..de19060f479 100644
--- a/tests/IDL_Test/simple.idl
+++ b/tests/IDL_Test/simple.idl
@@ -1,20 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    simple.idl
-//
-// = DESCRIPTION
-//    Tests of simple IDL
-//
-// = AUTHORS
-//    Andy Gokhale <gokhale@dre.vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    simple.idl
+ *
+ *  $Id$
+ *
+ *  Tests of simple IDL
+ *
+ *
+ *  @author Andy Gokhale <gokhale@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 typedef sequence<long,10> vec10;
 
@@ -37,7 +34,7 @@ interface simple2 : simple
   {
     long reason2;
   };
-  
+
   long op2 (in long a,
             in simple b,
             out simple2 c)
diff --git a/tests/IDL_Test/simple2.idl b/tests/IDL_Test/simple2.idl
index afad6e2e0e1..339054dd24e 100644
--- a/tests/IDL_Test/simple2.idl
+++ b/tests/IDL_Test/simple2.idl
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    simple2.idl
-//
-// = DESCRIPTION
-//    Further tests of simple IDL
-//
-// = AUTHORS
-//    Andy Gokhale <gokhale@dre.vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    simple2.idl
+ *
+ *  $Id$
+ *
+ *  Further tests of simple IDL
+ *
+ *
+ *  @author Andy Gokhale <gokhale@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #include "simple.idl"
 
@@ -38,7 +35,7 @@ interface simple3 : simple2
   };
 
   exception UserError
-  { 
+  {
     any reason;
   };
 
diff --git a/tests/IDL_Test/typecode.idl b/tests/IDL_Test/typecode.idl
index c3dee7f5c70..65901444b5e 100644
--- a/tests/IDL_Test/typecode.idl
+++ b/tests/IDL_Test/typecode.idl
@@ -1,20 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    typecode.idl
-//
-// = DESCRIPTION
-//    Test a sequence of typecodes
-//
-// = AUTHORS
-//    Johnny Willemsen  <jwillemsen@remedy.nl>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    typecode.idl
+ *
+ *  $Id$
+ *
+ *  Test a sequence of typecodes
+ *
+ *
+ *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
 
 #include "orb.idl"
 
diff --git a/tests/IDL_Test/typedef.idl b/tests/IDL_Test/typedef.idl
index 27248fc3374..5385c5ef936 100644
--- a/tests/IDL_Test/typedef.idl
+++ b/tests/IDL_Test/typedef.idl
@@ -1,23 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    typedef.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    typedef.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 
 // Must keep unaliasing until all levels of typedef
diff --git a/tests/IDL_Test/union.idl b/tests/IDL_Test/union.idl
index 3c9e365e678..8464ae52ef7 100644
--- a/tests/IDL_Test/union.idl
+++ b/tests/IDL_Test/union.idl
@@ -1,23 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    union.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    union.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
+ */
+//=============================================================================
+
 
 // Implicit default case
 
@@ -86,17 +83,6 @@ module UnionDiscTest
     };
 };
 
-// AnyUnion
-enum AnyUnionEnum {
-  ANYUNIONENUM2
-};
-
-union MyAnyUnion switch (AnyUnionEnum) {
-  case ANYUNIONENUM2:
-    any my_any;
-};
-
-
 // Nested unions
 
 enum disc1
@@ -263,6 +249,8 @@ union TestUnion switch (short)
 // Test for various kinds of declarations inside a union,
 // similar to the example in enum_in_struct.idl.
 
+typedef long NamedLongArray[10];
+
 union decl_heavy_union switch (short)
 {
   case 1:
@@ -291,5 +279,18 @@ union decl_heavy_union switch (short)
       case 1: long a;
       case 2: char b;
     } m_un_arr[10];
+  // The following caused compile problems once
+  // when generating ostream ops
+  case 5:
+    NamedLongArray m_named_long_array;
+  case 6:
+    long m_anon_long_array[10];
+};
+
+// Tests CORBA::LongDouble implementation on platforms
+// without a native 16-byte long double.
+union ld_test switch (long)
+{
+  case 1: long double ld_mem;
 };
 
diff --git a/tests/IDL_Test/valuetype.idl b/tests/IDL_Test/valuetype.idl
index 41ef604cd3c..de7d0f56ea3 100644
--- a/tests/IDL_Test/valuetype.idl
+++ b/tests/IDL_Test/valuetype.idl
@@ -1,24 +1,20 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Test
-//
-// = FILENAME
-//    valuetype.idl
-//
-// = DESCRIPTION
-//    This file contains examples of IDL code that has
-//    caused problems in the past for the TAO IDL
-//    compiler. This test is to make sure the problems
-//    stay fixed.
-//
-// = AUTHORS
-//    Gary Duzan <gduzan@bbn.com>
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    valuetype.idl
+ *
+ *  $Id$
+ *
+ *  This file contains examples of IDL code that has
+ *  caused problems in the past for the TAO IDL
+ *  compiler. This test is to make sure the problems
+ *  stay fixed.
+ *
+ *
+ *  @author Gary Duzan <gduzan@bbn.com> Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef IDL_TEST_VALUETYPE_IDL
 #define IDL_TEST_VALUETYPE_IDL
@@ -70,7 +66,7 @@ module X
     Object make_object ();
   };
 
-  abstract valuetype BXXX : AXXX 
+  abstract valuetype BXXX : AXXX
   {
   };
   typedef sequence<BXXX> BSeq;
diff --git a/tests/IORManipulation/IORTest.cpp b/tests/IORManipulation/IORTest.cpp
index abfc992c475..9bd530cdd3f 100644
--- a/tests/IORManipulation/IORTest.cpp
+++ b/tests/IORManipulation/IORTest.cpp
@@ -11,17 +11,11 @@
  */
 //=========================================================================
 
-
 #include "ace/Log_Msg.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
 
-
-ACE_RCSID (IORManipluation,
-           IORTest,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/IORManipulation/Makefile.am b/tests/IORManipulation/Makefile.am
deleted file mode 100644
index b8664b4dd0e..00000000000
--- a/tests/IORManipulation/Makefile.am
+++ /dev/null
@@ -1,50 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-SUBDIRS = \
-        . \
-        filter
-
-
-## Makefile.IORManipulation_IORTest.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = IORTest
-
-IORTest_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-IORTest_SOURCES = \
-  IORTest.cpp
-
-IORTest_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/IORManipulation/filter/Makefile.am b/tests/IORManipulation/filter/Makefile.am
deleted file mode 100644
index 6b41a1ec8e4..00000000000
--- a/tests/IORManipulation/filter/Makefile.am
+++ /dev/null
@@ -1,79 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.IORManip_Filter_Test_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/IORManipulation/filter/run_test.pl b/tests/IORManipulation/filter/run_test.pl
index 6063a25b8e1..11dff36ee06 100755
--- a/tests/IORManipulation/filter/run_test.pl
+++ b/tests/IORManipulation/filter/run_test.pl
@@ -26,7 +26,7 @@ $SV = $server->CreateProcess ("server",
                               "-ORBUseSharedProfiles 0 " .
                               "-ORBEndpoint iiop://localhost " .
                               "-ORBEndpoint iiop://$hostname");
-    
+
 $server_status = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
 
 if ($server_status != 0) {
diff --git a/tests/IORManipulation/filter/server.cpp b/tests/IORManipulation/filter/server.cpp
index 7ba5cbed371..49fb18bdf7e 100644
--- a/tests/IORManipulation/filter/server.cpp
+++ b/tests/IORManipulation/filter/server.cpp
@@ -4,10 +4,6 @@
 #include "tao/IORManipulation/IORManip_IIOP_Filter.h"
 #include "tao/Stub.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 class Filter_Localhost: public TAO_IORManip_IIOP_Filter
 {
 public:
diff --git a/tests/IOR_Endpoint_Hostnames/Makefile.am b/tests/IOR_Endpoint_Hostnames/Makefile.am
deleted file mode 100644
index 61beaf2a28c..00000000000
--- a/tests/IOR_Endpoint_Hostnames/Makefile.am
+++ /dev/null
@@ -1,100 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.generate_ior.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  bogusC.cpp \
-  bogusC.h \
-  bogusC.inl \
-  bogusS.cpp \
-  bogusS.h \
-  bogusS.inl
-
-CLEANFILES = \
-  bogus-stamp \
-  bogusC.cpp \
-  bogusC.h \
-  bogusC.inl \
-  bogusS.cpp \
-  bogusS.h \
-  bogusS.inl
-
-bogusC.cpp bogusC.h bogusC.inl bogusS.cpp bogusS.h bogusS.inl: bogus-stamp
-
-bogus-stamp: $(srcdir)/bogus.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/bogus.idl
-	@touch $@
-
-noinst_PROGRAMS += generate_ior
-
-generate_ior_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-generate_ior_SOURCES = \
-  bogusC.cpp \
-  bogusS.cpp \
-  bogus_i.cpp \
-  generate_ior.cpp \
-  bogusC.h \
-  bogusC.inl \
-  bogusS.h \
-  bogusS.inl \
-  bogus_i.h
-
-generate_ior_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.list_interfaces.am
-
-noinst_PROGRAMS += list_interfaces
-
-list_interfaces_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-list_interfaces_SOURCES = \
-  list_interfaces.cpp
-
-list_interfaces_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/IOR_Endpoint_Hostnames/bogus_i.cpp b/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
index fc4222d3e30..b4039bb8ddc 100644
--- a/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
+++ b/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
@@ -2,8 +2,6 @@
 
 #include "bogus_i.h"
 
-ACE_RCSID (IOR_Endpoint_Hostnames, bogus_i, "$Id$")
-
 bogus::bogus()
 {
 }
diff --git a/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
index 8d13e5ff5f2..7bdbfc10987 100644
--- a/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
+++ b/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
@@ -10,10 +10,6 @@
 
 #include "bogus_i.h"
 
-ACE_RCSID (IOR_Endpoint_Hostnames,
-           generate_ior,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
@@ -38,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp b/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
index 10935773c5c..cd941841865 100644
--- a/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
+++ b/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
@@ -1,3 +1,4 @@
+// $Id$
 //
 // Extract the address for each network interface using EXACTLY
 // the same algorithm as TAO_IIOP_Acceptor, and then print
@@ -12,10 +13,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (IOR_Endpoint_Hostnames,
-           list_interfaces,
-           "$Id$")
-
 #if defined (ACE_HAS_IPV6) && !defined (ACE_USES_IPV4_IPV6_MIGRATION)
 ACE_INET_Addr default_address (static_cast<unsigned short> (0), ACE_IPV6_ANY, AF_INET6);
 #else
@@ -28,7 +25,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
 
-  CORBA::ULong endpoint_count;
 #if defined (ACE_HAS_IPV6)
   int def_type = AF_UNSPEC;
 #endif /* ACE_HAS_IPV6 */
@@ -139,21 +135,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   // in a localhost environment.
   if (!ipv4_only && !ipv6_non_ll)
     lo_cnt = ipv4_lo_cnt;
-
-  if (!ignore_lo)
-    endpoint_count = static_cast<CORBA::ULong> (if_ok_cnt - ipv6_ll);
-  else
-    endpoint_count = static_cast<CORBA::ULong> (if_ok_cnt - ipv6_ll - lo_cnt);
 #else /* ACE_HAS_IPV6 */
   // If the loopback interface is the only interface then include it
   // in the list of interfaces to query for a hostname, otherwise
   // exclude it from the list.
   bool ignore_lo;
   ignore_lo = if_cnt != lo_cnt;
-  if (!ignore_lo)
-    endpoint_count = static_cast<CORBA::ULong> (if_cnt);
-  else
-    endpoint_count = static_cast<CORBA::ULong> (if_cnt - lo_cnt);
 #endif /* !ACE_HAS_IPV6 */
 
   // The number of hosts/interfaces we want to cache may not be the
diff --git a/tests/IPV6/Hello.cpp b/tests/IPV6/Hello.cpp
index df5dc90d3d9..0f62f20b906 100644
--- a/tests/IPV6/Hello.cpp
+++ b/tests/IPV6/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/IPV6/Makefile.am b/tests/IPV6/Makefile.am
deleted file mode 100644
index 899cd19797c..00000000000
--- a/tests/IPV6/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.IPV6_Hello_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.IPV6_Hello_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.IPV6_Hello_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/IPV6/client.cpp b/tests/IPV6/client.cpp
index 20026ad82e6..8ab32ee47c3 100644
--- a/tests/IPV6/client.cpp
+++ b/tests/IPV6/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 bool expect_error = false;
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/IPV6/server.cpp b/tests/IPV6/server.cpp
index c1d8bd1bb30..ab19d0fb0a7 100644
--- a/tests/IPV6/server.cpp
+++ b/tests/IPV6/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/InterOp-Naming/INS_i.h b/tests/InterOp-Naming/INS_i.h
index 6f24fbc2094..5888b059637 100644
--- a/tests/InterOp-Naming/INS_i.h
+++ b/tests/InterOp-Naming/INS_i.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/InterOp-Naming
-//
-// = FILENAME
-//    INS_i.h
-//
-// = DESCRIPTION
-//    This class implements the INS interface.
-//
-// = AUTHOR
-//    Vishal Kachroo <vishal@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    INS_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the INS interface.
+ *
+ *
+ *  @author Vishal Kachroo <vishal@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef INS_I_H
 #define INS_I_H
@@ -27,21 +24,21 @@ class INS_i : public POA_INS
 
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   INS_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~INS_i (void);
-  // Destructor.
 
+  /// test the INS.
   char * test_ins (void);
-  // test the INS.
 
+  /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
 
 private:
+  /// ORB pointer.
   CORBA::ORB_var orb_;
-  // ORB pointer.
 
 };
 
diff --git a/tests/InterOp-Naming/Makefile.am b/tests/InterOp-Naming/Makefile.am
deleted file mode 100644
index 4a746e3d312..00000000000
--- a/tests/InterOp-Naming/Makefile.am
+++ /dev/null
@@ -1,113 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.InterOp_Naming_Idl.am
-
-BUILT_SOURCES = \
-  INSC.cpp \
-  INSC.h \
-  INSC.inl \
-  INSS.cpp \
-  INSS.h \
-  INSS.inl
-
-CLEANFILES = \
-  INS-stamp \
-  INSC.cpp \
-  INSC.h \
-  INSC.inl \
-  INSS.cpp \
-  INSS.h \
-  INSS.inl
-
-INSC.cpp INSC.h INSC.inl INSS.cpp INSS.h INSS.inl: INS-stamp
-
-INS-stamp: $(srcdir)/INS.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/INS.idl
-	@touch $@
-
-noinst_HEADERS = \
-  INS.idl
-
-## Makefile.InterOp_Naming_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += INS_test_client
-
-INS_test_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-INS_test_client_SOURCES = \
-  INSC.cpp \
-  INS_test_client.cpp \
-  INS_i.h \
-  Server_i.h
-
-INS_test_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.InterOp_Naming_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += INS_test_server
-
-INS_test_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-INS_test_server_SOURCES = \
-  INSC.cpp \
-  INSS.cpp \
-  INS_i.cpp \
-  INS_test_server.cpp \
-  Server_i.cpp \
-  INS_i.h \
-  Server_i.h
-
-INS_test_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/InterOp-Naming/Server_i.h b/tests/InterOp-Naming/Server_i.h
index e833b024a1e..35248fd2acd 100644
--- a/tests/InterOp-Naming/Server_i.h
+++ b/tests/InterOp-Naming/Server_i.h
@@ -1,20 +1,17 @@
-//$Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/InterOp-Naming
-//
-// = FILENAME
-//   Server_i.h
-//
-// = DESCRIPTION
-//    The class is the driver for the INS test server.
-//
-// = AUTHOR
-//   Vishal Kachroo <vishal@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Server_i.h
+ *
+ *  $Id$
+ *
+ *  The class is the driver for the INS test server.
+ *
+ *
+ *  @author Vishal Kachroo <vishal@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef SERVER_I_H
 #define SERVER_I_H
@@ -30,45 +27,45 @@ class Server_i
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.
   Server_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~Server_i (void);
-  // Destructor.
 
+  /// Initialize the Server state - parsing arguments and waiting.
   int init (int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the Server state - parsing arguments and waiting.
 
+  /// Add an IOR to the ORB-IOR table.
   int add_IOR_to_table (CORBA::String_var ior);
-  // Add an IOR to the ORB-IOR table.
 
+  /// Run the orb.
   int run (void);
-  // Run the orb.
 
 protected:
 
+  /// Servant class
   INS_i servant_;
-  // Servant class
 
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// The ORB manager - a helper class for accessing the POA and
+  /// registering objects.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager - a helper class for accessing the POA and
-  // registering objects.
 
+  /// File where the IOR of the server object is stored.
   FILE *ior_output_file_;
-  // File where the IOR of the server object is stored.
 
+  /// Used test the INS.
   char * ins_;
-  // Used test the INS.
 
+  /// Number of command line arguments.
   int argc_;
-  // Number of command line arguments.
 
+  /// The command line arguments.
   ACE_TCHAR **argv_;
-  // The command line arguments.
 };
 
 #endif /* SERVER_I_H */
diff --git a/tests/Leader_Followers/Makefile.am b/tests/Leader_Followers/Makefile.am
deleted file mode 100644
index 8e6746e9201..00000000000
--- a/tests/Leader_Followers/Makefile.am
+++ /dev/null
@@ -1,112 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Leader_Followers_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Leader_Followers_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Leader_Followers_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Leader_Followers/client.cpp b/tests/Leader_Followers/client.cpp
index 50085c4d683..a69ca775862 100644
--- a/tests/Leader_Followers/client.cpp
+++ b/tests/Leader_Followers/client.cpp
@@ -1,17 +1,17 @@
-// $Id$
-
-// ================================================================
-//
-// = FILENAME
-//     client.cpp
-//
-// = DESCRIPTION
-//     See README.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *   See README.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
@@ -21,8 +21,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Leader_Followers, client, "$Id$")
-
 // Name of file contains ior.
 static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 
diff --git a/tests/Leader_Followers/select_mt.conf b/tests/Leader_Followers/select_mt.conf
index 8d22cd57f68..8c9ba3c2c58 100644
--- a/tests/Leader_Followers/select_mt.conf
+++ b/tests/Leader_Followers/select_mt.conf
@@ -1 +1,3 @@
+# $Id$
+
 static Advanced_Resource_Factory "-ORBreactortype select_mt"
diff --git a/tests/Leader_Followers/server.cpp b/tests/Leader_Followers/server.cpp
index 0154a90b7d0..ccc53a35c99 100644
--- a/tests/Leader_Followers/server.cpp
+++ b/tests/Leader_Followers/server.cpp
@@ -6,8 +6,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Leader_Followers, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 
 int number_of_event_loop_threads = 1;
@@ -40,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Leader_Followers/test_i.cpp b/tests/Leader_Followers/test_i.cpp
index 1a8c3d88221..b1e87f1c15a 100644
--- a/tests/Leader_Followers/test_i.cpp
+++ b/tests/Leader_Followers/test_i.cpp
@@ -3,8 +3,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Leader_Followers, test_i, "$Id$")
-
 test_i::test_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Leader_Followers/test_i.h b/tests/Leader_Followers/test_i.h
index 74db1115a2b..175291ddca8 100644
--- a/tests/Leader_Followers/test_i.h
+++ b/tests/Leader_Followers/test_i.h
@@ -1,28 +1,27 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Leader_Followers/
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Irfan Pyarali
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
 
+/**
+ * @class test_i
+ *
+ * @brief Simple test implementation.
+ */
 class test_i : public POA_test
 {
-  // = TITLE
-  //   Simple test implementation.
-  //
 public:
+  /// ctor.
   test_i (CORBA::ORB_ptr orb);
-  // ctor.
 
   // = The test interface methods.
   CORBA::ULong method (CORBA::ULong work);
@@ -30,6 +29,6 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB.
   CORBA::ORB_var orb_;
-  // The ORB.
 };
diff --git a/tests/Leader_Followers/tp.conf b/tests/Leader_Followers/tp.conf
index b996e118b39..b954c2c1707 100644
--- a/tests/Leader_Followers/tp.conf
+++ b/tests/Leader_Followers/tp.conf
@@ -1 +1,3 @@
+# $Id$
+
 static Advanced_Resource_Factory "-ORBreactortype tp"
diff --git a/tests/LongDouble/LongDoubleTest.cpp b/tests/LongDouble/LongDoubleTest.cpp
index 1980e729449..f3da93063ac 100644
--- a/tests/LongDouble/LongDoubleTest.cpp
+++ b/tests/LongDouble/LongDoubleTest.cpp
@@ -4,8 +4,6 @@
 #include "LongDoubleTest.h"
 #include "Global.h"
 
-ACE_RCSID (LongDoubleTest, LongDoubleTest, "$Id$")
-
 LongDoubleTest::LongDoubleTest (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/LongDouble/Makefile.am b/tests/LongDouble/Makefile.am
deleted file mode 100644
index bdc9eefc041..00000000000
--- a/tests/LongDouble/Makefile.am
+++ /dev/null
@@ -1,108 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.LongDoubleTest_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.LongDoubleTest_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Global.cpp \
-  TestC.cpp \
-  client.cpp \
-  Global.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.LongDoubleTest_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Global.cpp \
-  LongDoubleTest.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Global.h \
-  LongDoubleTest.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/LongDouble/client.cpp b/tests/LongDouble/client.cpp
index c29a84d6511..02fdbebed49 100644
--- a/tests/LongDouble/client.cpp
+++ b/tests/LongDouble/client.cpp
@@ -5,9 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/streams.h"
 
-
-ACE_RCSID (LongDoubleTest, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://server.ior");
 
 int
@@ -32,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/LongDouble/server.cpp b/tests/LongDouble/server.cpp
index fd1680bd140..078a6750c43 100644
--- a/tests/LongDouble/server.cpp
+++ b/tests/LongDouble/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (LongDoubleTest,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/LongUpcalls/AMI_Manager.cpp b/tests/LongUpcalls/AMI_Manager.cpp
index 97bac4aba5b..a8a17609364 100644
--- a/tests/LongUpcalls/AMI_Manager.cpp
+++ b/tests/LongUpcalls/AMI_Manager.cpp
@@ -5,10 +5,6 @@
 #include "AMI_Manager.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (LongUpcalls,
-           AMI_Manager,
-           "$Id$")
-
 static void
 validate_connection (Test::Controller_ptr controller)
 {
diff --git a/tests/LongUpcalls/Controller.cpp b/tests/LongUpcalls/Controller.cpp
index cb65f340fcb..81eb5edbc9b 100644
--- a/tests/LongUpcalls/Controller.cpp
+++ b/tests/LongUpcalls/Controller.cpp
@@ -3,8 +3,6 @@
 //
 #include "Controller.h"
 
-ACE_RCSID(LongUpcalls, Controller, "$Id$")
-
 Controller::Controller (void)
   :  start_count_ (0)
   ,  finish_count_ (0)
diff --git a/tests/LongUpcalls/Makefile.am b/tests/LongUpcalls/Makefile.am
deleted file mode 100644
index 584f04c4fc0..00000000000
--- a/tests/LongUpcalls/Makefile.am
+++ /dev/null
@@ -1,205 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.LongUpcalls_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LongUpcalls_AMI_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += ami_client
-
-ami_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ami_client_SOURCES = \
-  Controller.cpp \
-  Manager_Handler.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  ami_client.cpp \
-  Controller.h \
-  Manager_Handler.h
-
-ami_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LongUpcalls_AMI_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += ami_server
-
-ami_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ami_server_SOURCES = \
-  AMI_Manager.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  ami_server.cpp \
-  AMI_Manager.h
-
-ami_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LongUpcalls_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += blocking_client
-
-blocking_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-blocking_client_SOURCES = \
-  Controller.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  blocking_client.cpp \
-  Controller.h
-
-blocking_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LongUpcalls_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += blocking_server
-
-blocking_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-blocking_server_SOURCES = \
-  Manager.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  blocking_server.cpp \
-  Manager.h
-
-blocking_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/LongUpcalls/Manager.cpp b/tests/LongUpcalls/Manager.cpp
index d6fcbbea8cb..8bb3ea0fe05 100644
--- a/tests/LongUpcalls/Manager.cpp
+++ b/tests/LongUpcalls/Manager.cpp
@@ -5,10 +5,6 @@
 #include "Manager.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (LongUpcalls,
-           Manager,
-           "$Id$")
-
 static void
 validate_connection (Test::Controller_ptr controller)
 {
diff --git a/tests/LongUpcalls/Manager_Handler.cpp b/tests/LongUpcalls/Manager_Handler.cpp
index a38e2edbc36..3e8ea30e8ea 100644
--- a/tests/LongUpcalls/Manager_Handler.cpp
+++ b/tests/LongUpcalls/Manager_Handler.cpp
@@ -4,8 +4,6 @@
 
 #include "Manager_Handler.h"
 
-ACE_RCSID(LongUpcalls, Manager_Handler, "$Id$")
-
 Manager_Handler::Manager_Handler (Test::Manager_ptr manager,
                                   Test::Controller_ptr controller)
   : manager_ (Test::Manager::_duplicate (manager))
diff --git a/tests/LongUpcalls/ami_client.cpp b/tests/LongUpcalls/ami_client.cpp
index 6a0b42b598a..b5f1efc52a2 100644
--- a/tests/LongUpcalls/ami_client.cpp
+++ b/tests/LongUpcalls/ami_client.cpp
@@ -4,8 +4,6 @@
 #include "Controller.h"
 #include "Manager_Handler.h"
 
-ACE_RCSID(LongUpcalls, ami_client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/LongUpcalls/ami_server.cpp b/tests/LongUpcalls/ami_server.cpp
index 3f0db7273cf..94164a1eb6a 100644
--- a/tests/LongUpcalls/ami_server.cpp
+++ b/tests/LongUpcalls/ami_server.cpp
@@ -3,8 +3,6 @@
 #include "ace/Get_Opt.h"
 #include "AMI_Manager.h"
 
-ACE_RCSID(LongUpcalls, ami_server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -28,7 +26,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/LongUpcalls/blocking_client.cpp b/tests/LongUpcalls/blocking_client.cpp
index aab93fa66ab..ceb750ed3b3 100644
--- a/tests/LongUpcalls/blocking_client.cpp
+++ b/tests/LongUpcalls/blocking_client.cpp
@@ -3,8 +3,6 @@
 #include "ace/Get_Opt.h"
 #include "Controller.h"
 
-ACE_RCSID(LongUpcalls, blocking_client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -28,7 +26,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/LongUpcalls/blocking_server.cpp b/tests/LongUpcalls/blocking_server.cpp
index 142d7fef6a3..128c91f59f1 100644
--- a/tests/LongUpcalls/blocking_server.cpp
+++ b/tests/LongUpcalls/blocking_server.cpp
@@ -3,8 +3,6 @@
 #include "ace/Get_Opt.h"
 #include "Manager.h"
 
-ACE_RCSID(LongUpcalls, blocking_server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -28,7 +26,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/MProfile/Makefile.am b/tests/MProfile/Makefile.am
deleted file mode 100644
index 519fa6b84d9..00000000000
--- a/tests/MProfile/Makefile.am
+++ /dev/null
@@ -1,112 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MProfile_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MProfile_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MProfile_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/MProfile/client.cpp b/tests/MProfile/client.cpp
index e610b16c39a..f3f1dfeb84d 100644
--- a/tests/MProfile/client.cpp
+++ b/tests/MProfile/client.cpp
@@ -6,8 +6,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "testC.h"
 
-ACE_RCSID(MT_Server, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int do_shutdown = 0;
 
@@ -44,7 +42,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/MProfile/server.cpp b/tests/MProfile/server.cpp
index f9991fc9952..fa3c1874c6e 100644
--- a/tests/MProfile/server.cpp
+++ b/tests/MProfile/server.cpp
@@ -5,8 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(MT_Client, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/MProfile/test_i.cpp b/tests/MProfile/test_i.cpp
index b3f4772e9fa..9c6d464b6ab 100644
--- a/tests/MProfile/test_i.cpp
+++ b/tests/MProfile/test_i.cpp
@@ -2,8 +2,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID(MT_Client, test_i, "$Id$")
-
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     val_ (1)
diff --git a/tests/MProfile/test_i.h b/tests/MProfile/test_i.h
index 07f971408ac..58cc6ea1bb9 100644
--- a/tests/MProfile/test_i.h
+++ b/tests/MProfile/test_i.h
@@ -1,37 +1,35 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Mprofile
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan <coryan@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_MPROFILE_TEST_I_H
 #define TAO_MPROFILE_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// ctor
   Simple_Server_i (void);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long remote_call (void);
diff --git a/tests/MProfile_Connection_Timeout/Makefile.am b/tests/MProfile_Connection_Timeout/Makefile.am
deleted file mode 100644
index 660cc9718c1..00000000000
--- a/tests/MProfile_Connection_Timeout/Makefile.am
+++ /dev/null
@@ -1,121 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MProfile_Connection_Timeout_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.MProfile_Connection_Timeout_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.MProfile_Connection_Timeout_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/MProfile_Connection_Timeout/client.cpp b/tests/MProfile_Connection_Timeout/client.cpp
index 596ae335751..df2e469c5f1 100644
--- a/tests/MProfile_Connection_Timeout/client.cpp
+++ b/tests/MProfile_Connection_Timeout/client.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/IORManipulation/IORManip_Loader.h"
@@ -8,10 +9,6 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(MProfile_Connection_Timeout,
-          client,
-          "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int do_shutdown = 0;
 
@@ -49,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -77,11 +74,11 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         orb->string_to_object (name);
 
       // Get an object reference for the ORBs IORManipultion object!
-      CORBA::Object_ptr IORM =
+      CORBA::Object_var IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0);
 
-      TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM);
+      TAO_IOP::TAO_IOR_Manipulation_var iorm =
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ());
 
       TAO_IOP::TAO_IOR_Manipulation::IORList iors (2);
       iors.length(2);
diff --git a/tests/MProfile_Connection_Timeout/server.cpp b/tests/MProfile_Connection_Timeout/server.cpp
index 7d7dfdb3feb..3fa9c78bea4 100644
--- a/tests/MProfile_Connection_Timeout/server.cpp
+++ b/tests/MProfile_Connection_Timeout/server.cpp
@@ -1,13 +1,10 @@
+// -*- C++ -*-
 // $Id$
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(MProfile_Connection_Timeout,
-          server,
-          "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 int orb_run = 0;
 int
@@ -34,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/MProfile_Connection_Timeout/test_i.cpp b/tests/MProfile_Connection_Timeout/test_i.cpp
index 81c92cbb04c..c9666c5d7ab 100644
--- a/tests/MProfile_Connection_Timeout/test_i.cpp
+++ b/tests/MProfile_Connection_Timeout/test_i.cpp
@@ -1,11 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
 #include "test_i.h"
 
-ACE_RCSID(MProfile_Connection_Timeout,
-          test_i,
-          "$Id$")
-
 // part of the famous caesium 133 atom transition for a
 // second. Cannot represent the last part since the value gets out of
 // range.
diff --git a/tests/MProfile_Connection_Timeout/test_i.h b/tests/MProfile_Connection_Timeout/test_i.h
index cb4554e8655..bd1c4cbe7e8 100644
--- a/tests/MProfile_Connection_Timeout/test_i.h
+++ b/tests/MProfile_Connection_Timeout/test_i.h
@@ -1,37 +1,35 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MProfile_Connection_Timeout
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_MPROFILE_CONNECTION_TIMEOUT_TEST_I_H
 #define TAO_MPROFILE_CONNECTION_TIMEOUT_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// ctor
   Simple_Server_i (void);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::ULongLong remote_call (void);
diff --git a/tests/MProfile_Forwarding/Makefile.am b/tests/MProfile_Forwarding/Makefile.am
deleted file mode 100644
index 4d80c6acbbb..00000000000
--- a/tests/MProfile_Forwarding/Makefile.am
+++ /dev/null
@@ -1,139 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MProfile_Forwarding_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.MProfile_Forwarding_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  Manager.h \
-  Servant_Locator.h \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MProfile_Forwarding_Manager.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += manager
-
-manager_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-manager_SOURCES = \
-  Manager.cpp \
-  Servant_Locator.cpp \
-  testC.cpp \
-  Manager.h \
-  Servant_Locator.h \
-  test_i.inl
-
-manager_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MProfile_Forwarding_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/MProfile_Forwarding/Manager.cpp b/tests/MProfile_Forwarding/Manager.cpp
index 21880114610..d4981d2deae 100644
--- a/tests/MProfile_Forwarding/Manager.cpp
+++ b/tests/MProfile_Forwarding/Manager.cpp
@@ -44,7 +44,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/MProfile_Forwarding/Servant_Locator.cpp b/tests/MProfile_Forwarding/Servant_Locator.cpp
index 4185fda90f6..5fa43c2d25c 100644
--- a/tests/MProfile_Forwarding/Servant_Locator.cpp
+++ b/tests/MProfile_Forwarding/Servant_Locator.cpp
@@ -1,31 +1,24 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/Forwarding/Servant_Locator
-//
-// = FILENAME
-//     Servant_Locator.cpp
-//
-// = DESCRIPTION
-//     Implementation of MyFooServantLocator class , used with a POA
-//     having a NON_RETAIN policy.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//     Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file     Servant_Locator.cpp
+ *
+ *  $Id$
+ *
+ *   Implementation of MyFooServantLocator class , used with a POA
+ *   having a NON_RETAIN policy.
+ *
+ *
+ *  @author  Irfan Pyarali  Michael Kircher
+ */
+//=============================================================================
+
 
 #include "Servant_Locator.h"
 #include "ace/Log_Msg.h"
 #include "testC.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID(Forwarding, Servant_Locator, "$Id$")
-
 Servant_Locator::Servant_Locator (CORBA::ORB_ptr orb_ptr)
 
   : orb_var_ (CORBA::ORB::_duplicate (orb_ptr))
diff --git a/tests/MProfile_Forwarding/Servant_Locator.h b/tests/MProfile_Forwarding/Servant_Locator.h
index 112a61c7432..891d8ea1374 100644
--- a/tests/MProfile_Forwarding/Servant_Locator.h
+++ b/tests/MProfile_Forwarding/Servant_Locator.h
@@ -1,21 +1,18 @@
-// $Id$
 
-// ================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/Forwarding/Servant_Locator
-//
-// = FILENAME
-//     Servant_Locator.h
-//
-// = DESCRIPTION
-//     Defines a MyFooServantLocator class , used with a POA having
-//     a NON_RETAIN policy
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ================================================================
+//=============================================================================
+/**
+ *  @file     Servant_Locator.h
+ *
+ *  $Id$
+ *
+ *   Defines a MyFooServantLocator class , used with a POA having
+ *   a NON_RETAIN policy
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #ifndef _SERVANT_LOCATOR_H_
 #define _SERVANT_LOCATOR_H_
@@ -24,11 +21,14 @@
 #include "tao/PortableServer/ServantLocatorC.h"
 #include "tao/ORB.h"
 
+/**
+ * @class Servant_Locator
+ *
+ * @brief This class is used by a POA with USE_SERVANT_MANAGER and
+ * NON_RETAIN policy.
+ */
 class Servant_Locator : public PortableServer::ServantLocator
 {
-  // = TITLE
-  //   This class is used by a POA with USE_SERVANT_MANAGER and
-  //   NON_RETAIN policy.
 public:
   Servant_Locator (CORBA::ORB_ptr orb_ptr);
 
@@ -36,29 +36,29 @@ public:
 
   ~Servant_Locator ();
 
+  /// This method is invoked by a POA whenever it receives a request
+  /// for MyFoo object that is not currently active.
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
                                              PortableServer::ServantLocator::Cookie &the_cookie);
-  // This method is invoked by a POA whenever it receives a request
-  // for MyFoo object that is not currently active.
 
+  /// This method is invoked whenever a MyFooServant completes a
+  /// request.
   virtual void postinvoke (const PortableServer::ObjectId &oid,
                            PortableServer::POA_ptr adapter,
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
                            PortableServer::Servant the_servant);
-  // This method is invoked whenever a MyFooServant completes a
-  // request.
 
+  /// To be removed..
   void set (CORBA::Object_var obj);
-  // To be removed..
 
  private:
   CORBA::ORB_var orb_var_;
 
+  /// To be removed
   CORBA::Object_var objref_;
-  // To be removed
 };
 
 #endif /* _SERVANT_LOCATOR_H */
diff --git a/tests/MProfile_Forwarding/client.cpp b/tests/MProfile_Forwarding/client.cpp
index 2864a422a4b..7d255007aa8 100644
--- a/tests/MProfile_Forwarding/client.cpp
+++ b/tests/MProfile_Forwarding/client.cpp
@@ -5,8 +5,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "testC.h"
 
-ACE_RCSID(MT_Server, client, "$Id$")
-
 const ACE_TCHAR *ior_input_file = 0;
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/MProfile_Forwarding/server.cpp b/tests/MProfile_Forwarding/server.cpp
index 3b88b668292..405a6eca91a 100644
--- a/tests/MProfile_Forwarding/server.cpp
+++ b/tests/MProfile_Forwarding/server.cpp
@@ -5,8 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(MT_Client, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/MProfile_Forwarding/test_i.cpp b/tests/MProfile_Forwarding/test_i.cpp
index 4fb6535c3ab..65291139aa8 100644
--- a/tests/MProfile_Forwarding/test_i.cpp
+++ b/tests/MProfile_Forwarding/test_i.cpp
@@ -6,8 +6,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(MT_Client, test_i, "$Id$")
-
 Simple_Server_i::Simple_Server_i (void)
   :orb_ (0)
 {
diff --git a/tests/MProfile_Forwarding/test_i.h b/tests/MProfile_Forwarding/test_i.h
index 69525a827ec..ba29a0b6941 100644
--- a/tests/MProfile_Forwarding/test_i.h
+++ b/tests/MProfile_Forwarding/test_i.h
@@ -1,37 +1,36 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Balachandran Natarajan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan
+ */
+//=============================================================================
+
 
 #ifndef MPROFILE_FORWARDING_TEST_I_H
 #define MPROFILE_FORWARDING_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
   Simple_Server_i (CORBA::ORB_ptr orb);
 
   // ctor
 
+  /// ctor
   Simple_Server_i (void);
-  // ctor
 
   // = The Simple_Server methods.
   void remote_call (void);
diff --git a/tests/MT_BiDir/Client_Task.cpp b/tests/MT_BiDir/Client_Task.cpp
index f3661e9aa95..24d1baf9ead 100644
--- a/tests/MT_BiDir/Client_Task.cpp
+++ b/tests/MT_BiDir/Client_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(Muxing, Client_Task, "Client_Task.cpp,v 1.1 2001/03/10 23:37:42 coryan Exp")
-
 Client_Task::Client_Task (CORBA::ORB_ptr orb,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr)
diff --git a/tests/MT_BiDir/Makefile.am b/tests/MT_BiDir/Makefile.am
deleted file mode 100644
index 4d95482be7d..00000000000
--- a/tests/MT_BiDir/Makefile.am
+++ /dev/null
@@ -1,145 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_BiDir_Idl.am
-
-BUILT_SOURCES = \
-  ReceiverC.cpp \
-  ReceiverC.h \
-  ReceiverC.inl \
-  ReceiverS.cpp \
-  ReceiverS.h \
-  ReceiverS.inl
-
-CLEANFILES = \
-  Receiver-stamp \
-  ReceiverC.cpp \
-  ReceiverC.h \
-  ReceiverC.inl \
-  ReceiverS.cpp \
-  ReceiverS.h \
-  ReceiverS.inl
-
-ReceiverC.cpp ReceiverC.h ReceiverC.inl ReceiverS.cpp ReceiverS.h ReceiverS.inl: Receiver-stamp
-
-Receiver-stamp: $(srcdir)/Receiver.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Receiver.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  SenderC.cpp \
-  SenderC.h \
-  SenderC.inl \
-  SenderS.cpp \
-  SenderS.h \
-  SenderS.inl
-
-CLEANFILES += \
-  Sender-stamp \
-  SenderC.cpp \
-  SenderC.h \
-  SenderC.inl \
-  SenderS.cpp \
-  SenderS.h \
-  SenderS.inl
-
-SenderC.cpp SenderC.h SenderC.inl SenderS.cpp SenderS.h SenderS.inl: Sender-stamp
-
-Sender-stamp: $(srcdir)/Sender.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Sender.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Receiver.idl \
-  Sender.idl
-
-## Makefile.MT_BiDir_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  ReceiverC.cpp \
-  ReceiverS.cpp \
-  Receiver_i.cpp \
-  SenderC.cpp \
-  client.cpp \
-  Client_Task.h \
-  Receiver_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MT_BiDir_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ReceiverC.cpp \
-  SenderC.cpp \
-  SenderS.cpp \
-  Sender_i.cpp \
-  Server_Task.cpp \
-  server.cpp \
-  Sender_i.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/MT_BiDir/Receiver_i.cpp b/tests/MT_BiDir/Receiver_i.cpp
index cf6b1a2c027..72b6bf4f7aa 100644
--- a/tests/MT_BiDir/Receiver_i.cpp
+++ b/tests/MT_BiDir/Receiver_i.cpp
@@ -3,10 +3,6 @@
 //
 #include "Receiver_i.h"
 
-ACE_RCSID(MT_BiDir,
-          Receiver_i,
-          "$Id$")
-
 Receiver_i::Receiver_i (void)
   :  message_count_ (0)
   ,  byte_count_ (0)
diff --git a/tests/MT_BiDir/Sender_i.cpp b/tests/MT_BiDir/Sender_i.cpp
index 131b21cd59d..35f2360528c 100644
--- a/tests/MT_BiDir/Sender_i.cpp
+++ b/tests/MT_BiDir/Sender_i.cpp
@@ -1,12 +1,8 @@
+// $Id$
+
 #include "Sender_i.h"
 #include "ace/Manual_Event.h"
 
-
-ACE_RCSID(MT_BiDir,
-          Sender_i,
-          "$Id$")
-
-
 Sender_i::Sender_i (CORBA::ULong no_clients,
                     ACE_Manual_Event &event)
   : event_ (event)
diff --git a/tests/MT_BiDir/Server_Task.cpp b/tests/MT_BiDir/Server_Task.cpp
index fa16e325137..d095f295801 100644
--- a/tests/MT_BiDir/Server_Task.cpp
+++ b/tests/MT_BiDir/Server_Task.cpp
@@ -9,12 +9,6 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "ace/Manual_Event.h"
 
-
-ACE_RCSID (MT_BiDir,
-           Server_Task,
-           "Server_Task.cpp,v 1.1 2001/03/10 23:37:42 coryan Exp")
-
-
 Server_Task::Server_Task (Sender_i *sender,
                           ACE_Manual_Event &event,
                           int no_iterations,
diff --git a/tests/MT_BiDir/client.cpp b/tests/MT_BiDir/client.cpp
index 62b9bd177d6..abf16e115a9 100644
--- a/tests/MT_BiDir/client.cpp
+++ b/tests/MT_BiDir/client.cpp
@@ -7,8 +7,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "Client_Task.h"
 
-ACE_RCSID(BiDirectional, client, "client.cpp,v 1.6 2001/03/30 20:11:05 bala Exp")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -32,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/MT_BiDir/server.cpp b/tests/MT_BiDir/server.cpp
index f359a0cbb79..043ed95d566 100644
--- a/tests/MT_BiDir/server.cpp
+++ b/tests/MT_BiDir/server.cpp
@@ -10,12 +10,6 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "ace/Manual_Event.h"
 
-
-ACE_RCSID (MT_BirDir,
-           server,
-           "$Id$")
-
-
 const ACE_TCHAR *ior_output_file = 0;
 static int no_iterations = 10;
 static int no_clients = 2;
@@ -49,7 +43,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/MT_Client/Makefile.am b/tests/MT_Client/Makefile.am
deleted file mode 100644
index 278c404f181..00000000000
--- a/tests/MT_Client/Makefile.am
+++ /dev/null
@@ -1,107 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_Client_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.MT_Client_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MT_Client_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/MT_Client/client.cpp b/tests/MT_Client/client.cpp
index e9326f57905..a717f92b9f7 100644
--- a/tests/MT_Client/client.cpp
+++ b/tests/MT_Client/client.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(MT_Client, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
 int niterations = 5;
@@ -44,7 +42,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/MT_Client/client_muxed.conf b/tests/MT_Client/client_muxed.conf
index 05145bd0896..924b53fcb2a 100644
--- a/tests/MT_Client/client_muxed.conf
+++ b/tests/MT_Client/client_muxed.conf
@@ -1,3 +1,3 @@
 # $Id$
 
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler MT  -ORBTransportMuxStrategy MUXED"
+static Client_Strategy_Factory "-ORBClientConnectionHandler MT  -ORBTransportMuxStrategy MUXED"
diff --git a/tests/MT_Client/client_muxed.conf.xml b/tests/MT_Client/client_muxed.conf.xml
index ba4727350fc..a03048a0550 100644
--- a/tests/MT_Client/client_muxed.conf.xml
+++ b/tests/MT_Client/client_muxed.conf.xml
@@ -2,5 +2,5 @@
 <!-- Converted from ./tests/MT_Client/client_muxed.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
  <!--  $Id$ -->
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler MT  -ORBTransportMuxStrategy MUXED"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler MT  -ORBTransportMuxStrategy MUXED"/>
 </ACE_Svc_Conf>
diff --git a/tests/MT_Client/orb_creation.cpp b/tests/MT_Client/orb_creation.cpp
index 1aaae1ef783..0c1b9ff0d51 100644
--- a/tests/MT_Client/orb_creation.cpp
+++ b/tests/MT_Client/orb_creation.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(MT_Client, orb_creation, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
 int niterations = 5;
@@ -40,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/MT_Client/server.cpp b/tests/MT_Client/server.cpp
index 7250c546583..cc915920a38 100644
--- a/tests/MT_Client/server.cpp
+++ b/tests/MT_Client/server.cpp
@@ -4,8 +4,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(MT_Client, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/MT_Client/test.idl b/tests/MT_Client/test.idl
index cbb8054de28..1c92c90a571 100644
--- a/tests/MT_Client/test.idl
+++ b/tests/MT_Client/test.idl
@@ -11,7 +11,7 @@ interface Simple_Server
 
   /// Shutdown the server
   /**
-   * Provide a simple way to cleanup the test when it finishes 
+   * Provide a simple way to cleanup the test when it finishes
    */
   oneway void shutdown ();
 };
diff --git a/tests/MT_Client/test_i.cpp b/tests/MT_Client/test_i.cpp
index ed136fa4fa4..3d7090b6bb2 100644
--- a/tests/MT_Client/test_i.cpp
+++ b/tests/MT_Client/test_i.cpp
@@ -6,8 +6,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(MT_Client, test_i, "$Id$")
-
 void
 Simple_Server_i::test_method (void)
 {
diff --git a/tests/MT_Client/test_i.h b/tests/MT_Client/test_i.h
index e38a1d70ad0..a752d15c3ea 100644
--- a/tests/MT_Client/test_i.h
+++ b/tests/MT_Client/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Client
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_MT_CLIENT_TEST_I_H
 #define TAO_MT_CLIENT_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   void test_method (void);
diff --git a/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc b/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc
new file mode 100644
index 00000000000..a11e11f20a6
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc
@@ -0,0 +1,48 @@
+// -*- MPC -*-
+// $Id$
+
+
+project(*idl): taoidldefaults {
+  idlflags += -Sp
+  IDL_Files {
+    SharedIntf.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): messaging, taoserver, threads {
+  exename = server
+  after += *idl
+  Source_Files {
+    SharedIntf_i.cpp
+    server.cpp
+    worker.cpp
+    chatter.cpp
+    police.cpp
+  }
+  Source_Files {
+    SharedIntfC.cpp
+    SharedIntfS.cpp
+  }
+  IDL_Files {
+  }
+}
+
+project(*Client): messaging, taoserver, threads {
+  exename = client
+  after += *idl
+  Source_Files {
+    SharedIntf_i.cpp
+    client.cpp
+    worker.cpp
+    chatter.cpp
+    police.cpp
+  }
+  Source_Files {
+    SharedIntfC.cpp
+    SharedIntfS.cpp
+  }
+  IDL_Files {
+  }
+}
+
diff --git a/tests/MT_NoUpcall_Client_Leader/README b/tests/MT_NoUpcall_Client_Leader/README
new file mode 100644
index 00000000000..f8174c18bc2
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/README
@@ -0,0 +1,29 @@
+// $Id$
+
+The test simulates a case when an incomming requests is being detected while a
+client-leader thread is waiting in the reactor event loop for its own reply.
+
+The server uses MT_NOUPCALL client connection handling strategy. The defect was
+in the fact that while the above described incomming request was correctly not
+being handled, the corresponding transport handle remained suspended. This
+caused the reactor to exclude that handle from the read mask and it never gave
+other followers a chance to read from that handle. Eventually, these requests
+remained "ignored"
+
+The resolution is to resume the handle *and* notify the reactor when an
+incomming requests is being detected, while a client-leader thread is waiting
+in the reactor event loop for its own reply. Thus, if any follower threads are
+available, they can pick it up and process it eventually.
+
+A rapidly increasing spin prevention back-off delay helps to mitigate the
+negative influence of this solution over the processor utilization. 
+
+Run the test by starting the server:
+
+  ./server -ORBSvcConf mt_noupcall.conf
+  
+And the client:
+
+  ./client
+  
+If any requests get "ignored" the server process will hang indefinitely.
diff --git a/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl b/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl
new file mode 100644
index 00000000000..0081a42b4d0
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl
@@ -0,0 +1,8 @@
+// $Id$
+
+module Test_Idl {
+   interface SharedIntf {
+      void ping();
+      oneway void farewell();
+   };
+};
diff --git a/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp b/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp
new file mode 100644
index 00000000000..4fcaa2aae6c
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp
@@ -0,0 +1,27 @@
+// $Id$
+
+#include "SharedIntf_i.h"
+#include "ace/Log_Priority.h"
+#include "ace/OS_NS_unistd.h"
+
+Test_Idl_SharedIntf_i::Test_Idl_SharedIntf_i(CORBA::ORB_ptr orb)
+  : orb_ (orb)
+{
+}
+
+Test_Idl_SharedIntf_i::~Test_Idl_SharedIntf_i(void) {}
+
+void Test_Idl_SharedIntf_i::ping ()
+{
+   ACE_DEBUG((LM_DEBUG,"(%P|%t) Test_Idl_SharedIntf::ping - sleeping for 5 seconds\n"));
+   ACE_OS::sleep(5);
+   ACE_DEBUG((LM_DEBUG,"(%P|%t) Test_Idl_SharedIntf::ping - waking up\n"));
+}
+
+void Test_Idl_SharedIntf_i::farewell ()
+{
+  ACE_DEBUG((LM_INFO,"(%P|%t) farewell begins\n"));
+  this->orb_->shutdown ();
+  ACE_DEBUG((LM_INFO,"(%P|%t) farewell completes\n"));
+}
+
diff --git a/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h b/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h
new file mode 100644
index 00000000000..3926689bcd1
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h
@@ -0,0 +1,25 @@
+// $Id$
+
+#ifndef SHAREDINTF_I_H_
+#define SHAREDINTF_I_H_
+
+#include "SharedIntfS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class  Test_Idl_SharedIntf_i : public virtual POA_Test_Idl::SharedIntf
+{
+   public:
+
+      Test_Idl_SharedIntf_i (CORBA::ORB_ptr orb);
+      virtual ~Test_Idl_SharedIntf_i (void);
+
+      virtual void ping ();
+      virtual void farewell ();
+  private:
+      CORBA::ORB_ptr orb_;
+};
+
+#endif /* SHAREDINTF_I_H_  */
diff --git a/tests/MT_NoUpcall_Client_Leader/chatter.cpp b/tests/MT_NoUpcall_Client_Leader/chatter.cpp
new file mode 100644
index 00000000000..6a9248bda6f
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/chatter.cpp
@@ -0,0 +1,93 @@
+// $Id$
+
+#include "SharedIntf_i.h"
+#include "worker.h"
+#include "chatter.h"
+
+Chatter::Chatter (CORBA::ORB_ptr orb, const ACE_TCHAR *ior, ACE_Condition<ACE_Mutex>& cond)
+ : Worker (orb),
+   nrequests_ (0),
+   nreplies_ (0),
+   ior_ (ior),
+   cond_ (cond)
+{
+}
+
+long
+Chatter::nreplies (void)
+{
+  return this->nreplies_;
+}
+
+long
+Chatter::nrequests (void)
+{
+  return this->nrequests_;
+}
+
+int
+Chatter::svc (void)
+{
+  long nrq = nrequests ();
+  try
+  {
+     //sleep(1);
+
+     // get server ior from file
+     CORBA::Object_var rawObject = orb_->string_to_object(ior_);
+
+     Test_Idl::SharedIntf_var intf_var =
+        Test_Idl::SharedIntf::_narrow(rawObject.in());
+
+     if (CORBA::is_nil (intf_var.in ()))
+       ACE_ERROR_RETURN ((LM_ERROR, "Nil reference <%s>\n", ior_), -1);
+
+     // make call on server
+     ACE_DEBUG((LM_INFO,"(%P|%t) Chatter[%d] started for %s\n", nrq, ior_));
+     nrequests_++;
+     intf_var->ping();
+     nreplies_++;
+
+     ACE_DEBUG((LM_INFO,"(%P|%t) Chatter[%d] completed for %s\n", nrq, ior_));
+     cond_.signal();
+     return 0;
+   }
+   catch (const CORBA::Exception& ex)
+   {
+      ex._tao_print_exception ("Exception caught:");
+      ACE_DEBUG((LM_INFO,"(%P|%t) Chatter[%d] %p for %s\n", nrq, "failed", ior_));
+   }
+   return -1;
+}
+
+int
+Chatter::farewell ()
+{
+  try
+  {
+     ACE_DEBUG((LM_INFO,"(%P|%t) Farewell requested for %s\n", ior_));
+
+     // get server ior from file
+     CORBA::Object_var rawObject = orb_->string_to_object( ior_);
+
+     Test_Idl::SharedIntf_var intf_var =
+        Test_Idl::SharedIntf::_narrow(rawObject.in());
+
+     if (CORBA::is_nil (intf_var.in ()))
+       ACE_ERROR_RETURN ((LM_ERROR, "Nil reference <%s>\n", ior_), -1);
+
+     // make call on server
+     ACE_DEBUG((LM_INFO,"(%P|%t) farewell START for %s\n", ior_));
+      intf_var->farewell();
+
+      ACE_DEBUG((LM_INFO,"(%P|%t) farewell COMPLETE for %s\n", ior_));
+   }
+   catch (const CORBA::Exception& ex)
+   {
+      ex._tao_print_exception ("Exception caught:");
+      ACE_DEBUG((LM_INFO,"(%P|%t) %p for %s\n", "farewell FAILED", ior_));
+   }
+   return 0;
+}
+
+
diff --git a/tests/MT_NoUpcall_Client_Leader/chatter.h b/tests/MT_NoUpcall_Client_Leader/chatter.h
new file mode 100644
index 00000000000..8e5a313a0fa
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/chatter.h
@@ -0,0 +1,26 @@
+// $Id$
+
+#if !defined( CHATTER_H)
+#define CHATTER_H
+
+#include "worker.h"
+
+#include "ace/Condition_T.h"
+#include "ace/Mutex.h"
+
+class Chatter : public Worker
+{
+public:
+  Chatter (CORBA::ORB_ptr orb, const ACE_TCHAR *ior, ACE_Condition<ACE_Mutex>& cond);
+  virtual int svc (void);
+  int farewell ();
+  long nrequests (void);
+  long nreplies (void);
+public:
+  long nrequests_;
+  long nreplies_;
+private:
+  const ACE_TCHAR* ior_;
+  ACE_Condition<ACE_Mutex>& cond_;
+};
+#endif /* CHATTER_H */
diff --git a/tests/MT_NoUpcall_Client_Leader/client.cpp b/tests/MT_NoUpcall_Client_Leader/client.cpp
new file mode 100644
index 00000000000..fafa60c74d1
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/client.cpp
@@ -0,0 +1,167 @@
+// $Id$
+
+#include "SharedIntf_i.h"
+#include "worker.h"
+#include "chatter.h"
+#include "police.h"
+
+#include "ace/SString.h"
+#include "ace/Get_Opt.h"
+
+const ACE_TCHAR *ior_output_file = ACE_TEXT ("client.ior");
+int nr_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':
+        nr_threads = ACE_OS::atoi(get_opts.opt_arg ());
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-t threads "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  CORBA::ORB_var orb_;
+  int result = 0;
+
+  try
+  {
+    ACE_DEBUG((LM_INFO,"(%P|%t) START OF CLIENT TEST\n"));
+
+    orb_ = CORBA::ORB_init (argc, argv, "myorb-client");
+
+    if (parse_args (argc, argv) != 0)
+      return 1;
+
+    CORBA::Object_var poa_object =
+      orb_->resolve_initial_references ("RootPOA");
+
+    PortableServer::POA_var root_poa =
+      PortableServer::POA::_narrow (poa_object.in());
+
+    PortableServer::POAManager_var poa_manager =
+      root_poa->the_POAManager ();
+    PortableServer::POA_var poa = root_poa;
+
+    poa_manager->activate ();
+
+    // Creating the monitorable servant and activating it
+    //
+    Test_Idl_SharedIntf_i* intf_i = new Test_Idl_SharedIntf_i (orb_.in());
+
+    PortableServer::ServantBase_var base_var = intf_i;
+    PortableServer::ObjectId_var intfId_var =
+      poa->activate_object (base_var.in());
+
+    CORBA::Object_var obj_var =
+      poa->id_to_reference (intfId_var.in());
+
+    Test_Idl::SharedIntf_var intf_var =
+      Test_Idl::SharedIntf::_narrow (obj_var.in());
+
+    // Creating stringified IOR of the servant and writing it to a file.
+    //
+    CORBA::String_var intfString_var =
+      orb_->object_to_string (intf_var.in());
+
+    // Output the IOR to the <ior_output_file>
+    FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+    if (output_file == 0)
+      ACE_ERROR_RETURN ((LM_ERROR,
+                          "Cannot open output file for writing IOR: %s\n",
+                          ior_output_file),
+                          1);
+    ACE_OS::fprintf (output_file, "%s", intfString_var.in ());
+    ACE_OS::fclose (output_file);
+
+    ACE_DEBUG ((LM_INFO,"(%P|%t) client IOR to %s\n", ior_output_file));
+
+    // Running ORB in separate thread
+    Worker worker (orb_.in ());
+    if (worker.activate (THR_NEW_LWP | THR_JOINABLE, nr_threads) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n",
+        "Cannot activate client threads"), -1);
+
+    ACE_DEBUG((LM_INFO,"(%P|%t) Await server initialization\n"));
+    poll ("./server.ior");
+    ACE_DEBUG((LM_INFO,"(%P|%t) Server IOR file was detected\n"));
+
+    ACE_Mutex mutex;
+    ACE_Condition<ACE_Mutex> stop_condition (mutex);
+
+    const ACE_TCHAR* serverior = ACE_TEXT("file://server.ior");
+    Chatter worker2 (orb_.in (), serverior, stop_condition);
+
+    if (worker2.activate (THR_NEW_LWP | THR_JOINABLE, 2) != 0)
+      ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n",
+      "Cannot activate chatty client threads"), -1);
+
+
+    do {
+      stop_condition.wait ();
+      ACE_DEBUG((LM_INFO,"(%P|%t) So far, %d/%d requests/replies have been processed\n",
+        worker2.nrequests (), worker2.nreplies ()));
+    }
+    while (worker2.nreplies () < 2);
+
+    // Kill the peer
+    {
+      CORBA::Object_var rawObject = orb_->string_to_object( serverior);
+
+      Test_Idl::SharedIntf_var intf_var =
+        Test_Idl::SharedIntf::_narrow(rawObject.in());
+
+      if (CORBA::is_nil (intf_var.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR, "Nil reference <%s>\n", serverior), -1);
+
+      // make call on server
+      ACE_DEBUG((LM_INFO,"(%P|%t) farewell START for %s\n", serverior));
+
+      intf_var->farewell();
+
+      ACE_DEBUG((LM_INFO,"(%P|%t) farewell COMPLETE for %s\n", serverior));
+    }
+
+    ACE_DEBUG((LM_INFO,"(%P|%t) END OF CLIENT TEST\n"));
+
+    orb_.in()->shutdown ();
+
+    worker.thr_mgr()->wait ();
+
+    root_poa->destroy(1,1);
+
+    orb_->destroy();
+
+    ACE_DEBUG((LM_INFO,"(%P|%t) Client Test %C\n",
+      (worker2.nrequests() == worker2.nreplies())?"succeeded":"failed"));
+
+    result = (worker2.nrequests_ == worker2.nreplies_)? 0 : -1;
+  }
+  catch (const CORBA::Exception& ex)
+  {
+    ex._tao_print_exception ("Error: Exception caught:");
+  }
+
+  ACE_OS::unlink ("client.ior");
+  return result;
+}
+
diff --git a/tests/MT_NoUpcall_Client_Leader/mt_noupcall.conf b/tests/MT_NoUpcall_Client_Leader/mt_noupcall.conf
new file mode 100644
index 00000000000..f503eb428e8
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/mt_noupcall.conf
@@ -0,0 +1,3 @@
+# $Id$
+
+static Client_Strategy_Factory "-ORBClientconnectionHandler mt_noupcall"
diff --git a/tests/MT_NoUpcall_Client_Leader/police.cpp b/tests/MT_NoUpcall_Client_Leader/police.cpp
new file mode 100644
index 00000000000..17eb4ea649e
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/police.cpp
@@ -0,0 +1,13 @@
+// $Id$
+
+#include "ace/OS_NS_sys_stat.h"
+#include "ace/OS_NS_unistd.h"
+
+void poll (const char* filename)
+{
+  ACE_stat st;
+  for (int r=1; r != 0; r = ACE_OS::stat (filename, &st))
+  {
+    ACE_OS::sleep (1);
+  }
+}
diff --git a/tests/MT_NoUpcall_Client_Leader/police.h b/tests/MT_NoUpcall_Client_Leader/police.h
new file mode 100644
index 00000000000..af3144b1292
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/police.h
@@ -0,0 +1,3 @@
+// $Id$
+
+void poll (const char* filename);
diff --git a/tests/MT_NoUpcall_Client_Leader/run_test.pl b/tests/MT_NoUpcall_Client_Leader/run_test.pl
new file mode 100755
index 00000000000..d64c2393165
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/run_test.pl
@@ -0,0 +1,91 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+my $client_conf = $server->LocalFile ("mt_noupcall$PerlACE::svcconf_ext");
+my $server_conf = $server->LocalFile ("mt_noupcall$PerlACE::svcconf_ext");
+
+$debug_level = '0';
+
+foreach $i (@ARGV) {
+    if ($i eq '-d') {
+        $debug_level = '10';
+    }
+}
+
+my $server_iorbase = "server.ior";
+my $client_iorbase = "client.ior";
+my $server_iorfile = $server->LocalFile ($server_iorbase);
+my $client_iorfile = $client->LocalFile ($client_iorbase);
+
+$server->DeleteFile($server_iorbase);
+$client->DeleteFile($client_iorbase);
+
+$SV = $server->CreateProcess ("server",
+                              "-ORBDebugLevel $debug_level -ORBSvcConf $server_conf " .
+                              "-t 1");
+
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($server_iorbase,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$CL = $client->CreateProcess ("client", "-t 1");
+
+$client_status = $CL->Spawn ();
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+if ($client->WaitForFileTimed ($client_iorbase,
+                               $client->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$client_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+print "INFO: Awaiting server ...\n";
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval() + 30);
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+print "INFO: Awaiting client ...\n";
+
+$client_status = $CL->WaitKill ($client->ProcessStartWaitInterval());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile($server_iorfile);
+$client->DeleteFile($client_iorfile);
+
+print "INFO: Test succeeded\n";
+exit 0;
+
diff --git a/tests/MT_NoUpcall_Client_Leader/server.cpp b/tests/MT_NoUpcall_Client_Leader/server.cpp
new file mode 100644
index 00000000000..b8e2e942dbc
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/server.cpp
@@ -0,0 +1,144 @@
+// $Id$
+
+#include "SharedIntf_i.h"
+#include "worker.h"
+#include "chatter.h"
+#include "police.h"
+
+#include "ace/SString.h"
+#include "ace/Get_Opt.h"
+
+const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior");
+int nr_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':
+        nr_threads = ACE_OS::atoi(get_opts.opt_arg ());
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-t threads "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  CORBA::ORB_var orb_;
+  int result = 0;
+
+  try
+  {
+    ACE_DEBUG((LM_INFO,"(%P|%t) START OF SERVER TEST\n"));
+
+    orb_ = CORBA::ORB_init (argc, argv, "myorb-server");
+
+    if (parse_args (argc, argv) != 0)
+      return 1;
+
+    CORBA::Object_var poa_object =
+      orb_->resolve_initial_references("RootPOA");
+
+    PortableServer::POA_var root_poa =
+      PortableServer::POA::_narrow (poa_object.in());
+
+    PortableServer::POAManager_var poa_manager =
+      root_poa->the_POAManager ();
+    PortableServer::POA_var poa = root_poa;
+
+    poa_manager->activate ();
+
+    ACE_DEBUG((LM_INFO,"(%P|%t) ORB initialized\n"));
+
+    // Creating the servant and activating it
+    //
+    Test_Idl_SharedIntf_i* intf_i = new Test_Idl_SharedIntf_i(orb_.in());
+
+    PortableServer::ServantBase_var base_var = intf_i;
+    PortableServer::ObjectId_var intfId_var =
+      poa->activate_object(base_var.in());
+
+    CORBA::Object_var obj_var =
+      poa->id_to_reference(intfId_var.in());
+
+    Test_Idl::SharedIntf_var intf_var =
+      Test_Idl::SharedIntf::_narrow(obj_var.in());
+
+    // Creating stringified IOR of the servant and writing it to a file.
+    //
+    CORBA::String_var intfString_var =
+      orb_->object_to_string(intf_var.in());
+
+    // Output the IOR to the <ior_output_file>
+    FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+    if (output_file == 0)
+      ACE_ERROR_RETURN ((LM_ERROR,
+                          "Cannot open output file for writing IOR: %s\n",
+                          ior_output_file),
+                          1);
+    ACE_OS::fprintf (output_file, "%s", intfString_var.in ());
+    ACE_OS::fclose (output_file);
+
+    ACE_DEBUG((LM_INFO,"(%P|%t) server IOR to %s\n",
+      ior_output_file));
+
+    // Running ORB in separate thread
+    Worker worker (orb_.in ());
+    if (worker.activate (THR_NEW_LWP | THR_JOINABLE, nr_threads) != 0)
+      ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "Cannot activate server thread(s)"), -1);
+
+    ACE_DEBUG((LM_INFO,"(%P|%t) Await client initialization\n"));
+    poll ("./client.ior");
+    ACE_DEBUG((LM_INFO,"(%P|%t) Client IOR file was detected\n"));
+
+    ACE_Mutex mutex;
+    ACE_Condition<ACE_Mutex> stop_condition (mutex);
+
+    Chatter worker2 (orb_.in (), ACE_TEXT("file://client.ior"), stop_condition);
+    if (worker2.activate (THR_NEW_LWP | THR_JOINABLE, 1) != 0)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "Cannot activate chatty client threads"), -1);
+    }
+
+    do {
+      stop_condition.wait ();
+      ACE_DEBUG((LM_INFO,"(%P|%t) So far, %d/%d requests/replies have been processed\n",
+        worker2.nrequests (), worker2.nreplies ()));
+    }
+    while (worker2.nrequests () < 1);
+
+    worker.thr_mgr()->wait ();
+
+    root_poa->destroy(1, 1);
+
+    orb_->destroy();
+
+    ACE_DEBUG((LM_INFO,"(%P|%t) Server Test %C\n",
+      (worker2.nrequests() == worker2.nreplies())?"succeeded":"failed"));
+    result = (worker2.nrequests() == worker2.nreplies())? 0 : -1;
+  }
+  catch (const CORBA::Exception& ex)
+  {
+    ex._tao_print_exception ("Error: Exception caught:");
+  }
+
+  ACE_OS::unlink ("server.ior");
+  return result;
+}
+
diff --git a/tests/MT_NoUpcall_Client_Leader/worker.cpp b/tests/MT_NoUpcall_Client_Leader/worker.cpp
new file mode 100644
index 00000000000..5c5041b6418
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/worker.cpp
@@ -0,0 +1,23 @@
+// $Id$
+
+#include "worker.h"
+
+Worker::Worker (CORBA::ORB_ptr orb)
+  :  orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+int
+Worker::svc (void)
+{
+  ACE_DEBUG((LM_INFO,"(%P|%t) Running ORB in a separate thread\n"));
+  try
+    {
+      this->orb_->run ();
+    }
+  catch (const CORBA::Exception&)
+    {
+    }
+  return 0;
+}
+
diff --git a/tests/MT_NoUpcall_Client_Leader/worker.h b/tests/MT_NoUpcall_Client_Leader/worker.h
new file mode 100644
index 00000000000..55146024151
--- /dev/null
+++ b/tests/MT_NoUpcall_Client_Leader/worker.h
@@ -0,0 +1,32 @@
+// $Id$
+
+#if !defined( WORKER_H)
+#define WORKER_H
+
+#include /**/ "ace/pre.h"
+#include "tao/corba.h"
+#include "ace/Task.h"
+
+class Worker : public ACE_Task_Base
+{
+  // = TITLE
+  //   Run a server thread
+  //
+  // = DESCRIPTION
+  //   Use the ACE_Task_Base class to run server threads
+  //
+public:
+  Worker (CORBA::ORB_ptr orb);
+  // ctor
+
+  virtual int svc (void);
+  // The thread entry point.
+
+public:
+  // The orb
+  CORBA::ORB_var orb_;
+};
+
+#include /**/ "ace/post.h"
+
+#endif /* WORKER_H */
diff --git a/tests/MT_Server/Makefile.am b/tests/MT_Server/Makefile.am
deleted file mode 100644
index 92ee4bc5eca..00000000000
--- a/tests/MT_Server/Makefile.am
+++ /dev/null
@@ -1,108 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_Server_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.MT_Server_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MT_Server_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/MT_Server/client.cpp b/tests/MT_Server/client.cpp
index bbd7c0fbf61..e95c34b2f64 100644
--- a/tests/MT_Server/client.cpp
+++ b/tests/MT_Server/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Task.h"
 #include "testC.h"
 
-ACE_RCSID(MT_Server, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int do_shutdown = 0;
@@ -41,7 +39,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/MT_Server/server.cpp b/tests/MT_Server/server.cpp
index ffb6c640744..ea6351e2bdf 100644
--- a/tests/MT_Server/server.cpp
+++ b/tests/MT_Server/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(MT_Server, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int nthreads = 4;
@@ -36,18 +34,17 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   Worker (CORBA::ORB_ptr orb);
   // ctor
diff --git a/tests/MT_Server/test_i.cpp b/tests/MT_Server/test_i.cpp
index 80aa987cc4a..c42d5905cc6 100644
--- a/tests/MT_Server/test_i.cpp
+++ b/tests/MT_Server/test_i.cpp
@@ -8,8 +8,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(MT_Server, test_i, "$Id$")
-
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x)
 {
diff --git a/tests/MT_Server/test_i.h b/tests/MT_Server/test_i.h
index d1113ac50d7..aa98bce6909 100644
--- a/tests/MT_Server/test_i.h
+++ b/tests/MT_Server/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Server
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_MT_SERVER_TEST_I_H
 #define TAO_MT_SERVER_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
@@ -36,8 +34,8 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/tests/MT_Timeout/Client_Task.cpp b/tests/MT_Timeout/Client_Task.cpp
index a90d57ecc50..34ab2dbfc26 100644
--- a/tests/MT_Timeout/Client_Task.cpp
+++ b/tests/MT_Timeout/Client_Task.cpp
@@ -8,8 +8,6 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(MT_Timeout, Client_Task, "$Id$")
-
 Client_Task::Client_Task (CORBA::ORB_ptr orb,
                           Test::Sleep_Service_ptr sleep_service,
                           int iterations,
diff --git a/tests/MT_Timeout/Client_Task.h b/tests/MT_Timeout/Client_Task.h
index 62d419c2ba1..d5ba569ca0d 100644
--- a/tests/MT_Timeout/Client_Task.h
+++ b/tests/MT_Timeout/Client_Task.h
@@ -40,7 +40,7 @@ public:
                CORBA::ULong sleep_time,
                CORBA::ULong timeout);
 
-  /// Return the total number of sucessful calls
+  /// Return the total number of successful calls
   int successful_calls (void) const;
 
   /// Return the total number of timed out calls
diff --git a/tests/MT_Timeout/Makefile.am b/tests/MT_Timeout/Makefile.am
deleted file mode 100644
index 395c93826e9..00000000000
--- a/tests/MT_Timeout/Makefile.am
+++ /dev/null
@@ -1,122 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_Timeout_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.MT_Timeout_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.MT_Timeout_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_Task.cpp \
-  Sleep_Service.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Server_Task.h \
-  Sleep_Service.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/MT_Timeout/Server_Task.cpp b/tests/MT_Timeout/Server_Task.cpp
index 3bd6359ebc3..a7a022e9e91 100644
--- a/tests/MT_Timeout/Server_Task.cpp
+++ b/tests/MT_Timeout/Server_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Server_Task.h"
 
-ACE_RCSID(MT_Timeout, Server_Task, "$Id$")
-
 Server_Task::Server_Task (ACE_Thread_Manager *thr_mgr,
                           CORBA::ORB_ptr orb,
                           const ACE_Time_Value &running_time)
diff --git a/tests/MT_Timeout/Sleep_Service.cpp b/tests/MT_Timeout/Sleep_Service.cpp
index 4af378547bc..fa61211d0f2 100644
--- a/tests/MT_Timeout/Sleep_Service.cpp
+++ b/tests/MT_Timeout/Sleep_Service.cpp
@@ -4,8 +4,6 @@
 #include "Sleep_Service.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(MT_Timeout, Sleep_Service, "$Id$")
-
 Sleep_Service::Sleep_Service (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/MT_Timeout/client.cpp b/tests/MT_Timeout/client.cpp
index 846b887b646..f6ef9ebbff2 100644
--- a/tests/MT_Timeout/client.cpp
+++ b/tests/MT_Timeout/client.cpp
@@ -3,8 +3,6 @@
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Client_Leaks, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int iterations = 500;
 int threads = 4;
@@ -41,7 +39,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/MT_Timeout/server.cpp b/tests/MT_Timeout/server.cpp
index da675d78db1..07af58ea28d 100644
--- a/tests/MT_Timeout/server.cpp
+++ b/tests/MT_Timeout/server.cpp
@@ -4,8 +4,6 @@
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(MT_Timeout, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index c302a10bcef..00000000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,241 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AMH_Exceptions \
-        AMH_Oneway \
-        AMI \
-        AMI_Buffering \
-        AMI_Timeouts \
-        Abstract_Interface \
-        Any \
-        BiDirectional \
-        BiDirectional_DelayedUpcall \
-        BiDirectional_MultipleORB \
-        BiDirectional_NestedUpcall \
-        Big_AMI \
-        Big_Oneways \
-        Big_Reply \
-        Big_Request_Muxing \
-        Big_Twoways \
-        Blocking_Sync_None \
-        Bug_1020_Basic_Regression \
-        Bug_1020_Regression \
-        Bug_1254_Regression \
-        Bug_1269_Regression \
-        Bug_1270_Regression \
-        Bug_1330_Regression \
-        Bug_1361_Regression \
-        Bug_1383_Regression \
-        Bug_1476_Regression \
-        Bug_1476_Test \
-        Bug_1482_Regression \
-        Bug_1495_Regression \
-        Bug_1535_Regression \
-        Bug_1551_Regression \
-        Bug_1568_Regression \
-        Bug_1627_Regression \
-        Bug_1635_Regression \
-        Bug_1636_Regression \
-        Bug_1639_Regression \
-        Bug_1670_Regression \
-        Bug_1676_Regression \
-        Bug_1693_Test \
-        Bug_1812_Regression \
-        Bug_1813_Regression \
-        Bug_1869_Regression \
-        Bug_1904_Regression \
-        Bug_2084_Regression \
-        Bug_2085_Regression \
-        Bug_2119_Regression \
-        Bug_2122_Regression \
-        Bug_2124_Regression \
-        Bug_2126_Regression \
-        Bug_2134_Regression \
-        Bug_2144_Regression \
-        Bug_2174_Regression \
-        Bug_2183_Regression \
-        Bug_2186_Regression \
-        Bug_2188_Regression \
-        Bug_2201_Regression \
-        Bug_2222_Regression \
-        Bug_2234_Regression \
-        Bug_2243_Regression \
-        Bug_2289_Regression \
-        Bug_2319_Regression \
-        Bug_2328_Regression \
-        Bug_2345_Regression \
-        Bug_2349_Regression \
-        Bug_2356_Regression \
-        Bug_2375_Regression \
-        Bug_2399_Regression \
-        Bug_2417_Regression \
-        Bug_2419_Regression \
-        Bug_2424_Regression \
-        Bug_2429_Regression \
-        Bug_2494_Regression \
-        Bug_2503_Regression \
-        Bug_2542_Regression \
-        Bug_2543_Regression \
-        Bug_2549_Regression \
-        Bug_2560_Regression \
-        Bug_2593_Regression \
-        Bug_2595_Regression \
-        Bug_2654_Regression \
-        Bug_2669_Regression \
-        Bug_2677_Regression \
-        Bug_2678_Regression \
-        Bug_2683_Regression \
-        Bug_2702_Regression \
-        Bug_2734_Regression \
-        Bug_2735_Regression \
-        Bug_2768_Regression \
-        Bug_2791_Regression \
-        Bug_2792_Regression \
-        Bug_2795_Regression \
-        Bug_2804_Regression \
-        Bug_2805_Regression \
-        Bug_2809_Regression \
-        Bug_2826_Regression \
-        Bug_2844_Regression \
-        Bug_2869_Regression \
-        Bug_2909_Regression \
-        Bug_2918_Regression \
-        Bug_2935_Regression \
-        Bug_2936_Regression \
-        Bug_2953_Regression \
-        Bug_2966_Regression \
-        Bug_3000_Regression \
-        Bug_3042_Regression \
-        Bug_3108_Regression \
-        Bug_3163_Regression \
-        Bug_3171_Regression \
-        Bug_3198_Regression \
-        Bug_3251_Regression \
-        Bug_3276_Regression \
-        Bug_3299_Regression \
-        Bug_3311_Regression \
-        Bug_3315_Regression \
-        Bug_3321_Regression \
-        Bug_933_Regression \
-        CDR \
-        COIOP \
-        CORBA_e_Implicit_Activation \
-        CSD_Collocation \
-        CSD_Strategy_Tests \
-        Cache_Growth_Test \
-        CallbackTest \
-        Client_Leaks \
-        CodeSets \
-        Codec \
-        Collocated_Forwarding \
-        Collocation \
-        CollocationLockup \
-        Collocation_Exception_Test \
-        Collocation_Oneway_Tests \
-        Collocation_Opportunities \
-        Collocation_Tests \
-        Compression \
-        Connect_Strategy_Test \
-        Connection_Failure \
-        Connection_Purging \
-        Connection_Timeout \
-        Crash_On_Write \
-        Crashed_Callback \
-        DII_AMI_Forward \
-        DII_Collocation_Tests \
-        DIOP \
-        DLL_ORB \
-        DSI_AMH \
-        DSI_AMI_Gateway \
-        DSI_Gateway \
-        DiffServ \
-        DynAny_Test \
-        DynUnion_Test \
-        Explicit_Event_Loop \
-        Exposed_Policies \
-        FL_Cube \
-        Faults \
-        File_IO \
-        Forwarding \
-        GIOP_Fragments \
-        HandleExhaustion \
-        Hang_Shutdown \
-        Hello \
-        ICMG_Any_Bug \
-        IDL_Test \
-        IORManipulation \
-        IOR_Endpoint_Hostnames \
-        IPV6 \
-        InterOp-Naming \
-        Leader_Followers \
-        LongDouble \
-        LongUpcalls \
-        MProfile \
-        MProfile_Connection_Timeout \
-        MProfile_Forwarding \
-        MT_BiDir \
-        MT_Client \
-        MT_Server \
-        MT_Timeout \
-        Monitor \
-        Multiple \
-        Multiple_Inheritance \
-        Muxed_GIOP_Versions \
-        Muxing \
-        Native_Exceptions \
-        NestedUpcall \
-        Nested_Event_Loop \
-        Nested_Upcall_Crash \
-        No_Server_MT_Connect_Test \
-        OBV \
-        ORB_Local_Config \
-        ORB_destroy \
-        ORB_init \
-        ORB_shutdown \
-        ORT \
-        Object_Loader \
-        Objref_Sequence_Test \
-        OctetSeq \
-        Ondemand_Write \
-        Oneway_Buffering \
-        Oneway_Send_Timeouts \
-        Oneway_Timeouts \
-        Oneways_Invoking_Twoways \
-        Optimized_Connection \
-        POA \
-        Parallel_Connect_Strategy \
-        Param_Test \
-        Permanent_Forward \
-        Policies \
-        Portable_Interceptors \
-        QtTests \
-        Queued_Message_Test \
-        RTCORBA \
-        RTScheduling \
-        Reliable_Oneways \
-        Sequence_Unit_Tests \
-        Servant_To_Reference_Test \
-        Server_Connection_Purging \
-        Server_Leaks \
-        Server_Port_Zero \
-        Single_Read \
-        Smart_Proxies \
-        Stack_Recursion \
-        Strategies \
-        Timed_Buffered_Oneways \
-        Timeout \
-        TransportCurrent \
-        Two_Objects \
-        Typedef_String_Array \
-        UNKNOWN_Exception \
-        Xt_Stopwatch \
-        objref_comparison_test
-
diff --git a/tests/Monitor/Makefile.am b/tests/Monitor/Makefile.am
deleted file mode 100644
index 7c75b0fba7f..00000000000
--- a/tests/Monitor/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Marshal_Buffer
-
diff --git a/tests/Monitor/Marshal_Buffer/Makefile.am b/tests/Monitor/Marshal_Buffer/Makefile.am
deleted file mode 100644
index c51cdce2d00..00000000000
--- a/tests/Monitor/Marshal_Buffer/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.marshal_buffer_idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.marshal_buffer_client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testC.h \
-  testC.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-endif BUILD_EXCEPTIONS
-
-## Makefile.marshal_buffer_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Multiple/Collocation_Tester.cpp b/tests/Multiple/Collocation_Tester.cpp
index 4e75b286b50..55a5b85d921 100644
--- a/tests/Multiple/Collocation_Tester.cpp
+++ b/tests/Multiple/Collocation_Tester.cpp
@@ -3,8 +3,6 @@
 #include "Collocation_Tester.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (tests, Collocation_Tester, "$Id$")
-
 const char *Quote::top = "Ciao";
 const char *Quote::left = "Hola";
 const char *Quote::right = "Hello";
diff --git a/tests/Multiple/Collocation_Tester.h b/tests/Multiple/Collocation_Tester.h
index e220b07b466..64c3a0c0dad 100644
--- a/tests/Multiple/Collocation_Tester.h
+++ b/tests/Multiple/Collocation_Tester.h
@@ -1,21 +1,17 @@
-//$Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Multiple
-//
-// = FILENAME
-//    Collocation_Tester.h
-//
-// = DESCRIPTION
-//     This file contains the class that tests the TAO's collocation
-//     mechanism.
-//
-// = AUTHOR
-//     Angelo Corsaro <corsaro@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Collocation_Tester.h
+ *
+ *  $Id$
+ *
+ *   This file contains the class that tests the TAO's collocation
+ *   mechanism.
+ *
+ *
+ *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 // -- Custom App. Include --
 #include "MultipleC.h"
@@ -41,38 +37,40 @@ public:
   ~Collocation_Tester ();
 
   // -- Command --
+  /// Runs the test.
   void run (void);
-  // Runs the test.
 
 
 private:
 
   // -- Helper Methods --
 
+  /// Tests the method accessible thru the
+  /// Top interface.
   int  test_top (void);
-  // Tests the method accessible thru the
-  // Top interface.
 
+  /// Tests the method accessible thru the
+  /// Right interface.
   int test_right (void);
-  // Tests the method accessible thru the
-  // Right interface.
 
+  /// Tests the method accessible thru the
+  /// Left interface.
   int test_left (void);
-  // Tests the method accessible thru the
-  // Left interface.
 
+  /// Tests the method accessible thru the
+  /// Bottom interface.
   int test_bottom (void);
-  // Tests the method accessible thru the
-  // Bottom interface.
 
+  /**
+   * This method tests wether the answer obtained
+   * is the one expected. As strcmp, it returns zero
+   * if a match occurs and a non-zero value if there
+   * is no match (actually 1 is returned if there is
+   * no match.
+   */
   int match_answer (const char *actual_answer,
                      const char *right_answer,
                      const char *method_name);
-  // This method tests wether the answer obtained
-  // is the one expected. As strcmp, it returns zero
-  // if a match occurs and a non-zero value if there
-  // is no match (actually 1 is returned if there is
-  // no match.
 
   void shutdown (void);
 private:
diff --git a/tests/Multiple/Makefile.am b/tests/Multiple/Makefile.am
deleted file mode 100644
index a792d23de7a..00000000000
--- a/tests/Multiple/Makefile.am
+++ /dev/null
@@ -1,113 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Multiple_Idl.am
-
-BUILT_SOURCES = \
-  MultipleC.cpp \
-  MultipleC.h \
-  MultipleC.inl \
-  MultipleS.cpp \
-  MultipleS.h \
-  MultipleS.inl
-
-CLEANFILES = \
-  Multiple-stamp \
-  MultipleC.cpp \
-  MultipleC.h \
-  MultipleC.inl \
-  MultipleS.cpp \
-  MultipleS.h \
-  MultipleS.inl
-
-MultipleC.cpp MultipleC.h MultipleC.inl MultipleS.cpp MultipleS.h MultipleS.inl: Multiple-stamp
-
-Multiple-stamp: $(srcdir)/Multiple.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gd $(srcdir)/Multiple.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Multiple.idl
-
-## Makefile.Multiple_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Collocation_Tester.cpp \
-  MultipleC.cpp \
-  MultipleS.cpp \
-  Multiple_Impl.cpp \
-  client.cpp \
-  Collocation_Tester.h \
-  Multiple_Impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Multiple_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Collocation_Tester.cpp \
-  MultipleC.cpp \
-  MultipleS.cpp \
-  Multiple_Impl.cpp \
-  server.cpp \
-  Collocation_Tester.h \
-  Multiple_Impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Multiple/Multiple.idl b/tests/Multiple/Multiple.idl
index e669d7f0345..2739c5a79b2 100644
--- a/tests/Multiple/Multiple.idl
+++ b/tests/Multiple/Multiple.idl
@@ -1,32 +1,26 @@
-//$Id$
-
-/* ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Multiple
-//
-// = FILENAME
-//    Multiple.idl
-//
-// = DESCRIPTION
-//    IDL definition of a Diamond shaped hierarchy
-//    of IDL interfaces. This Diamond shaped hierarchy
-//    is used for testing the collocation.
-//    The hierarchy used is decipted in the following
-//    figure.
-//
-//                      Top
-//                     /   \
-//                 Left     Right
-//                     \   /
-//                     Bottom
-//
-// = AUTHOR
-//     Angelo Corsaro <corsaro@cs.wustl.edu>
-//
-// ============================================================================
-*/
 
+//=============================================================================
+/**
+ *  @file    Multiple.idl
+ *
+ *  $Id$
+ *
+ *  IDL definition of a Diamond shaped hierarchy
+ *  of IDL interfaces. This Diamond shaped hierarchy
+ *  is used for testing the collocation.
+ *  The hierarchy used is decipted in the following
+ *  figure.
+ *
+ *                    Top
+ *                   /   \
+ *               Left     Right
+ *                   \   /
+ *                   Bottom
+ *
+ *
+ *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
+ */
+//=============================================================================
 
 module _Multiple
 {
@@ -52,5 +46,4 @@ module _Multiple
   {
     string bottom_quote ();
   };
-
 };
diff --git a/tests/Multiple/Multiple_Impl.cpp b/tests/Multiple/Multiple_Impl.cpp
index 06ba1e71ca6..46f6fbd0c1e 100644
--- a/tests/Multiple/Multiple_Impl.cpp
+++ b/tests/Multiple/Multiple_Impl.cpp
@@ -3,8 +3,6 @@
 #include "Multiple_Impl.h"
 #include "Collocation_Tester.h"
 
-ACE_RCSID (tests, Multiple_Impl, "$Id$")
-
 ///////////////////////////////////////////////////////////
 //     Bottom_Impl Implementation
 //
diff --git a/tests/Multiple/Multiple_Impl.h b/tests/Multiple/Multiple_Impl.h
index 97b507ea1b2..e53381aef39 100644
--- a/tests/Multiple/Multiple_Impl.h
+++ b/tests/Multiple/Multiple_Impl.h
@@ -1,21 +1,17 @@
-//$Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Multiple
-//
-// = FILENAME
-//    Multiple_Impl.h
-//
-// = DESCRIPTION
-//     This file contains the servant implementation used to test the
-//     new collocation collocation scheme.
-//
-// = AUTHOR
-//     Angelo Corsaro <corsaro@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Multiple_Impl.h
+ *
+ *  $Id$
+ *
+ *   This file contains the servant implementation used to test the
+ *   new collocation collocation scheme.
+ *
+ *
+ *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 
 #ifndef TAO_MULTIPLE_IMPL_H_
@@ -24,14 +20,16 @@
 // -- App. Specific Include --
 #include "MultipleS.h"
 
+/**
+ * @class Bottom_Impl
+ *
+ * @brief Bottom_Impl
+ *
+ * This class implements the servant for the Bottom interface
+ * defined in the IDL file.
+ */
 class Bottom_Impl : public virtual POA_Multiple::Bottom
 {
-// = TITLE
-//    Bottom_Impl
-//
-// = DESCRIPTION
-//    This class implements the servant for the Bottom interface
-//    defined in the IDL file.
 
 public:
 
@@ -56,16 +54,18 @@ private:
 
 
 
+/**
+ * @class Delegated_Bottom_Impl
+ *
+ * @brief Delegated_Bottom_Impl
+ *
+ * This class implements the servant for the Bottom interface
+ * which delegates all the request to another Bottom corba object.
+ * This call forwarding is made using different strategy depending
+ * on the option set for the ORB.
+ */
 class Delegated_Bottom_Impl : public virtual POA_Multiple::Bottom
 {
-// = TITLE
-//    Delegated_Bottom_Impl
-//
-// = DESCRIPTION
-//    This class implements the servant for the Bottom interface
-//    which delegates all the request to another Bottom corba object.
-//    This call forwarding is made using different strategy depending
-//    on the option set for the ORB.
 
 public:
 
diff --git a/tests/Multiple/client.cpp b/tests/Multiple/client.cpp
index 1b1d7a9d8f5..96788e8b1b8 100644
--- a/tests/Multiple/client.cpp
+++ b/tests/Multiple/client.cpp
@@ -3,8 +3,6 @@
 # include "Collocation_Tester.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (tests, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Multiple/server.cpp b/tests/Multiple/server.cpp
index b36c578233c..a3ee10f8edd 100644
--- a/tests/Multiple/server.cpp
+++ b/tests/Multiple/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (tests, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Multiple_Inheritance/Makefile.am b/tests/Multiple_Inheritance/Makefile.am
deleted file mode 100644
index 5fea80abc5e..00000000000
--- a/tests/Multiple_Inheritance/Makefile.am
+++ /dev/null
@@ -1,108 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Multiple_Inheritance_Idl.am
-
-BUILT_SOURCES = \
-  Multiple_InheritanceC.cpp \
-  Multiple_InheritanceC.h \
-  Multiple_InheritanceC.inl \
-  Multiple_InheritanceS.cpp \
-  Multiple_InheritanceS.h \
-  Multiple_InheritanceS.inl
-
-CLEANFILES = \
-  Multiple_Inheritance-stamp \
-  Multiple_InheritanceC.cpp \
-  Multiple_InheritanceC.h \
-  Multiple_InheritanceC.inl \
-  Multiple_InheritanceS.cpp \
-  Multiple_InheritanceS.h \
-  Multiple_InheritanceS.inl
-
-Multiple_InheritanceC.cpp Multiple_InheritanceC.h Multiple_InheritanceC.inl Multiple_InheritanceS.cpp Multiple_InheritanceS.h Multiple_InheritanceS.inl: Multiple_Inheritance-stamp
-
-Multiple_Inheritance-stamp: $(srcdir)/Multiple_Inheritance.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Multiple_Inheritance.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Multiple_Inheritance.idl
-
-## Makefile.Multiple_Inheritance_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Multiple_InheritanceC.cpp \
-  client.cpp \
-  Multiple_Inheritance_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Multiple_Inheritance_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Multiple_InheritanceC.cpp \
-  Multiple_InheritanceS.cpp \
-  server.cpp \
-  Multiple_Inheritance_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
index f8a3e188bfe..ae87b53f82a 100644
--- a/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
+++ b/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
@@ -2,8 +2,6 @@
 
 #include "Multiple_InheritanceS.h"
 
-ACE_RCSID(Multiple_Inheritance, Multiple_Inheritance_i, "$Id$")
-
 class Multiple_Inheritance_i : public POA_D
 {
 public:
diff --git a/tests/Multiple_Inheritance/client.cpp b/tests/Multiple_Inheritance/client.cpp
index 6eb79d73d47..b49b16472c0 100644
--- a/tests/Multiple_Inheritance/client.cpp
+++ b/tests/Multiple_Inheritance/client.cpp
@@ -1,19 +1,16 @@
-// $Id$
-//
-//===================================================================
-//  = LIBRARY
-//      TAO/tests/Multiple_Inheritance
-//
-//  = FILENAME
-//     client.cpp
-//
-//  = DESCRIPTION
-//      A client program for the Multiple Inheritance module
-//
-//  = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *    A client program for the Multiple Inheritance module
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
@@ -22,8 +19,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Multiple_Inheritance, client, "$Id$")
-
 static ACE_TCHAR *ior = 0;
 static ACE_TCHAR *ior_input_file = 0;
 
diff --git a/tests/Multiple_Inheritance/server.cpp b/tests/Multiple_Inheritance/server.cpp
index d8bfb2b812d..2cf2385d16f 100644
--- a/tests/Multiple_Inheritance/server.cpp
+++ b/tests/Multiple_Inheritance/server.cpp
@@ -6,8 +6,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Multiple_Inheritance, server, "$Id$")
-
 static ACE_TCHAR *ior_output_file = 0;
 
 Multiple_Inheritance_i::Multiple_Inheritance_i (void)
@@ -38,7 +36,7 @@ parse_args (int argc, ACE_TCHAR **argv)
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Muxed_GIOP_Versions/Makefile.am b/tests/Muxed_GIOP_Versions/Makefile.am
deleted file mode 100644
index 4f392d4ad98..00000000000
--- a/tests/Muxed_GIOP_Versions/Makefile.am
+++ /dev/null
@@ -1,108 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Muxed_GIOP_Versions_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Muxed_GIOP_Versions_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Muxed_GIOP_Versions_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Muxed_GIOP_Versions/client.cpp b/tests/Muxed_GIOP_Versions/client.cpp
index 630a944d033..07c2d7d5a75 100644
--- a/tests/Muxed_GIOP_Versions/client.cpp
+++ b/tests/Muxed_GIOP_Versions/client.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(MT_Client, client, "client.cpp,v 1.16 2002/01/29 20:21:08 okellogg Exp")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 const ACE_TCHAR *corbaloc_arg = ACE_TEXT("corbaloc:iiop:1.0@localhost:12000/ObjectName");
 int nthreads = 5;
@@ -48,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Muxed_GIOP_Versions/server.cpp b/tests/Muxed_GIOP_Versions/server.cpp
index 2ed67f53282..9573acfcedc 100644
--- a/tests/Muxed_GIOP_Versions/server.cpp
+++ b/tests/Muxed_GIOP_Versions/server.cpp
@@ -3,9 +3,6 @@
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
-#include "ace/Synch_T.h"
-
-ACE_RCSID(MT_Server, server, "server.cpp,v 1.7 2002/01/29 20:21:08 okellogg Exp")
 
 const ACE_TCHAR *ior_output_file = 0;
 const ACE_TCHAR *corbaloc_arg = ACE_TEXT("corbaloc:iiop:1.0@localhost:12000/ObjectName");
@@ -56,20 +53,19 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
 /*****************************************************/
 
+/**
+ * Run a server thread
+ *
+ * Use the ACE_Task_Base class to run server threads
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
   /// ctor
   Worker (CORBA::ORB_ptr orb);
@@ -85,14 +81,13 @@ private:
 
 /*****************************************************/
 
+/**
+ * Run a client thread
+ *
+ * Use the ACE_Task_Base class to run client threads
+ */
 class SelfClient : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run the client thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads.
-  //
 public:
   SelfClient (CORBA::ORB_ptr orb, Simple_Server_ptr server, int niterations);
   // ctor
diff --git a/tests/Muxed_GIOP_Versions/test_i.cpp b/tests/Muxed_GIOP_Versions/test_i.cpp
index 7090526b738..7314f7555fe 100644
--- a/tests/Muxed_GIOP_Versions/test_i.cpp
+++ b/tests/Muxed_GIOP_Versions/test_i.cpp
@@ -9,8 +9,6 @@
 
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(MT_Server, test_i, "test_i.cpp,v 1.6 2002/01/29 20:21:08 okellogg Exp")
-
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x)
 {
diff --git a/tests/Muxed_GIOP_Versions/test_i.h b/tests/Muxed_GIOP_Versions/test_i.h
index d1113ac50d7..aa98bce6909 100644
--- a/tests/Muxed_GIOP_Versions/test_i.h
+++ b/tests/Muxed_GIOP_Versions/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Server
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_MT_SERVER_TEST_I_H
 #define TAO_MT_SERVER_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
@@ -36,8 +34,8 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/tests/Muxing/Client_Task.cpp b/tests/Muxing/Client_Task.cpp
index 2002768040c..0ba1e8728fa 100644
--- a/tests/Muxing/Client_Task.cpp
+++ b/tests/Muxing/Client_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (Test::Receiver_ptr receiver,
                           CORBA::Long event_count,
                           CORBA::ULong event_size,
diff --git a/tests/Muxing/Makefile.am b/tests/Muxing/Makefile.am
deleted file mode 100644
index 8ba422d54bf..00000000000
--- a/tests/Muxing/Makefile.am
+++ /dev/null
@@ -1,109 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Muxing_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Muxing_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Muxing_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Receiver.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Receiver.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Muxing/Receiver.cpp b/tests/Muxing/Receiver.cpp
index 1ad5ab31565..b8953970bdb 100644
--- a/tests/Muxing/Receiver.cpp
+++ b/tests/Muxing/Receiver.cpp
@@ -3,8 +3,6 @@
 //
 #include "Receiver.h"
 
-ACE_RCSID(Muxing, Receiver, "$Id$")
-
 Receiver::Receiver (CORBA::ORB_ptr orb)
   :  message_count_ (0)
   ,  byte_count_ (0)
diff --git a/tests/Muxing/Server_Task.cpp b/tests/Muxing/Server_Task.cpp
index 34e6f5e9edb..e51cb2f7168 100644
--- a/tests/Muxing/Server_Task.cpp
+++ b/tests/Muxing/Server_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Server_Task.h"
 
-ACE_RCSID(Muxing, Server_Task, "$Id$")
-
 Server_Task::Server_Task (CORBA::ORB_ptr orb,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr)
diff --git a/tests/Muxing/client.cpp b/tests/Muxing/client.cpp
index b839fca5b4c..e5d0bc88b04 100644
--- a/tests/Muxing/client.cpp
+++ b/tests/Muxing/client.cpp
@@ -3,8 +3,6 @@
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Muxing, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 bool shutdown_srv = false;
 
@@ -33,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Muxing/server.cpp b/tests/Muxing/server.cpp
index 185470abca0..dc8a4887b11 100644
--- a/tests/Muxing/server.cpp
+++ b/tests/Muxing/server.cpp
@@ -4,8 +4,6 @@
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Muxing, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Native_Exceptions/Makefile.am b/tests/Native_Exceptions/Makefile.am
deleted file mode 100644
index 5e168763a6d..00000000000
--- a/tests/Native_Exceptions/Makefile.am
+++ /dev/null
@@ -1,108 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Native_Exceptions_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Native_Exceptions_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Native_Exceptions_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Native_Exceptions/client.cpp b/tests/Native_Exceptions/client.cpp
index f5f1f82d65e..67d1c39ae4d 100644
--- a/tests/Native_Exceptions/client.cpp
+++ b/tests/Native_Exceptions/client.cpp
@@ -3,8 +3,6 @@
 #include "ace/Get_Opt.h"
 #include "testC.h"
 
-ACE_RCSID(Native_Exceptions, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 100;
 
@@ -35,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Native_Exceptions/server.cpp b/tests/Native_Exceptions/server.cpp
index 7a79dd13fb2..99722ee799d 100644
--- a/tests/Native_Exceptions/server.cpp
+++ b/tests/Native_Exceptions/server.cpp
@@ -4,8 +4,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Native_Exceptions, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Native_Exceptions/test_i.cpp b/tests/Native_Exceptions/test_i.cpp
index 62e6003f6ea..43643b16f0d 100644
--- a/tests/Native_Exceptions/test_i.cpp
+++ b/tests/Native_Exceptions/test_i.cpp
@@ -6,8 +6,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Native_Exceptions, test_i, "$Id$")
-
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x)
 {
diff --git a/tests/Native_Exceptions/test_i.h b/tests/Native_Exceptions/test_i.h
index 5bbb20d51b1..7d91d2db577 100644
--- a/tests/Native_Exceptions/test_i.h
+++ b/tests/Native_Exceptions/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Native_Exceptions
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_NATIVE_EXCEPTIONS_TEST_I_H
 #define TAO_NATIVE_EXCEPTIONS_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x);
diff --git a/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl b/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl
index f93b53177b9..4eafae95875 100644
--- a/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl
+++ b/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl
@@ -1,32 +1,22 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpcall/Triangle_Test
-//
-// = FILENAME
-//    Triangle_Test.idl
-//
-// = DESCRIPTION
-//    An example of how nested upcalls work/fail?
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-
+//=============================================================================
+/**
+ *  @file    MT_Client_Test.idl
+ *
+ *  $Id$
+ *
+ *  An example of how nested upcalls work/fail?
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
 
 interface Object_A {
-
   long foo (in long time);
-
 };
 
 interface MT_Object;
 
-interface MT_Object 
+interface MT_Object
 {
   long yadda (in long hop_count, in MT_Object partner);
 };
diff --git a/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
index c017c639d69..26419d62263 100644
--- a/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
+++ b/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
@@ -1,28 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client_Test
-//
-// = FILENAME
-//    MT_Object_i.cpp
-//
-// = DESCRIPTION
-//    This class implements the Object A  of the
-//    Nested Upcalls - MT Client test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    MT_Object_i.cpp
+ *
+ *  $Id$
+ *
+ *  This class implements the Object A  of the
+ *  Nested Upcalls - MT Client test.
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
 
 #include "MT_Object_i.h"
 
 #include "tao/Exception.h"
 
-ACE_RCSID(MT_Client_Test, MT_Object_i, "$Id$")
-
 #define MAX_HOP_COUNT 20
 
 // CTOR
diff --git a/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
index bfddb076334..e75f44a01ec 100644
--- a/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
+++ b/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
@@ -1,22 +1,16 @@
-// -*- c++ -*-
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client test
-//
-// = FILENAME
-//    MT_Object_A_i.h
-//
-// = DESCRIPTION
-//    This class implements the Object A of the
-//    Nested Upcalls - MT Client test
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    MT_Object_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Object A of the
+ *  Nested Upcalls - MT Client test
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
 
 #ifndef MT_OBJECT_IMPL_H
 #  define MT_OBJECT_IMPL_H
@@ -24,20 +18,22 @@
 #include "MT_Client_TestS.h"
 #include "MT_Client_TestC.h"
 
+/**
+ * @class MT_Object_i
+ *
+ * @brief Implement the <MT_Object> IDL interface.
+ */
 class MT_Object_i : public POA_MT_Object
 {
-  // = TITLE
-  //     Implement the <MT_Object> IDL interface.
 public:
+  /// Constructor.
   MT_Object_i (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~MT_Object_i (void);
-  // Destructor.
 
   virtual CORBA::Long yadda (CORBA::Long hop_count,
                              MT_Object_ptr partner);
-
 };
 
 #endif /* MT_OBJECT_IMPL_H */
diff --git a/tests/NestedUpcall/MT_Client_Test/Makefile.am b/tests/NestedUpcall/MT_Client_Test/Makefile.am
deleted file mode 100644
index ddbd154fcff..00000000000
--- a/tests/NestedUpcall/MT_Client_Test/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.MT_Client_Test_Nested_Upcall_Idl.am
-
-BUILT_SOURCES = \
-  MT_Client_TestC.cpp \
-  MT_Client_TestC.h \
-  MT_Client_TestC.inl \
-  MT_Client_TestS.cpp \
-  MT_Client_TestS.h \
-  MT_Client_TestS.inl
-
-CLEANFILES = \
-  MT_Client_Test-stamp \
-  MT_Client_TestC.cpp \
-  MT_Client_TestC.h \
-  MT_Client_TestC.inl \
-  MT_Client_TestS.cpp \
-  MT_Client_TestS.h \
-  MT_Client_TestS.inl
-
-MT_Client_TestC.cpp MT_Client_TestC.h MT_Client_TestC.inl MT_Client_TestS.cpp MT_Client_TestS.h MT_Client_TestS.inl: MT_Client_Test-stamp
-
-MT_Client_Test-stamp: $(srcdir)/MT_Client_Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/MT_Client_Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  MT_Client_Test.idl
-
-## Makefile.MT_Client_Test_Nested_Upcall_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  MT_Client_TestC.cpp \
-  MT_Client_TestS.cpp \
-  MT_Object_i.cpp \
-  client.cpp \
-  local_server.cpp \
-  MT_Object_i.h \
-  client.h \
-  local_server.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MT_Client_Test_Nested_Upcall_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  MT_Client_TestC.cpp \
-  MT_Client_TestS.cpp \
-  MT_Object_i.cpp \
-  server.cpp \
-  MT_Object_i.h \
-  server.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/NestedUpcall/MT_Client_Test/client.cpp b/tests/NestedUpcall/MT_Client_Test/client.cpp
index 2935b601b93..b1d3f5db780 100644
--- a/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -1,22 +1,19 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client_Test
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//    Start one server thread calling a distant MT Object serveral times,
-//    also starting serveral client threads which call the MT Object too.
-//    The server does nested upcalls.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  Start one server thread calling a distant MT Object serveral times,
+ *  also starting serveral client threads which call the MT Object too.
+ *  The server does nested upcalls.
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #include "client.h"
 #include "local_server.h"
@@ -27,8 +24,6 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/Malloc_Base.h"
 
-ACE_RCSID(MT_Client_Test, client, "$Id$")
-
 MT_Client_Task::MT_Client_Task (int argc, ACE_TCHAR **argv,
                                 int client_number)
   : argc_ (argc),
diff --git a/tests/NestedUpcall/MT_Client_Test/client.h b/tests/NestedUpcall/MT_Client_Test/client.h
index 6d25e8c355e..5226fe9aca8 100644
--- a/tests/NestedUpcall/MT_Client_Test/client.h
+++ b/tests/NestedUpcall/MT_Client_Test/client.h
@@ -1,21 +1,16 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client_Test
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION
-//    Test for multithreaded client using one global ORB (and Reactor)
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.h
+ *
+ *  $Id$
+ *
+ *  Test for multithreaded client using one global ORB (and Reactor)
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
 
 #ifndef MT_CLIENT_H
 #define MT_CLIENT_H
@@ -31,68 +26,72 @@
 #include "tao/ORB.h"
 #include "MT_Client_TestC.h"
 
+/**
+ * @class MT_Client
+ *
+ * @brief A simple client talking to one server
+ *
+ * It is connecting to a server which holds the Object_A
+ * or using the "-m" switch to a server holding the MT_Object
+ */
 class MT_Client
 {
-  // = TITLE
-  //    A simple client talking to one server
-  //
-  // = DESCRIPTION
-  //    It is connecting to a server which holds the Object_A
-  //    or using the "-m" switch to a server holding the MT_Object
 
 public:
+  /// = Constructor and destructor.
   MT_Client (void);
   ~MT_Client (void);
-  // = Constructor and destructor.
 
+  /// Execute client example code.
   int run (void);
-  // Execute client example code.
 
+  /// Initialize the client communication endpoint with server.
   int init (int argc,
             ACE_TCHAR **argv,
             int client_number);
-  // Initialize the client communication endpoint with server.
 
 private:
+  /// reading the IOR of object A in
   int read_ior (ACE_TCHAR *filename);
-  // reading the IOR of object A in
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// Key of the object
   char *object_key_;
-  // Key of the object
 
+  /// Flag to tell server to shutdown.
   int shutdown_;
-  // Flag to tell server to shutdown.
 
+  /// Remember our orb.
   CORBA::ORB_var orb_var_;
-  // Remember our orb.
 
+  /// pointer to the mt Object
   MT_Object_var mT_Object_var_;
-  // pointer to the mt Object
 
+  /// This is used to choose the server...
   int client_number_;
-  // This is used to choose the server...
 
+  /// number of loops
   unsigned long iterations_;
-  // number of loops
 
 };
 
+/**
+ * @class MT_Client_Task
+ *
+ * @brief Wrapper for the MT_Client to be an extra thread
+ *
+ * No big purpose, just wrapping
+ */
 class MT_Client_Task : public ACE_Task<ACE_SYNCH>
 {
-  // = TITLE
-  //    Wrapper for the MT_Client to be an extra thread
-  //
-  // = DESCRIPTION
-  //    No big purpose, just wrapping
 public:
   MT_Client_Task (int argc, ACE_TCHAR **argv, int client_number);
 
@@ -103,8 +102,8 @@ private:
   int argc_;
   ACE_TCHAR **argv_;
 
+  /// To determine if we use the first or the second server.
   int client_number_;
-  // To determine if we use the first or the second server.
 };
 
 #endif /* MT_CLIENT_H */
diff --git a/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index dd2d64f0aad..94aeb20f8ca 100644
--- a/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client_Test
-//
-// = FILENAME
-//    local_server.cpp
-//
-// = DESCRIPTION
-//    This server will run the ORB briefly and then make
-//    several calls on the distant MT Object.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    local_server.cpp
+ *
+ *  $Id$
+ *
+ *  This server will run the ORB briefly and then make
+ *  several calls on the distant MT Object.
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #include "local_server.h"
 #include "tao/debug.h"
@@ -24,8 +21,6 @@
 #include "ace/OS_NS_fcntl.h"
 #include "tao/Utils/ORB_Manager.h"
 
-ACE_RCSID(MT_Client_Test, local_server, "$Id$")
-
 MT_Server_Task::MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr,
                                 int argc,
                                 ACE_TCHAR **argv,
diff --git a/tests/NestedUpcall/MT_Client_Test/local_server.h b/tests/NestedUpcall/MT_Client_Test/local_server.h
index b486c2f443e..731fd936d21 100644
--- a/tests/NestedUpcall/MT_Client_Test/local_server.h
+++ b/tests/NestedUpcall/MT_Client_Test/local_server.h
@@ -1,22 +1,17 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client_Test
-//
-// = FILENAME
-//    local_server.h
-//
-// = DESCRIPTION
-//     This class implements a simple server for the
-//     Nested Upcalls - MT Client test
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    local_server.h
+ *
+ *  $Id$
+ *
+ *   This class implements a simple server for the
+ *   Nested Upcalls - MT Client test
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
 
 #ifndef MT_CLIENT_TEST_MT_SERVER_H
 #define MT_CLIENT_TEST_MT_SERVER_H
@@ -35,76 +30,80 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_ORB_Manager;
 TAO_END_VERSIONED_NAMESPACE_DECL
 
+/**
+ * @class MT_Server
+ *
+ * @brief This is the server for the mt_object
+ *
+ * See the README file for more information.
+ */
 class MT_Server
 {
-  // = TITLE
-  //   This is the server for the mt_object
-  //
-  // = DESCRIPTION
-  //   See the README file for more information.
 
 public:
 
+  /// Default constructor
   MT_Server ();
-  // Default constructor
 
+  /// Destructor
   ~MT_Server (void);
-  // Destructor
 
+  /// Initialize the MT_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv,
             TAO_ORB_Manager* orb_manager_ptr);
-  // Initialize the MT_Server state - parsing arguments and ...
 
+  /// Run the orb
   int run (void);
-  // Run the orb
 
+  /// Just run it briefly
   int run_ORB_briefly (void);
-  // Just run it briefly
 
 private:
+  /// reading the IOR of mt object in
   int read_ior (ACE_TCHAR *filename);
-  // reading the IOR of mt object in
 
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// Key of the object
   char *object_key_;
-  // Key of the object
 
+  /// File to output the IOR of the object A.
   FILE* ior_output_file_;
-  // File to output the IOR of the object A.
 
+  /// The ORB manager
   TAO_ORB_Manager* orb_manager_ptr_;
-  // The ORB manager
 
+  /// Implementation object
   MT_Object_i mT_Object_i_;
-  // Implementation object
 
+  /// reference for the distant MT Object
   MT_Object_var mT_Object_var_;
-  // reference for the distant MT Object
 
+  /// Number of commandline arguments.
   int argc_;
-  // Number of commandline arguments.
 
+  /// commandline arguments.
   ACE_TCHAR **argv_;
-  // commandline arguments.
 
+  /// number of times the server should call to the disted MT OBject
   unsigned int iterations_;
-  // number of times the server should call to the disted MT OBject
 
+  /// IOR of our servant.
   CORBA::String_var str_;
-  // IOR of our servant.
 };
 
 
+/**
+ * @class MT_Server_Task
+ *
+ * @brief Wrapper for the MT_Server to be an extra thread
+ *
+ * No big purpose, just wrapping
+ */
 class MT_Server_Task : public ACE_Task<ACE_SYNCH>
 {
-  // = TITLE
-  //    Wrapper for the MT_Server to be an extra thread
-  //
-  // = DESCRIPTION
-  //    No big purpose, just wrapping
 public:
   MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr,
                   int argc,
diff --git a/tests/NestedUpcall/MT_Client_Test/server.cpp b/tests/NestedUpcall/MT_Client_Test/server.cpp
index cc902da6345..5c9ae335c6f 100644
--- a/tests/NestedUpcall/MT_Client_Test/server.cpp
+++ b/tests/NestedUpcall/MT_Client_Test/server.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client_Test
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    This class implements a simple server for the
-//    Nested Upcalls - MT_Client test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  This class implements a simple server for the
+ *  Nested Upcalls - MT_Client test.
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #include "server.h"
 #include "tao/debug.h"
@@ -24,8 +21,6 @@
 #include "ace/Event_Handler.h"
 #include "ace/Sig_Handler.h"
 
-ACE_RCSID(MT_Client_Test, server, "$Id$")
-
 class TestShutdown : public ACE_Event_Handler
 {
 public:
diff --git a/tests/NestedUpcall/MT_Client_Test/server.h b/tests/NestedUpcall/MT_Client_Test/server.h
index 8d0e237514e..549c5a30830 100644
--- a/tests/NestedUpcall/MT_Client_Test/server.h
+++ b/tests/NestedUpcall/MT_Client_Test/server.h
@@ -1,22 +1,18 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client_Test
-//
-// = FILENAME
-//    server_A.h
-//
-// = DESCRIPTION
-//      This class implements a simple server for the
-//      Nested Upcalls - MT Client test
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.h
+ *
+ *  $Id$
+ *
+ *    This class implements a simple server for the
+ *    Nested Upcalls - MT Client test
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #ifndef MT_CLIENT_TEST_MT_OBJECT_SERVER_H
 #define MT_CLIENT_TEST_MT_OBJECT_SERVER_H
@@ -31,47 +27,49 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "MT_Object_i.h"
 
+/**
+ * @class MT_Object_Server
+ *
+ * @brief This is the server for the object A in the test.
+ *
+ * See the README file for more information.
+ */
 class MT_Object_Server
 {
-  // = TITLE
-  //   This is the server for the object A in the test.
-  //
-  // = DESCRIPTION
-  //   See the README file for more information.
 
 public:
 
+  /// Default constructor
   MT_Object_Server (void);
-  // Default constructor
 
+  /// Destructor
   ~MT_Object_Server (void);
-  // Destructor
 
+  /// Initialize the NestedUpCalls_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
-  // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
+  /// Run the orb
   int run (void);
-  // Run the orb
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// File to output the IOR of the object A.
   FILE* ior_output_file_;
-  // File to output the IOR of the object A.
 
+  /// The ORB manager
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager
 
+  /// Implementation object MT_OBject
   MT_Object_i mT_Object_i_;
-  // Implementation object MT_OBject
 
+  /// Number of commandline arguments.
   int argc_;
-  // Number of commandline arguments.
 
+  /// commandline arguments.
   ACE_TCHAR **argv_;
-  // commandline arguments.
 
   u_char use_mt_object_;
 };
diff --git a/tests/NestedUpcall/Makefile.am b/tests/NestedUpcall/Makefile.am
deleted file mode 100644
index 5cd4e889a89..00000000000
--- a/tests/NestedUpcall/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        MT_Client_Test \
-        Simple \
-        Triangle_Test
-
diff --git a/tests/NestedUpcall/Simple/Makefile.am b/tests/NestedUpcall/Simple/Makefile.am
deleted file mode 100644
index 2f3397a15a8..00000000000
--- a/tests/NestedUpcall/Simple/Makefile.am
+++ /dev/null
@@ -1,109 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Simple_Nested_Upcall_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Simple_Nested_Upcall_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  client_i.cpp \
-  testC.cpp \
-  testS.cpp \
-  client_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Simple_Nested_Upcall_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  server_i.cpp \
-  testC.cpp \
-  testS.cpp \
-  server_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/NestedUpcall/Simple/client.cpp b/tests/NestedUpcall/Simple/client.cpp
index 39912c97638..555e40df214 100644
--- a/tests/NestedUpcall/Simple/client.cpp
+++ b/tests/NestedUpcall/Simple/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(Simple, client, "$Id$")
-
 static const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 // Server IOR.
 
diff --git a/tests/NestedUpcall/Simple/server.cpp b/tests/NestedUpcall/Simple/server.cpp
index 2fceb937b1f..8121c3a19b5 100644
--- a/tests/NestedUpcall/Simple/server.cpp
+++ b/tests/NestedUpcall/Simple/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(Simple, server, "$Id$")
-
 static int quiet = 0;
 // The test is quiet...
 
diff --git a/tests/NestedUpcall/Simple/simple-client.cpp b/tests/NestedUpcall/Simple/simple-client.cpp
index 53fd7dc44a9..7a979bec324 100644
--- a/tests/NestedUpcall/Simple/simple-client.cpp
+++ b/tests/NestedUpcall/Simple/simple-client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(Simple, client, "$Id$")
-
 static const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 // Server IOR.
 
diff --git a/tests/NestedUpcall/Simple/test.idl b/tests/NestedUpcall/Simple/test.idl
index 45664cfb035..c31e438e6e5 100644
--- a/tests/NestedUpcall/Simple/test.idl
+++ b/tests/NestedUpcall/Simple/test.idl
@@ -1,20 +1,16 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpcall
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//    A simple test of nested upcalls.
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    test.idl
+ *
+ *  $Id$
+ *
+ *  A simple test of nested upcalls.
+ *
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
 
 interface client
 {
diff --git a/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
index c2ecfcc8498..49d08edf026 100644
--- a/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
+++ b/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
@@ -1,27 +1,21 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    Object_A_i.cpp
-//
-// = DESCRIPTION
-//    This class implements the Object A  of the
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Initiator_i.cpp
+ *
+ *  $Id$
+ *
+ *  This class implements the Object A  of the
+ *  Nested Upcalls - Triangle test.
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
 
 #include "tao/Exception.h"
 #include "Initiator_i.h"
 
-ACE_RCSID(Triangle_Test, Initiator_i, "$Id$")
-
 // CTOR
 Initiator_i::Initiator_i (Object_A_ptr object_A_ptr,
                                 Object_B_ptr object_B_ptr)
diff --git a/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/tests/NestedUpcall/Triangle_Test/Initiator_i.h
index 2d9e9fa1cac..2d4ba8b9c37 100644
--- a/tests/NestedUpcall/Triangle_Test/Initiator_i.h
+++ b/tests/NestedUpcall/Triangle_Test/Initiator_i.h
@@ -1,48 +1,47 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    Initiator_i.h
-//
-// = DESCRIPTION
-//    This class implements the Initiator of the
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Initiator_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Initiator of the
+ *  Nested Upcalls - Triangle test.
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #ifndef INITIATOR_IMPL_H
 #  define INITIATOR_IMPL_H
 
 #include "Triangle_TestS.h"
 
+/**
+ * @class Initiator_i
+ *
+ * @brief Implement the <Initiator> IDL interface.
+ */
 class Initiator_i : public POA_Initiator
 {
-  // = TITLE
-  //     Implement the <Initiator> IDL interface.
 public:
+  /// Constructor.
   Initiator_i (Object_A_ptr object_A_ptr,
                   Object_B_ptr object_B_ptr);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Initiator_i (void);
-  // Destructor.
 
   virtual void foo_object_B (void);
 
 private:
+  /// reference to object A
   Object_A_var object_A_var_;
-  // reference to object A
 
+  /// reference to object B
   Object_B_var object_B_var_;
-  // reference to object B
 };
 
 #endif /* INITIATOR_IMPL_H */
diff --git a/tests/NestedUpcall/Triangle_Test/Makefile.am b/tests/NestedUpcall/Triangle_Test/Makefile.am
deleted file mode 100644
index 96374a10b97..00000000000
--- a/tests/NestedUpcall/Triangle_Test/Makefile.am
+++ /dev/null
@@ -1,148 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.TT_Nested_Upcall_Server_Idl.am
-
-BUILT_SOURCES = \
-  Triangle_TestC.cpp \
-  Triangle_TestC.h \
-  Triangle_TestC.inl \
-  Triangle_TestS.cpp \
-  Triangle_TestS.h \
-  Triangle_TestS.inl
-
-CLEANFILES = \
-  Triangle_Test-stamp \
-  Triangle_TestC.cpp \
-  Triangle_TestC.h \
-  Triangle_TestC.inl \
-  Triangle_TestS.cpp \
-  Triangle_TestS.h \
-  Triangle_TestS.inl
-
-Triangle_TestC.cpp Triangle_TestC.h Triangle_TestC.inl Triangle_TestS.cpp Triangle_TestS.h Triangle_TestS.inl: Triangle_Test-stamp
-
-Triangle_Test-stamp: $(srcdir)/Triangle_Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Triangle_Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Triangle_Test.idl
-
-## Makefile.TT_Nested_Upcall_Initiator.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += initiator
-
-initiator_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-initiator_SOURCES = \
-  Initiator_i.cpp \
-  Triangle_TestC.cpp \
-  Triangle_TestS.cpp \
-  initiator.cpp \
-  Initiator_i.h \
-  initiator.h
-
-initiator_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.TT_Nested_Upcall_Server_A.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server_A
-
-server_A_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_A_SOURCES = \
-  Object_A_i.cpp \
-  Triangle_TestC.cpp \
-  Triangle_TestS.cpp \
-  server_A.cpp \
-  Object_A_i.h \
-  server_A.h
-
-server_A_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.TT_Nested_Upcall_Server_B.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server_B
-
-server_B_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_B_SOURCES = \
-  Object_B_i.cpp \
-  Triangle_TestC.cpp \
-  Triangle_TestS.cpp \
-  server_B.cpp \
-  Object_B_i.h \
-  server_B.h
-
-server_B_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
index 66764ee0b3c..0946f3c3ce7 100644
--- a/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
+++ b/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
@@ -1,28 +1,23 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    Object_A_i.cpp
-//
-// = DESCRIPTION
-//    This class implements the Object A  of the
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Object_A_i.cpp
+ *
+ *  $Id$
+ *
+ *  This class implements the Object A  of the
+ *  Nested Upcalls - Triangle test.
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #include "Object_A_i.h"
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
 
-ACE_RCSID(Triangle_Test, Object_A_i, "$Id$")
-
 // CTOR
 Object_A_i::Object_A_i (void)
   : finish_two_way_call_ (0)
@@ -59,3 +54,13 @@ Object_A_i::finish (void)
   this->finish_two_way_call_ = 1;
 
 }
+
+void
+Object_A_i::shutdown (void)
+{
+  int argc = 0;
+  ACE_TCHAR **argv = 0;
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+  orb->shutdown ();
+}
diff --git a/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/tests/NestedUpcall/Triangle_Test/Object_A_i.h
index 567412b6d83..71e604800f7 100644
--- a/tests/NestedUpcall/Triangle_Test/Object_A_i.h
+++ b/tests/NestedUpcall/Triangle_Test/Object_A_i.h
@@ -1,43 +1,44 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    Object_A_i.h
-//
-// = DESCRIPTION
-//    This class implements the Object A of the
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Object_A_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Object A of the
+ *  Nested Upcalls - Triangle test.
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #ifndef OBJECT_B_IMPL_H
 #  define OBJECT_B_IMPL_H
 
 #include "Triangle_TestS.h"
 
+/**
+ * @class Object_A_i
+ *
+ * @brief Implement the <Object_A> IDL interface.
+ */
 class Object_A_i : public POA_Object_A
 {
-  // = TITLE
-  //     Implement the <Object_A> IDL interface.
 public:
+  /// Constructor.
   Object_A_i (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Object_A_i (void);
-  // Destructor.
 
   virtual void foo (Initiator_ptr theInitiator_ptr);
 
   virtual void finish (void);
 
+  virtual void shutdown (void);
+
   unsigned long finish_two_way_call_;
 };
 
diff --git a/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
index 3428fd18159..70cc0810439 100644
--- a/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+++ b/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
@@ -1,28 +1,23 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    Object_B_i.cpp
-//
-// = DESCRIPTION
-//    This class implements the Object B  of the
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Object_B_i.cpp
+ *
+ *  $Id$
+ *
+ *  This class implements the Object B  of the
+ *  Nested Upcalls - Triangle test.
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #include "tao/Exception.h"
 #include "Object_B_i.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Triangle_Test, Object_B_i, "$Id$")
-
 // CTOR
 Object_B_i::Object_B_i (void)
 {
@@ -60,3 +55,13 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr)
     }
 
 }
+
+void
+Object_B_i::shutdown (void)
+{
+  int argc = 0;
+  ACE_TCHAR **argv = 0;
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+  orb->shutdown ();
+}
diff --git a/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/tests/NestedUpcall/Triangle_Test/Object_B_i.h
index 2eed4c74f4b..1fd5f66bb5e 100644
--- a/tests/NestedUpcall/Triangle_Test/Object_B_i.h
+++ b/tests/NestedUpcall/Triangle_Test/Object_B_i.h
@@ -1,40 +1,41 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    Object_B_i.h
-//
-// = DESCRIPTION
-//    This class implements the Object B of the
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Object_B_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Object B of the
+ *  Nested Upcalls - Triangle test.
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #ifndef OBJECT_B_IMPL_H
 #  define OBJECT_B_IMPL_H
 
 #include "Triangle_TestS.h"
 
+/**
+ * @class Object_B_i
+ *
+ * @brief Implement the <Object_B> IDL interface.
+ */
 class Object_B_i : public POA_Object_B
 {
-  // = TITLE
-  //     Implement the <Object_B> IDL interface.
 public:
+  /// Constructor.
   Object_B_i (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~Object_B_i (void);
-  // Destructor.
 
   virtual void foo(Object_A_ptr theObject_A_ptr);
+
+  virtual void shutdown (void);
 };
 
 #endif /* OBJECT_B_IMPL_H */
diff --git a/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl b/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl
index 485d1f0edc5..87b83f1661c 100644
--- a/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl
+++ b/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl
@@ -1,20 +1,16 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpcall/Triangle_Test
-//
-// = FILENAME
-//    Triangle_Test.idl
-//
-// = DESCRIPTION
-//    An example of how nested upcalls work/fail?
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Triangle_Test.idl
+ *
+ *  $Id$
+ *
+ *  An example of how nested upcalls work/fail?
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 
 interface Initiator {
@@ -26,13 +22,17 @@ interface Initiator {
 interface Object_A {
 
   void foo (in Initiator theInitiator);
-  
+
   oneway void finish ();
 
+  oneway void shutdown ();
+
 };
 
 interface Object_B {
 
   void foo (in Object_A theObject_A);
 
+  oneway void shutdown ();
+
 };
diff --git a/tests/NestedUpcall/Triangle_Test/initiator.cpp b/tests/NestedUpcall/Triangle_Test/initiator.cpp
index 3433e5fea2a..3b7500c822c 100644
--- a/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    initiator.cpp
-//
-// = DESCRIPTION
-//    This class implements a simple server for the
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    initiator.cpp
+ *
+ *  $Id$
+ *
+ *  This class implements a simple server for the
+ *  Nested Upcalls - Triangle test.
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #include "initiator.h"
 #include "tao/debug.h"
@@ -23,8 +20,6 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Triangle_Test, initiator, "$Id$")
-
 Initiator_Server::Initiator_Server (void)
   : object_A_key_ (0),
     object_B_key_ (0),
@@ -143,10 +138,11 @@ Initiator_Server::init (int argc,
 
   try
     {
+      CORBA::ORB_var orb = this->orb_manager_.orb();
       // Get Object A
 
       CORBA::Object_var object_A_obj_var =
-        this->orb_manager_.orb()->string_to_object (this->object_A_key_);
+        orb->string_to_object (this->object_A_key_);
 
       this->object_A_var_ =
         Object_A::_narrow (object_A_obj_var.in());
@@ -168,7 +164,7 @@ Initiator_Server::init (int argc,
       // Get Object B
 
       CORBA::Object_var object_B_obj_var =
-        this->orb_manager_.orb()->string_to_object (this->object_B_key_);
+        orb->string_to_object (this->object_B_key_);
 
       this->object_B_var_ =
         Object_B::_narrow (object_B_obj_var.in());
@@ -255,6 +251,9 @@ Initiator_Server::~Initiator_Server (void)
   if (this->object_B_key_ != 0)
     ACE_Allocator::instance ()->free (this->object_B_key_);
 
+  this->object_A_var_->shutdown ();
+  this->object_B_var_->shutdown ();
+
   try
     {
       this->orb_manager_.deactivate (this->str_.in ());
diff --git a/tests/NestedUpcall/Triangle_Test/initiator.h b/tests/NestedUpcall/Triangle_Test/initiator.h
index 36be7ab5da6..d1c4c5f6848 100644
--- a/tests/NestedUpcall/Triangle_Test/initiator.h
+++ b/tests/NestedUpcall/Triangle_Test/initiator.h
@@ -1,22 +1,18 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    initiator.h
-//
-// = DESCRIPTION
-//      This class implements a simple server for the
-//      Nested Upcalls - Triangle test
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    initiator.h
+ *
+ *  $Id$
+ *
+ *    This class implements a simple server for the
+ *    Nested Upcalls - Triangle test
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #ifndef _TRIANGLE_TEST_INITITATOR_SERVER_H
 #define _TRIANGLE_TEST_INITITATOR_SERVER_H
@@ -31,62 +27,64 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "Initiator_i.h"
 
+/**
+ * @class Initiator_Server
+ *
+ * @brief This is the server for the Initiator in the test.
+ *
+ * See the README file for more information.
+ */
 class Initiator_Server
 {
-  // = TITLE
-  //   This is the server for the Initiator in the test.
-  //
-  // = DESCRIPTION
-  //   See the README file for more information.
 
 public:
 
+  /// Default constructor
   Initiator_Server (void);
-  // Default constructor
 
+  /// Destructor
   ~Initiator_Server (void);
-  // Destructor
 
+  /// read in the IOR's for the two objects A and B
   int read_ior (ACE_TCHAR *filename, unsigned int A_B);
-  // read in the IOR's for the two objects A and B
 
+  /// Initialize the Initiator_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
-  // Initialize the Initiator_Server state - parsing arguments and ...
 
+  /// Run the orb
   int run (void);
-  // Run the orb
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// The IOR of object A
   char * object_A_key_;
-  // The IOR of object A
 
+  /// The IOR of object B
   char * object_B_key_;
-  // The IOR of object B
 
+  /// reference to object A
   Object_A_var object_A_var_;
-  // reference to object A
 
+  /// reference to object B
   Object_B_var object_B_var_;
-  // reference to object B
 
+  /// The ORB manager
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager
 
+  /// Implementation object of the Initiator
   Initiator_i *initiator_i_ptr_;
-  // Implementation object of the Initiator
 
+  /// Number of commandline arguments.
   int argc_;
-  // Number of commandline arguments.
 
+  /// commandline arguments.
   ACE_TCHAR **argv_;
-  // commandline arguments.
 
+  /// IOR of my servant.
   CORBA::String_var str_;
-  // IOR of my servant.
 };
 
 #endif /* _TRIANGLE_TEST_INITITATOR_SERVER_H */
diff --git a/tests/NestedUpcall/Triangle_Test/run_test.pl b/tests/NestedUpcall/Triangle_Test/run_test.pl
index d84559551a2..2e9c16d2cba 100755
--- a/tests/NestedUpcall/Triangle_Test/run_test.pl
+++ b/tests/NestedUpcall/Triangle_Test/run_test.pl
@@ -114,14 +114,14 @@ if ($client_status != 0) {
     $status = 1;
 }
 
-$server_status = $SV1->TerminateWaitKill ($server_a->ProcessStopWaitInterval());
+$server_status = $SV1->WaitKill ($server_a->ProcessStopWaitInterval());
 
 if ($server_status != 0) {
     print STDERR "ERROR: server returned $server_status\n";
     $status = 1;
 }
 
-$server_status = $SV2->TerminateWaitKill ($server_b->ProcessStopWaitInterval());
+$server_status = $SV2->WaitKill ($server_b->ProcessStopWaitInterval());
 
 if ($server_status != 0) {
     print STDERR "ERROR: server returned $server_status\n";
diff --git a/tests/NestedUpcall/Triangle_Test/server_A.cpp b/tests/NestedUpcall/Triangle_Test/server_A.cpp
index dd47d9447c5..f651030f77c 100644
--- a/tests/NestedUpcall/Triangle_Test/server_A.cpp
+++ b/tests/NestedUpcall/Triangle_Test/server_A.cpp
@@ -1,28 +1,23 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    server_A.cpp
-//
-// = DESCRIPTION
-//    This class implements a simple server for the
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server_A.cpp
+ *
+ *  $Id$
+ *
+ *  This class implements a simple server for the
+ *  Nested Upcalls - Triangle test.
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #include "server_A.h"
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Triangle_Test, server_A, "$Id$")
-
 Object_A_Server::Object_A_Server (void)
   : ior_output_file_ (0)
 {
diff --git a/tests/NestedUpcall/Triangle_Test/server_A.h b/tests/NestedUpcall/Triangle_Test/server_A.h
index 095d1122d51..efb5257f293 100644
--- a/tests/NestedUpcall/Triangle_Test/server_A.h
+++ b/tests/NestedUpcall/Triangle_Test/server_A.h
@@ -1,22 +1,18 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    server_A.h
-//
-// = DESCRIPTION
-//      This class implements a simple server for the
-//      Nested Upcalls - Triangle test
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server_A.h
+ *
+ *  $Id$
+ *
+ *    This class implements a simple server for the
+ *    Nested Upcalls - Triangle test
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #ifndef _TRIANGLE_TEST_OBJECT_A_SERVER_H
 #define _TRIANGLE_TEST_OBJECT_A_SERVER_H
@@ -31,47 +27,49 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "Object_A_i.h"
 
+/**
+ * @class Object_A_Server
+ *
+ * @brief This is the server for the object A in the test.
+ *
+ * See the README file for more information.
+ */
 class Object_A_Server
 {
-  // = TITLE
-  //   This is the server for the object A in the test.
-  //
-  // = DESCRIPTION
-  //   See the README file for more information.
 
 public:
 
+  /// Default constructor
   Object_A_Server (void);
-  // Default constructor
 
+  /// Destructor
   ~Object_A_Server (void);
-  // Destructor
 
+  /// Initialize the NestedUpCalls_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
-  // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
+  /// Run the orb
   int run (void);
-  // Run the orb
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// File to output the IOR of the object A.
   FILE* ior_output_file_;
-  // File to output the IOR of the object A.
 
+  /// The ORB manager
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager
 
+  /// Implementation object of the NestedUpCalls reactor.
   Object_A_i object_A_i_;
-  // Implementation object of the NestedUpCalls reactor.
 
+  /// Number of commandline arguments.
   int argc_;
-  // Number of commandline arguments.
 
+  /// commandline arguments.
   ACE_TCHAR **argv_;
-  // commandline arguments.
 };
 
 #endif /* _TRIANGLE_TEST_OBJECT_A_SERVER_H */
diff --git a/tests/NestedUpcall/Triangle_Test/server_B.cpp b/tests/NestedUpcall/Triangle_Test/server_B.cpp
index bee7d17754c..e37c51b3819 100644
--- a/tests/NestedUpcall/Triangle_Test/server_B.cpp
+++ b/tests/NestedUpcall/Triangle_Test/server_B.cpp
@@ -1,28 +1,23 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    server_B.cpp
-//
-// = DESCRIPTION
-//    This class implements a simple server for the
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server_B.cpp
+ *
+ *  $Id$
+ *
+ *  This class implements a simple server for the
+ *  Nested Upcalls - Triangle test.
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #include "server_B.h"
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Triangle_Test, server_B, "$Id$")
-
 Object_B_Server::Object_B_Server (void)
   : ior_output_file_ (0)
 {
diff --git a/tests/NestedUpcall/Triangle_Test/server_B.h b/tests/NestedUpcall/Triangle_Test/server_B.h
index ec252a201a0..2eb4faaf39d 100644
--- a/tests/NestedUpcall/Triangle_Test/server_B.h
+++ b/tests/NestedUpcall/Triangle_Test/server_B.h
@@ -1,22 +1,18 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    server_B.h
-//
-// = DESCRIPTION
-//      This class implements a simple server for the
-//      Nested Upcalls - Triangle test
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server_B.h
+ *
+ *  $Id$
+ *
+ *    This class implements a simple server for the
+ *    Nested Upcalls - Triangle test
+ *
+ *
+ *  @author Michael Kircher
+ */
+//=============================================================================
+
 
 #ifndef _TRIANGLE_TEST_OBJECT_B_SERVER_H
 #define _TRIANGLE_TEST_OBJECT_B_SERVER_H
@@ -31,47 +27,49 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "Object_B_i.h"
 
+/**
+ * @class Object_B_Server
+ *
+ * @brief This is the server for the object A in the test.
+ *
+ * See the README file for more information.
+ */
 class Object_B_Server
 {
-  // = TITLE
-  //   This is the server for the object A in the test.
-  //
-  // = DESCRIPTION
-  //   See the README file for more information.
 
 public:
 
+  /// Default constructor
   Object_B_Server (void);
-  // Default constructor
 
+  /// Destructor
   ~Object_B_Server (void);
-  // Destructor
 
+  /// Initialize the NestedUpCalls_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR **argv);
-  // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
+  /// Run the orb
   int run (void);
-  // Run the orb
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// File to output the IOR of the object A.
   FILE* ior_output_file_;
-  // File to output the IOR of the object A.
 
+  /// The ORB manager
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager
 
+  /// Implementation object of the NestedUpCalls reactor.
   Object_B_i object_B_i_;
-  // Implementation object of the NestedUpCalls reactor.
 
+  /// Number of commandline arguments.
   int argc_;
-  // Number of commandline arguments.
 
+  /// commandline arguments.
   ACE_TCHAR **argv_;
-  // commandline arguments.
 };
 
 #endif /* _TRIANGLE_TEST_OBJECT_B_SERVER_H */
diff --git a/tests/Nested_Event_Loop/Makefile.am b/tests/Nested_Event_Loop/Makefile.am
deleted file mode 100644
index 82890659246..00000000000
--- a/tests/Nested_Event_Loop/Makefile.am
+++ /dev/null
@@ -1,115 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Nested_Event_Loop_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Nested_Event_Loop_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Nested_Event_Loop_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/tests/Nested_Event_Loop/client.cpp b/tests/Nested_Event_Loop/client.cpp
index cda926dccea..4f1a972f14f 100644
--- a/tests/Nested_Event_Loop/client.cpp
+++ b/tests/Nested_Event_Loop/client.cpp
@@ -2,13 +2,10 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
-#include "ace/OS.h"
 #include "test_i.h"
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Nested_Event_Loop, client, "$Id$")
-
 // Name of file contains ior.
 static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 
diff --git a/tests/Nested_Event_Loop/server.cpp b/tests/Nested_Event_Loop/server.cpp
index baa544c7042..2dbfed5c6fc 100644
--- a/tests/Nested_Event_Loop/server.cpp
+++ b/tests/Nested_Event_Loop/server.cpp
@@ -5,8 +5,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Nested_Event_Loop, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 
 int
@@ -31,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Nested_Event_Loop/test_i.cpp b/tests/Nested_Event_Loop/test_i.cpp
index 3703b96ad4e..607f87b5ee1 100644
--- a/tests/Nested_Event_Loop/test_i.cpp
+++ b/tests/Nested_Event_Loop/test_i.cpp
@@ -3,8 +3,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Nested_Event_Loop, test_i, "$Id$")
-
 server_i::server_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Nested_Upcall_Crash/Client_Peer.cpp b/tests/Nested_Upcall_Crash/Client_Peer.cpp
index 7cb44068e63..19e2cb8f1a4 100644
--- a/tests/Nested_Upcall_Crash/Client_Peer.cpp
+++ b/tests/Nested_Upcall_Crash/Client_Peer.cpp
@@ -11,8 +11,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
 
-ACE_RCSID(Nested_Upcall_Crash, Client_Peer, "$Id$")
-
 class Crasher : public ACE_Event_Handler
 {
 public:
diff --git a/tests/Nested_Upcall_Crash/Clock_Ticks.cpp b/tests/Nested_Upcall_Crash/Clock_Ticks.cpp
index 2d1c7cbbb59..f91cc2b1705 100644
--- a/tests/Nested_Upcall_Crash/Clock_Ticks.cpp
+++ b/tests/Nested_Upcall_Crash/Clock_Ticks.cpp
@@ -8,8 +8,6 @@
  */
 #include "Clock_Ticks.h"
 
-ACE_RCSID(Nested_Upcall_Crash, Clock_Ticks, "$Id$")
-
 long
 Clock_Ticks::get_hz (void)
 {
diff --git a/tests/Nested_Upcall_Crash/Clock_Ticks.h b/tests/Nested_Upcall_Crash/Clock_Ticks.h
index 162dec87a9f..ea090bb72e8 100644
--- a/tests/Nested_Upcall_Crash/Clock_Ticks.h
+++ b/tests/Nested_Upcall_Crash/Clock_Ticks.h
@@ -9,8 +9,6 @@
  *
  */
 
-#include "ace/OS.h"
-
 namespace Clock_Ticks
 {
   /// Return the number of clock ticks per second
diff --git a/tests/Nested_Upcall_Crash/Makefile.am b/tests/Nested_Upcall_Crash/Makefile.am
deleted file mode 100644
index 8b5f7ab96e0..00000000000
--- a/tests/Nested_Upcall_Crash/Makefile.am
+++ /dev/null
@@ -1,159 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Nested_Upcall_Crash_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Nested_Upcall_Crash_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Peer.cpp \
-  Clock_Ticks.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Peer.h \
-  Clock_Ticks.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Nested_Upcall_Crash_Scavenger.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += scavenger
-
-scavenger_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-scavenger_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  scavenger.cpp \
-  Client_Peer.h \
-  Clock_Ticks.h \
-  Server_Peer.h
-
-scavenger_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Nested_Upcall_Crash_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Clock_Ticks.cpp \
-  Server_Peer.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Clock_Ticks.h \
-  Server_Peer.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Nested_Upcall_Crash/Server_Peer.cpp b/tests/Nested_Upcall_Crash/Server_Peer.cpp
index 294c3acfa60..7c95f5779e0 100644
--- a/tests/Nested_Upcall_Crash/Server_Peer.cpp
+++ b/tests/Nested_Upcall_Crash/Server_Peer.cpp
@@ -9,9 +9,7 @@
 #include "Server_Peer.h"
 #include "tao/debug.h"
 
-ACE_RCSID(Nested_Upcall_Crash, Server_Peer, "$Id$")
-
-Server_Peer::Server_Peer (ACE_RANDR_TYPE seed,
+Server_Peer::Server_Peer (unsigned int seed,
                           CORBA::ORB_ptr orb,
                           CORBA::ULong payload_size)
   : seed_ (seed)
@@ -25,7 +23,7 @@ Server_Peer::callme(Test::Peer_ptr callback,
                     CORBA::ULong max_depth,
                     Test::Payload const &)
 {
-  int r = ACE_OS::rand_r(this->seed_) % 50;
+  int r = ACE_OS::rand_r(&this->seed_) % 50;
 
   if(TAO_debug_level)
     {
diff --git a/tests/Nested_Upcall_Crash/Server_Peer.h b/tests/Nested_Upcall_Crash/Server_Peer.h
index 0840e86c995..e1db55b5ef3 100644
--- a/tests/Nested_Upcall_Crash/Server_Peer.h
+++ b/tests/Nested_Upcall_Crash/Server_Peer.h
@@ -15,7 +15,7 @@ class Server_Peer
   : public POA_Test::Peer
 {
 public:
-  Server_Peer (ACE_RANDR_TYPE seed,
+  Server_Peer (unsigned int seed,
                CORBA::ORB_ptr orb,
                CORBA::ULong payload_size);
 
@@ -26,7 +26,7 @@ public:
   void noop(void);
 
 private:
-  ACE_RANDR_TYPE seed_;
+  unsigned int seed_;
 
   CORBA::ORB_var orb_;
 
diff --git a/tests/Nested_Upcall_Crash/client.cpp b/tests/Nested_Upcall_Crash/client.cpp
index 6dfa76d62de..4f87edd2180 100644
--- a/tests/Nested_Upcall_Crash/client.cpp
+++ b/tests/Nested_Upcall_Crash/client.cpp
@@ -8,8 +8,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
 
-ACE_RCSID(Nested_Upcall_Crash, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -153,7 +151,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Nested_Upcall_Crash/scavenger.cpp b/tests/Nested_Upcall_Crash/scavenger.cpp
index 5636a204d2e..16801621f7b 100644
--- a/tests/Nested_Upcall_Crash/scavenger.cpp
+++ b/tests/Nested_Upcall_Crash/scavenger.cpp
@@ -6,8 +6,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Nested_Upcall_Crash, scavenger, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 #if defined (ACE_OPENVMS)
@@ -113,6 +111,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
diff --git a/tests/Nested_Upcall_Crash/server.cpp b/tests/Nested_Upcall_Crash/server.cpp
index 87c06081f53..5abc07a54f5 100644
--- a/tests/Nested_Upcall_Crash/server.cpp
+++ b/tests/Nested_Upcall_Crash/server.cpp
@@ -9,12 +9,8 @@
 #include "ace/Reactor.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID (Nested_Upcall_Crash,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
-ACE_RANDR_TYPE seed;
+unsigned int seed;
 int payload_size = 4;
 
 int
@@ -78,7 +74,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       policies[0]->destroy ();
 
-      seed = (ACE_RANDR_TYPE) ACE_OS::gethrtime ();
+      seed = (unsigned int) ACE_OS::gethrtime ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -171,7 +167,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/No_Server_MT_Connect_Test/Makefile.am b/tests/No_Server_MT_Connect_Test/Makefile.am
deleted file mode 100644
index 539bb917d34..00000000000
--- a/tests/No_Server_MT_Connect_Test/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.No_Server_Connect_Test_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.No_Server_Connect_Test_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.No_Server_Connect_Test_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/No_Server_MT_Connect_Test/client.cpp b/tests/No_Server_MT_Connect_Test/client.cpp
index 6dddbd46c07..ee461bf6f73 100644
--- a/tests/No_Server_MT_Connect_Test/client.cpp
+++ b/tests/No_Server_MT_Connect_Test/client.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(MT_Client, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
 int niterations = 5;
@@ -44,7 +42,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -112,8 +110,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
 
-
-
       orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
diff --git a/tests/No_Server_MT_Connect_Test/server.cpp b/tests/No_Server_MT_Connect_Test/server.cpp
index 7250c546583..cc915920a38 100644
--- a/tests/No_Server_MT_Connect_Test/server.cpp
+++ b/tests/No_Server_MT_Connect_Test/server.cpp
@@ -4,8 +4,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(MT_Client, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/No_Server_MT_Connect_Test/test.idl b/tests/No_Server_MT_Connect_Test/test.idl
index cbb8054de28..1c92c90a571 100644
--- a/tests/No_Server_MT_Connect_Test/test.idl
+++ b/tests/No_Server_MT_Connect_Test/test.idl
@@ -11,7 +11,7 @@ interface Simple_Server
 
   /// Shutdown the server
   /**
-   * Provide a simple way to cleanup the test when it finishes 
+   * Provide a simple way to cleanup the test when it finishes
    */
   oneway void shutdown ();
 };
diff --git a/tests/No_Server_MT_Connect_Test/test_i.cpp b/tests/No_Server_MT_Connect_Test/test_i.cpp
index 12636da24aa..f2601f6c371 100644
--- a/tests/No_Server_MT_Connect_Test/test_i.cpp
+++ b/tests/No_Server_MT_Connect_Test/test_i.cpp
@@ -2,8 +2,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID(MT_Client, test_i, "$Id$")
-
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/OBV/Any/AnyS_impl.cpp b/tests/OBV/Any/AnyS_impl.cpp
index 20d38507d16..361111eb191 100644
--- a/tests/OBV/Any/AnyS_impl.cpp
+++ b/tests/OBV/Any/AnyS_impl.cpp
@@ -2,9 +2,6 @@
 
 #include "AnyS_impl.h"
 
-
-ACE_RCSID(Any, AnyS_impl, "$Id$")
-
 Test_impl::Test_impl (CORBA::ORB_ptr orb)
     : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/OBV/Any/AnyS_impl.h b/tests/OBV/Any/AnyS_impl.h
index 44540f31ac8..7bdb376b825 100644
--- a/tests/OBV/Any/AnyS_impl.h
+++ b/tests/OBV/Any/AnyS_impl.h
@@ -1,35 +1,33 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/OBV/Any
-//
-// = FILENAME
-//   AnyS_impl.h
-//
-// = AUTHOR
-//   Boris Kolpackov <bosk@ipmce.ru>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   AnyS_impl.h
+ *
+ *  $Id$
+ *
+ *  @author Boris Kolpackov <bosk@ipmce.ru>
+ */
+//=============================================================================
+
 
 #ifndef TAO_ANY_S_IMPL_H
 #define TAO_ANY_S_IMPL_H
 
 #include "AnyS.h"
 
+/**
+ * @class Test_impl
+ *
+ * @brief Implementation of Test interface
+ *
+ * This interface is provided to produce valuetypes and test
+ * marshaling
+ */
 class Test_impl : public POA_OBV_AnyTest::Test
 {
-  // = TITLE
-  //   Implementation of Test interface
-  //
-  // = DESCRIPTION
-  //   This interface is provided to produce valuetypes and test
-  //   marshaling
-  //
 public:
+  /// ctor
   Test_impl (CORBA::ORB_ptr orb);
-  // ctor
 
   virtual CORBA::Any * get_something (
       CORBA::Boolean need_vb);
@@ -39,9 +37,9 @@ public:
   virtual void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
   CORBA::Boolean even_;
-  // The ORB
 };
 
 #endif /* TAO_ANY_S_IMPL_H */
diff --git a/tests/OBV/Any/Makefile.am b/tests/OBV/Any/Makefile.am
deleted file mode 100644
index abd75cf96f9..00000000000
--- a/tests/OBV/Any/Makefile.am
+++ /dev/null
@@ -1,112 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.OBV_Any_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  AnyC.cpp \
-  AnyC.h \
-  AnyC.inl \
-  AnyS.cpp \
-  AnyS.h \
-  AnyS.inl
-
-CLEANFILES = \
-  Any-stamp \
-  AnyC.cpp \
-  AnyC.h \
-  AnyC.inl \
-  AnyS.cpp \
-  AnyS.h \
-  AnyS.inl
-
-AnyC.cpp AnyC.h AnyC.inl AnyS.cpp AnyS.h AnyS.inl: Any-stamp
-
-Any-stamp: $(srcdir)/Any.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Any.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Any.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Any_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  AnyC.cpp \
-  client.cpp \
-  AnyS_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Any_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  AnyC.cpp \
-  AnyS.cpp \
-  AnyS_impl.cpp \
-  server.cpp \
-  AnyS_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/OBV/Any/client.cpp b/tests/OBV/Any/client.cpp
index 80a7b272826..834c8aee7f7 100644
--- a/tests/OBV/Any/client.cpp
+++ b/tests/OBV/Any/client.cpp
@@ -3,8 +3,6 @@
 #include "AnyC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Any, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OBV/Any/server.cpp b/tests/OBV/Any/server.cpp
index 0dec3a4796d..cc4bf4b55a1 100644
--- a/tests/OBV/Any/server.cpp
+++ b/tests/OBV/Any/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Any, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OBV/Collocated/Forward/Collocated_Test.cpp b/tests/OBV/Collocated/Forward/Collocated_Test.cpp
index b0900f52ba8..b0532b8e688 100644
--- a/tests/OBV/Collocated/Forward/Collocated_Test.cpp
+++ b/tests/OBV/Collocated/Forward/Collocated_Test.cpp
@@ -36,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         // This is a hack but that is okay!
         return 0;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OBV/Collocated/Forward/Makefile.am b/tests/OBV/Collocated/Forward/Makefile.am
deleted file mode 100644
index b5206b8c925..00000000000
--- a/tests/OBV/Collocated/Forward/Makefile.am
+++ /dev/null
@@ -1,145 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.OBV_Forward_Collocated.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TreeBaseC.cpp \
-  TreeBaseC.h \
-  TreeBaseC.inl \
-  TreeBaseS.cpp \
-  TreeBaseS.h \
-  TreeBaseS.inl
-
-CLEANFILES += \
-  TreeBase-stamp \
-  TreeBaseC.cpp \
-  TreeBaseC.h \
-  TreeBaseC.inl \
-  TreeBaseS.cpp \
-  TreeBaseS.h \
-  TreeBaseS.inl
-
-TreeBaseC.cpp TreeBaseC.h TreeBaseC.inl TreeBaseS.cpp TreeBaseS.h TreeBaseS.inl: TreeBase-stamp
-
-TreeBase-stamp: $(srcdir)/TreeBase.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeBase.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TreeControllerC.cpp \
-  TreeControllerC.h \
-  TreeControllerC.inl \
-  TreeControllerS.cpp \
-  TreeControllerS.h \
-  TreeControllerS.inl
-
-CLEANFILES += \
-  TreeController-stamp \
-  TreeControllerC.cpp \
-  TreeControllerC.h \
-  TreeControllerC.inl \
-  TreeControllerS.cpp \
-  TreeControllerS.h \
-  TreeControllerS.inl
-
-TreeControllerC.cpp TreeControllerC.h TreeControllerC.inl TreeControllerS.cpp TreeControllerS.h TreeControllerS.inl: TreeController-stamp
-
-TreeController-stamp: $(srcdir)/TreeController.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeController.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TreeNodeC.cpp \
-  TreeNodeC.h \
-  TreeNodeC.inl \
-  TreeNodeS.cpp \
-  TreeNodeS.h \
-  TreeNodeS.inl
-
-CLEANFILES += \
-  TreeNode-stamp \
-  TreeNodeC.cpp \
-  TreeNodeC.h \
-  TreeNodeC.inl \
-  TreeNodeS.cpp \
-  TreeNodeS.h \
-  TreeNodeS.inl
-
-TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.cpp TreeNodeS.h TreeNodeS.inl: TreeNode-stamp
-
-TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl
-	@touch $@
-
-noinst_PROGRAMS = collocated
-
-collocated_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-collocated_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Server_Task.cpp \
-  Test_impl.cpp \
-  TreeBaseC.cpp \
-  TreeBaseS.cpp \
-  TreeControllerC.cpp \
-  TreeControllerS.cpp \
-  TreeNodeC.cpp \
-  TreeNodeS.cpp \
-  Client_Task.h \
-  Server_Task.h \
-  Test_impl.h \
-  TreeBaseC.h \
-  TreeBaseC.inl \
-  TreeBaseS.h \
-  TreeBaseS.inl \
-  TreeControllerC.h \
-  TreeControllerC.inl \
-  TreeControllerS.h \
-  TreeControllerS.inl \
-  TreeNodeC.h \
-  TreeNodeC.inl \
-  TreeNodeS.h \
-  TreeNodeS.inl
-
-collocated_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/OBV/Collocated/Forward/Test_impl.h b/tests/OBV/Collocated/Forward/Test_impl.h
index 56bfb18a128..491368adb23 100644
--- a/tests/OBV/Collocated/Forward/Test_impl.h
+++ b/tests/OBV/Collocated/Forward/Test_impl.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/OBV/Collocated/Forward
-//
-// = FILENAME
-//   Test_impl.h
-//
-// = AUTHOR
-//   Boris Kolpackov <bosk@ipmce.ru>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Test_impl.h
+ *
+ *  $Id$
+ *
+ *  @author Boris Kolpackov <bosk@ipmce.ru>
+ */
+//=============================================================================
+
 
 #ifndef TAO_TEST_IMPL_H
 #define TAO_TEST_IMPL_H
@@ -20,18 +17,19 @@
 #include "TreeBaseS.h"
 #include "TreeNodeS.h"
 
+/**
+ * @class Test_impl
+ *
+ * @brief Implementation of Test interface
+ *
+ * This interface is provided to produce valuetypes and test
+ * marshaling
+ */
 class Test_impl : public POA_Test
 {
-  // = TITLE
-  //   Implementation of Test interface
-  //
-  // = DESCRIPTION
-  //   This interface is provided to produce valuetypes and test
-  //   marshaling
-  //
 public:
+  /// ctor
   Test_impl (CORBA::ORB_ptr orb);
-  // ctor
 
   virtual TreeController * reflect (
       TreeController * tc);
@@ -39,8 +37,8 @@ public:
   virtual void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #endif /* TAO_TEST_IMPL_H */
diff --git a/tests/OBV/Collocated/Forward/TreeBase.idl b/tests/OBV/Collocated/Forward/TreeBase.idl
index 662c919aea5..b350133f8ea 100644
--- a/tests/OBV/Collocated/Forward/TreeBase.idl
+++ b/tests/OBV/Collocated/Forward/TreeBase.idl
@@ -6,8 +6,8 @@ valuetype BaseNode;
 //@@ Dosn't work for now
 //typedef sequence<BaseNode> BaseNodeSeq;
 
-// Performance test: One may try to pass 
-// over the wire a cyclic graph and measure 
+// Performance test: One may try to pass
+// over the wire a cyclic graph and measure
 // how quickly TAO evaporates memory ;-)
 
 valuetype BaseNode
diff --git a/tests/OBV/Collocated/Forward/TreeController.idl b/tests/OBV/Collocated/Forward/TreeController.idl
index 4a9705db918..11665da53fe 100644
--- a/tests/OBV/Collocated/Forward/TreeController.idl
+++ b/tests/OBV/Collocated/Forward/TreeController.idl
@@ -2,8 +2,8 @@
 
 valuetype BaseNode;
 
-// This TreeController is probably a silly idea. 
-// All I want from it is a valutype forward declared 
+// This TreeController is probably a silly idea.
+// All I want from it is a valutype forward declared
 // in one file and fully defined in another.
 
 valuetype TreeController
@@ -15,7 +15,7 @@ interface Test
 {
   // Returnes the reflected copy of its argument.
   TreeController reflect (in TreeController tc);
-  
+
   // Shutdown the romote ORB
   oneway void shutdown ();
 };
diff --git a/tests/OBV/Collocated/Forward/TreeNode.idl b/tests/OBV/Collocated/Forward/TreeNode.idl
index 06010fd7b18..f37c1639395 100644
--- a/tests/OBV/Collocated/Forward/TreeNode.idl
+++ b/tests/OBV/Collocated/Forward/TreeNode.idl
@@ -5,7 +5,7 @@
 //
 // A concrete node type
 //
-valuetype StringNode : BaseNode 
+valuetype StringNode : BaseNode
 {
   public string name;
 };
diff --git a/tests/OBV/Collocated/Makefile.am b/tests/OBV/Collocated/Makefile.am
deleted file mode 100644
index b00fc1a19f3..00000000000
--- a/tests/OBV/Collocated/Makefile.am
+++ /dev/null
@@ -1,13 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Forward
-
diff --git a/tests/OBV/Factory/Factory.idl b/tests/OBV/Factory/Factory.idl
index f6fd41a6ab7..43ce343697a 100644
--- a/tests/OBV/Factory/Factory.idl
+++ b/tests/OBV/Factory/Factory.idl
@@ -10,7 +10,7 @@ module OBV_FactoryTest
 
   //
   // Base valuetype without any ops or factories. Result should be
-  // concrete BaseConcreteValue_init class ready to use. 
+  // concrete BaseConcreteValue_init class ready to use.
   //
   valuetype BaseValue
   {
@@ -19,13 +19,13 @@ module OBV_FactoryTest
     {
       unsigned long value;
     };
-    
+
     public unsigned long some_data;
   };
-  
+
   //
   // Another valuetype w/o ops, etc. Just to check proper inheritance
-  // of OBV_ classes and RefCounter's. Value1_init should be 
+  // of OBV_ classes and RefCounter's. Value1_init should be
   // concrete as well.
   //
   valuetype Value1 : BaseValue
@@ -40,7 +40,7 @@ module OBV_FactoryTest
   {
     public unsigned long id;
     public BV_Data data;
-    
+
     factory create_default (in unsigned long id);
     factory create (in unsigned long id,
                     in BV_Data data);
@@ -53,7 +53,7 @@ module OBV_FactoryTest
   {
     BaseValue get_base_value ();
     Value1 get_value1 ();
-    Value2 get_value2 ();    
+    Value2 get_value2 ();
 
     // Shutdown the romote ORB
     oneway void shutdown ();
diff --git a/tests/OBV/Factory/FactoryC_impl.cpp b/tests/OBV/Factory/FactoryC_impl.cpp
index 7bd2c91de8d..ceeec488401 100644
--- a/tests/OBV/Factory/FactoryC_impl.cpp
+++ b/tests/OBV/Factory/FactoryC_impl.cpp
@@ -1,8 +1,6 @@
-#include "FactoryC_impl.h"
+// $Id$
 
-ACE_RCSID (Factory,
-           FactoryC_impl,
-           "$Id$")
+#include "FactoryC_impl.h"
 
 OBV_FactoryTest::Value2*
 Value2_init_impl::create_default (CORBA::ULong id)
diff --git a/tests/OBV/Factory/FactoryS_impl.cpp b/tests/OBV/Factory/FactoryS_impl.cpp
index 57551f9d9ef..a1bd5c28db1 100644
--- a/tests/OBV/Factory/FactoryS_impl.cpp
+++ b/tests/OBV/Factory/FactoryS_impl.cpp
@@ -3,9 +3,6 @@
 #include "FactoryC_impl.h"
 #include "FactoryS_impl.h"
 
-
-ACE_RCSID(Factory, FactoryS_impl, "$Id$")
-
 Test_impl::Test_impl (CORBA::ORB_ptr orb)
     : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/OBV/Factory/FactoryS_impl.h b/tests/OBV/Factory/FactoryS_impl.h
index 24dfdf771d3..5dd7138e2ad 100644
--- a/tests/OBV/Factory/FactoryS_impl.h
+++ b/tests/OBV/Factory/FactoryS_impl.h
@@ -1,35 +1,33 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/OBV/Factory
-//
-// = FILENAME
-//   FactoryS_impl.h
-//
-// = AUTHOR
-//   Boris Kolpackov <bosk@ipmce.ru>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   FactoryS_impl.h
+ *
+ *  $Id$
+ *
+ *  @author Boris Kolpackov <bosk@ipmce.ru>
+ */
+//=============================================================================
+
 
 #ifndef TAO_FACTORY_S_IMPL_H
 #define TAO_FACTORY_S_IMPL_H
 
 #include "FactoryS.h"
 
+/**
+ * @class Test_impl
+ *
+ * @brief Implementation of Test interface
+ *
+ * This interface is provided to produce valuetypes and test
+ * marshaling
+ */
 class Test_impl : public POA_OBV_FactoryTest::Test
 {
-  // = TITLE
-  //   Implementation of Test interface
-  //
-  // = DESCRIPTION
-  //   This interface is provided to produce valuetypes and test
-  //   marshaling
-  //
 public:
+  /// ctor
   Test_impl (CORBA::ORB_ptr orb);
-  // ctor
 
   virtual OBV_FactoryTest::BaseValue * get_base_value (void);
 
@@ -40,8 +38,8 @@ public:
   virtual void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #endif /* TAO_FACTORY_S_IMPL_H */
diff --git a/tests/OBV/Factory/Makefile.am b/tests/OBV/Factory/Makefile.am
deleted file mode 100644
index decffcc6769..00000000000
--- a/tests/OBV/Factory/Makefile.am
+++ /dev/null
@@ -1,115 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.OBV_Factory_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  FactoryC.cpp \
-  FactoryC.h \
-  FactoryC.inl \
-  FactoryS.cpp \
-  FactoryS.h \
-  FactoryS.inl
-
-CLEANFILES = \
-  Factory-stamp \
-  FactoryC.cpp \
-  FactoryC.h \
-  FactoryC.inl \
-  FactoryS.cpp \
-  FactoryS.h \
-  FactoryS.inl
-
-FactoryC.cpp FactoryC.h FactoryC.inl FactoryS.cpp FactoryS.h FactoryS.inl: Factory-stamp
-
-Factory-stamp: $(srcdir)/Factory.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Factory.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Factory.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Factory_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  FactoryC.cpp \
-  FactoryC_impl.cpp \
-  client.cpp \
-  FactoryC_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Factory_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  FactoryC.cpp \
-  FactoryC_impl.cpp \
-  FactoryS.cpp \
-  FactoryS_impl.cpp \
-  server.cpp \
-  FactoryC_impl.h \
-  FactoryS_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/OBV/Factory/client.cpp b/tests/OBV/Factory/client.cpp
index b8e19d18d56..902fb5dd29d 100644
--- a/tests/OBV/Factory/client.cpp
+++ b/tests/OBV/Factory/client.cpp
@@ -4,8 +4,6 @@
 #include "FactoryC_impl.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Factory, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OBV/Factory/server.cpp b/tests/OBV/Factory/server.cpp
index 0cae1904804..528d1516f73 100644
--- a/tests/OBV/Factory/server.cpp
+++ b/tests/OBV/Factory/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Factory, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OBV/Forward/Makefile.am b/tests/OBV/Forward/Makefile.am
deleted file mode 100644
index 49e12b6b43f..00000000000
--- a/tests/OBV/Forward/Makefile.am
+++ /dev/null
@@ -1,168 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.OBV_Forward_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  TreeBaseC.cpp \
-  TreeBaseC.h \
-  TreeBaseC.inl \
-  TreeBaseS.cpp \
-  TreeBaseS.h \
-  TreeBaseS.inl
-
-CLEANFILES += \
-  TreeBase-stamp \
-  TreeBaseC.cpp \
-  TreeBaseC.h \
-  TreeBaseC.inl \
-  TreeBaseS.cpp \
-  TreeBaseS.h \
-  TreeBaseS.inl
-
-TreeBaseC.cpp TreeBaseC.h TreeBaseC.inl TreeBaseS.cpp TreeBaseS.h TreeBaseS.inl: TreeBase-stamp
-
-TreeBase-stamp: $(srcdir)/TreeBase.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeBase.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TreeControllerC.cpp \
-  TreeControllerC.h \
-  TreeControllerC.inl \
-  TreeControllerS.cpp \
-  TreeControllerS.h \
-  TreeControllerS.inl
-
-CLEANFILES += \
-  TreeController-stamp \
-  TreeControllerC.cpp \
-  TreeControllerC.h \
-  TreeControllerC.inl \
-  TreeControllerS.cpp \
-  TreeControllerS.h \
-  TreeControllerS.inl
-
-TreeControllerC.cpp TreeControllerC.h TreeControllerC.inl TreeControllerS.cpp TreeControllerS.h TreeControllerS.inl: TreeController-stamp
-
-TreeController-stamp: $(srcdir)/TreeController.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeController.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TreeNodeC.cpp \
-  TreeNodeC.h \
-  TreeNodeC.inl \
-  TreeNodeS.cpp \
-  TreeNodeS.h \
-  TreeNodeS.inl
-
-CLEANFILES += \
-  TreeNode-stamp \
-  TreeNodeC.cpp \
-  TreeNodeC.h \
-  TreeNodeC.inl \
-  TreeNodeS.cpp \
-  TreeNodeS.h \
-  TreeNodeS.inl
-
-TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.cpp TreeNodeS.h TreeNodeS.inl: TreeNode-stamp
-
-TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl
-	@touch $@
-
-noinst_HEADERS = \
-  TreeBase.idl \
-  TreeController.idl \
-  TreeNode.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Forward_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TreeBaseC.cpp \
-  TreeControllerC.cpp \
-  TreeNodeC.cpp \
-  client.cpp \
-  Test_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Forward_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Test_impl.cpp \
-  TreeBaseC.cpp \
-  TreeBaseS.cpp \
-  TreeControllerC.cpp \
-  TreeControllerS.cpp \
-  TreeNodeC.cpp \
-  TreeNodeS.cpp \
-  server.cpp \
-  Test_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/OBV/Forward/Test_impl.cpp b/tests/OBV/Forward/Test_impl.cpp
index c3a7d239330..78d97b39cf7 100644
--- a/tests/OBV/Forward/Test_impl.cpp
+++ b/tests/OBV/Forward/Test_impl.cpp
@@ -3,8 +3,6 @@
 #include "Test_impl.h"
 #include "TreeBaseC.h"
 
-ACE_RCSID(Forward, Test_impl, "$Id$")
-
 Test_impl::Test_impl (CORBA::ORB_ptr orb)
     : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/OBV/Forward/Test_impl.h b/tests/OBV/Forward/Test_impl.h
index 9092f1576e4..99d7d47f66d 100644
--- a/tests/OBV/Forward/Test_impl.h
+++ b/tests/OBV/Forward/Test_impl.h
@@ -1,35 +1,33 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/OBV/Forward
-//
-// = FILENAME
-//   Test_impl.h
-//
-// = AUTHOR
-//   Boris Kolpackov <bosk@ipmce.ru>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Test_impl.h
+ *
+ *  $Id$
+ *
+ *  @author Boris Kolpackov <bosk@ipmce.ru>
+ */
+//=============================================================================
+
 
 #ifndef TAO_TEST_IMPL_H
 #define TAO_TEST_IMPL_H
 
 #include "TreeControllerS.h"
 
+/**
+ * @class Test_impl
+ *
+ * @brief Implementation of Test interface
+ *
+ * This interface is provided to produce valuetypes and test
+ * marshaling
+ */
 class Test_impl : public POA_Test
 {
-  // = TITLE
-  //   Implementation of Test interface
-  //
-  // = DESCRIPTION
-  //   This interface is provided to produce valuetypes and test
-  //   marshaling
-  //
 public:
+  /// ctor
   Test_impl (CORBA::ORB_ptr orb);
-  // ctor
 
   virtual TreeController * reflect (
       TreeController * tc);
@@ -37,8 +35,8 @@ public:
   virtual void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #endif /* TAO_TEST_IMPL_H */
diff --git a/tests/OBV/Forward/TreeBase.idl b/tests/OBV/Forward/TreeBase.idl
index 662c919aea5..b350133f8ea 100644
--- a/tests/OBV/Forward/TreeBase.idl
+++ b/tests/OBV/Forward/TreeBase.idl
@@ -6,8 +6,8 @@ valuetype BaseNode;
 //@@ Dosn't work for now
 //typedef sequence<BaseNode> BaseNodeSeq;
 
-// Performance test: One may try to pass 
-// over the wire a cyclic graph and measure 
+// Performance test: One may try to pass
+// over the wire a cyclic graph and measure
 // how quickly TAO evaporates memory ;-)
 
 valuetype BaseNode
diff --git a/tests/OBV/Forward/TreeController.idl b/tests/OBV/Forward/TreeController.idl
index 4a9705db918..11665da53fe 100644
--- a/tests/OBV/Forward/TreeController.idl
+++ b/tests/OBV/Forward/TreeController.idl
@@ -2,8 +2,8 @@
 
 valuetype BaseNode;
 
-// This TreeController is probably a silly idea. 
-// All I want from it is a valutype forward declared 
+// This TreeController is probably a silly idea.
+// All I want from it is a valutype forward declared
 // in one file and fully defined in another.
 
 valuetype TreeController
@@ -15,7 +15,7 @@ interface Test
 {
   // Returnes the reflected copy of its argument.
   TreeController reflect (in TreeController tc);
-  
+
   // Shutdown the romote ORB
   oneway void shutdown ();
 };
diff --git a/tests/OBV/Forward/TreeNode.idl b/tests/OBV/Forward/TreeNode.idl
index 06010fd7b18..f37c1639395 100644
--- a/tests/OBV/Forward/TreeNode.idl
+++ b/tests/OBV/Forward/TreeNode.idl
@@ -5,7 +5,7 @@
 //
 // A concrete node type
 //
-valuetype StringNode : BaseNode 
+valuetype StringNode : BaseNode
 {
   public string name;
 };
diff --git a/tests/OBV/Forward/client.cpp b/tests/OBV/Forward/client.cpp
index dabff3e82c4..9055a264a94 100644
--- a/tests/OBV/Forward/client.cpp
+++ b/tests/OBV/Forward/client.cpp
@@ -1,14 +1,11 @@
 // $Id$
 
-
 #include "TreeBaseC.h"
 #include "TreeControllerC.h"
 #include "TreeNodeC.h"
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Forward, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -33,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OBV/Forward/server.cpp b/tests/OBV/Forward/server.cpp
index 178555e3dd2..9ed20a28341 100644
--- a/tests/OBV/Forward/server.cpp
+++ b/tests/OBV/Forward/server.cpp
@@ -8,8 +8,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Forward, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -34,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OBV/Indirection/MessengerClient.cpp b/tests/OBV/Indirection/MessengerClient.cpp
index 68112813009..2269964b8b4 100644
--- a/tests/OBV/Indirection/MessengerClient.cpp
+++ b/tests/OBV/Indirection/MessengerClient.cpp
@@ -37,11 +37,11 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
     bb->b1 (p1);
     bb->b2 (p1);
 
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing two boxed values in one valuetype: %s\n", 
+    ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing two boxed values in one valuetype: %s\n",
       tst->receive_boxedvalue (b)));
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing one boxed values twice in one valuetype: %s\n", 
+    ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing one boxed values twice in one valuetype: %s\n",
       tst->receive_boxedvalue (bb)));
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing two integers: %s\n", 
+    ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing two integers: %s\n",
       tst->receive_long (p1, p2)));
     ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing one integer twice: %s\n",
       tst->receive_long (p1, p1)));
diff --git a/tests/OBV/Indirection/MessengerServer.cpp b/tests/OBV/Indirection/MessengerServer.cpp
index 3bbb89b1966..f6797e1a980 100644
--- a/tests/OBV/Indirection/MessengerServer.cpp
+++ b/tests/OBV/Indirection/MessengerServer.cpp
@@ -15,36 +15,44 @@ void write_ior(const char* ior) {
   out << ior;
 }
 
-int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
+int ACE_TMAIN (int ac, ACE_TCHAR* av[])
+{
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init(ac, av);
 
-  CORBA::ORB_var orb = CORBA::ORB_init(ac, av);
+      NodeFactory::register_new_factory(* orb.in());
+      BoxedValueFactory::register_new_factory(* orb.in());
+      BaseValueFactory::register_new_factory(* orb.in());
+      TValueFactory::register_new_factory(* orb.in());
+      ConfigValueFactory::register_new_factory(* orb.in());
 
-  NodeFactory::register_new_factory(* orb.in());
-  BoxedValueFactory::register_new_factory(* orb.in());
-  BaseValueFactory::register_new_factory(* orb.in());
-  TValueFactory::register_new_factory(* orb.in());
-  ConfigValueFactory::register_new_factory(* orb.in());
+      CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
+      PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in());
 
-  CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
-  PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in());
+      PortableServer::POAManager_var poaman = poa->the_POAManager();
 
-  PortableServer::POAManager_var poaman = poa->the_POAManager();
+      PortableServer::Servant_var<Messenger_i> svt = new Messenger_i;
 
-  PortableServer::Servant_var<Messenger_i> svt = new Messenger_i;
+      PortableServer::ObjectId_var id = poa->activate_object(svt.in());
+      obj = poa->id_to_reference(id.in());
+      CORBA::String_var ior = orb->object_to_string(obj.in());
+      write_ior(ior.in());
 
-  PortableServer::ObjectId_var id = poa->activate_object(svt.in());
-  obj = poa->id_to_reference(id.in());
-  CORBA::String_var ior = orb->object_to_string(obj.in());
-  write_ior(ior.in());
+      std::cout << "Starting server." << std::endl;
 
-  std::cout << "Starting server." << std::endl;
+      poaman->activate();
 
-  poaman->activate();
+      orb->run();
 
-  orb->run();
-
-  poa->destroy(true, true);
-  orb->destroy();
+      poa->destroy(true, true);
+      orb->destroy();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
 
   return 0;
 }
diff --git a/tests/OBV/Indirection/Messenger_i.cpp b/tests/OBV/Indirection/Messenger_i.cpp
index eccd01852bd..bd845b32e07 100644
--- a/tests/OBV/Indirection/Messenger_i.cpp
+++ b/tests/OBV/Indirection/Messenger_i.cpp
@@ -19,9 +19,9 @@ char * Messenger_i::receive_boxedvalue (::demo::value::idl::boxedValue * b)
   std::ostringstream os;
   if (b == 0)
     os << "null boxed values";
-  else 
+  else
     os << "boxed values: " << b->b1 ()->_value() << ", " << b->b2 ()->_value();
-    
+
   return CORBA::string_dup (os.str().c_str());
 }
 
@@ -36,7 +36,7 @@ char * Messenger_i::receive_long (
     os << "shared long: " << p1->_value ();
   else
     os << "two longs: " << p1->_value () << ", " << p2->_value ();
-    
+
   return CORBA::string_dup (os.str().c_str());
 }
 
@@ -71,7 +71,7 @@ char * Messenger_i::receive_list (::demo::value::idl::Node * node)
       if (l[i] == x)
         break;
     }
-    
+
     if (l[i] == x)
       break;
 
@@ -92,18 +92,18 @@ char * Messenger_i::receive_list (::demo::value::idl::Node * node)
   return CORBA::string_dup (os.str().c_str());
 }
 
-char * 
+char *
 Messenger_i::receive_truncatable (::demo::value::idl::TValue *& v)
 {
-  v->data (v->data () + 1); 
-  v->basic_data (v->basic_data () + 1); 
+  v->data (v->data () + 1);
+  v->basic_data (v->basic_data () + 1);
 
   std::ostringstream os;
   os << "truncatable basic_data " << v->basic_data () << " data " << v->data ();
   return CORBA::string_dup (os.str().c_str());
 }
 
-char *  
+char *
 Messenger_i::receive_sequence (const ::demo::value::idl::ConfigValues & v)
 {
   std::ostringstream os;
diff --git a/tests/OBV/Indirection/Messenger_i.h b/tests/OBV/Indirection/Messenger_i.h
index 34cbeb3ff95..dc8f061cb07 100644
--- a/tests/OBV/Indirection/Messenger_i.h
+++ b/tests/OBV/Indirection/Messenger_i.h
@@ -11,7 +11,7 @@ class Messenger_i : public virtual POA_demo::value::idl::ValueServer
 {
 public:
   Messenger_i();
-  
+
   virtual char * receive_boxedvalue (
     ::demo::value::idl::boxedValue * b);
 
diff --git a/tests/OBV/Indirection/run_test.pl b/tests/OBV/Indirection/run_test.pl
index 0808ee9c8d4..8c4a7e550b4 100755
--- a/tests/OBV/Indirection/run_test.pl
+++ b/tests/OBV/Indirection/run_test.pl
@@ -22,24 +22,24 @@ $S->Spawn();
 
 if ($server->WaitForFileTimed ($iorfile, $server->ProcessStartWaitInterval()) == -1) {
     print STDERR "ERROR: cannot find file <$server_iorfile>\n";
-    $S->Kill(); 
+    $S->Kill();
     exit 1;
 }
 
-$C = $client->CreateProcess("MessengerClient");  
+$C = $client->CreateProcess("MessengerClient");
 $C->Spawn();
 
 $CRET = $C->WaitKill($client->ProcessStartWaitInterval());
 $S->Kill();
 
-# clean-up 
+# clean-up
 
 $server->DeleteFile($iorfile);
 
 if ($CRET != 0) {
     print STDERR "ERROR: Client returned <$CRET>\n";
     exit 1 ;
-}  
+}
 
 exit 0;
 
diff --git a/tests/OBV/Makefile.am b/tests/OBV/Makefile.am
deleted file mode 100644
index 4e18d90f362..00000000000
--- a/tests/OBV/Makefile.am
+++ /dev/null
@@ -1,20 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Any \
-        Collocated \
-        Factory \
-        Forward \
-        Simple \
-        TC_Alignment \
-        Truncatable \
-        ValueBox
-
diff --git a/tests/OBV/Simple/Client_i.cpp b/tests/OBV/Simple/Client_i.cpp
index cc43b60108c..e83a9203b6a 100644
--- a/tests/OBV/Simple/Client_i.cpp
+++ b/tests/OBV/Simple/Client_i.cpp
@@ -3,8 +3,6 @@
 #include "Client_i.h"
 #include "OBV_impl.h"
 
-#include "tao/ORB_Core.h"
-
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_sys_time.h"
 
diff --git a/tests/OBV/Simple/Client_i.h b/tests/OBV/Simple/Client_i.h
index 7406b10edcb..296bf588550 100644
--- a/tests/OBV/Simple/Client_i.h
+++ b/tests/OBV/Simple/Client_i.h
@@ -1,26 +1,20 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/OBV/Typed_Events
-//
-// = FILENAME
-//    Client_i.h
-//
-// = DESCRIPTION
-//    This class is a template for a CORBA client.
-//    run () sends some valuetypes to a server and
-//    gets back a list of valuetypes.
-//
-// = AUTHOR
-//
-//   Torsten Kuepper
-//   based on the echo example
-//   from code from Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Client_i.h
+ *
+ *  $Id$
+ *
+ *  This class is a template for a CORBA client.
+ *  run () sends some valuetypes to a server and
+ *  gets back a list of valuetypes.
+ *
+ *
+ *  @author Torsten Kuepperbased on the echo examplefrom code from Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ECHO_CLIENT_I_H
 #define ECHO_CLIENT_I_H
@@ -28,28 +22,30 @@
 #include "OBVC.h"
 #include "Simple_util.h"
 
+/**
+ * @class Checkpoint_Client_i
+ *
+ * @brief Checkpoint_Client interface subclass.
+ *
+ * This class implements the interface between the interface
+ * objects and the client .
+ */
 class Checkpoint_Client_i
 {
-  // = TITLE
-  //   Checkpoint_Client interface subclass.
-  //
-  // = DESCRIPTION
-  //   This class implements the interface between the interface
-  //   objects and the client .
 public:
   // = Initialization and termination methods.
+  /// Constructor
   Checkpoint_Client_i (void);
-  // Constructor
 
+  /// Destructor
   virtual  ~Checkpoint_Client_i (void);
-  // Destructor
 
+  /// Execute the methods
   virtual int run (const char *,int, ACE_TCHAR** );
-  // Execute the methods
 
 private:
+  /// Instantiate the checkpoint object.
   Client<Checkpoint, Checkpoint_var> checkpoint;
-  // Instantiate the checkpoint object.
 };
 
 
diff --git a/tests/OBV/Simple/Makefile.am b/tests/OBV/Simple/Makefile.am
deleted file mode 100644
index 95707be9505..00000000000
--- a/tests/OBV/Simple/Makefile.am
+++ /dev/null
@@ -1,121 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.OBV_Simple_IDL.am
-
-BUILT_SOURCES = \
-  OBVC.cpp \
-  OBVC.h \
-  OBVC.inl \
-  OBVS.cpp \
-  OBVS.h \
-  OBVS.inl
-
-CLEANFILES = \
-  OBV-stamp \
-  OBVC.cpp \
-  OBVC.h \
-  OBVC.inl \
-  OBVS.cpp \
-  OBVS.h \
-  OBVS.inl
-
-OBVC.cpp OBVC.h OBVC.inl OBVS.cpp OBVS.h OBVS.inl: OBV-stamp
-
-OBV-stamp: $(srcdir)/OBV.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa $(srcdir)/OBV.idl
-	@touch $@
-
-noinst_HEADERS = \
-  OBV.idl
-
-## Makefile.OBV_Simple_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_i.cpp \
-  OBVC.cpp \
-  OBVS.cpp \
-  OBV_impl.cpp \
-  client.cpp \
-  Client_i.h \
-  OBV_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Simple_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  OBVC.cpp \
-  OBVS.cpp \
-  OBV_impl.cpp \
-  Server_i.cpp \
-  server.cpp \
-  OBV_impl.h \
-  Server_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/OBV/Simple/Server_i.h b/tests/OBV/Simple/Server_i.h
index 0d249a51b72..ae0b534a54b 100644
--- a/tests/OBV/Simple/Server_i.h
+++ b/tests/OBV/Simple/Server_i.h
@@ -1,23 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/OBV/Typed_Events
-//
-// = FILENAME
-//    Server_i.h
-//
-// = DESCRIPTION
-//    This class implements the Event_Types IDL interface.
-//
-// = AUTHOR
-//    Torsten Kuepper
-//    derived from the Echo example TAO/example/Simple/echo
-//    of Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Server_i.h
+ *
+ *  $Id$
+ *
+ *  This class implements the Event_Types IDL interface.
+ *
+ *
+ *  @author Torsten Kuepper derived from the Echo example TAO/example/Simple/echo of Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef ECHO_I_H
 #define ECHO_I_H
@@ -29,11 +24,11 @@ class Checkpoint_i : public POA_Checkpoint
 {
 public:
   // = Initialization and termination methods.
+  /// Constructor.
   Checkpoint_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~Checkpoint_i (void);
-  // Destructor.
 
   virtual void put_event (
         Event * e
@@ -42,12 +37,12 @@ public:
   virtual void shutdown (
     );
 
+  /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
 
 private:
+  /// ORB pointer.
   CORBA::ORB_var orb_;
-  // ORB pointer.
 };
 
 #endif /* ECHO_I_H */
diff --git a/tests/OBV/Simple/Simple_util.h b/tests/OBV/Simple/Simple_util.h
index a8c70b1d52f..55da5de3889 100644
--- a/tests/OBV/Simple/Simple_util.h
+++ b/tests/OBV/Simple/Simple_util.h
@@ -1,24 +1,15 @@
-//$Id$
-
-// This version of Simple_Util doesn't need to link against orbsvcs
-// On the other hand it has no naming service.
-
-// ============================================================================
-//
-// = LIBRARY
-//
-//    taken from TAO/tests/Simple
-//
-// = FILENAME
-//    Simple_Util.h
-//
-// = DESCRIPTION
-//    The classe define the templates for the client and server.
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Simple_util.h
+ *
+ *  $Id$
+ *
+ *  The classe define the templates for the client and server.
+ *
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
 
 #ifndef TAO_UTIL_H
 #define TAO_UTIL_H
@@ -28,134 +19,138 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
+/**
+ * @class Server
+ *
+ * @brief A set of useful class Templates for using the TAO CORBA
+ * implementation.
+ *
+ * A template server definition. This template can be used by
+ * single server/client projects for defintion of their
+ * server/clients.  See the directories time, bank, echo for
+ * further details of implemenatation.
+ */
 template <class Servant>
 class Server
 {
-  // = TITLE
-  //   A set of useful class Templates for using the TAO CORBA
-  //   implementation.
-  //
-  // = DESCRIPTION
-  //   A template server definition. This template can be used by
-  //   single server/client projects for defintion of their
-  //   server/clients.  See the directories time, bank, echo for
-  //   further details of implemenatation.
 public:
   // = Initialization and termination methods.
 
+  /// Constructor.
   Server (void);
-  // Constructor.
 
+  /// Destructor.
   ~Server (void);
-  // Destructor.
 
+  /// Initialize the Server state - parsing arguments and waiting.
+  /// interface_name is the name used to register the Servant.
   int init (const char *servant_name,
             int argc,
             ACE_TCHAR *argv[]);
-  // Initialize the Server state - parsing arguments and waiting.
-  // interface_name is the name used to register the Servant.
 
+  /// After calling <init>, this method will register the server with
+  /// the TAO Naming Service using the servant_name passed to <init>.
   int register_name (void);
-  // After calling <init>, this method will register the server with
-  // the TAO Naming Service using the servant_name passed to <init>.
 
+  /// Run the orb.
   int run (void);
-  // Run the orb.
 
 protected:
+  /// Servant class
   Servant servant_;
-  // Servant class
 
+  /// name of the servant to be used for TAO Naming Service
   const char *name;
-  // name of the servant to be used for TAO Naming Service
 
+  /// Parses the commandline arguments.
   int parse_args (void);
-  // Parses the commandline arguments.
 
+  /// The ORB manager - a helper class for accessing the POA and
+  /// registering objects.
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager - a helper class for accessing the POA and
-  // registering objects.
 
   // TAO_Naming_Server namingServer;
   // helper class for getting access to Naming Service.
 
+  /// File where the IOR of the server object is stored.
   FILE *ior_output_file_;
-  // File where the IOR of the server object is stored.
 
+  /// Number of command line arguments.
   int argc_;
-  // Number of command line arguments.
 
+  /// The command line arguments.
   ACE_TCHAR **argv_;
-  // The command line arguments.
 };
 
+/**
+ * @class Client
+ *
+ * @brief Template Client class
+ *
+ * A template client implementation for a single server/client
+ * model. The example usage of these usage can be found in the
+ * sub-directories below
+ */
 template <class InterfaceObj, class Var>
 class Client
 {
-  // = TITLE
-  //   Template Client class
-  //
-  // = DESCRIPTION
-  //   A template client implementation for a single server/client
-  //   model. The example usage of these usage can be found in the
-  //   sub-directories below
 public:
 
   // = Initialization and termination methods.
+  /// Constructor.
   Client (void);
-  // Constructor.
 
+  /// Destructor.
   ~Client (void);
-  // Destructor.
 
+  /// Initialize the client communication endpoint with server.
   int init (const char *name,int argc, ACE_TCHAR *argv[]);
-  // Initialize the client communication endpoint with server.
 
+  /// Return the interface object pointer.
   InterfaceObj *operator-> () { return server_.in ();};
-  // Return the interface object pointer.
 
+  /// Returns the shutdown flag.
   int shutdown (void );
-  // Returns the shutdown flag.
 
+  /// Fills in the shutdwon flag.
   void shutdown (int);
-  // Fills in the shutdwon flag.
 
+  /// Initialize naming service
   int obtain_initial_references (void);
-  // Initialize naming service
 
 protected:
+  /// Function to read the server IOR from a file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the server IOR from a file.
 
+  /// Parses the arguments passed on the command line.
   int parse_args (void);
-  // Parses the arguments passed on the command line.
 
 //  TAO_Naming_Client namingClient;
   // helper class for getting access to Naming Service.
 
+  /// # of arguments on the command line.
   int argc_;
-  // # of arguments on the command line.
 
+  /// arguments from command line.
   ACE_TCHAR **argv_;
-  // arguments from command line.
 
+  /// IOR of the obj ref of the server.
   ACE_TCHAR *ior_;
-  // IOR of the obj ref of the server.
 
+  /// Name to be usred for the naming service
   char *name_;
-  // Name to be usred for the naming service
 
+  /// Remember our orb.
   CORBA::ORB_var orb_;
-  // Remember our orb.
 
+  /// Server object
   Var server_;
-  // Server object
 
+  /// Flag to use the naming service
   int naming_;
-  // Flag to use the naming service
 
+  /// Flag for shutting down the server
   int shutdown_;
-  // Flag for shutting down the server
 
 };
 
diff --git a/tests/OBV/Supports/Supports_Test.idl b/tests/OBV/Supports/Supports_Test.idl
index e86e3956839..9b60a941d7a 100644
--- a/tests/OBV/Supports/Supports_Test.idl
+++ b/tests/OBV/Supports/Supports_Test.idl
@@ -65,7 +65,7 @@ module Supports_Test
     long size ();
     void add_node (in string name);
     void print ();
-    
+
   };
 
   valuetype vt_graph supports graph
diff --git a/tests/OBV/Supports/client.cpp b/tests/OBV/Supports/client.cpp
index 2e77f6911e2..669d551153b 100644
--- a/tests/OBV/Supports/client.cpp
+++ b/tests/OBV/Supports/client.cpp
@@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OBV/Supports/server.cpp b/tests/OBV/Supports/server.cpp
index ae5bfe517f7..45870a85cab 100644
--- a/tests/OBV/Supports/server.cpp
+++ b/tests/OBV/Supports/server.cpp
@@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OBV/TC_Alignment/Makefile.am b/tests/OBV/TC_Alignment/Makefile.am
deleted file mode 100644
index 4b3f77b6592..00000000000
--- a/tests/OBV/TC_Alignment/Makefile.am
+++ /dev/null
@@ -1,112 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.OBV_TC_Alignment_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_TC_Alignment_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_TC_Alignment_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/OBV/TC_Alignment/client.cpp b/tests/OBV/TC_Alignment/client.cpp
index f88a5eb5392..5059c5a740c 100644
--- a/tests/OBV/TC_Alignment/client.cpp
+++ b/tests/OBV/TC_Alignment/client.cpp
@@ -3,10 +3,6 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (TC_Alignment,
-           client,
-           "$Id$")
-
 static const ACE_TCHAR *ior_input_file = ACE_TEXT("file://test.ior");
 
 static obvmod::tcOffset1 *vt1 = 0;
@@ -143,7 +139,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OBV/TC_Alignment/server.cpp b/tests/OBV/TC_Alignment/server.cpp
index eaf77808813..7a7b83fb205 100644
--- a/tests/OBV/TC_Alignment/server.cpp
+++ b/tests/OBV/TC_Alignment/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (TC_Alignment,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OBV/TC_Alignment/test.idl b/tests/OBV/TC_Alignment/test.idl
index a48a747f219..e21abcf1f46 100644
--- a/tests/OBV/TC_Alignment/test.idl
+++ b/tests/OBV/TC_Alignment/test.idl
@@ -1,20 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/OBV/TC_Alignment
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//    IDL description of the TypeCode alignment Test interface for valuetypes
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    test.idl
+ *
+ *  $Id$
+ *
+ *  IDL description of the TypeCode alignment Test interface for valuetypes
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 module obvmod
 {
diff --git a/tests/OBV/TC_Alignment/test_i.cpp b/tests/OBV/TC_Alignment/test_i.cpp
index 734c078f6c8..71ca17435a1 100644
--- a/tests/OBV/TC_Alignment/test_i.cpp
+++ b/tests/OBV/TC_Alignment/test_i.cpp
@@ -2,10 +2,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID (TC_Alignment,
-           test_i,
-           "$Id$")
-
 test_i::test_i (CORBA::ORB_ptr orb)
   : orb_ (orb)
 {
diff --git a/tests/OBV/TC_Alignment/test_i.h b/tests/OBV/TC_Alignment/test_i.h
index b51b8e7e1ab..c4a7c8086cc 100644
--- a/tests/OBV/TC_Alignment/test_i.h
+++ b/tests/OBV/TC_Alignment/test_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/OBV/TC_Alignment
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_OBV_TC_ALIGNMENT_TEST_I_H
 #define TAO_OBV_TC_ALIGNMENT_TEST_I_H
diff --git a/tests/OBV/Truncatable/Makefile.am b/tests/OBV/Truncatable/Makefile.am
deleted file mode 100644
index 07a4b563f98..00000000000
--- a/tests/OBV/Truncatable/Makefile.am
+++ /dev/null
@@ -1,141 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.OBV_Truncatable_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  ExtraC.cpp \
-  ExtraC.h \
-  ExtraC.inl \
-  ExtraS.cpp \
-  ExtraS.h \
-  ExtraS.inl
-
-CLEANFILES += \
-  Extra-stamp \
-  ExtraC.cpp \
-  ExtraC.h \
-  ExtraC.inl \
-  ExtraS.cpp \
-  ExtraS.h \
-  ExtraS.inl
-
-ExtraC.cpp ExtraC.h ExtraC.inl ExtraS.cpp ExtraS.h ExtraS.inl: Extra-stamp
-
-Extra-stamp: $(srcdir)/Extra.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Extra.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TruncatableC.cpp \
-  TruncatableC.h \
-  TruncatableC.inl \
-  TruncatableS.cpp \
-  TruncatableS.h \
-  TruncatableS.inl
-
-CLEANFILES += \
-  Truncatable-stamp \
-  TruncatableC.cpp \
-  TruncatableC.h \
-  TruncatableC.inl \
-  TruncatableS.cpp \
-  TruncatableS.h \
-  TruncatableS.inl
-
-TruncatableC.cpp TruncatableC.h TruncatableC.inl TruncatableS.cpp TruncatableS.h TruncatableS.inl: Truncatable-stamp
-
-Truncatable-stamp: $(srcdir)/Truncatable.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Truncatable.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Extra.idl \
-  Truncatable.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Truncatable_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ExtraC.cpp \
-  TruncatableC.cpp \
-  client.cpp \
-  TruncatableS_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OBV_Truncatable_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ExtraC.cpp \
-  ExtraS.cpp \
-  TruncatableC.cpp \
-  TruncatableS.cpp \
-  TruncatableS_impl.cpp \
-  server.cpp \
-  TruncatableS_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/OBV/Truncatable/TruncatableS_impl.cpp b/tests/OBV/Truncatable/TruncatableS_impl.cpp
index cebb9267320..cf704486e3c 100644
--- a/tests/OBV/Truncatable/TruncatableS_impl.cpp
+++ b/tests/OBV/Truncatable/TruncatableS_impl.cpp
@@ -3,8 +3,6 @@
 #include "TruncatableS_impl.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Truncatable, TruncatableS_impl, "$Id$")
-
 Test_impl::Test_impl (CORBA::ORB_ptr orb)
     : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/OBV/Truncatable/TruncatableS_impl.h b/tests/OBV/Truncatable/TruncatableS_impl.h
index 4c8c6d46218..456b546e83e 100644
--- a/tests/OBV/Truncatable/TruncatableS_impl.h
+++ b/tests/OBV/Truncatable/TruncatableS_impl.h
@@ -1,35 +1,33 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/OBV/Truncatable
-//
-// = FILENAME
-//   TruncatableS_impl.h
-//
-// = AUTHOR
-//   Boris Kolpackov <bosk@ipmce.ru>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   TruncatableS_impl.h
+ *
+ *  $Id$
+ *
+ *  @author Boris Kolpackov <bosk@ipmce.ru>
+ */
+//=============================================================================
+
 
 #ifndef TAO_TRUNCATABLE_S_IMPL_H
 #define TAO_TRUNCATABLE_S_IMPL_H
 
 #include "TruncatableS.h"
 
+/**
+ * @class Test_impl
+ *
+ * @brief Implementation of Test interface
+ *
+ * This interface is provided to produce valuetypes and test
+ * marshaling
+ */
 class Test_impl : public POA_OBV_TruncatableTest::Test
 {
-  // = TITLE
-  //   Implementation of Test interface
-  //
-  // = DESCRIPTION
-  //   This interface is provided to produce valuetypes and test
-  //   marshaling
-  //
 public:
+  /// ctor
   Test_impl (CORBA::ORB_ptr orb);
-  // ctor
 
   virtual void op1 (
         const char * id,
@@ -71,8 +69,8 @@ public:
   virtual void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #endif /* TAO_TRUNCATABLE_S_IMPL_H */
diff --git a/tests/OBV/Truncatable/client.cpp b/tests/OBV/Truncatable/client.cpp
index 2bc631f9667..4527a992e32 100644
--- a/tests/OBV/Truncatable/client.cpp
+++ b/tests/OBV/Truncatable/client.cpp
@@ -4,9 +4,7 @@
 #include "ExtraC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Truncatable, client, "$Id$")
-
-  const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
+const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int fail = 0;
 int pretest = 0;
@@ -50,7 +48,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OBV/Truncatable/server.cpp b/tests/OBV/Truncatable/server.cpp
index 4e45ad361ec..fdad2ebdcf2 100644
--- a/tests/OBV/Truncatable/server.cpp
+++ b/tests/OBV/Truncatable/server.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Truncatable, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -31,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OBV/ValueBox/Makefile.am b/tests/OBV/ValueBox/Makefile.am
deleted file mode 100644
index 42a3f415f4c..00000000000
--- a/tests/OBV/ValueBox/Makefile.am
+++ /dev/null
@@ -1,195 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.valuebox_idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES += \
-  vb_basicC.cpp \
-  vb_basicC.h \
-  vb_basicC.inl \
-  vb_basicS.cpp \
-  vb_basicS.h \
-  vb_basicS.inl
-
-CLEANFILES += \
-  vb_basic-stamp \
-  vb_basicC.cpp \
-  vb_basicC.h \
-  vb_basicC.inl \
-  vb_basicS.cpp \
-  vb_basicS.h \
-  vb_basicS.inl
-
-vb_basicC.cpp vb_basicC.h vb_basicC.inl vb_basicS.cpp vb_basicS.h vb_basicS.inl: vb_basic-stamp
-
-vb_basic-stamp: $(srcdir)/vb_basic.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_basic.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  vb_structC.cpp \
-  vb_structC.h \
-  vb_structC.inl \
-  vb_structS.cpp \
-  vb_structS.h \
-  vb_structS.inl
-
-CLEANFILES += \
-  vb_struct-stamp \
-  vb_structC.cpp \
-  vb_structC.h \
-  vb_structC.inl \
-  vb_structS.cpp \
-  vb_structS.h \
-  vb_structS.inl
-
-vb_structC.cpp vb_structC.h vb_structC.inl vb_structS.cpp vb_structS.h vb_structS.inl: vb_struct-stamp
-
-vb_struct-stamp: $(srcdir)/vb_struct.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_struct.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  vb_unionC.cpp \
-  vb_unionC.h \
-  vb_unionC.inl \
-  vb_unionS.cpp \
-  vb_unionS.h \
-  vb_unionS.inl
-
-CLEANFILES += \
-  vb_union-stamp \
-  vb_unionC.cpp \
-  vb_unionC.h \
-  vb_unionC.inl \
-  vb_unionS.cpp \
-  vb_unionS.h \
-  vb_unionS.inl
-
-vb_unionC.cpp vb_unionC.h vb_unionC.inl vb_unionS.cpp vb_unionS.h vb_unionS.inl: vb_union-stamp
-
-vb_union-stamp: $(srcdir)/vb_union.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_union.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  valueboxC.cpp \
-  valueboxC.h \
-  valueboxC.inl \
-  valueboxS.cpp \
-  valueboxS.h \
-  valueboxS.inl
-
-CLEANFILES += \
-  valuebox-stamp \
-  valueboxC.cpp \
-  valueboxC.h \
-  valueboxC.inl \
-  valueboxS.cpp \
-  valueboxS.h \
-  valueboxS.inl
-
-valueboxC.cpp valueboxC.h valueboxC.inl valueboxS.cpp valueboxS.h valueboxS.inl: valuebox-stamp
-
-valuebox-stamp: $(srcdir)/valuebox.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/valuebox.idl
-	@touch $@
-
-noinst_HEADERS = \
-  valuebox.idl \
-  vb_basic.idl \
-  vb_struct.idl \
-  vb_union.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Valuebox_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  valueboxC.cpp \
-  vb_basicC.cpp \
-  vb_structC.cpp \
-  vb_unionC.cpp \
-  Test_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Valuebox_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Test_impl.cpp \
-  server.cpp \
-  valueboxC.cpp \
-  valueboxS.cpp \
-  vb_basicC.cpp \
-  vb_basicS.cpp \
-  vb_structC.cpp \
-  vb_structS.cpp \
-  vb_unionC.cpp \
-  vb_unionS.cpp \
-  Test_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/OBV/ValueBox/Test_impl.cpp b/tests/OBV/ValueBox/Test_impl.cpp
index ec5b020d1c5..50e9c5b1d19 100644
--- a/tests/OBV/ValueBox/Test_impl.cpp
+++ b/tests/OBV/ValueBox/Test_impl.cpp
@@ -2,10 +2,6 @@
 
 #include "Test_impl.h"
 
-ACE_RCSID(Forward,
-          Test_impl,
-          "$Id$")
-
 Test_impl::Test_impl (CORBA::ORB_ptr orb)
     : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/OBV/ValueBox/Test_impl.h b/tests/OBV/ValueBox/Test_impl.h
index 179177176be..c5857dd9d47 100644
--- a/tests/OBV/ValueBox/Test_impl.h
+++ b/tests/OBV/ValueBox/Test_impl.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/OBV/ValueBox
-//
-// = FILENAME
-//   Test_impl.h
-//
-// = AUTHOR
-//   Gary Maxey
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Test_impl.h
+ *
+ *  $Id$
+ *
+ *  @author Gary Maxey
+ */
+//=============================================================================
+
 
 
 #ifndef TAO_TEST_IMPL_H
@@ -23,8 +20,8 @@
 class Test_impl : public POA_Test
 {
 public:
+  /// ctor
   Test_impl (CORBA::ORB_ptr orb);
-  // ctor
 
   virtual VBlong * basic_op1 (
                        VBlong * p1,
@@ -111,8 +108,8 @@ public:
   virtual void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #endif /* TAO_TEST_IMPL_H */
diff --git a/tests/OBV/ValueBox/client.cpp b/tests/OBV/ValueBox/client.cpp
index 5044f87e6ea..a88b462bdfa 100644
--- a/tests/OBV/ValueBox/client.cpp
+++ b/tests/OBV/ValueBox/client.cpp
@@ -3,11 +3,6 @@
 #include "valueboxC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(ValueBox,
-          client,
-          "$Id$")
-
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -32,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -65,29 +60,29 @@ int box_test1 (BoxT *valuebox, UT val1, UT val2)
     OBV_VERITY ( &valuebox_clone->_boxed_inout () != &valuebox->_boxed_inout () );
 
     // but values should be equal
-    OBV_VERITY ( valuebox_clone->_value () == valuebox->_value () );
+    OBV_VERITY (ACE::is_equal (valuebox_clone->_value (), valuebox->_value ()));
 
     // Check that modifier is working.
     valuebox_clone->_value ( val2 );
-    OBV_VERITY ( valuebox_clone->_value () != valuebox->_value () );
+    OBV_VERITY (!ACE::is_equal (valuebox_clone->_value (), valuebox->_value ()));
 
     // use operator=
     *valuebox = val2;
-    OBV_VERITY ( valuebox_clone->_value () == valuebox->_value () );
+    OBV_VERITY (ACE::is_equal (valuebox_clone->_value (), valuebox->_value ()));
 
     // Check that _value and _boxed_in are the same.
-    OBV_VERITY ( valuebox_clone->_value () == valuebox_clone->_boxed_in () );
-    OBV_VERITY ( valuebox->_value () == valuebox->_boxed_in () );
+    OBV_VERITY (ACE::is_equal (valuebox_clone->_value (), valuebox_clone->_boxed_in ()));
+    OBV_VERITY (ACE::is_equal (valuebox->_value (), valuebox->_boxed_in ()));
 
     // Used _boxed_inout to change the value
-    OBV_VERITY ( valuebox->_value () != val1 );
+    OBV_VERITY (!ACE::is_equal (valuebox->_value (), val1));
     valuebox->_boxed_inout () = val1;
-    OBV_VERITY ( valuebox->_value () == val1 );
+    OBV_VERITY (ACE::is_equal (valuebox->_value (), val1));
 
     // Use _boxed_out to access the value
-    OBV_VERITY ( valuebox_clone->_value () != val1 );
+    OBV_VERITY (!ACE::is_equal (valuebox_clone->_value (), val1));
     valuebox_clone->_boxed_out () = val1;
-    OBV_VERITY ( valuebox_clone->_value () == val1 );
+    OBV_VERITY (ACE::is_equal (valuebox_clone->_value (), val1));
 
     // Test _copy_value
     CORBA::ValueBase *copy = valuebox->_copy_value ();
@@ -105,10 +100,10 @@ int box_test1 (BoxT *valuebox, UT val1, UT val2)
       }
     else
       {
-        OBV_VERITY ( down->_value () == val1 );
+        OBV_VERITY (ACE::is_equal (down->_value (), val1));
         down->_value ( val2 );
-        OBV_VERITY ( down->_value () != valuebox->_value () );
-         OBV_VERITY ( down->_value () == val2 );
+        OBV_VERITY (!ACE::is_equal (down->_value (), valuebox->_value ()));
+        OBV_VERITY (ACE::is_equal (down->_value (), val2));
       }
 
     CORBA::remove_ref (copy);
diff --git a/tests/OBV/ValueBox/server.cpp b/tests/OBV/ValueBox/server.cpp
index 773833fa73e..37f27f1ccb3 100644
--- a/tests/OBV/ValueBox/server.cpp
+++ b/tests/OBV/ValueBox/server.cpp
@@ -5,10 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(ValueBox,
-          server,
-          "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OBV/ValueBox/valuebox.idl b/tests/OBV/ValueBox/valuebox.idl
index 6af684b75aa..235513c6c55 100644
--- a/tests/OBV/ValueBox/valuebox.idl
+++ b/tests/OBV/ValueBox/valuebox.idl
@@ -38,20 +38,20 @@ interface Test
                                  out vb_basic::M_VBlong  p3);
 
     long basic_op3 (in long p1, inout long p2, out long p3);
-    
+
     // Boxed string
     VBstring string_op1(in VBstring p1, inout VBstring p2, out VBstring  p3);
 
     string string_op2(in string p1, inout string p2, out string p3);
-    
+
     // Boxed sequence
     VBseqlong seq_op1(in VBseqlong p1, inout VBseqlong p2,
                          out VBseqlong  p3);
 
     void seq_op2(in TDseqlong p1, inout TDseqlong p2, out TDseqlong p3);
-    
+
     // Boxed struct
-    VBfixed_struct1 struct_op1(in VBfixed_struct1 p1, 
+    VBfixed_struct1 struct_op1(in VBfixed_struct1 p1,
                                inout VBfixed_struct1 p2,
                                out VBfixed_struct1  p3);
 
@@ -59,7 +59,7 @@ interface Test
                     inout Fixed_Struct1 p2,
                     out Fixed_Struct1 p3);
 
-    VBvariable_struct1 struct_op3(in VBvariable_struct1 p1, 
+    VBvariable_struct1 struct_op3(in VBvariable_struct1 p1,
                                   inout VBvariable_struct1 p2,
                                   out VBvariable_struct1  p3);
 
@@ -79,9 +79,9 @@ interface Test
 
     void array_op4 (in StringArray p1, inout StringArray p2,
                     out StringArray p3);
-    
+
     // Boxed union
-    VBfixed_union1 union_op1(in VBfixed_union1 p1, 
+    VBfixed_union1 union_op1(in VBfixed_union1 p1,
                                inout VBfixed_union1 p2,
                                out VBfixed_union1  p3);
 
@@ -89,14 +89,14 @@ interface Test
                     inout Fixed_Union1 p2,
                     out Fixed_Union1 p3);
 
-    VBvariable_union1 union_op3(in VBvariable_union1 p1, 
+    VBvariable_union1 union_op3(in VBvariable_union1 p1,
                                   inout VBvariable_union1 p2,
                                   out VBvariable_union1  p3);
 
     void union_op4(in Variable_Union1 p1,
                     inout Variable_Union1 p2,
                     out Variable_Union1 p3);
-  
+
     // Shutdown the remote ORB
     oneway void shutdown ();
 };
diff --git a/tests/OBV/ValueBox/vb_basic.idl b/tests/OBV/ValueBox/vb_basic.idl
index 3c4c5f09c54..14d1a9791f7 100644
--- a/tests/OBV/ValueBox/vb_basic.idl
+++ b/tests/OBV/ValueBox/vb_basic.idl
@@ -6,7 +6,7 @@
 
 // Valuebox of all basic types defined at outermost scope:
 
-enum Color { red, orange, yellow, green, blue, indigo, violet }; 
+enum Color { red, orange, yellow, green, blue, indigo, violet };
 
 valuetype VBshort      short;
 valuetype VBlong       long;
diff --git a/tests/ORB_Local_Config/Bug_1459/Makefile.am b/tests/ORB_Local_Config/Bug_1459/Makefile.am
deleted file mode 100644
index 07f2cdbbe15..00000000000
--- a/tests/ORB_Local_Config/Bug_1459/Makefile.am
+++ /dev/null
@@ -1,47 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1459.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/ORB_Local_Config/Bug_1459/Test.cpp b/tests/ORB_Local_Config/Bug_1459/Test.cpp
index 5dd5e5e5330..f67164da137 100644
--- a/tests/ORB_Local_Config/Bug_1459/Test.cpp
+++ b/tests/ORB_Local_Config/Bug_1459/Test.cpp
@@ -1,4 +1,4 @@
-
+// $Id$
 // @author Jeff Mirwaisi <jeff_mirwaisi@yahoo.com>
 // @author Iliyan Jeliazkov <iliyan2ociweb.com>
 
@@ -15,8 +15,6 @@
 #include "ace/Dynamic_Service.h"
 #include "Service_Configuration_Per_ORB.h"
 
-ACE_RCSID (tests, server, "$Id$")
-
 // Currently there is no way to test SSLIOP in this test due to a problem
 // described in bug 3418.
 //#define DO_1459_SSLIOP_TEST 1
diff --git a/tests/ORB_Local_Config/Bug_1459/a.conf b/tests/ORB_Local_Config/Bug_1459/a.conf
index 042a572964b..0e23b17e393 100644
--- a/tests/ORB_Local_Config/Bug_1459/a.conf
+++ b/tests/ORB_Local_Config/Bug_1459/a.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic UIOP_Factory Service_Object * TAO_Strategies:_make_TAO_UIOP_Protocol_Factory() ""
 dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBProtocolFactory UIOP_Factory"
diff --git a/tests/ORB_Local_Config/Bug_1459/b.conf b/tests/ORB_Local_Config/Bug_1459/b.conf
index 9452bc3f56a..2ed07d89bec 100644
--- a/tests/ORB_Local_Config/Bug_1459/b.conf
+++ b/tests/ORB_Local_Config/Bug_1459/b.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
 
diff --git a/tests/ORB_Local_Config/Bug_1459/d.conf b/tests/ORB_Local_Config/Bug_1459/d.conf
index 93678ab8146..a9376895eac 100644
--- a/tests/ORB_Local_Config/Bug_1459/d.conf
+++ b/tests/ORB_Local_Config/Bug_1459/d.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic DIOP_Factory Service_Object * TAO_Strategies:_make_TAO_DIOP_Protocol_Factory() ""
 dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory() "-ORBProtocolFactory DIOP_Factory"
diff --git a/tests/ORB_Local_Config/Bug_1459/m.conf b/tests/ORB_Local_Config/Bug_1459/m.conf
index e69de29bb2d..9406b2e4163 100644
--- a/tests/ORB_Local_Config/Bug_1459/m.conf
+++ b/tests/ORB_Local_Config/Bug_1459/m.conf
@@ -0,0 +1,2 @@
+# $Id$
+          
\ No newline at end of file
diff --git a/tests/ORB_Local_Config/Bug_1459/m1.conf b/tests/ORB_Local_Config/Bug_1459/m1.conf
index d9fad55aeb9..d00b33c76c1 100644
--- a/tests/ORB_Local_Config/Bug_1459/m1.conf
+++ b/tests/ORB_Local_Config/Bug_1459/m1.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
 static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/tests/ORB_Local_Config/Bug_2612/Makefile.am b/tests/ORB_Local_Config/Bug_2612/Makefile.am
deleted file mode 100644
index 3c877a90e26..00000000000
--- a/tests/ORB_Local_Config/Bug_2612/Makefile.am
+++ /dev/null
@@ -1,68 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.DllOrb.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libDllOrb.la
-
-libDllOrb_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DDLLORB_BUILD_DLL
-
-libDllOrb_la_SOURCES = \
-  DllOrb.cpp
-
-noinst_HEADERS = \
-  DllOrb.h \
-  DllOrb_Export.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2612.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Test_SOURCES = \
-  Test.cpp \
-  DllOrb.h \
-  DllOrb_Export.h
-
-Test_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/tests/ORB_Local_Config/Bug_2612/Test.cpp b/tests/ORB_Local_Config/Bug_2612/Test.cpp
index 33d4a2af1ca..33fcae3e2a7 100644
--- a/tests/ORB_Local_Config/Bug_2612/Test.cpp
+++ b/tests/ORB_Local_Config/Bug_2612/Test.cpp
@@ -5,9 +5,9 @@
  * $Id$
  */
 
-#include "ace/OS.h"
 #include "ace/Service_Config.h"
 #include "tao/corba.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_TCHAR const * const scpc_loadOrb = // NOTE due to the way ACE_DYNAMIC_SERVICE_DIRECTIVE() macro is defined,
   // each parameter CANNOT be split into multiple quoted strings "line1" "nextline" with the expectation that
diff --git a/tests/ORB_Local_Config/Bug_3049/Makefile.am b/tests/ORB_Local_Config/Bug_3049/Makefile.am
deleted file mode 100644
index 07f2cdbbe15..00000000000
--- a/tests/ORB_Local_Config/Bug_3049/Makefile.am
+++ /dev/null
@@ -1,47 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_1459.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/ORB_Local_Config/Bug_3049/Test.cpp b/tests/ORB_Local_Config/Bug_3049/Test.cpp
index 48e7bb9082b..9abda088933 100644
--- a/tests/ORB_Local_Config/Bug_3049/Test.cpp
+++ b/tests/ORB_Local_Config/Bug_3049/Test.cpp
@@ -1,4 +1,4 @@
-
+// $Id$
 // @author Phil Mesnier <mesnier_p@ociweb.com>
 
 // This test scenario is documented in bugzilla bug 3049. This test
@@ -12,10 +12,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/ARGV.h"
 #include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tests, server, "$Id$")
-
-
 #include "Service_Configuration_Per_ORB.h"
 
 const ACE_TCHAR argA[] = ACE_TEXT ("AAA -ORBGestalt LOCAL -ORBId ORB-A");
diff --git a/tests/ORB_Local_Config/Bug_3049/a.conf b/tests/ORB_Local_Config/Bug_3049/a.conf
index a93ffc0031e..07dbb5be23a 100644
--- a/tests/ORB_Local_Config/Bug_3049/a.conf
+++ b/tests/ORB_Local_Config/Bug_3049/a.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic SHMIOP_Factory Service_Object * TAO_Strategies:_make_TAO_SHMIOP_Protocol_Factory() ""
 dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBProtocolFactory SHMIOP_Factory"
 
diff --git a/tests/ORB_Local_Config/Bunch/Makefile.am b/tests/ORB_Local_Config/Bunch/Makefile.am
deleted file mode 100644
index 88dd5cfe315..00000000000
--- a/tests/ORB_Local_Config/Bunch/Makefile.am
+++ /dev/null
@@ -1,47 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bunch.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/ORB_Local_Config/Bunch/Test.cpp b/tests/ORB_Local_Config/Bunch/Test.cpp
index 6cfb53ba63f..29549b78b2f 100644
--- a/tests/ORB_Local_Config/Bunch/Test.cpp
+++ b/tests/ORB_Local_Config/Bunch/Test.cpp
@@ -9,9 +9,6 @@
 #include "ace/Service_Config.h"
 #include "ace/Intrusive_Auto_Ptr.h"
 #include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tests, server, "$Id$")
-
 #include "Service_Configuration_Per_ORB.h"
 
 int
diff --git a/tests/ORB_Local_Config/Makefile.am b/tests/ORB_Local_Config/Makefile.am
deleted file mode 100644
index 72468788ad8..00000000000
--- a/tests/ORB_Local_Config/Makefile.am
+++ /dev/null
@@ -1,20 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Bug_1459 \
-        Bug_2612 \
-        Bunch \
-        Separation \
-        Service_Dependency \
-        Shared \
-        Simple \
-        Two_DLL_ORB
-
diff --git a/tests/ORB_Local_Config/Separation/Makefile.am b/tests/ORB_Local_Config/Separation/Makefile.am
deleted file mode 100644
index b80cba26183..00000000000
--- a/tests/ORB_Local_Config/Separation/Makefile.am
+++ /dev/null
@@ -1,47 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Separation.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/ORB_Local_Config/Service_Dependency/Makefile.am b/tests/ORB_Local_Config/Service_Dependency/Makefile.am
deleted file mode 100644
index fd006206d71..00000000000
--- a/tests/ORB_Local_Config/Service_Dependency/Makefile.am
+++ /dev/null
@@ -1,66 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Service_Config_Dependent_DLL.am
-
-noinst_LTLIBRARIES = libService_Config_Dependent_DLL.la
-
-libService_Config_Dependent_DLL_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(srcdir)/../lib \
-  -DSERVICE_CONFIG_DLL_BUILD_DLL
-
-libService_Config_Dependent_DLL_la_SOURCES = \
-  Service_Config_DLL.cpp
-
-noinst_HEADERS = \
-  Service_Config_DLL.h \
-  Service_Config_DLL_Export.h
-
-## Makefile.Service_Dependency.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp \
-  Service_Config_DLL.h \
-  Service_Config_DLL_Export.h
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp b/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
index 2ffbdab6f80..41b069b5daa 100644
--- a/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
+++ b/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
@@ -1,14 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Service_Config_DLL.h"
 #include "ace/Service_Config.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (tests,
-           Service_Config_DLL,
-           "$Id$")
-
 static ACE_THR_FUNC_RETURN
 invoke_service_config (void *arg)
 {
diff --git a/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf b/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf
index 9001bd8266b..fbd70485d49 100644
--- a/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf
+++ b/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # Dynamically loading each of the Service Objects below causes a
 # number of threads to be spawned, each one invoking the Service
 # Configurator (e.g. ACE_Service_Config::process_directive().  If the
diff --git a/tests/ORB_Local_Config/Shared/Makefile.am b/tests/ORB_Local_Config/Shared/Makefile.am
deleted file mode 100644
index 73fa3a5805b..00000000000
--- a/tests/ORB_Local_Config/Shared/Makefile.am
+++ /dev/null
@@ -1,47 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Shared.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/ORB_Local_Config/Simple/Makefile.am b/tests/ORB_Local_Config/Simple/Makefile.am
deleted file mode 100644
index 9c20f390524..00000000000
--- a/tests/ORB_Local_Config/Simple/Makefile.am
+++ /dev/null
@@ -1,47 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Simple.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am b/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am
deleted file mode 100644
index 5e4afe47701..00000000000
--- a/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am
+++ /dev/null
@@ -1,140 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_LTLIBRARIES =
-
-## Makefile.Two_DLL_ORB_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.ORB_DLL_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES += libORB_DLL_Client.la
-
-libORB_DLL_Client_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DSERVICE_CONFIG_ORB_DLL_BUILD_DLL
-
-libORB_DLL_Client_la_SOURCES = \
-  ORB_DLL.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  client.cpp \
-  server.cpp
-
-noinst_HEADERS += \
-  ORB_DLL.h \
-  ORB_DLL_Export.h \
-  Test_i.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.ORB_DLL_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-noinst_LTLIBRARIES += libORB_DLL_Server.la
-
-libORB_DLL_Server_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DSERVICE_CONFIG_ORB_DLL_BUILD_DLL
-
-libORB_DLL_Server_la_SOURCES = \
-  ORB_DLL.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  client.cpp \
-  server.cpp
-
-noinst_HEADERS += \
-  ORB_DLL.h \
-  ORB_DLL_Export.h \
-  Test_i.h
-
-endif BUILD_THREADS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Two_DLL_ORB.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Test
-
-Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib
-
-Test_SOURCES = \
-  Test.cpp \
-  ORB_DLL.h \
-  ORB_DLL_Export.h \
-  Test_i.h
-
-Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp b/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
index 17532f8f92b..b56ec03a8e6 100644
--- a/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
+++ b/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ORB_DLL.h"
 #include "ace/Service_Config.h"
@@ -8,11 +9,6 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (tests,
-           ORB_DLL,
-           "$Id$")
-
-//
 Abstract_Worker::Abstract_Worker (const ACE_TCHAR *s)
   : ior_file_ (s)
 {
diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp b/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
index 3721c755bf0..0a5be851783 100644
--- a/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
+++ b/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
@@ -3,8 +3,6 @@
 //
 #include "Test_i.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
index b32d87d3aa5..dd7162beabe 100644
--- a/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
+++ b/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
@@ -7,8 +7,6 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 Client_Worker::Client_Worker ()
   : Abstract_Worker (ACE_TEXT ("file://test.ior"))
 {
@@ -39,83 +37,102 @@ Client_Worker::parse_args (int argc, ACE_TCHAR *argv[])
       break;
     }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
 int
 Client_Worker::test_main (int argc, ACE_TCHAR *argv[])
 {
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-  if (parse_args (argc, argv) != 0)
-    ACE_ERROR_RETURN ((LM_DEBUG,
-                       ACE_TEXT ("(%P|%t) Could not parse the arguments\n")),
-                      1);
-
-  // Doing this dance to allow the server some time to come up.
-  CORBA::Object_ptr co = 0;
-  for (int attempts_left=5; attempts_left > 0; --attempts_left)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) Client is ready to proceed - awaiting the server ...\n")));
-    ACE_OS::sleep (1);
-
-    try
+  try
     {
-      co = orb->string_to_object (ior_file_.c_str ());
-
-      if (co == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) Unable to obtain object reference yet. Retrying.\n")));
-          continue;
-        }
-      CORBA::Object_var tmp (co);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
-      Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in ());
+      if (parse_args (argc, argv) != 0)
+        ACE_ERROR_RETURN ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) Could not parse the arguments\n")),
+                          1);
 
-      if (CORBA::is_nil (hello.in ()))
+      // Doing this dance to allow the server some time to come up.
+      CORBA::Object_ptr co = 0;
+      for (int attempts_left = 5; attempts_left > 0; --attempts_left)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) Nil Test::Hello reference <%s>. Retrying.\n"),
-                      ior_file_.c_str ()));
-          continue;
-        }
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t) Successfuly narrowed the Hello interface\n")));
-
-      CORBA::String_var the_string =
-        hello->get_string ();
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t) String returned from the server <%C>\n"),
-                  the_string.in ()));
-
-      hello->shutdown ();
-
-      attempts_left = 0; // We're done here!
-
+                      ACE_TEXT ("(%P|%t) Client is ready to proceed - awaiting the server ...\n")));
+          ACE_OS::sleep (1);
+
+          try
+            {
+              co = orb->string_to_object (ior_file_.c_str ());
+
+              if (co == 0)
+                {
+                  ACE_DEBUG ((LM_DEBUG,
+                              ACE_TEXT ("(%P|%t) Unable to obtain object reference yet. Retrying.\n")));
+                  continue;
+                }
+              CORBA::Object_var tmp (co);
+
+              Test::Hello_var hello =
+                Test::Hello::_narrow(tmp.in ());
+
+              if (CORBA::is_nil (hello.in ()))
+                {
+                  ACE_DEBUG ((LM_DEBUG,
+                              ACE_TEXT ("(%P|%t) Nil Test::Hello reference <%s>. Retrying.\n"),
+                              ior_file_.c_str ()));
+                  continue;
+                }
+
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) Successfuly narrowed the Hello interface\n")));
+
+              CORBA::String_var the_string =
+                hello->get_string ();
+
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) String returned from the server <%C>\n"),
+                          the_string.in ()));
+
+              hello->shutdown ();
+
+              attempts_left = 0; // We're done here!
+
+            }
+          catch (const CORBA::TRANSIENT& ex)
+            {
+              if (!attempts_left)
+                throw;
+
+              ex._tao_print_exception ("Temporary problem encountered");
+
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) Client was too quick. Pausing ")
+                          ACE_TEXT ("while the server gets ready.\n")));
+              ACE_OS::sleep (5);
+            }
+          catch (const CORBA::Exception& ex)
+            {
+              ex._tao_print_exception("Unexpected CORBA exception caught");
+
+              if (!attempts_left)
+                throw;
+
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) Pausing for a while.\n")));
+              ACE_OS::sleep (5);
+            }
+      }
+
+      orb->shutdown (0);
+
+      orb->destroy ();
     }
-    catch (const CORBA::TRANSIENT& ex)
+  catch (const ::CORBA::Exception &e)
     {
-      if (!attempts_left)
-        throw;
-
-      ex._tao_print_exception ("Temporary problem encountered");
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t) Client was too quick. Pausing ")
-                  ACE_TEXT ("while the server gets ready.\n")));
-      ACE_OS::sleep (5);
+      e._tao_print_exception("Client_Worker::test_main");
+      return 1;
     }
-  }
-
-  orb->shutdown (0);
-
-  orb->destroy ();
 
   return 0;
 }
diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/primary-csd.conf b/tests/ORB_Local_Config/Two_DLL_ORB/primary-csd.conf
index 5de36bc6f60..d52e428e167 100644
--- a/tests/ORB_Local_Config/Two_DLL_ORB/primary-csd.conf
+++ b/tests/ORB_Local_Config/Two_DLL_ORB/primary-csd.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic ORB_DLL_Server Service_Object * ORB_DLL_Server:_make_Service_Config_ORB_DLL()  "-s -ORBDebugLevel 1 -ORBGestalt LOCAL -ORBId SERVER -ORBSvcConf secondary-empty.conf"
 dynamic ORB_DLL_Client Service_Object * ORB_DLL_Client:_make_Service_Config_ORB_DLL()  "-c -ORBDebugLevel 1 -ORBGestalt LOCAL -ORBId CLIENT -ORBSvcConf secondary-csd.conf"
diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/primary-ssl.conf b/tests/ORB_Local_Config/Two_DLL_ORB/primary-ssl.conf
index 205cf07dc9b..31b94c45d6c 100644
--- a/tests/ORB_Local_Config/Two_DLL_ORB/primary-ssl.conf
+++ b/tests/ORB_Local_Config/Two_DLL_ORB/primary-ssl.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLNOProtection"
 dynamic ORB_DLL_Server Service_Object * ORB_DLL_Server:_make_Service_Config_ORB_DLL()  "-s -ORBDebugLevel 1 -ORBGestalt LOCAL -ORBId SERVER -ORBSvcConf secondary-empty.conf"
 dynamic ORB_DLL_Client Service_Object * ORB_DLL_Client:_make_Service_Config_ORB_DLL()  "-c -ORBDebugLevel 1 -ORBGestalt LOCAL -ORBId CLIENT -ORBSvcConf secondary-ssl.conf"
diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/secondary-csd.conf b/tests/ORB_Local_Config/Two_DLL_ORB/secondary-csd.conf
index 6fde3ce799f..044750e8e5e 100644
--- a/tests/ORB_Local_Config/Two_DLL_ORB/secondary-csd.conf
+++ b/tests/ORB_Local_Config/Two_DLL_ORB/secondary-csd.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic TAO_CSD_TP_Strategy_Factory Service_Object * TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2"
 static Resource_Factory ""
diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf b/tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf
index 477c4795007..bacce361960 100644
--- a/tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf
+++ b/tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf
@@ -1 +1,3 @@
+# $Id$
+
 # Nothing so far
diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/secondary-ssl.conf b/tests/ORB_Local_Config/Two_DLL_ORB/secondary-ssl.conf
index 3e718372d8c..000be6b4bb0 100644
--- a/tests/ORB_Local_Config/Two_DLL_ORB/secondary-ssl.conf
+++ b/tests/ORB_Local_Config/Two_DLL_ORB/secondary-ssl.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLNOProtection"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
index 8f2f1ada5ab..ae4e5499fc3 100644
--- a/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
+++ b/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "Test_i.h"
 #include "ORB_DLL.h"
 
@@ -9,12 +8,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/Argv_Type_Converter.h"
 
-
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
-//
 Server_Worker::Server_Worker ()
   : Abstract_Worker (ACE_TEXT ("test.ior"))
 {
@@ -47,7 +40,7 @@ Server_Worker::parse_args (int argc, ACE_TCHAR *argv[])
       break;
     }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -55,76 +48,84 @@ Server_Worker::parse_args (int argc, ACE_TCHAR *argv[])
 int
 Server_Worker::test_main (int argc, ACE_TCHAR *argv[])
 {
-  // Making sure there are no stale ior files to confuse a client
-  ACE_OS::unlink (ior_file_.c_str ());
+  try
+    {
+      // Making sure there are no stale ior files to confuse a client
+      ACE_OS::unlink (ior_file_.c_str ());
 
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
-  CORBA::Object_var poa_object =
-    orb->resolve_initial_references ("RootPOA");
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references ("RootPOA");
 
-  PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (poa_object.in ());
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
 
-  if (CORBA::is_nil (root_poa.in ()))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%P|%t) Panic: nil RootPOA\n")),
-                      1);
+      if (CORBA::is_nil (root_poa.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                          ACE_TEXT ("(%P|%t) Panic: nil RootPOA\n")),
+                          1);
 
-  PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager ();
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
 
-  if (parse_args (argc, argv) != 0)
-    return 1;
+      if (parse_args (argc, argv) != 0)
+        return 1;
 
-  Hello *hello_impl;
-  ACE_NEW_RETURN (hello_impl,
-                  Hello (orb.in ()),
-                  1);
+      Hello *hello_impl;
+      ACE_NEW_RETURN (hello_impl,
+                      Hello (orb.in ()),
+                      1);
 
-  PortableServer::ServantBase_var owner_transfer (hello_impl);
+      PortableServer::ServantBase_var owner_transfer (hello_impl);
 
-  PortableServer::ObjectId_var id =
-    root_poa->activate_object (hello_impl);
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
 
-  CORBA::Object_var hello_obj =
-    root_poa->id_to_reference (id.in ());
+      CORBA::Object_var hello_obj =
+        root_poa->id_to_reference (id.in ());
 
-  Test::Hello_var hello =
-    Test::Hello::_narrow (hello_obj.in ());
+      Test::Hello_var hello =
+        Test::Hello::_narrow (hello_obj.in ());
 
-  CORBA::String_var ior =
-    orb->object_to_string (hello.in ());
+      CORBA::String_var ior =
+        orb->object_to_string (hello.in ());
 
-  poa_manager->activate ();
+      poa_manager->activate ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server activated POA manager\n")));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server activated POA manager\n")));
 
-  // Output the IOR to the <ior_output_file>
-  FILE *output_file= ACE_OS::fopen (ior_file_.c_str (), "w");
-  if (output_file == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%P|%t) Cannot open output file %s for writing IOR: %C"),
-                       ior_file_.c_str (),
-                       ior.in ()),
-                      1);
-  ACE_OS::fprintf (output_file, "%s", ior.in ());
-  ACE_OS::fclose (output_file);
+      // Output the IOR to the <ior_output_file>
+      FILE *output_file= ACE_OS::fopen (ior_file_.c_str (), "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                          ACE_TEXT ("(%P|%t) Cannot open output file %s for writing IOR: %C"),
+                          ior_file_.c_str (),
+                          ior.in ()),
+                          1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server entering the event loop\n")));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server entering the event loop\n")));
 
-  orb->run ();
+      orb->run ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server exiting the event loop\n")));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server exiting the event loop\n")));
 
-  root_poa->destroy (1, 1);
+      root_poa->destroy (1, 1);
 
-  // During normal test execution the ORB would have been destroyed
-  // by a request from the client.
+      // During normal test execution the ORB would have been destroyed
+      // by a request from the client.
 
-  //  orb->shutdown (0);
+      //  orb->shutdown (0);
 
-  orb->destroy ();
+      orb->destroy ();
+    }
+  catch (const ::CORBA::Exception &e)
+    {
+      e._tao_print_exception("Server_Worker::test_main");
+      return 1;
+    }
 
   return 0;
 }
diff --git a/tests/ORB_destroy/Makefile.am b/tests/ORB_destroy/Makefile.am
deleted file mode 100644
index 254e3a073b4..00000000000
--- a/tests/ORB_destroy/Makefile.am
+++ /dev/null
@@ -1,46 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.ORB_destroy.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = ORB_destroy
-
-ORB_destroy_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ORB_destroy_SOURCES = \
-  ORB_destroy.cpp
-
-ORB_destroy_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/ORB_destroy/ORB_destroy.cpp b/tests/ORB_destroy/ORB_destroy.cpp
index f77379f0d4a..61aa04872aa 100644
--- a/tests/ORB_destroy/ORB_destroy.cpp
+++ b/tests/ORB_destroy/ORB_destroy.cpp
@@ -1,28 +1,23 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/ORB_destroy
-//
-// = FILENAME
-//     ORB_destroy.cpp
-//
-// = DESCRIPTION
-//     Simple ORB destruction test.
-//
-// = AUTHOR
-//     Irfan Pyarali <irfan@cs.wustl.edu>
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     ORB_destroy.cpp
+ *
+ *  $Id$
+ *
+ *   Simple ORB destruction test.
+ *
+ *
+ *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "tao/ORB.h"
 #include "tao/PortableServer/PortableServer.h"
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(ORB_destroy, ORB_destroy, "$Id$")
-
 int
 test_with_regular_poa_manager (int argc,
                                ACE_TCHAR **argv,
diff --git a/tests/ORB_init/Makefile.am b/tests/ORB_init/Makefile.am
deleted file mode 100644
index 78920636fba..00000000000
--- a/tests/ORB_init/Makefile.am
+++ /dev/null
@@ -1,48 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-SUBDIRS = \
-        . \
-        Portspan
-
-
-## Makefile.ORB_init.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = ORB_init
-
-ORB_init_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ORB_init_SOURCES = \
-  ORB_init.cpp
-
-ORB_init_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/tests/ORB_init/ORB_init.cpp b/tests/ORB_init/ORB_init.cpp
index 679d40521e2..137b3920ba8 100644
--- a/tests/ORB_init/ORB_init.cpp
+++ b/tests/ORB_init/ORB_init.cpp
@@ -7,10 +7,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ORB_init,
-           ORB_init,
-           "$Id$")
-
 // Valid test IOR.
 // Do not attempt to narrow the object represented by this IOR, nor
 // should you modify the IOR unless you replace it with another
diff --git a/tests/ORB_init/Portspan/Makefile.am b/tests/ORB_init/Portspan/Makefile.am
deleted file mode 100644
index bf783a3cc2e..00000000000
--- a/tests/ORB_init/Portspan/Makefile.am
+++ /dev/null
@@ -1,80 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.ORB_Init_Portspan_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  simpleC.cpp \
-  simpleC.h \
-  simpleC.inl \
-  simpleS.cpp \
-  simpleS.h \
-  simpleS.inl
-
-CLEANFILES = \
-  simple-stamp \
-  simpleC.cpp \
-  simpleC.h \
-  simpleC.inl \
-  simpleS.cpp \
-  simpleS.h \
-  simpleS.inl
-
-simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl: simple-stamp
-
-simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  simpleC.cpp \
-  simpleI.cpp \
-  simpleS.cpp \
-  simpleC.h \
-  simpleC.inl \
-  simpleI.h \
-  simpleS.h \
-  simpleS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/ORB_shutdown/Foo_Bar.cpp b/tests/ORB_shutdown/Foo_Bar.cpp
index 27cb46e1a42..a55aa17b7e1 100644
--- a/tests/ORB_shutdown/Foo_Bar.cpp
+++ b/tests/ORB_shutdown/Foo_Bar.cpp
@@ -1,9 +1,6 @@
-//
 // $Id$
-//
-#include "Foo_Bar.h"
 
-ACE_RCSID(Foo_Bar, Foo_Bar, "$Id$")
+#include "Foo_Bar.h"
 
 Foo_Bar::Foo_Bar (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
@@ -15,5 +12,12 @@ Foo_Bar::~Foo_Bar (void)
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Shutting down the ORB again\n"));
 
-  this->orb_->shutdown (1);
+  try
+    {
+      this->orb_->shutdown (1);
+    }
+  catch (...)
+    {
+      // Don't allow exceptions to leave the destructor.
+    }
 }
diff --git a/tests/ORB_shutdown/Makefile.am b/tests/ORB_shutdown/Makefile.am
deleted file mode 100644
index d0e3e660b0c..00000000000
--- a/tests/ORB_shutdown/Makefile.am
+++ /dev/null
@@ -1,80 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.ORB_Shutdown_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Foo_Bar.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Foo_Bar.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/ORB_shutdown/server.cpp b/tests/ORB_shutdown/server.cpp
index 32a16e3f383..7618864afe6 100644
--- a/tests/ORB_shutdown/server.cpp
+++ b/tests/ORB_shutdown/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Time_Value.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/ORT/Makefile.am b/tests/ORT/Makefile.am
deleted file mode 100644
index c801a22a12e..00000000000
--- a/tests/ORT/Makefile.am
+++ /dev/null
@@ -1,149 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Test_ORT_IDL.am
-
-BUILT_SOURCES = \
-  ORT_testC.cpp \
-  ORT_testC.h \
-  ORT_testC.inl \
-  ORT_testS.cpp \
-  ORT_testS.h \
-  ORT_testS.inl
-
-CLEANFILES = \
-  ORT_test-stamp \
-  ORT_testC.cpp \
-  ORT_testC.h \
-  ORT_testC.inl \
-  ORT_testS.cpp \
-  ORT_testS.h \
-  ORT_testS.inl
-
-ORT_testC.cpp ORT_testC.h ORT_testC.inl ORT_testS.cpp ORT_testS.h ORT_testS.inl: ORT_test-stamp
-
-ORT_test-stamp: $(srcdir)/ORT_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ORT_test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  ObjectReferenceFactoryC.cpp \
-  ObjectReferenceFactoryC.h \
-  ObjectReferenceFactoryC.inl \
-  ObjectReferenceFactoryS.h
-
-CLEANFILES += \
-  ObjectReferenceFactory-stamp \
-  ObjectReferenceFactoryC.cpp \
-  ObjectReferenceFactoryC.h \
-  ObjectReferenceFactoryC.inl \
-  ObjectReferenceFactoryS.h
-
-ObjectReferenceFactoryC.cpp ObjectReferenceFactoryC.h ObjectReferenceFactoryC.inl ObjectReferenceFactoryS.h: ObjectReferenceFactory-stamp
-
-ObjectReferenceFactory-stamp: $(srcdir)/ObjectReferenceFactory.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -SS $(srcdir)/ObjectReferenceFactory.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ORT_test.idl \
-  ObjectReferenceFactory.idl
-
-## Makefile.Test_ORT_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ORT_testC.cpp \
-  ORT_testS.cpp \
-  ORT_test_IORInterceptor.cpp \
-  ORT_test_i.cpp \
-  ObjectReferenceFactory.cpp \
-  ObjectReferenceFactoryC.cpp \
-  ServerORBInitializer.cpp \
-  ServerRequestInterceptor.cpp \
-  server.cpp \
-  ORT_test_IORInterceptor.h \
-  ORT_test_i.h \
-  ObjectReferenceFactory.h \
-  ServerORBInitializer.h \
-  ServerRequestInterceptor.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Test_ORT_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ORT_testC.cpp \
-  client.cpp \
-  ORT_test_IORInterceptor.h \
-  ORT_test_i.h \
-  ObjectReferenceFactory.h \
-  ServerORBInitializer.h \
-  ServerRequestInterceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/ORT/ORT_test_IORInterceptor.cpp b/tests/ORT/ORT_test_IORInterceptor.cpp
index 3d8106210bc..53ddd0ecb11 100644
--- a/tests/ORT/ORT_test_IORInterceptor.cpp
+++ b/tests/ORT/ORT_test_IORInterceptor.cpp
@@ -1,13 +1,10 @@
+// $Id$
+
 #include "ORT_test_IORInterceptor.h"
 #include "ObjectReferenceFactory.h"
 
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (ORT,
-           ORT_test_IORInterceptor,
-           "$Id$")
-
-
 ORT_test_IORInterceptor::ORT_test_IORInterceptor (void)
   : establish_count_ (0),
     components_establish_count_ (0)
diff --git a/tests/ORT/ORT_test_i.cpp b/tests/ORT/ORT_test_i.cpp
index 3477dd25651..7580b83f35a 100644
--- a/tests/ORT/ORT_test_i.cpp
+++ b/tests/ORT/ORT_test_i.cpp
@@ -1,10 +1,6 @@
-#include "ORT_test_i.h"
-
-
-ACE_RCSID (ORT,
-           ORT_test_i,
-           "$Id$")
+// $Id$
 
+#include "ORT_test_i.h"
 
 ORT_test_i::ORT_test_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/tests/ORT/ObjectReferenceFactory.cpp b/tests/ORT/ObjectReferenceFactory.cpp
index 0373edccd29..cee5cdf81fa 100644
--- a/tests/ORT/ObjectReferenceFactory.cpp
+++ b/tests/ORT/ObjectReferenceFactory.cpp
@@ -1,11 +1,6 @@
-#include "ObjectReferenceFactory.h"
-
-
-ACE_RCSID (ORT,
-           ObjectReferenceFactory,
-           "$Id$")
-
+// $Id$
 
+#include "ObjectReferenceFactory.h"
 #include "tao/debug.h"
 
 
diff --git a/tests/ORT/ServerORBInitializer.cpp b/tests/ORT/ServerORBInitializer.cpp
index 054801c2c7e..c6170fd8ca3 100644
--- a/tests/ORT/ServerORBInitializer.cpp
+++ b/tests/ORT/ServerORBInitializer.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "ServerORBInitializer.h"
 #include "ServerRequestInterceptor.h"
 #include "ORT_test_IORInterceptor.h"
@@ -5,12 +7,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/PortableServer/PortableServer.h"
 
-
-ACE_RCSID (ORT,
-           ServerORBInitializer,
-           "$Id$")
-
-
 void
 ServerORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */)
diff --git a/tests/ORT/ServerRequestInterceptor.cpp b/tests/ORT/ServerRequestInterceptor.cpp
index f7465651657..7d71a124a69 100644
--- a/tests/ORT/ServerRequestInterceptor.cpp
+++ b/tests/ORT/ServerRequestInterceptor.cpp
@@ -1,15 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequestInterceptor.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (ORT,
-           ServerRequestInterceptor,
-           "$Id$")
-
-
 ServerRequestInterceptor::ServerRequestInterceptor (
   const char * orb_id,
   PortableServer::Current_ptr poa_current)
diff --git a/tests/ORT/client.cpp b/tests/ORT/client.cpp
index 9d0945ebd74..9d3d446fe01 100644
--- a/tests/ORT/client.cpp
+++ b/tests/ORT/client.cpp
@@ -4,10 +4,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (ORT,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/tests/ORT/server.cpp b/tests/ORT/server.cpp
index a340cfb774a..5918b3c001b 100644
--- a/tests/ORT/server.cpp
+++ b/tests/ORT/server.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "ORT_test_i.h"
 #include "ServerORBInitializer.h"
 
@@ -6,11 +8,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (ORT,
-           server,
-           "$Id$")
-
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -35,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Object_Loader/Loader.cpp b/tests/Object_Loader/Loader.cpp
index de9fba45745..ebbe574b6a7 100644
--- a/tests/Object_Loader/Loader.cpp
+++ b/tests/Object_Loader/Loader.cpp
@@ -3,8 +3,6 @@
 #include "Loader.h"
 #include "Test_i.h"
 
-ACE_RCSID(Object_Loader, Loader, "$Id$")
-
 Loader::Loader (void)
 {
 }
diff --git a/tests/Object_Loader/Loader.h b/tests/Object_Loader/Loader.h
index 18e157271b3..0d2ed52f964 100644
--- a/tests/Object_Loader/Loader.h
+++ b/tests/Object_Loader/Loader.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Object_Loader
-//
-// = FILENAME
-//   Loader.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Loader.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_OBJECT_LOADER_LOADER_H
 #define TAO_OBJECT_LOADER_LOADER_H
@@ -19,21 +16,22 @@
 #include "tao/Object_Loader.h"
 #include "OLT_Export.h"
 
+/**
+ * @class Loader
+ *
+ * @brief Implement the Test interface
+ *
+ */
 class OLT_Export Loader : public TAO_Object_Loader
 {
-  // = TITLE
-  //   Implement the Test interface
-  //
-  // = DESCRIPTION
-  //
 public:
+  /// ctor
   Loader (void);
-  // ctor
 
+  /// Create a new instance
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            ACE_TCHAR *argv[]);
-  // Create a new instance
 };
 
 // ACE_STATIC_SVC_DECLARE (Loader)
diff --git a/tests/Object_Loader/Makefile.am b/tests/Object_Loader/Makefile.am
deleted file mode 100644
index 0787fd68189..00000000000
--- a/tests/Object_Loader/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Object_Loader_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Object_Loader_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES = libTest_DLL.la
-
-libTest_DLL_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DOLT_BUILD_DLL
-
-libTest_DLL_la_SOURCES = \
-  Loader.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp
-
-noinst_HEADERS += \
-  Loader.h \
-  Test_i.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Object_Loader_Driver.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = driver
-
-driver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-driver_SOURCES = \
-  TestC.cpp \
-  driver.cpp \
-  Loader.h \
-  OLT_Export.h \
-  Test_i.h
-
-driver_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Object_Loader/Test_i.cpp b/tests/Object_Loader/Test_i.cpp
index f0f147c9f96..6ca3c420183 100644
--- a/tests/Object_Loader/Test_i.cpp
+++ b/tests/Object_Loader/Test_i.cpp
@@ -2,8 +2,6 @@
 
 #include "Test_i.h"
 
-ACE_RCSID(Object_Loader, Test_i, "$Id$")
-
 CORBA::Long
 Test_i::instance_count_ = 0;
 
diff --git a/tests/Object_Loader/Test_i.h b/tests/Object_Loader/Test_i.h
index e9a7edf00bb..e9efeb48bce 100644
--- a/tests/Object_Loader/Test_i.h
+++ b/tests/Object_Loader/Test_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Object_Loader
-//
-// = FILENAME
-//   Test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_OBJECT_LOADER_TEST_I_H
 #define TAO_OBJECT_LOADER_TEST_I_H
@@ -19,16 +16,17 @@
 #include "TestS.h"
 #include "OLT_Export.h"
 
+/**
+ * @class Test_i
+ *
+ * @brief Implement the Test interface
+ *
+ */
 class OLT_Export Test_i : public POA_Test
 {
-  // = TITLE
-  //   Implement the Test interface
-  //
-  // = DESCRIPTION
-  //
 public:
+  /// ctor
   Test_i (PortableServer::POA_ptr poa);
-  // ctor
 
   CORBA::Long instance_count (void);
 
@@ -37,8 +35,8 @@ public:
   PortableServer::POA_ptr _default_POA (void);
 
 private:
+  /// The default POA used for this object
   PortableServer::POA_var poa_;
-  // The default POA used for this object
 
   static CORBA::Long instance_count_;
 };
diff --git a/tests/Objref_Sequence_Test/Makefile.am b/tests/Objref_Sequence_Test/Makefile.am
deleted file mode 100644
index 3cc784fe1f6..00000000000
--- a/tests/Objref_Sequence_Test/Makefile.am
+++ /dev/null
@@ -1,103 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Objref_Sequence_Test_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Objref_Sequence_Test_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Objref_Sequence_Test_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Objref_Sequence_Test/client.cpp b/tests/Objref_Sequence_Test/client.cpp
index ca5d67393cb..89484499c3a 100644
--- a/tests/Objref_Sequence_Test/client.cpp
+++ b/tests/Objref_Sequence_Test/client.cpp
@@ -26,7 +26,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Objref_Sequence_Test/server.cpp b/tests/Objref_Sequence_Test/server.cpp
index 53da8b757dc..65b8af14aa6 100644
--- a/tests/Objref_Sequence_Test/server.cpp
+++ b/tests/Objref_Sequence_Test/server.cpp
@@ -132,7 +132,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OctetSeq/Makefile.am b/tests/OctetSeq/Makefile.am
deleted file mode 100644
index cba9c243c89..00000000000
--- a/tests/OctetSeq/Makefile.am
+++ /dev/null
@@ -1,137 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.OctetSeq_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.OctetSeq_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.OctetSeq_OctetSeq.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += OctetSeq
-
-OctetSeq_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-OctetSeq_SOURCES = \
-  OctetSeq.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.inl
-
-OctetSeq_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.OctetSeq_Server.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/tests/OctetSeq/OctetSeq.cpp b/tests/OctetSeq/OctetSeq.cpp
index c896d05fd26..899efbc9810 100644
--- a/tests/OctetSeq/OctetSeq.cpp
+++ b/tests/OctetSeq/OctetSeq.cpp
@@ -1,22 +1,19 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/OctetSeq
-//
-// = FILENAME
-//    octetseq.cpp
-//
-// = DESCRIPTION
-//   TAO optimizes octet sequences, this test verifies that the
-//   optimizations do not break any code and that they effectively
-//   improve performance.
-//
-// = AUTHORS
-//    Carlos O'Ryan
-//
-// ============================================================================
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    OctetSeq.cpp
+ *
+ *  $Id$
+ *
+ * TAO optimizes octet sequences, this test verifies that the
+ * optimizations do not break any code and that they effectively
+ * improve performance.
+ *
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
 
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
@@ -26,8 +23,6 @@
 #include "testC.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(OctetSeq, OctetSeq, "$Id$")
-
 static int
 test_write_octet (TAO_OutputCDR &cdr,
                   char* /* buf */,
diff --git a/tests/OctetSeq/client.cpp b/tests/OctetSeq/client.cpp
index ecaf3588334..1db48a68a30 100644
--- a/tests/OctetSeq/client.cpp
+++ b/tests/OctetSeq/client.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "ace/Get_Opt.h"
@@ -7,11 +8,9 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(OctetSeq, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
-ACE_RANDR_TYPE seed = 0;
+unsigned int seed = 0;
 int verbose = 0;
 
 int
@@ -51,7 +50,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -95,7 +94,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (seed == 0)
         {
-          seed = static_cast<ACE_RANDR_TYPE> (ACE_OS::time (0));
+          seed = static_cast<unsigned int> (ACE_OS::time (0));
           ACE_DEBUG ((LM_DEBUG, "Seed value is %d\n", seed));
         }
 
@@ -105,20 +104,20 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       for (int i = 0; i != niterations; ++i)
         {
-          CORBA::ULong r = ACE_OS::rand_r (seed);
+          CORBA::ULong r = ACE_OS::rand_r (&seed);
           Test::Index idx = (r % nelements);
 
           if (i % 100 == 0)
             {
               for (int j = 0; j != nelements; ++j)
                 {
-                  CORBA::ULong r = ACE_OS::rand_r (seed);
+                  CORBA::ULong r = ACE_OS::rand_r (&seed);
                   CORBA::ULong l = r % maxsize;
                   elements[j].length (l);
                   CORBA::Double token = 0;
                   for (CORBA::ULong k = 0; k != l; ++k)
                     {
-                      r = ACE_OS::rand_r (seed);
+                      r = ACE_OS::rand_r (&seed);
                       elements[j][k] = (r % 128);
                       token += r;
                     }
@@ -128,7 +127,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                                token,
                                returned_token);
 
-                  if (token != returned_token)
+                  if (!ACE::is_equal (token, returned_token))
                     {
                       ACE_ERROR ((LM_ERROR,
                                   "ERROR - invalid token <%f> returned,"
diff --git a/tests/OctetSeq/server.cpp b/tests/OctetSeq/server.cpp
index a27b76a8e3a..93fa08571ff 100644
--- a/tests/OctetSeq/server.cpp
+++ b/tests/OctetSeq/server.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "ace/Get_Opt.h"
@@ -5,10 +6,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (OctetSeq,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/OctetSeq/test.idl b/tests/OctetSeq/test.idl
index 493c026dd0c..4327caa4891 100644
--- a/tests/OctetSeq/test.idl
+++ b/tests/OctetSeq/test.idl
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/OctetSeq
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//   Simple IDL file to test octet sequences.
-//
-// = AUTHORS
-//   Carlos O'Ryan <coryan@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    test.idl
+ *
+ *  $Id$
+ *
+ * Simple IDL file to test octet sequences.
+ *
+ *
+ *  @author Carlos O'Ryan <coryan@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 module Test
 {
diff --git a/tests/OctetSeq/test_i.cpp b/tests/OctetSeq/test_i.cpp
index 39cd395e926..fb3a36f0e82 100644
--- a/tests/OctetSeq/test_i.cpp
+++ b/tests/OctetSeq/test_i.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "test_i.h"
@@ -7,8 +8,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(OctetSeq, test_i, "$Id$")
-
 Database_i::~Database_i (void)
 {
   delete[] this->elements_;
diff --git a/tests/OctetSeq/test_i.h b/tests/OctetSeq/test_i.h
index 1269850b911..5608f216f64 100644
--- a/tests/OctetSeq/test_i.h
+++ b/tests/OctetSeq/test_i.h
@@ -1,35 +1,34 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/OctetSeq
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_OCTETSEQ_TEST_I_H
 #define TAO_OCTETSEQ_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Database_i
+ *
+ * Implements the Database interface in test.idl
+ */
 class Database_i : public POA_Test::Database
 {
-  // = DESCRIPTION
-  //   Implements the Database interface in test.idl
-  //
 public:
+  /// ctor
   Database_i (CORBA::ORB_ptr orb,
               Test::Index max_range);
-  // ctor
 
+  /// dtor
   ~Database_i (void);
-  // dtor
 
   // = The Simple_Server methods.
   void set (Test::Index i,
@@ -44,14 +43,14 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB pointer
   CORBA::ORB_var orb_;
-  // The ORB pointer
 
+  /// The maximum number of elements in the database
   Test::Index max_range_;
-  // The maximum number of elements in the database
 
+  /// The elements
   Test::OctetSeq* elements_;
-  // The elements
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/tests/Ondemand_Write/Hello.cpp b/tests/Ondemand_Write/Hello.cpp
index a2a4d8ae380..68768aed3e2 100644
--- a/tests/Ondemand_Write/Hello.cpp
+++ b/tests/Ondemand_Write/Hello.cpp
@@ -1,9 +1,6 @@
-//
 // $Id$
-//
-#include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
+#include "Hello.h"
 
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/tests/Ondemand_Write/Makefile.am b/tests/Ondemand_Write/Makefile.am
deleted file mode 100644
index e0deedeba2a..00000000000
--- a/tests/Ondemand_Write/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Ondemand_Write_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Ondemand_Write_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Ondemand_Write_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Ondemand_Write/client.cpp b/tests/Ondemand_Write/client.cpp
index 50af9f4596b..d00f9a7cf84 100644
--- a/tests/Ondemand_Write/client.cpp
+++ b/tests/Ondemand_Write/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Ondemand_Write/server.cpp b/tests/Ondemand_Write/server.cpp
index c1d8bd1bb30..ab19d0fb0a7 100644
--- a/tests/Ondemand_Write/server.cpp
+++ b/tests/Ondemand_Write/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Oneway_Buffering/Makefile.am b/tests/Oneway_Buffering/Makefile.am
deleted file mode 100644
index 1c28c88f038..00000000000
--- a/tests/Oneway_Buffering/Makefile.am
+++ /dev/null
@@ -1,153 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Oneway_Buffering_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Oneway_Buffering_Admin.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += admin
-
-admin_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-admin_SOURCES = \
-  Oneway_Buffering_Admin.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  admin.cpp \
-  Oneway_Buffering_Admin.h
-
-admin_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Oneway_Buffering_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Oneway_Buffering.h \
-  Oneway_Buffering_Admin.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Oneway_Buffering_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Oneway_Buffering.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Oneway_Buffering.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Oneway_Buffering/Oneway_Buffering.cpp b/tests/Oneway_Buffering/Oneway_Buffering.cpp
index 698098675db..d36b6d9f84d 100644
--- a/tests/Oneway_Buffering/Oneway_Buffering.cpp
+++ b/tests/Oneway_Buffering/Oneway_Buffering.cpp
@@ -3,8 +3,6 @@
 //
 #include "Oneway_Buffering.h"
 
-ACE_RCSID(Oneway_Buffering, Oneway_Buffering, "$Id$")
-
 Oneway_Buffering::Oneway_Buffering (CORBA::ORB_ptr orb,
                                     Test::Oneway_Buffering_Admin_ptr admin)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
index 432642eac38..b788fa1b5a5 100644
--- a/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
+++ b/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
@@ -9,8 +9,6 @@ namespace
   const unsigned int timeout_in_sec= 2u;
 }
 
-ACE_RCSID(Oneway_Buffering, Oneway_Buffering_Admin, "$Id$")
-
 Oneway_Buffering_Admin::Oneway_Buffering_Admin (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
   , request_count_ (0)
diff --git a/tests/Oneway_Buffering/admin.cpp b/tests/Oneway_Buffering/admin.cpp
index 73b72c533a0..0443972028e 100644
--- a/tests/Oneway_Buffering/admin.cpp
+++ b/tests/Oneway_Buffering/admin.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Oneway_Buffering, admin, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("admin.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Oneway_Buffering/client.cpp b/tests/Oneway_Buffering/client.cpp
index 8a3362dc2ea..7c60f9a794f 100644
--- a/tests/Oneway_Buffering/client.cpp
+++ b/tests/Oneway_Buffering/client.cpp
@@ -9,8 +9,6 @@
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Oneway_Buffering, client, "$Id$")
-
 const ACE_TCHAR *server_ior = ACE_TEXT("file://server.ior");
 const ACE_TCHAR *admin_ior = ACE_TEXT("file://admin.ior");
 int iterations = 20;
@@ -87,7 +85,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Oneway_Buffering/server.cpp b/tests/Oneway_Buffering/server.cpp
index 7b8934d39b7..c27cd5cf5f0 100644
--- a/tests/Oneway_Buffering/server.cpp
+++ b/tests/Oneway_Buffering/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Oneway_Buffering, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 const ACE_TCHAR *ior = ACE_TEXT("file://admin.ior");
 
@@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Oneway_Send_Timeouts/Makefile.am b/tests/Oneway_Send_Timeouts/Makefile.am
deleted file mode 100644
index 637d2b191eb..00000000000
--- a/tests/Oneway_Send_Timeouts/Makefile.am
+++ /dev/null
@@ -1,92 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Oneway_Scenarios_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Oneway_Scenarios_Oneway_Test.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = oneway_test
-
-oneway_test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-oneway_test_SOURCES = \
-  Client.cpp \
-  Server.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  main.cpp \
-  Client.h \
-  Server.h \
-  Test_i.h
-
-oneway_test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Oneway_Send_Timeouts/Test_i.cpp b/tests/Oneway_Send_Timeouts/Test_i.cpp
index f96b69523e6..036c9580781 100644
--- a/tests/Oneway_Send_Timeouts/Test_i.cpp
+++ b/tests/Oneway_Send_Timeouts/Test_i.cpp
@@ -67,7 +67,7 @@ void
 Test_i::dummy_one_way (const char* msg)
 {
   if (msg != 0) {
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) Test_i::dummy_one_way> %.25s\n", msg));
+    ACE_DEBUG ((LM_DEBUG, "(%P|%t) Test_i::dummy_one_way> %.25C\n", msg));
   }
   // do nothing
 }
diff --git a/tests/Oneway_Send_Timeouts/block_flush.conf b/tests/Oneway_Send_Timeouts/block_flush.conf
index 9c379527209..fd51e319362 100644
--- a/tests/Oneway_Send_Timeouts/block_flush.conf
+++ b/tests/Oneway_Send_Timeouts/block_flush.conf
@@ -1 +1,3 @@
+# $Id$
+
 static Resource_Factory "-ORBFlushingStrategy blocking"
diff --git a/tests/Oneway_Send_Timeouts/lf_flush.conf b/tests/Oneway_Send_Timeouts/lf_flush.conf
index 82425ab8e93..415b7aca7e9 100644
--- a/tests/Oneway_Send_Timeouts/lf_flush.conf
+++ b/tests/Oneway_Send_Timeouts/lf_flush.conf
@@ -1 +1,3 @@
+# $Id$
+
 static Resource_Factory "-ORBFlushingStrategy leader_follower"
diff --git a/tests/Oneway_Send_Timeouts/reactive_flush.conf b/tests/Oneway_Send_Timeouts/reactive_flush.conf
index 4c233d061f6..6856499350b 100644
--- a/tests/Oneway_Send_Timeouts/reactive_flush.conf
+++ b/tests/Oneway_Send_Timeouts/reactive_flush.conf
@@ -1 +1,3 @@
+# $Id$
+
 static Resource_Factory "-ORBFlushingStrategy reactive"
diff --git a/tests/Oneway_Timeouts/Makefile.am b/tests/Oneway_Timeouts/Makefile.am
deleted file mode 100644
index 7ea65d7d73d..00000000000
--- a/tests/Oneway_Timeouts/Makefile.am
+++ /dev/null
@@ -1,118 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.test_server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.test_client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  TestC.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Oneway_Timeouts/test.mpc b/tests/Oneway_Timeouts/test.mpc
index cf7dcc95795..3f3e7cd6050 100644
--- a/tests/Oneway_Timeouts/test.mpc
+++ b/tests/Oneway_Timeouts/test.mpc
@@ -1,28 +1,38 @@
 // -*- MPC -*-
 // $Id$
 
-project (*client) : taoserver, messaging, strategies {
-  exename = client
-  after = *server
-  source_files {
-    TestC.cpp
-    client.cpp
+project(*idl): taoidldefaults {
+  idlflags += -Sp
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, messaging, strategies {
+  after += *idl
+  Source_Files {
+    server.cpp
   }
-  header_files {
-    TestC.h
+  Source_Files {
+    TestC.cpp
+    TestS.cpp
   }
-  idl_files {
+  IDL_Files {
   }
 }
 
-project (*server) : taoserver, messaging, strategies {
-  source_files {
+project(*Client): taoserver, messaging, strategies {
+  exename = client
+  after += *idl
+  Source_Files {
+    client.cpp
+  }
+  Source_Files {
     TestC.cpp
-    TestS.cpp
-    server.cpp
   }
-  header_files {
-    TestS.h
-    TestC.h
+  IDL_Files {
   }
 }
+
+
diff --git a/tests/Oneways_Invoking_Twoways/Client_Task.cpp b/tests/Oneways_Invoking_Twoways/Client_Task.cpp
index 738d0e312ed..5600b0a9eb1 100644
--- a/tests/Oneways_Invoking_Twoways/Client_Task.cpp
+++ b/tests/Oneways_Invoking_Twoways/Client_Task.cpp
@@ -5,8 +5,6 @@
 #include "Client_Task.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (Test::Sender_ptr reply_gen,
                           Test::Receiver_ptr us,
                           ACE_Thread_Manager *thr_mgr,
diff --git a/tests/Oneways_Invoking_Twoways/Makefile.am b/tests/Oneways_Invoking_Twoways/Makefile.am
deleted file mode 100644
index a9a5aac9654..00000000000
--- a/tests/Oneways_Invoking_Twoways/Makefile.am
+++ /dev/null
@@ -1,115 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Oneways_Invoking_Twoways_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Oneways_Invoking_Twoways_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  Receiver_i.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Task.h \
-  Receiver_i.h \
-  Server_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Oneways_Invoking_Twoways_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Sender_i.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Sender_i.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
index 570a06fe83b..f12cbc8c09b 100644
--- a/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
+++ b/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
@@ -1,6 +1,6 @@
-#include "Receiver_i.h"
+// $Id$
 
-ACE_RCSID(Oneways_Invoking_Twoways, Receiver_i, "$Id$")
+#include "Receiver_i.h"
 
 Receiver_i::Receiver_i (CORBA::ORB_ptr orb,
                         Test::Sender_ptr sender,
@@ -16,8 +16,6 @@ Receiver_i::~Receiver_i (void)
 {
 }
 
-
-
 CORBA::Long
 Receiver_i::receive_call (void)
 {
diff --git a/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/tests/Oneways_Invoking_Twoways/Sender_i.cpp
index 5e408c90e49..6944edebff0 100644
--- a/tests/Oneways_Invoking_Twoways/Sender_i.cpp
+++ b/tests/Oneways_Invoking_Twoways/Sender_i.cpp
@@ -1,6 +1,6 @@
-#include "Sender_i.h"
+// $Id$
 
-ACE_RCSID(Oneways_Invoking_Twoways, Sender_i, "$Id$")
+#include "Sender_i.h"
 
 Sender_i::Sender_i (CORBA::ORB_ptr orb,
                     CORBA::ULong no)
diff --git a/tests/Oneways_Invoking_Twoways/Sender_i.h b/tests/Oneways_Invoking_Twoways/Sender_i.h
index ab267b02277..e566594f46e 100644
--- a/tests/Oneways_Invoking_Twoways/Sender_i.h
+++ b/tests/Oneways_Invoking_Twoways/Sender_i.h
@@ -43,7 +43,7 @@ public:
 
 private:
   /// Our local ORB ptr
-  CORBA::ORB_ptr orb_;
+  CORBA::ORB_var orb_;
 
   /// Number of invocations to be made on the receiver
   CORBA::ULong number_;
diff --git a/tests/Oneways_Invoking_Twoways/Server_Task.cpp b/tests/Oneways_Invoking_Twoways/Server_Task.cpp
index 3529e7ac785..4e97b7ca0ca 100644
--- a/tests/Oneways_Invoking_Twoways/Server_Task.cpp
+++ b/tests/Oneways_Invoking_Twoways/Server_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Server_Task.h"
 
-ACE_RCSID(Muxing, Server_Task, "$Id$")
-
 Server_Task::Server_Task (CORBA::ORB_ptr orb,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr)
diff --git a/tests/Oneways_Invoking_Twoways/client.cpp b/tests/Oneways_Invoking_Twoways/client.cpp
index 50932a36842..89b4c650553 100644
--- a/tests/Oneways_Invoking_Twoways/client.cpp
+++ b/tests/Oneways_Invoking_Twoways/client.cpp
@@ -5,8 +5,6 @@
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Muxing, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -118,16 +116,16 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // wait for oneway sends and twoway replies to be processed
       client_task.wait ();
-      
+
       // shutdown server
       sender->shutdown ();
-      
+
       // shutdown ourself
       receiver->shutdown ();
-      
+
       // wait for event loop to finish
       server_task.wait ();
-        
+
       ACE_DEBUG ((LM_DEBUG,
                   "Event Loop finished\n"));
 
diff --git a/tests/Oneways_Invoking_Twoways/run_test_svc.pl b/tests/Oneways_Invoking_Twoways/run_test_svc.pl
index ecaa7acd182..ab2a0769b96 100755
--- a/tests/Oneways_Invoking_Twoways/run_test_svc.pl
+++ b/tests/Oneways_Invoking_Twoways/run_test_svc.pl
@@ -35,7 +35,7 @@ $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " .
                                         "-o $server_iorfile");
 
 $CL = $client->CreateProcess ("client",
-                              "-ORBSvcConf $client_conf " . 
+                              "-ORBSvcConf $client_conf " .
                               "-k file://$client_iorfile");
 
 $server_status = $SV->Spawn ();
diff --git a/tests/Oneways_Invoking_Twoways/server.cpp b/tests/Oneways_Invoking_Twoways/server.cpp
index 09b14bef701..ac3522946f8 100644
--- a/tests/Oneways_Invoking_Twoways/server.cpp
+++ b/tests/Oneways_Invoking_Twoways/server.cpp
@@ -4,8 +4,6 @@
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Oneways_Invoking_Twoways, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Optimized_Connection/Makefile.am b/tests/Optimized_Connection/Makefile.am
deleted file mode 100644
index 7d150ad25b2..00000000000
--- a/tests/Optimized_Connection/Makefile.am
+++ /dev/null
@@ -1,80 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Optimized_Connection_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Optimized_Connection_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  oc_client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_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/tests/Optimized_Connection/Optimized_Connection.mpc b/tests/Optimized_Connection/Optimized_Connection.mpc
index d28e7cc1381..39ff38f6991 100644
--- a/tests/Optimized_Connection/Optimized_Connection.mpc
+++ b/tests/Optimized_Connection/Optimized_Connection.mpc
@@ -2,14 +2,12 @@
 // $Id$
 
 project(*idl): taoidldefaults {
-  idlflags += -Sa -St
   IDL_Files {
     Test.idl
   }
   custom_only = 1
 }
 
-
 project(*Client): taoclient, strategies {
   after += *idl
   Source_Files {
diff --git a/tests/Optimized_Connection/oc_client.cpp b/tests/Optimized_Connection/oc_client.cpp
index f4e73d19dac..42295a80a16 100644
--- a/tests/Optimized_Connection/oc_client.cpp
+++ b/tests/Optimized_Connection/oc_client.cpp
@@ -6,8 +6,6 @@
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/Strategies/OC_Endpoint_Selector_Loader.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -32,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Optimized_Connection/oc_svc.conf b/tests/Optimized_Connection/oc_svc.conf
index 75b92f3c589..320c5e26391 100644
--- a/tests/Optimized_Connection/oc_svc.conf
+++ b/tests/Optimized_Connection/oc_svc.conf
@@ -1 +1,3 @@
+# $Id$
+
 static OC_Endpoint_Selector_Factory "-connect_timeout 1300"
diff --git a/tests/Optimized_Connection/run_test.pl b/tests/Optimized_Connection/run_test.pl
index b79ba666d13..79ad8241918 100755
--- a/tests/Optimized_Connection/run_test.pl
+++ b/tests/Optimized_Connection/run_test.pl
@@ -27,7 +27,7 @@ my $client_conf = $client->LocalFile ("oc_svc.conf");
 $CL = $client->CreateProcess ("client", "-k file://$client_iorfile ".
                                         "-orbsvcconf $client_conf ".
                                         "-ORBDebugLevel $debug_level");
-                                        
+
 
 if ($client->WaitForFileTimed ($iorbase,
                            $client->ProcessStartWaitInterval()) == -1) {
diff --git a/tests/POA/Adapter_Activator/Makefile.am b/tests/POA/Adapter_Activator/Makefile.am
deleted file mode 100644
index b2ba5518ab9..00000000000
--- a/tests/POA/Adapter_Activator/Makefile.am
+++ /dev/null
@@ -1,52 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Adapter_Activator_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant \
-  -I../Generic_Servant
-
-server_SOURCES = \
-  server.cpp
-
-server_LDFLAGS = \
-  -L../Generic_Servant
-
-server_LDADD = \
-  $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/POA/Adapter_Activator/server.cpp b/tests/POA/Adapter_Activator/server.cpp
index 3a690274174..075079129c5 100644
--- a/tests/POA/Adapter_Activator/server.cpp
+++ b/tests/POA/Adapter_Activator/server.cpp
@@ -1,26 +1,23 @@
-// $Id$
-
-// ================================================================
-//
-// = LIBRARY
-//    TAO/tests/POA/Adapter_Activator
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    This example is very similar to the Explicit_Activation example
-//    except that the POAs are deleted once the object references have
-//    been created. After this, an adapter activator is install in the
-//    RootPOA to reactivate the POAs on demand.
-//
-//    Similar to the Explicit_Activation, the client for this example
-//    is Generic_Servant.
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  This example is very similar to the Explicit_Activation example
+ *  except that the POAs are deleted once the object references have
+ *  been created. After this, an adapter activator is install in the
+ *  RootPOA to reactivate the POAs on demand.
+ *
+ *  Similar to the Explicit_Activation, the client for this example
+ *  is Generic_Servant.
+ *
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
@@ -28,8 +25,6 @@
 #include "ace/OS_NS_string.h"
 #include "tao/PortableServer/AdapterActivatorC.h"
 
-ACE_RCSID(Adapter_Activator, server, "$Id$")
-
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined (_MSC_VER)
@@ -40,9 +35,9 @@ class reference_counted_test_i :
   public virtual test_i
 {
 public:
+  /// Constructor - takes a POA and a value parameter
   reference_counted_test_i (CORBA::ORB_ptr orb,
                             PortableServer::POA_ptr poa);
-  // Constructor - takes a POA and a value parameter
 };
 
 reference_counted_test_i::reference_counted_test_i (CORBA::ORB_ptr orb,
diff --git a/tests/POA/Bug_1592_Regression/Makefile.am b/tests/POA/Bug_1592_Regression/Makefile.am
deleted file mode 100644
index 9a45fce19f5..00000000000
--- a/tests/POA/Bug_1592_Regression/Makefile.am
+++ /dev/null
@@ -1,120 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1592_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_1592_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  ServantLocator.h \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1592_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ServantLocator.cpp \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  ServantLocator.h \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/POA/Bug_1592_Regression/ServantLocator.cpp b/tests/POA/Bug_1592_Regression/ServantLocator.cpp
index 58e7a244d4c..b46f29f82bd 100644
--- a/tests/POA/Bug_1592_Regression/ServantLocator.cpp
+++ b/tests/POA/Bug_1592_Regression/ServantLocator.cpp
@@ -1,14 +1,8 @@
-#include "ServantLocator.h"
-
-
-ACE_RCSID (ServantLocator,
-           ServantLocator,
-           "$Id$")
-
+// $Id$
 
+#include "ServantLocator.h"
 #include "test_i.h"
 
-
 extern CORBA::Boolean receive_request_service_contexts_called;
 extern CORBA::Boolean ending_interception_point_called;
 
diff --git a/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp b/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
index 0c22259babf..b6aff9b68d2 100644
--- a/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
+++ b/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
@@ -1,9 +1,6 @@
-#include "Server_ORBInitializer.h"
-
-ACE_RCSID (ServantLocator,
-           Server_ORBInitializer,
-           "$Id$")
+// $Id$
 
+#include "Server_ORBInitializer.h"
 #include "tao/ORB_Constants.h"
 #include "Server_Request_Interceptor.h"
 
diff --git a/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp b/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
index a235fec3cee..38d56a401a0 100644
--- a/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
+++ b/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
@@ -1,10 +1,6 @@
-#include "Server_Request_Interceptor.h"
-
-
-ACE_RCSID (ServantLocator,
-           Server_Request_Interceptor,
-           "$Id$")
+// $Id$
 
+#include "Server_Request_Interceptor.h"
 
 CORBA::Boolean receive_request_service_contexts_called = 0;
 CORBA::Boolean receive_request_called = 0;
diff --git a/tests/POA/Bug_1592_Regression/client.cpp b/tests/POA/Bug_1592_Regression/client.cpp
index 8f40fd25861..f7c91f25a47 100644
--- a/tests/POA/Bug_1592_Regression/client.cpp
+++ b/tests/POA/Bug_1592_Regression/client.cpp
@@ -1,12 +1,8 @@
-#include "ace/Get_Opt.h"
+// $Id$
 
+#include "ace/Get_Opt.h"
 #include "testC.h"
 
-ACE_RCSID (ServantLocator,
-           client,
-           "$Id$")
-
-
 const ACE_TCHAR * ior = 0;
 
 int
diff --git a/tests/POA/Bug_1592_Regression/server.cpp b/tests/POA/Bug_1592_Regression/server.cpp
index eb9f9e71a98..0066751ec00 100644
--- a/tests/POA/Bug_1592_Regression/server.cpp
+++ b/tests/POA/Bug_1592_Regression/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
@@ -6,10 +7,6 @@
 #include "Server_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (ServantLocator,
-           server,
-           "$Id$")
-
 const ACE_TCHAR * ior_file = 0;
 
 int
diff --git a/tests/POA/Bug_1592_Regression/test_i.cpp b/tests/POA/Bug_1592_Regression/test_i.cpp
index 46086a944d2..4d9d57dd008 100644
--- a/tests/POA/Bug_1592_Regression/test_i.cpp
+++ b/tests/POA/Bug_1592_Regression/test_i.cpp
@@ -1,10 +1,6 @@
-#include "test_i.h"
-
-
-ACE_RCSID (ServantLocator,
-           test_i,
-           "$Id$")
+// $Id$
 
+#include "test_i.h"
 
 extern CORBA::Boolean receive_request_called;
 
diff --git a/tests/POA/Bug_2511_Regression/Makefile.am b/tests/POA/Bug_2511_Regression/Makefile.am
deleted file mode 100644
index a84dedbf249..00000000000
--- a/tests/POA/Bug_2511_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Bug_2511_Regression.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Bug_2511_Regression/server.cpp b/tests/POA/Bug_2511_Regression/server.cpp
index ef75c7a91c7..087db823045 100644
--- a/tests/POA/Bug_2511_Regression/server.cpp
+++ b/tests/POA/Bug_2511_Regression/server.cpp
@@ -1,24 +1,20 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/MT_Servant_Locator
-//
-// = FILENAME
-//     server.cpp
-//
-// = DESCRIPTION
-//     This program tests that multiple calls to the Servant Locator
-//     can take place simultaneously.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     server.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests that multiple calls to the Servant Locator
+ *   can take place simultaneously.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
-#include "ace/OS.h"
 #include "tao/PortableServer/ServantLocatorC.h"
 #include "tao/CDR.h"
 
@@ -49,19 +45,19 @@ test_i::test_i (PortableServer::POA_ptr poa)
 void
 test_i::normal (void)
 {
-    ACE_DEBUG ((LM_DEBUG, "executing normal\n"));
+  ACE_DEBUG ((LM_DEBUG, "executing normal\n"));
 }
 
 void
 test_i::exceptional (void)
 {
-    ACE_DEBUG ((LM_DEBUG, "executing exceptional\n"));
+  ACE_DEBUG ((LM_DEBUG, "executing exceptional\n"));
 }
 
 void
 test_i::notexisting (void)
 {
-    ACE_DEBUG ((LM_DEBUG, "executing notexisting\n"));
+  ACE_DEBUG ((LM_DEBUG, "executing notexisting\n"));
 }
 
 class Servant_Locator :
@@ -104,20 +100,20 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
               name.in (), op ));
 
   if (ACE_OS::strcmp (op, "normal") == 0)
-  {
-    ACE_DEBUG ((LM_DEBUG, "returning servant\n"));
-    return &this->servant_;
-  }
+    {
+      ACE_DEBUG ((LM_DEBUG, "returning servant\n"));
+      return &this->servant_;
+    }
   else if (ACE_OS::strcmp (op, "exceptional") == 0)
-  {
-    ACE_DEBUG ((LM_DEBUG, "throwing exception\n"));
-      throw CORBA::INTERNAL();
-  }
+    {
+      ACE_DEBUG ((LM_DEBUG, "throwing exception\n"));
+        throw CORBA::INTERNAL();
+    }
   else
-  {
-    ACE_DEBUG ((LM_DEBUG, "returning NULL\n"));
-    return 0;
-  }
+    {
+      ACE_DEBUG ((LM_DEBUG, "returning NULL\n"));
+      return 0;
+    }
 }
 
 void
@@ -132,10 +128,10 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid,
     PortableServer::ObjectId_to_string (oid);
 
   if (!op)
-  {
-    op = "NULL";
-    ++errorCount;
-  }
+    {
+      op = "NULL";
+      ++errorCount;
+    }
 
   ACE_DEBUG ((LM_DEBUG,
               "Servant_Locator::postinvoke for %C.%C\n",
@@ -146,8 +142,6 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid,
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-  int retval = 0;
-
   try
     {
       CORBA::ORB_var orb =
@@ -201,43 +195,43 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       bool caught = false;
       try
-      {
-        testObject->exceptional();
-      }
+        {
+          testObject->exceptional();
+        }
       catch (const CORBA::Exception&)
-      {
-        ACE_DEBUG ((LM_DEBUG, "exceptional() yielded exception\n"));
-        caught = true;
-      }
+        {
+          ACE_DEBUG ((LM_DEBUG, "exceptional() yielded exception\n"));
+          caught = true;
+        }
       if (!caught) ++errorCount;
 
       caught = false;
       try
-      {
-        testObject->notexisting();
-      }
+        {
+          testObject->notexisting();
+        }
       catch (const CORBA::Exception&)
-      {
-        ACE_DEBUG ((LM_DEBUG, "notexisting() yielded exception\n"));
-        caught = true;
-      }
+        {
+          ACE_DEBUG ((LM_DEBUG, "notexisting() yielded exception\n"));
+          caught = true;
+        }
       if (!caught) ++errorCount;
 
-      if (!errorCount)
-      {
-      ACE_DEBUG ((LM_DEBUG,"test successful\n"));
-      }
-      else
-      {
-      ACE_DEBUG ((LM_DEBUG,"unsuccessfull: %d errors\n", errorCount ));
-      }
-
       orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Exception caught");
-      retval = -1;
+      ++errorCount;
+    }
+
+  if (!errorCount)
+    {
+      ACE_DEBUG ((LM_DEBUG,"test successful\n"));
+    }
+  else
+    {
+      ACE_DEBUG ((LM_DEBUG,"unsuccessfull: %d errors\n", errorCount ));
     }
 
   return errorCount;
diff --git a/tests/POA/Current/Current.cpp b/tests/POA/Current/Current.cpp
index f710a939edc..914f665c636 100644
--- a/tests/POA/Current/Current.cpp
+++ b/tests/POA/Current/Current.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/Current
-//
-// = FILENAME
-//     Current.cpp
-//
-// = DESCRIPTION
-//     This program tests if accessing the POA current before the
-//     RootPOA can cause any problems.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     Current.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests if accessing the POA current before the
+ *   RootPOA can cause any problems.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "tao/ORB.h"
 #include "tao/PortableServer/PortableServer.h"
diff --git a/tests/POA/Current/Makefile.am b/tests/POA/Current/Makefile.am
deleted file mode 100644
index ed1e544b1a9..00000000000
--- a/tests/POA/Current/Makefile.am
+++ /dev/null
@@ -1,46 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Current.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Current
-
-Current_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Current_SOURCES = \
-  Current.cpp
-
-Current_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/DSI/Database_i.cpp b/tests/POA/DSI/Database_i.cpp
index 59a6445c636..0de086a877e 100644
--- a/tests/POA/DSI/Database_i.cpp
+++ b/tests/POA/DSI/Database_i.cpp
@@ -8,10 +8,6 @@
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "ace/Null_Mutex.h"
 
-ACE_RCSID (DSI,
-           Database_i,
-           "$Id$")
-
 DatabaseImpl::Simpler_Database_Malloc::Simpler_Database_Malloc (void)
   //  : DATABASE_MALLOC ()
 {
@@ -199,7 +195,7 @@ DatabaseImpl::Agent::find_entry (const char *key,
                       "Employee") != 0)
     throw Database::Unknown_Type ();
 
-  void *temp;
+  void *temp = 0;
   Database::Entry_var entry;
   if (DATABASE::instance ()->find (key, temp) == 0)
     {
@@ -243,7 +239,7 @@ DatabaseImpl::Agent::destroy_entry (const char *key,
   if (ACE_OS::strcmp (entry_type, "Employee") != 0)
     throw Database::Unknown_Type ();
 
-  void *temp;
+  void *temp = 0;
   if (DATABASE::instance ()->unbind (key, temp) == 0)
     {
       Employee *employee =
diff --git a/tests/POA/DSI/Makefile.am b/tests/POA/DSI/Makefile.am
deleted file mode 100644
index 7e23728b17c..00000000000
--- a/tests/POA/DSI/Makefile.am
+++ /dev/null
@@ -1,120 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.POA_DSI_IDL.am
-
-BUILT_SOURCES = \
-  DatabaseC.cpp \
-  DatabaseC.h \
-  DatabaseC.inl \
-  DatabaseS.cpp \
-  DatabaseS.h \
-  DatabaseS.inl
-
-CLEANFILES = \
-  Database-stamp \
-  DatabaseC.cpp \
-  DatabaseC.h \
-  DatabaseC.inl \
-  DatabaseS.cpp \
-  DatabaseS.h \
-  DatabaseS.inl
-
-DatabaseC.cpp DatabaseC.h DatabaseC.inl DatabaseS.cpp DatabaseS.h DatabaseS.inl: Database-stamp
-
-Database-stamp: $(srcdir)/Database.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Database.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Database.idl
-
-## Makefile.POA_DSI_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  DatabaseC.cpp \
-  client.cpp \
-  Database_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.POA_DSI_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  DatabaseC.cpp \
-  DatabaseS.cpp \
-  Database_i.cpp \
-  server.cpp \
-  Database_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/POA/DSI/client.cpp b/tests/POA/DSI/client.cpp
index 8376117469d..8cadb1d1896 100644
--- a/tests/POA/DSI/client.cpp
+++ b/tests/POA/DSI/client.cpp
@@ -1,19 +1,17 @@
-// $Id$
-
-//===================================================================
-//  = LIBRARY
-//      TAO/tests/POA/DSI/client
-//
-//  = FILENAME
-//     client.cpp
-//
-//  = DESCRIPTION
-//      A client program for the Database IDL module
-//
-//  = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *    A client program for the Database IDL module
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
@@ -22,8 +20,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(DSI, client, "$Id$")
-
 static char *IOR = 0;
 static const ACE_TCHAR *IOR_file = 0;
 static int shutdown_server = 0;
diff --git a/tests/POA/DSI/server.cpp b/tests/POA/DSI/server.cpp
index dd84c80edef..f702a4a42c8 100644
--- a/tests/POA/DSI/server.cpp
+++ b/tests/POA/DSI/server.cpp
@@ -1,26 +1,22 @@
-// $Id$
-
-//===================================================================
-//  = LIBRARY
-//      TAO/tests/POA/Default_Servant/server
-//
-//  = FILENAME
-//      server.cpp
-//
-//  = DESCRIPTION
-//      A server program for the File IDL module
-//
-//  = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
+
+//=============================================================================
+/**
+ *  @file      server.cpp
+ *
+ *  $Id$
+ *
+ *    A server program for the File IDL module
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "Database_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
 
-ACE_RCSID(DSI, server, "$Id$")
-
 static const ACE_TCHAR *ior_output_file = ACE_TEXT ("ior");
 
 static int
diff --git a/tests/POA/Deactivate_Object/Hello.cpp b/tests/POA/Deactivate_Object/Hello.cpp
index f6380be5ae2..8f5c72b2c0a 100644
--- a/tests/POA/Deactivate_Object/Hello.cpp
+++ b/tests/POA/Deactivate_Object/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/POA/Deactivate_Object/Makefile.am b/tests/POA/Deactivate_Object/Makefile.am
deleted file mode 100644
index bfce23023f6..00000000000
--- a/tests/POA/Deactivate_Object/Makefile.am
+++ /dev/null
@@ -1,80 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Deactivate_Object_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Deactivate_Object/server.cpp b/tests/POA/Deactivate_Object/server.cpp
index bddce540e7c..a4ccb0f8198 100644
--- a/tests/POA/Deactivate_Object/server.cpp
+++ b/tests/POA/Deactivate_Object/server.cpp
@@ -3,10 +3,6 @@
 #include "Hello.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/POA/Default_Servant/Default_Servant.cpp b/tests/POA/Default_Servant/Default_Servant.cpp
index 7ec6c3f722d..0a2ada0131d 100644
--- a/tests/POA/Default_Servant/Default_Servant.cpp
+++ b/tests/POA/Default_Servant/Default_Servant.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/Default_Servant
-//
-// = FILENAME
-//     Default_Servant.cpp
-//
-// = DESCRIPTION
-//     This program tests the behavior of POA::id_to_servant() and
-//     POA::reference_to_servant() with the use of default servants.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     Default_Servant.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests the behavior of POA::id_to_servant() and
+ *   POA::reference_to_servant() with the use of default servants.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
 #include "ace/SString.h"
@@ -121,10 +118,10 @@ test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa)
 
   PortableServer::ServantBase_var servant =
     root_poa->reference_to_servant (object.in ());
-  expected_refcount++;
+  ++expected_refcount;
 
   root_poa->deactivate_object (id.in ());
-  expected_refcount--;
+  --expected_refcount;
 
   CORBA::ULong refcount =
     test._refcount_value ();
diff --git a/tests/POA/Default_Servant/Makefile.am b/tests/POA/Default_Servant/Makefile.am
deleted file mode 100644
index 35367f867cb..00000000000
--- a/tests/POA/Default_Servant/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Default_Servant.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Default_Servant
-
-Default_Servant_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Default_Servant_SOURCES = \
-  Default_Servant.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Default_Servant_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Default_Servant2/File.idl b/tests/POA/Default_Servant2/File.idl
index c7476b120b9..e1e156e06ab 100644
--- a/tests/POA/Default_Servant2/File.idl
+++ b/tests/POA/Default_Servant2/File.idl
@@ -1,17 +1,17 @@
-// $Id$
-
-//=================================================================
-//
-// = FILENAME
-//     File.idl
-//
-// = DESCRIPTION
-//     A simple File Descriptor and File System IDL interface.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//==================================================================
+
+//=============================================================================
+/**
+ *  @file     File.idl
+ *
+ *  $Id$
+ *
+ *   A simple File Descriptor and File System IDL interface.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 // IDL
 
diff --git a/tests/POA/Default_Servant2/File_i.cpp b/tests/POA/Default_Servant2/File_i.cpp
index 72236f1fd14..8dadb95ddd7 100644
--- a/tests/POA/Default_Servant2/File_i.cpp
+++ b/tests/POA/Default_Servant2/File_i.cpp
@@ -1,18 +1,18 @@
-// $Id$
-
-//===================================================================
-//
-// = FILENAME
-//     File_i.cpp
-//
-// = DESCRIPTION
-//      Implementation of the File IDL module and the interfaces
-//      Descriptor and System in it.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
+
+//=============================================================================
+/**
+ *  @file     File_i.cpp
+ *
+ *  $Id$
+ *
+ *    Implementation of the File IDL module and the interfaces
+ *    Descriptor and System in it.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "File_i.h"
 #include "ace/OS_NS_stdio.h"
@@ -20,8 +20,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/PortableServer/PortableServer.h"
 
-ACE_RCSID(Default_Servant, File_i, "$Id$")
-
 // IDL File::System constructor
 FileImpl::System::System (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/tests/POA/Default_Servant2/File_i.h b/tests/POA/Default_Servant2/File_i.h
index 5c5de0a4da4..96238ca075e 100644
--- a/tests/POA/Default_Servant2/File_i.h
+++ b/tests/POA/Default_Servant2/File_i.h
@@ -1,82 +1,91 @@
-// $Id$
-
-//===================================================================
-//
-// = FILENAME
-//     File_i.h
-//
-// = DESCRIPTION
-//      Defines the implementation classes for the File IDL
-//     module
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
+
+//=============================================================================
+/**
+ *  @file     File_i.h
+ *
+ *  $Id$
+ *
+ *    Defines the implementation classes for the File IDL
+ *   module
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "FileS.h"
 
+/**
+ * @class FileImpl
+ *
+ * @brief FileImpl class provides the namespace for the File IDL module .
+ */
 class FileImpl
 {
-  // = TITLE
-  //   FileImpl class provides the namespace for the File IDL module .
 public:
+  /**
+   * @class Descriptor
+   *
+   * @brief Descriptor implements the Descriptor interface in the File
+   * Module A single Descriptor servant can serve multiple object
+   * references
+   */
   class Descriptor : public POA_File::Descriptor
   {
-    // = TITLE
-    //   Descriptor implements the Descriptor interface in the File
-    //   Module A single Descriptor servant can serve multiple object
-    //   references
   public:
+    /// Constructor
     Descriptor (PortableServer::POA_ptr poa);
-    // Constructor
 
+    /// Destructor
     ~Descriptor (void);
-    // Destructor
 
+    /// Returns the default POA of this object
     PortableServer::POA_ptr _default_POA (void);
-    // Returns the default POA of this object
 
+    /// write buffer to File corresponding to this Descriptor
     virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer);
-    // write buffer to File corresponding to this Descriptor
 
     virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes);
 
+    /// seek to the offset in file from whence
     virtual CORBA::ULong lseek (CORBA::ULong offset,
                                 CORBA::Long whence);
-    // seek to the offset in file from whence
 
+    /// closes the file corresponding to the requested ObjectID
     virtual void destroy (void);
-    // closes the file corresponding to the requested ObjectID
 
   private:
 
+    /// Extracts the ACE_HANDLE from the objectID
     ACE_HANDLE fd (void);
-    // Extracts the ACE_HANDLE from the objectID
 
     PortableServer::POA_var poa_;
   };
 
+  /**
+   * @class System
+   *
+   * @brief File System implementation class.
+   */
   class System : public POA_File::System
   {
-    // = TITLE
-    //   File System implementation class.
   public:
+    /// Constructor, Creates a single File Descriptor Servant and
+    /// registers it with the POA as the Default Servant
     System (CORBA::ORB_ptr orb,
             PortableServer::POA_ptr poa);
-    // Constructor, Creates a single File Descriptor Servant and
-    // registers it with the POA as the Default Servant
 
+    ///Destructor
     ~System (void);
-    //Destructor
 
+    ///Returns the default POA of this object
     PortableServer::POA_ptr _default_POA (void);
-    //Returns the default POA of this object
 
+    /// Opens a file ,creates a Descriptor reference with the
+    /// ACE_HANDLE and returns that reference
     File::Descriptor_ptr open (const char *file_name,
                                CORBA::Long flags);
-    // Opens a file ,creates a Descriptor reference with the
-    // ACE_HANDLE and returns that reference
 
     void shutdown (void);
   private:
@@ -84,8 +93,8 @@ public:
 
     PortableServer::POA_var poa_;
 
+    /// The single File Descriptor servant which serves requests for
+    /// any Descriptor object under poa_.
     Descriptor fd_servant_;
-    // The single File Descriptor servant which serves requests for
-    // any Descriptor object under poa_.
   };
 };
diff --git a/tests/POA/Default_Servant2/Makefile.am b/tests/POA/Default_Servant2/Makefile.am
deleted file mode 100644
index 3b07504808f..00000000000
--- a/tests/POA/Default_Servant2/Makefile.am
+++ /dev/null
@@ -1,110 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.POA_Default_Servant_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  FileC.cpp \
-  FileC.h \
-  FileC.inl \
-  FileS.cpp \
-  FileS.h \
-  FileS.inl
-
-CLEANFILES = \
-  File-stamp \
-  FileC.cpp \
-  FileC.h \
-  FileC.inl \
-  FileS.cpp \
-  FileS.h \
-  FileS.inl
-
-FileC.cpp FileC.h FileC.inl FileS.cpp FileS.h FileS.inl: File-stamp
-
-File-stamp: $(srcdir)/File.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/File.idl
-	@touch $@
-
-noinst_HEADERS = \
-  File.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.POA_Default_Servant_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  FileC.cpp \
-  client.cpp \
-  File_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.POA_Default_Servant_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  FileC.cpp \
-  FileS.cpp \
-  File_i.cpp \
-  server.cpp \
-  File_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Default_Servant2/client.cpp b/tests/POA/Default_Servant2/client.cpp
index 2140127120a..70cfde5879e 100644
--- a/tests/POA/Default_Servant2/client.cpp
+++ b/tests/POA/Default_Servant2/client.cpp
@@ -1,29 +1,26 @@
-// $Id$
-
-//===================================================================
-//  = LIBRARY
-//      TAO/tests/POA/Default_Servant/client
-//
-//  = FILENAME
-//     client.cpp
-//
-//  = DESCRIPTION
-//      A client program for the File IDL module
-//
-//  = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *    A client program for the File IDL module
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "FileC.h"
 #include "tao/debug.h"
 #include "ace/streams.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
-#include "ace/OS.h"
 #include "ace/SString.h"
-
-ACE_RCSID(Default_Servant, client, "$Id$")
+#include "ace/OS_NS_fcntl.h"
+#include "ace/OS_NS_unistd.h"
 
 static const ACE_TCHAR *iorfile = 0;
 static const ACE_TCHAR *filename = ACE_TEXT ("test");
diff --git a/tests/POA/Default_Servant2/server.cpp b/tests/POA/Default_Servant2/server.cpp
index 53cf482e0a9..c4bf0788b75 100644
--- a/tests/POA/Default_Servant2/server.cpp
+++ b/tests/POA/Default_Servant2/server.cpp
@@ -1,19 +1,17 @@
-// $Id$
-
-//===================================================================
-//  = LIBRARY
-//      TAO/tests/POA/Default_Servant/server
-//
-//  = FILENAME
-//      server.cpp
-//
-//  = DESCRIPTION
-//      A server program for the File IDL module
-//
-//  = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
+
+//=============================================================================
+/**
+ *  @file      server.cpp
+ *
+ *  $Id$
+ *
+ *    A server program for the File IDL module
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "File_i.h"
 #include "tao/debug.h"
@@ -22,8 +20,6 @@
 #include "ace/SString.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Default_Servant, server, "$Id$")
-
 static const ACE_TCHAR *ior_output_file = ACE_TEXT ("ior");
 
 static int
diff --git a/tests/POA/EndpointPolicy/EndpointPolicy.mpc b/tests/POA/EndpointPolicy/EndpointPolicy.mpc
index a100d5a8e5e..35f5976c43a 100644
--- a/tests/POA/EndpointPolicy/EndpointPolicy.mpc
+++ b/tests/POA/EndpointPolicy/EndpointPolicy.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project(*idl): taoidldefaults {
-  idlflags += -Sa -St
   IDL_Files {
     Test.idl
   }
diff --git a/tests/POA/EndpointPolicy/Hello.cpp b/tests/POA/EndpointPolicy/Hello.cpp
index df5dc90d3d9..0f62f20b906 100644
--- a/tests/POA/EndpointPolicy/Hello.cpp
+++ b/tests/POA/EndpointPolicy/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/POA/EndpointPolicy/Makefile.am b/tests/POA/EndpointPolicy/Makefile.am
deleted file mode 100644
index 637c39ab0de..00000000000
--- a/tests/POA/EndpointPolicy/Makefile.am
+++ /dev/null
@@ -1,109 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.EndpointPolicy_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.EndpointPolicy_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.EndpointPolicy_Server.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_EndpointPolicy.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/POA/EndpointPolicy/client.cpp b/tests/POA/EndpointPolicy/client.cpp
index 0ee720ca386..d5043541f5d 100644
--- a/tests/POA/EndpointPolicy/client.cpp
+++ b/tests/POA/EndpointPolicy/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 int bad_ior = 0;
 
@@ -34,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/POA/EndpointPolicy/multi_prot.conf b/tests/POA/EndpointPolicy/multi_prot.conf
index 0e7da86541c..e43fb7004f8 100644
--- a/tests/POA/EndpointPolicy/multi_prot.conf
+++ b/tests/POA/EndpointPolicy/multi_prot.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 static DIOP_Factory
 static Advanced_Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory DIOP_Factory"
diff --git a/tests/POA/EndpointPolicy/server.cpp b/tests/POA/EndpointPolicy/server.cpp
index ea2a57820ba..3b2f0887539 100644
--- a/tests/POA/EndpointPolicy/server.cpp
+++ b/tests/POA/EndpointPolicy/server.cpp
@@ -11,10 +11,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *good_ior_file = ACE_TEXT ("good.ior");
 const ACE_TCHAR *bad_ior_file = ACE_TEXT ("bad.ior");
 const ACE_TCHAR *root_ior_file = ACE_TEXT("root.ior");
@@ -96,7 +92,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                          argv [0]),
                         -1);
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/POA/Etherealization/Etherealization.cpp b/tests/POA/Etherealization/Etherealization.cpp
index 498dd087888..c5b086aa895 100644
--- a/tests/POA/Etherealization/Etherealization.cpp
+++ b/tests/POA/Etherealization/Etherealization.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/Etherealization
-//
-// = FILENAME
-//     Etherealization.cpp
-//
-// = DESCRIPTION
-//     This program tests for deactivation and etherealization of
-//     reference counted and non reference counted servants.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     Etherealization.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests for deactivation and etherealization of
+ *   reference counted and non reference counted servants.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
 #include "ace/OS_NS_string.h"
diff --git a/tests/POA/Etherealization/Makefile.am b/tests/POA/Etherealization/Makefile.am
deleted file mode 100644
index cd2b4410aa8..00000000000
--- a/tests/POA/Etherealization/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Etherealization.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Etherealization
-
-Etherealization_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Etherealization_SOURCES = \
-  Etherealization.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Etherealization_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
index 1f159c8cc13..9f7f101b28b 100644
--- a/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
+++ b/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
@@ -1,23 +1,20 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/Excessive_Object_Deactivations
-//
-// = FILENAME
-//     Excessive_Object_Deactivations.cpp
-//
-// = DESCRIPTION
-//     This program tests for excessive deactivations of a servant.
-//     The test checks excessive deactivations in a POA with SYSTEM_ID
-//     and other POA with USER_ID.  The test also check for excessive
-//     deactivations during upcalls.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     Excessive_Object_Deactivations.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests for excessive deactivations of a servant.
+ *   The test checks excessive deactivations in a POA with SYSTEM_ID
+ *   and other POA with USER_ID.  The test also check for excessive
+ *   deactivations during upcalls.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
 
diff --git a/tests/POA/Excessive_Object_Deactivations/Makefile.am b/tests/POA/Excessive_Object_Deactivations/Makefile.am
deleted file mode 100644
index 5a4cd97f714..00000000000
--- a/tests/POA/Excessive_Object_Deactivations/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Excessive_Object_Deactivations.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Excessive_Object_Deactivations
-
-Excessive_Object_Deactivations_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Excessive_Object_Deactivations_SOURCES = \
-  Excessive_Object_Deactivations.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Excessive_Object_Deactivations_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h b/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h
index f0a316eee8e..898bad28526 100644
--- a/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h
+++ b/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h
@@ -7,8 +7,6 @@
 #ifndef Alt_Resource_Factory_EXPORT_H
 #define Alt_Resource_Factory_EXPORT_H
 
-#include "ace/OS.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
diff --git a/tests/POA/Explicit_Activation/Alt_Resources/Makefile.am b/tests/POA/Explicit_Activation/Alt_Resources/Makefile.am
deleted file mode 100644
index 6418d4a8979..00000000000
--- a/tests/POA/Explicit_Activation/Alt_Resources/Makefile.am
+++ /dev/null
@@ -1,47 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Alt_Resource.am
-
-if BUILD_EXCEPTIONS
-if BUILD_WFMO
-
-noinst_LTLIBRARIES = libAlt_Resource_Factory.la
-
-libAlt_Resource_Factory_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DAlt_Resource_Factory_BUILD_DLL
-
-libAlt_Resource_Factory_la_SOURCES = \
-  Resource_Factory.cpp
-
-noinst_HEADERS = \
-  Alt_Resource_Factory.h \
-  Resource_Factory.h
-
-endif BUILD_WFMO
-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/tests/POA/Explicit_Activation/Makefile.am b/tests/POA/Explicit_Activation/Makefile.am
deleted file mode 100644
index ff427e6ce7a..00000000000
--- a/tests/POA/Explicit_Activation/Makefile.am
+++ /dev/null
@@ -1,56 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-SUBDIRS = \
-        . \
-        Alt_Resources
-
-
-## Makefile.POA_Explicit_Activation_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant \
-  -I../Generic_Servant
-
-server_SOURCES = \
-  server.cpp
-
-server_LDFLAGS = \
-  -L../Generic_Servant
-
-server_LDADD = \
-  $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/POA/Explicit_Activation/alternate.conf b/tests/POA/Explicit_Activation/alternate.conf
index 262dc5b4308..b1b8d3f22a8 100644
--- a/tests/POA/Explicit_Activation/alternate.conf
+++ b/tests/POA/Explicit_Activation/alternate.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # Refer to Alternate_Resource_Factory/README for details
 
 dynamic Resource_Factory Service_Object * Alt_Resources/Alt_Resource_Factory:_make_My_Resource_Factory()
diff --git a/tests/POA/Explicit_Activation/server.cpp b/tests/POA/Explicit_Activation/server.cpp
index 42c2663520b..54d1e76aa4d 100644
--- a/tests/POA/Explicit_Activation/server.cpp
+++ b/tests/POA/Explicit_Activation/server.cpp
@@ -1,28 +1,23 @@
-// $Id$
-
-// ================================================================
-//
-// = LIBRARY
-//    TAO/tests/POA/Explicit_Activation
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    Explicit creation of servants.
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  Explicit creation of servants.
+ *
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Explicit_Activation, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("ior");
 
 static int
diff --git a/tests/POA/FindPOA/FindPOA.cpp b/tests/POA/FindPOA/FindPOA.cpp
index 0d781c5f0ce..d7e3c868aa8 100644
--- a/tests/POA/FindPOA/FindPOA.cpp
+++ b/tests/POA/FindPOA/FindPOA.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-//===========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/FindPOA
-//
-// = FILENAME
-//     FindPOA.cpp
-//
-// = DESCRIPTION
-//     This Program tests the find_POA method of a POA.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//===========================================================================
+
+//=============================================================================
+/**
+ *  @file     FindPOA.cpp
+ *
+ *  $Id$
+ *
+ *   This Program tests the find_POA method of a POA.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Adapter_Activator.h"
@@ -23,10 +20,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/SString.h"
 
-ACE_RCSID (FindPOA,
-           FindPOA,
-           "$Id$")
-
 void
 find_non_existant_POA (PortableServer::POA_ptr parent,
                        const char *child_poa_name,
diff --git a/tests/POA/FindPOA/Makefile.am b/tests/POA/FindPOA/Makefile.am
deleted file mode 100644
index 2e62250678d..00000000000
--- a/tests/POA/FindPOA/Makefile.am
+++ /dev/null
@@ -1,46 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_FindPOA.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = FindPOA
-
-FindPOA_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-FindPOA_SOURCES = \
-  FindPOA.cpp
-
-FindPOA_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Forwarding/Makefile.am b/tests/POA/Forwarding/Makefile.am
deleted file mode 100644
index a1853b3178d..00000000000
--- a/tests/POA/Forwarding/Makefile.am
+++ /dev/null
@@ -1,113 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.POA_Forwarding_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.POA_Forwarding_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  Servant_Activator.h \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.POA_Forwarding_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Servant_Activator.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Servant_Activator.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Forwarding/Servant_Activator.cpp b/tests/POA/Forwarding/Servant_Activator.cpp
index 49f4d0825bd..605a43debaf 100644
--- a/tests/POA/Forwarding/Servant_Activator.cpp
+++ b/tests/POA/Forwarding/Servant_Activator.cpp
@@ -3,10 +3,8 @@
 #include "Servant_Activator.h"
 #include "test_i.h"
 
-ACE_RCSID(Forwarding, Servant_Activator, "$Id$")
-
-  ServantActivator::ServantActivator (CORBA::ORB_ptr orb,
-                                      CORBA::Object_ptr forward_to)
+ServantActivator::ServantActivator (CORBA::ORB_ptr orb,
+                                    CORBA::Object_ptr forward_to)
     : orb_ (CORBA::ORB::_duplicate (orb)),
       forward_to_ (CORBA::Object::_duplicate (forward_to))
 {
diff --git a/tests/POA/Forwarding/Servant_Activator.h b/tests/POA/Forwarding/Servant_Activator.h
index 57a31ea1bb8..e2e81975774 100644
--- a/tests/POA/Forwarding/Servant_Activator.h
+++ b/tests/POA/Forwarding/Servant_Activator.h
@@ -1,23 +1,19 @@
 // -*- C++ -*-
-// $Id$
-
-// ================================================================
-//
-// = LIBRARY
-//     TAO/examples/POA/Forwarding
-//
-// = FILENAME
-//     Servant_Activator.h
-//
-// = DESCRIPTION
-//     Defines a ServantActivator class, used with a POA having a
-//     RETAIN policy
-//
-// = AUTHOR
-//     Irfan Pyarali
-//     Michael Kircher
-//
-// ================================================================
+
+//=============================================================================
+/**
+ *  @file     Servant_Activator.h
+ *
+ *  $Id$
+ *
+ *   Defines a ServantActivator class, used with a POA having a
+ *   RETAIN policy
+ *
+ *
+ *  @author  Irfan Pyarali  Michael Kircher
+ */
+//=============================================================================
+
 
 #ifndef SERVANT_ACTIVATOR_H
 #define SERVANT_ACTIVATOR_H
@@ -47,14 +43,14 @@ public:
                             CORBA::Boolean cleanup_in_progress,
                             CORBA::Boolean remaining_activations);
 
+  /// Object should be forwarded from now on.
   void forward_requests (void);
-  // Object should be forwarded from now on.
 
 private:
   CORBA::ORB_var orb_;
 
+  /// Location to forward to
   CORBA::Object_var forward_to_;
-  // Location to forward to
 };
 
 #endif /* SERVANT_ACTIVATOR_H */
diff --git a/tests/POA/Forwarding/client.cpp b/tests/POA/Forwarding/client.cpp
index fad5e856b92..11f800e37f8 100644
--- a/tests/POA/Forwarding/client.cpp
+++ b/tests/POA/Forwarding/client.cpp
@@ -1,28 +1,25 @@
-// $Id$
-
-//==========================================================================
-//
-//
-// = FILENAME
-//     client.cpp
-//
-// = DESCRIPTION
-//
-//     This is a simple test client implementation.  Also looks out
-//     for forwarding exceptions
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//==========================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *
+ *   This is a simple test client implementation.  Also looks out
+ *   for forwarding exceptions
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "ace/streams.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "testC.h"
 
-ACE_RCSID(Forwarding, client, "$Id$")
-
 static ACE_TCHAR *IOR = 0;
 static int servers = 2;
 static int iterations = 3;
diff --git a/tests/POA/Forwarding/server.cpp b/tests/POA/Forwarding/server.cpp
index 444b323a98f..b73de679875 100644
--- a/tests/POA/Forwarding/server.cpp
+++ b/tests/POA/Forwarding/server.cpp
@@ -1,29 +1,24 @@
-// $Id$
-
-// ========================================================================
-// = LIBRARY
-//    TAO/examples/POA/Forwarding
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    Server that receives requests.  The server can be asked to
-//    forward new requests to another server.
-//
-// = AUTHOR
-//    Irfan Pyarali
-//    Michael Kircher
-//
-// ========================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  Server that receives requests.  The server can be asked to
+ *  forward new requests to another server.
+ *
+ *
+ *  @author Irfan Pyarali Michael Kircher
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "Servant_Activator.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Forwarding, server, "$Id$")
-
 static const ACE_TCHAR *ior_output_file = 0;
 static const ACE_TCHAR *forward_to_ior = 0;
 
diff --git a/tests/POA/Forwarding/test_i.cpp b/tests/POA/Forwarding/test_i.cpp
index b973b929ffc..e5869d89c06 100644
--- a/tests/POA/Forwarding/test_i.cpp
+++ b/tests/POA/Forwarding/test_i.cpp
@@ -3,8 +3,6 @@
 #include "test_i.h"
 #include "Servant_Activator.h"
 
-ACE_RCSID(Forwarding, test_i, "$Id$")
-
 // Constructor
 test_i::test_i (CORBA::ORB_ptr orb,
                 PortableServer::POA_ptr poa,
diff --git a/tests/POA/Forwarding/test_i.h b/tests/POA/Forwarding/test_i.h
index 023e60b962a..ce1fbff6f14 100644
--- a/tests/POA/Forwarding/test_i.h
+++ b/tests/POA/Forwarding/test_i.h
@@ -1,17 +1,17 @@
-// $Id$
 //=============================================================================
-//
-// = FILENAME
-//     test_i.h
-//
-// = DESCRIPTION
-//     Defines test_i class for the test interface
-//
-// = AUTHOR
-//     Irfan Pyarali and Michael Kircher
-//
+/**
+ *  @file     test_i.h
+ *
+ *  $Id$
+ *
+ *   Defines test_i class for the test interface
+ *
+ *
+ *  @author  Irfan Pyarali and Michael Kircher
+ */
 //=============================================================================
 
+
 #include "testS.h"
 
 class ServantActivator;
@@ -32,8 +32,8 @@ public:
 
   virtual void shutdown (void);
 
+  /// Returns the default POA for this servant.
   virtual PortableServer::POA_ptr _default_POA (void);
-  // Returns the default POA for this servant.
 
 protected:
   CORBA::ORB_var orb_;
diff --git a/tests/POA/Generic_Servant/Makefile.am b/tests/POA/Generic_Servant/Makefile.am
deleted file mode 100644
index 3bc9fab28c9..00000000000
--- a/tests/POA/Generic_Servant/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Generic_Servant_Lib.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h $(srcdir)/test.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libGeneric_Servant.la
-
-libGeneric_Servant_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DGENERIC_SERVANT_BUILD_DLL
-
-libGeneric_Servant_la_SOURCES = \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp
-
-noinst_HEADERS = \
-  test.idl \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.POA_Generic_Servant_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  generic_servant_export.h \
-  test_i.h
-
-client_LDADD = \
-  libGeneric_Servant.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-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/tests/POA/Generic_Servant/client.cpp b/tests/POA/Generic_Servant/client.cpp
index b00706c55da..2d6f2520451 100644
--- a/tests/POA/Generic_Servant/client.cpp
+++ b/tests/POA/Generic_Servant/client.cpp
@@ -6,8 +6,6 @@
 #include "ace/Read_Buffer.h"
 #include "testC.h"
 
-ACE_RCSID(Generic_Servant, client, "$Id$")
-
 static ACE_TCHAR *IOR = 0;
 static int iterations = 1;
 static int oneway = 0;
diff --git a/tests/POA/Generic_Servant/test_i.cpp b/tests/POA/Generic_Servant/test_i.cpp
index 787cbbd889e..2335e268f06 100644
--- a/tests/POA/Generic_Servant/test_i.cpp
+++ b/tests/POA/Generic_Servant/test_i.cpp
@@ -4,8 +4,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Generic_Servant, test_i, "$Id$")
-
 // Constructor
 test_i::test_i (CORBA::ORB_ptr orb,
                 PortableServer::POA_ptr poa)
diff --git a/tests/POA/Generic_Servant/test_i.h b/tests/POA/Generic_Servant/test_i.h
index 24094760497..cc3c834acb5 100644
--- a/tests/POA/Generic_Servant/test_i.h
+++ b/tests/POA/Generic_Servant/test_i.h
@@ -1,53 +1,52 @@
-// $Id$
 //=============================================================================
-//
-//
-// = FILENAME
-//     test_i.h
-//
-// = DESCRIPTION
-//     Defines test_i class for the test interface
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
+/**
+ *  @file     test_i.h
+ *
+ *  $Id$
+ *
+ *   Defines test_i class for the test interface
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
 //=============================================================================
 
+
 #include "testS.h"
 
 class GENERIC_SERVANT_Export test_i : public POA_test
 {
 public:
+  /// Constructor - takes a POA and a value parameter
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
-  // Constructor - takes a POA and a value parameter
 
+  /// Returns the Default POA of this servant
   PortableServer::POA_ptr _default_POA (void);
-  // Returns the Default POA of this servant
 
+  /// A twoway operation.
   void method (void);
-  // A twoway operation.
 
+  /// A oneway operation.
   void oneway_method (void);
-  // A oneway operation.
 
+  /// A timed twoway operation.
   void timed_method (CORBA::ULong timeout);
-  // A timed twoway operation.
 
+  /// A timed twoway operation.
   void timed_oneway_method (CORBA::ULong timeout);
-  // A timed twoway operation.
 
+  /// Shutdown the ORB
   void shutdown (void);
-  // Shutdown the ORB
 
+  /// Sleep for some time.
   void sleep (CORBA::ULong timeout,
               const char *operation);
-  // Sleep for some time.
 
 protected:
+  /// Our ORB.
   CORBA::ORB_var orb_;
-  // Our ORB.
 
+  /// Our POA.
   PortableServer::POA_var poa_;
-  // Our POA.
 };
diff --git a/tests/POA/Identity/Identity.cpp b/tests/POA/Identity/Identity.cpp
index 4474adba7a5..5d544812401 100644
--- a/tests/POA/Identity/Identity.cpp
+++ b/tests/POA/Identity/Identity.cpp
@@ -1,26 +1,23 @@
-// $Id$
-
-// ==================================================
-// = LIBRARY
-//    TAO/test/POA/Identity
-//
-// = FILENAME
-//    Identity.cpp
-//
-// = DESCRIPTION
-//    This program demonstrates and tests how to move between id,
-//    reference, and servants.
-//
-// = AUTHOR
-//    Irfan Pyarali
-// ==================================================
+
+//=============================================================================
+/**
+ *  @file    Identity.cpp
+ *
+ *  $Id$
+ *
+ *  This program demonstrates and tests how to move between id,
+ *  reference, and servants.
+ *
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
 #include "tao/ORB_Core.h"
 #include "tao/Server_Strategy_Factory.h"
 
-ACE_RCSID(Identity, Identity, "$Id$")
-
 class test_i : public POA_test
 {
 public:
diff --git a/tests/POA/Identity/Makefile.am b/tests/POA/Identity/Makefile.am
deleted file mode 100644
index 307d67d650d..00000000000
--- a/tests/POA/Identity/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Identity.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Identity
-
-Identity_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Identity_SOURCES = \
-  Identity.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Identity_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Loader/Makefile.am b/tests/POA/Loader/Makefile.am
deleted file mode 100644
index fb675280511..00000000000
--- a/tests/POA/Loader/Makefile.am
+++ /dev/null
@@ -1,52 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Loader_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Servant_Activator.cpp \
-  Servant_Locator.cpp \
-  Server_Manager.cpp \
-  server.cpp \
-  Servant_Activator.h \
-  Servant_Locator.h \
-  Server_Manager.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Loader/Servant_Activator.cpp b/tests/POA/Loader/Servant_Activator.cpp
index 76650d877d2..9f274cb60a4 100644
--- a/tests/POA/Loader/Servant_Activator.cpp
+++ b/tests/POA/Loader/Servant_Activator.cpp
@@ -1,29 +1,22 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//     TAO/examples/POA/Loader
-//
-// = FILENAME
-//     Servant_Activator.cpp
-//
-// = DESCRIPTION
-//     Implementation of <ServantActivator>, which is used by a POA
-//     with a RETAIN policy.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file     Servant_Activator.cpp
+ *
+ *  $Id$
+ *
+ *   Implementation of <ServantActivator>, which is used by a POA
+ *   with a RETAIN policy.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Servant_Activator.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Loader,
-           Servant_Activator,
-           "$Id$")
-
 // Initialization.The dllname is used by the Loactor to load it into
 // memory. The factory function is the point of entry into the dll and
 // is used for obtaining the servant. The garbage_collection_function
diff --git a/tests/POA/Loader/Servant_Activator.h b/tests/POA/Loader/Servant_Activator.h
index 2b00f10541a..7f1815ac5ed 100644
--- a/tests/POA/Loader/Servant_Activator.h
+++ b/tests/POA/Loader/Servant_Activator.h
@@ -1,22 +1,17 @@
 // This may look like C, but it's really -*- C++ -*-
-// $Id$
 
-// ================================================================
-//
-// = LIBRARY
-//     TAO/examples/POA/On_Demand_Loading
-//
-// = FILENAME
-//     Servant_Activator.h
-//
-// = DESCRIPTION
-//     Defines a <ServantActivator> class, which activates a servant by
-//     obtaining it and associates it with an object on-demand.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ================================================================
+//=============================================================================
+/**
+ *  @file     Servant_Activator.h
+ *
+ *  $Id$
+ *
+ *   Defines a <ServantActivator> class, which activates a servant by
+ *   obtaining it and associates it with an object on-demand.
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
 
 #ifndef SERVANT_ACTIVATOR_H
 #define SERVANT_ACTIVATOR_H
@@ -30,76 +25,84 @@
 #include "ace/DLL.h"
 #include "ace/Log_Msg.h"
 
+/**
+ * Servant Activator for the test servant.
+ *
+ * This class associates an unassociated servant with an object in
+ * the POA Active Object Map.
+ */
 class ServantActivator :
   public virtual PortableServer::ServantActivator,
   public virtual ::CORBA::LocalObject
 {
-  //= TITLE
-  //   Servant Activator for the test servant.
-  //
-  //= DESCRIPTION
-  //   This class associates an unassociated servant with an object in
-  //   the POA Active Object Map.
 public:
+  /**
+   * This typedef is used to typecast the void* obtained when finding
+   * a symbol in the dll. Invoking the function pointer obtained would
+   * get a servant.
+   */
   typedef PortableServer::Servant
            (*SERVANT_FACTORY) (const PortableServer::ObjectId &oid,
                                PortableServer::POA_ptr poa,
                                CORBA::ORB_ptr orb);
-  // This typedef is used to typecast the void* obtained when finding
-  // a symbol in the dll. Invoking the function pointer obtained would
-  // get a servant.
 
+  /**
+   * This typedef is used to obtain the garbage_collection_function symbol
+   * in the dll. Invoking the function pointer obtained would then destroy
+   * the servant.
+   */
   typedef void
           (*SERVANT_GARBAGE_COLLECTOR) (const PortableServer::ObjectId &oid,
                                         PortableServer::POA_ptr,
                                         PortableServer::Servant servant);
-  // This typedef is used to obtain the garbage_collection_function symbol
-  // in the dll. Invoking the function pointer obtained would then destroy
-  // the servant.
 
+  /// Initialization.
   ServantActivator (CORBA::ORB_ptr orb,
                     const ACE_TCHAR *dllname,
                     const ACE_TCHAR *factory_function,
                     const ACE_TCHAR *garbage_collection_function);
-  // Initialization.
 
+  /**
+   * This method is invoked by a POA with USE_SERVANT_MANAGER and
+   * RETAIN policies, whenever it receives a request for a
+   * test object that is not currently active. When an servant
+   * pointer corresponding to objectId is not found in the Active
+   * Object Map, the POA hands over the job of obtaining the servant
+   * to the Servant Manager. Depending upon whether the POA is created
+   * with RETAIN or NON_RETAIN as the servant_retention policy, the
+   * Servant Activator or the Servant Locator interface is invoked
+   * respectively.
+   */
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr poa);
-  // This method is invoked by a POA with USE_SERVANT_MANAGER and
-  // RETAIN policies, whenever it receives a request for a
-  // test object that is not currently active. When an servant
-  // pointer corresponding to objectId is not found in the Active
-  // Object Map, the POA hands over the job of obtaining the servant
-  // to the Servant Manager. Depending upon whether the POA is created
-  // with RETAIN or NON_RETAIN as the servant_retention policy, the
-  // Servant Activator or the Servant Locator interface is invoked
-  // respectively.
 
+  /**
+   * This method is invoked whenever a test object is
+   * deactivated. This occurs when the POA is destroyed or the Object
+   * is deactivated. When the POA is getting destroyed, it needs to
+   * deactivate every object in the Active Object Map and on that call
+   * the ServantActivator invokes this method which will destroy the
+   * servant associated with the object.
+   */
   virtual void etherealize (const PortableServer::ObjectId &oid,
                             PortableServer::POA_ptr adapter,
                             PortableServer::Servant servant,
                             CORBA::Boolean cleanup_in_progress,
                             CORBA::Boolean remaining_activations);
-  // This method is invoked whenever a test object is
-  // deactivated. This occurs when the POA is destroyed or the Object
-  // is deactivated. When the POA is getting destroyed, it needs to
-  // deactivate every object in the Active Object Map and on that call
-  // the ServantActivator invokes this method which will destroy the
-  // servant associated with the object.
 
 private:
+  /// The ACE_DLL object which performs the task of loading the dll
+  /// and accessing it.
   ACE_DLL dll_;
-  // The ACE_DLL object which performs the task of loading the dll
-  // and accessing it.
 
+  /// The function pointer of factory_function type.
   SERVANT_FACTORY servant_supplier_;
-  // The function pointer of factory_function type.
 
+  /// The function pointer of garbage_collection_function type.
   SERVANT_GARBAGE_COLLECTOR servant_garbage_collector_;
-  // The function pointer of garbage_collection_function type.
 
+  /// A reference to the ORB.
   CORBA::ORB_var orb_;
-  // A reference to the ORB.
 };
 
 #endif /* SERVANT_ACTIVATOR_H */
diff --git a/tests/POA/Loader/Servant_Locator.cpp b/tests/POA/Loader/Servant_Locator.cpp
index c7c91e02667..7faaa0a429d 100644
--- a/tests/POA/Loader/Servant_Locator.cpp
+++ b/tests/POA/Loader/Servant_Locator.cpp
@@ -1,29 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO/examples/POA/Loader
-//
-// = FILENAME
-//     Servant_Locator.cpp
-//
-// = DESCRIPTION
-//     Implementation of ServantLocator class, used with a POA
-//     having a NON_RETAIN policy.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file     Servant_Locator.cpp
+ *
+ *  $Id$
+ *
+ *   Implementation of ServantLocator class, used with a POA
+ *   having a NON_RETAIN policy.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Servant_Locator.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Loader,
-           Servant_Locator,
-           "$Id$")
-
 // Initialization.The dllname is used by the Loactor to load it into
 // memory. The factory function is the point of entry into the dll and
 // is used for obtaining the servant. The garbage_collection_function
diff --git a/tests/POA/Loader/Servant_Locator.h b/tests/POA/Loader/Servant_Locator.h
index 2c4c64a92a4..050856983b3 100644
--- a/tests/POA/Loader/Servant_Locator.h
+++ b/tests/POA/Loader/Servant_Locator.h
@@ -1,22 +1,19 @@
 // This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ================================================================
-//
-// = LIBRARY
-//     TAO/examples/POA/Loader
-//
-// = FILENAME
-//     Servant_Locator.h
-//
-// = DESCRIPTION
-//     Defines a ServantLocator class , used with a POA having
-//     a NON_RETAIN policy.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ================================================================
+
+//=============================================================================
+/**
+ *  @file     Servant_Locator.h
+ *
+ *  $Id$
+ *
+ *   Defines a ServantLocator class , used with a POA having
+ *   a NON_RETAIN policy.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef SERVANT_LOCATOR_H
 #define SERVANT_LOCATOR_H
@@ -44,74 +41,82 @@ class ServantLocator :
   //   Manager. It is invoked when the POA has an USE_SERVANT_MANAGER
   //   policy and a servant_retention policy of NON_RETAIN type.
 public:
+  /**
+   * This typedef is used to typecast the void* obtained when finding
+   * a symbol in the dll. Invoking the function pointer obtained would
+   * get a servant.
+   */
   typedef PortableServer::Servant
            (*SERVANT_FACTORY) (const PortableServer::ObjectId &oid,
                                PortableServer::POA_ptr poa,
                                CORBA::ORB_ptr orb);
-  // This typedef is used to typecast the void* obtained when finding
-  // a symbol in the dll. Invoking the function pointer obtained would
-  // get a servant.
 
+  /**
+   * This typedef is used to obtain the garbage_collection_function symbol
+   * in the dll. Invoking the function pointer obtained would then destroy
+   * the servant.
+   */
   typedef void
           (*SERVANT_GARBAGE_COLLECTOR) (const PortableServer::ObjectId &oid,
                                         PortableServer::POA_ptr,
                                         PortableServer::Servant servant);
-  // This typedef is used to obtain the garbage_collection_function symbol
-  // in the dll. Invoking the function pointer obtained would then destroy
-  // the servant.
 
+  /// Constructor.
   ServantLocator (CORBA::ORB_ptr orb,
                   const ACE_TCHAR *dllname,
                   const ACE_TCHAR *factory_function,
                   const ACE_TCHAR *garbage_collection_function);
-  // Constructor.
 
+  /**
+   * This method is invoked by a POA whenever it receives a request
+   * for test object that is not currently active.  When the POA is
+   * created using the NON_RETAIN policy the Active Object Map is not
+   * maintained, in other words, an association between the ObjectId
+   * and the servant is not maintained. Hence every client request the
+   * servant has to be loaded. Note the operation argument. This
+   * argument specifies the operation to be invoked on the
+   * servant. The cookie helps in marking the servant. This marking is
+   * useful while destroying the servant.
+   */
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
                                              PortableServer::ServantLocator::Cookie &the_cookie);
-  // This method is invoked by a POA whenever it receives a request
-  // for test object that is not currently active.  When the POA is
-  // created using the NON_RETAIN policy the Active Object Map is not
-  // maintained, in other words, an association between the ObjectId
-  // and the servant is not maintained. Hence every client request the
-  // servant has to be loaded. Note the operation argument. This
-  // argument specifies the operation to be invoked on the
-  // servant. The cookie helps in marking the servant. This marking is
-  // useful while destroying the servant.
 
+  /**
+   * This method is invoked whenever a test servant completes a
+   * request. As the Servant Loactor interface is used when the POA
+   * doesnt maintain the Active Object Map, its necessary to get rid
+   * of the servant after the client request has been processed. The
+   * appropriate servant is destroyed by verifying the cookie.Again
+   * this method is invoked per client request.
+   */
   virtual void postinvoke (const PortableServer::ObjectId &oid,
                            PortableServer::POA_ptr adapter,
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
                            PortableServer::Servant the_servant);
-  // This method is invoked whenever a test servant completes a
-  // request. As the Servant Loactor interface is used when the POA
-  // doesnt maintain the Active Object Map, its necessary to get rid
-  // of the servant after the client request has been processed. The
-  // appropriate servant is destroyed by verifying the cookie.Again
-  // this method is invoked per client request.
 
 private:
+  /// The name of the dll containing the servant.
   ACE_CString dllname_;
-  // The name of the dll containing the servant.
 
+  /// The symbol which on getting invoked will give us the servant
+  /// pointer.
   ACE_CString create_symbol_;
-  // The symbol which on getting invoked will give us the servant
-  // pointer.
 
+  /// The ACE_DLL object which performs the task of loading the dll
+  /// and accessing it.
   ACE_DLL dll_;
-  // The ACE_DLL object which performs the task of loading the dll
-  // and accessing it.
 
+  /// The function pointer of factory_function type.
   SERVANT_FACTORY servant_supplier_;
-  // The function pointer of factory_function type.
 
+  /// The function pointer of garbage_collection_function type.
   SERVANT_GARBAGE_COLLECTOR servant_garbage_collector_;
-  // The function pointer of garbage_collection_function type.
 
+  /// A reference to the ORB.
   CORBA::ORB_var orb_;
-  // A reference to the ORB.
 };
 
 #endif /* SERVANT_LOCATOR_H */
diff --git a/tests/POA/Loader/Server_Manager.cpp b/tests/POA/Loader/Server_Manager.cpp
index eae582da9c6..3511aeffe3b 100644
--- a/tests/POA/Loader/Server_Manager.cpp
+++ b/tests/POA/Loader/Server_Manager.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Loader, Server_Manager, "$Id$")
-
 Server_i::Server_i (void)
   : ior_output_file_ (0),
     policies_ (4)
diff --git a/tests/POA/Loader/Server_Manager.h b/tests/POA/Loader/Server_Manager.h
index 84d347dc2b4..15db7a8549a 100644
--- a/tests/POA/Loader/Server_Manager.h
+++ b/tests/POA/Loader/Server_Manager.h
@@ -1,102 +1,103 @@
 // This may look like C, but it's really -*- C++ -*-
-// $Id$
 
 //=============================================================================
-//
-// = LIBRARY
-//     TAO/examples/POA/Loader
-//
-// = FILENAME
-//     Server_Manager.h
-//
-// = DESCRIPTION
-//     Helper class for the server application.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
+/**
+ *  @file     Server_Manager.h
+ *
+ *  $Id$
+ *
+ *   Helper class for the server application.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
 //=============================================================================
 
+
 #ifndef SERVER_MANAGER_H
 #define SERVER_MANAGER_H
 
 #include "Servant_Activator.h"
 #include "Servant_Locator.h"
 
+/**
+ * @class Server_i
+ *
+ * @brief This class provides the server application with helper methods
+ *
+ * The various methods required by the server application for
+ * utilizing the ServantActivator and ServantLocator interfaces of
+ * the Servant Manager are implemented by this class.  These
+ * include initialisation procedures of the ServantActivator and
+ * ServantLocator, and creation of POAs with emphasis on the
+ * servant retention policy.
+ */
 class Server_i
 {
-  // = TITLE
-  //   This class provides the server application with helper methods
-  //
-  // = DESCRIPTION
-  //   The various methods required by the server application for
-  //   utilizing the ServantActivator and ServantLocator interfaces of
-  //   the Servant Manager are implemented by this class.  These
-  //   include initialisation procedures of the ServantActivator and
-  //   ServantLocator, and creation of POAs with emphasis on the
-  //   servant retention policy.
 public:
   // = Initialization and termination methods.
+  /// Initialisation.
   Server_i (void);
-  // Initialisation.
 
+  /// Destruction.
   ~Server_i (void);
-  // Destruction.
 
+  /// Initialisation of the ORB and poa.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialisation of the ORB and poa.
 
+  /**
+   * This method creates a POA from the root_poa with emphasis being
+   * on the servant_retention_policy which decides the use of the
+   * ServantActivator or ServantLocator interfaces. The
+   * servent_retention_policy value is 1 for the RETAIN policy and 0
+   * for the NONRETAIN policy.
+   */
   PortableServer::POA_ptr create_poa (const char* name,
                                       int servant_retention_policy);
-  // This method creates a POA from the root_poa with emphasis being
-  // on the servant_retention_policy which decides the use of the
-  // ServantActivator or ServantLocator interfaces. The
-  // servent_retention_policy value is 1 for the RETAIN policy and 0
-  // for the NONRETAIN policy.
 
+  /// A ServantActivator object is created and initialised.
   int create_activator (PortableServer::POA_var first_poa);
-  // A ServantActivator object is created and initialised.
 
+  /// A ServantActivator object is created and initialised.
   int create_locator (PortableServer::POA_var second_poa);
-  // A ServantActivator object is created and initialised.
 
+  /// The server is executed.
   int run (void);
-  // The server is executed.
 
 private:
+  /// Parses the input arguments.
   int parse_args (int argc, ACE_TCHAR **argv);
-  // Parses the input arguments.
 
+  /// The IORs are written to a file for future use.
   int write_iors_to_file (const char *first_ior,
                           const char *second_ior);
-  // The IORs are written to a file for future use.
 
+  /// Default ior file.
   ACE_TCHAR *ior_output_file_;
-  // Default ior file.
 
+  /// The orb pointer.
   CORBA::ORB_var orb_;
-  // The orb pointer.
 
+  /// The poa policicies.
   CORBA::PolicyList policies_;
-  // The poa policicies.
 
+  /// The root_poa which is used for cretaing different child poas.
   PortableServer::POA_var root_poa_;
-  // The root_poa which is used for cretaing different child poas.
 
+  /// The poa_manager object.
   PortableServer::POAManager_var poa_manager_;
-  // The poa_manager object.
 
+  /// The object pointer used by the ServantActivator.
   CORBA::Object_var first_test_;
-  // The object pointer used by the ServantActivator.
 
+  /// The object pointer used by the Servant Locator.
   CORBA::Object_var second_test_;
-  // The object pointer used by the Servant Locator.
 
+  /// The servant activator object.
   ServantActivator *servant_activator_;
-  // The servant activator object.
 
+  /// The servant locator object.
   ServantLocator *servant_locator_;
-  // The servant locator object.
 };
 
 #endif /* SERVER_MANAGER_H */
diff --git a/tests/POA/Loader/run_test.pl b/tests/POA/Loader/run_test.pl
index 0bc52287cac..83dda3bc405 100755
--- a/tests/POA/Loader/run_test.pl
+++ b/tests/POA/Loader/run_test.pl
@@ -18,8 +18,8 @@ $extra_args = "";
 
 $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 $client  = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
- 
-$server->AddLibPath ('../Generic_Servant/.'); 
+
+$server->AddLibPath ('../Generic_Servant/.');
 $client->AddLibPath ('../Generic_Servant/.');
 
 # Parse the arguments
diff --git a/tests/POA/Loader/server.cpp b/tests/POA/Loader/server.cpp
index 55e2f7f8b3f..809eccba1fa 100644
--- a/tests/POA/Loader/server.cpp
+++ b/tests/POA/Loader/server.cpp
@@ -1,21 +1,19 @@
-// $Id$
 
-//============================================================================
-//
-// = FILENAME
-//     server.cpp
-//
-// = DESCRIPTION
-//     Server application to test the Servant Activator and Servant Locator.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
+//=============================================================================
+/**
+ *  @file     server.cpp
+ *
+ *  $Id$
+ *
+ *   Server application to test the Servant Activator and Servant Locator.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
 //=============================================================================
 
-#include "Server_Manager.h"
 
-ACE_RCSID(Loader, server, "$Id$")
+#include "Server_Manager.h"
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
index 3b556cafe75..98350ccd826 100644
--- a/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
+++ b/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/MT_Servant_Locator
-//
-// = FILENAME
-//     MT_Servant_Locator.cpp
-//
-// = DESCRIPTION
-//     This program tests that multiple calls to the Servant Locator
-//     can take place simultaneously.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     MT_Servant_Locator.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests that multiple calls to the Servant Locator
+ *   can take place simultaneously.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
 #include "ace/Task.h"
diff --git a/tests/POA/MT_Servant_Locator/Makefile.am b/tests/POA/MT_Servant_Locator/Makefile.am
deleted file mode 100644
index 0abd36986a7..00000000000
--- a/tests/POA/MT_Servant_Locator/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_MT_Servant_Locator.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = MT_Servant_Locator
-
-MT_Servant_Locator_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-MT_Servant_Locator_SOURCES = \
-  MT_Servant_Locator.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-MT_Servant_Locator_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Makefile.am b/tests/POA/Makefile.am
deleted file mode 100644
index bcbf18f8568..00000000000
--- a/tests/POA/Makefile.am
+++ /dev/null
@@ -1,47 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Bug_1592_Regression \
-        Bug_2511_Regression \
-        Current \
-        DSI \
-        Deactivate_Object \
-        Default_Servant \
-        Default_Servant2 \
-        EndpointPolicy \
-        Etherealization \
-        Excessive_Object_Deactivations \
-        FindPOA \
-        Forwarding \
-        Generic_Servant \
-        Explicit_Activation \
-        Adapter_Activator \
-        Identity \
-        Loader \
-        MT_Servant_Locator \
-        Nested_Non_Servant_Upcalls \
-        NewPOA \
-        Non_Servant_Upcalls \
-        Object_Reactivation \
-        On_Demand_Activation \
-        On_Demand_Loading \
-        POAManagerFactory \
-        POA_BiDir \
-        POA_Destruction \
-        Persistent_ID \
-        Policies \
-        Reference_Counted_Servant \
-        Reference_Counting \
-        RootPOA \
-        Single_Threaded_POA \
-        TIE \
-        wait_for_completion
-
diff --git a/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am b/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am
deleted file mode 100644
index 69d97514a73..00000000000
--- a/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Nested_Non_Servant_Upcalls.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Nested_Non_Servant_Upcalls
-
-Nested_Non_Servant_Upcalls_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Nested_Non_Servant_Upcalls_SOURCES = \
-  Nested_Non_Servant_Upcalls.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Nested_Non_Servant_Upcalls_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
index 01961ebc2ee..77a0ad2a2c0 100644
--- a/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
+++ b/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/Nested_Non_Servant_Upcalls
-//
-// = FILENAME
-//     Nested_Non_Servant_Upcalls.cpp
-//
-// = DESCRIPTION
-//     This program tests that nested non-servant upcalls are handled
-//     correctly.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     Nested_Non_Servant_Upcalls.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests that nested non-servant upcalls are handled
+ *   correctly.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
 #include "ace/Task.h"
diff --git a/tests/POA/NewPOA/Makefile.am b/tests/POA/NewPOA/Makefile.am
deleted file mode 100644
index f1ff572e71f..00000000000
--- a/tests/POA/NewPOA/Makefile.am
+++ /dev/null
@@ -1,46 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_NewPOA.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = NewPOA
-
-NewPOA_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-NewPOA_SOURCES = \
-  NewPOA.cpp
-
-NewPOA_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/NewPOA/NewPOA.cpp b/tests/POA/NewPOA/NewPOA.cpp
index 97ec819ccc3..3d503c35d19 100644
--- a/tests/POA/NewPOA/NewPOA.cpp
+++ b/tests/POA/NewPOA/NewPOA.cpp
@@ -1,25 +1,24 @@
-// $Id$
-
-// ==========================================================================
-// = LIBRARY
-//    TAO/tests/POA/NewPOA
-//
-// = FILENAME
-//    NewPOA.cpp
-//
-// = DESCRIPTION
-//    This program demonstrates creation of new POAs, as children of the root POA or the
-//    existing POA.
-//    There are three new POA created in this example.
-//    The hierarchy of POAs looks like this.
-//
-//             /-->first_poa-->first_poa/second_poa
-//    RootPOA--
-//             \-->third_poa
-//
-// = AUTHOR
-//    Irfan Pyarali
-// ========================================================================
+
+//=============================================================================
+/**
+ *  @file    NewPOA.cpp
+ *
+ *  $Id$
+ *
+ *  This program demonstrates creation of new POAs, as children of the root POA or the
+ *  existing POA.
+ *  There are three new POA created in this example.
+ *  The hierarchy of POAs looks like this.
+ *
+ *           /-->first_poa-->first_poa/second_poa
+ *  RootPOA--
+ *           \-->third_poa
+ *
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "tao/PortableServer/PortableServer.h"
 
@@ -28,10 +27,6 @@
 #include "ace/SString.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (NewPOA,
-           NewPOA,
-           "$Id$")
-
 void
 print_poa (PortableServer::POA_ptr poa)
 {
diff --git a/tests/POA/Non_Servant_Upcalls/Makefile.am b/tests/POA/Non_Servant_Upcalls/Makefile.am
deleted file mode 100644
index 3192f7d27fb..00000000000
--- a/tests/POA/Non_Servant_Upcalls/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Non_Servant_Upcalls.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Non_Servant_Upcalls
-
-Non_Servant_Upcalls_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Non_Servant_Upcalls_SOURCES = \
-  Non_Servant_Upcalls.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Non_Servant_Upcalls_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
index b63df5cebd5..3d862fd28db 100644
--- a/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
+++ b/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
@@ -1,23 +1,20 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/Non_Servant_Upcalls
-//
-// = FILENAME
-//     Non_Servant_Upcalls.cpp
-//
-// = DESCRIPTION
-//     This program tests the users ability to make calls on a POA
-//     during non-servant upcalls.  In this example, a servant which
-//     is being destroyed during because of a deactivate_object()
-//     call, tries to deactivate another object in its destructor.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     Non_Servant_Upcalls.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests the users ability to make calls on a POA
+ *   during non-servant upcalls.  In this example, a servant which
+ *   is being destroyed during because of a deactivate_object()
+ *   call, tries to deactivate another object in its destructor.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
 
diff --git a/tests/POA/Object_Reactivation/Makefile.am b/tests/POA/Object_Reactivation/Makefile.am
deleted file mode 100644
index 0aa28e71aa5..00000000000
--- a/tests/POA/Object_Reactivation/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Object_Reactivation.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Object_Reactivation
-
-Object_Reactivation_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Object_Reactivation_SOURCES = \
-  Object_Reactivation.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Object_Reactivation_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/tests/POA/Object_Reactivation/Object_Reactivation.cpp
index 67835cf92cf..f497a31d384 100644
--- a/tests/POA/Object_Reactivation/Object_Reactivation.cpp
+++ b/tests/POA/Object_Reactivation/Object_Reactivation.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/Object_Reactivation
-//
-// = FILENAME
-//     Object_Reactivation.cpp
-//
-// = DESCRIPTION
-//     This program tests the reactivation of a servant that has been
-//     deactivated but not removed from the Active Object Map yet.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     Object_Reactivation.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests the reactivation of a servant that has been
+ *   deactivated but not removed from the Active Object Map yet.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
 #include "ace/Task.h"
diff --git a/tests/POA/On_Demand_Activation/Makefile.am b/tests/POA/On_Demand_Activation/Makefile.am
deleted file mode 100644
index 25a7f4d121a..00000000000
--- a/tests/POA/On_Demand_Activation/Makefile.am
+++ /dev/null
@@ -1,56 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_On_Demand_Activation_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant \
-  -I../Generic_Servant
-
-server_SOURCES = \
-  Servant_Activator.cpp \
-  Servant_Locator.cpp \
-  server.cpp \
-  Servant_Activator.h \
-  Servant_Locator.h
-
-server_LDFLAGS = \
-  -L../Generic_Servant
-
-server_LDADD = \
-  $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/POA/On_Demand_Activation/Servant_Activator.cpp b/tests/POA/On_Demand_Activation/Servant_Activator.cpp
index 7b20091b85f..abbd67a4ceb 100644
--- a/tests/POA/On_Demand_Activation/Servant_Activator.cpp
+++ b/tests/POA/On_Demand_Activation/Servant_Activator.cpp
@@ -1,30 +1,23 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/On_Demand_Activation/Servant_Activator
-//
-// = FILENAME
-//     Servant_Activator.cpp
-//
-// = DESCRIPTION
-//     Implementation of ServantActivator, which is used by a POA with
-//     a RETAIN policy.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file     Servant_Activator.cpp
+ *
+ *  $Id$
+ *
+ *   Implementation of ServantActivator, which is used by a POA with
+ *   a RETAIN policy.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "Servant_Activator.h"
 #include "test_i.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (On_Demand_Activation,
-           Servant_Activator,
-           "$Id$")
-
 ServantActivator::ServantActivator (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/POA/On_Demand_Activation/Servant_Activator.h b/tests/POA/On_Demand_Activation/Servant_Activator.h
index af28972deb1..5f455082704 100644
--- a/tests/POA/On_Demand_Activation/Servant_Activator.h
+++ b/tests/POA/On_Demand_Activation/Servant_Activator.h
@@ -1,21 +1,18 @@
 // -*- C++ -*-
-// $Id$
-
-// ================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/On_Demand_Activation/Servant_Activator
-//
-// = FILENAME
-//     Servant_Activator.h
-//
-// = DESCRIPTION
-//     Defines a ServantActivator class.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ================================================================
+
+//=============================================================================
+/**
+ *  @file     Servant_Activator.h
+ *
+ *  $Id$
+ *
+ *   Defines a ServantActivator class.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/ServantActivatorC.h"
@@ -30,20 +27,22 @@ class ServantActivator :
 public:
   ServantActivator (CORBA::ORB_ptr orb);
 
+  /**
+   * This method is invoked by a POA with USE_SERVANT_MANAGER and
+   * RETAIN policies, whenever it receives a request for a test object
+   * that is not currently active.
+   */
   PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
                                      PortableServer::POA_ptr poa);
-  // This method is invoked by a POA with USE_SERVANT_MANAGER and
-  // RETAIN policies, whenever it receives a request for a test object
-  // that is not currently active.
 
+  /// This method is invoked whenever a test object is deactivated.
   void etherealize (const PortableServer::ObjectId &oid,
                     PortableServer::POA_ptr adapter,
                     PortableServer::Servant servant,
                     CORBA::Boolean cleanup_in_progress,
                     CORBA::Boolean remaining_activations);
-  // This method is invoked whenever a test object is deactivated.
 
 private:
+  /// A reference to the ORB.
   CORBA::ORB_var orb_;
-  // A reference to the ORB.
 };
diff --git a/tests/POA/On_Demand_Activation/Servant_Locator.cpp b/tests/POA/On_Demand_Activation/Servant_Locator.cpp
index 083ef55fbee..ed317299e10 100644
--- a/tests/POA/On_Demand_Activation/Servant_Locator.cpp
+++ b/tests/POA/On_Demand_Activation/Servant_Locator.cpp
@@ -1,30 +1,23 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/On_Demand_Activation/Servant_Locator
-//
-// = FILENAME
-//     Servant_Locator.cpp
-//
-// = DESCRIPTION
-//     Implementation of ServantLocator class , used with a POA
-//     having a NON_RETAIN policy.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file     Servant_Locator.cpp
+ *
+ *  $Id$
+ *
+ *   Implementation of ServantLocator class , used with a POA
+ *   having a NON_RETAIN policy.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "Servant_Locator.h"
 #include "test_i.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (On_Demand_Activation,
-           Servant_Locator,
-           "$Id$")
-
 ServantLocator::ServantLocator (CORBA::ORB_ptr orb)
   : counter_ (0),
     orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/tests/POA/On_Demand_Activation/Servant_Locator.h b/tests/POA/On_Demand_Activation/Servant_Locator.h
index fb1460827ac..13c3e5857ab 100644
--- a/tests/POA/On_Demand_Activation/Servant_Locator.h
+++ b/tests/POA/On_Demand_Activation/Servant_Locator.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
-// $Id$
-
-//================================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/On_Demand_Activation/Servant_Locator
-//
-// = FILENAME
-//     Servant_Locator.h
-//
-// = DESCRIPTION
-//     Defines a ServantLocator class, used with a POA having a
-//     NON_RETAIN policy
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//==================================================================================
+
+//=============================================================================
+/**
+ *  @file     Servant_Locator.h
+ *
+ *  $Id$
+ *
+ *   Defines a ServantLocator class, used with a POA having a
+ *   NON_RETAIN policy
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/ServantLocatorC.h"
@@ -33,27 +30,27 @@ class ServantLocator :
   //   This class is used by a POA with USE_SERVANT_MANAGER and
   //   NON_RETAIN policy.
 public:
+  /// constructor
   ServantLocator (CORBA::ORB_ptr orb);
-  // constructor
 
+  /// This method is invoked by a POA whenever it receives a request
+  /// for test object that is not currently active.
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
                                              PortableServer::ServantLocator::Cookie &the_cookie);
-  // This method is invoked by a POA whenever it receives a request
-  // for test object that is not currently active.
 
+  /// This method is invoked whenever a test servant completes a
+  /// request.
   virtual void postinvoke (const PortableServer::ObjectId &oid,
                            PortableServer::POA_ptr adapter,
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
                            PortableServer::Servant the_servant);
-  // This method is invoked whenever a test servant completes a
-  // request.
 
 private:
+  /// Counter for number of invocations of this.
   int counter_;
-  // Counter for number of invocations of this.
 
   CORBA::ORB_var orb_;
 };
diff --git a/tests/POA/On_Demand_Activation/run_test.pl b/tests/POA/On_Demand_Activation/run_test.pl
index 2957b71a8bc..454157f91bb 100755
--- a/tests/POA/On_Demand_Activation/run_test.pl
+++ b/tests/POA/On_Demand_Activation/run_test.pl
@@ -13,7 +13,7 @@ $iorbase0 = "ior";
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
 
-$server->AddLibPath ('../Generic_Servant/.'); 
+$server->AddLibPath ('../Generic_Servant/.');
 $client->AddLibPath ('../Generic_Servant/.');
 
 $oneway = "";
diff --git a/tests/POA/On_Demand_Activation/server.cpp b/tests/POA/On_Demand_Activation/server.cpp
index e624e900df8..ed72b90c473 100644
--- a/tests/POA/On_Demand_Activation/server.cpp
+++ b/tests/POA/On_Demand_Activation/server.cpp
@@ -1,18 +1,18 @@
-// $Id$
-
-//============================================================================
-//
-//  = FILENAME
-//     server.cpp
-//
-//  = DESCRIPTION
-//     Server to test the Servant Activator and Servant Locator for a POA.
-//
-//  = AUTHOR
-//     Irfan Pyarali <irfan@cs.wustl.edu>
-//
+
+//=============================================================================
+/**
+ *  @file     server.cpp
+ *
+ *  $Id$
+ *
+ *   Server to test the Servant Activator and Servant Locator for a POA.
+ *
+ *
+ *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
+ */
 //=============================================================================
 
+
 #include "ace/streams.h"
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
@@ -20,8 +20,6 @@
 #include "Servant_Locator.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(On_Demand_Activation, server, "$Id$")
-
 static const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 
 static int
diff --git a/tests/POA/On_Demand_Loading/Makefile.am b/tests/POA/On_Demand_Loading/Makefile.am
deleted file mode 100644
index 3f8c10eb082..00000000000
--- a/tests/POA/On_Demand_Loading/Makefile.am
+++ /dev/null
@@ -1,54 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_On_Demand_Loading_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Servant_Activator.cpp \
-  Servant_Locator.cpp \
-  Servant_Manager.cpp \
-  Server_Manager.cpp \
-  server.cpp \
-  Servant_Activator.h \
-  Servant_Locator.h \
-  Servant_Manager.h \
-  Server_Manager.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/On_Demand_Loading/Servant_Activator.cpp b/tests/POA/On_Demand_Loading/Servant_Activator.cpp
index b0d2e096c74..8b79859a529 100644
--- a/tests/POA/On_Demand_Loading/Servant_Activator.cpp
+++ b/tests/POA/On_Demand_Loading/Servant_Activator.cpp
@@ -1,27 +1,20 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//     TAO/examples/POA/On_Demand_Loading
-//
-// = FILENAME
-//     Servant_Activator.cpp
-//
-// = DESCRIPTION
-//     Implementation of <ServantActivator_i>, which is used by a POA
-//     with a RETAIN policy.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file     Servant_Activator.cpp
+ *
+ *  $Id$
+ *
+ *   Implementation of <ServantActivator_i>, which is used by a POA
+ *   with a RETAIN policy.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
 
-#include "Servant_Activator.h"
 
-ACE_RCSID (On_Demand_Loading,
-           Servant_Activator,
-           "$Id$")
+#include "Servant_Activator.h"
 
 // Initialization.
 
diff --git a/tests/POA/On_Demand_Loading/Servant_Activator.h b/tests/POA/On_Demand_Loading/Servant_Activator.h
index aeca82015f8..254def99c1e 100644
--- a/tests/POA/On_Demand_Loading/Servant_Activator.h
+++ b/tests/POA/On_Demand_Loading/Servant_Activator.h
@@ -1,23 +1,19 @@
 // This may look like C, but it's really -*- C++ -*-
-// $Id$
 
-// ================================================================
-//
-// = LIBRARY
-//     TAO/examples/POA/On_Demand_Loading
-//
-// = FILENAME
-//     Servant_Activator.h
-//
-// = DESCRIPTION
-//     Defines a <ServantActivator_i> class, which uses a
-//     Servant_Manager to activate a servant by loading it and
-//     associates it with an object on-demand.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ================================================================
+//=============================================================================
+/**
+ *  @file     Servant_Activator.h
+ *
+ *  $Id$
+ *
+ *   Defines a <ServantActivator_i> class, which uses a
+ *   Servant_Manager to activate a servant by loading it and
+ *   associates it with an object on-demand.
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef SERVANT_ACTIVATOR_H
 #define SERVANT_ACTIVATOR_H
@@ -26,56 +22,62 @@
 #include "tao/PortableServer/ServantActivatorC.h"
 #include "tao/LocalObject.h"
 
+/**
+ * Servant Activator for the test servant.
+ *
+ * This class associates an unassociated servant with an object in
+ * the POA Active Object Map.
+ */
 class ServantActivator_i :
   public virtual PortableServer::ServantActivator,
   public virtual ::CORBA::LocalObject
 
 {
-  //= TITLE
-  //   Servant Activator for the test servant.
-  //
-  //= DESCRIPTION
-  //   This class associates an unassociated servant with an object in
-  //   the POA Active Object Map.
 public:
+  /// Initialization.
   ServantActivator_i (CORBA::ORB_ptr orb);
-  // Initialization.
 
+  /**
+   * This method is invoked by a POA with USE_SERVANT_MANAGER and
+   * RETAIN policies, whenever it receives a request for a test object
+   * that is not currently active. When an servant pointer
+   * corresponding to objectId is not found in the Active Object Map,
+   * the POA hands over the job of obtaining the servant to the
+   * Servant Manager. Depending upon whether the POA is created with
+   * RETAIN or NON_RETAIN as the servant_retention policy, the Servant
+   * Activator or the Servant Locator interface is invoked
+   * respectively.
+   */
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr poa);
-  // This method is invoked by a POA with USE_SERVANT_MANAGER and
-  // RETAIN policies, whenever it receives a request for a test object
-  // that is not currently active. When an servant pointer
-  // corresponding to objectId is not found in the Active Object Map,
-  // the POA hands over the job of obtaining the servant to the
-  // Servant Manager. Depending upon whether the POA is created with
-  // RETAIN or NON_RETAIN as the servant_retention policy, the Servant
-  // Activator or the Servant Locator interface is invoked
-  // respectively.
 
+  /**
+   * This method is invoked whenever a test servant is
+   * deactivated. This occurs when the POA is destroyed or the Object
+   * is deactivated. When the POA is getting destroyed, it needs to
+   * deactivate every object in the Active Object Map and on that call
+   * the ServantActivator invokes this method which will destroy the
+   * servant associated with the object.
+   */
   virtual void etherealize (const PortableServer::ObjectId &oid,
                             PortableServer::POA_ptr adapter,
                             PortableServer::Servant servant,
                             CORBA::Boolean cleanup_in_progress,
                             CORBA::Boolean remaining_activations);
-  // This method is invoked whenever a test servant is
-  // deactivated. This occurs when the POA is destroyed or the Object
-  // is deactivated. When the POA is getting destroyed, it needs to
-  // deactivate every object in the Active Object Map and on that call
-  // the ServantActivator invokes this method which will destroy the
-  // servant associated with the object.
 
+  /// Returns an ObjectId when given a DLL name and the factory
+  /// function in the DLL that will create an appropriate Servant.
   PortableServer::ObjectId_var create_dll_object_id (const char *dllname,
                                                      const char *factory_function);
-  // Returns an ObjectId when given a DLL name and the factory
-  // function in the DLL that will create an appropriate Servant.
 
 private:
+  /**
+   * An ServantManager object that provides utility methods.  The
+   * methods include obtaining the servant using an ACE_DLL object,
+   * destroying the servant and extracting the dllname and factory
+   * function from the ObjectId.
+   */
   ServantManager_i servant_manager_;
-  // An ServantManager object that provides utility methods.  The
-  // methods include obtaining the servant using an ACE_DLL object,
-  // destroying the servant and extracting the dllname and factory
-  // function from the ObjectId.
 };
 
 #endif /* SERVANT_ACTIVATOR_H */
diff --git a/tests/POA/On_Demand_Loading/Servant_Locator.cpp b/tests/POA/On_Demand_Loading/Servant_Locator.cpp
index 2eda77ee511..2ba068c0267 100644
--- a/tests/POA/On_Demand_Loading/Servant_Locator.cpp
+++ b/tests/POA/On_Demand_Loading/Servant_Locator.cpp
@@ -1,27 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO/examples/POA/On_Demand_Loading
-//
-// = FILENAME
-//     Servant_Locator.cpp
-//
-// = DESCRIPTION
-//     Implementation of ServantLocator_i class, used with a POA
-//     having a NON_RETAIN policy.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
 
-#include "Servant_Locator.h"
+//=============================================================================
+/**
+ *  @file     Servant_Locator.cpp
+ *
+ *  $Id$
+ *
+ *   Implementation of ServantLocator_i class, used with a POA
+ *   having a NON_RETAIN policy.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
-ACE_RCSID (On_Demand_Activation,
-           Servant_Locator,
-           "$Id$")
+#include "Servant_Locator.h"
 
 // Initialization.
 
diff --git a/tests/POA/On_Demand_Loading/Servant_Locator.h b/tests/POA/On_Demand_Loading/Servant_Locator.h
index f1a0b45c5f8..a75819b1bc1 100644
--- a/tests/POA/On_Demand_Loading/Servant_Locator.h
+++ b/tests/POA/On_Demand_Loading/Servant_Locator.h
@@ -1,22 +1,19 @@
 // This may look like C, but it's really -*- C++ -*-
-// $Id$
 
-//================================================================================
-//
-// = LIBRARY
-//     TAO/examples/POA/On_Demand_Loading
-//
-// = FILENAME
-//     Servant_Locator.h
-//
-// = DESCRIPTION
-//     Defines a ServantLocator_i class , used with a POA having
-//     a NON_RETAIN policy.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-//==================================================================================
+//=============================================================================
+/**
+ *  @file     Servant_Locator.h
+ *
+ *  $Id$
+ *
+ *   Defines a ServantLocator_i class , used with a POA having
+ *   a NON_RETAIN policy.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef SERVANT_LOCATOR_H
 #define SERVANT_LOCATOR_H
@@ -41,45 +38,51 @@ class ServantLocator_i :
   //   Manager. It is invoked when the POA has an USE_SERVANT_MANAGER
   //   policy and a servant_retention policy of NON_RETAIN type.
 public:
+  /// Constructor.
   ServantLocator_i (CORBA::ORB_ptr orb);
-  // Constructor.
 
+  /**
+   * This method is invoked by a POA whenever it receives a request
+   * for test object that is not currently active.  When the POA is
+   * created using the NON_RETAIN policy the Active Object Map is not
+   * maintained, in other words, an association between the ObjectId
+   * and the servant is not maintained. Hence every client request the
+   * servant has to be loaded. Note the operation argument. This
+   * argument specifies the operation to be invoked on the
+   * servant. The cookie helps in marking the servant. This marking is
+   * useful while destroying the servant.
+   */
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
                                              PortableServer::ServantLocator::Cookie &the_cookie);
-  // This method is invoked by a POA whenever it receives a request
-  // for test object that is not currently active.  When the POA is
-  // created using the NON_RETAIN policy the Active Object Map is not
-  // maintained, in other words, an association between the ObjectId
-  // and the servant is not maintained. Hence every client request the
-  // servant has to be loaded. Note the operation argument. This
-  // argument specifies the operation to be invoked on the
-  // servant. The cookie helps in marking the servant. This marking is
-  // useful while destroying the servant.
 
+  /**
+   * This method is invoked whenever a test servant completes a
+   * request. As the Servant Loactor interface is used when the POA
+   * doesnt maintain the Active Object Map, its necessary to get rid
+   * of the servant after the client request has been processed. The
+   * appropriate servant is destroyed by verifying the cookie.Again
+   * this method is invoked per client request.
+   */
   virtual void postinvoke (const PortableServer::ObjectId &oid,
                            PortableServer::POA_ptr adapter,
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
                            PortableServer::Servant the_servant);
-  // This method is invoked whenever a test servant completes a
-  // request. As the Servant Loactor interface is used when the POA
-  // doesnt maintain the Active Object Map, its necessary to get rid
-  // of the servant after the client request has been processed. The
-  // appropriate servant is destroyed by verifying the cookie.Again
-  // this method is invoked per client request.
 
+  /// Returns an ObjectId when given an dll name and the factory method
+  /// to be invoked in the dll.
   PortableServer::ObjectId_var create_dll_object_id (const char *dllname,
                                                      const char *factory_function);
-  // Returns an ObjectId when given an dll name and the factory method
-  // to be invoked in the dll.
 private:
+  /**
+   * The <ServantManager_i> object that provides utility methods.  The
+   * methods include obtaining the servant using an ACE_DLL object,
+   * destroying the servant and extracting the dllname and factory
+   * function from the ObjectId.
+   */
   ServantManager_i servant_manager_;
-  // The <ServantManager_i> object that provides utility methods.  The
-  // methods include obtaining the servant using an ACE_DLL object,
-  // destroying the servant and extracting the dllname and factory
-  // function from the ObjectId.
 };
 
 #endif /* SERVANT_LOCATOR_H */
diff --git a/tests/POA/On_Demand_Loading/Servant_Manager.cpp b/tests/POA/On_Demand_Loading/Servant_Manager.cpp
index 8b6a8d91629..edff944b13b 100644
--- a/tests/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/tests/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -1,30 +1,25 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO/examples/POA/On_Demand_Loading
-//
-// = FILENAME
-//     Servant_Manager.cpp
-//
-// = DESCRIPTION
-//     Implementation of the helper class for the ServantActivator_i
-//     and the ServantLocator_i.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file     Servant_Manager.cpp
+ *
+ *  $Id$
+ *
+ *   Implementation of the helper class for the ServantActivator_i
+ *   and the ServantLocator_i.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Servant_Manager.h"
 #include "tao/debug.h"
 
-ACE_RCSID(On_Demand_Activation, Servant_Manager, "$Id$")
-
-  // Initialization.
-  ServantManager_i::ServantManager_i (CORBA::ORB_ptr orb)
-    : orb_ (CORBA::ORB::_duplicate (orb))
+// Initialization.
+ServantManager_i::ServantManager_i (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
diff --git a/tests/POA/On_Demand_Loading/Servant_Manager.h b/tests/POA/On_Demand_Loading/Servant_Manager.h
index 2ada43d81ab..3177f0b3964 100644
--- a/tests/POA/On_Demand_Loading/Servant_Manager.h
+++ b/tests/POA/On_Demand_Loading/Servant_Manager.h
@@ -1,21 +1,18 @@
 // This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-//================================================================================
-//
-// = LIBRARY
-//     TAO/examples/POA/On_Demand_Loading
-//
-// = FILENAME
-//     Servant_Manager.h
-//
-// = DESCRIPTION
-//     Helper class for <ServantActivator_i> and <ServantLoactor_i>.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-//==================================================================================
+
+//=============================================================================
+/**
+ *  @file     Servant_Manager.h
+ *
+ *  $Id$
+ *
+ *   Helper class for <ServantActivator_i> and <ServantLoactor_i>.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef SERVANT_MANAGER_H
 #define SERVANT_MANAGER_H
@@ -34,68 +31,75 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class ServantManager_i
+ *
+ * @brief This class is the helper class for the ServantActivator_i and
+ * ServantLocator_i classes.
+ *
+ * The methods provided by this class are used by the ServantActivator_i
+ * and ServantLocator_i classes. This class contains the common methods
+ * needed by them.
+ */
 class ServantManager_i
 {
-  // = TITLE
-  //   This class is the helper class for the ServantActivator_i and
-  //   ServantLocator_i classes.
-  //
-  // = DESCRIPTION
-  //   The methods provided by this class are used by the ServantActivator_i
-  //   and ServantLocator_i classes. This class contains the common methods
-  //   needed by them.
-  //
 public:
+  /// This typedef is used to typecast the void* obtained when finding
+  /// a symbol in the DLL.
    typedef PortableServer::Servant
            (*SERVANT_FACTORY) (CORBA::ORB_ptr orb,
                                PortableServer::POA_ptr poa);
-  // This typedef is used to typecast the void* obtained when finding
-  // a symbol in the DLL.
 
+  /// Initialization.
   ServantManager_i (CORBA::ORB_ptr orb);
-  // Initialization.
 
+  /// Destruction.
    ~ServantManager_i (void);
-  // Destruction.
 
+  /**
+   * Returns an ObjectId when given an DLL name and the factory method
+   * to be invoked in the DLL. The application developer can initialise the
+   * ServantActivator object by providing the dllname and the factory function.
+   */
   PortableServer::ObjectId_var create_dll_object_id (const char *libname,
                                                      const char *factory_function);
-  // Returns an ObjectId when given an DLL name and the factory method
-  // to be invoked in the DLL. The application developer can initialise the
-  // ServantActivator object by providing the dllname and the factory function.
 
   // @@ *done*Kirthika, please explain what this function is USED for, i.e.,
   // who calls it and why?
 
+  /**
+   * Obtains a servant on activation by linking and loading the
+   * appropriate DLL and creating the servant object.  The <str>
+   * argument is the ObjectId that contains the servant DLL name and
+   * the factory function name. The <long> argument is an
+   * servant-specific argument needed to create the servant for this
+   * particular use-case.
+   */
   PortableServer::Servant obtain_servant (const ACE_TCHAR *str,
                                           PortableServer::POA_ptr poa);
-  // Obtains a servant on activation by linking and loading the
-  // appropriate DLL and creating the servant object.  The <str>
-  // argument is the ObjectId that contains the servant DLL name and
-  // the factory function name. The <long> argument is an
-  // servant-specific argument needed to create the servant for this
-  // particular use-case.
 
+  /// The servant is destroyed and the DLL that was dynamically linked
+  /// is closed.
   void destroy_servant (PortableServer::Servant servant,
                         const PortableServer::ObjectId &oid);
-  // The servant is destroyed and the DLL that was dynamically linked
-  // is closed.
 
  private:
+  /**
+   * Parse the string to obtain the DLL name and the factory function
+   * symbol that we will used to dynamically obtain the servant
+   * pointer.
+   */
   void parse_string (const ACE_TCHAR *s);
-  // Parse the string to obtain the DLL name and the factory function
-  // symbol that we will used to dynamically obtain the servant
-  // pointer.
 
+  /// A reference to the ORB.
   CORBA::ORB_var orb_;
-  // A reference to the ORB.
 
+  /// The name of the dll containing the servant.
   ACE_TString dllname_;
-  // The name of the dll containing the servant.
 
+  /// The symbol which on getting invoked will give us the servant
+  /// pointer.
   ACE_TString create_symbol_;
-  // The symbol which on getting invoked will give us the servant
-  // pointer.
 
   typedef ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId,
                                   ACE_DLL *,
@@ -104,10 +108,12 @@ public:
                                   ACE_Null_Mutex>
           SERVANT_MAP;
 
+  /**
+   * This is the hash map object. The hash map is used to provide
+   * an quick access to the dll object associated with every servant
+   * using the unique ObjectId as key.
+   */
   SERVANT_MAP servant_map_;
-  // This is the hash map object. The hash map is used to provide
-  // an quick access to the dll object associated with every servant
-  // using the unique ObjectId as key.
 
 };
 #endif /* SERVANT_MANAGER_H */
diff --git a/tests/POA/On_Demand_Loading/Server_Manager.cpp b/tests/POA/On_Demand_Loading/Server_Manager.cpp
index 2fb19d905d3..d7ae92ac6a8 100644
--- a/tests/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/tests/POA/On_Demand_Loading/Server_Manager.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(On_Demand_Loading, Server_Manager, "$Id$")
-
 Server_i::Server_i(void)
   : ior_output_file_ (0),
     policies_ (4),
diff --git a/tests/POA/On_Demand_Loading/Server_Manager.h b/tests/POA/On_Demand_Loading/Server_Manager.h
index 21e8a733bf2..2aa642ce766 100644
--- a/tests/POA/On_Demand_Loading/Server_Manager.h
+++ b/tests/POA/On_Demand_Loading/Server_Manager.h
@@ -1,102 +1,103 @@
 // This may look like C, but it's really -*- C++ -*-
-// $Id$
 
 //=============================================================================
-//
-// = LIBRARY
-//     TAO/examples/POA/On_Demand_Loading
-//
-// = FILENAME
-//     Server_Manager.h
-//
-// = DESCRIPTION
-//     Helper class for the server application.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
+/**
+ *  @file     Server_Manager.h
+ *
+ *  $Id$
+ *
+ *   Helper class for the server application.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
 //=============================================================================
 
+
 #ifndef SERVER_MANAGER_H
 #define SERVER_MANAGER_H
 
 #include "Servant_Activator.h"
 #include "Servant_Locator.h"
 
+/**
+ * @class Server_i
+ *
+ * @brief This class provides the server application with helper methods
+ *
+ * The various methods required by the server application for
+ * utilizing the ServantActivator and ServantLocator interfaces of
+ * the Servant Manager are implemented by this class.  These
+ * include initialisation procedures of the ServantActivator and
+ * ServantLocator, and creation of POAs with emphasis on the
+ * servant retention policy.
+ */
 class Server_i
 {
-  // = TITLE
-  //   This class provides the server application with helper methods
-  //
-  // = DESCRIPTION
-  //   The various methods required by the server application for
-  //   utilizing the ServantActivator and ServantLocator interfaces of
-  //   the Servant Manager are implemented by this class.  These
-  //   include initialisation procedures of the ServantActivator and
-  //   ServantLocator, and creation of POAs with emphasis on the
-  //   servant retention policy.
 public:
   // = Initialization and termination methods.
+  /// Initialisation.
   Server_i (void);
-  // Initialisation.
 
+  /// Destruction.
   ~Server_i (void);
-  // Destruction.
 
+  /// Initialisation of the ORB and poa.
   int init (int argc, ACE_TCHAR **argv);
-  // Initialisation of the ORB and poa.
 
+  /**
+   * This method creates a POA from the root_poa with emphasis being
+   * on the servant_retention_policy which decides the use of the
+   * ServantActivator or ServantLocator interfaces. The
+   * servent_retention_policy value is 1 for the RETAIN policy and 0
+   * for the NONRETAIN policy.
+   */
   PortableServer::POA_ptr create_poa (const char* name,
                                       int servant_retention_policy);
-  // This method creates a POA from the root_poa with emphasis being
-  // on the servant_retention_policy which decides the use of the
-  // ServantActivator or ServantLocator interfaces. The
-  // servent_retention_policy value is 1 for the RETAIN policy and 0
-  // for the NONRETAIN policy.
 
+  /// A ServantActivator object is created and initialised.
   int create_activator (PortableServer::POA_var first_poa);
-  // A ServantActivator object is created and initialised.
 
+  /// A ServantActivator object is created and initialised.
   int create_locator (PortableServer::POA_var second_poa);
-  // A ServantActivator object is created and initialised.
 
+  /// The server is executed.
   int run (void);
-  // The server is executed.
 
 private:
+  /// Parses the input arguments.
   int parse_args (int argc, ACE_TCHAR **argv);
-  // Parses the input arguments.
 
+  /// The IORs are written to a file for future use.
   int write_iors_to_file (const char *first_ior,
                           const char *second_ior);
-  // The IORs are written to a file for future use.
 
+  /// Default ior file.
   ACE_TCHAR *ior_output_file_;
-  // Default ior file.
 
+  /// The orb pointer.
   CORBA::ORB_var orb_;
-  // The orb pointer.
 
+  /// The poa policicies.
   CORBA::PolicyList policies_;
-  // The poa policicies.
 
+  /// The root_poa which is used for cretaing different child poas.
   PortableServer::POA_var root_poa_;
-  // The root_poa which is used for cretaing different child poas.
 
+  /// The poa_manager object.
   PortableServer::POAManager_var poa_manager_;
-  // The poa_manager object.
 
+  /// The object pointer used by the ServantActivator.
   CORBA::Object_var first_test_;
-  // The object pointer used by the ServantActivator.
 
+  /// The object pointer used by the Servant Locator.
   CORBA::Object_var second_test_;
-  // The object pointer used by the Servant Locator.
 
+  /// The servant activator object.
   ServantActivator_i *servant_activator_impl_;
-  // The servant activator object.
 
+  /// The servant locator object.
   ServantLocator_i *servant_locator_impl_;
-  // The servant locator object.
 };
 
 #endif /* SERVER_MANAGER_H */
diff --git a/tests/POA/On_Demand_Loading/run_test.pl b/tests/POA/On_Demand_Loading/run_test.pl
index 34ad00d6daa..4127f780899 100755
--- a/tests/POA/On_Demand_Loading/run_test.pl
+++ b/tests/POA/On_Demand_Loading/run_test.pl
@@ -13,7 +13,7 @@ $iorbase0 = "ior";
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
 
-$server->AddLibPath ('../Generic_Servant/.'); 
+$server->AddLibPath ('../Generic_Servant/.');
 $client->AddLibPath ('../Generic_Servant/.');
 
 $oneway = "";
diff --git a/tests/POA/On_Demand_Loading/server.cpp b/tests/POA/On_Demand_Loading/server.cpp
index ce70a5014c0..809eccba1fa 100644
--- a/tests/POA/On_Demand_Loading/server.cpp
+++ b/tests/POA/On_Demand_Loading/server.cpp
@@ -1,21 +1,19 @@
-// $Id$
 
-//============================================================================
-//
-// = FILENAME
-//     server.cpp
-//
-// = DESCRIPTION
-//     Server application to test the Servant Activator and Servant Locator.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
+//=============================================================================
+/**
+ *  @file     server.cpp
+ *
+ *  $Id$
+ *
+ *   Server application to test the Servant Activator and Servant Locator.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
 //=============================================================================
 
-#include "Server_Manager.h"
 
-ACE_RCSID(On_Demand_Loading, server, "$Id$")
+#include "Server_Manager.h"
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/tests/POA/POAManagerFactory/Makefile.am b/tests/POA/POAManagerFactory/Makefile.am
deleted file mode 100644
index c2a1826f118..00000000000
--- a/tests/POA/POAManagerFactory/Makefile.am
+++ /dev/null
@@ -1,49 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_POAManagerFactory.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = POAManagerFactory
-
-POAManagerFactory_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-POAManagerFactory_SOURCES = \
-  POAManagerFactory.cpp
-
-POAManagerFactory_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/POA/POAManagerFactory/POAManagerFactory.cpp b/tests/POA/POAManagerFactory/POAManagerFactory.cpp
index 2a94043c709..478e8a81e27 100644
--- a/tests/POA/POAManagerFactory/POAManagerFactory.cpp
+++ b/tests/POA/POAManagerFactory/POAManagerFactory.cpp
@@ -1,22 +1,19 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/POAManagerFactory
-//
-// = FILENAME
-//     POAManagerFactory.cpp
-//
-// = DESCRIPTION
-//     This program tests Root_POA::the_POAManagerFactory and
-//     the POAManagerFactory interfaces such as create_POAManager(),
-//     list () and find ().
-//
-// = AUTHOR
-//     Yan Dai
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     POAManagerFactory.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests Root_POA::the_POAManagerFactory and
+ *   the POAManagerFactory interfaces such as create_POAManager(),
+ *   list () and find ().
+ *
+ *
+ *  @author  Yan Dai
+ */
+//=============================================================================
+
 
 #include "tao/ORB.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -63,7 +60,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/POA/POA_BiDir/Makefile.am b/tests/POA/POA_BiDir/Makefile.am
deleted file mode 100644
index 34a34b595b1..00000000000
--- a/tests/POA/POA_BiDir/Makefile.am
+++ /dev/null
@@ -1,49 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_BiDir.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = POA_BiDir
-
-POA_BiDir_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-POA_BiDir_SOURCES = \
-  POA_BiDir.cpp
-
-POA_BiDir_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/POA/POA_BiDir/POA_BiDir.cpp b/tests/POA/POA_BiDir/POA_BiDir.cpp
index 2aaedd37c73..2fd60b0a6e6 100644
--- a/tests/POA/POA_BiDir/POA_BiDir.cpp
+++ b/tests/POA/POA_BiDir/POA_BiDir.cpp
@@ -1,20 +1,19 @@
-// $Id$
-
-// ==========================================================================
-// = LIBRARY
-//    TAO/example/POA/POA_BiDir
-//
-// = FILENAME
-//    POA_BiDir.cpp
-//
-// = DESCRIPTION
-//    This program is an extension of $TAO_ROOT/example/POA/NewPOA. In
-//    the many POA's created this example adds a BiDirGIOP policy to
-//    one of the POA's.
-//
-// = AUTHOR
-//    Balachandran Natarajan <bala@cs.wustl.edu>
-// ========================================================================
+
+//=============================================================================
+/**
+ *  @file    POA_BiDir.cpp
+ *
+ *  $Id$
+ *
+ *  This program is an extension of $TAO_ROOT/example/POA/NewPOA. In
+ *  the many POA's created this example adds a BiDirGIOP policy to
+ *  one of the POA's.
+ *
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "tao/PortableServer/PortableServer.h"
 
@@ -25,11 +24,6 @@
 
 #include "ace/SString.h"
 
-
-ACE_RCSID (POA_BiDir,
-           POA_BiDir,
-           "$Id$")
-
 void
 print_poa (PortableServer::POA_ptr poa)
 {
diff --git a/tests/POA/POA_Destruction/Makefile.am b/tests/POA/POA_Destruction/Makefile.am
deleted file mode 100644
index 28496ecd3eb..00000000000
--- a/tests/POA/POA_Destruction/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_POA_Destruction.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = POA_Destruction
-
-POA_Destruction_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-POA_Destruction_SOURCES = \
-  POA_Destruction.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-POA_Destruction_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/POA_Destruction/POA_Destruction.cpp b/tests/POA/POA_Destruction/POA_Destruction.cpp
index 46efabbc309..38df305afdb 100644
--- a/tests/POA/POA_Destruction/POA_Destruction.cpp
+++ b/tests/POA/POA_Destruction/POA_Destruction.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/POA_Destruction
-//
-// = FILENAME
-//     POA_Destruction.cpp
-//
-// = DESCRIPTION
-//     This program tests the destruction of a POA while there is an
-//     upcall in progress.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     POA_Destruction.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests the destruction of a POA while there is an
+ *   upcall in progress.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
 
diff --git a/tests/POA/Persistent_ID/Makefile.am b/tests/POA/Persistent_ID/Makefile.am
deleted file mode 100644
index b787848cb63..00000000000
--- a/tests/POA/Persistent_ID/Makefile.am
+++ /dev/null
@@ -1,104 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.POA_IDL_Persistent_ID.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.POA_Server_Persistent_ID.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.POA_Client_Persistent_ID.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Persistent_ID/client.cpp b/tests/POA/Persistent_ID/client.cpp
index fe95b34dfdf..ce3e525ea0c 100644
--- a/tests/POA/Persistent_ID/client.cpp
+++ b/tests/POA/Persistent_ID/client.cpp
@@ -1,25 +1,22 @@
-// $Id$
-
-// ================================================================
-//
-//
-// = FILENAME
-//     client.cpp
-//
-// = DESCRIPTION
-//     This is a client implementation.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *   This is a client implementation.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "testC.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Generic_Servant, client, "$Id$")
-
 static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 static int shutdown_server = 0;
 
diff --git a/tests/POA/Persistent_ID/server.cpp b/tests/POA/Persistent_ID/server.cpp
index 158da5b4b00..4ec3caaa473 100644
--- a/tests/POA/Persistent_ID/server.cpp
+++ b/tests/POA/Persistent_ID/server.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ================================================================
-//
-// = LIBRARY
-//    TAO/tests/POA/Persistent_ID
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    In this example of using Persistent IDs.
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  In this example of using Persistent IDs.
+ *
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
@@ -22,8 +19,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/PortableServer/PortableServer.h"
 
-ACE_RCSID(Explicit_Activation, server, "$Id$")
-
 class test_i :
   public virtual POA_test
 {
@@ -34,8 +29,8 @@ public:
   void method (void);
 
   //FUZZ: disable check_for_lack_ACE_OS
+  ///FUZZ: enable check_for_lack_ACE_OS
   void shutdown (void);
-  //FUZZ: enable check_for_lack_ACE_OS
 
   test_ptr create_POA (void);
 
diff --git a/tests/POA/Policies/Makefile.am b/tests/POA/Policies/Makefile.am
deleted file mode 100644
index 716682b4339..00000000000
--- a/tests/POA/Policies/Makefile.am
+++ /dev/null
@@ -1,49 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Policies.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Policies
-
-Policies_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Policies_SOURCES = \
-  Policies.cpp
-
-Policies_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/POA/Policies/Policies.cpp b/tests/POA/Policies/Policies.cpp
index d1a228faa12..38751511447 100644
--- a/tests/POA/Policies/Policies.cpp
+++ b/tests/POA/Policies/Policies.cpp
@@ -1,22 +1,19 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/Policies
-//
-// = FILENAME
-//     Policies.cpp
-//
-// = DESCRIPTION
-//     This program tests the construction of POA policies, both
-//     through the generic ORB::create_policy interface and the
-//     PortableServer specific interfaces.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     Policies.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests the construction of POA policies, both
+ *   through the generic ORB::create_policy interface and the
+ *   PortableServer specific interfaces.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "tao/ORB.h"
 #include "tao/AnyTypeCode/Any.h"
diff --git a/tests/POA/Reference_Counted_Servant/Makefile.am b/tests/POA/Reference_Counted_Servant/Makefile.am
deleted file mode 100644
index 236995f7094..00000000000
--- a/tests/POA/Reference_Counted_Servant/Makefile.am
+++ /dev/null
@@ -1,52 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Reference_Counted_Servant_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant \
-  -I../Generic_Servant
-
-server_SOURCES = \
-  server.cpp
-
-server_LDFLAGS = \
-  -L../Generic_Servant
-
-server_LDADD = \
-  $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/POA/Reference_Counted_Servant/run_test.pl b/tests/POA/Reference_Counted_Servant/run_test.pl
index c5500e776e9..06f56876a2e 100755
--- a/tests/POA/Reference_Counted_Servant/run_test.pl
+++ b/tests/POA/Reference_Counted_Servant/run_test.pl
@@ -13,7 +13,7 @@ $iorbase = "poa.ior";
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
 
-$server->AddLibPath ('../Generic_Servant/.'); 
+$server->AddLibPath ('../Generic_Servant/.');
 $client->AddLibPath ('../Generic_Servant/.');
 
 $oneway = "";
diff --git a/tests/POA/Reference_Counted_Servant/server.cpp b/tests/POA/Reference_Counted_Servant/server.cpp
index 6203b6bd76d..73ec73fae99 100644
--- a/tests/POA/Reference_Counted_Servant/server.cpp
+++ b/tests/POA/Reference_Counted_Servant/server.cpp
@@ -1,33 +1,28 @@
-// $Id$
-
-// ================================================================
-//
-// = LIBRARY
-//    TAO/tests/POA/Reference_Counted_Servant
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    This example shows how to use reference counted servants to
-//    automatically manage dynamic memory for servants.
-//    Stubs/Skeletons and client code is available in
-//    ../Generic_Servant.
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  This example shows how to use reference counted servants to
+ *  automatically manage dynamic memory for servants.
+ *  Stubs/Skeletons and client code is available in
+ *  ../Generic_Servant.
+ *
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Reference_Counted_Servant, server, "$Id$")
-
-  // This is to remove "inherits via dominance" warnings from MSVC.
-  // MSVC is being a little too paranoid.
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
 #if defined (_MSC_VER)
 # pragma warning (disable : 4250)
 #endif /* _MSC_VER */
@@ -36,9 +31,9 @@ class reference_counted_test_i :
   public virtual test_i
 {
 public:
+  /// Constructor - takes a POA and a value parameter
   reference_counted_test_i (CORBA::ORB_ptr orb,
                             PortableServer::POA_ptr poa);
-  // Constructor - takes a POA and a value parameter
 };
 
 reference_counted_test_i::reference_counted_test_i (CORBA::ORB_ptr orb,
diff --git a/tests/POA/Reference_Counting/Makefile.am b/tests/POA/Reference_Counting/Makefile.am
deleted file mode 100644
index 3197dbec12c..00000000000
--- a/tests/POA/Reference_Counting/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Reference_Counting_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-CLEANFILES = \
-  Hello-stamp \
-  HelloC.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.cpp \
-  HelloS.h \
-  HelloS.inl
-
-HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp
-
-Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Hello.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  HelloC.cpp \
-  HelloS.cpp \
-  test.cpp \
-  HelloC.h \
-  HelloC.inl \
-  HelloS.h \
-  HelloS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Reference_Counting/test.cpp b/tests/POA/Reference_Counting/test.cpp
index acb7b8941ac..8631f9e284a 100644
--- a/tests/POA/Reference_Counting/test.cpp
+++ b/tests/POA/Reference_Counting/test.cpp
@@ -2,10 +2,6 @@
 
 #include "HelloS.h"
 
-ACE_RCSID (Reference_Counting,
-           test,
-           "$Id$")
-
 class Hello_impl :
   virtual public POA_Hello
 {
diff --git a/tests/POA/RootPOA/Makefile.am b/tests/POA/RootPOA/Makefile.am
deleted file mode 100644
index e9988e682df..00000000000
--- a/tests/POA/RootPOA/Makefile.am
+++ /dev/null
@@ -1,46 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RootPOA_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = RootPOA
-
-RootPOA_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-RootPOA_SOURCES = \
-  RootPOA.cpp
-
-RootPOA_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/RootPOA/RootPOA.cpp b/tests/POA/RootPOA/RootPOA.cpp
index d3ffbe7e2c1..be973d012ad 100644
--- a/tests/POA/RootPOA/RootPOA.cpp
+++ b/tests/POA/RootPOA/RootPOA.cpp
@@ -1,22 +1,18 @@
-// $Id$
 
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/RootPOA
-//
-//
-// = FILENAME
-//     RootPOA.cpp
-//
-// = DESCRIPTION
-//     This program gets the name of the Root POA and prints it out on
-//     the standard output.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+//=============================================================================
+/**
+ *  @file     RootPOA.cpp
+ *
+ *  $Id$
+ *
+ *   This program gets the name of the Root POA and prints it out on
+ *   the standard output.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "tao/PortableServer/PortableServer.h"
 
@@ -24,10 +20,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (RootPOA,
-           RootPOA,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/POA/Single_Threaded_POA/Makefile.am b/tests/POA/Single_Threaded_POA/Makefile.am
deleted file mode 100644
index 32bf8155472..00000000000
--- a/tests/POA/Single_Threaded_POA/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Single_Threaded_POA.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Single_Threaded_POA
-
-Single_Threaded_POA_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Single_Threaded_POA_SOURCES = \
-  Single_Threaded_POA.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Single_Threaded_POA_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
index 80da9e7ac83..504889b7319 100644
--- a/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
+++ b/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
@@ -1,23 +1,20 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/Single_Threaded_POA
-//
-// = FILENAME
-//     Single_Threaded_POA.cpp
-//
-// = DESCRIPTION
-//     This program tests to make sure that two threads cannot call
-//     servants in a single threaded POA simultaneously. At the same
-//     time, it makes sure that a servant can call itself or other
-//     servants in the same POA while in an upcall.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     Single_Threaded_POA.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests to make sure that two threads cannot call
+ *   servants in a single threaded POA simultaneously. At the same
+ *   time, it makes sure that a servant can call itself or other
+ *   servants in the same POA while in an upcall.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
 #include "ace/Task.h"
diff --git a/tests/POA/TIE/Makefile.am b/tests/POA/TIE/Makefile.am
deleted file mode 100644
index 13a1a7ef9c9..00000000000
--- a/tests/POA/TIE/Makefile.am
+++ /dev/null
@@ -1,112 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.POA_TIE_IDL.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GT $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.POA_TIE_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-
-## Makefile.POA_TIE_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/TIE/client.cpp b/tests/POA/TIE/client.cpp
index 6c9f8fd6a06..c572f480427 100644
--- a/tests/POA/TIE/client.cpp
+++ b/tests/POA/TIE/client.cpp
@@ -1,18 +1,17 @@
-// $Id$
-
-//===========================================================================
-//
-//
-// = FILENAME
-//     client.cpp
-//
-// = DESCRIPTION
-//     This is a simple client implementation.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//===========================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *   This is a simple client implementation.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "ace/streams.h"
 #include "ace/Get_Opt.h"
@@ -20,8 +19,6 @@
 #include "testC.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(TIE, client, "$Id$")
-
 static ACE_TCHAR *IOR[7] = { 0, 0, 0, 0, 0, 0, 0 };
 static int iterations = 1;
 
diff --git a/tests/POA/TIE/server.cpp b/tests/POA/TIE/server.cpp
index f603f839bd6..95491670ee4 100644
--- a/tests/POA/TIE/server.cpp
+++ b/tests/POA/TIE/server.cpp
@@ -1,18 +1,17 @@
-// $Id$
-
-// =========================================================================
-// = LIBRARY
-//    TAO/tests/POA/TIE
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    In this example,
-//
-// = AUTHOR
-//    Irfan Pyarali
-// =========================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  In this example,
+ *
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "ace/streams.h"
 #include "ace/SString.h"
@@ -20,8 +19,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(TIE, server, "$Id$")
-
 const ACE_TCHAR *ior_1 = ACE_TEXT ("ior_1");
 const ACE_TCHAR *ior_2 = ACE_TEXT ("ior_2");
 const ACE_TCHAR *ior_3 = ACE_TEXT ("ior_3");
diff --git a/tests/POA/TIE/test_i.cpp b/tests/POA/TIE/test_i.cpp
index 8fc84b1abae..016e58330fa 100644
--- a/tests/POA/TIE/test_i.cpp
+++ b/tests/POA/TIE/test_i.cpp
@@ -1,22 +1,19 @@
-// $Id$
 
-//===========================================================================
-//
-//
-// = FILENAME
-//     test_i.cpp
-//
-// = DESCRIPTION
-//     This is a simple test servant implementation
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//===========================================================================
+//=============================================================================
+/**
+ *  @file     test_i.cpp
+ *
+ *  $Id$
+ *
+ *   This is a simple test servant implementation
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
 
-#include "test_i.h"
 
-ACE_RCSID(TIE, test_i, "$Id$")
+#include "test_i.h"
 
 // Constructor
 Tie_i::Tie_i (CORBA::Long value)
diff --git a/tests/POA/TIE/test_i.h b/tests/POA/TIE/test_i.h
index 3450c129f8a..534b44c29f5 100644
--- a/tests/POA/TIE/test_i.h
+++ b/tests/POA/TIE/test_i.h
@@ -1,20 +1,19 @@
 // -*- C++ -*-
-//
-// $Id$
 
 //=============================================================================
-//
-// = FILENAME
-//     test_i.h
-//
-// = DESCRIPTION
-//     Defines implementation classes for the interfaces
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
+/**
+ *  @file     test_i.h
+ *
+ *  $Id$
+ *
+ *   Defines implementation classes for the interfaces
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
 //=============================================================================
 
+
 #include "testS.h"
 
 class Tie_i
@@ -51,8 +50,8 @@ protected:
 
   CORBA::Long value_;
 
+  /// Default poa associated with this servant
   PortableServer::POA_var poa_;
-  // Default poa associated with this servant
 };
 
 class Outer_i
@@ -76,8 +75,8 @@ public:
 
     CORBA::Long value_;
 
+    /// Default poa associated with this servant
     PortableServer::POA_var poa_;
-    // Default poa associated with this servant
   };
 
   class Inner_i
@@ -101,8 +100,8 @@ public:
 
       CORBA::Long value_;
 
+      /// Default poa associated with this servant
       PortableServer::POA_var poa_;
-      // Default poa associated with this servant
     };
   };
 };
diff --git a/tests/POA/wait_for_completion/Makefile.am b/tests/POA/wait_for_completion/Makefile.am
deleted file mode 100644
index 8f2ea1832a1..00000000000
--- a/tests/POA/wait_for_completion/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Wait_For_Completion.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = wait_for_completion
-
-wait_for_completion_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-wait_for_completion_SOURCES = \
-  testC.cpp \
-  testS.cpp \
-  wait_for_completion.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-wait_for_completion_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/POA/wait_for_completion/wait_for_completion.cpp b/tests/POA/wait_for_completion/wait_for_completion.cpp
index c91fbc51fc9..c4a9224f105 100644
--- a/tests/POA/wait_for_completion/wait_for_completion.cpp
+++ b/tests/POA/wait_for_completion/wait_for_completion.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/wait_for_completion
-//
-// = FILENAME
-//     wait_for_completion.cpp
-//
-// = DESCRIPTION
-//     This program tests the wait_for_completion feature of a POA.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     wait_for_completion.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests the wait_for_completion feature of a POA.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testS.h"
 
diff --git a/tests/Parallel_Connect_Strategy/Makefile.am b/tests/Parallel_Connect_Strategy/Makefile.am
deleted file mode 100644
index abf2f9d3ed2..00000000000
--- a/tests/Parallel_Connect_Strategy/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Parallel_Connect_Strategy_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Parallel_Connect_Strategy_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Parallel_Connect_Strategy_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  server.cpp \
-  Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Parallel_Connect_Strategy/blocked.conf b/tests/Parallel_Connect_Strategy/blocked.conf
index 2feddbe2302..47c294272c1 100644
--- a/tests/Parallel_Connect_Strategy/blocked.conf
+++ b/tests/Parallel_Connect_Strategy/blocked.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # test for using the blocked connect strategy
 
 static Client_Strategy_Factory "-ORBConnectStrategy Blocked"
diff --git a/tests/Parallel_Connect_Strategy/client.cpp b/tests/Parallel_Connect_Strategy/client.cpp
index 4d9e11a5c5a..3e96f955529 100644
--- a/tests/Parallel_Connect_Strategy/client.cpp
+++ b/tests/Parallel_Connect_Strategy/client.cpp
@@ -5,8 +5,6 @@
 #include "ace/High_Res_Timer.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int kill_server = 0;
 bool sanity_timeout = false;
@@ -49,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Parallel_Connect_Strategy/reactive.conf b/tests/Parallel_Connect_Strategy/reactive.conf
index 0317f1c624c..4b6370b4daf 100644
--- a/tests/Parallel_Connect_Strategy/reactive.conf
+++ b/tests/Parallel_Connect_Strategy/reactive.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # test for using the blocked connect strategy
 
 static Client_Strategy_Factory "-ORBConnectStrategy Reactive"
diff --git a/tests/Parallel_Connect_Strategy/server.cpp b/tests/Parallel_Connect_Strategy/server.cpp
index 048f78895a2..ee7c20180f5 100644
--- a/tests/Parallel_Connect_Strategy/server.cpp
+++ b/tests/Parallel_Connect_Strategy/server.cpp
@@ -5,10 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/IORTable/IORTable.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Param_Test/Makefile.am b/tests/Param_Test/Makefile.am
deleted file mode 100644
index 428806e483c..00000000000
--- a/tests/Param_Test/Makefile.am
+++ /dev/null
@@ -1,264 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Param_Test_Idl.am
-
-BUILT_SOURCES = \
-  param_testC.cpp \
-  param_testC.h \
-  param_testC.inl \
-  param_testS.cpp \
-  param_testS.h \
-  param_testS.inl
-
-CLEANFILES = \
-  param_test-stamp \
-  param_testC.cpp \
-  param_testC.h \
-  param_testC.inl \
-  param_testS.cpp \
-  param_testS.h \
-  param_testS.inl
-
-param_testC.cpp param_testC.h param_testC.inl param_testS.cpp param_testS.h param_testS.inl: param_test-stamp
-
-param_test-stamp: $(srcdir)/param_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/param_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  param_test.idl
-
-## Makefile.Param_Test_Anyop.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += anyop
-
-anyop_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-anyop_SOURCES = \
-  anyop.cpp \
-  param_testC.cpp \
-  any.h \
-  bd_array_seq.h \
-  bd_long_seq.h \
-  bd_short_seq.h \
-  bd_str_seq.h \
-  bd_string.h \
-  bd_struct_seq.h \
-  bd_wstr_seq.h \
-  bd_wstring.h \
-  big_union.h \
-  client.h \
-  complex_any.h \
-  driver.h \
-  except.h \
-  fixed_array.h \
-  fixed_struct.h \
-  helper.h \
-  multdim_array.h \
-  nested_struct.h \
-  objref.h \
-  objref_struct.h \
-  options.h \
-  param_test_i.h \
-  recursive_struct.h \
-  recursive_union.h \
-  results.h \
-  short.h \
-  small_union.h \
-  tests.h \
-  typecode.h \
-  ub_any_seq.h \
-  ub_array_seq.h \
-  ub_long_seq.h \
-  ub_objref_seq.h \
-  ub_short_seq.h \
-  ub_str_seq.h \
-  ub_string.h \
-  ub_struct_seq.h \
-  ub_wstr_seq.h \
-  ub_wstring.h \
-  ulonglong.h \
-  var_array.h \
-  var_struct.h
-
-anyop_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Param_Test_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  any.cpp \
-  bd_array_seq.cpp \
-  bd_long_seq.cpp \
-  bd_short_seq.cpp \
-  bd_str_seq.cpp \
-  bd_string.cpp \
-  bd_struct_seq.cpp \
-  bd_wstr_seq.cpp \
-  bd_wstring.cpp \
-  big_union.cpp \
-  client.cpp \
-  complex_any.cpp \
-  driver.cpp \
-  except.cpp \
-  fixed_array.cpp \
-  fixed_struct.cpp \
-  helper.cpp \
-  multdim_array.cpp \
-  nested_struct.cpp \
-  objref.cpp \
-  objref_struct.cpp \
-  options.cpp \
-  param_testC.cpp \
-  recursive_struct.cpp \
-  recursive_union.cpp \
-  results.cpp \
-  short.cpp \
-  small_union.cpp \
-  typecode.cpp \
-  ub_any_seq.cpp \
-  ub_array_seq.cpp \
-  ub_long_seq.cpp \
-  ub_objref_seq.cpp \
-  ub_short_seq.cpp \
-  ub_str_seq.cpp \
-  ub_string.cpp \
-  ub_struct_seq.cpp \
-  ub_wstr_seq.cpp \
-  ub_wstring.cpp \
-  ulonglong.cpp \
-  var_array.cpp \
-  var_struct.cpp \
-  any.h \
-  bd_array_seq.h \
-  bd_long_seq.h \
-  bd_short_seq.h \
-  bd_str_seq.h \
-  bd_string.h \
-  bd_struct_seq.h \
-  bd_wstr_seq.h \
-  bd_wstring.h \
-  big_union.h \
-  client.h \
-  complex_any.h \
-  driver.h \
-  except.h \
-  fixed_array.h \
-  fixed_struct.h \
-  helper.h \
-  multdim_array.h \
-  nested_struct.h \
-  objref.h \
-  objref_struct.h \
-  options.h \
-  recursive_struct.h \
-  recursive_union.h \
-  results.h \
-  short.h \
-  small_union.h \
-  typecode.h \
-  ub_any_seq.h \
-  ub_array_seq.h \
-  ub_long_seq.h \
-  ub_objref_seq.h \
-  ub_short_seq.h \
-  ub_str_seq.h \
-  ub_string.h \
-  ub_struct_seq.h \
-  ub_wstr_seq.h \
-  ub_wstring.h \
-  ulonglong.h \
-  var_array.h \
-  var_struct.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Param_Test_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  param_testC.cpp \
-  param_testS.cpp \
-  param_test_i.cpp \
-  server.cpp \
-  param_test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Param_Test/any.cpp b/tests/Param_Test/any.cpp
index 8153e6b1df6..31468c2ceee 100644
--- a/tests/Param_Test/any.cpp
+++ b/tests/Param_Test/any.cpp
@@ -1,29 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    any.cpp
-//
-// = DESCRIPTION
-//    tests Anys
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    any.cpp
+ *
+ *  $Id$
+ *
+ *  tests Anys
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "any.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Param_Test,
-           any,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Any
 // ************************************************************************
diff --git a/tests/Param_Test/any.h b/tests/Param_Test/any.h
index 45358671fc4..5f999f95bfc 100644
--- a/tests/Param_Test/any.h
+++ b/tests/Param_Test/any.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    any.h
-//
-// = DESCRIPTION
-//     Tests Anys
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    any.h
+ *
+ *  $Id$
+ *
+ *   Tests Anys
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_ANY_H
 #define PARAM_TEST_ANY_H
@@ -27,11 +24,11 @@
 class Test_Any
 {
 public:
+  /// ctor
   Test_Any (void);
-  // ctor
 
+  /// dtor
   ~Test_Any (void);
-  // dtor
 
   enum
   {
@@ -47,51 +44,51 @@ public:
     ANY_LAST_TEST_ITEM
   };
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// Coffee object used to test Any with object.
   Coffee_var cobj_;
-  // Coffee object used to test Any with object.
 
+  /// test counter.
   static size_t counter;
-  // test counter.
 
+  /// in parameter
   CORBA::Any in_;
-  // in parameter
 
+  /// inout parameter
   CORBA::Any inout_;
-  // inout parameter
 
+  /// out parameter
   CORBA::Any_var out_;
-  // out parameter
 
+  /// return value
   CORBA::Any_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_ANY_H */
diff --git a/tests/Param_Test/anyop.cpp b/tests/Param_Test/anyop.cpp
index 04e391c457d..006d174f24e 100644
--- a/tests/Param_Test/anyop.cpp
+++ b/tests/Param_Test/anyop.cpp
@@ -1,19 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Param_Test
-//
-// = FILENAME
-//   anyop.cpp
-//
-// = DESCRIPTION
-//
-// = AUTHORS
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   anyop.cpp
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #include "param_testC.h"
 
@@ -27,10 +22,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Param_Test,
-           anyop,
-           "$Id$")
-
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
@@ -190,8 +181,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
             CORBA::Double o;
 
-            if (!(any >>= o)
-                || i != o)
+            if (!(any >>= o) || !ACE::is_equal (i, o))
               {
                 ACE_DEBUG ((LM_DEBUG,
                             "Failure for CORBA::Double (%f,%f)\n",
@@ -272,9 +262,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                 || o->c != i->c
                 || o->s != i->s
                 || o->o != i->o
-                || o->f != i->f
+                || !ACE::is_equal (o->f, i->f)
                 || o->b != i->b
-                || o->d != i->d)
+                || !ACE::is_equal (o->d, i->d))
               {
                 ACE_DEBUG ((LM_DEBUG,
                             "Failure for Fixed_Struct "
@@ -288,9 +278,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                 || o->c != i->c
                 || o->s != i->s
                 || o->o != i->o
-                || o->f != i->f
+                || !ACE::is_equal (o->f, i->f)
                 || o->b != i->b
-                || o->d != i->d)
+                || !ACE::is_equal (o->d, i->d))
               {
                 ACE_DEBUG ((LM_DEBUG,
                             "Failure for Fixed_Struct "
diff --git a/tests/Param_Test/bd_array_seq.cpp b/tests/Param_Test/bd_array_seq.cpp
index 18f09817c80..b394fcad4a2 100644
--- a/tests/Param_Test/bd_array_seq.cpp
+++ b/tests/Param_Test/bd_array_seq.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_array_seq.cpp
-//
-// = DESCRIPTION
-//    tests bounded array sequences
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_array_seq.cpp
+ *
+ *  $Id$
+ *
+ *  tests bounded array sequences
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "bd_array_seq.h"
 
-ACE_RCSID (Param_Test,
-           bd_array_seq,
-           "$Id$")
-
 const CORBA::ULong MAX_ARRAYSEQ_LEN = 1;
 
 // ************************************************************************
diff --git a/tests/Param_Test/bd_array_seq.h b/tests/Param_Test/bd_array_seq.h
index 5c0c29c5e0f..1cbb42e1129 100644
--- a/tests/Param_Test/bd_array_seq.h
+++ b/tests/Param_Test/bd_array_seq.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_array_seq.h
-//
-// = DESCRIPTION
-//     Tests bounded array sequence
-//
-// = AUTHORS
-//      Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_array_seq.h
+ *
+ *  $Id$
+ *
+ *   Tests bounded array sequence
+ *
+ *
+ *  @author   Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_BOUNDED_ARRAY_SEQUENCE_H
 #define PARAM_TEST_BOUNDED_ARRAY_SEQUENCE_H
@@ -28,60 +25,60 @@
 class Test_Bounded_Array_Sequence
 {
 public:
+  /// ctor
   Test_Bounded_Array_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_Bounded_Array_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 protected:
+  /// compare
   CORBA::Boolean compare (const Param_Test::Bounded_ArraySeq &s1,
                           const Param_Test::Bounded_ArraySeq &s2);
-  // compare
 
+  /// print individual sequence
   void print_sequence (const Param_Test::Bounded_ArraySeq &s);
-  // print individual sequence
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Bounded_ArraySeq in_;
-  // in parameter
 
   // these need memory management
+  /// inout parameter
   Param_Test::Bounded_ArraySeq_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Bounded_ArraySeq_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Bounded_ArraySeq_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_BOUNDED_ARRAY_SEQUENCE_H */
diff --git a/tests/Param_Test/bd_long_seq.cpp b/tests/Param_Test/bd_long_seq.cpp
index c4ab4067cae..5b047e073b0 100644
--- a/tests/Param_Test/bd_long_seq.cpp
+++ b/tests/Param_Test/bd_long_seq.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_long_seq.cpp
-//
-// = DESCRIPTION
-//    tests bounded long sequences
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_long_seq.cpp
+ *
+ *  $Id$
+ *
+ *  tests bounded long sequences
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "bd_long_seq.h"
 
-ACE_RCSID (Param_Test,
-           bd_long_seq,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Bounded_Long_Sequence
 // ************************************************************************
diff --git a/tests/Param_Test/bd_long_seq.h b/tests/Param_Test/bd_long_seq.h
index caaae1236e3..aa2978f6f4d 100644
--- a/tests/Param_Test/bd_long_seq.h
+++ b/tests/Param_Test/bd_long_seq.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_long_seq.h
-//
-// = DESCRIPTION
-//     Tests bounded long sequences
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_long_seq.h
+ *
+ *  $Id$
+ *
+ *   Tests bounded long sequences
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_BOUNDED_LONG_SEQUENCE_H
 #define PARAM_TEST_BOUNDED_LONG_SEQUENCE_H
@@ -28,51 +25,51 @@
 class Test_Bounded_Long_Sequence
 {
 public:
+  /// ctor
   Test_Bounded_Long_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_Bounded_Long_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Bounded_Long_Seq_var in_;
-  // in parameter
 
+  /// inout parameter
   Param_Test::Bounded_Long_Seq_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Bounded_Long_Seq_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Bounded_Long_Seq_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_BOUNDED_LONG_SEQUENCE_H */
diff --git a/tests/Param_Test/bd_short_seq.cpp b/tests/Param_Test/bd_short_seq.cpp
index 60363f53431..08899259432 100644
--- a/tests/Param_Test/bd_short_seq.cpp
+++ b/tests/Param_Test/bd_short_seq.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_short_seq.cpp
-//
-// = DESCRIPTION
-//    tests bounded short sequences
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_short_seq.cpp
+ *
+ *  $Id$
+ *
+ *  tests bounded short sequences
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "bd_short_seq.h"
 
-ACE_RCSID (Param_Test,
-           bd_short_seq,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Bounded_Short_Sequence
 // ************************************************************************
diff --git a/tests/Param_Test/bd_short_seq.h b/tests/Param_Test/bd_short_seq.h
index 9794e21de32..1ca0b16bc65 100644
--- a/tests/Param_Test/bd_short_seq.h
+++ b/tests/Param_Test/bd_short_seq.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_short_seq.h
-//
-// = DESCRIPTION
-//     Tests bounded short sequence
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_short_seq.h
+ *
+ *  $Id$
+ *
+ *   Tests bounded short sequence
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_BOUNDED_SHORT_SEQUENCE_H
 #define PARAM_TEST_BOUNDED_SHORT_SEQUENCE_H
@@ -28,51 +25,51 @@
 class Test_Bounded_Short_Sequence
 {
 public:
+  /// ctor
   Test_Bounded_Short_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_Bounded_Short_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Bounded_Short_Seq_var in_;
-  // in parameter
 
+  /// inout parameter
   Param_Test::Bounded_Short_Seq_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Bounded_Short_Seq_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Bounded_Short_Seq_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_BOUNDED_SHORT_SEQUENCE_H */
diff --git a/tests/Param_Test/bd_str_seq.cpp b/tests/Param_Test/bd_str_seq.cpp
index 968ebaaa976..b6bab477d37 100644
--- a/tests/Param_Test/bd_str_seq.cpp
+++ b/tests/Param_Test/bd_str_seq.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_str_seq.cpp
-//
-// = DESCRIPTION
-//    tests bounded string sequences
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_str_seq.cpp
+ *
+ *  $Id$
+ *
+ *  tests bounded string sequences
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "bd_str_seq.h"
 
-ACE_RCSID (Param_Test,
-           bd_str_seq,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Bounded_String_Sequence
 // ************************************************************************
diff --git a/tests/Param_Test/bd_str_seq.h b/tests/Param_Test/bd_str_seq.h
index 2abe9954fb6..9e9994fefab 100644
--- a/tests/Param_Test/bd_str_seq.h
+++ b/tests/Param_Test/bd_str_seq.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_str_seq.h
-//
-// = DESCRIPTION
-//     Tests bounded sequences of strings
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_str_seq.h
+ *
+ *  $Id$
+ *
+ *   Tests bounded sequences of strings
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_BOUNDED_STRING_SEQUENCE_H
 #define PARAM_TEST_BOUNDED_STRING_SEQUENCE_H
@@ -28,51 +25,51 @@
 class Test_Bounded_String_Sequence
 {
 public:
+  /// ctor
   Test_Bounded_String_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_Bounded_String_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Bounded_StrSeq_var in_;
-  // in parameter
 
+  /// inout parameter
   Param_Test::Bounded_StrSeq_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Bounded_StrSeq_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Bounded_StrSeq_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_BOUNDED_STRING_SEQUENCE_H */
diff --git a/tests/Param_Test/bd_string.cpp b/tests/Param_Test/bd_string.cpp
index 36a6aba5130..ace0459c1a9 100644
--- a/tests/Param_Test/bd_string.cpp
+++ b/tests/Param_Test/bd_string.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_string.cpp
-//
-// = DESCRIPTION
-//    tests bounded strings
-//
-// = AUTHORS
-//      Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_string.cpp
+ *
+ *  $Id$
+ *
+ *  tests bounded strings
+ *
+ *
+ *  @author   Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "bd_string.h"
 
-ACE_RCSID (Param_Test,
-           bd_string,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Bounded_String
 // ************************************************************************
diff --git a/tests/Param_Test/bd_string.h b/tests/Param_Test/bd_string.h
index 8019f18aecb..156dea3e0a2 100644
--- a/tests/Param_Test/bd_string.h
+++ b/tests/Param_Test/bd_string.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_string.h
-//
-// = DESCRIPTION
-//     Tests bounded string
-//
-// = AUTHORS
-//      Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_string.h
+ *
+ *  $Id$
+ *
+ *   Tests bounded string
+ *
+ *
+ *  @author   Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_BOUNDED_STRING_H
 #define PARAM_TEST_BOUNDED_STRING_H
@@ -27,51 +24,51 @@
 class Test_Bounded_String
 {
 public:
+  /// ctor
   Test_Bounded_String (void);
-  // ctor
 
+  /// dtor
   ~Test_Bounded_String (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   char *in_;
-  // in parameter
 
+  /// inout parameter
   char *inout_;
-  // inout parameter
 
+  /// out parameter
   char *out_;
-  // out parameter
 
+  /// return value
   char *ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_BOUNDED_STRING_H */
diff --git a/tests/Param_Test/bd_struct_seq.cpp b/tests/Param_Test/bd_struct_seq.cpp
index 2c1318e45d0..2e7aa0cc9d5 100644
--- a/tests/Param_Test/bd_struct_seq.cpp
+++ b/tests/Param_Test/bd_struct_seq.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_struct_seq.cpp
-//
-// = DESCRIPTION
-//    tests bounded struct sequences
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_struct_seq.cpp
+ *
+ *  $Id$
+ *
+ *  tests bounded struct sequences
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "bd_struct_seq.h"
 
-ACE_RCSID (Param_Test,
-           bd_struct_seq,
-           "$Id$")
-
 const CORBA::ULong MAX_STRUCTSEQ_LEN = 1;
 
 // ************************************************************************
@@ -190,9 +183,9 @@ Test_Bounded_Struct_Sequence::compare (const Param_Test::Bounded_StructSeq &s1,
           || vs1.c != vs2.c
           || vs1.s != vs2.s
           || vs1.o != vs2.o
-          || vs1.f != vs2.f
+          || !ACE::is_equal (vs1.f, vs2.f)
           || vs1.b != vs2.b
-          || vs1.d != vs2.d )
+          || !ACE::is_equal (vs1.d, vs2.d))
         return 0;
     }
 
diff --git a/tests/Param_Test/bd_struct_seq.h b/tests/Param_Test/bd_struct_seq.h
index dc640977d8f..576fde32ae7 100644
--- a/tests/Param_Test/bd_struct_seq.h
+++ b/tests/Param_Test/bd_struct_seq.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_struct_seq.h
-//
-// = DESCRIPTION
-//     Tests bounded struct sequence
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_struct_seq.h
+ *
+ *  $Id$
+ *
+ *   Tests bounded struct sequence
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_BOUNDED_STRUCT_SEQUENCE_H
 #define PARAM_TEST_BOUNDED_STRUCT_SEQUENCE_H
@@ -28,60 +25,60 @@
 class Test_Bounded_Struct_Sequence
 {
 public:
+  /// ctor
   Test_Bounded_Struct_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_Bounded_Struct_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 protected:
+  /// compare
   CORBA::Boolean compare (const Param_Test::Bounded_StructSeq &s1,
                           const Param_Test::Bounded_StructSeq &s2);
-  // compare
 
+  /// print individual sequence
   void print_sequence (const Param_Test::Bounded_StructSeq &s);
-  // print individual sequence
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Bounded_StructSeq in_;
-  // in parameter
 
   // these need memory management
+  /// inout parameter
   Param_Test::Bounded_StructSeq_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Bounded_StructSeq_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Bounded_StructSeq_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_BOUNDED_STRUCT_SEQUENCE_H */
diff --git a/tests/Param_Test/bd_wstr_seq.cpp b/tests/Param_Test/bd_wstr_seq.cpp
index 12b9a01ff52..49542b3a0a1 100644
--- a/tests/Param_Test/bd_wstr_seq.cpp
+++ b/tests/Param_Test/bd_wstr_seq.cpp
@@ -1,29 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_wstr_seq.cpp
-//
-// = DESCRIPTION
-//    tests bounded wide string sequences
-//
-// = AUTHORS
-//      Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_wstr_seq.cpp
+ *
+ *  $Id$
+ *
+ *  tests bounded wide string sequences
+ *
+ *
+ *  @author   Jeff Parsons
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "bd_wstr_seq.h"
 #include "ace/OS_NS_wchar.h"
 
-ACE_RCSID (Param_Test,
-           bd_wstr_seq,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Bounded_WString_Sequence
 // ************************************************************************
diff --git a/tests/Param_Test/bd_wstr_seq.h b/tests/Param_Test/bd_wstr_seq.h
index 0f0c6b9f7e6..1cec415071e 100644
--- a/tests/Param_Test/bd_wstr_seq.h
+++ b/tests/Param_Test/bd_wstr_seq.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_wstr_seq.h
-//
-// = DESCRIPTION
-//     Tests bounded sequences of wide strings
-//
-// = AUTHORS
-//      Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_wstr_seq.h
+ *
+ *  $Id$
+ *
+ *   Tests bounded sequences of wide strings
+ *
+ *
+ *  @author   Jeff Parsons
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_BOUNDED_WSTRING_SEQUENCE_H
 #define PARAM_TEST_BOUNDED_WSTRING_SEQUENCE_H
@@ -28,51 +25,51 @@
 class Test_Bounded_WString_Sequence
 {
 public:
+  /// ctor
   Test_Bounded_WString_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_Bounded_WString_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Bounded_WStrSeq_var in_;
-  // in parameter
 
+  /// inout parameter
   Param_Test::Bounded_WStrSeq_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Bounded_WStrSeq_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Bounded_WStrSeq_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_BOUNDED_WSTRING_SEQUENCE_H */
diff --git a/tests/Param_Test/bd_wstring.cpp b/tests/Param_Test/bd_wstring.cpp
index 4ce873cce40..3f99a121445 100644
--- a/tests/Param_Test/bd_wstring.cpp
+++ b/tests/Param_Test/bd_wstring.cpp
@@ -1,29 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_wstring.cpp
-//
-// = DESCRIPTION
-//    tests bounded wide strings
-//
-// = AUTHORS
-//      Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_wstring.cpp
+ *
+ *  $Id$
+ *
+ *  tests bounded wide strings
+ *
+ *
+ *  @author   Jeff Parsons
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "bd_wstring.h"
 #include "ace/OS_NS_wchar.h"
 
-ACE_RCSID (Param_Test,
-           bd_wstring,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Bounded_WString
 // ************************************************************************
diff --git a/tests/Param_Test/bd_wstring.h b/tests/Param_Test/bd_wstring.h
index 4e7719f272a..ae10a6f65d6 100644
--- a/tests/Param_Test/bd_wstring.h
+++ b/tests/Param_Test/bd_wstring.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    bd_wstring.h
-//
-// = DESCRIPTION
-//     Tests bounded wide string
-//
-// = AUTHORS
-//      Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    bd_wstring.h
+ *
+ *  $Id$
+ *
+ *   Tests bounded wide string
+ *
+ *
+ *  @author   Jeff Parsons
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_BOUNDED_WSTRING_H
 #define PARAM_TEST_BOUNDED_WSTRING_H
@@ -27,51 +24,51 @@
 class Test_Bounded_WString
 {
 public:
+  /// ctor
   Test_Bounded_WString (void);
-  // ctor
 
+  /// dtor
   ~Test_Bounded_WString (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   CORBA::WChar *in_;
-  // in parameter
 
+  /// inout parameter
   CORBA::WChar *inout_;
-  // inout parameter
 
+  /// out parameter
   CORBA::WChar *out_;
-  // out parameter
 
+  /// return value
   CORBA::WChar *ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_BOUNDED_WSTRING_H */
diff --git a/tests/Param_Test/big_union.cpp b/tests/Param_Test/big_union.cpp
index 5b7cc1121ff..929acbbe2bd 100644
--- a/tests/Param_Test/big_union.cpp
+++ b/tests/Param_Test/big_union.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    big_union.cpp
-//
-// = DESCRIPTION
-//    tests Big_Unions
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    big_union.cpp
+ *
+ *  $Id$
+ *
+ *  tests Big_Unions
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "big_union.h"
 
-ACE_RCSID (Param_Test,
-           big_union,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Big_Union
 // ************************************************************************
@@ -130,7 +123,7 @@ Test_Big_Union::reset_parameters (void)
     case 3:
       {
         Param_Test::short_array x;
-        
+
         for (int i = 0; i < 32; ++i)
           {
             x[i] = gen->gen_short ();
@@ -320,7 +313,7 @@ Test_Big_Union::check_validity (void)
         CORBA::Long inout = this->inout_.the_long ();
         CORBA::Long out   = this->out_->the_long ();
         CORBA::Long ret   = this->ret_->the_long ();
-        
+
         if (in != out || in != inout || in != ret)
           {
             return 0;
@@ -337,7 +330,7 @@ Test_Big_Union::check_validity (void)
           this->out_->another_array ();
         Param_Test::short_array_slice* ret_array   =
           this->ret_->another_array ();
-          
+
         for (int i = 0; i != 32; ++i)
           {
             if (in_array[i] != inout_array[i]
@@ -355,7 +348,7 @@ Test_Big_Union::check_validity (void)
         const char* inout = this->inout_.the_string ();
         const char* out   = this->out_->the_string ();
         const char* ret   = this->ret_->the_string ();
-        
+
         if (ACE_OS::strcmp (in,out)
             || ACE_OS::strcmp (in,inout)
             || ACE_OS::strcmp (in,ret))
@@ -402,7 +395,7 @@ Test_Big_Union::check_validity (void)
         CORBA::Short inout_short;
         CORBA::Short out_short;
         CORBA::Short ret_short;
-        
+
         if (!(in >>= in_short)
             || !(inout >>= inout_short)
             || !(out >>= out_short)
@@ -425,7 +418,7 @@ Test_Big_Union::check_validity (void)
         CORBA::Octet inout = this->inout_.the_octet ();
         CORBA::Octet out   = this->out_->the_octet ();
         CORBA::Octet ret   = this->ret_->the_octet ();
-        
+
         if (in != out || in != inout || in != ret)
           {
             return 0;
@@ -438,7 +431,7 @@ Test_Big_Union::check_validity (void)
         CORBA::Char inout = this->inout_.the_char ();
         CORBA::Char out   = this->out_->the_char ();
         CORBA::Char ret   = this->ret_->the_char ();
-        
+
         if (in != out || in != inout || in != ret)
           {
             return 0;
@@ -451,7 +444,7 @@ Test_Big_Union::check_validity (void)
         CORBA::Boolean inout = this->inout_.the_boolean ();
         CORBA::Boolean out   = this->out_->the_boolean ();
         CORBA::Boolean ret   = this->ret_->the_boolean ();
-        
+
         if (in != out || in != inout || in != ret)
           {
             return 0;
@@ -493,7 +486,7 @@ Test_Big_Union::check_validity (void)
           }
 
         CORBA::ULong len = in.seq.length ();
-        
+
         for (CORBA::ULong i = 0; i != len; ++i)
           {
             if (ACE_OS::strcmp (in.seq[i],
@@ -523,23 +516,23 @@ Test_Big_Union::check_validity (void)
                && in.c == inout.c
                && in.s == inout.s
                && in.o == inout.o
-               && in.f == inout.f
+               && ACE::is_equal (in.f, inout.f)
                && in.b == inout.b
-               && in.d == inout.d)
+               && ACE::is_equal (in.d, inout.d))
             || !(in.l == out.l
                  && in.c == out.c
                  && in.s == out.s
                  && in.o == out.o
-                 && in.f == out.f
+                 && ACE::is_equal (in.f, out.f)
                  && in.b == out.b
-                 && in.d == out.d)
+                 && ACE::is_equal (in.d, out.d))
             || !(in.l == ret.l
                  && in.c == ret.c
                  && in.s == ret.s
                  && in.o == ret.o
-                 && in.f == ret.f
+                 && ACE::is_equal (in.f, ret.f)
                  && in.b == ret.b
-                 && in.d == ret.d))
+                 && ACE::is_equal (in.d, ret.d)))
           {
             return 0;
           }
diff --git a/tests/Param_Test/big_union.h b/tests/Param_Test/big_union.h
index fc304337279..429705fb282 100644
--- a/tests/Param_Test/big_union.h
+++ b/tests/Param_Test/big_union.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    big_union.h
-//
-// = DESCRIPTION
-//     Tests Anys
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    big_union.h
+ *
+ *  $Id$
+ *
+ *   Tests Anys
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_BIG_UNION_H
 #define PARAM_TEST_BIG_UNION_H
@@ -27,61 +24,61 @@
 class Test_Big_Union
 {
 public:
+  /// ctor
   Test_Big_Union (void);
-  // ctor
 
+  /// dtor
   ~Test_Big_Union (void);
-  // dtor
 
   enum {
     BIG_UNION_N_BRANCHES = 12
   };
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// Coffee object used to test Big_Union with object.
   Coffee_var cobj_;
-  // Coffee object used to test Big_Union with object.
 
+  /// test counter.
   static size_t counter;
-  // test counter.
 
+  /// in parameter
   Param_Test::Big_Union in_;
-  // in parameter
 
+  /// inout parameter
   Param_Test::Big_Union inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Big_Union_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Big_Union_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_BIG_UNION_H */
diff --git a/tests/Param_Test/client.cpp b/tests/Param_Test/client.cpp
index 87324854779..1745c426aa7 100644
--- a/tests/Param_Test/client.cpp
+++ b/tests/Param_Test/client.cpp
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//    This file contains the implementation of the client-side of the
-//    Param_Test application.
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.cpp
+ *
+ *  $Id$
+ *
+ *  This file contains the implementation of the client-side of the
+ *  Param_Test application.
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef CLIENT_CPP
 #define CLIENT_CPP
@@ -24,11 +21,7 @@
 #include "results.h"
 #include "client.h"
 
-ACE_RCSID (Param_Test,
-           client,
-           "$Id$")
-
-// Constructor.p
+// Constructor.
 template <class T>
 Param_Test_Client<T>::Param_Test_Client (CORBA::ORB_ptr orb,
                                          Param_Test_ptr objref,
diff --git a/tests/Param_Test/client.h b/tests/Param_Test/client.h
index 8e9e0ec58d7..05bcee0d1e0 100644
--- a/tests/Param_Test/client.h
+++ b/tests/Param_Test/client.h
@@ -1,21 +1,17 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION
-//    Header file for the Param_Test client application.
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    client.h
+ *
+ *  $Id$
+ *
+ *  Header file for the Param_Test client application.
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_CLIENT_H
 #define PARAM_TEST_CLIENT_H
@@ -25,18 +21,20 @@
 #include "param_testC.h"
 #include "results.h"
 
+/**
+ * @class Param_Test_Client
+ *
+ * @brief Param_Test_Client
+ *
+ * This class declares an interface to run the example client for
+ * Param_Test CORBA server.  All the complexity for initializing
+ * the client is hidden in the class.  Just the run () interface
+ * is needed. The template class does the specific work of making
+ * the request of the desired data type
+ */
 template <class T>
 class Param_Test_Client
 {
-  // = TITLE
-  //    Param_Test_Client
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    Param_Test CORBA server.  All the complexity for initializing
-  //    the client is hidden in the class.  Just the run () interface
-  //    is needed. The template class does the specific work of making
-  //    the request of the desired data type
 public:
   typedef T TEST_OBJECT;
 
@@ -47,24 +45,24 @@ public:
 
   ~Param_Test_Client (void);
 
+  /// run the SII test
   int run_sii_test (void);
-  // run the SII test
 
+  /// run the DII test
   int run_dii_test (void);
-  // run the DII test
 
 private:
+  /// underlying ORB
   CORBA::ORB_ptr orb_;
-  // underlying ORB
 
+  /// param test object reference
   Param_Test_ptr param_test_;
-  // param test object reference
 
+  /// object doing the actual work
   TEST_OBJECT *test_object_;
-  // object doing the actual work
 
+  /// results
   Results results_;
-  // results
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/tests/Param_Test/complex_any.cpp b/tests/Param_Test/complex_any.cpp
index efabe515361..4520c5e5e31 100644
--- a/tests/Param_Test/complex_any.cpp
+++ b/tests/Param_Test/complex_any.cpp
@@ -1,29 +1,24 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    complex_any.cpp
-//
-// = DESCRIPTION
-//    tests complex Anys
-//
-// = AUTHORS
-//    Aniruddha Gokhale, Jeff Parsons, Frank Buschmann
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    complex_any.cpp
+ *
+ *  $Id$
+ *
+ *  tests complex Anys
+ *
+ *
+ *  @author Aniruddha Gokhale
+ *  @author Jeff Parsons
+ *  @author Frank Buschmann
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "complex_any.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Param_Test,
-           complex_any,
-           "$Id$")
-
 const int LEVEL_2_LENGTH = 5;
 const int LEVEL_3_LENGTH = 3;
 
diff --git a/tests/Param_Test/complex_any.h b/tests/Param_Test/complex_any.h
index 7eb861c2223..2d8ed898466 100644
--- a/tests/Param_Test/complex_any.h
+++ b/tests/Param_Test/complex_any.h
@@ -1,20 +1,19 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO/tests/Param_Test
-//
-// = FILENAME
-//     complex_any.h
-//
-// = DESCRIPTION
-//     Tests complex Anys
-//
-// = AUTHORS
-//     Aniruddha Gokhale, Jeff Parsons, Frank Buschmann
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file     complex_any.h
+ *
+ *  $Id$
+ *
+ *   Tests complex Anys
+ *
+ *
+ *  @author  Aniruddha Gokhale
+ *  @author Jeff Parsons
+ *  @author Frank Buschmann
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_COMPLEX_ANY_H
 #define PARAM_TEST_COMPLEX_ANY_H
@@ -27,58 +26,58 @@
 class Test_Complex_Any
 {
 public:
+  /// ctor
   Test_Complex_Any (void);
-  // ctor
 
+  /// dtor
   ~Test_Complex_Any (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// test counter.
   static size_t counter;
-  // test counter.
 
+  /// in parameter
   CORBA::Any in_;
-  // in parameter
 
+  /// inout parameter
   CORBA::Any inout_;
-  // inout parameter
 
+  /// out parameter
   CORBA::Any_var out_;
-  // out parameter
 
+  /// return value
   CORBA::Any_var ret_;
-  // return value
 
+  /// Compares the sequence extracted from in_ to one of the others.
   CORBA::Boolean comp_engine (const CORBA::AnySeq *in_seq,
                               const CORBA::AnySeq *comp_seq);
-  // Compares the sequence extracted from in_ to one of the others.
 };
 
 #endif /* PARAM_TEST_COMPLEX_ANY_H */
diff --git a/tests/Param_Test/driver.cpp b/tests/Param_Test/driver.cpp
index 228e6f61316..1217a092551 100644
--- a/tests/Param_Test/driver.cpp
+++ b/tests/Param_Test/driver.cpp
@@ -1,20 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    driver.cpp
-//
-// = DESCRIPTION
-//    Driver program
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    driver.cpp
+ *
+ *  $Id$
+ *
+ *  Driver program
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "client.h"
 #include "driver.h"
@@ -22,10 +19,6 @@
 #include "tests.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Param_Test,
-           driver,
-           "$Id$")
-
 // This function runs the test (main program)
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
diff --git a/tests/Param_Test/driver.h b/tests/Param_Test/driver.h
index 73f054c6765..df6ab513691 100644
--- a/tests/Param_Test/driver.h
+++ b/tests/Param_Test/driver.h
@@ -1,21 +1,17 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    driver.h
-//
-// = DESCRIPTION
-//    Header file for the driver program. The driver is a singleton.
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    driver.h
+ *
+ *  $Id$
+ *
+ *  Header file for the driver program. The driver is a singleton.
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef DRIVER_H
 #define DRIVER_H
@@ -23,30 +19,32 @@
 #include "options.h"
 #include "param_testC.h"
 
+/**
+ * @class Driver
+ *
+ * @brief Driver
+ *
+ * Driver program for the client
+ */
 class Driver
 {
-  // = TITLE
-  //    Driver
-  //
-  // = DESCRIPTION
-  //    Driver program for the client
 public:
   // = Constructor and destructor.
   Driver (void);
   ~Driver (void);
 
+  /// Initialize the driver object
   int init (int argc, ACE_TCHAR **argv);
-  // Initialize the driver object
 
+  /// Execute client example code.
   int run (void);
-  // Execute client example code.
 
 private:
+  /// underlying ORB (we do not own it)
   CORBA::ORB_var orb_;
-  // underlying ORB (we do not own it)
 
+  /// object reference (we do not own it)
   Param_Test_var objref_;
-  // object reference (we do not own it)
 };
 
 #endif /* !defined */
diff --git a/tests/Param_Test/except.cpp b/tests/Param_Test/except.cpp
index 6e349cd191e..decc97863f3 100644
--- a/tests/Param_Test/except.cpp
+++ b/tests/Param_Test/except.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Param_Test
-//
-// = FILENAME
-//   except.cpp
-//
-// = DESCRIPTION
-//   tests exception
-//
-// = AUTHORS
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   except.cpp
+ *
+ *  $Id$
+ *
+ * tests exception
+ *
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "except.h"
@@ -22,10 +19,6 @@
 
 #include "tao/DynamicInterface/Unknown_User_Exception.h"
 
-ACE_RCSID (Param_Test,
-           except,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Exception
 // ************************************************************************
diff --git a/tests/Param_Test/except.h b/tests/Param_Test/except.h
index b8bf8c3e9e4..acfd4b1d1cc 100644
--- a/tests/Param_Test/except.h
+++ b/tests/Param_Test/except.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Param_Test
-//
-// = FILENAME
-//   except.h
-//
-// = DESCRIPTION
-//   Tests system and user exceptions
-//
-// = AUTHORS
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   except.h
+ *
+ *  $Id$
+ *
+ * Tests system and user exceptions
+ *
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_EXCEPTION_H
 #define PARAM_TEST_EXCEPTION_H
@@ -24,54 +21,54 @@
 class Test_Exception
 {
 public:
+  /// ctor
   Test_Exception (void);
-  // ctor
 
+  /// dtor
   ~Test_Exception (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   CORBA::ULong in_;
-  // in parameter
 
+  /// inout parameter
   CORBA::ULong inout_;
-  // inout parameter
 
+  /// out parameter
   CORBA::ULong out_;
-  // out parameter
 
+  /// return value
   CORBA::ULong ret_;
-  // return value
 
+  /// Current iterations.
   CORBA::ULong iterations_;
-  // Current iterations.
 };
 
 #endif /* PARAM_TEST_EXCEPTION_H */
diff --git a/tests/Param_Test/fixed_array.cpp b/tests/Param_Test/fixed_array.cpp
index c976b0b690b..ebec9775c7a 100644
--- a/tests/Param_Test/fixed_array.cpp
+++ b/tests/Param_Test/fixed_array.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    fixed_array.cpp
-//
-// = DESCRIPTION
-//    tests fixed size arrays
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    fixed_array.cpp
+ *
+ *  $Id$
+ *
+ *  tests fixed size arrays
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "fixed_array.h"
 
-ACE_RCSID (Param_Test,
-           fixed_array,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Fixed_Array
 // ************************************************************************
diff --git a/tests/Param_Test/fixed_array.h b/tests/Param_Test/fixed_array.h
index 4e69fe59287..ff4626a020b 100644
--- a/tests/Param_Test/fixed_array.h
+++ b/tests/Param_Test/fixed_array.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    fixed_array.h
-//
-// = DESCRIPTION
-//     Tests fixed size array
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    fixed_array.h
+ *
+ *  $Id$
+ *
+ *   Tests fixed size array
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_FIXED_ARRAY_H
 #define PARAM_TEST_FIXED_ARRAY_H
@@ -27,58 +24,58 @@
 class Test_Fixed_Array
 {
 public:
+  /// ctor
   Test_Fixed_Array (void);
-  // ctor
 
+  /// dtor
   ~Test_Fixed_Array (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// compare arrays
   CORBA::Boolean compare (const Param_Test::Fixed_Array_slice *a1,
                           const Param_Test::Fixed_Array_slice *a2);
-  // compare arrays
 
+  /// print an array
   void print (const Param_Test::Fixed_Array_slice *a);
-  // print an array
 
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Fixed_Array in_;
-  // in parameter
 
+  /// inout parameter
   Param_Test::Fixed_Array inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Fixed_Array out_;
-  // out parameter
 
+  /// return value
   Param_Test::Fixed_Array_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_FIXED_ARRAY_H */
diff --git a/tests/Param_Test/fixed_struct.cpp b/tests/Param_Test/fixed_struct.cpp
index fee2186e8a8..b2c4e67281b 100644
--- a/tests/Param_Test/fixed_struct.cpp
+++ b/tests/Param_Test/fixed_struct.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    fixed_struct.cpp
-//
-// = DESCRIPTION
-//    tests fixed sized structs
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    fixed_struct.cpp
+ *
+ *  $Id$
+ *
+ *  tests fixed sized structs
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "fixed_struct.h"
 
-ACE_RCSID (Param_Test,
-           fixed_struct,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Fixed_Struct
 // ************************************************************************
@@ -128,23 +121,23 @@ Test_Fixed_Struct::check_validity (void)
       this->in_.c == this->inout_.c &&
       this->in_.s == this->inout_.s &&
       this->in_.o == this->inout_.o &&
-      this->in_.f == this->inout_.f &&
+      ACE::is_equal (this->in_.f, this->inout_.f) &&
       this->in_.b == this->inout_.b &&
-      this->in_.d == this->inout_.d &&
+      ACE::is_equal (this->in_.d, this->inout_.d) &&
       this->in_.l == this->out_.l &&
       this->in_.c == this->out_.c &&
       this->in_.s == this->out_.s &&
       this->in_.o == this->out_.o &&
-      this->in_.f == this->out_.f &&
+      ACE::is_equal (this->in_.f, this->out_.f) &&
       this->in_.b == this->out_.b &&
-      this->in_.d == this->out_.d &&
+      ACE::is_equal (this->in_.d, this->out_.d) &&
       this->in_.l == this->ret_.l &&
       this->in_.c == this->ret_.c &&
       this->in_.s == this->ret_.s &&
       this->in_.o == this->ret_.o &&
-      this->in_.f == this->ret_.f &&
+      ACE::is_equal (this->in_.f, this->ret_.f) &&
       this->in_.b == this->ret_.b &&
-      this->in_.d == this->ret_.d)
+      ACE::is_equal (this->in_.d, this->ret_.d))
     return 1;
   else
     return 0;
diff --git a/tests/Param_Test/fixed_struct.h b/tests/Param_Test/fixed_struct.h
index 07836d0cd7e..fc4bf1115bb 100644
--- a/tests/Param_Test/fixed_struct.h
+++ b/tests/Param_Test/fixed_struct.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    fixed_struct.h
-//
-// = DESCRIPTION
-//     Tests fixed size structs
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    fixed_struct.h
+ *
+ *  $Id$
+ *
+ *   Tests fixed size structs
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_FIXED_STRUCT_H
 #define PARAM_TEST_FIXED_STRUCT_H
@@ -27,51 +24,51 @@
 class Test_Fixed_Struct
 {
 public:
+  /// ctor
   Test_Fixed_Struct (void);
-  // ctor
 
+  /// dtor
   ~Test_Fixed_Struct (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Fixed_Struct in_;
-  // in parameter
 
+  /// inout parameter
   Param_Test::Fixed_Struct inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Fixed_Struct out_;
-  // out parameter
 
+  /// return value
   Param_Test::Fixed_Struct ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_FIXED_STRUCT_H */
diff --git a/tests/Param_Test/helper.cpp b/tests/Param_Test/helper.cpp
index 260879b6ce4..2aee194703e 100644
--- a/tests/Param_Test/helper.cpp
+++ b/tests/Param_Test/helper.cpp
@@ -1,31 +1,24 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    helper.cpp
-//
-// = DESCRIPTION
-//    Defines a helper class that can generate values for the parameters used
-//    for the Param_Test example
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    helper.cpp
+ *
+ *  $Id$
+ *
+ *  Defines a helper class that can generate values for the parameters used
+ *  for the Param_Test example
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "ace/OS_NS_ctype.h"
 
 const CORBA::ULong TEST_BUFSIZE = 128;
 
-ACE_RCSID (Param_Test,
-           helper,
-           "$Id$")
-
 Generator::Generator (void)
 {
 }
diff --git a/tests/Param_Test/helper.h b/tests/Param_Test/helper.h
index b8c9c8b14d0..41deb1a44e8 100644
--- a/tests/Param_Test/helper.h
+++ b/tests/Param_Test/helper.h
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    helper.h
-//
-// = DESCRIPTION
-//    Defines a helper class that can generate values for the parameters used
-//    for the Param_Test example
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    helper.h
+ *
+ *  $Id$
+ *
+ *  Defines a helper class that can generate values for the parameters used
+ *  for the Param_Test example
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef HELPER_H
 #define HELPER_H
@@ -27,11 +24,11 @@
 class Generator
 {
 public:
+  /// constructor
   Generator (void);
-  // constructor
 
+  /// destructor
   ~Generator (void);
-  // destructor
 
   CORBA::Short gen_short (void);
   CORBA::Long gen_long (void);
diff --git a/tests/Param_Test/multdim_array.cpp b/tests/Param_Test/multdim_array.cpp
index 5dea1681124..3df45926ae9 100644
--- a/tests/Param_Test/multdim_array.cpp
+++ b/tests/Param_Test/multdim_array.cpp
@@ -1,27 +1,22 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    multidim_array.cpp
-//
-// = DESCRIPTION
-//    tests multidimensional fixed size arrays
-//
-// = AUTHORS
-//      Bala
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    multdim_array.cpp
+ *
+ *  $Id$
+ *
+ *  tests multidimensional fixed size arrays
+ *
+ *
+ *  @author   Bala
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "multdim_array.h"
 
 
-ACE_RCSID (Param_Test,
-           multdim_array,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Multdim_Array
 // ************************************************************************
diff --git a/tests/Param_Test/multdim_array.h b/tests/Param_Test/multdim_array.h
index 0539bf803e7..b275ef78145 100644
--- a/tests/Param_Test/multdim_array.h
+++ b/tests/Param_Test/multdim_array.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    multdim_array.h
-//
-// = DESCRIPTION
-//     Tests multi dimensional array
-//
-// = AUTHORS
-//   Bala
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    multdim_array.h
+ *
+ *  $Id$
+ *
+ *   Tests multi dimensional array
+ *
+ *
+ *  @author Bala
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_MULTDIM_ARRAY_H
 #define PARAM_TEST_MULTDIM_ARRAY_H
@@ -27,58 +24,58 @@
 class Test_Multdim_Array
 {
 public:
+  /// ctor
   Test_Multdim_Array (void);
-  // ctor
 
+  /// dtor
   ~Test_Multdim_Array (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// compare arrays
   CORBA::Boolean compare (const Param_Test::Multdim_Array_slice *a1,
                           const Param_Test::Multdim_Array_slice *a2);
-  // compare arrays
 
+  /// print an array
   void print (const Param_Test::Multdim_Array_slice *a);
-  // print an array
 
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Multdim_Array_var in_;
-  // in parameter
 
+  /// inout parameter
   Param_Test::Multdim_Array_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Multdim_Array_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Multdim_Array_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_MULTDIM_ARRAY_H */
diff --git a/tests/Param_Test/nested_struct.cpp b/tests/Param_Test/nested_struct.cpp
index 5c93d78c007..e8a8805109e 100644
--- a/tests/Param_Test/nested_struct.cpp
+++ b/tests/Param_Test/nested_struct.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    nested_struct.cpp
-//
-// = DESCRIPTION
-//    tests nested structs
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    nested_struct.cpp
+ *
+ *  $Id$
+ *
+ *  tests nested structs
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "nested_struct.h"
 
-ACE_RCSID (Param_Test,
-           nested_struct,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Nested_Struct
 // ************************************************************************
diff --git a/tests/Param_Test/nested_struct.h b/tests/Param_Test/nested_struct.h
index a22145e958c..10044dfd3e0 100644
--- a/tests/Param_Test/nested_struct.h
+++ b/tests/Param_Test/nested_struct.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    nested_struct.h
-//
-// = DESCRIPTION
-//     Tests nested structures
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    nested_struct.h
+ *
+ *  $Id$
+ *
+ *   Tests nested structures
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_NESTED_STRUCT_H
 #define PARAM_TEST_NESTED_STRUCT_H
@@ -28,52 +25,52 @@
 class Test_Nested_Struct
 {
 public:
+  /// ctor
   Test_Nested_Struct (void);
-  // ctor
 
+  /// dtor
   ~Test_Nested_Struct (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Nested_Struct in_;
-  // in parameter
 
   // these need memory management
+  /// inout parameter
   Param_Test::Nested_Struct_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Nested_Struct_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Nested_Struct_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_NESTED_STRUCT_H */
diff --git a/tests/Param_Test/objref.cpp b/tests/Param_Test/objref.cpp
index 3bdde5b4cb5..4d35cecd7ac 100644
--- a/tests/Param_Test/objref.cpp
+++ b/tests/Param_Test/objref.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    objref.cpp
-//
-// = DESCRIPTION
-//    tests object references
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    objref.cpp
+ *
+ *  $Id$
+ *
+ *  tests object references
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "objref.h"
 
-ACE_RCSID (Param_Test,
-           objref,
-           "$Id$")
-
 // ************************************************************************
 //               Test_ObjRef
 // ************************************************************************
diff --git a/tests/Param_Test/objref.h b/tests/Param_Test/objref.h
index a6d491eb90e..bcbbc908007 100644
--- a/tests/Param_Test/objref.h
+++ b/tests/Param_Test/objref.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    objref.h
-//
-// = DESCRIPTION
-//     Tests object references
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    objref.h
+ *
+ *  $Id$
+ *
+ *   Tests object references
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_OBJREF_H
 #define PARAM_TEST_OBJREF_H
@@ -27,51 +24,51 @@
 class Test_ObjRef
 {
 public:
+  /// ctor
   Test_ObjRef (void);
-  // ctor
 
+  /// dtor
   ~Test_ObjRef (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Coffee_var in_;
-  // in parameter
 
+  /// inout parameter
   Coffee_var inout_;
-  // inout parameter
 
+  /// out parameter
   Coffee_var out_;
-  // out parameter
 
+  /// return value
   Coffee_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_OBJREF_H */
diff --git a/tests/Param_Test/objref_struct.cpp b/tests/Param_Test/objref_struct.cpp
index b5dc1e676ad..bb9bc19af57 100644
--- a/tests/Param_Test/objref_struct.cpp
+++ b/tests/Param_Test/objref_struct.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    objref_struct.cpp
-//
-// = DESCRIPTION
-//    test structures containing object references.
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    objref_struct.cpp
+ *
+ *  $Id$
+ *
+ *  test structures containing object references.
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "objref_struct.h"
 
-ACE_RCSID (Param_Test,
-           objref_struct,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Objref_Struct
 // ************************************************************************
diff --git a/tests/Param_Test/objref_struct.h b/tests/Param_Test/objref_struct.h
index e9f7164f903..0f8335c0506 100644
--- a/tests/Param_Test/objref_struct.h
+++ b/tests/Param_Test/objref_struct.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    objref_struct.h
-//
-// = DESCRIPTION
-//     Tests variable sized structures
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    objref_struct.h
+ *
+ *  $Id$
+ *
+ *   Tests variable sized structures
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_OBJREF_STRUCT_H
 #define PARAM_TEST_OBJREF_STRUCT_H
@@ -28,52 +25,52 @@
 class Test_Objref_Struct
 {
 public:
+  /// ctor
   Test_Objref_Struct (void);
-  // ctor
 
+  /// dtor
   ~Test_Objref_Struct (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Objref_Struct in_;
-  // in parameter
 
   // these need memory management
+  /// inout parameter
   Param_Test::Objref_Struct_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Objref_Struct_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Objref_Struct_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_OBJREF_STRUCT_H */
diff --git a/tests/Param_Test/options.cpp b/tests/Param_Test/options.cpp
index 08ed4d5205e..1193e8a64d0 100644
--- a/tests/Param_Test/options.cpp
+++ b/tests/Param_Test/options.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    options.cpp
-//
-// = DESCRIPTION
-//    Options for the Param_Test application
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    options.cpp
+ *
+ *  $Id$
+ *
+ *  Options for the Param_Test application
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "options.h"
 #include "tao/debug.h"
@@ -24,11 +21,7 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Param_Test,
-           options,
-           "$Id$")
-
-// Constructor.p
+// Constructor.
 Options::Options (void)
   : ior_ (CORBA::string_dup ("file://test.ior")),
     test_type_ (Options::NO_TEST),
diff --git a/tests/Param_Test/options.h b/tests/Param_Test/options.h
index 07ae447ca70..ca17dcba529 100644
--- a/tests/Param_Test/options.h
+++ b/tests/Param_Test/options.h
@@ -1,21 +1,17 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    options.h
-//
-// = DESCRIPTION
-//    Options for the Param_Test application
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    options.h
+ *
+ *  $Id$
+ *
+ *  Options for the Param_Test application
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef OPTIONS_H
 #define OPTIONS_H
@@ -80,54 +76,54 @@ public:
     DII
   };
 
+  /// constructor
   Options (void);
-  // constructor
 
+  /// destructor
   ~Options (void);
-  // destructor
 
+  /// Parses the arguments passed on the command line.
   int parse_args (int argc, ACE_TCHAR **argv);
-  // Parses the arguments passed on the command line.
 
+  /// return the IOR for the servant
   char const * param_test_ior (void) const;
-  // return the IOR for the servant
 
+  /// what test to run
   TEST_TYPE test_type (void);
-  // what test to run
 
+  /// whether to use SII or DII
   INVOKE_TYPE invoke_type (void);
-  // whether to use SII or DII
 
+  /// number of times to run the test
   CORBA::ULong loop_count (void);
-  // number of times to run the test
 
+  /// whether debug option is on or not
   CORBA::Boolean debug (void) const;
-  // whether debug option is on or not
 
+  /// If we should request the server to shutdown.
   CORBA::Boolean shutdown (void) const;
-  // If we should request the server to shutdown.
 
 private:
+  /// Function to read the servant IOR from a file.
   int read_ior (ACE_TCHAR *filename);
-  // Function to read the servant IOR from a file.
 
+  /// IOR for the servant
   CORBA::String_var ior_;
-  // IOR for the servant
 
+  /// what test to run
   TEST_TYPE test_type_;
-  // what test to run
 
+  /// whether SII or DII
   INVOKE_TYPE invoke_type_;
-  // whether SII or DII
 
+  /// Number of times to do the "test_*" operations.
   CORBA::ULong loop_count_;
-  // Number of times to do the "test_*" operations.
 
+  /// debugging output values
   CORBA::Boolean debug_;
-  // debugging output values
 
+  /// server shutdown flag.
   CORBA::Boolean shutdown_;
-  // server shutdown flag.
 };
 
 typedef ACE_Singleton<Options, TAO_SYNCH_RECURSIVE_MUTEX> OPTIONS;
diff --git a/tests/Param_Test/param_test.idl b/tests/Param_Test/param_test.idl
index 98222150819..2fbfafcf778 100644
--- a/tests/Param_Test/param_test.idl
+++ b/tests/Param_Test/param_test.idl
@@ -1,23 +1,19 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    params.idl
-//
-// = DESCRIPTION
-//    This IDL description is used to test all the parameter passing modes (in,
-//    inout, out, and return) for a number of IDL data types. The goal is to
-//    verify the correctness of the generated stubs and skeletons, and the
-//    the marshaling engine of TAO.
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    param_test.idl
+ *
+ *  $Id$
+ *
+ *  This IDL description is used to test all the parameter passing modes (in,
+ *  inout, out, and return) for a number of IDL data types. The goal is to
+ *  verify the correctness of the generated stubs and skeletons, and the
+ *  the marshaling engine of TAO.
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include <orb.idl>
 #include "tao/AnyTypeCode/AnySeq.pidl"
@@ -265,7 +261,7 @@ interface Param_Test
                                 inout unsigned long s2,
                                 out unsigned long s3)
     raises (Ooops);
-    
+
   typedef short short_array[32];
 
   union Big_Union switch (short)
@@ -339,7 +335,7 @@ interface Param_Test
   // Recursive structs. Contains a sequence of itself.
   struct Recursive_Struct;
   typedef sequence<Recursive_Struct> RecStructSeq;
-  
+
   struct Recursive_Struct
     {
       long x;
@@ -355,7 +351,7 @@ interface Param_Test
   // recursive union.
   union nested_rec_union;
   typedef sequence<nested_rec_union> NestedSeq;
-  
+
   union nested_rec_union switch (short)
     {
       case 0: long value;
@@ -364,7 +360,7 @@ interface Param_Test
 
   union Recursive_Union;
   typedef sequence<Recursive_Union> RecUnionSeq;
-  
+
   union Recursive_Union switch (short)
     {
       case 0: RecUnionSeq rec_member;
diff --git a/tests/Param_Test/param_test_i.cpp b/tests/Param_Test/param_test_i.cpp
index f0b9a3ee916..aa822a4f573 100644
--- a/tests/Param_Test/param_test_i.cpp
+++ b/tests/Param_Test/param_test_i.cpp
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    param_test_i.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    param_test_i.cpp
+ *
+ *  $Id$
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "param_test_i.h"
 
@@ -20,10 +17,6 @@
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Param_Test,
-           param_test_i,
-           "$Id$")
-
 // ********* class Coffee_i ****************
 // Constructor
 
diff --git a/tests/Param_Test/param_test_i.h b/tests/Param_Test/param_test_i.h
index 321df2bb9b3..478253046dd 100644
--- a/tests/Param_Test/param_test_i.h
+++ b/tests/Param_Test/param_test_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    param_test_i.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    param_test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_I_H
 #define PARAM_TEST_I_H
@@ -23,77 +20,81 @@ class Coffee_i : public POA_Coffee
 
 {
 public:
+  /// constructor
   Coffee_i (const char *name);
-  // constructor
 
+  /// destructor
   ~Coffee_i (void);
-  // destructor
 
   // =methods for the attribute
 
+  /// get attribute
   virtual Coffee::Desc * description (void);
-  // get attribute
 
+  /// set attribute
   virtual void description (const Coffee::Desc &description);
-  // set attribute
 
 private:
+  /// my description
   CORBA::String_var name_;
-  // my description
 };
 
 // the implementation of the Param_test interface
+/**
+ * @class Param_Test_i
+ *
+ * @brief Param_Test_i
+ *
+ * Implementation of the Param_Test test suite.
+ */
 class Param_Test_i : public POA_Param_Test
 {
-  // = TITLE
-  //    Param_Test_i
-  // = DESCRIPTION
-  //    Implementation of the Param_Test test suite.
 public:
+  /// Constructor
   Param_Test_i (const char *coffee_name,
                 CORBA::ORB_ptr orb);
-  // Constructor
 
+  /// Destructor
   ~Param_Test_i (void);
-  // Destructor
 
+  /// test for shorts
   virtual CORBA::Short test_short (CORBA::Short s1,
                                    CORBA::Short &s2,
                                    CORBA::Short_out s3);
-  // test for shorts
 
+  /// test for unsigned long long
   virtual CORBA::ULongLong test_ulonglong (CORBA::ULongLong s1,
                                            CORBA::ULongLong &s2,
                                            CORBA::ULongLong_out s3);
-  // test for unsigned long long
 
+  /// test for unbounded strings
   virtual char *test_unbounded_string (const char *s1,
                                        char *&s2,
                                        CORBA::String_out s3);
-  // test for unbounded strings
 
+  /// test for bounded strings
   virtual char *test_bounded_string (const char *s1,
                                      char *&s2,
                                      CORBA::String_out s3);
-  // test for bounded strings
 
+  /// test for unbounded wstrings
   virtual CORBA::WChar *test_unbounded_wstring (const CORBA::WChar *ws1,
                                                 CORBA::WChar *&ws2,
                                                 CORBA::WString_out ws3);
-  // test for unbounded wstrings
 
+  /// test for bounded wstrings
   virtual CORBA::WChar *test_bounded_wstring (const CORBA::WChar *ws1,
                                               CORBA::WChar *&ws2,
                                               CORBA::WString_out ws3);
-  // test for bounded wstrings
 
+  /// test for fixed structures
   virtual Param_Test::Fixed_Struct
   test_fixed_struct (const Param_Test::Fixed_Struct &s1,
                      Param_Test::Fixed_Struct &s2,
                      Param_Test::Fixed_Struct_out s3);
-  // test for fixed structures
 
   // = Start of sequences tests...
+  /// = End of sequences tests....
   virtual CORBA::LongSeq * test_long_sequence (
       const CORBA::LongSeq & s1,
       CORBA::LongSeq & s2,
@@ -158,64 +159,63 @@ public:
           const CORBA::AnySeq & s1,
           CORBA::AnySeq & s2,
           CORBA::AnySeq_out s3);
-  // = End of sequences tests....
 
+  /// test for variable structs
   virtual Param_Test::Var_Struct *
   test_var_struct (const Param_Test::Var_Struct &s1,
                    Param_Test::Var_Struct &s2,
                    Param_Test::Var_Struct_out s3);
-  // test for variable structs
 
+  /// test for nested structs
   virtual Param_Test::Nested_Struct *
   test_nested_struct (const Param_Test::Nested_Struct &s1,
                       Param_Test::Nested_Struct &s2,
                       Param_Test::Nested_Struct_out s3);
-  // test for nested structs
 
+  /// test for recursive structs
   virtual Param_Test::Recursive_Struct *
     test_recursive_struct (const Param_Test::Recursive_Struct &rs1,
                            Param_Test::Recursive_Struct &rs2,
                            Param_Test::Recursive_Struct_out rs3);
-  // test for recursive structs
 
   virtual Param_Test::Objref_Struct *
   test_objref_struct (const Param_Test::Objref_Struct &s1,
                       Param_Test::Objref_Struct &s2,
                       Param_Test::Objref_Struct_out s3);
 
+  /// make a coffee object
   virtual Coffee_ptr
   make_coffee (void);
-  // make a coffee object
 
+  /// test for object references
   virtual Coffee_ptr
   test_objref (Coffee_ptr o1,
                Coffee_ptr &o2,
                Coffee_out o3);
-  // test for object references
 
+  /// test for typecodes
   virtual CORBA::TypeCode_ptr
   test_typecode (CORBA::TypeCode_ptr t1,
                  CORBA::TypeCode_ptr &o2,
                  CORBA::TypeCode_out o3);
-  // test for typecodes
 
+  /// test for Anys
   virtual CORBA::Any *
   test_any (const CORBA::Any &a1,
             CORBA::Any &a2,
             CORBA::Any_out a3);
-  // test for Anys
 
+  /// test for fixed size arrays
   virtual Param_Test::Fixed_Array_slice *
   test_fixed_array (const Param_Test::Fixed_Array a1,
                     Param_Test::Fixed_Array a2,
                     Param_Test::Fixed_Array_out a3);
-  // test for fixed size arrays
 
+  /// test for arrays of variable types
   virtual Param_Test::Var_Array_slice *
   test_var_array (const Param_Test::Var_Array a1,
                   Param_Test::Var_Array a2,
                   Param_Test::Var_Array_out a3);
-  // test for arrays of variable types
 
   virtual CORBA::ULong test_exception (CORBA::ULong s1,
                                        CORBA::ULong& s2,
@@ -251,17 +251,19 @@ public:
 
 
 private:
+  /// Remember out ORB.
   CORBA::ORB_var orb_;
-  // Remember out ORB.
 
+  /// the coffee object reference we maintain
   Coffee_i obj_;
-  // the coffee object reference we maintain
 
+  /**
+   * Called by test_exception. This will avoid the compiler
+   * warning that test_exception is throwing an exception
+   * not in its THROW_SPEC, but still test TAO's
+   * conversion of such an exception to UNKNOWN.
+   */
   void throw_badboy (void);
-  // Called by test_exception. This will avoid the compiler
-  // warning that test_exception is throwing an exception
-  // not in its THROW_SPEC, but still test TAO's
-  // conversion of such an exception to UNKNOWN.
 };
 
 #endif /* PARAM_TEST_I_H */
diff --git a/tests/Param_Test/recursive_struct.cpp b/tests/Param_Test/recursive_struct.cpp
index 8558d1ac351..e6bcb00611a 100644
--- a/tests/Param_Test/recursive_struct.cpp
+++ b/tests/Param_Test/recursive_struct.cpp
@@ -1,26 +1,20 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    recursive_struct.cpp
-//
-// = DESCRIPTION
-//    test structure that contains a sequence of itself
-//
-// = AUTHORS
-//    Aniruddha Gokhale, Jeff Parsons
-//
-// ============================================================================
 
-#include "recursive_struct.h"
+//=============================================================================
+/**
+ *  @file    recursive_struct.cpp
+ *
+ *  $Id$
+ *
+ *  test structure that contains a sequence of itself
+ *
+ *
+ *  @author Aniruddha Gokhale
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
 
-ACE_RCSID (Param_Test,
-           recursive_struct,
-           "$Id$")
+#include "recursive_struct.h"
 
 const CORBA::ULong MAX_DEPTH = 5;
 const CORBA::ULong MAX_SEQ_LENGTH = 3;
diff --git a/tests/Param_Test/recursive_struct.h b/tests/Param_Test/recursive_struct.h
index 77d1ee7dabc..89aaf25746b 100644
--- a/tests/Param_Test/recursive_struct.h
+++ b/tests/Param_Test/recursive_struct.h
@@ -1,20 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    recursive_struct.h
-//
-// = DESCRIPTION
-//    Tests a structure that contains a sequence of itself
-//
-// = AUTHORS
-//    Aniruddha Gokhale, Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    recursive_struct.h
+ *
+ *  $Id$
+ *
+ *  Tests a structure that contains a sequence of itself
+ *
+ *
+ *  @author Aniruddha Gokhale
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_RECURSIVE_STRUCT_H
 #define PARAM_TEST_RECURSIVE_STRUCT_H
@@ -29,61 +27,61 @@
 class Test_Recursive_Struct
 {
 public:
+  /// ctor
   Test_Recursive_Struct (void);
-  // ctor
 
+  /// dtor
   ~Test_Recursive_Struct (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Recursive_Struct in_;
-  // in parameter
 
   // these need memory management
+  /// inout parameter
   Param_Test::Recursive_Struct_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Recursive_Struct_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Recursive_Struct_var ret_;
-  // return value
 
+  /// helper function for init_parameters
   void deep_init (Param_Test::Recursive_Struct &rs,
                   Generator *gen,
                   CORBA::ULong level);
-  // helper function for init_parameters
 
+  /// helper function for check_validity
   CORBA::Boolean deep_check (const Param_Test::Recursive_Struct &in_struct,
                              const Param_Test::Recursive_Struct &test_struct);
-  // helper function for check_validity
 };
 
 #endif /* PARAM_TEST_RECURSIVE_STRUCT_H */
diff --git a/tests/Param_Test/recursive_union.cpp b/tests/Param_Test/recursive_union.cpp
index 6bf47a98a78..8353cabdde8 100644
--- a/tests/Param_Test/recursive_union.cpp
+++ b/tests/Param_Test/recursive_union.cpp
@@ -1,26 +1,19 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    recursive_union.cpp
-//
-// = DESCRIPTION
-//    test union that contains a sequence of itself
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
 
-#include "recursive_union.h"
+//=============================================================================
+/**
+ *  @file    recursive_union.cpp
+ *
+ *  $Id$
+ *
+ *  test union that contains a sequence of itself
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
-ACE_RCSID (Param_Test,
-           recursive_union,
-           "$Id$")
+#include "recursive_union.h"
 
 const CORBA::ULong MAX_DEPTH = 3;
 const CORBA::ULong MAX_SEQ_LENGTH = 2;
diff --git a/tests/Param_Test/recursive_union.h b/tests/Param_Test/recursive_union.h
index 6f41e85292c..995a0c49c17 100644
--- a/tests/Param_Test/recursive_union.h
+++ b/tests/Param_Test/recursive_union.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    recursive_union.h
-//
-// = DESCRIPTION
-//    Tests a union that contains a sequence of itself
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    recursive_union.h
+ *
+ *  $Id$
+ *
+ *  Tests a union that contains a sequence of itself
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_RECURSIVE_UNION_H
 #define PARAM_TEST_RECURSIVE_UNION_H
@@ -29,68 +26,68 @@
 class Test_Recursive_Union
 {
 public:
+  /// ctor
   Test_Recursive_Union (void);
-  // ctor
 
+  /// dtor
   ~Test_Recursive_Union (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Recursive_Union in_;
-  // in parameter
 
   // these need memory management
+  /// inout parameter
   Param_Test::Recursive_Union_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Recursive_Union_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Recursive_Union_var ret_;
-  // return value
 
   void deep_init (Param_Test::Recursive_Union &u,
                   Generator *gen,
                   CORBA::ULong level);
 
+  /// helper functions for init_parameters
   void deep_init_nested (Param_Test::nested_rec_union &nu,
                          Generator *gen,
                          CORBA::ULong level);
-  // helper functions for init_parameters
 
   CORBA::Boolean deep_check (const Param_Test::Recursive_Union &in_union,
                              const Param_Test::Recursive_Union &test_union);
 
+  /// helper functions for check_validity
   CORBA::Boolean deep_check_nested (const Param_Test::nested_rec_union &in,
                                     const Param_Test::nested_rec_union &test);
-  // helper functions for check_validity
 };
 
 #endif /* PARAM_TEST_RECURSIVE_UNION_H */
diff --git a/tests/Param_Test/results.cpp b/tests/Param_Test/results.cpp
index 101e607c389..179a4adef02 100644
--- a/tests/Param_Test/results.cpp
+++ b/tests/Param_Test/results.cpp
@@ -1,29 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    results.cpp
-//
-// = DESCRIPTION
-//    Printing the results
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    results.cpp
+ *
+ *  $Id$
+ *
+ *  Printing the results
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "results.h"
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Param_Test,
-           results,
-           "results.cpp,v 1.8 1999/06/23 14:50:14 parsons Exp")
-
 Results::Results (void)
 {
 }
diff --git a/tests/Param_Test/results.h b/tests/Param_Test/results.h
index e04e26e5f3c..65c490debd4 100644
--- a/tests/Param_Test/results.h
+++ b/tests/Param_Test/results.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    results.h
-//
-// = DESCRIPTION
-//    Printing the results
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    results.h
+ *
+ *  $Id$
+ *
+ *  Printing the results
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef RESULTS_H
 #define RESULTS_H
@@ -38,51 +35,51 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 class Results
 {
 public:
+  /// ctor
   Results (void);
-  // ctor
 
+  /// destructor
   ~Results (void);
-  // destructor
 
+  /// prints the time stats
   void print_stats (void);
-  // prints the time stats
 
+  /// print the exception
   void print_exception (const char *call_name);
-  // print the exception
 
+  /// start timing
   void start_timer (void);
-  // start timing
 
+  /// stop timing
   void stop_timer (void);
-  // stop timing
 
+  /// return call count
   CORBA::ULong call_count (void);
-  // return call count
 
+  /// set the call count
   void call_count (CORBA::ULong);
-  // set the call count
 
+  /// return the error count
   CORBA::ULong error_count (void);
-  // return the error count
 
+  /// set error count
   void error_count (CORBA::ULong);
-  // set error count
 
+  /// set the number of times the test will be run
   void iterations (CORBA::ULong iters);
-  // set the number of times the test will be run
 
 private:
+  /// # of calls made to functions
   CORBA::ULong call_count_;
-  // # of calls made to functions
 
+  /// # of errors incurred in the lifetime of the application.
   CORBA::ULong error_count_;
-  // # of errors incurred in the lifetime of the application.
 
+  /// for timing the test
   ACE_Profile_Timer timer_;
-  // for timing the test
 
+  /// holds the elapsed time for each iteration
   ACE_Profile_Timer::ACE_Elapsed_Time *elapsed_time_;
-  // holds the elapsed time for each iteration
 };
 
 #endif /* RESULTS_H */
diff --git a/tests/Param_Test/server.cpp b/tests/Param_Test/server.cpp
index 69208f2f2f3..757cb9b435c 100644
--- a/tests/Param_Test/server.cpp
+++ b/tests/Param_Test/server.cpp
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    server.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    server.cpp
+ *
+ *  $Id$
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "param_test_i.h"
 #include "tao/Codeset/Codeset.h"
@@ -20,10 +17,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Param_Test,
-           server,
-           "$Id$")
-
 // Parses the command line arguments and returns an error status.
 static FILE *ior_output_file = 0;
 static const ACE_TCHAR *ior_output_filename = ACE_TEXT("test.ior");
diff --git a/tests/Param_Test/short.cpp b/tests/Param_Test/short.cpp
index b6975dfe98e..6bf5cacc815 100644
--- a/tests/Param_Test/short.cpp
+++ b/tests/Param_Test/short.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    short.cpp
-//
-// = DESCRIPTION
-//    tests shorts
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    short.cpp
+ *
+ *  $Id$
+ *
+ *  tests shorts
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "short.h"
 
-ACE_RCSID (Param_Test,
-           short,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Short
 // ************************************************************************
diff --git a/tests/Param_Test/short.h b/tests/Param_Test/short.h
index 2396e70663f..c4f3025a71b 100644
--- a/tests/Param_Test/short.h
+++ b/tests/Param_Test/short.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    short.h
-//
-// = DESCRIPTION
-//     Tests shorts
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    short.h
+ *
+ *  $Id$
+ *
+ *   Tests shorts
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_SHORT_H
 #define PARAM_TEST_SHORT_H
@@ -27,51 +24,51 @@
 class Test_Short
 {
 public:
+  /// ctor
   Test_Short (void);
-  // ctor
 
+  /// dtor
   ~Test_Short (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   CORBA::Short in_;
-  // in parameter
 
+  /// inout parameter
   CORBA::Short inout_;
-  // inout parameter
 
+  /// out parameter
   CORBA::Short out_;
-  // out parameter
 
+  /// return value
   CORBA::Short ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_SHORT_H */
diff --git a/tests/Param_Test/small_union.cpp b/tests/Param_Test/small_union.cpp
index 2947a1221f0..173476c4041 100644
--- a/tests/Param_Test/small_union.cpp
+++ b/tests/Param_Test/small_union.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    small_union.cpp
-//
-// = DESCRIPTION
-//    tests Small_Unions
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    small_union.cpp
+ *
+ *  $Id$
+ *
+ *  tests Small_Unions
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "small_union.h"
 
-ACE_RCSID (Param_Test,
-           small_union,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Small_Union
 // ************************************************************************
diff --git a/tests/Param_Test/small_union.h b/tests/Param_Test/small_union.h
index 8e3b1834cab..ad19888c6d7 100644
--- a/tests/Param_Test/small_union.h
+++ b/tests/Param_Test/small_union.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    small_union.h
-//
-// = DESCRIPTION
-//     Tests Anys
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    small_union.h
+ *
+ *  $Id$
+ *
+ *   Tests Anys
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_SMALL_UNION_H
 #define PARAM_TEST_SMALL_UNION_H
@@ -27,57 +24,57 @@
 class Test_Small_Union
 {
 public:
+  /// ctor
   Test_Small_Union (void);
-  // ctor
 
+  /// dtor
   ~Test_Small_Union (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// Coffee object used to test Small_Union with object.
   Coffee_var cobj_;
-  // Coffee object used to test Small_Union with object.
 
+  /// test counter.
   static size_t counter;
-  // test counter.
 
+  /// in parameter
   Param_Test::Small_Union in_;
-  // in parameter
 
+  /// inout parameter
   Param_Test::Small_Union inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Small_Union_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Small_Union_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_SMALL_UNION_H */
diff --git a/tests/Param_Test/tests.h b/tests/Param_Test/tests.h
index c042cad74fa..4c1f4627ffb 100644
--- a/tests/Param_Test/tests.h
+++ b/tests/Param_Test/tests.h
@@ -1,20 +1,17 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    tests.h
-//
-// = DESCRIPTION
-//    All the test objects header files included here
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    tests.h
+ *
+ *  $Id$
+ *
+ *  All the test objects header files included here
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef TESTS_H
 #define TESTS_H
diff --git a/tests/Param_Test/typecode.cpp b/tests/Param_Test/typecode.cpp
index d9477651899..4eb26c38662 100644
--- a/tests/Param_Test/typecode.cpp
+++ b/tests/Param_Test/typecode.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    typecode.cpp
-//
-// = DESCRIPTION
-//    tests typecodes
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    typecode.cpp
+ *
+ *  $Id$
+ *
+ *  tests typecodes
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "typecode.h"
 
-ACE_RCSID (Param_Test,
-           typecode,
-           "$Id$")
-
 // ************************************************************************
 //               Test_TypeCode
 // ************************************************************************
diff --git a/tests/Param_Test/typecode.h b/tests/Param_Test/typecode.h
index 1b4a2183f50..0f35979fa1f 100644
--- a/tests/Param_Test/typecode.h
+++ b/tests/Param_Test/typecode.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    typecode.h
-//
-// = DESCRIPTION
-//     Tests typecodes
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    typecode.h
+ *
+ *  $Id$
+ *
+ *   Tests typecodes
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_TYPECODE_H
 #define PARAM_TEST_TYPECODE_H
@@ -27,55 +24,55 @@
 class Test_TypeCode
 {
 public:
+  /// ctor
   Test_TypeCode (void);
-  // ctor
 
+  /// dtor
   ~Test_TypeCode (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// place for selected typecode to stay during time
+  /// between init_parameters () and reset_parameters ().
   CORBA::TypeCode_var tc_holder_;
-  // place for selected typecode to stay during time
-  // between init_parameters () and reset_parameters ().
 
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   CORBA::TypeCode_var in_;
-  // in parameter
 
+  /// inout parameter
   CORBA::TypeCode_var inout_;
-  // inout parameter
 
+  /// out parameter
   CORBA::TypeCode_var out_;
-  // out parameter
 
+  /// return value
   CORBA::TypeCode_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_TYPECODE_H */
diff --git a/tests/Param_Test/ub_any_seq.cpp b/tests/Param_Test/ub_any_seq.cpp
index abf567fc524..0c5b7c823b4 100644
--- a/tests/Param_Test/ub_any_seq.cpp
+++ b/tests/Param_Test/ub_any_seq.cpp
@@ -1,29 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_any_seq.cpp
-//
-// = DESCRIPTION
-//    tests unbounded Any sequences
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_any_seq.cpp
+ *
+ *  $Id$
+ *
+ *  tests unbounded Any sequences
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "ub_any_seq.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Param_Test,
-           ub_any_seq,
-           "$Id$")
-
 const CORBA::ULong TEST_SEQ_LENGTH = 5;
 const CORBA::ULong NUM_TEST_TYPES = 4;
 
diff --git a/tests/Param_Test/ub_any_seq.h b/tests/Param_Test/ub_any_seq.h
index c5431e8314c..4256a5e1f23 100644
--- a/tests/Param_Test/ub_any_seq.h
+++ b/tests/Param_Test/ub_any_seq.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_any_seq.h
-//
-// = DESCRIPTION
-//     Tests unbounded Any sequences
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_any_seq.h
+ *
+ *  $Id$
+ *
+ *   Tests unbounded Any sequences
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_UNBOUNDED_ANY_SEQUENCE_H
 #define PARAM_TEST_UNBOUNDED_ANY_SEQUENCE_H
@@ -27,59 +24,59 @@
 class Test_AnySeq
 {
 public:
+  /// ctor
   Test_AnySeq (void);
-  // ctor
 
+  /// dtor
   ~Test_AnySeq (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 protected:
+  /// compare
   CORBA::Boolean compare (const CORBA::AnySeq &s1,
                           const Param_Test::StructSeq &s2);
-  // compare
 
+  /// print individual sequence
   void print_sequence (const CORBA::AnySeq &s);
-  // print individual sequence
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   CORBA::AnySeq_var in_;
-  // in parameter
 
+  /// inout parameter
   CORBA::AnySeq_var inout_;
-  // inout parameter
 
+  /// out parameter
   CORBA::AnySeq_var out_;
-  // out parameter
 
+  /// return value
   CORBA::AnySeq_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_UNBOUNDED_ANY_SEQUENCE_H */
diff --git a/tests/Param_Test/ub_array_seq.cpp b/tests/Param_Test/ub_array_seq.cpp
index 821163fe4a7..20ceaf2992b 100644
--- a/tests/Param_Test/ub_array_seq.cpp
+++ b/tests/Param_Test/ub_array_seq.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_array_seq.cpp
-//
-// = DESCRIPTION
-//    tests unbounded array sequences
-//
-// = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_array_seq.cpp
+ *
+ *  $Id$
+ *
+ *  tests unbounded array sequences
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "ub_array_seq.h"
 
-ACE_RCSID (Param_Test,
-           ub_array_seq,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Array_Sequence
 // ************************************************************************
diff --git a/tests/Param_Test/ub_array_seq.h b/tests/Param_Test/ub_array_seq.h
index 258c2531567..c12cbbe29f6 100644
--- a/tests/Param_Test/ub_array_seq.h
+++ b/tests/Param_Test/ub_array_seq.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_array_seq.h
-//
-// = DESCRIPTION
-//     Tests unbounded array sequence
-//
-// = AUTHORS
-//      Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_array_seq.h
+ *
+ *  $Id$
+ *
+ *   Tests unbounded array sequence
+ *
+ *
+ *  @author   Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_UNBOUNED_ARRAY_SEQUENCE_H
 #define PARAM_TEST_UNBOUNED_ARRAY_SEQUENCE_H
@@ -28,60 +25,60 @@
 class Test_Array_Sequence
 {
 public:
+  /// ctor
   Test_Array_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_Array_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 protected:
+  /// compare
   CORBA::Boolean compare (const Param_Test::ArraySeq &s1,
                           const Param_Test::ArraySeq &s2);
-  // compare
 
+  /// print individual sequence
   void print_sequence (const Param_Test::ArraySeq &s);
-  // print individual sequence
 
 private:
+  /// operation name
  char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::ArraySeq in_;
-  // in parameter
 
   // these need memory management
+  /// inout parameter
   Param_Test::ArraySeq_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::ArraySeq_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::ArraySeq_var ret_;
-  // return value
 };
 
 
diff --git a/tests/Param_Test/ub_long_seq.cpp b/tests/Param_Test/ub_long_seq.cpp
index 698c50e153b..7e1fd4ff6dd 100644
--- a/tests/Param_Test/ub_long_seq.cpp
+++ b/tests/Param_Test/ub_long_seq.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_long_seq.cpp
-//
-// = DESCRIPTION
-//    tests unbounded long sequences
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_long_seq.cpp
+ *
+ *  $Id$
+ *
+ *  tests unbounded long sequences
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "ub_long_seq.h"
 
-ACE_RCSID (Param_Test,
-           ub_long_seq,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Long_Sequence
 // ************************************************************************
diff --git a/tests/Param_Test/ub_long_seq.h b/tests/Param_Test/ub_long_seq.h
index 4787743e140..2025d919676 100644
--- a/tests/Param_Test/ub_long_seq.h
+++ b/tests/Param_Test/ub_long_seq.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_long_seq.h
-//
-// = DESCRIPTION
-//     Tests unbounded long sequences
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_long_seq.h
+ *
+ *  $Id$
+ *
+ *   Tests unbounded long sequences
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_UNBOUNDED_LONG_SEQUENCE_H
 #define PARAM_TEST_UNBOUNDED_LONG_SEQUENCE_H
@@ -28,51 +25,51 @@
 class Test_Long_Sequence
 {
 public:
+  /// ctor
   Test_Long_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_Long_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   CORBA::LongSeq_var in_;
-  // in parameter
 
+  /// inout parameter
   CORBA::LongSeq_var inout_;
-  // inout parameter
 
+  /// out parameter
   CORBA::LongSeq_var out_;
-  // out parameter
 
+  /// return value
   CORBA::LongSeq_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_UNBOUNDED_LONG_SEQUENCE_H */
diff --git a/tests/Param_Test/ub_objref_seq.cpp b/tests/Param_Test/ub_objref_seq.cpp
index 8f796313893..561a210bdae 100644
--- a/tests/Param_Test/ub_objref_seq.cpp
+++ b/tests/Param_Test/ub_objref_seq.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_objref_seq.cpp
-//
-// = DESCRIPTION
-//    tests unbounded objref sequences
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_objref_seq.cpp
+ *
+ *  $Id$
+ *
+ *  tests unbounded objref sequences
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "ub_objref_seq.h"
 
-ACE_RCSID (Param_Test,
-           ub_objref_seq,
-           "$Id$")
-
 // ************************************************************************
 //               Test_ObjRef_Sequence
 // ************************************************************************
diff --git a/tests/Param_Test/ub_objref_seq.h b/tests/Param_Test/ub_objref_seq.h
index 21f3639dd08..f21cf35d34f 100644
--- a/tests/Param_Test/ub_objref_seq.h
+++ b/tests/Param_Test/ub_objref_seq.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_objref_seq.h
-//
-// = DESCRIPTION
-//     Tests unbounded sequences of object references
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_objref_seq.h
+ *
+ *  $Id$
+ *
+ *   Tests unbounded sequences of object references
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_UNBOUNDED_OBJREF_SEQUENCE_H
 #define PARAM_TEST_UNBOUNDED_OBJREF_SEQUENCE_H
@@ -28,59 +25,59 @@
 class Test_ObjRef_Sequence
 {
 public:
+  /// ctor
   Test_ObjRef_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_ObjRef_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 protected:
+  /// compare
   CORBA::Boolean compare (const Param_Test::Coffee_Mix &s1,
                           const Param_Test::Coffee_Mix &s2);
-  // compare
 
+  /// print individual sequence
   void print_sequence (const Param_Test::Coffee_Mix &s);
-  // print individual sequence
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Coffee_Mix in_;
-  // in parameter
 
   // these need memory management
+  /// inout parameter
   Param_Test::Coffee_Mix_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Coffee_Mix_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Coffee_Mix_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_UNBOUNDED_OBJREF_SEQUENCE_H */
diff --git a/tests/Param_Test/ub_short_seq.cpp b/tests/Param_Test/ub_short_seq.cpp
index 3319e89c703..8cbecfbf23b 100644
--- a/tests/Param_Test/ub_short_seq.cpp
+++ b/tests/Param_Test/ub_short_seq.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_short_seq.cpp
-//
-// = DESCRIPTION
-//    tests unbounded short sequences
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_short_seq.cpp
+ *
+ *  $Id$
+ *
+ *  tests unbounded short sequences
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "ub_short_seq.h"
 
-ACE_RCSID (Param_Test,
-           ub_short_seq,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Short_Sequence
 // ************************************************************************
diff --git a/tests/Param_Test/ub_short_seq.h b/tests/Param_Test/ub_short_seq.h
index a200873eadd..e69f052f50c 100644
--- a/tests/Param_Test/ub_short_seq.h
+++ b/tests/Param_Test/ub_short_seq.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_short_seq.h
-//
-// = DESCRIPTION
-//     Tests unbounded short sequence
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_short_seq.h
+ *
+ *  $Id$
+ *
+ *   Tests unbounded short sequence
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_UNBOUNDED_SHORT_SEQUENCE_H
 #define PARAM_TEST_UNBOUNDED_SHORT_SEQUENCE_H
@@ -28,51 +25,51 @@
 class Test_Short_Sequence
 {
 public:
+  /// ctor
   Test_Short_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_Short_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   CORBA::ShortSeq_var in_;
-  // in parameter
 
+  /// inout parameter
   CORBA::ShortSeq_var inout_;
-  // inout parameter
 
+  /// out parameter
   CORBA::ShortSeq_var out_;
-  // out parameter
 
+  /// return value
   CORBA::ShortSeq_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_UNBOUNDED_SHORT_SEQUENCE_H */
diff --git a/tests/Param_Test/ub_str_seq.cpp b/tests/Param_Test/ub_str_seq.cpp
index db7eead2aa5..889f49a0e64 100644
--- a/tests/Param_Test/ub_str_seq.cpp
+++ b/tests/Param_Test/ub_str_seq.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_str_seq.cpp
-//
-// = DESCRIPTION
-//    tests unbounded string sequences
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_str_seq.cpp
+ *
+ *  $Id$
+ *
+ *  tests unbounded string sequences
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "ub_str_seq.h"
 
-ACE_RCSID (Param_Test,
-           ub_str_seq,
-           "$Id$")
-
 // ************************************************************************
 //               Test_String_Sequence
 // ************************************************************************
diff --git a/tests/Param_Test/ub_str_seq.h b/tests/Param_Test/ub_str_seq.h
index b58373550da..516a5425a5a 100644
--- a/tests/Param_Test/ub_str_seq.h
+++ b/tests/Param_Test/ub_str_seq.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_str_seq.h
-//
-// = DESCRIPTION
-//     Tests sequences of strings
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_str_seq.h
+ *
+ *  $Id$
+ *
+ *   Tests sequences of strings
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_UNBOUNDED_STRING_SEQUENCE_H
 #define PARAM_TEST_UNBOUNDED_STRING_SEQUENCE_H
@@ -28,51 +25,51 @@
 class Test_String_Sequence
 {
 public:
+  /// ctor
   Test_String_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_String_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   CORBA::StringSeq_var in_;
-  // in parameter
 
+  /// inout parameter
   CORBA::StringSeq_var inout_;
-  // inout parameter
 
+  /// out parameter
   CORBA::StringSeq_var out_;
-  // out parameter
 
+  /// return value
   CORBA::StringSeq_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_UNBOUNDED_STRING_SEQUENCE_H */
diff --git a/tests/Param_Test/ub_string.cpp b/tests/Param_Test/ub_string.cpp
index ae253a1e54b..1d00e993d15 100644
--- a/tests/Param_Test/ub_string.cpp
+++ b/tests/Param_Test/ub_string.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_string.cpp
-//
-// = DESCRIPTION
-//    tests unbounded strings
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_string.cpp
+ *
+ *  $Id$
+ *
+ *  tests unbounded strings
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "ub_string.h"
 
-ACE_RCSID (Param_Test,
-           ub_string,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Unbounded_String
 // ************************************************************************
diff --git a/tests/Param_Test/ub_string.h b/tests/Param_Test/ub_string.h
index 834c4bfbcb2..753f35d7983 100644
--- a/tests/Param_Test/ub_string.h
+++ b/tests/Param_Test/ub_string.h
@@ -1,20 +1,16 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    unbounded_string.h
-//
-// = DESCRIPTION
-//     Tests unbounded string
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_string.h
+ *
+ *  $Id$
+ *
+ *   Tests unbounded string
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
 
 #ifndef PARAM_TEST_UNBOUNDED_STRING_H
 #define PARAM_TEST_UNBOUNDED_STRING_H
@@ -27,51 +23,51 @@
 class Test_Unbounded_String
 {
 public:
+  /// ctor
   Test_Unbounded_String (void);
-  // ctor
 
+  /// dtor
   ~Test_Unbounded_String (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   char *in_;
-  // in parameter
 
+  /// inout parameter
   char *inout_;
-  // inout parameter
 
+  /// out parameter
   char *out_;
-  // out parameter
 
+  /// return value
   char *ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_UNBOUNDED_STRING_H */
diff --git a/tests/Param_Test/ub_struct_seq.cpp b/tests/Param_Test/ub_struct_seq.cpp
index 633862bf044..4535cb61991 100644
--- a/tests/Param_Test/ub_struct_seq.cpp
+++ b/tests/Param_Test/ub_struct_seq.cpp
@@ -1,28 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_struct_seq.cpp
-//
-// = DESCRIPTION
-//    tests unbounded struct sequences
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ub_struct_seq.cpp
+ *
+ *  $Id$
+ *
+ *  tests unbounded struct sequences
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "ub_struct_seq.h"
 
-ACE_RCSID (Param_Test,
-           ub_struct_seq,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Struct_Sequence
 // ************************************************************************
@@ -183,9 +177,9 @@ Test_Struct_Sequence::compare (const Param_Test::StructSeq &s1,
           || vs1.c != vs2.c
           || vs1.s != vs2.s
           || vs1.o != vs2.o
-          || vs1.f != vs2.f
+          || !ACE::is_equal (vs1.f, vs2.f)
           || vs1.b != vs2.b
-          || vs1.d != vs2.d )
+          || !ACE::is_equal (vs1.d, vs2.d))
         return 0;
     }
 
diff --git a/tests/Param_Test/ub_struct_seq.h b/tests/Param_Test/ub_struct_seq.h
index 7459c7892f1..2e8a5a3fe71 100644
--- a/tests/Param_Test/ub_struct_seq.h
+++ b/tests/Param_Test/ub_struct_seq.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_struct_seq.h
-//
-// = DESCRIPTION
-//     Tests unbounded struct sequence
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_struct_seq.h
+ *
+ *  $Id$
+ *
+ *   Tests unbounded struct sequence
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_UNBOUNED_STRUCT_SEQUENCE_H
 #define PARAM_TEST_UNBOUNED_STRUCT_SEQUENCE_H
@@ -28,60 +25,60 @@
 class Test_Struct_Sequence
 {
 public:
+  /// ctor
   Test_Struct_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_Struct_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 protected:
+  /// compare
   CORBA::Boolean compare (const Param_Test::StructSeq &s1,
                           const Param_Test::StructSeq &s2);
-  // compare
 
+  /// print individual sequence
   void print_sequence (const Param_Test::StructSeq &s);
-  // print individual sequence
 
 private:
+  /// operation name
  char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::StructSeq in_;
-  // in parameter
 
   // these need memory management
+  /// inout parameter
   Param_Test::StructSeq_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::StructSeq_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::StructSeq_var ret_;
-  // return value
 };
 
 
@@ -89,60 +86,60 @@ private:
 class Test_Unbounded_Struct_Sequence
 {
 public:
+  /// ctor
   Test_Unbounded_Struct_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_Unbounded_Struct_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 protected:
+  /// compare
   CORBA::Boolean compare (const Param_Test::PathSpec &s1,
                           const Param_Test::PathSpec &s2);
-  // compare
 
+  /// print individual sequence
   void print_sequence (const Param_Test::PathSpec &s);
-  // print individual sequence
 
 private:
+  /// operation name
  char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::PathSpec in_;
-  // in parameter
 
   // these need memory management
+  /// inout parameter
   Param_Test::PathSpec_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::PathSpec_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::PathSpec_var ret_;
-  // return value
 };
 
 
diff --git a/tests/Param_Test/ub_wstr_seq.cpp b/tests/Param_Test/ub_wstr_seq.cpp
index 5761f22f962..7e768fff7de 100644
--- a/tests/Param_Test/ub_wstr_seq.cpp
+++ b/tests/Param_Test/ub_wstr_seq.cpp
@@ -1,29 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_wstr_seq.cpp
-//
-// = DESCRIPTION
-//    tests unbounded wide string sequences
-//
-// = AUTHORS
-//      Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_wstr_seq.cpp
+ *
+ *  $Id$
+ *
+ *  tests unbounded wide string sequences
+ *
+ *
+ *  @author   Jeff Parsons
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "ub_wstr_seq.h"
 #include "ace/OS_NS_wchar.h"
 
-ACE_RCSID (Param_Test,
-           ub_wstr_seq,
-           "$Id$")
-
 // ************************************************************************
 //               Test_WString_Sequence
 // ************************************************************************
diff --git a/tests/Param_Test/ub_wstr_seq.h b/tests/Param_Test/ub_wstr_seq.h
index 5351240f41c..8e5254d366f 100644
--- a/tests/Param_Test/ub_wstr_seq.h
+++ b/tests/Param_Test/ub_wstr_seq.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_wstr_seq.h
-//
-// = DESCRIPTION
-//     Tests sequences of wide strings
-//
-// = AUTHORS
-//      Jeff Parsons
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_wstr_seq.h
+ *
+ *  $Id$
+ *
+ *   Tests sequences of wide strings
+ *
+ *
+ *  @author   Jeff Parsons
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_UNBOUNDED_WSTRING_SEQUENCE_H
 #define PARAM_TEST_UNBOUNDED_WSTRING_SEQUENCE_H
@@ -28,51 +25,51 @@
 class Test_WString_Sequence
 {
 public:
+  /// ctor
   Test_WString_Sequence (void);
-  // ctor
 
+  /// dtor
   ~Test_WString_Sequence (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   CORBA::WStringSeq_var in_;
-  // in parameter
 
+  /// inout parameter
   CORBA::WStringSeq_var inout_;
-  // inout parameter
 
+  /// out parameter
   CORBA::WStringSeq_var out_;
-  // out parameter
 
+  /// return value
   CORBA::WStringSeq_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_UNBOUNDED_WSTRING_SEQUENCE_H */
diff --git a/tests/Param_Test/ub_wstring.cpp b/tests/Param_Test/ub_wstring.cpp
index fe1d49c4f69..370e9738381 100644
--- a/tests/Param_Test/ub_wstring.cpp
+++ b/tests/Param_Test/ub_wstring.cpp
@@ -1,29 +1,22 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_wstring.cpp
-//
-// = DESCRIPTION
-//    tests unbounded wide strings
-//
-// = AUTHORS
-//      Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_wstring.cpp
+ *
+ *  $Id$
+ *
+ *  tests unbounded wide strings
+ *
+ *
+ *  @author   Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "ub_wstring.h"
 #include "ace/OS_NS_wchar.h"
 
-ACE_RCSID (Param_Test,
-           ub_wstring,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Unbounded_WString
 // ************************************************************************
diff --git a/tests/Param_Test/ub_wstring.h b/tests/Param_Test/ub_wstring.h
index 0c11b453c98..66c38ee3769 100644
--- a/tests/Param_Test/ub_wstring.h
+++ b/tests/Param_Test/ub_wstring.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ub_wstring.h
-//
-// = DESCRIPTION
-//     Tests unbounded wide string
-//
-// = AUTHORS
-//      Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ub_wstring.h
+ *
+ *  $Id$
+ *
+ *   Tests unbounded wide string
+ *
+ *
+ *  @author   Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_UNBOUNDED_WSTRING_H
 #define PARAM_TEST_UNBOUNDED_WSTRING_H
@@ -27,51 +24,51 @@
 class Test_Unbounded_WString
 {
 public:
+  /// ctor
   Test_Unbounded_WString (void);
-  // ctor
 
+  /// dtor
   ~Test_Unbounded_WString (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   CORBA::WChar *in_;
-  // in parameter
 
+  /// inout parameter
   CORBA::WChar *inout_;
-  // inout parameter
 
+  /// out parameter
   CORBA::WChar *out_;
-  // out parameter
 
+  /// return value
   CORBA::WChar *ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_UNBOUNDED_WSTRING_H */
diff --git a/tests/Param_Test/ulonglong.cpp b/tests/Param_Test/ulonglong.cpp
index 3098bf9f256..0156640958f 100644
--- a/tests/Param_Test/ulonglong.cpp
+++ b/tests/Param_Test/ulonglong.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ulonglong.cpp
-//
-// = DESCRIPTION
-//    tests 64 bit longs
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ulonglong.cpp
+ *
+ *  $Id$
+ *
+ *  tests 64 bit longs
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "ulonglong.h"
 
-ACE_RCSID (Param_Test,
-           ulonglong,
-           "$Id$")
-
 Test_ULongLong::Test_ULongLong (void)
   : opname_ (CORBA::string_dup ("test_ulonglong"))
 {
diff --git a/tests/Param_Test/ulonglong.h b/tests/Param_Test/ulonglong.h
index c143ef00a70..e88464cf28f 100644
--- a/tests/Param_Test/ulonglong.h
+++ b/tests/Param_Test/ulonglong.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ulonglong.h
-//
-// = DESCRIPTION
-//     Tests 64bit unsigned longs.
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    ulonglong.h
+ *
+ *  $Id$
+ *
+ *   Tests 64bit unsigned longs.
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_ULONGLONG_H
 #define PARAM_TEST_ULONGLONG_H
@@ -24,51 +21,51 @@
 class Test_ULongLong
 {
 public:
+  /// ctor
   Test_ULongLong (void);
-  // ctor
 
+  /// dtor
   ~Test_ULongLong (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   CORBA::ULongLong in_;
-  // in parameter
 
+  /// inout parameter
   CORBA::ULongLong inout_;
-  // inout parameter
 
+  /// out parameter
   CORBA::ULongLong out_;
-  // out parameter
 
+  /// return value
   CORBA::ULongLong ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_ULONGLONG_H */
diff --git a/tests/Param_Test/var_array.cpp b/tests/Param_Test/var_array.cpp
index 01ba3ae9af5..daf31451008 100644
--- a/tests/Param_Test/var_array.cpp
+++ b/tests/Param_Test/var_array.cpp
@@ -1,28 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    var_array.cpp
-//
-// = DESCRIPTION
-//    tests fixed size arrays
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    var_array.cpp
+ *
+ *  $Id$
+ *
+ *  tests fixed size arrays
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "var_array.h"
 
-ACE_RCSID (Param_Test,
-           var_array,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Var_Array
 // ************************************************************************
diff --git a/tests/Param_Test/var_array.h b/tests/Param_Test/var_array.h
index 1a9b4e5c08f..863345610a6 100644
--- a/tests/Param_Test/var_array.h
+++ b/tests/Param_Test/var_array.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    var_array.h
-//
-// = DESCRIPTION
-//     Tests arrays whose base types are of variable size
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    var_array.h
+ *
+ *  $Id$
+ *
+ *   Tests arrays whose base types are of variable size
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_VAR_ARRAY_H
 #define PARAM_TEST_VAR_ARRAY_H
@@ -27,58 +24,58 @@
 class Test_Var_Array
 {
 public:
+  /// ctor
   Test_Var_Array (void);
-  // ctor
 
+  /// dtor
   ~Test_Var_Array (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// compare arrays
   CORBA::Boolean compare (const Param_Test::Var_Array_slice *a1,
                           const Param_Test::Var_Array_slice *a2);
-  // compare arrays
 
+  /// print an array
   void print (const Param_Test::Var_Array_slice *a);
-  // print an array
 
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Var_Array in_;
-  // in parameter
 
+  /// inout parameter
   Param_Test::Var_Array inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Var_Array_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Var_Array_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_VAR_ARRAY_H */
diff --git a/tests/Param_Test/var_struct.cpp b/tests/Param_Test/var_struct.cpp
index 5bf90ad5044..4dddf7fbfdf 100644
--- a/tests/Param_Test/var_struct.cpp
+++ b/tests/Param_Test/var_struct.cpp
@@ -1,28 +1,21 @@
-// $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    var_struct.cpp
-//
-// = DESCRIPTION
-//    test variable sized structures
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    var_struct.cpp
+ *
+ *  $Id$
+ *
+ *  test variable sized structures
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #include "helper.h"
 #include "var_struct.h"
 
-ACE_RCSID (Param_Test,
-           var_struct,
-           "$Id$")
-
 // ************************************************************************
 //               Test_Var_Struct
 // ************************************************************************
@@ -153,9 +146,9 @@ CORBA::Boolean
 Test_Var_Struct::check_validity (void)
 {
   CORBA::Boolean flag = 0;
-  if (this->in_.dbl == this->inout_->dbl &&
-      this->in_.dbl == this->out_->dbl &&
-      this->in_.dbl == this->ret_->dbl &&
+  if (ACE::is_equal (this->in_.dbl, this->inout_->dbl) &&
+      ACE::is_equal (this->in_.dbl, this->out_->dbl) &&
+      ACE::is_equal (this->in_.dbl, this->ret_->dbl) &&
       (!ACE_OS::strcmp (this->in_.dummy1, this->inout_->dummy1)) &&
       (!ACE_OS::strcmp (this->in_.dummy1, this->out_->dummy1)) &&
       (!ACE_OS::strcmp (this->in_.dummy1, this->ret_->dummy1)) &&
diff --git a/tests/Param_Test/var_struct.h b/tests/Param_Test/var_struct.h
index 79f15ff4ded..dcc2f16d0c8 100644
--- a/tests/Param_Test/var_struct.h
+++ b/tests/Param_Test/var_struct.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    var_struct.h
-//
-// = DESCRIPTION
-//     Tests variable sized structures
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    var_struct.h
+ *
+ *  $Id$
+ *
+ *   Tests variable sized structures
+ *
+ *
+ *  @author   Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef PARAM_TEST_VAR_STRUCT_H
 #define PARAM_TEST_VAR_STRUCT_H
@@ -28,52 +25,52 @@
 class Test_Var_Struct
 {
 public:
+  /// ctor
   Test_Var_Struct (void);
-  // ctor
 
+  /// dtor
   ~Test_Var_Struct (void);
-  // dtor
 
+  /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
-  // run the SII test
 
+  /// return operation name
   const char *opname (void) const;
-  // return operation name
 
+  /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
-  // set values for parameters
 
+  /// reset values for CORBA
   int reset_parameters (void);
-  // reset values for CORBA
 
+  /// check if results are valid
   CORBA::Boolean check_validity (void);
-  // check if results are valid
 
+  /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
 
+  /// print all the values
   void print_values (void);
-  // print all the values
 
+  /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);
-  // invoke DII request with appropriate exception handling.
 
 private:
+  /// operation name
   char *opname_;
-  // operation name
 
+  /// in parameter
   Param_Test::Var_Struct in_;
-  // in parameter
 
   // these need memory management
+  /// inout parameter
   Param_Test::Var_Struct_var inout_;
-  // inout parameter
 
+  /// out parameter
   Param_Test::Var_Struct_var out_;
-  // out parameter
 
+  /// return value
   Param_Test::Var_Struct_var ret_;
-  // return value
 };
 
 #endif /* PARAM_TEST_VAR_STRUCT_H */
diff --git a/tests/Permanent_Forward/Makefile.am b/tests/Permanent_Forward/Makefile.am
deleted file mode 100644
index 06863c3a49e..00000000000
--- a/tests/Permanent_Forward/Makefile.am
+++ /dev/null
@@ -1,46 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Permanent_Forward_StubTest.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = StubTest
-
-StubTest_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-StubTest_SOURCES = \
-  StubTest.cpp
-
-StubTest_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Permanent_Forward/StubTest.cpp b/tests/Permanent_Forward/StubTest.cpp
index a2cacd867ff..f013183931e 100644
--- a/tests/Permanent_Forward/StubTest.cpp
+++ b/tests/Permanent_Forward/StubTest.cpp
@@ -29,10 +29,6 @@
    : ACE_VERSIONED_NAMESPACE_NAME::__ace_assert(__FILE__, __LINE__, ACE_TEXT_CHAR_TO_TCHAR (#X)))
 #endif
 
-ACE_RCSID (Permanent_Forward,
-           StubTest,
-           "$Id$")
-
 static bool
 is_endpoint (TAO_Profile *profile, const char *host, unsigned short port)
   {
diff --git a/tests/Policies/Makefile.am b/tests/Policies/Makefile.am
deleted file mode 100644
index b7e1a866ee2..00000000000
--- a/tests/Policies/Makefile.am
+++ /dev/null
@@ -1,84 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Policies_Manipulation.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Manipulation
-
-Manipulation_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Manipulation_SOURCES = \
-  Manipulation.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Manipulation_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Policies/Manipulation.cpp b/tests/Policies/Manipulation.cpp
index becfd63d8ef..2feb981f76d 100644
--- a/tests/Policies/Manipulation.cpp
+++ b/tests/Policies/Manipulation.cpp
@@ -11,8 +11,6 @@
 #include "ace/Task.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID(Policies, Manipulation, "$Id$")
-
 int nthreads = 5;
 int niterations = 100;
 
@@ -41,7 +39,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -63,7 +61,7 @@ public:
   // The thread entry point.
 
 private:
-  void perform_iteration (ACE_RANDR_TYPE &seed,
+  void perform_iteration (unsigned int *seed,
                           CORBA::PolicyList_var &policies,
                           CORBA::PolicyManager_ptr policy_manager,
                           CORBA::PolicyCurrent_ptr policy_current);
@@ -140,7 +138,7 @@ Manipulation::Manipulation (CORBA::ORB_ptr orb,
 }
 
 void
-Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
+Manipulation::perform_iteration (unsigned int *seed,
                                  CORBA::PolicyList_var &policies,
                                  CORBA::PolicyManager_ptr policy_manager,
                                  CORBA::PolicyCurrent_ptr policy_current)
@@ -281,11 +279,11 @@ Manipulation::svc (void)
   try
     {
 #ifndef ACE_LACKS_LONGLONG_T
-      ACE_RANDR_TYPE seed =
-        static_cast<ACE_RANDR_TYPE> (ACE_OS::gethrtime ());
+      unsigned int seed =
+        static_cast<unsigned int> (ACE_OS::gethrtime ());
 #else
-      ACE_RANDR_TYPE seed =
-        static_cast<ACE_RANDR_TYPE> (ACE_OS::gethrtime().lo());
+      unsigned int seed =
+        static_cast<unsigned int> (ACE_OS::gethrtime().lo());
 #endif
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("ORBPolicyManager");
@@ -302,7 +300,7 @@ Manipulation::svc (void)
       for (int i = 0; i != this->niterations_; ++i)
         {
           CORBA::PolicyList_var policies;
-          this->perform_iteration (seed,
+          this->perform_iteration (&seed,
                                    policies,
                                    policy_manager.in (),
                                    policy_current.in ());
diff --git a/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp b/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
index 61d0ffc5046..38371695a84 100644
--- a/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
+++ b/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
@@ -13,12 +13,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (AMI,
-           Client_Interceptor,
-           "$Id$")
-
-
 unsigned long Echo_Client_Request_Interceptor::request_count = 0;
 unsigned long Echo_Client_Request_Interceptor::reply_count = 0;
 unsigned long Echo_Client_Request_Interceptor::other_count = 0;
diff --git a/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp
index 9e3115b5d4e..e438dcc3690 100644
--- a/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp
@@ -9,8 +9,6 @@
 #include "Client_ORBInitializer.h"
 #include "Client_Interceptor.h"
 
-ACE_RCSID(Portable_Interceptor_AMI, Client_ORBInitializer, "$Id$")
-
 Client_ORBInitializer::Client_ORBInitializer ()
 {
 }
diff --git a/tests/Portable_Interceptors/AMI/Echo.cpp b/tests/Portable_Interceptors/AMI/Echo.cpp
index 2f644181f4d..0d0b75a8b93 100644
--- a/tests/Portable_Interceptors/AMI/Echo.cpp
+++ b/tests/Portable_Interceptors/AMI/Echo.cpp
@@ -7,8 +7,6 @@
  */
 #include "Echo.h"
 
-ACE_RCSID(Portable_Interceptors_AMI, Echo, "$Id$")
-
 Echo::Echo(CORBA::ORB_ptr orb)
   : orb_(CORBA::ORB::_duplicate(orb))
 {
diff --git a/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
index 61f218c4c0c..1f2fc079948 100644
--- a/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
+++ b/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
@@ -7,12 +7,6 @@
  */
 #include "Echo_Handler.h"
 
-
-ACE_RCSID (AMI,
-           Echo_Handler,
-           "$Id$")
-
-
 Echo_Handler::Echo_Handler(void)
   : replies_ (0)
 {
diff --git a/tests/Portable_Interceptors/AMI/Makefile.am b/tests/Portable_Interceptors/AMI/Makefile.am
deleted file mode 100644
index 762f6d7f170..00000000000
--- a/tests/Portable_Interceptors/AMI/Makefile.am
+++ /dev/null
@@ -1,146 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_AMI_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.PI_AMI_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Interceptor.cpp \
-  Client_ORBInitializer.cpp \
-  Echo_Handler.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Client_Interceptor.h \
-  Client_ORBInitializer.h \
-  Echo_Handler.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.PI_AMI_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Echo.cpp \
-  Server_Interceptor.cpp \
-  Server_ORBInitializer.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Echo.h \
-  Server_Interceptor.h \
-  Server_ORBInitializer.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp b/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
index 1d56f937708..3839b1c0046 100644
--- a/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
+++ b/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
@@ -11,12 +11,6 @@
 #include "tao/OctetSeqC.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (AMI,
-           Server_Interceptor,
-           "$Id$")
-
-
 Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
 {
 }
diff --git a/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
index 4fc70427165..95528d118c6 100644
--- a/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
@@ -9,10 +9,6 @@
 #include "Server_ORBInitializer.h"
 #include "Server_Interceptor.h"
 
-ACE_RCSID (AMI,
-           Server_ORBInitializer,
-           "$Id$")
-
 Server_ORBInitializer::Server_ORBInitializer (void)
 {
 }
diff --git a/tests/Portable_Interceptors/AMI/client.cpp b/tests/Portable_Interceptors/AMI/client.cpp
index 4e20b64cfa9..b156ee49c15 100644
--- a/tests/Portable_Interceptors/AMI/client.cpp
+++ b/tests/Portable_Interceptors/AMI/client.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "Echo_Handler.h"
 #include "Client_ORBInitializer.h"
 #include "Client_Interceptor.h"
@@ -8,11 +10,6 @@
 #include "ace/Log_Msg.h"
 #include <iostream>
 
-ACE_RCSID (AMI,
-           client,
-           "$Id$")
-
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 static int exit_status = 0;
 const unsigned long ITERATIONS = 100;
@@ -39,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/AMI/server.cpp b/tests/Portable_Interceptors/AMI/server.cpp
index 3a17e6a96c3..b02337b54a6 100644
--- a/tests/Portable_Interceptors/AMI/server.cpp
+++ b/tests/Portable_Interceptors/AMI/server.cpp
@@ -1,17 +1,11 @@
+// $Id$
+
 #include "Echo.h"
 #include "Server_ORBInitializer.h"
-
 #include "tao/ORBInitializer_Registry.h"
-
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-
-ACE_RCSID (Portable_Interceptors,
-           AMI,
-           "$Id$")
-
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -36,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/AdvSlot/Makefile.am b/tests/Portable_Interceptors/AdvSlot/Makefile.am
deleted file mode 100644
index bb138ee2388..00000000000
--- a/tests/Portable_Interceptors/AdvSlot/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AdvSlot_Idl.am
-
-BUILT_SOURCES = \
-  StateTransferC.cpp \
-  StateTransferC.h \
-  StateTransferC.inl \
-  StateTransferS.cpp \
-  StateTransferS.h \
-  StateTransferS.inl
-
-CLEANFILES = \
-  StateTransfer-stamp \
-  StateTransferC.cpp \
-  StateTransferC.h \
-  StateTransferC.inl \
-  StateTransferS.cpp \
-  StateTransferS.h \
-  StateTransferS.inl
-
-StateTransferC.cpp StateTransferC.h StateTransferC.inl StateTransferS.cpp StateTransferS.h StateTransferS.inl: StateTransfer-stamp
-
-StateTransfer-stamp: $(srcdir)/StateTransfer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/StateTransfer.idl
-	@touch $@
-
-noinst_HEADERS = \
-  StateTransfer.idl
-
-## Makefile.AdvSlot_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  StateTransferC.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.AdvSlot_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  StateTransferC.cpp \
-  StateTransferS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Portable_Interceptors/AdvSlot/server.cpp b/tests/Portable_Interceptors/AdvSlot/server.cpp
index 119ecb8bbe8..007d6fca674 100644
--- a/tests/Portable_Interceptors/AdvSlot/server.cpp
+++ b/tests/Portable_Interceptors/AdvSlot/server.cpp
@@ -40,7 +40,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am b/tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am
deleted file mode 100644
index b8eaade1b8c..00000000000
--- a/tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AdvSlotDblCpy_Idl.am
-
-BUILT_SOURCES = \
-  InvokeMeC.cpp \
-  InvokeMeC.h \
-  InvokeMeC.inl \
-  InvokeMeS.cpp \
-  InvokeMeS.h \
-  InvokeMeS.inl
-
-CLEANFILES = \
-  InvokeMe-stamp \
-  InvokeMeC.cpp \
-  InvokeMeC.h \
-  InvokeMeC.inl \
-  InvokeMeS.cpp \
-  InvokeMeS.h \
-  InvokeMeS.inl
-
-InvokeMeC.cpp InvokeMeC.h InvokeMeC.inl InvokeMeS.cpp InvokeMeS.h InvokeMeS.inl: InvokeMe-stamp
-
-InvokeMe-stamp: $(srcdir)/InvokeMe.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/InvokeMe.idl
-	@touch $@
-
-noinst_HEADERS = \
-  InvokeMe.idl
-
-## Makefile.AdvSlotDblCpy_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  InvokeMeC.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.AdvSlotDblCpy_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  InvokeMeC.cpp \
-  InvokeMeS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
index c13845c7f9c..1ca2da2cf21 100644
--- a/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
+++ b/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
@@ -42,7 +42,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/AdvSlotExt/Makefile.am b/tests/Portable_Interceptors/AdvSlotExt/Makefile.am
deleted file mode 100644
index d97219bdbc7..00000000000
--- a/tests/Portable_Interceptors/AdvSlotExt/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.AdvSlotExt_Idl.am
-
-BUILT_SOURCES = \
-  StateTransferC.cpp \
-  StateTransferC.h \
-  StateTransferC.inl \
-  StateTransferS.cpp \
-  StateTransferS.h \
-  StateTransferS.inl
-
-CLEANFILES = \
-  StateTransfer-stamp \
-  StateTransferC.cpp \
-  StateTransferC.h \
-  StateTransferC.inl \
-  StateTransferS.cpp \
-  StateTransferS.h \
-  StateTransferS.inl
-
-StateTransferC.cpp StateTransferC.h StateTransferC.inl StateTransferS.cpp StateTransferS.h StateTransferS.inl: StateTransfer-stamp
-
-StateTransfer-stamp: $(srcdir)/StateTransfer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/StateTransfer.idl
-	@touch $@
-
-noinst_HEADERS = \
-  StateTransfer.idl
-
-## Makefile.AdvSlotExt_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  StateTransferC.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.AdvSlotExt_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  StateTransferC.cpp \
-  StateTransferS.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/tests/Portable_Interceptors/AdvSlotExt/server.cpp
index d64b3d63c9d..adcaa021347 100644
--- a/tests/Portable_Interceptors/AdvSlotExt/server.cpp
+++ b/tests/Portable_Interceptors/AdvSlotExt/server.cpp
@@ -36,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
index d6c1ed13d55..7556789e871 100644
--- a/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
@@ -1,14 +1,10 @@
 // -*- C++ -*-
-//
 // $Id$
-//
 
 #include "Client_ORBInitializer.h"
 #include "client_interceptors.h"
 #include "Interceptor_Type.h"
 
-ACE_RCSID (Benchmark, Client_ORBInitializer, "$Id$")
-
 Client_ORBInitializer::Client_ORBInitializer (int interceptor_type)
   : interceptor_type_ (interceptor_type)
 {
diff --git a/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp b/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
index d92a5761c36..5ecdecaeba5 100644
--- a/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
+++ b/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
@@ -1,12 +1,8 @@
 // -*- C++ -*-
-//
 // $Id$
-//
 
 #include "Interceptor_Type.h"
-#include "ace/OS_String.h"
-
-ACE_RCSID (Benchmark, Interceptor_Type, "$Id$")
+#include "ace/OS_NS_string.h"
 
 void get_interceptor_type (int argc, ACE_TCHAR *argv[],
                            int &interceptor_type)
diff --git a/tests/Portable_Interceptors/Benchmark/Makefile.am b/tests/Portable_Interceptors/Benchmark/Makefile.am
deleted file mode 100644
index d1f42075650..00000000000
--- a/tests/Portable_Interceptors/Benchmark/Makefile.am
+++ /dev/null
@@ -1,130 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_Benchmark_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_Benchmark_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  Interceptor_Type.cpp \
-  client.cpp \
-  client_interceptors.cpp \
-  marker.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  Interceptor_Type.h \
-  client_interceptors.h \
-  marker.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_Benchmark_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Interceptor_Type.cpp \
-  Server_ORBInitializer.cpp \
-  marker.cpp \
-  server.cpp \
-  server_interceptors.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Interceptor_Type.h \
-  Server_ORBInitializer.h \
-  marker.h \
-  server_interceptors.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
index 47a9da3516c..afb0b9d78f7 100644
--- a/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
@@ -1,16 +1,10 @@
 // -*- C++ -*-
-//
 // $Id$
-//
 
 #include "Server_ORBInitializer.h"
 #include "Interceptor_Type.h"
 #include "server_interceptors.h"
 
-ACE_RCSID (Benchmark,
-           Server_ORBInitializer,
-           "$Id$")
-
 Server_ORBInitializer::Server_ORBInitializer (int interceptor_type)
   :  interceptor_type_ (interceptor_type)
 {
diff --git a/tests/Portable_Interceptors/Benchmark/client.cpp b/tests/Portable_Interceptors/Benchmark/client.cpp
index 6eef1cd21d9..be1ad8ab0fd 100644
--- a/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -11,10 +11,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (Benchmark,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 int niterations = 5;
 int register_interceptor = 1;
diff --git a/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
index dc2eefb25f2..476a46d1dd4 100644
--- a/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
+++ b/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
@@ -7,10 +7,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Benchmark,
-           client_interceptors,
-           "$Id$")
-
 const CORBA::ULong request_ctx_id = 0xdead;
 //const CORBA::ULong reply_ctx_id = 0xbeef;   // Never used.
 
diff --git a/tests/Portable_Interceptors/Benchmark/server.cpp b/tests/Portable_Interceptors/Benchmark/server.cpp
index c84b894a241..a80e5756488 100644
--- a/tests/Portable_Interceptors/Benchmark/server.cpp
+++ b/tests/Portable_Interceptors/Benchmark/server.cpp
@@ -9,8 +9,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Benchmark, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 int register_interceptor = 1;
 
@@ -35,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
index 9464721742f..f4635a5725c 100644
--- a/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
+++ b/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
@@ -7,10 +7,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Benchmark,
-           server_interceptors,
-           "$Id$")
-
 const CORBA::ULong request_ctx_id = 0xdead;
 //const CORBA::ULong reply_ctx_id = 0xbeef;   // Never used.
 
diff --git a/tests/Portable_Interceptors/Benchmark/test.idl b/tests/Portable_Interceptors/Benchmark/test.idl
index 734ad8e5301..577a19bddc5 100644
--- a/tests/Portable_Interceptors/Benchmark/test.idl
+++ b/tests/Portable_Interceptors/Benchmark/test.idl
@@ -1,21 +1,17 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Portable_Interceptors
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//   Simple IDL file to test portable interceptor support.
-//
-// = AUTHORS
-//   Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    test.idl
+ *
+ *  $Id$
+ *
+ * Simple IDL file to test portable interceptor support.
+ *
+ *
+ *  @author Kirthika Parameswaran  <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 module Test_Interceptors
 {
diff --git a/tests/Portable_Interceptors/Benchmark/test_i.cpp b/tests/Portable_Interceptors/Benchmark/test_i.cpp
index c4b676c7d06..59c01162ab9 100644
--- a/tests/Portable_Interceptors/Benchmark/test_i.cpp
+++ b/tests/Portable_Interceptors/Benchmark/test_i.cpp
@@ -4,8 +4,6 @@
 #include "marker.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Benchmark, test_i, "$Id$")
-
 Secure_Vault_i::Secure_Vault_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Portable_Interceptors/Benchmark/test_i.h b/tests/Portable_Interceptors/Benchmark/test_i.h
index f6e15213c34..989976d0e32 100644
--- a/tests/Portable_Interceptors/Benchmark/test_i.h
+++ b/tests/Portable_Interceptors/Benchmark/test_i.h
@@ -1,36 +1,36 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Portable_Interceptors/Benchmark
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Nanbor Wang
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Nanbor Wang
+ */
+//=============================================================================
+
 
 #ifndef TAO_INTERCEPTOR_TEST_I_H
 #define TAO_INTERCEPTOR_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Secure_Vault_i
+ *
+ * Implements the Secure_Vault interface in test.idl
+ */
 class Secure_Vault_i : public POA_Test_Interceptors::Secure_Vault
 {
-  // = DESCRIPTION
-  //   Implements the Secure_Vault interface in test.idl
 
 public:
+  /// ctor
   Secure_Vault_i (CORBA::ORB_ptr orb);
-  // ctor
 
   virtual CORBA::Short ready (void);
 
+  /// Passwd sent in the service context list
   virtual void authenticate (const char * user);
-  // Passwd sent in the service context list
 
   virtual CORBA::Long update_records (CORBA::Long id,
                                       const Test_Interceptors::Secure_Vault::Record & val);
@@ -38,8 +38,8 @@ public:
   virtual void shutdown (void);
 
  private:
+  /// The ORB pointer (for shutdown.)
   CORBA::ORB_var orb_;
-  // The ORB pointer (for shutdown.)
 };
 
 #endif /* TAO_INTERCEPTOR_TEST_I_H */
diff --git a/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
index 2a0776226f0..778c95a2df9 100644
--- a/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
@@ -1,13 +1,9 @@
 // -*- C++ -*-
-//
 // $Id$
-//
 
 #include "Client_ORBInitializer.h"
 #include "client_interceptor.h"
 
-ACE_RCSID (Service_Context_Manipulation, Client_ORBInitializer, "$Id$")
-
 Client_ORBInitializer::Client_ORBInitializer (void)
 {
 }
diff --git a/tests/Portable_Interceptors/Bug_1559/Makefile.am b/tests/Portable_Interceptors/Bug_1559/Makefile.am
deleted file mode 100644
index 5d112b0ccaa..00000000000
--- a/tests/Portable_Interceptors/Bug_1559/Makefile.am
+++ /dev/null
@@ -1,122 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_1559_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_1559_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  client.cpp \
-  client_interceptor.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  client_interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_1559_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  server.cpp \
-  server_interceptor.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  server_interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
index b39d4b07273..d76f6edc043 100644
--- a/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
@@ -1,14 +1,8 @@
 // -*- C++ -*-
-//
 // $Id$
-//
 
 #include "Server_ORBInitializer.h"
 
-ACE_RCSID (Bug_1559,
-           Server_ORBInitializer,
-           "$Id$")
-
 Server_ORBInitializer::Server_ORBInitializer (void)
 {
 }
diff --git a/tests/Portable_Interceptors/Bug_1559/client.cpp b/tests/Portable_Interceptors/Bug_1559/client.cpp
index c7f335decc8..c7672a26863 100644
--- a/tests/Portable_Interceptors/Bug_1559/client.cpp
+++ b/tests/Portable_Interceptors/Bug_1559/client.cpp
@@ -5,8 +5,6 @@
 #include "Client_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID(Interceptors, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
index 2538c5dc5c2..6744b086064 100644
--- a/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
+++ b/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
@@ -6,10 +6,6 @@
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Bug_1559,
-           client_interceptor,
-           "$Id$")
-
 const IOP::ServiceId service_id = 0xdeadbeef;
 const char *request_msg = "REQUEST message";
 const char *reply_msg = "REPLY message";
diff --git a/tests/Portable_Interceptors/Bug_1559/server.cpp b/tests/Portable_Interceptors/Bug_1559/server.cpp
index ad934d1d728..e7af8982051 100644
--- a/tests/Portable_Interceptors/Bug_1559/server.cpp
+++ b/tests/Portable_Interceptors/Bug_1559/server.cpp
@@ -6,10 +6,6 @@
 #include "Server_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Service_Context_Manipulation,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
index dff89a0c69e..152ccde0295 100644
--- a/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
+++ b/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
@@ -6,10 +6,6 @@
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Bug_1559,
-           server_interceptor,
-           "$Id$")
-
 const IOP::ServiceId service_id = 0xdeadbeef;
 const char *request_msg = "REQUEST message";
 const char *reply_msg = "REPLY message";
diff --git a/tests/Portable_Interceptors/Bug_1559/test.idl b/tests/Portable_Interceptors/Bug_1559/test.idl
index 79a06a14351..2e858b32098 100644
--- a/tests/Portable_Interceptors/Bug_1559/test.idl
+++ b/tests/Portable_Interceptors/Bug_1559/test.idl
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Interceptors
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//   Simple IDL file to test portable interceptor support.
-//
-// = AUTHORS
-//   Nanbor Wang <nanbor@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    test.idl
+ *
+ *  $Id$
+ *
+ * Simple IDL file to test portable interceptor support.
+ *
+ *
+ *  @author Nanbor Wang <nanbor@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 module Test_Interceptors
 {
diff --git a/tests/Portable_Interceptors/Bug_1559/test_i.cpp b/tests/Portable_Interceptors/Bug_1559/test_i.cpp
index 0d201962ba4..75d61f3827e 100644
--- a/tests/Portable_Interceptors/Bug_1559/test_i.cpp
+++ b/tests/Portable_Interceptors/Bug_1559/test_i.cpp
@@ -2,11 +2,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID (Service_Context_Manipulation,
-           test_i,
-           "$Id$")
-
-
 Visual_i::Visual_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
index ea422a7f284..e578f750ae8 100644
--- a/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
@@ -1,12 +1,8 @@
 // -*- C++ -*-
-//
 // $Id$
-//
 
 #include "Client_ORBInitializer.h"
 
-ACE_RCSID (Bug_2088, Client_ORBInitializer, "$Id$")
-
 Client_ORBInitializer::Client_ORBInitializer (void) :
   pre_init_called (false),
   post_init_called (false)
diff --git a/tests/Portable_Interceptors/Bug_2088/Makefile.am b/tests/Portable_Interceptors/Bug_2088/Makefile.am
deleted file mode 100644
index 4ecbd165473..00000000000
--- a/tests/Portable_Interceptors/Bug_2088/Makefile.am
+++ /dev/null
@@ -1,51 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2088_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  client.cpp \
-  Client_ORBInitializer.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Bug_2088/client.cpp b/tests/Portable_Interceptors/Bug_2088/client.cpp
index 2fc166203f6..1eab0d806a8 100644
--- a/tests/Portable_Interceptors/Bug_2088/client.cpp
+++ b/tests/Portable_Interceptors/Bug_2088/client.cpp
@@ -4,8 +4,6 @@
 #include "Client_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID(Interceptors, client, "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/Portable_Interceptors/Bug_2133/Hello.cpp b/tests/Portable_Interceptors/Bug_2133/Hello.cpp
index 7b9497529ec..430c542a0a3 100644
--- a/tests/Portable_Interceptors/Bug_2133/Hello.cpp
+++ b/tests/Portable_Interceptors/Bug_2133/Hello.cpp
@@ -1,9 +1,6 @@
-//
 // $Id$
-//
-#include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "Hello.cpp,v 1.3 2002/01/29 20:21:07 okellogg Exp")
+#include "Hello.h"
 
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/tests/Portable_Interceptors/Bug_2133/Makefile.am b/tests/Portable_Interceptors/Bug_2133/Makefile.am
deleted file mode 100644
index bad868e5b6e..00000000000
--- a/tests/Portable_Interceptors/Bug_2133/Makefile.am
+++ /dev/null
@@ -1,111 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2133_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2133_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ClientORBInitializer.cpp \
-  ClientRequest_Interceptor.cpp \
-  TestC.cpp \
-  client.cpp \
-  ClientORBInitializer.h \
-  ClientRequest_Interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2133_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Portable_Interceptors/Bug_2133/client.cpp b/tests/Portable_Interceptors/Bug_2133/client.cpp
index d75ca74b237..50dd18fa608 100644
--- a/tests/Portable_Interceptors/Bug_2133/client.cpp
+++ b/tests/Portable_Interceptors/Bug_2133/client.cpp
@@ -6,9 +6,6 @@
 #include "ClientORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 
-
-ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
@@ -33,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/Bug_2133/server.cpp b/tests/Portable_Interceptors/Bug_2133/server.cpp
index 95d61429e99..2017e62d471 100644
--- a/tests/Portable_Interceptors/Bug_2133/server.cpp
+++ b/tests/Portable_Interceptors/Bug_2133/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
index 405d64c01a2..c11f53f3fee 100644
--- a/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
@@ -1,13 +1,9 @@
 // -*- C++ -*-
-//
 // $Id$
-//
 
 #include "Client_ORBInitializer.h"
 #include "client_interceptor.h"
 
-ACE_RCSID (Bug_2510_Regression, Client_ORBInitializer, "$Id$")
-
 Client_ORBInitializer::Client_ORBInitializer (void)
 {
 }
diff --git a/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am b/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am
deleted file mode 100644
index 5f6c038bf27..00000000000
--- a/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am
+++ /dev/null
@@ -1,122 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2510_Regression_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_2510_Regression_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  client.cpp \
-  client_interceptor.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  client_interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_2510_Regression_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  server.cpp \
-  server_interceptor.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  server_interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
index 7820c79abef..182d056edba 100644
--- a/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
@@ -1,15 +1,9 @@
 // -*- C++ -*-
-//
 // $Id$
-//
 
 #include "Server_ORBInitializer.h"
 extern PortableInterceptor::SlotId slotId;
 
-ACE_RCSID (Bug_2510,
-           Server_ORBInitializer,
-           "$Id$")
-
 Server_ORBInitializer::Server_ORBInitializer (void)
 {
 }
diff --git a/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
index 71f8f39bd63..3b0965ad24b 100644
--- a/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
+++ b/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
@@ -7,8 +7,6 @@
 #include "Client_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID(Bug_2510_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
index 2c261b4fbef..5c27180d963 100644
--- a/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
+++ b/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
@@ -6,10 +6,6 @@
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Bug_2510_Regression,
-           client_interceptor,
-           "$Id$")
-
 const IOP::ServiceId service_id = 0x08154711;
 const char * const request_msg = "TEST 0123456789 TEST";
 
diff --git a/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp b/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
index 2ee6f70d78a..9061a527d11 100644
--- a/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
+++ b/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
@@ -6,10 +6,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "Server_ORBInitializer.h"
 
-ACE_RCSID (Bug_2510_Regression,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -33,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
index 896c5da8d12..97e8b1004c2 100644
--- a/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
+++ b/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
@@ -1,15 +1,10 @@
-// test_i.cpp,v 1.1 2003/08/27 22:43:35 edwardgt Exp
+// $Id$
 
 #include "test_i.h"
 #include "tao/PI/PI.h"
 
 extern PortableInterceptor::SlotId slotId;
 
-ACE_RCSID (Bug_2510_Regression,
-           test_i,
-           "$Id$")
-
-
 Visual_i::Visual_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp
index c055c72e632..b67fbb88829 100644
--- a/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Client_ORBInitializer.h"
 
-ACE_RCSID (Redirection,
-           Client_ORBInitializer,
-           "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "Client_Request_Interceptor.h"
diff --git a/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp b/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
index e4a740cb650..2e00425798a 100644
--- a/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
+++ b/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Client_Request_Interceptor.h"
 #include "testC.h"
@@ -7,10 +8,6 @@
 #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Redirection,
-           Client_Request_Interceptor,
-           "$Id$")
-
 Client_Request_Interceptor::Client_Request_Interceptor (
   const char *orb_id,
   const char *first_forward_str, const char *second_forward_str)
@@ -58,7 +55,7 @@ Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
   ++this->exception_count_;
-  ACE_DEBUG ((LM_DEBUG, "received exception %d\n", 
+  ACE_DEBUG ((LM_DEBUG, "received exception %d\n",
               this->exception_count_));
   if (CORBA::is_nil (this->orb_.in ()))
   {
diff --git a/tests/Portable_Interceptors/Bug_3079/Makefile.am b/tests/Portable_Interceptors/Bug_3079/Makefile.am
deleted file mode 100644
index 8756201dd5a..00000000000
--- a/tests/Portable_Interceptors/Bug_3079/Makefile.am
+++ /dev/null
@@ -1,128 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_3079_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_3079_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  Client_Request_Interceptor.cpp \
-  client.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  Client_Request_Interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_3079_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  CrashPoint.cpp \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  CrashPoint.h \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
index 33fb284f0c2..8a83f147441 100644
--- a/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_ORBInitializer.h"
 
-ACE_RCSID (Redirection,
-           Server_ORBInitializer,
-           "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "Server_Request_Interceptor.h"
diff --git a/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp b/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
index 3123772c7cb..52449966d7f 100644
--- a/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
+++ b/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
@@ -1,14 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_Request_Interceptor.h"
 #include "tao/ORB_Constants.h"
 #include "ace/Log_Msg.h"
 #include "CrashPoint.h"
 
-ACE_RCSID (Redirection,
-           Server_Request_Interceptor,
-           "$Id$")
-
 Server_Request_Interceptor::Server_Request_Interceptor (void)
   : request_count_ (0)
 {
diff --git a/tests/Portable_Interceptors/Bug_3079/client.cpp b/tests/Portable_Interceptors/Bug_3079/client.cpp
index 7a89cf657e4..04ac47995c7 100644
--- a/tests/Portable_Interceptors/Bug_3079/client.cpp
+++ b/tests/Portable_Interceptors/Bug_3079/client.cpp
@@ -1,14 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "testC.h"
 #include "Client_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Redirection,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior1 = 0;
 const ACE_TCHAR *ior2 = 0;
 const ACE_TCHAR *ior3 = 0;
diff --git a/tests/Portable_Interceptors/Bug_3079/run_test.pl b/tests/Portable_Interceptors/Bug_3079/run_test.pl
index a0f0d93247b..def26a31c2c 100755
--- a/tests/Portable_Interceptors/Bug_3079/run_test.pl
+++ b/tests/Portable_Interceptors/Bug_3079/run_test.pl
@@ -36,7 +36,7 @@ $client->DeleteFile ($iorbase3);
 $SV1 = $server1->CreateProcess ("server", "-o $server1_iorfile -c 1 -n 1 -s 1");
 $SV2 = $server2->CreateProcess ("server", "-o $server2_iorfile -n 2 -s 2");
 $SV3 = $server3->CreateProcess ("server", "-o $server3_iorfile -n 3 -s 3");
-$CL  = $client->CreateProcess ("client", 
+$CL  = $client->CreateProcess ("client",
                     "-p file://$client_iorfile1 -f file://$client_iorfile2 -s file://$client_iorfile3");
 
 $status = 0;
diff --git a/tests/Portable_Interceptors/Bug_3079/server.cpp b/tests/Portable_Interceptors/Bug_3079/server.cpp
index 971d5faf2e8..d04d4dcca49 100644
--- a/tests/Portable_Interceptors/Bug_3079/server.cpp
+++ b/tests/Portable_Interceptors/Bug_3079/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
@@ -8,10 +9,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "CrashPoint.h"
 
-ACE_RCSID (Redirection,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_file = 0;
 int number = 0;
 int server_number = 0;
diff --git a/tests/Portable_Interceptors/Bug_3079/test_i.cpp b/tests/Portable_Interceptors/Bug_3079/test_i.cpp
index 189b2447c94..a845f0270e1 100644
--- a/tests/Portable_Interceptors/Bug_3079/test_i.cpp
+++ b/tests/Portable_Interceptors/Bug_3079/test_i.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "test_i.h"
 
-ACE_RCSID (Redirection,
-           test_i,
-           "$Id$")
-
 test_i::test_i (CORBA::Short num,
                 CORBA::ORB_ptr orb)
   : number_ (num),
diff --git a/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp
index 8390121b3b2..ba1070b0cd5 100644
--- a/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Client_ORBInitializer.h"
 
-ACE_RCSID (Redirection,
-           Client_ORBInitializer,
-           "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "Client_Request_Interceptor.h"
diff --git a/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp b/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
index a1644b2892d..e0c6aaeedea 100644
--- a/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
+++ b/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
@@ -1,13 +1,10 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Client_Request_Interceptor.h"
 #include "testC.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Redirection,
-           Client_Request_Interceptor,
-           "$Id$")
-
 Client_Request_Interceptor::Client_Request_Interceptor (void)
   : request_count_ (0),
     receive_exception_count_ (0)
diff --git a/tests/Portable_Interceptors/Bug_3080/Makefile.am b/tests/Portable_Interceptors/Bug_3080/Makefile.am
deleted file mode 100644
index 706ee4dec6a..00000000000
--- a/tests/Portable_Interceptors/Bug_3080/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_3080_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Bug_3080_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  Client_Request_Interceptor.cpp \
-  client.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  Client_Request_Interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Bug_3080_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Portable_Interceptors/Bug_3080/client.cpp b/tests/Portable_Interceptors/Bug_3080/client.cpp
index c6ed9e61acf..488ff0e88f1 100644
--- a/tests/Portable_Interceptors/Bug_3080/client.cpp
+++ b/tests/Portable_Interceptors/Bug_3080/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "testC.h"
@@ -6,10 +7,6 @@
 #include "Client_Request_Interceptor.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Redirection,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior1 = 0;
 
 int
diff --git a/tests/Portable_Interceptors/Bug_3080/server.cpp b/tests/Portable_Interceptors/Bug_3080/server.cpp
index 733e167e137..2f461dd4d16 100644
--- a/tests/Portable_Interceptors/Bug_3080/server.cpp
+++ b/tests/Portable_Interceptors/Bug_3080/server.cpp
@@ -1,13 +1,10 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "test_i.h"
 
-ACE_RCSID (Redirection,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_file = 0;
 
 int
diff --git a/tests/Portable_Interceptors/Bug_3080/test_i.cpp b/tests/Portable_Interceptors/Bug_3080/test_i.cpp
index 189b2447c94..a845f0270e1 100644
--- a/tests/Portable_Interceptors/Bug_3080/test_i.cpp
+++ b/tests/Portable_Interceptors/Bug_3080/test_i.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "test_i.h"
 
-ACE_RCSID (Redirection,
-           test_i,
-           "$Id$")
-
 test_i::test_i (CORBA::Short num,
                 CORBA::ORB_ptr orb)
   : number_ (num),
diff --git a/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp
index f42b8ca4578..15b949a6996 100644
--- a/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Client_ORBInitializer.h"
 
-ACE_RCSID (Redirection,
-           Client_ORBInitializer,
-           "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "Client_Request_Interceptor.h"
diff --git a/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp b/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
index 2db30bce0d9..df6b2fa9a8f 100644
--- a/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
+++ b/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Client_Request_Interceptor.h"
 #include "testC.h"
@@ -6,10 +7,6 @@
 
 extern bool interceptor_invoked;
 
-ACE_RCSID (Redirection,
-           Client_Request_Interceptor,
-           "$Id$")
-
 Client_Request_Interceptor::Client_Request_Interceptor (
   const char *orb_id,
   const char *forward_str)
@@ -63,8 +60,8 @@ Client_Request_Interceptor::receive_exception (
                                   this->orb_id_.in ());
   }
 
-  ACE_DEBUG ((LM_DEBUG, 
-              "Client_Request_Interceptor::receive_exception (%s)\n", 
+  ACE_DEBUG ((LM_DEBUG,
+              "Client_Request_Interceptor::receive_exception (%s)\n",
               ri->received_exception_id ()));
 
   if (ACE_OS::strcmp (ri->received_exception_id (),
diff --git a/tests/Portable_Interceptors/Bug_3582/client.cpp b/tests/Portable_Interceptors/Bug_3582/client.cpp
index ffa6087e66d..31689d1c388 100644
--- a/tests/Portable_Interceptors/Bug_3582/client.cpp
+++ b/tests/Portable_Interceptors/Bug_3582/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
@@ -6,10 +7,6 @@
 #include "Client_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Redirection,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior1 = 0;
 bool interceptor_invoked = false;
 
diff --git a/tests/Portable_Interceptors/Bug_3582/server.cpp b/tests/Portable_Interceptors/Bug_3582/server.cpp
index ec367253e1c..a849a628e61 100644
--- a/tests/Portable_Interceptors/Bug_3582/server.cpp
+++ b/tests/Portable_Interceptors/Bug_3582/server.cpp
@@ -1,13 +1,10 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Redirection,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_file = 0;
 int number = 0;
 
diff --git a/tests/Portable_Interceptors/Bug_3582/test.idl b/tests/Portable_Interceptors/Bug_3582/test.idl
index 1332b6d98b2..4eaa929ca10 100644
--- a/tests/Portable_Interceptors/Bug_3582/test.idl
+++ b/tests/Portable_Interceptors/Bug_3582/test.idl
@@ -8,7 +8,7 @@ module RTTest
   interface test
   {
     /// Return the number assigned to the current object.  For
-    /// example, object one will return "1," 
+    /// example, object one will return "1,"
     short number ();
 
     oneway void shutdown ();
diff --git a/tests/Portable_Interceptors/Bug_3582/test_i.cpp b/tests/Portable_Interceptors/Bug_3582/test_i.cpp
index 189b2447c94..a845f0270e1 100644
--- a/tests/Portable_Interceptors/Bug_3582/test_i.cpp
+++ b/tests/Portable_Interceptors/Bug_3582/test_i.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "test_i.h"
 
-ACE_RCSID (Redirection,
-           test_i,
-           "$Id$")
-
 test_i::test_i (CORBA::Short num,
                 CORBA::ORB_ptr orb)
   : number_ (num),
diff --git a/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
index 0447b0286f6..c9fb4b2e48d 100644
--- a/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
+++ b/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
@@ -1,13 +1,9 @@
-//
 // $Id$
-//
 
 #include "Client_Task.h"
 #include "testC.h"
 #include "interceptors.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (const ACE_TCHAR *ior,
                           CORBA::ORB_ptr corb,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
index 45692c0f273..0c8b1be11c7 100644
--- a/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
+++ b/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
@@ -34,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         // This is a hack but that is okay!
         return 0;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am b/tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am
deleted file mode 100644
index 8b649c336ce..00000000000
--- a/tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am
+++ /dev/null
@@ -1,93 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.PI_Dynamic_Collocated.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocated_Test
-
-Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Echo_Collocated_ORBInitializer.cpp \
-  Server_Task.cpp \
-  interceptors.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Client_Task.h \
-  Echo_Collocated_ORBInitializer.h \
-  Server_Task.h \
-  interceptors.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
index 3af152af5d4..ffaf78aae2c 100644
--- a/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
+++ b/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
@@ -1,17 +1,11 @@
-//
 // $Id$
-//
+
 #include "Server_Task.h"
 #include "test_i.h"
 #include "interceptors.h"
 
 #include "ace/Manual_Event.h"
 
-ACE_RCSID(Collocated_Test,
-          Server_Task,
-          "$Id$")
-
-
 Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
diff --git a/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
index 15fe176cc47..751f151c6bd 100644
--- a/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
+++ b/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
@@ -7,10 +7,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Dynamic,
-           interceptors,
-           "$Id$")
-
 const char *request_msg = "The Echo_Request_Interceptor request message";
 const char *reply_msg = "The Echo_Request_Interceptor reply message";
 CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0;
diff --git a/tests/Portable_Interceptors/Collocated/Dynamic/test.idl b/tests/Portable_Interceptors/Collocated/Dynamic/test.idl
index 8671f9b0a97..0a4f15fdac5 100644
--- a/tests/Portable_Interceptors/Collocated/Dynamic/test.idl
+++ b/tests/Portable_Interceptors/Collocated/Dynamic/test.idl
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Portable_Interceptors
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//   Simple IDL file to test portable interceptor support.
-//
-// = AUTHORS
-//   Nanbor Wang <nanbor@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    test.idl
+ *
+ *  $Id$
+ *
+ * Simple IDL file to test portable interceptor support.
+ *
+ *
+ *  @author Nanbor Wang <nanbor@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 module Test_Interceptors
 {
diff --git a/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
index 85cddd874d7..32a4e3ba0e2 100644
--- a/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
+++ b/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
@@ -3,8 +3,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Dynamic, test_i, "$Id$")
-
 Visual_i::Visual_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h b/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
index 2ccfe475b5f..96d6a044e67 100644
--- a/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
+++ b/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
@@ -1,31 +1,31 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Portable_Interceptors/Dynamic
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Nanbor Wang
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Nanbor Wang
+ */
+//=============================================================================
+
 
 #ifndef TAO_INTERCEPTOR_TEST_I_H
 #define TAO_INTERCEPTOR_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Visual_i
+ *
+ * Implements the Visual interface in test.idl
+ */
 class Visual_i : public POA_Test_Interceptors::Visual
 {
-  // = DESCRIPTION
-  //   Implements the Visual interface in test.idl
 
 public:
+  /// ctor
   Visual_i (CORBA::ORB_ptr orb);
-  // ctor
 
   void normal (CORBA::Long arg);
 
@@ -40,8 +40,8 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB pointer (for shutdown.)
   CORBA::ORB_var orb_;
-  // The ORB pointer (for shutdown.)
 };
 
 #endif /* TAO_INTERCEPTOR_TEST_I_H */
diff --git a/tests/Portable_Interceptors/Collocated/Makefile.am b/tests/Portable_Interceptors/Collocated/Makefile.am
deleted file mode 100644
index 18a11126170..00000000000
--- a/tests/Portable_Interceptors/Collocated/Makefile.am
+++ /dev/null
@@ -1,14 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Dynamic \
-        Service_Context_Manipulation
-
diff --git a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
index 99e8953ecb4..2fe57c77168 100644
--- a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
+++ b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
@@ -1,12 +1,8 @@
-//
 // $Id$
-//
 
 #include "Client_Task.h"
 #include "testC.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (const ACE_TCHAR *ior,
         CORBA::ORB_ptr corb,
         ACE_Thread_Manager *thr_mgr)
diff --git a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
index bdf94ffd6fd..234f16075d1 100644
--- a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
+++ b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
@@ -36,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         // This is a hack but that is okay!
         return 0;
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am
deleted file mode 100644
index d0fb67169a1..00000000000
--- a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am
+++ /dev/null
@@ -1,93 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.PI_Svc_Context_Manip_Collocated.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = collocated
-
-collocated_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-collocated_SOURCES = \
-  Client_Task.cpp \
-  Collocated_ORBInitializer.cpp \
-  Collocated_Test.cpp \
-  Server_Task.cpp \
-  interceptors.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Client_Task.h \
-  Collocated_ORBInitializer.h \
-  Server_Task.h \
-  interceptors.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-collocated_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
index 430eec2ee3d..117d516b577 100644
--- a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
+++ b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
@@ -5,10 +5,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Service_Context_Manipulation,
-           interceptors,
-           "$Id$")
-
 const IOP::ServiceId service_id = 0xdeadbeef;
 const char *request_msg = "The Echo_Request_Interceptor request message";
 const char *reply_msg = "The Echo_Request_Interceptor reply message";
diff --git a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl
index e9ed51b50c7..d49c6f7aa1a 100644
--- a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl
+++ b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//    Simple IDL file to test collocated portable interceptor support.
-//
-// = AUTHORS
-//    Nanbor Wang <nanbor@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    test.idl
+ *
+ *  $Id$
+ *
+ *  Simple IDL file to test collocated portable interceptor support.
+ *
+ *
+ *  @author Nanbor Wang <nanbor@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 module Test_Interceptors
 {
diff --git a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
index a1a35158494..c10682c5c68 100644
--- a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
+++ b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
@@ -2,11 +2,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID (Service_Context_Manipulation,
-           test_i,
-           "$Id$")
-
-
 Visual_i::Visual_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
index 2235181a86d..2cf11a1ff5f 100644
--- a/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
-//
 // $Id$
 
 #include "Echo_Client_ORBInitializer.h"
 
-ACE_RCSID (Dynamic, Echo_Client_ORBInitializer, "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "client_interceptor.h"
diff --git a/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
index b701542cab6..c5beae64d34 100644
--- a/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
-//
 // $Id$
 
 #include "Echo_Server_ORBInitializer.h"
 
-ACE_RCSID (Dynamic, Echo_Server_ORBInitializer, "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "server_interceptor.h"
diff --git a/tests/Portable_Interceptors/Dynamic/Makefile.am b/tests/Portable_Interceptors/Dynamic/Makefile.am
deleted file mode 100644
index d72731bd5c1..00000000000
--- a/tests/Portable_Interceptors/Dynamic/Makefile.am
+++ /dev/null
@@ -1,122 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_Dynamic_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_Dynamic_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Echo_Client_ORBInitializer.cpp \
-  client.cpp \
-  client_interceptor.cpp \
-  testC.cpp \
-  Echo_Client_ORBInitializer.h \
-  client_interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_Dynamic_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Echo_Server_ORBInitializer.cpp \
-  server.cpp \
-  server_interceptor.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Echo_Server_ORBInitializer.h \
-  server_interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Dynamic/client.cpp b/tests/Portable_Interceptors/Dynamic/client.cpp
index 00965c0617f..99e23771bf3 100644
--- a/tests/Portable_Interceptors/Dynamic/client.cpp
+++ b/tests/Portable_Interceptors/Dynamic/client.cpp
@@ -7,10 +7,6 @@
 
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Dynamic,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
index 082e29a7826..33fb5fbb16c 100644
--- a/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+++ b/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
@@ -10,10 +10,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Dynamic,
-           client_interceptor,
-           "$Id$")
-
 Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void)
   : myname_ ("Echo_Client_Interceptor")
 {
@@ -36,8 +32,7 @@ Echo_Client_Request_Interceptor::destroy (void)
 
 void
 Echo_Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    )
+    PortableInterceptor::ClientRequestInfo_ptr)
 {
   // Do nothing
 }
diff --git a/tests/Portable_Interceptors/Dynamic/server.cpp b/tests/Portable_Interceptors/Dynamic/server.cpp
index b06e09a630f..a6d7bc75836 100644
--- a/tests/Portable_Interceptors/Dynamic/server.cpp
+++ b/tests/Portable_Interceptors/Dynamic/server.cpp
@@ -7,10 +7,6 @@
 
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Dynamic,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -34,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
index 0fe10e2a3c3..5d0e7659b91 100644
--- a/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
+++ b/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
@@ -10,10 +10,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Dynamic,
-           server_interceptor,
-           "$Id$")
-
 Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
   : myname_ ("Echo_Server_Interceptor")
 {
diff --git a/tests/Portable_Interceptors/Dynamic/test.idl b/tests/Portable_Interceptors/Dynamic/test.idl
index e46baae1473..a5be699d716 100644
--- a/tests/Portable_Interceptors/Dynamic/test.idl
+++ b/tests/Portable_Interceptors/Dynamic/test.idl
@@ -46,7 +46,7 @@ module Test_Interceptors
 
     /// Normal operation with a return val.
     long calculate (in long one, in long two);
-    
+
     readonly attribute VarLenStruct the_structure;
 
     /// Throws a user exception.
diff --git a/tests/Portable_Interceptors/Dynamic/test_i.cpp b/tests/Portable_Interceptors/Dynamic/test_i.cpp
index b0f36f70bc2..83e6eba0c99 100644
--- a/tests/Portable_Interceptors/Dynamic/test_i.cpp
+++ b/tests/Portable_Interceptors/Dynamic/test_i.cpp
@@ -2,10 +2,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID (Dynamic,
-           test_i,
-           "$Id$")
-
 Visual_i::Visual_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
index e09717bbe6a..fa8404d8845 100644
--- a/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Client_ORBInitializer.h"
 
-ACE_RCSID (ForwardRequest,
-           Client_ORBInitializer,
-           "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "Client_Request_Interceptor.h"
diff --git a/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
index 3a23d0d6b9e..17e904ccc91 100644
--- a/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
+++ b/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
@@ -1,14 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Client_Request_Interceptor.h"
 #include "testC.h"
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ForwardRequest,
-           Client_Request_Interceptor,
-           "$Id$")
-
 Client_Request_Interceptor::Client_Request_Interceptor (
   const char *orb_id,
   const char *forward_str)
diff --git a/tests/Portable_Interceptors/ForwardRequest/Makefile.am b/tests/Portable_Interceptors/ForwardRequest/Makefile.am
deleted file mode 100644
index 10fa24b2481..00000000000
--- a/tests/Portable_Interceptors/ForwardRequest/Makefile.am
+++ /dev/null
@@ -1,126 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_ForwardRequest_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_ForwardRequest_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  Client_Request_Interceptor.cpp \
-  client.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  Client_Request_Interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_ForwardRequest_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
index f6503aca183..8409a93a337 100644
--- a/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_ORBInitializer.h"
 
-ACE_RCSID (ForwardRequest,
-           Server_ORBInitializer,
-           "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "Server_Request_Interceptor.h"
diff --git a/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
index b4380b6ef67..5a82e33c4d5 100644
--- a/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
+++ b/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
@@ -1,14 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "Server_Request_Interceptor.h"
 #include "tao/ORB_Constants.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ForwardRequest,
-           Server_Request_Interceptor,
-           "$Id$")
-
 Server_Request_Interceptor::Server_Request_Interceptor (void)
   : request_count_ (0)
 {
@@ -125,7 +122,7 @@ Server_Request_Interceptor::receive_request (
                   "SERVER (%P|%t) OBJ_NOT_EXIST exception thrown for request %d\n"
                   "SERVER (%P|%t) via receive_request().\n",
                   this->request_count_ - 2));
-      
+
       throw CORBA::OBJECT_NOT_EXIST (
         CORBA::SystemException::_tao_minor_code (
           TAO::VMCID,
diff --git a/tests/Portable_Interceptors/ForwardRequest/client.cpp b/tests/Portable_Interceptors/ForwardRequest/client.cpp
index 67cb50aa9c3..c9b39bd45c2 100644
--- a/tests/Portable_Interceptors/ForwardRequest/client.cpp
+++ b/tests/Portable_Interceptors/ForwardRequest/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 
@@ -7,10 +8,6 @@
 
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (ForwardRequest,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior1 = 0;
 const ACE_TCHAR *ior2 = 0;
 
diff --git a/tests/Portable_Interceptors/ForwardRequest/server.cpp b/tests/Portable_Interceptors/ForwardRequest/server.cpp
index 11ad5a24e17..d8cba77f51c 100644
--- a/tests/Portable_Interceptors/ForwardRequest/server.cpp
+++ b/tests/Portable_Interceptors/ForwardRequest/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 
@@ -10,10 +11,6 @@
 #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (ForwardRequest,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior1_file = 0;
 const ACE_TCHAR *ior2_file = 0;
 
diff --git a/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
index b25a7d02ce9..a845f0270e1 100644
--- a/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
+++ b/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "test_i.h"
 
-ACE_RCSID (ForwardRequest,
-           test_i,
-           "$Id$")
-
 test_i::test_i (CORBA::Short num,
                 CORBA::ORB_ptr orb)
   : number_ (num),
diff --git a/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
index 8da5481a2ec..04dfd2feb5b 100644
--- a/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+++ b/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "FOO_ClientRequestInterceptor.h"
 #include "testC.h"
 
@@ -5,11 +7,6 @@
 
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 
-ACE_RCSID (IORInterceptor,
-           FOO_ClientRequestInterceptor,
-           "$Id$")
-
-
 FOO_ClientRequestInterceptor::FOO_ClientRequestInterceptor (
   IOP::Codec_ptr codec)
   : codec_ (IOP::Codec::_duplicate (codec))
diff --git a/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
index 0200be0375c..cfc99735237 100644
--- a/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
@@ -1,14 +1,11 @@
+// $Id$
+
 #include "FOO_Client_ORBInitializer.h"
 #include "FOO_ClientRequestInterceptor.h"
 
 #include "tao/ORB_Constants.h"
 #include "tao/CodecFactory/CodecFactory.h"
 
-ACE_RCSID (IORInterceptor,
-           FOO_Client_ORBInitializer,
-           "$Id$")
-
-
 void
 FOO_Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
diff --git a/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
index bf9838c0ae4..ebe19cd21e7 100644
--- a/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
+++ b/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
@@ -1,13 +1,10 @@
+// $Id$
+
 #include "FOO_IORInterceptor.h"
 #include "testS.h"
 
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (IORInterceptor,
-           FOO_IORInterceptor,
-           "$Id$")
-
-
 FOO_IORInterceptor::FOO_IORInterceptor (IOP::Codec_ptr codec)
   : codec_ (IOP::Codec::_duplicate (codec))
 {
diff --git a/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
index 95d3c5babce..450ce02d48f 100644
--- a/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "FOO_IORInterceptor_ORBInitializer.h"
 #include "FOO_IORInterceptor.h"
@@ -6,10 +7,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/CodecFactory/CodecFactory.h"
 
-ACE_RCSID (IORInterceptor,
-           FOO_IORInterceptor_ORBInitializer,
-           "$Id$")
-
 void
 FOO_IORInterceptor_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
diff --git a/tests/Portable_Interceptors/IORInterceptor/Makefile.am b/tests/Portable_Interceptors/IORInterceptor/Makefile.am
deleted file mode 100644
index 253a7ef1254..00000000000
--- a/tests/Portable_Interceptors/IORInterceptor/Makefile.am
+++ /dev/null
@@ -1,124 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_IORInterceptor_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_IORInterceptor_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  FOO_ClientRequestInterceptor.cpp \
-  FOO_Client_ORBInitializer.cpp \
-  client.cpp \
-  testC.cpp \
-  FOO_ClientRequestInterceptor.h \
-  FOO_Client_ORBInitializer.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_IORInterceptor_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  FOO_IORInterceptor.cpp \
-  FOO_IORInterceptor_ORBInitializer.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  FOO_IORInterceptor.h \
-  FOO_IORInterceptor_ORBInitializer.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/IORInterceptor/client.cpp b/tests/Portable_Interceptors/IORInterceptor/client.cpp
index 3d9a5422dd9..9f5ca72f8d4 100644
--- a/tests/Portable_Interceptors/IORInterceptor/client.cpp
+++ b/tests/Portable_Interceptors/IORInterceptor/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 
@@ -7,10 +8,6 @@
 
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (IORInterceptor,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/tests/Portable_Interceptors/IORInterceptor/server.cpp b/tests/Portable_Interceptors/IORInterceptor/server.cpp
index 67047eecc7a..0b2b3ba607a 100644
--- a/tests/Portable_Interceptors/IORInterceptor/server.cpp
+++ b/tests/Portable_Interceptors/IORInterceptor/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 
@@ -8,10 +9,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (IORInterceptor,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -35,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
index 058e6335a3d..904570bb020 100644
--- a/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
+++ b/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "test_i.h"
 
-ACE_RCSID (IORInterceptors,
-           test_i,
-           "$Id$")
-
 test_i::test_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Portable_Interceptors/Makefile.am b/tests/Portable_Interceptors/Makefile.am
deleted file mode 100644
index 4d9f7debe66..00000000000
--- a/tests/Portable_Interceptors/Makefile.am
+++ /dev/null
@@ -1,37 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AMI \
-        AdvSlot \
-        AdvSlotDblCpy \
-        AdvSlotExt \
-        Benchmark \
-        Bug_1559 \
-        Bug_2088 \
-        Bug_2133 \
-        Bug_2510_Regression \
-        Bug_3079 \
-        Bug_3080 \
-        Collocated \
-        Dynamic \
-        ForwardRequest \
-        IORInterceptor \
-        ORB_Shutdown \
-        PICurrent \
-        PolicyFactory \
-        Processing_Mode_Policy \
-        Recursive_ORBInitializer \
-        Redirection \
-        Register_Initial_References \
-        Request_Interceptor_Flow \
-        Service_Context_Manipulation \
-        Slot
-
diff --git a/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am b/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am
deleted file mode 100644
index 25bb70cdab4..00000000000
--- a/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am
+++ /dev/null
@@ -1,117 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_ORB_Shutdown_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_ORB_Shutdown_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_ORB_Shutdown_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
index 2e52e0adeb6..c248a50c45a 100644
--- a/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_ORBInitializer.h"
 
-ACE_RCSID (ForwardRequest,
-           Server_ORBInitializer,
-           "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "Server_Request_Interceptor.h"
diff --git a/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp b/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
index a78dc678b9b..500f2c85eaf 100644
--- a/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
+++ b/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
@@ -1,11 +1,8 @@
-#include "Server_Request_Interceptor.h"
+// $Id$
 
+#include "Server_Request_Interceptor.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ORB_Shutdown,
-           Server_Request_Interceptor,
-           "$Id$")
-
 Server_Request_Interceptor::Server_Request_Interceptor (bool & destroy_called)
   : destroy_called_ (destroy_called)
 {
diff --git a/tests/Portable_Interceptors/ORB_Shutdown/client.cpp b/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
index 68bde6ac847..fd849a1bac8 100644
--- a/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
+++ b/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
@@ -1,15 +1,9 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
-
 #include "testC.h"
 
-
-ACE_RCSID (ORB_Shutdown,
-           client,
-           "$Id$")
-
-
 const ACE_TCHAR *ior = 0;
 
 int
diff --git a/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
index f50727cbfed..b17ddaded1d 100644
--- a/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
+++ b/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
@@ -1,18 +1,13 @@
-#include "ace/Get_Opt.h"
+// $Id$
 
+#include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "Server_ORBInitializer.h"
 #include "Server_Request_Interceptor.h"
-
 #include "tao/ORBInitializer_Registry.h"
 #include "ace/OS_NS_stdio.h"
 
 
-ACE_RCSID (ORB_Shutdown,
-           server,
-           "$Id$")
-
-
 const ACE_TCHAR *ior_file = 0;
 
 int
diff --git a/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp b/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
index ea019951879..3467c5b3390 100644
--- a/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
+++ b/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
@@ -1,10 +1,6 @@
-#include "test_i.h"
-
-
-ACE_RCSID (ORB_Shutdown,
-           test_i,
-           "$Id$")
+// $Id$
 
+#include "test_i.h"
 
 test_i::test_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp b/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
index f07af1f187a..507ac2ac517 100644
--- a/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
+++ b/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ClientORBInitializer.h"
 #include "ClientRequestInterceptor.h"
@@ -7,14 +8,8 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (PICurrent,
-           ClientORBInitializer,
-           "$Id$")
-
-
 PortableInterceptor::SlotId slot_id = 2093843211;
 
-
 void
 ClientORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
diff --git a/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp b/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
index 69042d4326f..5f402b7bdd5 100644
--- a/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
+++ b/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
@@ -1,16 +1,10 @@
-#include "ClientRequestInterceptor.h"
+// $Id$
 
+#include "ClientRequestInterceptor.h"
 #include "tao/CORBA_String.h"
-
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (PICurrent,
-           ClientRequestInterceptor,
-           "$Id$")
-
-
 ClientRequestInterceptor::ClientRequestInterceptor (
   PortableInterceptor::SlotId id,
   PortableInterceptor::Current_ptr pi_current)
diff --git a/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp b/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
index 0dd2ae70fc0..0761a907fcc 100644
--- a/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
+++ b/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
@@ -1,15 +1,10 @@
-#include "ClientRequestInterceptor2.h"
+// $Id$
 
+#include "ClientRequestInterceptor2.h"
 #include "tao/CORBA_String.h"
-
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (PICurrent,
-           ClientRequestInterceptor2,
-           "$Id$")
-
-
 ClientRequestInterceptor2::ClientRequestInterceptor2 (
   PortableInterceptor::SlotId id)
   : slot_id_ (id)
diff --git a/tests/Portable_Interceptors/PICurrent/Makefile.am b/tests/Portable_Interceptors/PICurrent/Makefile.am
deleted file mode 100644
index 624eb21d818..00000000000
--- a/tests/Portable_Interceptors/PICurrent/Makefile.am
+++ /dev/null
@@ -1,124 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_PICurrent_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_PICurrent_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  ClientORBInitializer.cpp \
-  ClientRequestInterceptor.cpp \
-  client.cpp \
-  testC.cpp \
-  ClientORBInitializer.h \
-  ClientRequestInterceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_PICurrent_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  ClientRequestInterceptor2.cpp \
-  ServerORBInitializer.cpp \
-  ServerRequestInterceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  ClientRequestInterceptor2.h \
-  ServerORBInitializer.h \
-  ServerRequestInterceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
index 0de620070ef..65217fc799f 100644
--- a/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
+++ b/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerORBInitializer.h"
 #include "ServerRequestInterceptor.h"
@@ -6,10 +7,6 @@
 #include "tao/PI/ORBInitInfo.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (PICurrent,
-           ServerORBInitializer,
-           "$Id$")
-
 PortableInterceptor::SlotId slot_id = 2093843221;
 
 void
diff --git a/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
index 0c5ac6f0ffc..396f088cc6e 100644
--- a/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
+++ b/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
@@ -1,16 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequestInterceptor.h"
-
 #include "tao/CORBA_String.h"
-
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (PICurrent,
-           ServerRequestInterceptor,
-           "$Id$")
-
 ServerRequestInterceptor::ServerRequestInterceptor (
   PortableInterceptor::SlotId id,
   PortableInterceptor::Current_ptr pi_current)
diff --git a/tests/Portable_Interceptors/PICurrent/client.cpp b/tests/Portable_Interceptors/PICurrent/client.cpp
index 38702e83179..d4891c53162 100644
--- a/tests/Portable_Interceptors/PICurrent/client.cpp
+++ b/tests/Portable_Interceptors/PICurrent/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
@@ -9,10 +10,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/PI/PI.h"
 
-ACE_RCSID (PICurrent,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/tests/Portable_Interceptors/PICurrent/server.cpp b/tests/Portable_Interceptors/PICurrent/server.cpp
index d3d15dd887b..c7b4b946957 100644
--- a/tests/Portable_Interceptors/PICurrent/server.cpp
+++ b/tests/Portable_Interceptors/PICurrent/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
@@ -11,10 +12,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (PICurrent,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 extern PortableInterceptor::SlotId slot_id;
@@ -68,7 +65,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                        argv[0]),
                       -1);
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/PICurrent/test_i.cpp b/tests/Portable_Interceptors/PICurrent/test_i.cpp
index 8237b777dcf..b2b72b018a4 100644
--- a/tests/Portable_Interceptors/PICurrent/test_i.cpp
+++ b/tests/Portable_Interceptors/PICurrent/test_i.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "test_i.h"
 
-ACE_RCSID (PICurrent,
-           test_i,
-           "$Id$")
-
 test_i::test_i (PortableInterceptor::Current_ptr current,
                 PortableInterceptor::SlotId id,
                 CORBA::ORB_ptr orb)
diff --git a/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
index 37e62f127da..4f3a65687d3 100644
--- a/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
+++ b/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
@@ -1,12 +1,8 @@
+// $Id$
+
 #include "IORInterceptor.h"
 #include "testC.h"
 
-
-ACE_RCSID (PolicyFactory,
-           IORInterceptor,
-           "$Id$")
-
-
 IORInterceptor::IORInterceptor (void)
   : success_ (false)
 {
diff --git a/tests/Portable_Interceptors/PolicyFactory/Makefile.am b/tests/Portable_Interceptors/PolicyFactory/Makefile.am
deleted file mode 100644
index eaffbc39f4e..00000000000
--- a/tests/Portable_Interceptors/PolicyFactory/Makefile.am
+++ /dev/null
@@ -1,90 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.PI_PolicyFactory_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  IORInterceptor.cpp \
-  Policy.cpp \
-  PolicyFactory.cpp \
-  Server_ORBInitializer.cpp \
-  server.cpp \
-  testC.cpp \
-  IORInterceptor.h \
-  Policy.h \
-  PolicyFactory.h \
-  Server_ORBInitializer.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/PolicyFactory/Policy.cpp b/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
index 6351d93f35a..1c048efbcbc 100644
--- a/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
+++ b/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
@@ -5,11 +5,6 @@
 #include "tao/SystemException.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (PolicyFactory,
-           Policy,
-           "$Id$")
-
-
 Policy::Policy (CORBA::ULong val)
   : value_ (val)
 {
diff --git a/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp b/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
index 4e90c443045..1d60d5a2e41 100644
--- a/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
+++ b/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
@@ -3,11 +3,6 @@
 #include "PolicyFactory.h"
 #include "Policy.h"
 
-ACE_RCSID (PolicyFactory,
-           PolicyFactory,
-           "$Id$")
-
-
 CORBA::Policy_ptr
 PolicyFactory::create_policy (CORBA::PolicyType type,
                               const CORBA::Any & value)
diff --git a/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
index c0ec2c8b751..450419eaac7 100644
--- a/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_ORBInitializer.h"
 #include "IORInterceptor.h"
@@ -9,12 +10,6 @@
 
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (PolicyFactory,
-           Server_ORBInitializer,
-           "$Id$")
-
-
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
diff --git a/tests/Portable_Interceptors/PolicyFactory/server.cpp b/tests/Portable_Interceptors/PolicyFactory/server.cpp
index 2ec075eee22..307332238dc 100644
--- a/tests/Portable_Interceptors/PolicyFactory/server.cpp
+++ b/tests/Portable_Interceptors/PolicyFactory/server.cpp
@@ -1,17 +1,12 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_ORBInitializer.h"
-
 #include "tao/ORBInitializer_Registry.h"
 #include "testC.h"
-
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (PolicyFactory,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
index 94bc8630a56..c6c5c380e07 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
@@ -1,13 +1,9 @@
-//
 // $Id$
-//
 
 #include "Client_Task.h"
 #include "testC.h"
 #include "interceptors.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (const ACE_TCHAR *ior,
                           CORBA::ORB_ptr corb,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
index 01e78ae2b96..034ca0322bb 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
@@ -47,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
        return 0;
       }
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am
deleted file mode 100644
index 3326661306f..00000000000
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am
+++ /dev/null
@@ -1,93 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.PI_ProcMode_Collocated_Collocated.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = PI_ProcMode_Collocated_Test
-
-PI_ProcMode_Collocated_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-PI_ProcMode_Collocated_Test_SOURCES = \
-  Client_Task.cpp \
-  Collocated_Test.cpp \
-  Echo_Collocated_ORBInitializer.cpp \
-  Server_Task.cpp \
-  interceptors.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Client_Task.h \
-  Echo_Collocated_ORBInitializer.h \
-  Server_Task.h \
-  interceptors.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-PI_ProcMode_Collocated_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
index 3af152af5d4..ffaf78aae2c 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
@@ -1,17 +1,11 @@
-//
 // $Id$
-//
+
 #include "Server_Task.h"
 #include "test_i.h"
 #include "interceptors.h"
 
 #include "ace/Manual_Event.h"
 
-ACE_RCSID(Collocated_Test,
-          Server_Task,
-          "$Id$")
-
-
 Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
index 20bbdf1918b..adde10c09d5 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
@@ -9,10 +9,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Dynamic,
-           interceptors,
-           "$Id$")
-
 const char *request_msg = "The Echo_Request_Interceptor request message";
 const char *reply_msg = "The Echo_Request_Interceptor reply message";
 CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0;
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test.idl b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test.idl
index 07ed4dee088..2447f44442e 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test.idl
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test.idl
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Portable_Interceptors
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//   Simple IDL file to test portable interceptor support.
-//
-// = AUTHORS
-//   Nanbor Wang <nanbor@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    test.idl
+ *
+ *  $Id$
+ *
+ * Simple IDL file to test portable interceptor support.
+ *
+ *
+ *  @author Nanbor Wang <nanbor@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 module Test_Interceptors
 {
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
index 547a8c5366c..4fe8eb0d837 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
@@ -3,8 +3,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Dynamic, test_i, "$Id$")
-
 Visual_i::Visual_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
index 2ccfe475b5f..96d6a044e67 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
@@ -1,31 +1,31 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Portable_Interceptors/Dynamic
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Nanbor Wang
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Nanbor Wang
+ */
+//=============================================================================
+
 
 #ifndef TAO_INTERCEPTOR_TEST_I_H
 #define TAO_INTERCEPTOR_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Visual_i
+ *
+ * Implements the Visual interface in test.idl
+ */
 class Visual_i : public POA_Test_Interceptors::Visual
 {
-  // = DESCRIPTION
-  //   Implements the Visual interface in test.idl
 
 public:
+  /// ctor
   Visual_i (CORBA::ORB_ptr orb);
-  // ctor
 
   void normal (CORBA::Long arg);
 
@@ -40,8 +40,8 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB pointer (for shutdown.)
   CORBA::ORB_var orb_;
-  // The ORB pointer (for shutdown.)
 };
 
 #endif /* TAO_INTERCEPTOR_TEST_I_H */
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am b/tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am
deleted file mode 100644
index 40e67c75e8c..00000000000
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am
+++ /dev/null
@@ -1,14 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Collocated \
-        Remote
-
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
index be36b6f1750..c6c56772cfb 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
@@ -1,13 +1,9 @@
-//
 // $Id$
-//
 
 #include "Client_Task.h"
 #include "testC.h"
 #include "client_interceptor.h"
 
-ACE_RCSID(Remote, Client_Task, "$Id$")
-
 Client_Task::Client_Task (const ACE_TCHAR *ior,
                           CORBA::ORB_ptr corb,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am
deleted file mode 100644
index 8380d73a2d1..00000000000
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am
+++ /dev/null
@@ -1,127 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_ProcMode_Remote_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_ProcMode_Remote_RemoteServer.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += PI_ProcMode_Remote_TestServer
-
-PI_ProcMode_Remote_TestServer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-PI_ProcMode_Remote_TestServer_SOURCES = \
-  Echo_Server_ORBInitializer.cpp \
-  Server_Task.cpp \
-  server_interceptor.cpp \
-  server_main.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Echo_Server_ORBInitializer.h \
-  Server_Task.h \
-  server_interceptor.h \
-  test_i.h
-
-PI_ProcMode_Remote_TestServer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_ProcMode_Remote_RemoteClient.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += PI_ProcMode_Remote_TestClient
-
-PI_ProcMode_Remote_TestClient_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-PI_ProcMode_Remote_TestClient_SOURCES = \
-  Client_Task.cpp \
-  Echo_Client_ORBInitializer.cpp \
-  client_interceptor.cpp \
-  client_main.cpp \
-  testC.cpp \
-  Client_Task.h \
-  Echo_Client_ORBInitializer.h \
-  client_interceptor.h
-
-PI_ProcMode_Remote_TestClient_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
index 665c2de1d60..b658317741e 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
@@ -1,17 +1,11 @@
-//
 // $Id$
-//
+
 #include "Server_Task.h"
 #include "test_i.h"
 #include "server_interceptor.h"
 
 #include "ace/Manual_Event.h"
 
-ACE_RCSID(Remote,
-          Server_Task,
-          "$Id$")
-
-
 Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
index 36af24c0c16..a094b78f209 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
@@ -7,10 +7,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Remote,
-           client_interceptor,
-           "$Id$")
-
 const char *request_msg = "The Echo_Client_Request_Interceptor request message";
 const char *reply_msg = "The Echo_Client_Request_Interceptor reply message";
 CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0;
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
index cab19179fe0..765508c93d2 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
        return 0;
       }
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
index 887a95d23fb..d50d028ec06 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
@@ -7,10 +7,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Remote,
-           server_interceptor,
-           "$Id$")
-
 const char *request_msg = "The Echo_Server_Request_Interceptor request message";
 const char *reply_msg = "The Echo_Server_Request_Interceptor reply message";
 CORBA::ULong Echo_Server_Request_Interceptor::server_interceptor_check_ = 0;
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
index 716b81cfaf3..afc44b481dd 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
        return 0;
       }
   }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test.idl b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test.idl
index 07ed4dee088..2447f44442e 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test.idl
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test.idl
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Portable_Interceptors
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//   Simple IDL file to test portable interceptor support.
-//
-// = AUTHORS
-//   Nanbor Wang <nanbor@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    test.idl
+ *
+ *  $Id$
+ *
+ * Simple IDL file to test portable interceptor support.
+ *
+ *
+ *  @author Nanbor Wang <nanbor@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 module Test_Interceptors
 {
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
index af6f50de15c..86c82f814ed 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
@@ -2,8 +2,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID(Remote, test_i, "$Id$")
-
 Visual_i::Visual_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
index 2ccfe475b5f..96d6a044e67 100644
--- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
+++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
@@ -1,31 +1,31 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Portable_Interceptors/Dynamic
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Nanbor Wang
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Nanbor Wang
+ */
+//=============================================================================
+
 
 #ifndef TAO_INTERCEPTOR_TEST_I_H
 #define TAO_INTERCEPTOR_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Visual_i
+ *
+ * Implements the Visual interface in test.idl
+ */
 class Visual_i : public POA_Test_Interceptors::Visual
 {
-  // = DESCRIPTION
-  //   Implements the Visual interface in test.idl
 
 public:
+  /// ctor
   Visual_i (CORBA::ORB_ptr orb);
-  // ctor
 
   void normal (CORBA::Long arg);
 
@@ -40,8 +40,8 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB pointer (for shutdown.)
   CORBA::ORB_var orb_;
-  // The ORB pointer (for shutdown.)
 };
 
 #endif /* TAO_INTERCEPTOR_TEST_I_H */
diff --git a/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp
index b5a7b63a0c4..281bba57562 100644
--- a/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp
@@ -6,10 +6,6 @@
 #include "Client_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Recursive_ORBInitializer,
-           Client_ORBInitializer,
-           "$Id$")
-
 Client_ORBInitializer::Client_ORBInitializer (Client_ORBInitializer *second) :
   pre_init_called (0),
   post_init_called (0),
diff --git a/tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am b/tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am
deleted file mode 100644
index bffd8a890b0..00000000000
--- a/tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am
+++ /dev/null
@@ -1,51 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Register_ORBInitializer_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  client.cpp \
-  Client_ORBInitializer.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp b/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
index 3541d3d65d5..247c131a64f 100644
--- a/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
+++ b/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
@@ -3,10 +3,6 @@
 #include "Client_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID(Recursive_ORBInitializer,
-          client,
-          "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
index f42b8ca4578..15b949a6996 100644
--- a/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Client_ORBInitializer.h"
 
-ACE_RCSID (Redirection,
-           Client_ORBInitializer,
-           "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "Client_Request_Interceptor.h"
diff --git a/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp b/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
index f088670f29b..11dd4f09a45 100644
--- a/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
+++ b/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
@@ -1,13 +1,10 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Client_Request_Interceptor.h"
 #include "testC.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Redirection,
-           Client_Request_Interceptor,
-           "$Id$")
-
 Client_Request_Interceptor::Client_Request_Interceptor (
   const char *orb_id,
   const char *forward_str)
diff --git a/tests/Portable_Interceptors/Redirection/Makefile.am b/tests/Portable_Interceptors/Redirection/Makefile.am
deleted file mode 100644
index a2cf5a0efd0..00000000000
--- a/tests/Portable_Interceptors/Redirection/Makefile.am
+++ /dev/null
@@ -1,128 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_Redirection_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_Redirection_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  Client_Request_Interceptor.cpp \
-  client.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  Client_Request_Interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_Redirection_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  CrashPoint.cpp \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  CrashPoint.h \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
index 33fb284f0c2..8a83f147441 100644
--- a/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_ORBInitializer.h"
 
-ACE_RCSID (Redirection,
-           Server_ORBInitializer,
-           "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "Server_Request_Interceptor.h"
diff --git a/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
index 3123772c7cb..52449966d7f 100644
--- a/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
+++ b/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
@@ -1,14 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_Request_Interceptor.h"
 #include "tao/ORB_Constants.h"
 #include "ace/Log_Msg.h"
 #include "CrashPoint.h"
 
-ACE_RCSID (Redirection,
-           Server_Request_Interceptor,
-           "$Id$")
-
 Server_Request_Interceptor::Server_Request_Interceptor (void)
   : request_count_ (0)
 {
diff --git a/tests/Portable_Interceptors/Redirection/client.cpp b/tests/Portable_Interceptors/Redirection/client.cpp
index 0c591bae70d..be64cb15b69 100644
--- a/tests/Portable_Interceptors/Redirection/client.cpp
+++ b/tests/Portable_Interceptors/Redirection/client.cpp
@@ -1,14 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "testC.h"
 #include "Client_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Redirection,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior1 = 0;
 const ACE_TCHAR *ior2 = 0;
 
diff --git a/tests/Portable_Interceptors/Redirection/server.cpp b/tests/Portable_Interceptors/Redirection/server.cpp
index 695300311be..48dd464b76d 100644
--- a/tests/Portable_Interceptors/Redirection/server.cpp
+++ b/tests/Portable_Interceptors/Redirection/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
@@ -8,10 +9,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "CrashPoint.h"
 
-ACE_RCSID (Redirection,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_file = 0;
 int number = 0;
 
diff --git a/tests/Portable_Interceptors/Redirection/test_i.cpp b/tests/Portable_Interceptors/Redirection/test_i.cpp
index 189b2447c94..a845f0270e1 100644
--- a/tests/Portable_Interceptors/Redirection/test_i.cpp
+++ b/tests/Portable_Interceptors/Redirection/test_i.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "test_i.h"
 
-ACE_RCSID (Redirection,
-           test_i,
-           "$Id$")
-
 test_i::test_i (CORBA::Short num,
                 CORBA::ORB_ptr orb)
   : number_ (num),
diff --git a/tests/Portable_Interceptors/Register_Initial_References/Makefile.am b/tests/Portable_Interceptors/Register_Initial_References/Makefile.am
deleted file mode 100644
index d2fb9f169ed..00000000000
--- a/tests/Portable_Interceptors/Register_Initial_References/Makefile.am
+++ /dev/null
@@ -1,86 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Register_ORBInitializer_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
index 64a56d5719b..0998a5aac00 100644
--- a/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
@@ -1,17 +1,11 @@
 // -*- C++ -*-
-//
 // $Id$
-//
 
 #include "Server_ORBInitializer.h"
 #include "test_i.h"
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (Recursive_ORBInitializer,
-           Server_ORBInitializer,
-           "$Id$")
-
 Server_ORBInitializer::Server_ORBInitializer (void)
 {
 }
diff --git a/tests/Portable_Interceptors/Register_Initial_References/server.cpp b/tests/Portable_Interceptors/Register_Initial_References/server.cpp
index 98853ebc269..55f9b3710d8 100644
--- a/tests/Portable_Interceptors/Register_Initial_References/server.cpp
+++ b/tests/Portable_Interceptors/Register_Initial_References/server.cpp
@@ -4,11 +4,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "test_i.h"
 
-ACE_RCSID(Recursive_ORBInitializer,
-          server,
-          "$Id$")
-
-
 int test_orb (CORBA::ORB_ptr orb)
 {
   int errors = 0;
diff --git a/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp b/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
index 9f1c4e44e7a..34a4258e7b0 100644
--- a/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
+++ b/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "test_i.h"
 
-ACE_RCSID (Register_Initial_References,
-           test_i,
-           "$Id$")
-
 test_i::test_i (void)
 {
 }
diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
index 7409c0021dc..78e66358303 100644
--- a/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
@@ -1,16 +1,10 @@
-#include "Client_ORBInitializer.h"
-
-ACE_RCSID (Request_Interceptor_Flow,
-           Client_ORBInitializer,
-           "$Id$")
-
+// $Id$
 
+#include "Client_ORBInitializer.h"
 #include "tao/Exception.h"
 #include "tao/ORB_Constants.h"
-
 #include "Client_Request_Interceptor.h"
 
-
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
index 107e2209a7b..19da555bfb0 100644
--- a/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
+++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Client_Request_Interceptor.h"
 #include "testC.h"
@@ -7,10 +8,6 @@
 #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Request_Interceptor_Flow,
-           Client_Request_Interceptor,
-           "$Id$")
-
 Client_Request_Interceptor::Client_Request_Interceptor (const char *name)
   : Request_Interceptor (name)
 {
diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am b/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am
deleted file mode 100644
index 64f048a5f71..00000000000
--- a/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am
+++ /dev/null
@@ -1,126 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_Request_Interceptor_Flow_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_Request_Interceptor_Flow_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  Client_Request_Interceptor.cpp \
-  Request_Interceptor.cpp \
-  client.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  Client_Request_Interceptor.h \
-  Request_Interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_Request_Interceptor_Flow_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Request_Interceptor.cpp \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Request_Interceptor.h \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
index df1b2742754..f91aeea4748 100644
--- a/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
+++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Request_Interceptor.h"
 
-ACE_RCSID (Request_Interceptor_Flow,
-           Request_Interceptor,
-           "$Id$")
-
 Request_Interceptor::Request_Interceptor (const char *name)
   : name_ (name),
     starting_interception_point_count_ (0),
diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
index fdaedb584cc..18520006375 100644
--- a/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
@@ -1,12 +1,8 @@
-#include "Server_ORBInitializer.h"
-
-ACE_RCSID (Request_Interceptor_Flow,
-           Server_ORBInitializer,
-           "$Id$")
+// $Id$
 
+#include "Server_ORBInitializer.h"
 #include "tao/Exception.h"
 #include "tao/ORB_Constants.h"
-
 #include "Server_Request_Interceptor.h"
 
 void
diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
index 349f9c5def0..d47d16aeb08 100644
--- a/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
+++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
@@ -1,16 +1,10 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_Request_Interceptor.h"
-
-ACE_RCSID (Request_Interceptor_Flow,
-           Server_Request_Interceptor,
-           "$Id$")
-
 #include "testC.h"
-
 #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
 #include "tao/AnyTypeCode/TypeCode.h"
-
 #include "ace/OS_NS_string.h"
 
 Server_Request_Interceptor::Server_Request_Interceptor (const char *name)
diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
index bc18fba7e18..2a2ac4e7b73 100644
--- a/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
+++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 
@@ -7,10 +8,6 @@
 
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Request_Interceptor_Flow,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = 0;
 
 int
diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
index 07ae27a8a99..023ad932f4a 100644
--- a/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
+++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
@@ -1,16 +1,12 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "Server_ORBInitializer.h"
-
 #include "tao/ORBInitializer_Registry.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Request_Interceptor_Flow,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_file = 0;
 
 int
diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
index 6eddcc6653c..519ffd3319c 100644
--- a/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
+++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "test_i.h"
 
-ACE_RCSID (Request_Interceptor_Flow,
-           test_i,
-           "$Id$")
-
 test_i::test_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
index 2a0776226f0..45170534be6 100644
--- a/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
@@ -6,8 +6,6 @@
 #include "Client_ORBInitializer.h"
 #include "client_interceptor.h"
 
-ACE_RCSID (Service_Context_Manipulation, Client_ORBInitializer, "$Id$")
-
 Client_ORBInitializer::Client_ORBInitializer (void)
 {
 }
diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am b/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am
deleted file mode 100644
index d0c56adfb37..00000000000
--- a/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am
+++ /dev/null
@@ -1,122 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PI_Svc_Context_Manip_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PI_Svc_Context_Manip_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  client.cpp \
-  client_interceptor.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  client_interceptor.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.PI_Svc_Context_Manip_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_ORBInitializer.cpp \
-  server.cpp \
-  server_interceptor.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_ORBInitializer.h \
-  server_interceptor.h \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
index 03a51a1c2e0..ad369d2b7ed 100644
--- a/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
+++ b/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
@@ -6,8 +6,6 @@
 #include "Server_ORBInitializer.h"
 #include "server_interceptor.h"
 
-ACE_RCSID (Service_Context_Manipulation, Server_ORBInitializer, "$Id$")
-
 Server_ORBInitializer::Server_ORBInitializer (void)
 {
 }
diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
index 9f6fb5660ef..13d6cfb232c 100644
--- a/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
+++ b/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
@@ -6,8 +6,6 @@
 
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID(Interceptors, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp b/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
index 2a2db026aa7..8dbf21a741a 100644
--- a/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
+++ b/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
@@ -6,10 +6,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Service_Context_Manipulation,
-           interceptors,
-           "$Id$")
-
 const IOP::ServiceId service_id = 0xdeadbeef;
 const char *request_msg = "The Echo_Request_Interceptor request message";
 const char *reply_msg = "The Echo_Request_Interceptor reply message";
diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
index f22ac303516..5891af15597 100644
--- a/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
+++ b/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
@@ -7,10 +7,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Service_Context_Manipulation,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -34,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp b/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
index 07fa8d7031c..c6d15ecfdb6 100644
--- a/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
+++ b/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
@@ -6,10 +6,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Service_Context_Manipulation,
-           server_interceptor,
-           "$Id$")
-
 const IOP::ServiceId service_id = 0xdeadbeef;
 const char *request_msg = "The Echo_Request_Interceptor request message";
 const char *reply_msg = "The Echo_Request_Interceptor reply message";
diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/test.idl b/tests/Portable_Interceptors/Service_Context_Manipulation/test.idl
index 79a06a14351..2e858b32098 100644
--- a/tests/Portable_Interceptors/Service_Context_Manipulation/test.idl
+++ b/tests/Portable_Interceptors/Service_Context_Manipulation/test.idl
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Interceptors
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//   Simple IDL file to test portable interceptor support.
-//
-// = AUTHORS
-//   Nanbor Wang <nanbor@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    test.idl
+ *
+ *  $Id$
+ *
+ * Simple IDL file to test portable interceptor support.
+ *
+ *
+ *  @author Nanbor Wang <nanbor@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 module Test_Interceptors
 {
diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp b/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
index 0d201962ba4..75d61f3827e 100644
--- a/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
+++ b/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
@@ -2,11 +2,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID (Service_Context_Manipulation,
-           test_i,
-           "$Id$")
-
-
 Visual_i::Visual_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Portable_Interceptors/Slot/Makefile.am b/tests/Portable_Interceptors/Slot/Makefile.am
deleted file mode 100644
index 5e0d16c1a6d..00000000000
--- a/tests/Portable_Interceptors/Slot/Makefile.am
+++ /dev/null
@@ -1,51 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.PI_Slot_Driver.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS = driver
-
-driver_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-driver_SOURCES = \
-  driver.cpp
-
-driver_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_INTERCEPTORS
-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/tests/Portable_Interceptors/Slot/driver.cpp b/tests/Portable_Interceptors/Slot/driver.cpp
index 49e82ac6077..aa24db1e945 100644
--- a/tests/Portable_Interceptors/Slot/driver.cpp
+++ b/tests/Portable_Interceptors/Slot/driver.cpp
@@ -1,6 +1,5 @@
-// file      : Slot/driver.cpp
 // author    : Boris Kolpackov <boris@kolpackov.net>
-// cvs-id    : $Id$
+// $Id$
 
 #include "tao/PI/PI.h"
 #include "tao/LocalObject.h"
@@ -57,10 +56,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     orb->destroy ();
   }
   catch (PortableInterceptor::InvalidSlot const&)
-  {
-    ACE_ERROR ((LM_ERROR, "ERROR: Caught InvalidSlot exception.\n"));
-    return 1;
-  }
+    {
+      ACE_ERROR ((LM_ERROR, "ERROR: Caught InvalidSlot exception.\n"));
+      return 1;
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
 
   return 0;
 }
diff --git a/tests/QtTests/Makefile.am b/tests/QtTests/Makefile.am
deleted file mode 100644
index 06fa5c967c8..00000000000
--- a/tests/QtTests/Makefile.am
+++ /dev/null
@@ -1,178 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.QtTests_Server.am
-
-if BUILD_ACE_QTREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_QT
-if BUILD_TAO_QTRESOURCE
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  test_i_moc.cpp
-
-CLEANFILES += \
-  test_i_moc.cpp
-
-test_i_moc.cpp: $(srcdir)/test_i.h
-	$(QTDIR)/bin/moc  $(srcdir)/test_i.h -o test_i_moc.cpp
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_QT_CPPFLAGS)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i_moc.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h
-
-server_LDFLAGS = \
- $(ACE_QT_LDFLAGS)
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_QtResource.la \
-  $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_QT_LIBS)
-
-endif BUILD_TAO_QTRESOURCE
-endif BUILD_QT
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_QTREACTOR
-
-## Makefile.QtTests_Client.am
-
-if BUILD_ACE_QTREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_QT
-if BUILD_TAO_QTRESOURCE
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  client_moc.cpp
-
-CLEANFILES += \
-  client_moc.cpp
-
-client_moc.cpp: $(srcdir)/client.h
-	$(QTDIR)/bin/moc  $(srcdir)/client.h -o client_moc.cpp
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_QT_CPPFLAGS)
-
-client_SOURCES = \
-  client.cpp \
-  client_moc.cpp \
-  testC.cpp \
-  client.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_LDFLAGS = \
- $(ACE_QT_LDFLAGS)
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_QtResource.la \
-  $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_QT_LIBS)
-
-endif BUILD_TAO_QTRESOURCE
-endif BUILD_QT
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_QTREACTOR
-
-## 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/tests/QtTests/QtTests.mpc b/tests/QtTests/QtTests.mpc
index 95dad19f581..5805f452dcd 100644
--- a/tests/QtTests/QtTests.mpc
+++ b/tests/QtTests/QtTests.mpc
@@ -1,10 +1,10 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoserver, tao_qtresource  {
+project(*server): taoserver, tao_qtresource, ace_qt4  {
 
   MOC_Files {
-    test_i.h
+   test_i.h
   }
 
   Source_Files {
@@ -14,7 +14,7 @@ project(*server): taoserver, tao_qtresource  {
   }
 }
 
-project(*client): taoclient, anytypecode, tao_qtresource {
+project(*client): taoclient, anytypecode, tao_qtresource, ace_qt4 {
   after += *server
 
   MOC_Files {
diff --git a/tests/QtTests/client.cpp b/tests/QtTests/client.cpp
index 9f91969b420..d4f549290d7 100644
--- a/tests/QtTests/client.cpp
+++ b/tests/QtTests/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "tao/QtResource/QtResource_Loader.h"
 
-ACE_RCSID(QtTests, client, "$Id$")
-
 #include "client.h"
 
 int
@@ -29,7 +27,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // This may look a bit suspect, but Qt wants the manager widget
       // as the toplevel widget unlike Xt for display purposes.
-      app.setMainWidget (&(client.box_));
+      app.setActiveWindow (&(client.mainwindow_));
 
       // Show them on Screen
       client.show ();
@@ -98,12 +96,13 @@ void
 Client::create_widgets (/**/)
 {
   // Ewsize the box
-  this->box_.resize (200,120);
+  this->mainwindow_.resize (200,120);
+  this->mainwindow_.setWindowTitle("QtClient");
 
   // Make a pushbutton widget
   ACE_NEW (this->push_button_,
-           QPushButton ("Quit",
-                        &this->box_));
+           QPushButton ("Quit"));
+  box_.addWidget(this->push_button_);
 
   // Connect the click () SIGNAL routine with the SLOT handler that we
   // have defined
@@ -114,14 +113,15 @@ Client::create_widgets (/**/)
 
   // Create a slider widget
   ACE_NEW (this->slider_,
-           QSlider (QSlider::Horizontal,
-                    &this->box_,
-                    "Slider"));
+           QSlider (Qt::Horizontal));
 
   // Add resource for the slider
   this->slider_->setRange (0, 99);
   this->slider_->setValue (0);
 
+  box_.addWidget(this->slider_);
+
+
   // Connect the valuechanged SIGNAL routine with the slot that we
   // have defined. THe slot routine would invoke the remote call.
   QObject::connect (this->slider_,
@@ -129,12 +129,15 @@ Client::create_widgets (/**/)
                     this,
                     SLOT (remote_call (int)));
 
+  this->mainwindow_.setLayout(&box_);
+
+
 }
 
 void
 Client::show (void)
 {
-  this->box_.show ();
+  this->mainwindow_.show ();
 }
 
 void
diff --git a/tests/QtTests/client.h b/tests/QtTests/client.h
index fedef24e6d1..e37ff4485b1 100644
--- a/tests/QtTests/client.h
+++ b/tests/QtTests/client.h
@@ -1,65 +1,63 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Xt_Stopwatch/Stopwatch_client
-//
-// = FILENAME
-//   client.h
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   client.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _QT_CLIENT_H
 #define _QT_CLIENT_H
 
 #include "testC.h"
 
-#include <qapplication.h>
-#include <qvbox.h>
-#include <qslider.h>
-#include <qpushbutton.h>
+#include <QtGui/qapplication.h>
+#include <QtGui/qboxlayout.h>
+#include <QtGui/qslider.h>
+#include <QtGui/qpushbutton.h>
 
 class Client : public QObject
 {
   Q_OBJECT
 public:
 
+  /// ctor
   Client (CORBA::ORB_ptr orb,
           QApplication &app);
-  // ctor
 
+  ///Dtor..
   ~Client (void);
-  //Dtor..
 
+  /// Adds the callbacks to the GUI underneath.....
   void create_widgets (void);
-  // Adds the callbacks to the GUI underneath.....
 
   void show (void);
 
   void parse_args (int argc, ACE_TCHAR *argv[]);
 
-  QVBox box_;
-  // A box widget..
+  /// A box widget..
+  QHBoxLayout box_;
+  QWidget mainwindow_;
 
  public slots:
+   /// Two slot handlers for the two widgets that we have
    void remote_call (int val);
    void shutdown_call (void);
-   // Two slot handlers for the two widgets that we have
 
 private:
 
+  /// A push button
   QPushButton *push_button_;
-  // A push button
 
+  /// A slider widget
   QSlider *slider_;
-  // A slider widget
 
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
   LCD_Display_var server_;
 
diff --git a/tests/QtTests/server.cpp b/tests/QtTests/server.cpp
index 7c7817eb715..6552506e4b8 100644
--- a/tests/QtTests/server.cpp
+++ b/tests/QtTests/server.cpp
@@ -3,16 +3,14 @@
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (QtTests, server, "$Id$")
-
 // who defines index macro?
 #ifdef index
 #undef index
 #endif
 #include "tao/QtResource/QtResource_Loader.h"
-#include <qlcdnumber.h>
-#include <qvbox.h>
-#include <qslider.h>
+#include <QtGui/qlcdnumber.h>
+#include <QtGui/qboxlayout.h>
+#include <QtGui/qslider.h>
 #include "ace/OS_NS_stdio.h"
 
 
@@ -42,7 +40,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 //                            argv [0]),
 //                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -89,10 +87,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         LCD_Display::_narrow (object.in ());
 
       // Create the LCD after the QVbox is created.
-      QVBox box;
+      QWidget mainwindow_;
+      mainwindow_.resize (145, 100);
+      mainwindow_.setWindowTitle("QtServer");
 
-      box.resize (145, 100);
-      QLCDNumber lcd (2, &box, "lcd_display");
+      QVBoxLayout *box = new QVBoxLayout();
+      QLCDNumber lcd (2);
+      box->addWidget(&lcd);
 
       // Connect the signal from the hosted servant with the public
       // SLOT method display () for the LCD Widget.
@@ -102,8 +103,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                         &lcd,
                         SLOT (display (int)));
 
-      app.setMainWidget(&box);
-      box.show ();
+      mainwindow_.setLayout(box);
+      app.setActiveWindow(&(mainwindow_));
+      mainwindow_.show ();
 
       // End of QT specific stuff..
 
diff --git a/tests/QtTests/test.idl b/tests/QtTests/test.idl
index 1dc08b44be6..d65cc24720a 100644
--- a/tests/QtTests/test.idl
+++ b/tests/QtTests/test.idl
@@ -3,7 +3,7 @@
 interface LCD_Display
 {
   void send_val (in long val);
-  // Remote method through which the 
+  // Remote method through which the
   // slider sets the value of the lcd display
 
   void shutdown ();
diff --git a/tests/QtTests/test_i.cpp b/tests/QtTests/test_i.cpp
index 7ce6cc05e7d..745b65dc513 100644
--- a/tests/QtTests/test_i.cpp
+++ b/tests/QtTests/test_i.cpp
@@ -2,10 +2,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID( QtTests,
-           test_i,
-           "$Id$")
-
 LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb)
 
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/tests/QtTests/test_i.h b/tests/QtTests/test_i.h
index f1d517adfa8..193e6e5655e 100644
--- a/tests/QtTests/test_i.h
+++ b/tests/QtTests/test_i.h
@@ -1,36 +1,35 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/QtTests
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Bala Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Bala Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _QT_TEST_I_H
 #define _QT_TEST_I_H
 
 #include "testS.h"
 
-#include <qapplication.h>
-#include <qobject.h>
+#include <QtGui/qapplication.h>
+#include <QtCore/qobject.h>
 
 class LCD_Display_imp : public QObject,
                         public POA_LCD_Display
 
 {
+  /**
+   * = TITLE
+   *   LCD_Display implementation class
+   *
+   * = DESCRIPTION
+   *   Implements the LCD_Display interface in test.idl
+   *
+   */
   Q_OBJECT
-  // = TITLE
-  //   LCD_Display implementation class
-  //
-  // = DESCRIPTION
-  //   Implements the LCD_Display interface in test.idl
-  //
 public:
   LCD_Display_imp (CORBA::ORB_ptr);
 
@@ -44,8 +43,8 @@ public:
   void set_value (int val);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #endif /* SERVER_TEST_I_H */
diff --git a/tests/Queued_Message_Test/Makefile.am b/tests/Queued_Message_Test/Makefile.am
deleted file mode 100644
index f7e4ca76e66..00000000000
--- a/tests/Queued_Message_Test/Makefile.am
+++ /dev/null
@@ -1,44 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Queued_Message_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Queued_Message_Test
-
-Queued_Message_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Queued_Message_Test_SOURCES = \
-  Queued_Message_Test.cpp
-
-Queued_Message_Test_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/tests/Queued_Message_Test/Queued_Message_Test.cpp b/tests/Queued_Message_Test/Queued_Message_Test.cpp
index 3a557a0c78e..e9cfc0daf8b 100644
--- a/tests/Queued_Message_Test/Queued_Message_Test.cpp
+++ b/tests/Queued_Message_Test/Queued_Message_Test.cpp
@@ -17,10 +17,6 @@
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_stdlib.h"
 
-ACE_RCSID (tests,
-           Queued_Message_Test,
-           "$Id$")
-
 /// Max number of bytes on each message block
 const size_t max_block_length = 256;
 
diff --git a/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am b/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am
deleted file mode 100644
index 12ef647cef0..00000000000
--- a/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.AO_Multiple_ORBs.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  test.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/RTCORBA/Banded_Connections/Makefile.am b/tests/RTCORBA/Banded_Connections/Makefile.am
deleted file mode 100644
index d6e46e184cf..00000000000
--- a/tests/RTCORBA/Banded_Connections/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Banded_Conn_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Banded_Conn_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Banded_Conn_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Banded_Connections/svc.conf b/tests/RTCORBA/Banded_Connections/svc.conf
index 2154375e265..e92d9e0da74 100644
--- a/tests/RTCORBA/Banded_Connections/svc.conf
+++ b/tests/RTCORBA/Banded_Connections/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # No options required for regular testing
 
 # For real-time testing, uncomment the following line:
diff --git a/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp b/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp
index 86416ddadde..cc6f1339fc7 100644
--- a/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp
+++ b/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp
@@ -6,8 +6,6 @@
 #include "Client_ORBInitializer.h"
 #include "interceptors.h"
 
-ACE_RCSID (Client_Propagated, Client_ORBInitializer, "$Id$")
-
 Client_ORBInitializer::Client_ORBInitializer (void)
 {
 }
diff --git a/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp b/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
index f0e7c5e1797..e455ac9af81 100644
--- a/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
+++ b/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
@@ -4,10 +4,6 @@
 #include "tao/OctetSeqC.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Client_Propagated,
-           interceptors,
-           "$Id$")
-
 Client_Request_Interceptor::
 Client_Request_Interceptor (const char *id)
   : myname_ ("Client_Request_Interceptor"),
diff --git a/tests/RTCORBA/Bug_3382_Regression/svc.conf b/tests/RTCORBA/Bug_3382_Regression/svc.conf
index 6ba8bde66ff..4e5bbb07102 100644
--- a/tests/RTCORBA/Bug_3382_Regression/svc.conf
+++ b/tests/RTCORBA/Bug_3382_Regression/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # No options required for regular testing
 # I've followed the pattern of other real time tests here - basically the client / server part of this
 # test is a no-op (as are they) unless you *do* modify this file.
diff --git a/tests/RTCORBA/Bug_3643_Regression/client.cpp b/tests/RTCORBA/Bug_3643_Regression/client.cpp
index d578c7336b4..0901e47d1c7 100644
--- a/tests/RTCORBA/Bug_3643_Regression/client.cpp
+++ b/tests/RTCORBA/Bug_3643_Regression/client.cpp
@@ -8,8 +8,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID(Thread_Pool, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://ior_1");
 int iterations = 1000;
 int shutdown_server = 0;
@@ -69,7 +67,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/RTCORBA/Bug_3643_Regression/run_test.pl b/tests/RTCORBA/Bug_3643_Regression/run_test.pl
index d51b5d263d5..89fb6d384b9 100755
--- a/tests/RTCORBA/Bug_3643_Regression/run_test.pl
+++ b/tests/RTCORBA/Bug_3643_Regression/run_test.pl
@@ -15,15 +15,15 @@ $number_of_clients = 4;
 $status = 0;
 $continuous = ($^O eq 'hpux');
 
-@configurations = 
+@configurations =
     ({
-        file => "ior_1", 
+        file => "ior_1",
         description => "Invoking methods on servant in default thread pool",
      },{
-        file => "ior_2", 
+        file => "ior_2",
         description => "Invoking methods on servant in first RT thread pool (without lanes)",
      },{
-        file => "ior_3", 
+        file => "ior_3",
         description => "Invoking methods on servant in second RT thread pool (with lanes)",
      },
      );
@@ -38,7 +38,7 @@ sub run_clients
     my @parms = @_;
     $arg = $parms[0];
     $clients = $parms[1];
-    
+
 
     for ($i = 0; $i < $clients; $i++) {
         $CL[$i] = $client->CreateProcess ("client", $arg);
@@ -72,7 +72,7 @@ for $test (@configurations) {
             # Mark as no longer running to avoid errors on exit.
             $SV->{RUNNING} = 0;
             exit $status;
-        } 
+        }
         else {
             print STDERR "ERROR: cannot find ior file: $test->{file}\n";
             $status = 1;
@@ -85,7 +85,7 @@ for $test (@configurations) {
     print STDERR "\n*************************************************************\n";
     print STDERR "$test->{description}\n";
     print STDERR "*************************************************************\n\n";
-      
+
     $iorfile = $client->LocalFile ($test->{file});
     run_clients ("-k file://$iorfile", $number_of_clients);
     print STDERR "Prepare next cycle";
diff --git a/tests/RTCORBA/Bug_3643_Regression/server.cpp b/tests/RTCORBA/Bug_3643_Regression/server.cpp
index 96745267fb2..a2562a1baf5 100644
--- a/tests/RTCORBA/Bug_3643_Regression/server.cpp
+++ b/tests/RTCORBA/Bug_3643_Regression/server.cpp
@@ -8,8 +8,6 @@
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "../check_supported_priorities.cpp"
 
-ACE_RCSID(Thread_Pool, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 int ior_count = 1;
 CORBA::ULong static_threads = 1;
@@ -53,7 +51,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -67,7 +65,7 @@ write_ior_to_file (CORBA::ORB_ptr orb,
   char filename[BUFSIZ];
   ACE_OS::sprintf (filename,
                    "%s_%d",
-                   ior_output_file,
+                   ACE_TEXT_ALWAYS_CHAR (ior_output_file),
                    ior_count++);
 
   FILE *output_file =
diff --git a/tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic b/tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic
index c288d674567..8b03973b4b9 100644
--- a/tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic
+++ b/tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic
@@ -1 +1,3 @@
+# $Id$
+
 static RT_ORB_Loader "-RTORBDynamicThreadIdleTimeout 1000000"
diff --git a/tests/RTCORBA/Bug_3643_Regression/test_i.cpp b/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
index 3fec3b5fbf6..93cf9c3939a 100644
--- a/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
+++ b/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
@@ -5,8 +5,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/RTCORBA/Thread_Pool.h"
 
-ACE_RCSID(Thread_Pools, test_i, "$Id$")
-
 test_i::test_i (CORBA::ORB_ptr orb,
                 PortableServer::POA_ptr poa,
                 long msec_sleep)
diff --git a/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
index 86416ddadde..cc6f1339fc7 100644
--- a/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
+++ b/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
@@ -6,8 +6,6 @@
 #include "Client_ORBInitializer.h"
 #include "interceptors.h"
 
-ACE_RCSID (Client_Propagated, Client_ORBInitializer, "$Id$")
-
 Client_ORBInitializer::Client_ORBInitializer (void)
 {
 }
diff --git a/tests/RTCORBA/Client_Propagated/Makefile.am b/tests/RTCORBA/Client_Propagated/Makefile.am
deleted file mode 100644
index 3157c972f23..00000000000
--- a/tests/RTCORBA/Client_Propagated/Makefile.am
+++ /dev/null
@@ -1,122 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Client_Propagated_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Client_Propagated_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_ORBInitializer.cpp \
-  client.cpp \
-  interceptors.cpp \
-  testC.cpp \
-  Client_ORBInitializer.h \
-  interceptors.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Client_Propagated_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  Client_ORBInitializer.h \
-  interceptors.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Client_Propagated/interceptors.cpp b/tests/RTCORBA/Client_Propagated/interceptors.cpp
index f0e7c5e1797..e455ac9af81 100644
--- a/tests/RTCORBA/Client_Propagated/interceptors.cpp
+++ b/tests/RTCORBA/Client_Propagated/interceptors.cpp
@@ -4,10 +4,6 @@
 #include "tao/OctetSeqC.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Client_Propagated,
-           interceptors,
-           "$Id$")
-
 Client_Request_Interceptor::
 Client_Request_Interceptor (const char *id)
   : myname_ ("Client_Request_Interceptor"),
diff --git a/tests/RTCORBA/Client_Propagated/svc.conf b/tests/RTCORBA/Client_Propagated/svc.conf
index 2154375e265..e92d9e0da74 100644
--- a/tests/RTCORBA/Client_Propagated/svc.conf
+++ b/tests/RTCORBA/Client_Propagated/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # No options required for regular testing
 
 # For real-time testing, uncomment the following line:
diff --git a/tests/RTCORBA/Client_Protocol/Makefile.am b/tests/RTCORBA/Client_Protocol/Makefile.am
deleted file mode 100644
index b1db2831849..00000000000
--- a/tests/RTCORBA/Client_Protocol/Makefile.am
+++ /dev/null
@@ -1,116 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Client_Protocol_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Client_Protocol_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Client_Protocol_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Client_Protocol/svc.conf b/tests/RTCORBA/Client_Protocol/svc.conf
index 16b29a6e009..b99bdeffc67 100644
--- a/tests/RTCORBA/Client_Protocol/svc.conf
+++ b/tests/RTCORBA/Client_Protocol/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # Options for SHMIOP protocol
 static SHMIOP_Factory "-MMAPFilePrefix server_shmiop"
 
diff --git a/tests/RTCORBA/Collocation/Collocation.cpp b/tests/RTCORBA/Collocation/Collocation.cpp
index 3d362683281..aaf702561a0 100644
--- a/tests/RTCORBA/Collocation/Collocation.cpp
+++ b/tests/RTCORBA/Collocation/Collocation.cpp
@@ -9,8 +9,6 @@
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "../check_supported_priorities.cpp"
 
-ACE_RCSID(Collocations, Collocations, "$Id$")
-
 RTCORBA::Priority default_thread_priority;
 
 class test_i;
diff --git a/tests/RTCORBA/Collocation/Makefile.am b/tests/RTCORBA/Collocation/Makefile.am
deleted file mode 100644
index 9ac1a07742a..00000000000
--- a/tests/RTCORBA/Collocation/Makefile.am
+++ /dev/null
@@ -1,84 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RTCORBA_Collocation_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = Collocation
-
-Collocation_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Collocation_SOURCES = \
-  Collocation.cpp \
-  testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-Collocation_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Collocation/continuous.conf b/tests/RTCORBA/Collocation/continuous.conf
index 8d8795f4817..fd95de5142e 100644
--- a/tests/RTCORBA/Collocation/continuous.conf
+++ b/tests/RTCORBA/Collocation/continuous.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 # Option for platforms where direct mapping doesn't work
 static RT_ORB_Loader "-ORBPriorityMapping continuous"
diff --git a/tests/RTCORBA/Collocation/svc.conf b/tests/RTCORBA/Collocation/svc.conf
index 2154375e265..e92d9e0da74 100644
--- a/tests/RTCORBA/Collocation/svc.conf
+++ b/tests/RTCORBA/Collocation/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # No options required for regular testing
 
 # For real-time testing, uncomment the following line:
diff --git a/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
index 27dce42812b..1db92e716ab 100644
--- a/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
+++ b/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
@@ -5,8 +5,6 @@
 #include "tao/RTCORBA/RTCORBA.h"
 #include "../check_supported_priorities.cpp"
 
-ACE_RCSID(Destroy_Thread_Pools, Destroy_Thread_Pools, "$Id$")
-
 static CORBA::ULong stacksize = 0;
 static CORBA::ULong static_threads = 1;
 static CORBA::ULong dynamic_threads = 0;
diff --git a/tests/RTCORBA/Destroy_Thread_Pool/Makefile.am b/tests/RTCORBA/Destroy_Thread_Pool/Makefile.am
deleted file mode 100644
index 0244903c9e5..00000000000
--- a/tests/RTCORBA/Destroy_Thread_Pool/Makefile.am
+++ /dev/null
@@ -1,52 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RTCORBA_Destroy_Thread_Pool_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS = Destroy_Thread_Pool
-
-Destroy_Thread_Pool_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Destroy_Thread_Pool_SOURCES = \
-  Destroy_Thread_Pool.cpp
-
-Destroy_Thread_Pool_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf b/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf
index 8d8795f4817..fd95de5142e 100644
--- a/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf
+++ b/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 # Option for platforms where direct mapping doesn't work
 static RT_ORB_Loader "-ORBPriorityMapping continuous"
diff --git a/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp b/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
index bb503a6728f..155d0516de5 100644
--- a/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
+++ b/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
@@ -4,10 +4,6 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Strategies,
-           Custom_Network_Priority_Mapping,
-           "$Id$")
-
 #define IPDSFIELD_DSCP_DEFAULT  0x00
 #define IPDSFIELD_DSCP_CS1      0x08
 #define IPDSFIELD_DSCP_CS2      0x10
diff --git a/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h b/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h
index fac5d84a433..cfdcb226bee 100644
--- a/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h
+++ b/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Custom_Network_Priority_Mapping.h
-//
-// = DESCRIPTION
-//   Declares the Custom_Network_Priority_Mapping interface,
-//
-// = AUTHOR
-//   Yamuna Krishnamurthy (yamuna@oomworks.com)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Custom_Network_Priority_Mapping.h
+ *
+ *  $Id$
+ *
+ * Declares the Custom_Network_Priority_Mapping interface,
+ *
+ *
+ *  @author Yamuna Krishnamurthy (yamuna@oomworks.com)
+ */
+//=============================================================================
+
 
 #ifndef CUSTOM_NETWORK_PRIORITY_MAPPING_H
 #define CUSTOM_NETWORK_PRIORITY_MAPPING_H
@@ -26,18 +23,18 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Custom_Network_Priority_Mapping
+ *
+ * @brief A simple implementation of the Network_Priority_Mapping interface
+ *
+ * This implementation uses custom mapping between the range of
+ * priorities for a given scheduling class (ACE_SCHED_OTHER,
+ * ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA
+ * priorities (0...32767)
+ */
 class Custom_Network_Priority_Mapping : public TAO_Network_Priority_Mapping
 {
-  //
-  // = TITLE
-  //   A simple implementation of the Network_Priority_Mapping interface
-  //
-  // = DESCRIPTION
-  //   This implementation uses custom mapping between the range of
-  //   priorities for a given scheduling class (ACE_SCHED_OTHER,
-  //   ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA
-  //   priorities (0...32767)
-  //
 public:
   Custom_Network_Priority_Mapping (void);
 
diff --git a/tests/RTCORBA/Diffserv/Makefile.am b/tests/RTCORBA/Diffserv/Makefile.am
deleted file mode 100644
index 4484516bf5c..00000000000
--- a/tests/RTCORBA/Diffserv/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Diffserv_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Diffserv_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Custom_Network_Priority_Mapping.cpp \
-  client.cpp \
-  testC.cpp \
-  Custom_Network_Priority_Mapping.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Diffserv_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Custom_Network_Priority_Mapping.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  Custom_Network_Priority_Mapping.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am b/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am
deleted file mode 100644
index 727f056645f..00000000000
--- a/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RT_Dynamic_Thread_Pool_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RT_Dynamic_Thread_Pool_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RT_Dynamic_Thread_Pool_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
index 4d1a63cc19c..e1a03f0299d 100644
--- a/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
+++ b/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
@@ -8,8 +8,6 @@
 #include "ace/OS_NS_unistd.h"
  #include "../check_supported_priorities.cpp"
 
-ACE_RCSID(Thread_Pool, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://ior_1");
 int iterations = 6;
 int shutdown_server = 0;
@@ -48,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf b/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf
index 41c1919a08a..a8ed67d58c8 100644
--- a/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf
+++ b/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 # Option for platforms where direct mapping doesn't work
 static RT_ORB_Loader "-ORBPriorityMapping continuous -RTORBDynamicThreadIdleTimeout 1000000"
diff --git a/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
index 862ade1d4f5..b703aff675d 100644
--- a/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
+++ b/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
@@ -8,8 +8,6 @@
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "../check_supported_priorities.cpp"
 
-ACE_RCSID(Thread_Pool, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 int ior_count = 1;
 CORBA::ULong static_threads = 1;
@@ -53,7 +51,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -67,7 +65,7 @@ write_ior_to_file (CORBA::ORB_ptr orb,
   char filename[BUFSIZ];
   ACE_OS::sprintf (filename,
                    "%s_%d",
-                   ior_output_file,
+                   ACE_TEXT_ALWAYS_CHAR (ior_output_file),
                    ior_count++);
 
   FILE *output_file =
diff --git a/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf b/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf
index d3e71e1da4b..0b1f7bb3bcd 100644
--- a/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf
+++ b/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf
@@ -1 +1,3 @@
+# $Id$
+
 static RT_ORB_Loader "-RTORBDynamicThreadIdleTimeout 100000"
diff --git a/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
index 3fec3b5fbf6..93cf9c3939a 100644
--- a/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
+++ b/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
@@ -5,8 +5,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/RTCORBA/Thread_Pool.h"
 
-ACE_RCSID(Thread_Pools, test_i, "$Id$")
-
 test_i::test_i (CORBA::ORB_ptr orb,
                 PortableServer::POA_ptr poa,
                 long msec_sleep)
diff --git a/tests/RTCORBA/Explicit_Binding/Makefile.am b/tests/RTCORBA/Explicit_Binding/Makefile.am
deleted file mode 100644
index 307bbec3cb7..00000000000
--- a/tests/RTCORBA/Explicit_Binding/Makefile.am
+++ /dev/null
@@ -1,116 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Explicit_Binding_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Explicit_Binding_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Explicit_Binding_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Explicit_Binding/svc.conf b/tests/RTCORBA/Explicit_Binding/svc.conf
index 57fc20f1023..74be1affa18 100644
--- a/tests/RTCORBA/Explicit_Binding/svc.conf
+++ b/tests/RTCORBA/Explicit_Binding/svc.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 # Options for SHMIOP protocol
 static SHMIOP_Factory "-MMAPFilePrefix server_shmiop"
diff --git a/tests/RTCORBA/Linear_Priority/Makefile.am b/tests/RTCORBA/Linear_Priority/Makefile.am
deleted file mode 100644
index e1695f0a247..00000000000
--- a/tests/RTCORBA/Linear_Priority/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Linear_Priority_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Linear_Priority_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Linear_Priority_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Linear_Priority/run_test.pl b/tests/RTCORBA/Linear_Priority/run_test.pl
index 72aaa9fa9f4..c60447d6388 100755
--- a/tests/RTCORBA/Linear_Priority/run_test.pl
+++ b/tests/RTCORBA/Linear_Priority/run_test.pl
@@ -65,7 +65,7 @@ sub run_server
     if ($SV->Spawn () == -1) {
         exit 1;
     }
-    
+
     if ($server->WaitForFileTimed ($iorbase,
                   $server->ProcessStartWaitInterval()) == -1) {
         check_supported_priorities ($SV);
@@ -83,7 +83,7 @@ sub zap_server
         print STDERR "ERROR: server returned $server_status\n";
         $status = 1;
     }
-    
+
     $server->DeleteFile($iorbase);
     $client->DeleteFile($iorbase);
 
diff --git a/tests/RTCORBA/Linear_Priority/svc.conf b/tests/RTCORBA/Linear_Priority/svc.conf
index 56e9a13fea0..cf6a420b24c 100644
--- a/tests/RTCORBA/Linear_Priority/svc.conf
+++ b/tests/RTCORBA/Linear_Priority/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # Options required for regular testing; comment out for real-time testing
 static RT_ORB_Loader "-ORBPriorityMapping linear"
 
diff --git a/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am b/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am
deleted file mode 100644
index 25e08c9ae06..00000000000
--- a/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am
+++ /dev/null
@@ -1,116 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_MT_Client_Proto_Prio_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_MT_Client_Proto_Prio_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_MT_Client_Proto_Prio_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl b/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl
index 56cc7f6a747..ebebfc4f323 100755
--- a/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl
+++ b/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl
@@ -129,20 +129,20 @@ elsif ($iiop_requests != $shmiop_requests)
 {
     print "ERROR: Number of iiop requests differs from shmiop differs from "
         ."number of iterations\n";
-    print "IIOP Request: "; 
+    print "IIOP Request: ";
     print $iiop_requests;
     print "\n";
 
-    print "IIOP Request: "; 
+    print "IIOP Request: ";
     print $iiop_requests;
     print "\n";
     ++$errors;
 }
-elsif (($priority1 != $priority2 
+elsif (($priority1 != $priority2
         and ($priority1_requests != $priority2_requests
              or $priority1_requests != $iterations))
-       or ($priority1 == $priority2 
-           and ($priority2_requests != 0 
+       or ($priority1 == $priority2
+           and ($priority2_requests != 0
                 or $priority1_requests != 2*$iterations)))
 {
     print "ERROR: Nonmatching number of requests of each priority\n";
diff --git a/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf b/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf
index d5c77cef4a9..4f5af462be1 100644
--- a/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf
+++ b/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # Options for SHMIOP protocol
 static SHMIOP_Factory "-MMAPFilePrefix server_shmiop"
 
diff --git a/tests/RTCORBA/Makefile.am b/tests/RTCORBA/Makefile.am
deleted file mode 100644
index 568e309829e..00000000000
--- a/tests/RTCORBA/Makefile.am
+++ /dev/null
@@ -1,34 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Activate_Object_Multiple_ORBs \
-        Banded_Connections \
-        Client_Propagated \
-        Client_Protocol \
-        Collocation \
-        Destroy_Thread_Pool \
-        Diffserv \
-        Dynamic_Thread_Pool \
-        Explicit_Binding \
-        Linear_Priority \
-        MT_Client_Protocol_Priority \
-        ORB_init \
-        Persistent_IOR \
-        Policies \
-        Policy_Combinations \
-        Priority_Inversion_With_Bands \
-        Private_Connection \
-        Profile_And_Endpoint_Selection \
-        RTMutex \
-        Server_Declared \
-        Server_Protocol \
-        Thread_Pool
-
diff --git a/tests/RTCORBA/ORB_init/Makefile.am b/tests/RTCORBA/ORB_init/Makefile.am
deleted file mode 100644
index 3b87ae65eeb..00000000000
--- a/tests/RTCORBA/ORB_init/Makefile.am
+++ /dev/null
@@ -1,50 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.ORB_init_RT.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS = ORB_init
-
-ORB_init_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ORB_init_SOURCES = \
-  ORB_init.cpp
-
-ORB_init_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Persistent_IOR/Makefile.am b/tests/RTCORBA/Persistent_IOR/Makefile.am
deleted file mode 100644
index a728daf22d0..00000000000
--- a/tests/RTCORBA/Persistent_IOR/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Persistent_IOR_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Persistent_IOR_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Persistent_IOR_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Persistent_IOR/continuous.conf b/tests/RTCORBA/Persistent_IOR/continuous.conf
index 8d8795f4817..fd95de5142e 100644
--- a/tests/RTCORBA/Persistent_IOR/continuous.conf
+++ b/tests/RTCORBA/Persistent_IOR/continuous.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 # Option for platforms where direct mapping doesn't work
 static RT_ORB_Loader "-ORBPriorityMapping continuous"
diff --git a/tests/RTCORBA/Persistent_IOR/server.cpp b/tests/RTCORBA/Persistent_IOR/server.cpp
index 28c06691035..fbfb1d0974d 100644
--- a/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -109,7 +109,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/RTCORBA/Policies/Makefile.am b/tests/RTCORBA/Policies/Makefile.am
deleted file mode 100644
index ab5b6b9cbb4..00000000000
--- a/tests/RTCORBA/Policies/Makefile.am
+++ /dev/null
@@ -1,52 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RTCORBA_Policies_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS = Policies
-
-Policies_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Policies_SOURCES = \
-  Policies.cpp
-
-Policies_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Policies/Policies.cpp b/tests/RTCORBA/Policies/Policies.cpp
index cd8aebbdca2..78b61e238c8 100644
--- a/tests/RTCORBA/Policies/Policies.cpp
+++ b/tests/RTCORBA/Policies/Policies.cpp
@@ -1,22 +1,19 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/RTCORBA/Policies
-//
-// = FILENAME
-//     Policies.cpp
-//
-// = DESCRIPTION
-//     This program tests the construction of RTCORBA policies, both
-//     through the generic ORB::create_policy interface and the
-//     RTCORBA specific interfaces.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     Policies.cpp
+ *
+ *  $Id$
+ *
+ *   This program tests the construction of RTCORBA policies, both
+ *   through the generic ORB::create_policy interface and the
+ *   RTCORBA specific interfaces.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "tao/ORB.h"
 #include "tao/RTCORBA/RTCORBA.h"
diff --git a/tests/RTCORBA/Policy_Combinations/Makefile.am b/tests/RTCORBA/Policy_Combinations/Makefile.am
deleted file mode 100644
index c706a19b40d..00000000000
--- a/tests/RTCORBA/Policy_Combinations/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Policy_Combinations_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Policy_Combinations_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Policy_Combinations_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Policy_Combinations/run_test.pl b/tests/RTCORBA/Policy_Combinations/run_test.pl
index 0f283da95ba..05b3c10408f 100755
--- a/tests/RTCORBA/Policy_Combinations/run_test.pl
+++ b/tests/RTCORBA/Policy_Combinations/run_test.pl
@@ -13,7 +13,7 @@ $status = 0;
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
 
-@iorfiles = 
+@iorfiles =
     (
      "root",
      "child",
@@ -36,7 +36,7 @@ sub run_client
     $CL = $client->CreateProcess ("client", @_);
 
     $CL->Spawn ();
-    
+
     $client_status = $CL->WaitKill ($client->ProcessStartWaitInterval ());
 
     if ($client_status != 0) {
@@ -64,18 +64,18 @@ for $file (@iorfiles) {
             # Mark as no longer running to avoid errors on exit.
             $SV->{RUNNING} = 0;
             exit $status;
-        } 
-        else {            
+        }
+        else {
             print STDERR "ERROR: cannot find ior file: $server_iorfile\n";
             $status = 1;
             goto kill_server;
         }
     }
-      
+
     print STDERR "\n******************************************************\n";
     print STDERR "Invoking methods on servant in $file poa\n";
     print STDERR "******************************************************\n\n";
-    
+
     run_client ("-k file://$client_iorfile");
 }
 
@@ -86,7 +86,7 @@ print STDERR "**************************\n\n";
 $ior_file = $client->LocalFile ($iorfiles[0]);
 run_client ("-k file://$ior_file -i 0 -x");
 
-kill_server: 
+kill_server:
     print STDERR "Killing server...\n";
     $server_status = $SV->Kill ($server->ProcessStopWaitInterval ());
 
diff --git a/tests/RTCORBA/Policy_Combinations/svc.conf b/tests/RTCORBA/Policy_Combinations/svc.conf
index 4f8bca41eeb..39d05a94c51 100644
--- a/tests/RTCORBA/Policy_Combinations/svc.conf
+++ b/tests/RTCORBA/Policy_Combinations/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # Options required for regular testing; comment out for real-time testing
 static RT_ORB_Loader "-ORBPriorityMapping continuous"
 
diff --git a/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am b/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am
deleted file mode 100644
index da9a2fc255a..00000000000
--- a/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Priority_Inversion_With_Bands_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Priority_Inversion_With_Bands_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.Priority_Inversion_With_Bands_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
index 1be484f6684..968e12e75bd 100644
--- a/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
+++ b/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
@@ -7,8 +7,6 @@
 #include "ace/Task.h"
 #include "../check_supported_priorities.cpp"
 
-ACE_RCSID(Priority_Inversion_With_Bands, client, "$Id$")
-
 static const ACE_TCHAR *ior = ACE_TEXT("file://ior_1");
 static int iterations = 12;
 static CORBA::ULong work = 2;
@@ -56,7 +54,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf b/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf
index 8d8795f4817..fd95de5142e 100644
--- a/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf
+++ b/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 # Option for platforms where direct mapping doesn't work
 static RT_ORB_Loader "-ORBPriorityMapping continuous"
diff --git a/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
index d32f0d268f9..8c424029757 100644
--- a/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
+++ b/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
@@ -7,8 +7,6 @@
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "../check_supported_priorities.cpp"
 
-ACE_RCSID(Priority_Inversion_With_Bands, server, "$Id$")
-
 static const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 static int ior_count = 1;
 static CORBA::ULong static_threads = 1;
@@ -52,7 +50,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -66,7 +64,7 @@ write_ior_to_file (CORBA::ORB_ptr orb,
   char filename[BUFSIZ];
   ACE_OS::sprintf (filename,
                    "%s_%d",
-                   ior_output_file,
+                   ACE_TEXT_ALWAYS_CHAR (ior_output_file),
                    ior_count++);
 
   FILE *output_file =
diff --git a/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf b/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf
index 2154375e265..e92d9e0da74 100644
--- a/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf
+++ b/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # No options required for regular testing
 
 # For real-time testing, uncomment the following line:
diff --git a/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
index c3af66871f5..636b668c44f 100644
--- a/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
+++ b/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
@@ -5,8 +5,6 @@
 #include "tao/RTCORBA/Thread_Pool.h"
 #include "ace/Countdown_Time.h"
 
-ACE_RCSID(Priority_Inversion_With_Bands, test_i, "$Id$")
-
 test_i::test_i (CORBA::ORB_ptr orb,
                 PortableServer::POA_ptr poa,
                 RTCORBA::Priority low_priority,
diff --git a/tests/RTCORBA/Private_Connection/Makefile.am b/tests/RTCORBA/Private_Connection/Makefile.am
deleted file mode 100644
index 5fb15f2895e..00000000000
--- a/tests/RTCORBA/Private_Connection/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Private_Connection_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Private_Connection_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Private_Connection_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am b/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am
deleted file mode 100644
index 2fe9ccba2d8..00000000000
--- a/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am
+++ /dev/null
@@ -1,117 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.PaE_Selection_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.PaE_Selection_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.PaE_Selection_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
index 3930ea0dc92..e06538fdc19 100644
--- a/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
+++ b/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
@@ -1,18 +1,17 @@
-// $Id$
-
-// ================================================================
-//
-//
-// = FILENAME
-//     client.cpp
-//
-// = DESCRIPTION
-//     This is a client implementation.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *   This is a client implementation.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
@@ -24,8 +23,6 @@
 #include "../common_args.cpp"
 #include "testC.h"
 
-ACE_RCSID(Profile_And_Endpoint_Selection, client, "$Id$")
-
 static int iterations = 1;
 static int debug = 1;
 static int shutdown_server = 0;
diff --git a/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl b/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl
index ada7040bb13..dc91a8ecbf8 100755
--- a/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl
+++ b/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl
@@ -85,7 +85,7 @@ sub run_client
     my $client_args = "@_" . " $extra_client_args";
 
     print "client $client_args\n";
-    
+
     $CL = $client->CreateProcess ("client", "$client_args");
 
     $CL->Spawn ();
diff --git a/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf b/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf
index 6bfc6d18fd8..9677f2345df 100644
--- a/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf
+++ b/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # Options for SHMIOP protocol
 static SHMIOP_Factory "-MMAPFilePrefix server_shmiop"
 
diff --git a/tests/RTCORBA/RTMutex/Makefile.am b/tests/RTCORBA/RTMutex/Makefile.am
deleted file mode 100644
index 1890acac35f..00000000000
--- a/tests/RTCORBA/RTMutex/Makefile.am
+++ /dev/null
@@ -1,52 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.RTCORBA_RTMutex_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Server_Declared/Makefile.am b/tests/RTCORBA/Server_Declared/Makefile.am
deleted file mode 100644
index c1986ef2e2f..00000000000
--- a/tests/RTCORBA/Server_Declared/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Server_Declared_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Server_Declared_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Server_Declared_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Server_Declared/continuous.conf b/tests/RTCORBA/Server_Declared/continuous.conf
index 8d8795f4817..fd95de5142e 100644
--- a/tests/RTCORBA/Server_Declared/continuous.conf
+++ b/tests/RTCORBA/Server_Declared/continuous.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 # Option for platforms where direct mapping doesn't work
 static RT_ORB_Loader "-ORBPriorityMapping continuous"
diff --git a/tests/RTCORBA/Server_Declared/run_test.pl b/tests/RTCORBA/Server_Declared/run_test.pl
index 777edcbd732..05bf789d0cd 100755
--- a/tests/RTCORBA/Server_Declared/run_test.pl
+++ b/tests/RTCORBA/Server_Declared/run_test.pl
@@ -64,15 +64,15 @@ if ($server_status != 0) {
 
 if ($server->WaitForFileTimed ($iorbase2,
                                $server->ProcessStartWaitInterval ()) == -1) {
-    $server_status = $SV->TimedWait (1);   
-    if ($server_status == 2) {   
+    $server_status = $SV->TimedWait (1);
+    if ($server_status == 2) {
         # Mark as no longer running to avoid errors on exit.
-        $SV->{RUNNING} = 0;   
-        exit $status;   
-    }   
-    else {   
-        print STDERR "ERROR: cannot find file <$server_iorfile2>\n";   
-        $SV->Kill ();   
+        $SV->{RUNNING} = 0;
+        exit $status;
+    }
+    else {
+        print STDERR "ERROR: cannot find file <$server_iorfile2>\n";
+        $SV->Kill ();
         exit 1;
     }
 }
diff --git a/tests/RTCORBA/Server_Declared/svc.conf b/tests/RTCORBA/Server_Declared/svc.conf
index 2154375e265..e92d9e0da74 100644
--- a/tests/RTCORBA/Server_Declared/svc.conf
+++ b/tests/RTCORBA/Server_Declared/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # No options required for regular testing
 
 # For real-time testing, uncomment the following line:
diff --git a/tests/RTCORBA/Server_Protocol/Makefile.am b/tests/RTCORBA/Server_Protocol/Makefile.am
deleted file mode 100644
index 0ee58c7eae2..00000000000
--- a/tests/RTCORBA/Server_Protocol/Makefile.am
+++ /dev/null
@@ -1,116 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Server_Protocol_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Server_Protocol_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Server_Protocol_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Server_Protocol/server_iiop.conf b/tests/RTCORBA/Server_Protocol/server_iiop.conf
index 6970cc7974c..f3f5f7b38e9 100644
--- a/tests/RTCORBA/Server_Protocol/server_iiop.conf
+++ b/tests/RTCORBA/Server_Protocol/server_iiop.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 # Protocol options
 static Advanced_Resource_Factory "-ORBProtocolFactory IIOP_Factory"
diff --git a/tests/RTCORBA/Server_Protocol/server_iiop_shmiop.conf b/tests/RTCORBA/Server_Protocol/server_iiop_shmiop.conf
index e93d62ad565..3ec59053a11 100644
--- a/tests/RTCORBA/Server_Protocol/server_iiop_shmiop.conf
+++ b/tests/RTCORBA/Server_Protocol/server_iiop_shmiop.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 # Protocol options
 static Advanced_Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory SHMIOP_Factory "
diff --git a/tests/RTCORBA/Server_Protocol/server_iiop_uiop.conf b/tests/RTCORBA/Server_Protocol/server_iiop_uiop.conf
index 8278e468550..8a6b8931749 100644
--- a/tests/RTCORBA/Server_Protocol/server_iiop_uiop.conf
+++ b/tests/RTCORBA/Server_Protocol/server_iiop_uiop.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 # Protocol options
 static Advanced_Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIOP_Factory "
diff --git a/tests/RTCORBA/Server_Protocol/server_reverse.conf b/tests/RTCORBA/Server_Protocol/server_reverse.conf
index 8f1988df985..5e13f4ec5e4 100644
--- a/tests/RTCORBA/Server_Protocol/server_reverse.conf
+++ b/tests/RTCORBA/Server_Protocol/server_reverse.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # Options for SHMIOP protocol
 static SHMIOP_Factory "-MMAPFilePrefix server_shmiop"
 
diff --git a/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf b/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf
index 9e1b5d05bab..c8678d85d41 100644
--- a/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf
+++ b/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # Options for SHMIOP protocol
 static SHMIOP_Factory "-MMAPFilePrefix server_shmiop"
 
diff --git a/tests/RTCORBA/Server_Protocol/server_shmiop.conf b/tests/RTCORBA/Server_Protocol/server_shmiop.conf
index c75f08cdd40..ae137dae9a8 100644
--- a/tests/RTCORBA/Server_Protocol/server_shmiop.conf
+++ b/tests/RTCORBA/Server_Protocol/server_shmiop.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # Options for SHMIOP protocol
 static SHMIOP_Factory "-MMAPFilePrefix server_shmiop"
 
diff --git a/tests/RTCORBA/Server_Protocol/server_uiop.conf b/tests/RTCORBA/Server_Protocol/server_uiop.conf
index eb6162bccf2..ed85b9686c9 100644
--- a/tests/RTCORBA/Server_Protocol/server_uiop.conf
+++ b/tests/RTCORBA/Server_Protocol/server_uiop.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 # Protocol options
 static Advanced_Resource_Factory "-ORBProtocolFactory UIOP_Factory "
diff --git a/tests/RTCORBA/Thread_Pool/Makefile.am b/tests/RTCORBA/Thread_Pool/Makefile.am
deleted file mode 100644
index 60f29fbaffd..00000000000
--- a/tests/RTCORBA/Thread_Pool/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.RTCORBA_Thread_Pool_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.RTCORBA_Thread_Pool_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.RTCORBA_Thread_Pool_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTCORBA/Thread_Pool/client.cpp b/tests/RTCORBA/Thread_Pool/client.cpp
index f4514bf5024..a4eac855841 100644
--- a/tests/RTCORBA/Thread_Pool/client.cpp
+++ b/tests/RTCORBA/Thread_Pool/client.cpp
@@ -8,8 +8,6 @@
 #include "ace/OS_NS_unistd.h"
  #include "../check_supported_priorities.cpp"
 
-ACE_RCSID(Thread_Pool, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://ior_1");
 int iterations = 6;
 int shutdown_server = 0;
@@ -47,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/RTCORBA/Thread_Pool/continuous.conf b/tests/RTCORBA/Thread_Pool/continuous.conf
index 8d8795f4817..fd95de5142e 100644
--- a/tests/RTCORBA/Thread_Pool/continuous.conf
+++ b/tests/RTCORBA/Thread_Pool/continuous.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 # Option for platforms where direct mapping doesn't work
 static RT_ORB_Loader "-ORBPriorityMapping continuous"
diff --git a/tests/RTCORBA/Thread_Pool/run_test.pl b/tests/RTCORBA/Thread_Pool/run_test.pl
index 3f3754b03ab..2a3ba89d6f6 100755
--- a/tests/RTCORBA/Thread_Pool/run_test.pl
+++ b/tests/RTCORBA/Thread_Pool/run_test.pl
@@ -15,15 +15,15 @@ $number_of_clients = 4;
 $status = 0;
 $continuous = ($^O eq 'hpux');
 
-@configurations = 
+@configurations =
     ({
-        file => "ior_1", 
+        file => "ior_1",
         description => "Invoking methods on servant in default thread pool",
      },{
-        file => "ior_2", 
+        file => "ior_2",
         description => "Invoking methods on servant in first RT thread pool (without lanes)",
      },{
-        file => "ior_3", 
+        file => "ior_3",
         description => "Invoking methods on servant in second RT thread pool (with lanes)",
      },
      );
@@ -38,7 +38,7 @@ sub run_clients
     my @parms = @_;
     $arg = $parms[0];
     $clients = $parms[1];
-    
+
 
     for ($i = 0; $i < $clients; $i++) {
         $CL[$i] = $client->CreateProcess ("client", $arg);
@@ -72,7 +72,7 @@ for $test (@configurations) {
             # Mark as no longer running to avoid errors on exit.
             $SV->{RUNNING} = 0;
             exit $status;
-        } 
+        }
         else {
             print STDERR "ERROR: cannot find ior file: $test->{file}\n";
             $status = 1;
@@ -85,7 +85,7 @@ for $test (@configurations) {
     print STDERR "\n*************************************************************\n";
     print STDERR "$test->{description}\n";
     print STDERR "*************************************************************\n\n";
-      
+
     $iorfile = $client->LocalFile ($test->{file});
     run_clients ("-k file://$iorfile", $number_of_clients);
     print STDERR "Prepare next cycle";
diff --git a/tests/RTCORBA/Thread_Pool/server.cpp b/tests/RTCORBA/Thread_Pool/server.cpp
index a1f7c2af78e..d5ff7b033f8 100644
--- a/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/tests/RTCORBA/Thread_Pool/server.cpp
@@ -8,8 +8,6 @@
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "../check_supported_priorities.cpp"
 
-ACE_RCSID(Thread_Pool, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 int ior_count = 1;
 CORBA::ULong static_threads = 2;
@@ -54,7 +52,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
@@ -68,7 +66,7 @@ write_ior_to_file (CORBA::ORB_ptr orb,
   char filename[BUFSIZ];
   ACE_OS::sprintf (filename,
                    "%s_%d",
-                   ior_output_file,
+                   ACE_TEXT_ALWAYS_CHAR (ior_output_file),
                    ior_count++);
 
   FILE *output_file =
diff --git a/tests/RTCORBA/Thread_Pool/svc.conf b/tests/RTCORBA/Thread_Pool/svc.conf
index 2154375e265..e92d9e0da74 100644
--- a/tests/RTCORBA/Thread_Pool/svc.conf
+++ b/tests/RTCORBA/Thread_Pool/svc.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 # No options required for regular testing
 
 # For real-time testing, uncomment the following line:
diff --git a/tests/RTCORBA/Thread_Pool/test_i.cpp b/tests/RTCORBA/Thread_Pool/test_i.cpp
index 2bf77daed60..f5f7fd2a337 100644
--- a/tests/RTCORBA/Thread_Pool/test_i.cpp
+++ b/tests/RTCORBA/Thread_Pool/test_i.cpp
@@ -5,8 +5,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/RTCORBA/Thread_Pool.h"
 
-ACE_RCSID(Thread_Pools, test_i, "$Id$")
-
 test_i::test_i (CORBA::ORB_ptr orb,
                 PortableServer::POA_ptr poa,
                 long msec_sleep)
diff --git a/tests/RTScheduling/Current/Makefile.am b/tests/RTScheduling/Current/Makefile.am
deleted file mode 100644
index adf84014b02..00000000000
--- a/tests/RTScheduling/Current/Makefile.am
+++ /dev/null
@@ -1,57 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Current.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS = Current
-
-Current_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Current_SOURCES = \
-  ../Scheduler.cpp \
-  Thread_Task.cpp \
-  test.cpp \
-  ../Scheduler.h \
-  Thread_Task.h
-
-Current_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTScheduling/Current/Thread_Task.h b/tests/RTScheduling/Current/Thread_Task.h
index a6ae16092a1..47682ac2328 100644
--- a/tests/RTScheduling/Current/Thread_Task.h
+++ b/tests/RTScheduling/Current/Thread_Task.h
@@ -15,7 +15,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH>
   int activate_task (int thr_count);
 
   ~Thread_Task (void);
-  
+
  protected:
   /// task svc
   virtual int svc (void);
diff --git a/tests/RTScheduling/DT_Spawn/Makefile.am b/tests/RTScheduling/DT_Spawn/Makefile.am
deleted file mode 100644
index d83080144ba..00000000000
--- a/tests/RTScheduling/DT_Spawn/Makefile.am
+++ /dev/null
@@ -1,55 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.DT_Spawn.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS = DT_Spawn
-
-DT_Spawn_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-DT_Spawn_SOURCES = \
-  ../Scheduler.cpp \
-  test.cpp \
-  ../Scheduler.h
-
-DT_Spawn_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTScheduling/Makefile.am b/tests/RTScheduling/Makefile.am
deleted file mode 100644
index 7e300b181e6..00000000000
--- a/tests/RTScheduling/Makefile.am
+++ /dev/null
@@ -1,17 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        Current \
-        DT_Spawn \
-        Scheduling_Interceptor \
-        Thread_Cancel \
-        VoidData
-
diff --git a/tests/RTScheduling/Scheduling_Interceptor/Makefile.am b/tests/RTScheduling/Scheduling_Interceptor/Makefile.am
deleted file mode 100644
index 6cf4f519c09..00000000000
--- a/tests/RTScheduling/Scheduling_Interceptor/Makefile.am
+++ /dev/null
@@ -1,123 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Scheduler_Interceptor_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Scheduler_Interceptor_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += Scheduler_Interceptor_Client
-
-Scheduler_Interceptor_Client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Scheduler_Interceptor_Client_SOURCES = \
-  ../Scheduler.cpp \
-  testC.cpp \
-  test_client.cpp \
-  ../Scheduler.h
-
-Scheduler_Interceptor_Client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.Scheduler_Interceptor_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += Scheduler_Interceptor_Server
-
-Scheduler_Interceptor_Server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Scheduler_Interceptor_Server_SOURCES = \
-  ../Scheduler.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_server.cpp \
-  ../Scheduler.h
-
-Scheduler_Interceptor_Server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTScheduling/Scheduling_Interceptor/run_test.pl b/tests/RTScheduling/Scheduling_Interceptor/run_test.pl
index 237be8be118..c6cfc4f738a 100755
--- a/tests/RTScheduling/Scheduling_Interceptor/run_test.pl
+++ b/tests/RTScheduling/Scheduling_Interceptor/run_test.pl
@@ -29,12 +29,12 @@ $client->DeleteFile($iorbase);
 $SV = $server->CreateProcess ("Scheduler_Interceptor_Server",
                               "-ORBdebuglevel $debug_level " .
                               "-f $server_iorfile");
-                              
+
 $CL = $client->CreateProcess ("Scheduler_Interceptor_Client",
                               "-f $client_iorfile");
-                              
+
 print STDERR "Starting Server\n";
-                              
+
 $server_status = $SV->Spawn ();
 
 if ($server_status != 0) {
diff --git a/tests/RTScheduling/Scheduling_Interceptor/test.idl b/tests/RTScheduling/Scheduling_Interceptor/test.idl
index c0c3d7e9da1..af5ea5b8b16 100644
--- a/tests/RTScheduling/Scheduling_Interceptor/test.idl
+++ b/tests/RTScheduling/Scheduling_Interceptor/test.idl
@@ -2,7 +2,7 @@
 interface test
 {
   oneway void one_way (in string message);
-  
+
   string two_way (in string message);
 
   oneway void shutdown ();
diff --git a/tests/RTScheduling/Thread_Cancel/Makefile.am b/tests/RTScheduling/Thread_Cancel/Makefile.am
deleted file mode 100644
index e1a77bdb23b..00000000000
--- a/tests/RTScheduling/Thread_Cancel/Makefile.am
+++ /dev/null
@@ -1,57 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Thread_Cancel.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS = Thread_Cancel
-
-Thread_Cancel_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Thread_Cancel_SOURCES = \
-  ../Scheduler.cpp \
-  Thread_Task.cpp \
-  test.cpp \
-  ../Scheduler.h \
-  Thread_Task.h
-
-Thread_Cancel_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/RTScheduling/Thread_Cancel/Thread_Task.h b/tests/RTScheduling/Thread_Cancel/Thread_Task.h
index 441469fa8d4..8d0441d08d3 100644
--- a/tests/RTScheduling/Thread_Cancel/Thread_Task.h
+++ b/tests/RTScheduling/Thread_Cancel/Thread_Task.h
@@ -13,7 +13,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH>
   int activate_task (CORBA::ORB_ptr orb);
 
   RTScheduling::Current::IdType* guids (void);
-  
+
  protected:
   /// task svc
   virtual int svc (void);
diff --git a/tests/RTScheduling/VoidData/Makefile.am b/tests/RTScheduling/VoidData/Makefile.am
deleted file mode 100644
index 87cc20bb478..00000000000
--- a/tests/RTScheduling/VoidData/Makefile.am
+++ /dev/null
@@ -1,82 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.VoidData.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS = VoidData
-
-VoidData_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-VoidData_SOURCES = \
-  testC.cpp \
-  test_client.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-VoidData_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/tests/Reliable_Oneways/Makefile.am b/tests/Reliable_Oneways/Makefile.am
deleted file mode 100644
index 3fe75700e6b..00000000000
--- a/tests/Reliable_Oneways/Makefile.am
+++ /dev/null
@@ -1,120 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Reliable_Oneways_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Reliable_Oneways_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Reliable_Oneways_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Oneway_Receiver.cpp \
-  Shutdown_Helper.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Oneway_Receiver.h \
-  Shutdown_Helper.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Reliable_Oneways/Oneway_Receiver.cpp b/tests/Reliable_Oneways/Oneway_Receiver.cpp
index a2e99ade4fc..4aab39a74d8 100644
--- a/tests/Reliable_Oneways/Oneway_Receiver.cpp
+++ b/tests/Reliable_Oneways/Oneway_Receiver.cpp
@@ -4,8 +4,6 @@
 #include "Oneway_Receiver.h"
 #include "Shutdown_Helper.h"
 
-ACE_RCSID(Reliable_Oneways, Oneway_Receiver, "$Id$")
-
 Oneway_Receiver::Oneway_Receiver (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Reliable_Oneways/Shutdown_Helper.cpp b/tests/Reliable_Oneways/Shutdown_Helper.cpp
index d7168f8a5a5..c001ac11463 100644
--- a/tests/Reliable_Oneways/Shutdown_Helper.cpp
+++ b/tests/Reliable_Oneways/Shutdown_Helper.cpp
@@ -3,8 +3,6 @@
 //
 #include "Shutdown_Helper.h"
 
-ACE_RCSID(Reliable_Oneways, Shutdown_Helper, "$Id$")
-
 Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Reliable_Oneways/client.cpp b/tests/Reliable_Oneways/client.cpp
index 52a6c6d8531..06564a478f7 100644
--- a/tests/Reliable_Oneways/client.cpp
+++ b/tests/Reliable_Oneways/client.cpp
@@ -6,8 +6,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID(Reliable_Oneways, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int test_sync_with_target    = 0;
 int test_sync_with_server    = 0;
diff --git a/tests/Reliable_Oneways/server.cpp b/tests/Reliable_Oneways/server.cpp
index c6a9dbc93d3..a6840a8110d 100644
--- a/tests/Reliable_Oneways/server.cpp
+++ b/tests/Reliable_Oneways/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Reliable_Oneways, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp b/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
index 75f2f941112..bb2e6367b84 100644
--- a/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
+++ b/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
@@ -9,6 +9,7 @@
  * @author Carlos O'Ryan
  */
 #include "tao/Bounded_Value_Sequence_T.h"
+#include "ace/Log_Msg.h"
 
 struct Foo
 {
@@ -20,54 +21,62 @@ CORBA::ULong const TEST_FOO_MAX = 64;
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  typedef TAO::bounded_value_sequence<int,TEST_INT_MAX> int_sequence;
+  try
+    {
+      typedef TAO::bounded_value_sequence<int,TEST_INT_MAX> int_sequence;
 
-  int_sequence a;
-  int_sequence b(a);
+      int_sequence a;
+      int_sequence b(a);
 
-  int_sequence c(0, int_sequence::allocbuf(), true);
+      int_sequence c(0, int_sequence::allocbuf(), true);
 
-  a = b;
+      a = b;
 
-  a.length(c.maximum());
-  if (a.release())
-  {
-    b.length(a.length());
-  }
+      a.length(c.maximum());
+      if (a.release())
+      {
+        b.length(a.length());
+      }
 
-  a[0] = 0;
-  b[0] = a[0];
+      a[0] = 0;
+      b[0] = a[0];
 
-  int_sequence const & d = a;
-  try
-    {
-      c[0] = d[0];
+      int_sequence const & d = a;
+      try
+        {
+          c[0] = d[0];
 #if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1)
-      return 1;
+          return 1;
 #endif
-    }
-  catch (const ::CORBA::BAD_PARAM &)
-    {
-      // c has length = 0, so there is an exception when we try
-      // to access element above length.
-    }
+        }
+      catch (const ::CORBA::BAD_PARAM &)
+        {
+          // c has length = 0, so there is an exception when we try
+          // to access element above length.
+        }
 
-  b.replace(0, int_sequence::allocbuf(), true);
+      b.replace(0, int_sequence::allocbuf(), true);
 
-  int const * x = d.get_buffer();
-  if (x != 0)
-  {
-    int_sequence::freebuf(a.get_buffer(true));
-  }
-  x = b.get_buffer();
+      int const * x = d.get_buffer();
+      if (x != 0)
+      {
+        int_sequence::freebuf(a.get_buffer(true));
+      }
+      x = b.get_buffer();
 
-  int_sequence e(c);
+      int_sequence e(c);
 
-  typedef TAO::bounded_value_sequence<Foo,TEST_FOO_MAX> Foo_sequence;
+      typedef TAO::bounded_value_sequence<Foo,TEST_FOO_MAX> Foo_sequence;
 
-  Foo_sequence u;
-  Foo_sequence v(u);
-  u = v;
+      Foo_sequence u;
+      Foo_sequence v(u);
+      u = v;
 
+    }
+  catch (const ::CORBA::Exception &)
+    {
+      ACE_ERROR ((LM_ERROR, "Caught unexpected exception\n"));
+      return 1;
+    }
   return 0;
 }
diff --git a/tests/Sequence_Unit_Tests/Bounded_String.cpp b/tests/Sequence_Unit_Tests/Bounded_String.cpp
index 31b9cb38d19..03f63c4f2f5 100644
--- a/tests/Sequence_Unit_Tests/Bounded_String.cpp
+++ b/tests/Sequence_Unit_Tests/Bounded_String.cpp
@@ -10,69 +10,77 @@
  */
 #include "tao/Bounded_Basic_String_Sequence_T.h"
 #include "tao/CORBA_String.h"
+#include "ace/Log_Msg.h"
 
 CORBA::ULong const MAXIMUM = 42;
 typedef TAO::bounded_basic_string_sequence<char, MAXIMUM> s_sequence;
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  s_sequence a;
-  s_sequence b(a);
+  try
+    {
+      s_sequence a;
+      s_sequence b(a);
 
-  s_sequence c(0, s_sequence::allocbuf(), true);
-  a = b;
+      s_sequence c(0, s_sequence::allocbuf(), true);
+      a = b;
 
-  a.length(c.maximum());
-  if (a.release())
-  {
-    b.length(a.length());
-  }
-  a[0] = const_cast<char const*>("Hello");
-  b[0] = a[0];
+      a.length(c.maximum());
+      if (a.release())
+      {
+        b.length(a.length());
+      }
+      a[0] = const_cast<char const*>("Hello");
+      b[0] = a[0];
 
-  s_sequence const & d = a;
-  try
-    {
-      c[0] = d[0];
-#if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1)
-      return 1;
-#endif
-    }
-  catch (const ::CORBA::BAD_PARAM &)
-    {
-      // c has length = 0, so there is an exception when we try
-      // to access element above length.
-    }
+      s_sequence const & d = a;
+      try
+        {
+          c[0] = d[0];
+    #if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1)
+          return 1;
+    #endif
+        }
+      catch (const ::CORBA::BAD_PARAM &)
+        {
+          // c has length = 0, so there is an exception when we try
+          // to access element above length.
+        }
 
-  b.replace(0, s_sequence::allocbuf(), true);
+      b.replace(0, s_sequence::allocbuf(), true);
 
-  char const * const * x = d.get_buffer();
-  if (x != 0)
-  {
-    s_sequence::freebuf(a.get_buffer(true));
-  }
-  x = b.get_buffer();
+      char const * const * x = d.get_buffer();
+      if (x != 0)
+      {
+        s_sequence::freebuf(a.get_buffer(true));
+      }
+      x = b.get_buffer();
 
-  if (d.length())
-  {
-    s_sequence::freebuf(s_sequence::allocbuf());
-  }
+      if (d.length())
+      {
+        s_sequence::freebuf(s_sequence::allocbuf());
+      }
 
-  s_sequence e(c);
+      s_sequence e(c);
 
-  CORBA::String_var w(const_cast<char const*>("World"));
-  try
-    {
-      e[0] = w;
+      CORBA::String_var w(const_cast<char const*>("World"));
+      try
+        {
+          e[0] = w;
 #if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1)
-      return 1;
+          return 1;
 #endif
+        }
+      catch (const ::CORBA::BAD_PARAM &)
+        {
+          // e has length = 0, so there is an exception when we try
+          // to access element above length.
+        }
     }
-  catch (const ::CORBA::BAD_PARAM &)
+  catch (const ::CORBA::Exception &)
     {
-      // e has length = 0, so there is an exception when we try
-      // to access element above length.
+      ACE_ERROR ((LM_ERROR, "Caught unexpected exception\n"));
+      return 1;
     }
-
   return 0;
 }
diff --git a/tests/Sequence_Unit_Tests/Makefile.am b/tests/Sequence_Unit_Tests/Makefile.am
deleted file mode 100644
index c5ed091dd25..00000000000
--- a/tests/Sequence_Unit_Tests/Makefile.am
+++ /dev/null
@@ -1,694 +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:
-## ../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.Sequence_Unit_Tests_B_Obj_Ref_Seq.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += bounded_object_reference_sequence_ut
-
-bounded_object_reference_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-bounded_object_reference_sequence_ut_SOURCES = \
-  bounded_object_reference_sequence_ut.cpp \
-  mock_reference.cpp \
-  mock_reference.hpp
-
-bounded_object_reference_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-bounded_object_reference_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_B_Sequence_CDR.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += bounded_sequence_cdr_ut
-
-bounded_sequence_cdr_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-bounded_sequence_cdr_ut_SOURCES = \
-  bounded_sequence_cdr_ut.cpp \
-  mock_reference.cpp \
-  mock_reference.hpp
-
-bounded_sequence_cdr_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-bounded_sequence_cdr_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_B_Simple_Types.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Bounded_Simple_Types
-
-Bounded_Simple_Types_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Bounded_Simple_Types_SOURCES = \
-  Bounded_Simple_Types.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-Bounded_Simple_Types_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Sequence_Unit_Tests_B_String_Seq.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += bounded_string_sequence_ut
-
-bounded_string_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-bounded_string_sequence_ut_SOURCES = \
-  bounded_string_sequence_ut.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-bounded_string_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-bounded_string_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_B_Value_Sequence.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += bounded_value_sequence_ut
-
-bounded_value_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-bounded_value_sequence_ut_SOURCES = \
-  bounded_value_sequence_ut.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-bounded_value_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-bounded_value_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_Bounded_String.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Bounded_String
-
-Bounded_String_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Bounded_String_SOURCES = \
-  Bounded_String.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-Bounded_String_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Sequence_Unit_Tests_Obj_Ref_Seq_Elem.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += object_reference_sequence_element_ut
-
-object_reference_sequence_element_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-object_reference_sequence_element_ut_SOURCES = \
-  mock_reference.cpp \
-  object_reference_sequence_element_ut.cpp \
-  mock_reference.hpp
-
-object_reference_sequence_element_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-object_reference_sequence_element_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_String_Seq_Elem.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += string_sequence_element_ut
-
-string_sequence_element_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-string_sequence_element_ut_SOURCES = \
-  string_sequence_element_ut.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-string_sequence_element_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-string_sequence_element_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_Test_Alloc_Traits.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += testing_allocation_traits_ut
-
-testing_allocation_traits_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-testing_allocation_traits_ut_SOURCES = \
-  testing_allocation_traits_ut.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-testing_allocation_traits_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-testing_allocation_traits_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_UB_Fwd_Ob_Ref_Seq.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += unbounded_fwd_object_reference_sequence_ut
-
-unbounded_fwd_object_reference_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-unbounded_fwd_object_reference_sequence_ut_SOURCES = \
-  fwd_mock_reference.cpp \
-  unbounded_fwd_object_reference_sequence_ut.cpp \
-  fwd_mock_reference.hpp
-
-unbounded_fwd_object_reference_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-unbounded_fwd_object_reference_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_UB_Obj_Ref_Seq.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += unbounded_object_reference_sequence_ut
-
-unbounded_object_reference_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-unbounded_object_reference_sequence_ut_SOURCES = \
-  mock_reference.cpp \
-  unbounded_object_reference_sequence_ut.cpp \
-  mock_reference.hpp
-
-unbounded_object_reference_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-unbounded_object_reference_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_UB_Oct_Seq_No_Cpy.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += unbounded_octet_sequence_nocopy_ut
-
-unbounded_octet_sequence_nocopy_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-unbounded_octet_sequence_nocopy_ut_SOURCES = \
-  mock_reference.cpp \
-  unbounded_octet_sequence_nocopy_ut.cpp \
-  mock_reference.hpp
-
-unbounded_octet_sequence_nocopy_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-unbounded_octet_sequence_nocopy_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_UB_Octet_Sequence.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += unbounded_octet_sequence_ut
-
-unbounded_octet_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-unbounded_octet_sequence_ut_SOURCES = \
-  mock_reference.cpp \
-  unbounded_octet_sequence_ut.cpp \
-  mock_reference.hpp
-
-unbounded_octet_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-unbounded_octet_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_UB_Sequence_CDR.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += unbounded_sequence_cdr_ut
-
-unbounded_sequence_cdr_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-unbounded_sequence_cdr_ut_SOURCES = \
-  mock_reference.cpp \
-  unbounded_sequence_cdr_ut.cpp \
-  mock_reference.hpp
-
-unbounded_sequence_cdr_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-unbounded_sequence_cdr_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_UB_Simple_Types.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Unbounded_Simple_Types
-
-Unbounded_Simple_Types_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Unbounded_Simple_Types_SOURCES = \
-  Unbounded_Simple_Types.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-Unbounded_Simple_Types_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Sequence_Unit_Tests_UB_String_Seq.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += unbounded_string_sequence_ut
-
-unbounded_string_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-unbounded_string_sequence_ut_SOURCES = \
-  unbounded_string_sequence_ut.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-unbounded_string_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-unbounded_string_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_UB_Value_Sequence.am
-
-if BUILD_BOOST
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += unbounded_value_sequence_ut
-
-unbounded_value_sequence_ut_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \
-  -I$(BOOST_ROOT)/.
-
-unbounded_value_sequence_ut_SOURCES = \
-  unbounded_value_sequence_ut.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-unbounded_value_sequence_ut_LDFLAGS = \
-  -L$(BOOST_ROOT)/lib
-
-unbounded_value_sequence_ut_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
-
-endif BUILD_EXCEPTIONS
-endif BUILD_BOOST
-
-## Makefile.Sequence_Unit_Tests_Unbounded_Octet.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Unbounded_Octet
-
-Unbounded_Octet_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Unbounded_Octet_SOURCES = \
-  Unbounded_Octet.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-Unbounded_Octet_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Sequence_Unit_Tests_Unbounded_String.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Unbounded_String
-
-Unbounded_String_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Unbounded_String_SOURCES = \
-  Unbounded_String.cpp \
-  bounded_sequence_cdr.hpp \
-  fwd_mock_reference.hpp \
-  mock_array.hpp \
-  mock_reference.hpp \
-  string_sequence_tester.hpp \
-  testing_allocation_traits.hpp \
-  testing_counters.hpp \
-  testing_exception.hpp \
-  testing_object_reference_traits.hpp \
-  testing_range_checking.hpp \
-  testing_string_traits.hpp \
-  unbounded_sequence_cdr.hpp \
-  value_sequence_tester.hpp
-
-Unbounded_String_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/tests/Sequence_Unit_Tests/Unbounded_Octet.cpp b/tests/Sequence_Unit_Tests/Unbounded_Octet.cpp
index ca0704ea501..dc4fc7db1f0 100644
--- a/tests/Sequence_Unit_Tests/Unbounded_Octet.cpp
+++ b/tests/Sequence_Unit_Tests/Unbounded_Octet.cpp
@@ -10,54 +10,64 @@
  */
 #include "tao/Basic_Types.h"
 #include "tao/Unbounded_Octet_Sequence_T.h"
+#include "ace/Log_Msg.h"
 
 typedef TAO::unbounded_value_sequence <CORBA::Octet> s_sequence;
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  s_sequence a;
-  s_sequence b(23);
+  try
+    {
+      s_sequence a;
+      s_sequence b(23);
 
-  s_sequence c(32, 0, s_sequence::allocbuf(32), true);
-  a = b;
+      s_sequence c(32, 0, s_sequence::allocbuf(32), true);
+      a = b;
 
-  a.length(c.maximum());
-  if (a.release())
-  {
-    b.length(a.length());
-  }
-  a[0] = 'a';
-  b[0] = a[0];
+      a.length(c.maximum());
+      if (a.release())
+      {
+        b.length(a.length());
+      }
 
-  s_sequence const & d = a;
-  try
-    {
-      c[0] = d[0];
+      a[0] = 'a';
+      b[0] = a[0];
+
+      s_sequence const & d = a;
+      try
+        {
+          c[0] = d[0];
 #if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1)
-      return 1;
+          return 1;
 #endif
-    }
-  catch (const ::CORBA::BAD_PARAM &)
-    {
-      // c has length = 0, so there is an exception when we try
-      // to access element above length.
-    }
+        }
+      catch (const ::CORBA::BAD_PARAM &)
+        {
+          // c has length = 0, so there is an exception when we try
+          // to access element above length.
+        }
 
-  b.replace(64, 0, s_sequence::allocbuf(64), true);
+      b.replace(64, 0, s_sequence::allocbuf(64), true);
 
-  CORBA::Octet const * x = d.get_buffer();
-  if (x != 0)
-  {
-    s_sequence::freebuf(a.get_buffer(true));
-  }
-  x = b.get_buffer();
+      CORBA::Octet const * x = d.get_buffer();
+      if (x != 0)
+      {
+        s_sequence::freebuf(a.get_buffer(true));
+      }
+      x = b.get_buffer();
 
-  if (d.length())
-  {
-    s_sequence::freebuf(s_sequence::allocbuf(64));
-  }
+      if (d.length())
+      {
+        s_sequence::freebuf(s_sequence::allocbuf(64));
+      }
 
-  s_sequence e(c);
+      s_sequence e(c);
+    }
+  catch (const ::CORBA::Exception &)
+    {
+      ACE_ERROR ((LM_ERROR, "Caught unexpected exception\n"));
+      return 1;
+    }
 
   return 0;
 }
diff --git a/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp b/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp
index 79a93c10ed1..743b3c76b62 100644
--- a/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp
+++ b/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp
@@ -9,6 +9,7 @@
  * @author Carlos O'Ryan
  */
 #include "tao/Unbounded_Value_Sequence_T.h"
+#include "ace/Log_Msg.h"
 
 struct Foo
 {
@@ -17,53 +18,61 @@ struct Foo
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  typedef TAO::unbounded_value_sequence<int> int_sequence;
+  try
+    {
+      typedef TAO::unbounded_value_sequence<int> int_sequence;
 
-  int_sequence a;
-  int_sequence b(23);
+      int_sequence a;
+      int_sequence b(23);
 
-  int_sequence c(32, 0, int_sequence::allocbuf(32), true);
+      int_sequence c(32, 0, int_sequence::allocbuf(32), true);
 
-  a = b;
+      a = b;
 
-  a.length(c.maximum());
-  if (a.release())
-  {
-    b.length(a.length());
-  }
-  a[0] = 0;
-  b[0] = a[0];
+      a.length(c.maximum());
+      if (a.release())
+      {
+        b.length(a.length());
+      }
+      a[0] = 0;
+      b[0] = a[0];
 
-  int_sequence const & d = a;
-  try
-    {
-      c[0] = d[0];
+      int_sequence const & d = a;
+      try
+        {
+          c[0] = d[0];
 #if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1)
-      return 1;
+          return 1;
 #endif
-    }
-  catch (const ::CORBA::BAD_PARAM &)
-    {
-      // c has length = 0, so there is an exception when we try
-      // to access element above length.
-    }
+        }
+      catch (const ::CORBA::BAD_PARAM &)
+        {
+          // c has length = 0, so there is an exception when we try
+          // to access element above length.
+        }
 
-  b.replace(64, 0, int_sequence::allocbuf(64), true);
+      b.replace(64, 0, int_sequence::allocbuf(64), true);
 
-  int const * x = d.get_buffer();
-  if (x != 0)
-  {
-    int_sequence::freebuf(a.get_buffer(true));
-  }
-  x = b.get_buffer();
+      int const * x = d.get_buffer();
+      if (x != 0)
+      {
+        int_sequence::freebuf(a.get_buffer(true));
+      }
+      x = b.get_buffer();
 
-  int_sequence e(c);
+      int_sequence e(c);
 
-  typedef TAO::unbounded_value_sequence<Foo> Foo_sequence;
+      typedef TAO::unbounded_value_sequence<Foo> Foo_sequence;
 
-  Foo_sequence u;
-  Foo_sequence v(32);
-  u = v;
+      Foo_sequence u;
+      Foo_sequence v(32);
+      u = v;
+    }
+  catch (const ::CORBA::Exception &)
+    {
+      ACE_ERROR ((LM_ERROR, "Caught unexpected exception\n"));
+      return 1;
+    }
 
   return 0;
 }
diff --git a/tests/Sequence_Unit_Tests/Unbounded_String.cpp b/tests/Sequence_Unit_Tests/Unbounded_String.cpp
index a7e77788021..67eefb40cc4 100644
--- a/tests/Sequence_Unit_Tests/Unbounded_String.cpp
+++ b/tests/Sequence_Unit_Tests/Unbounded_String.cpp
@@ -10,67 +10,76 @@
  */
 #include "tao/Unbounded_Basic_String_Sequence_T.h"
 #include "tao/CORBA_String.h"
+#include "ace/Log_Msg.h"
 
 typedef TAO::unbounded_basic_string_sequence<char> s_sequence;
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  s_sequence a;
-  s_sequence b(23);
+  try
+    {
+      s_sequence a;
+      s_sequence b(23);
 
-  s_sequence c(32, 0, s_sequence::allocbuf(32), true);
-  a = b;
+      s_sequence c(32, 0, s_sequence::allocbuf(32), true);
+      a = b;
 
-  a.length(c.maximum());
-  if (a.release())
-  {
-    b.length(a.length());
-  }
-  a[0] = const_cast<char const*>("Hello");
-  b[0] = a[0];
+      a.length(c.maximum());
+      if (a.release())
+      {
+        b.length(a.length());
+      }
+      a[0] = const_cast<char const*>("Hello");
+      b[0] = a[0];
 
-  s_sequence const & d = a;
-  try
-    {
-      c[0] = d[0];
+      s_sequence const & d = a;
+      try
+        {
+          c[0] = d[0];
 #if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1)
-      return 1;
+          return 1;
 #endif
-    }
-  catch (const ::CORBA::BAD_PARAM &)
-    {
-      // c has length = 0, so there is an exception when we try
-      // to access element above length.
-    }
+        }
+      catch (const ::CORBA::BAD_PARAM &)
+        {
+          // c has length = 0, so there is an exception when we try
+          // to access element above length.
+        }
 
-  b.replace(64, 0, s_sequence::allocbuf(64), true);
+      b.replace(64, 0, s_sequence::allocbuf(64), true);
 
-  char const * const * x = d.get_buffer();
-  if (x != 0)
-  {
-    s_sequence::freebuf(a.get_buffer(true));
-  }
-  x = b.get_buffer();
+      char const * const * x = d.get_buffer();
+      if (x != 0)
+      {
+        s_sequence::freebuf(a.get_buffer(true));
+      }
+      x = b.get_buffer();
 
-  if (d.length())
-  {
-    s_sequence::freebuf(s_sequence::allocbuf(64));
-  }
+      if (d.length())
+      {
+        s_sequence::freebuf(s_sequence::allocbuf(64));
+      }
 
-  s_sequence e(c);
+      s_sequence e(c);
 
-  CORBA::String_var w(const_cast<char const*>("World"));
-  try
-    {
-      e[0] = w;
+      CORBA::String_var w(const_cast<char const*>("World"));
+      try
+        {
+          e[0] = w;
 #if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1)
-      return 1;
+          return 1;
 #endif
+        }
+      catch (const ::CORBA::BAD_PARAM &)
+        {
+          // e has length = 0, so there is an exception when we try
+          // to access element above length.
+        }
     }
-  catch (const ::CORBA::BAD_PARAM &)
+  catch (const ::CORBA::Exception &)
     {
-      // e has length = 0, so there is an exception when we try
-      // to access element above length.
+      ACE_ERROR ((LM_ERROR, "Caught unexpected exception\n"));
+      return 1;
     }
 
   return 0;
diff --git a/tests/Sequence_Unit_Tests/string_sequence_tester.hpp b/tests/Sequence_Unit_Tests/string_sequence_tester.hpp
index 339c59ada80..6ebcf3d7018 100644
--- a/tests/Sequence_Unit_Tests/string_sequence_tester.hpp
+++ b/tests/Sequence_Unit_Tests/string_sequence_tester.hpp
@@ -204,10 +204,11 @@ struct string_sequence_tester
     x.length(8);
 
     tested_sequence const & y = x;
-    character_type const * lhs = 0;
+    character_type const * lhs;
     character_type const * rhs = 0;
     CHECK_THROW(lhs = y[32], std::range_error);
     CHECK_THROW(x[32] = rhs, std::range_error);
+    ACE_UNUSED_ARG (lhs);
     return 0;
   }
 
diff --git a/tests/Sequence_Unit_Tests/value_sequence_tester.hpp b/tests/Sequence_Unit_Tests/value_sequence_tester.hpp
index f07b05c0d9e..d14d90c36c5 100644
--- a/tests/Sequence_Unit_Tests/value_sequence_tester.hpp
+++ b/tests/Sequence_Unit_Tests/value_sequence_tester.hpp
@@ -12,6 +12,7 @@
 #include "tao/Basic_Types.h"
 
 #include "test_macros.h"
+#include "tao/SystemException.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -68,14 +69,22 @@ struct value_sequence_tester
 
   int test_index_accessor()
   {
-    tested_sequence x;
-    x.length(8);
-    // Set x[4] to any value just for suppressing valgrind complains.
-    x[4] = 1;
-
-    tested_sequence const & y = x;
-    const_value_type & z = y[4];
-    CHECK_EQUAL(z, y[4]);
+    try
+      {
+        tested_sequence x;
+        x.length(8);
+        // Set x[4] to any value just for suppressing valgrind complains.
+        x[4] = 1;
+
+        tested_sequence const & y = x;
+        const_value_type & z = y[4];
+        CHECK_EQUAL(z, y[4]);
+      }
+    catch (const ::CORBA::BAD_PARAM &)
+      {
+        ACE_ERROR ((LM_ERROR, "Error: test_index_accessor: BAD_PARAM exception caught\n"));
+        return 1;
+      }
     return 0;
   }
 
diff --git a/tests/Servant_To_Reference_Test/Makefile.am b/tests/Servant_To_Reference_Test/Makefile.am
deleted file mode 100644
index 43708b043b4..00000000000
--- a/tests/Servant_To_Reference_Test/Makefile.am
+++ /dev/null
@@ -1,80 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Servant_To_Reference_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  server.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl \
-  Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Servant_To_Reference_Test/Test_i.cpp b/tests/Servant_To_Reference_Test/Test_i.cpp
index 2002a8e631a..871deea0c89 100644
--- a/tests/Servant_To_Reference_Test/Test_i.cpp
+++ b/tests/Servant_To_Reference_Test/Test_i.cpp
@@ -3,8 +3,6 @@
 //
 #include "Test_i.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 One_Impl::One_Impl (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Servant_To_Reference_Test/server.cpp b/tests/Servant_To_Reference_Test/server.cpp
index ca960031eb2..0a9f412be5c 100644
--- a/tests/Servant_To_Reference_Test/server.cpp
+++ b/tests/Servant_To_Reference_Test/server.cpp
@@ -5,10 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Task.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 class MT_Task : public ACE_Task_Base
@@ -84,7 +80,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Server_Connection_Purging/Makefile.am b/tests/Server_Connection_Purging/Makefile.am
deleted file mode 100644
index a94e1eb2050..00000000000
--- a/tests/Server_Connection_Purging/Makefile.am
+++ /dev/null
@@ -1,130 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Server_Connection_Purging_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Server_Connection_Purging_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Server_Connection_Purging_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_i.cpp \
-  server.cpp \
-  Test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Server_Connection_Purging_ShutCl.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += shutdown_client
-
-shutdown_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-shutdown_client_SOURCES = \
-  TestC.cpp \
-  client2.cpp \
-  Test_i.h
-
-shutdown_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Server_Connection_Purging/client.cpp b/tests/Server_Connection_Purging/client.cpp
index e5821cede7f..ee883a364ac 100644
--- a/tests/Server_Connection_Purging/client.cpp
+++ b/tests/Server_Connection_Purging/client.cpp
@@ -37,7 +37,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Server_Connection_Purging/server.cpp b/tests/Server_Connection_Purging/server.cpp
index 65bd480b7fb..263256e1d5b 100644
--- a/tests/Server_Connection_Purging/server.cpp
+++ b/tests/Server_Connection_Purging/server.cpp
@@ -27,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                            -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Server_Leaks/Makefile.am b/tests/Server_Leaks/Makefile.am
deleted file mode 100644
index 19954882560..00000000000
--- a/tests/Server_Leaks/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Server_Leaks_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Server_Leaks_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Ping_Service.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Server_Leaks_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Ping_Service.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Ping_Service.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Server_Leaks/Ping_Service.cpp b/tests/Server_Leaks/Ping_Service.cpp
index e6c157058ea..2a0151b78f8 100644
--- a/tests/Server_Leaks/Ping_Service.cpp
+++ b/tests/Server_Leaks/Ping_Service.cpp
@@ -3,8 +3,6 @@
 //
 #include "Ping_Service.h"
 
-ACE_RCSID(Server_Leaks, Ping_Service, "$Id$")
-
 Ping_Service::Ping_Service (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Server_Leaks/client.cpp b/tests/Server_Leaks/client.cpp
index 14ac97af38b..f3a5cc20a6f 100644
--- a/tests/Server_Leaks/client.cpp
+++ b/tests/Server_Leaks/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Server_Leaks, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int do_shutdown = 0;
 
@@ -35,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Server_Leaks/server.cpp b/tests/Server_Leaks/server.cpp
index e26806e215c..b2f1c39fbbf 100644
--- a/tests/Server_Leaks/server.cpp
+++ b/tests/Server_Leaks/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Server_Leaks, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Server_Port_Zero/Hello.cpp b/tests/Server_Port_Zero/Hello.cpp
index 1769811f1c8..0f62f20b906 100644
--- a/tests/Server_Port_Zero/Hello.cpp
+++ b/tests/Server_Port_Zero/Hello.cpp
@@ -3,10 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Server_Port_Zero,
-          Hello,
-          "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Server_Port_Zero/Makefile.am b/tests/Server_Port_Zero/Makefile.am
deleted file mode 100644
index 7fec49ca73d..00000000000
--- a/tests/Server_Port_Zero/Makefile.am
+++ /dev/null
@@ -1,80 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Server_Port_Zero_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Server_Port_Zero/server.cpp b/tests/Server_Port_Zero/server.cpp
index 9c76207a19b..8bc92fedd9d 100644
--- a/tests/Server_Port_Zero/server.cpp
+++ b/tests/Server_Port_Zero/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Server_Port_Zero,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -32,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Single_Read/Makefile.am b/tests/Single_Read/Makefile.am
deleted file mode 100644
index ddbb4285f05..00000000000
--- a/tests/Single_Read/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Single_Read_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Single_Read_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Single_Read_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Single_Read/client.cpp b/tests/Single_Read/client.cpp
index c756e56970d..a7da7ced2c7 100644
--- a/tests/Single_Read/client.cpp
+++ b/tests/Single_Read/client.cpp
@@ -1,12 +1,9 @@
 // $Id$
 
-
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "testC.h"
 
-ACE_RCSID(Timed_Buffered_Oneways, client, "$Id$")
-
 // Name of file contains ior.
 static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 
diff --git a/tests/Single_Read/server.cpp b/tests/Single_Read/server.cpp
index bc3c4eb6698..455d25e9e97 100644
--- a/tests/Single_Read/server.cpp
+++ b/tests/Single_Read/server.cpp
@@ -4,8 +4,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Timed_Buffered_Oneways, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 const ACE_TCHAR *client_done_file = ACE_TEXT("client_done.ior");
 
@@ -35,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Single_Read/test_i.cpp b/tests/Single_Read/test_i.cpp
index 0c8b541d1da..5ff43da0a20 100644
--- a/tests/Single_Read/test_i.cpp
+++ b/tests/Single_Read/test_i.cpp
@@ -3,8 +3,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Single_Read, test_i, "$Id$")
-
 test_i::test_i (CORBA::ORB_ptr orb, const ACE_TCHAR *file_name)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     client_done_ (false),
diff --git a/tests/Single_Read/test_i.h b/tests/Single_Read/test_i.h
index c1218fe34a2..fdf530e5931 100644
--- a/tests/Single_Read/test_i.h
+++ b/tests/Single_Read/test_i.h
@@ -1,31 +1,30 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Single_Read
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_SINGLE_READ_TEST_I_H
 #define TAO_SINGLE_READ_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class test_i
+ *
+ * @brief Simple implementation.
+ */
 class test_i : public POA_test
 {
-  // = TITLE
-  //   Simple implementation.
-  //
 public:
+  /// ctor.
   test_i (CORBA::ORB_ptr orb, const ACE_TCHAR *file_name);
-  // ctor.
 
   // = The test interface methods.
   void method (CORBA::ULong request_number,
diff --git a/tests/Smart_Proxies/Benchmark/Makefile.am b/tests/Smart_Proxies/Benchmark/Makefile.am
deleted file mode 100644
index faee8593cae..00000000000
--- a/tests/Smart_Proxies/Benchmark/Makefile.am
+++ /dev/null
@@ -1,111 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.SP_Benchmark_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_Benchmark_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  client.cpp \
-  testC.cpp \
-  Smart_Proxy_Impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_Benchmark_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  Smart_Proxy_Impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Smart_Proxies/Benchmark/client.cpp b/tests/Smart_Proxies/Benchmark/client.cpp
index 891debe9049..4f26a42e822 100644
--- a/tests/Smart_Proxies/Benchmark/client.cpp
+++ b/tests/Smart_Proxies/Benchmark/client.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/Smart_Proxies/Benchmark
-//
-// = FILENAME
-//     client.cpp
-//
-// = DESCRIPTION
-//     This is the client program that tests TAO's Smart Proxy extension.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *   This is the client program that tests TAO's Smart Proxy extension.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "testC.h"
 #include "Smart_Proxy_Impl.h"
@@ -27,10 +24,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (Benchmark,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int register_smart_proxy = 1;
@@ -59,8 +52,8 @@ class Marker
 
     }
  private:
+  /// Keep throughput statistics on a per-thread basis
   ACE_Throughput_Stats throughput_;
-  // Keep throughput statistics on a per-thread basis
 };
 
 
@@ -184,7 +177,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                           now - latency_base);
 
            if (TAO_debug_level > 0 && i % 100 == 0)
-             ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
+             ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration <%d> - price <%d> - cost <%d>\n",
+                         i, price, cost));
          }
 
        marker.dump_stats (ACE_TEXT("buying tickets "), gsf);
diff --git a/tests/Smart_Proxies/Benchmark/server.cpp b/tests/Smart_Proxies/Benchmark/server.cpp
index 83c30de42f3..e1d7bede99d 100644
--- a/tests/Smart_Proxies/Benchmark/server.cpp
+++ b/tests/Smart_Proxies/Benchmark/server.cpp
@@ -1,27 +1,22 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/Smart_Proxies/Benchmark
-//
-// = FILENAME
-//     server.cpp
-//
-// = DESCRIPTION
-//     This is the server program that tests TAO's Smart Proxy extension.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     server.cpp
+ *
+ *  $Id$
+ *
+ *   This is the server program that tests TAO's Smart Proxy extension.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Benchmark, server, "$Id$")
-
 // The servant
 
 class Test_i : public POA_Test
@@ -34,8 +29,8 @@ public:
   CORBA::Long tickets  (CORBA::Short number);
 
   //FUZZ: disable check_for_lack_ACE_OS
+  ///FUZZ: enable check_for_lack_ACE_OS
   void shutdown  (void);
-  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
@@ -88,7 +83,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Smart_Proxies/Benchmark/test.idl b/tests/Smart_Proxies/Benchmark/test.idl
index 4ff86645b77..5bcb1fa79dd 100644
--- a/tests/Smart_Proxies/Benchmark/test.idl
+++ b/tests/Smart_Proxies/Benchmark/test.idl
@@ -6,7 +6,7 @@ interface Test
   //    A simple test interface
   //
   // = DESCRIPTION
-  //    This test demostrates the smart proxy feature in TAO 
+  //    This test demostrates the smart proxy feature in TAO
   //    and shows how it can improve performace via caching.
 
   short box_prices ();
diff --git a/tests/Smart_Proxies/Collocation/Makefile.am b/tests/Smart_Proxies/Collocation/Makefile.am
deleted file mode 100644
index 7c2237e86ad..00000000000
--- a/tests/Smart_Proxies/Collocation/Makefile.am
+++ /dev/null
@@ -1,135 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_LTLIBRARIES =
-noinst_HEADERS =
-
-## Makefile.SP_Collocation_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  DiamondC.cpp \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.cpp \
-  DiamondS.h \
-  DiamondS.inl
-
-CLEANFILES = \
-  Diamond-stamp \
-  DiamondC.cpp \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.cpp \
-  DiamondS.h \
-  DiamondS.inl
-
-DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp
-
-Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd $(srcdir)/Diamond.idl
-	@touch $@
-
-noinst_HEADERS += \
-  Diamond.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_Collocation_TestStubsLib.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES += libColl_Test_Stubs.la
-
-libColl_Test_Stubs_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DMY_STUB_BUILD_DLL
-
-libColl_Test_Stubs_la_SOURCES = \
-  DiamondC.cpp \
-  Smart_Proxy_Impl.cpp
-
-noinst_HEADERS += \
-  Smart_Proxy_Impl.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_Collocation_DiamondLib.am
-
-if BUILD_EXCEPTIONS
-
-noinst_LTLIBRARIES += libDiamond.la
-
-libDiamond_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DDIAMOND_BUILD_DLL
-
-libDiamond_la_SOURCES = \
-  DiamondS.cpp \
-  Diamond_i.cpp
-
-noinst_HEADERS += \
-  Diamond_i.h
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_Collocation_Test.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = main
-
-main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-main_SOURCES = \
-  Coll_Tester.cpp \
-  main.cpp \
-  Coll_Tester.h
-
-main_LDADD = \
-  libColl_Test_Stubs.la \
-  libDiamond.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Smart_Proxies/Collocation/main.cpp b/tests/Smart_Proxies/Collocation/main.cpp
index 7955d7a9770..d5eceaf8341 100644
--- a/tests/Smart_Proxies/Collocation/main.cpp
+++ b/tests/Smart_Proxies/Collocation/main.cpp
@@ -3,8 +3,6 @@
 #include "Coll_Tester.h"
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(Collocation, main, "$Id$")
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Collocation_Test coll_test;
diff --git a/tests/Smart_Proxies/Collocation/svc.conf b/tests/Smart_Proxies/Collocation/svc.conf
index 285b1297bd4..826ce10d8f7 100644
--- a/tests/Smart_Proxies/Collocation/svc.conf
+++ b/tests/Smart_Proxies/Collocation/svc.conf
@@ -8,7 +8,7 @@ static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocato
 
 # Make sure we use RW client handler so if something goes wrong, the program will bloc,
 # i.e., won't work.
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
 
 # Not absolutely necessary for this test, but we add it for fun.
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null"
+static Server_Strategy_Factory "-ORBConcurrency reactive"
diff --git a/tests/Smart_Proxies/Collocation/svc.conf.xml b/tests/Smart_Proxies/Collocation/svc.conf.xml
index 866550b8838..17e28d20bbd 100644
--- a/tests/Smart_Proxies/Collocation/svc.conf.xml
+++ b/tests/Smart_Proxies/Collocation/svc.conf.xml
@@ -9,7 +9,7 @@
  <static id="Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"/>
  <!--  Make sure we use RW client handler so if something goes wrong, the program will bloc, -->
  <!--  i.e., won't work. -->
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
  <!--  Not absolutely necessary for this test, but we add it for fun. -->
- <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive -ORBPOALock null"/>
+ <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive"/>
 </ACE_Svc_Conf>
diff --git a/tests/Smart_Proxies/Makefile.am b/tests/Smart_Proxies/Makefile.am
deleted file mode 100644
index 879e568b241..00000000000
--- a/tests/Smart_Proxies/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-SUBDIRS = \
-        . \
-        Benchmark \
-        Collocation \
-        On_Demand \
-        Policy \
-        dtor
-
-noinst_PROGRAMS =
-
-## Makefile.Smart_Proxies_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Smart_Proxies_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  client.cpp \
-  testC.cpp \
-  Smart_Proxy_Impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Smart_Proxies_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  Smart_Proxy_Impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Smart_Proxies/On_Demand/Makefile.am b/tests/Smart_Proxies/On_Demand/Makefile.am
deleted file mode 100644
index c4ba6d36b14..00000000000
--- a/tests/Smart_Proxies/On_Demand/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.SP_On_Demand_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_On_Demand_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  Smart_Test_Factory.cpp \
-  client.cpp \
-  testC.cpp \
-  Smart_Proxy_Impl.h \
-  Smart_Test_Factory.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_On_Demand_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  Smart_Proxy_Impl.h \
-  Smart_Test_Factory.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Smart_Proxies/On_Demand/client.cpp b/tests/Smart_Proxies/On_Demand/client.cpp
index 558dddea467..13cd632d504 100644
--- a/tests/Smart_Proxies/On_Demand/client.cpp
+++ b/tests/Smart_Proxies/On_Demand/client.cpp
@@ -1,28 +1,23 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/Smart_Proxy/On_Demand
-//
-// = FILENAME
-//     client.cpp
-//
-// = DESCRIPTION
-//     This is the client program that tests TAO's Smart Proxy extension.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *   This is the client program that tests TAO's Smart Proxy extension.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #define ACE_BUILD_SVC_DLL
 #include "ace/Get_Opt.h"
 #include "testC.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Smart_Proxy, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/tests/Smart_Proxies/On_Demand/server.cpp b/tests/Smart_Proxies/On_Demand/server.cpp
index 0ab01611e34..1da423a2ca8 100644
--- a/tests/Smart_Proxies/On_Demand/server.cpp
+++ b/tests/Smart_Proxies/On_Demand/server.cpp
@@ -1,27 +1,22 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/Smart_Proxy/On_Demand
-//
-// = FILENAME
-//     server.cpp
-//
-// = DESCRIPTION
-//     This is the server program that tests TAO's Smart Proxy extension.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     server.cpp
+ *
+ *  $Id$
+ *
+ *   This is the server program that tests TAO's Smart Proxy extension.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Smart_Proxy, server, "$Id$")
-
 // The servant
 
 class Test_i : public POA_Test
@@ -32,8 +27,8 @@ public:
   CORBA::Short method  (CORBA::Short boo);
 
   //FUZZ: disable check_for_lack_ACE_OS
+  ///FUZZ: enable check_for_lack_ACE_OS
   void shutdown  (void);
-  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
@@ -85,7 +80,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Smart_Proxies/On_Demand/test.idl b/tests/Smart_Proxies/On_Demand/test.idl
index c3478d7e120..0f8886ac634 100644
--- a/tests/Smart_Proxies/On_Demand/test.idl
+++ b/tests/Smart_Proxies/On_Demand/test.idl
@@ -10,7 +10,7 @@ interface Test
   //    which has a method which can be 'smartified'
   //    to provide extra functionality.
 
-  exception Oops 
+  exception Oops
     {
       string reason;
     };
diff --git a/tests/Smart_Proxies/Policy/Makefile.am b/tests/Smart_Proxies/Policy/Makefile.am
deleted file mode 100644
index d21ba51b584..00000000000
--- a/tests/Smart_Proxies/Policy/Makefile.am
+++ /dev/null
@@ -1,111 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.SP_Policy_Idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_Policy_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  client.cpp \
-  testC.cpp \
-  Smart_Proxy_Impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.SP_Policy_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  Smart_Proxy_Impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Smart_Proxies/Policy/client.cpp b/tests/Smart_Proxies/Policy/client.cpp
index 9bbf62c6333..18858ee8601 100644
--- a/tests/Smart_Proxies/Policy/client.cpp
+++ b/tests/Smart_Proxies/Policy/client.cpp
@@ -1,28 +1,23 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/Smart_Proxy
-//
-// = FILENAME
-//     client.cpp
-//
-// = DESCRIPTION
-//     This is the client program that tests TAO's Smart Proxy extension.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *   This is the client program that tests TAO's Smart Proxy extension.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 #include "testC.h"
 #include "Smart_Proxy_Impl.h"
 
-ACE_RCSID(Smart_Proxy, client, "$Id$")
-
 const ACE_TCHAR *ior1 = ACE_TEXT("file://test1.ior");
 const ACE_TCHAR *ior2 = ACE_TEXT("file://test2.ior");
 int one_shot_factory = 1;
diff --git a/tests/Smart_Proxies/Policy/server.cpp b/tests/Smart_Proxies/Policy/server.cpp
index dd5846f3797..33a19e5aff6 100644
--- a/tests/Smart_Proxies/Policy/server.cpp
+++ b/tests/Smart_Proxies/Policy/server.cpp
@@ -1,27 +1,22 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/Smart_Proxy
-//
-// = FILENAME
-//     server.cpp
-//
-// = DESCRIPTION
-//     This is the server program that tests TAO's Smart Proxy extension.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     server.cpp
+ *
+ *  $Id$
+ *
+ *   This is the server program that tests TAO's Smart Proxy extension.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Smart_Proxy, server, "$Id$")
-
 // The servant
 
 class Test_i : public POA_Test
@@ -32,8 +27,8 @@ public:
   CORBA::Short method  (CORBA::Short boo);
 
   //FUZZ: disable check_for_lack_ACE_OS
+  ///FUZZ: enable check_for_lack_ACE_OS
   void shutdown  (void);
-  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
@@ -85,7 +80,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Smart_Proxies/Policy/test.idl b/tests/Smart_Proxies/Policy/test.idl
index f870179f56d..6d98cb1223c 100644
--- a/tests/Smart_Proxies/Policy/test.idl
+++ b/tests/Smart_Proxies/Policy/test.idl
@@ -6,12 +6,12 @@ interface Test
   //    A simple test interface
   //
   // = DESCRIPTION
-  //    This test demostrates the smart proxy feature in TAO 
+  //    This test demostrates the smart proxy feature in TAO
   //    Note that though the interface has two methods just one
-  //    of them can be "smartified" if necessary, the other one 
+  //    of them can be "smartified" if necessary, the other one
   //    simply performs the same way as would the default proxy.
 
-  exception Oops 
+  exception Oops
     {
       string reason;
     };
diff --git a/tests/Smart_Proxies/client.cpp b/tests/Smart_Proxies/client.cpp
index 621d6fd794f..2000a28b4b2 100644
--- a/tests/Smart_Proxies/client.cpp
+++ b/tests/Smart_Proxies/client.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/Smart_Proxy
-//
-// = FILENAME
-//     client.cpp
-//
-// = DESCRIPTION
-//     This is the client program that tests TAO's Smart Proxy extension.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *   This is the client program that tests TAO's Smart Proxy extension.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "testC.h"
@@ -22,8 +19,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Smart_Proxy, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/tests/Smart_Proxies/dtor/Makefile.am b/tests/Smart_Proxies/dtor/Makefile.am
deleted file mode 100644
index 3eb71ba82e0..00000000000
--- a/tests/Smart_Proxies/dtor/Makefile.am
+++ /dev/null
@@ -1,112 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.dtor_idl.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Dtor_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  client.cpp \
-  testC.cpp \
-  Smart_Proxy_Impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Dtor_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  Smart_Proxy_Impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Smart_Proxies/dtor/server.cpp b/tests/Smart_Proxies/dtor/server.cpp
index f5ed8b0cf6e..ffbcf770d1b 100644
--- a/tests/Smart_Proxies/dtor/server.cpp
+++ b/tests/Smart_Proxies/dtor/server.cpp
@@ -59,7 +59,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Smart_Proxies/dtor/test.idl b/tests/Smart_Proxies/dtor/test.idl
index 5ab792d6458..06d125afd30 100644
--- a/tests/Smart_Proxies/dtor/test.idl
+++ b/tests/Smart_Proxies/dtor/test.idl
@@ -1,11 +1,11 @@
 //$Id$
 
-// This test is to ensure if the destruction process 
-// and the _non_existent() function in the smart proxy 
-// is working properly. 
+// This test is to ensure if the destruction process
+// and the _non_existent() function in the smart proxy
+// is working properly.
 
 
-interface Test 
+interface Test
 {
   void hello (in long howmany);
   oneway void shutdown ();
diff --git a/tests/Smart_Proxies/server.cpp b/tests/Smart_Proxies/server.cpp
index 3b3592d2d23..45705ad98aa 100644
--- a/tests/Smart_Proxies/server.cpp
+++ b/tests/Smart_Proxies/server.cpp
@@ -1,27 +1,22 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/Smart_Proxy
-//
-// = FILENAME
-//     server.cpp
-//
-// = DESCRIPTION
-//     This is the server program that tests TAO's Smart Proxy extension.
-//
-// = AUTHOR
-//     Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-//=========================================================================
+
+//=============================================================================
+/**
+ *  @file     server.cpp
+ *
+ *  $Id$
+ *
+ *   This is the server program that tests TAO's Smart Proxy extension.
+ *
+ *
+ *  @author  Kirthika Parameswaran <kirthika@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Smart_Proxy, server, "$Id$")
-
 // The servant
 
 class Test_i : public POA_Test
@@ -32,8 +27,8 @@ public:
   CORBA::Short method  (CORBA::Short boo);
 
   //FUZZ: disable check_for_lack_ACE_OS
+  ///FUZZ: enable check_for_lack_ACE_OS
   void shutdown  (void);
-  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
@@ -85,7 +80,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Smart_Proxies/test.idl b/tests/Smart_Proxies/test.idl
index f870179f56d..6d98cb1223c 100644
--- a/tests/Smart_Proxies/test.idl
+++ b/tests/Smart_Proxies/test.idl
@@ -6,12 +6,12 @@ interface Test
   //    A simple test interface
   //
   // = DESCRIPTION
-  //    This test demostrates the smart proxy feature in TAO 
+  //    This test demostrates the smart proxy feature in TAO
   //    Note that though the interface has two methods just one
-  //    of them can be "smartified" if necessary, the other one 
+  //    of them can be "smartified" if necessary, the other one
   //    simply performs the same way as would the default proxy.
 
-  exception Oops 
+  exception Oops
     {
       string reason;
     };
diff --git a/tests/Stack_Recursion/Client_Task.cpp b/tests/Stack_Recursion/Client_Task.cpp
index 61ae3c5e451..9bbaa1a9caf 100644
--- a/tests/Stack_Recursion/Client_Task.cpp
+++ b/tests/Stack_Recursion/Client_Task.cpp
@@ -4,10 +4,6 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(Stack_Recursion,
-          Client_Task,
-          "$Id$")
-
 Client_Task::Client_Task (Test::Sender_ptr sender,
                           CORBA::Long event_count,
                           CORBA::ULong event_size,
diff --git a/tests/Stack_Recursion/Makefile.am b/tests/Stack_Recursion/Makefile.am
deleted file mode 100644
index e6df4960f7b..00000000000
--- a/tests/Stack_Recursion/Makefile.am
+++ /dev/null
@@ -1,109 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Stack_Recursion_Idl.am
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Stack_Recursion_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Stack_Recursion_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Sender.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Sender.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Stack_Recursion/Sender.cpp b/tests/Stack_Recursion/Sender.cpp
index e82205e3e05..c221af4b87c 100644
--- a/tests/Stack_Recursion/Sender.cpp
+++ b/tests/Stack_Recursion/Sender.cpp
@@ -3,10 +3,6 @@
 //
 #include "Sender.h"
 
-ACE_RCSID(Stack_Recursion,
-          Sender,
-          "$Id$")
-
 Sender::Sender (CORBA::ORB_ptr orb)
   :  message_count_ (0)
   ,  byte_count_ (0)
diff --git a/tests/Stack_Recursion/Server_Task.cpp b/tests/Stack_Recursion/Server_Task.cpp
index ffacc6abae5..15daa14ac9a 100644
--- a/tests/Stack_Recursion/Server_Task.cpp
+++ b/tests/Stack_Recursion/Server_Task.cpp
@@ -5,10 +5,6 @@
 #include "Server_Task.h"
 #include "Sender.h"
 
-ACE_RCSID(Stack_Recusrion,
-          Server_Task,
-          "$Id$")
-
 Server_Task::Server_Task (CORBA::ORB_ptr orb,
                           const Sender *sender,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/tests/Stack_Recursion/client.cpp b/tests/Stack_Recursion/client.cpp
index 975cd259671..5f7e03858c6 100644
--- a/tests/Stack_Recursion/client.cpp
+++ b/tests/Stack_Recursion/client.cpp
@@ -3,10 +3,6 @@
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Stack_Recursion,
-          client,
-          "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 static int iterations = 1000;
 
@@ -34,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Stack_Recursion/server.cpp b/tests/Stack_Recursion/server.cpp
index 4e0a0cafe83..93f40f4df09 100644
--- a/tests/Stack_Recursion/server.cpp
+++ b/tests/Stack_Recursion/server.cpp
@@ -4,10 +4,6 @@
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Stack_Recursion,
-          server,
-          "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -31,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Strategies/Makefile.am b/tests/Strategies/Makefile.am
deleted file mode 100644
index 7c2193af698..00000000000
--- a/tests/Strategies/Makefile.am
+++ /dev/null
@@ -1,123 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Strategies_Idl.am
-
-BUILT_SOURCES = \
-  simple_testC.cpp \
-  simple_testC.h \
-  simple_testC.inl \
-  simple_testS.cpp \
-  simple_testS.h \
-  simple_testS.inl
-
-CLEANFILES = \
-  simple_test-stamp \
-  simple_testC.cpp \
-  simple_testC.h \
-  simple_testC.inl \
-  simple_testS.cpp \
-  simple_testS.h \
-  simple_testS.inl
-
-simple_testC.cpp simple_testC.h simple_testC.inl simple_testS.cpp simple_testS.h simple_testS.inl: simple_test-stamp
-
-simple_test-stamp: $(srcdir)/simple_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple_test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  simple_test.idl
-
-## Makefile.Strategies_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  simple_testC.cpp \
-  simple_test_i.h \
-  simple_test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Strategies_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  simple_testC.cpp \
-  simple_testS.cpp \
-  simple_test_i.cpp \
-  simple_test_i.h \
-  simple_test_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Strategies/client.cpp b/tests/Strategies/client.cpp
index 72b531d4f32..7d1dd8c33bf 100644
--- a/tests/Strategies/client.cpp
+++ b/tests/Strategies/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Task.h"
 #include "simple_testC.h"
 
-ACE_RCSID(tests, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int server_shutdown = 0;
 
@@ -34,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Strategies/server.cpp b/tests/Strategies/server.cpp
index e896098d5af..75cf6830738 100644
--- a/tests/Strategies/server.cpp
+++ b/tests/Strategies/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "simple_test_i.h"
 
-ACE_RCSID(tests, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Strategies/simple_test_i.cpp b/tests/Strategies/simple_test_i.cpp
index fc61c63ee2d..bbb6b1c07fb 100644
--- a/tests/Strategies/simple_test_i.cpp
+++ b/tests/Strategies/simple_test_i.cpp
@@ -7,8 +7,6 @@
 #include "simple_test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(tests, simple_test_i, "$Id$")
-
 CORBA::Boolean
 Simple_Server_i::print_status (void)
 {
diff --git a/tests/Strategies/simple_test_i.h b/tests/Strategies/simple_test_i.h
index c2680214a24..1077e9f1a54 100644
--- a/tests/Strategies/simple_test_i.h
+++ b/tests/Strategies/simple_test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tao/Strategies/tests/
-//
-// = FILENAME
-//   simple_test_i.h
-//
-// = AUTHOR
-//     Priyanka Gontla <pgontla@ece.uci.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   simple_test_i.h
+ *
+ *  $Id$
+ *
+ *  @author  Priyanka Gontla <pgontla@ece.uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_STRATEGIES_TEST_I_H
 #define TAO_STRATEGIES_TEST_I_H
 
 #include "simple_testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Boolean print_status (void);
diff --git a/tests/Timed_Buffered_Oneways/Makefile.am b/tests/Timed_Buffered_Oneways/Makefile.am
deleted file mode 100644
index 120dbfcb5d0..00000000000
--- a/tests/Timed_Buffered_Oneways/Makefile.am
+++ /dev/null
@@ -1,119 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Timed_Buffered_Oneways_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Timed_Buffered_Oneways_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Timed_Buffered_Oneways_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Timed_Buffered_Oneways/client.cpp b/tests/Timed_Buffered_Oneways/client.cpp
index 6bc6276367b..bd6881ba7a4 100644
--- a/tests/Timed_Buffered_Oneways/client.cpp
+++ b/tests/Timed_Buffered_Oneways/client.cpp
@@ -1,18 +1,18 @@
-// $Id$
-
-// ================================================================
-//
-// = FILENAME
-//     client.cpp
-//
-// = DESCRIPTION
-//     This is a client that uses oneways with buffering constraints
-//     and roundtrip timeout constraints.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ================================================================
+
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *   This is a client that uses oneways with buffering constraints
+ *   and roundtrip timeout constraints.
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "testC.h"
 
@@ -25,8 +25,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID(Timed_Buffered_Oneways, client, "$Id$")
-
 // Eager buffering option.
 static int eager_buffering = 0;
 
diff --git a/tests/Timed_Buffered_Oneways/server.cpp b/tests/Timed_Buffered_Oneways/server.cpp
index 2a50e5d639d..612df69b35f 100644
--- a/tests/Timed_Buffered_Oneways/server.cpp
+++ b/tests/Timed_Buffered_Oneways/server.cpp
@@ -4,8 +4,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Timed_Buffered_Oneways, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 
 int
@@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Timed_Buffered_Oneways/test_i.cpp b/tests/Timed_Buffered_Oneways/test_i.cpp
index d27303d7a99..62fce048a11 100644
--- a/tests/Timed_Buffered_Oneways/test_i.cpp
+++ b/tests/Timed_Buffered_Oneways/test_i.cpp
@@ -5,8 +5,6 @@
 #include "ace/OS_NS_sys_time.h"
 #include "ace/Time_Value.h"
 
-ACE_RCSID(Timed_Buffered_Oneways, test_i, "$Id$")
-
 test_i::test_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/tests/Timed_Buffered_Oneways/test_i.h b/tests/Timed_Buffered_Oneways/test_i.h
index 6a8e13412fe..7dc48785cb1 100644
--- a/tests/Timed_Buffered_Oneways/test_i.h
+++ b/tests/Timed_Buffered_Oneways/test_i.h
@@ -1,32 +1,31 @@
 // -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Timed_Buffered_Oneways/
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Irfan Pyarali
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
 
 #ifndef TAO_TIMED_BUFFERED_ONEWAYS_TEST_I_H
 #define TAO_TIMED_BUFFERED_ONEWAYS_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class test_i
+ *
+ * @brief Simple implementation.
+ */
 class test_i : public POA_test
 {
-  // = TITLE
-  //   Simple implementation.
-  //
 public:
+  /// ctor.
   test_i (CORBA::ORB_ptr orb);
-  // ctor.
 
   // = The test interface methods.
   void method (CORBA::ULong request_number,
@@ -39,8 +38,8 @@ public:
   void shutdown (CORBA::Long start_time);
 
 private:
+  /// The ORB.
   CORBA::ORB_var orb_;
-  // The ORB.
 };
 
 #endif /* TAO_TIMED_BUFFERED_ONEWAYS_TEST_I_H */
diff --git a/tests/Timeout/Makefile.am b/tests/Timeout/Makefile.am
deleted file mode 100644
index 51dbe32d08e..00000000000
--- a/tests/Timeout/Makefile.am
+++ /dev/null
@@ -1,113 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Timeout_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Timeout_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Timeout_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Timeout/client.cpp b/tests/Timeout/client.cpp
index 755d3da6daf..a5b94214917 100644
--- a/tests/Timeout/client.cpp
+++ b/tests/Timeout/client.cpp
@@ -6,8 +6,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Timeout, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 int min_timeout = 0;
 int max_timeout = 20;
diff --git a/tests/Timeout/server.cpp b/tests/Timeout/server.cpp
index 7812e2261e4..1e66973cff6 100644
--- a/tests/Timeout/server.cpp
+++ b/tests/Timeout/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Timeout, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -31,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Timeout/test_i.cpp b/tests/Timeout/test_i.cpp
index e75b0e611ce..4dec77755fe 100644
--- a/tests/Timeout/test_i.cpp
+++ b/tests/Timeout/test_i.cpp
@@ -4,8 +4,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID(Timeout, test_i, "$Id$")
-
 ACE_High_Res_Timer sleep_duration;
 
 
diff --git a/tests/Timeout/test_i.h b/tests/Timeout/test_i.h
index 8c102e3a1b7..eb3d07084a5 100644
--- a/tests/Timeout/test_i.h
+++ b/tests/Timeout/test_i.h
@@ -1,34 +1,32 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Timeout
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_TIMEOUT_TEST_I_H
 #define TAO_TIMEOUT_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
@@ -36,8 +34,8 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 };
 
 #endif /* TAO_TIMEOUT_TEST_I_H */
diff --git a/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
index 0697c11ac4c..b3f28bd21f5 100644
--- a/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
+++ b/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
@@ -1,19 +1,16 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/TransportCurrent/TCC.h"
 
 #include "Current_Test_Impl.h"
 
-ACE_RCSID (Transport_Current,
-           Current_Test_Impl,
-           "$Id$")
-
-  Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb,
-                                        PortableServer::POA_ptr poa,
-                                        int do_collocated_calls)
-    : orb_ (CORBA::ORB::_duplicate (orb))
-    , poa_ (PortableServer::POA::_duplicate (poa))
-    , do_collocated_calls_ (do_collocated_calls)
+Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb,
+                                      PortableServer::POA_ptr poa,
+                                      int do_collocated_calls)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+  , poa_ (PortableServer::POA::_duplicate (poa))
+  , do_collocated_calls_ (do_collocated_calls)
 {
 }
 
diff --git a/tests/TransportCurrent/Framework/Makefile.am b/tests/TransportCurrent/Framework/Makefile.am
deleted file mode 100644
index 236db0d4797..00000000000
--- a/tests/TransportCurrent/Framework/Makefile.am
+++ /dev/null
@@ -1,103 +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:
-## ../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.Framework_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_TRANSPORT_CURRENT
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib \
-  -I../lib
-
-server_SOURCES = \
-  Current_Test_Impl.cpp \
-  Server_Main.cpp \
-  Tester.cpp \
-  server.cpp
-
-server_LDADD = \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_TRANSPORT_CURRENT
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Framework_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_TRANSPORT_CURRENT
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib \
-  -I../lib
-
-client_SOURCES = \
-  Tester.cpp \
-  client.cpp
-
-client_LDADD = \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_TRANSPORT_CURRENT
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/TransportCurrent/Framework/Server_Main.cpp b/tests/TransportCurrent/Framework/Server_Main.cpp
index a11a01d1f00..c6d7ad97d0f 100644
--- a/tests/TransportCurrent/Framework/Server_Main.cpp
+++ b/tests/TransportCurrent/Framework/Server_Main.cpp
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 // $Id$
 
 #include "Server_Request_Interceptor.h"
diff --git a/tests/TransportCurrent/Framework/Tester.cpp b/tests/TransportCurrent/Framework/Tester.cpp
index 1bc137d006e..a17fec6c9d2 100644
--- a/tests/TransportCurrent/Framework/Tester.cpp
+++ b/tests/TransportCurrent/Framework/Tester.cpp
@@ -5,7 +5,6 @@
 
 using namespace TAO;
 
-
 /// Test referencing the TC data outside of the context of an upcall,
 /// or a client-side interceptor
 
diff --git a/tests/TransportCurrent/Framework/client-static.conf b/tests/TransportCurrent/Framework/client-static.conf
index 0f63cfe7965..ecdf64130c6 100644
--- a/tests/TransportCurrent/Framework/client-static.conf
+++ b/tests/TransportCurrent/Framework/client-static.conf
@@ -1 +1,3 @@
+# $Id$
+
 static TAO_Transport_Current_Loader ""
diff --git a/tests/TransportCurrent/Framework/client.conf b/tests/TransportCurrent/Framework/client.conf
index aecb1923f83..4d67c4ff957 100644
--- a/tests/TransportCurrent/Framework/client.conf
+++ b/tests/TransportCurrent/Framework/client.conf
@@ -1 +1,3 @@
+# $Id$
+
 dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() ""
diff --git a/tests/TransportCurrent/Framework/client.cpp b/tests/TransportCurrent/Framework/client.cpp
index 33c1a6b83ee..48b63aaba8e 100644
--- a/tests/TransportCurrent/Framework/client.cpp
+++ b/tests/TransportCurrent/Framework/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
@@ -13,10 +14,6 @@
 
 #include "Client_ORBInitializer.h"
 
-ACE_RCSID (PICurrent,
-           client,
-           "$Id$")
-
 // Prototype
 
 int
diff --git a/tests/TransportCurrent/Framework/server-static.conf b/tests/TransportCurrent/Framework/server-static.conf
index 0f63cfe7965..ecdf64130c6 100644
--- a/tests/TransportCurrent/Framework/server-static.conf
+++ b/tests/TransportCurrent/Framework/server-static.conf
@@ -1 +1,3 @@
+# $Id$
+
 static TAO_Transport_Current_Loader ""
diff --git a/tests/TransportCurrent/Framework/server.conf b/tests/TransportCurrent/Framework/server.conf
index aecb1923f83..4d67c4ff957 100644
--- a/tests/TransportCurrent/Framework/server.conf
+++ b/tests/TransportCurrent/Framework/server.conf
@@ -1 +1,3 @@
+# $Id$
+
 dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() ""
diff --git a/tests/TransportCurrent/Framework/server.cpp b/tests/TransportCurrent/Framework/server.cpp
index 6bb4bf2412f..f4f14a14a7a 100644
--- a/tests/TransportCurrent/Framework/server.cpp
+++ b/tests/TransportCurrent/Framework/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
@@ -10,10 +11,6 @@
 #include "Server_Request_Interceptor.h"
 #include "Server_ORBInitializer.h"
 
-ACE_RCSID (Transport_Current,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior");
 int nthreads = 1;
 int use_collocated_call = 1;
@@ -50,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/TransportCurrent/Framework/simple.cpp b/tests/TransportCurrent/Framework/simple.cpp
index 5e6a3d92beb..0b5d3a458b2 100644
--- a/tests/TransportCurrent/Framework/simple.cpp
+++ b/tests/TransportCurrent/Framework/simple.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/ORB.h"
 #include "tao/Object.h"
@@ -6,10 +7,6 @@
 #include "ace/Service_Config.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (Transport_Current,
-           simple,
-           "$Id$")
-
 int
 testCurrentORBInitializer (int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
index c113ed14627..82f2f56d9ea 100644
--- a/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
+++ b/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
@@ -1,15 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "tao/TransportCurrent/TC_IIOPC.h"
 #include "tao/TransportCurrent/TCC.h"
 
 #include "Current_Test_Impl.h"
 
-ACE_RCSID (Transport_Current,
-           Current_Test_Impl,
-           "$Id$")
-
-
 Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb,
                                       PortableServer::POA_ptr poa,
                                       int do_collocated_calls)
diff --git a/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp b/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
index c4ed3e82c24..3005a704841 100644
--- a/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
+++ b/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 // $Id$
 
 #include "IIOP_Server_Request_Interceptor.h"
diff --git a/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
index a7d21f99423..b0918b36806 100644
--- a/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
+++ b/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
@@ -1,13 +1,10 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Constants.h"
 #include "tao/TransportCurrent/TC_IIOPC.h"
 
-ACE_RCSID (ForwardRequest,
-           Server_Request_Interceptor,
-           "$Id$")
-
 #include "IIOP_Server_Request_Interceptor.h"
 
 namespace Test {
@@ -162,8 +159,6 @@ namespace Test {
       && !has_remaining_endpoints;
   }
 
-
-
   void
   IIOP_Server_Request_Interceptor::inbound_process_context  (PortableInterceptor::ServerRequestInfo_ptr ri)
   {
@@ -216,11 +211,6 @@ namespace Test {
     this->pop_request_info (ACE_OS::atoi (buf));
   }
 
-
-
-
-
-
   void
   IIOP_Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri)
   {
@@ -241,7 +231,6 @@ namespace Test {
 
   }
 
-
   void
   IIOP_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
   {
diff --git a/tests/TransportCurrent/IIOP/Makefile.am b/tests/TransportCurrent/IIOP/Makefile.am
deleted file mode 100644
index bfad7062390..00000000000
--- a/tests/TransportCurrent/IIOP/Makefile.am
+++ /dev/null
@@ -1,108 +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:
-## ../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.IIOP_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_TRANSPORT_CURRENT
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib \
-  -I../lib
-
-server_SOURCES = \
-  Current_Test_Impl.cpp \
-  IIOP_Server_Main.cpp \
-  IIOP_Server_Request_Interceptor.cpp \
-  IIOP_Tester.cpp \
-  server.cpp \
-  IIOP_Server_Request_Interceptor.h
-
-server_LDADD = \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TC_IIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_TRANSPORT_CURRENT
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.IIOP_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_TRANSPORT_CURRENT
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../lib \
-  -I../lib
-
-client_SOURCES = \
-  IIOP_Tester.cpp \
-  client.cpp \
-  IIOP_Server_Request_Interceptor.h
-
-client_LDADD = \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \
-  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TC_IIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_TC.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_TRANSPORT_CURRENT
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/TransportCurrent/IIOP/client.cpp b/tests/TransportCurrent/IIOP/client.cpp
index 7e7c5138f9b..5faa5e6ca69 100644
--- a/tests/TransportCurrent/IIOP/client.cpp
+++ b/tests/TransportCurrent/IIOP/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
@@ -13,10 +14,6 @@
 
 #include "Client_ORBInitializer.h"
 
-ACE_RCSID (IIOP,
-           client,
-           "$Id$")
-
 // Prototype
 
 int
diff --git a/tests/TransportCurrent/IIOP/client_dynamic.conf b/tests/TransportCurrent/IIOP/client_dynamic.conf
index 56ff8d9c269..804e5d98153 100644
--- a/tests/TransportCurrent/IIOP/client_dynamic.conf
+++ b/tests/TransportCurrent/IIOP/client_dynamic.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static Client_Strategy_Factory "-ORBTransportMuxStrategy exclusive"
 dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() ""
 dynamic TAO_Transport_IIOP_Current_Loader Service_Object * TAO_TC_IIOP:_make_TAO_Transport_IIOP_Current_Loader() ""
diff --git a/tests/TransportCurrent/IIOP/client_static.conf b/tests/TransportCurrent/IIOP/client_static.conf
index 56e191b9257..91095d4f9d2 100644
--- a/tests/TransportCurrent/IIOP/client_static.conf
+++ b/tests/TransportCurrent/IIOP/client_static.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 static TAO_Transport_Current_Loader ""
 static TAO_Transport_IIOP_Current_Loader ""
 static Client_Strategy_Factory "-ORBTransportMuxStrategy exclusive"
diff --git a/tests/TransportCurrent/IIOP/server.cpp b/tests/TransportCurrent/IIOP/server.cpp
index ae2d595b403..ec3f6611858 100644
--- a/tests/TransportCurrent/IIOP/server.cpp
+++ b/tests/TransportCurrent/IIOP/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
@@ -10,11 +11,6 @@
 #include "Server_Request_Interceptor.h"
 #include "Server_ORBInitializer.h"
 
-
-ACE_RCSID (Transport_Current,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior");
 int nthreads = 1;
 int use_collocated_call = 1;
@@ -51,14 +47,11 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
-
-
 /// A helper class to encapsulate a task
-
 class Worker : public ACE_Task_Base
 {
 public:
@@ -72,16 +65,13 @@ private:
 
 
 /// Ctor
-
 Worker::Worker (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
-
 /// Test referencing the TC data *inside* the context of a client-side
 /// interceptor
-
 int
 Worker::svc (void)
 {
diff --git a/tests/TransportCurrent/IIOP/server_dynamic.conf b/tests/TransportCurrent/IIOP/server_dynamic.conf
index df5758abd32..2456796ebbe 100644
--- a/tests/TransportCurrent/IIOP/server_dynamic.conf
+++ b/tests/TransportCurrent/IIOP/server_dynamic.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() ""
 dynamic TAO_Transport_IIOP_Current_Loader Service_Object * TAO_TC_IIOP:_make_TAO_Transport_IIOP_Current_Loader() ""
diff --git a/tests/TransportCurrent/IIOP/server_static.conf b/tests/TransportCurrent/IIOP/server_static.conf
index a3bca724d53..580aaef1564 100644
--- a/tests/TransportCurrent/IIOP/server_static.conf
+++ b/tests/TransportCurrent/IIOP/server_static.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 static TAO_Transport_Current_Loader ""
 static TAO_Transport_IIOP_Current_Loader ""
diff --git a/tests/TransportCurrent/Makefile.am b/tests/TransportCurrent/Makefile.am
deleted file mode 100644
index 31b17045a69..00000000000
--- a/tests/TransportCurrent/Makefile.am
+++ /dev/null
@@ -1,15 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        lib \
-        IIOP \
-        Framework
-
diff --git a/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
index c2bf2000119..d137ab4288c 100644
--- a/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
+++ b/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Current_Test_Lib,
-           Client_ORBInitializer,
-           "$Id$")
-
 #include "Client_Request_Interceptor.h"
 #include "Client_ORBInitializer.h"
 
diff --git a/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
index 8a27b51a923..db233e7864e 100644
--- a/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
+++ b/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ForwardRequest,
-           Client_Request_Interceptor,
-           "$Id$")
-
 #include "Current_TestC.h"
 #include "Client_Request_Interceptor.h"
 #include "Client_ORBInitializer.h"
diff --git a/tests/TransportCurrent/lib/Current_Test.idl b/tests/TransportCurrent/lib/Current_Test.idl
index a7f00f7d29f..9d38734be71 100644
--- a/tests/TransportCurrent/lib/Current_Test.idl
+++ b/tests/TransportCurrent/lib/Current_Test.idl
@@ -13,8 +13,6 @@
  */
 //=============================================================================
 
-
-
 module Test
 {
   module Transport
diff --git a/tests/TransportCurrent/lib/Makefile.am b/tests/TransportCurrent/lib/Makefile.am
deleted file mode 100644
index 1c92e6dc390..00000000000
--- a/tests/TransportCurrent/lib/Makefile.am
+++ /dev/null
@@ -1,114 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_LTLIBRARIES =
-
-## Makefile.Current_Test_Lib_Idl.am
-
-BUILT_SOURCES = \
-  Current_TestC.cpp \
-  Current_TestC.h \
-  Current_TestC.inl \
-  Current_TestS.cpp \
-  Current_TestS.h \
-  Current_TestS.inl
-
-CLEANFILES = \
-  Current_Test-stamp \
-  Current_TestC.cpp \
-  Current_TestC.h \
-  Current_TestC.inl \
-  Current_TestS.cpp \
-  Current_TestS.h \
-  Current_TestS.inl
-
-Current_TestC.cpp Current_TestC.h Current_TestC.inl Current_TestS.cpp Current_TestS.h Current_TestS.inl: Current_Test-stamp
-
-Current_Test-stamp: $(srcdir)/Current_Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,export_include=Current_Test_Export.h -Wb,export_macro=Current_Test_Export $(srcdir)/Current_Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Current_Test.idl
-
-## Makefile.Current_Test_Lib_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_TRANSPORT_CURRENT
-
-noinst_LTLIBRARIES += libCurrent_Test_Lib_Client.la
-
-libCurrent_Test_Lib_Client_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I. \
-  -DCURRENT_TEST_BUILD_DLL
-
-libCurrent_Test_Lib_Client_la_SOURCES = \
-  Client_ORBInitializer.cpp \
-  Client_Request_Interceptor.cpp \
-  Current_TestC.cpp
-
-noinst_HEADERS += \
-  Client_ORBInitializer.h \
-  Client_Request_Interceptor.h
-
-endif BUILD_TRANSPORT_CURRENT
-endif BUILD_INTERCEPTORS
-endif BUILD_EXCEPTIONS
-
-## Makefile.Current_Test_Lib_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
-if BUILD_TRANSPORT_CURRENT
-
-noinst_LTLIBRARIES += libCurrent_Test_Lib_Server.la
-
-libCurrent_Test_Lib_Server_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I. \
-  -DCURRENT_TEST_BUILD_DLL
-
-libCurrent_Test_Lib_Server_la_SOURCES = \
-  Current_TestC.cpp \
-  Current_TestS.cpp \
-  Server_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp
-
-noinst_HEADERS += \
-  Server_ORBInitializer.h \
-  Server_Request_Interceptor.h
-
-endif BUILD_TRANSPORT_CURRENT
-endif BUILD_INTERCEPTORS
-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/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
index 8e866e97052..c8d3752852d 100644
--- a/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
+++ b/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Current_Test_Lib,
-           Server_ORBInitializer,
-           "$Id$")
-
 #include "Server_Request_Interceptor.h"
 #include "Server_ORBInitializer.h"
 
diff --git a/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
index 27b85d96434..13a739ca479 100644
--- a/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
+++ b/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Current_Test_Lib,
-           Server_Request_Interceptor,
-           "$Id$")
-
 #include "Server_Request_Interceptor.h"
 #include "Server_ORBInitializer.h"
 
diff --git a/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp b/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
index ff63da47815..cedde496a0d 100644
--- a/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
+++ b/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
@@ -60,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
               ++result;
             }
         }
- 
+
      if (mytransport[0].purged_count () != 1)
        {
          ACE_ERROR ((LM_ERROR, "ERROR Incorrect purged count for transport 0: %d\n", mytransport[0].purged_count ()));
diff --git a/tests/Transport_Cache_Manager/mock_ps.h b/tests/Transport_Cache_Manager/mock_ps.h
index 6c6631d8c07..1ac46cc79ab 100644
--- a/tests/Transport_Cache_Manager/mock_ps.h
+++ b/tests/Transport_Cache_Manager/mock_ps.h
@@ -4,7 +4,7 @@ class mock_ps
 {
 public:
   mock_ps (int max) : maximum_ (max) {}
-  void update_item (mock_transport*) {}
+  void update_item (mock_transport&) {}
   int cache_maximum () { return this->maximum_;}
 private:
   int maximum_;
diff --git a/tests/Two_Objects/First_i.cpp b/tests/Two_Objects/First_i.cpp
index ffe3470c864..ca3287f6e3d 100644
--- a/tests/Two_Objects/First_i.cpp
+++ b/tests/Two_Objects/First_i.cpp
@@ -9,8 +9,6 @@
 #include "ace/Synch.h"
 #include "ace/Auto_Event.h"
 
-ACE_RCSID(Test, First_i, "$Id$")
-
 First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     two_way_done_(two_way_done)
diff --git a/tests/Two_Objects/Makefile.am b/tests/Two_Objects/Makefile.am
deleted file mode 100644
index b21da08d4be..00000000000
--- a/tests/Two_Objects/Makefile.am
+++ /dev/null
@@ -1,115 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Two_Objects_Idl.am
-
-BUILT_SOURCES = \
-  Two_ObjectsC.cpp \
-  Two_ObjectsC.h \
-  Two_ObjectsC.inl \
-  Two_ObjectsS.cpp \
-  Two_ObjectsS.h \
-  Two_ObjectsS.inl
-
-CLEANFILES = \
-  Two_Objects-stamp \
-  Two_ObjectsC.cpp \
-  Two_ObjectsC.h \
-  Two_ObjectsC.inl \
-  Two_ObjectsS.cpp \
-  Two_ObjectsS.h \
-  Two_ObjectsS.inl
-
-Two_ObjectsC.cpp Two_ObjectsC.h Two_ObjectsC.inl Two_ObjectsS.cpp Two_ObjectsS.h Two_ObjectsS.inl: Two_Objects-stamp
-
-Two_Objects-stamp: $(srcdir)/Two_Objects.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Two_Objects.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Two_Objects.idl
-
-## Makefile.Two_Objects_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Two_ObjectsC.cpp \
-  client.cpp \
-  First_i.h \
-  Object_Factory_i.h \
-  Second_i.h \
-  worker.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Two_Objects_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  First_i.cpp \
-  Object_Factory_i.cpp \
-  Second_i.cpp \
-  Two_ObjectsC.cpp \
-  Two_ObjectsS.cpp \
-  server.cpp \
-  worker.cpp \
-  First_i.h \
-  Object_Factory_i.h \
-  Second_i.h \
-  worker.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Two_Objects/Object_Factory_i.cpp b/tests/Two_Objects/Object_Factory_i.cpp
index 426ab1c5052..b7775ca7721 100644
--- a/tests/Two_Objects/Object_Factory_i.cpp
+++ b/tests/Two_Objects/Object_Factory_i.cpp
@@ -7,9 +7,6 @@
 #include "Object_Factory_i.h"
 #include "ace/Synch.h"
 
-ACE_RCSID(Test, Test, "$Id$")
-
-
 Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     length_(len)
@@ -31,8 +28,8 @@ Object_Factory_i::create_first (void)
   CORBA::Object_var poa_object =
     this->orb_->resolve_initial_references("RootPOA");
 
-  PortableServer::POA_var root_poa =    
-    PortableServer::POA::_narrow (poa_object.in ()); 
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::ObjectId_var id =
     root_poa->activate_object (first_impl);
@@ -61,8 +58,8 @@ Object_Factory_i::create_second (void)
   CORBA::Object_var poa_object =
     this->orb_->resolve_initial_references("RootPOA");
 
-  PortableServer::POA_var root_poa =    
-    PortableServer::POA::_narrow (poa_object.in ()); 
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::ObjectId_var id =
     root_poa->activate_object (second_impl);
diff --git a/tests/Two_Objects/Second_i.cpp b/tests/Two_Objects/Second_i.cpp
index 462864406a7..a4cc32c1562 100644
--- a/tests/Two_Objects/Second_i.cpp
+++ b/tests/Two_Objects/Second_i.cpp
@@ -7,12 +7,6 @@
 #include "tao/Thread_Lane_Resources.h"
 #include "ace/Auto_Event.h"
 
-
-ACE_RCSID (Two_Objects,
-           Second_i,
-           "$Id$")
-
-
 Second_i::Second_i (CORBA::ORB_ptr orb,
                     CORBA::ULong len, ACE_Auto_Event &two_way_done)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/tests/Two_Objects/client.cpp b/tests/Two_Objects/client.cpp
index df4b10ff103..72213d9df43 100644
--- a/tests/Two_Objects/client.cpp
+++ b/tests/Two_Objects/client.cpp
@@ -3,8 +3,6 @@
 #include "Two_ObjectsC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Test, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Two_Objects/server.cpp b/tests/Two_Objects/server.cpp
index 18a19d7071f..c1713a14618 100644
--- a/tests/Two_Objects/server.cpp
+++ b/tests/Two_Objects/server.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(Test, server, "$Id$")
-
 int msglen = 100; //default length of reply message is 100 bytes
 int nthreads = 2;
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
@@ -43,7 +41,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Typedef_String_Array/Makefile.am b/tests/Typedef_String_Array/Makefile.am
deleted file mode 100644
index 65e4c0466c0..00000000000
--- a/tests/Typedef_String_Array/Makefile.am
+++ /dev/null
@@ -1,106 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.typedef_string_array_idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.typedef_string_array_client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testImpl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.typedef_string_array_server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testImpl.cpp \
-  testS.cpp \
-  testImpl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Typedef_String_Array/client.cpp b/tests/Typedef_String_Array/client.cpp
index 03cd26b8eaf..a405d915563 100644
--- a/tests/Typedef_String_Array/client.cpp
+++ b/tests/Typedef_String_Array/client.cpp
@@ -3,8 +3,6 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(StringArray, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://server.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Typedef_String_Array/server.cpp b/tests/Typedef_String_Array/server.cpp
index d24d49cba4d..8e9538a4c4f 100644
--- a/tests/Typedef_String_Array/server.cpp
+++ b/tests/Typedef_String_Array/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "testImpl.h"
 
-ACE_RCSID(MT_Client, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/UNKNOWN_Exception/Makefile.am b/tests/UNKNOWN_Exception/Makefile.am
deleted file mode 100644
index b09d9f69774..00000000000
--- a/tests/UNKNOWN_Exception/Makefile.am
+++ /dev/null
@@ -1,103 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.UNKNOWN_Exception_Idl.am
-
-BUILT_SOURCES = \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES = \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.UNKNOWN_Exception_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.UNKNOWN_Exception_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/UNKNOWN_Exception/client.cpp b/tests/UNKNOWN_Exception/client.cpp
index 27aa30dd43e..c7fce7f224c 100644
--- a/tests/UNKNOWN_Exception/client.cpp
+++ b/tests/UNKNOWN_Exception/client.cpp
@@ -3,8 +3,6 @@
 #include "ace/Get_Opt.h"
 #include "testC.h"
 
-ACE_RCSID (UNKNOWN_Exception, client, "$Id$")
-
 static const ACE_TCHAR *ior = ACE_TEXT("file://ior");
 static int shutdown_server = 1;
 
diff --git a/tests/UNKNOWN_Exception/server.cpp b/tests/UNKNOWN_Exception/server.cpp
index 8d59c3a562b..df224db010e 100644
--- a/tests/UNKNOWN_Exception/server.cpp
+++ b/tests/UNKNOWN_Exception/server.cpp
@@ -5,8 +5,6 @@
 #include "tao/PortableServer/Root_POA.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (UNKNOWN_Exception, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 static int done = 0;
 
diff --git a/tests/Xt_Stopwatch/Client.h b/tests/Xt_Stopwatch/Client.h
index 45162e4daf3..f2cecb0a0a1 100644
--- a/tests/Xt_Stopwatch/Client.h
+++ b/tests/Xt_Stopwatch/Client.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Xt_Stopwatch/Stopwatch_client
-//
-// = FILENAME
-//   Client.h
-//
-// = AUTHOR
-//   Balachandran  Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Client.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran  Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef CLIENT_H
 #define CLIENT_H
@@ -26,35 +23,35 @@ class Client
 {
 public:
 
+  /// ctor
   Client (CORBA::ORB_ptr orb);
-  // ctor
 
+  ///Dtor..
   ~Client (void);
-  //Dtor..
 
+  /// The callbacks
   static void start_callback (Widget w,
                               XtPointer client_data,
                               XtPointer call_data);
   static void stop_callback  (Widget w,
                               XtPointer client_data,
                               XtPointer call_data);
-  // The callbacks
 
+  /// The hooks...
   void start_hook (void);
   void stop_hook (void);
-  // The hooks...
 
+  /// Adds the callbacks to the GUI underneath.....
   void add_callback (Control &);
-  // Adds the callbacks to the GUI underneath.....
 
   void parse_args (int argc, ACE_TCHAR *argv[]);
 private:
 
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
+  /// The server.
   Stopwatch_var server_;
-  // The server.
 };
 
 #endif /* CLIENT_H */
diff --git a/tests/Xt_Stopwatch/Control.h b/tests/Xt_Stopwatch/Control.h
index 0dea6b7eed9..4d57f38da39 100644
--- a/tests/Xt_Stopwatch/Control.h
+++ b/tests/Xt_Stopwatch/Control.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Xt_Stopwatch/Stopwatch_client
-//
-// = FILENAME
-//   Control.h
-//
-// = AUTHOR
-//   Balachandran  Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Control.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran  Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef CONTROL_H
 #define CONTROL_H
@@ -28,34 +25,34 @@
 class Control
 {
  public:
+  /// Stopwatch constructor
   Control (Widget &parent);
-  // Stopwatch constructor
 
+  /// Destructor
   virtual ~Control (void);
-  // Destructor
 
+  /// Manage the widget
   virtual void manage (void);
-  // Manage the widget
 
+  /// Return the start widget
   Widget& startwidget (void);
-  // Return the start widget
 
+  /// Return the stop widget..
   Widget& stopwidget (void);
-  // Return the stop widget..
 
  private:
 
+  /// A frame widget...
   Widget frame_;
-  // A frame widget...
 
+  /// A row column widget..
   Widget rowcolumn_;
-  // A row column widget..
 
+  /// Pushbutton  Widget that is used to start the  timer..
   Widget startwidget_;
-  // Pushbutton  Widget that is used to start the  timer..
 
+  /// Pushbutton widget that is used to stop the timer..
   Widget stopwidget_;
-  // Pushbutton widget that is used to stop the timer..
 
 };
 
diff --git a/tests/Xt_Stopwatch/Makefile.am b/tests/Xt_Stopwatch/Makefile.am
deleted file mode 100644
index 8232b73765c..00000000000
--- a/tests/Xt_Stopwatch/Makefile.am
+++ /dev/null
@@ -1,176 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.Xt_Stopwatch_Server.am
-
-if BUILD_ACE_XTREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_MOTIF
-if BUILD_TAO_XTRESOURCE
-if BUILD_X11
-if BUILD_XT
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_X11_CPPFLAGS) \
-  $(ACE_XT_CPPFLAGS)
-
-server_SOURCES = \
-  Stopwatch_display.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  timer.cpp \
-  Stopwatch_display.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
-  test_i.h \
-  timer.h
-
-server_LDFLAGS = \
- $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS)
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_XtResource.la \
-  $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -lXm \
-  $(ACE_XT_LIBS) \
-  $(ACE_X11_LIBS)
-
-endif BUILD_XT
-endif BUILD_X11
-endif BUILD_TAO_XTRESOURCE
-endif BUILD_MOTIF
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_XTREACTOR
-
-## Makefile.Xt_Stopwatch_Client.am
-
-if BUILD_ACE_XTREACTOR
-if BUILD_EXCEPTIONS
-if BUILD_MOTIF
-if BUILD_TAO_XTRESOURCE
-if BUILD_X11
-if BUILD_XT
-
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
-	@touch $@
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  $(ACE_X11_CPPFLAGS) \
-  $(ACE_XT_CPPFLAGS)
-
-client_SOURCES = \
-  Control.cpp \
-  client.cpp \
-  testC.cpp \
-  Control.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
-
-client_LDFLAGS = \
- $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS)
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_XtResource.la \
-  $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -lXm \
-  $(ACE_XT_LIBS) \
-  $(ACE_X11_LIBS)
-
-endif BUILD_XT
-endif BUILD_X11
-endif BUILD_TAO_XTRESOURCE
-endif BUILD_MOTIF
-endif BUILD_EXCEPTIONS
-endif BUILD_ACE_XTREACTOR
-
-## 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/tests/Xt_Stopwatch/Stopwatch_display.cpp b/tests/Xt_Stopwatch/Stopwatch_display.cpp
index 35c42b14cbe..aa6ff78ed24 100644
--- a/tests/Xt_Stopwatch/Stopwatch_display.cpp
+++ b/tests/Xt_Stopwatch/Stopwatch_display.cpp
@@ -1,15 +1,8 @@
 // $Id$
 
 #include "Stopwatch_display.h"
-
-
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Xt_Stopwatch,
-           Stopwatch_display,
-           "$Id$")
-
-
 Stopwatch_display::Stopwatch_display (Widget &parent)
 {
   // Instantiate the  sub-components of the Stopwatch_display
diff --git a/tests/Xt_Stopwatch/Stopwatch_display.h b/tests/Xt_Stopwatch/Stopwatch_display.h
index 984d90b4d35..9c5cfc6fd24 100644
--- a/tests/Xt_Stopwatch/Stopwatch_display.h
+++ b/tests/Xt_Stopwatch/Stopwatch_display.h
@@ -1,17 +1,13 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Xt_Stopwatch/Stopwatch_server
-//
-// = FILENAME
-//   Stopwatch.h
-//
-// = AUTHOR
-//   Balachandran  Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Stopwatch_display.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran  Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
 
 #ifndef STOPWATCH_H
 #define STOPWATCH_H
@@ -26,24 +22,24 @@ class Stopwatch_display
 {
 public:
 
+  /// Stopwatch_display constructor
   Stopwatch_display (Widget &parent);
-  // Stopwatch_display constructor
 
+  /// Destructor
   virtual ~Stopwatch_display (void);
-  // Destructor
 
+  /// Manage the widget
   virtual void manage (void);
-  // Manage the widget
 
+  /// Change the displayed time
   void set_time (CORBA::Float value);
-  // Change the displayed time
 
 private:
+  /// A frame widget...
   Widget frame_;
-  // A frame widget...
 
+  /// Label Widget that is used to display time..
   Widget label_;
-  // Label Widget that is used to display time..
 };
 
 
diff --git a/tests/Xt_Stopwatch/client.cpp b/tests/Xt_Stopwatch/client.cpp
index 1de9fca420f..61b62cb138a 100644
--- a/tests/Xt_Stopwatch/client.cpp
+++ b/tests/Xt_Stopwatch/client.cpp
@@ -3,12 +3,9 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Xt_Stopwatch, client, "$Id$")
-
 #include "Control.h"
 #include "Client.h"
 
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/Xt_Stopwatch/server.cpp b/tests/Xt_Stopwatch/server.cpp
index 80fc60a15f4..f42ca6922a7 100644
--- a/tests/Xt_Stopwatch/server.cpp
+++ b/tests/Xt_Stopwatch/server.cpp
@@ -3,11 +3,6 @@
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
-
-ACE_RCSID (Xt_Stopwatch,
-           server,
-           "$Id$")
-
 #include "tao/XtResource/XtResource_Loader.h"
 #include <Xm/Xm.h>
 #include "Stopwatch_display.h"
@@ -37,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/Xt_Stopwatch/test.idl b/tests/Xt_Stopwatch/test.idl
index 74e2d42aa80..a3fffd63f86 100644
--- a/tests/Xt_Stopwatch/test.idl
+++ b/tests/Xt_Stopwatch/test.idl
@@ -1,6 +1,6 @@
 // $Id$
 
-interface Stopwatch 
+interface Stopwatch
 {
    void start ();
    // Start the Stop watch
diff --git a/tests/Xt_Stopwatch/test_i.cpp b/tests/Xt_Stopwatch/test_i.cpp
index 3523135d7e3..aa38cd96551 100644
--- a/tests/Xt_Stopwatch/test_i.cpp
+++ b/tests/Xt_Stopwatch/test_i.cpp
@@ -2,8 +2,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID(Xt_Stopwatch, test_i, "$Id$")
-
 Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     timer_ (timer)
diff --git a/tests/Xt_Stopwatch/test_i.h b/tests/Xt_Stopwatch/test_i.h
index 539a82b16e0..10135d3652e 100644
--- a/tests/Xt_Stopwatch/test_i.h
+++ b/tests/Xt_Stopwatch/test_i.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Xt_Stopwatch
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Bala
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Bala
+ */
+//=============================================================================
+
 
 #ifndef SERVER_TEST_I_H
 #define SERVER_TEST_I_H
@@ -20,17 +17,18 @@
 #include "timer.h"
 
 
+/**
+ * @class Stopwatch_imp
+ *
+ * @brief Stopwatch implementation class
+ *
+ * Implements the Stopwatch interface in test.idl
+ */
 class Stopwatch_imp : public POA_Stopwatch
 {
-  // = TITLE
-  //   Stopwatch implementation class
-  //
-  // = DESCRIPTION
-  //   Implements the Stopwatch interface in test.idl
-  //
 public:
+  /// ctor
   Stopwatch_imp (CORBA::ORB_ptr, Timer_imp *);
-  // ctor
 
   // = The Simple_Server methods.
   void start (void);
@@ -40,11 +38,11 @@ public:
   void shutdown (void);
 
 private:
+  /// The ORB
   CORBA::ORB_var orb_;
-  // The ORB
 
+  /// Hold the timer object...
   Timer_imp *timer_;
-  // Hold the timer object...
 };
 
 #endif /* SERVER_TEST_I_H */
diff --git a/tests/Xt_Stopwatch/timer.h b/tests/Xt_Stopwatch/timer.h
index 1708bbc8428..e96d6c614f8 100644
--- a/tests/Xt_Stopwatch/timer.h
+++ b/tests/Xt_Stopwatch/timer.h
@@ -1,17 +1,14 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Xt_Stopwatch
-//
-// = FILENAME
-//   timer.h
-//
-// = AUTHOR
-//   Bala <bala@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   timer.h
+ *
+ *  $Id$
+ *
+ *  @author Bala <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TIMER_H
 #define TIMER_H
@@ -26,49 +23,49 @@ class Timer_imp
 {
  public:
 
+  /// Constructor
   Timer_imp (XtAppContext &,
              CORBA::Long,
              Stopwatch_display *);
-  // Constructor
 
+  /// Destructor
   virtual ~Timer_imp ();
-  // Destructor
 
+  /// Resets, and starts the clock ticking
   void start (void);
-  // Resets, and starts the clock ticking
 
+  /// Stops the clock
   void stop (void);
-  // Stops the clock
 
+  /// Returns time since timer started
   CORBA::Float  elapsed_time (void);
-  // Returns time since timer started
 
  private:
 
+  /// Static member function used for TimeOut callback.
   static void tick_callback (XtPointer,
                              XtIntervalId *);
-  // Static member function used for TimeOut callback.
 
+  /// Called every interval_ milliseconds
   void tick (void);
-  // Called every interval_ milliseconds
 
+  /// Called at each clock tick...
   virtual void report_time (CORBA::Float);
-  // Called at each clock tick...
 
+  /// A copy of the stopwatch object
   Stopwatch_display *stopwatch_;
-  // A copy of the stopwatch object
 
+  /// Current number of ticks
   CORBA::Long counter_;
-  // Current number of ticks
 
+  /// Time in milliseconds between updates
   CORBA::Long interval_;
-  // Time in milliseconds between updates
 
+  /// Identifier of current TimeOut
   XtIntervalId id_;
-  // Identifier of current TimeOut
 
+  /// Required by Xt functions
   XtAppContext app_;
-  // Required by Xt functions
 };
 
 
diff --git a/tests/ZIOP/Hello.cpp b/tests/ZIOP/Hello.cpp
index ab73744cbe1..e22724f5b73 100644
--- a/tests/ZIOP/Hello.cpp
+++ b/tests/ZIOP/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
@@ -36,17 +34,17 @@ Hello::get_big_reply ()
   return reply_mesg._retn ();
 }
 
-void 
+void
 Hello::big_request (const ::Test::Octet_Seq & octet_in)
 {
   if (octet_in.length () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("Server side BLOB received\n")));
     }
   else
     {
-      ACE_DEBUG ((LM_ERROR, 
+      ACE_DEBUG ((LM_ERROR,
                   ACE_TEXT("Error recieving BLOB on server\n")));
     }
 }
diff --git a/tests/ZIOP/Hello.h b/tests/ZIOP/Hello.h
index dbbd2d62e2a..6209a6541e8 100644
--- a/tests/ZIOP/Hello.h
+++ b/tests/ZIOP/Hello.h
@@ -28,7 +28,7 @@ private:
   /// Use an ORB reference to conver strings to objects and shutdown
   /// the application.
   CORBA::ULong length_;
-  
+
   CORBA::ORB_var orb_;
 };
 
diff --git a/tests/ZIOP/TestCompressor/TestCompressor.cpp b/tests/ZIOP/TestCompressor/TestCompressor.cpp
index ef1bba0bc57..8c711ba1536 100644
--- a/tests/ZIOP/TestCompressor/TestCompressor.cpp
+++ b/tests/ZIOP/TestCompressor/TestCompressor.cpp
@@ -1,9 +1,6 @@
-#include "TestCompressor.h"
-
-ACE_RCSID (TEST,
-           TestCompressor,
-           "$Id$")
+// $Id$
 
+#include "TestCompressor.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp b/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
index 276edc0c121..a61e71d60f3 100644
--- a/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
+++ b/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "TestCompressor_Factory.h"
 #include "TestCompressor.h"
 
-ACE_RCSID (TEST,
-           TestCompressor_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/tests/ZIOP/client.cpp b/tests/ZIOP/client.cpp
index 15e2b51cc37..9a4dcab1601 100644
--- a/tests/ZIOP/client.cpp
+++ b/tests/ZIOP/client.cpp
@@ -3,13 +3,10 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 #include "tao/ZIOP/ZIOP.h"
-#include "ace/OS.h"
 #include "tao/Compression/zlib/ZlibCompressor_Factory.h"
 #include "tao/Compression/bzip2/Bzip2Compressor_Factory.h"
 #include "TestCompressor//TestCompressor_Factory.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 #define DEFAULT_COMPRESSION_LEVEL 6
 ::Compression::CompressionManager_var compression_manager = 0;
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
@@ -43,7 +40,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/ZIOP/server.cpp b/tests/ZIOP/server.cpp
index 5fdd724b921..2b2abfc7190 100644
--- a/tests/ZIOP/server.cpp
+++ b/tests/ZIOP/server.cpp
@@ -11,10 +11,6 @@
 #include "tao/Policy_CurrentC.h"
 #include "tao/Transport.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 int test = 1;
 
@@ -43,7 +39,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/objref_comparison_test/Makefile.am b/tests/objref_comparison_test/Makefile.am
deleted file mode 100644
index dd46876c7c6..00000000000
--- a/tests/objref_comparison_test/Makefile.am
+++ /dev/null
@@ -1,78 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.objref_comparison_test.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  fooC.cpp \
-  fooC.h \
-  fooC.inl \
-  fooS.cpp \
-  fooS.h \
-  fooS.inl
-
-CLEANFILES = \
-  foo-stamp \
-  fooC.cpp \
-  fooC.h \
-  fooC.inl \
-  fooS.cpp \
-  fooS.h \
-  fooS.inl
-
-fooC.cpp fooC.h fooC.inl fooS.cpp fooS.h fooS.inl: foo-stamp
-
-foo-stamp: $(srcdir)/foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/foo.idl
-	@touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  fooC.cpp \
-  fooS.cpp \
-  main.cpp \
-  fooC.h \
-  fooC.inl \
-  fooS.h \
-  fooS.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/objref_comparison_test/foo.idl b/tests/objref_comparison_test/foo.idl
index 4e6dc131bea..6c5acbe1288 100644
--- a/tests/objref_comparison_test/foo.idl
+++ b/tests/objref_comparison_test/foo.idl
@@ -3,7 +3,7 @@
 #ifndef FOO_IDL
 #define FOO_IDL
 
-interface foo 
+interface foo
 {
   boolean match_references ();
 };
diff --git a/utils/Makefile.am b/utils/Makefile.am
deleted file mode 100644
index e9331e36f75..00000000000
--- a/utils/Makefile.am
+++ /dev/null
@@ -1,16 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        catior \
-        monitor \
-        nslist \
-        wxNamingViewer
-
diff --git a/utils/NamingViewer/NamingViewer.cpp b/utils/NamingViewer/NamingViewer.cpp
index b9e71b0c68f..91cde3a4952 100644
--- a/utils/NamingViewer/NamingViewer.cpp
+++ b/utils/NamingViewer/NamingViewer.cpp
@@ -67,7 +67,7 @@ BOOL CNamingViewerApp::InitInstance()
   {
     int argc = Argv.argc ();
     CORBA::ORB_var ORB = CORBA::ORB_init(argc, Argv.argv());
-    
+
     CNamingViewerDlg dlg(ORB);
     m_pMainWnd = &dlg;
     int const nResponse = dlg.DoModal();
diff --git a/utils/NamingViewer/resource.h b/utils/NamingViewer/resource.h
index d2788078a96..379585f672a 100644
--- a/utils/NamingViewer/resource.h
+++ b/utils/NamingViewer/resource.h
@@ -41,7 +41,7 @@
 #define ID_CONTEXTPOPUP_BINDNEWCONTEXT  32779
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        138
diff --git a/utils/catior/Catior_i.cpp b/utils/catior/Catior_i.cpp
index f39a9024f0f..5e7b348c523 100644
--- a/utils/catior/Catior_i.cpp
+++ b/utils/catior/Catior_i.cpp
@@ -1,24 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/Utils/catior
-//
-// = FILENAME
-//    Catior_i.cpp
-//
-// = DESCRIPTION
-//    Reads stringified IORs and outputs the encoded information.
-//
-// = AUTHORS
-//      Jeff Hopper <jrhopper@cts.com>
-//      SCIOP and Tagged component modifications by:
-//      Jason Cohen, Lockheed Martin ATL <jcohen@atl.lmco.com>
-//      Split into a separate library by:
-//      Chad Elliott <elliott_c@ociweb.com>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Catior_i.cpp
+ *
+ *  $Id$
+ *
+ *  Reads stringified IORs and outputs the encoded information.
+ *
+ *
+ *  @author   Jeff Hopper <jrhopper@cts.com>   SCIOP and Tagged component modifications by:   Jason Cohen
+ *  @author Lockheed Martin ATL <jcohen@atl.lmco.com>   Split into a separate library by:   Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 
 #include "Catior_i.h"
 #include "tao/Messaging_PolicyValueC.h"
@@ -307,6 +301,10 @@ Catior_i::catior (char const * str)
           {
             continue_decoding = cat_iiop_profile (stream);
           }
+        else if (tag == IOP::TAG_MULTIPLE_COMPONENTS)
+          {
+            continue_decoding = cat_multiple_components (stream);
+          }
         else if (tag == TAO_TAG_SCIOP_PROFILE)
           {
             continue_decoding = cat_sciop_profile (stream);
@@ -504,12 +502,48 @@ Catior_i::cat_tag_orb_type (TAO_InputCDR& stream) {
                          "ORB Type: 0x%x (TAO)\n", orbtype);
        break;
      }
+    case 0x47430000 :
+     {
+       ACE_OS::snprintf (buf, bufsize,
+                         "ORB Type: 0x%x (GNU Classpath)\n", orbtype);
+       break;
+     }
+    case 0x49540000 :
+     {
+       ACE_OS::snprintf (buf, bufsize,
+                         "ORB Type: 0x%x (Orbix)\n", orbtype);
+       break;
+     }
+    case 0x4A430000 :
+     {
+       ACE_OS::snprintf (buf, bufsize,
+                         "ORB Type: 0x%x (JacORB)\n", orbtype);
+       break;
+     }
+    case 0x41540000 :
+     {
+       ACE_OS::snprintf (buf, bufsize,
+                         "ORB Type: 0x%x (OmniORB)\n", orbtype);
+       break;
+     }
+    case 0x53550000 :
+     {
+       ACE_OS::snprintf (buf, bufsize,
+                         "ORB Type: 0x%x (Sun)\n", orbtype);
+       break;
+     }
    case 0x29A:
      {
        ACE_OS::snprintf (buf, bufsize,
                          "ORB Type: 0x%x (TIDorbC++)\n", orbtype);
        break;
      }
+  case 0x4a414300:
+    {
+       ACE_OS::snprintf (buf, bufsize,
+                         "ORB Type: 0x%x (JacORB)\n", orbtype);
+       break;
+    }
    default:
      {
        ACE_OS::snprintf (buf, bufsize,
@@ -578,19 +612,19 @@ Catior_i::cat_tao_tag_endpoints (TAO_InputCDR& stream)
     const char *host = epseq[iter].host;
     CORBA::UShort port = epseq[iter].port;
     indent ();
-    ACE_OS::snprintf (buf, bufsize, 
+    ACE_OS::snprintf (buf, bufsize,
                       "Endpoint #%d:\n", iter+1);
     buffer_ += buf;
     indent ();
-    ACE_OS::snprintf (buf, bufsize, 
+    ACE_OS::snprintf (buf, bufsize,
                       "Host: %s\n", host);
     buffer_ += buf;
     indent ();
-    ACE_OS::snprintf (buf, bufsize, 
+    ACE_OS::snprintf (buf, bufsize,
                       "Port: %d\n", port);
     buffer_ += buf;
     indent ();
-    ACE_OS::snprintf (buf, bufsize, 
+    ACE_OS::snprintf (buf, bufsize,
                       "Priority: %d\n", epseq[iter].priority);
     buffer_ += buf;
   }
@@ -959,7 +993,7 @@ Catior_i::cat_octet_seq (const char *object_name,
       if (!stream.read_octet (anOctet))
         return false;
 
-      ACE_OS::snprintf (buf, bufsize, "%02.2x ", anOctet);
+      ACE_OS::snprintf (buf, bufsize, "%2.2x ", anOctet);
       buffer_ += buf;
       objKey[i] = (char) anOctet;
     }
@@ -1080,7 +1114,9 @@ Catior_i::cat_codeset_info (TAO_InputCDR& cdr)
   for ( ; index < c_ccslen; ++index)
     {
       // CodesetId for char
-      ACE_OS::snprintf (buf, bufsize, "\t%u) ", index + 1L);
+      ACE_OS::snprintf (buf, bufsize,
+                        "\t" ACE_UINT32_FORMAT_SPECIFIER_ASCII ") ",
+                        index + 1);
       buffer_ += buf;
       displayHex (stream);
     }
@@ -1107,7 +1143,9 @@ Catior_i::cat_codeset_info (TAO_InputCDR& cdr)
   //  Loop through and display them
   for (index = 0; index < w_ccslen; ++index)
     {
-      ACE_OS::snprintf (buf, bufsize, "\t %u) ", index + 1L);
+      ACE_OS::snprintf (buf, bufsize,
+                        "\t " ACE_UINT32_FORMAT_SPECIFIER_ASCII ") ",
+                        index + 1);
       buffer_ += buf;
       displayHex (stream);
     }
@@ -1140,7 +1178,9 @@ Catior_i::cat_tagged_components (TAO_InputCDR& stream)
 
       indent ();
       ACE_OS::snprintf (buf, bufsize,
-                        "The component <%d> ID is ", i+1, tag);
+                        "The component <" ACE_UINT32_FORMAT_SPECIFIER_ASCII
+                        "> ID is " ACE_UINT32_FORMAT_SPECIFIER_ASCII,
+                        i+1, tag);
       buffer_ += buf;
 
       if (tag == IOP::TAG_ORB_TYPE) {
@@ -1242,8 +1282,8 @@ Catior_i::cat_profile_helper (TAO_InputCDR& stream,
          && iiop_version_minor <= 2))
     {
       indent ();
-      ACE_OS::snprintf (buf, bufsize, 
-                        "detected new v%d.%d %C profile that catior cannot decode\n",
+      ACE_OS::snprintf (buf, bufsize,
+                        "detected new v%d.%d %s profile that catior cannot decode\n",
                         iiop_version_major,
                         iiop_version_minor,
                         protocol);
@@ -1456,6 +1496,18 @@ Catior_i::cat_uiop_profile (TAO_InputCDR& stream)
 }
 
 CORBA::Boolean
+Catior_i::cat_multiple_components (TAO_InputCDR& stream)
+{
+  static const size_t bufsize = 512;
+  char buf[bufsize];
+
+  ACE_OS::snprintf (buf, bufsize,
+                    "Multiple Components Profile\n");
+  buffer_ += buf;
+  return cat_tagged_components (stream);
+}
+
+CORBA::Boolean
 Catior_i::cat_sciop_profile (TAO_InputCDR& stream)
 {
   // OK, we've got an SCIOP profile.
@@ -1596,7 +1648,7 @@ Catior_i::cat_nsk_profile_helper (TAO_InputCDR& stream,
     {
       indent ();
       ACE_OS::snprintf (buf, bufsize,
-                        "detected new v%d.%d %C profile that catior cannot decode",
+                        "detected new v%d.%d %s profile that catior cannot decode",
                         iiop_version_major,
                         iiop_version_minor,
                         protocol);
diff --git a/utils/catior/Catior_i.h b/utils/catior/Catior_i.h
index 9b7efea6c5e..dc15b9f9bfb 100644
--- a/utils/catior/Catior_i.h
+++ b/utils/catior/Catior_i.h
@@ -1,27 +1,21 @@
-// $Id$
 
 #ifndef CATIOR_I_H
 #define CATIOR_I_H
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/Utils/catior
-//
-// = FILENAME
-//    Catior_i.h
-//
-// = DESCRIPTION
-//    Reads stringified IORs and outputs the encoded information.
-//
-// = AUTHORS
-//      Jeff Hopper <jrhopper@cts.com>
-//      SCIOP and Tagged component modifications by:
-//      Jason Cohen, Lockheed Martin ATL <jcohen@atl.lmco.com>
-//      Split into a separate library by:
-//      Chad Elliott <elliott_c@ociweb.com>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Catior_i.h
+ *
+ *  $Id$
+ *
+ *  Reads stringified IORs and outputs the encoded information.
+ *
+ *
+ *  @author   Jeff Hopper <jrhopper@cts.com>   SCIOP and Tagged component modifications by:   Jason Cohen
+ *  @author Lockheed Martin ATL <jcohen@atl.lmco.com>   Split into a separate library by:   Chad Elliott <elliott_c@ociweb.com>
+ */
+//=============================================================================
+
 
 #include "catior_export.h"
 #include "ace/String_Base.h"
@@ -44,6 +38,7 @@ private:
   // These methods used to be functions in catior.cpp
   CORBA::Boolean catiiop (char* string);
 
+
   CORBA::Boolean catior (char const* str);
 
   CORBA::Boolean catpoop (char* string);
@@ -75,6 +70,8 @@ private:
 
   CORBA::Boolean cat_tagged_components (TAO_InputCDR& stream);
 
+  CORBA::Boolean cat_multiple_components (TAO_InputCDR& stream);
+
   CORBA::Boolean cat_profile_helper (TAO_InputCDR& stream,
                                      const char* protocol);
 
diff --git a/utils/catior/Makefile.am b/utils/catior/Makefile.am
deleted file mode 100644
index afad7c7f320..00000000000
--- a/utils/catior/Makefile.am
+++ /dev/null
@@ -1,105 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-includedir = @includedir@/utils/catior
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.catior_lib.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-lib_LTLIBRARIES = libTAO_Catior.la
-
-libTAO_Catior_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DCATIOR_BUILD_DLL
-
-libTAO_Catior_la_SOURCES = \
-  Catior_i.cpp
-
-libTAO_Catior_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Catior_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_ZIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Compression.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS = \
-  Catior_i.h \
-  catior_export.h
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.catior.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-bin_PROGRAMS = tao_catior
-
-tao_catior_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-tao_catior_SOURCES = \
-  catior.cpp
-
-tao_catior_LDADD = \
-  libTAO_Catior.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ZIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Compression.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/utils/catior/README.catior b/utils/catior/README.catior
index b26c06d951c..a862cf0d7bb 100644
--- a/utils/catior/README.catior
+++ b/utils/catior/README.catior
@@ -6,10 +6,10 @@ printing out the information contained in it.
 Usage
 -----
 
-catior -f <filename>
+tao_catior -f <filename>
 
 Takes in a file which contains the IOR and will then output the
 encoded information to stdout.
 
 There are samples file in the test subdirectory.  You can run the
-"catior" utility against them to see what the output looks like.
+"tao_catior" utility against them to see what the output looks like.
diff --git a/utils/catior/catior.cpp b/utils/catior/catior.cpp
index bba2834efe6..8621cf2bd5b 100644
--- a/utils/catior/catior.cpp
+++ b/utils/catior/catior.cpp
@@ -27,405 +27,414 @@
 int
 ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 {
-  Catior_i catior_impl;
-  CORBA::ORB_var orb_var =  CORBA::ORB_init (argcw, argvw, "TAO");
-  CORBA::Boolean b = 0;
-  CORBA::Boolean have_argument = 0;
-  int opt;
+  CORBA::ORB_var orb_var;
+  try
+    {
+      Catior_i catior_impl;
+      orb_var =  CORBA::ORB_init (argcw, argvw);
+      CORBA::Boolean b = false;
+      CORBA::Boolean have_argument = false;
+      int opt;
 
-  ACE_Get_Opt get_opt (argcw, argvw, ACE_TEXT ("f:n:x"));
+      ACE_Get_Opt get_opt (argcw, argvw, ACE_TEXT ("f:n:x"));
 
-  while ((opt = get_opt ()) != EOF)
-    {
-      // some arguments have been supplied
-      have_argument = 1;
-      switch (opt)
+      while ((opt = get_opt ()) != EOF)
         {
-        case 'n':
-          {
-            //  Read the CosName from the NamingService convert the
-            //  object_ptr to a CORBA::String_var via the call to
-            //  object_to_string.
-            ACE_DEBUG ((LM_DEBUG,
-                        "opening a connection to the NamingService\n"
-                        "resolving the CosName %s\n",
-                        get_opt.opt_arg ()));
-
-            CORBA::Object_var server_object;
-
-            try
+          // some arguments have been supplied
+          have_argument = 1;
+          switch (opt)
+            {
+            case 'n':
               {
-                // Find the Naming Service.
-                CORBA::Object_var naming_context_object =
-                  orb_var->resolve_initial_references ("NameService");
-                CosNaming::NamingContextExt_var naming_context =
-                  CosNaming::NamingContextExt::_narrow (naming_context_object.in ());
-
-                if (CORBA::is_nil (naming_context.in ()))
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                    "NameService cannot be resolved\n"),
-                                   -1);
-                }
-
-                CosNaming::Name *name =
-                  naming_context->to_name (ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg ()));
+                //  Read the CosName from the NamingService convert the
+                //  object_ptr to a CORBA::String_var via the call to
+                //  object_to_string.
+                ACE_DEBUG ((LM_DEBUG,
+                            "opening a connection to the NamingService\n"
+                            "resolving the CosName %s\n",
+                            get_opt.opt_arg ()));
+
+                CORBA::Object_var server_object;
 
                 try
                   {
-                    server_object = naming_context->resolve (*name);
-                      if (CORBA::is_nil (server_object.in ()))
+                    // Find the Naming Service.
+                    CORBA::Object_var naming_context_object =
+                      orb_var->resolve_initial_references ("NameService");
+                    CosNaming::NamingContextExt_var naming_context =
+                      CosNaming::NamingContextExt::_narrow (naming_context_object.in ());
+
+                    if (CORBA::is_nil (naming_context.in ()))
+                    {
+                      ACE_ERROR_RETURN ((LM_ERROR,
+                                        "NameService cannot be resolved\n"),
+                                      -1);
+                    }
+
+                    CosNaming::Name *name =
+                      naming_context->to_name (ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg ()));
+
+                    try
+                      {
+                        server_object = naming_context->resolve (*name);
+                          if (CORBA::is_nil (server_object.in ()))
+                          {
+                            ACE_ERROR_RETURN ((LM_ERROR,
+                                  "name is not resolved to a valid object\n"),
+                                              -1);
+                          }
+                      }
+                    catch (const CosNaming::NamingContext::NotFound& nf)
                       {
+                        const ACE_TCHAR *reason;
+
+                        switch (nf.why)
+                          {
+                            case CosNaming::NamingContext::missing_node:
+                              reason = ACE_TEXT ("missing node");
+                              break;
+                            case CosNaming::NamingContext::not_context:
+                              reason = ACE_TEXT ("not context");
+                              break;
+                            case CosNaming::NamingContext::not_object:
+                              reason = ACE_TEXT ("not object");
+                              break;
+                            default:
+                              reason = ACE_TEXT ("not known");
+                              break;
+                          }
                         ACE_ERROR_RETURN ((LM_ERROR,
-                              "name is not resolved to a valid object\n"),
-                                          -1);
+                                  "%s cannot be resolved, exception reason = %s\n",
+                                          get_opt.opt_arg (),
+                                          reason),
+                                        -1);
                       }
-                  }
-                catch (const CosNaming::NamingContext::NotFound& nf)
-                  {
-                    const ACE_TCHAR *reason;
-
-                    switch (nf.why)
+                    catch (const CosNaming::NamingContext::InvalidName&)
                       {
-                        case CosNaming::NamingContext::missing_node:
-                          reason = ACE_TEXT ("missing node");
-                          break;
-                        case CosNaming::NamingContext::not_context:
-                          reason = ACE_TEXT ("not context");
-                          break;
-                        case CosNaming::NamingContext::not_object:
-                          reason = ACE_TEXT ("not object");
-                          break;
-                        default:
-                          reason = ACE_TEXT ("not known");
-                          break;
+                        ACE_ERROR_RETURN ((LM_ERROR,
+                                      "%s cannot be resolved, exception reason = "
+                                          "Invalid Name"
+                                          "\n",
+                                          get_opt.opt_arg ()),
+                                        -1);
                       }
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                              "%s cannot be resolved, exception reason = %s\n",
-                                      get_opt.opt_arg (),
-                                      reason),
-                                     -1);
-                  }
-                catch (const CosNaming::NamingContext::InvalidName&)
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                   "%s cannot be resolved, exception reason = "
-                                      "Invalid Name"
-                                      "\n",
-                                      get_opt.opt_arg ()),
-                                     -1);
-                  }
-                catch (const CosNaming::NamingContext::CannotProceed&)
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                   "%s cannot be resolved, exception reason = "
-                                      "Cannot Proceed"
-                                      "\n",
-                                      get_opt.opt_arg ()),
-                                     -1);
+                    catch (const CosNaming::NamingContext::CannotProceed&)
+                      {
+                        ACE_ERROR_RETURN ((LM_ERROR,
+                                      "%s cannot be resolved, exception reason = "
+                                          "Cannot Proceed"
+                                          "\n",
+                                          get_opt.opt_arg ()),
+                                        -1);
+                      }
+                    catch (const CORBA::Exception&)
+                      {
+                        ACE_ERROR_RETURN ((LM_ERROR,
+                                      "%s cannot be resolved, exception reason = "
+                                          "Unexpected Exception"
+                                          "\n",
+                                          argvw[0]),
+                                          -1);
+                      }
+
+                    ACE_CString aString;
+
+                    aString = orb_var->object_to_string (server_object.in ());
+
+                    ACE_DEBUG ((LM_DEBUG,
+                                "\nhere is the IOR\n%C\n\n",
+                                aString.rep ()));
+
+                    ACE_CString str;
+                    b = catior_impl.decode(aString, str);
+                    ACE_DEBUG ((LM_DEBUG, "%s", str.c_str()));
                   }
                 catch (const CORBA::Exception&)
                   {
                     ACE_ERROR_RETURN ((LM_ERROR,
-                                   "%s cannot be resolved, exception reason = "
-                                       "Unexpected Exception"
-                                       "\n",
-                                       argvw[0]),
+                                      "%s cannot be resolved, exception reason = "
+                                      "Unexpected Exception"
+                                      "\n",
+                                      argvw[0]),
                                       -1);
                   }
 
-                ACE_CString aString;
-
-                aString = orb_var->object_to_string (server_object.in ());
-
-                ACE_DEBUG ((LM_DEBUG,
-                            "\nhere is the IOR\n%C\n\n",
-                            aString.rep ()));
-
-                ACE_CString str;
-                b = catior_impl.decode(aString, str);
-                ACE_DEBUG ((LM_DEBUG, "%s", str.c_str()));
+                if (b == 1)
+                  ACE_DEBUG ((LM_DEBUG,
+                              "catior returned true\n"));
+                else
+                  ACE_DEBUG ((LM_DEBUG,
+                              "catior returned false\n"));
+                break;
               }
-            catch (const CORBA::Exception&)
+            case 'f':
               {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "%s cannot be resolved, exception reason = "
-                                   "Unexpected Exception"
-                                   "\n",
-                                   argvw[0]),
-                                  -1);
-              }
+                int have_some_input = 0;
+                int decode_pass_count = 0;
 
-            if (b == 1)
-              ACE_DEBUG ((LM_DEBUG,
-                          "catior returned true\n"));
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          "catior returned false\n"));
-            break;
-          }
-        case 'f':
-          {
-            int have_some_input = 0;
-            int decode_pass_count = 0;
-
-            //  Read the file into a CORBA::String_var.
-            ACE_DEBUG ((LM_DEBUG,
-                        "reading the file %s\n",
-                        get_opt.opt_arg ()));
+                //  Read the file into a CORBA::String_var.
+                ACE_DEBUG ((LM_DEBUG,
+                            "reading the file %s\n",
+                            get_opt.opt_arg ()));
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-            ifstream ifstr (ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()));
+                ifstream ifstr (ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()));
 
-            if (!ifstr.good ())
-              {
-                ifstr.close ();
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "%s "
-                                   "-f %s "
-                                   "\n"
-                                   "Invalid IOR file nominated"
-                                   "\n",
-                                   argvw[0],
-                                   get_opt.opt_arg ()),
-                                  -1);
-              }
-
-            while (!ifstr.eof())
-              {
-                ACE_CString aString;
-
-                have_some_input = 0;
-
-                while (!ifstr.eof ())
+                if (!ifstr.good ())
                   {
-                    char ch = 0;
-                    ifstr.get (ch);
-                    if (ifstr.eof () || ch == '\n' || ch == '\r')
-                      break;
-                    aString += ch;
-                    ++have_some_input;
+                    ifstr.close ();
+                    ACE_ERROR_RETURN ((LM_ERROR,
+                                      "%s "
+                                      "-f %s "
+                                      "\n"
+                                      "Invalid IOR file nominated"
+                                      "\n",
+                                      argvw[0],
+                                      get_opt.opt_arg ()),
+                                      -1);
                   }
-#else
-            FILE* ifstr = ACE_OS::fopen (get_opt.opt_arg (), ACE_TEXT ("r"));
 
-            if (!ifstr || ferror (ifstr))
-              {
-                if (ifstr)
+                while (!ifstr.eof())
                   {
-                  ACE_OS::fclose (ifstr);
-                  }
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "%s "
-                                     "-f %s "
-                                     "\n"
-                                     "Invalid IOR file nominated"
-                                     "\n",
-                                     argvw[0],
-                                     get_opt.opt_arg ()),
-                                    -1);
-              }
+                    ACE_CString aString;
 
-            while (!feof (ifstr))
-              {
-                char ch;
-                ACE_CString aString;
+                    have_some_input = 0;
 
-                have_some_input = 0;
+                    while (!ifstr.eof ())
+                      {
+                        char ch = 0;
+                        ifstr.get (ch);
+                        if (ifstr.eof () || ch == '\n' || ch == '\r')
+                          break;
+                        aString += ch;
+                        ++have_some_input;
+                      }
+#else
+                FILE* ifstr = ACE_OS::fopen (get_opt.opt_arg (), ACE_TEXT ("r"));
 
-                while (!feof (ifstr))
+                if (!ifstr || ferror (ifstr))
                   {
-                    ch = ACE_OS::fgetc (ifstr);
-                    if (ch == EOF || ch == '\n' || ch == '\r')
-                      break;
-                    aString += ch;
-                    ++have_some_input;
+                    if (ifstr)
+                      {
+                      ACE_OS::fclose (ifstr);
+                      }
+                      ACE_ERROR_RETURN ((LM_ERROR,
+                                        "%s "
+                                        "-f %s "
+                                        "\n"
+                                        "Invalid IOR file nominated"
+                                        "\n",
+                                        argvw[0],
+                                        get_opt.opt_arg ()),
+                                        -1);
                   }
-#endif /* !defined (ACE_LACKS_IOSTREAM_TOTALLY) */
-                if (have_some_input == 0 || !aString.length())
+
+                while (!feof (ifstr))
                   {
-                    if (!decode_pass_count)
+                    char ch;
+                    ACE_CString aString;
+
+                    have_some_input = 0;
+
+                    while (!feof (ifstr))
                       {
-                          ACE_ERROR_RETURN ((LM_ERROR,
-                                             "%s "
-                                             "-f %s "
-                                             "\n"
-                                             "Empty IOR file nominated"
-                                             "\n",
-                                             argvw[0],
-                                             get_opt.opt_arg ()),
-                                            -1);
+                        ch = ACE_OS::fgetc (ifstr);
+                        if (ch == EOF || ch == '\n' || ch == '\r')
+                          break;
+                        aString += ch;
+                        ++have_some_input;
                       }
-                    else
+#endif /* !defined (ACE_LACKS_IOSTREAM_TOTALLY) */
+                    if (have_some_input == 0 || !aString.length())
                       {
-                        ACE_DEBUG ((LM_DEBUG,
-                                    "catior returned true\n"));
-                        return 0;               // All done now
+                        if (!decode_pass_count)
+                          {
+                              ACE_ERROR_RETURN ((LM_ERROR,
+                                                "%s "
+                                                "-f %s "
+                                                "\n"
+                                                "Empty IOR file nominated"
+                                                "\n",
+                                                argvw[0],
+                                                get_opt.opt_arg ()),
+                                                -1);
+                          }
+                        else
+                          {
+                            ACE_DEBUG ((LM_DEBUG,
+                                        "catior returned true\n"));
+                            return 0;               // All done now
+                          }
                       }
-                  }
 
-                ++decode_pass_count;
+                    ++decode_pass_count;
 
-                ACE_DEBUG ((LM_DEBUG,
-                            "\nhere is the IOR\n%C\n\n",
-                            aString.rep ()));
+                    ACE_DEBUG ((LM_DEBUG,
+                                "\nhere is the IOR\n%C\n\n",
+                                aString.rep ()));
 
-                ACE_CString str;
-                b = catior_impl.decode(aString, str);
-                ACE_DEBUG ((LM_DEBUG, "%s", str.c_str()));
-              }
-            if (b == 1)
-              ACE_DEBUG ((LM_DEBUG,
-                          "catior returned true\n"));
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          "catior returned false\n"));
+                    ACE_CString str;
+                    b = catior_impl.decode(aString, str);
+                    ACE_DEBUG ((LM_DEBUG, "%s", str.c_str()));
+                  }
+                if (b == 1)
+                  ACE_DEBUG ((LM_DEBUG,
+                              "catior returned true\n"));
+                else
+                  ACE_DEBUG ((LM_DEBUG,
+                              "catior returned false\n"));
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-            ifstr.close ();
+                ifstr.close ();
 #else
-            ACE_OS::fclose (ifstr);
+                ACE_OS::fclose (ifstr);
 #endif /* !defined (ACE_LACKS_IOSTREAM_TOTALLY) */
-          }
-          break;
-        case 'x':
-          {
-            int have_some_input = 0;
-            int decode_pass_count = 0;
-
-            //  Read the input into a CORBA::String_var.
-            ACE_DEBUG ((LM_DEBUG,
-                        "reading from stdin\n"));
-
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-            if (!cin.good ())
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "%s "
-                                   "-x"
-                                   "\n"
-                                   "Invalid input stream"
-                                   "\n",
-                                   argvw[0]),
-                                  -1);
               }
-
-            while (!cin.eof())
+              break;
+            case 'x':
               {
-                ACE_CString aString;
+                int have_some_input = 0;
+                int decode_pass_count = 0;
 
-                have_some_input = 0;
+                //  Read the input into a CORBA::String_var.
+                ACE_DEBUG ((LM_DEBUG,
+                            "reading from stdin\n"));
 
-                while (!cin.eof ())
+    #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
+                if (!cin.good ())
                   {
-                    char ch = 0;
-                    cin.get (ch);
-                    if (cin.eof () || ch == '\n' || ch == '\r')
-                      break;
-                    aString += ch;
-                    ++have_some_input;
+                    ACE_ERROR_RETURN ((LM_ERROR,
+                                      "%s "
+                                      "-x"
+                                      "\n"
+                                      "Invalid input stream"
+                                      "\n",
+                                      argvw[0]),
+                                      -1);
                   }
-#else
-            FILE* ifstr = stdin;
 
-            if (!ifstr || ferror (ifstr))
-              {
-                if (ifstr)
+                while (!cin.eof())
                   {
-                  ACE_OS::fclose (ifstr);
-                  }
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "%s "
-                                   "-x"
-                                   "\n"
-                                   "Invalid input stream"
-                                   "\n",
-                                   argvw[0]),
-                                  -1);
-              }
+                    ACE_CString aString;
 
-            while (!feof (ifstr))
-              {
-                char ch;
-                ACE_CString aString;
+                    have_some_input = 0;
 
-                have_some_input = 0;
+                    while (!cin.eof ())
+                      {
+                        char ch = 0;
+                        cin.get (ch);
+                        if (cin.eof () || ch == '\n' || ch == '\r')
+                          break;
+                        aString += ch;
+                        ++have_some_input;
+                      }
+#else
+                FILE* ifstr = stdin;
 
-                while (!feof (ifstr))
+                if (!ifstr || ferror (ifstr))
                   {
-                    ch = ACE_OS::fgetc (ifstr);
-                    if (ch == EOF || ch == '\n' || ch == '\r')
-                      break;
-                    aString += ch;
-                    ++have_some_input;
+                    if (ifstr)
+                      {
+                      ACE_OS::fclose (ifstr);
+                      }
+                    ACE_ERROR_RETURN ((LM_ERROR,
+                                      "%s "
+                                      "-x"
+                                      "\n"
+                                      "Invalid input stream"
+                                      "\n",
+                                      argvw[0]),
+                                      -1);
                   }
-#endif /* !defined (ACE_LACKS_IOSTREAM_TOTALLY) */
 
-                if (have_some_input == 0)
+                while (!feof (ifstr))
                   {
-                    if (!decode_pass_count)
+                    char ch;
+                    ACE_CString aString;
+
+                    have_some_input = 0;
+
+                    while (!feof (ifstr))
                       {
-                        ACE_ERROR_RETURN ((LM_ERROR,
-                                           "%s "
-                                           "-x"
-                                           "\n"
-                                           "Empty input stream"
-                                           "\n",
-                                           argvw[0]),
-                                          -1);
+                        ch = ACE_OS::fgetc (ifstr);
+                        if (ch == EOF || ch == '\n' || ch == '\r')
+                          break;
+                        aString += ch;
+                        ++have_some_input;
                       }
-                    else
+#endif /* !defined (ACE_LACKS_IOSTREAM_TOTALLY) */
+
+                    if (have_some_input == 0)
                       {
-                        return 0;               // All done now
+                        if (!decode_pass_count)
+                          {
+                            ACE_ERROR_RETURN ((LM_ERROR,
+                                              "%s "
+                                              "-x"
+                                              "\n"
+                                              "Empty input stream"
+                                              "\n",
+                                              argvw[0]),
+                                              -1);
+                          }
+                        else
+                          {
+                            return 0;               // All done now
+                          }
                       }
-                  }
 
-                ++decode_pass_count;
+                    ++decode_pass_count;
 
-                ACE_DEBUG ((LM_DEBUG,
-                            "\nhere is the IOR\n%C\n\n",
-                            aString.rep ()));
+                    ACE_DEBUG ((LM_DEBUG,
+                                "\nhere is the IOR\n%C\n\n",
+                                aString.rep ()));
 
-                ACE_CString str;
-                b = catior_impl.decode(aString, str);
-                ACE_DEBUG ((LM_DEBUG, "%s", str.c_str()));
+                    ACE_CString str;
+                    b = catior_impl.decode(aString, str);
+                    ACE_DEBUG ((LM_DEBUG, "%s", str.c_str()));
+                  }
+                if (b == 1)
+                  ACE_DEBUG ((LM_DEBUG,
+                              "catior returned true\n"));
+                else
+                  ACE_DEBUG ((LM_DEBUG,
+                              "catior returned false\n"));
               }
-            if (b == 1)
-              ACE_DEBUG ((LM_DEBUG,
-                          "catior returned true\n"));
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          "catior returned false\n"));
-          }
-          break;
-        case '?':
-        case 'h':
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Usage: %s "
-                             "-f filename "
-                             "-n CosName "
-                             "\n"
-                             "Reads an IOR "
-                             "and dumps the contents to stdout "
-                             "\n",
-                             argvw[0]),
-                            1);
+              break;
+            case '?':
+            case 'h':
+            default:
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                "Usage: %s "
+                                "-f filename "
+                                "-n CosName "
+                                "\n"
+                                "Reads an IOR "
+                                "and dumps the contents to stdout "
+                                "\n",
+                                argvw[0]),
+                                1);
+            }
         }
-    }
 
-    // check that some relevant arguments have been supplied
-    if (have_argument == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Usage: %s "
-                             "-f filename "
-                             "-n CosName "
-                             "\n"
-                             "Reads an IOR "
-                             "and dumps the contents to stdout "
-                             "\n",
-                             argvw[0]),
-                            1);
+        // check that some relevant arguments have been supplied
+        if (have_argument == 0)
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                "Usage: %s "
+                                "-f filename "
+                                "-n CosName "
+                                "\n"
+                                "Reads an IOR "
+                                "and dumps the contents to stdout "
+                                "\n",
+                                argvw[0]),
+                                1);
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ACE_DEBUG ((LM_DEBUG, "\nError:\n"));
+      ex._tao_print_exception ("Exception in nsadd");
+      orb_var->destroy ();
+      return 1;
+    }
   return 0;
 }
-
-
diff --git a/utils/logWalker/HostProcess.cpp b/utils/logWalker/HostProcess.cpp
index 899d8569fbf..7b9f9fa8bd5 100644
--- a/utils/logWalker/HostProcess.cpp
+++ b/utils/logWalker/HostProcess.cpp
@@ -69,7 +69,8 @@ HostProcess::find_thread (long tid)
         return thr;
     }
   char alias[20];
-  ACE_OS::sprintf (alias,"Thread[%d]",this->threads_.size() + 1);
+  ACE_OS::sprintf (alias,"Thread[" ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "]",
+                   this->threads_.size() + 1);
   thr = new Thread (tid, alias);
   threads_.insert_tail (thr);
   return thr;
@@ -163,7 +164,9 @@ HostProcess::add_peer(long handle, PeerProcess *peer)
     }
   const ACE_CString &addr = peer->is_server() ?
     peer->server_addr() : peer->last_client_addr();
-  this->by_addr_.bind (addr,peer);
+  int result = this->by_addr_.bind (addr,peer);
+  if (result != 0)
+    ACE_ERROR ((LM_ERROR,"add_peer, cannot bind to addr %s %p\n", addr.c_str(), "by_addr_.bind"));
   PeerNode *node = new PeerNode (handle,peer);
   this->by_handle_.insert_tail(node);
 }
diff --git a/utils/logWalker/HostProcess.h b/utils/logWalker/HostProcess.h
index 9c63d4ac63f..659cb298d13 100644
--- a/utils/logWalker/HostProcess.h
+++ b/utils/logWalker/HostProcess.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
 // $Id$
-// 
+//
 
 #ifndef LOG_WALKER_HOST_PROCESS_H
 #define LOG_WALKER_HOST_PROCESS_H
@@ -48,7 +48,7 @@ public:
   HostProcess (const ACE_CString &src, long pid);
   ~HostProcess (void);
 
-  // set/get the name of the process. This is only provided by 
+  // set/get the name of the process. This is only provided by
   // an alias supplied to the logWalker command line or manifest file.
   void proc_name (const ACE_CString &name);
   const ACE_CString &proc_name (void) const;
@@ -58,7 +58,7 @@ public:
   Thread * find_thread (long tid);
 
   // Returns a thread that had previously worked with handle h. May return
-  // a null pointer. 
+  // a null pointer.
   Thread * find_thread_for_handle (long h);
 
   // Returns the process id.
@@ -66,7 +66,7 @@ public:
 
   // returns true if the supplied endpoint has been visited before. This
   // may be either a listen endpoint or a client endpoint used to connect
-  // to another peer. 
+  // to another peer.
   bool has_endpoint (ACE_CString& addr, bool listen);
 
   // adds a new endpoint to the list of listen endpoints. Client endpoints
@@ -77,7 +77,7 @@ public:
   // are added as part of the process to add a new peer process
   void add_listen_endpoint (ACE_CString& addr);
 
-  // add a peer to the connection list. If the peer is not in the 
+  // add a peer to the connection list. If the peer is not in the
   // by_addr_ table, it will be added there too.
   void add_peer (long handle, PeerProcess *peer);
 
@@ -104,9 +104,9 @@ public:
   void reconcile_peers (Session *session);
 
 private:
-  void iterate_peers (int group, 
-                      int operation, 
-                      ostream *strm = 0, 
+  void iterate_peers (int group,
+                      int operation,
+                      ostream *strm = 0,
                       Session * session = 0);
 
   long pid_;
diff --git a/utils/logWalker/Invocation.cpp b/utils/logWalker/Invocation.cpp
index 8bee29de488..fd357bf9d0e 100644
--- a/utils/logWalker/Invocation.cpp
+++ b/utils/logWalker/Invocation.cpp
@@ -139,8 +139,6 @@ Invocation::GIOP_Buffer::GIOP_Buffer(const char *text,
       timebuf[time_tok - text] = 0;
       char *hms = ACE_OS::strchr (timebuf,' ');
       if (hms != 0)
-        hms = ACE_OS::strchr (hms + 1, ' ');
-      if (hms != 0)
         {
           int hr, min, sec, msec;
           ::sscanf (hms+1,"%d:%d:%d.%d", &hr, &min, &sec, &msec);
@@ -530,7 +528,7 @@ Invocation::init (const char * text, size_t offset, Thread *thread)
   if (size_str == 0 || id == 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  "Not a request preamble:\n '%s'\n",
+                  "Not a request preamble line %d:\n '%s'\n",offset,
                   text));
       return false;
   }
@@ -729,11 +727,11 @@ Invocation::dump_detail (ostream &strm, int indent, Dump_Mode mode, bool show_ha
           strm << " " << this->repl_octets_->thread()->alias();
 #endif
           char rstat = this->repl_octets_->reply_status();
-          switch (rstat) 
+          switch (rstat)
             {
             case 0:
               break;
-            case 1: 
+            case 1:
               strm << " User Exception";
               break;
             case 2:
diff --git a/utils/logWalker/Log.cpp b/utils/logWalker/Log.cpp
index abd3a05adc5..2402d13e690 100644
--- a/utils/logWalker/Log.cpp
+++ b/utils/logWalker/Log.cpp
@@ -6,6 +6,7 @@
 #include "HostProcess.h"
 #include "Session.h"
 #include "Thread.h"
+#include "ace/OS_NS_stdio.h"
 
 #include "ace/Mem_Map.h"
 
@@ -69,8 +70,8 @@ Log::init (const ACE_TCHAR *filename, const char *alias)
   delete [] buffer;
 
   mapped_file.close();
-  
-  return true;  
+
+  return true;
 }
 
 bool
@@ -107,30 +108,30 @@ Log::get_host (long pid)
   size_t numprocs = this->procs_.size();
   hp = new HostProcess (this->origin_,pid);
   this->procs_.insert_tail(hp);
-  if (this->alias_.length() > 0)
+  ACE_CString &procname = this->alias_.length() > 0 ?
+    this->alias_ : this->origin_;
+  switch (numprocs)
     {
-      switch (numprocs)
-        {
-        case 0:
-          hp->proc_name(alias_);
-          break;
-        case 1:
-          {
-            ACE_CString a2 = alias_ + "_1";
-            HostProcess *first;
-            if (this->procs_.get(first) == 0)
-              first->proc_name(a2);
-          }
-          //fallthru
-        default:
-          {
-            char ext[10];
-            ACE_OS::sprintf(ext,"_%d",numprocs+1);
-            ACE_CString a2 = alias_ + ext;
-            hp->proc_name(a2);
-          }
-        }
+    case 0:
+      hp->proc_name(procname);
+      break;
+    case 1:
+      {
+        ACE_CString a2 = procname + "_1";
+        HostProcess *first;
+        if (this->procs_.get(first) == 0)
+          first->proc_name(a2);
+      }
+      //fallthru
+    default:
+      {
+        char ext[10];
+        ACE_OS::sprintf(ext,"_" ACE_SIZE_T_FORMAT_SPECIFIER_ASCII,numprocs+1);
+        ACE_CString a2 = procname + ext;
+        hp->proc_name(a2);
+      }
     }
+
   this->session_.add_process(hp);
   return hp;
 }
@@ -158,7 +159,7 @@ Log::handle_msg_dump (char *line, size_t offset)
                   new_target->transfer_from (this->dump_target_);
                   this->dump_target_ = new_target;
                   t_iter.remove();
-                  this->giop_waiters_.insert_tail (tmp_thr); 
+                  this->giop_waiters_.insert_tail (tmp_thr);
                   break;
                 }
             }
@@ -242,17 +243,16 @@ Log::parse_dump_msg (Log *this_, char *line, size_t offset)
   if (pp == 0)
     {
       ACE_ERROR((LM_ERROR,
-                 "%d: dump_msg, could not find pp for incoming, text = %s\n", 
+                 "%d: dump_msg, could not find pp for incoming, text = %s\n",
                  offset, line));
       return;
     }
 
-//   if (mode < 2)
-//     thr->enter_wait(pp);
   Invocation::GIOP_Buffer *target = 0;
-  switch (mode) 
+  switch (mode)
     {
     case 1: { // receiving request
+      thr->handle_request();
       Invocation *inv = pp->new_invocation (rid,thr);
       if (inv == 0)
         {
@@ -264,8 +264,10 @@ Log::parse_dump_msg (Log *this_, char *line, size_t offset)
       inv->init (line, offset, thr);
       target = inv->octets(true);
       break;
-    }         
+    }
     case 0: // sending request
+      thr->enter_wait(pp);
+      // fall through.
     case 3: { // receiving reply
       Invocation *inv = pp->find_invocation(rid, thr->active_handle());
       if (inv == 0)
@@ -277,6 +279,13 @@ Log::parse_dump_msg (Log *this_, char *line, size_t offset)
         }
       inv->init (line, offset, thr);
       target = inv->octets(mode == 0);
+      if (target == 0 && mode == 3)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "%d: could not map invocation to target for req_id %d\n",
+                      offset, rid));
+          return;
+        }
 //       if (mode == 3)
 //         thr->exit_wait(pp, offset);
       break;
@@ -287,7 +296,7 @@ Log::parse_dump_msg (Log *this_, char *line, size_t offset)
     }
     default:;
     }
- 
+
   thr->set_giop_target (target);
   this_->giop_waiters_.insert_tail(thr);
   if (this_->giop_waiters_.size() > 1 && (mode == 1 || mode == 3))
@@ -311,7 +320,7 @@ Log::parse_open_listener (Log *this_, char *line, size_t )
   this_->get_pid_tid(pid,tid,line);
 
   HostProcess *hp = this_->get_host(pid);
-  char *addr = ACE_OS::strchr(line,'<') +1; 
+  char *addr = ACE_OS::strchr(line,'<') +1;
   char *c = ACE_OS::strchr(addr,'>');
   *c = '\0';
   ACE_CString server_addr(addr);
@@ -451,19 +460,33 @@ Log::parse_wait_for_event (Log *this_, char *line, size_t offset)
   if (pp == 0)
     {
       ACE_ERROR((LM_ERROR,
-                 "%d: wait_for_event, could not find pp for incoming, text = %s\n", 
+                 "%d: wait_for_event, could not find pp for incoming, text = %s\n",
                  offset, line));
       return;
     }
 
-  bool done = (ACE_OS::strstr (line,"done (follower)") != 0) || 
+  bool done = (ACE_OS::strstr (line,"done (follower)") != 0) ||
     (ACE_OS::strstr(line,"(leader) exit") != 0);
 
 
   if (done)
     thr->exit_wait(pp, offset);
-  else
-    thr->enter_wait(pp);
+//   else
+//     thr->enter_wait(pp);
+}
+
+void
+Log::parse_wait_on_read (Log *this_, char *line, size_t offset)
+{
+  long pid = 0;
+  long tid = 0;
+  this_->get_pid_tid(pid,tid,line);
+
+  HostProcess *hp = this_->get_host(pid);
+  Thread *thr = hp == 0 ? 0 : hp->find_thread (tid);
+  PeerProcess *pp = thr->incoming();
+
+  thr->exit_wait (pp, offset);
 }
 
 void
@@ -507,7 +530,7 @@ Log::parse_cleanup_queue (Log *this_, char *line, size_t offset)
         {
           ACE_ERROR ((LM_ERROR,
                       "%d: Cleanup queue detected, "
-                      "could not find invocation for rid = %d\n", 
+                      "could not find invocation for rid = %d\n",
                       offset, rid));
           rid = target->expected_req_id();
           inv = pp->find_invocation (rid, handle);
@@ -562,7 +585,7 @@ Log::parse_handler_open (Log *this_, char *line, size_t offset)
   HostProcess *hp = this_->get_host(pid);
   Thread *thr = hp == 0 ? 0 : hp->find_thread (tid);
 
-  char *addr = ACE_OS::strchr(line,'<') +1; 
+  char *addr = ACE_OS::strchr(line,'<') +1;
   char *c = ACE_OS::strchr(addr,'>');
   *c = '\0';
   c = ACE_OS::strstr(c+1,"on ");
@@ -589,7 +612,7 @@ Log::parse_handler_open (Log *this_, char *line, size_t offset)
         }
       //      trans->client_endpoint_ = addr;
     }
-  else 
+  else
     {
       trans = new Transport (addr,false,offset);
       pp->add_transport(trans);
@@ -609,7 +632,7 @@ Log::parse_begin_connection (Log *this_, char *line, size_t offset)
   HostProcess *hp = this_->get_host(pid);
   Thread *thr = hp == 0 ? 0 : hp->find_thread (tid);
 
-  char *addr = ACE_OS::strchr(line,'<') +1; 
+  char *addr = ACE_OS::strchr(line,'<') +1;
   char *c = ACE_OS::strchr(addr,'>');
   *c = '\0';
   PeerProcess *pp = hp->find_peer(addr);
@@ -637,9 +660,9 @@ Log::parse_local_addr (Log *this_, char *line, size_t offset)
       ACE_ERROR((LM_ERROR, "%d: file %s, no pending client or server\n",
                  offset, this_->origin_.c_str()));
       return;
-    }      
-  
-  char *addr = ACE_OS::strchr(line,'<') +1; 
+    }
+
+  char *addr = ACE_OS::strchr(line,'<') +1;
   char *c = ACE_OS::strchr(addr,'>');
   *c = '\0';
   if (peer->is_server())
@@ -668,7 +691,7 @@ Log::parse_open_as_server (Log *this_, char *line, size_t offset)
 
 }
 
-void 
+void
 Log::parse_line (char *line, size_t offset)
 {
   // first, is it a client connection to a new peer?
@@ -686,6 +709,7 @@ Log::parse_line (char *line, size_t offset)
       { "Exclusive_TMS::request_id", parse_exclusive_tms },
       { "process_parsed_messages", parse_process_parsed_msgs },
       { "wait_for_event", parse_wait_for_event },
+      { "Wait_On_Read", parse_wait_on_read },
       { "::cleanup_queue, byte_count", parse_cleanup_queue },
       { "close_connection_eh", parse_close_connection },
       { "IIOP_Connector::begin_connection, to ", parse_begin_connection },
@@ -700,7 +724,7 @@ Log::parse_line (char *line, size_t offset)
       this->handle_msg_dump (line, offset);
       return;
     }
-     
+
   for (int i = 0; exprs[i].text != 0; i++)
     {
       if (ACE_OS::strstr(line, exprs[i].text) != 0)
diff --git a/utils/logWalker/Log.h b/utils/logWalker/Log.h
index 8b346c31147..6d4e2b4da09 100644
--- a/utils/logWalker/Log.h
+++ b/utils/logWalker/Log.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
 // $Id$
-// 
+//
 
 #ifndef LOG_WALKER_LOG_H
 #define LOG_WALKER_LOG_H
@@ -53,6 +53,7 @@ private:
   static void parse_exclusive_tms (Log *this_, char *line, size_t offset);
   static void parse_process_parsed_msgs (Log *this_, char *line, size_t offset);
   static void parse_wait_for_event (Log *this_, char *line, size_t offset);
+  static void parse_wait_on_read (Log *this_, char *line, size_t offset);
   static void parse_cleanup_queue (Log *this_, char *line, size_t offset);
   static void parse_close_connection (Log *this_, char *line, size_t offset);
   static void parse_begin_connection (Log *this_, char *line, size_t offset);
diff --git a/utils/logWalker/PeerObject.h b/utils/logWalker/PeerObject.h
index 7a7be19bd68..dcb15acd81c 100644
--- a/utils/logWalker/PeerObject.h
+++ b/utils/logWalker/PeerObject.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
 // $Id$
-// 
+//
 
 #ifndef LOG_WALKER_PEER_OBJECT_H
 #define LOG_WALKER_PEER_OBJECT_H
diff --git a/utils/logWalker/PeerProcess.h b/utils/logWalker/PeerProcess.h
index bdb2f7b6227..76205ba19ad 100644
--- a/utils/logWalker/PeerProcess.h
+++ b/utils/logWalker/PeerProcess.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
 // $Id$
-// 
+//
 
 #ifndef LOG_WALKER_PEER_PROCESS_H
 #define LOG_WALKER_PEER_PROCESS_H
@@ -57,7 +57,7 @@ public:
   void add_transport (Transport *t);
   Transport *last_transport (void);
   Transport *find_transport (long handle);
-  
+
   bool match_local (const char *addr) const;
 
   Invocation *new_invocation (size_t req_id, Thread *thr);
diff --git a/utils/logWalker/README b/utils/logWalker/README
index 6e6409263a6..bc67b032cef 100644
--- a/utils/logWalker/README
+++ b/utils/logWalker/README
@@ -12,10 +12,10 @@ The executable is installed as $ACE_ROOT/bin/tao_logWalker.
 The command line options are:
 
   -t <version>	 	 where <version> represents a TAO minor version
-     			 number, currently only 1.5 and 1.6 are supported.
+     			 number, currently 1.5 through 2.0 are supported.
 			 As variations in logfile output bound to version
 			 are found, this option will expand and may include
-			 micro release numbers as well. Default is 1.6.
+			 micro release numbers as well. Default is 2.0.
 
   -o <filename>		 redirects the output to the named file rather than
      			 standard out.
diff --git a/utils/logWalker/Session.cpp b/utils/logWalker/Session.cpp
index 4a0b7c9992c..898be5e84c6 100644
--- a/utils/logWalker/Session.cpp
+++ b/utils/logWalker/Session.cpp
@@ -8,7 +8,7 @@
 #include "ace/OS_NS_sys_stat.h"
 
 long
-Session::tao_version_ = 160;
+Session::tao_version_ = 200;
 
 Session::Session (void)
 {
@@ -27,13 +27,22 @@ Session::~Session (void)
     }
 }
 
-void
+bool
 Session::set_tao_version (ACE_TCHAR *str)
 {
   if (ACE_OS::strncmp(str, ACE_TEXT("1.5"), 3)== 0)
     tao_version_ = 150;
   else if (ACE_OS::strncmp (str, ACE_TEXT("1.6"), 3) == 0)
     tao_version_ = 160;
+  else if (ACE_OS::strncmp (str, ACE_TEXT("1.7"), 3) == 0)
+    tao_version_ = 170;
+  else if (ACE_OS::strncmp (str, ACE_TEXT("1.8"), 3) == 0)
+    tao_version_ = 180;
+  else if (ACE_OS::strncmp (str, ACE_TEXT("2.0"), 3) == 0)
+    tao_version_ = 200;
+  else
+    return false;
+  return true;
 }
 
 long
@@ -87,10 +96,10 @@ Session::default_service (const char *addrspec)
 HostProcess *
 Session::find_process (long pid)
 {
-  Processes::ENTRY *entry;
+  Processes::ENTRY *entry = 0;
   if (this->processes_.find(pid,entry) == 0)
     return entry->item();
-  else 
+  else
     return 0;
 }
 
@@ -145,7 +154,7 @@ Session::stream_for ( ostream *oldstream, HostProcess *hp, const char *sub)
   if (this->has_dir())
     {
       ACE_CString outname = this->base_dir_;
-      
+
       if (oldstream == 0)
         {
           ACE_OS::mkdir(this->base_dir_.c_str());
@@ -170,13 +179,13 @@ Session::stream_for ( ostream *oldstream, HostProcess *hp, const char *sub)
     return &cout;
 }
 
-void 
+void
 Session::dump ()
 {
   bool single = !this->has_dir();
   ostream *strm = this->stream_for(0);
-  
-  // report session metrics 
+
+  // report session metrics
 
   if (single)
     *strm << "Session summary report: "
@@ -250,7 +259,7 @@ Session::dump ()
 
 
 // iterate over the collection of host processes to associate peer
-// processes via endpoints. 
+// processes via endpoints.
 void
 Session::reconcile (void)
 {
diff --git a/utils/logWalker/Session.h b/utils/logWalker/Session.h
index 7bb8c05b04c..2219921469a 100644
--- a/utils/logWalker/Session.h
+++ b/utils/logWalker/Session.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
 // $Id$
-// 
+//
 
 #ifndef LOG_WALKER_SESSION_H
 #define LOG_WALKER_SESSION_H
@@ -31,7 +31,7 @@ public:
   HostProcess *find_host (ACE_CString &endpoint, bool server);
   void reconcile (void);
 
-  static void set_tao_version (ACE_TCHAR *str);
+  static bool set_tao_version (ACE_TCHAR *str);
   static long tao_version (void);
   void alternate_address (const char *string);
   void default_service (const char *string);
diff --git a/utils/logWalker/Thread.cpp b/utils/logWalker/Thread.cpp
index cf15d84f9a2..57345a22447 100644
--- a/utils/logWalker/Thread.cpp
+++ b/utils/logWalker/Thread.cpp
@@ -33,7 +33,15 @@ Thread::pending_peer (void) const
   return this->new_connection_;
 }
 
-void 
+void
+Thread::handle_request (void)
+{
+  this->encounters_++;
+  if (this->pending_.size() > 1)
+    this->nested_++;
+}
+
+void
 Thread::enter_wait (PeerProcess *pp)
 {
   this->pending_.push (pp);
@@ -44,7 +52,7 @@ Thread::enter_wait (PeerProcess *pp)
     this->nested_++;
 }
 
-void 
+void
 Thread::exit_wait (PeerProcess *pp, size_t linenum)
 {
   PeerProcess *old;
@@ -52,7 +60,7 @@ Thread::exit_wait (PeerProcess *pp, size_t linenum)
     return;
   while (old != pp)
     {
-      ACE_ERROR ((LM_ERROR, 
+      ACE_ERROR ((LM_ERROR,
                   "Line %d, Ending an invocation to peer %s, but most recent started"
                   " is to peer %s\n", linenum, pp->id(), old->id()));
       //      this->pending_.push(old);
@@ -61,19 +69,19 @@ Thread::exit_wait (PeerProcess *pp, size_t linenum)
     }
 }
 
-long 
+long
 Thread::max_depth (void) const
 {
   return this->max_depth_;
 }
 
-long 
+long
 Thread::encounters (void) const
 {
   return this->encounters_;
 }
 
-long 
+long
 Thread::id (void) const
 {
   return this->id_;
@@ -103,7 +111,7 @@ Thread::active_handle (long handle)
   this->active_handle_ = handle;
 }
 
-long 
+long
 Thread::active_handle (void) const
 {
   return this->active_handle_;
@@ -115,7 +123,7 @@ Thread::giop_target (void)
   return this->giop_target_;
 }
 
-void 
+void
 Thread::set_giop_target (Invocation::GIOP_Buffer *buffer)
 {
   this->giop_target_ = buffer;
@@ -130,12 +138,12 @@ Thread::add_invocation (Invocation *inv)
 void
 Thread::dump_detail (ostream &strm)
 {
-  strm << "   " << this->alias_ << " tid = " << this->id_ 
+  strm << "   " << this->alias_ << " tid = " << this->id_
        << "\t" << this->encounters_ << " encounters";
   if (nested_ > 0)
-    strm <<", with " << this->nested_ << " nested upcalls, max depth " 
+    strm <<", with " << this->nested_ << " nested upcalls, max depth "
          << this->max_depth_;
-  strm << endl; 
+  strm << endl;
 }
 
 void
diff --git a/utils/logWalker/Thread.h b/utils/logWalker/Thread.h
index 0905fdecaac..4660d34a0c1 100644
--- a/utils/logWalker/Thread.h
+++ b/utils/logWalker/Thread.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
 // $Id$
-// 
+//
 
 #ifndef LOG_WALKER_THREAD_H
 #define LOG_WALKER_THREAD_H
@@ -27,6 +27,7 @@ public:
   void add_invocation (Invocation *);
 
   PeerProcess *incoming (void) const;
+  void handle_request (void);
   void enter_wait (PeerProcess *);
   void exit_wait (PeerProcess *, size_t linenum);
   Invocation::GIOP_Buffer *giop_target (void);
diff --git a/utils/logWalker/logWalker.cpp b/utils/logWalker/logWalker.cpp
index 626dcb37354..4e99f33de40 100644
--- a/utils/logWalker/logWalker.cpp
+++ b/utils/logWalker/logWalker.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-// Utility to traverse and simplify verbose log files. 
+// Utility to traverse and simplify verbose log files.
 //
 // The goal is to take a collection of log files and extract details
 // related to connections, objects, and invocations to separate out
 // perhaps multiple processes, or at least threads to get a sense of
 // invocation lifecycle.
-// 
+//
 // Ideally a collection of files could be used so that invocations
 // that traverse many processes could be tracked.
 
@@ -56,7 +56,7 @@ parse_manifest (Session &session, ACE_TCHAR *filename)
   while (!strm.eof())
     {
       strm.getline(buffer,500);
-      if (buffer[0] == '\0' || 
+      if (buffer[0] == '\0' ||
           buffer[0] == '#')
         {
           continue;
@@ -107,6 +107,18 @@ parse_manifest (Session &session, ACE_TCHAR *filename)
     }
 }
 
+void
+print_help (void)
+{
+  ACE_DEBUG ((LM_DEBUG, "tao_logWalker recongizes the following arguments\n"));
+  ACE_DEBUG ((LM_DEBUG, "-o <filename> - write all output to specified file\n"));
+  ACE_DEBUG ((LM_DEBUG, "-d <directory> - create separate output files, one per log, and put them in specified directory.\n   Either -o or -d may be set but not both. Default output to stdout.\n"));
+  ACE_DEBUG ((LM_DEBUG, "-m <manifest> - Take inputs from named manifest file\n"));
+  ACE_DEBUG ((LM_DEBUG, "-t <1.5 .. 2.0>  - set source TAO version, default 2.0\n"));
+  ACE_DEBUG ((LM_DEBUG, "-a <name=address> - bind an alias to a host address.\n   Repeat as many times as necessary.\n"));
+  ACE_DEBUG ((LM_DEBUG, "-p <service=address> - bind a service such as Naming to a specific endpoint address\n"));
+}
+
 int
 ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
@@ -144,8 +156,11 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
         }
       if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-t")) == 0)
         {
-          Session::set_tao_version (argv[++i]);
-          continue;
+          if (Session::set_tao_version (argv[++i]))
+            continue;
+          else
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               ACE_TEXT("TAO version must be 1.5, 1.6, 1.7, 1.8, or 2.0 \n")), 0);
         }
       if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-a")) == 0)
         {
@@ -157,6 +172,11 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
           session.default_service (ACE_TEXT_ALWAYS_CHAR (argv[++i]));
           continue;
         }
+      if (argv[i][0] == ACE_TEXT('-'))
+        {
+          print_help ();
+          return 0;
+        }
 
       Log log(session);
 
diff --git a/utils/monitor/Makefile.am b/utils/monitor/Makefile.am
deleted file mode 100644
index 6f21fae6e8c..00000000000
--- a/utils/monitor/Makefile.am
+++ /dev/null
@@ -1,56 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.monitor_client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_WINCE
-
-noinst_PROGRAMS = monitor_client
-
-monitor_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-monitor_client_SOURCES = \
-  monitor_client.cpp
-
-monitor_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \
-  $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \
-  $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \
-  $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_WINCE
-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/utils/monitor/monitor_client.cpp b/utils/monitor/monitor_client.cpp
index 35e98ed761d..69ed3c43e12 100644
--- a/utils/monitor/monitor_client.cpp
+++ b/utils/monitor/monitor_client.cpp
@@ -67,7 +67,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                           -1);
       }
 
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/utils/nslist/Makefile.am b/utils/nslist/Makefile.am
deleted file mode 100644
index fea45083f9f..00000000000
--- a/utils/nslist/Makefile.am
+++ /dev/null
@@ -1,116 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-bin_PROGRAMS =
-
-## Makefile.nsadd.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS += tao_nsadd
-
-tao_nsadd_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-tao_nsadd_SOURCES = \
-  nsadd.cpp
-
-tao_nsadd_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.nsdel.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS += tao_nsdel
-
-tao_nsdel_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-tao_nsdel_SOURCES = \
-  nsdel.cpp
-
-tao_nsdel_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.nslist.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS += tao_nslist
-
-tao_nslist_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-tao_nslist_SOURCES = \
-  nslist.cpp
-
-tao_nslist_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/utils/nslist/nsadd.cpp b/utils/nslist/nsadd.cpp
index 265aff18561..beaab182720 100644
--- a/utils/nslist/nsadd.cpp
+++ b/utils/nslist/nsadd.cpp
@@ -1,34 +1,28 @@
-// $Id$
 
-// ================================================================
-//
-// = LIBRARY
-//    utils
-//
-// = FILENAME
-//    nsadd.cpp
-//
-// = DESCRIPTION
-//    Naming Service add utility
-//
-// = AUTHOR
-//     Carlos O'Ryan
-//     enhanced Nov 6, 2002 Paul Caffrey <denginere@hotmail.com>
-//     redone   Jun 21 2006 Simon Massey <sma@prismtech.com>
-//
-// ================================================================
+//=============================================================================
+/**
+ *  @file    nsadd.cpp
+ *
+ *  $Id$
+ *
+ *  Naming Service add utility
+ *
+ *
+ *  @author  Carlos O'Ryan  enhanced Nov 6
+ *  @author 2002 Paul Caffrey <denginere@hotmail.com>  redone   Jun 21 2006 Simon Massey <sma@prismtech.com>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
-#include "ace/Argv_Type_Converter.h"
 
-CORBA::ORB_var orb;
 int showIOR = 0;
 int showNSonly = 0;
 
 int
-ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   CosNaming::Name the_name (0);
   CORBA::ORB_var orb;
@@ -37,9 +31,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
   try
     {
       // Contact the orb
-      ACE_Argv_Type_Converter argcon (argcw, argvw);
-      orb = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv (),
-                             "");
+      orb = CORBA::ORB_init (argc, argv);
 
       // Scan through the command line options
       bool
@@ -47,10 +39,6 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
         quiet = false,
         rebind = false,
         context = false;
-      int
-        argc = argcon.get_argc ();
-      ACE_TCHAR
-        **argv = argcon.get_TCHAR_argv ();
       const ACE_TCHAR
         *const pname = argv[0];
       const ACE_TCHAR *nameService = 0;
@@ -378,6 +366,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                 root_nc->bind (the_name, obj.in ());
             }
         }
+      orb->destroy ();
     }
   catch (const CosNaming::NamingContext::NotFound& nf)
     {
@@ -428,7 +417,6 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
       return 1;
     }
 
-  orb->destroy ();
   return 0;
 }
 
diff --git a/utils/nslist/nsdel.cpp b/utils/nslist/nsdel.cpp
index 9f6fdae2315..0b426a93c8d 100644
--- a/utils/nslist/nsdel.cpp
+++ b/utils/nslist/nsdel.cpp
@@ -1,22 +1,19 @@
-// $Id$
 
-// ================================================================
-//
-// = LIBRARY
-//    utils
-//
-// = FILENAME
-//    nsdel.cpp
-//
-// = DESCRIPTION
-//    Naming Service del utility
-//
-// = AUTHOR
-//     Carlos O'Ryan <coryan@uci.edu>
-//     enhanced Jan 15, 2001 Paul Caffrey <denginere@hotmail.com>
-//     redone   Jun 21, 2006 Simon Massey <sma@prismtech.com>
-//
-// ================================================================
+//=============================================================================
+/**
+ *  @file    nsdel.cpp
+ *
+ *  $Id$
+ *
+ *  Naming Service del utility
+ *
+ *
+ *  @author  Carlos O'Ryan <coryan@uci.edu>  enhanced Jan 15
+ *  @author 2001 Paul Caffrey <denginere@hotmail.com>  redone   Jun 21
+ *  @author 2006 Simon Massey <sma@prismtech.com>
+ */
+//=============================================================================
+
 
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Time_Utilities.h"
@@ -63,7 +60,7 @@ namespace
 } // end of local unnamed namespace
 
 int
-ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   CosNaming::Name the_name (0);
   CORBA::ORB_var orb;
@@ -71,18 +68,13 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
   try
     {
       // Contact the orb
-      ACE_Argv_Type_Converter argcon (argcw, argvw);
-      orb = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ());
+      orb = CORBA::ORB_init (argc, argv);
 
       // Scan through the command line options
       bool
         failed = false,
         quiet = false,
         destroy = false;
-      int
-        argc = argcon.get_argc ();
-      ACE_TCHAR
-        **argv = argcon.get_TCHAR_argv ();
       const ACE_TCHAR *const pname = argv[0];
       const ACE_TCHAR *nameService = 0;
       ACE_TCHAR kindsep = ACE_TEXT('.');
@@ -339,6 +331,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
             }
           }
       }
+      orb->destroy ();
     }
   catch (const CosNaming::NamingContext::NotFound& nf)
     {
@@ -390,6 +383,5 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
       return 1;
     }
 
-  orb->destroy ();
   return 0;
 }
diff --git a/utils/nslist/nslist.cpp b/utils/nslist/nslist.cpp
index 09c336d5810..a37959d410a 100644
--- a/utils/nslist/nslist.cpp
+++ b/utils/nslist/nslist.cpp
@@ -718,6 +718,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                      ((showCtxIOR)? str.in () : "")));
           list_context (root_nc.in (), 1);
         }
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
@@ -726,6 +727,5 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return -1;
     }
 
-  orb->destroy ();
   return 0;
 }
diff --git a/utils/nslist/run_test.pl b/utils/nslist/run_test.pl
index 2b67bd9427e..025ec46d67a 100755
--- a/utils/nslist/run_test.pl
+++ b/utils/nslist/run_test.pl
@@ -37,7 +37,7 @@ $server4->DeleteFile ($naming_ior);
 $client->DeleteFile ($naming_ior);
 
 
-$NS = $server1->CreateProcess ("../../orbsvcs/Naming_Service/Naming_Service", "");
+$NS = $server1->CreateProcess ("../../orbsvcs/Naming_Service/tao_cosnaming", "");
 $LS = $server2->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_nslist", "");
 $AD = $server3->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_nsadd", "");
 $DL = $server4->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_nsdel", "");
diff --git a/utils/wxNamingViewer/Makefile.am b/utils/wxNamingViewer/Makefile.am
deleted file mode 100644
index 14abba3d97b..00000000000
--- a/utils/wxNamingViewer/Makefile.am
+++ /dev/null
@@ -1,79 +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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.wxNamingViewer.am
-
-if BUILD_EXCEPTIONS
-if BUILD_WXWINDOWS
-
-noinst_PROGRAMS = wxNamingViewer
-
-wxNamingViewer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  $(ACE_WX_CPPFLAGS)
-
-wxNamingViewer_SOURCES = \
-  wxAddNameServerDlg.cpp \
-  wxBindDialog.cpp \
-  wxBindNewContext.cpp \
-  wxNamingObject.cpp \
-  wxNamingTree.cpp \
-  wxNamingViewer.cpp \
-  wxNamingViewerFrame.cpp \
-  wxSelectNSDialog.cpp \
-  wxViewIORDialog.cpp \
-  pch.h \
-  wxAddNameServerDlg.h \
-  wxAutoDialog.h \
-  wxBindDialog.h \
-  wxBindNewContext.h \
-  wxNamingObject.h \
-  wxNamingTree.h \
-  wxNamingViewer.h \
-  wxNamingViewerFrame.h \
-  wxSelectNSDialog.h \
-  wxViewIORDialog.h
-
-wxNamingViewer_LDFLAGS = \
- $(ACE_WX_LDFLAGS)
-
-wxNamingViewer_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_WX_LIBS)
-
-endif BUILD_WXWINDOWS
-endif BUILD_EXCEPTIONS
-
-EXTRA_DIST = \
-  wxNamingViewer.rc
-
-
-## 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/utils/wxNamingViewer/wxAddNameServerDlg.cpp b/utils/wxNamingViewer/wxAddNameServerDlg.cpp
index a2fb3bb74ec..c3054807464 100644
--- a/utils/wxNamingViewer/wxAddNameServerDlg.cpp
+++ b/utils/wxNamingViewer/wxAddNameServerDlg.cpp
@@ -8,7 +8,7 @@
 #include "wxAddNameServerDlg.h"
 
 #include "wxNamingViewer.h"
-  
+
 #include "wx/sizer.h"
 #include "wx/textctrl.h"
 
@@ -17,7 +17,7 @@ namespace  // anonymous
   void create_dialog_components( wxDialog* dialog)
     {
       wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL);
- 
+
       {
         wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL);
         sizer->Add(
@@ -40,7 +40,7 @@ namespace  // anonymous
                       0,
                       wxALIGN_LEFT | wxEXPAND);
       }
- 
+
       {
         wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL);
         sizer->Add(
@@ -63,7 +63,7 @@ namespace  // anonymous
                       0,
                       wxALIGN_LEFT | wxEXPAND);
       }
- 
+
       wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL);
       {
         wxButton* okButton = new wxButton( dialog, wxID_OK, "OK" );
@@ -85,12 +85,12 @@ namespace  // anonymous
                     button_sizer,
                     0,
                     wxALIGN_CENTER);
- 
+
       dialog->SetSizer( topsizer);
       topsizer->SetSizeHints( dialog);
     }
 };  // anonymous
- 
+
 WxAddNameServerDlg::WxAddNameServerDlg( wxWindow* parent)
 #if defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1)
   : wxDialog()
@@ -109,7 +109,7 @@ WxAddNameServerDlg::WxAddNameServerDlg( wxWindow* parent)
 {
 #if defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1)
   LoadFromResource( parent, "addNameServer");
-#else 
+#else
   create_dialog_components( this);
 #endif  // defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1)
    wxButton* ctrl = static_cast<wxButton*>( wxFindWindowByName(
diff --git a/utils/wxNamingViewer/wxBindNewContext.cpp b/utils/wxNamingViewer/wxBindNewContext.cpp
index ab4b66c916a..748c51c5ec7 100644
--- a/utils/wxNamingViewer/wxBindNewContext.cpp
+++ b/utils/wxNamingViewer/wxBindNewContext.cpp
@@ -14,7 +14,7 @@ namespace  // anonymous
   void create_dialog_components( wxDialog* dialog)
   {
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL);
- 
+
     {
       wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL);
       sizer->Add(
@@ -37,7 +37,7 @@ namespace  // anonymous
                     0,
                     wxALIGN_LEFT | wxEXPAND);
     }
- 
+
     {
       wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL);
       sizer->Add(
@@ -60,7 +60,7 @@ namespace  // anonymous
                     0,
                     wxALIGN_LEFT | wxEXPAND);
     }
- 
+
     wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL);
     {
       wxButton* okButton = new wxButton( dialog, wxID_OK, "OK" );
@@ -82,11 +82,11 @@ namespace  // anonymous
                   button_sizer,
                   0,
                   wxALIGN_CENTER);
- 
+
     dialog->SetSizer( topsizer);
     topsizer->SetSizeHints( dialog);
   }
- 
+
 }; // anonymous
 
 WxBindNewContext::WxBindNewContext( wxWindow* parent)
diff --git a/utils/wxNamingViewer/wxSelectNSDialog.cpp b/utils/wxNamingViewer/wxSelectNSDialog.cpp
index e5ba621186d..8657771243d 100644
--- a/utils/wxNamingViewer/wxSelectNSDialog.cpp
+++ b/utils/wxNamingViewer/wxSelectNSDialog.cpp
@@ -27,14 +27,14 @@ namespace  // anonymous
                                   wxDefaultSize,
                                   0,
                                   0,
-                                  wxLB_SINGLE, 
+                                  wxLB_SINGLE,
                                   wxDefaultValidator,
-                                  "serversList" 
+                                  "serversList"
                                   ),
                     1,
                     wxEXPAND | wxALL,
                     5);
- 
+
       wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
       {
         wxButton* okButton = new wxButton( dialog, wxID_OK, "OK" );
@@ -65,12 +65,12 @@ namespace  // anonymous
                         0,
                         wxALL,
                         5);
- 
+
       topsizer->Add(
                     button_sizer,
                     0,
                     wxALIGN_CENTER);
- 
+
       dialog->SetSizer( topsizer);
       topsizer->SetSizeHints( dialog);
     }